From d77572b99a51b81801ca42e14599aa00c950afeb Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 27 Aug 2008 16:00:40 +0200 Subject: [PATCH] Move noautoconfig hint from floppy part to top level --- autoconfig.functions | 4 ++-- debian/changelog | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index 1f76476..6870e59 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -1790,13 +1790,13 @@ if checkbootparam noautoconfig || checkbootparam forensic ; then ewarn "Skipping running automount of device(s) labeled GRMLCFG as requested." ; eend 0 else if [ -z "$INSTALLED" ] ; then - einfo "Searching for device(s) labeled with GRMLCFG." ; eend 0 + einfo "Searching for device(s) labeled with GRMLCFG. (Disable this via boot option: noautoconfig)" ; eend 0 eindent [ -d /mnt/grml ] || mkdir /mnt/grml umount /mnt/grml 1>>$DEBUG 2>&1 # make sure it is not mounted # We do need the following fix so floppy disk is available to blkid in any case :-/ if [ -r /dev/fd0 ] ; then - einfo "Floppy device detected. Trying to access floppy disk. (Disable this via boot option: noautoconfig)" + einfo "Floppy device detected. Trying to access floppy disk." # dd if=/dev/fd0 of=/dev/null bs=512 count=1 1>>$DEBUG 2>&1 if timeout 4 dd if=/dev/fd0 of=/dev/null bs=512 count=1 1>>$DEBUG 2>&1 ; then blkid /dev/fd0 1>>$DEBUG 2>&1 diff --git a/debian/changelog b/debian/changelog index 22f6b98..5cf2e8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-autoconfig (0.8.11) unstable; urgency=low + + * Move noautoconfig hint from floppy part to top level. + + -- Michael Prokop Wed, 27 Aug 2008 16:00:13 +0200 + grml-autoconfig (0.8.10) unstable; urgency=low * Update cpufrequency handling to reflect changes in current -- 2.1.4