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
This commit is contained in:
Ignaz Forster 2019-10-02 11:35:52 +00:00 committed by Git OBS Bridge
parent 8d1da0015c
commit 4089e51eef

View File

@ -1,23 +0,0 @@
commit 8009e46dc1d43f075740025d15a91cbcfd91cec2
Author: Ignaz Forster <iforster@suse.com>
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