diff options
| author | sc157166 <none@none> | 2006-09-28 23:34:29 -0700 |
|---|---|---|
| committer | sc157166 <none@none> | 2006-09-28 23:34:29 -0700 |
| commit | 3471bc8c6d7a07a376b0e7eba2297717b94415d5 (patch) | |
| tree | e43fcd29ae851ac76df580a8295a47ba2aa2474b | |
| parent | 91c7793e73e8fb0edb9c55f2828d2dfd8ff09994 (diff) | |
| download | illumos-joyent-3471bc8c6d7a07a376b0e7eba2297717b94415d5.tar.gz | |
6446353 flarcreate on S10U2/Nevada could fail because caplib is not alternate root aware
| -rw-r--r-- | usr/src/lib/libc/i386/etc/caplib.ksh | 11 | ||||
| -rwxr-xr-x | usr/src/lib/libc_psr/etc/caplib.ksh | 14 |
2 files changed, 15 insertions, 10 deletions
diff --git a/usr/src/lib/libc/i386/etc/caplib.ksh b/usr/src/lib/libc/i386/etc/caplib.ksh index 8fd18a9ba7..4cab453bbe 100644 --- a/usr/src/lib/libc/i386/etc/caplib.ksh +++ b/usr/src/lib/libc/i386/etc/caplib.ksh @@ -3,9 +3,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -39,6 +38,10 @@ if [ -z "$FLASH_PID" ]; then echo "$0: ERROR: FLASH_PID not set in execution environment, exiting..." exit 1 fi +if [ -z "$FLASH_DIR" ]; then + echo "$0: ERROR: FLASH_DIR not set in execution environment, exiting..." + exit 1 +fi CHMOD=/usr/bin/chmod ELFDUMP=/usr/ccs/bin/elfdump @@ -69,7 +72,7 @@ if [ ! "$LIBS" ]; then exit 0 fi -REMOUNT_DIR=/etc/flash/preexit +REMOUNT_DIR=${FLASH_DIR}/preexit REMOUNT=${REMOUNT_DIR}/remount_hwcap.${FLASH_PID} # diff --git a/usr/src/lib/libc_psr/etc/caplib.ksh b/usr/src/lib/libc_psr/etc/caplib.ksh index 03b3ef7423..fc7f5eed65 100755 --- a/usr/src/lib/libc_psr/etc/caplib.ksh +++ b/usr/src/lib/libc_psr/etc/caplib.ksh @@ -3,9 +3,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -39,14 +38,17 @@ if [ -z "$FLASH_PID" ]; then echo "$0: ERROR: FLASH_PID not set in execution environment, exiting..." exit 1 fi +if [ -z "$FLASH_DIR" ]; then + echo "$0: ERROR: FLASH_DIR not set in execution environment, exiting..." + exit 1 +fi CHMOD=/usr/bin/chmod -ELFDUMP=/usr/ccs/bin/elfdump MOUNT=/usr/sbin/mount UMOUNT=/usr/sbin/umount EGREP=/usr/bin/egrep SED=/usr/bin/sed -CMD_LIST="$CHMOD $ELFDUMP $MOUNT $UMOUNT $EGREP $SED" +CMD_LIST="$CHMOD $MOUNT $UMOUNT $EGREP $SED" for cmd in $CMD_LIST do @@ -69,7 +71,7 @@ if [ -z "$LIBS" ]; then exit 0 fi -REMOUNT_DIR=/etc/flash/preexit +REMOUNT_DIR=${FLASH_DIR}/preexit REMOUNT=${REMOUNT_DIR}/remount_hwcap.${FLASH_PID} # |