diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-06-06 22:19:01 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-06-07 08:58:09 +0200 |
commit | 6e00c56127b4fa2328e596ac18647fb7f27b674d (patch) | |
tree | d9cb5f96f79880fb29e1875aa169336346d94989 /source/installer/sources/initrd/usr/lib/setup/INShd | |
parent | ec4fd2d70a99a651f8498ce4c1ca8b38b9583c39 (diff) | |
download | current-6e00c56127b4fa2328e596ac18647fb7f27b674d.tar.gz |
Wed Jun 6 22:19:01 UTC 201820180606221901
a/bash-4.4.023-x86_64-1.txz: Upgraded.
a/kernel-firmware-20180604_1fa9ce3-noarch-1.txz: Upgraded.
a/kernel-generic-4.14.48-x86_64-1.txz: Upgraded.
a/kernel-huge-4.14.48-x86_64-1.txz: Upgraded.
a/kernel-modules-4.14.48-x86_64-1.txz: Upgraded.
ap/cups-2.2.8-x86_64-1.txz: Upgraded.
ap/ghostscript-fonts-std-8.11-noarch-3.txz: Rebuilt.
Rebuilt this and many other font packages or packages with build scripts
that call mkfontdir or mkfontscale to suppress any error messages caused
by collisions if another package installation is writing files to the
same font directories when those utilities are run. In that case, the
other package will also be running mkfontdir/mkfontscale after the files
are installed, so any issues will be cleaned up then. Last one out turn
off the lights, so to speak.
ap/sqlite-3.24.0-x86_64-1.txz: Upgraded.
ap/terminus-font-4.40-noarch-3.txz: Rebuilt.
d/kernel-headers-4.14.48-x86-1.txz: Upgraded.
d/rust-1.26.2-x86_64-1.txz: Upgraded.
k/kernel-source-4.14.48-noarch-1.txz: Upgraded.
l/elfutils-0.171-x86_64-1.txz: Upgraded.
l/harfbuzz-1.7.7-x86_64-1.txz: Upgraded.
l/mozilla-nss-3.37.3-x86_64-1.txz: Upgraded.
l/readline-7.0.005-x86_64-1.txz: Upgraded.
x/dejavu-fonts-ttf-2.37-noarch-4.txz: Rebuilt.
x/font-adobe-100dpi-1.0.3-noarch-3.txz: Rebuilt.
x/font-adobe-75dpi-1.0.3-noarch-3.txz: Rebuilt.
x/font-adobe-utopia-100dpi-1.0.4-noarch-3.txz: Rebuilt.
x/font-adobe-utopia-75dpi-1.0.4-noarch-3.txz: Rebuilt.
x/font-adobe-utopia-type1-1.0.4-noarch-3.txz: Rebuilt.
x/font-arabic-misc-1.0.3-noarch-3.txz: Rebuilt.
x/font-bh-100dpi-1.0.3-noarch-3.txz: Rebuilt.
x/font-bh-75dpi-1.0.3-noarch-3.txz: Rebuilt.
x/font-bh-lucidatypewriter-100dpi-1.0.3-noarch-3.txz: Rebuilt.
x/font-bh-lucidatypewriter-75dpi-1.0.3-noarch-3.txz: Rebuilt.
x/font-bh-ttf-1.0.3-noarch-3.txz: Rebuilt.
x/font-bh-type1-1.0.3-noarch-3.txz: Rebuilt.
x/font-bitstream-100dpi-1.0.3-noarch-3.txz: Rebuilt.
x/font-bitstream-75dpi-1.0.3-noarch-3.txz: Rebuilt.
x/font-bitstream-speedo-1.0.2-noarch-3.txz: Rebuilt.
x/font-bitstream-type1-1.0.3-noarch-3.txz: Rebuilt.
x/font-cronyx-cyrillic-1.0.3-noarch-3.txz: Rebuilt.
x/font-cursor-misc-1.0.3-noarch-3.txz: Rebuilt.
x/font-daewoo-misc-1.0.3-noarch-3.txz: Rebuilt.
x/font-dec-misc-1.0.3-noarch-3.txz: Rebuilt.
x/font-ibm-type1-1.0.3-noarch-3.txz: Rebuilt.
x/font-isas-misc-1.0.3-noarch-3.txz: Rebuilt.
x/font-jis-misc-1.0.3-noarch-3.txz: Rebuilt.
x/font-micro-misc-1.0.3-noarch-3.txz: Rebuilt.
x/font-misc-cyrillic-1.0.3-noarch-3.txz: Rebuilt.
x/font-misc-ethiopic-1.0.3-noarch-3.txz: Rebuilt.
x/font-misc-meltho-1.0.3-noarch-3.txz: Rebuilt.
x/font-misc-misc-1.1.2-noarch-3.txz: Rebuilt.
x/font-mutt-misc-1.0.3-noarch-3.txz: Rebuilt.
x/font-schumacher-misc-1.1.2-noarch-3.txz: Rebuilt.
x/font-screen-cyrillic-1.0.4-noarch-3.txz: Rebuilt.
x/font-sony-misc-1.0.3-noarch-3.txz: Rebuilt.
x/font-sun-misc-1.0.3-noarch-3.txz: Rebuilt.
x/font-winitzki-cyrillic-1.0.3-noarch-3.txz: Rebuilt.
x/font-xfree86-type1-1.0.4-noarch-3.txz: Rebuilt.
x/liberation-fonts-ttf-2.00.1-noarch-3.txz: Rebuilt.
x/libinput-1.11.0-x86_64-1.txz: Upgraded.
x/sazanami-fonts-ttf-20040629-noarch-3.txz: Rebuilt.
x/sinhala_lklug-font-ttf-20060929-noarch-3.txz: Rebuilt.
x/tibmachuni-font-ttf-1.901b-noarch-3.txz: Rebuilt.
x/ttf-indic-fonts-0.5.14-noarch-3.txz: Rebuilt.
x/ttf-tlwg-0.6.4-noarch-3.txz: Rebuilt.
x/urw-core35-fonts-otf-20170801_91edd6e_git-noarch-2.txz: Rebuilt.
x/wqy-zenhei-font-ttf-0.8.38_1-noarch-6.txz: Rebuilt.
xap/mozilla-firefox-60.0.2-x86_64-1.txz: Upgraded.
This release contains security fixes and improvements.
For more information, see:
https://www.mozilla.org/security/known-vulnerabilities/firefox.html
(* Security fix *)
xap/x3270-3.3.12ga7-x86_64-5.txz: Rebuilt.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/installer/sources/initrd/usr/lib/setup/INShd')
-rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/INShd | 146 |
1 files changed, 146 insertions, 0 deletions
diff --git a/source/installer/sources/initrd/usr/lib/setup/INShd b/source/installer/sources/initrd/usr/lib/setup/INShd new file mode 100755 index 00000000..ce30cb2f --- /dev/null +++ b/source/installer/sources/initrd/usr/lib/setup/INShd @@ -0,0 +1,146 @@ +#!/bin/sh +TMP=/var/log/setup/tmp +if [ ! -d $TMP ]; then + mkdir -p $TMP +fi +# Include function to check for Slackware ISO images: +. /usr/lib/setup/INCISO +while [ 0 ]; do +rm -f $TMP/SeTDS $TMP/SeTmount $TMP/SeTsource +# OK, at this point /var/log/mount should not have anything mounted on it, +# but we will umount just in case. +umount /var/log/mount 2> /dev/null +# Anything mounted on /var/log/mount now is a fatal error: +if mount | grep /var/log/mount 1> /dev/null 2> /dev/null ; then + echo "Can't umount /var/log/mount. Reboot machine and run setup again." + exit +fi +# If the mount table is corrupt, the above might not do it, so we will +# try to detect Linux and FAT32 partitions that have slipped by: +if [ -d /var/log/mount/lost+found -o -d /var/log/mount/recycled \ + -o -r /var/log/mount/io.sys ]; then + echo "Mount table corrupt. Reboot machine and run setup again." + exit +fi + +while [ 0 ]; do + cat << EOF > $TMP/tempmsg +In order to install directly from the hard disk you must have a +partition (such as /dev/sda1, /dev/sdb5, etc) with the Slackware +distribution's slackware/ directory like you'd find it on the FTP +site. It can be in another directory. For example, if the +distribution is in /stuff/slackware/, then you have to have +directories named /stuff/slackware/a, /stuff/slackware/ap, and so +on each containing the files that would be in that directory on +the FTP site. You may install from FAT or Linux partitions. + +Please enter the partition (such as /dev/sda1) where the Slackware +sources can be found, or [enter] to see a partition list: +EOF + dialog --title "INSTALLING FROM HARD DISK" --inputbox \ +"`cat $TMP/tempmsg`" 18 70 2> $TMP/source.part + if [ ! $? = 0 ]; then + rm -f $TMP/source.part $TMP/tempmsg + exit + fi + rm -f $TMP/tempmsg + SLACK_DEVICE="`cat $TMP/source.part`" + rm -f $TMP/source.part + if [ "$SLACK_DEVICE" = "" ]; then + dialog --title "PARTITION LIST" --no-collapse --msgbox "`probe -l | grep -v cylind | grep dev | sort 2> /dev/null`" 22 75 + continue; + fi + break; +done + +dialog --title "SELECT SOURCE DIRECTORY" --inputbox \ +"Now we need to know the full path on this partition to the\n\ +slackware/ directory where the directories containing\n\ +installation files and packages to be installed are kept.\n\ +For example, if you downloaded Slackware into the /stuff\n\ +directory on your hard drive (so that you have the\n\ +directories /stuff/slackware/a, /stuff/slackware/ap, and so on\n\ +each containing the files that would be in that directory on\n\ +the FTP site), then the full path to enter here would be:\n\ +\n\ + /stuff/slackware\n\ +\n\ +What directory are the Slackware sources in?" \ +19 65 2> $TMP/source.dir +if [ ! $? = 0 ]; then + rm -f $TMP/source.dir + exit +fi +SLACK_SOURCE_LOCATION="`cat $TMP/source.dir`" +rm -f $TMP/source.dir +if mount | grep $SLACK_DEVICE 1> /dev/null 2> /dev/null ; then + # This partition is already mounted, so we will have to + # tweak things funny. + rm -f /var/log/mount 2> /dev/null + rmdir /var/log/mount 2> /dev/null + PREFIX="`mount | grep $SLACK_DEVICE | cut -f 3 -d ' '`" + ln -sf $PREFIX /var/log/mount +else + SUCCESS=false + for type in ext4 ext3 ext2 vfat reiserfs hpfs msdos ; do + mount -r -t $type $SLACK_DEVICE /var/log/mount 1> /dev/null 2> /dev/null + if [ $? = 0 ]; then # mounted successfully + SUCCESS=true + break; + fi + done + if [ ! $SUCCESS = true ]; then # there was a mount error + cat << EOF > $TMP/tempmsg +There was a problem mounting your partition. Would you like to: + +EOF + dialog --title "MOUNT ERROR" --menu "`cat $TMP/tempmsg`" 10 68 2 \ +"Restart" "Start over" \ +"Ignore " "Ignore the error and continue" 2> $TMP/dowhat + if [ ! $? = 0 ]; then + rm -f $TMP/dowhat + exit + fi + DOWHAT="`cat $TMP/dowhat`" + rm -f $TMP/dowhat + if [ "$DOWHAT" = "Restart" ]; then + umount /var/log/mount 2> /dev/null + continue; + fi + echo + fi # mount error +fi + +# First, check if a Slackware ISO image is present in $SLACK_SOURCE_LOCATION +if check_iso_image /var/log/mount/$SLACK_SOURCE_LOCATION /var/log/mntiso ; then + echo "/var/log/mntiso/slackware" > $TMP/SeTDS + echo "-source_mounted" > $TMP/SeTmount + echo "/dev/null" > $TMP/SeTsource + exit +elif [ -f /var/log/mount/$SLACK_SOURCE_LOCATION/slackware/PACKAGES.TXT ]; then + echo "/var/log/mount/$SLACK_SOURCE_LOCATION/slackware" > $TMP/SeTDS + echo "-source_mounted" > $TMP/SeTmount + echo "/dev/null" > $TMP/SeTsource + exit +elif [ -d /var/log/mount/$SLACK_SOURCE_LOCATION ]; then + echo "/var/log/mount/$SLACK_SOURCE_LOCATION" > $TMP/SeTDS + echo "-source_mounted" > $TMP/SeTmount + echo "/dev/null" > $TMP/SeTsource + exit +else + cat << EOF > $TMP/tempmsg + +Sorry, but the directory $SLACK_SOURCE_LOCATION does not exist +on partition $SLACK_DEVICE. + +Would you like to try again? +EOF + dialog --title "SOURCE DIRECTORY NOT FOUND" --yesno "`cat $TMP/tempmsg`" 10 70 + if [ ! $? = 0 ]; then + rm -f $TMP/tempmsg + exit + fi + rm -r $TMP/tempmsg +fi + +done |