added latest upstream fixes :-)

5 files changed, 39 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index 7288dcf..00643e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,7 +24,24 @@ initramfs-tools (0.31) UNRELEASED; urgency=low
 
    * hook-functions: Add ibmvscsic to list of scsi modules.
 
- -- Bastian Blank <waldi@debian.org>  Mon, 10 Oct 2005 18:27:12 +0000
+  [ maximilian attems ]
+  * Resynchronise with latest upstream release.
+
+  [ Jeff Bailey ]
+  * scripts/nfs (mountroot): New variable: NFSOPTS, default to
+    -o retranfs=10. (Ubuntu 12942)
+    This can be overridden in the initramfs.conf file.
+    Thanks to Oliver Grawert for testing this!
+
+  * hook-scripts (auto_add_modules): Add jfs
+    (dep_add_modules): Ditto. (Ubuntu #16742)
+    Thanks to Colin Watson for this fix!
+
+  [ Adam Conrad ]
+  * Make us a bit more silent/tidy by default, unless "quiet" isn't on
+    the kernel's command line (then we're just as verbose as ever)
+
+ -- maximilian attems <maks@sternwelten.at>  Sun, 16 Oct 2005 19:22:55 +0200
 
 initramfs-tools (0.31) unstable; urgency=low
 
diff --git a/hook-functions b/hook-functions
index c06d3e9..cb424d4 100644
--- a/hook-functions
+++ b/hook-functions
@@ -63,7 +63,7 @@ dep_add_modules()
 {
 
 	# Things that are too hard to autodetect.
-	for x in md raid0 raid1 raid5 raid6 ext2 ext3 isofs nfs reiserfs xfs af_packet dm_mod; do
+	for x in md raid0 raid1 raid5 raid6 ext2 ext3 isofs jfs nfs reiserfs xfs af_packet dm_mod; do
 		manual_add_modules ${x}
 	done
 
@@ -99,7 +99,7 @@ dep_add_modules()
 auto_add_modules()
 {
 	# base
-	for x in md raid0 raid1 raid5 raid6 ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 ext3 isofs nfs reiserfs xfs af_packet dm_mod; do
+	for x in md raid0 raid1 raid5 raid6 ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 ext3 isofs jfs nfs reiserfs xfs af_packet dm_mod; do
 		manual_add_modules ${x}
 	done
 
diff --git a/init b/init
index 113a224..18d31ad 100755
--- a/init
+++ b/init
@@ -97,9 +97,9 @@ log_begin_msg "Mounting root file system"
 mountroot
 log_end_msg
 
-log_begin_msg "Running /scripts/init-bottom"
+[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/init-bottom"
 run_scripts /scripts/init-bottom
-log_end_msg
+[ "$quiet" != "y" ] && log_end_msg
 
 # Move our /dev to the real filesystem.  Do the setup that udev otherwise
 # would.
diff --git a/scripts/local b/scripts/local
index 539a2a4..aa2cbfb 100644
--- a/scripts/local
+++ b/scripts/local
@@ -3,9 +3,9 @@
 # Parameter: Where to mount the filesystem
 mountroot ()
 {
-	log_begin_msg "Running /scripts/local-top"
+	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-top"
 	run_scripts /scripts/local-top
-	log_end_msg
+	[ "$quiet" != "y" ] && log_end_msg
 
 	# Get the root filesystem type
 	if [ ! -e "${ROOT}" ]; then
@@ -14,9 +14,9 @@ mountroot ()
 
 	eval $(fstype < ${ROOT})
 
-	log_begin_msg "Running /scripts/local-premount"
+	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-premount"
 	run_scripts /scripts/local-premount
-	log_end_msg
+	[ "$quiet" != "y" ] && log_end_msg
 
 	if [ ${readonly} = y ]; then
 		roflag=-r
@@ -31,7 +31,7 @@ mountroot ()
 	# Mount root
 	mount ${roflag} -t ${FSTYPE} ${ROOT} ${rootmnt}
 
-	log_begin_msg "Running /scripts/log-bottom"
+	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/log-bottom"
 	run_scripts /scripts/local-bottom
-	log_end_msg
+	[ "$quiet" != "y" ] && log_end_msg
 }
diff --git a/scripts/nfs b/scripts/nfs
index 10f8f1d..7166b08 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -5,9 +5,9 @@
 # Paramter: Where the root should be mounted
 mountroot ()
 {
-	log_begin_msg "Running /scripts/nfs-top"
+	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/nfs-top"
 	run_scripts /scripts/nfs-top
-	log_end_msg
+	[ "$quiet" != "y" ] && log_end_msg
 
 	modprobe nfs
 	# For DHCP
@@ -19,9 +19,13 @@ mountroot ()
 		NFSROOT=${ROOTSERVER}:${ROOTPATH}
 	fi
 
-	log_begin_msg "Running /scripts/nfs-premount"
+	if [ "x${NFSOPTS}" = "x" ]; then
+		NFSOPTS="-o retrans=10"
+	fi
+
+	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/nfs-premount"
 	run_scripts /scripts/nfs-premount
-	log_end_msg
+	[ "$quiet" != "y" ] && log_end_msg
 
 	if [ ${readonly} = y ]; then
 		roflag="-o ro"
@@ -30,10 +34,10 @@ mountroot ()
 	fi
 
 	sleep 3
-	nfsmount ${roflag} ${NFSROOT} ${rootmnt}
+	nfsmount ${roflag} ${NFSOPTS} ${NFSROOT} ${rootmnt}
 
-	log_begin_msg "Running /scripts/nfs-bottom"
+	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/nfs-bottom"
 	run_scripts /scripts/nfs-bottom
-	log_end_msg
+	[ "$quiet" != "y" ] && log_end_msg
 
 }