diff options
author | Jonathan Bauer | 2014-03-06 14:40:10 +0100 |
---|---|---|
committer | Jonathan Bauer | 2014-03-06 14:40:10 +0100 |
commit | 09168aff06b5093d0e143264e0eec545d27a76ad (patch) | |
tree | 7ed59a1c290313b52126df35c7420ae8606d9299 /remote | |
parent | [xorg] add iptable rule for X11 port (diff) | |
parent | [dhcpc-busybox] Fix domain not appearing in resolv.conf due to broken printf ... (diff) | |
download | tm-scripts-09168aff06b5093d0e143264e0eec545d27a76ad.tar.gz tm-scripts-09168aff06b5093d0e143264e0eec545d27a76ad.tar.xz tm-scripts-09168aff06b5093d0e143264e0eec545d27a76ad.zip |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
-rwxr-xr-x | remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx index 4edce5fc..17932f48 100755 --- a/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx +++ b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx @@ -76,16 +76,16 @@ case "$1" in # Update resolver configuration file CONF="" if [ -n "$domain" ]; then - printf -v CONF "domain $domain\n" + printf -v CONF "${CONF}domain $domain\n" elif [ -n "$SLX_NET_DOMAIN" ]; then - printf -v CONF "domain $SLX_NET_DOMAIN\n" + printf -v CONF "${CONF}domain $SLX_NET_DOMAIN\n" fi if [ -n "$search" ]; then - printf -v CONF "search $search\n" + printf -v CONF "${CONF}search $search\n" elif [ -n "$SLX_SEARCH_DOMAIN" ]; then - printf -v CONF "search $SLX_SEARCH_DOMAIN\n" + printf -v CONF "${CONF}search $SLX_SEARCH_DOMAIN\n" elif [ -n "$SLX_NET_DOMAIN" ]; then - printf -v CONF "search $SLX_NET_DOMAIN\n" + printf -v CONF "${CONF}search $SLX_NET_DOMAIN\n" fi for i in $dns; do echo "$0: Adding DNS $i" |