aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-12-21 22:02:12 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-12-21 22:02:12 +0000
commitad301504d955663f0d60ee11217a5ffd3e121916 (patch)
tree698f7a0e15a571ce1daf84aa8e8f67f2573fdb22
parent2fbbdd02fb49ce0e92ecb8bd658ed301ebe185aa (diff)
downloadmsec-ad301504d955663f0d60ee11217a5ffd3e121916.tar
msec-ad301504d955663f0d60ee11217a5ffd3e121916.tar.gz
msec-ad301504d955663f0d60ee11217a5ffd3e121916.tar.bz2
msec-ad301504d955663f0d60ee11217a5ffd3e121916.tar.xz
msec-ad301504d955663f0d60ee11217a5ffd3e121916.zip
no_comment
-rw-r--r--ChangeLog7
-rw-r--r--init-sh/lib.sh6
-rw-r--r--msec.spec9
3 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 04129e1..8984f19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-12-21 Pixel <pixel@mandrakesoft.com>
+ * init-sh/lib.sh (LiloUpdate): replace the -z ${LILO_PASSWORD} by
+ ${LILO_PASSWORD+set} != set
+ * init-sh/lib.sh (LiloUpdate): replace the call to AddRules to
+ AddBegRules (password= must in the beginning of lilo.conf)
+ * init-sh/lib.sh (AddBegRules): 1 \n instead of 2
+
1999-12-20 Yoann Vandoorselaere <yoann@mandrakesoft.com>
* init-sh/perm.[05]: Oops, /var/spool/mail is 771 not 755.
diff --git a/init-sh/lib.sh b/init-sh/lib.sh
index d01d57f..920996f 100644
--- a/init-sh/lib.sh
+++ b/init-sh/lib.sh
@@ -47,7 +47,7 @@ AddBegRules() {
echo "Modifying config in ${2}..."
export VAL=$1
- perl -pi -e '/^#/ or /^$/ or $m++ or print "$ENV{COMMENT}\n$ENV{VAL}\n\n"' $2
+ perl -pi -e '/^#/ or /^$/ or $m++ or print "$ENV{COMMENT}\n$ENV{VAL}\n"' $2
echo -e "done.\n"
}
@@ -134,7 +134,7 @@ Ttylog() {
LiloUpdate() {
- if [[ -z ${LILO_PASSWORD} ]]; then
+ if [[ ${LILO_PASSWORD+set} != set ]]; 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".
@@ -157,7 +157,7 @@ LiloUpdate() {
rm -f ${tmpfile}
clear
- AddRules "password=$password" /etc/lilo.conf
+ AddBegRules "password=$password" /etc/lilo.conf
fi
}
diff --git a/msec.spec b/msec.spec
index 0ebf7d4..0afdb4f 100644
--- a/msec.spec
+++ b/msec.spec
@@ -4,7 +4,7 @@
Summary: Security Level & Program for the Linux Mandrake distribution
Name: msec
Version: %{version}
-Release: 4mdk
+Release: 5mdk
Source: %{name}-%{version}.tar.bz2
Copyright: GPL
Group: System Environment/Base
@@ -40,6 +40,13 @@ rm -rf $RPM_BUILD_ROOT
/var/log/security
%changelog
+* Tue Dec 21 1999 Pixel <pixel@mandrakesoft.com>
+- init-sh/lib.sh (LiloUpdate): replace the -z ${LILO_PASSWORD} by
+${LILO_PASSWORD+set} != set
+- init-sh/lib.sh (LiloUpdate): replace the call to AddRules to
+AddBegRules (password= must in the beginning of lilo.conf)
+- init-sh/lib.sh (AddBegRules): 1 \n instead of 2
+
* Mon Dec 20 1999 Yoann Vandoorselaere <yoann@mandrakesoft.com>
- fixed a typo / variable pb.