From bd7296b98d0dad004241df366051e9cf6c96bdbc07472f9bfaadd4ff14a92c5b Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 18 May 2021 09:09:07 +0000 Subject: [PATCH 1/4] - Update to version 054+suse.95.gd5820102: * chore(suse) update spec - Update to version 054+suse.94.g1648453e: * chore(suse): re-add SUSE mkinitrd - Update to version 054+suse.93.gd393f006: With this release dracut has undergone a major overhaul. A lot of systemd related modules have been added. The integration test suite has finally ironed out the flaky behaviour due to the parallel device probing of the kernel, which bit sometimes in the non-kvm github CI. So, if you see any /dev/sda in a setup script with more than two hard drives, chances are, that the script works on the wrong disk. Same goes for network interfaces. This release is also fully shellcheck'ed with ShellCheck-0.7.2 and indented with shfmt and astyle. The dracut project builds test containers every day for: opensuse/tumbleweed-dnf:latest archlinux:latest fedora:rawhide fedora:latest fedora:33 These containers can easily be used to run the integration tests locally without root permissions via podman. We hope this serves as a blueprint for your distribution's CI process. More information can be found in docs/HACKING.md. Bug Fixes OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=434 --- _service | 4 +- _servicedata | 2 +- dracut-053+suse.93.g039ac07d.obscpio | 3 - dracut-054+suse.95.gd5820102.obscpio | 3 + dracut.changes | 198 +++++++++++++++++++++++++++ dracut.obsinfo | 6 +- dracut.spec | 51 +++++-- 7 files changed, 247 insertions(+), 20 deletions(-) delete mode 100644 dracut-053+suse.93.g039ac07d.obscpio create mode 100644 dracut-054+suse.95.gd5820102.obscpio diff --git a/_service b/_service index f091855..c1c5518 100644 --- a/_service +++ b/_service @@ -2,9 +2,9 @@ git https://github.com/opensuse/dracut.git - SUSE/053 + SUSE/054 @PARENT_TAG@+suse.@TAG_OFFSET@.g%h - + suse/dracut.spec suse/README.susemaint enable diff --git a/_servicedata b/_servicedata index 308b5ee..83d3e9d 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/opensuse/dracut.git - ed7efdabfbdcafbe108526547f470e5d9a532dd8 \ No newline at end of file + d58201029c4ffb4754e6c203916bb35f05b1cc59 \ No newline at end of file diff --git a/dracut-053+suse.93.g039ac07d.obscpio b/dracut-053+suse.93.g039ac07d.obscpio deleted file mode 100644 index 0509c87..0000000 --- a/dracut-053+suse.93.g039ac07d.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52d453ef9a69d9c4aba7f683e65502ceadd59c4878508831bde1aba13a2527e3 -size 1848844 diff --git a/dracut-054+suse.95.gd5820102.obscpio b/dracut-054+suse.95.gd5820102.obscpio new file mode 100644 index 0000000..3c8f108 --- /dev/null +++ b/dracut-054+suse.95.gd5820102.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c58fe477cee7994cc9906b8d4de0f46e0ea09de5610076c0cb345820363c024 +size 1911308 diff --git a/dracut.changes b/dracut.changes index 0e73cb5..83d8a40 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,201 @@ +------------------------------------------------------------------- +Tue May 18 08:55:15 UTC 2021 - daniel.molkentin@suse.com + +- Update to version 054+suse.95.gd5820102: + * chore(suse) update spec + +------------------------------------------------------------------- +Mon May 17 18:24:47 UTC 2021 - daniel.molkentin@suse.com + +- Update to version 054+suse.94.g1648453e: + * chore(suse): re-add SUSE mkinitrd + +------------------------------------------------------------------- +Mon May 17 17:34:10 UTC 2021 - daniel.molkentin@suse.com + +- Update to version 054+suse.93.gd393f006: + + With this release dracut has undergone a major overhaul. + + A lot of systemd related modules have been added. + + The integration test suite has finally ironed out the flaky behaviour due to the parallel device probing of the kernel, + which bit sometimes in the non-kvm github CI. So, if you see any /dev/sda in a setup script with more than two hard drives, + chances are, that the script works on the wrong disk. Same goes for network interfaces. + + This release is also fully shellcheck'ed with ShellCheck-0.7.2 and indented with shfmt and astyle. + + The dracut project builds test containers every day for: + + opensuse/tumbleweed-dnf:latest + archlinux:latest + fedora:rawhide + fedora:latest + fedora:33 + + These containers can easily be used to run the integration tests locally without root permissions via podman. + We hope this serves as a blueprint for your distribution's CI process. + + More information can be found in docs/HACKING.md. + + Bug Fixes + + make testsuite pass on OpenSuse and Arch (8b2afb08) + cope with distributions with /usr/etc files (3ad3b3a4) + deprecate gummiboot (5c94cf41) + set vimrc and emacs indention according to .editorconfig (9012f399) + correctly handle kernel parameters (501d82f7) + remove dracut.pc on make clean (d643156d) + honor KVERSION environment in the Makefile (d8a454a5) + always use mkdir -p (9cf7b1c5) + dracut.sh: + prevent symbolic links containing // (de0c0872) + adding missing globalvars for udev (f35d479d) + sysctl global variables (3ca9aa1d) + add global vars for modules-load (ec4539c6) + omission is an addition to other omissions in conf files (96c31333) + harden dracut against GZIP environment variable (d8e47e20) + add a missing tmpfilesconfdir global variable (8849dd8d) + include modules.builtin.alias in the initramfs (7f633747) + install all depmod relevant configuration files (50a01dd4) + add modules.builtin.modinfo to the initramfs (87c4c178) + search for btrfs devices from actual mount poiont (3fdc734a) + dracut-functions.sh: + implement a cache for get_maj_min (c3bb9d18) + word splitting issue for sed in get_ucode_file (122657b2) + dracut-logger.sh: double dash trigger unknown logger warnings during run (4fbccde5) + dracut-install: + handle $LIB in ldd output parsing (d1a36d3d) + handle builtin modules (2536a9ea) + base: + suppress calls to getarg in build phase (6feaaabc) + source hooks without exec (8059bcb2) + wait_for_dev quote shell variables (b800edd6) + adding crc32c for ext3 (61f45643) + crypt: + install all crypto modules in the generic initrd (10f9e569) + include cryptsetups tmpfile (a4cc1964) + crypt-gpg: + cope with different scdaemon location (44fd1c13) + dbus-broker: + enable the service (df1e5f06) + dbus-daemon: + only error out in install() (ae4fbb3d) + dracut-systemd: + don't refuse root=tmpfs when systemd is used (a96900a8) + examples: remove the examples directory and reference to it (b37c90c8) + fips: + add dh and ecdh ciphers (543b8014) + remove old udev version requirements (be30d987) + i18n: + skip if data is missing (651fe01e) + img-lib: + ignored null byte in input (85eb9680) + integrity: + properly set up EVM when using an x509 cert (4bdd7eb2) + iscsi: + replace sed call with bash internals (66b920c6) + add iscsid.service requirements (bb6770f1) + only rely on socket activiation (0eb87d78) + kernel-modules: + optionally add /usr/lib/modules.d to initramfs (92e6a8f8) + add watchdog drivers for generic initrd (3a60c036) + mdraid: + remove dependency statements (86b75634) + memstrack: + correct dependencies (c2ecc4d1) + multipath: + stop multipath before udev db cleanup (3c244c7c) + revise multipathd-stop (7b8c78ff) + nbd: + assume nbd version >= 3.8 (6209edeb) + remove old udev version requirements (fd15dbad) + make nbd work again with systemd (77906443) + network: + use wicked unit instead of find_binary (57eefcf7) + user variable for sdnetworkd instead of path (4982e16d) + correct regression in iface_has_carrier (36af0518) + network-legacy: + add missing options to dhclient.conf (abfd547a) + silence getargs (60a34d8b) + network-manager: + cope with distributions not using libexec (22d6863e) + set timeout via command line option (8a51ee1f) + run after dracut-cmdline (4d03404f) + create /run directories (49b61496) + use /run/NetworkManager/initrd/neednet in initqueue (6a37c6f6) + only run NetworkManager if rd.neednet=1 (ac0e8f7d) + nm-run.service: don't kill forked processes (1f21fac6) + no default deps for nm-run.service (ba4bcf5f) + nm-lib.sh does not require bash (3402142e) + squash: + post install should be the last step before stripping (8c8aecdc) + systemd: + include all nss libraries (b3bbf5fb) + include hosts and nsswitch.conf in hostonly mode (5912f4fb) + remove old systemd version requirements (fc53987b) + systemd-hostnamed: extra quote (2aa65234) + systemd-modules: remove dependency on systemd meta module (afef4557) + systemd-modules-load: + misc repairs (782ac8f1) + systemd-networkd: + make systemd-networkd a proper network provider (ea779750, closes #737) + systemd-resolved: remove nss libraries (12bef83c) + systemd-sysctl: + sysctl global variables (02acedd0) + systemd-sysusers: + misc fixes and cleanup (7359ba8a) + systemd-udev: use global vars instead of fixed path (fd883a58) + systemd-udevd: add udev id program files (562cb77b) + systemd-verity: + incorrect reference to cryptsetup target (ba92d1fc) + re-naming module to veritysetup (0267f3c3) + tpm2-tss: add tpm2 requirement (8f99fada) + udev-rules: + remove sourcing of network link files (69f4e7cd) + add btrfs udev rules by default (567c4557) + url-lib: + fix passing args (5f6be515) + zipl: + don't depend on grub2 (6b499ec1) + + Performance + + disable initrd compression when squash module is enabled (7c0bc0b2) + + Features + + support ZSTD-compressed kernel modules (ce9af251) + also restore the initramfs from /lib/modules (33e27fab) + extend Makefile indent target (e0a0fa61) + customize .editorconfig according to shfmt (1f621aba) + squash module follow --compress option (5d05ffbd) + bluetooth: implement bluetooth support in initrd (64ee2a53) + btrfs: add 64-btrfs-dm.rules rules (d4caa86a) + mkinitrd: remove mkinitrd (43df4ee2) + nbd: support ipv6 link local nbds (b12f8188) + network-manager: run as daemon with D-Bus (112f03f9) + qemu: include the virtio_mem kernel module (f3dcb606) + skipcpio: speed up and harden skipcpio (63033495) + squash: + use busybox for early setup if available (90f269f6) + install and depmod modules seperately (5a18b24a) + systemd-ac-power: introducing the systemd-ac-power module (e7407230) + systemd-hostnamed: introducing the systemd-hostnamed module (bf273e3e) + systemd-initrd: add initrd-usr-fs.target (5eb73610) + systemd-journald: introducing the systemd-journald module (3697891b) + systemd-ldconfig: introducing the systemd-ldconfig module (563c434e) + systemd-network-management: introducing systemd-network-management module (e942d86c) + systemd-resolved: introducing the systemd-resolved module (b7d3caef) + systemd-rfkill: introducing the systemd-rfkill module (21536544) + systemd-sysext: introducing the systemd-sysext module (fc88af54) + systemd-timedated: introducing the systemd-timedated module (1c41cc90) + systemd-timesyncd: introducing the systemd-timesyncd module (2257d545) + systemd-tmpfiles: introducing the systemd-tmpfiles module (2b61be32) + systemd-udevd: introducing the systemd-udevd module (3534789c) + systemd-verity: introducing the systemd-verity module (3d4dea58) + tpm2-tss: introducing the tpm2-tss module (8743b073) + ------------------------------------------------------------------- Wed Mar 03 12:38:14 UTC 2021 - daniel.molkentin@suse.com diff --git a/dracut.obsinfo b/dracut.obsinfo index 95cea22..52f598a 100644 --- a/dracut.obsinfo +++ b/dracut.obsinfo @@ -1,5 +1,5 @@ name: dracut -version: 053+suse.93.g039ac07d -mtime: 1614775094 -commit: 039ac07d6576b0e1f0b378851bc6360e4fdb193c +version: 054+suse.95.gd5820102 +mtime: 1621328017 +commit: d58201029c4ffb4754e6c203916bb35f05b1cc59 diff --git a/dracut.spec b/dracut.spec index 1e888f7..f3c0b72 100644 --- a/dracut.spec +++ b/dracut.spec @@ -19,7 +19,7 @@ %define dracutlibdir %{_prefix}/lib/dracut Name: dracut -Version: 053+suse.93.g039ac07d +Version: 054+suse.95.gd5820102 Release: 0 Summary: Initramfs generator using udev License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -57,8 +57,6 @@ Requires: util-linux >= 2.21 Requires: xz # We use 'btrfs fi usage' that was not present before Conflicts: btrfsprogs < 3.18 -Obsoletes: mkinitrd < 2.8.2 -Provides: mkinitrd = 2.8.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} @@ -114,6 +112,18 @@ Requires: keyutils This package contains all modules that are part of dracut upstream but are not normally supported or required. +%package mkinitrd-deprecated +Summary: Dracut mkinitrd wrapper +Group: System/Base +Requires: %{name} = %{version}-%{release} +Requires: dracut +Obsoletes: mkinitrd < 2.8.2 +Provides: mkinitrd = 2.8.2 + +%description mkinitrd-deprecated +This package contains the legacy initrd script for dracut. +Call dracut directly instead. + %prep %setup -q @@ -143,8 +153,7 @@ install -m 0644 dracut.conf.d/ima.conf.example %{buildroot}%{_sysconfdir}/dracut install -m 0644 suse/s390x_persistent_device.conf %{buildroot}%{_sysconfdir}/dracut.conf.d/10-s390x_persistent_device.conf %endif -rm %{buildroot}%{_bindir}/mkinitrd -install -D -m 0755 mkinitrd-suse.sh %{buildroot}/%{_sbindir}/mkinitrd +install -D -m 0755 suse/mkinitrd-suse.sh %{buildroot}/%{_sbindir}/mkinitrd install -D -m 0755 suse/dracut-installkernel %{buildroot}/%{_sbindir}/installkernel %if !0%{?usrmerged} @@ -251,18 +260,23 @@ fi %{dracutlibdir}/modules.d/95zfcp %{dracutlibdir}/modules.d/95znet +%files mkinitrd-deprecated +%defattr(-,root,root,0755) +%{_sbindir}/mkinitrd +/sbin/mkinitrd +%{_mandir}/man8/mkinitrd.8* + %files %defattr(-,root,root,0755) %license COPYING -%doc README.md README.cross README.generic README.kernel -%doc HACKING.md NEWS.md AUTHORS dracut.html dracut.png dracut.svg +%doc README.md NEWS.md AUTHORS dracut.html +%doc docs/README.cross docs/README.generic docs/README.kernel +%doc docs/HACKING.md docs/dracut.png docs/dracut.svg %{_bindir}/dracut %{_bindir}/lsinitrd %{_sbindir}/installkernel -%{_sbindir}/mkinitrd %if !0%{?usrmerged} /sbin/installkernel -/sbin/mkinitrd %endif %{_datarootdir}/bash-completion/completions/lsinitrd %{_datadir}/pkgconfig/dracut.pc @@ -279,7 +293,6 @@ fi %endif %{_mandir}/man8/dracut.8* -%{_mandir}/man8/mkinitrd.8* %{_mandir}/man1/lsinitrd.1* %{_mandir}/man7/dracut.kernel.7* %{_mandir}/man7/dracut.cmdline.7* @@ -309,19 +322,33 @@ fi %{dracutlibdir}/dracut-logger.sh %{dracutlibdir}/dracut-initramfs-restore %{dracutlibdir}/dracut-install +%{dracutlibdir}/dracut-util %dir %{dracutlibdir}/modules.d %{dracutlibdir}/modules.d/00bash %{dracutlibdir}/modules.d/00systemd +%{dracutlibdir}/modules.d/00systemd-network-management %{dracutlibdir}/modules.d/00warpclock +%{dracutlibdir}/modules.d/01systemd-ac-power %{dracutlibdir}/modules.d/01systemd-ask-password %{dracutlibdir}/modules.d/01systemd-coredump +%{dracutlibdir}/modules.d/01systemd-hostnamed %{dracutlibdir}/modules.d/01systemd-initrd +%{dracutlibdir}/modules.d/01systemd-journald +%{dracutlibdir}/modules.d/01systemd-ldconfig %{dracutlibdir}/modules.d/01systemd-modules-load +%{dracutlibdir}/modules.d/01systemd-networkd %{dracutlibdir}/modules.d/01systemd-repart +%{dracutlibdir}/modules.d/01systemd-resolved +%{dracutlibdir}/modules.d/01systemd-rfkill %{dracutlibdir}/modules.d/01systemd-sysctl +%{dracutlibdir}/modules.d/01systemd-sysext %{dracutlibdir}/modules.d/01systemd-sysusers -%{dracutlibdir}/modules.d/02systemd-networkd +%{dracutlibdir}/modules.d/01systemd-timedated +%{dracutlibdir}/modules.d/01systemd-timesyncd +%{dracutlibdir}/modules.d/01systemd-tmpfiles +%{dracutlibdir}/modules.d/01systemd-udevd +%{dracutlibdir}/modules.d/01systemd-veritysetup %{dracutlibdir}/modules.d/03modsign %{dracutlibdir}/modules.d/03rescue @@ -341,6 +368,7 @@ fi %{dracutlibdir}/modules.d/45url-lib %{dracutlibdir}/modules.d/50drm %{dracutlibdir}/modules.d/50plymouth +%{dracutlibdir}/modules.d/62bluetooth %{dracutlibdir}/modules.d/80cms %{dracutlibdir}/modules.d/80lvmmerge %{dracutlibdir}/modules.d/81cio_ignore @@ -362,6 +390,7 @@ fi %{dracutlibdir}/modules.d/90qemu-net %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-loop +%{dracutlibdir}/modules.d/91tpm2-tss %{dracutlibdir}/modules.d/91zipl %{dracutlibdir}/modules.d/95cifs %{dracutlibdir}/modules.d/95dasd_mod From db36687452803fc8c2a6f76c62413b781f22b7df0c659f1ec114419baf05d09c Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 18 May 2021 09:15:25 +0000 Subject: [PATCH 2/4] Important change on mkinitrd: mkinitrd is now in its own subpackage "dracut-mkinit-deprecated", which requires dracut. If you need mkinitrd, require "mkinitrd". However note that in the long run, mkinit will go away. It is preferred to call dracut directly. OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=435 --- dracut.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dracut.changes b/dracut.changes index 83d8a40..0a33f28 100644 --- a/dracut.changes +++ b/dracut.changes @@ -4,6 +4,13 @@ Tue May 18 08:55:15 UTC 2021 - daniel.molkentin@suse.com - Update to version 054+suse.95.gd5820102: * chore(suse) update spec + Important change on mkinitrd: + + mkinitrd is now in its own subpackage "dracut-mkinit-deprecated", + which requires dracut. If you need mkinitrd, require "mkinitrd". + However note that in the long run, mkinit will go away. It is + preferred to call dracut directly. + ------------------------------------------------------------------- Mon May 17 18:24:47 UTC 2021 - daniel.molkentin@suse.com From 02d2af25488b8f2e719b257f8e52c0b1e912f85603995cba3967ee665ea98145 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Mon, 31 May 2021 13:40:55 +0000 Subject: [PATCH 3/4] - Update to version 055+suse.97.gb98506b2: * docs: update NEWS.md and AUTHORS * fix(fs-lib): install fsck utilities * fix(integrity): require ALLOW_METADATA_WRITES to come from EVM config file * fix(install): configure logging earlier * fix(warpclock): minor cleanups * fix(dash): minor cleanups * fix(mksh): minor cleanups * feat(install): add default value for --firmwaredirs * fix(dracut-functions): get_maj_min without get_maj_min_cache_file set * fix(dracut): pipe hardlink output to `dinfo` * fix(install): sane default --kerneldir * fix(bash): minor cleanups * fix(squash): don't mount the mount points if already mounted * ci: add shfmt to Fedora containers * fix(base): add missing `str_replace` to `dracut-dev-lib.sh` * feat(dracut.sh): detect running in a container * fix(base): split out `dracut-dev-lib.sh` * fix(dracut-util): print error message with trailing newline * fix(packit): downstream has renamed the master branch to main - Update to version 054+suse.96.gb5aa64d2: * fix(suse-initrd) fix list of modprobe.d directories OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=436 --- _service | 2 +- _servicedata | 2 +- dracut-054+suse.95.gd5820102.obscpio | 3 --- dracut-055+suse.97.gb98506b2.obscpio | 3 +++ dracut.changes | 30 ++++++++++++++++++++++++++++ dracut.obsinfo | 6 +++--- dracut.spec | 2 +- 7 files changed, 39 insertions(+), 9 deletions(-) delete mode 100644 dracut-054+suse.95.gd5820102.obscpio create mode 100644 dracut-055+suse.97.gb98506b2.obscpio diff --git a/_service b/_service index c1c5518..fa7fd5a 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/opensuse/dracut.git - SUSE/054 + SUSE/055 @PARENT_TAG@+suse.@TAG_OFFSET@.g%h suse/dracut.spec suse/README.susemaint diff --git a/_servicedata b/_servicedata index 83d3e9d..f64cfe0 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/opensuse/dracut.git - d58201029c4ffb4754e6c203916bb35f05b1cc59 \ No newline at end of file + b98506b287476922f9d69eb94e2a9de176bda10a \ No newline at end of file diff --git a/dracut-054+suse.95.gd5820102.obscpio b/dracut-054+suse.95.gd5820102.obscpio deleted file mode 100644 index 3c8f108..0000000 --- a/dracut-054+suse.95.gd5820102.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c58fe477cee7994cc9906b8d4de0f46e0ea09de5610076c0cb345820363c024 -size 1911308 diff --git a/dracut-055+suse.97.gb98506b2.obscpio b/dracut-055+suse.97.gb98506b2.obscpio new file mode 100644 index 0000000..e953f0e --- /dev/null +++ b/dracut-055+suse.97.gb98506b2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a5967d1bfeed57151609a0e98d91d862243f5a134c9590cf4e8e0e7155d4cf6 +size 1918476 diff --git a/dracut.changes b/dracut.changes index 0a33f28..5c70811 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon May 31 13:33:05 UTC 2021 - thomas.blume@suse.com + +- Update to version 055+suse.97.gb98506b2: + * docs: update NEWS.md and AUTHORS + * fix(fs-lib): install fsck utilities + * fix(integrity): require ALLOW_METADATA_WRITES to come from EVM config file + * fix(install): configure logging earlier + * fix(warpclock): minor cleanups + * fix(dash): minor cleanups + * fix(mksh): minor cleanups + * feat(install): add default value for --firmwaredirs + * fix(dracut-functions): get_maj_min without get_maj_min_cache_file set + * fix(dracut): pipe hardlink output to `dinfo` + * fix(install): sane default --kerneldir + * fix(bash): minor cleanups + * fix(squash): don't mount the mount points if already mounted + * ci: add shfmt to Fedora containers + * fix(base): add missing `str_replace` to `dracut-dev-lib.sh` + * feat(dracut.sh): detect running in a container + * fix(base): split out `dracut-dev-lib.sh` + * fix(dracut-util): print error message with trailing newline + * fix(packit): downstream has renamed the master branch to main + +------------------------------------------------------------------- +Mon May 31 13:29:17 UTC 2021 - thomas.blume@suse.com + +- Update to version 054+suse.96.gb5aa64d2: + * fix(suse-initrd) fix list of modprobe.d directories + ------------------------------------------------------------------- Tue May 18 08:55:15 UTC 2021 - daniel.molkentin@suse.com diff --git a/dracut.obsinfo b/dracut.obsinfo index 52f598a..8adf427 100644 --- a/dracut.obsinfo +++ b/dracut.obsinfo @@ -1,5 +1,5 @@ name: dracut -version: 054+suse.95.gd5820102 -mtime: 1621328017 -commit: d58201029c4ffb4754e6c203916bb35f05b1cc59 +version: 055+suse.97.gb98506b2 +mtime: 1622467191 +commit: b98506b287476922f9d69eb94e2a9de176bda10a diff --git a/dracut.spec b/dracut.spec index f3c0b72..a9fbdf3 100644 --- a/dracut.spec +++ b/dracut.spec @@ -19,7 +19,7 @@ %define dracutlibdir %{_prefix}/lib/dracut Name: dracut -Version: 054+suse.95.gd5820102 +Version: 055+suse.97.gb98506b2 Release: 0 Summary: Initramfs generator using udev License: GPL-2.0-or-later AND LGPL-2.1-or-later From 87475d129735e94cfdd0b63b491408c812b118c75de6f6d1354821d2d59bcf72 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Mon, 21 Jun 2021 09:37:20 +0000 Subject: [PATCH 4/4] Accepting request 900623 from home:tsaupe:branches:Base:System - Update to version 055+suse.106.g760b0c69: * chore(suse): add Conflicts for old suse-module-tools to specfile (bsc#1187115) - Update to version 055+suse.104.g9d45c1df: * feat(suse-initrd): add INITRD_MODULES from /etc/sysconfig/kernel, too * fix(suse-initrd): call dracut_instmods with hostonly= * fix(suse-initrd): use $kernel rather than $(uname -r) - Update to version 055+suse.100.ga2700279: * fix(suse-initrd): remove references to INITRD_MODULES (bsc#1187115) * chore(suse): erase conditional for usrmerge from specfile * chore(suse): fix specfile for usrmerge OBS-URL: https://build.opensuse.org/request/show/900623 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=437 --- _servicedata | 2 +- dracut-055+suse.106.g760b0c69.obscpio | 3 +++ dracut-055+suse.97.gb98506b2.obscpio | 3 --- dracut.changes | 22 ++++++++++++++++++++++ dracut.obsinfo | 6 +++--- dracut.spec | 15 +++------------ 6 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 dracut-055+suse.106.g760b0c69.obscpio delete mode 100644 dracut-055+suse.97.gb98506b2.obscpio diff --git a/_servicedata b/_servicedata index f64cfe0..2581e21 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/opensuse/dracut.git - b98506b287476922f9d69eb94e2a9de176bda10a \ No newline at end of file + 259fdc4b2a5cc180ade64b376420f14689d2a7dc \ No newline at end of file diff --git a/dracut-055+suse.106.g760b0c69.obscpio b/dracut-055+suse.106.g760b0c69.obscpio new file mode 100644 index 0000000..17dc8f4 --- /dev/null +++ b/dracut-055+suse.106.g760b0c69.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55e453af58b9308c78974686062393583693688aba869dc6092f4a8ac52467a3 +size 1919500 diff --git a/dracut-055+suse.97.gb98506b2.obscpio b/dracut-055+suse.97.gb98506b2.obscpio deleted file mode 100644 index e953f0e..0000000 --- a/dracut-055+suse.97.gb98506b2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a5967d1bfeed57151609a0e98d91d862243f5a134c9590cf4e8e0e7155d4cf6 -size 1918476 diff --git a/dracut.changes b/dracut.changes index 5c70811..307a943 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Thu Jun 17 15:22:31 UTC 2021 - thomas.blume@suse.com + +- Update to version 055+suse.106.g760b0c69: + * chore(suse): add Conflicts for old suse-module-tools to specfile (bsc#1187115) + +------------------------------------------------------------------- +Thu Jun 17 14:06:35 UTC 2021 - thomas.blume@suse.com + +- Update to version 055+suse.104.g9d45c1df: + * feat(suse-initrd): add INITRD_MODULES from /etc/sysconfig/kernel, too + * fix(suse-initrd): call dracut_instmods with hostonly= + * fix(suse-initrd): use $kernel rather than $(uname -r) + +------------------------------------------------------------------- +Mon Jun 14 16:11:29 UTC 2021 - thomas.blume@suse.com + +- Update to version 055+suse.100.ga2700279: + * fix(suse-initrd): remove references to INITRD_MODULES (bsc#1187115) + * chore(suse): erase conditional for usrmerge from specfile + * chore(suse): fix specfile for usrmerge + ------------------------------------------------------------------- Mon May 31 13:33:05 UTC 2021 - thomas.blume@suse.com diff --git a/dracut.obsinfo b/dracut.obsinfo index 8adf427..10daccf 100644 --- a/dracut.obsinfo +++ b/dracut.obsinfo @@ -1,5 +1,5 @@ name: dracut -version: 055+suse.97.gb98506b2 -mtime: 1622467191 -commit: b98506b287476922f9d69eb94e2a9de176bda10a +version: 055+suse.106.g760b0c69 +mtime: 1623943107 +commit: 760b0c6935ee2df576e42aedaec9363922a0b803 diff --git a/dracut.spec b/dracut.spec index a9fbdf3..bec453d 100644 --- a/dracut.spec +++ b/dracut.spec @@ -19,7 +19,7 @@ %define dracutlibdir %{_prefix}/lib/dracut Name: dracut -Version: 055+suse.97.gb98506b2 +Version: 055+suse.106.g760b0c69 Release: 0 Summary: Initramfs generator using udev License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -57,6 +57,8 @@ Requires: util-linux >= 2.21 Requires: xz # We use 'btrfs fi usage' that was not present before Conflicts: btrfsprogs < 3.18 +# suse-module-tools >= 16.0.3 is prepared for the removal of mkinitrd-suse.sh +Conflicts: suse-module-tools < 16.0.3 BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} @@ -156,13 +158,6 @@ install -m 0644 suse/s390x_persistent_device.conf %{buildroot}%{_sysconfdir}/dra install -D -m 0755 suse/mkinitrd-suse.sh %{buildroot}/%{_sbindir}/mkinitrd install -D -m 0755 suse/dracut-installkernel %{buildroot}/%{_sbindir}/installkernel -%if !0%{?usrmerged} -# moved to /usr/sbin, maintain /sbin compat symlinks -mkdir -p %{buildroot}/sbin -ln -s %{_sbindir}/mkinitrd %{buildroot}/sbin/mkinitrd -ln -s %{_sbindir}/installkernel %{buildroot}/sbin/installkernel -%endif - mv %{buildroot}%{_mandir}/man8/mkinitrd-suse.8 %{buildroot}%{_mandir}/man8/mkinitrd.8 %if 0%{?suse_version} @@ -263,7 +258,6 @@ fi %files mkinitrd-deprecated %defattr(-,root,root,0755) %{_sbindir}/mkinitrd -/sbin/mkinitrd %{_mandir}/man8/mkinitrd.8* %files @@ -275,9 +269,6 @@ fi %{_bindir}/dracut %{_bindir}/lsinitrd %{_sbindir}/installkernel -%if !0%{?usrmerged} -/sbin/installkernel -%endif %{_datarootdir}/bash-completion/completions/lsinitrd %{_datadir}/pkgconfig/dracut.pc