openmamba/makedist-openmamba-milestone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Silvan Calarco 2011-10-30 18:23:08 +01:00
parent 238c91148f
commit ee69311a42
5 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.defs
View File

@ -5,10 +5,10 @@ libpthread.so.0 = glibc
# kernel # kernel
kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia 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 kernelsound = kernel-$(KERNEL_EXTRAVER)-sound-backport
kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl kernel-$(KERNEL_EXTRAVER)-rtl8192se 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 kernelfglrx = kernel-$(KERNEL_EXTRAVER)-nongpl-fglrx
kernelslmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems kernelslmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems
kernelhsfmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems kernelhsfmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems

8
platforms/livecd-gnome-root/post.inc.sh
View File

@ -45,14 +45,6 @@ esac
echo $timezone > $MOUNTDIR/etc/timezone echo $timezone > $MOUNTDIR/etc/timezone
cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime 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) # 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` [ -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 echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh

8
platforms/livecd-light-root/post.inc.sh
View File

@ -34,14 +34,6 @@ esac
echo $timezone > $MOUNTDIR/etc/timezone echo $timezone > $MOUNTDIR/etc/timezone
cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime 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) # 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` [ -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 echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh

9
platforms/livecd-root/post.inc.sh
View File

@ -41,15 +41,6 @@ esac
echo $timezone > $MOUNTDIR/etc/timezone echo $timezone > $MOUNTDIR/etc/timezone
cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime 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 # configure favorites in kde menu
for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do 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 chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f

8
platforms/livedvd-root/post.inc.sh
View File

@ -41,14 +41,6 @@ esac
echo $timezone > $MOUNTDIR/etc/timezone echo $timezone > $MOUNTDIR/etc/timezone
cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime 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 # configure favorites in kde menu
for f in /usr/share/applications/chromium-devel.desktop \ for f in /usr/share/applications/chromium-devel.desktop \
/opt/kde/share/applications/kaffeine.desktop /opt/kde/share/applications/amarok.desktop; do /opt/kde/share/applications/kaffeine.desktop /opt/kde/share/applications/amarok.desktop; do