manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clarify configuration loading cases

This commit is contained in:
oddlama 2021-05-31 17:20:06 +02:00
parent a80b22f687
commit 23ec84eef2
No known key found for this signature in database
GPG Key ID: 14EFE510775FE39A
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install
View File

@ -109,10 +109,10 @@ if [[ -z "$ACTION" ]]; then
fi fi
fi fi
if [[ -e "$CONFIG" ]]; then if [[ "$ACTION" != "chroot" ]]; then
# Load config if we aren't just chrooting # Load config if we aren't just chrooting
[[ "$ACTION" == "chroot" ]] \ [[ -e "$CONFIG" ]] \
continue || die "Configuration file '$CONFIG' does not exist. To run the configurator, omit '-i' flag or run ./configure"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "$CONFIG" || die "Could not source config" source "$CONFIG" || die "Could not source config"
@ -120,8 +120,6 @@ 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 ]] \