From 8e965dd3d2b41a7b47e876f3214f9b095864c404 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Mon, 27 Feb 2017 21:49:19 +0100
Subject: [PATCH] util, util-iso-boot: clean up code

---
 lib/util-iso-boot.sh | 8 +-------
 lib/util.sh          | 7 +------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh
index d169582..465fdc6 100644
--- a/lib/util-iso-boot.sh
+++ b/lib/util-iso-boot.sh
@@ -21,17 +21,11 @@ set_mkinicpio_hooks(){
     fi
 }
 
-gen_boot_args(){
-    local args=(quiet)
-    echo ${args[@]}
-}
-
 prepare_initcpio(){
     msg2 "Copying initcpio ..."
     cp /etc/initcpio/hooks/miso* $1/etc/initcpio/hooks
     cp /etc/initcpio/install/miso* $1/etc/initcpio/install
     cp /etc/initcpio/miso_shutdown $1/etc/initcpio
-#     sed -e "s|/usr/lib/initcpio/|/etc/initcpio/|" -i $1/etc/initcpio/install/miso_shutdown
 }
 
 prepare_initramfs(){
@@ -79,7 +73,7 @@ vars_to_boot_conf(){
         -e "s|@ARCH@|${target_arch}|g" \
         -e "s|@DRV@|$2|g" \
         -e "s|@SWITCH@|$3|g" \
-        -e "s|@BOOT_ARGS@|$(gen_boot_args)|g" \
+        -e "s|@BOOT_ARGS@||g" \
         -i $1
 }
 
diff --git a/lib/util.sh b/lib/util.sh
index 6de9bbf..7d20e01 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -393,11 +393,6 @@ check_profile_vars(){
     fi
 }
 
-get_svc(){
-    local service=${displaymanager}
-    echo $service
-}
-
 load_profile_config(){
 
     [[ -f $1 ]] || return 1
@@ -453,7 +448,7 @@ load_profile_config(){
 
     if [[ ${displaymanager} != "none" ]]; then
         enable_openrc+=('xdm')
-        enable_systemd+=("$(get_svc)")
+        enable_systemd+=("${displaymanager}")
     fi
 
     [[ -z ${netinstall} ]] && netinstall='false'