Merge "Bug 1268: Prepends $RUNSH_DIR to relative paths in base distribution run.sh"

diff --cc distributions/base/src/assemble/resources/run.sh
index 4b84ffc20f2f074a73ccee0c846ffaf7a3849b68,bfe0cc23e98cf806d97d0a92cc020ab35d0ebfae..ece3a515193b591427696bfafad428bfeeb555dc
--- 1/distributions/base/src/assemble/resources/run.sh
--- 2/distributions/base/src/assemble/resources/run.sh
+++ b/distributions/base/src/assemble/resources/run.sh
@@@ -48,12 -26,8 +48,12 @@@ while true ; d
  done
  
  # clean available optional configurations (links)
- find configuration/initial -type l -exec rm {} \;
+ find ${RUNSH_DIR}/configuration/initial -type l -exec rm {} \;
  
 +##of13
 +#of13             [-of13]
 +#   Option to run the OpenDaylight controller with the OpenFlow plugin (1.3).
 +##
  # OF Filter selection
  OF_FILTER="org.opendaylight.(openflowplugin|openflowjava|controller.sal-compatibility)"
  if (( $OF13 != 0 )); then