From ee69311a42eeecdaa504353113bd0270f9995409 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sun, 30 Oct 2011 18:23:08 +0100
Subject: [PATCH] Remove eject code in platforms; now the job is done by
 livecd-tools

---
 Makefile.defs                           | 4 ++--
 platforms/livecd-gnome-root/post.inc.sh | 8 --------
 platforms/livecd-light-root/post.inc.sh | 8 --------
 platforms/livecd-root/post.inc.sh       | 9 ---------
 platforms/livedvd-root/post.inc.sh      | 8 --------
 5 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs
index 7dced49..072b776 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -5,10 +5,10 @@ libpthread.so.0 = glibc
 
 # kernel
 kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia
-# kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_96xx
+# kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_96xx
 kernelsound = kernel-$(KERNEL_EXTRAVER)-sound-backport
 kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl kernel-$(KERNEL_EXTRAVER)-rtl8192se
-# kernel-$(KERNEL_MORE_EXTRAVER)-atl1e
+# kernel-$(KERNEL_EXTRAVER)-atl1e
 kernelfglrx = kernel-$(KERNEL_EXTRAVER)-nongpl-fglrx
 kernelslmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems
 kernelhsfmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems
diff --git a/platforms/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh
index 89d9cd7..d0bf1f2 100644
--- a/platforms/livecd-gnome-root/post.inc.sh
+++ b/platforms/livecd-gnome-root/post.inc.sh
@@ -45,14 +45,6 @@ esac
 echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
-# enable CDROM autoeject on shutdown/reboot
-#
-sed -i -e '/^halt .*/i \
-/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/halt
-
-sed -i -e '/^reboot .*/i \
-/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/reboot
-
 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
 [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
 echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
diff --git a/platforms/livecd-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh
index bab1b21..e57a1de 100644
--- a/platforms/livecd-light-root/post.inc.sh
+++ b/platforms/livecd-light-root/post.inc.sh
@@ -34,14 +34,6 @@ esac
 echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
-# enable CDROM autoeject on shutdown/reboot
-#
-sed -i -e '/^halt .*/i \
-/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/halt
-
-sed -i -e '/^reboot .*/i \
-/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/reboot
-
 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
 [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
 echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh
index a29ed0f..a7a9bae 100644
--- a/platforms/livecd-root/post.inc.sh
+++ b/platforms/livecd-root/post.inc.sh
@@ -41,15 +41,6 @@ esac
 echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
-# enable CDROM autoeject on shutdown/reboot
-#
-sed -i -e '/^halt .*/i \
-/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/halt
-
-sed -i -e '/^reboot .*/i \
-/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/reboot
-
-
 # configure favorites in kde menu
 for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh
index 1a6b496..8fad3d2 100644
--- a/platforms/livedvd-root/post.inc.sh
+++ b/platforms/livedvd-root/post.inc.sh
@@ -41,14 +41,6 @@ esac
 echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
-# enable CDROM autoeject on shutdown/reboot
-#
-sed -i -e '/^halt .*/i \
-/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/halt
-
-sed -i -e '/^reboot .*/i \
-/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/reboot
-
 # configure favorites in kde menu
 for f in /usr/share/applications/chromium-devel.desktop \
          /opt/kde/share/applications/kaffeine.desktop /opt/kde/share/applications/amarok.desktop; do