no_comment

3 files changed, 9 insertions, 11 deletions

diff --git a/docs/TODO b/docs/TODO
index 7b98d52bd..f0939546d 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,10 +1,6 @@
-(done,pix)draksec is buggy, don't try security >= 4
-
 in ftp install, locale not installed properly
 locale (and fonts?) buggy in case ramdisk is used
 
-missing alias ll for root
-
 bug rpmdrake: just after installing a package, switch to `Installed', the package has wrong name
 
 bug in users: mandrake user is added twice in strange installs
@@ -32,8 +28,6 @@ bug in upgrade: install from hda1:/usr/local/blah with hda1:/
 
 msec custom
 
-install apmd on laptops?? (maybe ask emcweb@btinernet.com (see alix))
-
 paride in stage1
 
 bug in diskdrake: can in strange cases create a primary partition at sector #0
@@ -209,3 +203,9 @@ suggested partition tables must be better foreach installClass
 
 (done,pix) move the last done stuff before Xconfiguration if possible
 
+(done,pix)draksec is buggy, don't try security >= 4
+
+(done,pix)install apmd on laptops?? (maybe ask emcweb@btinernet.com (see alix))
+
+(done,pix)missing alias ll for root
+
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);