diff options
| -rwxr-xr-x | perl-install/standalone/XFdrake | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/adduserdrake | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakboot | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakgw | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/draknet | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakproxy | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/draksec | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakxconf | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakxservices | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/keyboarddrake | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/livedrake | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/mousedrake | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/net_monitor | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/printerdrake | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/tinyfirewall | 2 |
15 files changed, 21 insertions, 15 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 840e0f68e..3373821fb 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -42,7 +42,7 @@ $::noauto = /-noauto/; $::testing = /-testing/; $i->{skiptest} = /-skiptest/; -my $in = interactive->vnew('su', 'X'); +my $in = 'interactive'->vnew('su', 'X'); -r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf'); diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake index e8c98929a..d2893c850 100755 --- a/perl-install/standalone/adduserdrake +++ b/perl-install/standalone/adduserdrake @@ -26,7 +26,7 @@ my $in; if (my @l = grep { ! /^-/ } @ARGV) { $users = [ map { { name => $_, realname => $_ } } @l ]; } else { - $in = interactive->vnew('su', 'user'); + $in = 'interactive'->vnew('su', 'user'); any::ask_users('', $in, $users, $ENV{SECURE_LEVEL}); } diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index d0c718ded..4b8abde3c 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -20,7 +20,7 @@ local $_ = join '', @ARGV; $::expert = /-expert/; -my $in = interactive->vnew('su', 'bootloader'); +my $in = 'interactive'->vnew('su', 'bootloader'); require 'bootlook.pm' if ref($in) =~ /gtk/; lilo_choice(); diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index c5d32e506..35257a6ad 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -54,7 +54,7 @@ log::l("[drakgw] kernel_version $kernel_version"); $kernel_version eq '2.2' || $kernel_version eq '2.4' or die "Only for 2.2 or 2.4 kernels.\n"; -my $in = interactive::vnew('su', 'default'); +my $in = 'interactive'->vnew('su', 'default'); pur_gtk_mode() if $::isEmbedded && ref($in) =~ /gtk/; @@ -665,6 +665,9 @@ Click on Configure to launch the setup wizard.", $setup_state)); #------------------------------------------------- #- $Log$ +#- Revision 1.49 2001/08/09 09:35:37 gc +#- use vnew the right way everywhere +#- #- Revision 1.48 2001/08/09 09:15:38 gc #- - if package installs fail, redo one by one to know which one failed #- - try to not end up with a failing configuration file, if program is brutally stopped diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet index f61f7f822..533b49da2 100755 --- a/perl-install/standalone/draknet +++ b/perl-install/standalone/draknet @@ -46,7 +46,7 @@ my @conx_type = ('modem', 'isdn_internal', 'isdn_external', 'adsl', 'cable', 'la #$::wizard_xpm = "/usr/share/pixmaps/internet.xpm"; -my $in = vnew interactive('su', 'network'); +my $in = 'interactive'->vnew('su', 'network'); MDK::Common::Globals::init( in => $in, diff --git a/perl-install/standalone/drakproxy b/perl-install/standalone/drakproxy index 66307e460..426d73b9c 100755 --- a/perl-install/standalone/drakproxy +++ b/perl-install/standalone/drakproxy @@ -32,7 +32,7 @@ $::isEmbedded or $::isWizard = 1; $::Wizard_pix_up = "wiz_drakgw.png"; # FIXME $::Wizard_title = _("Proxy handling"); -my $in = interactive::vnew('su', 'default'); +my $in = 'interactive'->vnew('su', 'default'); if ($::isWizard || ($::isEmbedded && ref($in) =~ /gtk/)) { proxy::main('', $in); @@ -67,6 +67,9 @@ Gtk->exit(0); #------------------------------------------------- #- $Log$ +#- Revision 1.7 2001/08/09 09:35:37 gc +#- use vnew the right way everywhere +#- #- Revision 1.6 2001/08/08 18:26:31 prigaux #- add interactive_pkgs stuff #- diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index c3b325d1e..e1436c067 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -15,7 +15,7 @@ local $_ = join '', @ARGV; $::expert = /-expert/ || cat_("/etc/sysconfig/system") =~ /^CLASS="?expert/m; #" $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/; -my $in = vnew interactive('su', 'security'); +my $in = 'interactive'->vnew('su', 'security'); my %m = reverse (my %l = ( 0 => _("Welcome To Crackers"), diff --git a/perl-install/standalone/drakxconf b/perl-install/standalone/drakxconf index f7a4fb794..9ced4f8da 100755 --- a/perl-install/standalone/drakxconf +++ b/perl-install/standalone/drakxconf @@ -14,7 +14,7 @@ local $_ = join '', @ARGV; /-h/ and die "usage: drakxconf\n"; -my $in = vnew interactive('su'); +my $in = 'interactive'->vnew('su', 'default'); my @l=( { des => 'Display Configuration', cmd => 'XFdrake'}, diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices index a7f750944..21e7baade 100755 --- a/perl-install/standalone/drakxservices +++ b/perl-install/standalone/drakxservices @@ -15,7 +15,7 @@ local $_ = join '', @ARGV; /-h/ and die "usage: drakxservices\n"; -my $in = vnew interactive('su', 'services'); +my $in = 'interactive'->vnew('su', 'services'); begin: my $l = services::ask($in); services::doit($in, $l) if $l; diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake index d43ff7e02..59118baae 100755 --- a/perl-install/standalone/keyboarddrake +++ b/perl-install/standalone/keyboarddrake @@ -21,7 +21,7 @@ print "[$::expert]\n"; my $keyboard=''; if ($::expert) { ($keyboard) = grep { !/^-/ } @ARGV;} print "[$keyboard]\n"; -my $in = interactive->vnew('su', 'keyboard'); +my $in = 'interactive'->vnew('su', 'keyboard'); begin: $::isEmbedded and kill USR2, $::CCPID; diff --git a/perl-install/standalone/livedrake b/perl-install/standalone/livedrake index 839339754..bb689996f 100755 --- a/perl-install/standalone/livedrake +++ b/perl-install/standalone/livedrake @@ -14,7 +14,7 @@ local $_ = join '', @ARGV; $::testing = /-testing/; -my $in = vnew interactive('su'); +my $in = 'interactive'->vnew('su', 'default'); my $cd_mntpoint = "/mnt/cdrom"; diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index bc99d6ede..4bb6340d4 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -18,7 +18,7 @@ local $_ = join '', @ARGV; $::auto = /-auto/; $::testing = /-testing/; -my $in = vnew interactive('su', 'mouse'); +my $in = 'interactive'->vnew('su', 'mouse'); -r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf'); diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor index 8fc3d968a..2f58c073f 100755 --- a/perl-install/standalone/net_monitor +++ b/perl-install/standalone/net_monitor @@ -31,7 +31,7 @@ use MDK::Common::Globals "network", qw($in $prefix $connect_file $disconnect_fil my ($connect, $default_intf); init Gtk; -my $in = vnew interactive('su'); +my $in = 'interactive'->vnew('su', 'default'); $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/; ($default_intf) = "@ARGV" =~ /--defaultintf (\w+)/; $connect = "@ARGV" =~ /--connect/; diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake index de72bc178..b8a4628a5 100755 --- a/perl-install/standalone/printerdrake +++ b/perl-install/standalone/printerdrake @@ -53,7 +53,7 @@ eval { $printer = printer::getinfo('') }; /-pdq/ and $printer->{mode} = 'pdq' and printer::read_configured_queues($printer); -my $in = vnew interactive('printer', 'su'); +my $in = 'interactive'->vnew('su', 'printer'); -r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf'); diff --git a/perl-install/standalone/tinyfirewall b/perl-install/standalone/tinyfirewall index a9aeb1f5a..86f59e5cb 100755 --- a/perl-install/standalone/tinyfirewall +++ b/perl-install/standalone/tinyfirewall @@ -30,7 +30,7 @@ $::Wizard_title = _("Firewalling Configuration"); local $_ = join '', @ARGV; -my $in = vnew interactive('su'); +my $in = 'interactive'->vnew('su', 'default'); $::isEmbedded && ref($in) =~ /gtk/ or goto dd; require Gtk; |