From a4bbfdf05ce3fc1e6b79323cc54dee84a2931e99 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 28 Feb 2005 23:40:38 +0000 Subject: [PATCH] -n, not -z git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@548 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- targets/livecd-stage1/livecd-stage1.sh | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29a38a8b..0d0fff61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.173 2005/02/28 23:21:09 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.174 2005/02/28 23:40:38 wolf31o2 Exp $ + + 28 Feb 2005; Chris Gianelloni + targets/livecd-stage1/livecd-stage1.sh: + -n, not -z 28 Feb 2005; Chris Gianelloni livecd/files/livecd-local.start, livecd/runscript/default-runscript.sh, diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh index 01197f08..d04db8df 100755 --- a/targets/livecd-stage1/livecd-stage1.sh +++ b/targets/livecd-stage1/livecd-stage1.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.19 2005/02/28 23:21:09 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.20 2005/02/28 23:40:38 wolf31o2 Exp $ case $1 in enter) @@ -17,7 +17,7 @@ case $1 in preclean) GCONFD_RUNNING="`pidof gconfd-2`" - if [ -z "${GCONFD_RUNNING}" ] + if [ -n "${GCONFD_RUNNING}" ] then killall -9 gconfd-2 fi -- 2.26.2