summaryrefslogtreecommitdiffstats
path: root/source/installer
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-04-30 18:09:21 +0000
committer Eric Hameleers <alien@slackware.com>2021-05-01 08:59:57 +0200
commit47328317b34b179ce388a8211b61554215c37148 (patch)
tree09c7ab980b47cbe6c7b912f103f8380841b3cb7a /source/installer
parentded2ad645c217d20866979991ea57ca71b602f74 (diff)
downloadcurrent-47328317b34b179ce388a8211b61554215c37148.tar.gz
current-47328317b34b179ce388a8211b61554215c37148.tar.xz
Fri Apr 30 18:09:21 UTC 202120210430180921
l/gvfs-1.48.1-x86_64-1.txz: Upgraded. l/imagemagick-7.0.11_10-x86_64-1.txz: Upgraded. n/php-7.4.18-x86_64-1.txz: Upgraded. This update fixes bugs and security issues. For more information, see: https://www.php.net/ChangeLog-7.php#7.4.18 (* Security fix *) n/postfix-3.6.0-x86_64-1.txz: Upgraded. x/libepoxy-1.5.7-x86_64-1.txz: Upgraded. x/libinput-1.17.2-x86_64-1.txz: Upgraded. x/xorgproto-2021.4-x86_64-1.txz: Upgraded. xap/pavucontrol-4.0-x86_64-4.txz: Rebuilt. Fix segfault after crtl-Q. Thanks to Jonathan Woithe and 2slguevH. xap/pidgin-2.14.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/installer')
-rw-r--r--source/installer/ChangeLog.txt4
-rwxr-xr-xsource/installer/sources/initrd/usr/lib/setup/setup2
2 files changed, 5 insertions, 1 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 6f035d8f7..3f38f3ba6 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Fri Apr 30 17:30:36 UTC 2021
+ setup: filter partition list through sort | uniq to prevent duplicates.
+ Thanks to Heinz Wiesinger.
++--------------------------+
Thu Apr 22 16:56:28 UTC 2021
setup: fix running ldconfig. Thanks to alienBOB and MoZes.
+--------------------------+
diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup
index 520b9dbcd..a2b76153d 100755
--- a/source/installer/sources/initrd/usr/lib/setup/setup
+++ b/source/installer/sources/initrd/usr/lib/setup/setup
@@ -51,7 +51,7 @@ sleep 1
# that may exist from before the boot:
vgchange -ay 1> /dev/null 2> /dev/null
if probe -l 2> /dev/null | grep -E 'Linux$' 1> /dev/null 2> /dev/null ; then
- probe -l 2> /dev/null | grep -E 'Linux$' | sort 1> $TMP/SeTplist 2> /dev/null
+ probe -l 2> /dev/null | grep -E 'Linux$' | sort | uniq 1> $TMP/SeTplist 2> /dev/null
else
dialog --title "NO LINUX PARTITIONS DETECTED" \
--msgbox "There don't seem to be any partitions on this machine of type \