Fixed conditional confustion in config existence check in ./install
This commit is contained in:
parent
68a128153c
commit
a80b22f687
6
install
6
install
|
@ -109,10 +109,10 @@ if [[ -z "$ACTION" ]]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Load config if we aren't just chrooting
|
|
||||||
if [[ -e "$CONFIG" ]]; then
|
if [[ -e "$CONFIG" ]]; then
|
||||||
|
# Load config if we aren't just chrooting
|
||||||
[[ "$ACTION" == "chroot" ]] \
|
[[ "$ACTION" == "chroot" ]] \
|
||||||
|| die "Configuration file '$CONFIG' does not exist. To run the configurator, omit '-i' or "
|
continue
|
||||||
|
|
||||||
# shellcheck disable=SC1090
|
# shellcheck disable=SC1090
|
||||||
source "$CONFIG" || die "Could not source config"
|
source "$CONFIG" || die "Could not source config"
|
||||||
|
@ -120,6 +120,8 @@ if [[ -e "$CONFIG" ]]; then
|
||||||
|| die "You have not properly read the config. Edit the config file and set I_HAVE_READ_AND_EDITED_THE_CONFIG_PROPERLY=true to continue."
|
|| die "You have not properly read the config. Edit the config file and set I_HAVE_READ_AND_EDITED_THE_CONFIG_PROPERLY=true to continue."
|
||||||
|
|
||||||
preprocess_config
|
preprocess_config
|
||||||
|
elif [[ "$ACTION" != "chroot" ]]; then
|
||||||
|
die "Configuration file '$CONFIG' does not exist. To run the configurator, omit '-i' flag or run ./configure"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ $EUID == 0 ]] \
|
[[ $EUID == 0 ]] \
|
||||||
|
|
|
@ -7,11 +7,13 @@ virt-install \
|
||||||
--memory=2048 \
|
--memory=2048 \
|
||||||
--cdrom=/vm/images/archlinux-2021.05.01-x86_64.iso \
|
--cdrom=/vm/images/archlinux-2021.05.01-x86_64.iso \
|
||||||
--disk path=/vm/disks/disk-vm-gentoo-zfs.disk,size=25 \
|
--disk path=/vm/disks/disk-vm-gentoo-zfs.disk,size=25 \
|
||||||
--graphics none \
|
--transient \
|
||||||
--console pty,target.type=virtio \
|
--boot uefi \
|
||||||
--serial pty \
|
|
||||||
--extra-args 'console=ttyS0,115200n8 --- console=ttyS0,115200n8' \
|
|
||||||
--os-variant=gentoo \
|
--os-variant=gentoo \
|
||||||
--noautoconsole
|
--noautoconsole
|
||||||
|
# --graphics none \
|
||||||
|
# --console pty,target.type=virtio \
|
||||||
|
# --serial pty \
|
||||||
|
# --extra-args 'console=ttyS0,115200n8 --- console=ttyS0,115200n8' \
|
||||||
|
|
||||||
# virsh
|
# virsh
|
||||||
|
|
Loading…
Reference in New Issue