branch to build the firewall install.topic/unlabeled-1.1.1

1 files changed, 13 insertions, 20 deletions

diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index d34342dec..38194c3dd 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 
-#- CHANGE THIS! (dam's)
-# DrakFuck
+# DrakNet
 
 # Copyright (C) 1999 MandrakeSoft (damien@mandrakesoft.com)
 #
@@ -19,20 +18,21 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-use lib ".."; #qw(/usr/lib/libDrakX);
+use lib qw(/usr/lib/libDrakX);
 
 use interactive;
 use netconnect;
-#use Xconfig;
 use c;
 
 local $_ = join '', @ARGV;
 
-#/-h/ and die "usage: DrakFuck[--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
+#/-h/ and die "usage: draknet[--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
 
-my $i = {};
+my $netcnx = {};
 
 $::isStandalone = 1;
+$::isWizard = 0;
+$::wizard_xpm = "/usr/share/pixmaps/internet.xpm";
 #$::force_xf3 = /-xf3/;
 #$::beginner = /-beginner/;
 #$::expert = /-expert/;
@@ -45,19 +45,12 @@ $::isStandalone = 1;
 #-e $f or system("urpmi --auto XFree86 XFree86-75dpi-fonts");
 #-e $f or die "install XFree86 first!\n";
 
-my $in = vnew interactive;#('su');
-
-#`pidof xfs` > 0 or system("/etc/rc.d/init.d/xfs start");
-
-#system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
-
-#Xconfig::getinfoFromXF86Config($i) if $0 =~ Xdrakres;
-#Xconfig::getinfo($i);
-
-#Xconfigurator::main('', $i, $in, 0, -e "/etc/pcmcia", sub { system("urpmi --auto XFree86-$_[0]") });
-
-#netconnect::isdn_ask('', $i, $in, -e "/etc/pcmcia");
-netconnect::isdn_detect('', $i, $in, -e "/etc/pcmcia");
-#netconnect::isdn_write_config('', $i, $in, -e "/etc/pcmcia");
+my $in = vnew interactive('su');
 
+$::isStandalone and my $wait=$in->wait_message('', "", 1);
+netconnect::intro('', $netcnx, $in, -e "/etc/pcmcia", sub {
+		      $in->suspend;
+		      system("urpmi --auto --best-output " . join(' ', @_));
+		      $in->resume;
+		  });
 $in->exit(0);