summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2004-01-20 18:23:42 +0000
committerAntoine Ginies <aginies@mandriva.com>2004-01-20 18:23:42 +0000
commit4ef5b1e0cc1414b6fa1d7fe04df909a76b4fe8a0 (patch)
tree9f6f8238efba57be794aac216017cbbcb6905012
parent6ace92b35adc92d0642bba9a987b853694cd3b16 (diff)
downloaddrakwizard-4ef5b1e0cc1414b6fa1d7fe04df909a76b4fe8a0.tar
drakwizard-4ef5b1e0cc1414b6fa1d7fe04df909a76b4fe8a0.tar.gz
drakwizard-4ef5b1e0cc1414b6fa1d7fe04df909a76b4fe8a0.tar.bz2
drakwizard-4ef5b1e0cc1414b6fa1d7fe04df909a76b4fe8a0.tar.xz
drakwizard-4ef5b1e0cc1414b6fa1d7fe04df909a76b4fe8a0.zip
- restart needed service
- http and nfs installation are always enabled
-rw-r--r--installsrv_wizard/Installsrv.pm17
1 files changed, 9 insertions, 8 deletions
diff --git a/installsrv_wizard/Installsrv.pm b/installsrv_wizard/Installsrv.pm
index 48018700..f146fdd6 100644
--- a/installsrv_wizard/Installsrv.pm
+++ b/installsrv_wizard/Installsrv.pm
@@ -39,8 +39,8 @@ my $WWWDIR = "/var/www/html";
my $o = {
name => 'MDK Install Server Wizard',
var => {
- DESTDIR => '/var/install/i',
- SOURCEDIR => '/tmp/i/',
+ DESTDIR => '/var/install/cooker',
+ SOURCEDIR => '/mnt/nfs/cooker',
},
needed_rpm => [ 'nfs-utils', 'apache' ],
defaultimage => "/usr/share/wizards/dns_wizard/images/Install.png"
@@ -48,12 +48,12 @@ my $o = {
$o->{pages} = {
welcome => {
- name => N("Configure a MDK install server (via NFS and http)") . "\n\n" . N("Easily configure a Mandrake server installation directory, with nfs export and http access."),
+ name => N("Configure a MDK install server (via NFS and http)") . "\n\n" . N("Easily configure a Mandrake server installation directory, with NFS and HTTP access."),
no_back => 1,
next => 'install_srv',
},
install_srv => {
- name => N("Install server configuration") . "\n\n" . N("Path to data: specify your source directory (should be base of an Mandrake installation.") . "\n\n" . N("Destination directory: copy file in wich directory ?"),
+ name => N("Install server configuration") . "\n\n" . N("Path to data: specify your source directory, should be base of an Mandrake installation.") . "\n\n" . N("Destination directory: copy file in wich directory ?"),
pre => sub {
$o->{var}{wiz_nfs} ||= 1;
$o->{var}{wiz_http} ||= 1;
@@ -61,8 +61,8 @@ $o->{pages} = {
data => [
{ label => "Path to data:", val => \$o->{var}{SOURCEDIR} },
{ label => "Destination directory:", val => \$o->{var}{DESTDIR} },
- { label => N("Enable NFS install server:"), type => 'bool', val => \$o->{var}{wiz_nfs} },
- { label => N("Enable HTTP install server:"), type => 'bool', val => \$o->{var}{wiz_http} },
+# { label => N("Enable NFS install server:"), type => 'bool', val => \$o->{var}{wiz_nfs} },
+# { label => N("Enable HTTP install server:"), type => 'bool', val => \$o->{var}{wiz_http} },
],
post => \&test_data,
next => 'summary_srv',
@@ -108,7 +108,7 @@ sub add_install_dir {
print " - " . $NFSEXPORTS . " ready\n";
} else {
append_to_file($NFSEXPORTS, "$INSTALLDIR *(async,rw,no_root_squash)\n");
- system("service nfslock reload");
+ system("service nfs reload");
}
}
@@ -128,6 +128,7 @@ sub add_http_link {
if (! -f $LINK) {
symlink $PATH, $LINK;
}
+ system("service httpd restart");
}
sub cp_data {
@@ -139,7 +140,7 @@ sub cp_data {
sub do_it {
return if $::testing;
my $in = 'interactive'->vnew('su', 'Install server');
- my $w = $in->wait_message(N("Install Server"), N("Copying data to destination directory..."));
+ my $w = $in->wait_message(N("Install Server"), N("Copying data to destination directory, can take a while...."));
cp_data($o->{var}{SOURCEDIR}, $o->{var}{DESTDIR});
add_install_dir();
add_http_link($o->{var}{DESTDIR});