keep mtab symlink

[pve-installer.git] / proxinstall

diff --git a/proxinstall b/proxinstall
index 81774a1006f2402bbce2044ef9c1a39d9e5ed75a..c3acc346cf89ba04fcf5b362efb4c25d0c6e0b5c 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -944,9 +944,6 @@ _EOD
        # hack: remove dead.letter from sshd installation
        syscmd ("rm -rf $targetdir/dead.letter");
 
-       unlink ("$targetdir/etc/mtab");
-       syscmd ("touch $targetdir/etc/mtab");
-
        unlink "$targetdir/usr/sbin/policy-rc.d";
 
        diversion_remove ($targetdir, "/sbin/start-stop-daemon");
@@ -1128,7 +1125,7 @@ sub check_num {
     my $val = $event->get_keyval;
 
     if ($val == ord '.') {
-       $entry->parent->child_focus ('right');
+       $entry->get_parent->child_focus ('right');
        return 1;
     }
 
@@ -1283,7 +1280,7 @@ sub create_ipconf_view {
     my $vbox =  Gtk3::VBox->new (0, 0);
     $inbox->pack_start ($vbox, 1, 0, 0);
     my $hbox =  Gtk3::HBox->new (0, 0);
-    $vbox->pack_start ($hbox, 0, 0, 30);
+    $vbox->pack_start ($hbox, 0, 0, 10);
     my $vbox2 =  Gtk3::VBox->new (0, 0);
     $hbox->add ($vbox2);
 
@@ -1310,7 +1307,7 @@ sub create_ipconf_view {
     ($gwbox, $gw_1, $gw_2, $gw_3, $gw_4) =
        creat_ip_input ($gateway, '0.0.0.0', 'Gateway:');
 
-    $vbox2->pack_start ($gwbox, 0, 0, 15);
+    $vbox2->pack_start ($gwbox, 0, 0, 2);
 
     $dnsserver = $ipconf->{dnsserver} || $gateway;
 
@@ -1426,7 +1423,7 @@ sub create_password_view {
     my $vbox2 =  Gtk3::VBox->new (0, 0);
     $inbox->pack_start ($vbox2, 1, 0, 0);
     my $vbox =  Gtk3::VBox->new (0, 0);
-    $vbox2->pack_start ($vbox, 0, 0, 30);
+    $vbox2->pack_start ($vbox, 0, 0, 10);
 
     my $hbox1 = Gtk3::HBox->new (0, 0);
     my $label = Gtk3::Label->new ("Password");
@@ -1512,7 +1509,7 @@ sub create_country_view {
     my $vbox2 =  Gtk3::VBox->new (0, 0);
     $inbox->pack_start ($vbox2, 1, 0, 0);
     my $vbox =  Gtk3::VBox->new (0, 0);
-    $vbox2->pack_start ($vbox, 0, 0, 30);
+    $vbox2->pack_start ($vbox, 0, 0, 10);
 
     my $w = Gtk3::Entry->new ();
     $w->set_size_request (200, -1);
@@ -1521,6 +1518,7 @@ sub create_country_view {
     $c->set_text_column (0);
     $c->set_minimum_key_length(0);
     $c->set_popup_set_width (1);
+    $c->set_inline_completion (1);
 
     my $hbox2 = Gtk3::HBox->new (0, 0);
     my $label = Gtk3::Label->new ("Time zone");
@@ -1573,18 +1571,24 @@ sub create_country_view {
 
        if ($val == Gtk3::Gdk::KEY_Tab) {
            my $cc = $countryhash->{lc($text)};
-           return undef if $cc;
+           
            my $found = 0;
            my $compl;
 
-           foreach my $cc (keys %$ctr) {
-               my $ct = $ctr->{$cc}->{name};
-               if ($ct =~ m/^\Q$text\E.*$/i) {
-                   $found++;
-                   $compl = $ct;
+           if ($cc) {
+               $found = 1;
+               $compl = $ctr->{$cc}->{name};
+           } else {
+               foreach my $cc (keys %$ctr) {
+                   my $ct = $ctr->{$cc}->{name};
+                   if ($ct =~ m/^\Q$text\E.*$/i) {
+                       $found++;
+                       $compl = $ct;
+                   }
+                   last if $found > 1;
                }
-               last if $found > 1;
            }
+
            if ($found == 1) {
                $entry->set_text($compl);
                $c->complete();
@@ -1657,7 +1661,7 @@ sub create_hdsel_view {
     my $vbox =  Gtk3::VBox->new (0, 0);
     $inbox->pack_start ($vbox, 1, 0, 0);
     my $hbox =  Gtk3::HBox->new (0, 0);
-    $vbox->pack_start ($hbox, 0, 0, 30);
+    $vbox->pack_start ($hbox, 0, 0, 10);
 
     my ($disk, $devname, $size, $model) = @{@$hds[0]};
     $target_hd = $devname;
@@ -1721,7 +1725,7 @@ sub create_extract_view {
     my $vbox =  Gtk3::VBox->new (0, 0);
     $inbox->pack_start ($vbox, 1, 0, 0);
     my $hbox =  Gtk3::HBox->new (0, 0);
-    $vbox->pack_start ($hbox, 0, 0, 30);
+    $vbox->pack_start ($hbox, 0, 0, 10);
 
     my $vbox2 =  Gtk3::VBox->new (0, 0);
     $hbox->pack_start ($vbox2, 0, 0, 0);
@@ -1730,6 +1734,7 @@ sub create_extract_view {
     $vbox2->pack_start ($progress_status, 1, 1, 0);
 
     $progress = Gtk3::ProgressBar->new;
+    $progress->set_show_text(1);
     $progress->set_size_request (600, -1);
 
     $vbox2->pack_start ($progress, 0, 0, 0);
@@ -1747,15 +1752,13 @@ sub create_extract_view {
 
     set_next ("_Reboot", sub { exit (0); } );
 
-    display_html ($err ? "fail.htm" : "success.htm");
-
-    display_error ($err) if $err;
-}
-
-sub mupdate_progress {
-    my $per = shift;
-    print "GOT1: $per\n";
-
+    if ($err) {
+       display_html ("fail.htm");
+       display_error ($err);
+    } else {
+       cleanup_view ();
+       display_html ("success.htm");
+    }
 }
 
 sub create_intro_view {