r1722 - in trunk/oe/packages/initscripts: . initscripts-1.0
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Tue Apr 10 23:41:16 CEST 2007
Author: mickey
Date: 2007-04-10 23:41:15 +0200 (Tue, 10 Apr 2007)
New Revision: 1722
Removed:
trunk/oe/packages/initscripts/initscripts-openprotium_1.0.bb
trunk/oe/packages/initscripts/initscripts-slugos_1.0.bb
Modified:
trunk/oe/packages/initscripts/initscripts-1.0/checkroot.sh
trunk/oe/packages/initscripts/initscripts_1.0.bb
Log:
oe/initscripts: add extra quotes fixing the checkroot.sh bug
Modified: trunk/oe/packages/initscripts/initscripts-1.0/checkroot.sh
===================================================================
--- trunk/oe/packages/initscripts/initscripts-1.0/checkroot.sh 2007-04-10 17:14:57 UTC (rev 1721)
+++ trunk/oe/packages/initscripts/initscripts-1.0/checkroot.sh 2007-04-10 21:41:15 UTC (rev 1722)
@@ -193,7 +193,7 @@
if ! grep -q "^$ROOTFSDEV\w" /proc/mounts; then
ROOTFSDEV="rootfs"
fi
-if [ $(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = rw ]; then
+if [ "$(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}')" = rw ]; then
echo "Root filesystem already read-write, not remounting"
exit 0
fi
Deleted: trunk/oe/packages/initscripts/initscripts-openprotium_1.0.bb
===================================================================
--- trunk/oe/packages/initscripts/initscripts-openprotium_1.0.bb 2007-04-10 17:14:57 UTC (rev 1721)
+++ trunk/oe/packages/initscripts/initscripts-openprotium_1.0.bb 2007-04-10 21:41:15 UTC (rev 1722)
@@ -1,179 +0,0 @@
-#
-# OpenProtium stuff sorta specific for the storcenter.
-#
-# This is, in effect, an extended patch to fix various
-# problems in the initscripts on SlugOS. The problems
-# mostly come down to the order the scripts are executed
-# in.
-include initscripts_${PV}.bb
-
-RCONFLICTS = "initscripts"
-# All other standard definitions inherited from initscripts
-# Except the PR which is hacked here. The format used is
-# a suffix
-PR := "${PR}.11"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = "${PN}"
-
-SRC_URI += "file://openprotium/devfs.sh"
-SRC_URI += "file://openprotium/domainname.sh"
-SRC_URI += "file://openprotium/devices"
-SRC_URI += "file://openprotium/halt"
-SRC_URI += "file://openprotium/reboot"
-SRC_URI += "file://openprotium/flashclean"
-SRC_URI += "file://openprotium/checkroot.sh"
-
-# Without this it is not possible to patch checkroot.sh
-S = "${WORKDIR}"
-
-do_install_append() {
- # the image build command now installs this for slugos
- # except that mine doesn't. we don't need it, but we turnup
- # expects it to at least exist
- rm ${D}${sysconfdir}/device_table
- touch ${D}${sysconfdir}/device_table
-
- # openprotium specific scripts
- # install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/domainname.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/devfs.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/halt ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/reboot ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/devices ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/flashclean ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/checkroot.sh ${D}${sysconfdir}/init.d
-
- # Remove the do install links (this detects a change to the
- # initscripts .bb file - it will cause a build failure here.)
- # This is a copy of the ln -sf lines from the initscripts
- # do_install.
- rm ${D}${sysconfdir}/rc2.d/S99rmnologin
- rm ${D}${sysconfdir}/rc3.d/S99rmnologin
- rm ${D}${sysconfdir}/rc4.d/S99rmnologin
- rm ${D}${sysconfdir}/rc5.d/S99rmnologin
- rm ${D}${sysconfdir}/rc6.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc6.d/S30urandom
- rm ${D}${sysconfdir}/rc6.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc6.d/S40umountfs
- rm ${D}${sysconfdir}/rcS.d/S30ramdisk
- rm ${D}${sysconfdir}/rc6.d/S90reboot
- rm ${D}${sysconfdir}/rc0.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc0.d/S30urandom
- rm ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc0.d/S40umountfs
- rm ${D}${sysconfdir}/rc0.d/S90halt
- rm ${D}${sysconfdir}/rcS.d/S02banner
- rm ${D}${sysconfdir}/rcS.d/S10checkroot.sh
-# rm ${D}${sysconfdir}/rcS.d/S30checkfs.sh
- rm ${D}${sysconfdir}/rcS.d/S35mountall.sh
- rm ${D}${sysconfdir}/rcS.d/S39hostname.sh
- rm ${D}${sysconfdir}/rcS.d/S45mountnfs.sh
- rm ${D}${sysconfdir}/rcS.d/S55bootmisc.sh
-# rm ${D}${sysconfdir}/rcS.d/S55urandom
- rm ${D}${sysconfdir}/rcS.d/S99finish
- rm ${D}${sysconfdir}/rcS.d/S05devices
- # udev will run at S04 if installed
- rm ${D}${sysconfdir}/rcS.d/S03sysfs
- rm ${D}${sysconfdir}/rcS.d/S38devpts.sh
- rm -f ${D}${sysconfdir}/rcS.d/S06alignment
- rm ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
- rm ${D}${sysconfdir}/rc0.d/S25save-rtc.sh
- rm ${D}${sysconfdir}/rc6.d/S25save-rtc.sh
-
-
-
- # Check the result
- find ${D}${sysconfdir}/rc?.d ! -type d -print | {
- status=0
- while read d
- do
- oenote "initscripts-openprotium: unexpected link $d"
- status=1
- done
- test $status -eq 0 ||
- oefatal "initscripts-openprotium: new links break do_install"
- }
-
- # Set the run-level links
- #
- # Startup (S) links - UNCHANGED
- #
- # Keep these in order of startup - S, then 1, 2-5, 0,6
- # according to the level in which the script starts (or stops) first.
- update-rc.d -r ${D} banner start 2 S .
- update-rc.d -r ${D} sysfs.sh start 3 S .
- # udev runs at S 04 .
- update-rc.d -r ${D} devices start 5 S .
- # update-rc.d -r ${D} alignment.sh start 7 S .
- # busybox hwclock.sh (slugos-init) starts here (08)
- # slugos-init umountinitrd runs here (09)
-
- update-rc.d -r ${D} checkroot.sh start 10 S .
- # slugos buffer syslog starts here (11)
- # sysconfsetup runs at S 12
- # modutils.sh runs at S 20
- # checkfs.sh is currently disabled from S 30 (and won't work on SlugOS)
- # ramdisk is not used on SlugOS, would run at S 30
- update-rc.d -r ${D} mountall.sh start 35 S .
- # base-files populate-volatile.sh runs at S37
- update-rc.d -r ${D} devpts.sh start 38 S .
- # slugos file syslog starts here (39)
- update-rc.d -r ${D} populate-volatile.sh start 37 S .
-
- # set hostname and domainname before the network script works (by
- # entering them at level 40), networking may reset them.
- update-rc.d -r ${D} domainname.sh start 40 S .
- update-rc.d -r ${D} hostname.sh start 40 S .
- # network runs at S 40
- # slugos network syslog starts here (44)
- update-rc.d -r ${D} mountnfs.sh start 45 S .
-
- update-rc.d -r ${D} bootmisc.sh start 55 S .
- # urandom is currently disabled from S 55 (and won't work with tmpfs /var)
-
- # ipkg-cl configure runs at S 98
- update-rc.d -r ${D} finish start 99 S .
-
- #
- # User (2-5) links - UNCHANGED
- # rmnologin is the only thing added to user levels
- update-rc.d -r ${D} rmnologin start 99 2 3 4 5 .
- update-rc.d -r ${D} flashclean start 99 5 .
-
- #
- # Shutdown (0,6) links - !!!CHANGED!!!
- #
- # The problem here is that netbase installs K40networking but portmap
- # installs S32portmap. One of these has to change! The safe change
- # is to make the networking stop at S40, so all network related shutdown
- # must be in a K script or <S40.
- #
- # S20sendsigs is a disaster. It needs to happen before the umounts
- # but after the portmapper (which it would otherwise kill).
- #
- # urandom would stop at (S)30
-
- # This is the special, correct, slugos umountnfs.sh (it looks in
- # the /proc/mounts information, not /etc/fstab)
- update-rc.d -r ${D} umountnfs.sh start 31 0 6 .
- update-rc.d -r ${D} save-rtc.sh start 25 0 6 .
- # portmap stops at 32
- # slugos network syslog stops here (39)
- # networking stops at 40 (nothing else does, believe me.)
-
- # busybox hwclock.sh (slugos-init) stops here (45)
- # slugos file syslog stops here (47)
- # slugos buffer syslog stops here (49)
- # udev stops here (55)
- # Remove any errant processes
- update-rc.d -r ${D} sendsigs start 60 0 6 .
-
- # This is the special, correct, slugos umountfs, it will umount
- # any network file systems which failed to umount before.
- update-rc.d -r ${D} umountfs start 70 0 6 .
-
- update-rc.d -r ${D} halt start 90 0 .
- update-rc.d -r ${D} reboot start 90 6 .
-}
Deleted: trunk/oe/packages/initscripts/initscripts-slugos_1.0.bb
===================================================================
--- trunk/oe/packages/initscripts/initscripts-slugos_1.0.bb 2007-04-10 17:14:57 UTC (rev 1721)
+++ trunk/oe/packages/initscripts/initscripts-slugos_1.0.bb 2007-04-10 21:41:15 UTC (rev 1722)
@@ -1,164 +0,0 @@
-# SlugOS specific stuff for the init scripts.
-#
-# This is, in effect, an extended patch to fix various
-# problems in the initscripts on SlugOS. The problems
-# mostly come down to the order the scripts are executed
-# in.
-include initscripts_${PV}.bb
-
-RCONFLICTS = "initscripts"
-# All other standard definitions inherited from initscripts
-# Except the PR which is hacked here. The format used is
-# a suffix
-PR := "${PR}.11"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = "${PN}"
-
-SRC_URI += "file://alignment.sh"
-SRC_URI += "file://domainname.sh"
-SRC_URI += "file://devices.patch;patch=1"
-
-# Without this it is not possible to patch checkroot.sh
-S = "${WORKDIR}"
-
-do_install_append() {
- # the image build command now installs this for slugos
- rm ${D}${sysconfdir}/device_table
-
- # slugos specific scripts
- install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/domainname.sh ${D}${sysconfdir}/init.d
-
- # Remove the do install links (this detects a change to the
- # initscripts .bb file - it will cause a build failure here.)
- # This is a copy of the ln -sf lines from the initscripts
- # do_install.
- rm ${D}${sysconfdir}/rc2.d/S99rmnologin
- rm ${D}${sysconfdir}/rc3.d/S99rmnologin
- rm ${D}${sysconfdir}/rc4.d/S99rmnologin
- rm ${D}${sysconfdir}/rc5.d/S99rmnologin
- rm ${D}${sysconfdir}/rc6.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc6.d/S30urandom
- rm ${D}${sysconfdir}/rc6.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc6.d/S40umountfs
- rm ${D}${sysconfdir}/rcS.d/S30ramdisk
- rm ${D}${sysconfdir}/rc6.d/S90reboot
- rm ${D}${sysconfdir}/rc0.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc0.d/S30urandom
- rm ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc0.d/S40umountfs
- rm ${D}${sysconfdir}/rc0.d/S90halt
- rm ${D}${sysconfdir}/rcS.d/S02banner
- rm ${D}${sysconfdir}/rcS.d/S10checkroot.sh
-# rm ${D}${sysconfdir}/rcS.d/S30checkfs.sh
- rm ${D}${sysconfdir}/rcS.d/S35mountall.sh
- rm ${D}${sysconfdir}/rcS.d/S39hostname.sh
- rm ${D}${sysconfdir}/rcS.d/S45mountnfs.sh
- rm ${D}${sysconfdir}/rcS.d/S55bootmisc.sh
-# rm ${D}${sysconfdir}/rcS.d/S55urandom
- rm ${D}${sysconfdir}/rcS.d/S99finish
- rm ${D}${sysconfdir}/rcS.d/S05devices
- # udev will run at S04 if installed
- rm ${D}${sysconfdir}/rcS.d/S03sysfs
- rm ${D}${sysconfdir}/rcS.d/S38devpts.sh
- rm -f ${D}${sysconfdir}/rcS.d/S06alignment
- rm ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
- rm ${D}${sysconfdir}/rc0.d/S25save-rtc.sh
- rm ${D}${sysconfdir}/rc6.d/S25save-rtc.sh
-
-
-
- # Check the result
- find ${D}${sysconfdir}/rc?.d ! -type d -print | {
- status=0
- while read d
- do
- oenote "initscripts-slugos: unexpected link $d"
- status=1
- done
- test $status -eq 0 ||
- oefatal "initscripts-slugos: new links break do_install"
- }
-
- # Set the run-level links
- #
- # Startup (S) links - UNCHANGED
- #
- # Keep these in order of startup - S, then 1, 2-5, 0,6
- # according to the level in which the script starts (or stops) first.
- update-rc.d -r ${D} banner start 2 S .
- update-rc.d -r ${D} sysfs.sh start 3 S .
- # udev runs at S 04 .
- update-rc.d -r ${D} devices start 5 S .
- update-rc.d -r ${D} alignment.sh start 7 S .
- # busybox hwclock.sh (slugos-init) starts here (08)
- # slugos-init umountinitrd runs here (09)
-
- update-rc.d -r ${D} checkroot.sh start 10 S .
- # slugos buffer syslog starts here (11)
- # sysconfsetup runs at S 12
- # modutils.sh runs at S 20
- # checkfs.sh is currently disabled from S 30 (and won't work on SlugOS)
- # ramdisk is not used on SlugOS, would run at S 30
- update-rc.d -r ${D} mountall.sh start 35 S .
- # base-files populate-volatile.sh runs at S37
- update-rc.d -r ${D} devpts.sh start 38 S .
- # slugos file syslog starts here (39)
- update-rc.d -r ${D} populate-volatile.sh start 37 S .
-
- # set hostname and domainname before the network script works (by
- # entering them at level 40), networking may reset them.
- update-rc.d -r ${D} domainname.sh start 40 S .
- update-rc.d -r ${D} hostname.sh start 40 S .
- # network runs at S 40
- # slugos network syslog starts here (44)
- update-rc.d -r ${D} mountnfs.sh start 45 S .
-
- update-rc.d -r ${D} bootmisc.sh start 55 S .
- # urandom is currently disabled from S 55 (and won't work with tmpfs /var)
-
- # ipkg-cl configure runs at S 98
- update-rc.d -r ${D} finish start 99 S .
-
- #
- # User (2-5) links - UNCHANGED
- # rmnologin is the only thing added to user levels
- update-rc.d -r ${D} rmnologin start 99 2 3 4 5 .
-
- #
- # Shutdown (0,6) links - !!!CHANGED!!!
- #
- # The problem here is that netbase installs K40networking but portmap
- # installs S32portmap. One of these has to change! The safe change
- # is to make the networking stop at S40, so all network related shutdown
- # must be in a K script or <S40.
- #
- # S20sendsigs is a disaster. It needs to happen before the umounts
- # but after the portmapper (which it would otherwise kill).
- #
- # urandom would stop at (S)30
-
- # This is the special, correct, slugos umountnfs.sh (it looks in
- # the /proc/mounts information, not /etc/fstab)
- update-rc.d -r ${D} umountnfs.sh start 31 0 6 .
- update-rc.d -r ${D} save-rtc.sh start 25 0 6 .
- # portmap stops at 32
- # slugos network syslog stops here (39)
- # networking stops at 40 (nothing else does, believe me.)
-
- # busybox hwclock.sh (slugos-init) stops here (45)
- # slugos file syslog stops here (47)
- # slugos buffer syslog stops here (49)
- # udev stops here (55)
- # Remove any errant processes
- update-rc.d -r ${D} sendsigs start 60 0 6 .
-
- # This is the special, correct, slugos umountfs, it will umount
- # any network file systems which failed to umount before.
- update-rc.d -r ${D} umountfs start 70 0 6 .
-
- update-rc.d -r ${D} halt start 90 0 .
- update-rc.d -r ${D} reboot start 90 6 .
-}
Modified: trunk/oe/packages/initscripts/initscripts_1.0.bb
===================================================================
--- trunk/oe/packages/initscripts/initscripts_1.0.bb 2007-04-10 17:14:57 UTC (rev 1721)
+++ trunk/oe/packages/initscripts/initscripts_1.0.bb 2007-04-10 21:41:15 UTC (rev 1722)
@@ -5,7 +5,7 @@
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r89"
+PR = "r90"
SRC_URI = "file://halt \
file://ramdisk \
More information about the commitlog
mailing list
