From 19c9010f079857dac9b084e9ccec7d6a5676626d Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 28 May 2011 15:20:16 +0200
Subject: [PATCH] Port some cleanups from openmamba (devel) target

---
 makedist.inc.sh                      | 3 +++
 platforms/livecd-root/post.inc.sh    | 8 --------
 platforms/livedvd-root/post.inc.sh   | 8 --------
 platforms/livegames-root/post.inc.sh | 8 --------
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/makedist.inc.sh b/makedist.inc.sh
index 4982f5b..2e8251b 100644
--- a/makedist.inc.sh
+++ b/makedist.inc.sh
@@ -105,6 +105,9 @@ find $MOUNTDIR/usr/share/locale \
  -maxdepth 1 -mindepth 1 -type d \
 ! -name it* ! -name en* ! -name C ! -name l10n -exec rm -rf {} \;
 
+# cleanup: prevent generating a cleanfs script crash due to a unionfs bug
+rm -rf $MOUNTDIR/tmp/.ICE-unix
+
 #$CHROOTCMD chkconfig --add acpid ||
 #   { echo "$mkcd_me: fatal error, aborting installation" >&2
 #      { (exit 1); exit 1; }; }
diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh
index b6c5493..cef9704 100644
--- a/platforms/livecd-root/post.inc.sh
+++ b/platforms/livecd-root/post.inc.sh
@@ -13,14 +13,6 @@ echo "Forcing \`inittab' to open tty root shells with no login..."
 sed -i 's,^\([1-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab
 sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
 
-# configure extlinux boot loader
-cat > $MOUNTDIR/boot/extlinux.conf << _EOF
-DEFAULT $PLATFORM
-LABEL $PLATFORM
-KERNEL /boot/vmlinuz-${KERNEL_VER}${KERNEL_EXTRAVER}
-APPEND video=uvesafb:1024x768-32,ywrap,mtrr root=$ROOTDEV console=tty1 initrd=/boot/initramfs-${KERNEL_VER}${KERNEL_EXTRAVER}.img.gz splash=silent quiet
-_EOF
-
 # configure for runlevel 5 boot
 sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
 
diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh
index 324c1ba..b28ef4b 100644
--- a/platforms/livedvd-root/post.inc.sh
+++ b/platforms/livedvd-root/post.inc.sh
@@ -13,14 +13,6 @@ echo "Forcing \`inittab' to open tty root shells with no login..."
 sed -i 's,^\([1-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab
 sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
 
-# configure extlinux boot loader
-cat > $MOUNTDIR/boot/extlinux.conf << _EOF
-DEFAULT $PLATFORM
-LABEL $PLATFORM
-KERNEL /boot/vmlinuz-${KERNEL_VER}${KERNEL_EXTRAVER}
-APPEND video=uvesafb:1024x768-32,ywrap,mtrr root=$ROOTDEV console=tty1 initrd=/boot/initramfs-${KERNEL_VER}${KERNEL_EXTRAVER}.img.gz splash=silent quiet
-_EOF
-
 # configure for runlevel 5 boot
 sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
 
diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh
index e24789d..3844b53 100644
--- a/platforms/livegames-root/post.inc.sh
+++ b/platforms/livegames-root/post.inc.sh
@@ -13,14 +13,6 @@ echo "Forcing \`inittab' to open tty root shells with no login..."
 sed -i 's,^\([1-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab
 sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
 
-# configure extlinux boot loader
-cat > $MOUNTDIR/boot/extlinux.conf << _EOF
-DEFAULT $PLATFORM
-LABEL $PLATFORM
-KERNEL /boot/vmlinuz-${KERNEL_VER}${KERNEL_EXTRAVER}
-APPEND video=uvesafb:1024x768-32,ywrap,mtrr root=$ROOTDEV console=tty1 initrd=/boot/initramfs-${KERNEL_VER}${KERNEL_EXTRAVER}.img.gz splash=silent quiet
-_EOF
-
 # configure for runlevel 5 boot
 sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab