Work with dash again.

Package-Manager: portage-2.1.2.6

3 files changed, 21 insertions, 28 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 959cb63f34d0..9aea449f6063 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.301 2007/05/04 14:14:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.302 2007/05/05 21:24:57 uberlord Exp $
+
+  05 May 2007; Roy Marples <uberlord@gentoo.org> files/udev-start-110-r1.sh:
+  Work with dash again.
 
 *udev-110-r1 (04 May 2007)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index c8c4de9ff034..974c36c70164 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 SHA1 fbdeedb8b7a638c9d930f1e405aa83e55d9d2eec SHA256 63602afdbefafa4eb0b3301685e47dec5cc206b66765e733f9bcc6afe2a5d31b
 MD5 17c291f5c6e624792d02dd304fb8177e files/05-udev-early.rules-078 288
 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 files/05-udev-early.rules-078 288
@@ -201,10 +198,10 @@ AUX udev-start-108-r1.sh 3935 RMD160 f65acd07a4edeb35eeed5468b4b0c30e6c1efc17 SH
 MD5 f0fde8cc31e129c9eb55e1954f42c288 files/udev-start-108-r1.sh 3935
 RMD160 f65acd07a4edeb35eeed5468b4b0c30e6c1efc17 files/udev-start-108-r1.sh 3935
 SHA256 16a7969ad8dcebc5893d1f04c0207db0344d24011f9630785518b954c47c06f3 files/udev-start-108-r1.sh 3935
-AUX udev-start-110-r1.sh 5331 RMD160 f3e3b9ee6a6ce2ae3e448f36cb9d2484c71bf2d2 SHA1 e88d1cab677dda061248f05718b65df46fb85f30 SHA256 d98225f45c86d7a3f2ec0e3d707e89f1c6c22c5ff467e43629e33aab75fe577a
-MD5 193e0866b642e83035de9a825e4a8e4b files/udev-start-110-r1.sh 5331
-RMD160 f3e3b9ee6a6ce2ae3e448f36cb9d2484c71bf2d2 files/udev-start-110-r1.sh 5331
-SHA256 d98225f45c86d7a3f2ec0e3d707e89f1c6c22c5ff467e43629e33aab75fe577a files/udev-start-110-r1.sh 5331
+AUX udev-start-110-r1.sh 5327 RMD160 caeac2277a26017330b9c626976842eadfb0b11f SHA1 875243c2724691ec583c4a5d5f17d7da1dbde438 SHA256 7845199f72bc41f440da36a8a3e44c92b943fdbb84241f13c073961246190ad7
+MD5 07f7b394707e9c1a70e7511a4fd5f810 files/udev-start-110-r1.sh 5327
+RMD160 caeac2277a26017330b9c626976842eadfb0b11f files/udev-start-110-r1.sh 5327
+SHA256 7845199f72bc41f440da36a8a3e44c92b943fdbb84241f13c073961246190ad7 files/udev-start-110-r1.sh 5327
 AUX udev-start-110.sh 4072 RMD160 2fd2792a5bc1606638f5fb49f87169882f256179 SHA1 139e3d220d8f64ccadb688e276834c73d8bdfd1c SHA256 2dd8572157375455187e9dee2d53807d57ea0f334617733a8cce71b35eeb135b
 MD5 eaee4384c4143fc1772c31cc6532c4aa files/udev-start-110.sh 4072
 RMD160 2fd2792a5bc1606638f5fb49f87169882f256179 files/udev-start-110.sh 4072
@@ -452,10 +449,10 @@ EBUILD udev-110.ebuild 9829 RMD160 3452835fc9d94da4b5266498509c84ee8ea79811 SHA1
 MD5 d3bf2a664ff303283108edd767cae6a5 udev-110.ebuild 9829
 RMD160 3452835fc9d94da4b5266498509c84ee8ea79811 udev-110.ebuild 9829
 SHA256 5677205d17d3401184e097d04ec97ddfcff0cc6c9bd73cfac400a457a1ddb204 udev-110.ebuild 9829
-MISC ChangeLog 58093 RMD160 e27ab44038f49d6ab7c46fdc217b3c12b89fcd25 SHA1 32a85c434a40efafcfd9525bea415deffc5b5b3e SHA256 940b961a6c0ae9af228e3950e3cbf6c2fd571ea4adfacfe7cf9c1eaff6d302d0
-MD5 7229a54e9d22e3bcc0e1617fd8a1676c ChangeLog 58093
-RMD160 e27ab44038f49d6ab7c46fdc217b3c12b89fcd25 ChangeLog 58093
-SHA256 940b961a6c0ae9af228e3950e3cbf6c2fd571ea4adfacfe7cf9c1eaff6d302d0 ChangeLog 58093
+MISC ChangeLog 58199 RMD160 24cfcb694fab9d4a2bbbdf2ba60a49af9d505a23 SHA1 8ad15e87786a5113ab7a80544c5ac0bbb490a0dd SHA256 ba45eeb379e3b106cc034107a2d11a59232a3bc45e4567745f2556c71c3a9ba2
+MD5 6f7a8ad30677fc63176bdcf206611fbf ChangeLog 58199
+RMD160 24cfcb694fab9d4a2bbbdf2ba60a49af9d505a23 ChangeLog 58199
+SHA256 ba45eeb379e3b106cc034107a2d11a59232a3bc45e4567745f2556c71c3a9ba2 ChangeLog 58199
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -532,10 +529,3 @@ SHA256 69a1572d54ff5ba74652f37125d187171cc62f7d1cce3a09c4c11be16112a482 files/di
 MD5 2bed01dff144a7f267cc55a2eeb748e4 files/digest-udev-110-r1 229
 RMD160 88d77d0fa4c3c670326891749d674ef3c73a4c94 files/digest-udev-110-r1 229
 SHA256 69a1572d54ff5ba74652f37125d187171cc62f7d1cce3a09c4c11be16112a482 files/digest-udev-110-r1 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGOz/it2vP6XvVdOcRAqwoAJwOHUjMGB3+xkxU6CQPU0Jkmx9deQCfbJPo
-VpQwH7Rii6Y/H6QZwnIdY6E=
-=d6aN
------END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/udev-start-110-r1.sh b/sys-fs/udev/files/udev-start-110-r1.sh
index 0ae63972151d..67277434b1c7 100644
--- a/sys-fs/udev/files/udev-start-110-r1.sh
+++ b/sys-fs/udev/files/udev-start-110-r1.sh
@@ -10,15 +10,15 @@ populate_udev() {
 
 	# tell modprobe.sh to be verbose to $CONSOLE
 
-	echo export CONSOLE=${CONSOLE} > /dev/.udev_populate
-	echo export TERM=${TERM} >> /dev/.udev_populate
+	echo "export CONSOLE=${CONSOLE}" > /dev/.udev_populate
+	echo "export TERM=${TERM}" >> /dev/.udev_populate
 
 	if get_bootparam "nocoldplug" ; then
 		RC_COLDPLUG="no"
 		ewarn "Skipping udev coldplug as requested in kernel cmdline"
 	fi
 
-	if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then
+	if [ "$(get_KV)" -gt "$(KV_to_int '2.6.14')" ] ; then
 		ebegin "Populating /dev with existing devices through uevents"
 		local opts=
 		[ "${RC_COLDPLUG}" != "yes" ] && opts="--attr-match=dev"
@@ -81,16 +81,16 @@ unpack_device_tarball() {
 }
 
 make_dev_root() {
-	local DEV=$(/lib/udev/get_dir_major_minor "/")
-	if [ $? == 0 ] && [ -n "${DEV}" ]; then
+	local DEV="$(/lib/udev/get_dir_major_minor "/")"
+	if [ $? = 0 -a -n "${DEV}" ]; then
 		mknod -m 600 /dev/root b ${DEV}
 	fi
 }
 
 check_persistent_net() {
 	# check if there are problems with persistent-net
-	local syspath
-	local devs=""
+	local syspath=
+	local devs=
 	local problem_found=0
 	for syspath in /sys/class/net/*_rename*; do
 		if [ -d "${syspath}" ]; then
@@ -153,7 +153,7 @@ main() {
 	touch /dev/.rcsysinit
 
 	# Selinux lovin; /selinux should be mounted by selinux-patched init
-	if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then
+	if [ -x /sbin/restorecon -a -c /selinux/null ] ; then
 		restorecon /dev > /selinux/null
 	fi
 
@@ -190,7 +190,7 @@ main() {
 		[ -x /sbin/lvm ] && \
 			/sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null
 		# Running evms_activate on a LiveCD causes lots of headaches
-		[ -z "${CDBOOT}" ] && [ -x /sbin/evms_activate ] && \
+		[ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \
 			/sbin/evms_activate -q &>/dev/null
 		eend 0
 	fi