2014-07-21 12:41:52 +00:00
|
|
|
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(-)
|
|
|
|
|
2015-06-30 12:59:59 +00:00
|
|
|
Index: dracut-042/dracut.sh
|
2015-03-31 14:12:12 +00:00
|
|
|
===================================================================
|
2015-06-30 12:59:59 +00:00
|
|
|
--- 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
|
2014-07-21 12:41:52 +00:00
|
|
|
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
|
|
|
|
|
2015-06-30 12:59:59 +00:00
|
|
|
Index: dracut-042/lsinitrd.sh
|
2015-03-31 14:12:12 +00:00
|
|
|
===================================================================
|
2015-06-30 12:59:59 +00:00
|
|
|
--- 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
|
2014-07-21 12:41:52 +00:00
|
|
|
&& [[ -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
|
|
|
|
|