diff options
| author | Nicolas Lécureuil <neoclust@mageia.org> | 2016-02-12 23:13:02 +0100 |
|---|---|---|
| committer | Nicolas Lécureuil <neoclust@mageia.org> | 2016-02-12 23:13:02 +0100 |
| commit | db9b41d4763cb7cc1fae3d6fbd10825690c079e3 (patch) | |
| tree | a1dc7e49160eb86e823117b2eb87cd28bd3c2408 /rc.d/init.d | |
| parent | 57fc7a5a7a974ac606208a618d67aba55eb84618 (diff) | |
| parent | e5282b7755a453cc2a938d1514c03b83821c4f61 (diff) | |
| download | initscripts-db9b41d4763cb7cc1fae3d6fbd10825690c079e3.tar initscripts-db9b41d4763cb7cc1fae3d6fbd10825690c079e3.tar.gz initscripts-db9b41d4763cb7cc1fae3d6fbd10825690c079e3.tar.bz2 initscripts-db9b41d4763cb7cc1fae3d6fbd10825690c079e3.tar.xz initscripts-db9b41d4763cb7cc1fae3d6fbd10825690c079e3.zip | |
Merge tag 'initscripts-9.63-1' into distro/mga
Tag as initscripts-9.63-1
In rc.d/init.d/functions, gprintf replaced as upstream does by echo.
TODO: See if we keep this or revert the behaviour
Diffstat (limited to 'rc.d/init.d')
| -rw-r--r-- | rc.d/init.d/functions | 4 | ||||
| -rwxr-xr-x | rc.d/init.d/network | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index c9c15b71..fdf58bd0 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -241,7 +241,7 @@ daemon() { nicelevel=0 while [ "$1" != "${1##[-+]}" ]; do case $1 in - '') gprintf "%s: Usage: daemon [+/-nicelevel] {program}\n" $0 + '') echo $"$0: Usage: daemon [+/-nicelevel] {program}" "[arg1]..." return 1;; --check) base=$2 @@ -277,7 +277,7 @@ daemon() { nice="nice -n $1" shift ;; - *) gprintf "%s: Usage: daemon [+/-nicelevel] {program}\n" $0 + *) echo $"$0: Usage: daemon [+/-nicelevel] {program}" "[arg1]..." return 1;; esac done diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 2f35f494..4e0cd8b4 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -68,10 +68,11 @@ case "$1" in apply_sysctl - if [ -r /etc/ethers -a -x /sbin/arp ]; then - action "Storing ARP mapping" /sbin/arp -f /etc/ethers + #tell NM to reload its configuration + if [ "$(LANG=C nmcli -t --fields running general status 2>/dev/null)" = "running" ]; then + nmcli connection reload fi - + # bring up loopback interface action "Bringing up loopback interface: " ./ifup ifcfg-lo |