Drop support for Upstart init scripts

Not a single one of the platforms we target still uses Upstart, and
the Upstart project itself has been abandoned for several years now.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/m4/virt-init-script.m4 b/m4/virt-init-script.m4
index 757fd10541b0184930f517d03b9cd7b4537e15c2..7094e29f4629052c7282dc831977ecb8efb7e546 100644 (file)
--- a/m4/virt-init-script.m4
+++ b/m4/virt-init-script.m4
@@ -20,7 +20,7 @@ dnl
 AC_DEFUN([LIBVIRT_ARG_INIT_SCRIPT],[
     LIBVIRT_ARG_WITH([INIT_SCRIPT],
                      [Style of init script to install: redhat, systemd,
-                      systemd+redhat, upstart, check, none], [check])
+                      systemd+redhat, check, none], [check])
 ])
 
 AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
@@ -28,7 +28,6 @@ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
 
     init_redhat=no
     init_systemd=no
-    init_upstart=no
 
     if test "$with_init_script" = check && test "$cross_compiling" = yes; then
         with_init_script=none
@@ -51,9 +50,6 @@ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
         [systemd],[
             init_systemd=yes
         ],
-        [upstart],[
-            init_upstart=yes
-        ],
         [redhat],[
             init_redhat=yes
         ],
@@ -64,7 +60,6 @@ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
     )
 
     AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], test "$init_redhat" = "yes")
-    AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_UPSTART], test "$init_upstart" = "yes")
     AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_SYSTEMD], test "$init_systemd" = "yes")
 
     AC_MSG_RESULT($with_init_script)

diff --git a/src/Makefile.am b/src/Makefile.am
index 5dc9990c17f1d7371f26e840b8e0f6d481f44582..94a9a7c27d29caba154c381560ecd6a6a95346c6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,7 +85,6 @@ PODFILES =
 MANINFILES =
 SYSTEMD_UNIT_FILES_IN =
 SYSVINIT_FILES_IN =
-UPSTART_FILES =
 SYSCONF_FILES =
 sbin_PROGRAMS =
 man8_MANS =
@@ -872,34 +871,6 @@ endif LIBVIRT_INIT_SCRIPT_SYSTEMD
 endif WITH_LIBVIRTD
 
 
-EXTRA_DIST += $(UPSTART_FILES)
-
-if WITH_LIBVIRTD
-if LIBVIRT_INIT_SCRIPT_UPSTART
-
-install-upstart: install-sysconfig
-       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
-       for f in $(UPSTART_FILES:%.upstart=%); \
-       do \
-         tgt=`basename $$f` ; \
-         $(INSTALL_SCRIPT) $(srcdir)/$$f.upstart \
-             $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
-       done
-
-uninstall-upstart: uninstall-sysconfig
-       for f in $(UPSTART_FILES:%.upstart=%); \
-       do \
-         tgt=`basename $$f` ; \
-         rm -f $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
-       done
-       rmdir $(DESTDIR)$(sysconfdir)/event.d || :
-
-INSTALL_DATA_LOCAL += install-upstart
-UNINSTALL_LOCAL += uninstall-upstart
-endif LIBVIRT_INIT_SCRIPT_UPSTART
-endif WITH_LIBVIRTD
-
-
 EXTRA_DIST += dtrace2systemtap.pl
 
 

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 468a3f5d973cd8ec6c89def8d13d8fb9cc404ee0..bc1d7f462fe4cf8ee6623813e7eba7f2cf1f4478 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -54,8 +54,6 @@ SYSTEMD_UNIT_FILES_IN += \
        remote/virt-guest-shutdown.target.in \
        $(NULL)
 
-UPSTART_FILES += remote/libvirtd.upstart
-
 REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x
 LXC_PROTOCOL = $(srcdir)/remote/lxc_protocol.x
 QEMU_PROTOCOL = $(srcdir)/remote/qemu_protocol.x

diff --git a/src/remote/libvirtd.upstart b/src/remote/libvirtd.upstart
deleted file mode 100644 (file)
index e620f41..0000000
--- a/src/remote/libvirtd.upstart
+++ /dev/null
@@ -1,47 +0,0 @@
-# libvirtd upstart job
-#
-# XXX wait for rc to get all dependent initscripts started
-# from sysv libvirtd initscript: Required-Start: $network messagebus
-start on stopped rc RUNLEVEL=[345]
-stop on runlevel [!345]
-
-respawn
-
-script
-    LIBVIRTD_CONFIG=
-    LIBVIRTD_ARGS=
-    KRB5_KTNAME=/etc/libvirt/krb5.tab
-
-    if [ -f /etc/sysconfig/libvirtd ]; then
-        . /etc/sysconfig/libvirtd
-    fi
-
-    export QEMU_AUDIO_DRV
-    export SDL_AUDIODRIVER
-    export KRB5_KTNAME
-
-    LIBVIRTD_CONFIG_ARGS=
-    if [ -n "$LIBVIRTD_CONFIG" ]; then
-        LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG"
-    fi
-
-    # DAEMON_COREFILE_LIMIT from /etc/sysconfig/libvirtd is not handled
-    # automatically
-    if [ -n "$DAEMON_COREFILE_LIMIT" ]; then
-        ulimit -c "$DAEMON_COREFILE_LIMIT"
-    fi
-
-    # LIBVIRTD_NOFILES_LIMIT from /etc/sysconfig/libvirtd is not handled
-    # automatically
-    if [ -n "$LIBVIRTD_NOFILES_LIMIT" ]; then
-        ulimit -n "$LIBVIRTD_NOFILES_LIMIT"
-    fi
-    mkdir -p /var/cache/libvirt
-    rm -rf /var/cache/libvirt/*
-
-    exec /usr/sbin/libvirtd $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
-end script
-
-post-stop script
-    rm -rf /var/cache/libvirt/*
-end script