Merge branch 'master' into src

This commit is contained in:
MatMoul 2019-06-20 21:56:26 +02:00
commit 64339e740b

5
archfi
View file

@ -592,6 +592,7 @@ formatdevice(){
options+=("ext3" "") options+=("ext3" "")
options+=("ext2" "") options+=("ext2" "")
options+=("xfs" "") options+=("xfs" "")
options+=("f2fs" "")
options+=("jfs" "") options+=("jfs" "")
if [ ! "${3}" = "noluks" ]; then if [ ! "${3}" = "noluks" ]; then
options+=("luks" "encrypted") options+=("luks" "encrypted")
@ -640,6 +641,10 @@ formatdevice(){
echo "mkfs.xfs -f ${2}" echo "mkfs.xfs -f ${2}"
mkfs.xfs -f ${2} mkfs.xfs -f ${2}
;; ;;
f2fs)
echo "mkfs.f2fs $2"
mkfs.f2fs $2
;;
jfs) jfs)
echo "mkfs.xfs -f ${2}" echo "mkfs.xfs -f ${2}"
mkfs.jfs -f ${2} mkfs.jfs -f ${2}