Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2025-01-09 15:05:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Thu Jan 9 15:05:12 2025 rev:235 rq:1235649 version:059+suse.672.gcd143fd0 Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2024-12-13 22:32:37.467775671 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new.1881/dracut.changes 2025-01-09 15:05:30.011468005 +0100 @@ -1,0 +2,6 @@ +Tue Jan 07 14:21:37 UTC 2025 - antonio.fei...@suse.com + +- Update to version 059+suse.672.gcd143fd0: + * fix(dracut): rework timeout for devices added via --mount and --add-device (bsc#1231792) + +------------------------------------------------------------------- Old: ---- dracut-059+suse.669.g60f5981b.obscpio New: ---- dracut-059+suse.672.gcd143fd0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.6406iI/_old 2025-01-09 15:05:30.939506596 +0100 +++ /var/tmp/diff_new_pack.6406iI/_new 2025-01-09 15:05:30.939506596 +0100 @@ -1,7 +1,7 @@ # # spec file for package dracut # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ %endif Name: dracut -Version: 059+suse.669.g60f5981b +Version: 059+suse.672.gcd143fd0 Release: 0 Summary: Event driven initramfs infrastructure License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ README.susemaint ++++++ --- /var/tmp/diff_new_pack.6406iI/_old 2025-01-09 15:05:30.979508259 +0100 +++ /var/tmp/diff_new_pack.6406iI/_new 2025-01-09 15:05:30.979508259 +0100 @@ -388,4 +388,5 @@ ad36b61e fix(dracut.sh): omit compressed kernel modules from find searching exec files bfa00c2a fix(pcsc): add libpcsclite_real.so.* 0df92885 fix(systemd-tmpfiles): copy 20-systemd-stub.conf into the initrd +c79fc8fd fix(dracut): rework timeout for devices added via --mount and --add-device ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.6406iI/_old 2025-01-09 15:05:31.011509590 +0100 +++ /var/tmp/diff_new_pack.6406iI/_new 2025-01-09 15:05:31.015509756 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/opensuse/dracut.git</param> - <param name="changesrevision">4a31103183e58c13a61c1a3adf5af8e57e84a34a</param></service></servicedata> + <param name="changesrevision">0dd3f2bcf2139dc2a85b770972b40bb261695a05</param></service></servicedata> (No newline at EOF) ++++++ dracut-059+suse.669.g60f5981b.obscpio -> dracut-059+suse.672.gcd143fd0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.669.g60f5981b/dracut-functions.sh new/dracut-059+suse.672.gcd143fd0/dracut-functions.sh --- old/dracut-059+suse.669.g60f5981b/dracut-functions.sh 2024-12-11 12:30:33.000000000 +0100 +++ new/dracut-059+suse.672.gcd143fd0/dracut-functions.sh 2025-01-07 15:20:02.000000000 +0100 @@ -608,9 +608,9 @@ local _dev local _ret=1 - [[ "${host_devs[*]}" ]] || return 2 + [[ "${host_devs[*]}" ]] || [[ "${user_devs[*]}" ]] || return 2 - for _dev in "${host_devs[@]}"; do + for _dev in "${host_devs[@]}" "${user_devs[@]}"; do [[ -b $_dev ]] || continue if check_block_and_slaves_all "$_func" "$(get_maj_min "$_dev")"; then _ret=0 @@ -623,9 +623,9 @@ local _func="$1" local _dev - [[ "${host_devs[*]}" ]] || return 2 + [[ "${host_devs[*]}" ]] || [[ "${user_devs[*]}" ]] || return 2 - for _dev in "${host_devs[@]}"; do + for _dev in "${host_devs[@]}" "${user_devs[@]}"; do [[ -b $_dev ]] || continue check_block_and_slaves "$_func" "$(get_maj_min "$_dev")" && return 0 done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.669.g60f5981b/dracut.sh new/dracut-059+suse.672.gcd143fd0/dracut.sh --- old/dracut-059+suse.669.g60f5981b/dracut.sh 2024-12-11 12:30:33.000000000 +0100 +++ new/dracut-059+suse.672.gcd143fd0/dracut.sh 2025-01-07 15:20:02.000000000 +0100 @@ -315,6 +315,16 @@ done } +# Fills up user_devs stack variable and makes sure there are no duplicates +push_user_devs() { + local _dev + for _dev in "$@"; do + [[ -z $_dev ]] && continue + [[ " ${user_devs[*]} " == *" $_dev "* ]] && return + user_devs+=("$_dev") + done +} + # Little helper function for reading args from the commandline. # it automatically handles -a b and -a=b variants, and returns 1 if # we need to shift $3. @@ -1624,7 +1634,7 @@ push_host_devs "$mp" done fi - push_host_devs "$dev" + push_user_devs "$dev" host_fs_types["$dev"]="$3" done @@ -1636,12 +1646,12 @@ done for dev in $add_device; do - push_host_devs "$dev" + push_user_devs "$dev" done if ((${#add_device_l[@]})); then add_device+=" ${add_device_l[*]} " - push_host_devs "${add_device_l[@]}" + push_user_devs "${add_device_l[@]}" fi if [[ $hostonly ]] && [[ $hostonly_default_device != "no" ]]; then @@ -1763,7 +1773,7 @@ return 1 } -for dev in "${host_devs[@]}"; do +for dev in "${host_devs[@]}" "${user_devs[@]}"; do _get_fs_type "$dev" check_block_and_slaves_all _get_fs_type "$(get_maj_min "$dev")" done @@ -1791,7 +1801,7 @@ omit_drivers mdadmconf lvmconf root_devs \ use_fstab fstab_lines libdirs fscks nofscks ro_mnt \ stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \ - host_fs_types host_devs swap_devs sshkey add_fstab \ + host_fs_types host_devs user_devs swap_devs sshkey add_fstab \ DRACUT_VERSION \ prefix filesystems drivers \ hostonly_cmdline loginstall check_supported diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.669.g60f5981b/modules.d/99base/module-setup.sh new/dracut-059+suse.672.gcd143fd0/modules.d/99base/module-setup.sh --- old/dracut-059+suse.669.g60f5981b/modules.d/99base/module-setup.sh 2024-12-11 12:30:33.000000000 +0100 +++ new/dracut-059+suse.672.gcd143fd0/modules.d/99base/module-setup.sh 2025-01-07 15:20:02.000000000 +0100 @@ -110,7 +110,7 @@ ## save host_devs which we need bring up if [[ $hostonly_cmdline == "yes" ]]; then - if [[ -n ${host_devs[*]} ]]; then + if [[ -n ${host_devs[*]} ]] || [[ -n ${user_devs[*]} ]]; then dracut_need_initqueue fi if [[ -f $initdir/lib/dracut/need-initqueue ]] || ! dracut_module_included "systemd"; then @@ -143,6 +143,22 @@ *) ;; esac done + + for _dev in "${user_devs[@]}"; do + + case "$_dev" in + /dev/?*) wait_for_dev "$_dev" 0 ;; + *) ;; + esac + + _pdev=$(get_persistent_dev "$_dev") + [[ $_dev == "$_pdev" ]] && continue + + case "$_pdev" in + /dev/?*) wait_for_dev "$_pdev" 0 ;; + *) ;; + esac + done ) fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.669.g60f5981b/suse/README.susemaint new/dracut-059+suse.672.gcd143fd0/suse/README.susemaint --- old/dracut-059+suse.669.g60f5981b/suse/README.susemaint 2024-12-11 12:30:33.000000000 +0100 +++ new/dracut-059+suse.672.gcd143fd0/suse/README.susemaint 2025-01-07 15:20:02.000000000 +0100 @@ -388,3 +388,4 @@ ad36b61e fix(dracut.sh): omit compressed kernel modules from find searching exec files bfa00c2a fix(pcsc): add libpcsclite_real.so.* 0df92885 fix(systemd-tmpfiles): copy 20-systemd-stub.conf into the initrd +c79fc8fd fix(dracut): rework timeout for devices added via --mount and --add-device ++++++ dracut.obsinfo ++++++ --- /var/tmp/diff_new_pack.6406iI/_old 2025-01-09 15:05:31.307521899 +0100 +++ /var/tmp/diff_new_pack.6406iI/_new 2025-01-09 15:05:31.311522066 +0100 @@ -1,5 +1,5 @@ name: dracut -version: 059+suse.669.g60f5981b -mtime: 1733916633 -commit: 60f5981b9f46541c96d0955b5553da2eaba6dc2c +version: 059+suse.672.gcd143fd0 +mtime: 1736259602 +commit: cd143fd012f91e24e92e04b0be53bc658a253ec0