Skip to content

fix: use L instead of L! for resolv.conf tmpfiles entry #23

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

Open
mpiscaer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use L instead of L! for resolv.conf tmpfiles entry #23

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion arch/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN printf '[Match]\nType=ether\n\n[Network]\nDHCP=yes\n' \
# Point resolv.conf at systemd-resolved's stub via tmpfiles.d so it's
# created correctly at first boot (can't symlink during build; resolv.conf
# is bind-mounted by the container runtime and is EBUSY).
RUN printf 'L! /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf\n' \
RUN printf 'L /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf\n' \
> /usr/lib/tmpfiles.d/resolv-conf.conf

RUN --mount=type=tmpfs,dst=/tmp --mount=type=tmpfs,dst=/root \
Expand Down
2 changes: 1 addition & 1 deletion debian/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN --mount=type=tmpfs,dst=/tmp --mount=type=tmpfs,dst=/root --mount=type=tmpfs,
apt clean -y

RUN systemctl enable systemd-networkd systemd-resolved ssh && \
printf 'L! /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf\n' \
printf 'L /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf\n' \
> /usr/lib/tmpfiles.d/resolv-conf.conf && \
mkdir -p /etc/netplan && \
printf 'network:\n version: 2\n ethernets:\n all-en:\n match:\n name: en*\n dhcp4: true\n dhcp4-overrides:\n use-domains: true\n dhcp6: true\n dhcp6-overrides:\n use-domains: true\n all-eth:\n match:\n name: eth*\n dhcp4: true\n dhcp4-overrides:\n use-domains: true\n dhcp6: true\n dhcp6-overrides:\n use-domains: true\n' > /etc/netplan/90-default.yaml && \
Expand Down
2 changes: 1 addition & 1 deletion opensuse/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN printf '[Match]\nType=ether\n\n[Network]\nDHCP=yes\n' \
> /usr/lib/systemd/network/20-wired.network

# Point resolv.conf at systemd-resolved's stub at first boot.
RUN printf 'L! /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf\n' \
RUN printf 'L /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf\n' \
> /usr/lib/tmpfiles.d/resolv-conf.conf


Expand Down
2 changes: 1 addition & 1 deletion ubuntu/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN --mount=type=tmpfs,dst=/tmp --mount=type=tmpfs,dst=/root --mount=type=tmpfs,
apt clean -y

RUN systemctl enable systemd-networkd systemd-resolved ssh && \
printf 'L! /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf\n' \
printf 'L /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf\n' \
> /usr/lib/tmpfiles.d/resolv-conf.conf && \
mkdir -p /etc/netplan && \
printf 'network:\n version: 2\n ethernets:\n all-en:\n match:\n name: en*\n dhcp4: true\n all-eth:\n match:\n name: eth*\n dhcp4: true\n' > /etc/netplan/90-default.yaml
Expand Down