diff options
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 | ||||
| -rw-r--r-- | tools/Makefile | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 1d6bf4c0c..c67527193 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -524,7 +524,7 @@ sub addUser($) { my @shells = install_any::shells($o); if ($o->{security} < 2 && !$clicked || $o->ask_from_entries_refH( - [ _("Add user"), _("Accept user"), _("Done") ], + [ _("Add user"), _("Accept user"), $o->{security} > 4 && !@{$o->{users}} ? () : _("Done") ], _("Enter a user\n%s", $o->{users} ? _("(already added %s)", join(", ", map { $_->{realname} || $_->{name} } @{$o->{users}})) : ''), [ _("Real name") => \$u->{realname}, diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 9cd90bc9d..e22eed6de 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -499,7 +499,7 @@ sub selectPackagesToUpgrade($$$;$$) { c::headerGetEntry($header, 'version'). '-' . c::headerGetEntry($header, 'release')); if ($toRemove{$otherPackage}) { - if (c::headerGetEntry($header, 'name') eq 'libtermcap') { + if ($packages->{c::headerGetEntry($header, 'name')}{base}) { delete $toRemove{$otherPackage}; #- keep it selected, but force upgrade. } else { my @files = c::headerGetEntry($header, 'filenames'); diff --git a/tools/Makefile b/tools/Makefile index 654345ef8..5e4a5764b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -15,6 +15,7 @@ $(DIRS): install: $(MAKE) gendepslist rpm2header xhost+ install make_mdkinst_stage2 gendepslist rpm2header genhdlist $(ROOTDEST)/misc + mkdir -p $(DEST)/usr/bin install -s xhost+ $(DEST)/usr/bin xhost+: %: %.c |