root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

added flag -n to disable multilib (override profile setting)

Browse source
This commit is contained in:
Frede Hundewadt 2023-12-16 08:26:01 +01:00
parent 98eda6b062
commit aec896c90c
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/buildiso.in
View file

@ -131,6 +131,7 @@ usage() {
echo " [default: ${kernel}]" echo " [default: ${kernel}]"
echo ' -l Create permalink' echo ' -l Create permalink'
echo ' -m Set SquashFS image mode to persistence' echo ' -m Set SquashFS image mode to persistence'
echo ' -n Disable multilib'
echo " -p <profile> Buildset or profile [default: ${build_list_iso}]" echo " -p <profile> Buildset or profile [default: ${build_list_iso}]"
echo ' -o Enable office installer module' echo ' -o Enable office installer module'
echo ' -q Query settings and pretend build' echo ' -q Query settings and pretend build'
@ -150,7 +151,7 @@ usage() {
orig_argv=("$@") orig_argv=("$@")
opts='p:a:b:r:t:k:g:d:cfzxmvqhilo' opts='p:a:b:r:t:k:g:d:cfzxmnvqhilo'
while getopts "${opts}" arg; do while getopts "${opts}" arg; do
case "${arg}" in case "${arg}" in
@ -163,6 +164,7 @@ while getopts "${opts}" arg; do
g) gpgkey="$OPTARG" ;; g) gpgkey="$OPTARG" ;;
k) kernel="$OPTARG" ;; k) kernel="$OPTARG" ;;
m) persist=true ;; m) persist=true ;;
n) no_multilib=true ;; # only exist if set here
p) build_list_iso="$OPTARG" ;; p) build_list_iso="$OPTARG" ;;
q) pretend=true ;; q) pretend=true ;;
r) chroots_iso="$OPTARG" ;; r) chroots_iso="$OPTARG" ;;

2
lib/util.sh
View file

@ -409,6 +409,7 @@ load_profile_config(){
[[ -z ${snap_channel} ]] && snap_channel="stable" [[ -z ${snap_channel} ]] && snap_channel="stable"
[[ -z ${multilib} ]] && multilib="true" [[ -z ${multilib} ]] && multilib="true"
[[ ${no_multilib} == 'true' ]] && multilib="false"
[[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true" [[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true"
@ -516,6 +517,7 @@ reset_profile(){
unset extra unset extra
unset full_iso unset full_iso
unset office_installer unset office_installer
unset no_multilib
} }
check_profile(){ check_profile(){