diff options
| author | Nicolas Lécureuil <neoclust@mageia.org> | 2016-02-12 22:18:45 +0100 |
|---|---|---|
| committer | Nicolas Lécureuil <neoclust@mageia.org> | 2016-02-12 22:18:45 +0100 |
| commit | 57fc7a5a7a974ac606208a618d67aba55eb84618 (patch) | |
| tree | fc2573f12db17b607b0c577c1f6bc7aff597e2ef /sysconfig/network-scripts/network-functions | |
| parent | 8613e72572d775568e83404d7aaf1fd718716686 (diff) | |
| parent | 7d0df4232dc55afb9b1ca44cbe54a52817d0f321 (diff) | |
| download | initscripts-57fc7a5a7a974ac606208a618d67aba55eb84618.tar initscripts-57fc7a5a7a974ac606208a618d67aba55eb84618.tar.gz initscripts-57fc7a5a7a974ac606208a618d67aba55eb84618.tar.bz2 initscripts-57fc7a5a7a974ac606208a618d67aba55eb84618.tar.xz initscripts-57fc7a5a7a974ac606208a618d67aba55eb84618.zip | |
Merge tag 'initscripts-9.62-1' into distro/mga
Tag as initscripts-9.62-1
Diffstat (limited to 'sysconfig/network-scripts/network-functions')
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 92919ae9..98a844b6 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -560,10 +560,10 @@ is_bonding_device () change_resolv_conf () { s=$(/bin/grep '^[\ \ ]*option' /etc/resolv.conf 2>/dev/null); - if [ "x$s" != "x" ]; then - s="$s"$'\n'; - fi; if [ $# -gt 1 ]; then + if [ "x$s" != "x" ]; then + s="$s"$'\n'; + fi; n_args=$#; while [ $n_args -gt 0 ]; do @@ -581,7 +581,7 @@ change_resolv_conf () done; elif [ $# -eq 1 -a -r "$1" ]; then if [ "x$s" != "x" ]; then - s="$s"$(/bin/grep -vF "$s" $1); + s="$s"$'\n'$(/bin/grep -vF "$s" $1); else s=$(cat $1); fi; |