- drop md scripts

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

7 files changed, 29 insertions, 70 deletions

diff --git a/debian/changelog b/debian/changelog
index b48be87..faaf90a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,16 @@
+initramfs-tools (0.70b) unstable; urgency=low
+
+  * Be more careful about vi dot files, removed.
+    Thanks Frederik Schüler <fs@debian.org> for review.
+
+ -- maximilian attems <maks@sternwelten.at>  Wed, 19 Jul 2006 16:00:47 +0200
+
 initramfs-tools (0.70) unstable; urgency=low
 
+  * mkinitramfs: Don't include static kinit, nor gzip. They are the biggest
+    klibc-utils binaries and we don't use them. Keep static gunzip, zcat and
+    shared kinit for now.
+
   * Reduce diff against 0.69ubuntu3:
     - hook-functions: Fix kernel typo.
     - hooks/kernelextras: Fix comment and add vga16fb too.
@@ -7,6 +18,8 @@ initramfs-tools (0.70) unstable; urgency=low
     - mkinitramfs: Use check_minkver instead of dpkg itself. Whitespace
       cleanup and add quoting.
     - scripts/local: Whitespace cleanup and add a comment.
+    - scripts/nfs: Use mount with nolock instead of nfsmount.
+      (closes: 359926)
     - update-initramfs: Add quoting + whitespace fix.
     - changelog: for noise reduction add 0.69ubuntu{1,2,3}, all 0.40ubuntu*,
       0.36ubuntu1 and missing 0.29 + 0.28 entries.
@@ -18,10 +31,17 @@ initramfs-tools (0.70) unstable; urgency=low
     hooks/lvm, hooks/md, init, initramfs-tools.8, initramfs.conf.5,
     mkinitramfs, mkinitramfs-kpkg, mkinitramfs-kpkg.8, mkinitramfs.8,
     scripts/functions, scripts/local-top/udev_helper, update-initramfs,
-    update-initramfs.8: Whitespace policy cleanup trailing whitespace and
-    non tabular indents.
+    update-initramfs.8: Cleanup trailing whitespace and non tabular indents.
+
+  * scripts/local-premount/resume: Use new resume bin from klibc-utils.
+    Removes superflous stat and awk usage.
+
+  * debian/control: Depend against newer klibc-utils 1.4.11-1.
+
+  * hooks/md, scripts/local-top/md: Drop as mdadm > 2.5-1 features them.
+    (closes: #367567)
 
- -- maximilian attems <maks@sternwelten.at>  Sun, 16 Jul 2006 21:50:34 +0200
+ -- maximilian attems <maks@sternwelten.at>  Wed, 19 Jul 2006 11:09:52 +0200
 
 initramfs-tools (0.69b) unstable; urgency=high
 
diff --git a/debian/control b/debian/control
index a5a1cee..53caa8f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2.0
 
 Package: initramfs-tools
 Architecture: all
-Depends: klibc-utils (>= 1.1.16-1), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, module-init-tools, udev (>= 0.086-1)
+Depends: klibc-utils (>= 1.4.11-1), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, module-init-tools, udev (>= 0.086-1)
 Provides: linux-initramfs-tool
 Description: tools for generating an initramfs
  This package contains tools to create and boot an initramfs for prepackaged
diff --git a/hooks/md b/hooks/md
deleted file mode 100755
index df2abc8..0000000
--- a/hooks/md
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-
-prereqs()
-{
-	echo "$PREREQ"
-}
-
-case $1 in
-prereqs)
-	prereqs
-	exit 0
-	;;
-esac
-
-if [ ! -x /sbin/mdadm ]; then
-	exit 0
-fi
-
-. /usr/share/initramfs-tools/hook-functions
-
-copy_exec /sbin/mdadm /sbin
-copy_exec /sbin/mdrun /sbin
-
-for x in md linear raid0 raid1 raid5 raid6 raid10; do
-	manual_add_modules ${x}
-done
diff --git a/mkinitramfs b/mkinitramfs
index 81a859e..0f1cb58 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -183,8 +183,11 @@ fi
 # Have to do each file, because cpio --dereference doesn't recurse down
 # symlinks.
 
+# klibc
 ln -s /usr/lib/klibc/bin/* ${DESTDIR}/bin
 ln -s /lib/klibc-*.so ${DESTDIR}/lib
+rm -f ${DESTDIR}/bin/kinit ${DESTDIR}/bin/gzip
+
 copy_exec /usr/share/initramfs-tools/init /init
 cp -a /usr/share/initramfs-tools/scripts/* "${DESTDIR}/scripts"
 for f in $(cd ${CONFDIR}/scripts && \
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