diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2013-06-24 12:46:53 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2013-06-24 12:46:53 +0000 |
| commit | ec8de00f9ce33583c14ece43e2f797b6bc3bbbf1 (patch) | |
| tree | 47056f77cf9758b01ca468d9731731cdf366624e /usr/src | |
| parent | bda7907f05ce783bce74fe1f277b4fbdcb1a36b6 (diff) | |
| download | illumos-joyent-ec8de00f9ce33583c14ece43e2f797b6bc3bbbf1.tar.gz | |
OS-2320 common.ksh post_unpack function doesn't support sparse zone model
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/brand/shared/zone/common.ksh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/lib/brand/shared/zone/common.ksh b/usr/src/lib/brand/shared/zone/common.ksh index d9a7ae469e..463ba7a51a 100644 --- a/usr/src/lib/brand/shared/zone/common.ksh +++ b/usr/src/lib/brand/shared/zone/common.ksh @@ -333,10 +333,12 @@ post_unpack() # # Check if the image was created with a valid libc.so.1. # - hwcap=`moe -v -32 $ZONEROOT/lib/libc.so.1 2>&1` - if (( $? != 0 )); then - vlog "$f_hwcap_info" "$hwcap" - fail_fatal "$f_sanity_hwcap" + if [[ -f $ZONEROOT/lib/libc.so.1 ]]; then + hwcap=`moe -v -32 $ZONEROOT/lib/libc.so.1 2>&1` + if (( $? != 0 )); then + vlog "$f_hwcap_info" "$hwcap" + fail_fatal "$f_sanity_hwcap" + fi fi ( cd "$ZONEROOT" && \ @@ -1020,7 +1022,7 @@ f_mkdir="Unable to create directory %s." f_chmod="Unable to chmod directory %s." f_chown="Unable to chown directory %s." f_hwcap_info="HWCAP: %s\n" -f_sanity_hwcap= "The image was created with an incompatible libc.so.1 hwcap lofs mount.\n"\ +f_sanity_hwcap="The image was created with an incompatible libc.so.1 hwcap lofs mount.\n"\ " The zone will not boot on this platform. See the zone's\n"\ " documentation for the recommended way to create the archive." |