From 1af77e2b7f733067343c41bbd007b0cac81815f8 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 30 Oct 2011 18:20:01 +0100 Subject: [PATCH] Remove live cd eject code, now done in livecd-tools --- platforms/livecd-gnome-root/post.inc.sh | 8 -------- platforms/livecd-light-root/post.inc.sh | 8 -------- platforms/livecd-root/post.inc.sh | 8 -------- platforms/livedvd-root/post.inc.sh | 8 -------- platforms/livegames-root/post.inc.sh | 8 -------- platforms/livestudio-root/post.inc.sh | 8 -------- platforms/testcd-root/post.inc.sh | 8 -------- 7 files changed, 56 deletions(-) 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 18b7e65..a7a9bae 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-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; 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 diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh index 7d27432..d6b8793 100644 --- a/platforms/livegames-root/post.inc.sh +++ b/platforms/livegames-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; do chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f diff --git a/platforms/livestudio-root/post.inc.sh b/platforms/livestudio-root/post.inc.sh index 2df90d6..5cc23c0 100644 --- a/platforms/livestudio-root/post.inc.sh +++ b/platforms/livestudio-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/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh index 18b7e65..a7a9bae 100644 --- a/platforms/testcd-root/post.inc.sh +++ b/platforms/testcd-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; do chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f