root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix group creation #3

Browse source
This commit is contained in:
Tobias Powalowski 2022-05-04 22:46:33 +02:00
parent e486cf309c
commit 2443161aec
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
usr/lib/archboot/container.sh
View file

@ -142,7 +142,7 @@ _install_archboot() {
_aarch64_install_base_packages() {
echo "Installing packages ${_PACKAGES} to ${1} ..."
if [[ -e "$(basename "${_PACMAN_CONF}")" ]]; then
if [[ -e "${1}/$(basename "${_PACMAN_CONF}")" ]]; then
_PACMAN_CONF=$(basename "${_PACMAN_CONF}")
fi
[[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
@ -153,7 +153,7 @@ _aarch64_install_base_packages() {
}
_aarch64_install_archboot() {
if [[ -e "$(basename "${_PACMAN_CONF}")" ]]; then
if [[ -e "${1}/$(basename "${_PACMAN_CONF}")" ]]; then
_PACMAN_CONF=$(basename "${_PACMAN_CONF}")
fi
echo "Downloading ${_ARCHBOOT} ${_DOWNLOAD_PACKAGES} to ${1} ..."
@ -191,6 +191,7 @@ _set_hostname() {
_fix_groups() {
echo "Recreate system groups ..."
rm "${1}"/etc/{group,gshadow}
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Sy filesystem --config $(basename ${_PACMAN_CONF}) --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
systemd-nspawn -q -D "${1}" groupadd netdev >/dev/null 2>&1
systemd-nspawn -q -D "${1}" systemd-sysusers >/dev/null 2>&1
# fix missing group in dbus
systemd-nspawn -q -D "${1}" groupadd netdev >/dev/null 2>&1
}