From nobody Thu Apr 25 08:56:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552670903487856.7687071530545; Fri, 15 Mar 2019 10:28:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BD74F306D605; Fri, 15 Mar 2019 17:28:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96BF35D6A6; Fri, 15 Mar 2019 17:28:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5AD89181A13C; Fri, 15 Mar 2019 17:28:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2FHSJoJ025820 for ; Fri, 15 Mar 2019 13:28:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5F5746BF9C; Fri, 15 Mar 2019 17:28:19 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C78E56FEE5 for ; Fri, 15 Mar 2019 17:27:49 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Mar 2019 18:27:38 +0100 Message-Id: <20190315172743.14620-2-abologna@redhat.com> In-Reply-To: <20190315172743.14620-1-abologna@redhat.com> References: <20190315172743.14620-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/6] travis: Stop using --with-init-script X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 15 Mar 2019 17:28:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We're gonna drop support for non-systemd init scripts soon, and we don't want Travis CI builds to break when we do. Since we have init system auto-detection, we can just rely on that and stop passing --with-init-script to configure entirely. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55ba340a34..0e7a1a033c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,13 +11,11 @@ matrix: - docker env: - IMAGE=3D"ubuntu-18" - - DISTCHECK_CONFIGURE_FLAGS=3D"--with-init-script=3Dsystemd" - DOCKER_CMD=3D"$LINUX_CMD" - services: - docker env: - IMAGE=3D"centos-7" - - DISTCHECK_CONFIGURE_FLAGS=3D"--with-init-script=3Dupstart" - DOCKER_CMD=3D"$LINUX_CMD" - services: - docker --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 08:56:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552670904586777.1591750041522; Fri, 15 Mar 2019 10:28:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A4B8130A2218; Fri, 15 Mar 2019 17:28:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D0B45D6A6; Fri, 15 Mar 2019 17:28:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 32C523FAF5; Fri, 15 Mar 2019 17:28:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2FHSKEw025825 for ; Fri, 15 Mar 2019 13:28:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 569B26E3E9; Fri, 15 Mar 2019 17:28:20 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B8A086FEFB for ; Fri, 15 Mar 2019 17:28:19 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Mar 2019 18:27:39 +0100 Message-Id: <20190315172743.14620-3-abologna@redhat.com> In-Reply-To: <20190315172743.14620-1-abologna@redhat.com> References: <20190315172743.14620-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/6] travis: Drop $DISTCHECK_CONFIGURE_FLAGS X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 15 Mar 2019 17:28:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" It's no longer used. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e7a1a033c..54de7dd7ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,6 @@ script: -w /build -e VIR_TEST_DEBUG=3D"$VIR_TEST_DEBUG" -e MINGW=3D"$MINGW" - -e DISTCHECK_CONFIGURE_FLAGS=3D"$DISTCHECK_CONFIGURE_FLAGS" "quay.io/libvirt/buildenv-$IMAGE:master" /bin/sh -xc "$DOCKER_CMD" =20 @@ -56,7 +55,7 @@ env: - LINUX_CMD=3D" ./autogen.sh && make -j3 syntax-check && - make -j3 distcheck DISTCHECK_CONFIGURE_FLAGS=3D\"\$DISTCHECK_CONFI= GURE_FLAGS\" || + make -j3 distcheck || ( echo '=3D=3D=3D LOG FILE(S) START =3D=3D=3D'; find -name test-suite.log | xargs cat; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 08:56:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552670908747154.2107465046712; Fri, 15 Mar 2019 10:28:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BBA893065452; Fri, 15 Mar 2019 17:28:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6BB891001E8B; Fri, 15 Mar 2019 17:28:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 23CBC181A1E6; Fri, 15 Mar 2019 17:28:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2FHSLTa025841 for ; Fri, 15 Mar 2019 13:28:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8E8BC77019; Fri, 15 Mar 2019 17:28:21 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B68B918FCB for ; Fri, 15 Mar 2019 17:28:20 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Mar 2019 18:27:40 +0100 Message-Id: <20190315172743.14620-4-abologna@redhat.com> In-Reply-To: <20190315172743.14620-1-abologna@redhat.com> References: <20190315172743.14620-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 3/6] Drop support for Upstart init scripts X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 15 Mar 2019 17:28:27 +0000 (UTC) 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- m4/virt-init-script.m4 | 7 +----- src/Makefile.am | 29 ----------------------- src/remote/Makefile.inc.am | 2 -- src/remote/libvirtd.upstart | 47 ------------------------------------- 4 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 src/remote/libvirtd.upstart diff --git a/m4/virt-init-script.m4 b/m4/virt-init-script.m4 index 757fd10541..7094e29f46 100644 --- 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]) ]) =20 AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ @@ -28,7 +28,6 @@ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ =20 init_redhat=3Dno init_systemd=3Dno - init_upstart=3Dno =20 if test "$with_init_script" =3D check && test "$cross_compiling" =3D y= es; then with_init_script=3Dnone @@ -51,9 +50,6 @@ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ [systemd],[ init_systemd=3Dyes ], - [upstart],[ - init_upstart=3Dyes - ], [redhat],[ init_redhat=3Dyes ], @@ -64,7 +60,6 @@ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ ) =20 AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], test "$init_redhat" =3D = "yes") - AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_UPSTART], test "$init_upstart" =3D= "yes") AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_SYSTEMD], test "$init_systemd" =3D= "yes") =20 AC_MSG_RESULT($with_init_script) diff --git a/src/Makefile.am b/src/Makefile.am index 5dc9990c17..94a9a7c27d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -85,7 +85,6 @@ PODFILES =3D MANINFILES =3D SYSTEMD_UNIT_FILES_IN =3D SYSVINIT_FILES_IN =3D -UPSTART_FILES =3D SYSCONF_FILES =3D sbin_PROGRAMS =3D man8_MANS =3D @@ -872,34 +871,6 @@ endif LIBVIRT_INIT_SCRIPT_SYSTEMD endif WITH_LIBVIRTD =20 =20 -EXTRA_DIST +=3D $(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=3D%); \ - do \ - tgt=3D`basename $$f` ; \ - $(INSTALL_SCRIPT) $(srcdir)/$$f.upstart \ - $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ - done - -uninstall-upstart: uninstall-sysconfig - for f in $(UPSTART_FILES:%.upstart=3D%); \ - do \ - tgt=3D`basename $$f` ; \ - rm -f $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ - done - rmdir $(DESTDIR)$(sysconfdir)/event.d || : - -INSTALL_DATA_LOCAL +=3D install-upstart -UNINSTALL_LOCAL +=3D uninstall-upstart -endif LIBVIRT_INIT_SCRIPT_UPSTART -endif WITH_LIBVIRTD - - EXTRA_DIST +=3D dtrace2systemtap.pl =20 =20 diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 468a3f5d97..bc1d7f462f 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -54,8 +54,6 @@ SYSTEMD_UNIT_FILES_IN +=3D \ remote/virt-guest-shutdown.target.in \ $(NULL) =20 -UPSTART_FILES +=3D remote/libvirtd.upstart - REMOTE_PROTOCOL =3D $(srcdir)/remote/remote_protocol.x LXC_PROTOCOL =3D $(srcdir)/remote/lxc_protocol.x QEMU_PROTOCOL =3D $(srcdir)/remote/qemu_protocol.x diff --git a/src/remote/libvirtd.upstart b/src/remote/libvirtd.upstart deleted file mode 100644 index e620f41450..0000000000 --- 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=3D[345] -stop on runlevel [!345] - -respawn - -script - LIBVIRTD_CONFIG=3D - LIBVIRTD_ARGS=3D - KRB5_KTNAME=3D/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=3D - if [ -n "$LIBVIRTD_CONFIG" ]; then - LIBVIRTD_CONFIG_ARGS=3D"--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 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 08:56:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552670907590592.3787584968957; Fri, 15 Mar 2019 10:28:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D12C09D788; Fri, 15 Mar 2019 17:28:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A0DC05D75C; Fri, 15 Mar 2019 17:28:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 64D00181A13E; Fri, 15 Mar 2019 17:28:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2FHSMNm025858 for ; Fri, 15 Mar 2019 13:28:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 77E3A6FEE5; Fri, 15 Mar 2019 17:28:22 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A9D867A5E4 for ; Fri, 15 Mar 2019 17:28:21 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Mar 2019 18:27:41 +0100 Message-Id: <20190315172743.14620-5-abologna@redhat.com> In-Reply-To: <20190315172743.14620-1-abologna@redhat.com> References: <20190315172743.14620-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 4/6] Drop support for "Red Hat" init scripts X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 15 Mar 2019 17:28:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Despite the misleading name, these were supposed to be used with a System V style init; however, none of the platforms we target is using that kind of init anymore: almost all Linux distributions have switched to systemd, those that haven't (such as Gentoo and Alpine) are mostly using OpenRC with custom init scripts, and the BSDs have been doing their own thing all along. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitignore | 1 - m4/virt-init-script.m4 | 16 +---- src/Makefile.am | 32 --------- src/locking/Makefile.inc.am | 9 --- src/locking/virtlockd.init.in | 98 --------------------------- src/logging/Makefile.inc.am | 11 --- src/logging/virtlogd.init.in | 98 --------------------------- src/remote/Makefile.inc.am | 2 - src/remote/libvirtd.init.in | 122 ---------------------------------- tools/Makefile.am | 33 +-------- tools/libvirt-guests.init.in | 30 --------- 11 files changed, 5 insertions(+), 447 deletions(-) delete mode 100644 src/locking/virtlockd.init.in delete mode 100644 src/logging/virtlogd.init.in delete mode 100644 src/remote/libvirtd.init.in delete mode 100644 tools/libvirt-guests.init.in diff --git a/.gitignore b/.gitignore index 3303eed411..3223cf1b76 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ *.gcov *.html *.i -*.init *.la *.lo *.loT diff --git a/m4/virt-init-script.m4 b/m4/virt-init-script.m4 index 7094e29f46..8045fc06bb 100644 --- a/m4/virt-init-script.m4 +++ b/m4/virt-init-script.m4 @@ -19,14 +19,13 @@ dnl =20 AC_DEFUN([LIBVIRT_ARG_INIT_SCRIPT],[ LIBVIRT_ARG_WITH([INIT_SCRIPT], - [Style of init script to install: redhat, systemd, - systemd+redhat, check, none], [check]) + [Style of init script to install: systemd, check, non= e], + [check]) ]) =20 AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ AC_MSG_CHECKING([for init script type]) =20 - init_redhat=3Dno init_systemd=3Dno =20 if test "$with_init_script" =3D check && test "$cross_compiling" =3D y= es; then @@ -35,31 +34,20 @@ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ if test "$with_init_script" =3D check && type systemctl >/dev/null 2>&= 1; then with_init_script=3Dsystemd fi - if test "$with_init_script" =3D check && test -f /etc/redhat-release; = then - with_init_script=3Dredhat - fi if test "$with_init_script" =3D check; then with_init_script=3Dnone fi =20 AS_CASE([$with_init_script], - [systemd+redhat],[ - init_redhat=3Dyes - init_systemd=3Dyes - ], [systemd],[ init_systemd=3Dyes ], - [redhat],[ - init_redhat=3Dyes - ], [none],[], [*],[ AC_MSG_ERROR([Unknown initscript flavour $with_init_script]) ] ) =20 - AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], test "$init_redhat" =3D = "yes") AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_SYSTEMD], test "$init_systemd" =3D= "yes") =20 AC_MSG_RESULT($with_init_script) diff --git a/src/Makefile.am b/src/Makefile.am index 94a9a7c27d..a73f43c483 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -84,7 +84,6 @@ LOGROTATE_FILES_IN =3D PODFILES =3D MANINFILES =3D SYSTEMD_UNIT_FILES_IN =3D -SYSVINIT_FILES_IN =3D SYSCONF_FILES =3D sbin_PROGRAMS =3D man8_MANS =3D @@ -765,14 +764,6 @@ uninstall-sysconfig: done rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : =20 -SYSVINIT_FILES_IN +=3D \ - locking/virtlockd.init.in \ - $(NULL) - -SYSVINIT_FILES =3D $(notdir $(SYSVINIT_FILES_IN:%.in=3D%)) - -EXTRA_DIST +=3D $(SYSVINIT_FILES_IN) - LOGROTATE_FILES :=3D $(LOGROTATE_FILES_IN:remote/%.in=3D%) =20 EXTRA_DIST +=3D $(LOGROTATE_FILES_IN) @@ -804,29 +795,6 @@ INSTALL_DATA_LOCAL +=3D install-logrotate UNINSTALL_LOCAL +=3D uninstall-logrotate endif WITH_LIBVIRTD =20 -if WITH_LIBVIRTD -if LIBVIRT_INIT_SCRIPT_RED_HAT -initdir =3D $(sysconfdir)/rc.d/init.d - -install-init: $(SYSVINIT_FILES) install-sysconfig - $(MKDIR_P) $(DESTDIR)$(initdir) - for f in $(SYSVINIT_FILES:%.init=3D%) ; \ - do \ - $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \ - done - -uninstall-init: uninstall-sysconfig - rm -f $(SYSVINIT_FILES:%.init=3D$(DESTDIR)$(initdir)/%) - rmdir $(DESTDIR)$(initdir) || : - -BUILT_SOURCES +=3D $(SYSVINIT_FILES) -DISTCLEANFILES +=3D $(SYSVINIT_FILES) - -INSTALL_DATA_LOCAL +=3D install-init -UNINSTALL_LOCAL +=3D uninstall-init -endif LIBVIRT_INIT_SCRIPT_RED_HAT -endif WITH_LIBVIRTD - =20 %.8: %.8.in $(top_srcdir)/configure.ac $(AM_V_GEN)sed \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index f2eb2efb7b..6de7f7bab8 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -305,15 +305,6 @@ virtlockd-admin.socket: locking/virtlockd-admin.socket= .in \ < $< > $@-t && \ mv $@-t $@ =20 -virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - < $< > $@-t && \ - chmod a+x $@-t && \ - mv $@-t $@ - virtlockd.8.in: locking/virtlockd.pod $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ diff --git a/src/locking/virtlockd.init.in b/src/locking/virtlockd.init.in deleted file mode 100644 index 0bf868ca7f..0000000000 --- a/src/locking/virtlockd.init.in +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh - -# the following is the LSB init header see -# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-= generic/initscrcomconv.html -# -### BEGIN INIT INFO -# Provides: virtlockd -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -# Required-Start: -# Required-Stop: -# Should-Start: $network $remote_fs -# Should-Stop: $network $remote_fs -# Short-Description: virtual machine lock manager -# Description: This is a daemon for managing locks -# on virtual machine disk images -### END INIT INFO - -# the following is chkconfig init header -# -# virtlockd: virtual machine lock manager -# -# chkconfig: 345 96 04 -# description: This is a daemon for managing locks \ -# on virtual machine disk images -# -# processname: virtlockd -# pidfile: @localstatedir@/run/virtlockd.pid -# - -# Source function library. -. @sysconfdir@/rc.d/init.d/functions - -SERVICE=3Dvirtlockd -PROCESS=3Dvirtlockd -PIDFILE=3D@localstatedir@/run/$SERVICE.pid - -VIRTLOCKD_ARGS=3D - -test -f @sysconfdir@/sysconfig/virtlockd && . @sysconfdir@/sysconfig/virtl= ockd - -RETVAL=3D0 - -start() { - echo -n $"Starting $SERVICE daemon: " - daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $VIRTLOCK= D_ARGS - RETVAL=3D$? - echo - [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE -} - -stop() { - echo -n $"Stopping $SERVICE daemon: " - - killproc -p $PIDFILE $PROCESS - RETVAL=3D$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f @localstatedir@/lock/subsys/$SERVICE - rm -f $PIDFILE - fi -} - -restart() { - stop - start -} - -reload() { - echo -n $"Reloading $SERVICE configuration: " - - killproc -p $PIDFILE $PROCESS -USR1 - RETVAL=3D$? - echo - return $RETVAL -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 - ;; - status) - status -p $PIDFILE $PROCESS - RETVAL=3D$? - ;; - force-reload) - reload - ;; - condrestart|try-restart) - [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || : - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|for= ce-reload|try-restart}" - exit 2 - ;; -esac -exit $RETVAL diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index ae022ade0b..a4739b2d44 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -26,8 +26,6 @@ LOG_DAEMON_SOURCES =3D \ =20 LOG_PROTOCOL =3D $(srcdir)/logging/log_protocol.x =20 -SYSVINIT_FILES_IN +=3D logging/virtlogd.init.in - EXTRA_DIST +=3D \ $(LOG_PROTOCOL) \ $(LOG_PROTOCOL_GENERATED) \ @@ -116,15 +114,6 @@ logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \ virLogManagerProtocol VIR_LOG_MANAGER_PROTOCOL \ $(LOG_PROTOCOL) > $(srcdir)/logging/log_daemon_dispatch_stubs.h =20 -virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - < $< > $@-t && \ - chmod a+x $@-t && \ - mv $@-t $@ - virtlogd.8.in: logging/virtlogd.pod $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ diff --git a/src/logging/virtlogd.init.in b/src/logging/virtlogd.init.in deleted file mode 100644 index 6aa8815046..0000000000 --- a/src/logging/virtlogd.init.in +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh - -# the following is the LSB init header see -# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-= generic/initscrcomconv.html -# -### BEGIN INIT INFO -# Provides: virtlogd -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -# Required-Start: -# Required-Stop: -# Should-Start: $network $remote_fs -# Should-Stop: $network $remote_fs -# Short-Description: virtual machine log manager -# Description: This is a daemon for managing logs -# of virtual machine consoles -### END INIT INFO - -# the following is chkconfig init header -# -# virtlogd: virtual machine log manager -# -# chkconfig: 345 96 04 -# description: This is a daemon for managing logs \ -# of virtual machine consoles -# -# processname: virtlogd -# pidfile: @localstatedir@/run/virtlogd.pid -# - -# Source function library. -. @sysconfdir@/rc.d/init.d/functions - -SERVICE=3Dvirtlogd -PROCESS=3Dvirtlogd -PIDFILE=3D@localstatedir@/run/$SERVICE.pid - -VIRTLOGD_ARGS=3D - -test -f @sysconfdir@/sysconfig/virtlogd && . @sysconfdir@/sysconfig/virtlo= gd - -RETVAL=3D0 - -start() { - echo -n $"Starting $SERVICE daemon: " - daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $VIRTLOGD= _ARGS - RETVAL=3D$? - echo - [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE -} - -stop() { - echo -n $"Stopping $SERVICE daemon: " - - killproc -p $PIDFILE $PROCESS - RETVAL=3D$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f @localstatedir@/lock/subsys/$SERVICE - rm -f $PIDFILE - fi -} - -restart() { - stop - start -} - -reload() { - echo -n $"Reloading $SERVICE configuration: " - - killproc -p $PIDFILE $PROCESS -USR1 - RETVAL=3D$? - echo - return $RETVAL -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 - ;; - status) - status -p $PIDFILE $PROCESS - RETVAL=3D$? - ;; - force-reload) - reload - ;; - condrestart|try-restart) - [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || : - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|for= ce-reload|try-restart}" - exit 2 - ;; -esac -exit $RETVAL diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index bc1d7f462f..dccecf8cd3 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -42,8 +42,6 @@ LOGROTATE_FILES_IN +=3D \ remote/libvirtd.logrotate.in \ $(NULL) =20 -SYSVINIT_FILES_IN +=3D remote/libvirtd.init.in - SYSCONF_FILES +=3D remote/libvirtd.sysconf =20 PODFILES +=3D remote/libvirtd.pod diff --git a/src/remote/libvirtd.init.in b/src/remote/libvirtd.init.in deleted file mode 100644 index d81dca6f2e..0000000000 --- a/src/remote/libvirtd.init.in +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh - -# the following is the LSB init header see -# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-= generic/initscrcomconv.html -# -### BEGIN INIT INFO -# Provides: libvirtd -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -# Required-Start: $network messagebus virtlogd -# Required-Stop: $network messagebus -# Should-Start: $named xend avahi-daemon virtlockd -# Should-Stop: $named -# Short-Description: daemon for libvirt virtualization API -# Description: This is a daemon for managing guest instances -# and libvirt virtual networks -# See https://libvirt.org -### END INIT INFO - -# the following is chkconfig init header -# -# libvirtd: guest and virtual network management daemon -# -# chkconfig: 345 97 03 -# description: This is a daemon for managing guest instances \ -# and libvirt virtual networks \ -# See https://libvirt.org -# -# processname: libvirtd -# pidfile: @localstatedir@/run/libvirtd.pid -# - -# Source function library. -. @sysconfdir@/rc.d/init.d/functions - -SERVICE=3Dlibvirtd -PROCESS=3Dlibvirtd -PIDFILE=3D@localstatedir@/run/$SERVICE.pid - -LIBVIRTD_CONFIG=3D -LIBVIRTD_ARGS=3D -KRB5_KTNAME=3D/etc/libvirt/krb5.tab - -test -f @sysconfdir@/sysconfig/libvirtd && . @sysconfdir@/sysconfig/libvir= td - -export QEMU_AUDIO_DRV -export SDL_AUDIODRIVER - -LIBVIRTD_CONFIG_ARGS=3D -if [ -n "$LIBVIRTD_CONFIG" ] -then - LIBVIRTD_CONFIG_ARGS=3D"--config $LIBVIRTD_CONFIG" -fi - -RETVAL=3D0 - -start() { - echo -n $"Starting $SERVICE daemon: " - mkdir -p @localstatedir@/cache/libvirt - rm -rf @localstatedir@/cache/libvirt/* - - # LIBVIRTD_NOFILES_LIMIT from /etc/sysconfig/libvirtd is not handled - # automatically - if [ -n "$LIBVIRTD_NOFILES_LIMIT" ]; then - ulimit -n "$LIBVIRTD_NOFILES_LIMIT" - fi - - KRB5_KTNAME=3D$KRB5_KTNAME daemon --pidfile $PIDFILE --check $SERVICE = $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS - RETVAL=3D$? - echo - [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE -} - -stop() { - echo -n $"Stopping $SERVICE daemon: " - - killproc -p $PIDFILE $PROCESS - RETVAL=3D$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f @localstatedir@/lock/subsys/$SERVICE - rm -rf @localstatedir@/cache/libvirt/* - else - exit $RETVAL - fi -} - -restart() { - stop - start -} - -reload() { - echo -n $"Reloading $SERVICE configuration: " - - killproc -p $PIDFILE $PROCESS -HUP - RETVAL=3D$? - echo - return $RETVAL -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 - ;; - status) - status -p $PIDFILE $PROCESS - RETVAL=3D$? - ;; - force-reload) - reload - ;; - condrestart|try-restart) - [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || : - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|for= ce-reload|try-restart}" - exit 2 - ;; -esac -exit $RETVAL diff --git a/tools/Makefile.am b/tools/Makefile.am index 95025ced43..c6064dee08 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -327,10 +327,10 @@ POD2MAN =3D pod2man -c "Virtualization Support" -r "$= (PACKAGE)-$(VERSION)" < $< > $@-t && \ mv $@-t $@ =20 -install-data-local: install-init install-systemd install-nss \ +install-data-local: install-systemd install-nss \ install-bash-completion =20 -uninstall-local: uninstall-init uninstall-systemd uninstall-nss \ +uninstall-local: uninstall-systemd uninstall-nss \ uninstall-bash-completion =20 install-sysconfig: @@ -342,26 +342,7 @@ uninstall-sysconfig: rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: =20 -EXTRA_DIST +=3D libvirt-guests.sh.in libvirt-guests.init.in - -install-initscript: libvirt-guests.init - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d - $(INSTALL_SCRIPT) libvirt-guests.init \ - $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests - -uninstall-initscript: - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests - rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d ||: - - -if LIBVIRT_INIT_SCRIPT_RED_HAT -BUILT_SOURCES +=3D libvirt-guests.init -install-init: install-sysconfig install-initscript -uninstall-init: uninstall-sysconfig uninstall-initscript -else ! LIBVIRT_INIT_SCRIPT_RED_HAT -install-init: -uninstall-init: -endif ! LIBVIRT_INIT_SCRIPT_RED_HAT +EXTRA_DIST +=3D libvirt-guests.sh.in =20 libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status $(AM_V_GEN)sed \ @@ -376,14 +357,6 @@ libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir= )/config.status mv $@-t $@ BUILT_SOURCES +=3D libvirt-guests.sh =20 -libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh - $(AM_V_GEN)sed \ - -e 's|[@]libexecdir[@]|$(libexecdir)|g' \ - < $< > $@-t && \ - chmod a+x $@-t && \ - mv $@-t $@ - - EXTRA_DIST +=3D libvirt-guests.service.in SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system =20 diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in deleted file mode 100644 index 495d4c7d1d..0000000000 --- a/tools/libvirt-guests.init.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# the following is the LSB init header see -# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-= generic/initscrcomconv.html -# -### BEGIN INIT INFO -# Provides: libvirt-guests -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -# Required-Start: libvirtd -# Required-Stop: libvirtd -# Should-Start: -# Should-Stop: -# Short-Description: suspend/resume libvirt guests on shutdown/boot -# Description: This is a script for suspending active libvirt guests -# on shutdown and resuming them on next boot -# See https://libvirt.org -### END INIT INFO - -# the following is chkconfig init header -# -# libvirt-guests: suspend/resume libvirt guests on shutdown/boot -# -# chkconfig: 345 99 01 -# description: This is a script for suspending active libvirt guests \ -# on shutdown and resuming them on next boot \ -# See https://libvirt.org -# - -exec @libexecdir@/libvirt-guests.sh "$@" --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 08:56:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552670911858507.4910787418579; Fri, 15 Mar 2019 10:28:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0900300412A; Fri, 15 Mar 2019 17:28:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B14955D6A6; Fri, 15 Mar 2019 17:28:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 60B993FAF4; Fri, 15 Mar 2019 17:28:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2FHSOU6025873 for ; Fri, 15 Mar 2019 13:28:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E1D317995; Fri, 15 Mar 2019 17:28:24 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5D7E77BE8 for ; Fri, 15 Mar 2019 17:28:22 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Mar 2019 18:27:42 +0100 Message-Id: <20190315172743.14620-6-abologna@redhat.com> In-Reply-To: <20190315172743.14620-1-abologna@redhat.com> References: <20190315172743.14620-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 5/6] m4: Simplify LIBVIRT_CHECK_INIT_SCRIPT X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 15 Mar 2019 17:28:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Now that we no longer support the weird "redhat+systemd" configuration, we can make our code slightly simpler. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- m4/virt-init-script.m4 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/m4/virt-init-script.m4 b/m4/virt-init-script.m4 index 8045fc06bb..91bbd68235 100644 --- a/m4/virt-init-script.m4 +++ b/m4/virt-init-script.m4 @@ -26,8 +26,6 @@ AC_DEFUN([LIBVIRT_ARG_INIT_SCRIPT],[ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ AC_MSG_CHECKING([for init script type]) =20 - init_systemd=3Dno - if test "$with_init_script" =3D check && test "$cross_compiling" =3D y= es; then with_init_script=3Dnone fi @@ -39,16 +37,15 @@ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ fi =20 AS_CASE([$with_init_script], - [systemd],[ - init_systemd=3Dyes - ], + [systemd],[], [none],[], [*],[ AC_MSG_ERROR([Unknown initscript flavour $with_init_script]) ] ) =20 - AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_SYSTEMD], test "$init_systemd" =3D= "yes") + AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_SYSTEMD], + [test "$with_init_script" =3D "systemd"]) =20 AC_MSG_RESULT($with_init_script) ]) --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 08:56:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552670910258140.04049641716824; Fri, 15 Mar 2019 10:28:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9527D300413F; Fri, 15 Mar 2019 17:28:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6141D1001DC0; Fri, 15 Mar 2019 17:28:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0E9B61819AFD; Fri, 15 Mar 2019 17:28:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2FHSPur025883 for ; Fri, 15 Mar 2019 13:28:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 18D9B17F49; Fri, 15 Mar 2019 17:28:25 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 90B666BF68 for ; Fri, 15 Mar 2019 17:28:24 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Mar 2019 18:27:43 +0100 Message-Id: <20190315172743.14620-7-abologna@redhat.com> In-Reply-To: <20190315172743.14620-1-abologna@redhat.com> References: <20190315172743.14620-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 6/6] news: Document dropping support for certain init scripts X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 15 Mar 2019 17:28:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/news.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index cc07b5dd0a..bb548f1ec1 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -95,6 +95,19 @@ +
+ + + Drop support for Upstart and "Red Hat" init scripts + + + Not a single one of the platforms we target still uses Upstart, + and the Upstart project itself has been abandoned for several ye= ars + now; the same is true for the "Red Hat" (really System V) init + scripts, since RHEL 7 and later releases use systemd. + + +
--=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list