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

buildiso: add ">extra" tag in pkglists to support full profiles

Browse source
This commit is contained in:
udeved 2017-02-04 10:51:00 +01:00
parent bf1e534684
commit 84784f2774
4 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildiso.in
View file

@ -34,6 +34,8 @@ show_profile(){
[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
msg2 "extra: %s" "${extra}"
msg2 "netinstall: %s" "${netinstall}"
msg2 "chrootcfg: %s" "${chrootcfg}"
${netinstall} && msg2 "netgroups: %s" "$(get_yaml)"

2
bin/check-yaml.in
View file

@ -31,6 +31,8 @@ show_profile(){
[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
msg2 "extra: %s" "${extra}"
msg2 "netinstall: %s" "${netinstall}"
msg2 "chrootcfg: %s" "${chrootcfg}"
${netinstall} && msg2 "netgroups: %s" "$(get_yaml)"

3
data/profile.conf.example
View file

@ -8,6 +8,9 @@
# use pxe
# pxe_boot="true"
# use extra packages as defined in pkglist to activate a full profile
# extra="false"
################ torrent ################
# the torrent tracker urls, comma separated

14
lib/util.sh
View file

@ -400,6 +400,8 @@ load_profile_config(){
[[ -z ${pxe_boot} ]] && pxe_boot="true"
[[ -z ${extra} ]] && extra='false'
[[ -z ${plymouth_boot} ]] && plymouth_boot="true"
[[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true"
@ -498,6 +500,7 @@ reset_profile(){
unset netgroups
unset geoip
unset plymouth_boot
unset extra
}
check_profile(){
@ -554,7 +557,14 @@ load_pkgs(){
;;
esac
local _multi _nonfree_default _nonfree_multi _arch _arch_rm _nonfree_i686 _nonfree_x86_64
local _multi _nonfree_default _nonfree_multi _arch _arch_rm _nonfree_i686 _nonfree_x86_64 _extra _extra_rm
if ${extra};then
_extra="s|>extra||g"
else
_extra_rm="s|>extra.*||g"
fi
case "${target_arch}" in
"i686")
_arch="s|>i686||g"
@ -638,6 +648,8 @@ load_pkgs(){
| sed "$_kernel" \
| sed "$_edition" \
| sed "$_edition_rm" \
| sed "$_extra" \
| sed "$_extra_rm" \
| sed "$_clean")
if [[ $1 == "${packages_mhwd}" ]]; then