diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-14 00:09:40 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-14 22:41:20 +0000 |
| commit | 48d2b18bf88860cd458864e364e8f1c1f1127ebf (patch) | |
| tree | 78a820ae769cef3ceeb7daed745526829768a1db /lib/MGA/DrakISO | |
| parent | acc95dd9395e6dcb6f99d65e1e064d6f0f7cd407 (diff) | |
| download | drakiso-48d2b18bf88860cd458864e364e8f1c1f1127ebf.tar drakiso-48d2b18bf88860cd458864e364e8f1c1f1127ebf.tar.gz drakiso-48d2b18bf88860cd458864e364e8f1c1f1127ebf.tar.bz2 drakiso-48d2b18bf88860cd458864e364e8f1c1f1127ebf.tar.xz drakiso-48d2b18bf88860cd458864e364e8f1c1f1127ebf.zip | |
draklive: Fix cleaning of system configuration files.
Can't test for file existence when not running as root.
Add /etc/shorewall6/interfaces to the list.
Diffstat (limited to 'lib/MGA/DrakISO')
| -rw-r--r-- | lib/MGA/DrakISO/BuildRoot.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm index 65e3a0b..9646508 100644 --- a/lib/MGA/DrakISO/BuildRoot.pm +++ b/lib/MGA/DrakISO/BuildRoot.pm @@ -558,7 +558,7 @@ sub customise_live_system { run_in_root($root, undef, 'perl', '-MStorable', '-e', qq(Storable::store({ UNKNOWN => {} }, '/etc/sysconfig/harddrake2/previous_hw'))); # Remove some build-machine specific configuration. - foreach (qw(/etc/shorewall/interfaces /etc/mdadm.conf)) { + foreach (qw(/etc/shorewall/interfaces /etc/shorewall6/interfaces /etc/mdadm.conf)) { clean_system_conf_file($root . $_); } @@ -650,7 +650,7 @@ sub configure_draklive_resize { sub clean_system_conf_file { my ($file) = @_; - run_as_root('sed', '-i', '/^[^#]/d', $file) if -f $file; + run_as_root('sed', '-i', '/^[^#]/d', $file); } sub write_dist_lists { |