Hello community,
here is the log from the commit of package ignition-dracut for openSUSE:Factory
checked in at 2019-11-13 13:26:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ignition-dracut (Old)
and /work/SRC/openSUSE:Factory/.ignition-dracut.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ignition-dracut"
Wed Nov 13 13:26:45 2019 rev:5 rq:747795 version:0.0+git20191107.d9e8a63
Changes:
--------
--- /work/SRC/openSUSE:Factory/ignition-dracut/ignition-dracut.changes
2019-10-05 16:22:06.425155704 +0200
+++
/work/SRC/openSUSE:Factory/.ignition-dracut.new.2990/ignition-dracut.changes
2019-11-13 13:26:45.795599876 +0100
@@ -1,0 +2,14 @@
+Mon Nov 11 16:25:37 UTC 2019 - [email protected]
+
+- Update to version 0.0+git20191107.d9e8a63:
+ * 30ignition/ignition-setup-user: mount /boot partition ro
+ * firstboot-complete: tell zipl to run
+ * coreos-gpt-setup: workaround old lsblk not having PTUUID
+ * Add `ignition-subsequent.target` for non-Ignition boots
+ * ignition-firstboot-complete.service: Run as part of basic.target
+- Increase timeout for 'ignition' device on ARM
+- Prefer Ignition configuration if a mount point is both configured
+ in Ignition and fstab (x-initrd.mount flag)
+- Explicitly add awk as initrd dependency
+
+-------------------------------------------------------------------
Old:
----
ignition-dracut-0.0+git20191001.cefb71c.tar.xz
New:
----
ignition-dracut-0.0+git20191107.d9e8a63.tar.xz
ignition-userconfig-timeout-arm.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ignition-dracut.spec ++++++
--- /var/tmp/diff_new_pack.DugE7z/_old 2019-11-13 13:26:46.503600613 +0100
+++ /var/tmp/diff_new_pack.DugE7z/_new 2019-11-13 13:26:46.503600613 +0100
@@ -17,7 +17,7 @@
Name: ignition-dracut
-Version: 0.0+git20191001.cefb71c
+Version: 0.0+git20191107.d9e8a63
Release: 0
Summary: Dracut scripts for ignition
License: BSD-2-Clause
@@ -26,13 +26,14 @@
URL: https://github.com/dustymabe/ignition-dracut
Source: %{name}-%{version}.tar.xz
Source1: ignition-mount-initrd-fstab.service
-Source2: ignition-userconfig-timeout.conf
Source3: ignition-suse-generator
Source4: module-setup.sh
Source5: 01_suse_set_ignition
Source6: change-ignition-firstboot-path.conf
Source7: README.SUSE
Source8: ignition-setup-user-suse.sh
+Source20: ignition-userconfig-timeout.conf
+Source21: ignition-userconfig-timeout-arm.conf
Patch2: 0002-Support-different-flagfile-location.patch
Patch3: 0003-Disable-resetting-UUID.patch
BuildRequires: suse-module-tools
@@ -59,7 +60,12 @@
%patch3 -p1
mkdir dracut/30ignition-microos
chmod +x %{SOURCE3} %{SOURCE4} %{SOURCE8}
-cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE8}
dracut/30ignition-microos/
+cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE8} dracut/30ignition-microos/
+%ifarch aarch64 %{arm}
+cp %{SOURCE21} dracut/30ignition-microos/
+%else
+cp %{SOURCE20} dracut/30ignition-microos/
+%endif
cp %{SOURCE5} grub/
cp %{SOURCE6} systemd/
cp %{SOURCE7} .
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.DugE7z/_old 2019-11-13 13:26:46.915601042 +0100
+++ /var/tmp/diff_new_pack.DugE7z/_new 2019-11-13 13:26:46.927601054 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/coreos/ignition-dracut.git</param>
- <param
name="changesrevision">4cdd02487aea163fe2541861ea0eab9383287114</param>
+ <param
name="changesrevision">e96e7fc7ca6adffa8b6eff87ab2a3fec24a5ccee</param>
</service>
</servicedata>
\ No newline at end of file
++++++ ignition-dracut-0.0+git20191001.cefb71c.tar.xz ->
ignition-dracut-0.0+git20191107.d9e8a63.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ignition-dracut-0.0+git20191001.cefb71c/dracut/30ignition/coreos-gpt-setup.sh
new/ignition-dracut-0.0+git20191107.d9e8a63/dracut/30ignition/coreos-gpt-setup.sh
---
old/ignition-dracut-0.0+git20191001.cefb71c/dracut/30ignition/coreos-gpt-setup.sh
2019-10-01 22:09:25.000000000 +0200
+++
new/ignition-dracut-0.0+git20191107.d9e8a63/dracut/30ignition/coreos-gpt-setup.sh
2019-11-07 15:05:43.000000000 +0100
@@ -1,13 +1,24 @@
#!/bin/bash
-# randomizes the disk guid on the disking containing the partition specified
by $1
+# randomizes the disk guid on the disk containing the partition specified by $1
# and moves the secondary gpt header/partition table to the end of the disk
where it
# should be. If the disk guid is already randomized, it does nothing.
set -euo pipefail
UNINITIALIZED_GUID='00000000-0000-4000-a000-000000000001'
-# PTUUID is the disk guid, PKANME is the parent kernel name
-eval $(lsblk --output PTUUID,PKNAME --pairs --paths --nodeps "$1")
+# On RHEL 8 the version of lsblk doesn't have PTUUID. Let's detect
+# if lsblk supports it. In the future we can remove the 'if' and
+# just use the 'else'.
+if ! lsblk --help | grep -q PTUUID; then
+ # Get the PKNAME
+ eval $(lsblk --output PKNAME --pairs --paths --nodeps "$1")
+ # Get the PTUUID
+ eval $(blkid -o export $PKNAME)
+else
+ # PTUUID is the disk guid, PKNAME is the parent kernel name
+ eval $(lsblk --output PTUUID,PKNAME --pairs --paths --nodeps "$1")
+fi
+
[ "$PTUUID" != "$UNINITIALIZED_GUID" ] && exit 0
sgdisk --disk-guid=R --move-second-header "$PKNAME"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ignition-dracut-0.0+git20191001.cefb71c/dracut/30ignition/ignition-generator
new/ignition-dracut-0.0+git20191107.d9e8a63/dracut/30ignition/ignition-generator
---
old/ignition-dracut-0.0+git20191001.cefb71c/dracut/30ignition/ignition-generator
2019-10-01 22:09:25.000000000 +0200
+++
new/ignition-dracut-0.0+git20191107.d9e8a63/dracut/30ignition/ignition-generator
2019-11-07 15:05:43.000000000 +0100
@@ -53,6 +53,12 @@
After=dev-disk-by\x2dlabel-boot.device
EOF
fi
+else
+ # If we're doing a non-Ignition (subsequent) boot, then
+ # queue a different target. This is necessary so that units
+ # like `ignition-ostree-mount-sysroot.service`
+ # can cleanly distinguish between the two.
+ add_requires ignition-subsequent.target initrd.target
fi
echo "PLATFORM_ID=$(cmdline_arg ignition.platform.id)" > /run/ignition.env
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ignition-dracut-0.0+git20191001.cefb71c/dracut/30ignition/ignition-setup-user.sh
new/ignition-dracut-0.0+git20191107.d9e8a63/dracut/30ignition/ignition-setup-user.sh
---
old/ignition-dracut-0.0+git20191001.cefb71c/dracut/30ignition/ignition-setup-user.sh
2019-10-01 22:09:25.000000000 +0200
+++
new/ignition-dracut-0.0+git20191107.d9e8a63/dracut/30ignition/ignition-setup-user.sh
2019-11-07 15:05:43.000000000 +0100
@@ -25,6 +25,8 @@
# with MountFlags=slave so it is unmounted for us.
bootmnt=/mnt/boot_partition
mkdir -p $bootmnt
- mount /dev/disk/by-label/boot $bootmnt
+ # mount as read-only since we don't strictly need write access and we may
be
+ # running alongside other code that also has it mounted ro
+ mount -o ro /dev/disk/by-label/boot $bootmnt
copy_file_if_exists "${bootmnt}/ignition/config.ign"
"${destination}/user.ign"
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ignition-dracut-0.0+git20191001.cefb71c/dracut/30ignition/ignition-subsequent.target
new/ignition-dracut-0.0+git20191107.d9e8a63/dracut/30ignition/ignition-subsequent.target
---
old/ignition-dracut-0.0+git20191001.cefb71c/dracut/30ignition/ignition-subsequent.target
1970-01-01 01:00:00.000000000 +0100
+++
new/ignition-dracut-0.0+git20191107.d9e8a63/dracut/30ignition/ignition-subsequent.target
2019-11-07 15:05:43.000000000 +0100
@@ -0,0 +1,14 @@
+# This target is queued to run when Ignition will *not* run.
+# It's intended right now for mounting sysroot, which happens in a quite
+# different order on the Ignition boot versus "subsequent" boots.
+[Unit]
+Description=Subsequent (Not Ignition) boot complete
+Before=initrd.target
+
+# See comments in ignition-complete.target
+OnFailure=emergency.target
+OnFailureJobMode=isolate
+
+# Make sure we stop all the units before switching root
+Conflicts=initrd-switch-root.target umount.target
+Conflicts=dracut-emergency.service emergency.service emergency.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ignition-dracut-0.0+git20191001.cefb71c/dracut/30ignition/module-setup.sh
new/ignition-dracut-0.0+git20191107.d9e8a63/dracut/30ignition/module-setup.sh
---
old/ignition-dracut-0.0+git20191001.cefb71c/dracut/30ignition/module-setup.sh
2019-10-01 22:09:25.000000000 +0200
+++
new/ignition-dracut-0.0+git20191107.d9e8a63/dracut/30ignition/module-setup.sh
2019-11-07 15:05:43.000000000 +0100
@@ -54,6 +54,8 @@
inst_simple "$moddir/ignition-complete.target" \
"$systemdsystemunitdir/ignition-complete.target"
+ inst_simple "$moddir/ignition-subsequent.target" \
+ "$systemdsystemunitdir/ignition-subsequent.target"
inst_simple "$moddir/ignition-diskful.target" \
"$systemdsystemunitdir/ignition-diskful.target"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ignition-dracut-0.0+git20191001.cefb71c/systemd/ignition-firstboot-complete.service
new/ignition-dracut-0.0+git20191107.d9e8a63/systemd/ignition-firstboot-complete.service
---
old/ignition-dracut-0.0+git20191001.cefb71c/systemd/ignition-firstboot-complete.service
2019-10-01 22:09:25.000000000 +0200
+++
new/ignition-dracut-0.0+git20191107.d9e8a63/systemd/ignition-firstboot-complete.service
2019-11-07 15:05:43.000000000 +0100
@@ -18,7 +18,14 @@
# detected this file. Fail if we are unable to remove it, rather than risking
# rerunning Ignition at next boot.
MountFlags=slave
-ExecStart=/bin/sh -c 'mount -o remount,rw /boot && rm /boot/ignition.firstboot'
+# It is better to have a separate script to do this but it might be polluting
+# the target system with some script in i.e. /usr/sbin/firstboot-complete
+# The retval code is still respected with having this if-else block.
+ExecStart=/bin/sh -c \
+ 'mount -o remount,rw /boot && \
+ if [[ $(uname -m) = s390x ]]; then zipl; fi && \
+ rm /boot/ignition.firstboot'
[Install]
-WantedBy=multi-user.target
+# Part of basic.target so this happens early on in firstboot
+WantedBy=basic.target
++++++ ignition-mount-initrd-fstab.service ++++++
--- /var/tmp/diff_new_pack.DugE7z/_old 2019-11-13 13:26:47.811601975 +0100
+++ /var/tmp/diff_new_pack.DugE7z/_new 2019-11-13 13:26:47.811601975 +0100
@@ -9,12 +9,14 @@
After=initrd-root-fs.target
After=ignition-remount-sysroot.service
-# Allow Ignition to overwrite automatic mounts
+# Run only after Ignition's mount stage - mount points configured by Ignition
+# itself will be skipped below, just mount the rest.
Requires=ignition-mount.service
-Before=ignition-mount.service
+After=ignition-mount.service
+Before=ignition-files.service
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/bin/sh -c 'eval $(awk '"'"'$4 ~ /x-initrd.mount/ {print "mount -t "
$3 " -o " $4 " " $1 " /sysroot" $2 "; sleep 5; " }'"'"' /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=/usr/bin/umount -a -O "x-initrd.mount"
++++++ ignition-userconfig-timeout-arm.conf ++++++
[Unit]
JobTimeoutSec=10
++++++ module-setup.sh ++++++
--- /var/tmp/diff_new_pack.DugE7z/_old 2019-11-13 13:26:47.855602020 +0100
+++ /var/tmp/diff_new_pack.DugE7z/_new 2019-11-13 13:26:47.855602020 +0100
@@ -15,6 +15,7 @@
"$systemdutildir/system-generators/ignition-suse-generator"
inst_script "$moddir/ignition-setup-user-suse.sh" \
"/usr/sbin/ignition-setup-user-suse"
+ inst_multiple awk
}
installkernel() {
