summaryrefslogtreecommitdiff
path: root/hooks-addons/clean_initramfs
diff options
context:
space:
mode:
authorDimitri John Ledkov <dimitri.ledkov@canonical.com>2013-12-31 13:28:27 +0000
committerDimitri John Ledkov <dimitri.ledkov@canonical.com>2013-12-31 13:28:27 +0000
commit9b4f2dd391d79f67fbff8627d7217f003105dfab (patch)
tree82a07d69e72baa942283bc332b5d4456a52fbc1a /hooks-addons/clean_initramfs
parent85e11fb132b2b81b50a45647b070e8f6fd648d65 (diff)
parentde57566ca38d821454f8df4dfe36f4820c8fbaa4 (diff)
Merge tag 'tcos-0.89.93' into dgit/sidHEADdebian/0.89.93master
0.89.93
Diffstat (limited to 'hooks-addons/clean_initramfs')
-rwxr-xr-xhooks-addons/clean_initramfs7
1 files changed, 5 insertions, 2 deletions
diff --git a/hooks-addons/clean_initramfs b/hooks-addons/clean_initramfs
index 9d10fc4..b8154e1 100755
--- a/hooks-addons/clean_initramfs
+++ b/hooks-addons/clean_initramfs
@@ -7,7 +7,7 @@
_verbose "(clean_initramfs) Cleaning initramfs..."
-if [ "${DESTDIR}" = "" ] || [ "$DESTDIR" = "/" ]; then
+if [ "${DESTDIR}" = "" ] || [ "$DESTDIR" = "/" ] || [ ! -d "$DESTDIR/scripts" ]; then
_echo " * ERROR: DESTDIR var not set. not cleaning initramfs..."
exit 1
fi
@@ -116,6 +116,9 @@ create_link /usr/lib/xorg/modules/drivers/i810_drv.so /usr/lib/xorg/modules/driv
create_link /usr/share/X11/xkb/rules/evdev.lst /usr/share/X11/xkb/rules/base.lst
+create_link /sbin/mke2fs /sbin/mkfs.ext3
+create_link /sbin/mke2fs /sbin/mkfs.ext4
+
#( cd $DESTDIR/bin && rm -f zcat ; ln -s gunzip zcat )
if [ -d $DESTDIR/lib/cmds ]; then
( cd $DESTDIR/lib/cmds && rm -f poweroff && ln -s reboot poweroff )
@@ -163,7 +166,7 @@ fi
if [ "$TCOS_DISABLE_USPLASH" = "1" ]; then
- _echo " * Remove usplash"
+ #_echo " * Remove usplash"
rm -f ${DESTDIR}/lib/usplash 2>/dev/null
rm -f ${DESTDIR}/sbin/usplash 2>/dev/null
rm -f ${DESTDIR}/sbin/usplash_write 2>/dev/null