forked from mirrored-repos/manjaro-tools
Merge pull request #282 from fhdk/master
Option to override `extra` option in profile
This commit is contained in:
commit
59e04fc4d1
3 changed files with 13 additions and 4 deletions
|
@ -156,6 +156,7 @@ usage() {
|
|||
echo " [default: ${gpgkey}]"
|
||||
echo ' -m Set SquashFS image mode to persistence'
|
||||
echo ' -c Disable clean work dir'
|
||||
echo ' -f Build full iso (extra=true)'
|
||||
echo ' -x Build images only'
|
||||
echo ' -z Generate iso only'
|
||||
echo ' Requires pre built images (-x)'
|
||||
|
@ -169,7 +170,7 @@ usage() {
|
|||
|
||||
orig_argv=("$0" "$@")
|
||||
|
||||
opts='p:a:b:r:t:k:i:g:czxmvqh'
|
||||
opts='p:a:b:r:t:k:i:g:cfzxmvqh'
|
||||
|
||||
while getopts "${opts}" arg; do
|
||||
case "${arg}" in
|
||||
|
@ -182,9 +183,10 @@ while getopts "${opts}" arg; do
|
|||
i) initsys="$OPTARG" ;;
|
||||
g) gpgkey="$OPTARG" ;;
|
||||
c) clean_first=false ;;
|
||||
f) full_iso=true ;;
|
||||
x) images_only=true ;;
|
||||
z) iso_only=true ;;
|
||||
m) persist=true ;;
|
||||
m) persist=true ;;
|
||||
v) verbose=true ;;
|
||||
q) pretend=true ;;
|
||||
h|?) usage 0 ;;
|
||||
|
|
|
@ -253,14 +253,17 @@ make_iso() {
|
|||
|
||||
gen_iso_fn(){
|
||||
local vars=() name
|
||||
vars+=("${iso_name}")
|
||||
vars+=("${iso_name}")
|
||||
if ! ${chrootcfg};then
|
||||
[[ -n ${profile} ]] && vars+=("${profile}")
|
||||
fi
|
||||
[[ ${initsys} == 'openrc' ]] && vars+=("${initsys}")
|
||||
vars+=("${dist_release}")
|
||||
vars+=("${target_branch}")
|
||||
vars+=("${target_arch}")
|
||||
if ! ${full_iso}; then
|
||||
vars+=("minimal")
|
||||
fi
|
||||
vars+=("${target_arch}")
|
||||
for n in ${vars[@]};do
|
||||
name=${name:-}${name:+-}${n}
|
||||
done
|
||||
|
|
|
@ -379,6 +379,10 @@ load_profile_config(){
|
|||
|
||||
[[ -z ${smb_workgroup} ]] && smb_workgroup=''
|
||||
|
||||
if ${full_iso}; then
|
||||
extra='true'
|
||||
fi
|
||||
|
||||
basic='true'
|
||||
[[ -z ${extra} ]] && extra='false'
|
||||
|
||||
|
|
Loading…
Reference in a new issue