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
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 05bee849390ba39a5a441cbcc921634ddc298232 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Renninger <trenn@suse.de>
|
|
Date: Wed, 16 Jul 2014 16:37:15 +0200
|
|
Subject: Adjust initramfs-$kernel.img to SUSE default: initrd-$kernel
|
|
|
|
In lsinitrd and /usr/bin/dracut
|
|
|
|
bnc#882306
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
---
|
|
dracut.sh | 2 +-
|
|
lsinitrd.sh | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: dracut-042/dracut.sh
|
|
===================================================================
|
|
--- dracut-042.orig/dracut.sh 2015-06-24 18:02:08.745336946 +0200
|
|
+++ dracut-042/dracut.sh 2015-06-24 18:02:21.906086174 +0200
|
|
@@ -658,7 +658,7 @@ if ! [[ $outfile ]]; then
|
|
if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
|
|
outfile="/boot/${MACHINE_ID}/$kernel/initrd"
|
|
else
|
|
- outfile="/boot/initramfs-$kernel.img"
|
|
+ outfile="/boot/initrd-$kernel"
|
|
fi
|
|
fi
|
|
|
|
Index: dracut-042/lsinitrd.sh
|
|
===================================================================
|
|
--- dracut-042.orig/lsinitrd.sh 2015-06-11 17:39:47.000000000 +0200
|
|
+++ dracut-042/lsinitrd.sh 2015-06-24 18:02:21.906086174 +0200
|
|
@@ -89,7 +89,7 @@ else
|
|
&& [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
|
|
image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
|
|
else
|
|
- image="/boot/initramfs-${KERNEL_VERSION}.img"
|
|
+ image="/boot/initrd-${KERNEL_VERSION}"
|
|
fi
|
|
fi
|
|
|