From cbcce84a6660a03d798972254265e83e246ac2f3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Jan 2011 14:56:01 +0100 Subject: [PATCH] netmount: seperate netmount script Signed-off-by: Stephan Raue --- packages/network/netmount/init.d/59_netmount | 26 +--------- packages/network/netmount/install | 3 ++ packages/network/netmount/scripts/netmount | 51 ++++++++++++++++++++ 3 files changed, 56 insertions(+), 24 deletions(-) create mode 100755 packages/network/netmount/scripts/netmount diff --git a/packages/network/netmount/init.d/59_netmount b/packages/network/netmount/init.d/59_netmount index 1e6c9beaad..f35f58c0d0 100644 --- a/packages/network/netmount/init.d/59_netmount +++ b/packages/network/netmount/init.d/59_netmount @@ -22,29 +22,7 @@ # # runlevels: openelec, textmode -NETMOUNT_USERCONF="/storage/.config/netmount.conf" - -if [ -f $NETMOUNT_USERCONF ]; then - wait_for_network -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 ..." - mkdir -p $MOUNTPOINT - case "$SERVICE" in - cifs|smb|samba) - mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 || true - ;; - nfs) - mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1 || true - ;; - esac - done -fi +progress "mounting Network shares" + netmount diff --git a/packages/network/netmount/install b/packages/network/netmount/install index 70d9667db0..87546cd92a 100755 --- a/packages/network/netmount/install +++ b/packages/network/netmount/install @@ -22,5 +22,8 @@ . config/options $1 + mkdir -p $INSTALL/usr/bin + cp $PKG_DIR/scripts/netmount $INSTALL/usr/bin + mkdir -p $INSTALL/usr/config cp $PKG_DIR/config/netmount.conf.sample $INSTALL/usr/config diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount new file mode 100755 index 0000000000..38730eca3b --- /dev/null +++ b/packages/network/netmount/scripts/netmount @@ -0,0 +1,51 @@ +#!/bin/sh + +################################################################################ +# Copyright (C) 2009-2010 OpenELEC.tv +# http://www.openelec.tv +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +# Mounting Network shares + +NETMOUNT_USERCONF="/storage/.config/netmount.conf" + +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]*$//'` + + logger -t Netmount "... mounting $SHARE to $MOUNTPOINT via $SERVICE ..." + + mkdir -p $MOUNTPOINT + case "$SERVICE" in + cifs) + mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 + ;; + nfs) + mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1 + ;; + esac + done +fi + +exit 0