From b17e23b6201a9d0965662f8a4b2972ee2e570b9a Mon Sep 17 00:00:00 2001
From: Yoann Vandoorselaere <yoann@mandriva.com>
Date: Wed, 1 Dec 1999 15:51:15 +0000
Subject: Ok now add the user list to audio group ( level 1 & 2 ). lib.sh
 delete user list from audio group

---
 init-sh/lib.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'init-sh/lib.sh')

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
 
 
-- 
cgit v1.2.1