From d16387463ea985460fad7a7cdd614074530b134a Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Sun, 4 Jan 2015 13:58:33 +0300
Subject: knot (1.4.4-1+dyson3) unstable; urgency=medium

  * Renamed SMF service to network/dns/knot
  * Removed dependency on system/filesystem/autofs
---
 debian/changelog                                   |  7 ++++
 debian/knot.smf/manifest/network/dns/knot.xml      | 36 +++++++++++++++++++
 .../knot.smf/manifest/network/dns/server-knot.xml  | 40 ----------------------
 3 files changed, 43 insertions(+), 40 deletions(-)
 create mode 100644 debian/knot.smf/manifest/network/dns/knot.xml
 delete mode 100644 debian/knot.smf/manifest/network/dns/server-knot.xml

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/knot.xml b/debian/knot.smf/manifest/network/dns/knot.xml
new file mode 100644
index 0000000..55bd8b1
--- /dev/null
+++ b/debian/knot.smf/manifest/network/dns/knot.xml
@@ -0,0 +1,36 @@
+<?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/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>
+    <dependency name="net-loopback" grouping="require_all" restart_on="none" type="service">
+      <service_fmri value="svc:/network/loopback"/>
+    </dependency>
+    <dependency name="net-physical" grouping="require_all" restart_on="restart" type="service">
+      <service_fmri value="svc:/network/physical"/>
+    </dependency>
+    <dependency name="syslog" grouping="optional_all" restart_on="none" type="service">
+      <service_fmri value="svc:/system/system-log"/>
+    </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"/>
+    <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">
+          Knot DNS server
+        </loctext>
+      </common_name>
+      <documentation>
+        <manpage title="knotd" section="8" manpath="/usr/share/man"/>
+        <manpage title="knot.conf" section="5" manpath="/usr/share/man"/>
+      </documentation>
+    </template>
+  </service>
+</service_bundle>
diff --git a/debian/knot.smf/manifest/network/dns/server-knot.xml b/debian/knot.smf/manifest/network/dns/server-knot.xml
deleted file mode 100644
index fb94de1..0000000
--- a/debian/knot.smf/manifest/network/dns/server-knot.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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">
-    <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
-      <service_fmri value="svc:/system/filesystem/local"/>
-    </dependency>
-    <dependency name="net-loopback" grouping="require_all" restart_on="none" type="service">
-      <service_fmri value="svc:/network/loopback"/>
-    </dependency>
-    <dependency name="net-physical" grouping="require_all" restart_on="restart" type="service">
-      <service_fmri value="svc:/network/physical"/>
-    </dependency>
-    <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>
-    <template>
-      <common_name>
-        <loctext xml:lang="C">
-          Knot DNS server
-        </loctext>
-      </common_name>
-      <documentation>
-        <manpage title="knotd" section="8" manpath="/usr/share/man"/>
-        <manpage title="knot.conf" section="5" manpath="/usr/share/man"/>
-      </documentation>
-    </template>
-  </service>
-</service_bundle>
-- 
cgit v1.2.3