[oe-commits] org.oe.dev initscripts: fix checkroot and remove angstrom specific checkroot

koen commit openembedded-commits at lists.openembedded.org
Sun Apr 1 07:44:58 UTC 2007


initscripts: fix checkroot and remove angstrom specific checkroot

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 971e3adc9d7bff05d723604dbae7cb601a6e1b2f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=971e3adc9d7bff05d723604dbae7cb601a6e1b2f
Files:
1
packages/initscripts/initscripts-1.0/angstrom
packages/initscripts/initscripts-1.0/angstrom/checkroot.sh
packages/initscripts/initscripts-1.0/checkroot.sh
packages/initscripts/initscripts_1.0.bb
Diffs:

#
# mt diff -r98980367a856ce7d20ae203efdc330984432a9b3 -r971e3adc9d7bff05d723604dbae7cb601a6e1b2f
#
# 
# 
# delete "packages/initscripts/initscripts-1.0/angstrom"
# 
# delete "packages/initscripts/initscripts-1.0/angstrom/checkroot.sh"
# 
# patch "packages/initscripts/initscripts-1.0/checkroot.sh"
#  from [a263d776a075ba5d4eb6aa4bf4a315dc3712d5b0]
#    to [7ad29f37420497e06e098e12f9c7a09c25482a0c]
# 
# patch "packages/initscripts/initscripts_1.0.bb"
#  from [b4af32cf9c4d715a01338817a81d32468a046417]
#    to [6d95dda42000b9e9a85bb8cc87d8cb2385131916]
# 
============================================================
--- packages/initscripts/initscripts-1.0/checkroot.sh	a263d776a075ba5d4eb6aa4bf4a315dc3712d5b0
+++ packages/initscripts/initscripts-1.0/checkroot.sh	7ad29f37420497e06e098e12f9c7a09c25482a0c
@@ -193,7 +193,7 @@ fi
 if ! grep -q "^$ROOTFSDEV\w" /proc/mounts; then
   ROOTFSDEV="rootfs"
 fi
-if [ $(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = rw ]; then
+if [ x$(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = "xrw" ]; then
 	echo "Root filesystem already read-write, not remounting"
 	exit 0
 fi
============================================================
--- packages/initscripts/initscripts_1.0.bb	b4af32cf9c4d715a01338817a81d32468a046417
+++ packages/initscripts/initscripts_1.0.bb	6d95dda42000b9e9a85bb8cc87d8cb2385131916
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r87"
+PR = "r88"
 
 SRC_URI = "file://halt \
            file://ramdisk \






More information about the Openembedded-commits mailing list