kreyren/parabola-vmbootstrap
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

restore 'base' group packages only for systemd

Browse Source 
to be sure we are not addin base to base-openrc. Cause that could be a mess.

OpenRC still hanging at "starting local..."
This commit is contained in:
Freemor 2019-10-16 13:12:48 -03:00 committed by bill-auger
parent a557f2518e
commit 45bc48b51b
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pvmbootstrap.sh
View File

@ -183,14 +183,6 @@ 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$init" "device-mapper$init" "dhcpcd$init" e2fsprogs inetutils \
jfsutils linux-libre logrotate "lvm2$init" man-db "mdadm$init" nano \
netctl pacman-mirrorlist perl reiserfsprogs s-nail sysfsutils \
texinfo usbutils vi xfsprogs your-freedom )
case "$arch" in
i686|x86_64) pkg+=(grub) ;;
esac
@ -199,11 +191,17 @@ EOF
*) pkg+=("haveged$init" net-tools) ;;
esac
# Be specific to skip around some conflicts
# Add back in base packages that the switch from base group
# to base PKG yanked and be specific on OpenRC to avoid conflicts
if [[ ! $init ]]; then
pkg+=(systemd-udev systemd-libudev)
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 systemd-udev \
systemd-libudev)
else
pkg+=(eudev-libudev)
pkg+=(systemd-libs-dummy)
fi
local pkg_guest_cache=(ca-certificates-utils)