This commit is contained in:
parent
ab08c33713
commit
4819a70717
@ -1,7 +1,7 @@
|
||||
--- libparted/labels/dos.c
|
||||
+++ libparted/labels/dos.c 2005/01/11 14:39:51
|
||||
@@ -170,6 +170,9 @@
|
||||
if (PED_BE32_TO_CPU (*(unsigned int*)(part_table.boot_code)) == AIXIPLRECID)
|
||||
if (PED_BE32_TO_CPU (*(unsigned int*)(part_table->boot_code)) == AIXIPLRECID)
|
||||
return 0;
|
||||
|
||||
+/* disable this check since it makes parted fail on some IDE disks with
|
||||
@ -11,9 +11,9 @@
|
||||
* Loader (SBML) signature indicates a partition table, not a file
|
||||
* system.
|
||||
@@ -178,6 +181,7 @@
|
||||
&& strncmp (part_table.boot_code + 0x40, "SBML", 4) != 0)
|
||||
|| !strncmp (part_table.boot_code + 0x52, "FAT", 3))
|
||||
return 0;
|
||||
&& strncmp (part_table->boot_code + 0x40, "SBML", 4) != 0)
|
||||
|| !strncmp (part_table->boot_code + 0x52, "FAT", 3))
|
||||
goto probe_fail;
|
||||
+#endif
|
||||
|
||||
/* If this is a GPT disk, fail here */
|
||||
|
@ -1,11 +1,12 @@
|
||||
--- include/parted/device.h
|
||||
+++ include/parted/device.h 2006/12/04 11:54:55
|
||||
@@ -50,6 +50,8 @@
|
||||
,
|
||||
PED_DEVICE_DM = 12
|
||||
+++ include/parted/device.h 2007/08/13 11:39:37
|
||||
@@ -48,7 +48,8 @@
|
||||
#ifdef ENABLE_DEVICE_MAPPER
|
||||
PED_DEVICE_DM = 12,
|
||||
#endif
|
||||
+ ,
|
||||
+ PED_DEVICE_AOE = 13
|
||||
- PED_DEVICE_XVD = 13
|
||||
+ PED_DEVICE_XVD = 13,
|
||||
+ PED_DEVICE_AOE = 14
|
||||
} PedDeviceType;
|
||||
|
||||
typedef struct _PedDevice PedDevice;
|
||||
|
@ -1,32 +0,0 @@
|
||||
jokers.
|
||||
|
||||
---
|
||||
libparted/fs/linux_swap/linux_swap.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
Index: parted-1.8.7/libparted/fs/linux_swap/linux_swap.c
|
||||
===================================================================
|
||||
--- parted-1.8.7.orig/libparted/fs/linux_swap/linux_swap.c
|
||||
+++ parted-1.8.7/libparted/fs/linux_swap/linux_swap.c
|
||||
@@ -719,6 +719,13 @@ static PedFileSystemType _swap_v2_type =
|
||||
block_sizes: LINUXSWAP_BLOCK_SIZES
|
||||
};
|
||||
|
||||
+static PedFileSystemType _swap_default_type = {
|
||||
+ next: NULL,
|
||||
+ ops: &_swap_v2_ops,
|
||||
+ name: "linux-swap",
|
||||
+ block_sizes: LINUXSWAP_BLOCK_SIZES
|
||||
+};
|
||||
+
|
||||
static PedFileSystemType _swap_swsusp_type = {
|
||||
next: NULL,
|
||||
ops: &_swap_swsusp_ops,
|
||||
@@ -729,6 +736,7 @@ static PedFileSystemType _swap_swsusp_ty
|
||||
void
|
||||
ped_file_system_linux_swap_init ()
|
||||
{
|
||||
+ ped_file_system_type_register (&_swap_default_type);
|
||||
ped_file_system_type_register (&_swap_v1_type);
|
||||
ped_file_system_type_register (&_swap_v2_type);
|
||||
ped_file_system_type_register (&_swap_swsusp_type);
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:634e816cd7a1c3ea171991d27991a0b65675adc25e3d807a9b6b066ba35b4a5a
|
||||
size 1443220
|
3
parted-1.8.8.tar.bz2
Normal file
3
parted-1.8.8.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dfcd811a9cc7753d6f310a34301716a7e18a45b905fa8c7eb77d5f121bc3c5ea
|
||||
size 1553881
|
@ -10,11 +10,11 @@
|
||||
#define PARTITION_FAT12 0x01
|
||||
#define PARTITION_FAT16_SM 0x04
|
||||
@@ -166,6 +166,10 @@
|
||||
if (PED_LE16_TO_CPU (part_table.magic) != MSDOS_MAGIC)
|
||||
if (PED_LE16_TO_CPU (part_table->magic) != MSDOS_MAGIC)
|
||||
return 0;
|
||||
|
||||
+ /* Is this an AIX IPL label? Then just go away. */
|
||||
+ if (PED_BE32_TO_CPU (*(unsigned int*)(part_table.boot_code)) == AIXIPLRECID)
|
||||
+ if (PED_BE32_TO_CPU (*(unsigned int*)(part_table->boot_code)) == AIXIPLRECID)
|
||||
+ return 0;
|
||||
+
|
||||
/* if this is a FAT fs, fail here. Note that the Smart Boot Manager
|
||||
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 13 15:07:28 CEST 2007 - fehr@suse.de
|
||||
|
||||
- Update to new version 1.8.8
|
||||
Properly detect 'ext2 fs too small' cases.
|
||||
Read an msdos partition table from a device with 2K sectors.
|
||||
Correct handling of HeaderSize field in GPT labels.
|
||||
Fix block number used when checking for ext2 fs state.
|
||||
Add detection support for Xen virtual block devices (/dev/xvd*).
|
||||
Fixed exception handling in mkpart and mkpartfs commands.
|
||||
Fix invalid command line argument handling.
|
||||
Close memory leaks in parted.c and table.c.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 13 11:38:09 CEST 2007 - olh@suse.de
|
||||
|
||||
|
20
parted.spec
20
parted.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package parted (Version 1.8.7)
|
||||
# spec file for package parted (Version 1.8.8)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -16,8 +16,8 @@ BuildRequires: device-mapper device-mapper-devel e2fsprogs-devel libreiserfs re
|
||||
License: GPL v2 or later
|
||||
Group: System/Filesystems
|
||||
Summary: GNU partitioner
|
||||
Version: 1.8.7
|
||||
Release: 19
|
||||
Version: 1.8.8
|
||||
Release: 1
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Patch: always-resize-part.dif
|
||||
Patch1: parted-type.patch
|
||||
@ -28,11 +28,10 @@ Patch6: etherd_support.diff
|
||||
Patch7: parted-1.8.3.dif
|
||||
Patch8: fat16_hfs_fix.dif
|
||||
Patch9: always_print_geom.diff
|
||||
Patch42: parted-1.8.7-linux-swap.patch
|
||||
Patch51: parted.tty.patch
|
||||
Patch52: parted.no-O_DIRECT.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
URL: http://www.gnu.org/software/parted/
|
||||
Url: http://www.gnu.org/software/parted/
|
||||
PreReq: %install_info_prereq
|
||||
|
||||
%description
|
||||
@ -67,7 +66,6 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch42 -p1
|
||||
%patch
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
@ -126,6 +124,16 @@ rm -rf "$RPM_BUILD_ROOT"
|
||||
%{_libdir}/*.so
|
||||
|
||||
%changelog
|
||||
* Mon Aug 13 2007 - fehr@suse.de
|
||||
- Update to new version 1.8.8
|
||||
Properly detect 'ext2 fs too small' cases.
|
||||
Read an msdos partition table from a device with 2K sectors.
|
||||
Correct handling of HeaderSize field in GPT labels.
|
||||
Fix block number used when checking for ext2 fs state.
|
||||
Add detection support for Xen virtual block devices (/dev/xvd*).
|
||||
Fixed exception handling in mkpart and mkpartfs commands.
|
||||
Fix invalid command line argument handling.
|
||||
Close memory leaks in parted.c and table.c.
|
||||
* Fri Jul 13 2007 - olh@suse.de
|
||||
- do not open with O_DIRECT (#290087)
|
||||
* Thu Jul 05 2007 - sassmann@suse.de
|
||||
|
Loading…
x
Reference in New Issue
Block a user