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

Browse source
This commit is contained in:
Tobias Powalowski 2022-05-04 21:48:20 +02:00
parent d338dd196b
commit e486cf309c
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
usr/bin/archboot-aarch64-create-container.sh
View file

@ -18,6 +18,7 @@ if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
_install_archboot "${1}" || exit 1 _install_archboot "${1}" || exit 1
_umount_special "${1}" || exit 1 _umount_special "${1}" || exit 1
_generate_locales "${1}" _generate_locales "${1}"
_fix_groups "${1}"
_clean_container "${1}" _clean_container "${1}"
_clean_archboot_cache _clean_archboot_cache
_generate_keyring "${1}" || exit 1 _generate_keyring "${1}" || exit 1
@ -26,16 +27,14 @@ fi
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
_aarch64_pacman_chroot "${1}" || exit 1 _aarch64_pacman_chroot "${1}" || exit 1
_aarch64_install_base_packages "${1}" || exit 1 _aarch64_install_base_packages "${1}" || exit 1
_clean_mkinitcpio "${1}"
_clean_cache "${1}"
_aarch64_install_archboot "${1}" || exit 1 _aarch64_install_archboot "${1}" || exit 1
_fix_groups "${1}"
_clean_mkinitcpio "${1}" _clean_mkinitcpio "${1}"
_clean_cache "${1}" _clean_cache "${1}"
_generate_locales "${1}" _generate_locales "${1}"
_clean_container "${1}" 2>/dev/null _clean_container "${1}" 2>/dev/null
fi fi
_change_pacman_conf "${1}" || exit 1 _change_pacman_conf "${1}" || exit 1
_fix_groups "${1}"
_reproducibility "${1}" _reproducibility "${1}"
_set_hostname "${1}" || exit 1 _set_hostname "${1}" || exit 1
echo "Finished container setup in ${1} ." echo "Finished container setup in ${1} ."

2
usr/bin/archboot-x86_64-create-container.sh
View file

@ -18,6 +18,7 @@ _clean_cache "${1}"
_install_archboot "${1}" || exit 1 _install_archboot "${1}" || exit 1
_umount_special "${1}" || exit 1 _umount_special "${1}" || exit 1
_generate_locales "${1}" _generate_locales "${1}"
_fix_groups "${1}"
_clean_container "${1}" _clean_container "${1}"
_clean_archboot_cache _clean_archboot_cache
_generate_keyring "${1}" || exit 1 _generate_keyring "${1}" || exit 1
@ -31,7 +32,6 @@ if grep -q "^\[testing" /etc/pacman.conf; then
sed -i -e '/^#\[community-testing\]/ { n ; s/^#// }' "${1}/etc/pacman.conf" sed -i -e '/^#\[community-testing\]/ { n ; s/^#// }' "${1}/etc/pacman.conf"
sed -i -e 's:^#\[testing\]:\[testing\]:g' -e 's:^#\[community-testing\]:\[community-testing\]:g' "${1}/etc/pacman.conf" sed -i -e 's:^#\[testing\]:\[testing\]:g' -e 's:^#\[community-testing\]:\[community-testing\]:g' "${1}/etc/pacman.conf"
fi fi
_fix_groups "${1}"
_reproducibility "${1}" _reproducibility "${1}"
_set_hostname "${1}" || exit 1 _set_hostname "${1}" || exit 1
echo "Finished container setup in ${1} ." echo "Finished container setup in ${1} ."

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

@ -191,6 +191,6 @@ _set_hostname() {
_fix_groups() { _fix_groups() {
echo "Recreate system groups ..." echo "Recreate system groups ..."
rm "${1}"/etc/{group,gshadow} rm "${1}"/etc/{group,gshadow}
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Sy filesystem --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1 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}" groupadd netdev >/dev/null 2>&1
} }