89f9350d9e
- Fix dmraid issue bnc#905746 A dracut_dmraid_use_udev.patch - Taken over from SLE12 A fips_add_aesni-intel.patch - Do not touch /run vs /var/run bnc#922676 D 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Update dracut to version 042 Remove these already included or unneeded patches: D dracut_v041_to_HEAD.patch D 0011-Correct-paths-for-openSUSE.patch D 0068-95fcoe-uefi-Test-for-EFI-firmware.patch D 0170-enable-logitech-hidpp.patch Adjust/refresh: M 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch M 0016-Add-new-s390x-specific-rule-files.patch M 0017-45ifcfg-use-distro-specific-scripts.patch M 0019-40network-Fix-race-condition-when-wait-for-networks.patch M 0020-00warpclock-Set-correct-timezone.patch M 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch M 0048-40network-Only-enable-network-interfaces-if-explicit.patch M 0053-01fips-fixup-loading-issues.patch M 0056-81cio_ignore-handle-cio_ignore-commandline.patch M 0057-01fips-Include-some-more-hmacs.patch M 0058-dracut-add-warning-when-including-unsupported-module.patch M 0059-99suse-Add-SUSE-specific-initrd-parsing.patch M 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch M 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch M 0066-40network-always-start-netroot-in-ifup.sh.patch M 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch M 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch OBS-URL: https://build.opensuse.org/request/show/314510 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=219
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
Index: dracut-042/mkinitrd-suse.sh
|
|
===================================================================
|
|
--- dracut-042.orig/mkinitrd-suse.sh 2015-06-24 18:02:21.618069777 +0200
|
|
+++ dracut-042/mkinitrd-suse.sh 2015-06-24 18:02:22.218103937 +0200
|
|
@@ -145,6 +145,33 @@ is_xen_kernel() {
|
|
return
|
|
}
|
|
|
|
+# kernel_image_gz_from_image() and kernel_version_from_image() are helpers
|
|
+# for arm* kernels which produce zImage files which cannot be read from
|
|
+# get_kernel_version -> get rid of this workaround if possible
|
|
+kernel_image_gz_from_image() {
|
|
+ local arch=$(uname -i)
|
|
+ local r=${1}.gz
|
|
+
|
|
+ # uImage kernels can't be extracted directly. Use the vmlinux.gz instead
|
|
+ r=${r//uImage/vmlinux}
|
|
+
|
|
+ # on ARM a zImage can't be extracted directly. Other platforms define it
|
|
+ # as a gzipped vmlinux file, but not ARM. So only on ARM, use vmlinux.gz.
|
|
+ if [[ $arch =~ arm ]] || [[ $arch =~ aarch ]]; then
|
|
+ r=${r//zImage/vmlinux}
|
|
+ fi
|
|
+
|
|
+ echo $r
|
|
+}
|
|
+
|
|
+kernel_version_from_image() {
|
|
+ local kernel_image="$1" kernel_image_gz=$(kernel_image_gz_from_image "$1")
|
|
+
|
|
+ if get_kernel_version "$kernel_image" 2>/dev/null; then
|
|
+ return
|
|
+ fi
|
|
+ get_kernel_version "$kernel_image_gz" 2>/dev/null
|
|
+}
|
|
|
|
# Taken over from SUSE mkinitrd
|
|
default_kernel_images() {
|
|
@@ -183,7 +210,8 @@ default_kernel_images() {
|
|
|
|
[ -L "$boot_dir/$kernel_image" ] && continue
|
|
[ "${kernel_image%%.gz}" != "$kernel_image" ] && continue
|
|
- kernel_version=$(/usr/bin/get_kernel_version \
|
|
+
|
|
+ kernel_version=$(kernel_version_from_image \
|
|
$boot_dir/$kernel_image 2> /dev/null)
|
|
initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|")
|
|
if [ "$kernel_image" != "$initrd_image" -a \
|