Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

main: override systemd features only when security.nesting=false #619

Merged
merged 1 commit into from
Apr 20, 2022
Merged

main: override systemd features only when security.nesting=false #619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions distrobuilder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,14 +729,24 @@ fi

# Workarounds for containers.
if is_lxc_container; then
# Apply systemd overrides
if [ "${systemd_version}" -ge 244 ]; then
fix_systemd_override_unit system/service
else
# Setup per-unit overrides
find /lib/systemd /etc/systemd /run/systemd /usr/lib/systemd -name "*.service" -type f | sed 's#/\(lib\|etc\|run\|usr/lib\)/systemd/##g'| while read -r service_file; do
fix_systemd_override_unit "${service_file}"
done
# Overriding some systemd features is only needed if security.nesting=false
# in which case, /dev/.lxc will be missing
if [ ! -d /dev/.lxc ]; then
# Apply systemd overrides
if [ "${systemd_version}" -ge 244 ]; then
fix_systemd_override_unit system/service
else
# Setup per-unit overrides
find /lib/systemd /etc/systemd /run/systemd /usr/lib/systemd -name "*.service" -type f | sed 's#/\(lib\|etc\|run\|usr/lib\)/systemd/##g'| while read -r service_file; do
fix_systemd_override_unit "${service_file}"
done
fi

# Workarounds for privileged containers.
if ! grep -q 4294967295 /proc/self/uid_map && { [ "${ID}" = "altlinux" ] || [ "${ID}" = "arch" ] || [ "${ID}" = "fedora" ]; }; then
fix_ro_paths systemd-networkd.service
fix_ro_paths systemd-resolved.service
fi
fi

# Ignore failures on some units.
Expand All @@ -760,12 +770,6 @@ if is_lxc_container; then
fix_nm_force_up eth0
fi

# Workarounds for privileged containers.
if ! grep -q 4294967295 /proc/self/uid_map && { [ "${ID}" = "altlinux" ] || [ "${ID}" = "arch" ] || [ "${ID}" = "fedora" ]; }; then
fix_ro_paths systemd-networkd.service
fix_ro_paths systemd-resolved.service
fi

# Workarounds for NetworkManager in containers
if [ "${nm_exists}" -eq 1 ]; then
if [ "${ID}" = "ol" ] || [ "${ID}" = "centos" ]; then
Expand Down