Mercurial > illumos > illumos-gate
changeset 3736:aa9dbf463acb
6525459 mpxio-upgrade and SUNWcsr/postinstall have some issues
| author | qh201292 |
|---|---|
| date | Wed, 28 Feb 2007 18:47:22 -0800 |
| parents | 74d8d0dc0268 |
| children | ddc3d2cb268a |
| files | usr/src/cmd/stmsboot/mpxio-upgrade.xml usr/src/pkgdefs/SUNWcsr/postinstall |
| diffstat | 2 files changed, 10 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/stmsboot/mpxio-upgrade.xml Wed Feb 28 18:20:16 2007 -0800 +++ b/usr/src/cmd/stmsboot/mpxio-upgrade.xml Wed Feb 28 18:47:22 2007 -0800 @@ -61,7 +61,7 @@ </dependency> <dependent - name='root' + name='mpxio-root' grouping='optional_all' restart_on='none'> <service_fmri value='svc:/system/filesystem/root' />
--- a/usr/src/pkgdefs/SUNWcsr/postinstall Wed Feb 28 18:20:16 2007 -0800 +++ b/usr/src/pkgdefs/SUNWcsr/postinstall Wed Feb 28 18:47:22 2007 -0800 @@ -269,21 +269,15 @@ fi fi -#delete old mpxio-upgrade service and import new mpxio-upgrade service -OLD_MPXIO_SERVICE="svc:/platform/sun4u/mpxio-upgrade" -OLD_MPXIO_XML=$PKG_INSTALL_ROOT/var/svc/manifest/platform/sun4u/mpxio-upgrade.xml -NEW_MPXIO_XML=$PKG_INSTALL_ROOT/var/svc/manifest/system/device/mpxio-upgrade.xml - +# if platform/sun4u/mpxio-upgrade service exists, then +# delete the service on boot after upgrading. if [ "$UPDATE" = yes ]; then - if [ -x /usr/sbin/svcadm -a -x /usr/sbin/svccfg -a \ - -f $OLD_MPXIO_XML ]; then - svccfg delete $OLD_MPXIO_SERVICE:default > /dev/null 2>&1 - svccfg delete $OLD_MPXIO_SERVICE > /dev/null 2>&1 - rm $OLD_MPXIO_XML + cat >> $BASEDIR/var/svc/profile/upgrade <<\_MPXIOUPGRD + /usr/bin/svcs platform/sun4u/mpxio-upgrade > /dev/null 2>&1 + if [ "$?" = 0 ]; then + /usr/sbin/svccfg delete svc:/platform/sun4u/mpxio-upgrade + fi +_MPXIOUPGRD +fi - if [ -f $NEW_MPXIO_XML ]; then - svccfg import $NEW_MPXIO_XML - fi - fi -fi exit 0