diff options
Diffstat (limited to 'source/installer')
| -rw-r--r-- | source/installer/ChangeLog.txt | 18 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/INS-all-in-one | 199 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/SeTmedia | 12 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/SeTpasswd | 2 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/setup | 36 |
5 files changed, 257 insertions, 10 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 5ac0c1199..a1f932521 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,21 @@ +Wed Jan 18 20:30:13 UTC 2023 + /usr/lib/setup/INS-all-in-one: Added. + This detects the AiO (All in One Offline) partition labeled 'SLKins_aio-pkgs' + that houses the Slackware source media (installable packages), and configures + the Installer to use it as the media source. + /usr/lib/setup/SeTmedia: Call INS-all-in-one first to discover the A-i-O media + partition. If unavailable, fails sanity check or the user opted not to use + the included media, the regular set of source media selection options are + presented. + /usr/lib/setup/setup: Post install: If the A-i-O partition is mounted, umount + and suggest to physically unplug the Slackware Installer USB stick. + This is skipped on ARM since the A-i-O partition resides on the same storage + as the OS' /boot partition, so cannot/should not be removed. + Fixed white space in license header. + /usr/lib/setup/SeTpasswd: Clear screen before setting 'root' user password to + fix a text overlap from the 'dialog' box when installing over SSH. + Thanks to Stuart Winter. ++--------------------------+ Tue Jan 17 20:55:17 UTC 2023 pxesetup: after sorting the partition list, run it through 'uniq' to ensure no duplicates are listed. Thanks to 'opty' in Libera.Chat ##slackware. diff --git a/source/installer/sources/initrd/usr/lib/setup/INS-all-in-one b/source/installer/sources/initrd/usr/lib/setup/INS-all-in-one new file mode 100755 index 000000000..c6463626f --- /dev/null +++ b/source/installer/sources/initrd/usr/lib/setup/INS-all-in-one @@ -0,0 +1,199 @@ +#!/bin/bash +#################################################################################### +# File.......: /usr/lib/setup/INS-all-in-one +# Called from: Forked from /usr/lib/setup/SeTmedia +# Purpose....: Detect a partition labeled 'SLKins_aio-pkgs' and configure the +# Installer to use it as the media source. +# Version....: 1.00 +# Date.......: 22-Nov-2022 +# Author.....: Stuart Winter <mozes@slackware.com> +################################################################################### +# Change log +# v1.00, 22-Nov-2022 +# * Initial version +################################################################################### +# +# Copyright 2022 Stuart Winter, Earth, Milky Way, "". +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Exit codes +# 0 = Success (Install media dialog screen can exit cleanly) +# 1 = General failure. (Install media dialog needs to present the list of options) +# 2 = No media label found on any removable block device. +# 3 = Sanity checks failed. +# 4 = User chose not to use the bundled media, although the media passed sanity check. +# 10 = User configured not to use All-In-One feature. + +# Check if the user has bypassed the all-in-one Installer functionality. +# This may be if they have the all-in-one Installer on the USB stick but want +# to install from another medium, and don't fancy re-deploying the standard USB +# Installer image to the USB stick. +[ -f /.no-allinone ] && exit 10 + +# Settings: +SLKINSMNT=/slack-all-in-one +TMP=/var/log/setup/tmp +[ ! -d $TMP ] && mkdir -pm755 $TMP + +################################################################################### +################### Functions ##################################################### +################################################################################### + +# This code was copied in part from usr/lib/setup/INSUSB: +# Detect a device with a partition label 'SLKins_aio-pkgs' +# The MMC block devices aren't identified as 'removeable' so we don't filter on +# that attribute since this is the standard storage subsystem we use on ARM. +#lsblk -o name,label -ripn | grep -E 'SLKins_aio-pkgs$' +function media_scan(){ + local rdevice founddev + for rdevice in $( ls --indicator-style none /sys/block | grep -Ev "loop|ram|^dm-|^sr|^md" ); do + # Is it labeled 'SLKins_aio-pkgs'? If so we'll take the first one we find: + founddev="$( lsblk -o name,label -ripn /dev/${rdevice} 2>/dev/null | grep -E 'SLKins_aio-pkgs$' | awk '{print $1}' )" + [ ! -z "${founddev}" ] && break + done + # Report back if we found one: + [ ! -z "${founddev}" ] && { echo "${founddev}" ; return 0 ;} || return 1 +} + +# Mount the specified block device under the known mount point: +function media_mount() { + mount -o noatime -m "$1" $SLKINSMNT 2>/dev/null + return $? ;} + +# umount the media: +function media_umount() { + umount $SLKINSMNT 2>/dev/null + return $? ;} + +# Check if the Slackware media partition is already mounted: +function media_ismounted() { + findmnt -DRM ${SLKINSMNT} > /dev/null 2>&1 + return $? +} + +# Sanity check the media: +# The directory layout is: '/slackware/<slackware-tree-name>' +# This is to enable users to add non-Slackware related assets to the partition upon installation +# of the OS, if they wish. +function media_sanity_check() { + local slacktree=$( media_report_slacktree ) + [ -z "$slacktree" ] && return 1 + # Is the tree available? We'll check the 'A' series directory is present: + [ ! -d $SLKINSMNT/slackware/$slacktree/a ] && return 1 + # Enough sanity checking, it's probably good! + return 0 +} + +# Report the path to the configured Slackware media: +# Output is relative - e.g. doesn's include the mount point and parent 'slackware' directory. +function media_report_slacktree() { + # The Slackware tree we're using is configured in this file. + # This is placed by the script that creates the All-in-One Installer image. + [ ! -f $SLKINSMNT/slackware/.slktree ] && return 1 + # Output content of the file which is a relative path: e.g. "slackwareaarch64-current/slackware" + grep -Ev '^$' $SLKINSMNT/slackware/.slktree +} + +# Inform the user that the All-in-One Installer is ready to go. +function offer_msg_ready() { + local blockdev="$1" mntpnt="$2" +# --msgbox "\nThe Slackware package directory has been found on $blockdev and is mounted on $mntpnt ready for use.\n + dialog \ + --backtitle "Slackware Installer" \ + --title "INSTALLATION MEDIA SOURCE FOUND" --ok-button "OK" \ + --msgbox "\nThis edition of the Slackware Installer has the installation media bundled, and is ready to use.\n + " 8 79 + clear +} + +# Inform the user that the All-in-One Installer was detected but failed sanity check. +function offer_msg_failsanity() { + local blockdev="$1" mntpnt="$2" + dialog \ + --backtitle "Slackware Installer" \ + --title "INSTALLATION MEDIA SOURCE" --ok-button "OK" \ + --msgbox "\nThis edition of the Slackware Installer contains the installation media.\n\n +The media has been located on $blockdev but has failed the tests.\n\n +You will now be presented with the option to choose a different installation media source.\n" 12 79 + clear +} + +# Offer the option to use the bundled media or pick the option manually: +# Y=return 0, N=1 +function offer_chooseaio() { + dialog \ + --backtitle "Slackware Installer" \ + --title "INSTALLATION MEDIA SOURCE" --yesno \ + "\nThis edition of the Slackware Installer contains the installation media.\n\n +Would you like to use this as the media source?\n\n +Answering 'No' provides a list of alternate installation media selection options.\n\n +Recommendation: Yes" 15 77 + return $? +} + +# Configure the Slackware Installer to find the installation media on the All-in-One partition: +function installer_configure() { + # An example of the entry in this file: /slack-all-in-one/slackware/slackwareaarch64-current/slackware + echo "$SLKINSMNT/slackware/$( media_report_slacktree )" > $TMP/SeTDS # is $SLKINSMNT/slackware/[contents of file '.slktree'] + echo "-source_mounted" > $TMP/SeTmount + echo "/dev/null" > $TMP/SeTsource +} + +################################################################################### + +# Try to locate the All-in-One Installer partition: +mediablockdev=$( media_scan ) + +# If we didn't find a block device with our label, bail out to enable the user to select +# one from the list presented by /usr/lib/setup/SeTmedia: +[ -z "${mediablockdev}" ] && exit 2 + +# If the media is already mounted and the sanity check passes, inform the user. +# This is to facilitate that the user may bounce through the main 'setup' menu and select +# the installation media chooser (/usr/lib/setup/SeTmedia) more than once. +# No, we're not going to offer them the option to pick a different installation source media: +# it might break something. They can reboot. +if media_ismounted && media_sanity_check; then + offer_msg_ready $mediablockdev $SLKINSMNT + exit 0 +fi + +# It's not mounted, but we found a label on a removable block device. Let's mount it, +# configure the Installer to find the package source media, and inform the user that it's +# ready to roll: +if media_mount $mediablockdev && media_sanity_check; then + # Give the user the choice to use it. At this point we know it's validated so is a viable option. + # If the user chooses 'no', we umount the media and are returned to the '/usr/lib/setup/SeTmedia' + # process to pick an option. + offer_chooseaio || { media_umount ; clear ; exit 4 ;} + installer_configure + #offer_msg_ready $mediablockdev $SLKINSMNT + exit 0 + else + # umount the media. If it fails, no problem - we can ignore it. The Installer won't be configured + # to use it unless the sanity check passed, so anything mounted isn't used nor is in the way. + media_umount + # Inform the user that they get to pick from the list of source media installation options: + offer_msg_failsanity $mediablockdev + exit 3 +fi + +clear +exit 0 diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTmedia b/source/installer/sources/initrd/usr/lib/setup/SeTmedia index 65e05f4db..d42658c99 100755 --- a/source/installer/sources/initrd/usr/lib/setup/SeTmedia +++ b/source/installer/sources/initrd/usr/lib/setup/SeTmedia @@ -1,9 +1,19 @@ -#!/bin/sh +#!/bin/bash TMP=/var/log/setup/tmp if [ ! -d $TMP ]; then mkdir -p $TMP fi +# Call the A-i-O (All-in-One Offline Installer) media handler. +# This is for Slackware Installer images that contain a partition +# labeled 'SLKins_aio' which holds the Slackware packages. +# If a partition exists, passes the sanity checks and the user +# wants to use the bundled media, we exit. +# Otherwise, if the user creates a file named '/.no-allinone', the +# the sanity checks fail or the user doesn't want to use the +# media, we offer the set of options to select the source media. +INS-all-in-one && exit 0 + dialog --backtitle "Select Slackware installation source." \ --title "SOURCE MEDIA SELECTION" --menu \ "Please select the media from which to install Slackware Linux:" \ diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTpasswd b/source/installer/sources/initrd/usr/lib/setup/SeTpasswd index 967ffd2ed..16133c423 100755 --- a/source/installer/sources/initrd/usr/lib/setup/SeTpasswd +++ b/source/installer/sources/initrd/usr/lib/setup/SeTpasswd @@ -13,9 +13,11 @@ time the machine is rebooted. This is especially important if you're \ using a network enabled kernel and the machine is on an Internet \ connected LAN. Would you like to set a root password?" 10 68 if [ $? = 0 ] ; then + clear echo echo echo + echo "Setting password for 'root' user" chroot $T_PX /usr/bin/passwd root echo echo -n "Press [enter] to continue:" diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup index 5fc8a0e4b..98984cd3a 100755 --- a/source/installer/sources/initrd/usr/lib/setup/setup +++ b/source/installer/sources/initrd/usr/lib/setup/setup @@ -1,25 +1,25 @@ -#!/bin/sh +#!/bin/bash # # Copyright 1993, 1994, 1999 Patrick Volkerding, Moorhead, Minnesota USA # Copyright 2001, 2003, 2004 Slackware Linux, Inc., Concord, CA -# Copyright 2006, 2007, 2018, 2021, 2022 Patrick Volkerding, Sebeka, Minnesota USA +# Copyright 2006, 2007, 2018, 2021, 2022, 2023 Patrick Volkerding, Sebeka, Minnesota USA # All rights reserved. # -# Redistribution and use of this script, with or without modification, is +# Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # As always, bug reports, suggestions, etc: volkerdi@slackware.com @@ -100,7 +100,7 @@ mkdir /var/log/mount 2> /dev/null while [ 0 ]; do - dialog --title "Slackware Linux Setup (version 15.0)" \ + dialog --title "Slackware Linux Setup (version 15.1)" \ --menu \ "Welcome to Slackware Linux Setup.\n\ Select an option below using the UP/DOWN keys and SPACE or ENTER.\n\ @@ -436,6 +436,24 @@ if [ -f ${T_PX}/etc/fstab ]; then "\nYou may now physically unplug the Slackware Installation Media USB stick from the USB port.\n" 8 60 } + # Prompt the user to unplug the bootable USB stick containing + # A-i-O (All in One Offline) partition. + mountpoint -q /slack-all-in-one && { + # Try to umount the A-i-O partition, 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 /slack-all-in-one > /dev/null 2>&1 + # Don't suggest disconnection if it's on ARM, because the A-i-O partition + # is on the same SD card that is converted from being the Installer to the + # OS's /boot partition. + [[ ! "$( uname -m )" =~ a(rm*|arch64) ]] && { + dialog \ + --title "Unplug Slackware Installation USB Stick" \ + --msgbox \ + "\nYou may now physically unplug the Slackware Installation USB stick from the USB port.\n" 8 60 ;} + } + # Offer to reboot or drop to shell or power off. exec 3>&1 installerexittype=$( dialog \ |