diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/rsyslog.postinst.smf | 1 | ||||
| -rw-r--r-- | debian/rsyslog.prerm.smf | 2 | ||||
| -rw-r--r-- | debian/smf/manifest/system/rsyslog.xml | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 2165323..2d40071 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +rsyslog (7.3.14-2+dyson2) unstable; urgency=low + + * Added dependency on /etc/rsyslog.confin SMF service and thus support for + "offline" state in post-install script. + * Stop SMF service synchronously in prerm (svcadm disable -s) + + -- Igor Pashev <pashev.igor@gmail.com> Mon, 13 May 2013 01:57:30 +0400 + rsyslog (7.3.14-2+dyson1) unstable; urgency=low * Package for Dyson diff --git a/debian/rsyslog.postinst.smf b/debian/rsyslog.postinst.smf index 01a85ad..244b098 100644 --- a/debian/rsyslog.postinst.smf +++ b/debian/rsyslog.postinst.smf @@ -12,6 +12,7 @@ if [ "$1" = configure ]; then fi ;; maintenance) svcadm -v clear $fmri || true;; + offline) svcadm -v refresh $fmri || true;; esac fi diff --git a/debian/rsyslog.prerm.smf b/debian/rsyslog.prerm.smf index 081e739..c0032ea 100644 --- a/debian/rsyslog.prerm.smf +++ b/debian/rsyslog.prerm.smf @@ -4,7 +4,7 @@ state=`svcstatus $fmri` case "$1" in remove) case "$state" in - online) svcadm -v disable $fmri || true;; + online) svcadm -v disable -s $fmri || true;; esac ;; esac diff --git a/debian/smf/manifest/system/rsyslog.xml b/debian/smf/manifest/system/rsyslog.xml index 7fb8b59..2b3e6d0 100644 --- a/debian/smf/manifest/system/rsyslog.xml +++ b/debian/smf/manifest/system/rsyslog.xml @@ -3,6 +3,9 @@ <service_bundle type="manifest" name="rsyslog"> <service name="system/system-log" type="service" version="1"> <instance name="rsyslog" enabled="true"> + <dependency name="config_data" grouping="require_all" restart_on="restart" type="path"> + <service_fmri value="file://localhost/etc/rsyslog.conf"/> + </dependency> <dependency name="milestone" grouping="require_all" restart_on="none" type="service"> <service_fmri value="svc:/milestone/sysconfig"/> </dependency> |