summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-05-26 17:38:19 +0000
committerOlivier Blin <oblin@mandriva.com>2007-05-26 17:38:19 +0000
commit0933357c4a420578aaecc14b8e51c67d099bd445 (patch)
treed8567cb4bfacb9f932b6c3de6aebc9f2a290501b
parent8f88d6a96de16652334ead626fe72cfbe97223b6 (diff)
downloaddraklive-0933357c4a420578aaecc14b8e51c67d099bd445.tar
draklive-0933357c4a420578aaecc14b8e51c67d099bd445.tar.gz
draklive-0933357c4a420578aaecc14b8e51c67d099bd445.tar.bz2
draklive-0933357c4a420578aaecc14b8e51c67d099bd445.tar.xz
draklive-0933357c4a420578aaecc14b8e51c67d099bd445.zip
copy resolv.conf in chroot for urpmi to work (and clean it at end of post-install)
-rwxr-xr-xdraklive5
1 files changed, 4 insertions, 1 deletions
diff --git a/draklive b/draklive
index 48562a0..8ee929f 100755
--- a/draklive
+++ b/draklive
@@ -652,6 +652,9 @@ sub post_install_system {
#- workaround buggy installation of directories that are not owned by any packages
umask 022;
+ #- copy resolv.conf for name resolution to work when adding media
+ cp_f("/etc/resolv.conf", get_system_root($live) . "/etc");
+
#- remove previous draklive leftovers if needed
run_({ root => get_system_root($live) }, 'urpmi.removemedia', '-a');
@@ -693,7 +696,7 @@ sub post_install_system {
#- remove some build-machine specific configuration
substInFile { undef $_ if /^[^#]/ } get_system_root($live) . $_
- foreach qw(/etc/fstab /etc/mtab /etc/modprobe.conf /etc/modprobe.preload /etc/iftab /etc/shorewall/interfaces /etc/mdadm.conf);
+ foreach qw(/etc/fstab /etc/mtab /etc/modprobe.conf /etc/modprobe.preload /etc/iftab /etc/shorewall/interfaces /etc/mdadm.conf /etc/resolv.conf);
unlink($_) foreach map { glob_(get_system_root($live) . $_) } @{$live->{system}{remove_files} || []};
output_with_perm(get_system_root($live) . '/etc/fstab', 0644, "none / unionfs rw 0 0\n");