SVN: rc-scripts/trunk/rc.d: init.d/network rc.sysinit

[baggins]

Author: baggins
Date: Tue May  1 02:53:53 2007
New Revision: 8487

Modified:
   rc-scripts/trunk/rc.d/init.d/network
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
- reverted some command substitution changes due to conflicting parenthesis


Modified: rc-scripts/trunk/rc.d/init.d/network
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/network	(original)
+++ rc-scripts/trunk/rc.d/init.d/network	Tue May  1 02:53:53 2007
@@ -132,7 +132,7 @@
 
 	if [ -n "$bootprio" ]; then
 		# find all the interfaces besides loopback.
-		interfaces_boot=$(
+		interfaces_boot=`
 			for a in $(echo "$bootprio" | sort -t= -n -k2,2); do
 				i="${a%:BOOTPRIO*}"
 				case $i in
@@ -141,9 +141,9 @@
 				ONBOOT=""; . "$i" 2>/dev/null
 				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
 			done
-		)
+		`
 	else
-		interfaces_boot=$(
+		interfaces_boot=`
 			for i in $ifcfg_files; do
 				case ${i##*/} in
 					ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-*.*) continue ;;
@@ -151,9 +151,9 @@
 				ONBOOT=""; . "$i" 2>/dev/null
 				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
 			done
-		)
+		`
 
-		interfaces_vlan_boot=$(
+		interfaces_vlan_boot=`
 			for i in $ifcfg_files; do
 				case ${i##*/} in
 					ifcfg-*.*) ;;
@@ -162,9 +162,9 @@
 				ONBOOT=""; . "$i" 2>/dev/null
 				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
 			done
-		)
+		`
 
-		interfaces_br_boot=$(
+		interfaces_br_boot=`
 			for i in $ifcfg_files; do
 				case ${i##*/} in
 					ifcfg-br*) ;;
@@ -173,9 +173,9 @@
 				ONBOOT=""; . "$i" 2>/dev/null
 				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
 			done
-		)
+		`
 
-		interfaces_sit_boot=$(
+		interfaces_sit_boot=`
 			for i in $ifcfg_files; do
 				case ${i##*/} in
 					ifcfg-sit*) ;;
@@ -184,7 +184,7 @@
 				ONBOOT=""; . "$i" 2>/dev/null
 				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
 			done
-		)
+		`
 	fi
 
 	tunnels=$(

Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Tue May  1 02:53:53 2007
@@ -316,7 +316,7 @@
 			nls "*** when you leave the shell."
 			echo
 
-			PS1="$(nls '(Repair filesystem)# ')"; export PS1
+			PS1="`nls '(Repair filesystem)# '`"; export PS1
 			[ "$SELINUX" = "1" ] && disable_selinux
 			if ! is_no "$RUN_SULOGIN_ON_ERR"; then
 				/sbin/sulogin