From 0159cd6a77a918b57f139bd1e2d6fe3926cc3e50 Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Sun, 29 Jan 2017 15:27:14 +0100 Subject: [PATCH] archlinux: fix pacman.d dropin not activated if pacman.conf does not already contains qubes markers --- archlinux/PKGBUILD.install | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install index 339f10d..7bb92bd 100644 --- a/archlinux/PKGBUILD.install +++ b/archlinux/PKGBUILD.install @@ -319,11 +319,15 @@ fi update_finalize() { - # Archlinux specific: Cleanup pre pacman.d qubes marker + # Archlinux specific: If marker exists, cleanup text between begin and end marker QUBES_MARKER="### QUBES CONFIG MARKER ###" if grep -F -q "$QUBES_MARKER" /etc/pacman.conf; then config_prependtomark "/etc/pacman.conf" "# REPOSITORIES" "### QUBES CONFIG END MARKER ###" config_cleanupmark "/etc/pacman.conf" "$QUBES_MARKER" "### QUBES CONFIG END MARKER ###" + # Else, add qubes config block marker + else + config_prependtomark "/etc/pacman.conf" "# REPOSITORIES" "$QUBES_MARKER" + config_prependtomark "/etc/pacman.conf" "# REPOSITORIES" "### QUBES CONFIG END MARKER ###" fi # Include /etc/pacman.d drop-in directory