aboutsummaryrefslogtreecommitdiffstats
path: root/init-sh
diff options
context:
space:
mode:
authorYoann Vandoorselaere <yoann@mandriva.com>1999-12-16 16:42:43 +0000
committerYoann Vandoorselaere <yoann@mandriva.com>1999-12-16 16:42:43 +0000
commit5adce68dac806902a90b655dcddd694470721ffb (patch)
tree1a6bdac4c026da27973e9542a91113a0980332cb /init-sh
parent5a2662e03d6d2206105e7c87343c17ac9d1f28b1 (diff)
downloadmsec-5adce68dac806902a90b655dcddd694470721ffb.tar
msec-5adce68dac806902a90b655dcddd694470721ffb.tar.gz
msec-5adce68dac806902a90b655dcddd694470721ffb.tar.bz2
msec-5adce68dac806902a90b655dcddd694470721ffb.tar.xz
msec-5adce68dac806902a90b655dcddd694470721ffb.zip
*** empty log message ***
Diffstat (limited to 'init-sh')
-rwxr-xr-xinit-sh/level0.sh11
-rw-r--r--init-sh/lib.sh9
2 files changed, 8 insertions, 12 deletions
diff --git a/init-sh/level0.sh b/init-sh/level0.sh
index 4b9e743..62904ac 100755
--- a/init-sh/level0.sh
+++ b/init-sh/level0.sh
@@ -75,14 +75,9 @@ AddBegRules "/usr/X11R6/bin/xhost +" /etc/X11/xdm/Xsession quiet
AddBegRules "/usr/X11R6/bin/xhost +" /etc/X11/xinit/xinitrc
# Group
-if [[ ! -z ${DRAKX_USERS} ]]; then
- echo -n "Adding \"${DRAKX_USERS}\" to audio group :"
- for user in ${DRAKX_USERS}; do
- usermod -G audio "${user}"
- done
- echo "done."
-fi
-
+echo "Adding system users to specific groups :"
+/etc/security/msec/init-sh/grpuser.sh --refresh
+echo -e "done.\n"
diff --git a/init-sh/lib.sh b/init-sh/lib.sh
index c7d0efd..e523f5a 100644
--- a/init-sh/lib.sh
+++ b/init-sh/lib.sh
@@ -9,7 +9,7 @@ if [[ ${UID} != 0 ]]; then
exit 1
fi
-COMMENT="# Mandrake-Security : if you remove this comment, remove the next line too."
+export COMMENT="# Mandrake-Security : if you remove this comment, remove the next line too."
WaitAnswer() {
answer="nothing"
@@ -60,6 +60,7 @@ AddBegRules() {
while (<FH>) {
if (!/^\#/ && !/^$/ && !$m) {
print FW $ENV{"COMMENT"};
+ print FW "\n";
print FW "@ARGV\n\n"; $m++;
}
print FW;
@@ -147,7 +148,7 @@ Ttylog() {
LiloUpdate() {
- if [[ ! -f /tmp/secure.DrakX ]]; then
+ if [[ -z ${LILO_PASSWORD} ]]; then
echo "Do you want a password authentication at boot time ?"
echo "Be very carefull,"
echo "this will prevent your server to reboot without an operator to enter password".
@@ -159,10 +160,10 @@ LiloUpdate() {
password=""
fi
else
- password=${DRAKX_PASSWORD}
+ password=${LILO_PASSWORD}
fi
- if [[ ! -z "${password}" ]]; then
+ if [[ ! -z ${password} ]]; then
tmpfile=`mktemp /tmp/secure.XXXXXX`
cp -f /etc/lilo.conf ${tmpfile}