9f28177407
- Update to dracut mainline version 041. Half of the patches got integrated mainline. Some others have been merged together when it made sense some have been left out, but are still in the repository as they need some special treating and mainline discussion whether/how they get added. These are also not urgently needed, but are debugging patches. I broke the rule here to mention every added/deleted/modified patch as every patch is touched and every 2nd got removed (mainline integrated). I also re-ordered the patches in the PatchXY: area for easier merging them and get them discussed and posted mainline easier, topic by topic. OBS-URL: https://build.opensuse.org/request/show/293267 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=214
126 lines
4.7 KiB
Diff
126 lines
4.7 KiB
Diff
From 5473e4b5d8d9bbf9bd995dff815647de0ed1b30b Mon Sep 17 00:00:00 2001
|
|
From: Jeff Mahoney <jeffm@suse.com>
|
|
Date: Thu, 12 Jun 2014 09:30:01 +0200
|
|
Subject: dracut: add warning when including unsupported modules
|
|
|
|
With self-built kernels (often used for debugging by both internal and
|
|
external development), it's a common mistake to not set up
|
|
Module.supported properly. As a result, modules can end up without the
|
|
supported tag. "make install" will happily build an initramfs, via
|
|
dracut, that will not boot due to the kernel refusing to load the
|
|
unsupported modules.
|
|
|
|
This patch adds a --check-supported option to check whether all modules
|
|
added to the initramfs are marked supported and warn if they are not.
|
|
It will not cause the initramfs creation to fail.
|
|
|
|
The option is intended to be called via /sbin/installkernel, which will
|
|
check to see if the kernel has CONFIG_SUSE_KERNEL_SUPPORTED before using
|
|
the option.
|
|
|
|
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
|
|
---
|
|
dracut-functions.sh | 21 +++++++++++++++++++++
|
|
dracut.8.asc | 11 +++++++++++
|
|
dracut.sh | 5 +++++
|
|
3 files changed, 37 insertions(+)
|
|
|
|
Index: dracut-041/dracut-functions.sh
|
|
===================================================================
|
|
--- dracut-041.orig/dracut-functions.sh 2015-03-17 13:03:05.977340283 +0100
|
|
+++ dracut-041/dracut-functions.sh 2015-03-17 13:04:36.570421062 +0100
|
|
@@ -1436,6 +1436,17 @@
|
|
done
|
|
}
|
|
|
|
+check_supported_kmod() {
|
|
+ kmod=$1
|
|
+ supported=$(modinfo -k $kernel -F supported $kmod 2>/dev/null)
|
|
+ case "$supported" in
|
|
+ yes|external) ;;
|
|
+ *) dwarn "Module \"$(basename $kmod)\" is unsupported. This may cause" \
|
|
+ "problems while booting." ;;
|
|
+ esac
|
|
+}
|
|
+
|
|
+
|
|
# Install a single kernel module along with any firmware it may require.
|
|
# $1 = full path to kernel module to install
|
|
install_kmod_with_fw() {
|
|
@@ -1498,6 +1509,10 @@
|
|
fi
|
|
fi
|
|
done
|
|
+
|
|
+ if [[ "$check_supported" = "yes" ]]; then
|
|
+ check_supported_kmod $1
|
|
+ fi
|
|
return 0
|
|
}
|
|
|
|
@@ -1544,6 +1559,12 @@
|
|
inst_simple "$_modpath" "/lib/modules/$kernel/${_destpath}" || exit $?
|
|
done < "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist.dep"
|
|
fi
|
|
+
|
|
+ if [[ $check_supported ]]; then
|
|
+ while read _modpath; do
|
|
+ check_supported_kmod $_modpath
|
|
+ done < "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist.dep"
|
|
+ fi
|
|
) &
|
|
_pid=$(jobs -p | while read a ; do printf ":$a";done)
|
|
_pid=${_pid##*:}
|
|
Index: dracut-041/dracut.8.asc
|
|
===================================================================
|
|
--- dracut-041.orig/dracut.8.asc 2015-03-17 13:03:05.985340731 +0100
|
|
+++ dracut-041/dracut.8.asc 2015-03-17 13:04:36.574421286 +0100
|
|
@@ -465,6 +465,17 @@
|
|
**--loginstall _<DIR>_::
|
|
Log all files installed from the host to _<DIR>_.
|
|
|
|
+**--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_::
|
|
Index: dracut-041/dracut.sh
|
|
===================================================================
|
|
--- dracut-041.orig/dracut.sh 2015-03-17 13:04:36.578421510 +0100
|
|
+++ dracut-041/dracut.sh 2015-03-17 13:05:51.022596862 +0100
|
|
@@ -193,6 +193,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
|
|
--loginstall [DIR] Log all files installed from the host to [DIR]
|
|
|
|
@@ -387,6 +390,7 @@
|
|
--long noimageifnotneeded \
|
|
--long early-microcode \
|
|
--long no-early-microcode \
|
|
+ --long check-supported \
|
|
--long reproducible \
|
|
--long loginstall: \
|
|
-- "$@")
|
|
@@ -576,6 +580,7 @@
|
|
--printsize) printsize="yes";;
|
|
--regenerate-all) regenerate_all="yes";;
|
|
--noimageifnotneeded) noimageifnotneeded="yes";;
|
|
+ --check-supported) check_supported="yes" ;;
|
|
--reproducible) reproducible_l="yes";;
|
|
--) shift; break;;
|
|
|