-f build full_iso instead of -n no_extra

This commit is contained in:
fhdk 2018-03-18 18:11:17 +01:00
parent c2933bb143
commit 266b8db157
3 changed files with 7 additions and 7 deletions

View file

@ -155,8 +155,8 @@ 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 ' -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 ;;

View file

@ -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}")

View file

@ -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'