From 9c81fd807ec210e12649f84ef50bb75b4a600c08 Mon Sep 17 00:00:00 2001
From: "Thierry.Vignaud" <thierry.vignaud@gmail.com>
Date: Thu, 19 Jun 2014 14:27:08 +0200
Subject: do not bother creating /dev/fd[01]

now done by udev
---
 perl-install/detect_devices.pm | 2 +-
 perl-install/devices.pm        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 687ab8b2f..49cfd2346 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -107,7 +107,7 @@ sub floppies {
         #-   then hal probes /dev/fd0 and triggers floppy module loading through kernel's kmod
         if (any { (split)[1] eq 'fd' } cat_("/proc/devices")) {
             @fds = map {
-                my $info = c::floppy_info(devices::make("fd$_"));
+                my $info = c::floppy_info("/dev/fd$_");
                 if_($info && $info ne '(null)', { device => "fd$_", media_type => 'fd', info => $info });
             } qw(0 1);
         }
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index f06168c1d..a4c9a7f62 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -79,7 +79,7 @@ sub entry {
 	$major = ($1 eq 'ida' ? 72 : 104) + $2;
 	$minor = 16 * $3 + ($4 || 0);
     } elsif (my ($prefix, $nb) = /(.*?)(\d+)$/) {	
-	my $f = ${{"fd"          => sub { c::S_IFBLK(), 2,  0  },
+	my $f = ${{
 		   "ubd/"        => sub { c::S_IFBLK(), 98, 0  },
 	       }}{$prefix};
 	if ($f) {
-- 
cgit v1.2.1