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

Accepting request 256766 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/256766
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=63
This commit is contained in:
Stephan Kulow 2014-10-18 07:08:19 +00:00 committed by Git OBS Bridge
commit 8f639b23f3
4 changed files with 54 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-installkernel
View File

@ -71,6 +71,15 @@ cp -fp $BOOTIMAGE $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION
cp -fp $MAPFILE $INSTALL_PATH/System.map-$KERNEL_VERSION
cp -fp .config $INSTALL_PATH/$CONFIGFILE
# If the kernel has module support, recreate modules.dep using depmod
# since the contents of modules.dep do not have a consistent format across
# releases.
if [ -x /sbin/depmod -a -d /lib/modules/$KERNEL_VERSION ]; then
/sbin/depmod $KERNEL_VERSION;
fi
CONFIG=$(dirname $MAPFILE)/.config
CHECK_SUPPORTED=
if [ -e "$CONFIG" ]; then

15
dracut.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
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
- Overwrite/generate modules.dep file using depmod since the file
modules.dep is not portable across releases (bsc#874621).
-------------------------------------------------------------------
Thu Oct 2 14:33:20 UTC 2014 - trenn@suse.de

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\