forked from mirrored-repos/manjaro-tools
no_extra option added
This commit is contained in:
parent
369cb4b3e5
commit
50f39a3b23
3 changed files with 14 additions and 2 deletions
|
@ -111,6 +111,7 @@ display_settings(){
|
|||
msg2 "images_only: %s" "${images_only}"
|
||||
msg2 "iso_only: %s" "${iso_only}"
|
||||
msg2 "persist: %s" "${persist}"
|
||||
msg2 "extra: %s" "${extra}"
|
||||
|
||||
msg "DIST SETTINGS:"
|
||||
msg2 "dist_name: %s" "${dist_name}"
|
||||
|
@ -155,6 +156,7 @@ usage() {
|
|||
echo ' -g <key> The gpg key for sfs signing'
|
||||
echo " [default: ${gpgkey}]"
|
||||
echo ' -m Set SquashFS image mode to persistence'
|
||||
echo ' -n Build minimal if available (extra=false)'
|
||||
echo ' -c Disable clean work dir'
|
||||
echo ' -x Build images only'
|
||||
echo ' -z Generate iso only'
|
||||
|
@ -169,7 +171,7 @@ usage() {
|
|||
|
||||
orig_argv=("$0" "$@")
|
||||
|
||||
opts='p:a:b:r:t:k:i:g:czxmvqh'
|
||||
opts='p:a:b:r:t:k:i:g:czxmnvqh'
|
||||
|
||||
while getopts "${opts}" arg; do
|
||||
case "${arg}" in
|
||||
|
@ -185,6 +187,7 @@ while getopts "${opts}" arg; do
|
|||
x) images_only=true ;;
|
||||
z) iso_only=true ;;
|
||||
m) persist=true ;;
|
||||
n) no_extra=true ;;
|
||||
v) verbose=true ;;
|
||||
q) pretend=true ;;
|
||||
h|?) usage 0 ;;
|
||||
|
|
|
@ -254,13 +254,18 @@ make_iso() {
|
|||
gen_iso_fn(){
|
||||
local vars=() name
|
||||
vars+=("${iso_name}")
|
||||
|
||||
if ${no_extra}: then
|
||||
vars+=("minimal")
|
||||
fi
|
||||
|
||||
if ! ${chrootcfg};then
|
||||
[[ -n ${profile} ]] && vars+=("${profile}")
|
||||
fi
|
||||
[[ ${initsys} == 'openrc' ]] && vars+=("${initsys}")
|
||||
vars+=("${dist_release}")
|
||||
vars+=("${target_branch}")
|
||||
vars+=("${target_arch}")
|
||||
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 ${no_extra}; then
|
||||
extra='false'
|
||||
fi
|
||||
|
||||
basic='true'
|
||||
[[ -z ${extra} ]] && extra='false'
|
||||
|
||||
|
|
Loading…
Reference in a new issue