From 5eea642add63663b9a0726ead15d94e5cc09f365 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 14 Jan 2014 18:01:01 +0100
Subject: [PATCH] fix quickinst in network mode

---
 usr/share/archboot/installer/quickinst | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/usr/share/archboot/installer/quickinst b/usr/share/archboot/installer/quickinst
index 69dc9bfab..c03cb40ab 100755
--- a/usr/share/archboot/installer/quickinst
+++ b/usr/share/archboot/installer/quickinst
@@ -30,13 +30,8 @@ usage() {
     echo "Examples:"
     
     if [[ -e "/usr/bin/curl" ]]; then
-        if [[ "$(uname -m)" = "x86_64" ]]; then
-                echo "  quickinst net /mnt ftp://ftp.archlinux.org/core/os/x86_64"
-                echo "  quickinst net /mnt http://ftp.archlinux.org/core/os/x86_64"
-        else
-                echo "  quickinst net /mnt ftp://ftp.archlinux.org/core/os/i686"
-                echo "  quickinst net /mnt http://ftp.archlinux.org/core/os/i686"
-        fi
+                echo "  quickinst net /mnt 'ftp://ftp.archlinux.org/$repo/os/$arch'"
+                echo "  quickinst net /mnt 'http://ftp.archlinux.org/$repo/os/$arch'"
     fi
 
     echo "  quickinst media /mnt /packages/core-$(uname -m)/pkg"
@@ -153,7 +148,7 @@ install_packages() {
     if [[ "$(lsblk -rnpo FSTYPE | grep jfs)" ]]; then
         ! [[ "$(echo ${PACKAGES} | grep -w jfsutils)" ]] && PACKAGES="${PACKAGES} jfsutils"
     fi
-    if [[ "$(${_BLKID} -o value -s TYPE | grep f2fs)" ]]; then
+    if [[ "$(lsblk -rnpo FSTYPE | grep f2fs)" ]]; then
         ! [[ "$(echo ${PACKAGES} | grep -w f2fs-tools)" ]] && PACKAGES="${PACKAGES} f2fs-tools"
     fi
     if [[ "$(lsblk -rnpo FSTYPE | grep vfat)" ]]; then
@@ -180,7 +175,7 @@ fi
 
 # prepare pacman
 pacman_conf
-if [[ "${INSTMODE}" = "net" ]]; then
+if [[ "${MODE}" = "net" ]]; then
     pacman_conf_extra
 fi
 prepare_pacman