From 1077c70f4ce2ee18d697509fffbf318482d33054ea49b516ddaa9f2f1bbad039 Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Wed, 16 Apr 2014 23:26:23 +0000
Subject: [PATCH] Accepting request 230357 from home:trenn:branches:Base:System

- Remove mkinitrd bits -> we use dracut now which already has
  nfs stuff provided in its package in:
  /usr/lib/dracut/modules.d/95nfs/
  Remove sources:
    - mkinitrd-boot.sh
    - mkinitrd-setup.sh

OBS-URL: https://build.opensuse.org/request/show/230357
OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=116
---
 mkinitrd-boot.sh  | 70 -----------------------------------------------
 mkinitrd-setup.sh |  9 ------
 nfs-utils.changes | 10 +++++++
 nfs-utils.spec    | 12 +-------
 4 files changed, 11 insertions(+), 90 deletions(-)
 delete mode 100644 mkinitrd-boot.sh
 delete mode 100644 mkinitrd-setup.sh

diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh
deleted file mode 100644
index 145f928..0000000
--- a/mkinitrd-boot.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#%stage: block
-#%modules: nfs nfsv2 nfsv3 nfsv4
-#%programs: mount.nfs mount.nfs4
-#%if: "$rootfstype" = "nfs" -o "$need_nfs"
-#
-##### Network FileSystem
-##
-## This is where NFS gets mounted.
-## If no root= option was given, the root device will be taken from the DHCP-server.
-##
-## Command line parameters
-## -----------------------
-##
-## root=<server>:/<folder>	the nfs root path
-## 
-
-# Prefer NFS root setting via DHCP the fallback provided in config/*.
-# So at first, consider the command line (that's why we check for "$cmd_root"
-# being empty here. Then consider the DHCP setting. And finally consider the
-# fallback via config/*.
-
-if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then
-  case "$ROOTPATH" in
-    iscsi:*)
-	;;
-    *:*)
-	rootfstype="nfs"
-	rootdev="$ROOTPATH" ;;
-    *)
-	if [ -n "$DHCPSIADDR" ]; then
-	    rootdev="$DHCPSIADDR:$ROOTPATH"
-	    rootfstype="nfs"
-	elif [ -n "$DHCPSNAME" ]; then
-	    rootdev="$DHCPSNAME:$ROOTPATH"
-	    rootfstype="nfs"
-	fi ;;
-  esac
-
-  if [ -n "$rootdev" ] ; then
-      echo >&2 "Using root device ($rootdev) provided via DHCP"
-  fi
-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"
-	else
-	    rootflags="nolock"
-	fi
-	# tell boot.rootfsck to skip warning
-	ROOTFS_FSCK=0
-	export ROOTFS_FSCK
-else
-	dont_load_modules
-fi
-
-# Absolutely required for networking to function
-ip link set dev lo up
diff --git a/mkinitrd-setup.sh b/mkinitrd-setup.sh
deleted file mode 100644
index f496e6e..0000000
--- a/mkinitrd-setup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-#
-#%stage: device
-#
-
-if [ "$rootfstype" = "nfs" ]; then
-	interface=${interface:-default}
-	save_var rootfstype
-fi
diff --git a/nfs-utils.changes b/nfs-utils.changes
index 60a018d..b2d5ba4 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Apr 16 15:24:27 UTC 2014 - trenn@suse.de
+
+- Remove mkinitrd bits -> we use dracut now which already has
+  nfs stuff provided in its package in:
+  /usr/lib/dracut/modules.d/95nfs/
+  Remove sources:
+    - mkinitrd-boot.sh
+    - mkinitrd-setup.sh
+
 -------------------------------------------------------------------
 Tue Mar 11 00:11:18 UTC 2014 - sleep_walker@suse.cz
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 818dde5..a977aab 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           nfs-utils
 BuildRequires:  device-mapper-devel
 BuildRequires:  e2fsprogs-devel
@@ -58,8 +59,6 @@ Source5:        nfs-kernel-server.xml
 Source6:        README.NFSv4
 Source7:        fw-client
 Source8:        fw-server
-Source9:        mkinitrd-setup.sh
-Source10:       mkinitrd-boot.sh
 Source11:       idmapd.conf
 Source12:       start-statd
 Source13:       nfs-utils.rpmlintrc
@@ -203,9 +202,6 @@ touch $RPM_BUILD_ROOT/var/lib/nfs/state
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services
 install -m 0644 %{SOURCE7} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-client
 install -m 0644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server
-install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts
-install -m 755 %{S:9} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-nfs.sh
-install -m 755 %{S:10} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-nfs.sh
 install -m 755 %{S:12} $RPM_BUILD_ROOT/usr/sbin/start-statd
 install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf
 #
@@ -232,7 +228,6 @@ if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then
 	mv /var/lock/subsys/nfsserver-rpc.idmapd /run/nfs
 fi
 ###
-[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
 %{fillup_and_insserv -n nfs nfs}
 #
 %set_permissions /sbin/mount.nfs
@@ -244,7 +239,6 @@ fi
 
 %postun -n nfs-client
 %restart_on_update nfs
-[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
 %insserv_cleanup
 %service_del_postun nfs
 
@@ -281,10 +275,6 @@ fi
 %config /etc/init.d/nfs
 %config /etc/idmapd.conf
 %config /etc/nfsmount.conf
-%dir /lib/mkinitrd
-%dir /lib/mkinitrd/scripts
-/lib/mkinitrd/scripts/setup-nfs.sh
-/lib/mkinitrd/scripts/boot-nfs.sh
 %verify(not mode) %attr(0755,root,root) /sbin/mount.nfs
 /sbin/mount.nfs4
 /sbin/umount.nfs