recoded wizard mode

corrected some stuff.
trying not to break draknet for cooker snapshot

2 files changed, 9 insertions, 3 deletions

diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 1902069c8..4ecab2b75 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -33,6 +33,12 @@ use fs;
 use log;
 use c;
 
+$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\S*) (\S*)/;
+
+print "EMBED\n" if $::isEmbedded;
+print "XID : $::XID\n";
+print "CCPID :  $::CCPID\n";
+
 local $_ = join '', @ARGV;
 
 /-h/ and die "usage: diskdrake [--expert] [--testing]\n";
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 5698c54c5..174481d9a 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -56,7 +56,7 @@ $::wizard_xpm = "/usr/share/pixmaps/internet.xpm";
 
 my $in = vnew interactive('su');
 
-#goto dd;
+goto dd;
 my $window1 = new Gtk::Window -toplevel;
 $window1->signal_connect ( delete_event => sub { Gtk->exit(0); });
 $window1->set_position(1);
@@ -75,7 +75,8 @@ $hbox1->pack_start($combo1,0,0,0);
 my $hbox2 = new Gtk::HBox(0,0);
 $vbox1->pack_start($hbox2,1,1,0);
 $hbox2->pack_start(new Gtk::Label(_("Hostname: ")),0,0,0);
-$hbox2->pack_start(new Gtk::Label("petite.mandrakesoft.com"),0,0,0);
+chop (my $hostname = `hostname`);
+$hbox2->pack_start(new Gtk::Label($hostname),0,0,0);
 
 $vbox1->pack_start(new Gtk::HSeparator,1,1,5);
 
@@ -107,7 +108,6 @@ $button1->signal_connect( 'clicked', \&configure_net );
 my $button2 = new Gtk::Button(_("Connect..."));
 $table1->attach($button2, 2, 3, 2, 3, 'fill', 'fill',0,0);
 
-
 my $separator2 = new Gtk::HSeparator;
 $vbox1->pack_start($separator2,1,1,5);