Merge ~xnox/ubuntu/+source/os-prober:ubuntu/devel into ubuntu/+source/os-prober:ubuntu/devel

[Dimitri John Ledkov]

Ignore logger socket-errors to workaround apparmor denials. (LP: #1826294)

diff --git a/common.sh b/common.sh
index e1646d4..16806a6 100644
--- a/common.sh
+++ b/common.sh
@@ -59,7 +59,7 @@ cache_progname() {
 
 log() {
   cache_progname
-  logger -t "$progname" "$@"
+  logger --socket-errors=off -t "$progname" "$@"
 }
 
 error() {
diff --git a/debian/changelog b/debian/changelog
index f22497a..fc5df72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+os-prober (1.81ubuntu2) lunar; urgency=medium
+
+  * Ignore logger socket-errors to workaround apparmor denials. (LP: #1826294)
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 07 Mar 2023 13:28:14 +0000
+
 os-prober (1.81ubuntu1) kinetic; urgency=low
 
   * Merge from Debian unstable (LP: #1987386). Remaining changes:
diff --git a/os-probes/init/common/10filesystems b/os-probes/init/common/10filesystems
index f50e55e..9d66e0e 100755
--- a/os-probes/init/common/10filesystems
+++ b/os-probes/init/common/10filesystems
@@ -26,7 +26,7 @@ if [ ! -e /var/lib/os-prober/modules ]; then
 			fs-*)
 				;;
 			*)
-				modprobe "$fs" 2>/dev/null | logger -t os-prober
+				modprobe "$fs" 2>/dev/null | logger --socket-errors=off -t os-prober
 				;;
 		esac
 	done
diff --git a/os-probes/mounted/powerpc/20macosx b/os-probes/mounted/powerpc/20macosx
index 2fc7e85..c128719 100755
--- a/os-probes/mounted/powerpc/20macosx
+++ b/os-probes/mounted/powerpc/20macosx
@@ -8,7 +8,7 @@ type="$3"
 
 debug() {
   if [ -z "$OS_PROBER_DISABLE_DEBUG" ]; then
-    logger -t macosx-prober "debug: $@"
+    logger --socket-errors=off -t macosx-prober "debug: $@"
   fi
 }