From d881dc94c257854bd6c016538caabe4b0748bd70 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Sat, 19 Jul 2025 13:45:40 -0600
Subject: [PATCH] casper: fix profile overwriting.

---
 ...5apparmor_abrowser => 35apparmor_browsers} |  7 +++--
 helpers/DATA/casper/36apparmor_icecat         | 30 -------------------
 helpers/make-casper                           | 11 +++----
 3 files changed, 9 insertions(+), 39 deletions(-)
 rename helpers/DATA/casper/{35apparmor_abrowser => 35apparmor_browsers} (72%)
 delete mode 100644 helpers/DATA/casper/36apparmor_icecat

diff --git a/helpers/DATA/casper/35apparmor_abrowser b/helpers/DATA/casper/35apparmor_browsers
similarity index 72%
rename from helpers/DATA/casper/35apparmor_abrowser
rename to helpers/DATA/casper/35apparmor_browsers
index dffa611..c3ac340 100644
--- a/helpers/DATA/casper/35apparmor_abrowser
+++ b/helpers/DATA/casper/35apparmor_browsers
@@ -20,10 +20,13 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-cat << EOF > /root/etc/rc.local
+cat << 'EOF' > /root/etc/rc.local
 #!/bin/sh
 # Enable apparmor profile during live session to allow Abrowser to create user namespaces
-[ -d /rofs ] && apparmor_parser -a /etc/apparmor.d/abrowser
+BROWSERS="abrowser icecat"
+for browser in $BROWSERS; do
+[ -d /rofs ] && apparmor_parser -a /etc/apparmor.d/$browser
+done
 EOF
 chmod 755 /root/etc/rc.local
 
diff --git a/helpers/DATA/casper/36apparmor_icecat b/helpers/DATA/casper/36apparmor_icecat
deleted file mode 100644
index 6204cee..0000000
--- a/helpers/DATA/casper/36apparmor_icecat
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Enabling IceCat apparmor profile..."
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-. /scripts/casper-functions
-
-log_begin_msg "$DESCRIPTION"
-
-cat << EOF > /root/etc/rc.local
-#!/bin/sh
-# Enable apparmor profile during live session to allow IceCat to create user namespaces
-[ -d /rofs ] && apparmor_parser -a /etc/apparmor.d/icecat
-EOF
-chmod 755 /root/etc/rc.local
-
-log_end_msg
diff --git a/helpers/make-casper b/helpers/make-casper
index 798fc77..816ed70 100644
--- a/helpers/make-casper
+++ b/helpers/make-casper
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=23
+VERSION=24
 
 . ./config
 
@@ -41,14 +41,11 @@ sed "s/cut/cut -d: -f2- | cut/" -i scripts/casper-functions
 sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions
 
 # Set trisquel isos as default suggestion.
-patch --no-backup-if-mismatch -p1 < $DATA/set_trisquel_iso_suggestion.patch
+patch_p1 $DATA/set_trisquel_iso_suggestion.patch
 
 # Enable abrowser apparmor profile
-for i in 35apparmor_abrowser 36apparmor_icecat
-do
-    cp $DATA/$i scripts/casper-bottom
-    chmod 755 scripts/casper-bottom/$i
-done
+cp $DATA/35apparmor_browsers scripts/casper-bottom
+chmod 755 scripts/casper-bottom/35apparmor_browsers
 
 changelog "Compiled and customized for Trisquel enviroment."