Accepting request 288168 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/288168
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=69
This commit is contained in:
Dominique Leuenberger 2015-03-01 13:49:50 +00:00 committed by Git OBS Bridge
commit 47f15ae29e
5 changed files with 85 additions and 0 deletions

View File

@ -0,0 +1,16 @@
Index: dracut-037/modules.d/50plymouth/plymouth-populate-initrd.sh
===================================================================
--- dracut-037.orig/modules.d/50plymouth/plymouth-populate-initrd.sh
+++ dracut-037/modules.d/50plymouth/plymouth-populate-initrd.sh
@@ -1,11 +1,9 @@
#!/bin/bash
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
PLYMOUTH_THEME=$(plymouth-set-default-theme)
inst_multiple plymouthd plymouth \
- "${PLYMOUTH_LOGO_FILE}" \
/etc/system-release
mkdir -m 0755 -p "${initdir}/usr/share/plymouth"

View File

@ -0,0 +1,26 @@
commit 027565d0233f76edf434b63a847a717185d267e2
Author: Harald Hoyer <harald@redhat.com>
Date: Thu Nov 6 10:44:33 2014 +0100
systemd: add 90-vconsole.rules
run systemd-vconsole-setup if fbcon device shows up
Index: dracut-037/modules.d/98systemd/module-setup.sh
===================================================================
--- dracut-037.orig/modules.d/98systemd/module-setup.sh
+++ dracut-037/modules.d/98systemd/module-setup.sh
@@ -199,7 +199,12 @@ install() {
inst_binary true
ln_r $(type -P true) "/usr/bin/loginctl"
ln_r $(type -P true) "/bin/loginctl"
- inst_rules 70-uaccess.rules 71-seat.rules 73-seat-late.rules 99-systemd.rules
+ inst_rules \
+ 70-uaccess.rules \
+ 71-seat.rules \
+ 73-seat-late.rules \
+ 90-vconsole.rules \
+ 99-systemd.rules
for i in \
emergency.target \

View File

@ -0,0 +1,13 @@
Index: dracut-037/modules.d/90kernel-modules/module-setup.sh
===================================================================
--- dracut-037.orig/modules.d/90kernel-modules/module-setup.sh
+++ dracut-037/modules.d/90kernel-modules/module-setup.sh
@@ -45,7 +45,7 @@ installkernel() {
instmods yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \
atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \
- hid-logitech-dj hid-microsoft firewire-ohci \
+ hid-logitech-dj hid-logitech-hidpp hid-microsoft firewire-ohci \
pcmcia usb_storage nvme hid-hyperv hv-vmbus \
sdhci_acpi

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Fri Feb 27 18:37:56 UTC 2015 - sfalken@opensuse.org
- Add patch to load logitech-hidpp module in default initrd, fixes
issues with not being able to enter LUKS password with logitech
wireless keyboards (boo#918938)
+ Added: 0170-enable-logitech-hidpp.patch
-------------------------------------------------------------------
Mon Feb 23 16:13:16 UTC 2015 - meissner@suse.com
- dracut-fix-systemd-vconsole.patch: patch from upstream to start
the vconsole for new systemd.
+ Added 0169-fix-systemd-vconsole.patch
-------------------------------------------------------------------
Tue Feb 17 16:23:04 UTC 2015 - sfalken@opensuse.org
- Add patch to remove PLYMOUTH_LOGO_FILE from
modules.d/50plymouth/plymouth-populate-initrd.sh (bnc#910952)
+ 0168-remove_plymouth_logo_file.patch
-------------------------------------------------------------------
Mon Feb 9 14:28:56 UTC 2015 - dimstar@opensuse.org

View File

@ -189,6 +189,11 @@ Patch164: 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch
Patch165: 0165-Order-root-fsck-after-pre-mount.patch
Patch166: 0166-load-xhci-pci.patch
Patch167: 0167-do-not-symlink-var-log-to-run-log.patch
# PATCH-FIX-OPENSUSE sfalken@opensuse.com -- remove PLYMOUTH_LOGO_FILE from modules.d/50plymouth/plymouth-populate-initrd.sh (bnc#910952)
Patch168: 0168-remove_plymouth_logo_file.patch
Patch169: 0169-fix-systemd-vconsole.patch
# PATCH-FIX-UPSTREAM sfalken@opensuse.com -- Add logitech-hidpp module to default initrd, fixes (boo#918938)
Patch170: 0170-enable-logitech-hidpp.patch
BuildRequires: asciidoc
BuildRequires: bash
@ -401,6 +406,9 @@ and its cryptography during startup.
%patch165 -p1
%patch166 -p1
%patch167 -p1
%patch168 -p1
%patch169 -p1
%patch170 -p1
%build
%configure\