PKG-198 Fix apparmor update issue in PS 8.4.2

percona · Oct 2, 2024 · de853dd · de853dd
1 parent 94497d6
commit de853dd
Showing 1 changed file with 23 additions and 17 deletions.
diff --git a/build-ps/debian/percona-server-server.postinst b/build-ps/debian/percona-server-server.postinst
@@ -47,22 +47,27 @@ check_exit_status() {
 # If the file has been changed, append telemetry rules to the file
 # If unchanged, install the new apparmor profile
 check_apparmor_files() {
-	if ! diff -q /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/old_apparmor >/dev/null; then
-		sed -i 's:  # Site-specific additions and overrides. See local/README for details.::' /etc/apparmor.d/usr.sbin.mysqld
-                sed -i 's:  #include <local/usr.sbin.mysqld>::' /etc/apparmor.d/usr.sbin.mysqld
-                sed -i '$ s/}//' /etc/apparmor.d/usr.sbin.mysqld
-                echo "# Allow access to PS telemetry directory" >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "  /usr/local/percona/telemetry/ps/ rw," >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "  /usr/local/percona/telemetry/ps/** rw," >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "" >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "  # Site-specific additions and overrides. See local/README for details." >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "  #include <local/usr.sbin.mysqld>" >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "}" >> /etc/apparmor.d/usr.sbin.mysqld
-                sed -r -i ':a; /^\s*$/ {N;ba}; s/( *\n *){2,}/\n/'  /etc/apparmor.d/usr.sbin.mysqld
-                rm -f /etc/apparmor.d/usr.sbin.mysqld.in2
-        else
-                mv -f /etc/apparmor.d/usr.sbin.mysqld.in2 /etc/apparmor.d/usr.sbin.mysqld
-        fi
+	TA_EXISTS=$(grep -c "telemetry" /etc/apparmor.d/usr.sbin.mysqld) 2> /dev/null || true
+	if [ "$TA_EXISTS" -eq 0 ]; then
+		if ! diff -q /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/old_apparmor >/dev/null; then
+			sed -i 's:  # Site-specific additions and overrides. See local/README for details.::' /etc/apparmor.d/usr.sbin.mysqld
+			sed -i 's:  #include <local/usr.sbin.mysqld>::' /etc/apparmor.d/usr.sbin.mysqld
+			sed -i '$ s/}//' /etc/apparmor.d/usr.sbin.mysqld
+			echo "# Allow access to PS telemetry directory" >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "  /usr/local/percona/telemetry/ps/ rw," >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "  /usr/local/percona/telemetry/ps/** rw," >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "" >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "  # Site-specific additions and overrides. See local/README for details." >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "  #include <local/usr.sbin.mysqld>" >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "}" >> /etc/apparmor.d/usr.sbin.mysqld
+			sed -r -i ':a; /^\s*$/ {N;ba}; s/( *\n *){2,}/\n/'  /etc/apparmor.d/usr.sbin.mysqld
+			rm -f /etc/apparmor.d/usr.sbin.mysqld.in2
+		else
+			mv -f /etc/apparmor.d/usr.sbin.mysqld.in2 /etc/apparmor.d/usr.sbin.mysqld
+		fi
+	else
+		rm -f /etc/apparmor.d/usr.sbin.mysqld.in2
+	fi
 }
 
 MY_BASEDIR_VERSION=$(my_print_defaults --loose-verbose mysqld server | grep basedir | awk -F'=' '{print $2}')
@@ -203,9 +208,10 @@ EOF
 	else
 		if [ -f "/etc/apparmor.d/usr.sbin.mysqld" ]; then
 			check_apparmor_files
+		else
+			mv -f /etc/apparmor.d/usr.sbin.mysqld.in2 /etc/apparmor.d/usr.sbin.mysqld 2> /dev/null || true
                 fi
 		rm -f /etc/apparmor.d/old_apparmor
-		mv -f /etc/apparmor.d/usr.sbin.mysqld.in2 /etc/apparmor.d/usr.sbin.mysqld 2> /dev/null || true
 		if aa-status --enabled 2>/dev/null; then
 			apparmor_parser -r -T -W /etc/apparmor.d/usr.sbin.mysqld 2>/dev/null || true
                 fi