summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-11-30 17:16:09 +0000
committerOlivier Blin <oblin@mandriva.com>2009-11-30 17:16:09 +0000
commit6795e8b724c77ffb63adf4e48c06185c67e8fee8 (patch)
treec743e101f652f05f4140ede1f7e3351cb0c4cb26
parentf01b302ab0acfcbacb441379c1739ce33c882d56 (diff)
downloaddraklive-6795e8b724c77ffb63adf4e48c06185c67e8fee8.tar
draklive-6795e8b724c77ffb63adf4e48c06185c67e8fee8.tar.gz
draklive-6795e8b724c77ffb63adf4e48c06185c67e8fee8.tar.bz2
draklive-6795e8b724c77ffb63adf4e48c06185c67e8fee8.tar.xz
draklive-6795e8b724c77ffb63adf4e48c06185c67e8fee8.zip
add missing live parameter
-rwxr-xr-xdraklive6
1 files changed, 3 insertions, 3 deletions
diff --git a/draklive b/draklive
index 3c8940c..f569371 100755
--- a/draklive
+++ b/draklive
@@ -228,7 +228,7 @@ sub remove_files_from {
}
sub clean_system_conf_file {
- my ($file) = @_;
+ my ($live, $file) = @_;
substInFile { undef $_ if /^[^#]/ } $live->get_system_root . $file;
}
@@ -282,7 +282,7 @@ sub post_install_system {
'perl', '-MStorable', '-e', qq(Storable::store({ UNKNOWN => {} }, '/etc/sysconfig/harddrake2/previous_hw')));
#- remove some build-machine specific configuration
- clean_system_conf_file($_)
+ clean_system_conf_file($live, $_)
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,7 +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");
+ clean_system_conf_file($live, "/etc/resolv.conf");
write_dist_lists($live);
umask $previous_umask;