aboutsummaryrefslogtreecommitdiffstats
path: root/init-sh/lib.sh
diff options
context:
space:
mode:
Diffstat (limited to 'init-sh/lib.sh')
-rw-r--r--init-sh/lib.sh12
1 files changed, 9 insertions, 3 deletions
diff --git a/init-sh/lib.sh b/init-sh/lib.sh
index 499e81e..ec5e2dd 100644
--- a/init-sh/lib.sh
+++ b/init-sh/lib.sh
@@ -23,7 +23,6 @@ if [ -f /etc/security/msec/security.conf ]; then
. /etc/security/msec/security.conf
fi
-USERNAME="blah"
COMMENT="# Mandrake-Security : if you remove this comment, remove the next line too."
WaitAnswer() {
@@ -177,8 +176,15 @@ groupadd audio >& /dev/null
groupadd xgrp >& /dev/null
usermod -G xgrp xfs
-if ! /etc/security/msec/init-sh/grpuser --del audio "${USERNAME}"; then
- echo "Problem removing user \"${USERNAME}\" from group audio."
+# We aren't at install time,
+# so we delete ( temporarily ) audio user.
+
+if [ ! -f /tmp/secure.DrakX ]; then
+ for user in ${USERS_DRAKX}; do
+ if ! /etc/security/msec/init-sh/grpuser --del audio "${user}"; then
+ echo "Problem removing user \"${user}\" from group audio."
+ fi
+ done
fi