From ac408e3f5aec8d4902b85e3f50acba78e72582de Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Tue, 1 Nov 2016 11:16:22 +0100
Subject: [PATCH] buildiso: use new netgroups repo for netgroups url

---
 lib/util-yaml.sh | 8 ++++----
 lib/util.sh      | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 728dda7..7fb9692 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -232,18 +232,18 @@ write_postcfg_conf(){
 }
 
 get_yaml(){
-    local args=() ext="yaml" yaml
+    local args=() yaml
     if ${chrootcfg};then
         args+=('chrootcfg')
     else
-        args+=("packages")
+        args+=("${profile}/packages")
     fi
     args+=("${initsys}")
     [[ ${edition} == 'sonar' ]] && args+=("${edition}")
     for arg in ${args[@]};do
         yaml=${yaml:-}${yaml:+-}${arg}
     done
-    echo "${yaml}.${ext}"
+    echo "${yaml}.yaml"
 }
 
 write_netinstall_conf(){
@@ -399,7 +399,7 @@ write_pacman_group_yaml(){
 }
 
 prepare_check(){
-    local profile=$1
+    profile=$1
     edition=$(get_edition ${profile})
     profile_dir=${run_dir}/${edition}/${profile}
     check_profile
diff --git a/lib/util.sh b/lib/util.sh
index 385d815..4968180 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -456,7 +456,7 @@ load_profile_config(){
 
     #[[ -z ${netgroups} ]] && -- needs to be hardcoded for now, until a standard has been established
     # will be unlocked again after everything has been established.
-    netgroups="https://raw.githubusercontent.com/manjaro/iso-profiles/master/shared/netgroups"
+    netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master"
 
     [[ -z ${geoip} ]] && geoip='true'
 
@@ -646,8 +646,7 @@ load_pkgs(){
 
     if [[ $1 == "${packages_mhwd}" ]]; then
 
-        local  _used_kernel=${kernel:5:2}
-                [[ ${_used_kernel} < "42" ]] && local _amd="s|xf86-video-amdgpu||g"
+        [[ ${_used_kernel} < "42" ]] && local _amd="s|xf86-video-amdgpu||g"
 
         packages_cleanup=$(sed "$_com_rm" "$1" \
             | grep cleanup \