summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-04-06 09:18:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-04-06 09:18:14 +0000
commitc8bc3005227b1e2c40351719cdd5c7e7e41cdbad (patch)
tree2706caf42fd6145ca68016d824b0281ef71f2ab8
parenta8d333775d21aeb3ec5c056305a89e52b8055986 (diff)
downloaddrakx-c8bc3005227b1e2c40351719cdd5c7e7e41cdbad.tar
drakx-c8bc3005227b1e2c40351719cdd5c7e7e41cdbad.tar.gz
drakx-c8bc3005227b1e2c40351719cdd5c7e7e41cdbad.tar.bz2
drakx-c8bc3005227b1e2c40351719cdd5c7e7e41cdbad.tar.xz
drakx-c8bc3005227b1e2c40351719cdd5c7e7e41cdbad.zip
make the auto_inst.cfg more valid in report.bug.gz, and add a warning
-rw-r--r--perl-install/install_any.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 1808c89a1..71a0dea5f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1159,10 +1159,10 @@ sub g_auto_install {
$o->{interactiveSteps} = [ 'doPartitionDisks', 'formatPartitions' ] if $b_replay;
#- deep copy because we're modifying it below
- $o->{users} = [ @{$o->{users} || []} ];
+ $o->{users} = $b_respect_privacy ? [] : [ @{$o->{users} || []} ];
my @user_info_to_remove = (
- if_($b_respect_privacy, qw(name realname home pw)),
+ if_($b_respect_privacy, qw(realname pw)),
qw(oldu oldg password password2),
);
$_ = { %{$_ || {}} }, delete @$_{@user_info_to_remove} foreach $o->{superuser}, @{$o->{users} || []};
@@ -1173,11 +1173,13 @@ sub g_auto_install {
$_ = { %{$_ || {}} }, delete @$_{@netcnx_type_to_remove} foreach $o->{netcnx}{$type};
}
}
+ my $warn_privacy = $b_respect_privacy ? "!! This file has been simplified to respect privacy when reporting problems.
+# You should use /root/drakx/auto_inst.cfg.pl instead !!\n#" : '';
require Data::Dumper;
my $str = join('',
"#!/usr/bin/perl -cw
-#
+# $warn_privacy
# You should check the syntax of this file before using it in an auto-install.
# You can do this with 'perl -cw auto_inst.cfg.pl' or by executing this file
# (note the '#!/usr/bin/perl -cw' on the first line).