summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-12-20 17:52:47 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-12-20 17:52:47 +0000
commiteb8ec6300ad08687136cc291be3eea311754a736 (patch)
tree00461c82ade3511411555ef05863e56cade1bc18 /perl-install
parentee55d090aa6af13799c803588369418d4fcb5897 (diff)
downloaddrakx-eb8ec6300ad08687136cc291be3eea311754a736.tar
drakx-eb8ec6300ad08687136cc291be3eea311754a736.tar.gz
drakx-eb8ec6300ad08687136cc291be3eea311754a736.tar.bz2
drakx-eb8ec6300ad08687136cc291be3eea311754a736.tar.xz
drakx-eb8ec6300ad08687136cc291be3eea311754a736.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm4
-rwxr-xr-xperl-install/standalone/drakxservices4
2 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 77af259fd..75941b1c2 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -373,8 +373,6 @@ sub miscellaneous {
local $ENV{LILO_PASSWORD} = $o->{lilo}{password};
run_program::rooted($o->{prefix}, "/etc/security/msec/init.sh", $o->{security});
- chmod 0755, map { "$o->{prefix}/etc/X11/$_" } qw(xdm/Xsession xinit/xinitrc);
-
} 'doInstallStep';
}
@@ -469,7 +467,7 @@ sub exitInstall { $o->exitInstall(getNextStep() eq "exitInstall") }
#- MAIN
#-######################################################################################
sub main {
- $SIG{__DIE__} = sub { chomp(my $err = $_[0]); log::l("WARNING: $err") };
+ $SIG{__DIE__} = sub { chomp(my $err = $_[0]); log::l("warning: $err") };
$::beginner = $::expert = $::g_auto_install = 0;
diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices
index 621def75f..e34b1a22f 100755
--- a/perl-install/standalone/drakxservices
+++ b/perl-install/standalone/drakxservices
@@ -13,7 +13,7 @@ $::isStandalone = 1;
my $in = vnew interactive('su');
-my @l = map { chop; $_ } `cd /etc/rc.d/init.d ; grep -l "chkconfig:" *`;
+my @l = grep { !/\.rpmsave$/ } map { chop; $_ } `cd /etc/rc.d/init.d ; grep -l "chkconfig:" *`;
my @before = map { bool(@_ = glob("/etc/rc.d/rc*.d/*$_")) } @l;
my $after = $in->ask_many_from_list("drakxservices",
@@ -25,6 +25,6 @@ mapn {
if ($before != $after) {
system("chkconfig", $after ? "--add" : "--del", $name);
}
-} \@l, \@before, $after;
+} \@l, \@before, $after if $after;
$in->exit(0);