Merge branch 'master' into 'maintainance'

# Conflicts:
#   PKGBUILD

lib/util-advanced.sh

@@ -716,12 +716,12 @@ fi
 
 set_schedulers() {
   [[ -e /mnt/etc/udev/rules.d/60-ioscheduler.rules ]] ||  \
-  echo '# set scheduler for non-rotating disks
-# noop and deadline are recommended for non-rotating disks
-# for rotational disks, cfq gives better performance and bfq-sq more responsive desktop environment
-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline"
+  echo '# set scheduler for NVMe
+ACTION=="add|change", KERNEL=="nvme[0-9]n[0-9]", ATTR{queue/scheduler}="none"
+# set scheduler for SSD and eMMC
+ACTION=="add|change", KERNEL=="sd[a-z]|mmcblk[0-9]*", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="mq-deadline"
 # set scheduler for rotating disks
-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="bfq-sq"' > /mnt/etc/udev/rules.d/60-ioscheduler.rules
+ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="bfq"' > /mnt/etc/udev/rules.d/60-ioscheduler.rules
   nano /mnt/etc/udev/rules.d/60-ioscheduler.rules
 }
 

lib/util-disk.sh

@@ -254,8 +254,10 @@ select_filesystem() {
     DIALOG " $_FSTitle " --menu "\n$_FSBody\n " 0 0 10 \
       "$_FSSkip" "-" \
       "btrfs" "mkfs.btrfs -f" \
+      "ext2" "mkfs.ext2 -q" \
       "ext3" "mkfs.ext3 -q" \
       "ext4" "mkfs.ext4 -q" \
+      "f2fs" "mkfs.f2fs -q" \
       "jfs" "mkfs.jfs -q" \
       "nilfs2" "mkfs.nilfs2 -fq" \
       "ntfs" "mkfs.ntfs -q" \