diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 6e23052e61d1..fbb8e8d04f2c 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -98,6 +98,7 @@ mkdir -m 0700 -p /var/log/journal
 # Miscellaneous boot time cleanup.
 rm -rf /var/run /var/lock
 rm -f /etc/resolv.conf
+rm -f /etc/{group,passwd,shadow}.lock
 
 if test -n "@cleanTmpDir@"; then
     echo -n "cleaning \`/tmp'..."