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
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-041/dracut.sh
|
|
===================================================================
|
|
--- dracut-041.orig/dracut.sh 2015-03-24 15:12:43.427456873 +0100
|
|
+++ dracut-041/dracut.sh 2015-03-24 15:16:01.578586094 +0100
|
|
@@ -646,7 +646,7 @@
|
|
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-041/lsinitrd.sh
|
|
===================================================================
|
|
--- dracut-041.orig/lsinitrd.sh 2015-01-31 12:54:52.000000000 +0100
|
|
+++ dracut-041/lsinitrd.sh 2015-03-24 15:16:01.578586094 +0100
|
|
@@ -89,7 +89,7 @@
|
|
&& [[ -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
|
|
|