diff options
| -rw-r--r-- | perl-install/network/network.pm | 7 | ||||
| -rwxr-xr-x | perl-install/standalone/drakbackup | 19 |
2 files changed, 17 insertions, 9 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 61828cdec..e8575c320 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -57,6 +57,7 @@ sub up_it { run_program::rooted($prefix, "/etc/rc.d/init.d/network", "start"); $_->{isUp} = 1 foreach values %$intfs; } + sub down_it { my ($prefix, $intfs) = @_; run_program::rooted($prefix, "/etc/rc.d/init.d/network", "stop"); @@ -66,7 +67,11 @@ sub down_it { sub write_conf { my ($file, $netc) = @_; - ($netc->{DOMAINNAME}) ||= 'localdomain'; + if ($netc->{HOSTNAME}) { + $netc->{HOSTNAME} =~ /^[^\.]\.(.*)$/; + $1 and $netc->{DOMAINNAME} = $1; + } + ($netc->{DOMAINNAME}) ||= 'localdomain'; add2hash($netc, { NETWORKING => "yes", FORWARD_IPV4 => "false", diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup index 305f378a3..12ff6efc3 100755 --- a/perl-install/standalone/drakbackup +++ b/perl-install/standalone/drakbackup @@ -2421,16 +2421,19 @@ sub button_box_wizard { gtkpack($button_box, $button_box_tmp = gtkpack_(new Gtk::HButtonBox, 1, gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { - ${$central_widget}->destroy(); interactive_mode_box(); }), + ${$central_widget}->destroy(); interactive_mode_box(); }), 1, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { - ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help); }), + ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help); }), 1, new Gtk::HBox(0, 0), - 0, gtksignal_connect(new Gtk::Button(_("Previous")), clicked => sub { - ${$central_widget}->destroy(); $previous_widget->(); }), - 1, gtksignal_connect(new Gtk::Button(_("Next")), clicked => sub { - ${$central_widget}->destroy(); $next_widget->(); - }), - ), + 0, gtksignal_connect(new Gtk::Button($next_widget ? _("Previous") : _("OK")), clicked => sub { + ${$central_widget}->destroy(); + $previous_widget ? $previous_widget->() : $next_widget->(); + }), + if_($next_widget, 1, gtksignal_connect(new Gtk::Button(_("Next")), clicked => sub { + ${$central_widget}->destroy(); + $next_widget ? $next_widget->() : $previous_widget->(); + })), + ), ); } |