diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2006-01-01 19:52:35 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2006-01-01 19:52:35 +0000 |
| commit | f141f9d7a90b27b2bd7455852abe5f1881321fa4 (patch) | |
| tree | 54c8de146f503928b8fc1f65422648567683f33c /sys-apps | |
| parent | Stable on x86; bug #116181 (diff) | |
| download | gentoo-2-f141f9d7a90b27b2bd7455852abe5f1881321fa4.tar.gz gentoo-2-f141f9d7a90b27b2bd7455852abe5f1881321fa4.tar.bz2 gentoo-2-f141f9d7a90b27b2bd7455852abe5f1881321fa4.zip | |
sys floppy patch
(Portage version: 2.1_pre3)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/hal/files/hal-0.4.7-sys_floppy_detection.patch | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys-apps/hal/files/hal-0.4.7-sys_floppy_detection.patch b/sys-apps/hal/files/hal-0.4.7-sys_floppy_detection.patch index b04168bf01c0..9127f70ad5a7 100644 --- a/sys-apps/hal/files/hal-0.4.7-sys_floppy_detection.patch +++ b/sys-apps/hal/files/hal-0.4.7-sys_floppy_detection.patch @@ -1,6 +1,5 @@ -diff -x '*~' -uNr hal-0.4.7/hald/linux/platform_bus_device.c hal-0.4.7.patched/hald/linux/platform_bus_device.c --- hal-0.4.7/hald/linux/platform_bus_device.c 2004-11-22 22:53:50.000000000 +0100 -+++ hal-0.4.7.patched/hald/linux/platform_bus_device.c 2005-04-17 19:20:37.000000000 +0200 ++++ hal-0.4.7-patched/hald/linux/platform_bus_device.c 2005-10-11 13:53:46.000000000 +0200 @@ -66,7 +66,7 @@ if (strncmp (device->bus_id, "floppy", 6) != 0) return FALSE; @@ -10,3 +9,12 @@ diff -x '*~' -uNr hal-0.4.7/hald/linux/platform_bus_device.c hal-0.4.7.patched/h /* get device file */ snprintf (fd_sysfs_path, sizeof (fd_sysfs_path), "%s/block/fd%d", +@@ -147,7 +147,7 @@ + char device_file[256]; + char fd_sysfs_path[256]; + +- sscanf (device->bus_id, "floppy%d", &number); ++ sscanf (device->bus_id, "%*[flopy.]%d", &number); + hal_device_property_set_int (d, "storage.legacy_floppy.number", number); + + hal_device_property_set_string (d, "info.product", "Legacy Floppy Drive"); |