aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--Makefile2
-rw-r--r--init-sh/lib.sh107
-rw-r--r--msec.spec4
4 files changed, 72 insertions, 42 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e80250..d73baf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2000-04-19 Yoann Vandoorselaere <yoann@mandrakesoft.com>
- Support grub as well as lilo...
- bugfix.
+- Loaders bugfix
2000-04-17 Yoann Vandoorselaere <yoann@mandrakesoft.com>
* file_perm.sh : removed a check to see if file exist because it block *
diff --git a/Makefile b/Makefile
index cc14f75..f870cf7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 0.12
+VERSION = 0.14
NAME = msec
all: promisc_check msec_find
diff --git a/init-sh/lib.sh b/init-sh/lib.sh
index 2625b23..d1802f6 100644
--- a/init-sh/lib.sh
+++ b/init-sh/lib.sh
@@ -45,6 +45,10 @@ AddRules() {
AddBegRules() {
echo "Modifying config in ${2}..."
+
+ if [[ ! -f ${file} ]]; then
+ return;
+ fi
export VAL=$1
perl -pi -e '/^#/ or /^$/ or $m++ or print "$ENV{COMMENT}\n$ENV{VAL}\n"' $2
@@ -134,64 +138,86 @@ Ttylog() {
LoaderUpdate() {
- loader=`/usr/sbin/detectloader`
-
- case "${loader}" in
- "LILO")
- file="/etc/lilo.conf"
- at_exit="/sbin/lilo"
- ;;
- "GRUB")
- file="/boot/grub/menu.lst"
- at_exit=""
- ;;
- esac
-
- if [[ ${LILO_PASSWORD+set} != set ]]; then
+
+ # Ask only if we're not inside DrakX.
+ if [[ -z ${DRAKX_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".
- WaitAnswer;
+ WaitAnswer;
if [[ ${answer} == yes ]]; then
echo -n "Please enter the password which will be used at boot time : "
read password
else
password=""
fi
- else
- password=${LILO_PASSWORD}
- fi
-
- if [[ ! -z ${password} ]]; then
- tmpfile=`mktemp /tmp/secure.XXXXXX`
- cp ${file} ${tmpfile}
- cat ${tmpfile} | grep -v password > ${file}
-
- rm -f ${tmpfile}
- clear
- AddBegRules "password=$password" ${file}
+ if [[ ! -z ${password} ]]; then
+ if [[ -f /etc/lilo.conf ]]; then
+ AddBegRules "password=$password" /etc/lilo.conf
+ chmod 600 /etc/lilo.conf
+ fi
+ if [[ -f /boot/grub/menu.lst ]]; then
+ AddBegRules "password $password" /boot/grub/menu.lst
+ chmod 600 /boot/grub/menu.lst
+ fi
+
+ loader=`/usr/sbin/detectloader`
+ case "${loader}" in
+ "LILO")
+ /sbin/lilo
+ ;;
+ "GRUB")
+ ;;
+ esac
+ fi
fi
-
- ${at_exit};
}
-CleanLoaderRules() {
+# Do something only if DRAKX_PASSWORD set ( we're in DrakX )
+LoaderDrakX() {
+ if [[ -n "${DRAKX_PASSWORD}" ]]; then
+ if [[ -f /etc/lilo.conf ]]; then
+ AddBegRules "password=$DRAKX_PASSWORD" /etc/lilo.conf
+ chmod 600 /etc/lilo.conf
+ fi
+ if [[ -f /boot/grub/menu.lst ]]; then
+ AddBegRules "password $DRAKX_PASSWORD" /boot/grub/menu.lst
+ chmod 600 /boot/grub/menu.lst
+ fi
+
loader=`/usr/sbin/detectloader`
- file=""
case "${loader}" in
+ "LILO")
+ /sbin/lilo
+ ;;
+ "GRUB")
+ ;;
+ esac
+ fi
+}
+
+
+CleanLoaderRules() {
+ if [[ -f /etc/lilo.conf ]]; then
+ CleanRules /etc/lilo.conf
+ chmod 644 /etc/lilo.conf
+ fi
+ if [[ -f /boot/grub/menu.lst ]]; then
+ CleanRules /boot/grub/menu.lst
+ chmod 644 /boot/grub/menu.lst
+ fi
+
+ if [[ -z ${DRAKX_PASSWORD} ]]; then
+ loader=`/usr/sbin/detectloader`
+ case "${loader}" in
"LILO")
- file="/etc/lilo.conf"
- at_exit="/sbin/lilo"
+ /sbin/lilo
;;
"GRUB")
- file="/boot/grub/menu.lst"
- at_exit=""
;;
- esac
-
- CleanRules ${file}
- ${at_exit};
+ esac
+ fi
}
# If we are currently installing our
@@ -213,7 +239,10 @@ CommentUserRules /etc/securetty
CleanRules /etc/security/msec/security.conf
CommentUserRules /etc/security/msec/security.conf
CleanRules /etc/profile
+
CleanLoaderRules
+LoaderDrakX
+
CleanRules /etc/logrotate.conf
CleanRules /etc/rc.d/rc.local
CleanRules /etc/rc.d/rc.firewall
diff --git a/msec.spec b/msec.spec
index d650ff0..df14a86 100644
--- a/msec.spec
+++ b/msec.spec
@@ -1,4 +1,4 @@
-%define version 0.13
+%define version 0.14
%define release 1mdk
Summary: Security Level & Program for the Linux Mandrake distribution
@@ -46,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT
%config /etc/security/msec
%changelog
-* Wed Apr 19 2000 Yoann Vandoorselaere <yoann@mandrakesoft.com> 0.12-5mdk
+* Wed Apr 19 2000 Yoann Vandoorselaere <yoann@mandrakesoft.com> 0.14-1mdk
- Bug fix.
- Support Grub as well as Lilo.