summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorJonathan Bauer2014-06-04 15:42:45 +0200
committerJonathan Bauer2014-06-04 15:42:45 +0200
commit71b98d83660963797632b2aa2b6bdd7f7f3fcfc8 (patch)
tree03c59f12cfb6ac94f42b35b3cdefb241e447b2a1 /remote/rootfs
parent[vmchooser2] guest mount for cifs is of no use, so add support for credentials (diff)
downloadtm-scripts-71b98d83660963797632b2aa2b6bdd7f7f3fcfc8.tar.gz
tm-scripts-71b98d83660963797632b2aa2b6bdd7f7f3fcfc8.tar.xz
tm-scripts-71b98d83660963797632b2aa2b6bdd7f7f3fcfc8.zip
[resolv.conf] dont save it to run, since it will be lost when systemd re-mounts it
Diffstat (limited to 'remote/rootfs')
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/inc/setup_stage322
l---------remote/rootfs/rootfs-stage32/data/etc/resolv.conf2
2 files changed, 2 insertions, 2 deletions
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