summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/live.cfg12
-rw-r--r--files/resolv.conf5
2 files changed, 17 insertions, 0 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 18ff20e..f716730 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -53,6 +53,9 @@ my $_l = {
[ 'files/mga_rpms/x86_64/mga_rpms', '/var/local/mga_rpms' ],
),
+ # 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 } ],
#- make cups the default spooler
@@ -200,6 +203,15 @@ my $_l = {
"urpmi.addmedia 'Live Core' /var/local/mga_rpms/core with media_info/hdlist.cz",
"urpmi.addmedia 'Live Nonfree' /var/local/mga_rpms/nonfree with media_info/hdlist.cz",
+ # add some online medias to avoid slowdown on initial boot
+ # will be replaced with mirrorbrain urls soon-ish
+ if_($live->{settings}{arch} eq 'i586',
+ "urpmi.addmedia --distrib http://mirrors.kernel.org/mageia/distrib/6/i586/",
+ ),
+ if_($live->{settings}{arch} eq 'x86_64',
+ "urpmi.addmedia --distrib http://mirrors.kernel.org/mageia/distrib/6/x86_64/",
+ ),
+
# remove pre-installed grub2, we need to be able to select grub2 vs grub2-efi at install time
"rpm -e --nodeps grub2",
diff --git a/files/resolv.conf b/files/resolv.conf
new file mode 100644
index 0000000..1941dae
--- /dev/null
+++ b/files/resolv.conf
@@ -0,0 +1,5 @@
+# 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