From de27bf79e5af0c86887e40fa657000b1f4ad812e Mon Sep 17 00:00:00 2001 From: Freemor Date: Tue, 15 Oct 2019 22:20:19 -0300 Subject: [PATCH] add back 'base' group packages Add back in packages yanked by the switch from base Group to base PKG systemd pacstraps and builds correctly openrc not quite. I will have to check whats going on there and fix it. but as openrc-base has not transitioned to a package yet that will probably need further tweaking at that point anyways. --- src/pvmbootstrap.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/pvmbootstrap.sh b/src/pvmbootstrap.sh index fcd0145..bac9d85 100644 --- a/src/pvmbootstrap.sh +++ b/src/pvmbootstrap.sh @@ -182,6 +182,15 @@ EOF # prepare lists of packages local pkg=("base$init" "openssh$init" openresolv ldns) + + # Add back in the packages that the switch from base group + # to base PKG yanked + pkg+=(cryptsetup device-mapper dhcpcd e2fsprogs inetutils \ + jfsutils linux-libre logrotate lvm2 man-db mdadm nano \ + netctl pacman-mirrorlist perl reiserfsprogs s-nail sysfsutils \ + texinfo usbutils vi xfsprogs your-freedom ) + + case "$arch" in i686|x86_64) pkg+=(grub) ;; esac @@ -192,7 +201,9 @@ EOF # Be specific to skip around some conflicts if [[ ! $init ]]; then - pkg+=("systemd-udev") + pkg+=(systemd-udev systemd-libudev) + else + pkg+=(eudev-libudev) fi local pkg_guest_cache=(ca-certificates-utils)