summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2002-08-05 23:13:54 +0000
committerStew Benedict <stewb@mandriva.org>2002-08-05 23:13:54 +0000
commit7e472296d5c7890bf8a01c1e1ac1e9213bcc399c (patch)
tree0ba17904b8cd0afa7a410c98ecb6a33d6f046fa1
parent389f38c07459e3bebafe3ee5479e9f921252f4cd (diff)
downloaddrakx-7e472296d5c7890bf8a01c1e1ac1e9213bcc399c.tar
drakx-7e472296d5c7890bf8a01c1e1ac1e9213bcc399c.tar.gz
drakx-7e472296d5c7890bf8a01c1e1ac1e9213bcc399c.tar.bz2
drakx-7e472296d5c7890bf8a01c1e1ac1e9213bcc399c.tar.xz
drakx-7e472296d5c7890bf8a01c1e1ac1e9213bcc399c.zip
smbpasswd call deferred with addToBeDone
-rw-r--r--perl-install/install_any.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index fd386512b..445d8f3ca 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -439,7 +439,7 @@ sub addToBeDone(&$) {
sub setAuthentication {
my ($o) = @_;
- my ($shadow, $md5, $ldap, $nis, $winbind) = @{$o->{authentication} || {}}{qw(shadow md5 LDAP NIS winbind)};
+ my ($shadow, $md5, $ldap, $nis, $winbind, $winpass) = @{$o->{authentication} || {}}{qw(shadow md5 LDAP NIS winbind winpass)};
my $p = $o->{prefix};
#- obsoleted always enabled (in /etc/pam.d/system-auth furthermore) #any::enableMD5Shadow($p, $shadow, $md5);
any::enableShadow($p) if $shadow;
@@ -477,6 +477,11 @@ sub setAuthentication {
mkdir "$o->{prefix}/var/run/samba", 0755;
#- defer running smbpassword - no network yet
+ $winbind = $winbind . "%" . $winpass;
+ addToBeDone {
+ install_steps::upNetwork($o, 'pppAvoided');
+ run_program::rooted($o->{prefix}, "/usr/bin/smbpasswd", "-j", $domain, "-U", $winbind);
+ } 'configureNetwork';
}
}