forked from mirrored-repos/manjaro-tools
buildiso: add profile_repo variable to configure
This commit is contained in:
parent
13587d3079
commit
1ab0ef0f79
4 changed files with 12 additions and 0 deletions
|
@ -83,6 +83,9 @@ overriding
|
|||
|
||||
################ buildiso ################
|
||||
|
||||
# the iso-profiles directory name/git repo name
|
||||
# profile_repo='manjaro-tools-iso-profiles'
|
||||
|
||||
# default iso buildset; name without .set extension
|
||||
# buildset_iso=default
|
||||
|
||||
|
|
|
@ -69,6 +69,7 @@ display_settings(){
|
|||
msg2 "buildsets: $(load_sets ${sets_dir_iso})"
|
||||
msg2 "buildset_iso: ${buildset_iso}"
|
||||
msg2 "is_buildset: ${is_buildset}"
|
||||
msg2 "profile_repo: ${profile_repo}"
|
||||
|
||||
msg "OPTIONS:"
|
||||
msg2 "arch: ${arch}"
|
||||
|
@ -103,6 +104,9 @@ load_user_info
|
|||
load_config "${USER_CONFIG}/manjaro-tools.conf"
|
||||
load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
# to force old way to have buildiso run in iso-profiles dir
|
||||
# run_dir=$(pwd)
|
||||
|
||||
load_run_dir "${profile_repo}"
|
||||
|
||||
clean_first=true
|
||||
|
|
|
@ -34,6 +34,9 @@
|
|||
|
||||
################ buildiso ################
|
||||
|
||||
# the iso-profiles directory name/git repo name
|
||||
profile_repo='manjaro-tools-iso-profiles'
|
||||
|
||||
# default iso buildset; name without .set extension
|
||||
# buildset_iso=default
|
||||
|
||||
|
|
|
@ -201,6 +201,8 @@ init_buildiso(){
|
|||
[[ -z ${use_overlayfs} ]] && use_overlayfs='true'
|
||||
used_kernel=$(uname -r | cut -d . -f1)
|
||||
[[ ${used_kernel} -lt "4" ]] && use_overlayfs='false'
|
||||
|
||||
[[ -z ${profile_repo} ]] && profile_repo='manjaro-tools-iso-profiles'
|
||||
}
|
||||
|
||||
init_deployiso(){
|
||||
|
|
Loading…
Reference in a new issue