diff --git a/0001-fix-install-permissions.patch b/0001-fix-install-permissions.patch index 45c2c84..0a42adc 100644 --- a/0001-fix-install-permissions.patch +++ b/0001-fix-install-permissions.patch @@ -1,33 +1,24 @@ -commit 2ff83c70c46a22920aa9d5d0e58bbc71a62184ef +commit 5c3b4221dafdc4b701495d85a5a563bd428fe5ec Author: Ignaz Forster -Date: Wed Jul 29 09:20:05 2020 +0200 +Date: Mon Aug 10 23:47:43 2020 +0200 References: (gh#coreos/ignition#1069) Upstream: Submitted Install Dracut modules with correct permissions diff --git a/Makefile b/Makefile -index 29e52840..35b0deda 100644 +index 932b9c7f..fac2218d 100644 --- a/Makefile +++ b/Makefile -@@ -14,11 +14,17 @@ all: - - .PHONY: install +@@ -18,9 +18,10 @@ all: install: all -- for x in dracut/*; do \ -- bn=$$(basename $$x); \ + for x in dracut/*; do \ + bn=$$(basename $$x); \ - install -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x/*; \ -+ for x in dracut/*/*.service dracut/*/*.target dracut/*/*.conf dracut/*/*.rules; do \ -+ bn=$$(dirname $$x); \ -+ bn=$$(basename $$bn); \ -+ install -m 0644 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x; \ ++ install -m 0644 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x/*; \ done - install -D -t $(DESTDIR)/usr/lib/systemd/system systemd/* -+ for x in dracut/*/*.sh dracut/*/*-generator; do \ -+ bn=$$(dirname $$x); \ -+ bn=$$(basename $$bn); \ -+ install -m 0755 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x; \ -+ done ++ chmod a+x $(DESTDIR)/usr/lib/dracut/modules.d/*/*.sh $(DESTDIR)/usr/lib/dracut/modules.d/*/*-generator + install -m 0644 -D -t $(DESTDIR)/usr/lib/systemd/system systemd/* install -m 0755 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/30ignition bin/$(GOARCH)/ignition install -m 0755 -D -t $(DESTDIR)/usr/bin bin/$(GOARCH)/ignition-validate diff --git a/ignition-mount-initrd-fstab.service b/ignition-mount-initrd-fstab.service index 0764ae9..296267f 100644 --- a/ignition-mount-initrd-fstab.service +++ b/ignition-mount-initrd-fstab.service @@ -19,4 +19,5 @@ Before=ignition-files.service Type=oneshot RemainAfterExit=yes ExecStart=/bin/sh -c 'eval $(awk '"'"'$4 ~ /x-initrd.mount/ {print "if ! findmnt /sysroot" $2 " >/dev/null; then mount -t " $3 " -o " $4 " " $1 " /sysroot" $2 "; fi;" }'"'"' /sysroot/etc/fstab)' +ExecStop=/bin/sh -c 'if [ -f /sysroot/etc/systemd/system-preset/20-ignition.preset ]; then while read line; do systemctl --root=/sysroot $line; done < /sysroot/etc/systemd/system-preset/20-ignition.preset; fi' ExecStop=/usr/bin/umount -a -O "x-initrd.mount" diff --git a/ignition.changes b/ignition.changes index aa3a0d4..b840a11 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 12 09:27:01 UTC 2020 - Ignaz Forster + +- Fixed "ignition presets not applied" (boo#1172510) +- Refresh 0001-fix-install-permissions.patch to match pull request + ------------------------------------------------------------------- Sun Aug 09 22:06:51 UTC 2020 - kukuk@suse.de