diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-09-08 19:55:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 19:55:23 -0400 |
| commit | 1d4d656f8c9cf7ca5660027c04963264589016bd (patch) | |
| tree | 881404013076648e7685ac6bafa3eba663a60197 | |
| parent | b1381a40e062a4684394828249626c3f6a2d5d56 (diff) | |
| download | illumos-joyent-release-20210909.tar.gz | |
OS-8315 lx_boot_zone_ubuntu should check for non empty valrelease-20210909
Actually authored by: Jorge Schrauwen <registration@blackdot.be>
Reviewed by: Dan McDonald <danmcd@joyent.com>
Approved by: Brian Bennett <brian.bennett@joyent.com>
| -rw-r--r-- | usr/src/lib/brand/lx/zone/lx_boot_zone_ubuntu.ksh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/brand/lx/zone/lx_boot_zone_ubuntu.ksh b/usr/src/lib/brand/lx/zone/lx_boot_zone_ubuntu.ksh index 97629094fd..d1423a38c1 100644 --- a/usr/src/lib/brand/lx/zone/lx_boot_zone_ubuntu.ksh +++ b/usr/src/lib/brand/lx/zone/lx_boot_zone_ubuntu.ksh @@ -33,7 +33,7 @@ safe_dir /etc/systemd # Populate resolv.conf setup files IFF we have resolvers information. resolvers=`zone_attr resolvers` -if [[ $? == 0 ]]; then +if [ -n "$resolvers" ]; then echo "# AUTOMATIC ZONE CONFIG" > $tmpfile _IFS=$IFS; IFS=,; for r in $resolvers; do @@ -41,7 +41,7 @@ if [[ $? == 0 ]]; then done >> $tmpfile IFS=$_IFS domain=`zone_attr dns-domain` - [[ $? == 0 ]] && echo "search $domain" >> $tmpfile + [ -n "$domain" ] && echo "search $domain" >> $tmpfile if [ -f $ZONEROOT/etc/systemd/resolved.conf ]; then cf=$ZONEROOT/etc/systemd/resolved.conf |