summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-11-30 17:15:21 +0000
committerOlivier Blin <oblin@mandriva.com>2009-11-30 17:15:21 +0000
commitf01b302ab0acfcbacb441379c1739ce33c882d56 (patch)
tree4aa55dafc7ecfcd9202337c4d36649a933a3d944
parent911783c2b61b1abe455456c2fd0d2d0d8384ca1a (diff)
downloaddraklive-f01b302ab0acfcbacb441379c1739ce33c882d56.tar
draklive-f01b302ab0acfcbacb441379c1739ce33c882d56.tar.gz
draklive-f01b302ab0acfcbacb441379c1739ce33c882d56.tar.bz2
draklive-f01b302ab0acfcbacb441379c1739ce33c882d56.tar.xz
draklive-f01b302ab0acfcbacb441379c1739ce33c882d56.zip
clean resolv.conf later
-rwxr-xr-xdraklive3
1 files changed, 2 insertions, 1 deletions
diff --git a/draklive b/draklive
index 335e7ba..3c8940c 100755
--- a/draklive
+++ b/draklive
@@ -283,7 +283,7 @@ sub post_install_system {
#- remove some build-machine specific configuration
clean_system_conf_file($_)
- foreach qw(/etc/mtab /etc/modprobe.conf /etc/modprobe.preload /etc/iftab /etc/shorewall/interfaces /etc/mdadm.conf /etc/resolv.conf),
+ foreach qw(/etc/mtab /etc/modprobe.conf /etc/modprobe.preload /etc/iftab /etc/shorewall/interfaces /etc/mdadm.conf),
if_(!$live->{system}{skip_fstab}, '/etc/fstab');
unlink($_) foreach map { glob($live->get_system_root . $_) } @{$live->{system}{remove_files} || []};
@@ -337,6 +337,7 @@ sub post_install_system {
run_({ setarch => $live->{settings}{arch} },
"chroot", $live->get_system_root, "bash", "-c", $live->{system}{postInstall}) if $live->{system}{postInstall};
+ clean_system_conf_file("/etc/resolv.conf");
write_dist_lists($live);
umask $previous_umask;