summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.flxfiles3
-rw-r--r--ChangeLog7
l---------etc/init.d1
-rwxr-xr-xetc/startup.rc1
-rwxr-xr-xobsolete/ntp (renamed from sbin/init.d/ntp)0
-rwxr-xr-xobsolete/squid (renamed from sbin/init.d/squid)0
-rwxr-xr-xsbin/init.d/network8
-rwxr-xr-xsbin/init.d/system8
8 files changed, 19 insertions, 9 deletions
diff --git a/.flxfiles b/.flxfiles
index 3b1ac4d..4b8f063 100644
--- a/.flxfiles
+++ b/.flxfiles
@@ -7,8 +7,6 @@ sbin/init.d/klogd
sbin/init.d/monitor
sbin/init.d/mouse
sbin/init.d/network
-sbin/init.d/ntp
-sbin/init.d/squid
sbin/init.d/sshd
sbin/init.d/stat
sbin/init.d/sysprofiles
@@ -26,6 +24,7 @@ sbin/rc.K
sbin/rc.M
sbin/rc.S
sbin/initscript
+etc/init.d
etc/initscript
etc/startup.rc
.preinit
diff --git a/ChangeLog b/ChangeLog
index fd4351d..a969e63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004/02/01 : 0.3.30
+- squid has been removed
+- etc/init.d points to ../sbin/init.d
+2004/01/01
+- system : modules are now allowed to fail
+- ntp script has been removed
+- network: always set link down before flush addr to workaround a kernel bug
2003/12/07 : 0.3.29
- network : added 'ip arp' ; allow modprobe to fail ; add flush & reload
- rc.S : ordered mounts & automatic mkdir
diff --git a/etc/init.d b/etc/init.d
new file mode 120000
index 0000000..3de0faa
--- /dev/null
+++ b/etc/init.d
@@ -0,0 +1 @@
+../sbin/init.d \ No newline at end of file
diff --git a/etc/startup.rc b/etc/startup.rc
index 0581ebf..177d2c1 100755
--- a/etc/startup.rc
+++ b/etc/startup.rc
@@ -1,4 +1,3 @@
#!/bin/sh
/sbin/init.d/sysprofiles /etc/config.rc
-
diff --git a/sbin/init.d/ntp b/obsolete/ntp
index 8735348..8735348 100755
--- a/sbin/init.d/ntp
+++ b/obsolete/ntp
diff --git a/sbin/init.d/squid b/obsolete/squid
index 6b6f328..6b6f328 100755
--- a/sbin/init.d/squid
+++ b/obsolete/squid
diff --git a/sbin/init.d/network b/sbin/init.d/network
index 4a0c318..a136a69 100755
--- a/sbin/init.d/network
+++ b/sbin/init.d/network
@@ -227,8 +227,8 @@ function do_start {
fi
fi
- ip addr flush dev $instname >/dev/null 2>&1
ip link set $instname down >/dev/null 2>&1
+ ip addr flush dev $instname >/dev/null 2>&1
if [ "$opt_lladdr" ]; then
ip link set $instname address $opt_lladdr
@@ -390,8 +390,8 @@ function do_stop {
arg=$[$arg+1]
done
- ip addr flush dev $instname >/dev/null 2>&1
ip link set $instname down >/dev/null 2>&1
+ ip addr flush dev $instname >/dev/null 2>&1
# a dot in an interface name means physical_if.vlanid
# We have to remove the interface now.
@@ -449,8 +449,8 @@ function do_flush {
arg=$[$arg+1]
done
- ip addr flush dev $instname >/dev/null 2>&1
ip link set $instname down >/dev/null 2>&1
+ ip addr flush dev $instname >/dev/null 2>&1
# a dot in an interface name means physical_if.vlanid
# We have to remove the interface now.
@@ -570,8 +570,8 @@ _do_stop()
if grep -qs $eth /proc/$proc/cmdline ; then kill $proc ; fi
done
fi
- ip addr flush dev $eth >/dev/null 2>&1
ip link set $eth down
+ ip addr flush dev $eth >/dev/null 2>&1
if [ ! -z `eval echo \\$int_"$eth"_slave` ]; then
for slave in `eval echo \\$int_"$eth"_slave`; do
ip link set $slave down arp on
diff --git a/sbin/init.d/system b/sbin/init.d/system
index 02cf429..27d891d 100755
--- a/sbin/init.d/system
+++ b/sbin/init.d/system
@@ -73,10 +73,14 @@ function do_start {
arg=0
while [ $arg -lt ${#opt_modprobe[*]} ]; do
- modprobe ${opt_modprobe[$arg]} || return 1
+ if [ "${opt_modprobe[$arg]}" != "#" ]; then
+ if ! modprobe ${opt_modprobe[$arg]}; then
+ echo " ==> start $svcname : modprobe ${opt_modprobe[$arg]} failed. Trying anyway."
+ fi
+ fi
arg=$[$arg+1]
done
-
+
if [ -n "$opt_file_max" ]; then
echo $opt_file_max > /proc/sys/fs/file-max
fi