Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2022-04-30 00:44:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Sat Apr 30 00:44:11 2022 rev:190 rq:973619 version:056+suse.280.g8dd85003
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2022-04-23
19:45:23.238942024 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new.1538/dracut.changes 2022-04-30
00:44:16.522885712 +0200
@@ -1,0 +2,9 @@
+Thu Apr 28 06:54:43 UTC 2022 - antonio.fei...@suse.com
+
+- Update to version 056+suse.280.g8dd85003:
+ * fix(suse-initrd): avoid use with systemd-boot (bsc#1198681)
+ * fix(man): add missing default paths (bsc#1198681)
+ * fix(lsinitrd.sh): add missing default paths (bsc#1198681)
+ * fix(dracut.sh): add missing default output file paths (bsc#1198681)
+
+-------------------------------------------------------------------
Old:
----
dracut-056+suse.275.g4ce7a6a7.obscpio
New:
----
dracut-056+suse.280.g8dd85003.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.SQqZoA/_old 2022-04-30 00:44:17.126886236 +0200
+++ /var/tmp/diff_new_pack.SQqZoA/_new 2022-04-30 00:44:17.130886239 +0200
@@ -25,7 +25,7 @@
%endif
Name: dracut
-Version: 056+suse.275.g4ce7a6a7
+Version: 056+suse.280.g8dd85003
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.SQqZoA/_old 2022-04-30 00:44:17.182886284 +0200
+++ /var/tmp/diff_new_pack.SQqZoA/_new 2022-04-30 00:44:17.190886291 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/opensuse/dracut.git</param>
- <param
name="changesrevision">4ce7a6a7da532202b5110ca5c5d4855353ac3aff</param></service></servicedata>
+ <param
name="changesrevision">079bd7b5af98bda720494bc64d5d7292151e8d51</param></service></servicedata>
(No newline at EOF)
++++++ dracut-056+suse.275.g4ce7a6a7.obscpio ->
dracut-056+suse.280.g8dd85003.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-056+suse.275.g4ce7a6a7/dracut.sh
new/dracut-056+suse.280.g8dd85003/dracut.sh
--- old/dracut-056+suse.275.g4ce7a6a7/dracut.sh 2022-04-22 09:58:54.000000000
+0200
+++ new/dracut-056+suse.280.g8dd85003/dracut.sh 2022-04-28 08:14:56.000000000
+0200
@@ -1025,7 +1025,15 @@
if ! [[ $outfile ]]; then
if [[ $machine_id != "no" ]]; then
- [[ -f "$dracutsysrootdir"/etc/machine-id ]] && read -r MACHINE_ID <
"$dracutsysrootdir"/etc/machine-id
+ if [[ -d "$dracutsysrootdir"/efi/Default ]] \
+ || [[ -d "$dracutsysrootdir"/boot/Default ]] \
+ || [[ -d "$dracutsysrootdir"/boot/efi/Default ]]; then
+ MACHINE_ID="Default"
+ elif [[ -f "$dracutsysrootdir"/etc/machine-id ]]; then
+ read -r MACHINE_ID < "$dracutsysrootdir"/etc/machine-id
+ else
+ MACHINE_ID="Default"
+ fi
fi
if [[ $uefi == "yes" ]]; then
@@ -1049,7 +1057,7 @@
efidir=/efi/EFI
else
efidir=/boot/EFI
- if [[ -d $dracutsysrootdir/boot/efi/EFI ]]; then
+ if [[ -d /boot/efi/EFI ]]; then
efidir=/boot/efi/EFI
fi
fi
@@ -1062,10 +1070,26 @@
mkdir -p "$dracutsysrootdir$efidir/Linux"
outfile="$dracutsysrootdir$efidir/Linux/linux-$kernel${MACHINE_ID:+-${MACHINE_ID}}${BUILD_ID:+-${BUILD_ID}}.efi"
else
- if [[ -e "$dracutsysrootdir/boot/initrd-$kernel" ]]; then
- outfile="/boot/initrd-$kernel"
- elif [[ $MACHINE_ID ]] && { [[ -d $dracutsysrootdir/boot/${MACHINE_ID}
]] || [[ -L $dracutsysrootdir/boot/${MACHINE_ID} ]]; }; then
- outfile="$dracutsysrootdir/boot/${MACHINE_ID}/$kernel/initrd"
+ if [[ -d "$dracutsysrootdir"/efi/loader/entries || -L
"$dracutsysrootdir"/efi/loader/entries ]] \
+ && [[ $MACHINE_ID ]] \
+ && [[ -d "$dracutsysrootdir"/efi/${MACHINE_ID} || -L
"$dracutsysrootdir"/efi/${MACHINE_ID} ]]; then
+ outfile="$dracutsysrootdir/efi/${MACHINE_ID}/${kernel}/initrd"
+ elif [[ -d "$dracutsysrootdir"/boot/loader/entries || -L
"$dracutsysrootdir"/boot/loader/entries ]] \
+ && [[ $MACHINE_ID ]] \
+ && [[ -d "$dracutsysrootdir"/boot/${MACHINE_ID} || -L
"$dracutsysrootdir"/boot/${MACHINE_ID} ]]; then
+ outfile="$dracutsysrootdir/boot/${MACHINE_ID}/${kernel}/initrd"
+ elif [[ -d "$dracutsysrootdir"/boot/efi/loader/entries || -L
"$dracutsysrootdir"/boot/efi/loader/entries ]] \
+ && [[ $MACHINE_ID ]] \
+ && [[ -d "$dracutsysrootdir"/boot/efi/${MACHINE_ID} || -L
"$dracutsysrootdir"/boot/efi/${MACHINE_ID} ]]; then
+ outfile="$dracutsysrootdir/boot/efi/${MACHINE_ID}/${kernel}/initrd"
+ elif [[ -f "$dracutsysrootdir"/lib/modules/${kernel}/initrd ]]; then
+ outfile="$dracutsysrootdir/lib/modules/${kernel}/initrd"
+ elif [[ -e $dracutsysrootdir/boot/initrd-${kernel} ]]; then
+ outfile="$dracutsysrootdir/boot/initrd-${kernel}"
+ elif [[ -z $dracutsysrootdir ]] && mountpoint -q /efi; then
+ outfile="/efi/${MACHINE_ID}/${kernel}/initrd"
+ elif [[ -z $dracutsysrootdir ]] && mountpoint -q /boot/efi; then
+ outfile="/boot/efi/${MACHINE_ID}/${kernel}/initrd"
else
outfile="$dracutsysrootdir/boot/initrd-$kernel"
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-056+suse.275.g4ce7a6a7/lsinitrd.sh
new/dracut-056+suse.280.g8dd85003/lsinitrd.sh
--- old/dracut-056+suse.275.g4ce7a6a7/lsinitrd.sh 2022-04-22
09:58:54.000000000 +0200
+++ new/dracut-056+suse.280.g8dd85003/lsinitrd.sh 2022-04-28
08:14:56.000000000 +0200
@@ -109,7 +109,13 @@
exit 1
fi
else
- [[ -f /etc/machine-id ]] && read -r MACHINE_ID < /etc/machine-id
+ if [[ -d /efi/Default ]] || [[ -d /boot/Default ]] || [[ -d
/boot/efi/Default ]]; then
+ MACHINE_ID="Default"
+ elif [[ -f /etc/machine-id ]]; then
+ read -r MACHINE_ID < /etc/machine-id
+ else
+ MACHINE_ID="Default"
+ fi
if [[ -d /efi/loader/entries || -L /efi/loader/entries ]] \
&& [[ $MACHINE_ID ]] \
@@ -119,8 +125,20 @@
&& [[ $MACHINE_ID ]] \
&& [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]]; then
image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
- else
+ elif [[ -d /boot/efi/loader/entries || -L /boot/efi/loader/entries ]] \
+ && [[ $MACHINE_ID ]] \
+ && [[ -d /boot/efi/${MACHINE_ID} || -L /boot/efi/${MACHINE_ID} ]]; then
+ image="/boot/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
+ elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then
+ image="/lib/modules/${KERNEL_VERSION}/initrd"
+ elif [[ -f /boot/initrd-${KERNEL_VERSION} ]]; then
image="/boot/initrd-${KERNEL_VERSION}"
+ elif mountpoint -q /efi; then
+ image="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
+ elif mountpoint -q /boot/efi; then
+ image="/boot/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
+ else
+ image=""
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-056+suse.275.g4ce7a6a7/man/dracut.8.asc
new/dracut-056+suse.280.g8dd85003/man/dracut.8.asc
--- old/dracut-056+suse.275.g4ce7a6a7/man/dracut.8.asc 2022-04-22
09:58:54.000000000 +0200
+++ new/dracut-056+suse.280.g8dd85003/man/dracut.8.asc 2022-04-28
08:14:56.000000000 +0200
@@ -18,8 +18,13 @@
Create an initramfs <image> for the kernel with the version <kernel version>.
If <kernel version> is omitted, then the version of the actual running
-kernel is used. If <image> is omitted or empty, then the default location
-/boot/initramfs-<kernel version>.img is used.
+kernel is used. If <image> is omitted or empty, depending on bootloader
+specification, the default location can be
+_/efi/<machine-id>/<kernel-version>/initrd_,
+_/boot/<machine-id>/<kernel-version>/initrd_,
+_/boot/efi/<machine-id>/<kernel-version>/initrd_,
+_/lib/modules/<kernel-version>/initrd_ or
+_/boot/initrd-<kernel-version>_.
dracut creates an initial image used by the kernel for preloading the block
device modules (such as IDE, SCSI or RAID) which are needed to access the root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-056+suse.275.g4ce7a6a7/man/dracut.usage.asc
new/dracut-056+suse.280.g8dd85003/man/dracut.usage.asc
--- old/dracut-056+suse.275.g4ce7a6a7/man/dracut.usage.asc 2022-04-22
09:58:54.000000000 +0200
+++ new/dracut-056+suse.280.g8dd85003/man/dracut.usage.asc 2022-04-28
08:14:56.000000000 +0200
@@ -5,9 +5,13 @@
This will generate a general purpose initramfs image, with all possible
functionality resulting of the combination of the installed dracut modules and
-system tools. The image is /boot/initramfs-_++<kernel version>++_.img and
-contains the kernel modules of the currently active kernel with version
-_++<kernel version>++_.
+system tools. The image, depending on bootloader specification, can be
+_/efi/_++<machine-id>++_/_++<kernel-version>++_/initrd_,
+_/boot/_++<machine-id>++_/_++<kernel-version>++_/initrd_,
+_/boot/efi/_++<machine-id>++_/_++<kernel-version>++_/initrd_,
+_/lib/modules/_++<kernel-version>++_/initrd_ or
+_/boot/initrd-_++<kernel-version>++_,_ and contains the kernel modules of
+the currently active kernel with version _++<kernel-version>++_.
If the initramfs image already exists, dracut will display an error message,
and
to overwrite the existing image, you have to use the --force option.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-056+suse.275.g4ce7a6a7/man/lsinitrd.1.asc
new/dracut-056+suse.280.g8dd85003/man/lsinitrd.1.asc
--- old/dracut-056+suse.275.g4ce7a6a7/man/lsinitrd.1.asc 2022-04-22
09:58:54.000000000 +0200
+++ new/dracut-056+suse.280.g8dd85003/man/lsinitrd.1.asc 2022-04-28
08:14:56.000000000 +0200
@@ -13,13 +13,16 @@
--------
*lsinitrd* ['OPTION...'] [<image> [<filename> [<filename> [...] ]]]
-*lsinitrd* ['OPTION...'] -k <kernel-version>
+*lsinitrd* ['OPTION...'] -k <kernel version>
DESCRIPTION
-----------
lsinitrd shows the contents of an initramfs image. if <image> is omitted, then
-lsinitrd uses the default image _/boot/<machine-id>/<kernel-version>/initrd_ or
-_/boot/initramfs-<kernel-version>.img_.
+lsinitrd uses the default image _/efi/<machine-id>/<kernel-version>/initrd_,
+_/boot/<machine-id>/<kernel-version>/initrd_,
+_/boot/efi/<machine-id>/<kernel-version>/initrd_,
+_/lib/modules/<kernel-version>/initrd_ or
+_/boot/initrd-<kernel-version>_.
OPTIONS
-------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-056+suse.275.g4ce7a6a7/suse/mkinitrd-suse.sh
new/dracut-056+suse.280.g8dd85003/suse/mkinitrd-suse.sh
--- old/dracut-056+suse.275.g4ce7a6a7/suse/mkinitrd-suse.sh 2022-04-22
09:58:54.000000000 +0200
+++ new/dracut-056+suse.280.g8dd85003/suse/mkinitrd-suse.sh 2022-04-28
08:14:56.000000000 +0200
@@ -301,6 +301,14 @@
shift
done
+if [ -e /etc/machine-id ]; then
+ read -r MACHINE_ID < /etc/machine-id
+ if [ -d "$boot_dir/efi/$MACHINE_ID" ]; then
+ error "Looks like systemd-boot is installed. mkinitrd won't work here.
Use dracut directly instead."
+ exit 1
+ fi
+fi
+
[[ $targets && $kernels ]] || default_kernel_images
if [[ ! $targets || ! $kernels ]];then
error "No kernel found in $boot_dir or bad modules dir in /lib/modules"
++++++ dracut.obsinfo ++++++
--- /var/tmp/diff_new_pack.SQqZoA/_old 2022-04-30 00:44:17.530886586 +0200
+++ /var/tmp/diff_new_pack.SQqZoA/_new 2022-04-30 00:44:17.534886590 +0200
@@ -1,6 +1,6 @@
name: dracut
-version: 056+suse.275.g4ce7a6a7
-mtime: 1650614334
-commit: 4ce7a6a7da532202b5110ca5c5d4855353ac3aff
+version: 056+suse.280.g8dd85003
+mtime: 1651126496
+commit: 8dd850030ab3c7b6ee1d60d123c14cb7946864e1
