From 1b32aa25b8b246672901c833201b4b67e05276f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 30 Jun 2019 09:10:11 +0200
Subject: [PATCH] [snaps] make it more optional

---
 lib/util-iso-image.sh | 10 ++++++++++
 lib/util-iso.sh       |  5 ++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 12ab44d..5eddf14 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -218,12 +218,22 @@ configure_journald(){
 
 configure_services(){
     info "Configuring services"
+    use_apparmor="false"
+    apparmor_boot_args=""
     for svc in ${enable_systemd[@]}; do
         add_svc_sd "$1" "$svc"
+        [[ "$svc" == "apparmor" ]] && use_apparmor="true"
     done
     for svc in ${enable_systemd_live[@]}; do
         add_svc_sd "$1" "$svc"
+        [[ "$svc" == "apparmor" ]] && use_apparmor="true"
     done
+
+    if [[ ${use_apparmor} == 'true' ]]; then
+        msg2 "Enable apparmor kernel parameters"
+        apparmor_boot_args="'apparmor=1' 'security=apparmor'"
+    fi
+
     info "Done configuring services"
 }
 
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index a4505c9..c5a7056 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -246,6 +246,7 @@ function seed_snaps() {
     local SEED_SNAPS="${strict_snaps} ${classic_snaps}"
 
     if [[ -n "${strict_snaps}" ]] || [[ -n "${classic_snaps}" ]]; then
+        msg2 "Configuring snaps"
         # Preseeded snaps should be downloaded from a versioned channel
         rm -rfv "$1/${SEED_DIR}"
         mkdir -p "$1/${SEED_DIR}/snaps"
@@ -265,8 +266,6 @@ function seed_snaps() {
         # Runs outside the container.
         snap known model > /tmp/generic.model
         snap prepare-image --arch amd64 --classic /tmp/generic.model "${SEED_LIST[@]}" "$1"
-
-        snap_boot_args="'apparmor=1' 'security=apparmor'"
     else
         msg2 "No snaps found in profile. Skipping adding snaps"
     fi
@@ -423,7 +422,7 @@ make_image_boot() {
 
 configure_grub(){
     local default_args="misobasedir=${iso_name} misolabel=${iso_label}" \
-        boot_args=('quiet' 'systemd.show_status=1' ${snap_boot_args})
+        boot_args=('quiet' 'systemd.show_status=1' ${apparmor_boot_args})
 
     sed -e "s|@DIST_NAME@|${dist_name}|g" \
         -e "s|@ARCH@|${target_arch}|g" \