- Fix parted not building on s390

This commit is contained in:
Hans de Goede 2009-11-11 21:08:51 +00:00
parent b7679338df
commit 9aaca8c090
2 changed files with 6 additions and 4 deletions

View File

@ -20,15 +20,14 @@ diff -up parted-1.9.0/libparted/arch/linux.c.dasd2 parted-1.9.0/libparted/arch/l
if (!_device_stat (dev, &dev_stat)) if (!_device_stat (dev, &dev_stat))
goto error; goto error;
@@ -1115,15 +1118,18 @@ init_dasd (PedDevice* dev, const char* m @@ -1115,15 +1118,17 @@ init_dasd (PedDevice* dev, const char* m
dev->hw_geom = dev->bios_geom; dev->hw_geom = dev->bios_geom;
} }
+ if (!ioctl(arch_specific->fd, BIODASDINFO, &dasd_info)) { + if (!ioctl(arch_specific->fd, BIODASDINFO, &dasd_info)) {
+ arch_specific->devno = dasd_info.devno; + arch_specific->devno = dasd_info.devno;
+ } else { + } else {
+ arch_specific->devno = arch_specific->major * 256 + + arch_specific->devno = -1;
+ arch_specific->minor;
+ } + }
+ +
dev->model = strdup (model_name); dev->model = strdup (model_name);

View File

@ -4,7 +4,7 @@
Summary: The GNU disk partition manipulation program Summary: The GNU disk partition manipulation program
Name: parted Name: parted
Version: 1.9.0 Version: 1.9.0
Release: 22%{?dist} Release: 23%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/System Group: Applications/System
URL: http://www.gnu.org/software/parted URL: http://www.gnu.org/software/parted
@ -149,6 +149,9 @@ fi
%{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
%changelog %changelog
* Wed Nov 11 2009 Hans de Goede <hdegoede@redhat.com> 1.9.0-23
- Fix parted not building on s390
* Mon Nov 9 2009 Hans de Goede <hdegoede@redhat.com> 1.9.0-22 * Mon Nov 9 2009 Hans de Goede <hdegoede@redhat.com> 1.9.0-22
- Fix error when creating a fresh dasd disk on a dasd device - Fix error when creating a fresh dasd disk on a dasd device
with a corrupted dasd label (#533808) with a corrupted dasd label (#533808)