# HG changeset patch # User Michael Schloh von Bennewitz # Date 1343859386 -7200 # Node ID b2db2cf97b30234ad2af8df90c8a3c8b4ce13fcf # Parent 96a355979688fb1855113c8c4d912331b08508a6 Change smf(5) OpenPKG name handle to my personal preference, the prefix. This matches the ${name} variable on uninstallation, but strangely when installing an instance a bug causes ${name} to expand to openpkg-${prefix}. diff -r 96a355979688 -r b2db2cf97b30 openpkg/openpkg.spec --- a/openpkg/openpkg.spec Thu Aug 02 00:03:59 2012 +0200 +++ b/openpkg/openpkg.spec Thu Aug 02 00:16:26 2012 +0200 @@ -2698,13 +2698,13 @@ if [ ! -d /var/svc/manifest/openpkg ]; then mkdir /var/svc/manifest/openpkg fi - if [ ! -f /var/svc/manifest/openpkg/${name}.xml ]; then + if [ ! -f /var/svc/manifest/openpkg/${prefix}.xml ]; then # install SMF manifest ( echo "" echo "" - echo "" + echo "" echo " " echo " " @@ -2767,7 +2767,7 @@ echo " " + echo " value='solaris.smf.manage.openpkg.${prefix}' />" echo " " echo " " echo " " @@ -2778,10 +2778,10 @@ echo " " echo " " echo "" - ) >/var/svc/manifest/openpkg/${name}.xml - chmod 644 /var/svc/manifest/openpkg/${name}.xml - /usr/sbin/svccfg import /var/svc/manifest/openpkg/${name}.xml - ( echo "/usr/sbin/svcadm enable \"svc:/openpkg/${name}:default\"" + ) >/var/svc/manifest/openpkg/${prefix}.xml + chmod 644 /var/svc/manifest/openpkg/${prefix}.xml + /usr/sbin/svccfg import /var/svc/manifest/openpkg/${prefix}.xml + ( echo "/usr/sbin/svcadm enable \"svc:/openpkg/${prefix}:default\"" ) >%{l_prefix}.pre-post-process.sh fi ;; @@ -3586,9 +3586,9 @@ fi ;; SunOS/5.1* ) - /usr/sbin/svcadm disable "svc:/openpkg/${name}:default"; sleep 2 - /usr/sbin/svccfg delete -f "svc:/openpkg/${name}:default" >/dev/null 2>&1 || true - rm -f /var/svc/manifest/openpkg/${name}.xml >/dev/null 2>&1 + /usr/sbin/svcadm disable "svc:/openpkg/${prefix}:default"; sleep 2 + /usr/sbin/svccfg delete -f "svc:/openpkg/${prefix}:default" >/dev/null 2>&1 || true + rm -f /var/svc/manifest/openpkg/${prefix}.xml >/dev/null 2>&1 rmdir /var/svc/manifest/openpkg >/dev/null 2>&1 || true ;; SunOS/5.* )