Commit ee69311a42eeecdaa504353113bd0270f9995409

Authored by Silvan Calarco
1 parent 238c91148f
Exists in master

Remove eject code in platforms; now the job is done by livecd-tools

Showing 5 changed files with 2 additions and 35 deletions Side-by-side Diff

... ... @@ -5,10 +5,10 @@
5 5  
6 6 # kernel
7 7 kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia
8   -# kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_96xx
  8 +# kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_96xx
9 9 kernelsound = kernel-$(KERNEL_EXTRAVER)-sound-backport
10 10 kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl kernel-$(KERNEL_EXTRAVER)-rtl8192se
11   -# kernel-$(KERNEL_MORE_EXTRAVER)-atl1e
  11 +# kernel-$(KERNEL_EXTRAVER)-atl1e
12 12 kernelfglrx = kernel-$(KERNEL_EXTRAVER)-nongpl-fglrx
13 13 kernelslmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems
14 14 kernelhsfmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems
platforms/livecd-gnome-root/post.inc.sh
... ... @@ -45,14 +45,6 @@
45 45 echo $timezone > $MOUNTDIR/etc/timezone
46 46 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
47 47  
48   -# enable CDROM autoeject on shutdown/reboot
49   -#
50   -sed -i -e '/^halt .*/i \
51   -/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/halt
52   -
53   -sed -i -e '/^reboot .*/i \
54   -/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/reboot
55   -
56 48 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
57 49 [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
58 50 echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
platforms/livecd-light-root/post.inc.sh
... ... @@ -34,14 +34,6 @@
34 34 echo $timezone > $MOUNTDIR/etc/timezone
35 35 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
36 36  
37   -# enable CDROM autoeject on shutdown/reboot
38   -#
39   -sed -i -e '/^halt .*/i \
40   -/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/halt
41   -
42   -sed -i -e '/^reboot .*/i \
43   -/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/reboot
44   -
45 37 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
46 38 [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
47 39 echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
platforms/livecd-root/post.inc.sh
... ... @@ -41,15 +41,6 @@
41 41 echo $timezone > $MOUNTDIR/etc/timezone
42 42 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
43 43  
44   -# enable CDROM autoeject on shutdown/reboot
45   -#
46   -sed -i -e '/^halt .*/i \
47   -/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/halt
48   -
49   -sed -i -e '/^reboot .*/i \
50   -/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/reboot
51   -
52   -
53 44 # configure favorites in kde menu
54 45 for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
55 46 chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
platforms/livedvd-root/post.inc.sh
... ... @@ -41,14 +41,6 @@
41 41 echo $timezone > $MOUNTDIR/etc/timezone
42 42 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
43 43  
44   -# enable CDROM autoeject on shutdown/reboot
45   -#
46   -sed -i -e '/^halt .*/i \
47   -/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/halt
48   -
49   -sed -i -e '/^reboot .*/i \
50   -/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/reboot
51   -
52 44 # configure favorites in kde menu
53 45 for f in /usr/share/applications/chromium-devel.desktop \
54 46 /opt/kde/share/applications/kaffeine.desktop /opt/kde/share/applications/amarok.desktop; do