r4481 - in dists/trunk/utils/initramfs-tools: . debian scripts
maximilian attems
maks-guest at costa.debian.org
Sun Oct 16 17:39:30 UTC 2005
Author: maks-guest
Date: 2005-10-16 17:39:29 +0000 (Sun, 16 Oct 2005)
New Revision: 4481
Modified:
dists/trunk/utils/initramfs-tools/debian/changelog
dists/trunk/utils/initramfs-tools/hook-functions
dists/trunk/utils/initramfs-tools/init
dists/trunk/utils/initramfs-tools/scripts/local
dists/trunk/utils/initramfs-tools/scripts/nfs
Log:
resynchronize with latest upstream.
Modified: dists/trunk/utils/initramfs-tools/debian/changelog
===================================================================
--- dists/trunk/utils/initramfs-tools/debian/changelog 2005-10-16 16:45:06 UTC (rev 4480)
+++ dists/trunk/utils/initramfs-tools/debian/changelog 2005-10-16 17:39:29 UTC (rev 4481)
@@ -1,17 +1,35 @@
-initramfs-tools (0.31) UNRELEASED; urgency=low
+initramfs-tools (0.32) UNRELEASED; urgency=low
[ Bastian Blank ]
* Use new busybox. (closes: #333755)
* Use mklibs-copy.
* Use udevsynthesize instead of udevstart.
+ * hook-functions: Add ibmvscsic to list of scsi modules.
[ Sven Luther ]
* Added --supported-(host|target)-version support for the new post-2.6.13
ramdisk-tool policy. Added linux-ramdisk-tool virtual package too.
(Closes: #333856)
- -- Sven Luther <luther at debian.org> Fri, 14 Oct 2005 08:03:44 +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 at sternwelten.at> Sun, 16 Oct 2005 19:22:55 +0200
+
initramfs-tools (0.30) unstable; urgency=low
Apparition Octobre Rouge
Modified: dists/trunk/utils/initramfs-tools/hook-functions
===================================================================
--- dists/trunk/utils/initramfs-tools/hook-functions 2005-10-16 16:45:06 UTC (rev 4480)
+++ dists/trunk/utils/initramfs-tools/hook-functions 2005-10-16 17:39:29 UTC (rev 4481)
@@ -63,7 +63,7 @@
{
# 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 @@
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
Modified: dists/trunk/utils/initramfs-tools/init
===================================================================
--- dists/trunk/utils/initramfs-tools/init 2005-10-16 16:45:06 UTC (rev 4480)
+++ dists/trunk/utils/initramfs-tools/init 2005-10-16 17:39:29 UTC (rev 4481)
@@ -97,9 +97,9 @@
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.
Modified: dists/trunk/utils/initramfs-tools/scripts/local
===================================================================
--- dists/trunk/utils/initramfs-tools/scripts/local 2005-10-16 16:45:06 UTC (rev 4480)
+++ dists/trunk/utils/initramfs-tools/scripts/local 2005-10-16 17:39:29 UTC (rev 4481)
@@ -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 @@
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 @@
# 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
}
Modified: dists/trunk/utils/initramfs-tools/scripts/nfs
===================================================================
--- dists/trunk/utils/initramfs-tools/scripts/nfs 2005-10-16 16:45:06 UTC (rev 4480)
+++ dists/trunk/utils/initramfs-tools/scripts/nfs 2005-10-16 17:39:29 UTC (rev 4481)
@@ -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 @@
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 @@
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
}
More information about the Kernel-svn-changes
mailing list