From 31249fa9fd147696cf389beaf0c7762ef596b3f3 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Fri, 2 Nov 2018 18:41:23 +0100
Subject: [PATCH] Adopt by default kernel 4.19 and master branch. Note when we
 decide to create a v18.0 branch we need to change it

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 data/manjaro-tools.conf | 10 +++++-----
 lib/util.sh             |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index 8ac11ca..0b2d2a9 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -37,17 +37,17 @@
 
 ################ buildiso ################
 
-#default branch for iso-profiles repo: v17.1>current release | master>development release
-# branch=v17.1
+#default branch for iso-profiles repo: master>current release
+# branch=master
 
 # default iso build list; name without .list extension
 # build_list_iso=default
 
 # the dist release; default: auto
-# dist_release=17.1
+# dist_release=18.0
 
 # the dist codename; default: auto
-# dist_codename=Hakoila
+# dist_codename=Illyria
 
 # the branding; default: auto
 # dist_branding="MJRO"
@@ -57,7 +57,7 @@
 # iso_compression=xz
 
 # unset defaults to given value
-# kernel="linux414"
+# kernel="linux419"
 
 # gpg key; leave empty or commented to skip sfs signing
 # gpgkey=""
diff --git a/lib/util.sh b/lib/util.sh
index 5deea77..aa7d5bd 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -315,7 +315,7 @@ init_buildiso(){
 
     iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
 
-    [[ -z ${kernel} ]] && kernel="linux414"
+    [[ -z ${kernel} ]] && kernel="linux419"
     
     load_run_dir "${profile_repo}"
     
@@ -325,7 +325,7 @@ init_buildiso(){
     	branch=$(git rev-parse --abbrev-ref HEAD)
     	cd ${current_path}
     else
-    	[[ -z ${branch} ]] && branch="v17.1" #current branch release
+    	[[ -z ${branch} ]] && branch="master" #current branch release
     fi
 
     [[ -z ${gpgkey} ]] && gpgkey=''