summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2002-03-08 16:26:24 +0000
committerdamien <damien@mandriva.com>2002-03-08 16:26:24 +0000
commit6decae73a124dbb4ba9226e51d224eff3fa3a3aa (patch)
treebb66823da667cf1a3658e6b014875e7f18862c36
parent8571bb3cd5e1c0a433fd70bfcff2c3f6ae0f91e9 (diff)
downloaddrakx-6decae73a124dbb4ba9226e51d224eff3fa3a3aa.tar
drakx-6decae73a124dbb4ba9226e51d224eff3fa3a3aa.tar.gz
drakx-6decae73a124dbb4ba9226e51d224eff3fa3a3aa.tar.bz2
drakx-6decae73a124dbb4ba9226e51d224eff3fa3a3aa.tar.xz
drakx-6decae73a124dbb4ba9226e51d224eff3fa3a3aa.zip
corrected network up/down when network install
-rw-r--r--perl-install/install_steps.pm3
-rwxr-xr-xperl-install/standalone/drakfont19
2 files changed, 14 insertions, 8 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 207331e89..84abe01b0 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -1001,7 +1001,7 @@ sub upNetwork {
if (length($o->{prefix}) > 1) {
symlinkf("$o->{prefix}/etc/$_", "/etc/$_") foreach (qw(resolv.conf protocols services));
}
-
+ $o->{method} eq "ftp" || $o->{method} eq "http" || $o->{method} eq "nfs" and return 1;
modules::write_conf($o->{prefix});
if (hasNetwork($o)) {
if ($o->{netcnx}{type} =~ /adsl|lan|cable/) {
@@ -1023,6 +1023,7 @@ sub upNetwork {
sub downNetwork {
my ($o, $costlyOnly) = @_;
+ $o->{method} eq "ftp" || $o->{method} eq "http" || $o->{method} eq "nfs" and return 1;
modules::write_conf($o->{prefix});
if (hasNetwork($o)) {
if (!$costlyOnly) {
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 8fc899d7f..9caf0cac4 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -557,20 +557,20 @@ sub interactive_mode {
1, gtkpack($font_box = new Gtk::VBox(0,5),
$font_sel = new Gtk::FontSelection,
),
- ),
- 0, gtkpack_(new Gtk::VBox(0,5),
- 0, new Gtk::VBox(0,0),
- 0, new Gtk::Pixmap($pix_user_map, $pix_user_mask),
0, gtkadd(gtkset_layout(new Gtk::VButtonBox, -end),
gtksignal_connect(new Gtk::Button(_("Get Windows Fonts")), clicked =>
- sub { ${$central_widget}->destroy(); $windows = 1; appli_choice();}),
+ sub { ${$central_widget}->destroy(); $windows = 1; appli_choice();}),
gtksignal_connect(new Gtk::Button(_("Advanced Options")), clicked =>
- sub { ${$central_widget}->destroy(); $windows = 0; advanced_install();}),
+ sub { ${$central_widget}->destroy(); $windows = 0; advanced_install();}),
gtksignal_connect(new Gtk::Button(_("Uninstall Fonts")), clicked =>
sub { ${$central_widget}->destroy(); uninstall() }),
gtksignal_connect(new Gtk::Button(_("Font List")), clicked =>
sub { ${$central_widget}->destroy(); create_fontsel()}),
),
+ ),
+ 0, gtkpack_(new Gtk::VBox(0,5),
+ 0, new Gtk::VBox(0,0),
+ 0, new Gtk::Pixmap($pix_user_map, $pix_user_mask),
1, new Gtk::VBox(0,0),
1, gtkadd(gtkset_layout(new Gtk::VButtonBox, -end),
gtksignal_connect(new Gtk::Button(_("About")), clicked => sub {
@@ -587,8 +587,13 @@ sub interactive_mode {
);
$central_widget = \$font_sel;
$window1->show_all;
+ $font_sel->set_page(1);
+ $font_sel->cur_page->child->hide();
+ $font_sel->set_page(2);
+ $font_sel->cur_page->child->hide();
+ $font_sel->set_page(0);
$window1->realize;
- $window1->show_all();
+# $window1->show_all();
Gtk->main_iteration while Gtk->events_pending;
$::isEmbedded and kill USR2, $::CCPID;
Gtk->main;