3 files changed, 21 insertions, 16 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 2d749cfd..b0f413e8 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,6 @@
+Sun Jun  7 23:24:18 UTC 2020
+  Fix NTFS partition detection, and add support for exFAT.
++--------------------------+
 Sun May 17 19:57:48 UTC 2020
   Added PAM libraries, security modules, and config files.
 +--------------------------+
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index c26bdfbb..f087f1f6 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -1570,9 +1570,10 @@ for ind in $(seq 0 $((${#KERNELS[*]} -1)) ); do
     mv block.orig/virtio_blk.ko block
     rm -rf${VERBOSE1} block.orig
     # Done with block directory
-    # Save the Hyper-V modules in staging, but toss the rest:
+    # Grab a few modules from staging:
     mv staging staging.orig
     mv staging.orig/hv staging
+    mv staging.orig/exfat staging
     rm -rf${VERBOSE1} staging.orig
     # Save the Hyper-V keyboard module:
     mkdir -p input.orig/serio
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?" \