- more nfs work (timeout, parsing, typo)

- lilo codeflow
- add lasi700 scsi module

4 files changed, 28 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 51987c7..d4033ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,22 @@
-initramfs-tools (0.80) unstable; urgency=low
+initramfs-tools (0.80) unstable; urgency=high
+
+  Release "O partigiano, portami via, che mi sento di morir."
 
   * update-initramfs: Test for lilo executable earlier otherwise an warning
     would be issued with grub installed and left over lilo config.
 
- -- maximilian attems <maks@sternwelten.at>  Tue, 12 Sep 2006 15:59:14 +0200
+  * hook-functions: Add lasi700 to the scsi modules. (closes: 387909) Thanks
+    Nagilum <nagilum@nagilum.org>. Thus urgency high.
+
+  * scripts/nfs: Fix typo in ipconfig protocol handling, fix dhcp server
+    passing ser-ip as part of root-path, retry every second to not hammer
+    an FAI'ed nfs initramfs network.  Thanks for input and patches
+    Vagrant Cascadian <vagrant+bugs@freegeek.org>. While we are there refactor
+    the loop. (closes: 387841, 387808, 387809)
+
+  * update-initramfs: Check if /proc is mounted for ro_boot_check.
+
+ -- maximilian attems <maks@sternwelten.at>  Tue, 19 Sep 2006 07:56:47 +0200
 
 initramfs-tools (0.79) unstable; urgency=high
 
diff --git a/hook-functions b/hook-functions
index bfbe56a..9f4d890 100644
--- a/hook-functions
+++ b/hook-functions
@@ -170,11 +170,11 @@ auto_add_modules()
 		for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci \
 		aic79xx aic7xxx arcmsr ata_piix atari_scsi atp870u BusLogic \
 		cciss ch cpqarray DAC960 dc395x dmx3191d dpt_i2o eata fdomain \
-		gdth hptiop ibmvscsic initio ipr ips isp1020 lpfc max_scsi \
-		mac53c94 megaraid megaraid_mbox megaraid_mm megaraid_sas \
-		mesh mptfc mptscsih mptsas mptspi nsp32 osst qla1280 \
-		qla2100 qla2200 qla2300 qla2322 qla2xxx qla6312 \
-		qlogicfas408 qlogicfc sata_mv sata_nv sata_promise \
+		gdth hptiop ibmvscsic initio ipr ips isp1020 lasi700 lpfc \
+		max_scsi mac53c94 megaraid megaraid_mbox megaraid_mm \
+		megaraid_sas mesh mptfc mptscsih mptsas mptspi nsp32 \
+		osst qla1280 qla2100 qla2200 qla2300 qla2322 qla2xxx \
+		qla6312 qlogicfas408 qlogicfc sata_mv sata_nv sata_promise \
 		sata_qstor sata_sil sata_sis sata_svw \
 		sata_sx4 sata_uli sata_via sata_vsc scsi_mod \
 		scsi_transport_fc scsi_transport_iscsi scsi_transport_spi \
diff --git a/scripts/nfs b/scripts/nfs
index c66e2a1..b3ac06f 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -16,7 +16,7 @@ do_nfsmount()
 			# Bring up device
 			ipconfig ${DEVICE}
 			;;
-		dhcp|bootb|rarp|both)
+		dhcp|bootp|rarp|both)
 			ipconfig -c ${IPOPTS} -d ${DEVICE}
 			;;
 		*)
@@ -49,7 +49,7 @@ do_nfsmount()
 			NFSOPTS="-o ${NFSROOT#*,}"
 		fi
 		NFSROOT=${NFSROOT%%,*}
-		if [ "${NFSROOT#*:}" = "$NFSROOT" ]; then
+		if [ "${NFSROOT#:*}" = "$NFSROOT" ]; then
 			NFSROOT=${ROOTSERVER}:${NFSROOT}
 		fi
 	fi
@@ -83,7 +83,7 @@ mountroot()
 	modprobe -q af_packet
 
 	# Default delay is around 180s
-	# FIXME: add usplash info
+	# FIXME: add usplash_write info
 	if [ -z "${ROOTDELAY}" ]; then
 		delay=180
 	else
@@ -91,15 +91,13 @@ mountroot()
 	fi
 
 	# loop until nfsmount succeds
-	while [ ${delay} -gt 0 ] && [ ! -e ${rootmnt}${init} ]; do
+	while [ ${retry_nr} -lt ${delay} ] && [ ! -e ${rootmnt}${init} ]; do
 		[ ${retry_nr} -gt 0 ] && \
 		[ "$quiet" != "y" ] && log_begin_msg "Retrying nfs mount"
 		do_nfsmount
-		# FIXME: ipconfig loops every min at least - better param??
-		delay=$(( ${delay} - 1 ))
-		[ ${retry_nr} -gt 0 ] && [ "$quiet" != "y" ] && log_end_msg
-		[ ! -e ${rootmnt}/sbin/init ] && /bin/sleep 0.1
 		retry_nr=$(( ${retry_nr} + 1 ))
+		[ ! -e ${rootmnt}${init} ] && /bin/sleep 1
+		[ ${retry_nr} -gt 0 ] && [ "$quiet" != "y" ] && log_end_msg
 	done
 
 	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/nfs-bottom"
diff --git a/update-initramfs b/update-initramfs
index d1b7026..4a03614 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -113,7 +113,7 @@ run_bootloader()
 		fi
 		return 0
 	fi
-	if [ -e /etc/lilo.conf ]; then
+	if [ -e /etc/lilo.conf ] && [ -x /sbin/lilo ]; then
 		run_lilo
 	fi
 }
@@ -138,6 +138,7 @@ delete_sha1()
 # ro /boot is not modified
 ro_boot_check()
 {
+	[ -d /proc ] || return 0
 	boot_opts=$(awk '/boot/{if (match($4, /ro/)) print "ro"}' /proc/mounts)
 	if [ -n "${boot_opts}" ]; then
 		echo "WARNING: /boot is ro mounted."