From 9317aa38df56460b247f791bf7061de5ed781ef7 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 9 Jan 2011 03:50:47 +0100
Subject: [PATCH] netmount: rework init scripts

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../43_netmount => init.d/59_netmount}        | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)
 rename packages/network/netmount/{init.network/43_netmount => init.d/59_netmount} (70%)
 mode change 100755 => 100644

diff --git a/packages/network/netmount/init.network/43_netmount b/packages/network/netmount/init.d/59_netmount
old mode 100755
new mode 100644
similarity index 70%
rename from packages/network/netmount/init.network/43_netmount
rename to packages/network/netmount/init.d/59_netmount
index 36033fcd69..5352c37fab
--- a/packages/network/netmount/init.network/43_netmount
+++ b/packages/network/netmount/init.d/59_netmount
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      Copyright (C) 2009-2010 OpenELEC.tv
 #      http://www.openelec.tv
@@ -24,24 +22,20 @@
 #
 # runlevels: openelec, textmode
 
-. /etc/profile
+NETMOUNT_USERCONF="/storage/.config/netmount.conf"
 
-  NETMOUNT_USERCONF="/storage/.config/netmount.conf"
-
-  if [ -f $NETMOUNT_USERCONF ]; then
+if [ -f $NETMOUNT_USERCONF ]; then
 
 IFS="
 "
-    for i in `cat $NETMOUNT_USERCONF |grep -v "^#"`; do
-      SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
-      SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
-      MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
-      OPTIONS=`echo $i | awk -F\| '{print $4}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
-
-      progress "... mounting $SHARE to $MOUNTPOINT via $SERVICE ..."
+  for i in `cat $NETMOUNT_USERCONF |grep -v "^#"`; do
+    SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
+    SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
+    MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
+    OPTIONS=`echo $i | awk -F\| '{print $4}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
 
+    progress "... mounting $SHARE to $MOUNTPOINT via $SERVICE ..."
       mkdir -p $MOUNTPOINT
-
       case "$SERVICE" in
         cifs|smb|samba)
           mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1
@@ -50,5 +44,5 @@ IFS="
           mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1
           ;;
       esac
-    done
-  fi
+  done
+fi