Accepting request 729811 from devel:kubic:ignition

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/729811
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ignition?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2019-09-11 08:36:06 +00:00 committed by Git OBS Bridge
commit 826fea04b9
6 changed files with 37 additions and 5 deletions

View File

@ -0,0 +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
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

View File

@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/coreos/ignition.git</param>
<param name="changesrevision">7efe9588b06ff41147bc3a92236cf3bd44459fce</param>
<param name="changesrevision">dedd8ddd5da76a78e630533d87d43b2a4a323e22</param>
</service>
</servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3180ef14d046cebee2796628f8612cbeea8b1f18f78756012c9d24d9a69e7a06
size 594952

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:510da22f9d209b7b8a378f6a55d1c309f52307c6b08f0d1ce56099143ca6f14c
size 594992

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Sep 02 16:34:22 UTC 2019 - iforster@suse.de
- Update to version 2.0.1+git20190802.d523754:
* main: log stage at startup
- Add 0001-Continue-on-empty-GPT-partition-label.patch
-------------------------------------------------------------------
Fri Jul 26 08:36:17 UTC 2019 - kukuk@suse.de

View File

@ -17,13 +17,14 @@
Name: ignition
Version: 2.0.1+git20190725.10b85d1
Version: 2.0.1+git20190802.d523754
Release: 0
Summary: First boot installer and configuration tool
License: Apache-2.0
Group: System/Management
URL: https://github.com/coreos/ignition
Source: %{name}-%{version}.tar.xz
Patch1: 0001-Continue-on-empty-GPT-partition-label.patch
Requires: dracut
BuildRequires: dracut
BuildRequires: libblkid-devel
@ -40,6 +41,7 @@ applies the configuration.
%prep
%setup -q
%patch1 -p1
%build
sed -i -e 's|go build -ldflags|go build -buildmode=pie -ldflags|g' build