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 diff --git a/_servicedata b/_servicedata index e437bb2..60d2ec8 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/coreos/ignition.git - dedd8ddd5da76a78e630533d87d43b2a4a323e22 + 641ec6a44062f956bf1d46cf10824032a1996590 \ No newline at end of file diff --git a/ignition-2.0.1+git20190802.d523754.tar.xz b/ignition-2.0.1+git20190802.d523754.tar.xz deleted file mode 100644 index f0651dd..0000000 --- a/ignition-2.0.1+git20190802.d523754.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:510da22f9d209b7b8a378f6a55d1c309f52307c6b08f0d1ce56099143ca6f14c -size 594992 diff --git a/ignition-2.0.1+git20190925.641ec6a.tar.xz b/ignition-2.0.1+git20190925.641ec6a.tar.xz new file mode 100644 index 0000000..03309f3 --- /dev/null +++ b/ignition-2.0.1+git20190925.641ec6a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37197325d60c3634362273f6ba7dc87b1171ea0d094cd69d85eadfd2fae5313e +size 599120 diff --git a/ignition.changes b/ignition.changes index 40aa217..1e2fcca 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Sep 27 11:17:00 UTC 2019 - kukuk@suse.de + +- Update to version 2.0.1+git20190925.641ec6a: + * selinux: use /run/systemd/relabel-extra.d for etc + * resource/url: Don't use a tmpfile in FetchToBuffer + * resource/url: use only needed ifaces in fetchFrom* + * resource/url: make FetchFrom* private + * Add a `fetch` stage + * build: Add `make install` + * tests: fix bb tests for size/start 0 + * Continue on empty GPT partition label + * files/selinux: deglob user/group related paths + * stages/files: relabel masking symlinks for systemd + * engine: Write `/run/ignition.json` atomically + * vendor: Add github.com/google/renameio + * stages/filesystems: drop stray debug print + * doc/supported-platforms: mention qemu version requirements + * Source build file correctly + * resource/url: update schema version in Accept header + * fix check path mount +- Drop 0001-Continue-on-empty-GPT-partition-label.patch: Added + upstream + ------------------------------------------------------------------- Mon Sep 02 16:34:22 UTC 2019 - iforster@suse.de diff --git a/ignition.spec b/ignition.spec index feced64..5118321 100644 --- a/ignition.spec +++ b/ignition.spec @@ -17,14 +17,13 @@ Name: ignition -Version: 2.0.1+git20190802.d523754 +Version: 2.0.1+git20190925.641ec6a 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 @@ -41,7 +40,6 @@ applies the configuration. %prep %setup -q -%patch1 -p1 %build sed -i -e 's|go build -ldflags|go build -buildmode=pie -ldflags|g' build