Merge branch 'master' of https://github.com/Chrysostomus/manjaro-architect

lib/util-base.sh

@@ -328,7 +328,7 @@ install_base() {
             # If the virtual console has been set, then copy config file to installation
             if [[ -e /tmp/vconsole.conf ]]; then
                 cp -f /tmp/vconsole.conf ${MOUNTPOINT}/etc/vconsole.conf
-                check_for_error "copy vconsole.conf" $ install_base
+                check_for_error "copy vconsole.conf" $? install_base
             fi
 
             # If specified, copy over the pacman.conf file to the installation

lib/util-disk.sh

@@ -227,10 +227,8 @@ select_filesystem() {
     DIALOG " $_FSTitle " --menu "$_FSBody" 0 0 12 \
       "$_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" \