From e7f25571d0865cd08bceac7c4e5bba845a8805a2 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Tue, 17 Jun 2025 00:22:34 +0200
Subject: [PATCH] chore(profile): rename netplan.script to netplan.

---
 apparmor.d/groups/network/{netplan.script => netplan} | 8 ++++----
 apparmor.d/groups/ubuntu/subiquity-console-conf       | 2 +-
 dists/flags/main.flags                                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename apparmor.d/groups/network/{netplan.script => netplan} (81%)

diff --git a/apparmor.d/groups/network/netplan.script b/apparmor.d/groups/network/netplan
similarity index 81%
rename from apparmor.d/groups/network/netplan.script
rename to apparmor.d/groups/network/netplan
index 094726865..5855131a8 100644
--- a/apparmor.d/groups/network/netplan.script
+++ b/apparmor.d/groups/network/netplan
@@ -7,7 +7,7 @@ abi <abi/4.0>,
 include <tunables/global>
 
 @{exec_path} = /usr/share/netplan/netplan.script
-profile netplan.script @{exec_path} flags=(attach_disconnected) {
+profile netplan @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
@@ -33,7 +33,7 @@ profile netplan.script @{exec_path} flags=(attach_disconnected) {
     @{run}/udev/rules.d/90-netplan.rules rw,
     @{run}/udev/rules.d/90-netplan.rules.@{rand6} rw,
 
-    include if exists <local/netplan.script_udevadm>
+    include if exists <local/netplan_udevadm>
   }
 
   profile systemctl {
@@ -42,10 +42,10 @@ profile netplan.script @{exec_path} flags=(attach_disconnected) {
 
     capability net_admin,
 
-    include if exists <local/netplan.script_systemctl>
+    include if exists <local/netplan_systemctl>
   }
 
-  include if exists <local/netplan.script>
+  include if exists <local/netplan>
 }
 
 # vim:syntax=apparmor
diff --git a/apparmor.d/groups/ubuntu/subiquity-console-conf b/apparmor.d/groups/ubuntu/subiquity-console-conf
index 916279378..840e33cdd 100644
--- a/apparmor.d/groups/ubuntu/subiquity-console-conf
+++ b/apparmor.d/groups/ubuntu/subiquity-console-conf
@@ -38,7 +38,7 @@ profile subiquity-console-conf @{exec_path} {
   @{sbin}/sshd                           rPx,
   @{bin}/snap                           rPUx,
   /usr/lib/snapd/snap-recovery-chooser  rPUx,
-  /usr/share/netplan/netplan.script     rPUx, # TODO: rPx,
+  /usr/share/netplan/netplan.script      rPx,
 
   /usr/share/subiquity/{,**} r,
   /usr/share/subiquity/console-conf-tui rix,
diff --git a/dists/flags/main.flags b/dists/flags/main.flags
index 77ea8761f..71670d4d7 100644
--- a/dists/flags/main.flags
+++ b/dists/flags/main.flags
@@ -240,7 +240,7 @@ multipathd complain
 needrestart-hook complain
 needrestart-notify complain
 needrestart-restart complain
-netplan.script attach_disconnected,complain
+netplan attach_disconnected,complain
 networkctl attach_disconnected,complain
 networkd-dispatcher complain
 nm-online complain