Hello community,
here is the log from the commit of package dracut for openSUSE:Leap:15.2
checked in at 2020-02-27 06:40:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/dracut (Old)
and /work/SRC/openSUSE:Leap:15.2/.dracut.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Thu Feb 27 06:40:47 2020 rev:70 rq:778830 version:049.1+git124.70941b30
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/dracut/dracut.changes 2020-02-13
14:40:37.625649750 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.dracut.new.26092/dracut.changes
2020-02-27 06:40:50.141526169 +0100
@@ -1,0 +2,14 @@
+Fri Feb 21 16:08:12 UTC 2020 - daniel.molken...@suse.com
+
+- Update to version 049.1+git124.70941b30:
+ * 90kernel-modules: Add PCI host controller modules (boo#1162669)
+
+-------------------------------------------------------------------
+Fri Feb 21 14:41:37 UTC 2020 - daniel.molken...@suse.com
+
+- Update to version 049.1+git123.c2a6645e:
+ * dracut: add warning when including unsupported modules (bsc#1163055)
+ * 01fips: Boot without BOOT_IMAGE being set (bsc#1161292)
+ * 01fips: Use correct kernel image name for more platforms (bsc#1164076)
+
+-------------------------------------------------------------------
Old:
----
dracut-049.1+git120.dbfbfcb8.obscpio
dracut-049.1+git120.dbfbfcb8.tar.xz
New:
----
dracut-049.1+git124.70941b30.obscpio
dracut-049.1+git124.70941b30.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.aSq3x0/_old 2020-02-27 06:40:50.877527702 +0100
+++ /var/tmp/diff_new_pack.aSq3x0/_new 2020-02-27 06:40:50.877527702 +0100
@@ -19,7 +19,7 @@
%define dracutlibdir %{_prefix}/lib/dracut
Name: dracut
-Version: 049.1+git120.dbfbfcb8
+Version: 049.1+git124.70941b30
Release: 0
Summary: Initramfs generator using udev
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.aSq3x0/_old 2020-02-27 06:40:50.913527778 +0100
+++ /var/tmp/diff_new_pack.aSq3x0/_new 2020-02-27 06:40:50.913527778 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/opensuse/dracut.git</param>
- <param
name="changesrevision">dbfbfcb8fe0bc086850aca67b182e6ca2fe2c63d</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">70941b302bb05a22c508c74aa2568f51a472a558</param></service></servicedata>
\ No newline at end of file
++++++ dracut-049.1+git120.dbfbfcb8.obscpio ->
dracut-049.1+git124.70941b30.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-049.1+git120.dbfbfcb8/dracut-init.sh
new/dracut-049.1+git124.70941b30/dracut-init.sh
--- old/dracut-049.1+git120.dbfbfcb8/dracut-init.sh 2020-02-04
15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/dracut-init.sh 2020-02-21
17:07:19.000000000 +0100
@@ -239,8 +239,8 @@
done
$DRACUT_INSTALL \
- ${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"}
${hostonly:+-H} ${omit_drivers:+-N "$omit_drivers"} ${srcmods:+--kerneldir
"$srcmods"} -m "$@"
- (($? != 0)) && (($_silent == 0)) && derror FAILED: $DRACUT_INSTALL
${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"} ${hostonly:+-H}
${omit_drivers:+-N "$omit_drivers"} ${srcmods:+--kerneldir "$srcmods"} -m "$@"
|| :
+ ${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"}
${hostonly:+-H} ${check_supported:+--check-supported} ${omit_drivers:+-N
"$omit_drivers"} ${srcmods:+--kerneldir "$srcmods"} -m "$@"
+ (($? != 0)) && (($_silent == 0)) && derror FAILED: $DRACUT_INSTALL
${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"} ${hostonly:+-H}
${check_supported:+--check-supported} ${omit_drivers:+-N "$omit_drivers"}
${srcmods:+--kerneldir "$srcmods"} -m "$@" || :
}
inst_library() {
@@ -958,6 +958,7 @@
${initdir:+-D "$initdir"} \
${loginstall:+-L "$loginstall"} \
${hostonly:+-H} \
+ ${check_supported:+--check-supported} \
${omit_drivers:+-N "$omit_drivers"} \
${srcmods:+--kerneldir "$srcmods"} \
${_optional:+-o} \
@@ -971,6 +972,7 @@
${initdir:+-D "$initdir"} \
${loginstall:+-L "$loginstall"} \
${hostonly:+-H} \
+ ${check_supported:+--check-supported} \
${omit_drivers:+-N "$omit_drivers"} \
${srcmods:+--kerneldir "$srcmods"} \
${_optional:+-o} \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-049.1+git120.dbfbfcb8/dracut.8.asc
new/dracut-049.1+git124.70941b30/dracut.8.asc
--- old/dracut-049.1+git120.dbfbfcb8/dracut.8.asc 2020-02-04
15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/dracut.8.asc 2020-02-21
17:07:19.000000000 +0100
@@ -517,6 +517,17 @@
_INITRD_COMPRESS_::
sets the default compression program. See **--compress**.
+**--check-supported**::
+ The kernel may be configured to check whether a module is
+ supported by the vendor before allowing it to be loaded. On these
+ systems, it's possible to generate an initramfs image that will
+ fail to boot due to unsupported modules being refused. This
+ option enables a check that will issue a warning if a module built
+ without the support option enabled is encountered while building
+ the image. Use of this option assumes that the kernel requires
+ supported modules and will issue a warning on every module if used
+ otherwise.
+
FILES
-----
_/var/log/dracut.log_::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-049.1+git120.dbfbfcb8/dracut.sh
new/dracut-049.1+git124.70941b30/dracut.sh
--- old/dracut-049.1+git120.dbfbfcb8/dracut.sh 2020-02-04 15:37:13.000000000
+0100
+++ new/dracut-049.1+git124.70941b30/dracut.sh 2020-02-21 17:07:19.000000000
+0100
@@ -228,6 +228,9 @@
--printsize Print out the module install size
--sshkey [SSHKEY] Add ssh key to initramfs (use with ssh-client module)
--logfile [FILE] Logfile to use (overrides configuration setting)
+ --check-supported Check to ensure that modules are marked supported when
+ using a kernel that is configured to check the
+ support status of a module before loading.
--reproducible Create reproducible images
--no-reproducible Do not create reproducible images
--loginstall [DIR] Log all files installed from the host to [DIR]
@@ -390,6 +393,7 @@
--long noimageifnotneeded \
--long early-microcode \
--long no-early-microcode \
+ --long check-supported \
--long reproducible \
--long no-reproducible \
--long loginstall: \
@@ -587,6 +591,7 @@
--printsize) printsize="yes";;
--regenerate-all) regenerate_all="yes";;
--noimageifnotneeded) noimageifnotneeded="yes";;
+ --check-supported) check_supported="yes" ;;
--reproducible) reproducible_l="yes";;
--no-reproducible) reproducible_l="no";;
--uefi) uefi="yes";;
@@ -1352,7 +1357,7 @@
DRACUT_VERSION udevdir prefix filesystems drivers \
systemdutildir systemdsystemunitdir systemdsystemconfdir \
hostonly_cmdline loginstall \
- tmpfilesdir
+ tmpfilesdir check_supported
mods_to_load=""
# check all our modules to see if they should be sourced.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-049.1+git120.dbfbfcb8/install/dracut-install.c
new/dracut-049.1+git124.70941b30/install/dracut-install.c
--- old/dracut-049.1+git120.dbfbfcb8/install/dracut-install.c 2020-02-04
15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/install/dracut-install.c 2020-02-21
17:07:19.000000000 +0100
@@ -59,6 +59,7 @@
static bool arg_resolvelazy = false;
static bool arg_resolvedeps = false;
static bool arg_hostonly = false;
+static bool arg_supported = false;
static char *destrootdir = NULL;
static char *kerneldir = NULL;
static size_t kerneldirlen = 0;
@@ -798,6 +799,7 @@
" --firmwaredirs Specify the firmware directory search path
with : separation\n"
" --silent Don't display error messages for kernel
module install\n"
" --modalias Only generate module list from
/sys/devices modalias list\n"
+ " --check-supported Check if module is supported by a vendor\n"
" -o --optional If kernel module does not exist, do not
fail\n"
" -p --mod-filter-path Filter kernel modules by path
regexp\n"
" -P --mod-filter-nopath Exclude kernel modules by path
regexp\n"
@@ -825,12 +827,14 @@
ARG_MODALIAS,
ARG_KERNELDIR,
ARG_FIRMWAREDIRS,
- ARG_DEBUG
+ ARG_DEBUG,
+ ARG_SUPPORTED
};
static struct option const options[] = {
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, ARG_VERSION},
+ {"check-supported", no_argument, NULL, ARG_SUPPORTED},
{"dir", no_argument, NULL, 'd'},
{"debug", no_argument, NULL, ARG_DEBUG},
{"verbose", no_argument, NULL, 'v'},
@@ -869,6 +873,9 @@
case ARG_SILENT:
arg_silent = true;
break;
+ case ARG_SUPPORTED:
+ arg_supported = true;
+ break;
case ARG_MODALIAS:
arg_modalias = true;
return 1;
@@ -1243,6 +1250,34 @@
return true;
}
+static int check_module_supported(struct kmod_module *mod) {
+ struct kmod_list *l;
+ _cleanup_kmod_module_info_free_list_ struct kmod_list *list = NULL;
+ int ret;
+
+ ret = kmod_module_get_info(mod, &list);
+ if (ret < 0) {
+ log_error("could not get modinfo from '%s': %s\n",
+ kmod_module_get_name(mod), strerror(-ret));
+ return ret;
+ }
+
+ kmod_list_foreach(l, list) {
+ const char *key = kmod_module_info_get_key(l);
+ const char *value = NULL;
+
+ if (!streq("supported", key))
+ continue;
+
+ value = kmod_module_info_get_value(l);
+ if (!streq("yes", value) && !streq("external", value)) {
+ log_warning("Module '%s' is unsupported. This may
cause" \
+ "problems while booting.",
kmod_module_get_name(mod));
+ }
+ }
+ return ret;
+}
+
static int install_dependent_modules(struct kmod_list *modlist)
{
struct kmod_list *itr;
@@ -1271,6 +1306,12 @@
continue;
}
+ if (arg_supported) {
+ ret = check_module_supported(mod);
+ if (ret < 0)
+ return ret;
+ }
+
ret = dracut_install(path, &path[kerneldirlen], false, false,
true);
if (ret == 0) {
_cleanup_kmod_module_unref_list_ struct kmod_list
*modlist = NULL;
@@ -1328,6 +1369,12 @@
return 1;
}
+ if (arg_supported) {
+ ret = check_module_supported(mod);
+ if (ret < 0)
+ return ret;
+ }
+
log_debug("dracut_install '%s' '%s'", path, &path[kerneldirlen]);
ret = dracut_install(path, &path[kerneldirlen], false, false, true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-049.1+git120.dbfbfcb8/modules.d/01fips/fips.sh
new/dracut-049.1+git124.70941b30/modules.d/01fips/fips.sh
--- old/dracut-049.1+git120.dbfbfcb8/modules.d/01fips/fips.sh 2020-02-04
15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/modules.d/01fips/fips.sh 2020-02-21
17:07:19.000000000 +0100
@@ -89,12 +89,25 @@
local _s
local _v
local _module
- local _arch=$(uname -m)
- local _vmname=vmlinuz
+ local _vmname
- if [ "$_arch" = "s390x" ]; then
+ case "$(uname -m)" in
+ s390|s390x)
_vmname=image
- fi
+ ;;
+ ppc*)
+ _vmname=vmlinux
+ ;;
+ aarch64)
+ _vmname=Image
+ ;;
+ armv*)
+ _vmname=zImage
+ ;;
+ *)
+ _vmname=vmlinuz
+ ;;
+ esac
KERNEL=$(uname -r)
@@ -168,8 +181,14 @@
return 1
fi
+ BOOT_IMAGE_KERNEL="/boot/${BOOT_IMAGE_PATH}${BOOT_IMAGE_NAME}"
+ if ! [ -e "${BOOT_IMAGE_KERNEL}" ]; then
+ warn "${BOOT_IMAGE_KERNEL} does not exist"
+ return 1
+ fi
+
if [ -n "$(fipscheck)" ]; then
- $(fipscheck) -c ${BOOT_IMAGE_HMAC} ${BOOT_IMAGE} || return 1
+ $(fipscheck) -c ${BOOT_IMAGE_HMAC} ${BOOT_IMAGE_KERNEL} || return 1
else
warn "Could not find fipscheck to verify MACs"
return 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-049.1+git120.dbfbfcb8/modules.d/90kernel-modules/module-setup.sh
new/dracut-049.1+git124.70941b30/modules.d/90kernel-modules/module-setup.sh
--- old/dracut-049.1+git120.dbfbfcb8/modules.d/90kernel-modules/module-setup.sh
2020-02-04 15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/modules.d/90kernel-modules/module-setup.sh
2020-02-21 17:07:19.000000000 +0100
@@ -33,6 +33,7 @@
"=drivers/tty/serial" \
"=drivers/input/serio" \
"=drivers/input/keyboard" \
+ "=drivers/usb/controller" \
"=drivers/usb/storage" \
"=drivers/pci/host" \
${NULL}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-049.1+git120.dbfbfcb8/suse/dracut-installkernel
new/dracut-049.1+git124.70941b30/suse/dracut-installkernel
--- old/dracut-049.1+git120.dbfbfcb8/suse/dracut-installkernel 2020-02-04
15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/suse/dracut-installkernel 2020-02-21
17:07:19.000000000 +0100
@@ -21,7 +21,7 @@
s390|s390x)
BOOTFILE=image
;;
- ppc|ppc64)
+ ppc*)
BOOTFILE=vmlinux
;;
aarch64)
++++++ dracut-049.1+git120.dbfbfcb8.tar.xz ->
dracut-049.1+git124.70941b30.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-049.1+git120.dbfbfcb8/dracut-init.sh
new/dracut-049.1+git124.70941b30/dracut-init.sh
--- old/dracut-049.1+git120.dbfbfcb8/dracut-init.sh 2020-02-04
15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/dracut-init.sh 2020-02-21
17:07:19.000000000 +0100
@@ -239,8 +239,8 @@
done
$DRACUT_INSTALL \
- ${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"}
${hostonly:+-H} ${omit_drivers:+-N "$omit_drivers"} ${srcmods:+--kerneldir
"$srcmods"} -m "$@"
- (($? != 0)) && (($_silent == 0)) && derror FAILED: $DRACUT_INSTALL
${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"} ${hostonly:+-H}
${omit_drivers:+-N "$omit_drivers"} ${srcmods:+--kerneldir "$srcmods"} -m "$@"
|| :
+ ${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"}
${hostonly:+-H} ${check_supported:+--check-supported} ${omit_drivers:+-N
"$omit_drivers"} ${srcmods:+--kerneldir "$srcmods"} -m "$@"
+ (($? != 0)) && (($_silent == 0)) && derror FAILED: $DRACUT_INSTALL
${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"} ${hostonly:+-H}
${check_supported:+--check-supported} ${omit_drivers:+-N "$omit_drivers"}
${srcmods:+--kerneldir "$srcmods"} -m "$@" || :
}
inst_library() {
@@ -958,6 +958,7 @@
${initdir:+-D "$initdir"} \
${loginstall:+-L "$loginstall"} \
${hostonly:+-H} \
+ ${check_supported:+--check-supported} \
${omit_drivers:+-N "$omit_drivers"} \
${srcmods:+--kerneldir "$srcmods"} \
${_optional:+-o} \
@@ -971,6 +972,7 @@
${initdir:+-D "$initdir"} \
${loginstall:+-L "$loginstall"} \
${hostonly:+-H} \
+ ${check_supported:+--check-supported} \
${omit_drivers:+-N "$omit_drivers"} \
${srcmods:+--kerneldir "$srcmods"} \
${_optional:+-o} \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-049.1+git120.dbfbfcb8/dracut.8.asc
new/dracut-049.1+git124.70941b30/dracut.8.asc
--- old/dracut-049.1+git120.dbfbfcb8/dracut.8.asc 2020-02-04
15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/dracut.8.asc 2020-02-21
17:07:19.000000000 +0100
@@ -517,6 +517,17 @@
_INITRD_COMPRESS_::
sets the default compression program. See **--compress**.
+**--check-supported**::
+ The kernel may be configured to check whether a module is
+ supported by the vendor before allowing it to be loaded. On these
+ systems, it's possible to generate an initramfs image that will
+ fail to boot due to unsupported modules being refused. This
+ option enables a check that will issue a warning if a module built
+ without the support option enabled is encountered while building
+ the image. Use of this option assumes that the kernel requires
+ supported modules and will issue a warning on every module if used
+ otherwise.
+
FILES
-----
_/var/log/dracut.log_::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-049.1+git120.dbfbfcb8/dracut.sh
new/dracut-049.1+git124.70941b30/dracut.sh
--- old/dracut-049.1+git120.dbfbfcb8/dracut.sh 2020-02-04 15:37:13.000000000
+0100
+++ new/dracut-049.1+git124.70941b30/dracut.sh 2020-02-21 17:07:19.000000000
+0100
@@ -228,6 +228,9 @@
--printsize Print out the module install size
--sshkey [SSHKEY] Add ssh key to initramfs (use with ssh-client module)
--logfile [FILE] Logfile to use (overrides configuration setting)
+ --check-supported Check to ensure that modules are marked supported when
+ using a kernel that is configured to check the
+ support status of a module before loading.
--reproducible Create reproducible images
--no-reproducible Do not create reproducible images
--loginstall [DIR] Log all files installed from the host to [DIR]
@@ -390,6 +393,7 @@
--long noimageifnotneeded \
--long early-microcode \
--long no-early-microcode \
+ --long check-supported \
--long reproducible \
--long no-reproducible \
--long loginstall: \
@@ -587,6 +591,7 @@
--printsize) printsize="yes";;
--regenerate-all) regenerate_all="yes";;
--noimageifnotneeded) noimageifnotneeded="yes";;
+ --check-supported) check_supported="yes" ;;
--reproducible) reproducible_l="yes";;
--no-reproducible) reproducible_l="no";;
--uefi) uefi="yes";;
@@ -1352,7 +1357,7 @@
DRACUT_VERSION udevdir prefix filesystems drivers \
systemdutildir systemdsystemunitdir systemdsystemconfdir \
hostonly_cmdline loginstall \
- tmpfilesdir
+ tmpfilesdir check_supported
mods_to_load=""
# check all our modules to see if they should be sourced.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-049.1+git120.dbfbfcb8/install/dracut-install.c
new/dracut-049.1+git124.70941b30/install/dracut-install.c
--- old/dracut-049.1+git120.dbfbfcb8/install/dracut-install.c 2020-02-04
15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/install/dracut-install.c 2020-02-21
17:07:19.000000000 +0100
@@ -59,6 +59,7 @@
static bool arg_resolvelazy = false;
static bool arg_resolvedeps = false;
static bool arg_hostonly = false;
+static bool arg_supported = false;
static char *destrootdir = NULL;
static char *kerneldir = NULL;
static size_t kerneldirlen = 0;
@@ -798,6 +799,7 @@
" --firmwaredirs Specify the firmware directory search path
with : separation\n"
" --silent Don't display error messages for kernel
module install\n"
" --modalias Only generate module list from
/sys/devices modalias list\n"
+ " --check-supported Check if module is supported by a vendor\n"
" -o --optional If kernel module does not exist, do not
fail\n"
" -p --mod-filter-path Filter kernel modules by path
regexp\n"
" -P --mod-filter-nopath Exclude kernel modules by path
regexp\n"
@@ -825,12 +827,14 @@
ARG_MODALIAS,
ARG_KERNELDIR,
ARG_FIRMWAREDIRS,
- ARG_DEBUG
+ ARG_DEBUG,
+ ARG_SUPPORTED
};
static struct option const options[] = {
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, ARG_VERSION},
+ {"check-supported", no_argument, NULL, ARG_SUPPORTED},
{"dir", no_argument, NULL, 'd'},
{"debug", no_argument, NULL, ARG_DEBUG},
{"verbose", no_argument, NULL, 'v'},
@@ -869,6 +873,9 @@
case ARG_SILENT:
arg_silent = true;
break;
+ case ARG_SUPPORTED:
+ arg_supported = true;
+ break;
case ARG_MODALIAS:
arg_modalias = true;
return 1;
@@ -1243,6 +1250,34 @@
return true;
}
+static int check_module_supported(struct kmod_module *mod) {
+ struct kmod_list *l;
+ _cleanup_kmod_module_info_free_list_ struct kmod_list *list = NULL;
+ int ret;
+
+ ret = kmod_module_get_info(mod, &list);
+ if (ret < 0) {
+ log_error("could not get modinfo from '%s': %s\n",
+ kmod_module_get_name(mod), strerror(-ret));
+ return ret;
+ }
+
+ kmod_list_foreach(l, list) {
+ const char *key = kmod_module_info_get_key(l);
+ const char *value = NULL;
+
+ if (!streq("supported", key))
+ continue;
+
+ value = kmod_module_info_get_value(l);
+ if (!streq("yes", value) && !streq("external", value)) {
+ log_warning("Module '%s' is unsupported. This may
cause" \
+ "problems while booting.",
kmod_module_get_name(mod));
+ }
+ }
+ return ret;
+}
+
static int install_dependent_modules(struct kmod_list *modlist)
{
struct kmod_list *itr;
@@ -1271,6 +1306,12 @@
continue;
}
+ if (arg_supported) {
+ ret = check_module_supported(mod);
+ if (ret < 0)
+ return ret;
+ }
+
ret = dracut_install(path, &path[kerneldirlen], false, false,
true);
if (ret == 0) {
_cleanup_kmod_module_unref_list_ struct kmod_list
*modlist = NULL;
@@ -1328,6 +1369,12 @@
return 1;
}
+ if (arg_supported) {
+ ret = check_module_supported(mod);
+ if (ret < 0)
+ return ret;
+ }
+
log_debug("dracut_install '%s' '%s'", path, &path[kerneldirlen]);
ret = dracut_install(path, &path[kerneldirlen], false, false, true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-049.1+git120.dbfbfcb8/modules.d/01fips/fips.sh
new/dracut-049.1+git124.70941b30/modules.d/01fips/fips.sh
--- old/dracut-049.1+git120.dbfbfcb8/modules.d/01fips/fips.sh 2020-02-04
15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/modules.d/01fips/fips.sh 2020-02-21
17:07:19.000000000 +0100
@@ -89,12 +89,25 @@
local _s
local _v
local _module
- local _arch=$(uname -m)
- local _vmname=vmlinuz
+ local _vmname
- if [ "$_arch" = "s390x" ]; then
+ case "$(uname -m)" in
+ s390|s390x)
_vmname=image
- fi
+ ;;
+ ppc*)
+ _vmname=vmlinux
+ ;;
+ aarch64)
+ _vmname=Image
+ ;;
+ armv*)
+ _vmname=zImage
+ ;;
+ *)
+ _vmname=vmlinuz
+ ;;
+ esac
KERNEL=$(uname -r)
@@ -168,8 +181,14 @@
return 1
fi
+ BOOT_IMAGE_KERNEL="/boot/${BOOT_IMAGE_PATH}${BOOT_IMAGE_NAME}"
+ if ! [ -e "${BOOT_IMAGE_KERNEL}" ]; then
+ warn "${BOOT_IMAGE_KERNEL} does not exist"
+ return 1
+ fi
+
if [ -n "$(fipscheck)" ]; then
- $(fipscheck) -c ${BOOT_IMAGE_HMAC} ${BOOT_IMAGE} || return 1
+ $(fipscheck) -c ${BOOT_IMAGE_HMAC} ${BOOT_IMAGE_KERNEL} || return 1
else
warn "Could not find fipscheck to verify MACs"
return 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-049.1+git120.dbfbfcb8/modules.d/90kernel-modules/module-setup.sh
new/dracut-049.1+git124.70941b30/modules.d/90kernel-modules/module-setup.sh
--- old/dracut-049.1+git120.dbfbfcb8/modules.d/90kernel-modules/module-setup.sh
2020-02-04 15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/modules.d/90kernel-modules/module-setup.sh
2020-02-21 17:07:19.000000000 +0100
@@ -33,6 +33,7 @@
"=drivers/tty/serial" \
"=drivers/input/serio" \
"=drivers/input/keyboard" \
+ "=drivers/usb/controller" \
"=drivers/usb/storage" \
"=drivers/pci/host" \
${NULL}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-049.1+git120.dbfbfcb8/suse/dracut-installkernel
new/dracut-049.1+git124.70941b30/suse/dracut-installkernel
--- old/dracut-049.1+git120.dbfbfcb8/suse/dracut-installkernel 2020-02-04
15:37:13.000000000 +0100
+++ new/dracut-049.1+git124.70941b30/suse/dracut-installkernel 2020-02-21
17:07:19.000000000 +0100
@@ -21,7 +21,7 @@
s390|s390x)
BOOTFILE=image
;;
- ppc|ppc64)
+ ppc*)
BOOTFILE=vmlinux
;;
aarch64)
++++++ dracut.obsinfo ++++++
--- /var/tmp/diff_new_pack.aSq3x0/_old 2020-02-27 06:40:51.409528810 +0100
+++ /var/tmp/diff_new_pack.aSq3x0/_new 2020-02-27 06:40:51.409528810 +0100
@@ -1,5 +1,5 @@
name: dracut
-version: 049.1+git120.dbfbfcb8
-mtime: 1580827033
-commit: dbfbfcb8fe0bc086850aca67b182e6ca2fe2c63d
+version: 049.1+git124.70941b30
+mtime: 1582301239
+commit: 70941b302bb05a22c508c74aa2568f51a472a558
