diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2022-01-18 20:39:39 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2022-01-19 08:59:55 +0100 |
| commit | 1c7cd7d8173b5ad45462c7bfd8ba99cd013b959e (patch) | |
| tree | 04e15766d9232af3c39e47ddc8f5e30556cbef2c /source/installer | |
| parent | 387bf82d1caf0cb8c6e4407796b3fabe587be38e (diff) | |
| download | current-1c7cd7d8173b5ad45462c7bfd8ba99cd013b959e.tar.gz current-1c7cd7d8173b5ad45462c7bfd8ba99cd013b959e.tar.xz | |
Tue Jan 18 20:39:39 UTC 202220220118203939
l/rpcsvc-proto-1.4.3-x86_64-1.txz: Upgraded.
x/xterm-370-x86_64-5.txz: Rebuilt.
XTerm-console: don't include locale options by default. Fix typo in comment.
Thanks to GazL.
isolinux/initrd.img: Rebuilt.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/installer')
| -rw-r--r-- | source/installer/ChangeLog.txt | 7 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/INSUSB | 2 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/setup | 16 |
3 files changed, 23 insertions, 2 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index d2e7a8730..5282ea364 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,10 @@ +Tue Jan 18 11:42:59 UTC 2022 + /usr/lib/setup/setup: If a Slackware USB stick was used as the package + source, prompt user to unplug the USB stick when the installation + completes. + /usr/lib/setup/INSUSB: Fix a cosmetic bug if the USB stick has no partitions. + MoZes. ++--------------------------+ Sun Jan 16 20:51:35 UTC 2022 Fix installation of the exfat kernel module(s). Thanks to Nille_kungen. diff --git a/source/installer/sources/initrd/usr/lib/setup/INSUSB b/source/installer/sources/initrd/usr/lib/setup/INSUSB index 04723159c..3b04c1f4f 100755 --- a/source/installer/sources/initrd/usr/lib/setup/INSUSB +++ b/source/installer/sources/initrd/usr/lib/setup/INSUSB @@ -77,7 +77,7 @@ if [ "$DRIVE_FOUND" = "" ]; then break fi if [ -d /usb-stick/slackware*-*/slackware/a ]; then - DRIVE_FOUND="/dev/$DEVICE$PARTITION" + DRIVE_FOUND="/dev/$DEVICE" INSTALL_PATH=$(echo /usb-stick/slackware*-*/slackware) break fi diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup index c8c2aeabd..5fc8a0e4b 100755 --- a/source/installer/sources/initrd/usr/lib/setup/setup +++ b/source/installer/sources/initrd/usr/lib/setup/setup @@ -2,7 +2,7 @@ # # Copyright 1993, 1994, 1999 Patrick Volkerding, Moorhead, Minnesota USA # Copyright 2001, 2003, 2004 Slackware Linux, Inc., Concord, CA -# Copyright 2006, 2007, 2018, 2021 Patrick Volkerding, Sebeka, Minnesota USA +# Copyright 2006, 2007, 2018, 2021, 2022 Patrick Volkerding, Sebeka, Minnesota USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -422,6 +422,20 @@ if [ -f ${T_PX}/etc/fstab ]; then --msgbox "\nPlease remove the installation disc.\n" 7 40 fi + # Prompt the user to unplug the USB stick containing the Slackware + # media: + mountpoint -q /usb-stick && { + # Try to umount the USB stick, but ignore any errors (errors would typically be + # occur if the user has a shell open within the USB stick's mount point), since + # we'll be shutting down soon anyway. + sync + umount /usb-stick > /dev/null 2>&1 + dialog \ + --title "Unplug Slackware Installation Media USB Stick" \ + --msgbox \ + "\nYou may now physically unplug the Slackware Installation Media USB stick from the USB port.\n" 8 60 + } + # Offer to reboot or drop to shell or power off. exec 3>&1 installerexittype=$( dialog \ |