pool/ignition
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always initialize label field

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=25
This commit is contained in:
Ignaz Forster 2019-09-03 10:24:23 +00:00 committed by Git OBS Bridge
parent 804a125886
commit a75a0a82b1
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
0001-Continue-on-empty-GPT-partition-label.patch
View File

@ -1,13 +1,23 @@
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 diff --git a/internal/exec/util/blkid.c b/internal/exec/util/blkid.c
index 7762d57..3ac8395 100644 index 7762d57..35e876c 100644
--- a/internal/exec/util/blkid.c --- a/internal/exec/util/blkid.c
+++ b/internal/exec/util/blkid.c +++ b/internal/exec/util/blkid.c
@@ -201,7 +201,7 @@ static result_t extract_part_info(blkid_partition part, struct partition_info *i @@ -201,7 +201,9 @@ static result_t extract_part_info(blkid_partition part, struct partition_info *i
// label // label
ctmp = blkid_partition_get_name(part); ctmp = blkid_partition_get_name(part);
err = checked_copy(info->label, ctmp, PART_INFO_BUF_SIZE); err = checked_copy(info->label, ctmp, PART_INFO_BUF_SIZE);
- if (err) - if (err)
+ if (err && err != RESULT_LOOKUP_FAILED) + if (err == RESULT_LOOKUP_FAILED)
+ strcpy(info->label, "");
+ else if (err)
return err; return err;
// uuid // uuid