Lock failures now receive an extra message.

2011-07-14 16:34:53 +00:00
parent 31b4793161
commit 21b28d9ac2
12 changed files with 12 additions and 1 deletions
@@ -1 +1,2 @@
+usermod: existing lock file /etc/passwd.lock without a PID
 usermod: cannot lock /etc/passwd; try again later.
@@ -1 +1,2 @@
+usermod: existing lock file /etc/group.lock without a PID
 usermod: cannot lock /etc/group; try again later.
@@ -1 +1,2 @@
+usermod: existing lock file /etc/shadow.lock without a PID
 usermod: cannot lock /etc/shadow; try again later.
@@ -1 +1,2 @@
+usermod: existing lock file /etc/gshadow.lock without a PID
 usermod: cannot lock /etc/gshadow; try again later.
@@ -1 +1,2 @@
+usermod: existing lock file /etc/group.lock without a PID
 usermod: cannot lock /etc/group; try again later.
@@ -1 +1,2 @@
+usermod: existing lock file /etc/gshadow.lock without a PID
 usermod: cannot lock /etc/gshadow; try again later.
@@ -1 +1 @@
-userdel: user foo is currently logged in
+userdel: user foo is currently used by process <PID>
@@ -40,6 +40,7 @@ echo "======================================================================="
 cat tmp/userdel.err
 echo "======================================================================="
 echo -n "Check that there were a failure message..."
+sed -i -e "s/ [0-9]*$/ <PID>/" tmp/userdel.err
 diff -au data/userdel.err tmp/userdel.err
 echo "error message OK."
 rm -f tmp/userdel.err
@@ -1 +1,2 @@
+userdel: existing lock file /etc/passwd.lock without a PID
 userdel: cannot lock /etc/passwd; try again later.
@@ -1 +1,2 @@
+userdel: existing lock file /etc/group.lock without a PID
 userdel: cannot lock /etc/group; try again later.
@@ -1 +1,2 @@
+userdel: existing lock file /etc/shadow.lock without a PID
 userdel: cannot lock /etc/shadow; try again later.
@@ -1 +1,2 @@
+userdel: existing lock file /etc/gshadow.lock without a PID
 userdel: cannot lock /etc/gshadow; try again later.