[Ipcop-svn] SF.net SVN: ipcop:[5389] ipcop/trunk/config/install/init-mini-initramfs

[<ges...@us...>]

Revision: 5389
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5389&view=rev
Author:   gespinasse
Date:     2011-01-30 13:04:54 +0000 (Sun, 30 Jan 2011)

Log Message:
-----------
Fix the Quiting typo

Shorten the sleep and modify the message as it may happen more than once
When you have 
unhardened vmlinuz properly build with 'CC_STACKPROTECTOR is not set'
normal vmlinuz and modules build with CC_STACKPROTECTOR=y

on floppy boot, kernel modules will fail to insmod with 'Invalid module format'

So we need the same STACKPROTECTOR setting everytime or rebuild the modules for floppy only.
But STACKPROTECTOR is what cause the compressed kernel to be 100 kB bigger and overflow the boot floppy size.

Modified Paths:
--------------
    ipcop/trunk/config/install/init-mini-initramfs

Modified: ipcop/trunk/config/install/init-mini-initramfs
===================================================================
--- ipcop/trunk/config/install/init-mini-initramfs	2011-01-30 11:17:44 UTC (rev 5388)
+++ ipcop/trunk/config/install/init-mini-initramfs	2011-01-30 13:04:54 UTC (rev 5389)
@@ -32,7 +32,7 @@
 # The installer kernel version
 KVER=KVER
 
-# Floppy installs are supported on x86 and ppc.  Find out which one we're installing on
+# Floppy installs are supported on x86 and ppc old-world.  Find out which one we're installing on
 MACHINE=`uname -m`
 
 # Temporary variable
@@ -44,11 +44,10 @@
 	local MESSAGE=${1}
 
 	echo "FATAL ERROR: ${MESSAGE}!"
-	echo "Quiting"
+	echo "Quitting"
 
-	# If we exit, the kernel will panic, so sleep for 2 minutes
-	echo "The kernel will panic in 2 minutes ..."
-	sleep 120
+	echo "kernel will panic in 1 mn after last error ..."
+	sleep 60
 }
 
 case ${MACHINE} in


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.