From 15afd972ab042dfa6a20b5c165bf56a5730da0eb Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 6 Nov 2018 09:07:05 +0000
Subject: [PATCH] Drop libvirt wrapper script, no longer needed

---
 snap-wrappers/libvirtd/launch-libvirtd |  3 ---
 snapcraft.yaml                         | 17 ++---------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100755 snap-wrappers/libvirtd/launch-libvirtd

diff --git a/snap-wrappers/libvirtd/launch-libvirtd b/snap-wrappers/libvirtd/launch-libvirtd
deleted file mode 100755
index 79b954e..0000000
--- a/snap-wrappers/libvirtd/launch-libvirtd
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-exec "$SNAP/sbin/libvirtd"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 36e6f39..cc8b503 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -213,18 +213,13 @@ apps:
       - network
 
   # Libvirt/Qemu
-  libvirt-bin:
-    command: launch-libvirtd
+  libvirtd:
+    command: libvirtd
     daemon: simple
     environment:
       LD_LIBRARY_PATH: $SNAP/lib:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
-      PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
-      LC_ALL: C
   virsh:
     command: virsh
-    environment:
-      PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
-      LC_ALL: C
 
   # MySQL
   # MySQL
@@ -692,14 +687,6 @@ parts:
       # * is not used to avoid directory merge conflicts
       snap/microstack/current/: ./
 
-  libvirtd-wrapper:
-    source: ./snap-wrappers/libvirtd
-    plugin: dump
-    after:
-      - libvirt
-    organize:
-      launch-libvirtd: bin/launch-libvirtd
-
   # MySQL
   mysql-server:
     plugin: dump