summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-14 21:53:05 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-14 21:53:05 +0000
commitc6f1fbe1557b473ff287f24813fd160ade04964f (patch)
tree81419588ac98208172b70070ce2f1e67596c5628
parentae17937155b36c09a88bf7716607426a115cb0a7 (diff)
downloaddraklive-config-c6f1fbe1557b473ff287f24813fd160ade04964f.tar
draklive-config-c6f1fbe1557b473ff287f24813fd160ade04964f.tar.gz
draklive-config-c6f1fbe1557b473ff287f24813fd160ade04964f.tar.bz2
draklive-config-c6f1fbe1557b473ff287f24813fd160ade04964f.tar.xz
draklive-config-c6f1fbe1557b473ff287f24813fd160ade04964f.zip
No point adding a custom resolv.conf - draklive cleans it.
-rw-r--r--config/build.cfg3
-rw-r--r--files/resolv.conf5
2 files changed, 0 insertions, 8 deletions
diff --git a/config/build.cfg b/config/build.cfg
index 7cf2dcd..c0c9cc2 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -256,9 +256,6 @@ my $_l = {
[ 'files/live.51-mageia-resume.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ],
[ 'files/live.modprobe.conf', '/etc/modprobe.conf', { mode => 0644 } ],
- # add initial dns resolver for online medias
- [ 'files/resolv.conf', '/etc/resolv.conf', { mode => 0644 } ],
-
# disable suspend and hibernate in live mode
[ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ],
diff --git a/files/resolv.conf b/files/resolv.conf
deleted file mode 100644
index 1941dae..0000000
--- a/files/resolv.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8)
-# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
-
-nameserver 8.8.8.8
-nameserver 8.8.4.4