On Saturday 10 November 2007, Joey Hess wrote: > Frans Pop wrote: > > The patch may well introduce regressions, probably mainly in arches > > other than i386/amd64. > > The most likely regression looks to be ide-floppy, which AFAICS is not > autoloadable by udev. Richard Hirst at one point had ia64 hardware that > used ide-floppy (see #215455). Yes, I see what you mean. > Rather than going to all the pain to test that, I'd just modify > get_floppy_info to call or include get_ide_floppy_info. Don't see how that would help. Both functions are called from the same location... > For bonus points, move the floppy module loading code into mountfloppy, > which doesn't use hw-detect anyway, and already has to modprobe floppy. The patch below should do that and has a few other minor changes. I propose to not remove the code from hw-detect until we clean up the ide module loading. > > +if db_get hw-detect/load-ide && [ "$RET" = true ]; then > > This template should be added to the templates file. However, I hope > this option would be removed sooner or later, since noone should need it. Yes, it's very temporary. I added it mostly so we can easily determine if this change is the cause of a regression by asking users to try booting with that option. I did not add it in the templates file as that is not strictly required. The check allows for the fact that the template may not exist. However, if you prefer I can add it. Cheers, FJP --- a/packages/mountfloppy/debian/changelog +++ b/packages/mountfloppy/debian/changelog @@ -1,3 +1,10 @@ +mountfloppy (0.14) UNRELEASED; urgency=low + + * If regular floppy fails, also try loading ide-floppy before asking the + user. + + -- Frans Pop <fjp@debian.org> Sun, 11 Nov 2007 13:56:34 +0100 + mountfloppy (0.13) unstable; urgency=low [ Jérémy Bobbio ] diff --git a/packages/mountfloppy/mountfloppy b/packages/mountfloppy/mountfloppy index 981408e..7aa15d0 100755 --- a/packages/mountfloppy/mountfloppy +++ b/packages/mountfloppy/mountfloppy @@ -44,14 +44,19 @@ if ! mount | cut -d' ' -f3 | grep -q "^$FLOPPYMNT$"; then if [ ! -e $FLOPPYDEV ]; then - log-output -t mountfloppy modprobe floppy || true + log-output -t mountfloppy modprobe -q floppy || true + update-dev fi if ! grep -q ^vfat /proc/modules ; then - log-output -t mountfloppy modprobe vfat || true + log-output -t mountfloppy modprobe -q vfat || true fi + # Cannot find a device, or found the wrong device. if [ ! -e "$FLOPPYDEV" ] || ! try_mount $FLOPPYDEV $FLOPPYMNT; then - # Cannot find a device, or found the wrong device. + # Maybe the user has an ide-floppy device? + log-output -t mountfloppy modprobe -q ide-floppy || true + update-dev + # Ask for help from the user and try it again. FLOPPYDEV=$(ask_dev) try_mount $FLOPPYDEV $FLOPPYMNT
Attachment:
signature.asc
Description: This is a digitally signed message part.