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

- Fixed "ignition presets not applied" (boo#1172510)

Browse Source 
- Refresh 0001-fix-install-permissions.patch to match pull request

OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=55
This commit is contained in:
Ignaz Forster 2020-08-12 09:30:38 +00:00 committed by Git OBS Bridge
parent d9320f8dce
commit e05d76ae86
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-fix-install-permissions.patch
View File

@ -1,33 +1,24 @@
commit 2ff83c70c46a22920aa9d5d0e58bbc71a62184ef commit 5c3b4221dafdc4b701495d85a5a563bd428fe5ec
Author: Ignaz Forster <iforster@suse.com> Author: Ignaz Forster <iforster@suse.com>
Date: Wed Jul 29 09:20:05 2020 +0200 Date: Mon Aug 10 23:47:43 2020 +0200
References: (gh#coreos/ignition#1069) References: (gh#coreos/ignition#1069)
Upstream: Submitted Upstream: Submitted
Install Dracut modules with correct permissions Install Dracut modules with correct permissions
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 29e52840..35b0deda 100644 index 932b9c7f..fac2218d 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -14,11 +14,17 @@ all: @@ -18,9 +18,10 @@ all:
.PHONY: install
install: all install: all
- for x in dracut/*; do \ for x in dracut/*; do \
- bn=$$(basename $$x); \ bn=$$(basename $$x); \
- install -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x/*; \ - install -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x/*; \
+ for x in dracut/*/*.service dracut/*/*.target dracut/*/*.conf dracut/*/*.rules; do \ + install -m 0644 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x/*; \
+ bn=$$(dirname $$x); \
+ bn=$$(basename $$bn); \
+ install -m 0644 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x; \
done done
- install -D -t $(DESTDIR)/usr/lib/systemd/system systemd/* - install -D -t $(DESTDIR)/usr/lib/systemd/system systemd/*
+ for x in dracut/*/*.sh dracut/*/*-generator; do \ + chmod a+x $(DESTDIR)/usr/lib/dracut/modules.d/*/*.sh $(DESTDIR)/usr/lib/dracut/modules.d/*/*-generator
+ bn=$$(dirname $$x); \
+ bn=$$(basename $$bn); \
+ install -m 0755 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x; \
+ done
+ install -m 0644 -D -t $(DESTDIR)/usr/lib/systemd/system systemd/* + 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/lib/dracut/modules.d/30ignition bin/$(GOARCH)/ignition
install -m 0755 -D -t $(DESTDIR)/usr/bin bin/$(GOARCH)/ignition-validate install -m 0755 -D -t $(DESTDIR)/usr/bin bin/$(GOARCH)/ignition-validate

1
ignition-mount-initrd-fstab.service
View File

@ -19,4 +19,5 @@ Before=ignition-files.service
Type=oneshot Type=oneshot
RemainAfterExit=yes 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)' 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" ExecStop=/usr/bin/umount -a -O "x-initrd.mount"

6
ignition.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 12 09:27:01 UTC 2020 - Ignaz Forster <iforster@suse.com>
- 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 Sun Aug 09 22:06:51 UTC 2020 - kukuk@suse.de