- drop md scripts

- pump klibc dep
- use resume klibc-utils bin
- remove some klibc binaries
- use nfsmount

3 files changed, 2 insertions, 38 deletions

diff --git a/scripts/local-premount/resume b/scripts/local-premount/resume
index 0c88ccc..059e7a4 100755
--- a/scripts/local-premount/resume
+++ b/scripts/local-premount/resume
@@ -24,6 +24,5 @@ if [ ! -e "${resume}" ]; then
 fi
 
 if [ -e /sys/power/resume ]; then
-	major_minor=$(ls -l ${resume} | awk '{printf "%d:%d", $5, $6}')
-	echo $major_minor >/sys/power/resume
+	resume ${resume}
 fi
diff --git a/scripts/local-top/md b/scripts/local-top/md
deleted file mode 100755
index aa48474..0000000
--- a/scripts/local-top/md
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-PREREQ="udev_helper"
-
-prereqs()
-{
-	echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-	prereqs
-	exit 0
-	;;
-esac
-
-unset raidlvl
-gotraid=n
-
-# Detect raid level
-for x in /dev/hd[a-z][0-9]* /dev/sd[a-z][0-9]*; do
-	if [ ! -e ${x} ]; then
-		continue
-	fi
-	raidlvl=$(mdadm --examine ${x} 2>/dev/null | grep "Level" | sed -e 's/.*Raid Level : \(.*\)/\1/')
-	if [ "$raidlvl" ]; then
-		modprobe -q ${raidlvl} 2>/dev/null
-		gotraid=y
-	fi
-done
-
-[ "${gotraid}" = y ] || exit
-
-/sbin/mdrun /dev
diff --git a/scripts/nfs b/scripts/nfs
index 89b5c20..47e9ac1 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -33,7 +33,7 @@ mountroot ()
 		roflag="-o rw"
 	fi
 
-	nfsmount ${roflag} ${NFSOPTS} ${NFSROOT} ${rootmnt}
+	mount -o nolock ${roflag} ${NFSOPTS} ${NFSROOT} ${rootmnt}
 
 	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/nfs-bottom"
 	run_scripts /scripts/nfs-bottom