From 183031f091e56caa86fa48a89eee44a0819118eb Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 May 2014 12:37:19 +0200
Subject: Make resolv.conf a symlink to /run/network/resolv.conf (where we
 generate ours from now on), in case someone wants to override the resolv.conf
 via config.tgz

---
 remote/rootfs/rootfs-stage31/data/inc/setup_stage32                    | 3 ++-
 remote/rootfs/rootfs-stage32/data/etc/resolv.conf                      | 1 +
 .../data/opt/openslx/scripts/systemd-early_network_triggers            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 120000 remote/rootfs/rootfs-stage32/data/etc/resolv.conf

(limited to 'remote/rootfs')

diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
index 9bf30d25..68b509b2 100755
--- a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
+++ b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
@@ -44,7 +44,8 @@ busybox mount -n --move "$FUTURE_ROOT" /mnt/opt/openslx/uniontmp || drop_shell "
 FUTURE_ROOT="/mnt"
 
 # Move network stuff
-cp /etc/hostname /etc/hosts /etc/resolv.conf   "${FUTURE_ROOT}/etc/"
+cp /etc/hostname /etc/hosts   "${FUTURE_ROOT}/etc/"
+cp /etc/resolv.conf   "${FUTURE_ROOT}/run/network/"
 [ -s "/run/config" ] && cat "/run/config" >> "${FUTURE_ROOT}/opt/openslx/config"
 
 # if booting with splash, suppress kernel output in stage32
diff --git a/remote/rootfs/rootfs-stage32/data/etc/resolv.conf b/remote/rootfs/rootfs-stage32/data/etc/resolv.conf
new file mode 120000
index 00000000..9f9115ae
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/resolv.conf
@@ -0,0 +1 @@
+/run/network/resolv.conf
\ No newline at end of file
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-early_network_triggers b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-early_network_triggers
index 990fdb44..1e999da6 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-early_network_triggers
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-early_network_triggers
@@ -7,7 +7,7 @@
 # Main interface
 BRIDGE="br0"
 
-if [ ! -e "/sys/class/net/${BRIDGE}/operstate" -o "x$(cat "/sys/class/net/${BRIDGE}/operstate")" == "xup" ] && [ -e "/opt/openslx/uniontmp/etc/hostname" -o -e "/opt/openslx/uniontmp/etc/resolv.conf" ]; then
+if [ ! -e "/sys/class/net/${BRIDGE}/operstate" -o "x$(cat "/sys/class/net/${BRIDGE}/operstate")" == "xup" ] && [ -e "/opt/openslx/uniontmp/etc/hostname" -o -e "/etc/resolv.conf" ]; then
 	echo "Triggering network.target"
 	touch "/run/network/network-ready"
 	systemctl start network.target &
-- 
cgit v1.2.3-55-g7522