summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakTermServ
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2004-02-24 02:36:07 +0000
committerStew Benedict <stewb@mandriva.org>2004-02-24 02:36:07 +0000
commit3d72f3592ce784d9dea06c15469bc042a391b5d1 (patch)
treeaf5c99632425fdcc0291026bc3c586a8132ab57e /perl-install/standalone/drakTermServ
parent860d4a0b31cc57542642c27e0cc1e3c85756c468 (diff)
downloaddrakx-3d72f3592ce784d9dea06c15469bc042a391b5d1.tar
drakx-3d72f3592ce784d9dea06c15469bc042a391b5d1.tar.gz
drakx-3d72f3592ce784d9dea06c15469bc042a391b5d1.tar.bz2
drakx-3d72f3592ce784d9dea06c15469bc042a391b5d1.tar.xz
drakx-3d72f3592ce784d9dea06c15469bc042a391b5d1.zip
Deal with conflicts with msec > 3 and exporting / (use no_root_squash).
Always pass a kernel to mkinitrd-net. (Both part of #8216) Add --restart option for terminal-server.
Diffstat (limited to 'perl-install/standalone/drakTermServ')
-rwxr-xr-xperl-install/standalone/drakTermServ29
1 files changed, 18 insertions, 11 deletions
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index 9a94bc85f..7c56c650c 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -85,6 +85,13 @@ if ("@ARGV" =~ /--disable/) {
exit(0);
}
+if ("@ARGV" =~ /--restart/) {
+ my $cmd_line = 1;
+ stop_ts($cmd_line);
+ start_ts($cmd_line);
+ exit(0);
+}
+
if ("@ARGV" =~ /--start/) {
my $cmd_line = 1;
start_ts($cmd_line);
@@ -706,7 +713,7 @@ sub make_nbi() {
my $nbi;
my $nbi_iter;
- update_list($list_model);
+ update_list($list_model);
$list_nbis->get_selection->signal_connect(changed => sub {
my ($model, $iter) = $_[0]->get_selected;
@@ -724,7 +731,7 @@ sub make_nbi() {
if ($kernel) {
$in->ask_warn(N("Information"), N("This will take a few minutes."));
cursor_wait();
- build_n_update($list_model, "-k /boot/$kernel");
+ build_n_update($list_model, "-k /boot/$kernel");
cursor_norm();
} else {
$in->ask_warn(N("Error"), N("No kernel selected!")) if !($kernel);
@@ -732,7 +739,7 @@ sub make_nbi() {
}),
gtksignal_connect(new Gtk2::Button(N("Build Single NIC -->")), clicked => sub {
if ($nic) {
- build_n_update($list_model, "-k /boot/$kernel -r $nic");
+ build_n_update($list_model, "-k /boot/$kernel -r $nic");
} else {
$in->ask_warn(N("Error"), N("No NIC selected!"));
}
@@ -740,7 +747,7 @@ sub make_nbi() {
gtksignal_connect(new Gtk2::Button(N("Build All Kernels -->")), clicked => sub {
$in->ask_warn(N("Information"), N("This will take a few minutes."));
cursor_wait();
- build_n_update($list_model, "");
+ build_n_update($list_model, "-k /boot/$_") foreach @kernels;
cursor_norm();
}),
new Gtk2::HBox(1,1),
@@ -1383,19 +1390,19 @@ sub enable_ts {
my $buff_index = toggle_chkconfig("on", "dhcpd", 2);
$buff[$buff_index] = "\tSetting up default /etc/exports...\n";
cp_af("/etc/exports", "/etc/exports.mdkTS") if -e "/etc/exports";
- local *FHANDLE;
- open(FHANDLE, "> /etc/exports");
- print FHANDLE "#/etc/exports - generated by drakTermServ\n\n";
- print FHANDLE "/\t(ro,all_squash)\n";
+ my $squash = "root_squash";
+ my %msec = getVarsFromSh("/etc/sysconfig/msec");
+ $squash = "no_root_squash" if $msec{SECURE_LEVEL} > 2;
+ my $exports = "#/etc/exports - generated by drakTermServ\n\n";
if ($nfs_subnet eq '') {
$nfs_subnet = get_subnet_from_sys();
$nfs_mask = get_mask_from_sys();
my $sys_broadcast = get_broadcast_from_sys();
$nfs_subnet = get_subnet_from_sys($sys_broadcast, $nfs_mask);
-
}
- print FHANDLE "/home\t$nfs_subnet/$nfs_mask(rw,root_squash)\n";
- close FHANDLE;
+ $exports .= "/\t$nfs_subnet/$nfs_mask(ro,$squash)\n";
+ $exports .= "/home\t$nfs_subnet/$nfs_mask(rw,root_squash)\n";
+ output_p("/etc/exports", $exports);
$buff_index = toggle_chkconfig("on", "clusternfs", $buff_index+1);
$buff_index = toggle_chkconfig("on", "tftp", $buff_index);
$buff_index = service_change("xinetd", "restart", $buff_index);