diff --git a/README.md b/README.md index 6ef8a61..b24176f 100644 --- a/README.md +++ b/README.md @@ -242,6 +242,7 @@ Usage: buildiso [options] [default: linux49] -l Create permalink -m Set SquashFS image mode to persistence + -o Enable office installer -p Buildset or profile [default: default] -q Query settings and pretend build -r Chroots directory diff --git a/data/pacman-mirrors.conf b/data/pacman-mirrors.conf index 7141548..566e409 100644 --- a/data/pacman-mirrors.conf +++ b/data/pacman-mirrors.conf @@ -10,6 +10,10 @@ Branch = stable ## 2) random - randomly generate the output mirrorlist # Method = rank +## Filename to use when ranking mirrors +## The file must be present in core repo +# TestFile = core.db.tar.gz + ## Define protocols and priority ## separated by comma 'https,http' or 'http,https' ## ATM available protocols are: http, https, ftp diff --git a/lib/util.sh b/lib/util.sh index a964454..73d40fe 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -462,6 +462,8 @@ load_profile_config(){ [[ -z ${office_installer} ]] && office_installer="false" + [[ -z ${permalink} ]] && permalink="false" + return 0 } @@ -508,6 +510,8 @@ reset_profile(){ unset geoip unset extra unset full_iso + unset office_installer + unset permalink } check_profile(){ @@ -625,7 +629,7 @@ load_pkgs(){ esac local _office _office_rm - if ${office_chooser}; then + if ${office_installer}; then _office="s|>office||g" else _office_rm="s|>office.*||g"