5d2771c238
- mkinitrd-suse.sh: Bail out with exit 1 if initrd cannot be generated (bnc#886630) * Add: 0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch - Adjust initramfs-$kernel.img to SUSE default: initrd-$kernel (bnc#882306) * Add: 0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch - btrfs: btrfs-dump-super and btrfs-select-super do not exist (bnc#886883) * Add: 0122-btrfs-btrfs-dump-super-and-btrfs-select-super-do-not.patch - 95zfcp_rules: fix typo in module_setup (bnc#887582) * Add: 0123-95zfcp_rules-fix-typo-in-module_setup.patch - 40network: Update iBFT scanning code to handle IPv6 (bnc#887542) * Add: 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch - 40network: separate 'mask' and 'prefix' (bnc#887542) * Add: 0125-40network-separate-mask-and-prefix.patch - 01fips: Add drbg module to force loaded modules (bnc#875855) * Add: 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch OBS-URL: https://build.opensuse.org/request/show/241711 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=174
45 lines
1.2 KiB
Diff
45 lines
1.2 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(-)
|
|
|
|
diff --git a/dracut.sh b/dracut.sh
|
|
index a166cb6..2d8be59 100755
|
|
--- a/dracut.sh
|
|
+++ b/dracut.sh
|
|
@@ -627,7 +627,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
|
|
|
|
diff --git a/lsinitrd.sh b/lsinitrd.sh
|
|
index a697bc2..b66a653 100755
|
|
--- a/lsinitrd.sh
|
|
+++ b/lsinitrd.sh
|
|
@@ -87,7 +87,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
|
|
|
|
--
|
|
1.8.4.5
|
|
|