From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Tue, 23 Aug 2022 23:56:21 +0000 (+0200)
Subject: rootfspostcommands.py: Cleanup subid backup files generated by shadow-utils
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3144
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e4ea5adea8a00b4a78ffbe7cc60931deb74c161;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

rootfspostcommands.py: Cleanup subid backup files generated by shadow-utils

When creating users, shadow-utils might create backup files for
subordinate ID files (subid, subgid). Make sure we clean them up
similarly to the other backup files shadow-utils creates.

Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/rootfspostcommands.py b/meta/lib/rootfspostcommands.py
index e344ae2efc2..5386eea409e 100644
--- a/meta/lib/rootfspostcommands.py
+++ b/meta/lib/rootfspostcommands.py
@@ -73,6 +73,8 @@ def remove_shadowutils_backup_files(sysconfdir):
             'gshadow',
             'passwd',
             'shadow',
+            'subgid',
+            'subuid',
         ):
         filepath = os.path.join(sysconfdir, filename)
         remove_shadowutils_backup_file(filepath)