summaryrefslogtreecommitdiffstats
path: root/builder
diff options
context:
space:
mode:
authorJonathan Bauer2019-08-12 12:13:33 +0200
committerJonathan Bauer2019-08-12 12:13:33 +0200
commit30987147d8d12a5615a1943d16085b2199e7111d (patch)
tree6a59d97c2f0ce4f3f23df7f4857d0b412e343193 /builder
parent[slx-network] only care about main bootif (diff)
downloadsystemd-init-30987147d8d12a5615a1943d16085b2199e7111d.tar.gz
systemd-init-30987147d8d12a5615a1943d16085b2199e7111d.tar.xz
systemd-init-30987147d8d12a5615a1943d16085b2199e7111d.zip
[slx-network] fix missing link for resolv.conf
Diffstat (limited to 'builder')
-rw-r--r--builder/modules.d/slx-network/hooks/copy-network-files.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/builder/modules.d/slx-network/hooks/copy-network-files.sh b/builder/modules.d/slx-network/hooks/copy-network-files.sh
index 6e76a27f..10725595 100644
--- a/builder/modules.d/slx-network/hooks/copy-network-files.sh
+++ b/builder/modules.d/slx-network/hooks/copy-network-files.sh
@@ -1,6 +1,8 @@
#!/bin/bash
if [ -n "$NEWROOT" ]; then
+ # backup network configuration files found within stage4
+ # before copying ours over.
for file in /etc/{hostname,resolv.conf,hosts}; do
if [ -e "${NEWROOT}/${file}" ]; then
mv "${NEWROOT}/${file}" "${NEWROOT}/${file}.stage4"
@@ -10,6 +12,7 @@ if [ -n "$NEWROOT" ]; then
# move resolv.conf to /opt/openslx to detect we are managing it
mkdir -p "${NEWROOT}/opt/openslx"
mv "${NEWROOT}/etc/resolv.conf" "${NEWROOT}/opt/openslx/resolv.conf"
+ ln -s "/opt/openslx/resolv.conf" "${NEWROOT}/etc/resolv.conf"
# finally make sure we have rdns helper
rdns="$(type -p rdns)"
if [ -n "$rdns" ]; then