From 804a12588698bcf47bad7e1eaf7a1eca2f020dfd4f118804c443e49359b0a045 Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Mon, 2 Sep 2019 17:12:34 +0000 Subject: [PATCH 1/2] - Update to version 2.0.1+git20190802.d523754: * main: log stage at startup - Add 0001-Continue-on-empty-GPT-partition-label.patch OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=24 --- 0001-Continue-on-empty-GPT-partition-label.patch | 13 +++++++++++++ _servicedata | 2 +- ignition-2.0.1+git20190725.10b85d1.tar.xz | 3 --- ignition-2.0.1+git20190802.d523754.tar.xz | 3 +++ ignition.changes | 7 +++++++ ignition.spec | 4 +++- 6 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 0001-Continue-on-empty-GPT-partition-label.patch delete mode 100644 ignition-2.0.1+git20190725.10b85d1.tar.xz create mode 100644 ignition-2.0.1+git20190802.d523754.tar.xz diff --git a/0001-Continue-on-empty-GPT-partition-label.patch b/0001-Continue-on-empty-GPT-partition-label.patch new file mode 100644 index 0000000..c3df05f --- /dev/null +++ b/0001-Continue-on-empty-GPT-partition-label.patch @@ -0,0 +1,13 @@ +diff --git a/internal/exec/util/blkid.c b/internal/exec/util/blkid.c +index 7762d57..3ac8395 100644 +--- a/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 + // label + ctmp = blkid_partition_get_name(part); + err = checked_copy(info->label, ctmp, PART_INFO_BUF_SIZE); +- if (err) ++ if (err && err != RESULT_LOOKUP_FAILED) + return err; + + // uuid diff --git a/_servicedata b/_servicedata index 5227b5b..e437bb2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/coreos/ignition.git - 7efe9588b06ff41147bc3a92236cf3bd44459fce + dedd8ddd5da76a78e630533d87d43b2a4a323e22 \ No newline at end of file diff --git a/ignition-2.0.1+git20190725.10b85d1.tar.xz b/ignition-2.0.1+git20190725.10b85d1.tar.xz deleted file mode 100644 index 1bb17cf..0000000 --- a/ignition-2.0.1+git20190725.10b85d1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3180ef14d046cebee2796628f8612cbeea8b1f18f78756012c9d24d9a69e7a06 -size 594952 diff --git a/ignition-2.0.1+git20190802.d523754.tar.xz b/ignition-2.0.1+git20190802.d523754.tar.xz new file mode 100644 index 0000000..f0651dd --- /dev/null +++ b/ignition-2.0.1+git20190802.d523754.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:510da22f9d209b7b8a378f6a55d1c309f52307c6b08f0d1ce56099143ca6f14c +size 594992 diff --git a/ignition.changes b/ignition.changes index 3a9f388..40aa217 100644 --- a/ignition.changes +++ b/ignition.changes @@ -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 diff --git a/ignition.spec b/ignition.spec index c2c083d..feced64 100644 --- a/ignition.spec +++ b/ignition.spec @@ -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 From a75a0a82b1ccbf7e94978cc353dbdc631eabc84fca226ad523333d2821aa2e3d Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Tue, 3 Sep 2019 10:24:23 +0000 Subject: [PATCH 2/2] Always initialize label field OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=25 --- 0001-Continue-on-empty-GPT-partition-label.patch | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/0001-Continue-on-empty-GPT-partition-label.patch b/0001-Continue-on-empty-GPT-partition-label.patch index c3df05f..661b829 100644 --- a/0001-Continue-on-empty-GPT-partition-label.patch +++ b/0001-Continue-on-empty-GPT-partition-label.patch @@ -1,13 +1,23 @@ +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..3ac8395 100644 +index 7762d57..35e876c 100644 --- a/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 ctmp = blkid_partition_get_name(part); err = checked_copy(info->label, ctmp, PART_INFO_BUF_SIZE); - if (err) -+ if (err && err != RESULT_LOOKUP_FAILED) ++ if (err == RESULT_LOOKUP_FAILED) ++ strcpy(info->label, ""); ++ else if (err) return err; // uuid