root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix quickinst in network mode

Browse source
This commit is contained in:
Tobias Powalowski 2014-01-14 18:01:01 +01:00
parent 48007d001c
commit 5eea642add
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
usr/share/archboot/installer/quickinst
View file

@ -30,13 +30,8 @@ usage() {
echo "Examples:" echo "Examples:"
if [[ -e "/usr/bin/curl" ]]; then if [[ -e "/usr/bin/curl" ]]; then
if [[ "$(uname -m)" = "x86_64" ]]; then echo " quickinst net /mnt 'ftp://ftp.archlinux.org/$repo/os/$arch'"
echo " quickinst net /mnt ftp://ftp.archlinux.org/core/os/x86_64" echo " quickinst net /mnt 'http://ftp.archlinux.org/$repo/os/$arch'"
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
fi fi
echo " quickinst media /mnt /packages/core-$(uname -m)/pkg" echo " quickinst media /mnt /packages/core-$(uname -m)/pkg"
@ -153,7 +148,7 @@ install_packages() {
if [[ "$(lsblk -rnpo FSTYPE | grep jfs)" ]]; then if [[ "$(lsblk -rnpo FSTYPE | grep jfs)" ]]; then
! [[ "$(echo ${PACKAGES} | grep -w jfsutils)" ]] && PACKAGES="${PACKAGES} jfsutils" ! [[ "$(echo ${PACKAGES} | grep -w jfsutils)" ]] && PACKAGES="${PACKAGES} jfsutils"
fi 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" ! [[ "$(echo ${PACKAGES} | grep -w f2fs-tools)" ]] && PACKAGES="${PACKAGES} f2fs-tools"
fi fi
if [[ "$(lsblk -rnpo FSTYPE | grep vfat)" ]]; then if [[ "$(lsblk -rnpo FSTYPE | grep vfat)" ]]; then
@ -180,7 +175,7 @@ fi
# prepare pacman # prepare pacman
pacman_conf pacman_conf
if [[ "${INSTMODE}" = "net" ]]; then if [[ "${MODE}" = "net" ]]; then
pacman_conf_extra pacman_conf_extra
fi fi
prepare_pacman prepare_pacman