From 365e83a8ff516035b5d3394b64dfeec9b01bf505 Mon Sep 17 00:00:00 2001
From: Chrysostomus <mattitheman@gmail.com>
Date: Wed, 1 Mar 2017 02:13:02 +0800
Subject: [PATCH] Remove ext2 from menu, fix some errors from install_base
 error reporting

---
 lib/util-base.sh | 2 +-
 lib/util-disk.sh | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/util-base.sh b/lib/util-base.sh
index 14b2d92..18cbbe8 100644
--- a/lib/util-base.sh
+++ b/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
diff --git a/lib/util-disk.sh b/lib/util-disk.sh
index fb209be..033c4b0 100644
--- a/lib/util-disk.sh
+++ b/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" \