d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More checking if kenv actually know something.

Browse Source 
Guard against test(1)-unfriendly outputs from kenv.
This commit is contained in:
Poul-Henning Kamp 2003-10-03 19:07:31 +00:00
parent 282e0f015b
commit 027ec595a1
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/rc.d/diskless
View File

@ -145,7 +145,8 @@ fi
# generate our hostname
#
if [ -z "`hostname -s`" ]; then
if [ -z "`hostname -s`" -a \
"x`/bin/kenv dhdp.host-name`" != "x" ]; then
hostname=`/bin/kenv dhcp.host-name`
hostname $hostname
echo "Hostname is $hostname"
@ -154,7 +155,8 @@ fi
# if the info is available via dhcp/kenv
# build the resolv.conf
#
if [ ! -e /etc/resolv.conf -a `/bin/kenv dhcp.domain-name-servers` != "" ]; then
if [ ! -e /etc/resolv.conf -a \
"x`/bin/kenv dhcp.domain-name-servers`" != "x" ]; then
echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf
set `/bin/kenv dhcp.domain-name-servers`

6
etc/rc.d/resolv
View File

@ -145,7 +145,8 @@ fi
# generate our hostname
#
if [ -z "`hostname -s`" ]; then
if [ -z "`hostname -s`" -a \
"x`/bin/kenv dhdp.host-name`" != "x" ]; then
hostname=`/bin/kenv dhcp.host-name`
hostname $hostname
echo "Hostname is $hostname"
@ -154,7 +155,8 @@ fi
# if the info is available via dhcp/kenv
# build the resolv.conf
#
if [ ! -e /etc/resolv.conf -a `/bin/kenv dhcp.domain-name-servers` != "" ]; then
if [ ! -e /etc/resolv.conf -a \
"x`/bin/kenv dhcp.domain-name-servers`" != "x" ]; then
echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf
set `/bin/kenv dhcp.domain-name-servers`

6
etc/rc.d/tmp
View File

@ -145,7 +145,8 @@ fi
# generate our hostname
#
if [ -z "`hostname -s`" ]; then
if [ -z "`hostname -s`" -a \
"x`/bin/kenv dhdp.host-name`" != "x" ]; then
hostname=`/bin/kenv dhcp.host-name`
hostname $hostname
echo "Hostname is $hostname"
@ -154,7 +155,8 @@ fi
# if the info is available via dhcp/kenv
# build the resolv.conf
#
if [ ! -e /etc/resolv.conf -a `/bin/kenv dhcp.domain-name-servers` != "" ]; then
if [ ! -e /etc/resolv.conf -a \
"x`/bin/kenv dhcp.domain-name-servers`" != "x" ]; then
echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf
set `/bin/kenv dhcp.domain-name-servers`

6
etc/rc.d/var
View File

@ -145,7 +145,8 @@ fi
# generate our hostname
#
if [ -z "`hostname -s`" ]; then
if [ -z "`hostname -s`" -a \
"x`/bin/kenv dhdp.host-name`" != "x" ]; then
hostname=`/bin/kenv dhcp.host-name`
hostname $hostname
echo "Hostname is $hostname"
@ -154,7 +155,8 @@ fi
# if the info is available via dhcp/kenv
# build the resolv.conf
#
if [ ! -e /etc/resolv.conf -a `/bin/kenv dhcp.domain-name-servers` != "" ]; then
if [ ! -e /etc/resolv.conf -a \
"x`/bin/kenv dhcp.domain-name-servers`" != "x" ]; then
echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf
set `/bin/kenv dhcp.domain-name-servers`