diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 17:32:57 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 17:32:57 +0000 |
| commit | 82c25b3a645d87e92adc1d1c2b13af48401317ec (patch) | |
| tree | 9268bd0a047da4d2cf88a84072da1c2f0766a0f7 /setup_native/scripts | |
| parent | d2d620f4e92417afa924675387b64decb0a678d4 (diff) | |
INTEGRATION: CWS native72 (1.16.16); FILE MERGED
2006/11/14 12:22:59 obr 1.16.16.1: added appropriate error message for pkg lock problem
Diffstat (limited to 'setup_native/scripts')
| -rw-r--r-- | setup_native/scripts/install_solaris.sh | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/setup_native/scripts/install_solaris.sh b/setup_native/scripts/install_solaris.sh index 2def95361216..fe4fdecf74eb 100644 --- a/setup_native/scripts/install_solaris.sh +++ b/setup_native/scripts/install_solaris.sh @@ -63,6 +63,21 @@ try_to_unpack_languagepack_file() UPDATE="yes" } +pkg_error() +{ + # pkg command failed, check for admin log and report help + if [ -f /tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e ] + then + echo "####################################################################" + echo "# Installation failed due to stale administrative lock #" + echo "####################################################################" + printf "\nERROR: please remove the following file first:\n" + ls -l /tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e + fi + rm -f $GETUID_SO + exit 1 +} + # # this script is for userland not for root # @@ -226,9 +241,9 @@ then if [ -z "${PKG_LIST}" ] then - LD_PRELOAD_32=$GETUID_SO /usr/sbin/patchadd -R ${INSTALL_ROOT} -M ${PATCH_PATH} ${PATCH_LIST} 2>&1 | grep -v '/var/sadm/patch' + LD_PRELOAD_32=$GETUID_SO /usr/sbin/patchadd -R ${INSTALL_ROOT} -M ${PATCH_PATH} ${PATCH_LIST} 2>&1 | grep -v '/var/sadm/patch' || pkg_error else - LD_PRELOAD_32=$GETUID_SO /usr/sbin/pkgadd -d ${PACKAGE_PATH} -R ${INSTALL_ROOT} ${PKG_LIST} >/dev/null + LD_PRELOAD_32=$GETUID_SO /usr/sbin/pkgadd -d ${PACKAGE_PATH} -R ${INSTALL_ROOT} ${PKG_LIST} >/dev/null || pkg_error fi else @@ -260,7 +275,7 @@ else echo "Path to the packages : " $PACKAGE_PATH echo "Path to the installation : " $INSTALL_ROOT - LD_PRELOAD_32=$GETUID_SO /usr/sbin/pkgadd -d ${PACKAGE_PATH} -R ${INSTALL_ROOT} ${PKG_LIST} ${GNOMEPKG} >/dev/null + LD_PRELOAD_32=$GETUID_SO /usr/sbin/pkgadd -d ${PACKAGE_PATH} -R ${INSTALL_ROOT} ${PKG_LIST} ${GNOMEPKG} >/dev/null || pkg_error fi rm -f $GETUID_SO |