]> git.pld-linux.org Git - packages/rc-scripts.git/commitdiff
- ignore non-empty but commented /etc/mactab
authorElan Ruusamäe <glen@pld-linux.org>
Sun, 16 Oct 2005 01:26:49 +0000 (01:26 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    rc-scripts-mactab-emptycheck.patch -> 1.1

rc-scripts-mactab-emptycheck.patch [new file with mode: 0644]

diff --git a/rc-scripts-mactab-emptycheck.patch b/rc-scripts-mactab-emptycheck.patch
new file mode 100644 (file)
index 0000000..2963ffd
--- /dev/null
@@ -0,0 +1,13 @@
+--- etc/rc.d/init.d/network~   2005-10-16 04:22:43.823119234 +0300
++++ etc/rc.d/init.d/network    2005-10-16 04:22:45.702829164 +0300
+@@ -57,7 +57,9 @@
+ modprobe_net
+ # Setup interfaces names
+-[ -x /sbin/nameif -a -f /etc/mactab ] && run_cmd "Setting interfaces names (nameif)" /sbin/nameif
++if [ -x /sbin/nameif -a -f /etc/mactab ] && [ $(egrep -v '^(#| *$)' /etc/mactab | wc -l) -gt 0 ]; then
++    run_cmd "Setting interfaces names (nameif)" /sbin/nameif
++fi
+ # Kernel network parameters
+ sysctl -e -p /etc/sysctl.conf > /dev/null 2>&1
This page took 0.090384 seconds and 4 git commands to generate.