diff options
| author | ae112802 <none@none> | 2006-05-19 16:15:40 -0700 |
|---|---|---|
| committer | ae112802 <none@none> | 2006-05-19 16:15:40 -0700 |
| commit | bc13c17b8e093e9582f8b62b4f13059b70f8d307 (patch) | |
| tree | e7020377254c16327bb9bae5be000182f7b76baf /usr/src/cmd/svc | |
| parent | 154b1f02449b21af9273efd1a7776a3fe65a0744 (diff) | |
| download | illumos-joyent-bc13c17b8e093e9582f8b62b4f13059b70f8d307.tar.gz | |
6407767 libc_psr does not get mounted in a zone
Diffstat (limited to 'usr/src/cmd/svc')
| -rw-r--r-- | usr/src/cmd/svc/milestone/fs-root | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/usr/src/cmd/svc/milestone/fs-root b/usr/src/cmd/svc/milestone/fs-root index d9d6e2c851..1672188383 100644 --- a/usr/src/cmd/svc/milestone/fs-root +++ b/usr/src/cmd/svc/milestone/fs-root @@ -127,6 +127,28 @@ sun4u_libc_psr_mount() { fi } +# +# Discover architecture and find and mount optimal libc_psr +# +libc_psr_mount() { + PLAT=`/usr/bin/uname -i` + ARCH=`/usr/bin/uname -m` + if [ "$ARCH" = "sun4v" ]; then + sun4v_libc_psr_mount + elif [ "$ARCH" = "sun4u" ]; then + if [ -h /platform/$PLAT/lib/libc_psr.so.1 ]; then + LINKSTO=`/usr/bin/ls -l \ + /platform/$PLAT/lib/libc_psr.so.1 | + /usr/bin/awk '{print $NF}'` + if [ "$LINKSTO" = \ + "../../sun4u-us3/lib/libc_psr.so.1" ]; then + ARCH=sun4u-us3 + fi + fi + sun4u_libc_psr_mount + fi +} + . /lib/svc/share/smf_include.sh . /lib/svc/share/fs_include.sh @@ -137,6 +159,7 @@ sun4u_libc_psr_mount() { # if smf_is_nonglobalzone; then libc_mount + libc_psr_mount exit $SMF_EXIT_OK fi @@ -237,23 +260,6 @@ fi [ -f /etc/.dynamic_routing ] && /usr/bin/rm -f /etc/.dynamic_routing libc_mount - -# -# Discover architecture and find and mount optimal libc_psr -# -PLAT=`/usr/bin/uname -i` -ARCH=`/usr/bin/uname -m` -if [ "$ARCH" = "sun4v" ]; then - sun4v_libc_psr_mount -elif [ "$ARCH" = "sun4u" ]; then - if [ -h /platform/$PLAT/lib/libc_psr.so.1 ]; then - LINKSTO=`/usr/bin/ls -l /platform/$PLAT/lib/libc_psr.so.1 | - /usr/bin/awk '{print $NF}'` - if [ "$LINKSTO" = "../../sun4u-us3/lib/libc_psr.so.1" ]; then - ARCH=sun4u-us3 - fi - fi - sun4u_libc_psr_mount -fi +libc_psr_mount exit $SMF_EXIT_OK |