diff options
| author | Josh Wilsdon <jwilsdon@joyent.com> | 2013-02-21 08:34:14 +0000 |
|---|---|---|
| committer | Josh Wilsdon <jwilsdon@joyent.com> | 2013-02-21 08:34:14 +0000 |
| commit | c6920fb1d0f6cd852da06e049631f1ee274b5b9d (patch) | |
| tree | 63a438859e9a722c38af7fda1ed00341cd5f6c97 | |
| parent | 300dd07ebb131e103f3ca8e405adfd00d4ab7df5 (diff) | |
| download | illumos-joyent-release-20130221.tar.gz | |
OS-1906 have sngl brand use files from dataset, remove use of SNGL_BASE tarball.release-20130221
| -rw-r--r-- | usr/src/lib/brand/sngl/zone/sinstall.sh | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/usr/src/lib/brand/sngl/zone/sinstall.sh b/usr/src/lib/brand/sngl/zone/sinstall.sh index 152c3139a3..70b02a06c5 100644 --- a/usr/src/lib/brand/sngl/zone/sinstall.sh +++ b/usr/src/lib/brand/sngl/zone/sinstall.sh @@ -30,18 +30,11 @@ export PATH . /usr/lib/brand/shared/common.ksh . /usr/lib/brand/joyent/common.ksh -SNGL_BASE=/zones/sngl_base.tar.gz - ZONENAME="" ZONEPATH="" # Default to 10GB diskset quota ZQUOTA=10 -if [[ ! -f $SNGL_BASE ]]; then - print -u2 "Brand error: missing the SNGL install tar file" - exit $ZONE_SUBPROC_FATAL -fi - while getopts "R:t:U:q:z:" opt do case "$opt" in @@ -103,12 +96,6 @@ zfs snapshot $PDS_NAME/${TMPLZONE}@${bname} zfs clone -F ${QUOTA_ARG} $PDS_NAME/${TMPLZONE}@${bname} \ $PDS_NAME/$bname || fatal "failed to clone zone dataset" -# Make sure zoneinit is setup to use -o xtrace, this handles old datasets where -# is not yet enabled by default. -if [[ -f ${ZROOT}/root/zoneinit && -z $(grep "^set -o xtrace" ${ZROOT}/root/zoneinit) ]]; then - sed -i "" -e "s/^#set -o xtrace/set -o xtrace/" ${ZROOT}/root/zoneinit -fi - if [ ! -d ${ZONEPATH}/config ]; then mkdir -p ${ZONEPATH}/config chmod 755 ${ZONEPATH}/config @@ -116,10 +103,4 @@ fi final_setup -# Modify to make it a SNGL zone -rm -f $ZROOT/bin -ln -s /system/usr/bin $ZROOT/bin - -(cd $ZROOT; rm -rf usr; gzcat $SNGL_BASE | tar xbf 512 -) - exit $ZONE_SUBPROC_OK |