From 4089e51eef92428b98fa047efe48d60299bc90db2bbd1e37d8ea3d696cad927e Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Wed, 2 Oct 2019 11:35:52 +0000 Subject: [PATCH] Drop 0001-Continue-on-empty-GPT-partition-label.patch OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=28 --- ...ontinue-on-empty-GPT-partition-label.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 0001-Continue-on-empty-GPT-partition-label.patch diff --git a/0001-Continue-on-empty-GPT-partition-label.patch b/0001-Continue-on-empty-GPT-partition-label.patch deleted file mode 100644 index 661b829..0000000 --- a/0001-Continue-on-empty-GPT-partition-label.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 8009e46dc1d43f075740025d15a91cbcfd91cec2 -Author: Ignaz Forster -Date: Mon Sep 2 19:14:18 2019 +0200 - - Continue on empty GPT partition label - - In case no GPT partition label is set don't abort execution. - -diff --git a/internal/exec/util/blkid.c b/internal/exec/util/blkid.c -index 7762d57..35e876c 100644 ---- a/internal/exec/util/blkid.c -+++ b/internal/exec/util/blkid.c -@@ -201,7 +201,9 @@ static result_t extract_part_info(blkid_partition part, struct partition_info *i - // label - ctmp = blkid_partition_get_name(part); - err = checked_copy(info->label, ctmp, PART_INFO_BUF_SIZE); -- if (err) -+ if (err == RESULT_LOOKUP_FAILED) -+ strcpy(info->label, ""); -+ else if (err) - return err; - - // uuid