From 847991443dc4661dd26d6a5c5aff090c9a0c9ebd Mon Sep 17 00:00:00 2001 From: udeved Date: Sun, 14 Jun 2015 23:08:24 +0200 Subject: [PATCH] [util-iso] add check_profile_conf() checks profile.conf for valid variable values --- lib/util-iso.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index d84a2cd..1ad5846 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -19,6 +19,7 @@ import ${LIBDIR}/util-iso-fs.sh check_profile(){ local keyfiles=('profile.conf' 'mkinitcpio.conf' 'Packages' 'Packages-Livecd') local keydirs=('overlay' 'overlay-livecd' 'isolinux') + local err="Profile [$1] sanity check failed!" local has_keyfiles=false has_keydirs=false for f in ${keyfiles[@]}; do if [[ -f $1/$f ]];then @@ -554,10 +555,23 @@ check_custom_pacman_conf(){ fi } +check_profile_conf(){ + if ! is_valid_bool "${autologin}";then + die "autologin only accepts true/false value!" + fi + if ! is_valid_bool "${multilib}";then + die "multilib only accepts true/false value!" + fi + if ! is_valid_bool "${nonfree_xorg}";then + die "nonfree_xorg only accepts true/false value!" + fi +} + # $1: profile load_profile(){ msg3 "Profile: [$1]" load_profile_config 'profile.conf' + check_profile_conf local files=$(ls Packages*) for f in ${files[@]};do case $f in