From 21deb78026b2db5ad24996053b6d431327f88b02 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sun, 30 Jul 2017 13:42:53 +0200
Subject: [PATCH 1/2] [util] introduce mhwd_used

---
 lib/util-yaml.sh | 2 ++
 lib/util.sh      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 0c649b4..17e1a2e 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -316,7 +316,9 @@ write_settings_conf(){
     echo "        - initcpio" >> "$conf" && write_initcpio_conf
     echo "        - users" >> "$conf"
     echo "        - displaymanager" >> "$conf" && write_displaymanager_conf
+    if ${mhwd_used};then
     echo "        - mhwdcfg" >> "$conf" && write_mhwdcfg_conf
+    fi
     echo "        - hwclock" >> "$conf"
     case ${initsys} in
         'systemd') echo "        - services" >> "$conf" && write_services_conf ;;
diff --git a/lib/util.sh b/lib/util.sh
index 8f80a5c..8be6d38 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -418,6 +418,8 @@ load_profile_config(){
 
     [[ -z ${netinstall} ]] && netinstall='false'
 
+    [[ -z ${mhwd_used} ]] && mhwd_used='true'
+
     [[ -z ${chrootcfg} ]] && chrootcfg='false'
 
     netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master"

From ed0903bf3fd7472e79b2fb204fdff207cb2637ca Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sat, 12 Aug 2017 17:25:38 +0100
Subject: [PATCH 2/2] [util{-yaml}] add oem_used function

---
 lib/util-yaml.sh | 41 ++++++++++++++++++++++++++++++++---------
 lib/util.sh      |  6 +++++-
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 17e1a2e..f4a1ca6 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -281,10 +281,18 @@ write_settings_conf(){
     echo "sequence:" >> "$conf"
     echo "    - show:" >> "$conf"
     echo "        - welcome" >> "$conf" && write_welcome_conf
-    echo "        - locale" >> "$conf" && write_locale_conf
-    echo "        - keyboard" >> "$conf"
+    if ${oem_used};then
+        msg2 "Skipping to show locale and keyboard modules."
+    else
+        echo "        - locale" >> "$conf" && write_locale_conf
+        echo "        - keyboard" >> "$conf"
+    fi
     echo "        - partition" >> "$conf"
-    echo "        - users" >> "$conf" && write_users_conf
+    if ${oem_used};then
+        msg2 "Skipping to show users module."
+    else
+        echo "        - users" >> "$conf" && write_users_conf
+    fi
     if ${netinstall};then
         echo "        - netinstall" >> "$conf" && write_netinstall_conf
     fi
@@ -307,17 +315,28 @@ write_settings_conf(){
     fi
     echo "        - machineid" >> "$conf" && write_machineid_conf
     echo "        - fstab" >> "$conf"
-    echo "        - locale" >> "$conf"
-    echo "        - keyboard" >> "$conf"
-    echo "        - localecfg" >> "$conf"
+    if ${oem_used};then
+        msg2 "Skipping to set locale, keyboard and localecfg modules."
+    else
+        echo "        - locale" >> "$conf"
+        echo "        - keyboard" >> "$conf"
+        echo "        - localecfg" >> "$conf"
+    fi
     echo "        - luksopenswaphookcfg" >> "$conf"
     echo "        - luksbootkeyfile" >> "$conf"
     echo "        - initcpiocfg" >> "$conf"
     echo "        - initcpio" >> "$conf" && write_initcpio_conf
-    echo "        - users" >> "$conf"
+    if ${oem_used};then
+        msg2 "Skipping to set users module."
+        echo "        - oemuser" >> "$conf"
+    else
+        echo "        - users" >> "$conf"
+    fi
     echo "        - displaymanager" >> "$conf" && write_displaymanager_conf
     if ${mhwd_used};then
-    echo "        - mhwdcfg" >> "$conf" && write_mhwdcfg_conf
+        echo "        - mhwdcfg" >> "$conf" && write_mhwdcfg_conf
+    else
+        msg2 "Skipping to set mhwdcfg module."
     fi
     echo "        - hwclock" >> "$conf"
     case ${initsys} in
@@ -326,7 +345,11 @@ write_settings_conf(){
     esac
     echo "        - grubcfg" >> "$conf"
     echo "        - bootloader" >> "$conf" && write_bootloader_conf
-    echo "        - postcfg" >> "$conf" && write_postcfg_conf
+    if ${oem_used};then
+        msg2 "Skipping to set postcfg module."
+    else
+        echo "        - postcfg" >> "$conf" && write_postcfg_conf
+    fi
     echo "        - umount" >> "$conf"
     echo "    - show:" >> "$conf"
     echo "        - finished" >> "$conf" && write_finished_conf
diff --git a/lib/util.sh b/lib/util.sh
index 8be6d38..bfa07b0 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -183,7 +183,9 @@ load_vars() {
 }
 
 prepare_dir(){
-    [[ ! -d $1 ]] && mkdir -p $1
+    if [[ ! -d $1 ]];then
+        mkdir -p $1
+    fi
 }
 
 # $1: chroot
@@ -420,6 +422,8 @@ load_profile_config(){
 
     [[ -z ${mhwd_used} ]] && mhwd_used='true'
 
+    [[ -z ${oem_used} ]] && oem_used='false'
+
     [[ -z ${chrootcfg} ]] && chrootcfg='false'
 
     netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master"