# 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");
my $val = $event->get_keyval;
if ($val == ord '.') {
- $entry->parent->child_focus ('right');
+ $entry->get_parent->child_focus ('right');
return 1;
}
$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");
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();
$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);
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 {