From f2bbb9ba618a91b0c5b4bec5e68de927e316105a099ce19573f5ddc6cc6eb620 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 31 Mar 2010 17:28:51 +0000
Subject: [PATCH] Accepting request 35966 from Base:System

checked in (request 35966)

OBS-URL: https://build.opensuse.org/request/show/35966
OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=15
---
 mkinitrd-boot.sh  | 18 ++++++++----------
 nfs-utils.changes |  6 ------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh
index 5f9543b..1e0c8c4 100644
--- a/mkinitrd-boot.sh
+++ b/mkinitrd-boot.sh
@@ -2,7 +2,7 @@
 #%stage: block
 #%modules: nfs
 #%programs: /sbin/mount.nfs
-#%if: "$rootfstype" = "nfs" -a "$interface"
+#%if: "$rootfstype" = "nfs" -o "$interface"
 #
 ##### Network FileSystem
 ##
@@ -22,8 +22,6 @@
 
 if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then
   case "$ROOTPATH" in
-    iscsi:*)
-	;;
     *:*)
 	rootfstype="nfs"
 	rootdev="$ROOTPATH" ;;
@@ -42,17 +40,17 @@ if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then
   fi
 fi
 
+if [ -z "$rootdev" ]; then
+    echo "no local root= kernel option given and no root server set by the dhcp server."
+    echo "exiting to /bin/sh"
+    cd /
+    PATH=$PATH PS1='$ ' /bin/sh -i
+fi
+
 if [ "$rootfstype" = "nfs" ]; then
 	# load the nfs module before using it
 	load_modules
 	
-	if [ -z "$rootdev" ]; then
-	    echo "no local root= kernel option given and no root server set by the dhcp server."
-	    echo "exiting to /bin/sh"
-	    cd /
-	    PATH=$PATH PS1='$ ' /bin/sh -i
-	fi
-
 	rootfsmod=
 	if [ -n "$rootflags" ] ; then
 	    rootflags="${rootflags},nolock"
diff --git a/nfs-utils.changes b/nfs-utils.changes
index 2243fc8..3acc902 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Fri Mar 26 15:39:05 CET 2010 - mmarek@suse.cz
-
-- mkinitrd-boot.sh: Do not do anything over if iscsi should be used
-  (bnc#590135).
-
 -------------------------------------------------------------------
 Tue Mar  9 21:18:22 UTC 2010 - nfbrown@novell.com