From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 2 Nov 2006 17:36:34 +0000 (+0000)
Subject: - filesystem.rpm fails to install if /tmp, /usr/tmp, or /var/tmp already
X-Git-Tag: planetlab-4_0-rc1~83
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=8a54569aa10e5c44dd8e771968cd59e0537e6de6

- filesystem.rpm fails to install if /tmp, /usr/tmp, or /var/tmp already
  exist
---

diff --git a/build.sh b/build.sh
index ecc3ea2..db225bf 100755
--- a/build.sh
+++ b/build.sh
@@ -95,8 +95,10 @@ datadirs=(
 )
 for datadir in "${datadirs[@]}" ; do
     # If we are being re-run, it may be a symlink
-    rm -f root/$datadir || :
-    mkdir -p root/$datadir
+    if [ -h root/$datadir ] ; then
+	rm -f root/$datadir
+	mkdir -p root/$datadir
+    fi
 done
 
 echo "* myplc: Installing base filesystem"