From nobody Tue Feb 10 00:59:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605473038; cv=none; d=zohomail.com; s=zohoarc; b=LtGyQj51EvPNYAy7eV4d613hvJFZFc7Iw7Nupe6l9Qy2sIx8ZqAjOs2E6TvsBZj/0Dh6hkuUfLzsQjYSNa4d3t7TZ1FzmoDhHWq1oByGrr1Wtre7jJqETaf7MTsYjrqHuSvgKynOIvqbxziUZk08hiaYxjPuSW1U5VyJq+1BMc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605473038; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0t/24N7/+bhlrpYef1bx14mbArh4jdaEemN/ppkYbHc=; b=mZo/pK/FDWJbWRwVfP8o9ebTn5dpYpqV/MwBiLBd0jj471BsKQ3mABjgQw1s75tI4GvhzHtJMB8XGGE+sPvmCvSAJwzJr6+I2WngZrLXpJOSQ5Ss8weug0+1Zwzq9cRGHvRFj2WfYYb8BW0fcYZsovYBX+rbLfhv/YwT5bcw58A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605473037885731.1047023261076; Sun, 15 Nov 2020 12:43:57 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-451-oTatbzb8MAyUHpw-i5Q_mw-1; Sun, 15 Nov 2020 15:43:51 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id EAF6C8049C4; Sun, 15 Nov 2020 20:43:43 +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 C931A51919; Sun, 15 Nov 2020 20:43:43 +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 913F5180C5A2; Sun, 15 Nov 2020 20:43:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AFKhZcB027944 for ; Sun, 15 Nov 2020 15:43:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6E2EE27BA5; Sun, 15 Nov 2020 20:43:35 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D1363C04 for ; Sun, 15 Nov 2020 20:43:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605473034; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0t/24N7/+bhlrpYef1bx14mbArh4jdaEemN/ppkYbHc=; b=HuST2WeWN54ofgRUewsSdF6PkIHpQpheD+nlC2h6dUj+Nd/Ua4ZHexx5iNK/SdJhhafVAS uG72aatA8iszk805lr+l7SSRCHBVS/LgVtgVcKBAJ39ALpD2N42YruvMJHr0t20+CcDOq/ x3fQ0vU1pRHe7tTn+okX5/KZ6nnleZM= X-MC-Unique: oTatbzb8MAyUHpw-i5Q_mw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] spec: Drop UUID handling for default network Date: Sun, 15 Nov 2020 21:43:23 +0100 Message-Id: <20201115204323.119777-3-abologna@redhat.com> In-Reply-To: <20201115204323.119777-1-abologna@redhat.com> References: <20201115204323.119777-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We're no longer generating a UUID during installation, so we clearly don't need to strip it afterwards; and since the network driver is perfectly capable of generating a UUID if necessary, we don't need to do that at %post time either. Signed-off-by: Andrea Bolognani Reviewed-by: Neal Gompa --- libvirt.spec.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 034982809d..f4cee8940d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1240,8 +1240,6 @@ cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/= *.xml \ # libvirt saves these files with mode 600 chmod 600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml =20 -# Strip auto-generated UUID - we need it generated per-install -sed -i -e "//d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.= xml %if ! %{with_qemu} rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug @@ -1422,9 +1420,7 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/= qemu/networks/default.xml ; ;; esac =20 - UUID=3D`/usr/bin/uuidgen` sed -e "s/${orig_sub}/${sub}/g" \ - -e "s,,\n $UUID," \ < %{_datadir}/libvirt/networks/default.xml \ > %{_sysconfdir}/libvirt/qemu/networks/default.xml ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/de= fault.xml --=20 2.26.2