[util-iso] add check_profile_conf()
checks profile.conf for valid variable values
This commit is contained in:
parent
9de8d8e832
commit
847991443d
1 changed files with 14 additions and 0 deletions
|
@ -19,6 +19,7 @@ import ${LIBDIR}/util-iso-fs.sh
|
||||||
check_profile(){
|
check_profile(){
|
||||||
local keyfiles=('profile.conf' 'mkinitcpio.conf' 'Packages' 'Packages-Livecd')
|
local keyfiles=('profile.conf' 'mkinitcpio.conf' 'Packages' 'Packages-Livecd')
|
||||||
local keydirs=('overlay' 'overlay-livecd' 'isolinux')
|
local keydirs=('overlay' 'overlay-livecd' 'isolinux')
|
||||||
|
local err="Profile [$1] sanity check failed!"
|
||||||
local has_keyfiles=false has_keydirs=false
|
local has_keyfiles=false has_keydirs=false
|
||||||
for f in ${keyfiles[@]}; do
|
for f in ${keyfiles[@]}; do
|
||||||
if [[ -f $1/$f ]];then
|
if [[ -f $1/$f ]];then
|
||||||
|
@ -554,10 +555,23 @@ check_custom_pacman_conf(){
|
||||||
fi
|
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
|
# $1: profile
|
||||||
load_profile(){
|
load_profile(){
|
||||||
msg3 "Profile: [$1]"
|
msg3 "Profile: [$1]"
|
||||||
load_profile_config 'profile.conf'
|
load_profile_config 'profile.conf'
|
||||||
|
check_profile_conf
|
||||||
local files=$(ls Packages*)
|
local files=$(ls Packages*)
|
||||||
for f in ${files[@]};do
|
for f in ${files[@]};do
|
||||||
case $f in
|
case $f in
|
||||||
|
|
Loading…
Reference in a new issue