Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions setup/setupdisk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -220,13 +223,15 @@ 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
commandFailure="Formatting home partition has failed."
case "$filesystem" in
xfs) mkfs.xfs "$home" || die ;;
ext4) mkfs.ext4 "$home" || die ;;
ntfs) mkfs.ntfs "$home" || die ;;
esac
fi

Expand Down
1 change: 1 addition & 0 deletions setup/setupinstaller
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down