diff --git a/bin/buildiso.in b/bin/buildiso.in index 5391d21..2bf4236 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -155,8 +155,8 @@ usage() { echo ' -g 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 ' -f Build full iso (extra=true)' echo ' -x Build images only' echo ' -z Generate iso only' echo ' Requires pre built images (-x)' @@ -170,7 +170,7 @@ usage() { orig_argv=("$0" "$@") -opts='p:a:b:r:t:k:i:g:czxmnvqh' +opts='p:a:b:r:t:k:i:g:cfzxmvqh' while getopts "${opts}" arg; do case "${arg}" in @@ -183,10 +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 ;; - n) no_extra=true ;; + m) persist=true ;; v) verbose=true ;; q) pretend=true ;; h|?) usage 0 ;; diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 018f298..b235217 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -260,7 +260,7 @@ gen_iso_fn(){ [[ ${initsys} == 'openrc' ]] && vars+=("${initsys}") vars+=("${dist_release}") vars+=("${target_branch}") - if ${no_extra}; then + if ! ${full_iso}; then vars+=("minimal") fi vars+=("${target_arch}") diff --git a/lib/util.sh b/lib/util.sh index 20833c3..1881b82 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -379,8 +379,8 @@ load_profile_config(){ [[ -z ${smb_workgroup} ]] && smb_workgroup='' - if ${no_extra}; then - extra='false' + if ${full_iso}; then + extra='true' fi basic='true'