docs: update NEWS.md and AUTHORS

* clog from last tag
* push commits to kernelorg also

.github/stale.yml

@@ -8,6 +8,7 @@ exemptLabels:
   - 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

.mailmap

@@ -34,3 +34,4 @@ Xunlei Pang <xlpang@redhat.com> <xpang@redhat.com>
 Daniel Molkentin <daniel.molkentin@suse.com> <dmolkentin@suse.com>
 Thomas Blume <thomas.blume@suse.com> <Thomas.Blume@suse.com>
 Brian C. Lane <bcl@redhat.com> <bcl@brianlane.com>
+Tomasz Paweł Gajc <tpgxyz@gmail.com> <tpgxyz@gmail.com>

.packit.yml

@@ -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

AUTHORS

@@ -6,12 +6,12 @@ Daniel Molkentin <daniel.molkentin@suse.com>
 Will Woods <wwoods@redhat.com>
 Philippe Seewer <philippe.seewer@bfh.ch>
 Warren Togami <wtogami@redhat.com>
-Kairui Song <kasong@redhat.com>
 Jóhann B. Guðmundsson <johannbg@gmail.com>
+Kairui Song <kasong@redhat.com>
 Dave Young <dyoung@redhat.com>
 Jeremy Katz <katzj@redhat.com>
-David Dillow <dave@thedillows.org>
 Lukas Nykryn <lnykryn@redhat.com>
+David Dillow <dave@thedillows.org>
 Lubomir Rintel <lkundrak@v3.sk>
 Michal Soltys <soltys@ziu.info>
 Colin Guthrie <colin@mageia.org>
@@ -35,6 +35,7 @@ Zoltán Böszörményi <zboszor@pr.hu>
 Colin Walters <walters@verbum.org>
 John Reiser <jreiser@bitwagon.com>
 Luca Berra <bluca@vodka.it>
+Tomasz Paweł Gajc <tpgxyz@gmail.com>
 Xunlei Pang <xlpang@redhat.com>
 Brian C. Lane <bcl@redhat.com>
 Daniel Drake <drake@endlessm.com>
@@ -79,8 +80,6 @@ Norbert Lange <norbert.lange@andritz.com>
 Roberto Sassu <roberto.sassu@polito.it>
 Stefan Reimer <it@startux.de>
 Takashi Iwai <tiwai@suse.de>
-Tomasz Paweł Gajc <tpgxyz@gmail.com>
-tpgxyz <tpgxyz@gmail.com>
 Anton Blanchard <anton@samba.org>
 Bill Nottingham <notting@redhat.com>
 Chapman Flack <g2@anastigmatix.net>
@@ -165,6 +164,7 @@ Alexander Todorov <atodorov@redhat.com>
 Alexey Kodanev <alexey.kodanev@oracle.com>
 Andreas Schwab <schwab@suse.de>
 Andreas Stieger <astieger@suse.com>
+Andrew J. Hesford <ajh@sideband.org>
 Andy Lutomirski <luto@mit.edu>
 Anjali Kulkarni <anjali.k.kulkarni@oracle.com>
 Anssi Hannula <anssi@mageia.org>
@@ -198,6 +198,7 @@ Enno Boland <g@s01.de>
 Enzo Matsumiya <ematsumiya@suse.de>
 Eugene S. Sobolev <sobolev@protei.ru>
 Eugene Syromiatnikov <esyr@redhat.com>
+Evgeni Golov <evgeni@golov.de>
 Fabian Vogt <fvogt@suse.de>
 Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 Florian Gamböck <mail@floga.de>
@@ -268,6 +269,7 @@ Ruben Kerkhof <ruben@rubenkerkhof.com>
 Rumbaut Thomas <Thomas.Rumbaut@digipolis.gent>
 Rusty Bird <rustybird@openmailbox.org>
 Sebastian Mitterle <smitterl@redhat.com>
+Sergei Iudin <tsipa740@gmail.com>
 Sergey Fionov <fionov@gmail.com>
 Shawn W Dunn <sfalken@opensuse.org>
 Srinivasa T N <seenutn@linux.vnet.ibm.com>
@@ -305,6 +307,5 @@ mwberry <mwberry@users.noreply.github.com>
 nabijaczleweli <nabijaczleweli@gmail.com>
 privb0x23 <privb0x23@users.noreply.github.com>
 realtime-neil <neil@rtr.ai>
-tpg <tpgxyz@gmail.com>
 xtraeme <xtraeme@voidlinux.eu>
 Дамјан Георгиевски <gdamjan@gmail.com>

NEWS.md

@@ -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
 ==========
 

docs/RELEASE.md

@@ -6,7 +6,7 @@ This documents contains the necessary steps to conduct a successful release.
 
     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 @@ This documents contains the necessary steps to conduct a successful release.
    $ 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 @@ This documents contains the necessary steps to conduct a successful release.
 
    Push to kernel.org git:
    ```console
-   $ git push kernelorg master
+   $ git push --atomic kernelorg master "$VERSION"
    ```
 
 
@@ -59,7 +60,11 @@ This documents contains the necessary steps to conduct a successful release.
    ```
 
    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. 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/)
+10. Ensure that announcement was sent and reached the linux-initramfs mailinglist (https://www.spinics.net/lists/linux-initramfs/)

dracut-init.sh

@@ -258,12 +258,13 @@ inst_symlink() {
 
 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() {

dracut.cmdline.7.asc

@@ -868,7 +868,7 @@ iscsistart -b --param node.session.timeo.replacement_timeout=30
 
 FCoE
 ~~~~
-**rd.nofcoe=0**::
+**rd.fcoe=0**::
     disable FCoE and lldpad
 
 **fcoe=**__<edd|interface|MAC>__:__{dcb|nodcb}__:__{fabric|vn2vn}__::

dracut.sh

@@ -608,8 +608,6 @@ while :; do
                        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";;
@@ -769,8 +767,6 @@ export SYSTEMCTL=${SYSTEMCTL:-systemctl}
 (( ${#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[*]} "
@@ -1009,6 +1005,9 @@ readonly DRACUT_TMPDIR="$(mktemp -p "$TMPDIR/" -d -t dracut.XXXXXX)"
 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
 
@@ -2304,9 +2303,11 @@ if [[ -d $dracutsysrootdir/run/systemd/system ]]; then
 
     # 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
 

modules.d/10i18n/module-setup.sh

@@ -22,7 +22,7 @@ install() {
         [[ -f "$dracutsysrootdir"/etc/vconsole.conf ]] && . "$dracutsysrootdir"/etc/vconsole.conf
     fi
 
-    KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
+    KBDSUBDIRS=(consolefonts consoletrans keymaps unimaps)
     DEFAULT_FONT="${i18n_default_font:-eurlatgr}"
     I18N_CONF="/etc/locale.conf"
     VCONFIG_CONF="/etc/vconsole.conf"
@@ -110,7 +110,7 @@ install() {
 
         if [[ ${kbddir} != "/usr/share" ]]; then
             inst_dir /usr/share
-            for _src in $(eval echo "{ ${KBDSUBDIRS} }"); do
+            for _src in "${KBDSUBDIRS[@]}"; do
                 [ ! -e "${initdir}/usr/share/${_src}" ] && ln -s "${kbddir}/${_src}" "${initdir}/usr/share/${_src}"
             done
         fi
@@ -119,10 +119,9 @@ install() {
     install_all_kbd() {
         local rel f
 
-        for __src in $(eval echo $dracutsysrootdir${kbddir}/{${KBDSUBDIRS}}); do
+        for _src in "${KBDSUBDIRS[@]}"; do
-            _src=${__src#$dracutsysrootdir}
+            inst_dir "${kbddir}/$_src"
-            inst_dir "$_src"
+            $DRACUT_CP -L -t "${initdir}/${kbddir}/$_src" "${dracutsysrootdir}${kbddir}/$_src"/*
-            $DRACUT_CP -L -t "${initdir}/${_src}" "$__src"/*
         done
 
         # remove unnecessary files
@@ -242,14 +241,13 @@ install() {
     }
 
     checks() {
-        for kbddir in ${kbddir} /usr/lib/kbd /lib/kbd /usr/share /usr/share/kbd
+        for kbddir in ${kbddir} /usr/lib/kbd /lib/kbd /usr/share /usr/share/kbd; do
-        do
+            if [[ -d "$dracutsysrootdir${kbddir}" ]]; then
-            [[ -d "$dracutsysrootdir${kbddir}" ]] && \
+                for dir in "${KBDSUBDIRS[@]}"; do
-                for dir in ${KBDSUBDIRS//,/ }
+                    [[ -d "$dracutsysrootdir${kbddir}/${dir}" ]] && continue
-            do
+                    false
-                [[ -d "$dracutsysrootdir${kbddir}/${dir}" ]] && continue
+                done && break
-                false
+            fi
-            done && break
             kbddir=''
         done
 

modules.d/35network-manager/module-setup.sh

@@ -34,7 +34,13 @@ install() {
     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"

modules.d/35network-manager/nm-config.sh

@@ -6,4 +6,12 @@ if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
     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

modules.d/35network-manager/nm-run.service

@@ -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

modules.d/35network-manager/nm-run.sh

@@ -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 --no-daemon
-      /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
   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)

modules.d/40network/netroot.sh

@@ -65,6 +65,9 @@ if [ -z "$2" ]; then
     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'"
 

modules.d/50drm/module-setup.sh

@@ -33,6 +33,7 @@ installkernel() {
     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

modules.d/95fcoe/lldpad.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if getargbool 0 rd.nofcoe ; then
+if ! getargbool 1 rd.fcoe -d -n rd.nofcoe ; then
-	info "rd.nofcoe=0: skipping lldpad activation"
+	info "rd.fcoe=0: skipping lldpad activation"
 	return 0
 fi
 

modules.d/95fcoe/parse-fcoe.sh

@@ -13,8 +13,8 @@
 # fcoe=eth0:nodcb:vn2vn
 # fcoe=4a:3f:4c:04:f8:d7:nodcb:fabric
 
-if getargbool 0 rd.nofcoe ; then
+if ! getargbool 1 rd.fcoe -d -n rd.nofcoe ; then
-	info "rd.nofcoe=0: skipping fcoe"
+	info "rd.fcoe=0: skipping fcoe"
 	return 0
 fi