From: Matthias Hentges <oe@hentges.net>
Date: Sat, 8 Apr 2006 21:45:19 +0000 (+0000)
Subject: initscripts/populate-volatile.sh: Include change from .oz354x
X-Git-Tag: Release-2010-05/1~9453^2~2086^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02fdb87022fe84bdf046f4d2b777e1da0fa4d989;p=openembedded.git

initscripts/populate-volatile.sh: Include change from .oz354x
---

diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh
index 99a469d576..bf498084e4 100755
--- a/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -85,8 +85,10 @@ apply_cfgfile() {
         echo "Cannot create link over existing -${TNAME}-." >&2
         } || {
         TSOURCE=`echo ${LINE} | cut -d " " -f 6`
-        [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
-        ln -s "${TSOURCE}" "${TNAME}"
+	[ -L "${TNAME}" ] || {
+          [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
+          ln -s "${TSOURCE}" "${TNAME}"
+	  }
         }
       continue
       }
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index ed4e205519..29886d0ac0 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r70"
+PR = "r71"
 
 SRC_URI = "file://halt \
            file://ramdisk \