forked from pool/parted
Marcus Meissner
5b97712c80
- port fixes for various bugs from upstream (bsc#1136245) - add: libparted-dasd-correct-the-offset-where-the-first-pa.patch 4126d02, correct the offset where the first partition begins. This patch implements libparted-dasd-do-not-use-first-tracks.patch - remove: libparted-dasd-do-not-use-first-tracks.patch - add: parted-fix-crash-due-to-improper-partition-number-in.patch 149f009, fix crash due to improper partition number input, changed call to strtol, use base 0 to fit our parted-type.patch - modify: parted-type.patch (removed ui.c part) - add: parted-check-the-name-of-partition-first-when-to-nam.patch d7a2ff1, check the name of partition first when to name a partition - add: libparted-dasd-add-test-cases-for-the-new-fdasd-func.patch c11f5c0, 571e078, add test cases for the new fdasd functions - add: libparted-dasd-add-an-exception-for-changing-DASD-LD.patch ee2c0c2, add an exception for changing DASD-LDL partition table - add: libpartd-dasd-improve-flag-processing-for-DASD-LDL.patch 1545d6d, improve flag processing for DASD-LDL - add: clean-the-disk-information-when-commands-fail-in-int.patch 5a61f15, clean the disk information when commands fail in interactive mode - add: parted-ui-remove-unneccesary-information-of-command.patch 0b7946a, remove unneccesary information of command line - add: parted-fix-wrong-error-label-jump-in-mkpart.patch af150f6, fix wrong error label jump in mkpart - refresh: libparted-dasd-unify-vtoc-handling-for-cdl-ldl.patch 4f25d54, unify vtoc handling for cdl/ldl - refresh: libparted-dasd-update-and-improve-fdasd-functions.patch db37c8c, update and improve fdasd functions - refresh: libparted-dasd-add-new-fdasd-functions.patch b9e1281, add new fdasd functions OBS-URL: https://build.opensuse.org/request/show/712877 OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=142
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From d7a2ff17b15842bf9a3de65ca1ba577bdf568e79 Mon Sep 17 00:00:00 2001
|
|
From: Wang Dong <dongdwdw@linux.vnet.ibm.com>
|
|
Date: Fri, 24 Mar 2017 03:11:08 +0100
|
|
Subject: [PATCH] parted: check the name of partition first when to name a
|
|
partition
|
|
|
|
The previous function works well for the labels supporting naming
|
|
partition, but not for these which don't. If the disk label does not
|
|
support partition naming, two exceptions will be raised. Even after the first
|
|
error indicates it does not support name, parted yet asks user for
|
|
name in iteractive mode.
|
|
|
|
First check if the disk label supports partition naming and if it
|
|
does, it will continue; otherwise, it will stop and raise an
|
|
exception.
|
|
|
|
Signed-off-by: Wang Dong <dongdwdw@linux.vnet.ibm.com>
|
|
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
|
|
---
|
|
parted/parted.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
Index: parted-3.2/parted/parted.c
|
|
===================================================================
|
|
--- parted-3.2.orig/parted/parted.c
|
|
+++ parted-3.2/parted/parted.c
|
|
@@ -930,6 +930,13 @@ do_name (PedDevice** dev, PedDisk** disk
|
|
if (!diskp)
|
|
goto error;
|
|
|
|
+ if (!ped_disk_type_check_feature((*diskp)->type, PED_DISK_TYPE_PARTITION_NAME)) {
|
|
+ ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
|
|
+ _("%s disk labels do not support partition name."),
|
|
+ (*diskp)->type->name);
|
|
+ goto error;
|
|
+ }
|
|
+
|
|
if (!command_line_get_partition (_("Partition number?"), *diskp, &part))
|
|
goto error;
|
|
|