From 19cece4d0e2e092d0ec56783475e65fa5dcec151 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Mon, 22 May 2017 00:00:03 +0200
Subject: [PATCH] buildiso: let live services depend on netinstall switch

---
 data/profile.conf.example | 10 ----------
 lib/util-iso-chroot.sh    |  4 ++--
 lib/util.sh               | 15 +++++++--------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/data/profile.conf.example b/data/profile.conf.example
index c6efca9..29daabf 100644
--- a/data/profile.conf.example
+++ b/data/profile.conf.example
@@ -58,13 +58,3 @@
 
 # unset defaults to given value
 # password="manjaro"
-
-# unset defaults to given values
-# names must match systemd service names
-# services in enable_systemd array don't need to be listed here
-# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
-
-# unset defaults to given values,
-# names must match openrc service names
-# services in enable_openrc array don't need to be listed here
-# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
diff --git a/lib/util-iso-chroot.sh b/lib/util-iso-chroot.sh
index bff2a1d..325896f 100644
--- a/lib/util-iso-chroot.sh
+++ b/lib/util-iso-chroot.sh
@@ -105,7 +105,7 @@ configure_services(){
                 [[ $svc == "xdm" ]] && set_xdm "$mnt"
                 add_svc_rc "$mnt" "$svc"
             done
-            for svc in ${enable_openrc_live[@]}; do
+            for svc in ${enable_live[@]}; do
                 add_svc_rc "$mnt" "$svc"
             done
         ;;
@@ -113,7 +113,7 @@ configure_services(){
             for svc in ${enable_systemd[@]}; do
                 add_svc_sd "$mnt" "$svc"
             done
-            for svc in ${enable_systemd_live[@]}; do
+            for svc in ${enable_live[@]}; do
                 add_svc_sd "$mnt" "$svc"
             done
         ;;
diff --git a/lib/util.sh b/lib/util.sh
index e7242ee..e9385a7 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -357,14 +357,6 @@ load_profile(){
 
     [[ -z ${disable_openrc[@]} ]] && disable_openrc=()
 
-    if [[ -z ${enable_systemd_live[@]} ]];then
-        enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
-    fi
-
-    if [[ -z ${enable_openrc_live[@]} ]];then
-        enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
-    fi
-
     if [[ ${displaymanager} != "none" ]]; then
         enable_openrc+=('xdm')
         enable_systemd+=("${displaymanager}")
@@ -374,6 +366,13 @@ load_profile(){
 
     [[ -z ${chrootcfg} ]] && chrootcfg='false'
 
+    enable_live=('manjaro-live' 'pacman-init')
+    if ${netinstall};then
+        enable_live+=('mhwd-live-net' 'mirrors-live-net')
+    else
+        enable_live+=('mhwd-live' 'mirrors-live')
+    fi
+
     netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master"
 
     [[ -z ${geoip} ]] && geoip='true'