Hello community,
here is the log from the commit of package dracut-saltboot for
openSUSE:Leap:15.2 checked in at 2020-05-18 10:59:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/dracut-saltboot (Old)
and /work/SRC/openSUSE:Leap:15.2/.dracut-saltboot.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut-saltboot"
Mon May 18 10:59:56 2020 rev:3 rq:806111 version:0.1.1587051918.6bc9e88
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/dracut-saltboot/dracut-saltboot.changes
2020-03-15 07:13:16.197031721 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.dracut-saltboot.new.2738/dracut-saltboot.changes
2020-05-18 10:59:56.982705429 +0200
@@ -1,0 +2,28 @@
+Thu Apr 9 12:00:44 UTC 2020 - Ondrej Holecek <[email protected]>
+
+- Add missing terminal naming modifiers as exported veriables
+- Update to version 0.1.1587051918.6bc9e88
+
+-------------------------------------------------------------------
+Mon Mar 16 16:04:39 UTC 2020 - Vladimir Nadvornik <[email protected]>
+
+- Assemble existing RAIDs before searching for salt configuration
+- Update to version 0.1.1585064259.12b97ef
+
+-------------------------------------------------------------------
+Wed Mar 11 16:17:25 UTC 2020 - Vladimir Nadvornik <[email protected]>
+
+- Force installation of raid1 kernel module
+
+-------------------------------------------------------------------
+Tue Mar 10 12:26:51 UTC 2020 - Vladimir Nadvornik <[email protected]>
+
+- Use more reliable progress output
+
+-------------------------------------------------------------------
+Sat Feb 29 22:31:11 UTC 2020 - Ondrej Holecek <[email protected]>
+
+- Use start event grains to avoid extra grains calls
+- Update to version 0.1.1583842676.2fc2fa6
+
+-------------------------------------------------------------------
Old:
----
dracut-saltboot-0.1.1580471316.1839544.tar.xz
New:
----
dracut-saltboot-0.1.1587051918.6bc9e88.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut-saltboot.spec ++++++
--- /var/tmp/diff_new_pack.Q1DOXl/_old 2020-05-18 10:59:57.458706414 +0200
+++ /var/tmp/diff_new_pack.Q1DOXl/_new 2020-05-18 10:59:57.462706421 +0200
@@ -16,7 +16,7 @@
#
Name: dracut-saltboot
-Version: 0.1.1580471316.1839544
+Version: 0.1.1587051918.6bc9e88
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: dracut-saltboot-%{version}.tar.xz
++++++ dracut-saltboot-0.1.1580471316.1839544.tar.xz ->
dracut-saltboot-0.1.1587051918.6bc9e88.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-saltboot-0.1.1580471316.1839544/dracut-saltboot.changes
new/dracut-saltboot-0.1.1587051918.6bc9e88/dracut-saltboot.changes
--- old/dracut-saltboot-0.1.1580471316.1839544/dracut-saltboot.changes
2020-01-31 12:48:36.000000000 +0100
+++ new/dracut-saltboot-0.1.1587051918.6bc9e88/dracut-saltboot.changes
2020-04-16 17:45:18.000000000 +0200
@@ -1,7 +1,35 @@
-------------------------------------------------------------------
+Thu Apr 9 12:00:44 UTC 2020 - Ondrej Holecek <[email protected]>
+
+- Add missing terminal naming modifiers as exported veriables
+
+-------------------------------------------------------------------
+Mon Mar 16 16:04:39 UTC 2020 - Vladimir Nadvornik <[email protected]>
+
+- Assemble existing RAIDs before searching for salt configuration
+- Update to version 0.1.1585064259.12b97ef
+
+-------------------------------------------------------------------
+Wed Mar 11 16:17:25 UTC 2020 - Vladimir Nadvornik <[email protected]>
+
+- Force installation of raid1 kernel module
+
+-------------------------------------------------------------------
+Tue Mar 10 12:26:51 UTC 2020 - Vladimir Nadvornik <[email protected]>
+
+- Use more reliable progress output
+
+-------------------------------------------------------------------
+Sat Feb 29 22:31:11 UTC 2020 - Ondrej Holecek <[email protected]>
+
+- Use start event grains to avoid extra grains calls
+- Update to version 0.1.1583842676.2fc2fa6
+
+-------------------------------------------------------------------
Wed Jan 29 12:43:16 UTC 2020 - Ondrej Holecek <[email protected]>
- Add support for FQDN as a terminal name
+- Update to version 0.1.1580471316.1839544
-------------------------------------------------------------------
Thu Jan 9 15:33:44 UTC 2020 - Ondrej Holecek <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-saltboot-0.1.1580471316.1839544/saltboot/module-setup.sh
new/dracut-saltboot-0.1.1587051918.6bc9e88/saltboot/module-setup.sh
--- old/dracut-saltboot-0.1.1580471316.1839544/saltboot/module-setup.sh
2020-01-31 12:48:36.000000000 +0100
+++ new/dracut-saltboot-0.1.1587051918.6bc9e88/saltboot/module-setup.sh
2020-04-16 17:45:18.000000000 +0200
@@ -28,6 +28,13 @@
}
# called by dracut
+installkernel() {
+ # for raid support, the kernel module is needed unconditionally, even in
hostonly mode
+ hostonly='' instmods raid1
+}
+
+
+# called by dracut
install() {
inst_multiple -o $(rpm -ql $(get_python_pkg_deps_recursive salt
salt-minion) | \
grep -v
'\.pyc$\|/etc/salt/minion_id\|/etc/salt/pki\|/usr/share/doc/\|/usr/share/man' )
@@ -35,11 +42,11 @@
inst_multiple -o grep dig ldconfig date dbus-uuidgen
systemd-machine-id-setup dmidecode seq parted \
lsblk partprobe mdadm dcounter mkswap curl head md5sum
resize2fs mkfs mkfs.btrfs \
mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.fat mkfs.vfat mkfs.xfs
sync cryptsetup busybox \
- swapon
+ swapon tail
inst_hook cmdline 91 "$moddir/saltboot-root.sh"
inst_hook pre-mount 99 "$moddir/saltboot.sh"
- echo "rd.neednet=1" > "${initdir}/etc/cmdline.d/50saltboot.conf"
+ echo "rd.neednet=1 rd.auto" > "${initdir}/etc/cmdline.d/50saltboot.conf"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-saltboot-0.1.1580471316.1839544/saltboot/saltboot-root.sh
new/dracut-saltboot-0.1.1587051918.6bc9e88/saltboot/saltboot-root.sh
--- old/dracut-saltboot-0.1.1580471316.1839544/saltboot/saltboot-root.sh
2020-01-31 12:48:36.000000000 +0100
+++ new/dracut-saltboot-0.1.1587051918.6bc9e88/saltboot/saltboot-root.sh
2020-04-16 17:45:18.000000000 +0200
@@ -30,9 +30,17 @@
DHCPORSERVER="1"
fi;
+# Salt minion modifiers
export MASTER=$(getarg MASTER=)
export MINION_ID_PREFIX=$(getarg MINION_ID_PREFIX=)
-export DISABLE_UNIQUE_SUFFIX=$(getarg DISABLE_UNIQUE_SUFFIX=)
export SALT_TIMEOUT=$(getarg SALT_TIMEOUT=)
export salt_device=$(getarg salt_device=)
+
+# Terminal naming modifiers
+export DISABLE_UNIQUE_SUFFIX=$(getarg DISABLE_UNIQUE_SUFFIX=)
+export DISABLE_HOSTNAME_ID=$(getarg DISABLE_HOSTNAME_ID=)
+export DISABLE_ID_PREFIX=$(getarg DISABLE_ID_PREFIX=)
+export USE_FQDN_MINION_ID=$(getarg USE_FQDN_MINION_ID=)
+
+# Debugging
export kiwidebug=$(getarg kiwidebug=)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-saltboot-0.1.1580471316.1839544/saltboot/saltboot.sh
new/dracut-saltboot-0.1.1587051918.6bc9e88/saltboot/saltboot.sh
--- old/dracut-saltboot-0.1.1580471316.1839544/saltboot/saltboot.sh
2020-01-31 12:48:36.000000000 +0100
+++ new/dracut-saltboot-0.1.1587051918.6bc9e88/saltboot/saltboot.sh
2020-04-16 17:45:18.000000000 +0200
@@ -32,12 +32,19 @@
PROGRESS_PID=$!
fi
+echo -n > /dc_progress
+bash -c 'tail -f /dc_progress | while true ; do read msg ; echo "$msg"
>/progress ; done ' &
+DC_PROGRESS_PID=$!
+
rm /etc/machine-id
mkdir -p /var/lib/dbus
rm /var/lib/dbus/machine-id
dbus-uuidgen --ensure
systemd-machine-id-setup
+# make sure there are no pending changes in devices
+udevadm settle -t 60
+
salt_device=${salt_device:-${root#block:}}
mkdir -p $NEWROOT
@@ -123,6 +130,15 @@
EOT
fi
+# send basic grains in the minion start event. This allows salt master to work
with saltboot minion
+# with 1 (new registration) or 0 (already existing registration) grains calls
+cat > /etc/salt/minion.d/grains-startup-event.conf <<EOT
+start_event_grains:
+ - machine_id
+ - saltboot_initrd
+ - susemanager
+EOT
+
CUR_MASTER=`salt-call --local --out newline_values_only grains.get master`
# do we have master explicitly configured?
if [ -z "$CUR_MASTER" -o "salt" == "$CUR_MASTER" ] ; then
@@ -202,6 +218,7 @@
fi
[ -n "$PROGRESS_PID" ] && kill $PROGRESS_PID
+[ -n "$DC_PROGRESS_PID" ] && kill $DC_PROGRESS_PID
if [ "$systemIntegrity" = "unknown" ] ; then
Echo "SALT Minion did not create valid configuration"
