From de5fe5cbe74234aa6ad9af44e88e9d88f5768357 Mon Sep 17 00:00:00 2001 From: Justin Kromlinger Date: Wed, 14 Jun 2023 14:06:27 +0200 Subject: [PATCH] Avoid creation of .pacnew files for every image This was just confusing to users, since a pacdiff on a new Arch container should always exit cleanly. --- Makefile | 2 +- pacman-conf.d-noextract.conf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 620284e..d381332 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ define rootfs --noscriptlet \ --hookdir $(BUILDDIR)/alpm-hooks/usr/share/libalpm/hooks/ $(2) - cp --recursive --preserve=timestamps --backup --suffix=.pacnew rootfs/* $(BUILDDIR)/ + cp --recursive --preserve=timestamps rootfs/* $(BUILDDIR)/ fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust fakechroot -- fakeroot -- chroot $(BUILDDIR) sh -c 'pacman-key --init && pacman-key --populate && bash -c "rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}*"' diff --git a/pacman-conf.d-noextract.conf b/pacman-conf.d-noextract.conf index c813919..6bcacb0 100644 --- a/pacman-conf.d-noextract.conf +++ b/pacman-conf.d-noextract.conf @@ -10,3 +10,4 @@ NoExtract = !usr/share/X11/locale/compose.dir !usr/share/X11/locale/iso8859-1/ NoExtract = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz NoExtract = usr/share/man/* usr/share/info/* NoExtract = usr/share/vim/vim*/lang/* +NoExtract = etc/pacman.conf etc/pacman.d/mirrorlist