summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2015-01-04 13:58:33 +0300
committerIgor Pashev <pashev.igor@gmail.com>2015-01-04 13:58:33 +0300
commitd16387463ea985460fad7a7cdd614074530b134a (patch)
tree7cf27d00d2fe6d1d977b2930aa1dd57c34b3fb35
parent5451b716ed08a62392bf6e3b5d8ffebfad95a6c0 (diff)
downloadknot-master.tar.gz
knot (1.4.4-1+dyson3) unstable; urgency=mediumHEADdyson/1.4.4-1+dyson3master
* Renamed SMF service to network/dns/knot * Removed dependency on system/filesystem/autofs
-rw-r--r--debian/changelog7
-rw-r--r--debian/knot.smf/manifest/network/dns/knot.xml (renamed from debian/knot.smf/manifest/network/dns/server-knot.xml)14
2 files changed, 12 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 2e8918b..2c5f801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+knot (1.4.4-1+dyson3) unstable; urgency=medium
+
+ * Renamed SMF service to network/dns/knot
+ * Removed dependency on system/filesystem/autofs
+
+ -- Igor Pashev <pashev.igor@gmail.com> Sun, 04 Jan 2015 12:42:06 +0300
+
knot (1.4.4-1+dyson2) unstable; urgency=medium
* SMF: added optional dependencies on svc:/system/system-log and
diff --git a/debian/knot.smf/manifest/network/dns/server-knot.xml b/debian/knot.smf/manifest/network/dns/knot.xml
index fb94de1..55bd8b1 100644
--- a/debian/knot.smf/manifest/network/dns/server-knot.xml
+++ b/debian/knot.smf/manifest/network/dns/knot.xml
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/xml/schema/smf/service_bundle.dtd.1">
<service_bundle type="manifest" name="knot">
- <service name="network/dns/server" type="service" version="1">
+ <service name="network/dns/knot" type="service" version="1">
+ <create_default_instance enabled="false"/>
<dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
<service_fmri value="svc:/system/filesystem/local"/>
</dependency>
@@ -14,17 +15,12 @@
<dependency name="syslog" grouping="optional_all" restart_on="none" type="service">
<service_fmri value="svc:/system/system-log"/>
</dependency>
- <dependency name="autofs" grouping="optional_all" restart_on="none" type="service">
- <service_fmri value="svc:/system/filesystem/autofs"/>
- </dependency>
<exec_method type="method" name="start" exec="/lib/svc/method/dns-server-knot start %{config_file}" timeout_seconds="30"/>
<exec_method type="method" name="stop" exec="/lib/svc/method/dns-server-knot stop %{config_file}" timeout_seconds="30"/>
<exec_method type="method" name="refresh" exec="/lib/svc/method/dns-server-knot refresh %{config_file}" timeout_seconds="30"/>
- <instance name="knot" enabled="false">
- <property_group name="application" type="application">
- <propval name="config_file" type="astring" value="/etc/knot/knot.conf"/>
- </property_group>
- </instance>
+ <property_group name="application" type="application">
+ <propval name="config_file" type="astring" value="/etc/knot/knot.conf"/>
+ </property_group>
<template>
<common_name>
<loctext xml:lang="C">