summaryrefslogtreecommitdiffstats
path: root/source/installer/sources/initrd/usr/lib/setup
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-06-07 23:31:27 +0000
committer Eric Hameleers <alien@slackware.com>2020-06-08 08:59:54 +0200
commitfd24414e6293d8d3c818a34ea63030b94df22f75 (patch)
tree0b5b559a61aaae2ca04a3a0dcf8f9a39615bb768 /source/installer/sources/initrd/usr/lib/setup
parentee48d8c07252f2fe9fd26558b8116b2595556891 (diff)
downloadcurrent-fd24414e6293d8d3c818a34ea63030b94df22f75.tar.gz
current-fd24414e6293d8d3c818a34ea63030b94df22f75.tar.xz
Sun Jun 7 23:31:27 UTC 202020200607233127
a/kernel-generic-5.4.45-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.45-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.45-x86_64-1.txz: Upgraded. d/kernel-headers-5.4.45-x86-1.txz: Upgraded. k/kernel-source-5.4.45-noarch-1.txz: Upgraded. l/imagemagick-7.0.10_17-x86_64-1.txz: Upgraded. l/python-certifi-2020.4.5.2-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/installer/sources/initrd/usr/lib/setup')
-rwxr-xr-xsource/installer/sources/initrd/usr/lib/setup/SeTDOS31
1 files changed, 16 insertions, 15 deletions
diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTDOS b/source/installer/sources/initrd/usr/lib/setup/SeTDOS
index abcb4095..0a709820 100755
--- a/source/installer/sources/initrd/usr/lib/setup/SeTDOS
+++ b/source/installer/sources/initrd/usr/lib/setup/SeTDOS
@@ -33,11 +33,11 @@ like your non-root users to have to partition $DOS_PART. The access level can \
range from no access at all, to read-only for everyone, to read-write access \
for every user on the machine. A reasonable default (read-write for root only) \
is chosen, but you may set this any way that you like." \
-16 77 4 \
-"fmask=177,dmask=077" "Root has read/write access, users have no access (ntfs-3g)" \
-"fmask=333,dmask=222" "Everyone has read only access (built-in kernel ntfs driver)" \
-"fmask=133,dmask=022" "Everyone has read access, but only root can write (ntfs-3g)" \
-"fmask=111,dmask=000" "All users can read/write to any file (ntfs-3g)" \
+17 77 4 \
+"fmask=177,dmask=077" "Root has read/write access, users have no access" \
+"fmask=333,dmask=222" "Everyone has read only access" \
+"fmask=133,dmask=022" "Everyone has read access, but only root can write" \
+"fmask=111,dmask=000" "All users can read/write to any file" \
2> $TMP/ntfs_security
if [ ! $? = 0 ]; then
rm -f $TMP/ntfs_security $TMP/mount-point $TMP/SeTDOS
@@ -56,7 +56,7 @@ like your non-root users to have to partition $DOS_PART. The access level can \
range from no access at all, to read-only for everyone, to read-write access \
for every user on the machine. A reasonable default (read-write for root only) \
is chosen, but you may set this any way that you like." \
-18 77 4 \
+17 77 4 \
"fmask=177,dmask=077" "Root has read/write access, users have no access" \
"fmask=333,dmask=222" "Everyone has read only access" \
"fmask=133,dmask=022" "Everyone has read access, but only root can write" \
@@ -145,29 +145,30 @@ EOF
elif [ "$DOS_PART" = "(IN USE)" ]; then
continue
fi
- if echo "$DOSLIST" | grep -w $DOS_PART | grep NTFS 1> $NDIR 2> $NDIR ; then
+ TYPE="$(blkid $DOS_PART | tr ' ' '\n' | grep "^TYPE=" | cut -f 2- -d = | tr -d \")"
+ if [ "$TYPE" = "ntfs" ]; then
ntfs_security
FS_UMASK="$(cat $TMP/ntfs_security)"
if [ "$FS_UMASK" = "1" ]; then
exit 1
else
- if [ "$FS_UMASK" = "fmask=333,dmask=222" ]; then
- FS_TYPE=ntfs
- else
- FS_TYPE=ntfs-3g
- fi
+ FS_TYPE="$TYPE"
fi
- else
- FS_TYPE=vfat
+ else # Must be fat or exfat:
fat_security
FS_UMASK="$(cat $TMP/fat_security)"
+ if [ "$FS_UMASK" = "1" ]; then
+ exit 1
+ else
+ FS_TYPE="$TYPE"
+ fi
fi
dialog --backtitle "Selecting a location to mount $DOS_PART." \
--title "PICK MOUNT POINT FOR $DOS_PART" \
--inputbox "Now this partition must be mounted somewhere in your \
directory tree. Please enter the directory under which \
you would like to put it. For instance, you might want to \
- enter /fat-c or /fat-d or something similar. \
+ enter /ntfs-c or /ntfs-d or something similar. \
NOTE: This \
partition won't actually be mounted until you reboot. \
Where would you like to mount $DOS_PART?" \