From e0d48fcd2fb1a7bbb6cb9bb4bce819ef8c5cf024 Mon Sep 17 00:00:00 2001
From: Andrea Righi <andrea.righi@canonical.com>
Date: Thu, 22 Feb 2024 11:05:37 +0100
Subject: [PATCH] virtme-ng: hide additional sudo settings

Try to keep sudo settings as simple as possible and rely only on our
custom /etc/sudoers.

This can help to prevent potential permissions errors while using sudo
inside a virtme-ng guest.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 virtme/guest/virtme-init | 6 ++++++
 virtme_ng_init           | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/virtme/guest/virtme-init b/virtme/guest/virtme-init
index 20ef887..58a1058 100755
--- a/virtme/guest/virtme-init
+++ b/virtme/guest/virtme-init
@@ -97,6 +97,9 @@ fi
 # Additional rw dirs required by snapd (if present)
 [ -e /var/lib/snapd/cookie ] && mount -t tmpfs tmpfs /var/lib/snapd/cookie &
 
+# Hide additional sudo settings
+[ -e /var/lib/sudo ] && mount -t tmpfs tmpfs /var/lib/sudo &
+
 # Fix up /etc a little bit
 touch /tmp/fstab
 mount --bind /tmp/fstab /etc/fstab
@@ -212,6 +215,9 @@ ip link set dev lo up
 
 # Setup sudoers
 real_sudoers=/etc/sudoers
+if [ ! -e ${real_sudoers} ]; then
+    touch ${real_sudoers}
+fi
 tmpfile="`mktemp --tmpdir=/tmp`"
 echo "Defaults secure_path=\"/usr/sbin:/usr/bin:/sbin:/bin\"" > $tmpfile
 echo "root ALL = (ALL) NOPASSWD: ALL" >> $tmpfile
diff --git a/virtme_ng_init b/virtme_ng_init
index 49615ab..a0d6fee 160000
--- a/virtme_ng_init
+++ b/virtme_ng_init
@@ -1 +1 @@
-Subproject commit 49615abce6beb3ae158893f1599b60b099ba987c
+Subproject commit a0d6feef6d3fd6b8869b5eddd06134a5abd5187d