Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2024-01-22 20:31:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new.16006 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Mon Jan 22 20:31:17 2024 rev:219 rq:1140602 version:059+suse.538.ge7a5cff9 Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2023-12-21 23:38:00.157201210 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new.16006/dracut.changes 2024-01-22 20:31:23.255000899 +0100 @@ -1,0 +2,9 @@ +Mon Jan 22 12:59:48 UTC 2024 - [email protected] + +- Update to version 059+suse.538.ge7a5cff9: + * fix(livenet): split `imgsize` calculation to avoid misleading error message + * fix(livenet): check also `content-length` from live image header + * fix(livenet): propagate error code + * fix(dracut): correct regression with multiple `rd.break=` options + +------------------------------------------------------------------- Old: ---- dracut-059+suse.533.g5a7cf9fa.obscpio New: ---- dracut-059+suse.538.ge7a5cff9.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.Mao4xg/_old 2024-01-22 20:31:24.123032637 +0100 +++ /var/tmp/diff_new_pack.Mao4xg/_new 2024-01-22 20:31:24.127032782 +0100 @@ -1,7 +1,7 @@ # # spec file for package dracut # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 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.533.g5a7cf9fa +Version: 059+suse.538.ge7a5cff9 Release: 0 Summary: Event driven initramfs infrastructure License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Mao4xg/_old 2024-01-22 20:31:24.179034684 +0100 +++ /var/tmp/diff_new_pack.Mao4xg/_new 2024-01-22 20:31:24.183034830 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/opensuse/dracut.git</param> - <param name="changesrevision">0cf16a9f1c92d9125607d5c25123456ca5926ad4</param></service></servicedata> + <param name="changesrevision">87c8f82d3ea7412213597a4b072ca4c8f125377c</param></service></servicedata> (No newline at EOF) ++++++ dracut-059+suse.533.g5a7cf9fa.obscpio -> dracut-059+suse.538.ge7a5cff9.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.533.g5a7cf9fa/modules.d/90livenet/livenetroot.sh new/dracut-059+suse.538.ge7a5cff9/modules.d/90livenet/livenetroot.sh --- old/dracut-059+suse.533.g5a7cf9fa/modules.d/90livenet/livenetroot.sh 2023-12-21 10:09:39.000000000 +0100 +++ new/dracut-059+suse.538.ge7a5cff9/modules.d/90livenet/livenetroot.sh 2024-01-22 13:58:40.000000000 +0100 @@ -17,10 +17,21 @@ info "fetching $liveurl" if getargbool 0 'rd.writable.fsimg'; then + imgheader=$(curl -sIL "$liveurl") - imgsize=$(($(curl -sIL "$liveurl" | sed -n 's/Content-Length: *\([[:digit:]]*\).*/\1/p') / (1024 * 1024))) - - check_live_ram $imgsize + # shellcheck disable=SC2181 + ret=$? + if [ $ret != 0 ]; then + warn "failed to get live image header: error $ret" + else + imgheaderlen=$(echo "$imgheader" | sed -n 's/[cC]ontent-[lL]ength: *\([[:digit:]]*\).*/\1/p') + if [ -z "$imgheaderlen" ]; then + warn "failed to get 'Content-Length' header from live image" + else + imgsize=$((imgheaderlen / (1024 * 1024))) + check_live_ram $imgsize + fi + fi fi imgfile= @@ -30,8 +41,9 @@ imgfile=$(fetch_url "$liveurl") # shellcheck disable=SC2181 - if [ $? != 0 ]; then - warn "failed to download live image: error $?" + ret=$? + if [ $ret != 0 ]; then + warn "failed to download live image: error $ret" imgfile= fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-cmdline.sh new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-cmdline.sh --- old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-cmdline.sh 2023-12-21 10:09:39.000000000 +0100 +++ new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-cmdline.sh 2024-01-22 13:58:40.000000000 +0100 @@ -45,7 +45,7 @@ make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab' # run scriptlets to parse the command line -getarg 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline" +getargs 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline" source_hook cmdline [ -f /lib/dracut/parse-resume.sh ] && . /lib/dracut/parse-resume.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-initqueue.sh new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-initqueue.sh --- old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-initqueue.sh 2023-12-21 10:09:39.000000000 +0100 +++ new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-initqueue.sh 2024-01-22 13:58:40.000000000 +0100 @@ -9,7 +9,7 @@ source_conf /etc/conf.d make_trace_mem "hook initqueue" '1:shortmem' '2+:mem' '3+:slab' -getarg 'rd.break=initqueue' -d 'rdbreak=initqueue' && emergency_shell -n initqueue "Break before initqueue" +getargs 'rd.break=initqueue' -d 'rdbreak=initqueue' && emergency_shell -n initqueue "Break before initqueue" RDRETRY=$(getarg rd.retry -d 'rd_retry=') RDRETRY=${RDRETRY:-180} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-mount.sh new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-mount.sh --- old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-mount.sh 2023-12-21 10:09:39.000000000 +0100 +++ new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-mount.sh 2024-01-22 13:58:40.000000000 +0100 @@ -9,7 +9,7 @@ make_trace_mem "hook mount" '1:shortmem' '2+:mem' '3+:slab' -getarg 'rd.break=mount' -d 'rdbreak=mount' && emergency_shell -n mount "Break before mount" +getargs 'rd.break=mount' -d 'rdbreak=mount' && emergency_shell -n mount "Break before mount" # mount scripts actually try to mount the root filesystem, and may # be sourced any number of times. As soon as one suceeds, no more are sourced. i=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-pre-mount.sh new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-pre-mount.sh --- old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-pre-mount.sh 2023-12-21 10:09:39.000000000 +0100 +++ new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-pre-mount.sh 2024-01-22 13:58:40.000000000 +0100 @@ -11,7 +11,7 @@ make_trace_mem "hook pre-mount" '1:shortmem' '2+:mem' '3+:slab' # pre pivot scripts are sourced just before we doing cleanup and switch over # to the new root. -getarg 'rd.break=pre-mount' 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break before pre-mount" +getargs 'rd.break=pre-mount' -d 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break before pre-mount" source_hook pre-mount export -p > /dracut-state.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-pre-pivot.sh new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-pre-pivot.sh --- old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-pre-pivot.sh 2023-12-21 10:09:39.000000000 +0100 +++ new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-pre-pivot.sh 2024-01-22 13:58:40.000000000 +0100 @@ -11,11 +11,11 @@ make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab' # pre pivot scripts are sourced just before we doing cleanup and switch over # to the new root. -getarg 'rd.break=pre-pivot' 'rdbreak=pre-pivot' && emergency_shell -n pre-pivot "Break before pre-pivot" +getargs 'rd.break=pre-pivot' -d 'rdbreak=pre-pivot' && emergency_shell -n pre-pivot "Break before pre-pivot" source_hook pre-pivot # pre pivot cleanup scripts are sourced just before we switch over to the new root. -getarg 'rd.break=cleanup' 'rdbreak=cleanup' && emergency_shell -n cleanup "Break before cleanup" +getargs 'rd.break=cleanup' -d 'rdbreak=cleanup' && emergency_shell -n cleanup "Break before cleanup" source_hook cleanup _bv=$(getarg rd.break -d rdbreak) && [ -z "$_bv" ] \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-pre-trigger.sh new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-pre-trigger.sh --- old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-pre-trigger.sh 2023-12-21 10:09:39.000000000 +0100 +++ new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-pre-trigger.sh 2024-01-22 13:58:40.000000000 +0100 @@ -12,7 +12,7 @@ source_hook pre-trigger -getarg 'rd.break=pre-trigger' 'rdbreak=pre-trigger' && emergency_shell -n pre-trigger "Break before pre-trigger" +getargs 'rd.break=pre-trigger' -d 'rdbreak=pre-trigger' && emergency_shell -n pre-trigger "Break before pre-trigger" udevadm control --reload > /dev/null 2>&1 || : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-pre-udev.sh new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-pre-udev.sh --- old/dracut-059+suse.533.g5a7cf9fa/modules.d/98dracut-systemd/dracut-pre-udev.sh 2023-12-21 10:09:39.000000000 +0100 +++ new/dracut-059+suse.538.ge7a5cff9/modules.d/98dracut-systemd/dracut-pre-udev.sh 2024-01-22 13:58:40.000000000 +0100 @@ -10,7 +10,7 @@ make_trace_mem "hook pre-udev" '1:shortmem' '2+:mem' '3+:slab' # pre pivot scripts are sourced just before we doing cleanup and switch over # to the new root. -getarg 'rd.break=pre-udev' 'rdbreak=pre-udev' && emergency_shell -n pre-udev "Break before pre-udev" +getargs 'rd.break=pre-udev' -d 'rdbreak=pre-udev' && emergency_shell -n pre-udev "Break before pre-udev" source_hook pre-udev _modprobe_d=/etc/modprobe.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.533.g5a7cf9fa/modules.d/99base/init.sh new/dracut-059+suse.538.ge7a5cff9/modules.d/99base/init.sh --- old/dracut-059+suse.533.g5a7cf9fa/modules.d/99base/init.sh 2023-12-21 10:09:39.000000000 +0100 +++ new/dracut-059+suse.538.ge7a5cff9/modules.d/99base/init.sh 2024-01-22 13:58:40.000000000 +0100 @@ -123,7 +123,7 @@ # run scriptlets to parse the command line make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab' -getarg 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline" +getargs 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline" source_hook cmdline [ -z "$root" ] && die "No or empty root= argument" @@ -133,7 +133,7 @@ # pre-udev scripts run before udev starts, and are run only once. make_trace_mem "hook pre-udev" '1:shortmem' '2+:mem' '3+:slab' -getarg 'rd.break=pre-udev' -d 'rdbreak=pre-udev' && emergency_shell -n pre-udev "Break before pre-udev" +getargs 'rd.break=pre-udev' -d 'rdbreak=pre-udev' && emergency_shell -n pre-udev "Break before pre-udev" source_hook pre-udev UDEV_LOG=err @@ -148,7 +148,7 @@ udevproperty "hookdir=$hookdir" make_trace_mem "hook pre-trigger" '1:shortmem' '2+:mem' '3+:slab' -getarg 'rd.break=pre-trigger' -d 'rdbreak=pre-trigger' && emergency_shell -n pre-trigger "Break before pre-trigger" +getargs 'rd.break=pre-trigger' -d 'rdbreak=pre-trigger' && emergency_shell -n pre-trigger "Break before pre-trigger" source_hook pre-trigger udevadm control --reload > /dev/null 2>&1 || : @@ -157,7 +157,7 @@ udevadm trigger --type=devices --action=add > /dev/null 2>&1 make_trace_mem "hook initqueue" '1:shortmem' '2+:mem' '3+:slab' -getarg 'rd.break=initqueue' -d 'rdbreak=initqueue' && emergency_shell -n initqueue "Break before initqueue" +getargs 'rd.break=initqueue' -d 'rdbreak=initqueue' && emergency_shell -n initqueue "Break before initqueue" RDRETRY=$(getarg rd.retry -d 'rd_retry=') RDRETRY=${RDRETRY:-180} @@ -223,10 +223,10 @@ # pre-mount happens before we try to mount the root filesystem, # and happens once. make_trace_mem "hook pre-mount" '1:shortmem' '2+:mem' '3+:slab' -getarg 'rd.break=pre-mount' -d 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break before pre-mount" +getargs 'rd.break=pre-mount' -d 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break before pre-mount" source_hook pre-mount -getarg 'rd.break=mount' -d 'rdbreak=mount' && emergency_shell -n mount "Break before mount" +getargs 'rd.break=mount' -d 'rdbreak=mount' && emergency_shell -n mount "Break before mount" # mount scripts actually try to mount the root filesystem, and may # be sourced any number of times. As soon as one suceeds, no more are sourced. _i_mount=0 @@ -262,12 +262,12 @@ # pre pivot scripts are sourced just before we doing cleanup and switch over # to the new root. make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab' -getarg 'rd.break=pre-pivot' -d 'rdbreak=pre-pivot' && emergency_shell -n pre-pivot "Break before pre-pivot" +getargs 'rd.break=pre-pivot' -d 'rdbreak=pre-pivot' && emergency_shell -n pre-pivot "Break before pre-pivot" source_hook pre-pivot make_trace_mem "hook cleanup" '1:shortmem' '2+:mem' '3+:slab' # pre pivot cleanup scripts are sourced just before we switch over to the new root. -getarg 'rd.break=cleanup' -d 'rdbreak=cleanup' && emergency_shell -n cleanup "Break before cleanup" +getargs 'rd.break=cleanup' -d 'rdbreak=cleanup' && emergency_shell -n cleanup "Break before cleanup" source_hook cleanup # By the time we get here, the root filesystem should be mounted. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.533.g5a7cf9fa/modules.d/99shutdown/shutdown.sh new/dracut-059+suse.538.ge7a5cff9/modules.d/99shutdown/shutdown.sh --- old/dracut-059+suse.533.g5a7cf9fa/modules.d/99shutdown/shutdown.sh 2023-12-21 10:09:39.000000000 +0100 +++ new/dracut-059+suse.538.ge7a5cff9/modules.d/99shutdown/shutdown.sh 2024-01-22 13:58:40.000000000 +0100 @@ -39,7 +39,7 @@ fi trap "emergency_shell --shutdown shutdown Signal caught!" 0 -getarg 'rd.break=pre-shutdown' && emergency_shell --shutdown pre-shutdown "Break before pre-shutdown" +getargs 'rd.break=pre-shutdown' && emergency_shell --shutdown pre-shutdown "Break before pre-shutdown" source_hook pre-shutdown @@ -155,7 +155,7 @@ /oldroot/bin/plymouth --hide-splash fi -getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown" +getargs 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown" case "$ACTION" in reboot | poweroff | halt) ++++++ dracut.obsinfo ++++++ --- /var/tmp/diff_new_pack.Mao4xg/_old 2024-01-22 20:31:24.519047115 +0100 +++ /var/tmp/diff_new_pack.Mao4xg/_new 2024-01-22 20:31:24.523047261 +0100 @@ -1,5 +1,5 @@ name: dracut -version: 059+suse.533.g5a7cf9fa -mtime: 1703149779 -commit: 5a7cf9fab17b88df3d58442aee878d7155e07a00 +version: 059+suse.538.ge7a5cff9 +mtime: 1705928320 +commit: e7a5cff9ab6865d881478107e35a74061fbbd628
