2010-12-09 10:45:03 +01:00
|
|
|
# bnc#657360
|
|
|
|
|
#
|
|
|
|
|
# This patch should make parted's process of informing the kernel
|
|
|
|
|
# about changes of partition table sligtly more reliable.
|
|
|
|
|
# It consists of 3 quite unrelated parts:
|
|
|
|
|
#
|
|
|
|
|
# 1. increase the max sleep time if partition is busy from 1 to 2 seconds
|
|
|
|
|
# 2. do not inform the kernel when only partition flags change - kernel
|
|
|
|
|
# does not care about the flags
|
|
|
|
|
---
|
2015-04-24 17:49:30 +02:00
|
|
|
libparted/arch/linux.c | 2 +-
|
- update to parted-3.1 (fate#316110)
- changes in parted-3.1:
* Changes in behavior
- Floppy drives are no longer scanned on linux: they cannot be
partitioned anyhow, and some users have a misconfigured BIOS
that claims to have a floppy when they don't, and scanning
gets hung up.
- parted: the mkpart command has changed semantics with regard
to specifying the end of the partition. If the end is
specified using units of MiB, GiB, etc., parted subtracts one
sector from the specified value. With this change, it is now
possible to create partitions like 1MiB-2MiB, 2MiB-3MiB and
so on.
* Many bugfixes (see changelog)
- changes in parted-3.0:
* Changes in behavior
- Remove all FS-related (file system-related) sub-commands;
these commands are no longer recognized because they were all
dependent on parted "knowing" too much about file system:
mkpartfs, mkfs, cp, move, check.
- 'resize' command changed semantics:
it no longer resizes the filesystem, but only moves end
sector of the partition
- libparted-devel contains libparted-fs-resize library
- add ability to change size of the partition (ignoring contained
filesystem) with 'resize' command; this command has different
semantics than the former 'resize' command which upstream
decided to drop
- parted-resize-command.patch (fate#316110)
- when using syncmbr on POWER, make the first partition type 0x41
OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=79
2014-01-09 17:35:35 +01:00
|
|
|
parted/parted.c | 28 +++++++++++++++++++++++++++-
|
2015-04-24 17:49:30 +02:00
|
|
|
2 files changed, 28 insertions(+), 2 deletions(-)
|
2010-12-09 10:45:03 +01:00
|
|
|
|
2015-04-24 17:49:30 +02:00
|
|
|
Index: parted-3.2/libparted/arch/linux.c
|
2010-12-09 10:45:03 +01:00
|
|
|
===================================================================
|
2015-04-24 17:49:30 +02:00
|
|
|
--- parted-3.2.orig/libparted/arch/linux.c
|
|
|
|
|
+++ parted-3.2/libparted/arch/linux.c
|
|
|
|
|
@@ -3011,7 +3011,7 @@ _disk_sync_part_table (PedDisk* disk)
|
|
|
|
|
/* Attempt to remove the partition, retrying for
|
|
|
|
|
up to max_sleep_seconds upon any failure due to EBUSY. */
|
|
|
|
|
unsigned int sleep_microseconds = 10000;
|
|
|
|
|
- unsigned int max_sleep_seconds = 1;
|
|
|
|
|
+ unsigned int max_sleep_seconds = 2;
|
|
|
|
|
unsigned int n_sleep = (max_sleep_seconds
|
|
|
|
|
* 1000000 / sleep_microseconds);
|
|
|
|
|
do {
|
|
|
|
|
Index: parted-3.2/parted/parted.c
|
2010-12-09 10:45:03 +01:00
|
|
|
===================================================================
|
2015-04-24 17:49:30 +02:00
|
|
|
--- parted-3.2.orig/parted/parted.c
|
|
|
|
|
+++ parted-3.2/parted/parted.c
|
|
|
|
|
@@ -266,6 +266,32 @@ _disk_warn_loss (PedDisk* disk)
|
2010-12-09 10:45:03 +01:00
|
|
|
disk->dev->path) == PED_EXCEPTION_YES;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+/*
|
2015-04-24 17:49:30 +02:00
|
|
|
+ * Copied from ped_disk_commit(), but with removed the call to
|
|
|
|
|
+ * ped_disk_commit_to_os(). This is used in do_set() - BLKPG* ioctls() do not
|
|
|
|
|
+ * care about the partition flags anyway.
|
2010-12-09 10:45:03 +01:00
|
|
|
+ */
|
|
|
|
|
+static int
|
|
|
|
|
+ped_disk_commit_just_to_disk (PedDisk* disk)
|
|
|
|
|
+{
|
|
|
|
|
+ /* Open the device here, so that the underlying fd is not closed
|
|
|
|
|
+ between commit_to_dev and commit_to_os (closing causes unwanted
|
|
|
|
|
+ udev events to be sent under Linux). */
|
|
|
|
|
+ if (!ped_device_open (disk->dev))
|
|
|
|
|
+ goto error;
|
|
|
|
|
+
|
|
|
|
|
+ if (!ped_disk_commit_to_dev (disk))
|
|
|
|
|
+ goto error_close_dev;
|
|
|
|
|
+
|
|
|
|
|
+ ped_device_close (disk->dev);
|
|
|
|
|
+ return 1;
|
|
|
|
|
+
|
|
|
|
|
+error_close_dev:
|
|
|
|
|
+ ped_device_close (disk->dev);
|
|
|
|
|
+error:
|
|
|
|
|
+ return 0;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
/* This function changes "sector" to "new_sector" if the new value lies
|
|
|
|
|
* within the required range.
|
|
|
|
|
*/
|
2015-04-24 17:49:30 +02:00
|
|
|
@@ -1735,7 +1761,7 @@ do_set (PedDevice** dev, PedDisk **diskp
|
2010-12-09 10:45:03 +01:00
|
|
|
|
|
|
|
|
if (!ped_partition_set_flag (part, flag, state))
|
2015-04-24 17:49:30 +02:00
|
|
|
goto error;
|
|
|
|
|
- if (!ped_disk_commit (*diskp))
|
|
|
|
|
+ if (!ped_disk_commit_just_to_disk (*diskp))
|
|
|
|
|
goto error;
|
2010-12-09 10:45:03 +01:00
|
|
|
|
2015-04-24 17:49:30 +02:00
|
|
|
if ((*dev)->type != PED_DEVICE_FILE)
|