diff options
| author | damien <damien@mandriva.com> | 2001-09-12 10:57:01 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-09-12 10:57:01 +0000 |
| commit | 679dfd84cc5213c8387e5a2952832fb8fa787a2b (patch) | |
| tree | 01a7cf0a05db841dd8ff2b2eed886a95370732a6 | |
| parent | b97e16a8cdd62795cd14636a7a721723487131f0 (diff) | |
| download | drakx-679dfd84cc5213c8387e5a2952832fb8fa787a2b.tar drakx-679dfd84cc5213c8387e5a2952832fb8fa787a2b.tar.gz drakx-679dfd84cc5213c8387e5a2952832fb8fa787a2b.tar.bz2 drakx-679dfd84cc5213c8387e5a2952832fb8fa787a2b.tar.xz drakx-679dfd84cc5213c8387e5a2952832fb8fa787a2b.zip | |
corrected wizard mode in newt mode
| -rwxr-xr-x | perl-install/standalone/drakgw | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/draknet | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index f857c7c30..ac6ad38f6 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -32,7 +32,7 @@ local $_ = join '', @ARGV; /-h/ and die "usage: drakgw [--version]\n"; /-version/ and die 'version: $Id$ '."\n"; -$::isEmbedded or $::isWizard = 1; +!$::isEmbedded && $in->isa('interactive_gtk') and $::isWizard=1; $::Wizard_pix_up = "wiz_drakgw.png"; $::Wizard_title = _("Internet Connection Sharing"); $::direct = /-direct/; @@ -664,6 +664,9 @@ Click on Configure to launch the setup wizard.", $setup_state)); #------------------------------------------------- #- $Log$ +#- Revision 1.53 2001/09/12 10:57:01 damien +#- corrected wizard mode in newt mode +#- #- Revision 1.52 2001/09/06 15:38:09 gc #- works now ;p #- diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet index bfc70118a..1ddca557b 100755 --- a/perl-install/standalone/draknet +++ b/perl-install/standalone/draknet @@ -38,9 +38,6 @@ my $xpm_path="/usr/share/libDrakX/pixmaps"; $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/; $::isWizard = "@ARGV" =~ /--wizard/; $::expert = "@ARGV" =~ /--expert/; -$::isEmbedded or $::isWizard=1; -$::Wizard_pix_up = "wiz_draknet.png"; -$::Wizard_title = "Network & Internet Configuration"; local $_ = join '', @ARGV; #/-h/ and die "usage: draknet[--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n"; @@ -53,6 +50,9 @@ my @conx_type = ('modem', 'isdn_internal', 'isdn_external', 'adsl', 'cable', 'la #$::wizard_xpm = "/usr/share/pixmaps/internet.xpm"; my $in = 'interactive'->vnew('su', 'network'); +!$::isEmbedded && $in->isa('interactive_gtk') and $::isWizard=1; +$::Wizard_pix_up = "wiz_draknet.png"; +$::Wizard_title = "Network & Internet Configuration"; MDK::Common::Globals::init( in => $in, |