From 61ad49e7d33a89e8ca4d604c2da5ff69c2548bdc Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Thu, 2 Feb 2012 19:18:48 +0100

Subject: [PATCH] 30convertfs/convertfs.sh: fix check for /var/run and

 /var/lock

---

 modules.d/30convertfs/convertfs.sh |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh

index 6c76a4c..eaeb8e4 100755

--- a/modules.d/30convertfs/convertfs.sh

+++ b/modules.d/30convertfs/convertfs.sh

@@ -160,13 +160,13 @@ if [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/fil

     /usr/sbin/setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || :

 fi

-if [ -d $ROOT/var/run ]; then

+if [ ! -L $ROOT/var/run ]; then

     echo "Converting /var/run to symlink"

     mv -f $ROOT/var/run $ROOT/var/run.runmove~

     ln -sfn ../run $ROOT/var/run

 fi

-if [ -d $ROOT/var/lock ]; then

+if [ ! -L $ROOT/var/lock ]; then

     echo "Converting /var/lock to symlink"

     mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~

     ln -sfn ../run/lock $ROOT/var/lock