From 224b14cb6b741fb15dcc4fd170306dc0165cba29 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 17 Dec 1999 17:28:14 +0000
Subject: no_comment

---
 perl-install/standalone/XFdrake      | 7 ++++++-
 perl-install/standalone/adduserdrake | 8 ++++++--
 perl-install/standalone/draksec      | 4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index f4d4cb263..99182ec85 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -36,8 +36,13 @@ $::skiptest = /--skiptest/;
 $::testing = /--testing/;
 $::isStandalone = 1;
 
+system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
+
 my $in = vnew interactive('su');
 
-Xconfigurator::main('', Xconfig::getinfo(), $in, 0, sub { `urpmi --auto XFree86-$_[0]` });
+my $i = $0 =~ Xdrakres ? Xconfig::getinfoFromXF86Config() : {};
+Xconfig::getinfo($i);
+
+Xconfigurator::main('', $i, $in, 0, sub { system("urpmi --auto XFree86-$_[0]") });
 
 $in->exit(0);
diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake
index 8c3b3c477..98c3ba3f9 100755
--- a/perl-install/standalone/adduserdrake
+++ b/perl-install/standalone/adduserdrake
@@ -16,10 +16,10 @@ $::isStandalone = 1;
 my $in = vnew interactive('su');
 
 my @etc_pass_fields = qw(name pw uid gid realname home shell);
-my @shells = map { "/bin/$_" } qw(bash tcsh zsh ash ksh);
+my @shells = grep { -x $_ } map { "/bin/$_" } qw(bash tcsh zsh ash ksh);
 my $isMD5 = cat_("/etc/pam.d/passwd") =~ /md5/;
 my $isShadow = cat_("/etc/pam.d/passwd") =~ /shadow/;
-my $security = $ENV{SECURITY_LEVEL};
+my $security = $ENV{SECURE_LEVEL};
 
 new:
 if ($in->ask_from_entries_refH(
@@ -62,6 +62,10 @@ if ($in->ask_from_entries_refH(
     } "/etc/passwd";
 
     system("pwconv") if $isShadow;
+
+    my $msec = "/etc/security/msec";
+    substInFile { s/^$u->{name}\n//; $_ .= "$u->{name}\n" if eof } "$msec/user.conf" if -d $msec;
+    system("$msec/init-sh/grpuser.sh --refresh");
      
     $u = {};
     goto new;
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 753d61603..5fc4cce86 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -2,7 +2,7 @@
 
 use lib qw(/usr/lib/libDrakX);
 
-use common qw(:system);
+use common qw(:system :file);
 use interactive;
 use mouse;
 use c;
@@ -11,7 +11,7 @@ local $_ = join '', @ARGV;
 
 /-h/ and die "usage: draksec [--expert]\n";
 
-$::expert = /--expert/ || cat_("/etc/sysconfig/system") =~ /^TYPE=.*expert/;
+$::expert = /--expert/ || cat_("/etc/sysconfig/system") =~ /^TYPE="?expert/m; #"
 $::isStandalone = 1;
 
 my $in = vnew interactive('su');
-- 
cgit v1.2.1