pool/dracut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
dracut/0011-Correct-paths-for-openSUSE.patch

45 lines
1.6 KiB
Diff
Raw Normal View History

Accepting request 236229 from home:hreinecke:branches:Base:System - Rediff patches to match git repository - 95fcoe: Check for FCoE devices prior to binaries * Modify 0055-95fcoe-Only-install-fcoe-module-if-required.patch - 99base: Install chown instead of chgrp * Modify 0052-99base-Add-chown-binary.patch - 95iscsi: do not try to detect iSCSI firmware during booting; should be handled via commandline parameter * Modify 0030-95iscsi-Autodetect-iSCSI-firmware.patch - Rename patch: * old: 0051-mkinitrd-suse-add-update-booloader-message.patch new: 0051-mkinitrd-suse-add-update-bootloader-message.patch OBS-URL: https://build.opensuse.org/request/show/236229 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=157
2014-06-07 05:11:38 +00:00
From 3c3453e92ae055674bd3260a23c98d64a1f2467d Mon Sep 17 00:00:00 2001
Accepting request 208892 from home:hreinecke:branches:Base:System - Update with patches from git repository: * kernel-modules: add ohci-pci to the list of forced module installs * Run 'xz' and 'lzma' with multiple threads * systemd: do not exit the initqueue, if systemd asks a password * iscsi,nbd: do not fail in hostonly mode * dracut-functions.sh: Avoid loading unnecessary 32-bit libraries for 64-bit initrds * fips: also install /etc/system-fips in the initramfs * dracut.modules.7.asc: removed empty section * dracut.sh: fixed PATH shortener * dracut.spec: move /sbin/dracut to /usr/sbin/dracut * iscsi/nbd: do not try to mount the whole disk, if root= is missing * fips: include crct10dif_generic * Handle crypto modules with and without modaliases * usrmount/module-setup.sh: fixed typo * lvm: always install thin utils for lvm * kernel-modules(ARM): add mmc_block usb_storage to static list of kernel mods * dracut-functions.sh:check_block_and_slaves*() skip LVM internal devs * mkdir basic dirs in /run * network/fcoe: only redirect output to loginit.pipe, if exists * dracut.sh: no need to make subdirs in run * dracut.sh: also mkdir /run/lock, which is copied to * lvm: fix thin recognition * Add lzo, lz4 compression and read INITRD_COMPRESS * remove resume-genrules.sh * resume: fix swap detection in hostonly * base/init.sh: also mkdir /run/lock * dmsquash-live: add /dev/mapper/live-base * Doc: cleanup, extend and split and reuse OBS-URL: https://build.opensuse.org/request/show/208892 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=82
2013-11-29 12:27:47 +00:00
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/98systemd/rescue.service | 2 +-
Accepting request 236229 from home:hreinecke:branches:Base:System - Rediff patches to match git repository - 95fcoe: Check for FCoE devices prior to binaries * Modify 0055-95fcoe-Only-install-fcoe-module-if-required.patch - 99base: Install chown instead of chgrp * Modify 0052-99base-Add-chown-binary.patch - 95iscsi: do not try to detect iSCSI firmware during booting; should be handled via commandline parameter * Modify 0030-95iscsi-Autodetect-iSCSI-firmware.patch - Rename patch: * old: 0051-mkinitrd-suse-add-update-booloader-message.patch new: 0051-mkinitrd-suse-add-update-bootloader-message.patch OBS-URL: https://build.opensuse.org/request/show/236229 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=157
2014-06-07 05:11:38 +00:00
2 files changed, 2 insertions(+), 2 deletions(-)
Accepting request 208892 from home:hreinecke:branches:Base:System - Update with patches from git repository: * kernel-modules: add ohci-pci to the list of forced module installs * Run 'xz' and 'lzma' with multiple threads * systemd: do not exit the initqueue, if systemd asks a password * iscsi,nbd: do not fail in hostonly mode * dracut-functions.sh: Avoid loading unnecessary 32-bit libraries for 64-bit initrds * fips: also install /etc/system-fips in the initramfs * dracut.modules.7.asc: removed empty section * dracut.sh: fixed PATH shortener * dracut.spec: move /sbin/dracut to /usr/sbin/dracut * iscsi/nbd: do not try to mount the whole disk, if root= is missing * fips: include crct10dif_generic * Handle crypto modules with and without modaliases * usrmount/module-setup.sh: fixed typo * lvm: always install thin utils for lvm * kernel-modules(ARM): add mmc_block usb_storage to static list of kernel mods * dracut-functions.sh:check_block_and_slaves*() skip LVM internal devs * mkdir basic dirs in /run * network/fcoe: only redirect output to loginit.pipe, if exists * dracut.sh: no need to make subdirs in run * dracut.sh: also mkdir /run/lock, which is copied to * lvm: fix thin recognition * Add lzo, lz4 compression and read INITRD_COMPRESS * remove resume-genrules.sh * resume: fix swap detection in hostonly * base/init.sh: also mkdir /run/lock * dmsquash-live: add /dev/mapper/live-base * Doc: cleanup, extend and split and reuse OBS-URL: https://build.opensuse.org/request/show/208892 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=82
2013-11-29 12:27:47 +00:00
Accepting request 236229 from home:hreinecke:branches:Base:System - Rediff patches to match git repository - 95fcoe: Check for FCoE devices prior to binaries * Modify 0055-95fcoe-Only-install-fcoe-module-if-required.patch - 99base: Install chown instead of chgrp * Modify 0052-99base-Add-chown-binary.patch - 95iscsi: do not try to detect iSCSI firmware during booting; should be handled via commandline parameter * Modify 0030-95iscsi-Autodetect-iSCSI-firmware.patch - Rename patch: * old: 0051-mkinitrd-suse-add-update-booloader-message.patch new: 0051-mkinitrd-suse-add-update-bootloader-message.patch OBS-URL: https://build.opensuse.org/request/show/236229 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=157
2014-06-07 05:11:38 +00:00
diff --git a/dracut.sh b/dracut.sh
index c4163bc..adf26ad 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -774,7 +774,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
Accepting request 208892 from home:hreinecke:branches:Base:System - Update with patches from git repository: * kernel-modules: add ohci-pci to the list of forced module installs * Run 'xz' and 'lzma' with multiple threads * systemd: do not exit the initqueue, if systemd asks a password * iscsi,nbd: do not fail in hostonly mode * dracut-functions.sh: Avoid loading unnecessary 32-bit libraries for 64-bit initrds * fips: also install /etc/system-fips in the initramfs * dracut.modules.7.asc: removed empty section * dracut.sh: fixed PATH shortener * dracut.spec: move /sbin/dracut to /usr/sbin/dracut * iscsi/nbd: do not try to mount the whole disk, if root= is missing * fips: include crct10dif_generic * Handle crypto modules with and without modaliases * usrmount/module-setup.sh: fixed typo * lvm: always install thin utils for lvm * kernel-modules(ARM): add mmc_block usb_storage to static list of kernel mods * dracut-functions.sh:check_block_and_slaves*() skip LVM internal devs * mkdir basic dirs in /run * network/fcoe: only redirect output to loginit.pipe, if exists * dracut.sh: no need to make subdirs in run * dracut.sh: also mkdir /run/lock, which is copied to * lvm: fix thin recognition * Add lzo, lz4 compression and read INITRD_COMPRESS * remove resume-genrules.sh * resume: fix swap detection in hostonly * base/init.sh: also mkdir /run/lock * dmsquash-live: add /dev/mapper/live-base * Doc: cleanup, extend and split and reuse OBS-URL: https://build.opensuse.org/request/show/208892 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=82
2013-11-29 12:27:47 +00:00
[[ $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
Accepting request 236229 from home:hreinecke:branches:Base:System - Rediff patches to match git repository - 95fcoe: Check for FCoE devices prior to binaries * Modify 0055-95fcoe-Only-install-fcoe-module-if-required.patch - 99base: Install chown instead of chgrp * Modify 0052-99base-Add-chown-binary.patch - 95iscsi: do not try to detect iSCSI firmware during booting; should be handled via commandline parameter * Modify 0030-95iscsi-Autodetect-iSCSI-firmware.patch - Rename patch: * old: 0051-mkinitrd-suse-add-update-booloader-message.patch new: 0051-mkinitrd-suse-add-update-bootloader-message.patch OBS-URL: https://build.opensuse.org/request/show/236229 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=157
2014-06-07 05:11:38 +00:00
diff --git a/modules.d/98systemd/rescue.service b/modules.d/98systemd/rescue.service
index edc2461..d80900f 100644
--- a/modules.d/98systemd/rescue.service
+++ b/modules.d/98systemd/rescue.service
Accepting request 208892 from home:hreinecke:branches:Base:System - Update with patches from git repository: * kernel-modules: add ohci-pci to the list of forced module installs * Run 'xz' and 'lzma' with multiple threads * systemd: do not exit the initqueue, if systemd asks a password * iscsi,nbd: do not fail in hostonly mode * dracut-functions.sh: Avoid loading unnecessary 32-bit libraries for 64-bit initrds * fips: also install /etc/system-fips in the initramfs * dracut.modules.7.asc: removed empty section * dracut.sh: fixed PATH shortener * dracut.spec: move /sbin/dracut to /usr/sbin/dracut * iscsi/nbd: do not try to mount the whole disk, if root= is missing * fips: include crct10dif_generic * Handle crypto modules with and without modaliases * usrmount/module-setup.sh: fixed typo * lvm: always install thin utils for lvm * kernel-modules(ARM): add mmc_block usb_storage to static list of kernel mods * dracut-functions.sh:check_block_and_slaves*() skip LVM internal devs * mkdir basic dirs in /run * network/fcoe: only redirect output to loginit.pipe, if exists * dracut.sh: no need to make subdirs in run * dracut.sh: also mkdir /run/lock, which is copied to * lvm: fix thin recognition * Add lzo, lz4 compression and read INITRD_COMPRESS * remove resume-genrules.sh * resume: fix swap detection in hostonly * base/init.sh: also mkdir /run/lock * dmsquash-live: add /dev/mapper/live-base * Doc: cleanup, extend and split and reuse OBS-URL: https://build.opensuse.org/request/show/208892 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=82
2013-11-29 12:27:47 +00:00
@@ -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
Accepting request 236229 from home:hreinecke:branches:Base:System - Rediff patches to match git repository - 95fcoe: Check for FCoE devices prior to binaries * Modify 0055-95fcoe-Only-install-fcoe-module-if-required.patch - 99base: Install chown instead of chgrp * Modify 0052-99base-Add-chown-binary.patch - 95iscsi: do not try to detect iSCSI firmware during booting; should be handled via commandline parameter * Modify 0030-95iscsi-Autodetect-iSCSI-firmware.patch - Rename patch: * old: 0051-mkinitrd-suse-add-update-booloader-message.patch new: 0051-mkinitrd-suse-add-update-bootloader-message.patch OBS-URL: https://build.opensuse.org/request/show/236229 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=157
2014-06-07 05:11:38 +00:00
--
1.8.4.5
Reference in New Issue Copy Permalink