From 964aeaa9c1eac3fafa73ef9abf344613a093cb06 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 4 Mar 2016 00:01:08 -0500
Subject: postinst/preinst: cleanup old multi-user.target enabled files

also, actually enable the services.
now this will have them enabled in the cloud-init.target.
---
 packages/debian/cloud-init.preinst | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 packages/debian/cloud-init.preinst

(limited to 'packages/debian/cloud-init.preinst')

diff --git a/packages/debian/cloud-init.preinst b/packages/debian/cloud-init.preinst
new file mode 100644
index 00000000..babaab6c
--- /dev/null
+++ b/packages/debian/cloud-init.preinst
@@ -0,0 +1,22 @@
+#!/bin/sh
+# vi: ts=4 expandtab
+
+set -x
+cleanup_lp1552999() {
+    local oldver="$1" last_bad_ver="0.7.7~bzr1178"
+    dpkg --compare-versions "$oldver" le "$last_bad_ver" || return 0
+    local hdir="/var/lib/systemd/deb-systemd-helper-enabled"
+    hdir="$hdir/multi-user.target.wants" 
+    local edir="/etc/systemd/system/multi-user.target.wants"
+    rm -f "$hdir/cloud-config.service" "$hdir/cloud-final.service" \
+        "$hdir/cloud-init-local.service" "$hdir/cloud-init.service"
+}
+
+
+if [ "$1" = "upgrade" ]; then
+   oldver="$2"
+   cleanup_lp1552999 "$oldver"
+fi
+set +x
+
+#DEBHELPER#
-- 
cgit v1.2.3


From a782829a083c7170df62dda94d6b7441963dcb94 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 4 Mar 2016 00:10:36 -0500
Subject: remove debug set -x

---
 packages/debian/cloud-init.postinst | 1 -
 packages/debian/cloud-init.preinst  | 2 --
 2 files changed, 3 deletions(-)

(limited to 'packages/debian/cloud-init.preinst')

diff --git a/packages/debian/cloud-init.postinst b/packages/debian/cloud-init.postinst
index f1222b42..cdd0466d 100644
--- a/packages/debian/cloud-init.postinst
+++ b/packages/debian/cloud-init.postinst
@@ -1,5 +1,4 @@
 #!/bin/sh
-set -x
 cleanup_lp1552999() {
     local oldver="$1" last_bad_ver="0.7.7~bzr1178"
     dpkg --compare-versions "$oldver" le "$last_bad_ver" || return 0
diff --git a/packages/debian/cloud-init.preinst b/packages/debian/cloud-init.preinst
index babaab6c..3c2af06d 100644
--- a/packages/debian/cloud-init.preinst
+++ b/packages/debian/cloud-init.preinst
@@ -1,7 +1,6 @@
 #!/bin/sh
 # vi: ts=4 expandtab
 
-set -x
 cleanup_lp1552999() {
     local oldver="$1" last_bad_ver="0.7.7~bzr1178"
     dpkg --compare-versions "$oldver" le "$last_bad_ver" || return 0
@@ -17,6 +16,5 @@ if [ "$1" = "upgrade" ]; then
    oldver="$2"
    cleanup_lp1552999 "$oldver"
 fi
-set +x
 
 #DEBHELPER#
-- 
cgit v1.2.3