root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clean up

Browse source
This commit is contained in:
udeved 2017-03-09 13:01:20 +01:00
parent 5ed1df3f39
commit 1010d59e72
4 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/profile.conf.example
View file

@ -8,9 +8,6 @@
# use pxe # use pxe
# pxe_boot="true" # pxe_boot="true"
# use core packages as defined in pkglist to use in basic profile
# basic="false"
# use extra packages as defined in pkglist to activate a full profile # use extra packages as defined in pkglist to activate a full profile
# extra="false" # extra="false"

2
lib/util-iso.sh
View file

@ -564,7 +564,7 @@ prepare_profile(){
profile=$1 profile=$1
edition=$(get_edition ${profile}) edition=$(get_edition ${profile})
profile_dir=${run_dir}/${edition}/${profile} profile_dir=${run_dir}/${edition}/${profile}
check_profile check_profile "${profile_dir}"
load_profile load_profile
} }

3
lib/util-yaml.sh
View file

@ -366,7 +366,6 @@ check_yaml(){
write_calamares_yaml(){ write_calamares_yaml(){
configure_calamares "${yaml_dir}" configure_calamares "${yaml_dir}"
local yf
if ${validate}; then if ${validate}; then
for conf in "${yaml_dir}"/etc/calamares/modules/*.conf "${yaml_dir}"/etc/calamares/settings.conf; do for conf in "${yaml_dir}"/etc/calamares/modules/*.conf "${yaml_dir}"/etc/calamares/settings.conf; do
check_yaml "$conf" check_yaml "$conf"
@ -401,7 +400,7 @@ prepare_check(){
profile=$1 profile=$1
local edition=$(get_edition ${profile}) local edition=$(get_edition ${profile})
profile_dir=${run_dir}/${edition}/${profile} profile_dir=${run_dir}/${edition}/${profile}
check_profile check_profile "${profile_dir}"
load_profile_config "${profile_dir}/profile.conf" load_profile_config "${profile_dir}/profile.conf"
yaml_dir=${cache_dir_netinstall}/${profile}/${target_arch} yaml_dir=${cache_dir_netinstall}/${profile}/${target_arch}

17
lib/util.sh
View file

@ -459,10 +459,9 @@ load_profile_config(){
[[ -z ${smb_workgroup} ]] && smb_workgroup='' [[ -z ${smb_workgroup} ]] && smb_workgroup=''
[[ -z ${basic} ]] && basic='true' basic='true'
[[ -z ${extra} ]] && extra='false' [[ -z ${extra} ]] && extra='false'
#${basic} && extra='false'
${extra} && basic='false' ${extra} && basic='false'
check_profile_vars check_profile_vars
@ -506,11 +505,11 @@ reset_profile(){
} }
check_profile(){ check_profile(){
local keyfiles=("${profile_dir}/Packages-Root" local keyfiles=("$1/Packages-Root"
"${profile_dir}/Packages-Live") "$1/Packages-Live")
local keydirs=("${profile_dir}/root-overlay" local keydirs=("$1/root-overlay"
"${profile_dir}/live-overlay") "$1/live-overlay")
local has_keyfiles=false has_keydirs=false local has_keyfiles=false has_keydirs=false
for f in ${keyfiles[@]}; do for f in ${keyfiles[@]}; do
@ -530,12 +529,12 @@ check_profile(){
fi fi
done done
if ! ${has_keyfiles} && ! ${has_keydirs};then if ! ${has_keyfiles} && ! ${has_keydirs};then
die "Profile [%s] sanity check failed!" "${profile_dir}" die "Profile [%s] sanity check failed!" "$1"
fi fi
[[ -f "${profile_dir}/Packages-Desktop" ]] && packages_desktop=${profile_dir}/Packages-Desktop [[ -f "$1/Packages-Desktop" ]] && packages_desktop=$1/Packages-Desktop
[[ -f "${profile_dir}/Packages-Mhwd" ]] && packages_mhwd=${profile_dir}/Packages-Mhwd [[ -f "$1/Packages-Mhwd" ]] && packages_mhwd=$1/Packages-Mhwd
if ! ${netinstall}; then if ! ${netinstall}; then
chrootcfg="false" chrootcfg="false"