From patchwork Mon Mar 18 19:46:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 160511 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp3033910jad; Mon, 18 Mar 2019 12:46:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqyQQVpXhfIwW86YfoDjDacz04kbOrBaMUA8lt6TIR04dZUm3SauTKA0VvIFPuRnW3g2SVS6 X-Received: by 2002:ac8:6147:: with SMTP id d7mr11154268qtm.6.1552938401704; Mon, 18 Mar 2019 12:46:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552938401; cv=none; d=google.com; s=arc-20160816; b=avdk7H1yR2+dAKzsnDcNFVPjtqIg7m8UMvWAT6tIo3fu4JmXq9vrj2cOo2RFM4RS7d XrbYl0g0FhLQsH+VUuUPNkfwP39ITe0ULObJtg+8fQR7y6faK5OJZodqnl0DR7/86fR9 aggEYz9lc3OK11Qb315xVpjAsXBNm+AC5V3RZeHo2c5MHVT3tKRarbJPw+sN5eYIlv65 ePJ/MAbRsnzPllbBvDc6EwLYw+g1VMcYeDq2t545mT5iIpn7NS7BLsKr7bixJcnRbA2G L0XujCiuiSi/UfdASjOKfg7thS8UkQG4vc0XVFv9IQ9jb0Zzmxm0dWEKH+EhdKI/mtVa yr3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:delivered-to; bh=an9+s7OAu0dysvdlBC64dV5dA7aZE97j/cuuMbXoTKU=; b=TaSlyU/tAwd7xw4jvWqMkbowGeE/1uF2tCZqHcAL7IoSnN9pRuR6FP7e2x3XysJZSl J9a9t/mGEWHcspHnC8l6r9VHFvh0SGDkXJApV2/WAF63jYAhZ/OrtBQbh6oLcO2LBOBr dFxG67j7sWigBkO483uypSDHq6OUTf88FuWvCdoPYjHjOn2INu5XuWQBqRHynnlzGXh6 H1wqesvmTTa2jabg77DZzDnc8FUtWbZCH8uqJL6qFUQyV2kanmlLNlfMVcs4Ccu7LamB B9Bbx3QzVOKJc9QLwEZL18xGnc6f0lxxwatlRSb/VVmnRREKN9UcfPF3xtM5Yd/fRCJx e/jQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id w5si724818qvf.6.2019.03.18.12.46.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 12:46:41 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D2A77D0C5; Mon, 18 Mar 2019 19:46:40 +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 878B160C4C; Mon, 18 Mar 2019 19:46:39 +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 431E63FB11; Mon, 18 Mar 2019 19:46:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2IJkb6f008277 for ; Mon, 18 Mar 2019 15:46:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 156615C646; Mon, 18 Mar 2019 19:46:37 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-117-160.phx2.redhat.com [10.3.117.160]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5454F5C28F; Mon, 18 Mar 2019 19:46:34 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 18 Mar 2019 15:46:28 -0400 Message-Id: <261ffe18437c8c395559703115e7c0fd88d6315c.1552938388.git.crobinso@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] spec: Remove libvirt < 0.9.4 upgrade compat 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 18 Mar 2019 19:46:40 +0000 (UTC) These blocks are only triggered when updating from a libvirt version less than 0.9.4, which was released in august 2011. I think it's been long enough that we can say this upgrade path is unsupported without an intermediate step Signed-off-by: Cole Robinson --- libvirt.spec.in | 19 ------------------- 1 file changed, 19 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/libvirt.spec.in b/libvirt.spec.in index 1497cad3d2..dd725baf24 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1444,16 +1444,6 @@ fi rm -rf %{_localstatedir}/lib/rpm-state/libvirt || : -%triggerun -- libvirt < 0.9.4 -%{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||: - -# If the package is allowed to autostart: -/bin/systemctl --no-reload enable libvirtd.service >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del libvirtd >/dev/null 2>&1 || : -/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : - %if %{with_qemu} %pre daemon-driver-qemu # We want soft static allocation of well-known ids, as disk images @@ -1485,15 +1475,6 @@ exit 0 /sbin/ldconfig %systemd_postun libvirt-guests.service -%triggerun client -- libvirt < 0.9.4 -%{_bindir}/systemd-sysv-convert --save libvirt-guests >/dev/null 2>&1 ||: - -# If the package is allowed to autostart: -/bin/systemctl --no-reload enable libvirt-guests.service >/dev/null 2>&1 ||: - -# Run this because the SysV package being removed won't do them -/sbin/chkconfig --del libvirt-guests >/dev/null 2>&1 || : - %if %{with_sanlock} %post lock-sanlock if getent group sanlock > /dev/null ; then