Merge lp:~darkmuggle-deactivatedaccount/ubuntu/saucy/hv-kvp-daemon-init/lp1235025 into lp:ubuntu/saucy/hv-kvp-daemon-init

[Ben Howard]

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-22 03:10:52 +0000
+++ debian/changelog	2013-10-08 18:13:07 +0000
@@ -1,3 +1,10 @@
+hv-kvp-daemon-init (0.3ubuntu6) saucy; urgency=low
+
+  * Added vss init job
+  * Use linux-tools packaged scripts for starting daemons
+
+ -- Ben Howard <[e-mail]>  Fri, 04 Oct 2013 15:28:33 -0600
+
 hv-kvp-daemon-init (0.3ubuntu5) raring; urgency=low
 
   * Restrict arches to amd64, i386, and x32 to match hv_netvsc module.

=== modified file 'debian/install'
--- debian/install	2012-12-14 17:10:34 +0000
+++ debian/install	2013-10-08 18:13:07 +0000
@@ -1,4 +1,5 @@
 hv_get_dhcp_info usr/sbin
 hv_get_dns_info  usr/sbin
 hv_set_ifconfig  usr/sbin
-hv_kvp_daemon    usr/sbin
+hv-kvp-daemon.conf  etc/init
+hv-vss-daemon.conf  etc/init

=== modified file 'debian/preinst'
--- debian/preinst	2012-12-14 17:10:34 +0000
+++ debian/preinst	2013-10-08 18:13:07 +0000
@@ -2,14 +2,6 @@
 
 set -e
 
-case "$1" in
-    install|upgrade)
-        dpkg-divert --add --rename --package hv-kvp-daemon-init --divert \
-          /usr/sbin/hv_kvp_daemon.hv-kvp-daemon-init \
-          /usr/sbin/hv_kvp_daemon > /dev/null
-	;;
-esac
-
 #DEBHELPER#
 
 exit 0

=== removed file 'debian/upstart'
--- debian/upstart	2012-12-14 17:10:34 +0000
+++ debian/upstart	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-# On Azure/Hyper-V systems start the hv_kvp_daemon
-#
-description "Hyper-V KVP Protocol Daemon"
-author "Adam Conrad <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-console log
-
-pre-start script
-        if [ -e "/etc/default/hv-kvp-daemon-init" ]; then
-                . /etc/default/hv-kvp-daemon-init
-        fi
-        [ "$RUN_DAEMON" -eq 0 ] && { stop; exit 0; }
-        [ -x /usr/sbin/hv_kvp_daemon ] || { stop; exit 0; }
-end script
-
-exec /usr/sbin/hv_kvp_daemon

=== added file 'hv-kvp-daemon.conf'
--- hv-kvp-daemon.conf	1970-01-01 00:00:00 +0000
+++ hv-kvp-daemon.conf	2013-10-08 18:13:07 +0000
@@ -0,0 +1,18 @@
+# On Azure/Hyper-V systems start the hv_kvp_daemon
+#
+description "Hyper-V KVP Protocol Daemon"
+author "Adam Conrad <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+console log
+
+pre-start script
+        if [ -e "/etc/default/hv-kvp-daemon-init" ]; then
+                . /etc/default/hv-kvp-daemon-init
+        fi
+        [ "$RUN_DAEMON" -eq 0 ] && { stop; exit 0; }
+        [ -x /usr/sbin/hv_kvp_daemon ] || { stop; exit 0; }
+end script
+
+exec /usr/sbin/hv_kvp_daemon

=== added file 'hv-vss-daemon.conf'
--- hv-vss-daemon.conf	1970-01-01 00:00:00 +0000
+++ hv-vss-daemon.conf	2013-10-08 18:13:07 +0000
@@ -0,0 +1,18 @@
+# On Azure/Hyper-V systems start the hv_vss_daemon
+#
+description "Hyper-V VSS Protocol Daemon"
+author "Ben Howard <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+console log
+
+pre-start script
+        if [ -e "/etc/default/hv-vss-daemon-init" ]; then
+                . /etc/default/hv-vss-daemon-init
+        fi
+        [ "$RUN_DAEMON" -eq 0 ] && { stop; exit 0; }
+        [ -x /usr/sbin/hv_vss_daemon ] || { stop; exit 0; }
+end script
+
+exec /usr/sbin/hv_vss_daemon

=== removed file 'hv_kvp_daemon'
--- hv_kvp_daemon	2012-12-14 17:10:34 +0000
+++ hv_kvp_daemon	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-#!/bin/bash
-full_version=$(uname -r)
-
-# Removing flavour from version i.e. generic or server.
-flavour_abi=${full_version#*-}
-flavour=${flavour_abi#*-}
-version=${full_version%-$flavour}
-
-# Prefer flavour-versioned hv_kvp_daemon, if it exists:
-if [ -x /usr/sbin/hv_kvp_daemon_${full_version} ]; then
-    exec /usr/sbin/hv_kvp_daemon_${full_version} "$@"
-elif [ -x /usr/sbin/hv_kvp_daemon_${version} ]; then
-    # Pre-3.7 linux-tools ships a broken hv_kvp_daemon, require lbm:
-    if dpkg --compare-versions ${version} lt 3.7.0 2>/dev/null; then
-        echo "You are running a pre-3.7 kernel but don't have" >&2
-        echo "linux-backports-modules-hv installed for your" >&2
-        echo "flavour, not executing hv_kvp_daemon_${version}" >&2
-        exit 2
-    fi
-    exec /usr/sbin/hv_kvp_daemon_${version} "$@"
-else
-    echo "/usr/sbin/hv_kvp_daemon_${version} not found" >&2
-    echo "You may need to install linux-tools-${version}" >&2
-    exit 2
-fi