From 2f84daca71ce8768ef0828ecac0d5b080205c851 Mon Sep 17 00:00:00 2001 From: lenny Date: Sun, 9 Mar 2025 23:02:20 -0700 Subject: [PATCH 1/2] added ntfs support --- installer.sh | 2 +- setup/setupdisk | 5 +++++ setup/setupinstaller | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/installer.sh b/installer.sh index 8ad8c7f..a808447 100755 --- a/installer.sh +++ b/installer.sh @@ -95,7 +95,7 @@ diskConfig() { [ "$?" == "3" ] && dungeonmap fi - filesystem=$(drawDialog --no-cancel --title "Partitioner - Filesystem" --extra-button --extra-label "Map" --menu "If you are unsure, choose 'ext4'" 0 0 0 "ext4" "" "xfs" "") + filesystem=$(drawDialog --no-cancel --title "Partitioner - Filesystem" --extra-button --extra-label "Map" --menu "If you are unsure, choose 'ext4'" 0 0 0 "ext4" "" "xfs" "" "ntfs" "") [ "$?" == "3" ] && dungeonmap suConfig diff --git a/setup/setupdisk b/setup/setupdisk index b6842ff..dffc93a 100644 --- a/setup/setupdisk +++ b/setup/setupdisk @@ -194,17 +194,20 @@ fi case "$filesystem" in xfs) mkfs.xfs /dev/void/root || die ;; ext4) mkfs.ext4 /dev/void/root || die ;; + ntfs) mkfs.ntfs /dev/void/root || die ;; esac if [ "$lvm" == "No" ] && [ "$encryption" == "Yes" ]; then case "$filesystem" in xfs) mkfs.xfs /dev/mapper/void || die ;; ext4) mkfs.ext4 /dev/mapper/void || die ;; + ntfs) mkfs.ntfs /dev/mapper/void || die ;; esac elif [ "$lvm" == "No" ] && [ "$encryption" == "No" ]; then case "$filesystem" in xfs) mkfs.xfs "$root" || die ;; ext4) mkfs.ext4 "$root" || die ;; + ntfs) mkfs.ntfs "$root" || die ;; esac fi @@ -220,6 +223,7 @@ if [ -n "$home" ] && [ "$lvm" == "Yes" ]; then case "$filesystem" in xfs) mkfs.xfs /dev/void/home || die ;; ext4) mkfs.ext4 /dev/void/home || die ;; + ntfs) mkfs.ntfs /dev/void/home || die ;; esac fi elif [ -n "$home" ] && [ "$lvm" == "No" ]; then @@ -227,6 +231,7 @@ elif [ -n "$home" ] && [ "$lvm" == "No" ]; then case "$filesystem" in xfs) mkfs.xfs "$home" || die ;; ext4) mkfs.ext4 "$home" || die ;; + ntfs) mkfs.ntfs "$home" || die ;; esac fi diff --git a/setup/setupinstaller b/setup/setupinstaller index 4690071..d5c28fe 100644 --- a/setup/setupinstaller +++ b/setup/setupinstaller @@ -43,6 +43,7 @@ ping -c 1 gnu.org &>/dev/null && ping -c 1 fsf.org &>/dev/null || commandFailure="Dependency installation has failed." xbps-install -Suy xbps || die xbps-install -Suy dialog bc || die +xbps-install -Suy ntfs-3g || die # it doesn't matter if these fail, do not || die dialog --create-rc ~/.dialogrc From 1686f1a31a37f969dc73a8a02ab7e533dbc13d47 Mon Sep 17 00:00:00 2001 From: lenny Date: Sun, 9 Mar 2025 23:03:15 -0700 Subject: [PATCH 2/2] swapped tabs for spaces --- setup/setupdisk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/setupdisk b/setup/setupdisk index dffc93a..2f6cbea 100644 --- a/setup/setupdisk +++ b/setup/setupdisk @@ -223,7 +223,7 @@ if [ -n "$home" ] && [ "$lvm" == "Yes" ]; then case "$filesystem" in xfs) mkfs.xfs /dev/void/home || die ;; ext4) mkfs.ext4 /dev/void/home || die ;; - ntfs) mkfs.ntfs /dev/void/home || die ;; + ntfs) mkfs.ntfs /dev/void/home || die ;; esac fi elif [ -n "$home" ] && [ "$lvm" == "No" ]; then @@ -231,7 +231,7 @@ elif [ -n "$home" ] && [ "$lvm" == "No" ]; then case "$filesystem" in xfs) mkfs.xfs "$home" || die ;; ext4) mkfs.ext4 "$home" || die ;; - ntfs) mkfs.ntfs "$home" || die ;; + ntfs) mkfs.ntfs "$home" || die ;; esac fi