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/file_perm.sh |  4 ++++
 init-sh/level1.sh    |  7 +++++--
 init-sh/level2.sh    |  8 +++++---
 init-sh/lib.sh       | 12 +++++++++---
 4 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'init-sh')

diff --git a/init-sh/file_perm.sh b/init-sh/file_perm.sh
index 9f76791..be834b7 100755
--- a/init-sh/file_perm.sh
+++ b/init-sh/file_perm.sh
@@ -3,6 +3,8 @@
 IFS="
 "
 
+echo -n "Setting files permissions : "
+
 for line in `cat /$1`; do
 	file=`echo ${line} | awk '{print $1}'`
 	owner=`echo ${line} | awk '{print $2}'`
@@ -15,5 +17,7 @@ for line in `cat /$1`; do
 		chmod ${perm} ${file}
 	fi
 done
+
+echo "done."
 		
 	
diff --git a/init-sh/level1.sh b/init-sh/level1.sh
index 8654fb2..7980fa0 100755
--- a/init-sh/level1.sh
+++ b/init-sh/level1.sh
@@ -64,8 +64,11 @@ AddRules "PATH=\$PATH:/usr/X11R6/bin:." /etc/profile quiet
 AddRules "export PATH SECURE_LEVEL" /etc/profile
 
 # Group
-echo "Adding \"${USERNAME} to audio group :"
-usermod -G audio "${USERNAME}"
+echo -n "Adding \"${USERS_DRAKX}\" to audio group :"
+for user in ${USERS_DRAKX}; do
+    usermod -G audio "${user}"
+done
+echo "done."
 
 
 
diff --git a/init-sh/level2.sh b/init-sh/level2.sh
index 896673c..4ac487f 100755
--- a/init-sh/level2.sh
+++ b/init-sh/level2.sh
@@ -63,6 +63,8 @@ echo "Adding \"normal\" PATH variable :"
 AddRules "PATH=\$PATH:/usr/X11R6/bin" /etc/profile quiet
 AddRules "export PATH SECURE_LEVEL" /etc/profile
 # Group
-echo "Adding \"${USERNAME} to audio group :"
-usermod -G audio "${USERNAME}"
-
+echo -n "Adding \"${USERS_DRAKX}\" to audio group :"
+for user in ${USERS_DRAKX}; do
+    usermod -G audio "${user}"
+done
+echo "done."
\ No newline at end of file
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