From 6795e8b724c77ffb63adf4e48c06185c67e8fee8 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 30 Nov 2009 17:16:09 +0000 Subject: add missing live parameter --- draklive | 6 +++--- 1 file 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; -- cgit v1.2.1