Author: nathan
Date: 2005-03-30 22:53:22 -0700 (Wed, 30 Mar 2005)
New Revision: 4824
Modified:
trunk/bootscripts/CHANGELOG
trunk/bootscripts/lfs/init.d/network
trunk/bootscripts/lfs/sysconfig/network-devices/ifdown
trunk/bootscripts/lfs/sysconfig/network-devices/ifup
Log:
Reverted ifup/ifdown/network to fix
Modified: trunk/bootscripts/CHANGELOG
===================================================================
--- trunk/bootscripts/CHANGELOG 2005-03-31 05:29:45 UTC (rev 4823)
+++ trunk/bootscripts/CHANGELOG 2005-03-31 05:53:22 UTC (rev 4824)
@@ -3,6 +3,8 @@
* Changed from syslog-ng to sysklogd (Archaic)
* Temporairly changed loadproc to return 0 if the program is
already running (Nathan Coulson)
+ * Fixed (by reverting) ifup/ifdown/network (Nathan Coulson),
+ Reported by Jim Gifford
* Tagged as lfs-bootscripts-3.2.0 (Nathan Coulson)
n/a - March 19, 2005
Modified: trunk/bootscripts/lfs/init.d/network
===================================================================
--- trunk/bootscripts/lfs/init.d/network 2005-03-31 05:29:45 UTC (rev
4823)
+++ trunk/bootscripts/lfs/init.d/network 2005-03-31 05:53:22 UTC (rev
4824)
@@ -30,19 +30,7 @@
continue
fi
- # A subshell allows us to open files,
- # without contaminating our network bootscript with
- # unneeded variables
- (
- . ${file}
- # If ONBOOT does not equal yes, process the
next file
- if [ "${ONBOOT}" != "yes" ]; then
- continue
- fi
-
- # Bring up ${interface}
- ${network_devices}/ifup ${interface}
- )
+ IN_BOOT=1 ${network_devices}/ifup ${interface}
done
;;
@@ -64,19 +52,7 @@
continue
fi
- # A subshell allows us to open files,
- # without contaminating our network bootscript with
- # unneeded variables
- (
- . ${file}
- # If ONBOOT does not equal yes, process the
next file
- if [ "${ONBOOT}" != "yes" ]; then
- continue
- fi
-
- # Bring up ${interface}
- ${network_devices}/ifdown ${interface}
- )
+ IN_BOOT=1 ${network_devices}/ifdown ${interface}
done
;;
Modified: trunk/bootscripts/lfs/sysconfig/network-devices/ifdown
===================================================================
--- trunk/bootscripts/lfs/sysconfig/network-devices/ifdown 2005-03-31
05:29:45 UTC (rev 4823)
+++ trunk/bootscripts/lfs/sysconfig/network-devices/ifdown 2005-03-31
05:53:22 UTC (rev 4824)
@@ -49,6 +49,12 @@
(
. ${file}
+ # Will not process this service if started by boot, and ONBOOT
+ # is not set to yes
+ if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
+ continue
+ fi
+
# Will not process this service if started by hotplug, and
# ONHOTPLUG is not set to yes
if [ "${IN_HOTPLUG}" = "1" -a "${ONHOTPLUG}" != "yes" ]; then
Modified: trunk/bootscripts/lfs/sysconfig/network-devices/ifup
===================================================================
--- trunk/bootscripts/lfs/sysconfig/network-devices/ifup 2005-03-31
05:29:45 UTC (rev 4823)
+++ trunk/bootscripts/lfs/sysconfig/network-devices/ifup 2005-03-31
05:53:22 UTC (rev 4824)
@@ -46,6 +46,11 @@
(
. ${file}
+ # Will not process this service if started by boot, and ONBOOT
+ # is not set to yes
+ if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
+ continue
+ fi
# Will not process this service if started by hotplug, and
# ONHOTPLUG is not set to yes
if [ "${IN_HOTPLUG}" = "1" -a "${ONHOTPLUG}" != "yes" ]; then
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
