diff options
| author | Bill Nottingham <notting@redhat.com> | 2012-04-20 14:33:30 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2012-04-20 14:33:30 -0400 |
| commit | fa2911a4dc5cc793f495b39d9c71bbcc29ff011b (patch) | |
| tree | bb8300fcc33709c42dfb02522a8f54f6a514e0ad | |
| parent | c1d21f7c44405f0fd8bf5d18e6465a49177c070b (diff) | |
| download | initscripts-fa2911a4dc5cc793f495b39d9c71bbcc29ff011b.tar initscripts-fa2911a4dc5cc793f495b39d9c71bbcc29ff011b.tar.gz initscripts-fa2911a4dc5cc793f495b39d9c71bbcc29ff011b.tar.bz2 initscripts-fa2911a4dc5cc793f495b39d9c71bbcc29ff011b.tar.xz initscripts-fa2911a4dc5cc793f495b39d9c71bbcc29ff011b.zip | |
Drop net-tools requirement; check for /sbin/route before calling legacy static-route support. (#682308)
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | rc.d/init.d/network | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec index 55e28336..deff3640 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -36,7 +36,7 @@ Requires: systemd-sysvinit %if %{_with_sysvinit} Requires: SysVinit >= 2.85-38 %endif -Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find +Requires: /sbin/ip, /sbin/arping, /bin/find Requires: /etc/system-release Requires: /sbin/runuser Requires: udev >= 125-1 diff --git a/rc.d/init.d/network b/rc.d/init.d/network index fe9476d7..c38381a3 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -154,9 +154,13 @@ case "$1" in # Add non interface-specific static-routes. if [ -f /etc/sysconfig/static-routes ]; then - grep "^any" /etc/sysconfig/static-routes | while read ignore args ; do - /sbin/route add -$args - done + if [ -x /sbin/route ]; then + grep "^any" /etc/sysconfig/static-routes | while read ignore args ; do + /sbin/route add -$args + done + else + net_log $"Legacy static-route support not available: route not found" + fi fi # IPv6 hook (post IPv4 start) |