6f6689329c
Add: dracut_do_not_update_booloader_if_no_kernel_is_found.patch Adding: Requires: systemd-sysvinit which has reboot, halt and other binaries dracut likes to add to the initrd. Cleanup and adjust to latest mainline: Dropping as these are included in the latest update_git_v034_to_head patch: Drop: 0001-95dasd-Install-kernel-modules-only-once.patch Drop: 0002-95dasd-Only-install-module-if-normalize_dasd_arg-is-.patch Drop: 0003-95dasd_mod-make-dasd_cio_free-optional.patch Drop: 0004-95zfcp-Make-installation-optional.patch Drop: 0005-95znet-Make-installation-optional.patch Drop: 0007-Fixup-keymap-setting-for-openSUSE.patch Drop: 0008-Add-DASD-configuration-for-SuSE.patch Drop: 0009-Add-zfcp-scripts-for-SUSE.patch Drop: 0010-Make-logfile-configurable.patch Drop: 0011-mkinitrd-suse-Add-SUSE-compability-wrapper-for-dracu.patch Drop: 0012-mkinitrd-suse.8.asc-Add-manpage-for-SUSE-compat-mkin.patch Drop: 0015-Fixup-script-permissions.patch Drop: 0016-Remove-shebang-from-shell-completion-files.patch Drop: dracut-git-update.patch Rebase: 0013-Correct-paths-for-openSUSE.patch This is a rename of dracut-git-update.patch to: Add: dracut_git_v034_to_head.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=87
56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
From 16b73ffc6f9c67800811f39641c484123d2a159a Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 28 Nov 2013 10:07:59 +0100
|
|
Subject: [PATCH] Correct paths for openSUSE
|
|
|
|
openSUSE has things stored in different places, so fixup the
|
|
paths here.
|
|
|
|
Signed-off-by: Christian Rodrigues <crrodriguez@opensuse.org>
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
dracut.sh | 2 +-
|
|
modules.d/10i18n/module-setup.sh | 2 ++
|
|
modules.d/98systemd/rescue.service | 2 +-
|
|
3 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
Index: dracut-034/dracut.sh
|
|
===================================================================
|
|
--- dracut-034.orig/dracut.sh
|
|
+++ dracut-034/dracut.sh
|
|
@@ -683,7 +683,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l
|
|
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
|
|
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
|
|
[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
|
-[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
|
|
+[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware /lib/firmware/$kernel"
|
|
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
|
|
[[ $tmpdir ]] || tmpdir=/var/tmp
|
|
[[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
|
|
Index: dracut-034/modules.d/10i18n/module-setup.sh
|
|
===================================================================
|
|
--- dracut-034.orig/modules.d/10i18n/module-setup.sh
|
|
+++ dracut-034/modules.d/10i18n/module-setup.sh
|
|
@@ -98,6 +98,8 @@ install() {
|
|
|
|
install_base() {
|
|
inst_multiple setfont loadkeys kbd_mode stty
|
|
+ inst /usr/bin/setfont /bin/setfont
|
|
+ inst /usr/bin/loadkeys /bin/loadkeys
|
|
|
|
if ! dracut_module_included "systemd"; then
|
|
inst ${moddir}/console_init.sh /lib/udev/console_init
|
|
Index: dracut-034/modules.d/98systemd/rescue.service
|
|
===================================================================
|
|
--- dracut-034.orig/modules.d/98systemd/rescue.service
|
|
+++ dracut-034/modules.d/98systemd/rescue.service
|
|
@@ -16,7 +16,7 @@ Environment=HOME=/
|
|
Environment=DRACUT_SYSTEMD=1
|
|
Environment=NEWROOT=/sysroot
|
|
WorkingDirectory=/
|
|
-ExecStartPre=-/bin/plymouth quit
|
|
+ExecStartPre=-/usr/bin/plymouth quit
|
|
ExecStart=-/bin/sh -i -l
|
|
ExecStopPost=-/bin/rm -f -- /.console_lock
|
|
ExecStopPost=-/usr/bin/systemctl --fail --no-block default
|