Skip to content
Browse files

Run blkid under timeout command as well when accessing floppy device

The floppy device support could probably go away anyway, but at
least until after the stable release let's keep it...

Thanks: Florian Apolloner for bugreport and testing
  • Loading branch information...
1 parent eb7a7cc commit a1526917cb7ba6e7cf8ae5334310123ba6d8fae6 @mika mika committed Feb 21, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 autoconfig.functions
View
4 autoconfig.functions
@@ -1585,9 +1585,9 @@ else
eindent
# 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."
+ einfo "Floppy device detected. Trying to access floppy disk (this might take a few seconds)."
if timeout 4 dd if=/dev/fd0 of=/dev/null bs=512 count=1 >>$DEBUG 2>&1 ; then
- blkid /dev/fd0 >>$DEBUG 2>&1
+ timeout 4 blkid /dev/fd0 >>$DEBUG 2>&1
fi
fi
DCSDEVICE=$(blkid -t LABEL=$GRMLCFG | head -1 | awk -F: '{print $1}')

0 comments on commit a152691

Please sign in to comment.
Something went wrong with that request. Please try again.