Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2021-03-02 14:42:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Tue Mar 2 14:42:56 2021 rev:171 rq:874632 version:053+suse.90.gb89b6347 Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2021-02-22 14:58:52.481823450 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new.2378/dracut.changes 2021-03-02 15:14:14.517462579 +0100 @@ -1,0 +2,19 @@ +Tue Feb 23 15:26:36 UTC 2021 - daniel.molken...@suse.com + +- Update to version 053+suse.90.gb89b6347: + Highlights: https://github.com/dracutdevs/dracut/releases/tag/053 + dracut.sh: + unfreeze /boot on exit (d87ae137) + proper return code for inst_multiple in dracut-init.sh (d437970c) + fcoe: + rename rd.nofcoe to rd.fcoe (6f7823bc) + rd.nofcoe=0 should disable fcoe (805b46c2) + i18n: + get rid of eval calls (5387ed24), backported for 052 downstream + create the keyboard symlinks again (9e1c7f3d), backported for 052 downstream + network-manager: + run as a service if systemd module is present (c17c5b76) + rework how NM is started in debug mode (34c73b33) + drm: skip empty modalias files in drm module setup (c3f24184) + +------------------------------------------------------------------- @@ -16,0 +36 @@ + Highlights: https://github.com/dracutdevs/dracut/releases/tag/052 Old: ---- dracut-052+suse.93.g7bfaa6d9.obscpio New: ---- dracut-053+suse.90.gb89b6347.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.Z75ENz/_old 2021-03-02 15:14:15.205463155 +0100 +++ /var/tmp/diff_new_pack.Z75ENz/_new 2021-03-02 15:14:15.209463158 +0100 @@ -19,7 +19,7 @@ %define dracutlibdir %{_prefix}/lib/dracut Name: dracut -Version: 052+suse.93.g7bfaa6d9 +Version: 053+suse.90.gb89b6347 Release: 0 Summary: Initramfs generator using udev License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Z75ENz/_old 2021-03-02 15:14:15.245463188 +0100 +++ /var/tmp/diff_new_pack.Z75ENz/_new 2021-03-02 15:14:15.245463188 +0100 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="localonly"> <param name="scm">git</param> <param name="url">https://github.com/opensuse/dracut.git</param> - <param name="revision">SUSE/052</param> + <param name="revision">SUSE/053</param> <param name="versionformat">@PARENT_TAG@+suse.@TAG_OFFSET@.g%h</param> <!-- <param name="extract">suse/dracut.spec</param> --> <param name="extract">suse/README.susemaint</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Z75ENz/_old 2021-03-02 15:14:15.261463201 +0100 +++ /var/tmp/diff_new_pack.Z75ENz/_new 2021-03-02 15:14:15.261463201 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/opensuse/dracut.git</param> - <param name="changesrevision">29145623e5aada76fa087f8d0b53ef8938e024a3</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">b89b6347038b903b777526934fc9339070172d92</param></service></servicedata> \ No newline at end of file ++++++ dracut-052+suse.93.g7bfaa6d9.obscpio -> dracut-053+suse.90.gb89b6347.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/.github/stale.yml new/dracut-053+suse.90.gb89b6347/.github/stale.yml --- old/dracut-052+suse.93.g7bfaa6d9/.github/stale.yml 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/.github/stale.yml 2021-02-23 16:23:01.000000000 +0100 @@ -8,6 +8,7 @@ - enhancement - regression - wiki + - bug # Label to use when marking an issue as stale staleLabel: stale # Comment to post when marking an issue as stale. Set to `false` to disable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/.mailmap new/dracut-053+suse.90.gb89b6347/.mailmap --- old/dracut-052+suse.93.g7bfaa6d9/.mailmap 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/.mailmap 2021-02-23 16:23:01.000000000 +0100 @@ -34,3 +34,4 @@ Daniel Molkentin <daniel.molken...@suse.com> <dmolken...@suse.com> Thomas Blume <thomas.bl...@suse.com> <thomas.bl...@suse.com> Brian C. Lane <b...@redhat.com> <b...@brianlane.com> +Tomasz Pawe?? Gajc <tpg...@gmail.com> <tpg...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/.packit.yml new/dracut-053+suse.90.gb89b6347/.packit.yml --- old/dracut-052+suse.93.g7bfaa6d9/.packit.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/.packit.yml 2021-02-23 16:23:01.000000000 +0100 @@ -0,0 +1,58 @@ +# This file is part of dracut. +# SPDX-License-Identifier: GPL-2.0-or-later + +# The name of the upstream package +upstream_package_name: dracut + +# The upstream tag versioning scheme +upstream_tag_template: "{version}" + +# The URL of the upstream project +upstream_project_url: https://github.com/dracutdevs/dracut + +# Relative path to a spec file within the upstream repository +specfile_path: dracut.spec + +# Name of the downstream package +downstream_package_name: dracut + +# The URL of the downstream project +dist_git_base_url: https://src.fedoraproject.org/ + +# Sync file(s) from upstream repo to dist-git +synced_files: + # The dracut spec file is maintained upstream so we sync it downstream. + - dracut.spec + # We sync the packit file downstream be able to optionally use the sync-from-downstream command + - .packit.yaml + +# We want new releases to be automatically built on rawhide and have few jobs +# on copr. +create_pr: false +jobs: +- job: propose_downstream + trigger: release + metadata: + dist_git_branches: master + +- job: tests + trigger: pull_request + metadata: + targets: + - fedora-rawhide + +- job: copr_build + trigger: pull_request + metadata: + targets: + - fedora-rawhide + +- job: copr_build + trigger: commit + metadata: + targets: + - fedora-rawhide + branch: master + owner: "@dracut" + project: Dracut + preserve_project: True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/AUTHORS new/dracut-053+suse.90.gb89b6347/AUTHORS --- old/dracut-052+suse.93.g7bfaa6d9/AUTHORS 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/AUTHORS 2021-02-23 16:23:01.000000000 +0100 @@ -6,12 +6,12 @@ Will Woods <wwo...@redhat.com> Philippe Seewer <philippe.see...@bfh.ch> Warren Togami <wtog...@redhat.com> -Kairui Song <kas...@redhat.com> J??hann B. Gu??mundsson <johan...@gmail.com> +Kairui Song <kas...@redhat.com> Dave Young <dyo...@redhat.com> Jeremy Katz <ka...@redhat.com> -David Dillow <d...@thedillows.org> Lukas Nykryn <lnyk...@redhat.com> +David Dillow <d...@thedillows.org> Lubomir Rintel <lkund...@v3.sk> Michal Soltys <sol...@ziu.info> Colin Guthrie <co...@mageia.org> @@ -35,6 +35,7 @@ Colin Walters <walt...@verbum.org> John Reiser <jrei...@bitwagon.com> Luca Berra <bl...@vodka.it> +Tomasz Pawe?? Gajc <tpg...@gmail.com> Xunlei Pang <xlp...@redhat.com> Brian C. Lane <b...@redhat.com> Daniel Drake <dr...@endlessm.com> @@ -79,8 +80,6 @@ Roberto Sassu <roberto.sa...@polito.it> Stefan Reimer <i...@startux.de> Takashi Iwai <ti...@suse.de> -Tomasz Pawe?? Gajc <tpg...@gmail.com> -tpgxyz <tpg...@gmail.com> Anton Blanchard <an...@samba.org> Bill Nottingham <nott...@redhat.com> Chapman Flack <g...@anastigmatix.net> @@ -165,6 +164,7 @@ Alexey Kodanev <alexey.koda...@oracle.com> Andreas Schwab <sch...@suse.de> Andreas Stieger <astie...@suse.com> +Andrew J. Hesford <a...@sideband.org> Andy Lutomirski <l...@mit.edu> Anjali Kulkarni <anjali.k.kulka...@oracle.com> Anssi Hannula <an...@mageia.org> @@ -198,6 +198,7 @@ Enzo Matsumiya <ematsum...@suse.de> Eugene S. Sobolev <sobo...@protei.ru> Eugene Syromiatnikov <e...@redhat.com> +Evgeni Golov <evg...@golov.de> Fabian Vogt <fv...@suse.de> Florian Albrechtskirchinger <falbrechtskirchin...@gmail.com> Florian Gamb??ck <m...@floga.de> @@ -268,6 +269,7 @@ Rumbaut Thomas <thomas.rumb...@digipolis.gent> Rusty Bird <rustyb...@openmailbox.org> Sebastian Mitterle <smitt...@redhat.com> +Sergei Iudin <tsipa...@gmail.com> Sergey Fionov <fio...@gmail.com> Shawn W Dunn <sfal...@opensuse.org> Srinivasa T N <seen...@linux.vnet.ibm.com> @@ -305,6 +307,5 @@ nabijaczleweli <nabijaczlew...@gmail.com> privb0x23 <privb0...@users.noreply.github.com> realtime-neil <n...@rtr.ai> -tpg <tpg...@gmail.com> xtraeme <xtra...@voidlinux.eu> ???????????? ?????????????????????? <gdam...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/NEWS.md new/dracut-053+suse.90.gb89b6347/NEWS.md --- old/dracut-052+suse.93.g7bfaa6d9/NEWS.md 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/NEWS.md 2021-02-23 16:23:01.000000000 +0100 @@ -1,5 +1,25 @@ Rendered view: https://github.com/dracutdevs/dracut/blob/master/NEWS.md +dracut-053 +========== + +#### Bug Fixes + +* **dracut.sh:** + * unfreeze /boot on exit ([d87ae137](https://github.com/dracutdevs/dracut/commit/d87ae13721d04a8a2192d896af224ac6965caf70)) + * proper return code for inst_multiple in dracut-init.sh ([d437970c](https://github.com/dracutdevs/dracut/commit/d437970c013e3287de263a1e60a117b15239896c)) +* **fcoe:** + * rename rd.nofcoe to rd.fcoe ([6f7823bc](https://github.com/dracutdevs/dracut/commit/6f7823bce65dd4b52497dbb94892b637fd06471a)) + * rd.nofcoe=0 should disable fcoe ([805b46c2](https://github.com/dracutdevs/dracut/commit/805b46c2a81e04d69fc3af912942568516d05ee7)) +* **i18n:** + * get rid of `eval` calls ([5387ed24](https://github.com/dracutdevs/dracut/commit/5387ed24c8b33da1214232d57ab1831e117aaba0)) + * create the keyboard symlinks again ([9e1c7f3d](https://github.com/dracutdevs/dracut/commit/9e1c7f3deadd387adaa97b189593b4ba3d7c6d5a)) +* **network-manager:** + * run as a service if systemd module is present ([c17c5b76](https://github.com/dracutdevs/dracut/commit/c17c5b7604c8d61dd1c00ee22d44c3a5d7d6dfee)) + * rework how NM is started in debug mode ([34c73b33](https://github.com/dracutdevs/dracut/commit/34c73b339baa025dfd8916379c4d191be34a8af5)) +* **drm:** skip empty modalias files in drm module setup ([c3f24184](https://github.com/dracutdevs/dracut/commit/c3f241849de6434d063ef92e6880f6b0335c1800)) + + dracut-052 ========== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/docs/RELEASE.md new/dracut-053+suse.90.gb89b6347/docs/RELEASE.md --- old/dracut-052+suse.93.g7bfaa6d9/docs/RELEASE.md 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/docs/RELEASE.md 2021-02-23 16:23:01.000000000 +0100 @@ -6,7 +6,7 @@ Get a first template with [`clog`](https://github.com/clog-tool/clog-cli) ```console - $ clog -r https://github.com/dracutdevs/dracut + $ clog -F -r https://github.com/dracutdevs/dracut ``` 2. Update the contributors list in NEWS.md @@ -30,11 +30,12 @@ $ git ci -m "docs: update NEWS.md and AUTHORS" NEWS.md AUTHORS ``` -5. Tag the release +5. Tag the release and push ```console $ VERSION=052 $ git tag -s "$VERSION" + $ git push --tags ``` Add the section from `NEWS.md` to the git tag message. @@ -48,7 +49,7 @@ Push to kernel.org git: ```console - $ git push kernelorg master + $ git push --atomic kernelorg master "$VERSION" ``` @@ -59,7 +60,11 @@ ``` This requires `kup` and a kernel.org account. + Wait until the tarballs are synced to http://www.kernel.org/pub/linux/utils/boot/dracut/ . +8. Create a new release on github (https://github.com/dracutdevs/dracut/releases/new) + - Add the section from `NEWS.md` to the release. + - Attach the tarballs and signature file from http://www.kernel.org/pub/linux/utils/boot/dracut/ to the github release. -8. Close the github milestone and open a new one (https://github.com/dracutdevs/dracut/milestones) -9. Ensure that announcement was sent and reached the linux-initramfs mailinglist (https://www.spinics.net/lists/linux-initramfs/) +9. Close the github milestone and open a new one (https://github.com/dracutdevs/dracut/milestones) +10. Ensure that announcement was sent and reached the linux-initramfs mailinglist (https://www.spinics.net/lists/linux-initramfs/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/dracut-init.sh new/dracut-053+suse.90.gb89b6347/dracut-init.sh --- old/dracut-052+suse.93.g7bfaa6d9/dracut-init.sh 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/dracut-init.sh 2021-02-23 16:23:01.000000000 +0100 @@ -258,12 +258,13 @@ inst_multiple() { local _ret - if ! "$DRACUT_INSTALL" ${dracutsysrootdir:+-r "$dracutsysrootdir"} ${initdir:+-D "$initdir"} -a ${loginstall:+-L "$loginstall"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@"; then + if "$DRACUT_INSTALL" ${dracutsysrootdir:+-r "$dracutsysrootdir"} ${initdir:+-D "$initdir"} -a ${loginstall:+-L "$loginstall"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@"; then + return 0 + else _ret=$? derror FAILED: "$DRACUT_INSTALL" ${dracutsysrootdir:+-r "$dracutsysrootdir"} ${initdir:+-D "$initdir"} -a ${loginstall:+-L "$loginstall"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} ${_hostonly_install:+-H} "$@" || : return $_ret fi - return 0 } dracut_install() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/dracut.cmdline.7.asc new/dracut-053+suse.90.gb89b6347/dracut.cmdline.7.asc --- old/dracut-052+suse.93.g7bfaa6d9/dracut.cmdline.7.asc 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/dracut.cmdline.7.asc 2021-02-23 16:23:01.000000000 +0100 @@ -868,7 +868,7 @@ FCoE ~~~~ -**rd.nofcoe=0**:: +**rd.fcoe=0**:: disable FCoE and lldpad **fcoe=**__<edd|interface|MAC>__:__{dcb|nodcb}__:__{fabric|vn2vn}__:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/dracut.sh new/dracut-053+suse.90.gb89b6347/dracut.sh --- old/dracut-052+suse.93.g7bfaa6d9/dracut.sh 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/dracut.sh 2021-02-23 16:23:01.000000000 +0100 @@ -612,8 +612,6 @@ persistent_policy_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;; --fstab) use_fstab_l="yes" ;; -h|--help) long_usage; exit 1 ;; - -i|--include) include_src+=("$2"); PARMS_TO_STORE+=" '$2'"; - shift;; --bzip2) compress_l="bzip2";; --lzma) compress_l="lzma";; --xz) compress_l="xz";; @@ -774,8 +772,6 @@ (( ${#force_add_dracutmodules_l[@]} )) && force_add_dracutmodules+=" ${force_add_dracutmodules_l[*]} " (( ${#fscks_l[@]} )) && fscks+=" ${fscks_l[*]} " (( ${#add_fstab_l[@]} )) && add_fstab+=" ${add_fstab_l[*]} " -# shellcheck disable=SC2154 -(( ${#fstab_lines_l[@]} )) && fstab_lines+=( "${fstab_lines_l[@]}" ) (( ${#install_items_l[@]} )) && install_items+=" ${install_items_l[*]} " (( ${#install_optional_items_l[@]} )) && install_optional_items+=" ${install_optional_items_l[*]} " (( ${#hostonly_nics_l[@]} )) && hostonly_nics+=" ${hostonly_nics_l[*]} " @@ -1014,6 +1010,9 @@ trap ' ret=$?; [[ $keep ]] && echo "Not removing $DRACUT_TMPDIR." >&2 || { [[ $DRACUT_TMPDIR ]] && rm -rf -- "$DRACUT_TMPDIR"; }; + if [[ ${FSFROZEN} ]]; then + fsfreeze -u "${FSFROZEN}" + fi exit $ret; ' EXIT @@ -2309,9 +2308,11 @@ # use fsfreeze only if we're not writing to / if [[ "$(stat -c %m -- "$outfile")" != "/" ]] && freeze_ok_for_fstype "$outfile"; then - if ! (fsfreeze -f "$(dirname "$outfile")" 2>/dev/null && fsfreeze -u "$(dirname "$outfile")" 2>/dev/null); then + FSFROZEN="$(dirname "$outfile")" + if ! (fsfreeze -f "${FSFROZEN}" 2>/dev/null && fsfreeze -u "${FSFROZEN}" 2>/dev/null); then dinfo "dracut: warning: could not fsfreeze $(dirname "$outfile")" fi + unset FSFROZEN fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/modules.d/35network-manager/module-setup.sh new/dracut-053+suse.90.gb89b6347/modules.d/35network-manager/module-setup.sh --- old/dracut-052+suse.93.g7bfaa6d9/modules.d/35network-manager/module-setup.sh 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/modules.d/35network-manager/module-setup.sh 2021-02-23 16:23:01.000000000 +0100 @@ -34,7 +34,13 @@ inst /usr/libexec/nm-initrd-generator inst_multiple -o teamd dhclient inst_hook cmdline 99 "$moddir/nm-config.sh" + if dracut_module_included "systemd"; then + inst_simple "${moddir}/nm-run.service" "${systemdsystemunitdir}/nm-run.service" + $SYSTEMCTL -q --root "$initdir" enable nm-run.service + fi + inst_hook initqueue/settled 99 "$moddir/nm-run.sh" + inst_rules 85-nm-unmanaged.rules inst_libdir_file "NetworkManager/$_nm_version/libnm-device-plugin-team.so" inst_simple "$moddir/nm-lib.sh" "/lib/nm-lib.sh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/modules.d/35network-manager/nm-config.sh new/dracut-053+suse.90.gb89b6347/modules.d/35network-manager/nm-config.sh --- old/dracut-052+suse.93.g7bfaa6d9/modules.d/35network-manager/nm-config.sh 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/modules.d/35network-manager/nm-config.sh 2021-02-23 16:23:01.000000000 +0100 @@ -6,4 +6,12 @@ echo rd.neednet >> /etc/cmdline.d/35-neednet.conf fi +if getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then + mkdir -m 0755 -p /run/NetworkManager/conf.d + ( + echo '[logging]' + echo 'level=TRACE' + ) > /run/NetworkManager/conf.d/initrd-logging.conf +fi + nm_generate_connections diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/modules.d/35network-manager/nm-run.service new/dracut-053+suse.90.gb89b6347/modules.d/35network-manager/nm-run.service --- old/dracut-052+suse.93.g7bfaa6d9/modules.d/35network-manager/nm-run.service 1970-01-01 01:00:00.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/modules.d/35network-manager/nm-run.service 2021-02-23 16:23:01.000000000 +0100 @@ -0,0 +1,28 @@ +# This file is part of dracut. +# SPDX-License-Identifier: GPL-2.0-or-later + +[Unit] +#make sure all devices showed up +Wants=systemd-udev-settle.service +After=systemd-udev-settle.service + +#pull the network targets into transaction +Wants=network.target network-online.target +Before=network.target network-online.target + +#run before we try to mount anything from the dracut hooks +Before=dracut-initqueue.service + +#do not run, if there is no configuration +ConditionPathExistsGlob=|/usr/lib/NetworkManager/system-connections/* +ConditionPathExistsGlob=|/run/NetworkManager/system-connections/* +ConditionPathExistsGlob=|/etc/NetworkManager/system-connections/* +ConditionPathExistsGlob=|/etc/sysconfig/network-scripts/ifcfg-* + +[Service] +#run the script and wait before it finishes +Type=oneshot +ExecStart=/usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon + +[Install] +WantedBy=initrd.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/modules.d/35network-manager/nm-run.sh new/dracut-053+suse.90.gb89b6347/modules.d/35network-manager/nm-run.sh --- old/dracut-052+suse.93.g7bfaa6d9/modules.d/35network-manager/nm-run.sh 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/modules.d/35network-manager/nm-run.sh 2021-02-23 16:23:01.000000000 +0100 @@ -1,26 +1,25 @@ #!/bin/sh +type source_hook >/dev/null 2>&1 || . /lib/dracut-lib.sh + if [ -e /tmp/nm.done ]; then return fi +[ -z "$DRACUT_SYSTEMD" ] && \ for i in /usr/lib/NetworkManager/system-connections/* \ /run/NetworkManager/system-connections/* \ /etc/NetworkManager/system-connections/* \ /etc/sysconfig/network-scripts/ifcfg-*; do [ -f "$i" ] || continue - if getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then - /usr/sbin/NetworkManager --configure-and-quit=initrd --debug --log-level=trace - else - /usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon - fi - - if [ -s /run/NetworkManager/initrd/hostname ]; then - cat /run/NetworkManager/initrd/hostname > /proc/sys/kernel/hostname - fi + /usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon break done +if [ -s /run/NetworkManager/initrd/hostname ]; then + cat /run/NetworkManager/initrd/hostname > /proc/sys/kernel/hostname +fi + for _i in /sys/class/net/* do state=/run/NetworkManager/devices/$(cat $_i/ifindex) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/modules.d/40network/netroot.sh new/dracut-053+suse.90.gb89b6347/modules.d/40network/netroot.sh --- old/dracut-052+suse.93.g7bfaa6d9/modules.d/40network/netroot.sh 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/modules.d/40network/netroot.sh 2021-02-23 16:23:01.000000000 +0100 @@ -65,6 +65,9 @@ fi # Check: do we really know how to handle (net)root? + if [ -z "$root" ]; then + root=$(getarg root=) + fi [ -z "$root" ] && die "No or empty root= argument" [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/modules.d/50drm/module-setup.sh new/dracut-053+suse.90.gb89b6347/modules.d/50drm/module-setup.sh --- old/dracut-052+suse.93.g7bfaa6d9/modules.d/50drm/module-setup.sh 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/modules.d/50drm/module-setup.sh 2021-02-23 16:23:01.000000000 +0100 @@ -33,6 +33,7 @@ if [[ $hostonly ]]; then for i in /sys/bus/{pci/devices,platform/devices,virtio/devices,soc/devices/soc?}/*/modalias; do [[ -e $i ]] || continue + [[ -n $(<"$i") ]] || continue if hostonly="" dracut_instmods --silent -s "drm_crtc_init|drm_dev_register|drm_encoder_init" -S "iw_handler_get_spy" $(<"$i"); then if strstr "$(modinfo -F filename $(<"$i") 2>/dev/null)" radeon.ko; then hostonly='' instmods amdkfd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/modules.d/95fcoe/lldpad.sh new/dracut-053+suse.90.gb89b6347/modules.d/95fcoe/lldpad.sh --- old/dracut-052+suse.93.g7bfaa6d9/modules.d/95fcoe/lldpad.sh 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/modules.d/95fcoe/lldpad.sh 2021-02-23 16:23:01.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -if getargbool 0 rd.nofcoe ; then - info "rd.nofcoe=0: skipping lldpad activation" +if ! getargbool 1 rd.fcoe -d -n rd.nofcoe ; then + info "rd.fcoe=0: skipping lldpad activation" return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/modules.d/95fcoe/parse-fcoe.sh new/dracut-053+suse.90.gb89b6347/modules.d/95fcoe/parse-fcoe.sh --- old/dracut-052+suse.93.g7bfaa6d9/modules.d/95fcoe/parse-fcoe.sh 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/modules.d/95fcoe/parse-fcoe.sh 2021-02-23 16:23:01.000000000 +0100 @@ -13,8 +13,8 @@ # fcoe=eth0:nodcb:vn2vn # fcoe=4a:3f:4c:04:f8:d7:nodcb:fabric -if getargbool 0 rd.nofcoe ; then - info "rd.nofcoe=0: skipping fcoe" +if ! getargbool 1 rd.fcoe -d -n rd.nofcoe ; then + info "rd.fcoe=0: skipping fcoe" return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-052+suse.93.g7bfaa6d9/suse/dracut.spec new/dracut-053+suse.90.gb89b6347/suse/dracut.spec --- old/dracut-052+suse.93.g7bfaa6d9/suse/dracut.spec 2021-02-17 16:59:02.000000000 +0100 +++ new/dracut-053+suse.90.gb89b6347/suse/dracut.spec 2021-02-23 16:23:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dracut # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define dracutlibdir %{_prefix}/lib/dracut Name: dracut -Version: 052 +Version: 049 Release: 0 Summary: Initramfs generator using udev License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -57,6 +57,7 @@ Requires: xz # We use 'btrfs fi usage' that was not present before Conflicts: btrfsprogs < 3.18 +Recommends: logrotate Obsoletes: mkinitrd < 2.8.2 Provides: mkinitrd = 2.8.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -156,6 +157,10 @@ mv %{buildroot}%{_mandir}/man8/mkinitrd-suse.8 %{buildroot}%{_mandir}/man8/mkinitrd.8 +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +install -m 0644 dracut.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/dracut + + %if 0%{?suse_version} #rm -f %%{buildroot}/%%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh #ln -s %%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-suse.sh %%{buildroot}/%%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh @@ -239,6 +244,9 @@ %defattr(-,root,root,0755) %license COPYING +# Use systemd-analyze instead, does not need dracut support +%{dracutlibdir}/modules.d/00bootchart + %{dracutlibdir}/modules.d/00mksh %{dracutlibdir}/modules.d/02caps %{dracutlibdir}/modules.d/00dash @@ -255,7 +263,8 @@ %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.modules README.testsuite +%doc HACKING TODO AUTHORS NEWS dracut.html dracut.png dracut.svg %{_bindir}/dracut %{_bindir}/lsinitrd %{_sbindir}/installkernel @@ -314,23 +323,14 @@ %{dracutlibdir}/modules.d/00bash %{dracutlibdir}/modules.d/00systemd %{dracutlibdir}/modules.d/00warpclock -%{dracutlibdir}/modules.d/01systemd-ask-password -%{dracutlibdir}/modules.d/01systemd-coredump %{dracutlibdir}/modules.d/01systemd-initrd -%{dracutlibdir}/modules.d/01systemd-modules-load -%{dracutlibdir}/modules.d/01systemd-repart -%{dracutlibdir}/modules.d/01systemd-sysctl -%{dracutlibdir}/modules.d/01systemd-sysusers %{dracutlibdir}/modules.d/02systemd-networkd - %{dracutlibdir}/modules.d/03modsign %{dracutlibdir}/modules.d/03rescue %{dracutlibdir}/modules.d/04watchdog %{dracutlibdir}/modules.d/04watchdog-modules -%{dracutlibdir}/modules.d/06dbus-broker -%{dracutlibdir}/modules.d/06dbus-daemon +%{dracutlibdir}/modules.d/06dbus %{dracutlibdir}/modules.d/06rngd -%{dracutlibdir}/modules.d/09dbus %{dracutlibdir}/modules.d/10i18n %{dracutlibdir}/modules.d/30convertfs %{dracutlibdir}/modules.d/35network-legacy @@ -400,6 +400,7 @@ %{dracutlibdir}/modules.d/99suse %{dracutlibdir}/modules.d/99suse-initrd %{dracutlibdir}/modules.d/99uefi-lib +%config(noreplace) %{_sysconfdir}/logrotate.d/dracut %attr(0640,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %dir %{_unitdir}/initrd.target.wants %dir %{_unitdir}/sysinit.target.wants ++++++ dracut.obsinfo ++++++ --- /var/tmp/diff_new_pack.Z75ENz/_old 2021-03-02 15:14:15.513463412 +0100 +++ /var/tmp/diff_new_pack.Z75ENz/_new 2021-03-02 15:14:15.513463412 +0100 @@ -1,5 +1,5 @@ name: dracut -version: 052+suse.93.g7bfaa6d9 -mtime: 1613577542 -commit: 7bfaa6d906564b693874530bac9e598dd8e78cb2 +version: 053+suse.90.gb89b6347 +mtime: 1614093781 +commit: b89b6347038b903b777526934fc9339070172d92
