summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-05 20:59:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-05 20:59:42 +0000
commit363aab7a71a0b505c780b763b22bcd5131995382 (patch)
treeec5940d21c5c321661d981e03a70ab388b183766 /perl-install/install_steps.pm
parentc3de4c115afa51c96bdd3684644cae2176f015b4 (diff)
downloaddrakx-backup-do-not-use-363aab7a71a0b505c780b763b22bcd5131995382.tar
drakx-backup-do-not-use-363aab7a71a0b505c780b763b22bcd5131995382.tar.gz
drakx-backup-do-not-use-363aab7a71a0b505c780b763b22bcd5131995382.tar.bz2
drakx-backup-do-not-use-363aab7a71a0b505c780b763b22bcd5131995382.tar.xz
drakx-backup-do-not-use-363aab7a71a0b505c780b763b22bcd5131995382.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 6d13edf22..fc60af16e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -553,6 +553,7 @@ sub addUser($) {
$_->{uid} = $u; $uids{$u} = 1;
$_->{gid} = $g; $gids{$g} = 1;
$_->{pw} ||= $_->{password} && install_any::crypt($_->{password});
+ $_->{shell} ||= "/bin/bash";
$done{$_->{name}} = 1;
}
} @{$o->{users} || []};
@@ -577,7 +578,6 @@ sub addUser($) {
}
eval { commands::chown_("-r", "$u->{uid}.$u->{gid}", "$p$u->{home}") }
if $u->{uid} != $u->{oldu} || $u->{gid} != $u->{oldg};
- any::addKdmIcon($p, $u->{name}, $u->{icon});
}
require any;
any::addUsers($o->{prefix}, map { $_->{name} } @l);
@@ -654,6 +654,11 @@ sub setupBootloaderBefore {
} else {
require lilo;
lilo::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion($o));
+ if ($o->{miscellaneous}{profiles}) {
+ my $e = lilo::get_label("linux", $o->{bootloader});
+ push @{$o->{bootloader}{entries}}, { %$e, label => "office", append => "$e->{append} prof=Office" };
+ $e->{append} .= " prof=Home";
+ }
lilo::suggest_floppy($o->{bootloader}) if $o->{security} <= 3;
$o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard});
}
@@ -699,8 +704,6 @@ sub setupXfreeBefore {
require Xconfig;
Xconfig::getinfoFromDDC($o->{X});
- $::xf4 = 1;
-
#- keep this here if the package has to be updated.
install_any::pkg_install($o, "XFree86");
}
@@ -746,7 +749,7 @@ sub miscellaneous {
my %s = getVarsFromSh("$o->{prefix}/etc/sysconfig/system");
$o->{miscellaneous}{HDPARM} ||= $s{HDPARM} if exists $s{HDPARM};
- $o->{miscellaneous}{CLEAN_TMP} ||= $s{HDPARM} if exists $s{CLEAN_TMP};
+ $o->{miscellaneous}{CLEAN_TMP} ||= $s{CLEAN_TMP} if exists $s{CLEAN_TMP};
$o->{security} ||= $s{SECURITY} if exists $s{SECURITY};
$ENV{SECURE_LEVEL} = $o->{security};