pool/dracut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 256764 from home:trenn:branches:Base:System

Browse Source 
- dracut-initrd-restore.patch: dracut-shutdown.service invokes 
  dracut-initramfs-restore script which will never work in 
  openSUSE because initrd images are named initrd not initramfs.
  Patch is from: Cristian Rodríguez <crrodriguez@opensuse.org>
* Add 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch

OBS-URL: https://build.opensuse.org/request/show/256764
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=196
This commit is contained in:
Thomas Renninger 2014-10-15 16:10:04 +00:00 committed by Git OBS Bridge
parent 0363c8870b
commit 125c8353e6
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch Normal file
View File

@ -0,0 +1,28 @@
From 76396977ee19d97697226bda13de007030433854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Wed, 15 Oct 2014 17:50:36 +0200
Subject: Fix initramfs-$ver.img vs initrd-$ver in dracut-initramfs-restore.sh
dracut-shutdown.service invokes dracut-initramfs-restore script which
will never work in openSUSE because initrd images are named initrd not
initramfs.
---
dracut-initramfs-restore.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
index 0dd1938..a3b7b1b 100644
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -15,7 +15,7 @@ SKIP="$dracutbasedir/skipcpio"
if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
fi
-[[ -f $IMG ]] || IMG="/boot/initramfs-${KERNEL_VERSION}.img"
+[[ -f $IMG ]] || IMG="/boot/initrd-${KERNEL_VERSION}"
cd /run/initramfs
--
1.8.4.5

9
dracut.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Oct 15 16:07:47 UTC 2014 - trenn@suse.de
- dracut-initrd-restore.patch: dracut-shutdown.service invokes
dracut-initramfs-restore script which will never work in
openSUSE because initrd images are named initrd not initramfs.
Patch is from: Cristian Rodríguez <crrodriguez@opensuse.org>
* Add 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch
-------------------------------------------------------------------
Wed Oct 8 17:29:35 UTC 2014 - spargaonkar@suse.com

2
dracut.spec
View File

@ -184,6 +184,7 @@ Patch160: 0160-nfs-Add-ip-.-and-root-nfs.-parameters-to-internal-dr.patch
Patch161: 0161-Fix-error-message-when-there-are-no-internal-kernel-.patch
Patch162: 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch
Patch163: 0163-Install-etc-sysconfig-console-to-see-specific-fonts.patch
Patch164: 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch
BuildRequires: asciidoc
BuildRequires: bash
@ -390,6 +391,7 @@ and its cryptography during startup.
%patch161 -p1
%patch162 -p1
%patch163 -p1
%patch164 -p1
%build
%configure\