[Pkg-iscsi-maintainers] [open-iscsi] 01/04: Revert "Add patch to enable fsck, mount and swap for network block devices"

[Ritesh Raj Sarraf]

This is an automated email from the git hooks/post-receive script.

rrs pushed a commit to branch master
in repository open-iscsi.

commit 56e20acff9f7cb4bb1af92f03f98b2b049fbb620
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Wed Aug 20 18:36:47 2014 +0530

    Revert "Add patch to enable fsck, mount and swap for network block devices"
    
    This reverts commit 7e1ae42defdced6869ba2dc2abe49c6072a15ae9.
    
    Revert back this commit because it causes more problems than it tries to
    resolve
---
 debian/open-iscsi.init | 46 ++++------------------------------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/debian/open-iscsi.init b/debian/open-iscsi.init
index 95bf75a..182b1ee 100644
--- a/debian/open-iscsi.init
+++ b/debian/open-iscsi.init
@@ -126,48 +126,10 @@ start() {
 	# Now let's mount
 	log_daemon_msg "Mounting network filesystems"
 	MOUNT_RESULT=1
-	fs=
-	grep -w _netdev /etc/fstab | \
-	    while read DEV MTPT FSTYPE OPTS REST; do
-		case "$DEV" in
-		    ""|\#*)
-			continue
-			;;
-		esac
-		case "$OPTS" in
-		    noauto|*,noauto|noauto,*|*,noauto,*)
-			continue
-			;;
-		esac
-		case "$FSTYPE" in
-		    nfs|nfs4|smbfs|cifs|coda|ncp|ncpfs|ocfs2|gfs|ceph)
-			continue
-			;;
-		    *)
-			echo "$FSTYPE:$DEV"
-			;;
-		esac
-	    done | \
-	    while read fs; do
-		set -- $(eval echo "$fs" | sed 's@:@ @')
-		case "$1" in
-		    swap)
-			swapon $2
-			;;
-		    *)
-			fsck -a "$2"
-
-			if mount "$2" >/dev/null 2>&1; then
-			    MOUNT_RESULT=0
-			    break
-			fi
-			;;
-		esac
-	    done
-
-
-
-
+	if mount -a -O _netdev >/dev/null 2>&1; then
+		MOUNT_RESULT=0
+		break
+	fi
 	log_end_msg $MOUNT_RESULT
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-iscsi/open-iscsi.git