From 71b98d83660963797632b2aa2b6bdd7f7f3fcfc8 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 4 Jun 2014 15:42:45 +0200
Subject: [resolv.conf] dont save it to run, since it will be lost when systemd
 re-mounts it

---
 remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx | 2 +-
 remote/rootfs/rootfs-stage31/data/inc/setup_stage32                  | 2 +-
 remote/rootfs/rootfs-stage32/data/etc/resolv.conf                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'remote')

diff --git a/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx
index 482adedc..66ab2189 100755
--- a/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx
+++ b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx
@@ -19,7 +19,7 @@
 
 . /opt/openslx/config
 
-RESOLV_CONF="/run/network/resolv.conf"
+RESOLV_CONF="/opt/openslx/resolv.conf"
 THIS_RESOLV="/run/network/${interface}.resolv"
 
 rebuild_resolv_conf () {
diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
index 68b509b2..b96566ce 100755
--- a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
+++ b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
@@ -45,7 +45,7 @@ FUTURE_ROOT="/mnt"
 
 # Move network stuff
 cp /etc/hostname /etc/hosts   "${FUTURE_ROOT}/etc/"
-cp /etc/resolv.conf   "${FUTURE_ROOT}/run/network/"
+cp /etc/resolv.conf   "${FUTURE_ROOT}/opt/openslx/"
 [ -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
index 9f9115ae..c6430d61 120000
--- a/remote/rootfs/rootfs-stage32/data/etc/resolv.conf
+++ b/remote/rootfs/rootfs-stage32/data/etc/resolv.conf
@@ -1 +1 @@
-/run/network/resolv.conf
\ No newline at end of file
+/opt/openslx/resolv.conf
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522