diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2011-03-10 12:59:09 -0800 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2011-03-10 12:59:09 -0800 |
| commit | 276c8f63b7afbc1867df6ad71dffe5ed838ff292 (patch) | |
| tree | 4b93efb7f5b087cef9f94dd962f491424adafca7 /usr/src | |
| parent | ad4723442de1084b204f83ae1c3650a6cebe9b39 (diff) | |
| download | illumos-joyent-276c8f63b7afbc1867df6ad71dffe5ed838ff292.tar.gz | |
OS-252 Studio compilers hardcodes /usr/ccs/bin when looking for tools
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/brand/joyent/zone/platform.xml | 2 | ||||
| -rw-r--r-- | usr/src/lib/brand/joyent/zone/statechange.ksh | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/usr/src/lib/brand/joyent/zone/platform.xml b/usr/src/lib/brand/joyent/zone/platform.xml index 64b6048b45..7ef726ed90 100644 --- a/usr/src/lib/brand/joyent/zone/platform.xml +++ b/usr/src/lib/brand/joyent/zone/platform.xml @@ -49,6 +49,8 @@ opt="ro,nodevices" type="lofs" /> <global_mount special="%R/local" directory="/usr/local" opt="nodevices" type="lofs" /> + <global_mount special="%R/ccs" directory="/usr/ccs" + opt="nodevices" type="lofs" /> <!-- Local filesystems to mount when booting the zone --> <mount special="/proc" directory="/proc" type="proc" /> diff --git a/usr/src/lib/brand/joyent/zone/statechange.ksh b/usr/src/lib/brand/joyent/zone/statechange.ksh index e2896ddf7f..623b1f0207 100644 --- a/usr/src/lib/brand/joyent/zone/statechange.ksh +++ b/usr/src/lib/brand/joyent/zone/statechange.ksh @@ -253,6 +253,11 @@ setup_fs() [ ! -d $ZONEPATH/local ] && mkdir -m755 $ZONEPATH/local [ ! -d $ZONEPATH/root/checkpoints ] && \ mkdir -m755 $ZONEPATH/root/checkpoints + if [ ! -d $ZONEPATH/ccs ]; then + mkdir -m755 $ZONEPATH/ccs + (cd /usr/ccs; tar cbf 512 - *) | \ + (cd $ZONEPATH/ccs; tar xbf 512 -) + fi # Force zone snapshots to get mounted ls $ZONEPATH/.zfs/snapshot/* >/dev/null 2>&1 |