aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian La Roche <laroche@redhat.com>2005-04-18 05:28:10 +0000
committerFlorian La Roche <laroche@redhat.com>2005-04-18 05:28:10 +0000
commitf4afa34404d587c06913bb6289fe07a271ce24fe (patch)
tree0a877fd0dff0c0e7d89212f8c1febd26fc757617
parent6042c9146b3c66aac6b4c90fa5dfc3b54ffb3a9e (diff)
downloadinitscripts-f4afa34404d587c06913bb6289fe07a271ce24fe.tar
initscripts-f4afa34404d587c06913bb6289fe07a271ce24fe.tar.gz
initscripts-f4afa34404d587c06913bb6289fe07a271ce24fe.tar.bz2
initscripts-f4afa34404d587c06913bb6289fe07a271ce24fe.tar.xz
initscripts-f4afa34404d587c06913bb6289fe07a271ce24fe.zip
- fix strstr call in rc.sysinit
-rw-r--r--initscripts.spec3
-rwxr-xr-xrc.d/rc.sysinit2
2 files changed, 4 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 125c2da4..97232b6c 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -205,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Mon Apr 18 2005 Florian La Roche <laroche@redhat.com>
+- fix strstr call in rc.sysinit
+
* Fri Apr 15 2005 Bill Nottingham <notting@redhat.com> 8.08-1
- update translation base
- automatically send hostname for DHCP if it's available and not
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 7d81ace2..774964c9 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -493,7 +493,7 @@ fi
if [ -n "$SELINUX" -a -f /.autorelabel ]; then
relabel_selinux
fi
-if [ -n "$SELINUX" -a strstr "$cmdline" autorelabel ]; then
+if [ -n "$SELINUX" ] && strstr "$cmdline" autorelabel ; then
relabel_selinux
fi