Merge branch 'master' of github.com:manjaro/manjaro-tools into stable-0.14.x

bin/buildiso.in

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

bin/check-yaml.in

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

data/profile.conf.example

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

lib/util-yaml.sh

@@ -181,6 +181,7 @@ write_welcome_conf(){
     echo "requirements:" >> "$conf"
     echo "    requiredStorage:    7.9" >> "$conf"
     echo "    requiredRam:        1.0" >> "$conf"
+    echo "    internetCheckUrl:   https://manjaro.org" >> "$conf"
     echo "    check:" >> "$conf"
     echo "      - storage" >> "$conf"
     echo "      - ram" >> "$conf"

lib/util.sh

@@ -376,10 +376,7 @@ check_profile_vars(){
 
 get_svc(){
     local service=${displaymanager}
-    case $service in
+    ${plymouth_boot} && service="$service-plymouth"
-        'sddm'|'lxdm') service="$service" ;;
-        *) ${plymouth_boot} && service="$service-plymouth" ;;
-    esac
     echo $service
 }
 
@@ -459,6 +456,12 @@ load_profile_config(){
 
     [[ -z ${smb_workgroup} ]] && smb_workgroup=''
 
+    [[ -z ${basic} ]] && basic='true'
+    [[ -z ${extra} ]] && extra='false'
+
+    #${basic} && extra='false'
+    ${extra} && basic='false'
+
     check_profile_vars
 
     return 0
@@ -498,6 +501,7 @@ reset_profile(){
     unset netgroups
     unset geoip
     unset plymouth_boot
+    unset extra
 }
 
 check_profile(){
@@ -554,7 +558,20 @@ 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 _basic _basic_rm _extra _extra_rm
+
+    if ${basic};then
+        _basic="s|>basic||g"
+    else
+        _basic_rm="s|>basic.*||g"
+    fi
+
+    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 +655,10 @@ load_pkgs(){
             | sed "$_kernel" \
             | sed "$_edition" \
             | sed "$_edition_rm" \
+            | sed "$_basic" \
+            | sed "$_basic_rm" \
+            | sed "$_extra" \
+            | sed "$_extra_rm" \
             | sed "$_clean")
 
     if [[ $1 == "${packages_mhwd}" ]]; then