diff --git a/SOURCES/0001-dracut.sh-harden-host_modalias-reading.patch b/SOURCES/0001-dracut.sh-harden-host_modalias-reading.patch index a695138..228a062 100644 --- a/SOURCES/0001-dracut.sh-harden-host_modalias-reading.patch +++ b/SOURCES/0001-dracut.sh-harden-host_modalias-reading.patch @@ -1,4 +1,4 @@ -From 57f90974f9d7c11e06c2b3f2b7e4b47801f380cc Mon Sep 17 00:00:00 2001 +From ffecc452321bbef2c0e1efca09c2077775448141 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 13 Sep 2013 16:33:01 +0200 Subject: [PATCH] dracut.sh: harden host_modalias reading diff --git a/SOURCES/0002-ifup-do-not-dhcp-on-network-interface-of-secondary-s.patch b/SOURCES/0002-ifup-do-not-dhcp-on-network-interface-of-secondary-s.patch index 0a2a216..961e833 100644 --- a/SOURCES/0002-ifup-do-not-dhcp-on-network-interface-of-secondary-s.patch +++ b/SOURCES/0002-ifup-do-not-dhcp-on-network-interface-of-secondary-s.patch @@ -1,4 +1,4 @@ -From 63f3bcd85245901515f4f45238301e030468cdc5 Mon Sep 17 00:00:00 2001 +From da63c0de561ce9ed158cc2438a1cc5fbb38c3758 Mon Sep 17 00:00:00 2001 From: WANG Chao Date: Fri, 13 Sep 2013 22:28:44 +0800 Subject: [PATCH] ifup: do not dhcp on network interface of secondary stack diff --git a/SOURCES/0003-dracut.sh-also-search-uevent-s-for-MODALIAS.patch b/SOURCES/0003-dracut.sh-also-search-uevent-s-for-MODALIAS.patch index 364d08d..92b1a9d 100644 --- a/SOURCES/0003-dracut.sh-also-search-uevent-s-for-MODALIAS.patch +++ b/SOURCES/0003-dracut.sh-also-search-uevent-s-for-MODALIAS.patch @@ -1,4 +1,4 @@ -From fc68c87afa4fbe4c40abe4326df8cc7cfc9ac23d Mon Sep 17 00:00:00 2001 +From af34b260474c551a45a6fa4ae8719622f1e35910 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 13 Sep 2013 17:34:18 +0200 Subject: [PATCH] dracut.sh: also search uevent's for MODALIAS diff --git a/SOURCES/0004-dracut.sh-we-don-t-need-to-read-the-modalias-files.patch b/SOURCES/0004-dracut.sh-we-don-t-need-to-read-the-modalias-files.patch index 14dae30..d0dd111 100644 --- a/SOURCES/0004-dracut.sh-we-don-t-need-to-read-the-modalias-files.patch +++ b/SOURCES/0004-dracut.sh-we-don-t-need-to-read-the-modalias-files.patch @@ -1,4 +1,4 @@ -From 3b9aaaab429903ace447fa9ab585592c3343c6f0 Mon Sep 17 00:00:00 2001 +From 72ce014bc79933379cb864cef665114ac5d4ccfa Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 13 Sep 2013 17:51:29 +0200 Subject: [PATCH] dracut.sh: we don't need to read the modalias files diff --git a/SOURCES/0005-Add-option-to-turn-on-off-prelinking.patch b/SOURCES/0005-Add-option-to-turn-on-off-prelinking.patch index f9d5136..3b86f32 100644 --- a/SOURCES/0005-Add-option-to-turn-on-off-prelinking.patch +++ b/SOURCES/0005-Add-option-to-turn-on-off-prelinking.patch @@ -1,4 +1,4 @@ -From f4a942783afae314afda3b0adcd33fc3ab2cd12c Mon Sep 17 00:00:00 2001 +From 96f48da50cdc049c635cca8466b38084a3de0f48 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 17 Sep 2013 12:23:20 -0500 Subject: [PATCH] Add option to turn on/off prelinking diff --git a/SOURCES/0006-add-etc-system-fips-for-dracut-fips-subpackage.patch b/SOURCES/0006-add-etc-system-fips-for-dracut-fips-subpackage.patch index f920d98..3ca5723 100644 --- a/SOURCES/0006-add-etc-system-fips-for-dracut-fips-subpackage.patch +++ b/SOURCES/0006-add-etc-system-fips-for-dracut-fips-subpackage.patch @@ -1,4 +1,4 @@ -From 78d5cf7cb4e10d9e08ba5e89fe130fe5d7714b95 Mon Sep 17 00:00:00 2001 +From 764b5209942dc435c7c611b0008975aa13738374 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 2 Oct 2013 12:36:25 +0200 Subject: [PATCH] add /etc/system-fips for dracut-fips subpackage diff --git a/SOURCES/0007-dracut-Generlize-microcode-early-cpio-usage.patch b/SOURCES/0007-dracut-Generlize-microcode-early-cpio-usage.patch index 6cf870d..622301a 100644 --- a/SOURCES/0007-dracut-Generlize-microcode-early-cpio-usage.patch +++ b/SOURCES/0007-dracut-Generlize-microcode-early-cpio-usage.patch @@ -1,4 +1,4 @@ -From b5b608e44ade93bee54d274f5edc6aad6dc45288 Mon Sep 17 00:00:00 2001 +From 4b1aa19fa0fad0e607961995dbbe971be2ef9f81 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Fri, 27 Sep 2013 20:10:37 +0200 Subject: [PATCH] dracut: Generlize microcode early cpio usage diff --git a/SOURCES/0008-dracut-Do-not-create-early_cpio-if-no-suitable-micro.patch b/SOURCES/0008-dracut-Do-not-create-early_cpio-if-no-suitable-micro.patch index e391ba7..5033f73 100644 --- a/SOURCES/0008-dracut-Do-not-create-early_cpio-if-no-suitable-micro.patch +++ b/SOURCES/0008-dracut-Do-not-create-early_cpio-if-no-suitable-micro.patch @@ -1,4 +1,4 @@ -From d8b04dc1840047a7533d19f577f30f19d42e2d33 Mon Sep 17 00:00:00 2001 +From ff33b576767d5e020c9f2685a0f5b0acb35a781c Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Fri, 27 Sep 2013 20:10:38 +0200 Subject: [PATCH] dracut: Do not create early_cpio if no suitable microcode diff --git a/SOURCES/0009-dracut-Implement-ACPI-table-overriding.patch b/SOURCES/0009-dracut-Implement-ACPI-table-overriding.patch index 6636287..786df6d 100644 --- a/SOURCES/0009-dracut-Implement-ACPI-table-overriding.patch +++ b/SOURCES/0009-dracut-Implement-ACPI-table-overriding.patch @@ -1,4 +1,4 @@ -From f3b14c2b6a852d21fc6fa1fd86959a3818624a36 Mon Sep 17 00:00:00 2001 +From ebc7f823c0013dfe7fcefe82db48bf4832f5dcec Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Fri, 27 Sep 2013 20:10:39 +0200 Subject: [PATCH] dracut: Implement ACPI table overriding diff --git a/SOURCES/0010-dracut.conf.5.asc-Add-ACPI-table-override-and-uncomp.patch b/SOURCES/0010-dracut.conf.5.asc-Add-ACPI-table-override-and-uncomp.patch index dd46f37..1020676 100644 --- a/SOURCES/0010-dracut.conf.5.asc-Add-ACPI-table-override-and-uncomp.patch +++ b/SOURCES/0010-dracut.conf.5.asc-Add-ACPI-table-override-and-uncomp.patch @@ -1,4 +1,4 @@ -From 4e93c3f7079305114779a4bf2adefdbd429a9701 Mon Sep 17 00:00:00 2001 +From 54011e3591216503dd93d1028ff209a6a4851a57 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Fri, 27 Sep 2013 20:10:40 +0200 Subject: [PATCH] dracut.conf.5.asc: Add ACPI table override and uncompressed diff --git a/SOURCES/0011-dracut-bash-completion.sh-add-prelink-noprelink.patch b/SOURCES/0011-dracut-bash-completion.sh-add-prelink-noprelink.patch index cb26fe9..3cfa91f 100644 --- a/SOURCES/0011-dracut-bash-completion.sh-add-prelink-noprelink.patch +++ b/SOURCES/0011-dracut-bash-completion.sh-add-prelink-noprelink.patch @@ -1,4 +1,4 @@ -From b19bdcbea7dd2f95fefb7ceea6d6252091c6e9b8 Mon Sep 17 00:00:00 2001 +From eaa4d30d5abd753bd08322e4b7e5ebd8a52dd75a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 2 Oct 2013 12:47:34 +0200 Subject: [PATCH] dracut-bash-completion.sh: add --prelink --noprelink diff --git a/SOURCES/0012-dracut.sh-bail-out-early-if-destination-dir-is-not-w.patch b/SOURCES/0012-dracut.sh-bail-out-early-if-destination-dir-is-not-w.patch index fc94468..45e80ad 100644 --- a/SOURCES/0012-dracut.sh-bail-out-early-if-destination-dir-is-not-w.patch +++ b/SOURCES/0012-dracut.sh-bail-out-early-if-destination-dir-is-not-w.patch @@ -1,4 +1,4 @@ -From 96cf7270da8f99e3972b18677e7f392a35d6ddd9 Mon Sep 17 00:00:00 2001 +From cf9f56be9c0ab44e5ae5d5abde01151b33206fc2 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 2 Oct 2013 12:48:11 +0200 Subject: [PATCH] dracut.sh: bail out early, if destination dir is not diff --git a/SOURCES/0013-dracut-logger.sh-do-not-log-to-syslog-kmsg-journal-f.patch b/SOURCES/0013-dracut-logger.sh-do-not-log-to-syslog-kmsg-journal-f.patch index 9db820f..29d670c 100644 --- a/SOURCES/0013-dracut-logger.sh-do-not-log-to-syslog-kmsg-journal-f.patch +++ b/SOURCES/0013-dracut-logger.sh-do-not-log-to-syslog-kmsg-journal-f.patch @@ -1,4 +1,4 @@ -From 283d385fbd7a715e75be4a6b94f82f4692f7024b Mon Sep 17 00:00:00 2001 +From d87da4c7776d0e16b8ce6c3a583d21209c3db144 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 2 Oct 2013 12:48:57 +0200 Subject: [PATCH] dracut-logger.sh: do not log to syslog/kmsg/journal for UID diff --git a/SOURCES/0014-lvm-mdraid-Fix-LVM-on-MD-activation.patch b/SOURCES/0014-lvm-mdraid-Fix-LVM-on-MD-activation.patch index 2c015cd..06497b1 100644 --- a/SOURCES/0014-lvm-mdraid-Fix-LVM-on-MD-activation.patch +++ b/SOURCES/0014-lvm-mdraid-Fix-LVM-on-MD-activation.patch @@ -1,4 +1,4 @@ -From f7289bcdab744f67b8c858bdf61cf08226e5b148 Mon Sep 17 00:00:00 2001 +From 32b970339f5439300fe6155352ec1f17c5e48d78 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Fri, 4 Oct 2013 10:41:24 +0200 Subject: [PATCH] lvm/mdraid: Fix LVM on MD activation diff --git a/SOURCES/0015-bcache-optionally-install-the-tools-and-rules.patch b/SOURCES/0015-bcache-optionally-install-the-tools-and-rules.patch index 68fe47b..948bb0b 100644 --- a/SOURCES/0015-bcache-optionally-install-the-tools-and-rules.patch +++ b/SOURCES/0015-bcache-optionally-install-the-tools-and-rules.patch @@ -1,4 +1,4 @@ -From 1fab351da0368e3da0ee0e883d58b4f53455af1e Mon Sep 17 00:00:00 2001 +From a5659901e87ef70b3cf8ea8b254e3d0f9fa88d96 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 9 Oct 2013 09:50:15 +0200 Subject: [PATCH] bcache: optionally install the tools and rules diff --git a/SOURCES/0016-dracut-functions.sh-inst_rules-do-not-install-rules-.patch b/SOURCES/0016-dracut-functions.sh-inst_rules-do-not-install-rules-.patch index a140e40..813334c 100644 --- a/SOURCES/0016-dracut-functions.sh-inst_rules-do-not-install-rules-.patch +++ b/SOURCES/0016-dracut-functions.sh-inst_rules-do-not-install-rules-.patch @@ -1,4 +1,4 @@ -From 400921d48bf71add0387a6f3ebdec83f32843f1d Mon Sep 17 00:00:00 2001 +From 31b89c8c2bfb5a0336268cc66bd663429122feb3 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 4 Oct 2013 13:32:15 +0200 Subject: [PATCH] dracut-functions.sh:inst_rules() do not install rules in CWD diff --git a/SOURCES/0017-mdraid-module-setup.sh-install-configs-from-etc-mdad.patch b/SOURCES/0017-mdraid-module-setup.sh-install-configs-from-etc-mdad.patch index ad63414..f9ce093 100644 --- a/SOURCES/0017-mdraid-module-setup.sh-install-configs-from-etc-mdad.patch +++ b/SOURCES/0017-mdraid-module-setup.sh-install-configs-from-etc-mdad.patch @@ -1,4 +1,4 @@ -From 07708515828f8f8cf0e64c90af46ef5dbf2854f6 Mon Sep 17 00:00:00 2001 +From fdaa69db2061cc83845f631e6e3216e55b2eb235 Mon Sep 17 00:00:00 2001 From: Alexander Tsoy Date: Thu, 3 Oct 2013 14:54:42 +0400 Subject: [PATCH] mdraid/module-setup.sh: install configs from diff --git a/SOURCES/0018-mdraid-module-setup.sh-fixes-for-mdadm-3.2.6.patch b/SOURCES/0018-mdraid-module-setup.sh-fixes-for-mdadm-3.2.6.patch index 06b41d6..160aae5 100644 --- a/SOURCES/0018-mdraid-module-setup.sh-fixes-for-mdadm-3.2.6.patch +++ b/SOURCES/0018-mdraid-module-setup.sh-fixes-for-mdadm-3.2.6.patch @@ -1,4 +1,4 @@ -From 9347898404ad1f8f0c11be9c5f13255a04d5e275 Mon Sep 17 00:00:00 2001 +From 4fde4d06474cdf321958592edf3f856446927d29 Mon Sep 17 00:00:00 2001 From: Alexander Tsoy Date: Sun, 29 Sep 2013 01:31:01 +0400 Subject: [PATCH] mdraid/module-setup.sh: fixes for mdadm-3.2.6+ diff --git a/SOURCES/0019-fcoe-add-FCoE-UEFI-boot-device-support.patch b/SOURCES/0019-fcoe-add-FCoE-UEFI-boot-device-support.patch index 86bec54..9e5f118 100644 --- a/SOURCES/0019-fcoe-add-FCoE-UEFI-boot-device-support.patch +++ b/SOURCES/0019-fcoe-add-FCoE-UEFI-boot-device-support.patch @@ -1,4 +1,4 @@ -From cda71132a633b0c49733939179fcbeb7b5de1305 Mon Sep 17 00:00:00 2001 +From 1b827040f8b3e1e4fec19de76526fe0620654502 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 7 Oct 2013 14:24:36 +0200 Subject: [PATCH] fcoe: add FCoE UEFI boot device support diff --git a/SOURCES/0020-rootfs-block-add-support-for-the-rootfallback-kernel.patch b/SOURCES/0020-rootfs-block-add-support-for-the-rootfallback-kernel.patch index acf681e..9cb2a9c 100644 --- a/SOURCES/0020-rootfs-block-add-support-for-the-rootfallback-kernel.patch +++ b/SOURCES/0020-rootfs-block-add-support-for-the-rootfallback-kernel.patch @@ -1,4 +1,4 @@ -From 85c8246d7ba0adbff98478b1f3f9ba1bea0937dc Mon Sep 17 00:00:00 2001 +From 4584826e9a25fdddb876f07875423196d9fc8840 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 7 Oct 2013 15:06:22 +0200 Subject: [PATCH] rootfs-block: add support for the rootfallback= kernel diff --git a/SOURCES/0021-btrfs-use-inst_hook-to-install-the-timeout-hook.patch b/SOURCES/0021-btrfs-use-inst_hook-to-install-the-timeout-hook.patch index 213b395..62473d8 100644 --- a/SOURCES/0021-btrfs-use-inst_hook-to-install-the-timeout-hook.patch +++ b/SOURCES/0021-btrfs-use-inst_hook-to-install-the-timeout-hook.patch @@ -1,4 +1,4 @@ -From 9d9f81d6a5f452a18dd1c253cd8805d39be8af21 Mon Sep 17 00:00:00 2001 +From 6ea78f9f4eb405e6743e8be67836f9134d11e77b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 7 Oct 2013 15:06:50 +0200 Subject: [PATCH] btrfs: use inst_hook to install the timeout hook diff --git a/SOURCES/0022-lvm-install-thin-utils-for-non-hostonly.patch b/SOURCES/0022-lvm-install-thin-utils-for-non-hostonly.patch index 7232670..df0f97d 100644 --- a/SOURCES/0022-lvm-install-thin-utils-for-non-hostonly.patch +++ b/SOURCES/0022-lvm-install-thin-utils-for-non-hostonly.patch @@ -1,4 +1,4 @@ -From 06b83706baaaf1586d83b1534dd52fccfa012ce2 Mon Sep 17 00:00:00 2001 +From 52d3c1b7267b6930fe6a835b4000546c5f106d0e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 8 Oct 2013 10:30:00 +0200 Subject: [PATCH] lvm: install thin utils for non-hostonly diff --git a/SOURCES/0023-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch b/SOURCES/0023-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch index c177b38..d1baa17 100644 --- a/SOURCES/0023-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch +++ b/SOURCES/0023-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch @@ -1,4 +1,4 @@ -From 28cf10ecf3881d1c364f85d2a1ac1673c70df45c Mon Sep 17 00:00:00 2001 +From f0df0f3fcd0e79a697ec8bd45b9ce2e420f2820a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 8 Oct 2013 15:03:40 +0200 Subject: [PATCH] dracut.sh: do not bail out, if kernel modules dir is missing diff --git a/SOURCES/0024-dmsquash-live-add-dev-mapper-live-base.patch b/SOURCES/0024-dmsquash-live-add-dev-mapper-live-base.patch index 3cb4aeb..5a21944 100644 --- a/SOURCES/0024-dmsquash-live-add-dev-mapper-live-base.patch +++ b/SOURCES/0024-dmsquash-live-add-dev-mapper-live-base.patch @@ -1,4 +1,4 @@ -From bebff290a27c2f5ccba5fc52323b31d8f1e4ef02 Mon Sep 17 00:00:00 2001 +From 86fff83927ad194def97c60c2eef80099ebb1238 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Oct 2013 15:13:44 +0200 Subject: [PATCH] dmsquash-live: add /dev/mapper/live-base diff --git a/SOURCES/0025-Doc-cleanup-extend-and-split-and-reuse.patch b/SOURCES/0025-Doc-cleanup-extend-and-split-and-reuse.patch index 83e3852..c627001 100644 --- a/SOURCES/0025-Doc-cleanup-extend-and-split-and-reuse.patch +++ b/SOURCES/0025-Doc-cleanup-extend-and-split-and-reuse.patch @@ -1,4 +1,4 @@ -From 9a2da3c39f90134d33d9397c9dd4687a6113a65c Mon Sep 17 00:00:00 2001 +From 84fe197facb96947638c518639c0913ecad1599b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 8 Oct 2013 14:59:47 +0200 Subject: [PATCH] Doc: cleanup, extend and split and reuse diff --git a/SOURCES/0026-lvm-fix-thin-recognition.patch b/SOURCES/0026-lvm-fix-thin-recognition.patch index ac7d2f0..a94c3ed 100644 --- a/SOURCES/0026-lvm-fix-thin-recognition.patch +++ b/SOURCES/0026-lvm-fix-thin-recognition.patch @@ -1,4 +1,4 @@ -From 51ebae23d21bc1b030e98558ee46257e4f99297d Mon Sep 17 00:00:00 2001 +From 1a21ed8d1dbec162986fff9f30d5efc68107524e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 16 Oct 2013 11:30:08 +0200 Subject: [PATCH] lvm: fix thin recognition diff --git a/SOURCES/0027-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch b/SOURCES/0027-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch index 2ed0659..4e20fcb 100644 --- a/SOURCES/0027-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch +++ b/SOURCES/0027-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch @@ -1,4 +1,4 @@ -From 1b512344ee34e488a4995534ab96f30362725296 Mon Sep 17 00:00:00 2001 +From 8e3620568cd4e2c7e8db52fcf3f6e25cc4608aaf Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Fri, 18 Oct 2013 14:40:40 +0200 Subject: [PATCH] dracut-functions.sh:check_block_and_slaves*() skip LVM diff --git a/SOURCES/0028-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch b/SOURCES/0028-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch index 186c05e..2d321c0 100644 --- a/SOURCES/0028-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch +++ b/SOURCES/0028-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch @@ -1,4 +1,4 @@ -From 4d52f2493b600324638b6bc0e6ecfb3fb554e547 Mon Sep 17 00:00:00 2001 +From 123feea1fab225478046db43454b10453df95b51 Mon Sep 17 00:00:00 2001 From: P J P Date: Fri, 11 Oct 2013 19:26:51 +0530 Subject: [PATCH] Add lzo, lz4 compression and read INITRD_COMPRESS diff --git a/SOURCES/0029-git2spec.pl-remove-.git-date-from-release-string.patch b/SOURCES/0029-git2spec.pl-remove-.git-date-from-release-string.patch index 64c11e3..d15b018 100644 --- a/SOURCES/0029-git2spec.pl-remove-.git-date-from-release-string.patch +++ b/SOURCES/0029-git2spec.pl-remove-.git-date-from-release-string.patch @@ -1,4 +1,4 @@ -From 239a2e91fb97a5ac3c4efdcfc31810f13b26d051 Mon Sep 17 00:00:00 2001 +From 9bd3573ddba40e4ee7b01f4e906126dbdc494f28 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 18 Oct 2013 15:34:44 +0200 Subject: [PATCH] git2spec.pl: remove ".git$(date)" from release string diff --git a/SOURCES/0030-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch b/SOURCES/0030-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch index b660838..ccf5fdb 100644 --- a/SOURCES/0030-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch +++ b/SOURCES/0030-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch @@ -1,4 +1,4 @@ -From f88fc58d7c048fe4c2cf40018e365405b4dc0935 Mon Sep 17 00:00:00 2001 +From 88fc0b8750c827ecdeacd70893905db5d6c9b87d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 18 Oct 2013 14:56:51 +0200 Subject: [PATCH] kernel-modules(ARM): add mmc_block usb_storage to statis list diff --git a/SOURCES/0031-lvm-always-install-thin-utils-for-lvm.patch b/SOURCES/0031-lvm-always-install-thin-utils-for-lvm.patch index 008c3f6..6c5d77b 100644 --- a/SOURCES/0031-lvm-always-install-thin-utils-for-lvm.patch +++ b/SOURCES/0031-lvm-always-install-thin-utils-for-lvm.patch @@ -1,4 +1,4 @@ -From f9fc4330da71dfb43c64fb424a5fef2909e4f4c3 Mon Sep 17 00:00:00 2001 +From 37e899aad1a9623d4932d689b4082832fa3660d8 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 21 Oct 2013 09:09:26 +0200 Subject: [PATCH] lvm: always install thin utils for lvm diff --git a/SOURCES/0032-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch b/SOURCES/0032-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch index 8a6b511..9e549cb 100644 --- a/SOURCES/0032-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch +++ b/SOURCES/0032-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch @@ -1,4 +1,4 @@ -From acbc09a360a1e1a8197db1fbb93b83f9823a1de1 Mon Sep 17 00:00:00 2001 +From 8eee542b4014166ef52efc20ab499aed4fe231d3 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 21 Oct 2013 09:43:04 +0200 Subject: [PATCH] dracut.spec: move /sbin/dracut to /usr/sbin/dracut diff --git a/SOURCES/0033-usrmount-module-setup.sh-fixed-typo.patch b/SOURCES/0033-usrmount-module-setup.sh-fixed-typo.patch index 23adaa4..e5d4917 100644 --- a/SOURCES/0033-usrmount-module-setup.sh-fixed-typo.patch +++ b/SOURCES/0033-usrmount-module-setup.sh-fixed-typo.patch @@ -1,4 +1,4 @@ -From 68801ee740e40257bdb4782657199428d29196d0 Mon Sep 17 00:00:00 2001 +From 352a49a21d5093955e45c0ccb84c258d4b375aad Mon Sep 17 00:00:00 2001 From: Alexander Tsoy Date: Fri, 25 Oct 2013 17:06:44 +0200 Subject: [PATCH] usrmount/module-setup.sh: fixed typo diff --git a/SOURCES/0034-Handle-crypto-modules-with-and-without-modaliases.patch b/SOURCES/0034-Handle-crypto-modules-with-and-without-modaliases.patch index c2961d1..ca2de67 100644 --- a/SOURCES/0034-Handle-crypto-modules-with-and-without-modaliases.patch +++ b/SOURCES/0034-Handle-crypto-modules-with-and-without-modaliases.patch @@ -1,4 +1,4 @@ -From 662592c46a4561d517e2fa45e917e17824b658c9 Mon Sep 17 00:00:00 2001 +From ee916b72cc6ec89adf68d5b538044ebb5edcdbbd Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 30 Oct 2013 12:22:52 +0100 Subject: [PATCH] Handle crypto modules with and without modaliases diff --git a/SOURCES/0035-fips-include-crct10dif_generic.patch b/SOURCES/0035-fips-include-crct10dif_generic.patch index ae4163a..da4c535 100644 --- a/SOURCES/0035-fips-include-crct10dif_generic.patch +++ b/SOURCES/0035-fips-include-crct10dif_generic.patch @@ -1,4 +1,4 @@ -From 5fe3473880475af8542de6568111d27db77588d0 Mon Sep 17 00:00:00 2001 +From eb27e4cc31ff995c5e70442d559fd22377e8a211 Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Wed, 30 Oct 2013 12:35:27 +0100 Subject: [PATCH] fips: include crct10dif_generic diff --git a/SOURCES/0036-resume-fix-swap-detection-in-hostonly.patch b/SOURCES/0036-resume-fix-swap-detection-in-hostonly.patch index bcd5db6..75bcfdd 100644 --- a/SOURCES/0036-resume-fix-swap-detection-in-hostonly.patch +++ b/SOURCES/0036-resume-fix-swap-detection-in-hostonly.patch @@ -1,4 +1,4 @@ -From 3ad9febfafc57aff4a705cc4c5f184fed2dc3c4c Mon Sep 17 00:00:00 2001 +From ccad388c2578ba3e3539c87268a06c73f42b762f Mon Sep 17 00:00:00 2001 From: Alexander Tsoy Date: Wed, 9 Oct 2013 06:39:46 +0400 Subject: [PATCH] resume: fix swap detection in hostonly diff --git a/SOURCES/0037-resume-remove-resume-genrules.sh.patch b/SOURCES/0037-resume-remove-resume-genrules.sh.patch index c2fcd8b..eac9fe3 100644 --- a/SOURCES/0037-resume-remove-resume-genrules.sh.patch +++ b/SOURCES/0037-resume-remove-resume-genrules.sh.patch @@ -1,4 +1,4 @@ -From 40c2e2db5c8b08e064a03235ec843ff39a2addc7 Mon Sep 17 00:00:00 2001 +From c35826c0e7623852be8735acf8cc13e6bf829208 Mon Sep 17 00:00:00 2001 From: Alexander Tsoy Date: Wed, 9 Oct 2013 07:02:56 +0400 Subject: [PATCH] resume: remove resume-genrules.sh diff --git a/SOURCES/0038-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch b/SOURCES/0038-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch index d2bfb63..7513a16 100644 --- a/SOURCES/0038-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch +++ b/SOURCES/0038-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch @@ -1,4 +1,4 @@ -From 26a42e80bed28da0fdf34f7835b2b404ec25e7e6 Mon Sep 17 00:00:00 2001 +From 65ba6c44d8f578a6fde7377cfcd7448202ba01e0 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 30 Oct 2013 17:36:54 +0100 Subject: [PATCH] iscsi/nbd: do not try to mount the whole disk, if root= is diff --git a/SOURCES/0039-fips-also-install-etc-system-fips-in-the-initramfs.patch b/SOURCES/0039-fips-also-install-etc-system-fips-in-the-initramfs.patch index e6a977e..1a0891f 100644 --- a/SOURCES/0039-fips-also-install-etc-system-fips-in-the-initramfs.patch +++ b/SOURCES/0039-fips-also-install-etc-system-fips-in-the-initramfs.patch @@ -1,4 +1,4 @@ -From 5dcfc56d59e732d7d60cf7f6448eae0dcbf1e28b Mon Sep 17 00:00:00 2001 +From 20ff2d37cc14f72a97325b12ebb7437efbaf0a8e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 4 Nov 2013 17:29:15 +0100 Subject: [PATCH] fips: also install /etc/system-fips in the initramfs diff --git a/SOURCES/0040-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch b/SOURCES/0040-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch index ead2c01..f0dc5dc 100644 --- a/SOURCES/0040-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch +++ b/SOURCES/0040-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch @@ -1,4 +1,4 @@ -From a6fd3168b3b60b5e14ff20011b03ba7bad72e278 Mon Sep 17 00:00:00 2001 +From 03bf7758aa08e6533f438b4a60b4d5bd1847b1cd Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 2 Nov 2013 11:26:30 +0000 Subject: [PATCH] dracut-functions.sh: Avoid loading unnecessary 32-bit diff --git a/SOURCES/0041-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch b/SOURCES/0041-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch index 400aa22..3e4d763 100644 --- a/SOURCES/0041-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch +++ b/SOURCES/0041-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch @@ -1,4 +1,4 @@ -From c79290761ff78ad47ec24854339ab3cbc2ff802d Mon Sep 17 00:00:00 2001 +From 52592ce022550fbf6c7576f5c8b8be1f2b6d72c8 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 11 Nov 2013 16:57:32 +0100 Subject: [PATCH] systemd: do not exit the initqueue, if systemd asks a diff --git a/SOURCES/0042-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch b/SOURCES/0042-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch index 58b4b6f..f6df29f 100644 --- a/SOURCES/0042-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch +++ b/SOURCES/0042-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch @@ -1,4 +1,4 @@ -From 8b63ce8afcf368f07f8272e17756c46796dbf7fb Mon Sep 17 00:00:00 2001 +From 1dd604efb199af87ba0079eed809483559c9b04f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 14 Nov 2013 10:07:04 +0100 Subject: [PATCH] kernel-modules: add ohci-pci to the list of forced module diff --git a/SOURCES/0043-lvm-do-not-run-pvscan-for-lvmetad-update.patch b/SOURCES/0043-lvm-do-not-run-pvscan-for-lvmetad-update.patch index 69652ef..a18e8ac 100644 --- a/SOURCES/0043-lvm-do-not-run-pvscan-for-lvmetad-update.patch +++ b/SOURCES/0043-lvm-do-not-run-pvscan-for-lvmetad-update.patch @@ -1,4 +1,4 @@ -From c16311681e042801f3ead0191da5dca621c6a54c Mon Sep 17 00:00:00 2001 +From 05b79aaa9dde30d4f179303a81084b59898406b6 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Mon, 25 Nov 2013 14:38:00 +0100 Subject: [PATCH] lvm: do not run pvscan for lvmetad update diff --git a/SOURCES/0044-fips-fix-RHEV-vmlinuz-check.patch b/SOURCES/0044-fips-fix-RHEV-vmlinuz-check.patch index 3c5f1b7..a0b2da5 100644 --- a/SOURCES/0044-fips-fix-RHEV-vmlinuz-check.patch +++ b/SOURCES/0044-fips-fix-RHEV-vmlinuz-check.patch @@ -1,4 +1,4 @@ -From ec72d9946bec0a9fcc386a1ea9915d6672eb7f94 Mon Sep 17 00:00:00 2001 +From e590f5beec5bc282898e38b8d1016288cfc4af9f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 8 Nov 2013 15:06:18 +0100 Subject: [PATCH] fips: fix RHEV vmlinuz check diff --git a/SOURCES/0045-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch b/SOURCES/0045-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch index 7ce1f95..5cd1cde 100644 --- a/SOURCES/0045-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch +++ b/SOURCES/0045-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch @@ -1,4 +1,4 @@ -From 16a841f79305818cbf51a2c31786c73b9284fd5a Mon Sep 17 00:00:00 2001 +From 15962471fed6c1f074f532d2e74c3583b1d38128 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 2 Dec 2013 10:30:52 +0100 Subject: [PATCH] dracut.cmdline.7.asc: document "server-ip" of "ip=" parameter diff --git a/SOURCES/0046-dracut.sh-_get_fs_type-if-block-device-exists-return.patch b/SOURCES/0046-dracut.sh-_get_fs_type-if-block-device-exists-return.patch index 9c278bc..e1fce81 100644 --- a/SOURCES/0046-dracut.sh-_get_fs_type-if-block-device-exists-return.patch +++ b/SOURCES/0046-dracut.sh-_get_fs_type-if-block-device-exists-return.patch @@ -1,4 +1,4 @@ -From cedb7d124c3c884b3feee873b67b78dd16e4300e Mon Sep 17 00:00:00 2001 +From fb67162559469fedd84950eee6808962ceaf48a7 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 2 Dec 2013 10:32:00 +0100 Subject: [PATCH] dracut.sh:_get_fs_type() if block device exists return early diff --git a/SOURCES/0047-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch b/SOURCES/0047-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch index 1e4b685..7397240 100644 --- a/SOURCES/0047-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch +++ b/SOURCES/0047-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch @@ -1,4 +1,4 @@ -From 508bac6231a967c637e7f880cefeeaef4870af2a Mon Sep 17 00:00:00 2001 +From 243b8e14a2cdd317717ad8db5bb82aae9a8d7d14 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 2 Dec 2013 10:34:18 +0100 Subject: [PATCH] network/net-lib.sh:wait_for_if_up() wait for "state UP" diff --git a/SOURCES/0048-network-net-lib.sh-iface_has_link-fixup.patch b/SOURCES/0048-network-net-lib.sh-iface_has_link-fixup.patch index 7016f6f..6e87422 100644 --- a/SOURCES/0048-network-net-lib.sh-iface_has_link-fixup.patch +++ b/SOURCES/0048-network-net-lib.sh-iface_has_link-fixup.patch @@ -1,4 +1,4 @@ -From 32cb5286ed0fded0a3be4147e48daac8513a5e79 Mon Sep 17 00:00:00 2001 +From 34397fe702ae21a3566e166b4001e8121766d5a7 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 2 Dec 2013 10:36:42 +0100 Subject: [PATCH] network/net-lib.sh:iface_has_link() fixup diff --git a/SOURCES/0049-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch b/SOURCES/0049-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch index def3ffb..deb455b 100644 --- a/SOURCES/0049-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch +++ b/SOURCES/0049-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch @@ -1,4 +1,4 @@ -From 2ec86382fb7e60ae808a591b7160e26e240a4c15 Mon Sep 17 00:00:00 2001 +From 7aa989a4fd5c29da18e9e57fb94dec253516b0c4 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 2 Dec 2013 10:38:21 +0100 Subject: [PATCH] network/ifup.sh: before doing dhcp, check, if the link has a diff --git a/SOURCES/0050-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch b/SOURCES/0050-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch index 0255f09..b7791d8 100644 --- a/SOURCES/0050-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch +++ b/SOURCES/0050-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch @@ -1,4 +1,4 @@ -From 151329c9d97aac24098d1f23ffc9db91499402ac Mon Sep 17 00:00:00 2001 +From 32c431bb48601a699d8da0b2ff22299ab3888183 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 2 Dec 2013 10:39:36 +0100 Subject: [PATCH] base/dracut-lib.sh:wait_for_dev() relax requirement diff --git a/SOURCES/0051-dracut.sh-skip-crypt-swaps-with-password-files.patch b/SOURCES/0051-dracut.sh-skip-crypt-swaps-with-password-files.patch index 464238e..27273c3 100644 --- a/SOURCES/0051-dracut.sh-skip-crypt-swaps-with-password-files.patch +++ b/SOURCES/0051-dracut.sh-skip-crypt-swaps-with-password-files.patch @@ -1,4 +1,4 @@ -From 6e76aee6b259c02eb23082f6f3285fa6c164b52d Mon Sep 17 00:00:00 2001 +From 7f61e2c8957081d929a4f4fba8645b6b6e71d043 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 2 Dec 2013 11:05:21 +0100 Subject: [PATCH] dracut.sh: skip crypt swaps with password files diff --git a/SOURCES/0052-Fixup-script-permissions.patch b/SOURCES/0052-Fixup-script-permissions.patch index 7cdc89e..27f821f 100644 --- a/SOURCES/0052-Fixup-script-permissions.patch +++ b/SOURCES/0052-Fixup-script-permissions.patch @@ -1,4 +1,4 @@ -From 7e0cacb7ad15e02d2a75548e673803f4e3719053 Mon Sep 17 00:00:00 2001 +From 411d2aedd602d2b1c85b42bf6de2b18b5a7a249a Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Fri, 29 Nov 2013 13:13:53 +0100 Subject: [PATCH] Fixup script permissions diff --git a/SOURCES/0053-Remove-shebang-from-shell-completion-files.patch b/SOURCES/0053-Remove-shebang-from-shell-completion-files.patch index ca65b28..6f8b14c 100644 --- a/SOURCES/0053-Remove-shebang-from-shell-completion-files.patch +++ b/SOURCES/0053-Remove-shebang-from-shell-completion-files.patch @@ -1,4 +1,4 @@ -From 53f6d59b5d0c9d55810e162669f22b9acc34448a Mon Sep 17 00:00:00 2001 +From ff3d291a68b912194a7f72a084359ab13853b753 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Fri, 29 Nov 2013 13:13:54 +0100 Subject: [PATCH] Remove shebang from shell-completion files diff --git a/SOURCES/0054-i18n-introduce-i18n_install_all-to-install-everythin.patch b/SOURCES/0054-i18n-introduce-i18n_install_all-to-install-everythin.patch index d86bdf0..cac4bc7 100644 --- a/SOURCES/0054-i18n-introduce-i18n_install_all-to-install-everythin.patch +++ b/SOURCES/0054-i18n-introduce-i18n_install_all-to-install-everythin.patch @@ -1,4 +1,4 @@ -From 2e798d8f8029c16faa5550dd2334833b7dd26d22 Mon Sep 17 00:00:00 2001 +From dac45f997e6868ffba23610167c8bcb7476b0f96 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 5 Dec 2013 16:42:05 +0100 Subject: [PATCH] i18n: introduce i18n_install_all, to install everything diff --git a/SOURCES/0055-Run-xz-and-lzma-with-multiple-threads.patch b/SOURCES/0055-Run-xz-and-lzma-with-multiple-threads.patch index 6dfaf29..165862d 100644 --- a/SOURCES/0055-Run-xz-and-lzma-with-multiple-threads.patch +++ b/SOURCES/0055-Run-xz-and-lzma-with-multiple-threads.patch @@ -1,4 +1,4 @@ -From 44158fc223873fbaa055736a488e4d290d1818ae Mon Sep 17 00:00:00 2001 +From 90441c4476481e4e05edacf44903aeac2feecd6d Mon Sep 17 00:00:00 2001 From: Vratislav Podzimek Date: Wed, 13 Nov 2013 13:20:39 +0100 Subject: [PATCH] Run 'xz' and 'lzma' with multiple threads diff --git a/SOURCES/0056-iscsi-nbd-do-not-fail-in-hostonly-mode.patch b/SOURCES/0056-iscsi-nbd-do-not-fail-in-hostonly-mode.patch index 499f54e..6dea759 100644 --- a/SOURCES/0056-iscsi-nbd-do-not-fail-in-hostonly-mode.patch +++ b/SOURCES/0056-iscsi-nbd-do-not-fail-in-hostonly-mode.patch @@ -1,4 +1,4 @@ -From 5cda22c36f06deb99ea54ee24487bd052724e397 Mon Sep 17 00:00:00 2001 +From d014032c62b22ef88be6123532b8f4fc545580ff Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 11 Nov 2013 16:57:09 +0100 Subject: [PATCH] iscsi,nbd: do not fail in hostonly mode diff --git a/SOURCES/0057-dracut.sh-fixed-PATH-shortener.patch b/SOURCES/0057-dracut.sh-fixed-PATH-shortener.patch index 677f23a..97b45ac 100644 --- a/SOURCES/0057-dracut.sh-fixed-PATH-shortener.patch +++ b/SOURCES/0057-dracut.sh-fixed-PATH-shortener.patch @@ -1,4 +1,4 @@ -From 9c1ddd0962be47ab1bcc7a5e93f5aca46112c9ab Mon Sep 17 00:00:00 2001 +From 8d7bd6af195ef6a7bd5caa89995084a8b484207c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Sat, 2 Nov 2013 13:14:40 +0100 Subject: [PATCH] dracut.sh: fixed PATH shortener diff --git a/SOURCES/0058-dracut.modules.7.asc-removed-empty-section.patch b/SOURCES/0058-dracut.modules.7.asc-removed-empty-section.patch index a85bdc0..f1ea255 100644 --- a/SOURCES/0058-dracut.modules.7.asc-removed-empty-section.patch +++ b/SOURCES/0058-dracut.modules.7.asc-removed-empty-section.patch @@ -1,4 +1,4 @@ -From 080a0f5c8d4361cb85b563afcab16630de42d24d Mon Sep 17 00:00:00 2001 +From 5a36d29f8a63da9b62b5ee655f11f03e25dc5ef9 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Sat, 2 Nov 2013 13:20:32 +0100 Subject: [PATCH] dracut.modules.7.asc: removed empty section diff --git a/SOURCES/0059-lvm-install-thin-tools-only-when-needed-in-hostonly.patch b/SOURCES/0059-lvm-install-thin-tools-only-when-needed-in-hostonly.patch index 15faf8b..791974f 100644 --- a/SOURCES/0059-lvm-install-thin-tools-only-when-needed-in-hostonly.patch +++ b/SOURCES/0059-lvm-install-thin-tools-only-when-needed-in-hostonly.patch @@ -1,4 +1,4 @@ -From ef290e26156d9f55a5e2bc3fc265c81e82fa510a Mon Sep 17 00:00:00 2001 +From 53b20afabbc034b4fe1e09f0b7d4f7d04f0584c5 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 5 Dec 2013 15:57:42 +0100 Subject: [PATCH] lvm: install thin tools, only when needed in hostonly diff --git a/SOURCES/0060-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch b/SOURCES/0060-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch index a2f6290..6d6a599 100644 --- a/SOURCES/0060-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch +++ b/SOURCES/0060-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch @@ -1,4 +1,4 @@ -From 958bc11ddd2b21c631bde5871b22cb727d051042 Mon Sep 17 00:00:00 2001 +From a1e9e9364a98032a83e166173930c141c8baa4c6 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 5 Dec 2013 18:38:35 +0100 Subject: [PATCH] systemd/dracut-initqueue.sh: fixed waiting in the loop if PW diff --git a/SOURCES/0061-base-rdsosreport.sh-add-ip-a-output.patch b/SOURCES/0061-base-rdsosreport.sh-add-ip-a-output.patch index 55874d2..73683f7 100644 --- a/SOURCES/0061-base-rdsosreport.sh-add-ip-a-output.patch +++ b/SOURCES/0061-base-rdsosreport.sh-add-ip-a-output.patch @@ -1,4 +1,4 @@ -From 89965b78b4bbf9b27b4f19baf805657f7e62bc6e Mon Sep 17 00:00:00 2001 +From be10aecb17b1f71682cfc364553cf35f150a1045 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 10 Dec 2013 12:58:37 +0100 Subject: [PATCH] base/rdsosreport.sh: add "ip a" output diff --git a/SOURCES/0062-lvm-fixed-lvm-thin-check.patch b/SOURCES/0062-lvm-fixed-lvm-thin-check.patch index 801a9a3..6fbb31b 100644 --- a/SOURCES/0062-lvm-fixed-lvm-thin-check.patch +++ b/SOURCES/0062-lvm-fixed-lvm-thin-check.patch @@ -1,4 +1,4 @@ -From d8481c86a9ea78d95e549999743e33860f557615 Mon Sep 17 00:00:00 2001 +From 793beab60c416e0edf7331fa2e6881b08f2bece0 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 13 Dec 2013 11:05:39 +0100 Subject: [PATCH] lvm: fixed lvm thin check diff --git a/SOURCES/0063-test-TEST-17-LVM-THIN-add-test-case-for-lvm-thin-poo.patch b/SOURCES/0063-test-TEST-17-LVM-THIN-add-test-case-for-lvm-thin-poo.patch index c9959bc..4763ced 100644 --- a/SOURCES/0063-test-TEST-17-LVM-THIN-add-test-case-for-lvm-thin-poo.patch +++ b/SOURCES/0063-test-TEST-17-LVM-THIN-add-test-case-for-lvm-thin-poo.patch @@ -1,4 +1,4 @@ -From fcbc3f941eeb85126ae5f56e82f121f3a51f2534 Mon Sep 17 00:00:00 2001 +From a34d3dcaa8947c8df6a3b809e42e6868d08ba649 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 16 Dec 2013 13:15:48 +0100 Subject: [PATCH] test/TEST-17-LVM-THIN: add test case for lvm thin pools diff --git a/SOURCES/0064-test-TEST-17-LVM-THIN-remove-.testdir.patch b/SOURCES/0064-test-TEST-17-LVM-THIN-remove-.testdir.patch index b004c89..3cf9809 100644 --- a/SOURCES/0064-test-TEST-17-LVM-THIN-remove-.testdir.patch +++ b/SOURCES/0064-test-TEST-17-LVM-THIN-remove-.testdir.patch @@ -1,4 +1,4 @@ -From e8b49c027061052e7e1168ab480b6e3832a44721 Mon Sep 17 00:00:00 2001 +From 998f4bb72048e7c56d919ba43b8776d82e14b698 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 17 Dec 2013 13:36:55 +0100 Subject: [PATCH] test/TEST-17-LVM-THIN: remove .testdir diff --git a/SOURCES/0065-iscsi-do-iscsi_firmware-regardless-of-network.patch b/SOURCES/0065-iscsi-do-iscsi_firmware-regardless-of-network.patch index 93f77d9..29f8289 100644 --- a/SOURCES/0065-iscsi-do-iscsi_firmware-regardless-of-network.patch +++ b/SOURCES/0065-iscsi-do-iscsi_firmware-regardless-of-network.patch @@ -1,4 +1,4 @@ -From 0b64ace800ada1fae8e84ed4b81c2f32fea4b015 Mon Sep 17 00:00:00 2001 +From 937456c65b0e641a6494a39acb5a001b2c9ed992 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 18 Dec 2013 12:26:05 +0100 Subject: [PATCH] iscsi: do iscsi_firmware regardless of network diff --git a/SOURCES/0066-dracut-lib-wait_for_dev-prevent-systemd-daemon-reloa.patch b/SOURCES/0066-dracut-lib-wait_for_dev-prevent-systemd-daemon-reloa.patch index d3d86dd..b789cde 100644 --- a/SOURCES/0066-dracut-lib-wait_for_dev-prevent-systemd-daemon-reloa.patch +++ b/SOURCES/0066-dracut-lib-wait_for_dev-prevent-systemd-daemon-reloa.patch @@ -1,4 +1,4 @@ -From 2985e93ffa5f91331f8c27745bd92ab67a9d19fe Mon Sep 17 00:00:00 2001 +From db110a036a13e5c99e073128ec8aa7b1fdc7e992 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 18 Dec 2013 12:28:51 +0100 Subject: [PATCH] dracut-lib/wait_for_dev(): prevent systemd daemon-reload diff --git a/SOURCES/0067-kernel-modules-add-more-block-driver.patch b/SOURCES/0067-kernel-modules-add-more-block-driver.patch index d6a1200..3c5a1de 100644 --- a/SOURCES/0067-kernel-modules-add-more-block-driver.patch +++ b/SOURCES/0067-kernel-modules-add-more-block-driver.patch @@ -1,4 +1,4 @@ -From 0014f6176312d43bbfeab506acf0bd2f1e14973f Mon Sep 17 00:00:00 2001 +From 04220f9affcbd59dd8d95fd716bd9443eb2ea81d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 19 Dec 2013 12:37:47 +0100 Subject: [PATCH] kernel-modules: add more block driver diff --git a/SOURCES/0068-network-include-usbnet-drivers.patch b/SOURCES/0068-network-include-usbnet-drivers.patch index 64325a1..673c899 100644 --- a/SOURCES/0068-network-include-usbnet-drivers.patch +++ b/SOURCES/0068-network-include-usbnet-drivers.patch @@ -1,4 +1,4 @@ -From 2416a117b165be5ff74bf360176a07745700a4cd Mon Sep 17 00:00:00 2001 +From 9a177f8d51afd332fe6528d5cbe80d78d7b74a9e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 19 Dec 2013 17:06:48 +0100 Subject: [PATCH] network: include usbnet drivers diff --git a/SOURCES/0069-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch b/SOURCES/0069-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch index 68079b1..e9755d1 100644 --- a/SOURCES/0069-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch +++ b/SOURCES/0069-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch @@ -1,4 +1,4 @@ -From 5b134070e8bff59f4588bb96ae3780645e918c2a Mon Sep 17 00:00:00 2001 +From 866e663fbdedcf520388218151d0f666857b6f92 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 7 Jan 2014 16:39:48 +0100 Subject: [PATCH] systemd/dracut-initqueue.sh: fstab is not a directory diff --git a/SOURCES/0070-iscsi-iscsiroot.sh-do-not-trust-iscsistart-return-va.patch b/SOURCES/0070-iscsi-iscsiroot.sh-do-not-trust-iscsistart-return-va.patch index a6259f7..a8e64f5 100644 --- a/SOURCES/0070-iscsi-iscsiroot.sh-do-not-trust-iscsistart-return-va.patch +++ b/SOURCES/0070-iscsi-iscsiroot.sh-do-not-trust-iscsistart-return-va.patch @@ -1,4 +1,4 @@ -From 6d346727a1692cbff09f6298beda9b98050ea610 Mon Sep 17 00:00:00 2001 +From 7faae1264db2d015135985c52bc2b8a2ae0636eb Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 7 Jan 2014 16:40:50 +0100 Subject: [PATCH] iscsi/iscsiroot.sh: do not trust iscsistart return value diff --git a/SOURCES/0071-dracut.sh-add-missing-piece-for-option-add-device.patch b/SOURCES/0071-dracut.sh-add-missing-piece-for-option-add-device.patch index 86b8022..9138e75 100644 --- a/SOURCES/0071-dracut.sh-add-missing-piece-for-option-add-device.patch +++ b/SOURCES/0071-dracut.sh-add-missing-piece-for-option-add-device.patch @@ -1,4 +1,4 @@ -From 3a6bc24b56412dedb0d404613efa1644022b002d Mon Sep 17 00:00:00 2001 +From ea9b961e8cffc30f131d62d21bcbd18b0482b7f6 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 8 Jan 2014 15:37:18 +0100 Subject: [PATCH] dracut.sh: add missing piece for option --add-device diff --git a/SOURCES/0072-dracut.sh-add-boot-efi-to-device-paths.patch b/SOURCES/0072-dracut.sh-add-boot-efi-to-device-paths.patch index 471f161..e99d621 100644 --- a/SOURCES/0072-dracut.sh-add-boot-efi-to-device-paths.patch +++ b/SOURCES/0072-dracut.sh-add-boot-efi-to-device-paths.patch @@ -1,4 +1,4 @@ -From dcf94be9a3817c9b11b6ac77d4f42835d62d1a05 Mon Sep 17 00:00:00 2001 +From 82286609c9736a967f36f0d77cdc585da7f3f506 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 8 Jan 2014 15:38:44 +0100 Subject: [PATCH] dracut.sh: add /boot/efi to device paths diff --git a/SOURCES/0073-documentation-line-wrap.patch b/SOURCES/0073-documentation-line-wrap.patch index d253b6a..3e5b268 100644 --- a/SOURCES/0073-documentation-line-wrap.patch +++ b/SOURCES/0073-documentation-line-wrap.patch @@ -1,4 +1,4 @@ -From d32e66826d6cf1e633d94a8e267b59a79a45c66e Mon Sep 17 00:00:00 2001 +From 81564fcefcf1554fa3a0f2145b9e18d149228344 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 9 Jan 2014 12:17:01 +0100 Subject: [PATCH] documentation: line wrap diff --git a/SOURCES/0074-network-include-all-ethernet-drivers.patch b/SOURCES/0074-network-include-all-ethernet-drivers.patch index d216c03..be36d1e 100644 --- a/SOURCES/0074-network-include-all-ethernet-drivers.patch +++ b/SOURCES/0074-network-include-all-ethernet-drivers.patch @@ -1,4 +1,4 @@ -From 3c67ed50135c8e454d0a4e0f414eca85c014b99a Mon Sep 17 00:00:00 2001 +From d1e9a5e3840b569aa8de6daba0e9ffd40b315a23 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 15 Jan 2014 14:35:53 +0100 Subject: [PATCH] network: include all ethernet drivers diff --git a/SOURCES/0075-dracut-install-dracut-fix-ldd-output-parsing.patch b/SOURCES/0075-dracut-install-dracut-fix-ldd-output-parsing.patch index b50d927..7ba2550 100644 --- a/SOURCES/0075-dracut-install-dracut-fix-ldd-output-parsing.patch +++ b/SOURCES/0075-dracut-install-dracut-fix-ldd-output-parsing.patch @@ -1,4 +1,4 @@ -From 761263922538d3c00b34dc6fc71a98eb8d8e1aa9 Mon Sep 17 00:00:00 2001 +From cb97abc7bb304a9eb8d6f6c29eaa62e9525117fb Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 17 Jan 2014 11:52:43 +0100 Subject: [PATCH] dracut-install,dracut: fix ldd output parsing diff --git a/SOURCES/0076-systemd-add-71-seat.rules-73-seat-late.rules.patch b/SOURCES/0076-systemd-add-71-seat.rules-73-seat-late.rules.patch index fb1e28a..5fe499c 100644 --- a/SOURCES/0076-systemd-add-71-seat.rules-73-seat-late.rules.patch +++ b/SOURCES/0076-systemd-add-71-seat.rules-73-seat-late.rules.patch @@ -1,4 +1,4 @@ -From 497e9e89dcb0196fd0c1b4ebf904eeb8556fc934 Mon Sep 17 00:00:00 2001 +From aa6ab2747106225b562e9b87f13703d0dee5679f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 17 Jan 2014 13:40:42 +0100 Subject: [PATCH] systemd: add 71-seat.rules 73-seat-late.rules diff --git a/SOURCES/0077-systemd-add-seat-udev-rules-and-mask-loginctl.patch b/SOURCES/0077-systemd-add-seat-udev-rules-and-mask-loginctl.patch index 3458c38..0d3e83a 100644 --- a/SOURCES/0077-systemd-add-seat-udev-rules-and-mask-loginctl.patch +++ b/SOURCES/0077-systemd-add-seat-udev-rules-and-mask-loginctl.patch @@ -1,4 +1,4 @@ -From 4a28b713d7968b422beefaa0a7e5a7cb269aacff Mon Sep 17 00:00:00 2001 +From 254f437848ca7e73535a9a5bf21478b0a62568f4 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 17 Jan 2014 14:01:33 +0100 Subject: [PATCH] systemd: add seat udev rules and mask loginctl diff --git a/SOURCES/0078-systemd-module-setup.sh-make-use-of-ln_r.patch b/SOURCES/0078-systemd-module-setup.sh-make-use-of-ln_r.patch index 45b6347..4935c96 100644 --- a/SOURCES/0078-systemd-module-setup.sh-make-use-of-ln_r.patch +++ b/SOURCES/0078-systemd-module-setup.sh-make-use-of-ln_r.patch @@ -1,4 +1,4 @@ -From 8914b61b0128f38fcda46c01dd96139201d932d4 Mon Sep 17 00:00:00 2001 +From 834f33440ff9890235908c46d1d24f4f72f0739c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 17 Jan 2014 14:01:57 +0100 Subject: [PATCH] systemd/module-setup.sh: make use of "ln_r" diff --git a/SOURCES/0079-network-add-rd.bootif-0-to-ignore-BOOTIF.patch b/SOURCES/0079-network-add-rd.bootif-0-to-ignore-BOOTIF.patch index a2f0a96..b73f81d 100644 --- a/SOURCES/0079-network-add-rd.bootif-0-to-ignore-BOOTIF.patch +++ b/SOURCES/0079-network-add-rd.bootif-0-to-ignore-BOOTIF.patch @@ -1,4 +1,4 @@ -From e33b4492dbfd18fe44d3dd3272e59745232c9eca Mon Sep 17 00:00:00 2001 +From 5183c9a58815970a5edc667cb6f531d7dace22ff Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 17 Jan 2014 14:37:55 +0100 Subject: [PATCH] network: add rd.bootif=0 to ignore BOOTIF diff --git a/SOURCES/0080-iscsi-call-iscsistart-b-until-it-succeeds.patch b/SOURCES/0080-iscsi-call-iscsistart-b-until-it-succeeds.patch index d5dabeb..bb8c3ff 100644 --- a/SOURCES/0080-iscsi-call-iscsistart-b-until-it-succeeds.patch +++ b/SOURCES/0080-iscsi-call-iscsistart-b-until-it-succeeds.patch @@ -1,4 +1,4 @@ -From 8dfe442d1ea9c418b1a2751040f89c6e0e0d30e6 Mon Sep 17 00:00:00 2001 +From 9bdbbe90efb11dfb840f9e9de0daf6388fa0f47f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 17 Jan 2014 14:45:15 +0100 Subject: [PATCH] iscsi: call "iscsistart -b" until it succeeds diff --git a/SOURCES/0081-base-dracut-lib.sh-halt-the-machine-in-systemd-mode-.patch b/SOURCES/0081-base-dracut-lib.sh-halt-the-machine-in-systemd-mode-.patch index ef14066..51dc38a 100644 --- a/SOURCES/0081-base-dracut-lib.sh-halt-the-machine-in-systemd-mode-.patch +++ b/SOURCES/0081-base-dracut-lib.sh-halt-the-machine-in-systemd-mode-.patch @@ -1,4 +1,4 @@ -From 9a222e393afe093b5e940679e13b8bf5c2fb16a3 Mon Sep 17 00:00:00 2001 +From 779f980658ab223773ef065ac3f833aacd374c53 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 17 Jan 2014 15:27:47 +0100 Subject: [PATCH] base/dracut-lib.sh: "halt" the machine in systemd mode for diff --git a/SOURCES/0082-systemd-rootfs-generator.sh-exit-0.patch b/SOURCES/0082-systemd-rootfs-generator.sh-exit-0.patch index 612f7a7..98516dc 100644 --- a/SOURCES/0082-systemd-rootfs-generator.sh-exit-0.patch +++ b/SOURCES/0082-systemd-rootfs-generator.sh-exit-0.patch @@ -1,4 +1,4 @@ -From 607ab52c03b187fd8ac28992ffb2b6b3a4b83ba0 Mon Sep 17 00:00:00 2001 +From 9d47a90b12dd5aa34488be2d5e6ff082c6713b8d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 17 Jan 2014 12:16:41 +0100 Subject: [PATCH] systemd/rootfs-generator.sh: exit 0 diff --git a/SOURCES/0083-systemd-rootfs-generator.sh-ignore-legacy-root-dev-n.patch b/SOURCES/0083-systemd-rootfs-generator.sh-ignore-legacy-root-dev-n.patch index 314875c..1075dd5 100644 --- a/SOURCES/0083-systemd-rootfs-generator.sh-ignore-legacy-root-dev-n.patch +++ b/SOURCES/0083-systemd-rootfs-generator.sh-ignore-legacy-root-dev-n.patch @@ -1,4 +1,4 @@ -From 5c088337f76742960f05f4cbac6c867f7a142323 Mon Sep 17 00:00:00 2001 +From 0ab5e8adc8c7132c4f858bcfe7bd7f8c493282d9 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 17 Jan 2014 13:40:05 +0100 Subject: [PATCH] systemd/rootfs-generator.sh: ignore legacy root=/dev/nfs diff --git a/SOURCES/0084-dracut-lib.sh-fixed-shebang.patch b/SOURCES/0084-dracut-lib.sh-fixed-shebang.patch index 3bab528..d2f7dcc 100644 --- a/SOURCES/0084-dracut-lib.sh-fixed-shebang.patch +++ b/SOURCES/0084-dracut-lib.sh-fixed-shebang.patch @@ -1,4 +1,4 @@ -From d02a9c97d4cfe4149aa71174892569b6347bdf52 Mon Sep 17 00:00:00 2001 +From d11012969527a027ad2db8d06e374fb8f04e7f45 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 20 Jan 2014 14:59:46 +0100 Subject: [PATCH] dracut-lib.sh: fixed shebang diff --git a/SOURCES/0085-iscsi-more-iscsiroot-fixes.patch b/SOURCES/0085-iscsi-more-iscsiroot-fixes.patch index ac0aa04..6ded99f 100644 --- a/SOURCES/0085-iscsi-more-iscsiroot-fixes.patch +++ b/SOURCES/0085-iscsi-more-iscsiroot-fixes.patch @@ -1,4 +1,4 @@ -From 72fc1ce3aba3e9fcbe0bfc47d0607e66947e8753 Mon Sep 17 00:00:00 2001 +From 6c7c8d8a071694efd0c7e450fa78e71224a8ced4 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 22 Jan 2014 17:05:22 +0100 Subject: [PATCH] iscsi: more iscsiroot fixes diff --git a/SOURCES/0086-iscsiroot-touch-the-right-marker-file.patch b/SOURCES/0086-iscsiroot-touch-the-right-marker-file.patch index 7955367..18ca211 100644 --- a/SOURCES/0086-iscsiroot-touch-the-right-marker-file.patch +++ b/SOURCES/0086-iscsiroot-touch-the-right-marker-file.patch @@ -1,4 +1,4 @@ -From 4d5ede17afb3402e1c9b48a8fecb8b4750fe160d Mon Sep 17 00:00:00 2001 +From 56a5975f91cf897d09ac3b5b74342fff48e7aea3 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 24 Jan 2014 16:35:08 +0100 Subject: [PATCH] iscsiroot: touch the right marker file diff --git a/SOURCES/0087-lvm-lvm_scan.sh-handle-one-LV-at-a-time-with-lvchang.patch b/SOURCES/0087-lvm-lvm_scan.sh-handle-one-LV-at-a-time-with-lvchang.patch index b769734..bf780d9 100644 --- a/SOURCES/0087-lvm-lvm_scan.sh-handle-one-LV-at-a-time-with-lvchang.patch +++ b/SOURCES/0087-lvm-lvm_scan.sh-handle-one-LV-at-a-time-with-lvchang.patch @@ -1,4 +1,4 @@ -From 50ef97540f53ea044653ca6c69212e93a01c8f4c Mon Sep 17 00:00:00 2001 +From 3c4e663251aa64d7946e8a2c91a8bc5eae444182 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 24 Jan 2014 16:37:13 +0100 Subject: [PATCH] lvm:lvm_scan.sh handle one LV at a time with lvchange diff --git a/SOURCES/0088-dracut-logger.sh-systemd-cat-only-understands-prio-0.patch b/SOURCES/0088-dracut-logger.sh-systemd-cat-only-understands-prio-0.patch index f90177d..be058ee 100644 --- a/SOURCES/0088-dracut-logger.sh-systemd-cat-only-understands-prio-0.patch +++ b/SOURCES/0088-dracut-logger.sh-systemd-cat-only-understands-prio-0.patch @@ -1,4 +1,4 @@ -From c411899e9dbc3071e7da68b023d532c69c79a05f Mon Sep 17 00:00:00 2001 +From 74c9df58f25736aea0da8c56e15d047dc6a9cb5a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 22 Jan 2014 11:48:45 +0100 Subject: [PATCH] dracut-logger.sh: systemd-cat only understands prio 0-7 diff --git a/SOURCES/0089-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch b/SOURCES/0089-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch index b3d7a8d..68c18e9 100644 --- a/SOURCES/0089-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch +++ b/SOURCES/0089-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch @@ -1,4 +1,4 @@ -From d7f6f22bca957cc0a5db13f26c3191cae11ac0c2 Mon Sep 17 00:00:00 2001 +From dfaeee7341acba43367dd26bce9143d8a5c08ac5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 10 Jan 2014 21:41:43 +0100 Subject: [PATCH] Use builtin xz/lzma option to use all cores for multihreaded diff --git a/SOURCES/0090-dracut-initramfs-restore-lsinitrd-add-LZ4-support.patch b/SOURCES/0090-dracut-initramfs-restore-lsinitrd-add-LZ4-support.patch index cae1c63..4224db1 100644 --- a/SOURCES/0090-dracut-initramfs-restore-lsinitrd-add-LZ4-support.patch +++ b/SOURCES/0090-dracut-initramfs-restore-lsinitrd-add-LZ4-support.patch @@ -1,4 +1,4 @@ -From 3eccb9139fcd7559e68162aac348b38782c4d817 Mon Sep 17 00:00:00 2001 +From a0b85db18e163a14144230ae67c43ac23246b7ea Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 16 Jan 2014 11:00:54 +0100 Subject: [PATCH] dracut-initramfs-restore,lsinitrd: add LZ4 support diff --git a/SOURCES/0091-Revert-dmraid-let-dmraid-setup-the-partitions.patch b/SOURCES/0091-Revert-dmraid-let-dmraid-setup-the-partitions.patch index b3ed76a..b520da1 100644 --- a/SOURCES/0091-Revert-dmraid-let-dmraid-setup-the-partitions.patch +++ b/SOURCES/0091-Revert-dmraid-let-dmraid-setup-the-partitions.patch @@ -1,4 +1,4 @@ -From 3378f290c9f307dea485d08a7ef7764ce81d6047 Mon Sep 17 00:00:00 2001 +From b1cdf7c5d4df3221504c34010985254f4261b3dd Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 24 Jan 2014 11:55:27 +0100 Subject: [PATCH] Revert "dmraid: let dmraid setup the partitions" diff --git a/SOURCES/0092-dracut.sh-create-early-cpio-dir-for-acpi-tables.patch b/SOURCES/0092-dracut.sh-create-early-cpio-dir-for-acpi-tables.patch index 24afb4b..da95d1a 100644 --- a/SOURCES/0092-dracut.sh-create-early-cpio-dir-for-acpi-tables.patch +++ b/SOURCES/0092-dracut.sh-create-early-cpio-dir-for-acpi-tables.patch @@ -1,4 +1,4 @@ -From 5adc20e4c2575c2a271e01e700a63a0258353870 Mon Sep 17 00:00:00 2001 +From 0d4bb7ce8928b67a2e835931bc85f317feabd32e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 24 Jan 2014 15:26:43 +0100 Subject: [PATCH] dracut.sh: create early cpio dir for acpi tables diff --git a/SOURCES/0093-dracut.sh-set-file-owners-of-early-cpio-files-to-0-0.patch b/SOURCES/0093-dracut.sh-set-file-owners-of-early-cpio-files-to-0-0.patch index 1a194b2..f363926 100644 --- a/SOURCES/0093-dracut.sh-set-file-owners-of-early-cpio-files-to-0-0.patch +++ b/SOURCES/0093-dracut.sh-set-file-owners-of-early-cpio-files-to-0-0.patch @@ -1,4 +1,4 @@ -From a590f63ec72df1197b294ad46da6611fca84daf9 Mon Sep 17 00:00:00 2001 +From 87862728daaefd56708fe2100c22a90ebf361fac Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 24 Jan 2014 15:27:15 +0100 Subject: [PATCH] dracut.sh: set file owners of early cpio files to 0:0 diff --git a/SOURCES/0094-add-skipcpio-utility.patch b/SOURCES/0094-add-skipcpio-utility.patch index 4392072..06fcda1 100644 --- a/SOURCES/0094-add-skipcpio-utility.patch +++ b/SOURCES/0094-add-skipcpio-utility.patch @@ -1,4 +1,4 @@ -From 979038ba0da3ff61ddb61a809795189d3c25f71a Mon Sep 17 00:00:00 2001 +From a3dc6a721873f0365612a5acee952a5f7d33853a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 24 Jan 2014 15:27:51 +0100 Subject: [PATCH] add skipcpio utility diff --git a/SOURCES/0095-dracut.sh-add-early_cpio-marker-file-to-the-early-cp.patch b/SOURCES/0095-dracut.sh-add-early_cpio-marker-file-to-the-early-cp.patch index 5a1e316..7dc4406 100644 --- a/SOURCES/0095-dracut.sh-add-early_cpio-marker-file-to-the-early-cp.patch +++ b/SOURCES/0095-dracut.sh-add-early_cpio-marker-file-to-the-early-cp.patch @@ -1,4 +1,4 @@ -From 77db409239f797e368bfa18a9f07cf119c0dd84d Mon Sep 17 00:00:00 2001 +From eb7c58eced499d5e894971b451d8fb940c829393 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 24 Jan 2014 15:29:24 +0100 Subject: [PATCH] dracut.sh: add early_cpio marker file to the early cpio diff --git a/SOURCES/0096-lsinitrd.sh-make-use-of-the-skipcpio-utility.patch b/SOURCES/0096-lsinitrd.sh-make-use-of-the-skipcpio-utility.patch index b4f3a9a..62f180b 100644 --- a/SOURCES/0096-lsinitrd.sh-make-use-of-the-skipcpio-utility.patch +++ b/SOURCES/0096-lsinitrd.sh-make-use-of-the-skipcpio-utility.patch @@ -1,4 +1,4 @@ -From 8732cab18a05e98086462e51d9c7b8b7a3190ddf Mon Sep 17 00:00:00 2001 +From 815b9c16a4e90b67bab008da678d73faa74f8e0c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 24 Jan 2014 15:30:22 +0100 Subject: [PATCH] lsinitrd.sh: make use of the skipcpio utility diff --git a/SOURCES/0097-network-dhclient-script.sh-set-lease-time.patch b/SOURCES/0097-network-dhclient-script.sh-set-lease-time.patch index 644527b..68fcb3a 100644 --- a/SOURCES/0097-network-dhclient-script.sh-set-lease-time.patch +++ b/SOURCES/0097-network-dhclient-script.sh-set-lease-time.patch @@ -1,4 +1,4 @@ -From 275262b9986cfe79ecb3343cbba7e72e359f8307 Mon Sep 17 00:00:00 2001 +From ade113d75b07ba294facbe943b859624fa45efb9 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 28 Jan 2014 12:12:43 +0100 Subject: [PATCH] network/dhclient-script.sh: set lease time diff --git a/SOURCES/0098-dracut-lib.sh-bugfix-for-pidof-function.patch b/SOURCES/0098-dracut-lib.sh-bugfix-for-pidof-function.patch index 4bbc350..dcb6dac 100644 --- a/SOURCES/0098-dracut-lib.sh-bugfix-for-pidof-function.patch +++ b/SOURCES/0098-dracut-lib.sh-bugfix-for-pidof-function.patch @@ -1,4 +1,4 @@ -From 365e7f70465af866e9f89ce630dc48ab75f78b54 Mon Sep 17 00:00:00 2001 +From 37a18fda1146ac619165af8dbbbda3cbfb8ad18b Mon Sep 17 00:00:00 2001 From: Stig Telfer Date: Fri, 24 Jan 2014 15:19:11 +0000 Subject: [PATCH] dracut-lib.sh: bugfix for pidof function diff --git a/SOURCES/0099-dracut-lib.sh-bugfix-for-pidof-function.patch b/SOURCES/0099-dracut-lib.sh-bugfix-for-pidof-function.patch index a3cae4b..11c4630 100644 --- a/SOURCES/0099-dracut-lib.sh-bugfix-for-pidof-function.patch +++ b/SOURCES/0099-dracut-lib.sh-bugfix-for-pidof-function.patch @@ -1,4 +1,4 @@ -From 9061e3281f8f0d6cf7fdfae1aaa585d6160b232e Mon Sep 17 00:00:00 2001 +From 2f117f4db3425229f9a9b107682ad05b8ba613ea Mon Sep 17 00:00:00 2001 From: Stig Telfer Date: Fri, 24 Jan 2014 15:48:32 +0000 Subject: [PATCH] dracut-lib.sh: bugfix for pidof function diff --git a/SOURCES/0100-iscsi-iscsiroot.sh-beautify-warning.patch b/SOURCES/0100-iscsi-iscsiroot.sh-beautify-warning.patch index fd9843d..ab0bbbb 100644 --- a/SOURCES/0100-iscsi-iscsiroot.sh-beautify-warning.patch +++ b/SOURCES/0100-iscsi-iscsiroot.sh-beautify-warning.patch @@ -1,4 +1,4 @@ -From 44e187c863848e51dc4118c2937ba037cbc37240 Mon Sep 17 00:00:00 2001 +From f812e271cb9d51365b70f0ee82bb2fd30209ba06 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 28 Jan 2014 12:14:07 +0100 Subject: [PATCH] iscsi/iscsiroot.sh: beautify warning diff --git a/SOURCES/0101-dracut.spec-add-skipcpio.patch b/SOURCES/0101-dracut.spec-add-skipcpio.patch index 39a7153..c4b284f 100644 --- a/SOURCES/0101-dracut.spec-add-skipcpio.patch +++ b/SOURCES/0101-dracut.spec-add-skipcpio.patch @@ -1,4 +1,4 @@ -From b46bc56874d879cdf528f71d8ae51ced8330c9cf Mon Sep 17 00:00:00 2001 +From 40cf35ef4ef959838729c12d4d0d73e03476914b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 28 Jan 2014 12:21:33 +0100 Subject: [PATCH] dracut.spec: add skipcpio diff --git a/SOURCES/0102-systemd-ensure-autofs4-and-ipv6-are-included.patch b/SOURCES/0102-systemd-ensure-autofs4-and-ipv6-are-included.patch index 4d6a6f9..4e734a4 100644 --- a/SOURCES/0102-systemd-ensure-autofs4-and-ipv6-are-included.patch +++ b/SOURCES/0102-systemd-ensure-autofs4-and-ipv6-are-included.patch @@ -1,4 +1,4 @@ -From 1e160b06d61d38fb4b97880ea952f5a8d0ba46f9 Mon Sep 17 00:00:00 2001 +From 657e832da0f7fb99e60dab9bb934071d81519dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Mon, 16 Dec 2013 03:40:58 +0000 Subject: [PATCH] systemd: ensure autofs4 and ipv6 are included diff --git a/SOURCES/0103-dracut-functions.sh-also-search-in-the-updates-direc.patch b/SOURCES/0103-dracut-functions.sh-also-search-in-the-updates-direc.patch index 11748aa..7b8a22b 100644 --- a/SOURCES/0103-dracut-functions.sh-also-search-in-the-updates-direc.patch +++ b/SOURCES/0103-dracut-functions.sh-also-search-in-the-updates-direc.patch @@ -1,4 +1,4 @@ -From 9d9dffa4234250aed696db52fc882cfa480fbde0 Mon Sep 17 00:00:00 2001 +From 27acb483e8f73ceb24eacca067dbea178d53aa2f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 30 Jan 2014 14:27:18 +0100 Subject: [PATCH] dracut-functions.sh: also search in the updates directory diff --git a/SOURCES/0104-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch b/SOURCES/0104-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch index 69e9c4c..cd77ec4 100644 --- a/SOURCES/0104-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch +++ b/SOURCES/0104-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch @@ -1,4 +1,4 @@ -From 6e2c53c689006eb71de3e70ac68475bc4c9f5910 Mon Sep 17 00:00:00 2001 +From 286fbebdaf4bc4954a3206ca11f1d14f9267a7fd Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 30 Jan 2014 16:11:40 +0100 Subject: [PATCH] dracut.sh: only set the owner of files to 0:0, if generated diff --git a/SOURCES/0105-dracut.conf.d-fedora.conf.example-turn-on-early_micr.patch b/SOURCES/0105-dracut.conf.d-fedora.conf.example-turn-on-early_micr.patch index 287cf33..ba54819 100644 --- a/SOURCES/0105-dracut.conf.d-fedora.conf.example-turn-on-early_micr.patch +++ b/SOURCES/0105-dracut.conf.d-fedora.conf.example-turn-on-early_micr.patch @@ -1,4 +1,4 @@ -From e81ace610db54972b84a6a2c7062092994557b71 Mon Sep 17 00:00:00 2001 +From c6fe81559e88b211fcd17a4687c1707a8434f3ff Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 30 Jan 2014 16:51:13 +0100 Subject: [PATCH] dracut.conf.d/fedora.conf.example: turn on early_microcode by diff --git a/SOURCES/0106-network-understand-ip-.-dns1-dns2.patch b/SOURCES/0106-network-understand-ip-.-dns1-dns2.patch index cd78f3d..e554e6c 100644 --- a/SOURCES/0106-network-understand-ip-.-dns1-dns2.patch +++ b/SOURCES/0106-network-understand-ip-.-dns1-dns2.patch @@ -1,4 +1,4 @@ -From 85682fb6f9c3e91580792b266fb4e1ef1caea92f Mon Sep 17 00:00:00 2001 +From b4b60da8dcdd6bc6f1e66ece90e1070b07db0cf4 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 30 Jan 2014 13:50:02 +0100 Subject: [PATCH] network: understand ip=.....:: diff --git a/SOURCES/0107-network-ifup.sh-handle-dns1-and-dns2-from-ip-setting.patch b/SOURCES/0107-network-ifup.sh-handle-dns1-and-dns2-from-ip-setting.patch index 2fc61e4..25c5734 100644 --- a/SOURCES/0107-network-ifup.sh-handle-dns1-and-dns2-from-ip-setting.patch +++ b/SOURCES/0107-network-ifup.sh-handle-dns1-and-dns2-from-ip-setting.patch @@ -1,4 +1,4 @@ -From b0b16988dd6378b51b6cbecbc70953d7f0a2a123 Mon Sep 17 00:00:00 2001 +From b397bb7c1953419162639308f3d70d6a1ddc9213 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 30 Jan 2014 17:12:24 +0100 Subject: [PATCH] network/ifup.sh: handle $dns1 and $dns2 from "ip=" settings diff --git a/SOURCES/0108-network-net-lib.sh-parse-ibft-nameserver-settings.patch b/SOURCES/0108-network-net-lib.sh-parse-ibft-nameserver-settings.patch index 5c7b5b8..d7f7021 100644 --- a/SOURCES/0108-network-net-lib.sh-parse-ibft-nameserver-settings.patch +++ b/SOURCES/0108-network-net-lib.sh-parse-ibft-nameserver-settings.patch @@ -1,4 +1,4 @@ -From 3a64364dfccab4253c315755171702db7a31e187 Mon Sep 17 00:00:00 2001 +From 3d47b5124c9539740a4b3cfd587765879b3226cc Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 30 Jan 2014 17:11:43 +0100 Subject: [PATCH] network/net-lib.sh: parse ibft nameserver settings diff --git a/SOURCES/0109-dmsquash-live-dmsquash-liveiso-genrules.sh-s-loop0-l.patch b/SOURCES/0109-dmsquash-live-dmsquash-liveiso-genrules.sh-s-loop0-l.patch index 30662fa..284b005 100644 --- a/SOURCES/0109-dmsquash-live-dmsquash-liveiso-genrules.sh-s-loop0-l.patch +++ b/SOURCES/0109-dmsquash-live-dmsquash-liveiso-genrules.sh-s-loop0-l.patch @@ -1,4 +1,4 @@ -From c1c355698174807bf816f022f84303b460ec9e32 Mon Sep 17 00:00:00 2001 +From 5676a6d877fec50cf969369045788ff3ac59fdc0 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 28 Jan 2014 18:33:36 +0100 Subject: [PATCH] dmsquash-live/dmsquash-liveiso-genrules.sh: diff --git a/SOURCES/0110-base-rdsosreport.sh-add-dracut-version-to-rdsosrepor.patch b/SOURCES/0110-base-rdsosreport.sh-add-dracut-version-to-rdsosrepor.patch index a803689..63f3b35 100644 --- a/SOURCES/0110-base-rdsosreport.sh-add-dracut-version-to-rdsosrepor.patch +++ b/SOURCES/0110-base-rdsosreport.sh-add-dracut-version-to-rdsosrepor.patch @@ -1,4 +1,4 @@ -From ea373728fe7ab62b60f94cef8026e30974d7a6bd Mon Sep 17 00:00:00 2001 +From c127eb8021b4b40b2cc32d393515bf56fe441ee2 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 31 Jan 2014 15:33:05 +0100 Subject: [PATCH] base/rdsosreport.sh: add dracut version to rdsosreport diff --git a/SOURCES/0111-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch b/SOURCES/0111-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch index 2a7257e..2bc699d 100644 --- a/SOURCES/0111-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch +++ b/SOURCES/0111-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch @@ -1,4 +1,4 @@ -From 837d1da3cd3b4578f4a7d0a9ff40623cc01099f0 Mon Sep 17 00:00:00 2001 +From 8bde20bc6553f306a549f80742995daad31baa55 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 12 Dec 2013 09:20:53 +0100 Subject: [PATCH] fcoe: move uefi parsing to fcoe-uefi module diff --git a/SOURCES/0112-move-uefi-lib-to-a-seperate-module.patch b/SOURCES/0112-move-uefi-lib-to-a-seperate-module.patch index ab577ee..b2d08f1 100644 --- a/SOURCES/0112-move-uefi-lib-to-a-seperate-module.patch +++ b/SOURCES/0112-move-uefi-lib-to-a-seperate-module.patch @@ -1,4 +1,4 @@ -From b148bdea9edfbdd86f318ad363c55fb96a1e559a Mon Sep 17 00:00:00 2001 +From c26eb3eb3ace56e336817d007da039c058cf330f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 12 Dec 2013 09:49:06 +0100 Subject: [PATCH] move uefi-lib to a seperate module diff --git a/SOURCES/0113-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch b/SOURCES/0113-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch index 4c81a16..d2f1e53 100644 --- a/SOURCES/0113-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch +++ b/SOURCES/0113-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch @@ -1,4 +1,4 @@ -From 98bd5fbf129ac738345e52503fb37cc469fc5add Mon Sep 17 00:00:00 2001 +From 3bb36e45126e6c1d92b2cbe9b6f54261475ecdff Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 16 Dec 2013 12:30:26 +0100 Subject: [PATCH] dracut.spec: add 95fcoe-uefi and 99uefi-lib diff --git a/SOURCES/0114-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch b/SOURCES/0114-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch index e3680b4..671fbcd 100644 --- a/SOURCES/0114-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch +++ b/SOURCES/0114-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch @@ -1,4 +1,4 @@ -From 521662043e8d71830c3c1157f8408523f736f469 Mon Sep 17 00:00:00 2001 +From d802e985aed9dbe48f7b9165f3eddd0be7d47c27 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 7 Jan 2014 14:34:55 +0100 Subject: [PATCH] fcoe-uefi: do not include, if fcoe utils not installed diff --git a/SOURCES/0115-network-fix-dns-parsing-in-ip-parameter.patch b/SOURCES/0115-network-fix-dns-parsing-in-ip-parameter.patch index e53e344..25095ff 100644 --- a/SOURCES/0115-network-fix-dns-parsing-in-ip-parameter.patch +++ b/SOURCES/0115-network-fix-dns-parsing-in-ip-parameter.patch @@ -1,4 +1,4 @@ -From a3a5b817ebd6cece50e2cd9e03fe4279d9c2f7ba Mon Sep 17 00:00:00 2001 +From 36d3274050935419c90fd0c0ba71ec26bf4a1b4c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 7 Feb 2014 15:41:50 +0100 Subject: [PATCH] network:fix dns parsing in ip= parameter diff --git a/SOURCES/0116-skipcpio-return-something-at-end-of-program.patch b/SOURCES/0116-skipcpio-return-something-at-end-of-program.patch index 6271844..188ef05 100644 --- a/SOURCES/0116-skipcpio-return-something-at-end-of-program.patch +++ b/SOURCES/0116-skipcpio-return-something-at-end-of-program.patch @@ -1,4 +1,4 @@ -From a7604c770435477482bbe48c2336964fcef45b7b Mon Sep 17 00:00:00 2001 +From dc662386dc22b049c311e49c859c05a15647c4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 28 Jan 2014 16:41:08 -0300 Subject: [PATCH] skipcpio: return something at end of program diff --git a/SOURCES/0117-skipcpio-fixed-signatured-check.patch b/SOURCES/0117-skipcpio-fixed-signatured-check.patch index 2ce10db..bd3f37c 100644 --- a/SOURCES/0117-skipcpio-fixed-signatured-check.patch +++ b/SOURCES/0117-skipcpio-fixed-signatured-check.patch @@ -1,4 +1,4 @@ -From a7e6fb923190640d961db10ee109d38b6227536b Mon Sep 17 00:00:00 2001 +From 226004e007314a0fbb340aec0d5cf0db418a7d5c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 29 Jan 2014 08:35:47 +0100 Subject: [PATCH] skipcpio: fixed signatured check diff --git a/SOURCES/0118-network-ifup-do-not-ifup-an-already-setup-network-in.patch b/SOURCES/0118-network-ifup-do-not-ifup-an-already-setup-network-in.patch index 220ef31..cade690 100644 --- a/SOURCES/0118-network-ifup-do-not-ifup-an-already-setup-network-in.patch +++ b/SOURCES/0118-network-ifup-do-not-ifup-an-already-setup-network-in.patch @@ -1,4 +1,4 @@ -From 9baaf2ab4b26d648d46d3c330b75f60a598c401e Mon Sep 17 00:00:00 2001 +From 0c0ca2d9bce27b3005b9893a699ea325b0161c00 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 4 Feb 2014 12:02:05 +0100 Subject: [PATCH] network/ifup: do not ifup an already setup network interface diff --git a/SOURCES/0119-network-ifup-do-not-run-dhclient-twice-on-the-same-i.patch b/SOURCES/0119-network-ifup-do-not-run-dhclient-twice-on-the-same-i.patch index deea068..6ff55e1 100644 --- a/SOURCES/0119-network-ifup-do-not-run-dhclient-twice-on-the-same-i.patch +++ b/SOURCES/0119-network-ifup-do-not-run-dhclient-twice-on-the-same-i.patch @@ -1,4 +1,4 @@ -From e880049a4092d8231d0342c4e56ace87108ecd48 Mon Sep 17 00:00:00 2001 +From 054447fa23017df5a1774ce30082cb383be97cfa Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 4 Feb 2014 12:02:34 +0100 Subject: [PATCH] network/ifup: do not run dhclient twice on the same interface diff --git a/SOURCES/0120-nfs-nfsroot-symlink-dev-null-to-dev-nfs-as-a-marker-.patch b/SOURCES/0120-nfs-nfsroot-symlink-dev-null-to-dev-nfs-as-a-marker-.patch index f0b5f14..9e87fb7 100644 --- a/SOURCES/0120-nfs-nfsroot-symlink-dev-null-to-dev-nfs-as-a-marker-.patch +++ b/SOURCES/0120-nfs-nfsroot-symlink-dev-null-to-dev-nfs-as-a-marker-.patch @@ -1,4 +1,4 @@ -From 9175fd58469282c1ca87674cec43bec33f6164e6 Mon Sep 17 00:00:00 2001 +From 37a09c9cb6f22309820dd7a9ab26ea99bb7af72d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 5 Feb 2014 13:06:29 +0100 Subject: [PATCH] nfs/nfsroot: symlink /dev/null to /dev/nfs, as a marker for diff --git a/SOURCES/0121-systemd-dracut-pre-pivot-run-for-dev-nfs-root-and-cl.patch b/SOURCES/0121-systemd-dracut-pre-pivot-run-for-dev-nfs-root-and-cl.patch index 3b67168..2dee6d5 100644 --- a/SOURCES/0121-systemd-dracut-pre-pivot-run-for-dev-nfs-root-and-cl.patch +++ b/SOURCES/0121-systemd-dracut-pre-pivot-run-for-dev-nfs-root-and-cl.patch @@ -1,4 +1,4 @@ -From 6d392317b87c316c9a0ac4dd064ecd9f99b7767e Mon Sep 17 00:00:00 2001 +From 80f75fed99eb969e1d8ba9f16e28dec2446a7544 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 5 Feb 2014 13:08:54 +0100 Subject: [PATCH] systemd/dracut-pre-pivot: run for /dev/{nfs,root} and cleanup diff --git a/SOURCES/0122-new_dhcp_next_server-is-really-new_next_server.patch b/SOURCES/0122-new_dhcp_next_server-is-really-new_next_server.patch index 1253d08..3fc4b95 100644 --- a/SOURCES/0122-new_dhcp_next_server-is-really-new_next_server.patch +++ b/SOURCES/0122-new_dhcp_next_server-is-really-new_next_server.patch @@ -1,4 +1,4 @@ -From 6a0da312e0118208fa2799abf188755fbd97b479 Mon Sep 17 00:00:00 2001 +From 99ed45c2181819be473ae275bbf88df556cdff1c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 5 Feb 2014 12:10:39 -0800 Subject: [PATCH] new_dhcp_next_server is really new_next_server diff --git a/SOURCES/0123-dracut.sh-Fix-variable-name-typo.patch b/SOURCES/0123-dracut.sh-Fix-variable-name-typo.patch index c0883e7..5638317 100644 --- a/SOURCES/0123-dracut.sh-Fix-variable-name-typo.patch +++ b/SOURCES/0123-dracut.sh-Fix-variable-name-typo.patch @@ -1,4 +1,4 @@ -From 833db4ead461130d529bfc74f35a632f56283a19 Mon Sep 17 00:00:00 2001 +From 361eaeaf073d4d6f778d54ca4060f6b880e265f2 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 5 Feb 2014 10:06:51 +0000 Subject: [PATCH] dracut.sh: Fix variable name typo. diff --git a/SOURCES/0124-kernel-modules-add-sdhci_acpi-to-the-static-list-of-.patch b/SOURCES/0124-kernel-modules-add-sdhci_acpi-to-the-static-list-of-.patch index 8eed3ad..4f5b577 100644 --- a/SOURCES/0124-kernel-modules-add-sdhci_acpi-to-the-static-list-of-.patch +++ b/SOURCES/0124-kernel-modules-add-sdhci_acpi-to-the-static-list-of-.patch @@ -1,4 +1,4 @@ -From c473c3ee57a630b887a442149024d1f319a7c826 Mon Sep 17 00:00:00 2001 +From 9bbea8caf83fac26c800e154b5b72b0333b23e1b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 12 Feb 2014 11:22:14 +0100 Subject: [PATCH] kernel-modules: add sdhci_acpi to the static list of kernel diff --git a/SOURCES/0125-dracut-functions.sh-find_kernel_modules_by_path-fixe.patch b/SOURCES/0125-dracut-functions.sh-find_kernel_modules_by_path-fixe.patch index 14a42a0..f76e898 100644 --- a/SOURCES/0125-dracut-functions.sh-find_kernel_modules_by_path-fixe.patch +++ b/SOURCES/0125-dracut-functions.sh-find_kernel_modules_by_path-fixe.patch @@ -1,4 +1,4 @@ -From 648353b27209fa24e51f54a12f105b2d4f521183 Mon Sep 17 00:00:00 2001 +From 64c88c2f1d9576afc8b22a9d0c0feea5b51dfb64 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 17 Feb 2014 13:27:46 +0100 Subject: [PATCH] dracut-functions.sh:find_kernel_modules_by_path() fixed diff --git a/SOURCES/0126-iscsi-for-iBFT-read-the-initiator-name-from-the-corr.patch b/SOURCES/0126-iscsi-for-iBFT-read-the-initiator-name-from-the-corr.patch index 04a0be9..79f8ab6 100644 --- a/SOURCES/0126-iscsi-for-iBFT-read-the-initiator-name-from-the-corr.patch +++ b/SOURCES/0126-iscsi-for-iBFT-read-the-initiator-name-from-the-corr.patch @@ -1,4 +1,4 @@ -From 09e11165a6ca55ca0b445753695923cb22e5d635 Mon Sep 17 00:00:00 2001 +From 84dfea4d2a9660c7cecfafb6955d075306da2bcb Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 19 Feb 2014 11:49:34 +0100 Subject: [PATCH] iscsi: for iBFT read the initiator-name from the correct file diff --git a/SOURCES/0127-fcoe-uefi-try-all-FcoeBootDevice-variables-for-a-Dev.patch b/SOURCES/0127-fcoe-uefi-try-all-FcoeBootDevice-variables-for-a-Dev.patch index 4468606..66a8655 100644 --- a/SOURCES/0127-fcoe-uefi-try-all-FcoeBootDevice-variables-for-a-Dev.patch +++ b/SOURCES/0127-fcoe-uefi-try-all-FcoeBootDevice-variables-for-a-Dev.patch @@ -1,4 +1,4 @@ -From 7633ef988a8b1e7611f2b8a64452c2d588ff89fb Mon Sep 17 00:00:00 2001 +From 346fab9500e8da9f5f48fb07248bbd2fb6348968 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 19 Feb 2014 15:20:34 +0100 Subject: [PATCH] fcoe-uefi: try all FcoeBootDevice-* variables for a diff --git a/SOURCES/0128-dracut.sh-write-directly-to-the-output-file.patch b/SOURCES/0128-dracut.sh-write-directly-to-the-output-file.patch index bfdd9e6..da5a93b 100644 --- a/SOURCES/0128-dracut.sh-write-directly-to-the-output-file.patch +++ b/SOURCES/0128-dracut.sh-write-directly-to-the-output-file.patch @@ -1,4 +1,4 @@ -From 97dd91273c811b79f99c7a62df9cebc390c818c9 Mon Sep 17 00:00:00 2001 +From 6381b9445980aae6c8533fe74603c902a9125fc5 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 19 Feb 2014 15:22:39 +0100 Subject: [PATCH] dracut.sh: write directly to the output file diff --git a/SOURCES/0129-systemd-add-sys-kernel-config.mount.patch b/SOURCES/0129-systemd-add-sys-kernel-config.mount.patch index fe3260d..1fe81df 100644 --- a/SOURCES/0129-systemd-add-sys-kernel-config.mount.patch +++ b/SOURCES/0129-systemd-add-sys-kernel-config.mount.patch @@ -1,4 +1,4 @@ -From e90e9dc73381cf0c54472e9346b3f0bf94889b90 Mon Sep 17 00:00:00 2001 +From a367bed83602ce482132f36dfb6047261fb930db Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 5 Feb 2014 13:58:33 +0100 Subject: [PATCH] systemd: add sys-kernel-config.mount diff --git a/SOURCES/0130-systemd-add-70-uaccess.rules.patch b/SOURCES/0130-systemd-add-70-uaccess.rules.patch index 5fcdff0..ef4bfa4 100644 --- a/SOURCES/0130-systemd-add-70-uaccess.rules.patch +++ b/SOURCES/0130-systemd-add-70-uaccess.rules.patch @@ -1,4 +1,4 @@ -From 190222ce98756bdeac92c9fbcf34624fe756cddd Mon Sep 17 00:00:00 2001 +From da41507de95445d776787da82a2476837ebc9305 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 25 Feb 2014 12:33:30 +0100 Subject: [PATCH] systemd: add 70-uaccess.rules diff --git a/SOURCES/0131-Add-flag-to-toggle-hostonly-cmdline-storing-in-the-i.patch b/SOURCES/0131-Add-flag-to-toggle-hostonly-cmdline-storing-in-the-i.patch index 37dd767..4fd3401 100644 --- a/SOURCES/0131-Add-flag-to-toggle-hostonly-cmdline-storing-in-the-i.patch +++ b/SOURCES/0131-Add-flag-to-toggle-hostonly-cmdline-storing-in-the-i.patch @@ -1,4 +1,4 @@ -From 2b965be4f11584462fa891e4508c6b115de2a1ed Mon Sep 17 00:00:00 2001 +From 81c9e224820fa284806690fc64ac39c58e8760a3 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 25 Feb 2014 12:35:32 +0100 Subject: [PATCH] Add flag to toggle hostonly cmdline storing in the initramfs diff --git a/SOURCES/0132-default-conf-set-hostonly_cmdline-no.patch b/SOURCES/0132-default-conf-set-hostonly_cmdline-no.patch index 3037080..fbfbfae 100644 --- a/SOURCES/0132-default-conf-set-hostonly_cmdline-no.patch +++ b/SOURCES/0132-default-conf-set-hostonly_cmdline-no.patch @@ -1,4 +1,4 @@ -From 06eb3b80be3d4da642aeb05b37f567dd3d468a92 Mon Sep 17 00:00:00 2001 +From c2c437edbaab1630a9308dc81ffbfe0262f52d64 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 25 Feb 2014 12:34:41 +0100 Subject: [PATCH] default conf: set hostonly_cmdline == "no" diff --git a/SOURCES/0133-systemd-rootfs-generator.sh-generate-units-in-run-sy.patch b/SOURCES/0133-systemd-rootfs-generator.sh-generate-units-in-run-sy.patch index 9b3f939..14def70 100644 --- a/SOURCES/0133-systemd-rootfs-generator.sh-generate-units-in-run-sy.patch +++ b/SOURCES/0133-systemd-rootfs-generator.sh-generate-units-in-run-sy.patch @@ -1,4 +1,4 @@ -From 40df7e9cc77e1cff9d3bf53eec6eea1dfbbc2d8a Mon Sep 17 00:00:00 2001 +From 5a3b267d06cc81fcb7e0374c7656a1f48d031497 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 25 Feb 2014 12:54:28 +0100 Subject: [PATCH] systemd/rootfs-generator.sh: generate units in diff --git a/SOURCES/0134-ifcfg-write-ifcfg.sh-do-not-bind-s390-to-MAC-if-SUBC.patch b/SOURCES/0134-ifcfg-write-ifcfg.sh-do-not-bind-s390-to-MAC-if-SUBC.patch index 16ddb06..e0dbb3e 100644 --- a/SOURCES/0134-ifcfg-write-ifcfg.sh-do-not-bind-s390-to-MAC-if-SUBC.patch +++ b/SOURCES/0134-ifcfg-write-ifcfg.sh-do-not-bind-s390-to-MAC-if-SUBC.patch @@ -1,4 +1,4 @@ -From fc4298a5dd3605db4e468ae58efa223775dbf0d0 Mon Sep 17 00:00:00 2001 +From ea6bc75ccbb626c62062bdf2d3ca2a90dbb9467d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 25 Feb 2014 13:05:11 +0100 Subject: [PATCH] ifcfg/write-ifcfg.sh: do not bind s390 to MAC if SUBCHANNELS diff --git a/SOURCES/0135-network-net-lib.sh-wait_for_ipv6_auto-also-wait-for-.patch b/SOURCES/0135-network-net-lib.sh-wait_for_ipv6_auto-also-wait-for-.patch index 4318d42..9482a2c 100644 --- a/SOURCES/0135-network-net-lib.sh-wait_for_ipv6_auto-also-wait-for-.patch +++ b/SOURCES/0135-network-net-lib.sh-wait_for_ipv6_auto-also-wait-for-.patch @@ -1,4 +1,4 @@ -From db7651a8bce141a09df6010f992d25d532cef896 Mon Sep 17 00:00:00 2001 +From 61fe0031683c8e1c36ca6ca3022ef6243bfae268 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 25 Feb 2014 13:31:29 +0100 Subject: [PATCH] network/net-lib.sh:wait_for_ipv6_auto() also wait for the diff --git a/SOURCES/0136-network-dhclient-script.sh-DHCP-IPv6-interface-setup.patch b/SOURCES/0136-network-dhclient-script.sh-DHCP-IPv6-interface-setup.patch index 333debe..2304094 100644 --- a/SOURCES/0136-network-dhclient-script.sh-DHCP-IPv6-interface-setup.patch +++ b/SOURCES/0136-network-dhclient-script.sh-DHCP-IPv6-interface-setup.patch @@ -1,4 +1,4 @@ -From 012f82f7ef99881ce41c231c774f838f49e59781 Mon Sep 17 00:00:00 2001 +From 54c9094e2e25b13fa90a7fcce574e6e4a52df973 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 25 Feb 2014 14:04:05 +0100 Subject: [PATCH] network/dhclient-script.sh:DHCP IPv6 interface setup diff --git a/SOURCES/0137-network-IPv6-status-wait-for-tentative-flag-to-be-cl.patch b/SOURCES/0137-network-IPv6-status-wait-for-tentative-flag-to-be-cl.patch index 6592e6a..147eb85 100644 --- a/SOURCES/0137-network-IPv6-status-wait-for-tentative-flag-to-be-cl.patch +++ b/SOURCES/0137-network-IPv6-status-wait-for-tentative-flag-to-be-cl.patch @@ -1,4 +1,4 @@ -From e25a74d851509ac7bc644de6986bedc06bfe748d Mon Sep 17 00:00:00 2001 +From 30e20744477c18a70c4f487275f2a8e957fca555 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 27 Feb 2014 12:11:20 +0100 Subject: [PATCH] network: IPv6 status, wait for tentative flag to be cleared diff --git a/SOURCES/0138-network-merge-setup_net_-netif.ok-and-net.-netif.did.patch b/SOURCES/0138-network-merge-setup_net_-netif.ok-and-net.-netif.did.patch index ac132b4..aa65db1 100644 --- a/SOURCES/0138-network-merge-setup_net_-netif.ok-and-net.-netif.did.patch +++ b/SOURCES/0138-network-merge-setup_net_-netif.ok-and-net.-netif.did.patch @@ -1,4 +1,4 @@ -From 8b77ffc4d82301e6a674e1d47aa8aa3872f9bc5e Mon Sep 17 00:00:00 2001 +From 853897808af835b23edacbd815087df3543d835f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 28 Feb 2014 10:36:12 +0100 Subject: [PATCH] network: merge setup_net_$netif.ok and net.$netif.did-setup diff --git a/SOURCES/0139-systemd-add-systemd-sysctl-service.patch b/SOURCES/0139-systemd-add-systemd-sysctl-service.patch index bce089a..9ba85f2 100644 --- a/SOURCES/0139-systemd-add-systemd-sysctl-service.patch +++ b/SOURCES/0139-systemd-add-systemd-sysctl-service.patch @@ -1,4 +1,4 @@ -From 902c42afdd0af97dfb3dd26add19de0367857c3a Mon Sep 17 00:00:00 2001 +From 61bad12d4415c00e9b0d3d0c8c321a82f5de8644 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 28 Feb 2014 12:03:24 +0100 Subject: [PATCH] systemd: add systemd-sysctl service diff --git a/SOURCES/0140-add-default-values-in-fstab_lines.patch b/SOURCES/0140-add-default-values-in-fstab_lines.patch index 5976e9a..789e473 100644 --- a/SOURCES/0140-add-default-values-in-fstab_lines.patch +++ b/SOURCES/0140-add-default-values-in-fstab_lines.patch @@ -1,4 +1,4 @@ -From cea62a2a68db9d63380d279acf64b672442d2f40 Mon Sep 17 00:00:00 2001 +From d52c4a761a5232f9d92cae90259fbb00e3859a9f Mon Sep 17 00:00:00 2001 From: Dave Young Date: Thu, 27 Feb 2014 10:44:23 +0800 Subject: [PATCH] add default values in fstab_lines diff --git a/SOURCES/0141-test-add-missing-Makefile.testdir.patch b/SOURCES/0141-test-add-missing-Makefile.testdir.patch index 50e8e23..969b4c1 100644 --- a/SOURCES/0141-test-add-missing-Makefile.testdir.patch +++ b/SOURCES/0141-test-add-missing-Makefile.testdir.patch @@ -1,4 +1,4 @@ -From 6ccf39ef1b96d4992abd6b6e95a1f6945592accc Mon Sep 17 00:00:00 2001 +From 8482be832cc24bf2676dca3dcebd2ee82396ab37 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 28 Feb 2014 12:57:57 +0100 Subject: [PATCH] test: add missing Makefile.testdir diff --git a/SOURCES/0142-test-Makefile-add-SKIP-env-to-skip-certain-tests.patch b/SOURCES/0142-test-Makefile-add-SKIP-env-to-skip-certain-tests.patch index 3f9b019..9ce8905 100644 --- a/SOURCES/0142-test-Makefile-add-SKIP-env-to-skip-certain-tests.patch +++ b/SOURCES/0142-test-Makefile-add-SKIP-env-to-skip-certain-tests.patch @@ -1,4 +1,4 @@ -From dd826ee50d06b8f8e22e78e56e7d09bd5368245f Mon Sep 17 00:00:00 2001 +From e96c0100113eb35a476fdb7949d5e347a81281a2 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 28 Feb 2014 13:25:39 +0100 Subject: [PATCH] test/Makefile: add SKIP env to skip certain tests diff --git a/SOURCES/0143-test-TEST-50-MULTINIC-client-init.sh-skip-MAC-marker.patch b/SOURCES/0143-test-TEST-50-MULTINIC-client-init.sh-skip-MAC-marker.patch index 723145d..61fdcf8 100644 --- a/SOURCES/0143-test-TEST-50-MULTINIC-client-init.sh-skip-MAC-marker.patch +++ b/SOURCES/0143-test-TEST-50-MULTINIC-client-init.sh-skip-MAC-marker.patch @@ -1,4 +1,4 @@ -From f9b2de9328b5d11de0a731d4724576ad7a4ff2b0 Mon Sep 17 00:00:00 2001 +From dccf47fd55e99700c930a23327bfb6647501c38a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 28 Feb 2014 13:26:13 +0100 Subject: [PATCH] test/TEST-50-MULTINIC/client-init.sh: skip MAC marker files diff --git a/SOURCES/0144-Add-no-hostonly-cmdline-option-handling-for-getopt.patch b/SOURCES/0144-Add-no-hostonly-cmdline-option-handling-for-getopt.patch index deab635..48d6c85 100644 --- a/SOURCES/0144-Add-no-hostonly-cmdline-option-handling-for-getopt.patch +++ b/SOURCES/0144-Add-no-hostonly-cmdline-option-handling-for-getopt.patch @@ -1,4 +1,4 @@ -From c401e97b0b649385debfb61c8e5e24f81810466f Mon Sep 17 00:00:00 2001 +From e2e32cd02febaf26b9cd0b17de9f02256dd72cb2 Mon Sep 17 00:00:00 2001 From: WANG Chao Date: Mon, 3 Mar 2014 15:22:00 +0800 Subject: [PATCH] Add -[-no]-hostonly-cmdline option handling for getopt diff --git a/SOURCES/0145-dracut-don-t-let-devices-timeout.patch b/SOURCES/0145-dracut-don-t-let-devices-timeout.patch index 7901b85..af8c6a9 100644 --- a/SOURCES/0145-dracut-don-t-let-devices-timeout.patch +++ b/SOURCES/0145-dracut-don-t-let-devices-timeout.patch @@ -1,4 +1,4 @@ -From f90bc8c75438c5a7e08288343edbb42f49d42178 Mon Sep 17 00:00:00 2001 +From 711030d61d8dbf195d416fbd23759feac0303c15 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 4 Mar 2014 13:46:14 +0100 Subject: [PATCH] dracut: don't let devices timeout diff --git a/SOURCES/0146-Do-not-wait_for_dev-if-hostonly_cmdline-not-set.patch b/SOURCES/0146-Do-not-wait_for_dev-if-hostonly_cmdline-not-set.patch index 8134630..c65863a 100644 --- a/SOURCES/0146-Do-not-wait_for_dev-if-hostonly_cmdline-not-set.patch +++ b/SOURCES/0146-Do-not-wait_for_dev-if-hostonly_cmdline-not-set.patch @@ -1,4 +1,4 @@ -From 285da6473b9b48a6eddc30c82964cdd2fca7c0a0 Mon Sep 17 00:00:00 2001 +From 84c66ac857b3cb6f5fa3ba597d298350753d79bf Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 6 Mar 2014 09:54:36 +0100 Subject: [PATCH] Do not wait_for_dev if hostonly_cmdline not set diff --git a/SOURCES/0147-systemd-dracut-shutdown.service-make-failure-non-fat.patch b/SOURCES/0147-systemd-dracut-shutdown.service-make-failure-non-fat.patch index 6eb9db8..3a7df59 100644 --- a/SOURCES/0147-systemd-dracut-shutdown.service-make-failure-non-fat.patch +++ b/SOURCES/0147-systemd-dracut-shutdown.service-make-failure-non-fat.patch @@ -1,4 +1,4 @@ -From ec67b82bd539625d35cdbe6e410a4e3bc16e25ce Mon Sep 17 00:00:00 2001 +From af1154fdce0e6fe0e8cb1216cc5e2f420eb03975 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 12 Mar 2014 15:39:08 +0100 Subject: [PATCH] systemd/dracut-shutdown.service: make failure non-fatal diff --git a/SOURCES/0148-network-dhclient-script-do-PREINIT6-for-DHCP6.patch b/SOURCES/0148-network-dhclient-script-do-PREINIT6-for-DHCP6.patch index f12d0a5..eca9909 100644 --- a/SOURCES/0148-network-dhclient-script-do-PREINIT6-for-DHCP6.patch +++ b/SOURCES/0148-network-dhclient-script-do-PREINIT6-for-DHCP6.patch @@ -1,4 +1,4 @@ -From f7a3db1abaf437d50615a54448d9d5f45efe8cf4 Mon Sep 17 00:00:00 2001 +From 89f2586ae93e948cb9c41f971423431e8cccf236 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 17 Mar 2014 13:00:17 +0100 Subject: [PATCH] network:dhclient-script do PREINIT6 for DHCP6 diff --git a/SOURCES/0149-shutdown-if-kexec-failed-do-a-simple-reboot.patch b/SOURCES/0149-shutdown-if-kexec-failed-do-a-simple-reboot.patch index de3238a..f50f81c 100644 --- a/SOURCES/0149-shutdown-if-kexec-failed-do-a-simple-reboot.patch +++ b/SOURCES/0149-shutdown-if-kexec-failed-do-a-simple-reboot.patch @@ -1,4 +1,4 @@ -From 1dedc040181895fc95819fc6546d6862f3aba0a5 Mon Sep 17 00:00:00 2001 +From 9d75fd3b62be29813c9c30a88e3f1bacc921847a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 18 Mar 2014 13:21:22 +0100 Subject: [PATCH] shutdown: if kexec failed, do a simple reboot diff --git a/SOURCES/0150-dracut-initramfs-restore-fix-unpacking-with-early-mi.patch b/SOURCES/0150-dracut-initramfs-restore-fix-unpacking-with-early-mi.patch index 1f1623e..4236601 100644 --- a/SOURCES/0150-dracut-initramfs-restore-fix-unpacking-with-early-mi.patch +++ b/SOURCES/0150-dracut-initramfs-restore-fix-unpacking-with-early-mi.patch @@ -1,4 +1,4 @@ -From 0573e86a95374ce5e8816b1771634db049c70a3f Mon Sep 17 00:00:00 2001 +From c2196a25b7ff4bd54f3cab64392535b755e4ff88 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 20 Mar 2014 13:18:13 +0100 Subject: [PATCH] dracut-initramfs-restore: fix unpacking with early microcode diff --git a/SOURCES/0151-fcoe-wait-for-lldpad-to-be-ready.patch b/SOURCES/0151-fcoe-wait-for-lldpad-to-be-ready.patch index c0aaa10..8b9b426 100644 --- a/SOURCES/0151-fcoe-wait-for-lldpad-to-be-ready.patch +++ b/SOURCES/0151-fcoe-wait-for-lldpad-to-be-ready.patch @@ -1,4 +1,4 @@ -From 17445cb35ff2f626ccde07de61106bbcd6d0b268 Mon Sep 17 00:00:00 2001 +From bdb6683d6feb744c85b416ea4cb48e7c6a49aaa9 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 25 Mar 2014 15:28:19 +0100 Subject: [PATCH] fcoe: wait for lldpad to be ready diff --git a/SOURCES/0152-network-handle-ip-dhcp6-for-all-interfaces.patch b/SOURCES/0152-network-handle-ip-dhcp6-for-all-interfaces.patch index ce5340a..9e0e749 100644 --- a/SOURCES/0152-network-handle-ip-dhcp6-for-all-interfaces.patch +++ b/SOURCES/0152-network-handle-ip-dhcp6-for-all-interfaces.patch @@ -1,4 +1,4 @@ -From 8cfcacd3f95621b71766071881a3f5a11a6001de Mon Sep 17 00:00:00 2001 +From 42896820ba1bba0da86e783ac6e1e4951a9acf88 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 25 Mar 2014 15:39:56 +0100 Subject: [PATCH] network: handle "ip=dhcp6" for all interfaces diff --git a/SOURCES/0153-lsinitrd.sh-prevent-construct.patch b/SOURCES/0153-lsinitrd.sh-prevent-construct.patch index a6ad8ef..745b5bd 100644 --- a/SOURCES/0153-lsinitrd.sh-prevent-construct.patch +++ b/SOURCES/0153-lsinitrd.sh-prevent-construct.patch @@ -1,4 +1,4 @@ -From 2819d1e4445b8be42fc6cbf0827ce4a00c3e66bf Mon Sep 17 00:00:00 2001 +From 7031115695bf014f39b4efc32a3e71a11daebfbc Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 27 Mar 2014 09:27:53 +0100 Subject: [PATCH] lsinitrd.sh: prevent < <$() construct diff --git a/SOURCES/0154-network-DCHPv6-set-valid_lft-and-preferred_lft.patch b/SOURCES/0154-network-DCHPv6-set-valid_lft-and-preferred_lft.patch index b61341f..dc46150 100644 --- a/SOURCES/0154-network-DCHPv6-set-valid_lft-and-preferred_lft.patch +++ b/SOURCES/0154-network-DCHPv6-set-valid_lft-and-preferred_lft.patch @@ -1,4 +1,4 @@ -From 02d602fe7014e39edf17f25643e3c3d1aa36c874 Mon Sep 17 00:00:00 2001 +From 69acbc47356b56a03a331b8be57ed83af2687c8d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 27 Mar 2014 12:31:23 +0100 Subject: [PATCH] network: DCHPv6: set valid_lft and preferred_lft diff --git a/SOURCES/0155-dm-add-dm-cache-modules.patch b/SOURCES/0155-dm-add-dm-cache-modules.patch index 8398925..33dba80 100644 --- a/SOURCES/0155-dm-add-dm-cache-modules.patch +++ b/SOURCES/0155-dm-add-dm-cache-modules.patch @@ -1,4 +1,4 @@ -From 863c6c0a8e1507feda51f2e310140c077841ff46 Mon Sep 17 00:00:00 2001 +From db1b5a38e9e80b2093763b7c3cdf65ddb02cd705 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 27 Mar 2014 12:34:40 +0100 Subject: [PATCH] dm: add dm-cache modules diff --git a/SOURCES/0156-fcoe-workaround-fcoe-timing-issues.patch b/SOURCES/0156-fcoe-workaround-fcoe-timing-issues.patch index b6ff190..60280b2 100644 --- a/SOURCES/0156-fcoe-workaround-fcoe-timing-issues.patch +++ b/SOURCES/0156-fcoe-workaround-fcoe-timing-issues.patch @@ -1,4 +1,4 @@ -From 876b463114b26bf33f71589ad99860efadc8d42e Mon Sep 17 00:00:00 2001 +From 4c2d48d5c4449789018024c3d9f402f5108e9a68 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 31 Mar 2014 16:21:49 +0200 Subject: [PATCH] fcoe: workaround fcoe timing issues diff --git a/SOURCES/0157-Add-legacy-flag-l-to-lz4-and-update-magic-number.patch b/SOURCES/0157-Add-legacy-flag-l-to-lz4-and-update-magic-number.patch index b20cd15..f45a660 100644 --- a/SOURCES/0157-Add-legacy-flag-l-to-lz4-and-update-magic-number.patch +++ b/SOURCES/0157-Add-legacy-flag-l-to-lz4-and-update-magic-number.patch @@ -1,4 +1,4 @@ -From dea5f0f06b306b786dda5af59f7a4d54afd3c040 Mon Sep 17 00:00:00 2001 +From 07c4a2fce5ddc0b6266526911586f1bd36f5700f Mon Sep 17 00:00:00 2001 From: Alexander Tsoy Date: Wed, 26 Feb 2014 15:50:17 +0400 Subject: [PATCH] Add legacy flag (-l) to lz4 and update magic number diff --git a/SOURCES/0158-fs-lib-always-install-fsck.-fs-if-present.patch b/SOURCES/0158-fs-lib-always-install-fsck.-fs-if-present.patch index 68d0172..c8028e2 100644 --- a/SOURCES/0158-fs-lib-always-install-fsck.-fs-if-present.patch +++ b/SOURCES/0158-fs-lib-always-install-fsck.-fs-if-present.patch @@ -1,4 +1,4 @@ -From c4bcf133dc4a56eb2ce21bec7a3c3bf7ef67c578 Mon Sep 17 00:00:00 2001 +From 4b07c26d33c5b2ab1e4d2e98c88e787bdf032917 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 4 Apr 2014 11:33:02 +0200 Subject: [PATCH] fs-lib: always install fsck.$fs, if present diff --git a/SOURCES/0159-ifcfg-write-ifcfg.sh-turn-on-IPV6INIT-if-any-inet6-a.patch b/SOURCES/0159-ifcfg-write-ifcfg.sh-turn-on-IPV6INIT-if-any-inet6-a.patch index 2daafab..303048a 100644 --- a/SOURCES/0159-ifcfg-write-ifcfg.sh-turn-on-IPV6INIT-if-any-inet6-a.patch +++ b/SOURCES/0159-ifcfg-write-ifcfg.sh-turn-on-IPV6INIT-if-any-inet6-a.patch @@ -1,4 +1,4 @@ -From 76251217e6adf885eea9780e7a5f07abe9179fc2 Mon Sep 17 00:00:00 2001 +From f1ea5376ed00e4e18b3829e4f267973bb9816f72 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 3 Apr 2014 08:53:09 +0200 Subject: [PATCH] ifcfg/write-ifcfg.sh: turn on IPV6INIT, if any inet6 address diff --git a/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch b/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch index 027bd05..11ffe95 100644 --- a/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch +++ b/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch @@ -1,4 +1,4 @@ -From 89353cd0cca255a5639e40992d58b8de596b66fb Mon Sep 17 00:00:00 2001 +From e1021bd2c1ece36c5a92b7282e0f452d9d1ececc Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 28 Apr 2014 12:45:44 +0200 Subject: [PATCH] dracut-functions.sh: add /lib/modules/*/{extras|weak-updates} diff --git a/SOURCES/0161-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch b/SOURCES/0161-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch new file mode 100644 index 0000000..81c074e --- /dev/null +++ b/SOURCES/0161-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch @@ -0,0 +1,37 @@ +From f077a200564b7197048003685a153aa1b2b3e306 Mon Sep 17 00:00:00 2001 +From: WANG Chao +Date: Tue, 1 Apr 2014 15:20:49 +0800 +Subject: [PATCH] fstab: do not mount and fsck from fstab if using systemd + +If using systemd in initramfs, we could run into a race condition when +dracut and systemd both are trying to mount and run fsck for the same +filesystem, and mount or fsck could be a failure. + +To fix such failure, we should use systemd to mount/fsck from /etc/fstab +only. + +v2: check $DRACUT_SYSTEMD suggested by Alexander Tsoy + +Signed-off-by: WANG Chao +(cherry picked from commit e920bfb1e8a5917e7b0f360d1c51d200db3acbfd) +--- + modules.d/95fstab-sys/mount-sys.sh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh +index 12711a0..a237810 100755 +--- a/modules.d/95fstab-sys/mount-sys.sh ++++ b/modules.d/95fstab-sys/mount-sys.sh +@@ -27,7 +27,11 @@ fstab_mount() { + return 0 + } + +-[ -f /etc/fstab ] && fstab_mount /etc/fstab ++# systemd will mount and run fsck from /etc/fstab and we don't want to ++# run into a race condition. ++if [ -z "$DRACUT_SYSTEMD" ]; then ++ [ -f /etc/fstab ] && fstab_mount /etc/fstab ++fi + + # prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys + if [ -f $NEWROOT/etc/fstab.sys ]; then diff --git a/SOURCES/0161-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch b/SOURCES/0161-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch deleted file mode 100644 index 37c7d95..0000000 --- a/SOURCES/0161-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch +++ /dev/null @@ -1,63 +0,0 @@ -From df308c56c5e917e24d57357797e213a792fdeeb8 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 4 Apr 2014 12:48:03 +0200 -Subject: [PATCH] ifcfg: do not bind persistent interface names to HWADDR - -(cherry picked from commit fb0e5184a6506185998fd12d151f7d34d07c07b3) ---- - modules.d/40network/net-lib.sh | 27 +++++++++++++++++++++++++++ - modules.d/45ifcfg/write-ifcfg.sh | 6 +++++- - 2 files changed, 32 insertions(+), 1 deletion(-) - -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 7430e4c..5d4ae32 100755 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -516,3 +516,30 @@ find_iface_with_link() { - done - return 1 - } -+ -+is_persistent_ethernet_name() { -+ [ -f /sys/class/net/$netif/addr_assign_type ] || return 1 -+ [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] || return 1 -+ -+ case "$1" in -+ # udev persistent interface names -+ eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*) -+ ;; -+ eno[0-9]|eno[0-9][0-9]|eno[0-9][0-9][0-9]*) -+ ;; -+ ens[0-9]|ens[0-9][0-9]|ens[0-9][0-9][0-9]*) -+ ;; -+ enp[0-9]s[0-9]*|enp[0-9][0-9]s[0-9]*|enp[0-9][0-9][0-9]*s[0-9]*) -+ ;; -+ enP*p[0-9]s[0-9]*|enP*p[0-9][0-9]s[0-9]*|enP*p[0-9][0-9][0-9]*s[0-9]*) -+ ;; -+ # biosdevname -+ em[0-9]|em[0-9][0-9]|em[0-9][0-9][0-9]*) -+ ;; -+ p[0-9]p[0-9]*|p[0-9][0-9]p[0-9]*|p[0-9][0-9][0-9]*p[0-9]*) -+ ;; -+ *) -+ return 1 -+ esac -+ return 0 -+} -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 486c69a..2631fbe 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -164,7 +164,11 @@ for netup in /tmp/net.*.did-setup ; do - { - [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" - if ! print_s390 $netif; then -- [ -n "$macaddr" ] || echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" -+ if [ -z "$macaddr" ] && \ -+ ! is_persistent_ethernet_name "$netif" && \ -+ [ -f /sys/class/net/$netif/address ]; then -+ echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" -+ fi - fi - echo "TYPE=Ethernet" - echo "NAME=\"$netif\"" diff --git a/SOURCES/0162-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch b/SOURCES/0162-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch deleted file mode 100644 index cc8b3f7..0000000 --- a/SOURCES/0162-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8edfe0d0d1758f95327ee2bc7ff8c86fa1f08f31 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 4 Apr 2014 12:52:39 +0200 -Subject: [PATCH] ifcfg: only bind to HWADDR, if addr_assign_type == 0 - -/sys/class/net/$netif/addr_assign_type is != 0 for random MAC address -interfaces - -(cherry picked from commit 2e094b20a6875fdb0a7ef8772e3d7688ad91c036) ---- - modules.d/40network/net-lib.sh | 3 --- - modules.d/45ifcfg/write-ifcfg.sh | 2 ++ - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 5d4ae32..d53e1a6 100755 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -518,9 +518,6 @@ find_iface_with_link() { - } - - is_persistent_ethernet_name() { -- [ -f /sys/class/net/$netif/addr_assign_type ] || return 1 -- [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] || return 1 -- - case "$1" in - # udev persistent interface names - eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*) -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 2631fbe..5dc351d 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -166,6 +166,8 @@ for netup in /tmp/net.*.did-setup ; do - if ! print_s390 $netif; then - if [ -z "$macaddr" ] && \ - ! is_persistent_ethernet_name "$netif" && \ -+ [ -f /sys/class/net/$netif/addr_assign_type ] && \ -+ [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] && \ - [ -f /sys/class/net/$netif/address ]; then - echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" - fi diff --git a/SOURCES/0162-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch b/SOURCES/0162-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch new file mode 100644 index 0000000..62c4b3a --- /dev/null +++ b/SOURCES/0162-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch @@ -0,0 +1,29 @@ +From 915618bc4fbbc631bf7661506b85fc5758f3ce26 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 3 Apr 2014 08:54:27 +0200 +Subject: [PATCH] lvm:module-setup.sh: check for existance of + 69-dm-lvm-metad.rules + +Before modifying 69-dm-lvm-metad.rules, we should check for the +existance first. Otherwise this results in error messages on +distributions (debian), which do not ship these rules. + +(cherry picked from commit 12819a579900b9691e2bfaf14e76fbb025851530) +--- + modules.d/90lvm/module-setup.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh +index 1c962d5..4a49fc7 100755 +--- a/modules.d/90lvm/module-setup.sh ++++ b/modules.d/90lvm/module-setup.sh +@@ -78,7 +78,8 @@ install() { + inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules + + # Do not run lvmetad update via pvscan in udev rule - lvmetad is not running yet in dracut! +- if grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then ++ if [[ -f ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ]] && \ ++ grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then + sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules + sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules + sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules diff --git a/SOURCES/0163-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch b/SOURCES/0163-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch new file mode 100644 index 0000000..81aaeb3 --- /dev/null +++ b/SOURCES/0163-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch @@ -0,0 +1,38 @@ +From 251d5b65e331b89249d4ce1b626a738874dfef06 Mon Sep 17 00:00:00 2001 +From: WANG Chao +Date: Thu, 3 Apr 2014 15:49:26 +0800 +Subject: [PATCH] dracut-initqueue service runs before remote-fs-pre.target + +With the following commit, dracut doesn't mount anything from /etc/fstab + +commit e920bfb +Author: WANG Chao +Date: Tue Apr 1 15:20:49 2014 +0800 + + fstab: do not mount and fsck from fstab if using systemd + +But systemd doesn't mount nfs at all, because no unit is pulling in +remote-fs.target. + +dracut must pull in these remote fs mount and all these remote mounts +should start only after network is up (ie. after dracut-initqueue). + +Signed-off-by: WANG Chao +(cherry picked from commit b31250e7e6e6e104674dc304ba74965bb56074d6) +--- + modules.d/98systemd/dracut-initqueue.service | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules.d/98systemd/dracut-initqueue.service b/modules.d/98systemd/dracut-initqueue.service +index 03dcc4e..1b9e701 100644 +--- a/modules.d/98systemd/dracut-initqueue.service ++++ b/modules.d/98systemd/dracut-initqueue.service +@@ -11,6 +11,8 @@ + Description=dracut initqueue hook + Documentation=man:dracut-initqueue.service(8) + DefaultDependencies=no ++Before=remote-fs-pre.target ++Wants=remote-fs-pre.target + After=systemd-udev-trigger.service + Wants=systemd-udev-trigger.service + ConditionPathExists=/etc/initrd-release diff --git a/SOURCES/0163-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch b/SOURCES/0163-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch deleted file mode 100644 index ef93484..0000000 --- a/SOURCES/0163-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3f286a37fcfdb819b020527db8673ca659687b75 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 16 May 2014 13:32:47 +0200 -Subject: [PATCH] ifcfg/write-ifcfg.sh: include net-lib.sh - -otherwise is_persistent_ethernet_name() is missing - -(cherry picked from commit 8fa1afb65cef30d56ce2e141b0b594cf780120a1) ---- - modules.d/45ifcfg/write-ifcfg.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 5dc351d..e1e2448 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -3,6 +3,8 @@ - # ex: ts=8 sw=4 sts=4 et filetype=sh - - # NFS root might have reached here before /tmp/net.ifaces was written -+type is_persistent_ethernet_name >/dev/null 2>&1 || . /lib/net-lib.sh -+ - udevadm settle --timeout=30 - - if [ -e /tmp/bridge.info ]; then diff --git a/SOURCES/0164-Do-not-reload-systemd-with-wait_for_dev.patch b/SOURCES/0164-Do-not-reload-systemd-with-wait_for_dev.patch deleted file mode 100644 index 4376748..0000000 --- a/SOURCES/0164-Do-not-reload-systemd-with-wait_for_dev.patch +++ /dev/null @@ -1,103 +0,0 @@ -From a110aa35c4e91e2f93c4fc2c7e83120433280393 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 5 Feb 2014 13:12:29 +0100 -Subject: [PATCH] Do not reload systemd with wait_for_dev - -(cherry picked from commit 352d557d4d94042e321b4acc81eeab8691e19f42) ---- - modules.d/90dmsquash-live/dmsquash-live-genrules.sh | 2 +- - modules.d/90dmsquash-live/parse-dmsquash-live.sh | 2 +- - modules.d/90livenet/parse-livenet.sh | 2 +- - modules.d/90lvm/parse-lvm.sh | 2 +- - modules.d/95iscsi/iscsiroot.sh | 2 +- - modules.d/95nbd/nbdroot.sh | 2 +- - modules.d/95nbd/parse-nbdroot.sh | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh -index b27fccc..0f51ed4 100755 ---- a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh -+++ b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh -@@ -9,7 +9,7 @@ case "$root" in - printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \ - ${root#live:/dev/} - } >> /etc/udev/rules.d/99-live-squash.rules -- wait_for_dev "${root#live:}" -+ wait_for_dev -n "${root#live:}" - ;; - live:*) - if [ -f "${root#live:}" ]; then -diff --git a/modules.d/90dmsquash-live/parse-dmsquash-live.sh b/modules.d/90dmsquash-live/parse-dmsquash-live.sh -index a5564e2..6e54dfe 100755 ---- a/modules.d/90dmsquash-live/parse-dmsquash-live.sh -+++ b/modules.d/90dmsquash-live/parse-dmsquash-live.sh -@@ -56,4 +56,4 @@ info "root was $liveroot, is now $root" - # make sure that init doesn't complain - [ -z "$root" ] && root="live" - --wait_for_dev /dev/mapper/live-rw -+wait_for_dev -n /dev/mapper/live-rw -diff --git a/modules.d/90livenet/parse-livenet.sh b/modules.d/90livenet/parse-livenet.sh -index 6c847ba..a6b2842 100755 ---- a/modules.d/90livenet/parse-livenet.sh -+++ b/modules.d/90livenet/parse-livenet.sh -@@ -27,7 +27,7 @@ if get_url_handler "$liveurl" >/dev/null; then - netroot="livenet:$liveurl" - root="livenet" # quiet complaints from init - rootok=1 -- wait_for_dev /dev/root -+ wait_for_dev -n /dev/root - else - info "livenet: no url handler for $liveurl" - fi -diff --git a/modules.d/90lvm/parse-lvm.sh b/modules.d/90lvm/parse-lvm.sh -index 74e1d43..d69cb45 100755 ---- a/modules.d/90lvm/parse-lvm.sh -+++ b/modules.d/90lvm/parse-lvm.sh -@@ -13,7 +13,7 @@ if ! getargbool 1 rd.lvm -d -n rd_NO_LVM \ - rm -f -- /etc/udev/rules.d/64-lvm*.rules - else - for dev in $LV_DEVS; do -- wait_for_dev "/dev/$dev" -+ wait_for_dev -n "/dev/$dev" - done - fi - -diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 54f4990..1de6fb7 100755 ---- a/modules.d/95iscsi/iscsiroot.sh -+++ b/modules.d/95iscsi/iscsiroot.sh -@@ -156,7 +156,7 @@ handle_netroot() - printf 'SYMLINK=="disk/by-path/*-iscsi-*-%s", SYMLINK+="root"\n' $iscsi_lun >> /etc/udev/rules.d/99-iscsi-root.rules - udevadm control --reload - write_fs_tab /dev/root -- wait_for_dev /dev/root -+ wait_for_dev -n /dev/root - - # install mount script - [ -z "$DRACUT_SYSTEMD" ] && \ -diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh -index 2e9d917..32f346d 100755 ---- a/modules.d/95nbd/nbdroot.sh -+++ b/modules.d/95nbd/nbdroot.sh -@@ -102,7 +102,7 @@ if [ "$root" = "block:/dev/root" -o "$root" = "dhcp" ]; then - udevadm control --reload - type write_fs_tab >/dev/null 2>&1 || . /lib/fs-lib.sh - write_fs_tab /dev/root "$nbdfstype" "$fsopts" -- wait_for_dev /dev/root -+ wait_for_dev -n /dev/root - - if [ -z "$DRACUT_SYSTEMD" ]; then - printf '/bin/mount %s\n' \ -diff --git a/modules.d/95nbd/parse-nbdroot.sh b/modules.d/95nbd/parse-nbdroot.sh -index 49c44b6..fe5a7fa 100755 ---- a/modules.d/95nbd/parse-nbdroot.sh -+++ b/modules.d/95nbd/parse-nbdroot.sh -@@ -61,6 +61,6 @@ rootok=1 - # Shut up init error check - if [ -z "$root" ]; then - root=block:/dev/root -- wait_for_dev /dev/root -+ wait_for_dev -n /dev/root - fi - diff --git a/SOURCES/0164-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch b/SOURCES/0164-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch new file mode 100644 index 0000000..6ef6df2 --- /dev/null +++ b/SOURCES/0164-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch @@ -0,0 +1,63 @@ +From b990775b6f2fc8eb52d283b0745bea4a71ef751a Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 4 Apr 2014 12:48:03 +0200 +Subject: [PATCH] ifcfg: do not bind persistent interface names to HWADDR + +(cherry picked from commit fb0e5184a6506185998fd12d151f7d34d07c07b3) +--- + modules.d/40network/net-lib.sh | 27 +++++++++++++++++++++++++++ + modules.d/45ifcfg/write-ifcfg.sh | 6 +++++- + 2 files changed, 32 insertions(+), 1 deletion(-) + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index 7430e4c..5d4ae32 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -516,3 +516,30 @@ find_iface_with_link() { + done + return 1 + } ++ ++is_persistent_ethernet_name() { ++ [ -f /sys/class/net/$netif/addr_assign_type ] || return 1 ++ [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] || return 1 ++ ++ case "$1" in ++ # udev persistent interface names ++ eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*) ++ ;; ++ eno[0-9]|eno[0-9][0-9]|eno[0-9][0-9][0-9]*) ++ ;; ++ ens[0-9]|ens[0-9][0-9]|ens[0-9][0-9][0-9]*) ++ ;; ++ enp[0-9]s[0-9]*|enp[0-9][0-9]s[0-9]*|enp[0-9][0-9][0-9]*s[0-9]*) ++ ;; ++ enP*p[0-9]s[0-9]*|enP*p[0-9][0-9]s[0-9]*|enP*p[0-9][0-9][0-9]*s[0-9]*) ++ ;; ++ # biosdevname ++ em[0-9]|em[0-9][0-9]|em[0-9][0-9][0-9]*) ++ ;; ++ p[0-9]p[0-9]*|p[0-9][0-9]p[0-9]*|p[0-9][0-9][0-9]*p[0-9]*) ++ ;; ++ *) ++ return 1 ++ esac ++ return 0 ++} +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index 486c69a..2631fbe 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -164,7 +164,11 @@ for netup in /tmp/net.*.did-setup ; do + { + [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" + if ! print_s390 $netif; then +- [ -n "$macaddr" ] || echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" ++ if [ -z "$macaddr" ] && \ ++ ! is_persistent_ethernet_name "$netif" && \ ++ [ -f /sys/class/net/$netif/address ]; then ++ echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" ++ fi + fi + echo "TYPE=Ethernet" + echo "NAME=\"$netif\"" diff --git a/SOURCES/0165-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch b/SOURCES/0165-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch new file mode 100644 index 0000000..2ef6ee1 --- /dev/null +++ b/SOURCES/0165-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch @@ -0,0 +1,41 @@ +From 0506080aee1da03e867b1ab3f182d19bfbeae443 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 4 Apr 2014 12:52:39 +0200 +Subject: [PATCH] ifcfg: only bind to HWADDR, if addr_assign_type == 0 + +/sys/class/net/$netif/addr_assign_type is != 0 for random MAC address +interfaces + +(cherry picked from commit 2e094b20a6875fdb0a7ef8772e3d7688ad91c036) +--- + modules.d/40network/net-lib.sh | 3 --- + modules.d/45ifcfg/write-ifcfg.sh | 2 ++ + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index 5d4ae32..d53e1a6 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -518,9 +518,6 @@ find_iface_with_link() { + } + + is_persistent_ethernet_name() { +- [ -f /sys/class/net/$netif/addr_assign_type ] || return 1 +- [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] || return 1 +- + case "$1" in + # udev persistent interface names + eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*) +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index 2631fbe..5dc351d 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -166,6 +166,8 @@ for netup in /tmp/net.*.did-setup ; do + if ! print_s390 $netif; then + if [ -z "$macaddr" ] && \ + ! is_persistent_ethernet_name "$netif" && \ ++ [ -f /sys/class/net/$netif/addr_assign_type ] && \ ++ [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] && \ + [ -f /sys/class/net/$netif/address ]; then + echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" + fi diff --git a/SOURCES/0165-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch b/SOURCES/0165-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch deleted file mode 100644 index 37153cd..0000000 --- a/SOURCES/0165-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 00314340d4a99a3856e962652e97e808f45027ea Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 23 Oct 2014 14:34:33 +0200 -Subject: [PATCH] network/net-lib.sh:is_persistent_ethernet_name() eth* is not - -eth* is _not_ a persistent ethernet name... tsk, tsk, tsk - -(cherry picked from commit 05065741f01e78119f1883f199820b804460c58d) ---- - modules.d/40network/net-lib.sh | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index d53e1a6..5f48c95 100755 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -520,8 +520,6 @@ find_iface_with_link() { - is_persistent_ethernet_name() { - case "$1" in - # udev persistent interface names -- eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*) -- ;; - eno[0-9]|eno[0-9][0-9]|eno[0-9][0-9][0-9]*) - ;; - ens[0-9]|ens[0-9][0-9]|ens[0-9][0-9][0-9]*) diff --git a/SOURCES/0166-dracut-lib.sh-fixed-return-value-of-pidof.patch b/SOURCES/0166-dracut-lib.sh-fixed-return-value-of-pidof.patch new file mode 100644 index 0000000..c49995c --- /dev/null +++ b/SOURCES/0166-dracut-lib.sh-fixed-return-value-of-pidof.patch @@ -0,0 +1,38 @@ +From e5f6899a550d749f25a19043b6842609e327cceb Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 7 May 2014 13:33:14 +0200 +Subject: [PATCH] dracut-lib.sh: fixed return value of pidof() + +pidof always returned with 0, so any "while pidof" loop would not +terminate. + +Thanks "Consus" for the hint! + +(cherry picked from commit 4e58a1ffc760e5c54e6cae5924a2439cae196848) +--- + modules.d/99base/dracut-lib.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index 62facda..66977e7 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -962,6 +962,7 @@ if ! command -v pidof >/dev/null 2>/dev/null; then + local _cmd + local _exe + local _rl ++ local _ret=1 + local i + _cmd="$1" + [ -z "$_cmd" ] && return 1 +@@ -976,8 +977,9 @@ if ! command -v pidof >/dev/null 2>/dev/null; then + fi + i=${i%/exe} + echo ${i##/proc/} ++ _ret=0 + done +- return 0 ++ return $_ret + } + fi + diff --git a/SOURCES/0166-ifcfg-depends-on-network.patch b/SOURCES/0166-ifcfg-depends-on-network.patch deleted file mode 100644 index bda554e..0000000 --- a/SOURCES/0166-ifcfg-depends-on-network.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 33ce29748f4e68b5c1976ae89be5e033b866d168 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Mon, 30 Jun 2014 11:28:08 +0200 -Subject: [PATCH] ifcfg: depends on network - -(cherry picked from commit f1a38e5294b76c60b7614ec29ed56eccc4ed078a) ---- - modules.d/45ifcfg/module-setup.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules.d/45ifcfg/module-setup.sh b/modules.d/45ifcfg/module-setup.sh -index ce53e5e..4299fea 100755 ---- a/modules.d/45ifcfg/module-setup.sh -+++ b/modules.d/45ifcfg/module-setup.sh -@@ -8,6 +8,7 @@ check() { - } - - depends() { -+ echo "network" - return 0 - } - diff --git a/SOURCES/0167-Do-not-log-to-kmsg-syslog-and-files-for-print-cmdlin.patch b/SOURCES/0167-Do-not-log-to-kmsg-syslog-and-files-for-print-cmdlin.patch new file mode 100644 index 0000000..44d2dc7 --- /dev/null +++ b/SOURCES/0167-Do-not-log-to-kmsg-syslog-and-files-for-print-cmdlin.patch @@ -0,0 +1,36 @@ +From a2a9a17cc6424c7b3899353ced9c425ef59f975a Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 7 May 2014 14:54:56 +0200 +Subject: [PATCH] Do not log to kmsg/syslog and files for "--print-cmdline" + +(cherry picked from commit 535f61ca4ab55aa58d9bcf3d537cc4c0d800f6c8) +--- + dracut.sh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/dracut.sh b/dracut.sh +index a5fcf38..705f090 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -758,6 +758,13 @@ trap 'exit 1;' SIGINT + export DRACUT_KERNEL_LAZY="1" + export DRACUT_RESOLVE_LAZY="1" + ++if [[ $print_cmdline ]]; then ++ stdloglvl=0 ++ sysloglvl=0 ++ fileloglvl=0 ++ kmsgloglvl=0 ++fi ++ + if [[ -f $dracutbasedir/dracut-functions.sh ]]; then + . $dracutbasedir/dracut-functions.sh + else +@@ -831,6 +838,7 @@ for ((i=0; i < ${#dracut_args[@]}; i++)); do + dracut_args[$i]="\"${dracut_args[$i]}\"" + #" keep vim happy + done ++ + dinfo "Executing: $0 ${dracut_args[@]}" + + [[ $do_list = yes ]] && { diff --git a/SOURCES/0167-network-add-rd.route-parameter.patch b/SOURCES/0167-network-add-rd.route-parameter.patch deleted file mode 100644 index 6f9512c..0000000 --- a/SOURCES/0167-network-add-rd.route-parameter.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 655656a8a20f1540818f131fc2358ab51690a6a3 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 22 Jul 2014 11:03:56 +0200 -Subject: [PATCH] network: add rd.route parameter - -(cherry picked from commit 7b46244bb94e3dfd635a8d222044ae7fc920240d) ---- - dracut.cmdline.7.asc | 15 +++++++++++++- - modules.d/40network/net-lib.sh | 42 ++++++++++++++++++++++++++++++++++++++++ - modules.d/45ifcfg/write-ifcfg.sh | 3 +++ - 3 files changed, 59 insertions(+), 1 deletion(-) - -diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 985285b..2b872c0 100644 ---- a/dracut.cmdline.7.asc -+++ b/dracut.cmdline.7.asc -@@ -487,6 +487,19 @@ WARNING: Do **not** use the default kernel naming scheme for the interface name, - as it can conflict with the kernel names. So, don't use "eth[0-9]+" for the - interface name. Better name it "bootnet" or "bluesocket". - -+**rd.route=**____/____:____[:____]:: -+ Add a static route with route options, which are separated by a colon. -+ IPv6 addresses have to be put in brackets. -++ -+[listing] -+.Example -+-- -+ rd.route=192.168.200.0/24:192.168.100.222:ens10 -+ rd.route=192.168.200.0/24:192.168.100.222 -+ rd.route=192.168.200.0/24::ens10 -+ rd.route=[2001:DB8:3::/8]:[2001:DB8:2::1]:ens10 -+-- -+ - **bootdev=**____:: - specify network interface to use routing and netroot information from. - Required if multiple ip= lines are used. -@@ -534,7 +547,7 @@ NFS - ~~~ - **root=**\[__:]____[:____]:: - mount nfs share from :/, if no server-ip is given, use -- dhcp next_server. if server-ip is an IPv6 address it has to be put in -+ dhcp next_server. If server-ip is an IPv6 address it has to be put in - brackets, e.g. [2001:DB8::1]. NFS options can be appended with the prefix - ":" or "," and are seperated by ",". - -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 5f48c95..d178353 100755 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -89,6 +89,7 @@ ifdown() { - - setup_net() { - local netif="$1" f="" gw_ip="" netroot_ip="" iface="" IFACES="" -+ local _p - [ -e /tmp/net.$netif.did-setup ] && return - [ -e /sys/class/net/$netif/address ] && \ - [ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && return -@@ -103,6 +104,20 @@ setup_net() { - [ -e /tmp/net.$netif.resolv.conf ] && \ - cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf - -+ # add static route -+ for _p in $(getargs rd.route); do -+ route_to_var "$_p" || continue -+ [ -n "$route_dev" ] && [ "$route_dev" != "$netif"] && continue -+ ip route add "$route_mask" ${route_gw:+via "$route_gw"} ${route_dev:+dev "$route_dev"} -+ if strstr ":" "$route_mask"; then -+ printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \ -+ > /tmp/net.route6."$netif" -+ else -+ printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \ -+ > /tmp/net.route."$netif" -+ fi -+ done -+ - # Handle STP Timeout: arping the default gateway. - # (or the root server, if a) it's local or b) there's no gateway.) - # Note: This assumes that if no router is present the -@@ -395,6 +410,33 @@ ip_to_var() { - fi - } - -+route_to_var() { -+ local v=${1}: -+ local i -+ set -- -+ while [ -n "$v" ]; do -+ if [ "${v#\[*:*:*\]:}" != "$v" ]; then -+ # handle IPv6 address -+ i="${v%%\]:*}" -+ i="${i##\[}" -+ set -- "$@" "$i" -+ v=${v#\[$i\]:} -+ else -+ set -- "$@" "${v%%:*}" -+ v=${v#*:} -+ fi -+ done -+ -+ unset route_mask route_gw route_dev -+ case $# in -+ 2) [ -n "$1" ] && route_mask="$1"; [ -n "$2" ] && route_gw="$2" -+ return 0;; -+ 3) [ -n "$1" ] && route_mask="$1"; [ -n "$2" ] && route_gw="$2"; [ -n "$3" ] && route_dev="$3" -+ return 0;; -+ *) return 1;; -+ esac -+} -+ - parse_ifname_opts() { - local IFS=: - set $1 -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index e1e2448..7548226 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -264,6 +264,9 @@ for netup in /tmp/net.*.did-setup ; do - echo "DNS${i}=\"${ns}\"" >> /tmp/ifcfg/ifcfg-$netif - i=$((i+1)) - done -+ -+ [ -f /tmp/net.route6."$netif" ] && cp /tmp/net.route6."$netif" /tmp/ifcfg/route6-"$netif" -+ [ -f /tmp/net.route."$netif" ] && cp /tmp/net.route."$netif" /tmp/ifcfg/route-"$netif" - done - - # Pass network opts diff --git a/SOURCES/0168-fixed-bridge-setup.patch b/SOURCES/0168-fixed-bridge-setup.patch deleted file mode 100644 index 98afd3b..0000000 --- a/SOURCES/0168-fixed-bridge-setup.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 4c96851f18196236a63a126c4fc4377b21402cc5 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 1 Aug 2014 13:16:29 +0200 -Subject: [PATCH] fixed bridge setup - -renamed "ethnames" in bridge.info to "bridgeslaves" - -fixed ifcfg generation - -(cherry picked from commit 2db6d7111870c5d16d812d9cddc23558f3f4a202) ---- - modules.d/40network/ifup.sh | 4 ++-- - modules.d/40network/net-genrules.sh | 2 +- - modules.d/40network/parse-bridge.sh | 18 ++++++++-------- - modules.d/45ifcfg/write-ifcfg.sh | 42 +++++++++---------------------------- - 4 files changed, 22 insertions(+), 44 deletions(-) - -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index ede0188..a50f45d 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -60,7 +60,7 @@ fi - # bridge this interface? - if [ -e /tmp/bridge.info ]; then - . /tmp/bridge.info -- for ethname in $ethnames ; do -+ for ethname in $bridgeslaves ; do - if [ "$netif" = "$ethname" ]; then - if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then - : # We need to really setup bond (recursive call) -@@ -234,7 +234,7 @@ if [ -e /tmp/bridge.info ]; then - if [ "$netif" = "$bridgename" ] && [ ! -e /tmp/net.$bridgename.up ]; then - brctl addbr $bridgename - brctl setfd $bridgename 0 -- for ethname in $ethnames ; do -+ for ethname in $bridgeslaves ; do - if [ "$ethname" = "$bondname" ] ; then - DO_BOND_SETUP=yes ifup $bondname -m - elif [ "$ethname" = "$teammaster" ] ; then -diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index af2f09c..a43e3df 100755 ---- a/modules.d/40network/net-genrules.sh -+++ b/modules.d/40network/net-genrules.sh -@@ -16,7 +16,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh - # bridge: attempt only the defined interface - if [ -e /tmp/bridge.info ]; then - . /tmp/bridge.info -- IFACES="$IFACES ${ethnames%% *}" -+ IFACES="$IFACES ${bridgeslaves%% *}" - MASTER_IFACES="$MASTER_IFACES $bridgename" - fi - -diff --git a/modules.d/40network/parse-bridge.sh b/modules.d/40network/parse-bridge.sh -index 8c305c0..a910109 100755 ---- a/modules.d/40network/parse-bridge.sh -+++ b/modules.d/40network/parse-bridge.sh -@@ -3,9 +3,9 @@ - # ex: ts=8 sw=4 sts=4 et filetype=sh - # - # Format: --# bridge=: -+# bridge=: - # --# is a comma-separated list of physical (ethernet) interfaces -+# is a comma-separated list of physical (ethernet) interfaces - # bridge without parameters assumes bridge=br0:eth0 - # - -@@ -25,20 +25,20 @@ parsebridge() { - v=${v#*:} - done - -- unset bridgename ethnames -+ unset bridgename bridgeslaves - case $# in -- 0) bridgename=br0; ethnames=$iface ;; -+ 0) bridgename=br0; bridgeslaves=$iface ;; - 1) die "bridge= requires two parameters" ;; -- 2) bridgename=$1; ethnames=$(str_replace "$2" "," " ") ;; -+ 2) bridgename=$1; bridgeslaves=$(str_replace "$2" "," " ") ;; - *) die "bridge= requires two parameters" ;; - esac - } - --unset bridgename ethnames -+unset bridgename bridgeslaves - - iface=eth0 - --# Parse bridge for bridgename and ethnames -+# Parse bridge for bridgename and bridgeslaves - if bridge="$(getarg bridge)"; then - # Read bridge= parameters if they exist - if [ -n "$bridge" ]; then -@@ -47,9 +47,9 @@ if bridge="$(getarg bridge)"; then - # Simple default bridge - if [ -z "$bridgename" ]; then - bridgename=br0 -- ethnames=$iface -+ bridgeslaves=$iface - fi - echo "bridgename=$bridgename" > /tmp/bridge.info -- echo "ethnames=\"$ethnames\"" >> /tmp/bridge.info -+ echo "bridgeslaves=\"$bridgeslaves\"" >> /tmp/bridge.info - return - fi -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 7548226..fa83a82 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -210,6 +210,7 @@ for netup in /tmp/net.*.did-setup ; do - echo "SLAVE=yes" - echo "MASTER=\"$netif\"" - echo "NAME=\"$slave\"" -+ echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" - } >> /tmp/ifcfg/ifcfg-$slave - done - fi -@@ -220,44 +221,21 @@ for netup in /tmp/net.*.did-setup ; do - echo "TYPE=Bridge" - echo "NAME=\"$netif\"" - } >> /tmp/ifcfg/ifcfg-$netif -- if [ "$ethname" = "$bondname" ] ; then -- { -- echo "# Generated by dracut initrd" -- echo "DEVICE=\"$bondname\"" -- echo "ONBOOT=yes" -- echo "NETBOOT=yes" -- # This variable is an indicator of a bond interface for initscripts -- echo "BONDING_OPTS=\"$bondoptions\"" -- echo "BRIDGE=\"$netif\"" -- echo "NAME=\"$bondname\"" -- } >> /tmp/ifcfg/ifcfg-$bondname -- for slave in $bondslaves ; do -- # write separate ifcfg file for the raw eth interface -- { -- echo "# Generated by dracut initrd" -- echo "DEVICE=\"$slave\"" -- echo "TYPE=Ethernet" -- echo "ONBOOT=yes" -- echo "NETBOOT=yes" -- echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" -- echo "SLAVE=yes" -- echo "MASTER=\"$bondname\"" -- echo "NAME=\"$slave\"" -- } >> /tmp/ifcfg/ifcfg-$slave -- done -- else -+ for slave in $bridgeslaves ; do - # write separate ifcfg file for the raw eth interface - { - echo "# Generated by dracut initrd" -- echo "DEVICE=\"$ethname\"" -+ echo "DEVICE=\"$slave\"" - echo "TYPE=Ethernet" - echo "ONBOOT=yes" - echo "NETBOOT=yes" -- echo "HWADDR=\"$(cat /sys/class/net/$ethname/address)\"" -- echo "BRIDGE=\"$netif\"" -- echo "NAME=\"$ethname\"" -- } >> /tmp/ifcfg/ifcfg-$ethname -- fi -+ echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" -+ echo "SLAVE=yes" -+ echo "MASTER=\"$bridgename\"" -+ echo "NAME=\"$slave\"" -+ echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" -+ } >> /tmp/ifcfg/ifcfg-$slave -+ done - fi - i=1 - for ns in $(getargs nameserver); do diff --git a/SOURCES/0168-ifcfg-write-ifcfg.sh-IPV6INIT-yes-check-also-for-non.patch b/SOURCES/0168-ifcfg-write-ifcfg.sh-IPV6INIT-yes-check-also-for-non.patch new file mode 100644 index 0000000..7ae6151 --- /dev/null +++ b/SOURCES/0168-ifcfg-write-ifcfg.sh-IPV6INIT-yes-check-also-for-non.patch @@ -0,0 +1,25 @@ +From d38488e8d561a80b34e532e31c00c0801c104a23 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 12 May 2014 13:53:38 +0200 +Subject: [PATCH] ifcfg/write-ifcfg.sh: "IPV6INIT=yes" check also for non-dhcp + +(cherry picked from commit 1230f3bcffd8837e8846e60376ea2a88ef5ab257) +--- + modules.d/45ifcfg/write-ifcfg.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index 5dc351d..457a9ac 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -120,9 +120,9 @@ for netup in /tmp/net.*.did-setup ; do + echo "ONBOOT=yes" + echo "NETBOOT=yes" + echo "UUID=\"$uuid\"" ++ strstr "$(ip -6 addr show dev $netif)" 'inet6' && echo "IPV6INIT=yes" + if [ -f /tmp/dhclient.$netif.lease ]; then + [ -f /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts +- strstr "$(ip -6 addr show dev $netif)" 'inet6' && echo "IPV6INIT=yes" + if [ -f /tmp/net.$netif.has_ibft_config ]; then + echo "BOOTPROTO=ibft" + else diff --git a/SOURCES/0169-bridging-update-the-ifcfg-files-generated-for-bridge.patch b/SOURCES/0169-bridging-update-the-ifcfg-files-generated-for-bridge.patch deleted file mode 100644 index ec11014..0000000 --- a/SOURCES/0169-bridging-update-the-ifcfg-files-generated-for-bridge.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ab886c76279775f3326116a65104ff26457e0a83 Mon Sep 17 00:00:00 2001 -From: Alex Harpin -Date: Sat, 2 Aug 2014 20:08:25 +0100 -Subject: [PATCH] bridging: update the ifcfg files generated for bridge slaves - -Update the ifcfg files generated for bridge slaves so they reference -the bridge they are part of. Related to early patch submitted as a -fix for Bug #1123552. - -Bug #1123552 https://bugzilla.redhat.com/show_bug.cgi?id=1123552 - -(cherry picked from commit 32125a976bb6ff67768ca813446743b781ba012f) ---- - modules.d/45ifcfg/write-ifcfg.sh | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index fa83a82..6fcf2c4 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -230,8 +230,7 @@ for netup in /tmp/net.*.did-setup ; do - echo "ONBOOT=yes" - echo "NETBOOT=yes" - echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" -- echo "SLAVE=yes" -- echo "MASTER=\"$bridgename\"" -+ echo "BRIDGE=\"$bridgename\"" - echo "NAME=\"$slave\"" - echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" - } >> /tmp/ifcfg/ifcfg-$slave diff --git a/SOURCES/0169-cms-cmssetup.sh-convert-SUBCHANNELS-to-lowercase.patch b/SOURCES/0169-cms-cmssetup.sh-convert-SUBCHANNELS-to-lowercase.patch new file mode 100644 index 0000000..36dd744 --- /dev/null +++ b/SOURCES/0169-cms-cmssetup.sh-convert-SUBCHANNELS-to-lowercase.patch @@ -0,0 +1,24 @@ +From 705c84321daeb847cecba7f1e1f8f3e23f8165f8 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 12 May 2014 14:36:08 +0200 +Subject: [PATCH] cms/cmssetup.sh: convert SUBCHANNELS to lowercase + +In udev rules, the channels need to be expressed in lower case. + +(cherry picked from commit 56d57a70ec89740dc6ddc09ea23b6fc4c3a6a531) +--- + modules.d/80cms/cmssetup.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh +index 36955bc..c9e1331 100755 +--- a/modules.d/80cms/cmssetup.sh ++++ b/modules.d/80cms/cmssetup.sh +@@ -144,6 +144,7 @@ function dasd_settle_all() { + processcmsfile() + { + source /tmp/cms.conf ++ SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')" + + if [[ $NETTYPE ]]; then + ( diff --git a/SOURCES/0170-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch b/SOURCES/0170-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch deleted file mode 100644 index 73edd31..0000000 --- a/SOURCES/0170-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch +++ /dev/null @@ -1,50 +0,0 @@ -From e47818e4ae8633b52df28d7549db2f8956f65b11 Mon Sep 17 00:00:00 2001 -From: Alex Harpin -Date: Tue, 6 May 2014 23:41:17 +0100 -Subject: [PATCH] bonding: use hwaddr of the slave rather than the master - -When a bonded interface is brought up, any slaves included in the bond -have their hardware address set to that of the bond master. Although -this allows an interface to be brought up on start up, when the -configuration file is imported into the booted system it prevents -the bonded interface being successfully restarted. - -The fix involves obtaining the hardware address of the slaves before -they are added to the bond and then using this value in the -configuration file. - -(cherry picked from commit 83c9ff7dbb465bedb10119bb2883d34266922180) ---- - modules.d/40network/ifup.sh | 1 + - modules.d/45ifcfg/write-ifcfg.sh | 6 +++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index a50f45d..178e7f4 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -188,6 +188,7 @@ if [ -e /tmp/bond.${netif}.info ]; then - - for slave in $bondslaves ; do - ip link set $slave down -+ cat /sys/class/net/$slave/address > /tmp/net.${netif}.${slave}.hwaddr - echo "+$slave" > /sys/class/net/$bondname/bonding/slaves - linkup $slave - done -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 6fcf2c4..9edbead 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -206,7 +206,11 @@ for netup in /tmp/net.*.did-setup ; do - echo "TYPE=Ethernet" - echo "ONBOOT=yes" - echo "NETBOOT=yes" -- echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" -+ if [ -e /tmp/net.${netif}.${slave}.hwaddr ]; then -+ echo "HWADDR=\"$(cat /tmp/net.${netif}.${slave}.hwaddr)\"" -+ else -+ echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" -+ fi - echo "SLAVE=yes" - echo "MASTER=\"$netif\"" - echo "NAME=\"$slave\"" diff --git a/SOURCES/0170-mdraid-module-setup.sh-fixed-print-cmdline-for-empty.patch b/SOURCES/0170-mdraid-module-setup.sh-fixed-print-cmdline-for-empty.patch new file mode 100644 index 0000000..080f589 --- /dev/null +++ b/SOURCES/0170-mdraid-module-setup.sh-fixed-print-cmdline-for-empty.patch @@ -0,0 +1,30 @@ +From ec158d758b880fc966f3f3e6b819ffcfbff7227d Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 14 May 2014 16:38:49 +0200 +Subject: [PATCH] mdraid/module-setup.sh: fixed print-cmdline for empty UUID + +fixes + +/usr/lib/dracut/modules.d/90mdraid/module-setup.sh: line 60: +_activated["${UUID}"]: bad array subscript + +Thanks to Jan ONDREJ for spotting this! + +(cherry picked from commit 19bb14c3467233f8c98f76b3fa57047a3a31e1a3) +--- + modules.d/90mdraid/module-setup.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh +index 1e03847..815a3eb 100755 +--- a/modules.d/90mdraid/module-setup.sh ++++ b/modules.d/90mdraid/module-setup.sh +@@ -50,6 +50,8 @@ cmdline() { + done + ) + ++ [[ -z "$UUID" ]] && continue ++ + if ! [[ ${_activated[${UUID}]} ]]; then + printf "%s" " rd.md.uuid=${UUID}" + _activated["${UUID}"]=1 diff --git a/SOURCES/0171-ifcfg-write-ifcfg.sh-bind-bond-and-bridge-interfaces.patch b/SOURCES/0171-ifcfg-write-ifcfg.sh-bind-bond-and-bridge-interfaces.patch deleted file mode 100644 index 9d5b571..0000000 --- a/SOURCES/0171-ifcfg-write-ifcfg.sh-bind-bond-and-bridge-interfaces.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 2a77da7015dfaa55429f1329dccbe9445ca51561 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 12 Sep 2014 09:48:00 +0200 -Subject: [PATCH] ifcfg/write-ifcfg.sh: bind bond and bridge interfaces to HW - -either by s390 SUBCHANNELS or HWADDR, if the interface name is not -persistent. - -Previously, this was bound unconditionally with HWADDR. - -(cherry picked from commit 80043e21c16db168ad087a162f1fa97cae866c8d) ---- - modules.d/45ifcfg/write-ifcfg.sh | 47 ++++++++++++++++++++++------------------ - 1 file changed, 26 insertions(+), 21 deletions(-) - -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 9edbead..0395e05 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -82,6 +82,20 @@ print_s390() { - return 0 - } - -+interface_bind() { -+ local netif="$1" -+ local macaddr="$2" -+ if ! print_s390 $netif; then -+ if [ -z "$macaddr" ] && \ -+ ! is_persistent_ethernet_name "$netif" && \ -+ [ -f /sys/class/net/$netif/addr_assign_type ] && \ -+ [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] && \ -+ [ -f /sys/class/net/$netif/address ]; then -+ echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" -+ fi -+ fi -+} -+ - for netup in /tmp/net.*.did-setup ; do - [ -f $netup ] || continue - -@@ -114,8 +128,7 @@ for netup in /tmp/net.*.did-setup ; do - if [ "$netif" = "$vlanname" ]; then - vlan=yes - fi -- [ -e /sys/class/net/$netif/address ] && \ -- cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr -+ - { - echo "# Generated by dracut initrd" - echo "DEVICE=\"$netif\"" -@@ -165,15 +178,7 @@ for netup in /tmp/net.*.did-setup ; do - # standard interface - { - [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" -- if ! print_s390 $netif; then -- if [ -z "$macaddr" ] && \ -- ! is_persistent_ethernet_name "$netif" && \ -- [ -f /sys/class/net/$netif/addr_assign_type ] && \ -- [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] && \ -- [ -f /sys/class/net/$netif/address ]; then -- echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" -- fi -- fi -+ interface_bind "$netif" "$macaddr" - echo "TYPE=Ethernet" - echo "NAME=\"$netif\"" - [ -n "$mtu" ] && echo "MTU=\"$mtu\"" -@@ -200,22 +205,20 @@ for netup in /tmp/net.*.did-setup ; do - - for slave in $bondslaves ; do - # write separate ifcfg file for the raw eth interface -- { -+ ( - echo "# Generated by dracut initrd" - echo "DEVICE=\"$slave\"" - echo "TYPE=Ethernet" - echo "ONBOOT=yes" - echo "NETBOOT=yes" -- if [ -e /tmp/net.${netif}.${slave}.hwaddr ]; then -- echo "HWADDR=\"$(cat /tmp/net.${netif}.${slave}.hwaddr)\"" -- else -- echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" -- fi - echo "SLAVE=yes" - echo "MASTER=\"$netif\"" - echo "NAME=\"$slave\"" - echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" -- } >> /tmp/ifcfg/ifcfg-$slave -+ [ -e /tmp/net.$slave.override ] && . /tmp/net.$slave.override -+ [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" -+ interface_bind "$slave" "$macaddr" -+ ) >> /tmp/ifcfg/ifcfg-$slave - done - fi - -@@ -227,17 +230,19 @@ for netup in /tmp/net.*.did-setup ; do - } >> /tmp/ifcfg/ifcfg-$netif - for slave in $bridgeslaves ; do - # write separate ifcfg file for the raw eth interface -- { -+ ( - echo "# Generated by dracut initrd" - echo "DEVICE=\"$slave\"" - echo "TYPE=Ethernet" - echo "ONBOOT=yes" - echo "NETBOOT=yes" -- echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" - echo "BRIDGE=\"$bridgename\"" - echo "NAME=\"$slave\"" - echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" -- } >> /tmp/ifcfg/ifcfg-$slave -+ [ -e /tmp/net.$slave.override ] && . /tmp/net.$slave.override -+ [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" -+ interface_bind "$slave" "$macaddr" -+ ) >> /tmp/ifcfg/ifcfg-$slave - done - fi - i=1 diff --git a/SOURCES/0171-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch b/SOURCES/0171-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch new file mode 100644 index 0000000..1b4e304 --- /dev/null +++ b/SOURCES/0171-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch @@ -0,0 +1,25 @@ +From 2a20064e44d14b2c84bf52fde9dfd3b43832a74b Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 16 May 2014 13:32:47 +0200 +Subject: [PATCH] ifcfg/write-ifcfg.sh: include net-lib.sh + +otherwise is_persistent_ethernet_name() is missing + +(cherry picked from commit 8fa1afb65cef30d56ce2e141b0b594cf780120a1) +--- + modules.d/45ifcfg/write-ifcfg.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index 457a9ac..7f997a2 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -3,6 +3,8 @@ + # ex: ts=8 sw=4 sts=4 et filetype=sh + + # NFS root might have reached here before /tmp/net.ifaces was written ++type is_persistent_ethernet_name >/dev/null 2>&1 || . /lib/net-lib.sh ++ + udevadm settle --timeout=30 + + if [ -e /tmp/bridge.info ]; then diff --git a/SOURCES/0172-ifcfg-write-ifcfg-only-write-DEVICE-for-non-kernel-n.patch b/SOURCES/0172-ifcfg-write-ifcfg-only-write-DEVICE-for-non-kernel-n.patch deleted file mode 100644 index 06ba65f..0000000 --- a/SOURCES/0172-ifcfg-write-ifcfg-only-write-DEVICE-for-non-kernel-n.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 5f6b68ac91103cd66ff79dc65b35ac0f613e4957 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 24 Oct 2014 15:47:24 +0200 -Subject: [PATCH] ifcfg/write-ifcfg: only write DEVICE for non-kernel names - -Rename an interface to the kernel namespace is not allowed, so don't add -DEVICE="", if HWADDR is given. - -(cherry picked from commit 3947f07d93cde5e1cf0d788537e93b135d6c27b0) ---- - modules.d/40network/net-lib.sh | 46 ++++++++++++++++++++++++++++++- - modules.d/45ifcfg/write-ifcfg.sh | 59 ++++++++++++++++++++++++++-------------- - 2 files changed, 84 insertions(+), 21 deletions(-) - -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index d178353..c39889a 100755 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -560,7 +560,19 @@ find_iface_with_link() { - } - - is_persistent_ethernet_name() { -- case "$1" in -+ local _netif="$1" -+ local _name_assign_type="0" -+ -+ [ -f "/sys/class/net/$_netif/name_assign_type" ] \ -+ && _name_assign_type=$(cat "/sys/class/net/$_netif/name_assign_type") -+ -+ # NET_NAME_ENUM 1 -+ [ "$_name_assign_type" = "1" ] && return 1 -+ -+ # NET_NAME_PREDICTABLE 2 -+ [ "$_name_assign_type" = "2" ] && return 0 -+ -+ case "$_netif" in - # udev persistent interface names - eno[0-9]|eno[0-9][0-9]|eno[0-9][0-9][0-9]*) - ;; -@@ -580,3 +592,35 @@ is_persistent_ethernet_name() { - esac - return 0 - } -+ -+is_kernel_ethernet_name() { -+ local _netif="$1" -+ local _name_assign_type="1" -+ -+ if [ -e "/sys/class/net/$_netif/name_assign_type" ]; then -+ _name_assign_type=$(cat "/sys/class/net/$_netif/name_assign_type") -+ -+ case "$_name_assign_type" in -+ 2|3|4) -+ # NET_NAME_PREDICTABLE 2 -+ # NET_NAME_USER 3 -+ # NET_NAME_RENAMED 4 -+ return 1 -+ ;; -+ 1|*) -+ # NET_NAME_ENUM 1 -+ return 0 -+ ;; -+ esac -+ fi -+ -+ # fallback to error prone manual name check -+ case "$_netif" in -+ eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*) -+ return 0 -+ ;; -+ *) -+ return 1 -+ esac -+ -+} -diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 0395e05..ef35a76 100755 ---- a/modules.d/45ifcfg/write-ifcfg.sh -+++ b/modules.d/45ifcfg/write-ifcfg.sh -@@ -82,18 +82,41 @@ print_s390() { - return 0 - } - -+hw_bind() { -+ local _netif="$1" -+ local _macaddr="$2" -+ -+ [ -n "$_macaddr" ] \ -+ && echo "MACADDR=\"$_macaddr\"" -+ -+ print_s390 "$_netif" \ -+ && return 0 -+ -+ [ -n "$_macaddr" ] && return 0 -+ -+ is_persistent_ethernet_name "$_netif" && return 0 -+ -+ [ -f "/sys/class/net/$_netif/addr_assign_type" ] \ -+ && [ "$(cat "/sys/class/net/$_netif/addr_assign_type")" != "0" ] \ -+ && return 1 -+ -+ [ -f "/sys/class/net/$_netif/address" ] \ -+ || return 1 -+ -+ echo "HWADDR=\"$(cat /sys/class/net/$_netif/address)\"" -+} -+ - interface_bind() { -- local netif="$1" -- local macaddr="$2" -- if ! print_s390 $netif; then -- if [ -z "$macaddr" ] && \ -- ! is_persistent_ethernet_name "$netif" && \ -- [ -f /sys/class/net/$netif/addr_assign_type ] && \ -- [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] && \ -- [ -f /sys/class/net/$netif/address ]; then -- echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" -- fi -+ local _netif="$1" -+ local _macaddr="$2" -+ -+ # see, if we can bind it to some hw parms -+ if hw_bind "$_netif" "$_macaddr"; then -+ # only print out DEVICE, if it's user assigned -+ is_kernel_ethernet_name "$_netif" && return 0 - fi -+ -+ echo "DEVICE=\"$_netif\"" - } - - for netup in /tmp/net.*.did-setup ; do -@@ -131,7 +154,8 @@ for netup in /tmp/net.*.did-setup ; do - - { - echo "# Generated by dracut initrd" -- echo "DEVICE=\"$netif\"" -+ echo "NAME=\"$netif\"" -+ interface_bind "$netif" "$macaddr" - echo "ONBOOT=yes" - echo "NETBOOT=yes" - echo "UUID=\"$uuid\"" -@@ -177,10 +201,7 @@ for netup in /tmp/net.*.did-setup ; do - if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ]; then - # standard interface - { -- [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" -- interface_bind "$netif" "$macaddr" - echo "TYPE=Ethernet" -- echo "NAME=\"$netif\"" - [ -n "$mtu" ] && echo "MTU=\"$mtu\"" - } >> /tmp/ifcfg/ifcfg-$netif - fi -@@ -207,16 +228,15 @@ for netup in /tmp/net.*.did-setup ; do - # write separate ifcfg file for the raw eth interface - ( - echo "# Generated by dracut initrd" -- echo "DEVICE=\"$slave\"" -+ echo "NAME=\"$slave\"" - echo "TYPE=Ethernet" - echo "ONBOOT=yes" - echo "NETBOOT=yes" - echo "SLAVE=yes" - echo "MASTER=\"$netif\"" -- echo "NAME=\"$slave\"" - echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" -+ unset macaddr - [ -e /tmp/net.$slave.override ] && . /tmp/net.$slave.override -- [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" - interface_bind "$slave" "$macaddr" - ) >> /tmp/ifcfg/ifcfg-$slave - done -@@ -232,15 +252,14 @@ for netup in /tmp/net.*.did-setup ; do - # write separate ifcfg file for the raw eth interface - ( - echo "# Generated by dracut initrd" -- echo "DEVICE=\"$slave\"" -+ echo "NAME=\"$slave\"" - echo "TYPE=Ethernet" - echo "ONBOOT=yes" - echo "NETBOOT=yes" - echo "BRIDGE=\"$bridgename\"" -- echo "NAME=\"$slave\"" - echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" -+ unset macaddr - [ -e /tmp/net.$slave.override ] && . /tmp/net.$slave.override -- [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" - interface_bind "$slave" "$macaddr" - ) >> /tmp/ifcfg/ifcfg-$slave - done diff --git a/SOURCES/0172-nbd-nbdroot.sh-call-nbd-client-with-systemd-mark.patch b/SOURCES/0172-nbd-nbdroot.sh-call-nbd-client-with-systemd-mark.patch new file mode 100644 index 0000000..9e3035c --- /dev/null +++ b/SOURCES/0172-nbd-nbdroot.sh-call-nbd-client-with-systemd-mark.patch @@ -0,0 +1,27 @@ +From 1175816c301dfc88f6ef4ecc009e1475a0d5362d Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 16 May 2014 13:33:33 +0200 +Subject: [PATCH] nbd/nbdroot.sh: call nbd-client with "--systemd-mark" + +otherwise nbd-client will get killed by systemd + +(cherry picked from commit 056a3f2427b6747d83fc48c5d1e3f85b4058c18f) +--- + modules.d/95nbd/nbdroot.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh +index 2e9d917..ddb3819 100755 +--- a/modules.d/95nbd/nbdroot.sh ++++ b/modules.d/95nbd/nbdroot.sh +@@ -111,6 +111,10 @@ if [ "$root" = "block:/dev/root" -o "$root" = "dhcp" ]; then + fi + fi + ++if strstr "$(nbd-client --help 2>&1)" "systemd-mark"; then ++ preopts="--systemd-mark $preopts" ++fi ++ + nbd-client $preopts "$nbdserver" $nbdport /dev/nbd0 $opts || exit 1 + + # NBD doesn't emit uevents when it gets connected, so kick it diff --git a/SOURCES/0173-fcoe-uefi-parse-uefifcoe.sh-fixed-parameter-generati.patch b/SOURCES/0173-fcoe-uefi-parse-uefifcoe.sh-fixed-parameter-generati.patch new file mode 100644 index 0000000..bb952f3 --- /dev/null +++ b/SOURCES/0173-fcoe-uefi-parse-uefifcoe.sh-fixed-parameter-generati.patch @@ -0,0 +1,26 @@ +From e92a7a25321d46da1c1f9d015a20b3759de10be4 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 20 May 2014 11:22:26 +0200 +Subject: [PATCH] fcoe-uefi/parse-uefifcoe.sh: fixed parameter generation from + UEFI + +"fcoe=" was missing for the parameter specifying the interface + +(cherry picked from commit 142710269279db70fceb3e76a077f3d6a89a84a5) +--- + modules.d/95fcoe-uefi/parse-uefifcoe.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/95fcoe-uefi/parse-uefifcoe.sh b/modules.d/95fcoe-uefi/parse-uefifcoe.sh +index 0799cdd..7b8f1a6 100755 +--- a/modules.d/95fcoe-uefi/parse-uefifcoe.sh ++++ b/modules.d/95fcoe-uefi/parse-uefifcoe.sh +@@ -26,7 +26,7 @@ print_fcoe_uefi_conf() + esac + fi + # fcoe=eth0:nodcb +- printf "%s\n" "$dev:nodcb" ++ printf "fcoe=%s\n" "$dev:nodcb" + return 0 + } + diff --git a/SOURCES/0174-dracut-functions.sh-print_vars-fix-for-values-with-s.patch b/SOURCES/0174-dracut-functions.sh-print_vars-fix-for-values-with-s.patch new file mode 100644 index 0000000..868f436 --- /dev/null +++ b/SOURCES/0174-dracut-functions.sh-print_vars-fix-for-values-with-s.patch @@ -0,0 +1,37 @@ +From 40a5d2c0291d4ec7d8c501fce8fb9d412235fdbb Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 20 May 2014 11:27:42 +0200 +Subject: [PATCH] dracut-functions.sh:print_vars() fix for values with spaces +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +for a variable with spaces, e.g.: +EXT_KEYMAPS='backspace keypad euro2' + +The following would occur: +print_vars: eval printf -v _value %s '$EXT_KEYMAPS' +print_vars: printf -v _value %s backspace keypad euro2 +print_vars: [[ -n backspacekeypadeuro2 ]] +print_vars: printf '%s=\"%s\"\n' EXT_KEYMAPS backspacekeypadeuro2 + +Thanks to Sebastian Köln for the fix! + +(cherry picked from commit 7a94a4326f0641396125acb2b444b562224457a1) +--- + dracut-functions.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index cb43f7a..915f70f 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -176,7 +176,7 @@ print_vars() { + + for _var in "$@" + do +- eval printf -v _value "%s" "\$$_var" ++ eval printf -v _value "%s" \""\$$_var"\" + [[ ${_value} ]] && printf '%s="%s"\n' "$_var" "$_value" + done + } diff --git a/SOURCES/0175-98systemd-fixup-rootfs-generator-installation-path.patch b/SOURCES/0175-98systemd-fixup-rootfs-generator-installation-path.patch new file mode 100644 index 0000000..d936b63 --- /dev/null +++ b/SOURCES/0175-98systemd-fixup-rootfs-generator-installation-path.patch @@ -0,0 +1,29 @@ +From e23057d5376158fb4d7618f3c6f664e415670cf8 Mon Sep 17 00:00:00 2001 +From: Hannes Reinecke +Date: Tue, 20 May 2014 11:20:10 +0200 +Subject: [PATCH] 98systemd: fixup rootfs-generator installation path + +The rootfs-generator was installed in the wrong path +in the initrd, cause it never to be run. + +References: bnc#878714 + +Signed-off-by: Hannes Reinecke +(cherry picked from commit ed2005fa5ba7d618bbb2c63bac616fba32a17a5d) +--- + modules.d/98systemd/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh +index 52edd80..36a0505 100755 +--- a/modules.d/98systemd/module-setup.sh ++++ b/modules.d/98systemd/module-setup.sh +@@ -188,7 +188,7 @@ install() { + inst_script "$moddir/dracut-mount.sh" /bin/dracut-mount + inst_script "$moddir/dracut-pre-pivot.sh" /bin/dracut-pre-pivot + +- inst_script "$moddir/rootfs-generator.sh" /lib/systemd/system-generators/dracut-rootfs-generator ++ inst_script "$moddir/rootfs-generator.sh" $systemdutildir/system-generators/dracut-rootfs-generator + + inst_binary true + ln_r $(type -P true) "/usr/bin/loginctl" diff --git a/SOURCES/0176-dracut-pre-pivot-pulls-in-remote-fs.target.patch b/SOURCES/0176-dracut-pre-pivot-pulls-in-remote-fs.target.patch new file mode 100644 index 0000000..8988814 --- /dev/null +++ b/SOURCES/0176-dracut-pre-pivot-pulls-in-remote-fs.target.patch @@ -0,0 +1,29 @@ +From 2fed6038bb9c30b903464b838b05a2ceb3412a6b Mon Sep 17 00:00:00 2001 +From: WANG Chao +Date: Fri, 4 Apr 2014 14:37:42 +0800 +Subject: [PATCH] dracut-pre-pivot pulls in remote-fs.target + +It turns out that commit f30b74e (dracut-initqueue service runs before +remote-fs-pre.target) is partial fix for remote fs mounts. Because no +one pulls in remote-fs.target, we can never start remote fs mounts. +Now pull in remote-fs.target in dracut-pre-pivot. + +Signed-off-by: WANG Chao +(cherry picked from commit ce7f408dfd473b3c2f4fdb9ddc2b2131e08007d3) +--- + modules.d/98systemd/dracut-pre-pivot.service | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules.d/98systemd/dracut-pre-pivot.service b/modules.d/98systemd/dracut-pre-pivot.service +index 6db1f2c..d7c7b1d 100644 +--- a/modules.d/98systemd/dracut-pre-pivot.service ++++ b/modules.d/98systemd/dracut-pre-pivot.service +@@ -13,6 +13,8 @@ Documentation=man:dracut-pre-pivot.service(8) + After=initrd.target initrd-parse-etc.service sysroot.mount + After=dracut-initqueue.service dracut-pre-mount.service dracut-mount.service + Before=initrd-cleanup.service ++Wants=remote-fs.target ++After=remote-fs.target + ConditionPathExists=/etc/initrd-release + ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-pivot + ConditionDirectoryNotEmpty=|/lib/dracut/hooks/cleanup diff --git a/SOURCES/0177-kernel-modules-Fix-storage-module-selection-for-sdhc.patch b/SOURCES/0177-kernel-modules-Fix-storage-module-selection-for-sdhc.patch new file mode 100644 index 0000000..1a4273d --- /dev/null +++ b/SOURCES/0177-kernel-modules-Fix-storage-module-selection-for-sdhc.patch @@ -0,0 +1,50 @@ +From 9c45cb9c117505191f2678e25edac481ff6da9f2 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Fri, 23 May 2014 11:54:01 +0100 +Subject: [PATCH] kernel-modules: Fix storage module selection for + sdhci/mmc/ahci + +Currently the block driver detection for generic initrd doesn't include +the SD/MMC drivers so we fail to boot generic images on any device using +those platforms as boot devices when using a generic initrd. Add logic +to detect those modules. This primarily fixes embedded ARM devices but +also likely intel tablets/dev boards and enterprise hypervisors that +have the ability to boot from SD. + +Also the ahci_init_controller misses a number of drivers that use the +libahci_platform module for the init so this fixes some missing achi +moduless too. + +Finally it cleans up the ARM storage module hacks that the above now +deals with in a more generic manner. + +Signed-off-by: +(cherry picked from commit 827ec27a9c36755095dda899eff75cdae78b2120) +--- + modules.d/90kernel-modules/module-setup.sh | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh +index a7803d0..603a7a1 100755 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -5,7 +5,7 @@ + installkernel() { + if [[ -z $drivers ]]; then + block_module_filter() { +- local _blockfuncs='ahci_init_controller|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect' ++ local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_pltfm_init' + # subfunctions inherit following FDs + local _merge=8 _side2=9 + function bmf1() { +@@ -50,9 +50,7 @@ installkernel() { + + if [[ "$(uname -p)" == arm* ]]; then + # arm specific modules +- hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap omapdrm \ +- omap_hsmmc panel-tfp410 sdhci_dove ahci_platform pata_imx sata_mv \ +- ehci-tegra mmc_block usb_storage ++ hostonly='' instmods omapdrm panel-tfp410 + fi + + # install virtual machine support diff --git a/SOURCES/0178-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch b/SOURCES/0178-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch new file mode 100644 index 0000000..dc2e9e2 --- /dev/null +++ b/SOURCES/0178-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch @@ -0,0 +1,50 @@ +From 5f5c07eca2bd44967e9043fefca3dae91db010f9 Mon Sep 17 00:00:00 2001 +From: Alex Harpin +Date: Tue, 6 May 2014 23:41:17 +0100 +Subject: [PATCH] bonding: use hwaddr of the slave rather than the master + +When a bonded interface is brought up, any slaves included in the bond +have their hardware address set to that of the bond master. Although +this allows an interface to be brought up on start up, when the +configuration file is imported into the booted system it prevents +the bonded interface being successfully restarted. + +The fix involves obtaining the hardware address of the slaves before +they are added to the bond and then using this value in the +configuration file. + +(cherry picked from commit 83c9ff7dbb465bedb10119bb2883d34266922180) +--- + modules.d/40network/ifup.sh | 1 + + modules.d/45ifcfg/write-ifcfg.sh | 6 +++++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index ede0188..fd84e4c 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -188,6 +188,7 @@ if [ -e /tmp/bond.${netif}.info ]; then + + for slave in $bondslaves ; do + ip link set $slave down ++ cat /sys/class/net/$slave/address > /tmp/net.${netif}.${slave}.hwaddr + echo "+$slave" > /sys/class/net/$bondname/bonding/slaves + linkup $slave + done +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index 7f997a2..fb388bc 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -206,7 +206,11 @@ for netup in /tmp/net.*.did-setup ; do + echo "TYPE=Ethernet" + echo "ONBOOT=yes" + echo "NETBOOT=yes" +- echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" ++ if [ -e /tmp/net.${netif}.${slave}.hwaddr ]; then ++ echo "HWADDR=\"$(cat /tmp/net.${netif}.${slave}.hwaddr)\"" ++ else ++ echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" ++ fi + echo "SLAVE=yes" + echo "MASTER=\"$netif\"" + echo "NAME=\"$slave\"" diff --git a/SOURCES/0179-network-ifup.sh-Don-t-try-to-modprobe-ipv6-if-alread.patch b/SOURCES/0179-network-ifup.sh-Don-t-try-to-modprobe-ipv6-if-alread.patch new file mode 100644 index 0000000..fd460ea --- /dev/null +++ b/SOURCES/0179-network-ifup.sh-Don-t-try-to-modprobe-ipv6-if-alread.patch @@ -0,0 +1,28 @@ +From 962bb116632480313c4b5094e554926968d8b946 Mon Sep 17 00:00:00 2001 +From: Vasiliy Tolstov +Date: Mon, 26 May 2014 15:28:43 +0400 +Subject: [PATCH] network/ifup.sh: Don't try to modprobe ipv6, if already + available + +Signed-off-by: Vasiliy Tolstov + +[Edited-by: Harald Hoyer] +Simplified logic. + +(cherry picked from commit 28f3f537c4ffb101c26def41c9a6a0278f9b4437) +--- + modules.d/40network/ifup.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index fd84e4c..79127f2 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -106,6 +106,7 @@ do_dhcp() { + } + + load_ipv6() { ++ [ -d /proc/sys/net/ipv6 ] && return + modprobe ipv6 + i=0 + while [ ! -d /proc/sys/net/ipv6 ]; do diff --git a/SOURCES/0180-iscsi-correctly-install-the-timeout-iscsiroot-dummy-.patch b/SOURCES/0180-iscsi-correctly-install-the-timeout-iscsiroot-dummy-.patch new file mode 100644 index 0000000..30eff42 --- /dev/null +++ b/SOURCES/0180-iscsi-correctly-install-the-timeout-iscsiroot-dummy-.patch @@ -0,0 +1,25 @@ +From b66bfd5b98d3e8411df2ebfa1390d81dc5f83c09 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 11 Jun 2014 14:55:11 +0200 +Subject: [PATCH] iscsi: correctly install the timeout iscsiroot dummy call + +initqueue parses $1 as the executable command + +(cherry picked from commit 486a8f33e2edaf249e3a09c98a910094e201cf9e) +--- + modules.d/95iscsi/parse-iscsiroot.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh +index 4be9d56..52a4805 100755 +--- a/modules.d/95iscsi/parse-iscsiroot.sh ++++ b/modules.d/95iscsi/parse-iscsiroot.sh +@@ -64,7 +64,7 @@ if [ -n "$iscsi_firmware" ] ; then + netroot=${netroot:-iscsi:} + modprobe -q iscsi_boot_sysfs 2>/dev/null + modprobe -q iscsi_ibft +- initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'" ++ initqueue --onetime --timeout /sbin/iscsiroot dummy "'$netroot'" "'$NEWROOT'" + fi + + # If it's not iscsi we don't continue diff --git a/SOURCES/0181-iscsi-correctly-install-the-settled-iscsiroot-dummy-.patch b/SOURCES/0181-iscsi-correctly-install-the-settled-iscsiroot-dummy-.patch new file mode 100644 index 0000000..c7bcdf5 --- /dev/null +++ b/SOURCES/0181-iscsi-correctly-install-the-settled-iscsiroot-dummy-.patch @@ -0,0 +1,25 @@ +From 98b104e88799ad461d9322faaee4c831d35c96c4 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 11 Jun 2014 14:58:55 +0200 +Subject: [PATCH] iscsi: correctly install the settled iscsiroot dummy call + +initqueue parses $1 as the executable command + +(cherry picked from commit bb8c16d12178373f17553294603ff5187e318b51) +--- + modules.d/95iscsi/parse-iscsiroot.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh +index 52a4805..b48be38 100755 +--- a/modules.d/95iscsi/parse-iscsiroot.sh ++++ b/modules.d/95iscsi/parse-iscsiroot.sh +@@ -88,7 +88,7 @@ fi + + if [ -n "$netroot" ] && [ "$root" != "/dev/root" ] && [ "$root" != "dhcp" ]; then + if ! getargbool 1 rd.neednet >/dev/null || ! getarg "ip="; then +- initqueue --onetime --settled "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'" ++ initqueue --onetime --settled /sbin/iscsiroot dummy "'$netroot'" "'$NEWROOT'" + fi + fi + diff --git a/SOURCES/0182-deprecate-ip-ibft-kernel-command-line-parameter.patch b/SOURCES/0182-deprecate-ip-ibft-kernel-command-line-parameter.patch new file mode 100644 index 0000000..4fcdc32 --- /dev/null +++ b/SOURCES/0182-deprecate-ip-ibft-kernel-command-line-parameter.patch @@ -0,0 +1,81 @@ +From 6db59a1630f80ab4a5d6a701f3063aa5a6aaccc9 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 20 Jun 2014 14:27:09 +0200 +Subject: [PATCH] deprecate "ip=ibft" kernel command line parameter + +rd.iscsi.ibft[=1] should be used instead. + +Thing is, 'ip=ibft' is not really an ip setting, but rather a marker +that iBFT should be evaluated. + +Also removed the trigger of the warning: +"Warning: Please supply bootdev argument for multiple ip= lines" + +(cherry picked from commit 5580e4c176c92624054691a8e12cffe8622cc1a0) +--- + dracut.cmdline.7.asc | 7 ++++--- + modules.d/40network/parse-ibft.sh | 6 +++--- + modules.d/40network/parse-ip-opts.sh | 4 ++++ + 3 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc +index 985285b..10550ee 100644 +--- a/dracut.cmdline.7.asc ++++ b/dracut.cmdline.7.asc +@@ -437,7 +437,7 @@ USB Android phone:: + * enp0s29u1u2 + ===================== + +-**ip=**__{dhcp|on|any|dhcp6|auto6|ibft}__:: ++**ip=**__{dhcp|on|any|dhcp6|auto6}__:: + dhcp|on|any::: get ip from dhcp server from all interfaces. If root=dhcp, + loop sequentially through all interfaces (eth0, eth1, ...) and use the first + with a valid DHCP root-path. +@@ -446,8 +446,6 @@ USB Android phone:: + + dhcp6::: IPv6 DHCP + +- ibft::: iBFT autoconfiguration +- + **ip=**____:__{dhcp|on|any|dhcp6|auto6}__[:[____][:____]]:: + This parameter can be specified multiple times. + + +@@ -661,6 +659,9 @@ will result in + iscsistart -b --param node.session.timeo.replacement_timeout=30 + -- + ++**rd.iscsi.ibft** **rd.iscsi.ibft=1**: ++ Turn on iBFT autoconfiguration for the interfaces ++ + FCoE + ~~~~ + **fcoe=**____:__{dcb|nodcb}__:: +diff --git a/modules.d/40network/parse-ibft.sh b/modules.d/40network/parse-ibft.sh +index 9776c75..643313d 100755 +--- a/modules.d/40network/parse-ibft.sh ++++ b/modules.d/40network/parse-ibft.sh +@@ -5,6 +5,6 @@ + command -v getarg >/dev/null || . /lib/dracut-lib.sh + command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh + +-# If ibft is requested, read ibft vals and write ip=XXX cmdline args +-[ "ibft" = "$(getarg ip=)" ] && ibft_to_cmdline +- ++if getargbool 0 rd.iscsi.ibft -d "ip=ibft"; then ++ ibft_to_cmdline ++fi +diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh +index 7e73574..b029d00 100755 +--- a/modules.d/40network/parse-ip-opts.sh ++++ b/modules.d/40network/parse-ip-opts.sh +@@ -25,6 +25,10 @@ fi + if [ -z "$NEEDBOOTDEV" ] ; then + count=0 + for p in $(getargs ip=); do ++ case "$p" in ++ ibft) ++ continue;; ++ esac + count=$(( $count + 1 )) + done + [ $count -gt 1 ] && NEEDBOOTDEV=1 diff --git a/SOURCES/0183-systemd-Optionally-include-efivarsfs-module.patch b/SOURCES/0183-systemd-Optionally-include-efivarsfs-module.patch new file mode 100644 index 0000000..26c41a2 --- /dev/null +++ b/SOURCES/0183-systemd-Optionally-include-efivarsfs-module.patch @@ -0,0 +1,24 @@ +From 7cab5fbf59bb0d1f654e7fbc888513367f4ea65d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= +Date: Mon, 16 Jun 2014 01:13:44 -0400 +Subject: [PATCH] systemd: Optionally, include efivarsfs module + +It is, however not an error if this module can't be found. + +(cherry picked from commit f46c2fff717d0036bf3cd4d6c1c9af28eb46ceb1) +--- + modules.d/98systemd/module-setup.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh +index 36a0505..19be587 100755 +--- a/modules.d/98systemd/module-setup.sh ++++ b/modules.d/98systemd/module-setup.sh +@@ -19,6 +19,7 @@ depends() { + + installkernel() { + instmods autofs4 ipv6 ++ instmods -s efivarfs + } + + install() { diff --git a/SOURCES/0184-98systemd-also-install-systemd-journald-dev-log.sock.patch b/SOURCES/0184-98systemd-also-install-systemd-journald-dev-log.sock.patch new file mode 100644 index 0000000..f29f5ea --- /dev/null +++ b/SOURCES/0184-98systemd-also-install-systemd-journald-dev-log.sock.patch @@ -0,0 +1,25 @@ +From 8c1807bc970f50a034251f6e157d97ad58a9c48f Mon Sep 17 00:00:00 2001 +From: Daniel Schaal +Date: Thu, 19 Jun 2014 11:38:25 +0200 +Subject: [PATCH] 98systemd: also install systemd-journald-dev-log.socket + +The /dev/log socket was moved to /run on systemd 214, install the +newly added socket unit. + +(cherry picked from commit 7eb0bc7bc4fdcf4ee9cde0e919eff2497c22beab) +--- + modules.d/98systemd/module-setup.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh +index 19be587..0de9d61 100755 +--- a/modules.d/98systemd/module-setup.sh ++++ b/modules.d/98systemd/module-setup.sh +@@ -103,6 +103,7 @@ install() { + $systemdsystemunitdir/sockets.target.wants/systemd-udevd-control.socket \ + $systemdsystemunitdir/sockets.target.wants/systemd-udevd-kernel.socket \ + $systemdsystemunitdir/sockets.target.wants/systemd-journald.socket \ ++ $systemdsystemunitdir/sockets.target.wants/systemd-journald-dev-log.socket \ + $systemdsystemunitdir/sysinit.target.wants/systemd-udevd.service \ + $systemdsystemunitdir/sysinit.target.wants/systemd-udev-trigger.service \ + $systemdsystemunitdir/sysinit.target.wants/kmod-static-nodes.service \ diff --git a/SOURCES/0185-lsinitrd.sh-don-t-choke-on-LZO-compressed-images.patch b/SOURCES/0185-lsinitrd.sh-don-t-choke-on-LZO-compressed-images.patch new file mode 100644 index 0000000..e05a2d8 --- /dev/null +++ b/SOURCES/0185-lsinitrd.sh-don-t-choke-on-LZO-compressed-images.patch @@ -0,0 +1,29 @@ +From 491dbfe072a6ac15da28c581eba2b885cf235051 Mon Sep 17 00:00:00 2001 +From: Tobias Geerinckx +Date: Tue, 3 Jun 2014 04:59:34 +0200 +Subject: [PATCH] lsinitrd.sh: don't choke on LZO-compressed images + +lsinitrd (and hence dracut) currently fail to list the contents of any +LZO-compressed image, and merely spit out misleading xzcat errors. + +I guess no-one actually uses them. + +(cherry picked from commit 773d6a7ded0cc717ecfb7bed6e3f52ceedfb1834) +--- + lsinitrd.sh | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lsinitrd.sh b/lsinitrd.sh +index 7b12ab9..b36b34e 100755 +--- a/lsinitrd.sh ++++ b/lsinitrd.sh +@@ -181,6 +181,9 @@ CAT=$({ + $'\x02\x21'*) + echo "lz4 -d -c" + ;; ++ $'\x89'LZO$'\0'*) ++ echo "lzop -d -c" ++ ;; + *) + if echo "test"|xz|xzcat --single-stream >/dev/null 2>&1; then + echo "xzcat --single-stream --" diff --git a/SOURCES/0186-usable_root-only-check-for-ld-.so.patch b/SOURCES/0186-usable_root-only-check-for-ld-.so.patch new file mode 100644 index 0000000..94eafec --- /dev/null +++ b/SOURCES/0186-usable_root-only-check-for-ld-.so.patch @@ -0,0 +1,41 @@ +From 49fe9bc014993d1dd4a7f26e1904d7359398a6dd Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 24 Jun 2014 18:54:35 +0200 +Subject: [PATCH] usable_root(): only check for ld-*.so + +current systemd allows booting with only /usr on the root partition + +see, if we can find an elf loader + +(cherry picked from commit 7e59d550425833e9ecaa892ef9f1a9fe8160065a) +--- + modules.d/99base/dracut-lib.sh | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index 66977e7..417cfd8 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -730,11 +730,18 @@ $(readlink -e -q "$d")" || return 255 + + + usable_root() { +- local _d +- [ -d $1 ] || return 1 +- for _d in proc sys dev; do +- [ -e "$1"/$_d ] || return 1 ++ local _i ++ ++ [ -d "$1" ] || return 1 ++ ++ for _i in "$1"/usr/lib*/ld-*.so "$1"/lib*/ld-*.so; do ++ [ -e "$_i" ] && return 0 + done ++ ++ for _i in proc sys dev; do ++ [ -e "$1"/$_i ] || return 1 ++ done ++ + return 0 + } + diff --git a/SOURCES/0187-print-out-what-kernel-command-line-parameters-are-us.patch b/SOURCES/0187-print-out-what-kernel-command-line-parameters-are-us.patch new file mode 100644 index 0000000..35a224e --- /dev/null +++ b/SOURCES/0187-print-out-what-kernel-command-line-parameters-are-us.patch @@ -0,0 +1,27 @@ +From 6a9d47ce27452c56487b6c6d1a078abb7e904f67 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 24 Jun 2014 18:55:49 +0200 +Subject: [PATCH] print out, what kernel command line parameters are used + +(cherry picked from commit fbc4620f059afec6169533259e24bc06479d18f9) + +Conflicts: + modules.d/98systemd/dracut-cmdline.sh +--- + modules.d/98systemd/dracut-cmdline.sh | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh +index 36406d9..8a5ab2f 100755 +--- a/modules.d/98systemd/dracut-cmdline.sh ++++ b/modules.d/98systemd/dracut-cmdline.sh +@@ -15,6 +15,9 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh + [ -f /etc/initrd-release ] && . /etc/initrd-release + [ -n "$VERSION" ] && info "dracut-$VERSION" + ++info "Using kernel command line parameters:" ++getcmdline | vinfo ++ + getargbool 0 rd.udev.log-priority=info -d rd.udev.info -d -n -y rdudevinfo && echo 'udev_log="info"' >> /etc/udev/udev.conf + getargbool 0 rd.udev.log-priority=debug -d rd.udev.debug -d -n -y rdudevdebug && echo 'udev_log="debug"' >> /etc/udev/udev.conf + diff --git a/SOURCES/0188-kernel-modules-add-tegra-arm-modules.patch b/SOURCES/0188-kernel-modules-add-tegra-arm-modules.patch new file mode 100644 index 0000000..b8a55cb --- /dev/null +++ b/SOURCES/0188-kernel-modules-add-tegra-arm-modules.patch @@ -0,0 +1,23 @@ +From f679f53b2ada8ab6a9d294f049517b407686f519 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 25 Jun 2014 12:02:30 +0200 +Subject: [PATCH] kernel-modules: add tegra arm modules + +(cherry picked from commit 54483dd773a67061746a146d276cb40953468132) +--- + modules.d/90kernel-modules/module-setup.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh +index 603a7a1..da3b1f3 100755 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -51,6 +51,8 @@ installkernel() { + if [[ "$(uname -p)" == arm* ]]; then + # arm specific modules + hostonly='' instmods omapdrm panel-tfp410 ++ instmods i2c-tegra gpio-regulator as3722-regulator \ ++ phy-tegra-usb ehci-tegra sdhci-tegra + fi + + # install virtual machine support diff --git a/SOURCES/0189-Add-rd.cmdline-ask-kernel-command-line-parameter.patch b/SOURCES/0189-Add-rd.cmdline-ask-kernel-command-line-parameter.patch new file mode 100644 index 0000000..ff8dbf6 --- /dev/null +++ b/SOURCES/0189-Add-rd.cmdline-ask-kernel-command-line-parameter.patch @@ -0,0 +1,142 @@ +From 9c2daa5d3aa1b98d5a005a78a7a2d332e7422034 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 27 Jun 2014 12:02:14 +0200 +Subject: [PATCH] Add "rd.cmdline=ask" kernel command line parameter + +prompts the user for additional kernel command line parameters + +(cherry picked from commit f232f6623d2b761c1538192c97e13842e5037adc) + +Conflicts: + dracut.cmdline.7.asc + modules.d/98systemd/dracut-cmdline.sh + modules.d/99base/init.sh +--- + dracut.cmdline.7.asc | 4 ++++ + modules.d/98systemd/dracut-cmdline-ask.service | 33 ++++++++++++++++++++++++++ + modules.d/98systemd/dracut-cmdline-ask.sh | 20 ++++++++++++++++ + modules.d/98systemd/module-setup.sh | 2 ++ + modules.d/99base/init.sh | 8 +++++++ + 5 files changed, 67 insertions(+) + create mode 100644 modules.d/98systemd/dracut-cmdline-ask.service + create mode 100755 modules.d/98systemd/dracut-cmdline-ask.sh + +diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc +index 10550ee..24bf449 100644 +--- a/dracut.cmdline.7.asc ++++ b/dracut.cmdline.7.asc +@@ -81,6 +81,10 @@ rootfstype=ext3 + enable autoassembly of special devices like cryptoLUKS, dmraid, mdraid or + lvm. Default is off as of dracut version >= 024. + ++ ++**rd.cmdline=ask**:: ++ prompts the user for additional kernel command line parameters ++ + **rd.fstab=0**:: + do not honor special mount options for the root filesystem found in + _/etc/fstab_ of the real root. +diff --git a/modules.d/98systemd/dracut-cmdline-ask.service b/modules.d/98systemd/dracut-cmdline-ask.service +new file mode 100644 +index 0000000..9993671 +--- /dev/null ++++ b/modules.d/98systemd/dracut-cmdline-ask.service +@@ -0,0 +1,33 @@ ++# This file is part of systemd. ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++ ++# See systemd.special(7) for details ++ ++[Unit] ++Description=dracut ask for additional cmdline parameters ++DefaultDependencies=no ++Before=dracut-cmdline.service ++After=systemd-journald.socket ++Wants=systemd-journald.socket ++ConditionPathExists=/etc/initrd-release ++ConditionKernelCommandLine=rd.cmdline=ask ++ ++[Service] ++Environment=DRACUT_SYSTEMD=1 ++Environment=NEWROOT=/sysroot ++Type=oneshot ++ExecStart=-/bin/dracut-cmdline-ask ++StandardInput=tty ++StandardOutput=inherit ++StandardError=inherit ++RemainAfterExit=yes ++KillMode=process ++IgnoreSIGPIPE=no ++ ++# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash ++# terminates cleanly. ++KillSignal=SIGHUP +diff --git a/modules.d/98systemd/dracut-cmdline-ask.sh b/modules.d/98systemd/dracut-cmdline-ask.sh +new file mode 100755 +index 0000000..024d60e +--- /dev/null ++++ b/modules.d/98systemd/dracut-cmdline-ask.sh +@@ -0,0 +1,20 @@ ++#!/bin/bash ++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- ++# ex: ts=8 sw=4 sts=4 et filetype=sh ++ ++sleep 0.5 ++echo ++sleep 0.5 ++echo ++sleep 0.5 ++echo ++echo ++echo ++echo ++echo "Enter additional kernel command line parameter (end with ctrl-d or .)" ++while read -e -p "> " line; do ++ [[ "$line" == "." ]] && break ++ [[ "$line" ]] && printf -- "%s\n" "$line" >> /etc/cmdline.d/99-cmdline-ask.conf ++done ++ ++exit 0 +diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh +index 0de9d61..015597f 100755 +--- a/modules.d/98systemd/module-setup.sh ++++ b/modules.d/98systemd/module-setup.sh +@@ -183,6 +183,7 @@ install() { + ln_r "${systemdsystemunitdir}/initrd.target" "${systemdsystemunitdir}/default.target" + + inst_script "$moddir/dracut-cmdline.sh" /bin/dracut-cmdline ++ inst_script "$moddir/dracut-cmdline-ask.sh" /bin/dracut-cmdline-ask + inst_script "$moddir/dracut-pre-udev.sh" /bin/dracut-pre-udev + inst_script "$moddir/dracut-pre-trigger.sh" /bin/dracut-pre-trigger + inst_script "$moddir/dracut-initqueue.sh" /bin/dracut-initqueue +@@ -212,6 +213,7 @@ install() { + mkdir -p "${initdir}/$systemdsystemunitdir/initrd.target.wants" + for i in \ + dracut-cmdline.service \ ++ dracut-cmdline-ask.service \ + dracut-initqueue.service \ + dracut-mount.service \ + dracut-pre-mount.service \ +diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh +index ae73fd2..9ee3e9d 100755 +--- a/modules.d/99base/init.sh ++++ b/modules.d/99base/init.sh +@@ -115,6 +115,14 @@ fi + + source_conf /etc/conf.d + ++if getarg "rd.cmdline=ask"; then ++ echo "Enter additional kernel command line parameter (end with ctrl-d or .)" ++ while read -p "> " line; do ++ [ "$line" = "." ] && break ++ echo "$line" >> /etc/cmdline.d/99-cmdline-ask.conf ++ done ++fi ++ + # run scriptlets to parse the command line + make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab' + getarg 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline" diff --git a/SOURCES/0190-base-init.sh-use-loop-counter-with-unique-varname.patch b/SOURCES/0190-base-init.sh-use-loop-counter-with-unique-varname.patch new file mode 100644 index 0000000..4db6750 --- /dev/null +++ b/SOURCES/0190-base-init.sh-use-loop-counter-with-unique-varname.patch @@ -0,0 +1,36 @@ +From ef6665ec410fe89af700e3257942083f4ea629a8 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 27 Jun 2014 18:05:37 +0200 +Subject: [PATCH] base/init.sh: use loop counter with unique varname + +$i can be polluted too easily + +(cherry picked from commit 6525182bfc06abfffd71dafc06c5faca6c55eace) +--- + modules.d/99base/init.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh +index 9ee3e9d..dcc62d2 100755 +--- a/modules.d/99base/init.sh ++++ b/modules.d/99base/init.sh +@@ -231,7 +231,7 @@ source_hook pre-mount + getarg 'rd.break=mount' -d 'rdbreak=mount' && emergency_shell -n mount "Break mount" + # mount scripts actually try to mount the root filesystem, and may + # be sourced any number of times. As soon as one suceeds, no more are sourced. +-i=0 ++_i_mount=0 + while :; do + if ismounted "$NEWROOT"; then + usable_root "$NEWROOT" && break; +@@ -247,8 +247,8 @@ while :; do + fi + done + +- i=$(($i+1)) +- [ $i -gt 20 ] \ ++ _i_mount=$(($_i_mount+1)) ++ [ $_i_mount -gt 20 ] \ + && { flock -s 9 ; action_on_fail "Can't mount root filesystem" && break; } 9>/.console_lock + done + diff --git a/SOURCES/0191-ifcfg-depends-on-network.patch b/SOURCES/0191-ifcfg-depends-on-network.patch new file mode 100644 index 0000000..54ce6db --- /dev/null +++ b/SOURCES/0191-ifcfg-depends-on-network.patch @@ -0,0 +1,22 @@ +From b201a3f405222ce210a364555fb2b69d07db3281 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 30 Jun 2014 11:28:08 +0200 +Subject: [PATCH] ifcfg: depends on network + +(cherry picked from commit f1a38e5294b76c60b7614ec29ed56eccc4ed078a) +--- + modules.d/45ifcfg/module-setup.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/45ifcfg/module-setup.sh b/modules.d/45ifcfg/module-setup.sh +index ce53e5e..4299fea 100755 +--- a/modules.d/45ifcfg/module-setup.sh ++++ b/modules.d/45ifcfg/module-setup.sh +@@ -8,6 +8,7 @@ check() { + } + + depends() { ++ echo "network" + return 0 + } + diff --git a/SOURCES/0192-test-add-udev-settle-after-sfdisk.patch b/SOURCES/0192-test-add-udev-settle-after-sfdisk.patch new file mode 100644 index 0000000..3f65042 --- /dev/null +++ b/SOURCES/0192-test-add-udev-settle-after-sfdisk.patch @@ -0,0 +1,151 @@ +From 932169bc349be88cd31bb3bd0e19c02a532b8241 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 30 Jun 2014 11:29:37 +0200 +Subject: [PATCH] test: add udev settle after sfdisk + +(cherry picked from commit e54d961160f12e30917c1a6360f7ba32ecb0f83d) +--- + test/TEST-01-BASIC/create-root.sh | 1 + + test/TEST-02-SYSTEMD/create-root.sh | 1 + + test/TEST-03-USR-MOUNT/create-root.sh | 1 + + test/TEST-04-FULL-SYSTEMD/create-root.sh | 1 + + test/TEST-10-RAID/create-root.sh | 1 + + test/TEST-11-LVM/create-root.sh | 1 + + test/TEST-12-RAID-DEG/create-root.sh | 1 + + test/TEST-13-ENC-RAID-LVM/create-root.sh | 1 + + test/TEST-15-BTRFSRAID/create-root.sh | 9 +++++---- + test/TEST-17-LVM-THIN/create-root.sh | 1 + + 10 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/test/TEST-01-BASIC/create-root.sh b/test/TEST-01-BASIC/create-root.sh +index 96e3c33..3a62afd 100755 +--- a/test/TEST-01-BASIC/create-root.sh ++++ b/test/TEST-01-BASIC/create-root.sh +@@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <keyfile + cryptsetup -q luksFormat /dev/sda2 /keyfile + cryptsetup -q luksFormat /dev/sda3 /keyfile +diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh +index 69f9280..b92f9c0 100755 +--- a/test/TEST-15-BTRFSRAID/create-root.sh ++++ b/test/TEST-15-BTRFSRAID/create-root.sh +@@ -15,14 +15,15 @@ sfdisk -C 327800 -H 2 -S 32 -L /dev/sda </dev/sda1 + poweroff -f +diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-17-LVM-THIN/create-root.sh +index 740704f..416c3c3 100755 +--- a/test/TEST-17-LVM-THIN/create-root.sh ++++ b/test/TEST-17-LVM-THIN/create-root.sh +@@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda < +Date: Mon, 30 Jun 2014 11:29:56 +0200 +Subject: [PATCH] TEST-15-BTRFSRAID: install /etc/os-release + +makes systemd switch-root happy + +(cherry picked from commit 44537b7bf89f297a8f188c93a2148d55cb7799e7) +--- + test/TEST-15-BTRFSRAID/test.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh +index e6ff351..3fc1d45 100755 +--- a/test/TEST-15-BTRFSRAID/test.sh ++++ b/test/TEST-15-BTRFSRAID/test.sh +@@ -37,6 +37,7 @@ test_setup() { + inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup" + inst_multiple grep + inst ./test-init.sh /sbin/init ++ inst_simple /etc/os-release + find_binary plymouth >/dev/null && inst_multiple plymouth + (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp ) + cp -a /etc/ld.so.conf* $initdir/etc diff --git a/SOURCES/0194-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch b/SOURCES/0194-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch new file mode 100644 index 0000000..6d3b742 --- /dev/null +++ b/SOURCES/0194-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch @@ -0,0 +1,41 @@ +From 0c81abbe79938423d41093b620175d97b435feb5 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 3 Jul 2014 15:04:17 +0200 +Subject: [PATCH] lvm:module-setup.sh: check for existance of + 69-dm-lvm-metad.rules + +fixup for 12819a579900b9691e2bfaf14e76fbb025851530 + +(cherry picked from commit fecc1d69e5a12c305d93e7dca64bd690a1fe8ff5) +--- + modules.d/90lvm/module-setup.sh | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh +index 4a49fc7..0c5890a 100755 +--- a/modules.d/90lvm/module-setup.sh ++++ b/modules.d/90lvm/module-setup.sh +@@ -78,13 +78,16 @@ install() { + inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules + + # Do not run lvmetad update via pvscan in udev rule - lvmetad is not running yet in dracut! +- if [[ -f ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ]] && \ +- grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then +- sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules +- sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules +- sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules +- else +- sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ++ if [[ -f ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ]]; then ++ if grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then ++ sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' \ ++ ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ++ sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ++ sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ++ else ++ sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' \ ++ ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ++ fi + fi + + # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules diff --git a/SOURCES/0195-dracut.sh-always-copy-prelink-files-in-FIPS-mode.patch b/SOURCES/0195-dracut.sh-always-copy-prelink-files-in-FIPS-mode.patch new file mode 100644 index 0000000..9c2c339 --- /dev/null +++ b/SOURCES/0195-dracut.sh-always-copy-prelink-files-in-FIPS-mode.patch @@ -0,0 +1,49 @@ +From bb232c88fa47ac8970d50dc97affe7cc65bc1ce9 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 8 Jul 2014 11:50:04 +0200 +Subject: [PATCH] dracut.sh: always copy prelink files in FIPS mode + +regardless of the the prelink={yes|no} switch + +(cherry picked from commit 6cd7001b35c66a12787bc0943b9a7e83a3d443c0) +--- + dracut.sh | 26 ++++++++++++-------------- + 1 file changed, 12 insertions(+), 14 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index 705f090..7997428 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1314,20 +1314,18 @@ if [[ $kernel_only != yes ]]; then + fi + fi + +-if [[ $do_prelink == yes ]]; then +- PRELINK_BIN="$(command -v prelink)" +- if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then +- if [[ $DRACUT_FIPS_MODE ]]; then +- dinfo "*** Installing prelink files ***" +- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache +- else +- dinfo "*** Pre-linking files ***" +- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf +- chroot "$initdir" "$PRELINK_BIN" -a +- rm -f -- "$initdir/$PRELINK_BIN" +- rm -fr -- "$initdir"/etc/prelink.* +- dinfo "*** Pre-linking files done ***" +- fi ++PRELINK_BIN="$(command -v prelink)" ++if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then ++ if [[ $DRACUT_FIPS_MODE ]]; then ++ dinfo "*** Installing prelink files ***" ++ inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache ++ elif [[ $do_prelink == yes ]]; then ++ dinfo "*** Pre-linking files ***" ++ inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf ++ chroot "$initdir" "$PRELINK_BIN" -a ++ rm -f -- "$initdir/$PRELINK_BIN" ++ rm -fr -- "$initdir"/etc/prelink.* ++ dinfo "*** Pre-linking files done ***" + fi + fi + diff --git a/SOURCES/0196-dracut-functions.sh-speed-up-ldconfig_paths.patch b/SOURCES/0196-dracut-functions.sh-speed-up-ldconfig_paths.patch new file mode 100644 index 0000000..931b433 --- /dev/null +++ b/SOURCES/0196-dracut-functions.sh-speed-up-ldconfig_paths.patch @@ -0,0 +1,30 @@ +From 8bf70609de708380c1184bb27a561f6f253650b6 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 8 Jul 2014 12:54:21 +0200 +Subject: [PATCH] dracut-functions.sh: speed up ldconfig_paths() + +(cherry picked from commit 5ea0be0a8c83969fd0041b3e647f82fcfb365e44) +--- + dracut-functions.sh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 915f70f..0002556 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -60,12 +60,11 @@ ldconfig_paths() + local a i + declare -A a + for i in $( +- ldconfig -pN 2>/dev/null | while read a b c d; do +- [[ "$c" != "=>" ]] && continue +- printf "%s\n" ${d%/*}; ++ ldconfig -pN 2>/dev/null | grep -F '=>' | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | while read a b c d; do ++ d=${d%/*} ++ printf "%s\n" "$d"; + done + ); do +- [[ "$i" = "/lib" || "$i" = "/usr/lib" || "$i" = "/lib64" || "$i" = "/usr/lib64" ]] && continue + a["$i"]=1; + done; + printf "%s\n" ${!a[@]} diff --git a/SOURCES/0197-Installing-an-OS-with-VLAN-enabled-to-an-ISCSI-LUN-f.patch b/SOURCES/0197-Installing-an-OS-with-VLAN-enabled-to-an-ISCSI-LUN-f.patch new file mode 100644 index 0000000..c3d8dca --- /dev/null +++ b/SOURCES/0197-Installing-an-OS-with-VLAN-enabled-to-an-ISCSI-LUN-f.patch @@ -0,0 +1,43 @@ +From 7b8f2e7a7bdd412dd1bd776967462de8a51683b9 Mon Sep 17 00:00:00 2001 +From: "Praveen_Paladugu@Dell.com" +Date: Tue, 10 Jun 2014 10:35:16 -0500 +Subject: [PATCH] Installing an OS with VLAN enabled to an ISCSI LUN (from + ibft) + +When installing OS to a VLAN enabled iscsi LUN (extracted from iBFT), "/tmp/net.{xyz}.has_ibft_config" is not being set properly. + +Then anaconda installer requires 'BOOTPROTO="ibft"' populated in ifcfg of the vlan interface (ex: ibft0.20), for it to properly populate the kernel parameters post installation. The setting 'BOOTPROTO="ibft"' is populated by write-ifcfg.sh script only if the corresponding interface has a file /tmp/net.{xyz}.has_inft_config + +To get around this issue, in ibft_to_cmdline() function in net-lib.sh file, I made the following changes to populate the has_ibft_config file for the vlan interface(ex: ibft0.20): + +(cherry picked from commit f4eb0d98048d51a0782d4a7137f699de174a65e4) +--- + modules.d/40network/net-lib.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index d53e1a6..90337f3 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -233,15 +233,20 @@ ibft_to_cmdline() { + case "$vlan" in + [0-9]*) + echo "vlan=$dev.$vlan:$dev" ++ echo $mac > /tmp/net.${dev}.${vlan}.has_ibft_config + ;; + *) + echo "vlan=$vlan:$dev" ++ echo $mac > /tmp/net.${vlan}.has_ibft_config + ;; + esac ++ else ++ echo $mac > /tmp/net.${dev}.has_ibft_config + fi ++ else ++ echo $mac > /tmp/net.${dev}.has_ibft_config + fi + +- echo $mac > /tmp/net.${dev}.has_ibft_config + done + ) >> /etc/cmdline.d/40-ibft.conf + } diff --git a/SOURCES/0198-ARM-update-modules-for-ARM-host-only-options.patch b/SOURCES/0198-ARM-update-modules-for-ARM-host-only-options.patch new file mode 100644 index 0000000..f40e02c --- /dev/null +++ b/SOURCES/0198-ARM-update-modules-for-ARM-host-only-options.patch @@ -0,0 +1,28 @@ +From 1e9926c12da04f1d31ad985dc564896124886cd8 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sun, 20 Jul 2014 22:20:04 +0100 +Subject: [PATCH] ARM: update modules for ARM host only options + +(cherry picked from commit 611c895772c73ebb5f769942bca5d5991adc169e) +--- + modules.d/90kernel-modules/module-setup.sh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh +index da3b1f3..fba2bc1 100755 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -50,9 +50,10 @@ installkernel() { + + if [[ "$(uname -p)" == arm* ]]; then + # arm specific modules +- hostonly='' instmods omapdrm panel-tfp410 +- instmods i2c-tegra gpio-regulator as3722-regulator \ +- phy-tegra-usb ehci-tegra sdhci-tegra ++ hostonly='' instmods \ ++ connector-hdmi connector-dvi encoder-tfp410 \ ++ encoder-tpd12s015 i2c-tegra gpio-regulator \ ++ as3722-regulator orion-ehci ehci-tegra + fi + + # install virtual machine support diff --git a/SOURCES/0199-base-dracut-lib-pidof-turn-off-debugging.patch b/SOURCES/0199-base-dracut-lib-pidof-turn-off-debugging.patch new file mode 100644 index 0000000..092ae9f --- /dev/null +++ b/SOURCES/0199-base-dracut-lib-pidof-turn-off-debugging.patch @@ -0,0 +1,41 @@ +From e502fd3099159479c303b9ab22e344d3a07ab7a7 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 22 Jul 2014 11:51:08 +0200 +Subject: [PATCH] base/dracut-lib:pidof() turn off debugging + +(cherry picked from commit ad8638e04e4ac3641afee0e273c91aa3fb6d4278) +--- + modules.d/99base/dracut-lib.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index 417cfd8..be724df 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -966,13 +966,17 @@ wait_for_loginit() + # pidof version for root + if ! command -v pidof >/dev/null 2>/dev/null; then + pidof() { ++ debug_off + local _cmd + local _exe + local _rl + local _ret=1 + local i + _cmd="$1" +- [ -z "$_cmd" ] && return 1 ++ if [ -z "$_cmd" ]; then ++ debug_on ++ return 1 ++ fi + _exe=$(type -P "$1") + for i in /proc/*/exe; do + [ -e "$i" ] || continue +@@ -986,6 +990,7 @@ if ! command -v pidof >/dev/null 2>/dev/null; then + echo ${i##/proc/} + _ret=0 + done ++ debug_on + return $_ret + } + fi diff --git a/SOURCES/0200-network-add-rd.route-parameter.patch b/SOURCES/0200-network-add-rd.route-parameter.patch new file mode 100644 index 0000000..dc32c86 --- /dev/null +++ b/SOURCES/0200-network-add-rd.route-parameter.patch @@ -0,0 +1,126 @@ +From c504204de548d45a0fd0e84ba22e29f94e670dbc Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 22 Jul 2014 11:03:56 +0200 +Subject: [PATCH] network: add rd.route parameter + +(cherry picked from commit 7b46244bb94e3dfd635a8d222044ae7fc920240d) +--- + dracut.cmdline.7.asc | 15 +++++++++++++- + modules.d/40network/net-lib.sh | 42 ++++++++++++++++++++++++++++++++++++++++ + modules.d/45ifcfg/write-ifcfg.sh | 3 +++ + 3 files changed, 59 insertions(+), 1 deletion(-) + +diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc +index 24bf449..bce8608 100644 +--- a/dracut.cmdline.7.asc ++++ b/dracut.cmdline.7.asc +@@ -489,6 +489,19 @@ WARNING: Do **not** use the default kernel naming scheme for the interface name, + as it can conflict with the kernel names. So, don't use "eth[0-9]+" for the + interface name. Better name it "bootnet" or "bluesocket". + ++**rd.route=**____/____:____[:____]:: ++ Add a static route with route options, which are separated by a colon. ++ IPv6 addresses have to be put in brackets. +++ ++[listing] ++.Example ++-- ++ rd.route=192.168.200.0/24:192.168.100.222:ens10 ++ rd.route=192.168.200.0/24:192.168.100.222 ++ rd.route=192.168.200.0/24::ens10 ++ rd.route=[2001:DB8:3::/8]:[2001:DB8:2::1]:ens10 ++-- ++ + **bootdev=**____:: + specify network interface to use routing and netroot information from. + Required if multiple ip= lines are used. +@@ -536,7 +549,7 @@ NFS + ~~~ + **root=**\[__:]____[:____]:: + mount nfs share from :/, if no server-ip is given, use +- dhcp next_server. if server-ip is an IPv6 address it has to be put in ++ dhcp next_server. If server-ip is an IPv6 address it has to be put in + brackets, e.g. [2001:DB8::1]. NFS options can be appended with the prefix + ":" or "," and are seperated by ",". + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index 90337f3..c8f9204 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -89,6 +89,7 @@ ifdown() { + + setup_net() { + local netif="$1" f="" gw_ip="" netroot_ip="" iface="" IFACES="" ++ local _p + [ -e /tmp/net.$netif.did-setup ] && return + [ -e /sys/class/net/$netif/address ] && \ + [ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && return +@@ -103,6 +104,20 @@ setup_net() { + [ -e /tmp/net.$netif.resolv.conf ] && \ + cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf + ++ # add static route ++ for _p in $(getargs rd.route); do ++ route_to_var "$_p" || continue ++ [ -n "$route_dev" ] && [ "$route_dev" != "$netif"] && continue ++ ip route add "$route_mask" ${route_gw:+via "$route_gw"} ${route_dev:+dev "$route_dev"} ++ if strstr ":" "$route_mask"; then ++ printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \ ++ > /tmp/net.route6."$netif" ++ else ++ printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \ ++ > /tmp/net.route."$netif" ++ fi ++ done ++ + # Handle STP Timeout: arping the default gateway. + # (or the root server, if a) it's local or b) there's no gateway.) + # Note: This assumes that if no router is present the +@@ -400,6 +415,33 @@ ip_to_var() { + fi + } + ++route_to_var() { ++ local v=${1}: ++ local i ++ set -- ++ while [ -n "$v" ]; do ++ if [ "${v#\[*:*:*\]:}" != "$v" ]; then ++ # handle IPv6 address ++ i="${v%%\]:*}" ++ i="${i##\[}" ++ set -- "$@" "$i" ++ v=${v#\[$i\]:} ++ else ++ set -- "$@" "${v%%:*}" ++ v=${v#*:} ++ fi ++ done ++ ++ unset route_mask route_gw route_dev ++ case $# in ++ 2) [ -n "$1" ] && route_mask="$1"; [ -n "$2" ] && route_gw="$2" ++ return 0;; ++ 3) [ -n "$1" ] && route_mask="$1"; [ -n "$2" ] && route_gw="$2"; [ -n "$3" ] && route_dev="$3" ++ return 0;; ++ *) return 1;; ++ esac ++} ++ + parse_ifname_opts() { + local IFS=: + set $1 +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index fb388bc..5e333e4 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -268,6 +268,9 @@ for netup in /tmp/net.*.did-setup ; do + echo "DNS${i}=\"${ns}\"" >> /tmp/ifcfg/ifcfg-$netif + i=$((i+1)) + done ++ ++ [ -f /tmp/net.route6."$netif" ] && cp /tmp/net.route6."$netif" /tmp/ifcfg/route6-"$netif" ++ [ -f /tmp/net.route."$netif" ] && cp /tmp/net.route."$netif" /tmp/ifcfg/route-"$netif" + done + + # Pass network opts diff --git a/SOURCES/0201-udev-rules-add-uaccess-and-seat-rules.patch b/SOURCES/0201-udev-rules-add-uaccess-and-seat-rules.patch new file mode 100644 index 0000000..42f75f9 --- /dev/null +++ b/SOURCES/0201-udev-rules-add-uaccess-and-seat-rules.patch @@ -0,0 +1,22 @@ +From 2a1bdab6e874e182793ccd7e20feb552bf53a282 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 29 Jul 2014 14:39:38 +0200 +Subject: [PATCH] udev-rules: add uaccess and seat rules + +plymouth needs the seat rules, also without systemd +--- + modules.d/95udev-rules/module-setup.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh +index 2cdcc1b..094479a 100755 +--- a/modules.d/95udev-rules/module-setup.sh ++++ b/modules.d/95udev-rules/module-setup.sh +@@ -31,6 +31,7 @@ install() { + 60-pcmcia.rules \ + 50-udev.rules 95-late.rules \ + 50-firmware.rules \ ++ 70-uaccess.rules 71-seat.rules 73-seat-late.rules \ + 75-net-description.rules 80-net-name-slot.rules \ + "$moddir/59-persistent-storage.rules" \ + "$moddir/61-persistent-storage.rules" diff --git a/SOURCES/0202-testsuite-mods-for-kvm-nested-in-kvm.patch b/SOURCES/0202-testsuite-mods-for-kvm-nested-in-kvm.patch new file mode 100644 index 0000000..90955c5 --- /dev/null +++ b/SOURCES/0202-testsuite-mods-for-kvm-nested-in-kvm.patch @@ -0,0 +1,98 @@ +From 1e03d8eb646938732e66e0babf93c93f1b466e44 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 29 Jul 2014 16:27:35 +0200 +Subject: [PATCH] testsuite mods for kvm nested in kvm + +--- + test/TEST-01-BASIC/test.sh | 1 + + test/TEST-02-SYSTEMD/test.sh | 2 +- + test/TEST-03-USR-MOUNT/test.sh | 9 ++++----- + test/TEST-12-RAID-DEG/test.sh | 2 +- + test/TEST-14-IMSM/test.sh | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh +index f857fd4..5ee6d23 100755 +--- a/test/TEST-01-BASIC/test.sh ++++ b/test/TEST-01-BASIC/test.sh +@@ -87,6 +87,7 @@ test_setup() { + ) + sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ + -a "debug watchdog" \ ++ -o "plymouth" \ + -d "piix ide-gd_mod ata_piix ext3 sd_mod i6300esb ib700wdt" \ + -f $TESTDIR/initramfs.testing $KVERSION || return 1 + +diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh +index cc9da27..2ccf8e6 100755 +--- a/test/TEST-02-SYSTEMD/test.sh ++++ b/test/TEST-02-SYSTEMD/test.sh +@@ -83,7 +83,7 @@ test_setup() { + ) + sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ + -a "debug systemd" \ +- -o "network" \ ++ -o "network plymouth" \ + -d "piix ide-gd_mod ata_piix ext3 sd_mod" \ + -f $TESTDIR/initramfs.testing $KVERSION || return 1 + +diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh +index b3d709e..ef74d40 100755 +--- a/test/TEST-03-USR-MOUNT/test.sh ++++ b/test/TEST-03-USR-MOUNT/test.sh +@@ -5,7 +5,7 @@ TEST_DESCRIPTION="root filesystem on a btrfs filesystem with /usr subvolume" + KVERSION=${KVERSION-$(uname -r)} + + # Uncomment this to debug failures +-#DEBUGFAIL="rd.shell rd.break" ++#DEBUGFAIL="rd.shell rd.break=cmdline" + + client_run() { + local test_name="$1"; shift +@@ -20,8 +20,7 @@ client_run() { + -hdc $TESTDIR/result \ + -m 256M -smp 2 -nographic \ + -net none -kernel /boot/vmlinuz-$KVERSION \ +- -watchdog i6300esb -watchdog-action poweroff \ +- -append "root=LABEL=dracut $client_opts quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \ ++ -append "root=LABEL=dracut $client_opts rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \ + -initrd $TESTDIR/initramfs.testing + + if (($? != 0)); then +@@ -121,8 +120,8 @@ test_setup() { + inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules + ) + sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -a "debug watchdog" \ +- -o "network" \ ++ -a "debug" \ ++ -o "network plymouth" \ + -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \ + -f $TESTDIR/initramfs.testing $KVERSION || return 1 + +diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh +index dfcf3dc..2631621 100755 +--- a/test/TEST-12-RAID-DEG/test.sh ++++ b/test/TEST-12-RAID-DEG/test.sh +@@ -19,7 +19,7 @@ client_run() { + -hdc $TESTDIR/disk2.img.new \ + -hdd $TESTDIR/disk3.img.new \ + -net none -kernel /boot/vmlinuz-$KVERSION \ +- -append "$* root=LABEL=root rw rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \ ++ -append "$* root=LABEL=root rw rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \ + -initrd $TESTDIR/initramfs.testing + if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then + echo "CLIENT TEST END: $@ [FAIL]" +diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh +index 9353a92..532c348 100755 +--- a/test/TEST-14-IMSM/test.sh ++++ b/test/TEST-14-IMSM/test.sh +@@ -15,7 +15,7 @@ client_run() { + -hdc $TESTDIR/disk2 \ + -m 256M -nographic \ + -net none -kernel /boot/vmlinuz-$KVERSION \ +- -append "$* root=LABEL=root rw debug rd.retry=5 rd.debug console=ttyS0,115200n81 selinux=0 rd.info $DEBUGFAIL" \ ++ -append "$* root=LABEL=root rw debug rd.retry=20 rd.debug console=ttyS0,115200n81 selinux=0 rd.info $DEBUGFAIL" \ + -initrd $TESTDIR/initramfs.testing + if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then + echo "CLIENT TEST END: $@ [FAIL]" diff --git a/SOURCES/0203-add-kate-and-emacs-per-directory-config-files.patch b/SOURCES/0203-add-kate-and-emacs-per-directory-config-files.patch new file mode 100644 index 0000000..a05188f --- /dev/null +++ b/SOURCES/0203-add-kate-and-emacs-per-directory-config-files.patch @@ -0,0 +1,72 @@ +From 4de30f02c8c20238053d2c0978980160fa7e3264 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 29 Aug 2014 13:33:40 +0200 +Subject: [PATCH] add kate and emacs per directory config files + +--- + .dir-locals.el | 2 ++ + .kateconfig | 1 + + .kateproject | 9 +++++++++ + install/.kateconfig | 1 + + skipcpio/.dir-locals.el | 2 ++ + skipcpio/.kateconfig | 1 + + 6 files changed, 16 insertions(+) + create mode 100644 .dir-locals.el + create mode 100644 .kateconfig + create mode 100644 .kateproject + create mode 100644 install/.kateconfig + create mode 100644 skipcpio/.dir-locals.el + create mode 100644 skipcpio/.kateconfig + +diff --git a/.dir-locals.el b/.dir-locals.el +new file mode 100644 +index 0000000..c9ac3af +--- /dev/null ++++ b/.dir-locals.el +@@ -0,0 +1,2 @@ ++(setq sh-basic-offset: 4) ++(setq indent-tabs-mode nil) +diff --git a/.kateconfig b/.kateconfig +new file mode 100644 +index 0000000..86b4ce5 +--- /dev/null ++++ b/.kateconfig +@@ -0,0 +1 @@ ++kate: space-indent on; tab-width 4; indent-width 4; replace-tabs on; eol unix; +diff --git a/.kateproject b/.kateproject +new file mode 100644 +index 0000000..7a84755 +--- /dev/null ++++ b/.kateproject +@@ -0,0 +1,9 @@ ++{ ++ "name": "Kate" ++ , "files": [ { "git": 1 } ] ++ , "build": { ++ "directory": "build" ++ , "build": "make -j $(getconf _NPROCESSORS_ONLN) all" ++ , "clean": "make clean" ++ } ++} +diff --git a/install/.kateconfig b/install/.kateconfig +new file mode 100644 +index 0000000..1221528 +--- /dev/null ++++ b/install/.kateconfig +@@ -0,0 +1 @@ ++kate: space-indent on; tab-width 8; indent-width 8; replace-tabs on; eol unix; +diff --git a/skipcpio/.dir-locals.el b/skipcpio/.dir-locals.el +new file mode 100644 +index 0000000..fd49d53 +--- /dev/null ++++ b/skipcpio/.dir-locals.el +@@ -0,0 +1,2 @@ ++(setq c-basic-offset 8) ++(setq indent-tabs-mode nil) +diff --git a/skipcpio/.kateconfig b/skipcpio/.kateconfig +new file mode 100644 +index 0000000..1221528 +--- /dev/null ++++ b/skipcpio/.kateconfig +@@ -0,0 +1 @@ ++kate: space-indent on; tab-width 8; indent-width 8; replace-tabs on; eol unix; diff --git a/SOURCES/0204-ssh-client-handle-etc-ssh-ssh_config.patch b/SOURCES/0204-ssh-client-handle-etc-ssh-ssh_config.patch new file mode 100644 index 0000000..9c2c0a6 --- /dev/null +++ b/SOURCES/0204-ssh-client-handle-etc-ssh-ssh_config.patch @@ -0,0 +1,34 @@ +From 828fd83bc1816bacb24b13106f935b2fbd0964a4 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 29 Aug 2014 14:06:57 +0200 +Subject: [PATCH] ssh-client: handle /etc/ssh/ssh_config + +- disable ProxyCommand +- install the GlobalKnownHostsFile + +https://bugzilla.redhat.com/show_bug.cgi?id=1086778 +--- + modules.d/95ssh-client/module-setup.sh | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/modules.d/95ssh-client/module-setup.sh b/modules.d/95ssh-client/module-setup.sh +index 66e5307..f60e963 100755 +--- a/modules.d/95ssh-client/module-setup.sh ++++ b/modules.d/95ssh-client/module-setup.sh +@@ -41,7 +41,15 @@ inst_sshenv() + + # Copy over root and system-wide ssh configs. + [[ -f /root/.ssh/config ]] && inst_simple /root/.ssh/config +- [[ -f /etc/ssh/ssh_config ]] && inst_simple /etc/ssh/ssh_config ++ if [[ -f /etc/ssh/ssh_config ]]; then ++ inst_simple /etc/ssh/ssh_config ++ sed -i -e 's/\(^[[:space:]]*\)ProxyCommand/\1# ProxyCommand/' ${initdir}/etc/ssh/ssh_config ++ while read key val; do ++ [[ key != "GlobalKnownHostsFile" ]] && continue ++ inst_simple "$val" ++ break ++ done < /etc/ssh/ssh_config ++ fi + + return 0 + } diff --git a/SOURCES/0205-dracut-lib.sh-cancel_wait_for_dev-fixed-double-escap.patch b/SOURCES/0205-dracut-lib.sh-cancel_wait_for_dev-fixed-double-escap.patch new file mode 100644 index 0000000..2567759 --- /dev/null +++ b/SOURCES/0205-dracut-lib.sh-cancel_wait_for_dev-fixed-double-escap.patch @@ -0,0 +1,22 @@ +From 8715aa00a9f046ff923dffb1f36e9a6d09f31249 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 21 Aug 2014 16:38:35 +0200 +Subject: [PATCH] dracut-lib.sh:cancel_wait_for_dev() fixed double escape + +--- + modules.d/99base/dracut-lib.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index be724df..b0ac08a 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -905,7 +905,7 @@ wait_for_dev() + cancel_wait_for_dev() + { + local _name +- _name="$(str_replace "$1" '/' '\\x2f')" ++ _name="$(str_replace "$1" '/' '\x2f')" + rm -f -- "$hookdir/initqueue/finished/devexists-${_name}.sh" + rm -f -- "$hookdir/emergency/80-${_name}.sh" + if [ -n "$DRACUT_SYSTEMD" ]; then diff --git a/SOURCES/0206-Do-not-reload-systemd-with-wait_for_dev.patch b/SOURCES/0206-Do-not-reload-systemd-with-wait_for_dev.patch new file mode 100644 index 0000000..a7beeb8 --- /dev/null +++ b/SOURCES/0206-Do-not-reload-systemd-with-wait_for_dev.patch @@ -0,0 +1,102 @@ +From 5648ff27e2df826bfb5721f115de83497ac5fb58 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 5 Feb 2014 13:12:29 +0100 +Subject: [PATCH] Do not reload systemd with wait_for_dev + +--- + modules.d/90dmsquash-live/dmsquash-live-genrules.sh | 2 +- + modules.d/90dmsquash-live/parse-dmsquash-live.sh | 2 +- + modules.d/90livenet/parse-livenet.sh | 2 +- + modules.d/90lvm/parse-lvm.sh | 2 +- + modules.d/95iscsi/iscsiroot.sh | 2 +- + modules.d/95nbd/nbdroot.sh | 2 +- + modules.d/95nbd/parse-nbdroot.sh | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh +index b27fccc..0f51ed4 100755 +--- a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh ++++ b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh +@@ -9,7 +9,7 @@ case "$root" in + printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \ + ${root#live:/dev/} + } >> /etc/udev/rules.d/99-live-squash.rules +- wait_for_dev "${root#live:}" ++ wait_for_dev -n "${root#live:}" + ;; + live:*) + if [ -f "${root#live:}" ]; then +diff --git a/modules.d/90dmsquash-live/parse-dmsquash-live.sh b/modules.d/90dmsquash-live/parse-dmsquash-live.sh +index a5564e2..6e54dfe 100755 +--- a/modules.d/90dmsquash-live/parse-dmsquash-live.sh ++++ b/modules.d/90dmsquash-live/parse-dmsquash-live.sh +@@ -56,4 +56,4 @@ info "root was $liveroot, is now $root" + # make sure that init doesn't complain + [ -z "$root" ] && root="live" + +-wait_for_dev /dev/mapper/live-rw ++wait_for_dev -n /dev/mapper/live-rw +diff --git a/modules.d/90livenet/parse-livenet.sh b/modules.d/90livenet/parse-livenet.sh +index 6c847ba..a6b2842 100755 +--- a/modules.d/90livenet/parse-livenet.sh ++++ b/modules.d/90livenet/parse-livenet.sh +@@ -27,7 +27,7 @@ if get_url_handler "$liveurl" >/dev/null; then + netroot="livenet:$liveurl" + root="livenet" # quiet complaints from init + rootok=1 +- wait_for_dev /dev/root ++ wait_for_dev -n /dev/root + else + info "livenet: no url handler for $liveurl" + fi +diff --git a/modules.d/90lvm/parse-lvm.sh b/modules.d/90lvm/parse-lvm.sh +index 74e1d43..d69cb45 100755 +--- a/modules.d/90lvm/parse-lvm.sh ++++ b/modules.d/90lvm/parse-lvm.sh +@@ -13,7 +13,7 @@ if ! getargbool 1 rd.lvm -d -n rd_NO_LVM \ + rm -f -- /etc/udev/rules.d/64-lvm*.rules + else + for dev in $LV_DEVS; do +- wait_for_dev "/dev/$dev" ++ wait_for_dev -n "/dev/$dev" + done + fi + +diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh +index 54f4990..1de6fb7 100755 +--- a/modules.d/95iscsi/iscsiroot.sh ++++ b/modules.d/95iscsi/iscsiroot.sh +@@ -156,7 +156,7 @@ handle_netroot() + printf 'SYMLINK=="disk/by-path/*-iscsi-*-%s", SYMLINK+="root"\n' $iscsi_lun >> /etc/udev/rules.d/99-iscsi-root.rules + udevadm control --reload + write_fs_tab /dev/root +- wait_for_dev /dev/root ++ wait_for_dev -n /dev/root + + # install mount script + [ -z "$DRACUT_SYSTEMD" ] && \ +diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh +index ddb3819..8bfbebc 100755 +--- a/modules.d/95nbd/nbdroot.sh ++++ b/modules.d/95nbd/nbdroot.sh +@@ -102,7 +102,7 @@ if [ "$root" = "block:/dev/root" -o "$root" = "dhcp" ]; then + udevadm control --reload + type write_fs_tab >/dev/null 2>&1 || . /lib/fs-lib.sh + write_fs_tab /dev/root "$nbdfstype" "$fsopts" +- wait_for_dev /dev/root ++ wait_for_dev -n /dev/root + + if [ -z "$DRACUT_SYSTEMD" ]; then + printf '/bin/mount %s\n' \ +diff --git a/modules.d/95nbd/parse-nbdroot.sh b/modules.d/95nbd/parse-nbdroot.sh +index 49c44b6..fe5a7fa 100755 +--- a/modules.d/95nbd/parse-nbdroot.sh ++++ b/modules.d/95nbd/parse-nbdroot.sh +@@ -61,6 +61,6 @@ rootok=1 + # Shut up init error check + if [ -z "$root" ]; then + root=block:/dev/root +- wait_for_dev /dev/root ++ wait_for_dev -n /dev/root + fi + diff --git a/SOURCES/0207-lsinird-Adding-option-m-mod-to-list-dracut-modules-i.patch b/SOURCES/0207-lsinird-Adding-option-m-mod-to-list-dracut-modules-i.patch new file mode 100644 index 0000000..63f0f89 --- /dev/null +++ b/SOURCES/0207-lsinird-Adding-option-m-mod-to-list-dracut-modules-i.patch @@ -0,0 +1,126 @@ +From 564c0c4577dfd676472f4a41798909470fee6744 Mon Sep 17 00:00:00 2001 +From: Hari Bathini +Date: Mon, 2 Jun 2014 16:27:37 +0530 +Subject: [PATCH] lsinird: Adding option "-m|--mod" to list dracut modules in + the image + +This patch adds option "-m|--mod" to lsinitrd to list dracut +modules in the image because sometimes having an option to +only list the dracut modules in the image could be handy. + +Sample output: +-------------- + +[hbathini@localhost dracut]$ sudo ./lsinitrd.sh initramfs-3.11.10-100.fc18.x86_64.img -m +Image: initramfs-3.11.10-100.fc18.x86_64.img: 33M +======================================================================== +Version: dracut-029-1.fc18.2 + +dracut modules: +i18n +network +ifcfg +drm +plymouth +btrfs +crypt +dm +dmraid +kernel-modules +lvm +mdraid +cifs +iscsi +nfs +resume +rootfs-block +terminfo +udev-rules +biosdevname +systemd +usrmount +base +fs-lib +shutdown +======================================================================== + +Signed-off-by: Hari Bathini +(cherry picked from commit 05d2a14526042417a4a2b1b3d003738b51ab3df7) +--- + lsinitrd.sh | 29 ++++++++++++++++++++++++----- + 1 file changed, 24 insertions(+), 5 deletions(-) + +diff --git a/lsinitrd.sh b/lsinitrd.sh +index b36b34e..b086a63 100755 +--- a/lsinitrd.sh ++++ b/lsinitrd.sh +@@ -27,6 +27,7 @@ usage() + echo + echo "-h, --help print a help message and exit." + echo "-s, --size sort the contents of the initramfs by size." ++ echo "-m, --mod list modules." + echo "-f, --file print the contents of ." + echo "-k, --kver inspect the initramfs of ." + echo +@@ -37,13 +38,15 @@ usage() + [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut + + sorted=0 ++modules=0 + declare -A filenames + + unset POSIXLY_CORRECT + TEMP=$(getopt \ +- -o "shf:k:" \ ++ -o "shmf:k:" \ + --long kver: \ + --long file: \ ++ --long mod \ + --long help \ + --long size \ + -- "$@") +@@ -61,6 +64,7 @@ while (($# > 0)); do + -f|--file) filenames[${2#/}]=1; shift;; + -s|--size) sorted=1;; + -h|--help) usage; exit 0;; ++ -m|--mod) modules=1;; + --) shift;break;; + *) usage; exit 1;; + esac +@@ -119,6 +123,13 @@ extract_files() + done + } + ++list_modules() ++{ ++ echo "dracut modules:" ++ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null ++ ((ret+=$?)) ++} ++ + list_files() + { + echo "========================================================================" +@@ -211,10 +222,18 @@ if (( ${#filenames[@]} > 0 )); then + else + version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null) + ((ret+=$?)) +- echo "$version with dracut modules:" +- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- '*lib/dracut/modules.txt' 2>/dev/null +- ((ret+=$?)) +- list_files ++ echo "Version: $version" ++ echo ++ if [ "$modules" -eq 1 ]; then ++ list_modules ++ echo "========================================================================" ++ else ++ echo -n "Arguments: " ++ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null ++ echo ++ list_modules ++ list_files ++ fi + fi + + exit $ret diff --git a/SOURCES/0208-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch b/SOURCES/0208-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch new file mode 100644 index 0000000..a05044c --- /dev/null +++ b/SOURCES/0208-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch @@ -0,0 +1,23 @@ +From c2ce987e383cac856d4e6c84a715324e148bd3c5 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 16 Oct 2013 11:31:54 +0200 +Subject: [PATCH] dracut.sh: also mkdir /run/lock, which is copied to + +(cherry picked from commit 68b736b50fbd6bb952d9499296ec70a218e1f5da) +--- + dracut.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dracut.sh b/dracut.sh +index 7997428..bcdc2d8 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1129,7 +1129,7 @@ if [[ $kernel_only != yes ]]; then + fi + done + +- for d in dev proc sys sysroot root run run/lock run/initramfs; do ++ for d in dev proc sys sysroot root run run/log run/lock run/initramfs; do + if [ -L "/$d" ]; then + inst_symlink "/$d" + else diff --git a/SOURCES/0209-dracut.sh-no-need-to-make-subdirs-in-run.patch b/SOURCES/0209-dracut.sh-no-need-to-make-subdirs-in-run.patch new file mode 100644 index 0000000..7f2dd30 --- /dev/null +++ b/SOURCES/0209-dracut.sh-no-need-to-make-subdirs-in-run.patch @@ -0,0 +1,23 @@ +From c46be834925dfa2b686e9f946792d94bf2ddbeab Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 16 Oct 2013 11:39:17 +0200 +Subject: [PATCH] dracut.sh: no need to make subdirs in run + +(cherry picked from commit 8d89fc6bb1b5b1f4c8be0694a1e1200a09ae07d1) +--- + dracut.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dracut.sh b/dracut.sh +index bcdc2d8..7d5c9e0 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1129,7 +1129,7 @@ if [[ $kernel_only != yes ]]; then + fi + done + +- for d in dev proc sys sysroot root run run/log run/lock run/initramfs; do ++ for d in dev proc sys sysroot root run; do + if [ -L "/$d" ]; then + inst_symlink "/$d" + else diff --git a/SOURCES/0210-dracut-functions.sh-do-not-force-require-modules.bui.patch b/SOURCES/0210-dracut-functions.sh-do-not-force-require-modules.bui.patch new file mode 100644 index 0000000..84e670a --- /dev/null +++ b/SOURCES/0210-dracut-functions.sh-do-not-force-require-modules.bui.patch @@ -0,0 +1,42 @@ +From 52923f5f2a3890449d59aa8a251f9116ab260e7f Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 5 Dec 2013 15:06:06 +0100 +Subject: [PATCH] dracut-functions.sh: do not force require modules.builtin* + +(cherry picked from commit b29cb51654db13706c7356aa827e554456b25b0a) +--- + dracut-functions.sh | 7 ------- + dracut.sh | 2 +- + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 0002556..8a0cd30 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -1455,13 +1455,6 @@ dracut_kernel_post() { + wait $_pid + fi + +- for _f in modules.builtin.bin modules.builtin; do +- [[ $srcmods/$_f ]] && break +- done || { +- dfatal "No modules.builtin.bin and modules.builtin found!" +- return 1 +- } +- + for _f in modules.builtin.bin modules.builtin modules.order; do + [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" + done +diff --git a/dracut.sh b/dracut.sh +index 7d5c9e0..f560dd1 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -518,7 +518,7 @@ if [[ $regenerate_all == "yes" ]]; then + + cd /lib/modules + for i in *; do +- [[ -f $i/modules.builtin ]] || continue ++ [[ -f $i/modules.dep ]] || [[ -f $i/modules.dep.bin ]] || continue + dracut --kver="$i" "${dracut_args[@]}" + ((ret+=$?)) + done diff --git a/SOURCES/0211-Make-logfile-configurable.patch b/SOURCES/0211-Make-logfile-configurable.patch new file mode 100644 index 0000000..a9442af --- /dev/null +++ b/SOURCES/0211-Make-logfile-configurable.patch @@ -0,0 +1,68 @@ +From 81a6e87f0f183c1ddf8808bb52be09e3070caefd Mon Sep 17 00:00:00 2001 +From: Hannes Reinecke +Date: Fri, 29 Nov 2013 13:13:49 +0100 +Subject: [PATCH] Make logfile configurable + +Add '--logfile' option to make the log file configurable during +runtime. + +Signed-off-by: Hannes Reinecke +(cherry picked from commit ee54b8404c10e29e5bddb633a4c7becb7acb0632) +--- + dracut.8.asc | 6 ++++++ + dracut.sh | 4 ++++ + 2 files changed, 10 insertions(+) + +diff --git a/dracut.8.asc b/dracut.8.asc +index f97074a..14ce26b 100644 +--- a/dracut.8.asc ++++ b/dracut.8.asc +@@ -275,6 +275,12 @@ Default: + + **--sshkey** __:: ssh key file used with ssh-client module. + ++**--logfile** __:: logfile to use; overrides any setting from ++ the configuration files. +++ ++Default: ++ _/var/log/dracut.log_ ++ + **-l, --local**:: + activates the local mode. dracut will use modules from the current working + directory instead of the system-wide installed modules in +diff --git a/dracut.sh b/dracut.sh +index f560dd1..8e5e86f 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -187,6 +187,7 @@ Creates initial ramdisk images for preloading modules + --keep Keep the temporary initramfs for debugging purposes + --printsize Print out the module install size + --sshkey [SSHKEY] Add ssh key to initramfs (use with ssh-client module) ++ --logfile [FILE] Logfile to use (overrides configuration setting) + + If [LIST] has multiple arguments, then you have to put these in quotes. + +@@ -340,6 +341,7 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \ + --long debug \ + --long profile \ + --long sshkey: \ ++ --long logfile: \ + --long verbose \ + --long quiet \ + --long local \ +@@ -430,6 +432,7 @@ while :; do + --debug) debug="yes";; + --profile) profile="yes";; + --sshkey) sshkey="$2"; shift;; ++ --logfile) logfile_l="$2"; shift;; + -v|--verbose) ((verbosity_mod_l++));; + -q|--quiet) ((verbosity_mod_l--));; + -l|--local) +@@ -709,6 +712,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) + [[ $ro_mnt_l ]] && ro_mnt="yes" + [[ $early_microcode_l ]] && early_microcode=$early_microcode_l + [[ $early_microcode ]] || early_microcode=no ++[[ $logfile_l ]] && logfile="$logfile_l" + # eliminate IFS hackery when messing with fw_dir + fw_dir=${fw_dir//:/ } + diff --git a/SOURCES/0212-Dracut-Add-a-new-argument-rebuild.patch b/SOURCES/0212-Dracut-Add-a-new-argument-rebuild.patch new file mode 100644 index 0000000..302cab2 --- /dev/null +++ b/SOURCES/0212-Dracut-Add-a-new-argument-rebuild.patch @@ -0,0 +1,440 @@ +From f2c5c5c961a91765640f381ec37af085dc91312b Mon Sep 17 00:00:00 2001 +From: Hari Bathini +Date: Thu, 16 Jan 2014 12:11:27 +0530 +Subject: [PATCH] Dracut: Add a new argument "--rebuild" + +Add "rebuild" option to dracut to append the current arguments +to those with which the input initramfs image was built. This +option helps in incrementally building initramfs for testing. + + Usage: dracut [output_file] --rebuild input_file + +If optional output file is not provided, input file provided to +rebuild will be used as output file. + +This patch alters the creation of the initramfs image by adding +the file "/tmp/params.txt" to the image. Command line parameters +excluding "--rebuild", input & output image names and "kernel +version" are stored in this file. In case "--rebuild" parameter +is specified, "/tmp/params.txt" file, if present in input image, +is read and its contents "prepend"ed to the current command line +parameters, that is if such a file is already present. Also, it +stores the cumulative parameters to the file "/tmp/params.txt", +in the new image. This patch has been tested successfully on a +PowerBox with f19. It does not alter the behaviour of any of the +existing options. + +Signed-off-by: Manik Bajpai +Signed-off-by: Hari Bathini + +[Edited-by: Harald Hoyer] +Simplified the cpio extraction process by using 'lsinitrd'. + +(cherry picked from commit 659dc319d950999f8d191a81fdc4d3114e9213de) +--- + dracut.sh | 342 ++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 210 insertions(+), 132 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index 8e5e86f..eff096e 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -70,6 +70,7 @@ Creates initial ramdisk images for preloading modules + --kver [VERSION] Set kernel version to [VERSION]. + -f, --force Overwrite existing initramfs file. + -a, --add [LIST] Add a space-separated list of dracut modules. ++ --rebuild Append arguments to those of existing image and rebuild + -m, --modules [LIST] Specify a space-separated list of dracut modules to + call when building the initramfs. Modules are located + in /usr/lib/dracut/modules.d. +@@ -283,132 +284,213 @@ dropindirs_sort() + } + } + ++rearrange_params() ++{ ++ # Workaround -i, --include taking 2 arguments ++ set -- "${@/--include/++include}" ++ ++ # This prevents any long argument ending with "-i" ++ # -i, like --opt-i but I think we can just prevent that ++ set -- "${@/%-i/++include}" ++ ++ TEMP=$(unset POSIXLY_CORRECT; getopt \ ++ -o "a:m:o:d:I:k:c:L:fvqlHhMN" \ ++ --long kver: \ ++ --long add: \ ++ --long force-add: \ ++ --long add-drivers: \ ++ --long omit-drivers: \ ++ --long modules: \ ++ --long omit: \ ++ --long drivers: \ ++ --long filesystems: \ ++ --long install: \ ++ --long fwdir: \ ++ --long libdirs: \ ++ --long fscks: \ ++ --long add-fstab: \ ++ --long mount: \ ++ --long device: \ ++ --long add-device: \ ++ --long nofscks: \ ++ --long ro-mnt \ ++ --long kmoddir: \ ++ --long conf: \ ++ --long confdir: \ ++ --long tmpdir: \ ++ --long stdlog: \ ++ --long compress: \ ++ --long prefix: \ ++ --long rebuild: \ ++ --long force \ ++ --long kernel-only \ ++ --long no-kernel \ ++ --long print-cmdline \ ++ --long kernel-cmdline: \ ++ --long strip \ ++ --long nostrip \ ++ --long prelink \ ++ --long noprelink \ ++ --long hardlink \ ++ --long nohardlink \ ++ --long noprefix \ ++ --long mdadmconf \ ++ --long nomdadmconf \ ++ --long lvmconf \ ++ --long nolvmconf \ ++ --long debug \ ++ --long profile \ ++ --long sshkey: \ ++ --long logfile: \ ++ --long verbose \ ++ --long quiet \ ++ --long local \ ++ --long hostonly \ ++ --long host-only \ ++ --long no-hostonly \ ++ --long no-host-only \ ++ --long hostonly-cmdline \ ++ --long no-hostonly-cmdline \ ++ --long persistent-policy: \ ++ --long fstab \ ++ --long help \ ++ --long bzip2 \ ++ --long lzma \ ++ --long xz \ ++ --long lzo \ ++ --long lz4 \ ++ --long no-compress \ ++ --long gzip \ ++ --long list-modules \ ++ --long show-modules \ ++ --long keep \ ++ --long printsize \ ++ --long regenerate-all \ ++ --long noimageifnotneeded \ ++ --long early-microcode \ ++ --long no-early-microcode \ ++ -- "$@") ++ ++ if (( $? != 0 )); then ++ usage ++ exit 1 ++ fi ++} ++ + verbosity_mod_l=0 + unset kernel + unset outfile + +-# Workaround -i, --include taking 2 arguments +-set -- "${@/--include/++include}" +- +-# This prevents any long argument ending with "-i" +-# -i, like --opt-i but I think we can just prevent that +-set -- "${@/%-i/++include}" +- +-TEMP=$(unset POSIXLY_CORRECT; getopt \ +- -o "a:m:o:d:I:k:c:L:fvqlHhMN" \ +- --long kver: \ +- --long add: \ +- --long force-add: \ +- --long add-drivers: \ +- --long omit-drivers: \ +- --long modules: \ +- --long omit: \ +- --long drivers: \ +- --long filesystems: \ +- --long install: \ +- --long fwdir: \ +- --long libdirs: \ +- --long fscks: \ +- --long add-fstab: \ +- --long mount: \ +- --long device: \ +- --long add-device: \ +- --long nofscks: \ +- --long ro-mnt \ +- --long kmoddir: \ +- --long conf: \ +- --long confdir: \ +- --long tmpdir: \ +- --long stdlog: \ +- --long compress: \ +- --long prefix: \ +- --long force \ +- --long kernel-only \ +- --long no-kernel \ +- --long print-cmdline \ +- --long kernel-cmdline: \ +- --long strip \ +- --long nostrip \ +- --long prelink \ +- --long noprelink \ +- --long hardlink \ +- --long nohardlink \ +- --long noprefix \ +- --long mdadmconf \ +- --long nomdadmconf \ +- --long lvmconf \ +- --long nolvmconf \ +- --long debug \ +- --long profile \ +- --long sshkey: \ +- --long logfile: \ +- --long verbose \ +- --long quiet \ +- --long local \ +- --long hostonly \ +- --long host-only \ +- --long no-hostonly \ +- --long no-host-only \ +- --long hostonly-cmdline \ +- --long no-hostonly-cmdline \ +- --long persistent-policy: \ +- --long fstab \ +- --long help \ +- --long bzip2 \ +- --long lzma \ +- --long xz \ +- --long lzo \ +- --long lz4 \ +- --long no-compress \ +- --long gzip \ +- --long list-modules \ +- --long show-modules \ +- --long keep \ +- --long printsize \ +- --long regenerate-all \ +- --long noimageifnotneeded \ +- --long early-microcode \ +- --long no-early-microcode \ +- -- "$@") +- +-if (( $? != 0 )); then +- usage +- exit 1 ++rearrange_params "$@" ++eval set -- "$TEMP" ++ ++# parse command line args to check if '--rebuild' option is present ++unset append_args_l ++unset rebuild_file ++while : ++do ++ if [ "$1" == "--" ]; then ++ shift; break ++ fi ++ if [ "$1" == "--rebuild" ]; then ++ append_args_l="yes" ++ rebuild_file=$2 ++ if [ ! -e $rebuild_file ]; then ++ echo "Image file '$rebuild_file', for rebuild, does not exist!" ++ exit 1 ++ fi ++ abs_rebuild_file=$(readlink -f "$rebuild_file") && rebuild_file="$abs_rebuild_file" ++ shift; continue ++ fi ++ shift ++done ++ ++# get output file name and kernel version from command line arguments ++while (($# > 0)); do ++ case ${1%%=*} in ++ ++include) ++ shift 2;; ++ *) ++ if ! [[ ${outfile+x} ]]; then ++ outfile=$1 ++ elif ! [[ ${kernel+x} ]]; then ++ kernel=$1 ++ else ++ printf "\nUnknown arguments: %s\n\n" "$*" >&2 ++ usage; exit 1; ++ fi ++ ;; ++ esac ++ shift ++done ++ ++# extract input image file provided with rebuild option to get previous parameters, if any ++if [[ $append_args_l == "yes" ]]; then ++ unset rebuild_param ++ ++ # determine resultant file ++ if ! [[ $outfile ]]; then ++ outfile=$rebuild_file ++ fi ++ ++ if ! rebuild_param=$(lsinitrd $rebuild_file '*lib/dracut/build-parameter.txt'); then ++ echo "Image '$rebuild_file' has no rebuild information stored" ++ exit 1 ++ fi ++ ++ # prepend previous parameters to current command line args ++ if [[ $rebuild_param ]]; then ++ TEMP="$rebuild_param $TEMP" ++ eval set -- "$TEMP" ++ rearrange_params "$@" ++ fi ++ ++ # clean the temporarily used scratch-pad directory ++ rm -rf $scratch_dir + fi + ++unset PARMS_TO_STORE ++PARMS_TO_STORE="" ++ + eval set -- "$TEMP" + + while :; do ++ if [ $1 != "--" ] && [ $1 != "--rebuild" ]; then ++ PARMS_TO_STORE+=" $1"; ++ fi + case $1 in +- --kver) kernel="$2"; shift;; +- -a|--add) push add_dracutmodules_l "$2"; shift;; +- --force-add) push force_add_dracutmodules_l "$2"; shift;; +- --add-drivers) push add_drivers_l "$2"; shift;; +- --omit-drivers) +- push omit_drivers_l "$2"; shift;; +- -m|--modules) push dracutmodules_l "$2"; shift;; +- -o|--omit) push omit_dracutmodules_l "$2"; shift;; +- -d|--drivers) push drivers_l "$2"; shift;; +- --filesystems) push filesystems_l "$2"; shift;; +- -I|--install) push install_items_l "$2"; shift;; +- --fwdir) push fw_dir_l "$2"; shift;; +- --libdirs) push libdirs_l "$2"; shift;; +- --fscks) push fscks_l "$2"; shift;; +- --add-fstab) push add_fstab_l "$2"; shift;; +- --mount) push fstab_lines "$2"; shift;; ++ --kver) kernel="$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ -a|--add) push add_dracutmodules_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --force-add) push force_add_dracutmodules_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --add-drivers) push add_drivers_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --omit-drivers) push omit_drivers_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ -m|--modules) push dracutmodules_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ -o|--omit) push omit_dracutmodules_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ -d|--drivers) push drivers_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --filesystems) push filesystems_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ -I|--install) push install_items_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --fwdir) push fw_dir_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --libdirs) push libdirs_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --fscks) push fscks_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --add-fstab) push add_fstab_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --mount) push fstab_lines "$2"; PARMS_TO_STORE+=" '$2'"; shift;; + --add-device|--device) +- push add_device_l "$2"; shift;; +- --kernel-cmdline) +- push kernel_cmdline_l "$2"; shift;; ++ push add_device_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --kernel-cmdline) push kernel_cmdline_l "$2"; PARMS_TO_STORE+=" '$2'"; shift;; + --nofscks) nofscks_l="yes";; + --ro-mnt) ro_mnt_l="yes";; +- -k|--kmoddir) drivers_dir_l="$2"; shift;; +- -c|--conf) conffile="$2"; shift;; +- --confdir) confdir="$2"; shift;; +- --tmpdir) tmpdir_l="$2"; shift;; +- -L|--stdlog) stdloglvl_l="$2"; shift;; +- --compress) compress_l="$2"; shift;; +- --prefix) prefix_l="$2"; shift;; ++ -k|--kmoddir) drivers_dir_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ -c|--conf) conffile="$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --confdir) confdir="$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --tmpdir) tmpdir_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ -L|--stdlog) stdloglvl_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --compress) compress_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --prefix) prefix_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;; ++ --rebuild) if [ $rebuild_file == $outfile ]; then ++ force=yes ++ fi ++ shift ++ ;; + -f|--force) force=yes;; + --kernel-only) kernel_only="yes"; no_kernel="no";; + --no-kernel) kernel_only="no"; no_kernel="yes";; +@@ -431,7 +513,7 @@ while :; do + --nolvmconf) lvmconf_l="no";; + --debug) debug="yes";; + --profile) profile="yes";; +- --sshkey) sshkey="$2"; shift;; ++ --sshkey) sshkey="$2"; PARMS_TO_STORE+=" '$2'"; shift;; + --logfile) logfile_l="$2"; shift;; + -v|--verbose) ((verbosity_mod_l++));; + -q|--quiet) ((verbosity_mod_l--));; +@@ -449,11 +531,10 @@ while :; do + --no-hostonly-cmdline) + hostonly_cmdline_l="no" ;; + --persistent-policy) +- persistent_policy_l="$2"; shift;; ++ persistent_policy_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;; + --fstab) use_fstab_l="yes" ;; + -h|--help) long_usage; exit 1 ;; +- -i|--include) +- push include_src "$2" ++ -i|--include) push include_src "$2"; PARMS_TO_STORE+=" '$2'"; + shift;; + --bzip2) compress_l="bzip2";; + --lzma) compress_l="lzma";; +@@ -483,21 +564,12 @@ done + # the old fashioned way + + while (($# > 0)); do +- case ${1%%=*} in +- ++include) push include_src "$2" +- push include_target "$3" +- shift 2;; +- *) +- if ! [[ ${outfile+x} ]]; then +- outfile=$1 +- elif ! [[ ${kernel+x} ]]; then +- kernel=$1 +- else +- printf "\nUnknown arguments: %s\n\n" "$*" >&2 +- usage; exit 1; +- fi +- ;; +- esac ++ if [ ${1%%=*} == "++include" ]; then ++ push include_src "$2" ++ push include_target "$3" ++ PARMS_TO_STORE+=" --include '$2' '$3'" ++ shift 2 ++ fi + shift + done + +@@ -1405,6 +1477,12 @@ if [[ $acpi_override = yes ]] && [[ -d $acpi_table_dir ]]; then + done + fi + ++dinfo "*** Store current command line parameters ***" ++if ! ( echo $PARMS_TO_STORE > $initdir/lib/dracut/build-parameter.txt ); then ++ dfatal "Could not store the current command line parameters" ++ exit 1 ++fi ++ + rm -f -- "$outfile" + dinfo "*** Creating image file ***" + diff --git a/SOURCES/0213-network-net-lib.sh-parse_iscsi_root-do-not-enforce-t.patch b/SOURCES/0213-network-net-lib.sh-parse_iscsi_root-do-not-enforce-t.patch new file mode 100644 index 0000000..79d6505 --- /dev/null +++ b/SOURCES/0213-network-net-lib.sh-parse_iscsi_root-do-not-enforce-t.patch @@ -0,0 +1,152 @@ +From f86fa29cda6dcea1320de29864173d4de47c5bb7 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 9 Sep 2014 13:33:16 +0200 +Subject: [PATCH] network/net-lib.sh:parse_iscsi_root() do not enforce target + name + +https://bugzilla.redhat.com/show_bug.cgi?id=1078867 + +cherry-picked from 29763cb72d17fe8d22766170ec06b32419829243 +--- + modules.d/40network/net-lib.sh | 112 ++++++++++++++++++----------------------- + 1 file changed, 50 insertions(+), 62 deletions(-) + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index c8f9204..e2901da 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -271,66 +271,46 @@ parse_iscsi_root() + local v + v=${1#iscsi:} + +-# extract authentication info ++ # extract authentication info + case "$v" in +- *@*:*:*:*:*) +- authinfo=${v%%@*} +- v=${v#*@} +- # allow empty authinfo to allow having an @ in iscsi_target_name like this: +- # netroot=iscsi:@192.168.1.100::3260::iqn.2009-01.com.example:testdi@sk +- if [ -n "$authinfo" ]; then +- OLDIFS="$IFS" +- IFS=: +- set $authinfo +- IFS="$OLDIFS" +- if [ $# -gt 4 ]; then +- warn "Wrong authentication info in iscsi: parameter!" +- return 1 +- fi +- iscsi_username=$1 +- iscsi_password=$2 +- if [ $# -gt 2 ]; then +- iscsi_in_username=$3 +- iscsi_in_password=$4 +- fi +- fi +- ;; +- esac +- +-# extract target ip +- case "$v" in +- [[]*[]]:*) +- iscsi_target_ip=${v#[[]} +- iscsi_target_ip=${iscsi_target_ip%%[]]*} +- v=${v#[[]$iscsi_target_ip[]]:} +- ;; +- *) +- iscsi_target_ip=${v%%[:]*} +- v=${v#$iscsi_target_ip:} +- ;; ++ *@*:*:*:*:*) ++ authinfo=${v%%@*} ++ v=${v#*@} ++ # allow empty authinfo to allow having an @ in iscsi_target_name like this: ++ # netroot=iscsi:@192.168.1.100::3260::iqn.2009-01.com.example:testdi@sk ++ if [ -n "$authinfo" ]; then ++ OLDIFS="$IFS" ++ IFS=: ++ set $authinfo ++ IFS="$OLDIFS" ++ if [ $# -gt 4 ]; then ++ warn "Wrong authentication info in iscsi: parameter!" ++ return 1 ++ fi ++ iscsi_username=$1 ++ iscsi_password=$2 ++ if [ $# -gt 2 ]; then ++ iscsi_in_username=$3 ++ iscsi_in_password=$4 ++ fi ++ fi ++ ;; + esac + +-# extract target name ++ # extract target ip + case "$v" in +- *:iqn.*) +- iscsi_target_name=iqn.${v##*:iqn.} +- v=${v%:iqn.*}: +- ;; +- *:eui.*) +- iscsi_target_name=iqn.${v##*:eui.} +- v=${v%:iqn.*}: +- ;; +- *:naa.*) +- iscsi_target_name=iqn.${v##*:naa.} +- v=${v%:iqn.*}: +- ;; +- *) +- warn "Invalid iscii target name, should begin with 'iqn.' or 'eui.' or 'naa.'" +- return 1 +- ;; ++ [[]*[]]:*) ++ iscsi_target_ip=${v#[[]} ++ iscsi_target_ip=${iscsi_target_ip%%[]]*} ++ v=${v#[[]$iscsi_target_ip[]]:} ++ ;; ++ *) ++ iscsi_target_ip=${v%%[:]*} ++ v=${v#$iscsi_target_ip:} ++ ;; + esac + +-# parse the rest ++ # parse the rest + OLDIFS="$IFS" + IFS=: + set $v +@@ -338,17 +318,25 @@ parse_iscsi_root() + + iscsi_protocol=$1; shift # ignored + iscsi_target_port=$1; shift +- if [ $# -eq 3 ]; then +- iscsi_iface_name=$1; shift +- fi +- if [ $# -eq 2 ]; then +- iscsi_netdev_name=$1; shift ++ ++ if [ $# -gt 3 ] && [ -n "$1$2" ]; then ++ iscsi_iface_name=$1; shift ++ iscsi_netdev_name=$1; shift + fi ++ + iscsi_lun=$1; shift +- if [ $# -ne 0 ]; then +- warn "Invalid parameter in iscsi: parameter!" +- return 1 ++ ++ if [ $# -gt 2 ]; then ++ warn "Invalid parameter in iscsi: parameter!" ++ return 1 + fi ++ ++ if [ $# -eq 2 ]; then ++ iscsi_target_name="$1:$2" ++ else ++ iscsi_target_name="$1" ++ fi ++ + } + + ip_to_var() { diff --git a/SOURCES/0214-replaced-ip-auto-with-ip-dhcp-in-the-documentation.patch b/SOURCES/0214-replaced-ip-auto-with-ip-dhcp-in-the-documentation.patch new file mode 100644 index 0000000..fe61c3b --- /dev/null +++ b/SOURCES/0214-replaced-ip-auto-with-ip-dhcp-in-the-documentation.patch @@ -0,0 +1,32 @@ +From e03b09212aaf33eab2dc8a330053448810c3546d Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 9 Sep 2014 13:35:13 +0200 +Subject: [PATCH] replaced ip=auto with ip=dhcp in the documentation + +https://bugzilla.redhat.com/show_bug.cgi?id=1086931 +--- + dracut.usage.asc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dracut.usage.asc b/dracut.usage.asc +index 0b874e6..bee9e2e 100644 +--- a/dracut.usage.asc ++++ b/dracut.usage.asc +@@ -209,7 +209,7 @@ be specified once. + ---- + # mkdir -p rd.live.overlay/etc/cmdline.d + # mkdir -p rd.live.overlay/etc/conf.d +-# echo "ip=auto" >> rd.live.overlay/etc/cmdline.d/mycmdline.conf ++# echo "ip=dhcp" >> rd.live.overlay/etc/cmdline.d/mycmdline.conf + # echo export FOO=testtest >> rd.live.overlay/etc/conf.d/testvar.conf + # echo export BAR=testtest >> rd.live.overlay/etc/conf.d/testvar.conf + # tree rd.live.overlay/ +@@ -261,7 +261,7 @@ How to setup your PXE/TFTP server can be found in the + http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/[Red + Hat Enterprise Linux Storage Administration Guide]. + +-If you specify ip=auto on the kernel command line, then dracut asks a dhcp ++If you specify ip=dhcp on the kernel command line, then dracut asks a dhcp + server about the ip adress for the machine. The dhcp server can also serve an + additional root-path, which will set the root device for dracut. With this + mechanism, you have static configuration on your client machine and a diff --git a/SOURCES/0215-Support-spaces-in-mount_nfs-1109933.patch b/SOURCES/0215-Support-spaces-in-mount_nfs-1109933.patch new file mode 100644 index 0000000..b8e5b03 --- /dev/null +++ b/SOURCES/0215-Support-spaces-in-mount_nfs-1109933.patch @@ -0,0 +1,34 @@ +From 17c1f640faf694e482cc657c9f40b5f61a23e301 Mon Sep 17 00:00:00 2001 +From: "Brian C. Lane" +Date: Thu, 21 Aug 2014 11:31:51 -0700 +Subject: [PATCH] Support spaces in mount_nfs (#1109933) + +nfs paths may contain spaces, make sure they are preserved when passed +to nfs_to_var and mount. + +Related: rhbz#1109933 +(cherry picked from commit 7e692cfd43ac7f70dd58a0b083f33d6e80d3908c) +--- + modules.d/95nfs/nfs-lib.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh +index 9ced2e6..bf7d044 100755 +--- a/modules.d/95nfs/nfs-lib.sh ++++ b/modules.d/95nfs/nfs-lib.sh +@@ -125,7 +125,7 @@ munge_nfs_options() { + mount_nfs() { + local nfsroot="$1" mntdir="$2" netif="$3" + local nfs="" server="" path="" options="" +- nfs_to_var $nfsroot $netif ++ nfs_to_var "$nfsroot" $netif + munge_nfs_options + if [ "$nfs" = "nfs4" ]; then + options=$options${nfslock:+,$nfslock} +@@ -136,5 +136,5 @@ mount_nfs() { + && warn "Locks unsupported on NFSv{2,3}, using nolock" 1>&2 + options=$options,nolock + fi +- mount -t $nfs -o$options $server:$path $mntdir ++ mount -t $nfs -o$options "$server:$path" "$mntdir" + } diff --git a/SOURCES/0216-fixed-bridge-setup.patch b/SOURCES/0216-fixed-bridge-setup.patch new file mode 100644 index 0000000..cab09fa --- /dev/null +++ b/SOURCES/0216-fixed-bridge-setup.patch @@ -0,0 +1,172 @@ +From 19bb8937ed492afdbde7076b74010e1fb2f3a7c4 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 1 Aug 2014 13:16:29 +0200 +Subject: [PATCH] fixed bridge setup + +renamed "ethnames" in bridge.info to "bridgeslaves" + +fixed ifcfg generation + +(cherry picked from commit 2db6d7111870c5d16d812d9cddc23558f3f4a202) +--- + modules.d/40network/ifup.sh | 4 ++-- + modules.d/40network/net-genrules.sh | 2 +- + modules.d/40network/parse-bridge.sh | 18 ++++++++-------- + modules.d/45ifcfg/write-ifcfg.sh | 42 +++++++++---------------------------- + 4 files changed, 22 insertions(+), 44 deletions(-) + +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index 79127f2..43e84a2 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -60,7 +60,7 @@ fi + # bridge this interface? + if [ -e /tmp/bridge.info ]; then + . /tmp/bridge.info +- for ethname in $ethnames ; do ++ for ethname in $bridgeslaves ; do + if [ "$netif" = "$ethname" ]; then + if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then + : # We need to really setup bond (recursive call) +@@ -236,7 +236,7 @@ if [ -e /tmp/bridge.info ]; then + if [ "$netif" = "$bridgename" ] && [ ! -e /tmp/net.$bridgename.up ]; then + brctl addbr $bridgename + brctl setfd $bridgename 0 +- for ethname in $ethnames ; do ++ for ethname in $bridgeslaves ; do + if [ "$ethname" = "$bondname" ] ; then + DO_BOND_SETUP=yes ifup $bondname -m + elif [ "$ethname" = "$teammaster" ] ; then +diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh +index af2f09c..a43e3df 100755 +--- a/modules.d/40network/net-genrules.sh ++++ b/modules.d/40network/net-genrules.sh +@@ -16,7 +16,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh + # bridge: attempt only the defined interface + if [ -e /tmp/bridge.info ]; then + . /tmp/bridge.info +- IFACES="$IFACES ${ethnames%% *}" ++ IFACES="$IFACES ${bridgeslaves%% *}" + MASTER_IFACES="$MASTER_IFACES $bridgename" + fi + +diff --git a/modules.d/40network/parse-bridge.sh b/modules.d/40network/parse-bridge.sh +index 8c305c0..a910109 100755 +--- a/modules.d/40network/parse-bridge.sh ++++ b/modules.d/40network/parse-bridge.sh +@@ -3,9 +3,9 @@ + # ex: ts=8 sw=4 sts=4 et filetype=sh + # + # Format: +-# bridge=: ++# bridge=: + # +-# is a comma-separated list of physical (ethernet) interfaces ++# is a comma-separated list of physical (ethernet) interfaces + # bridge without parameters assumes bridge=br0:eth0 + # + +@@ -25,20 +25,20 @@ parsebridge() { + v=${v#*:} + done + +- unset bridgename ethnames ++ unset bridgename bridgeslaves + case $# in +- 0) bridgename=br0; ethnames=$iface ;; ++ 0) bridgename=br0; bridgeslaves=$iface ;; + 1) die "bridge= requires two parameters" ;; +- 2) bridgename=$1; ethnames=$(str_replace "$2" "," " ") ;; ++ 2) bridgename=$1; bridgeslaves=$(str_replace "$2" "," " ") ;; + *) die "bridge= requires two parameters" ;; + esac + } + +-unset bridgename ethnames ++unset bridgename bridgeslaves + + iface=eth0 + +-# Parse bridge for bridgename and ethnames ++# Parse bridge for bridgename and bridgeslaves + if bridge="$(getarg bridge)"; then + # Read bridge= parameters if they exist + if [ -n "$bridge" ]; then +@@ -47,9 +47,9 @@ if bridge="$(getarg bridge)"; then + # Simple default bridge + if [ -z "$bridgename" ]; then + bridgename=br0 +- ethnames=$iface ++ bridgeslaves=$iface + fi + echo "bridgename=$bridgename" > /tmp/bridge.info +- echo "ethnames=\"$ethnames\"" >> /tmp/bridge.info ++ echo "bridgeslaves=\"$bridgeslaves\"" >> /tmp/bridge.info + return + fi +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index 5e333e4..c1cd23c 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -214,6 +214,7 @@ for netup in /tmp/net.*.did-setup ; do + echo "SLAVE=yes" + echo "MASTER=\"$netif\"" + echo "NAME=\"$slave\"" ++ echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" + } >> /tmp/ifcfg/ifcfg-$slave + done + fi +@@ -224,44 +225,21 @@ for netup in /tmp/net.*.did-setup ; do + echo "TYPE=Bridge" + echo "NAME=\"$netif\"" + } >> /tmp/ifcfg/ifcfg-$netif +- if [ "$ethname" = "$bondname" ] ; then +- { +- echo "# Generated by dracut initrd" +- echo "DEVICE=\"$bondname\"" +- echo "ONBOOT=yes" +- echo "NETBOOT=yes" +- # This variable is an indicator of a bond interface for initscripts +- echo "BONDING_OPTS=\"$bondoptions\"" +- echo "BRIDGE=\"$netif\"" +- echo "NAME=\"$bondname\"" +- } >> /tmp/ifcfg/ifcfg-$bondname +- for slave in $bondslaves ; do +- # write separate ifcfg file for the raw eth interface +- { +- echo "# Generated by dracut initrd" +- echo "DEVICE=\"$slave\"" +- echo "TYPE=Ethernet" +- echo "ONBOOT=yes" +- echo "NETBOOT=yes" +- echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" +- echo "SLAVE=yes" +- echo "MASTER=\"$bondname\"" +- echo "NAME=\"$slave\"" +- } >> /tmp/ifcfg/ifcfg-$slave +- done +- else ++ for slave in $bridgeslaves ; do + # write separate ifcfg file for the raw eth interface + { + echo "# Generated by dracut initrd" +- echo "DEVICE=\"$ethname\"" ++ echo "DEVICE=\"$slave\"" + echo "TYPE=Ethernet" + echo "ONBOOT=yes" + echo "NETBOOT=yes" +- echo "HWADDR=\"$(cat /sys/class/net/$ethname/address)\"" +- echo "BRIDGE=\"$netif\"" +- echo "NAME=\"$ethname\"" +- } >> /tmp/ifcfg/ifcfg-$ethname +- fi ++ echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" ++ echo "SLAVE=yes" ++ echo "MASTER=\"$bridgename\"" ++ echo "NAME=\"$slave\"" ++ echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" ++ } >> /tmp/ifcfg/ifcfg-$slave ++ done + fi + i=1 + for ns in $(getargs nameserver); do diff --git a/SOURCES/0217-bridging-update-the-ifcfg-files-generated-for-bridge.patch b/SOURCES/0217-bridging-update-the-ifcfg-files-generated-for-bridge.patch new file mode 100644 index 0000000..08ff4b8 --- /dev/null +++ b/SOURCES/0217-bridging-update-the-ifcfg-files-generated-for-bridge.patch @@ -0,0 +1,30 @@ +From 4fa660ba8f768861f8f8d5b3b8c82837ffcc6bb3 Mon Sep 17 00:00:00 2001 +From: Alex Harpin +Date: Sat, 2 Aug 2014 20:08:25 +0100 +Subject: [PATCH] bridging: update the ifcfg files generated for bridge slaves + +Update the ifcfg files generated for bridge slaves so they reference +the bridge they are part of. Related to early patch submitted as a +fix for Bug #1123552. + +Bug #1123552 https://bugzilla.redhat.com/show_bug.cgi?id=1123552 + +(cherry picked from commit 32125a976bb6ff67768ca813446743b781ba012f) +--- + modules.d/45ifcfg/write-ifcfg.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index c1cd23c..48e75a6 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -234,8 +234,7 @@ for netup in /tmp/net.*.did-setup ; do + echo "ONBOOT=yes" + echo "NETBOOT=yes" + echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" +- echo "SLAVE=yes" +- echo "MASTER=\"$bridgename\"" ++ echo "BRIDGE=\"$bridgename\"" + echo "NAME=\"$slave\"" + echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" + } >> /tmp/ifcfg/ifcfg-$slave diff --git a/SOURCES/0218-ifcfg-write-ifcfg.sh-bind-bond-and-bridge-interfaces.patch b/SOURCES/0218-ifcfg-write-ifcfg.sh-bind-bond-and-bridge-interfaces.patch new file mode 100644 index 0000000..4d4e268 --- /dev/null +++ b/SOURCES/0218-ifcfg-write-ifcfg.sh-bind-bond-and-bridge-interfaces.patch @@ -0,0 +1,118 @@ +From efaa5b05dfb3578999c31a1bbbc053706ec89ddb Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 12 Sep 2014 09:48:00 +0200 +Subject: [PATCH] ifcfg/write-ifcfg.sh: bind bond and bridge interfaces to HW + +either by s390 SUBCHANNELS or HWADDR, if the interface name is not +persistent. + +Previously, this was bound unconditionally with HWADDR. + +(cherry picked from commit 80043e21c16db168ad087a162f1fa97cae866c8d) +--- + modules.d/45ifcfg/write-ifcfg.sh | 47 ++++++++++++++++++++++------------------ + 1 file changed, 26 insertions(+), 21 deletions(-) + +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index 48e75a6..aed3069 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -82,6 +82,20 @@ print_s390() { + return 0 + } + ++interface_bind() { ++ local netif="$1" ++ local macaddr="$2" ++ if ! print_s390 $netif; then ++ if [ -z "$macaddr" ] && \ ++ ! is_persistent_ethernet_name "$netif" && \ ++ [ -f /sys/class/net/$netif/addr_assign_type ] && \ ++ [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] && \ ++ [ -f /sys/class/net/$netif/address ]; then ++ echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" ++ fi ++ fi ++} ++ + for netup in /tmp/net.*.did-setup ; do + [ -f $netup ] || continue + +@@ -114,8 +128,7 @@ for netup in /tmp/net.*.did-setup ; do + if [ "$netif" = "$vlanname" ]; then + vlan=yes + fi +- [ -e /sys/class/net/$netif/address ] && \ +- cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr ++ + { + echo "# Generated by dracut initrd" + echo "DEVICE=\"$netif\"" +@@ -165,15 +178,7 @@ for netup in /tmp/net.*.did-setup ; do + # standard interface + { + [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" +- if ! print_s390 $netif; then +- if [ -z "$macaddr" ] && \ +- ! is_persistent_ethernet_name "$netif" && \ +- [ -f /sys/class/net/$netif/addr_assign_type ] && \ +- [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] && \ +- [ -f /sys/class/net/$netif/address ]; then +- echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" +- fi +- fi ++ interface_bind "$netif" "$macaddr" + echo "TYPE=Ethernet" + echo "NAME=\"$netif\"" + [ -n "$mtu" ] && echo "MTU=\"$mtu\"" +@@ -200,22 +205,20 @@ for netup in /tmp/net.*.did-setup ; do + + for slave in $bondslaves ; do + # write separate ifcfg file for the raw eth interface +- { ++ ( + echo "# Generated by dracut initrd" + echo "DEVICE=\"$slave\"" + echo "TYPE=Ethernet" + echo "ONBOOT=yes" + echo "NETBOOT=yes" +- if [ -e /tmp/net.${netif}.${slave}.hwaddr ]; then +- echo "HWADDR=\"$(cat /tmp/net.${netif}.${slave}.hwaddr)\"" +- else +- echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" +- fi + echo "SLAVE=yes" + echo "MASTER=\"$netif\"" + echo "NAME=\"$slave\"" + echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" +- } >> /tmp/ifcfg/ifcfg-$slave ++ [ -e /tmp/net.$slave.override ] && . /tmp/net.$slave.override ++ [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" ++ interface_bind "$slave" "$macaddr" ++ ) >> /tmp/ifcfg/ifcfg-$slave + done + fi + +@@ -227,17 +230,19 @@ for netup in /tmp/net.*.did-setup ; do + } >> /tmp/ifcfg/ifcfg-$netif + for slave in $bridgeslaves ; do + # write separate ifcfg file for the raw eth interface +- { ++ ( + echo "# Generated by dracut initrd" + echo "DEVICE=\"$slave\"" + echo "TYPE=Ethernet" + echo "ONBOOT=yes" + echo "NETBOOT=yes" +- echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\"" + echo "BRIDGE=\"$bridgename\"" + echo "NAME=\"$slave\"" + echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" +- } >> /tmp/ifcfg/ifcfg-$slave ++ [ -e /tmp/net.$slave.override ] && . /tmp/net.$slave.override ++ [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" ++ interface_bind "$slave" "$macaddr" ++ ) >> /tmp/ifcfg/ifcfg-$slave + done + fi + i=1 diff --git a/SOURCES/0219-cms-cmssetup.sh-fixed-indention.patch b/SOURCES/0219-cms-cmssetup.sh-fixed-indention.patch new file mode 100644 index 0000000..1f3475b --- /dev/null +++ b/SOURCES/0219-cms-cmssetup.sh-fixed-indention.patch @@ -0,0 +1,316 @@ +From 49a23aa4261a896303d7923d5c94c9840739022f Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 12 Sep 2014 09:57:13 +0200 +Subject: [PATCH] cms/cmssetup.sh: fixed indention + +(cherry picked from commit d68163551226d302677e358e721560d8d651a30f) +--- + modules.d/80cms/cmssetup.sh | 260 ++++++++++++++++++++++---------------------- + 1 file changed, 130 insertions(+), 130 deletions(-) + +diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh +index c9e1331..7dd481b 100755 +--- a/modules.d/80cms/cmssetup.sh ++++ b/modules.d/80cms/cmssetup.sh +@@ -44,147 +44,147 @@ function dasd_settle() { + } + + function dasd_settle_all() { +- for dasdccw in $(while read line; do echo ${line%%(*}; done < /proc/dasd/devices) ; do ++ for dasdccw in $(while read line; do echo "${line%%(*}"; done < /proc/dasd/devices) ; do + if ! dasd_settle $dasdccw ; then + echo $"Could not access DASD $dasdccw in time" + return 1 + fi + done + return 0 +- } ++} + + # prints a canonocalized device bus ID for a given devno of any format +- function canonicalize_devno() +- { +- case ${#1} in +- 3) echo "0.0.0${1}" ;; +- 4) echo "0.0.${1}" ;; +- *) echo "${1}" ;; +- esac +- return 0 +- } ++function canonicalize_devno() ++{ ++ case ${#1} in ++ 3) echo "0.0.0${1}" ;; ++ 4) echo "0.0.${1}" ;; ++ *) echo "${1}" ;; ++ esac ++ return 0 ++} + + # read file from CMS and write it to /tmp +- function readcmsfile() # $1=dasdport $2=filename +- { +- local dev +- local numcpus +- local devname +- local ret=0 +- if [ $# -ne 2 ]; then return; fi ++function readcmsfile() # $1=dasdport $2=filename ++{ ++ local dev ++ local numcpus ++ local devname ++ local ret=0 ++ if [ $# -ne 2 ]; then return; fi + # precondition: udevd created dasda block device node +- if ! dasd_cio_free -d $1 ; then +- echo $"DASD $1 could not be cleared from device blacklist" +- return 1 +- fi ++ if ! dasd_cio_free -d $1 ; then ++ echo $"DASD $1 could not be cleared from device blacklist" ++ return 1 ++ fi + +- modprobe dasd_mod dasd=$CMSDASD +- modprobe dasd_eckd_mod +- udevadm settle ++ modprobe dasd_mod dasd=$CMSDASD ++ modprobe dasd_eckd_mod ++ udevadm settle + + # precondition: dasd_eckd_mod driver incl. dependencies loaded, + # dasd_mod must be loaded without setting any DASD online +- dev=$(canonicalize_devno $1) +- numcpus=$( +- while read line; do +- if strstr "$line" "# processors"; then +- echo ${line##*:}; +- break; +- fi; +- done < /proc/cpuinfo +- ) +- +- if [ ${numcpus} -eq 1 ]; then +- echo 1 > /sys/bus/ccw/devices/$dev/online +- else +- if ! sysecho /sys/bus/ccw/devices/$dev/online 1; then +- echo $"DASD $dev could not be set online" +- return 1 +- fi +- udevadm settle +- if ! dasd_settle $dev ; then +- echo $"Could not access DASD $dev in time" +- return 1 +- fi ++ dev=$(canonicalize_devno $1) ++ numcpus=$( ++ while read line; do ++ if strstr "$line" "# processors"; then ++ echo ${line##*:}; ++ break; ++ fi; ++ done < /proc/cpuinfo ++ ) ++ ++ if [ ${numcpus} -eq 1 ]; then ++ echo 1 > /sys/bus/ccw/devices/$dev/online ++ else ++ if ! sysecho /sys/bus/ccw/devices/$dev/online 1; then ++ echo $"DASD $dev could not be set online" ++ return 1 + fi +- + udevadm settle ++ if ! dasd_settle $dev ; then ++ echo $"Could not access DASD $dev in time" ++ return 1 ++ fi ++ fi + +- devname=$(cd /sys/bus/ccw/devices/$dev/block; set -- *; [ -b /dev/$1 ] && echo $1) +- devname=${devname:-dasda} ++ udevadm settle + +- [[ -d /mnt ]] || mkdir /mnt +- if cmsfs-fuse --to=UTF-8 -a /dev/$devname /mnt; then +- cat /mnt/$2 > /run/initramfs/$2 +- umount /mnt || umount -l /mnt +- udevadm settle +- else +- echo $"Could not read conf file $2 on CMS DASD $1." +- ret=1 +- fi ++ devname=$(cd /sys/bus/ccw/devices/$dev/block; set -- *; [ -b /dev/$1 ] && echo $1) ++ devname=${devname:-dasda} + +- if ! sysecho /sys/bus/ccw/devices/$dev/online 0; then +- echo $"DASD $dev could not be set offline again" +- #return 1 +- fi ++ [[ -d /mnt ]] || mkdir /mnt ++ if cmsfs-fuse --to=UTF-8 -a /dev/$devname /mnt; then ++ cat /mnt/$2 > /run/initramfs/$2 ++ umount /mnt || umount -l /mnt + udevadm settle ++ else ++ echo $"Could not read conf file $2 on CMS DASD $1." ++ ret=1 ++ fi ++ ++ if ! sysecho /sys/bus/ccw/devices/$dev/online 0; then ++ echo $"DASD $dev could not be set offline again" ++ #return 1 ++ fi ++ udevadm settle + + # unbind all dasds to unload the dasd modules for a clean start +- ( cd /sys/bus/ccw/drivers/dasd-eckd; for i in *.*; do echo $i > unbind;done) +- udevadm settle +- modprobe -r dasd_eckd_mod +- udevadm settle +- modprobe -r dasd_diag_mod +- udevadm settle +- modprobe -r dasd_mod +- udevadm settle +- return $ret +- } +- +- processcmsfile() +- { +- source /tmp/cms.conf +- SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')" +- +- if [[ $NETTYPE ]]; then +- ( +- echo -n $NETTYPE,$SUBCHANNELS +- [[ $PORTNAME ]] && echo -n ",portname=$PORTNAME" +- [[ $LAYER2 ]] && echo -n ",layer2=$LAYER2" +- [[ "$NETTYPE" = "ctc" ]] && [[ $CTCPROT ]] && echo -n ",protocol=$CTCPROT" +- echo +- ) >> /etc/ccw.conf +- +- OLDIFS=$IFS +- IFS=, +- read -a subch_array <<< "indexzero,$SUBCHANNELS" +- IFS=$OLDIFS +- devbusid=${subch_array[1]} +- if [ "$NETTYPE" = "ctc" ]; then +- driver="ctcm" +- else +- driver=$NETTYPE +- fi +- +- printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="%s", KERNELS=="%s", ENV{INTERFACE}=="?*", RUN+="/sbin/initqueue --onetime --unique --name cmsifup-$env{INTERFACE} /sbin/cmsifup $env{INTERFACE}"\n' "$driver" "$devbusid" > /etc/udev/rules.d/99-cms.rules +- # remove the default net rules +- rm -f -- /etc/udev/rules.d/91-default-net.rules +- [[ -f /etc/udev/rules.d/90-net.rules ]] \ +- || printf 'SUBSYSTEM=="net", ACTION=="online", RUN+="/sbin/initqueue --onetime --env netif=$env{INTERFACE} source_hook initqueue/online"\n' >> /etc/udev/rules.d/99-cms.rules +- udevadm control --reload +- znet_cio_free +- fi ++ ( cd /sys/bus/ccw/drivers/dasd-eckd; for i in *.*; do echo $i > unbind;done) ++ udevadm settle ++ modprobe -r dasd_eckd_mod ++ udevadm settle ++ modprobe -r dasd_diag_mod ++ udevadm settle ++ modprobe -r dasd_mod ++ udevadm settle ++ return $ret ++} + +- if [[ $DASD ]]; then +- echo $DASD | normalize_dasd_arg > /etc/dasd.conf +- echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf +- dasd_cio_free ++processcmsfile() ++{ ++ source /tmp/cms.conf ++ SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')" ++ ++ if [[ $NETTYPE ]]; then ++ ( ++ echo -n $NETTYPE,$SUBCHANNELS ++ [[ $PORTNAME ]] && echo -n ",portname=$PORTNAME" ++ [[ $LAYER2 ]] && echo -n ",layer2=$LAYER2" ++ [[ "$NETTYPE" = "ctc" ]] && [[ $CTCPROT ]] && echo -n ",protocol=$CTCPROT" ++ echo ++ ) >> /etc/ccw.conf ++ ++ OLDIFS=$IFS ++ IFS=, ++ read -a subch_array <<< "indexzero,$SUBCHANNELS" ++ IFS=$OLDIFS ++ devbusid=${subch_array[1]} ++ if [ "$NETTYPE" = "ctc" ]; then ++ driver="ctcm" ++ else ++ driver=$NETTYPE + fi + +- unset _do_zfcp +- for i in ${!FCP_*}; do +- echo "${!i}" | while read port rest; do +- case $port in ++ printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="%s", KERNELS=="%s", ENV{INTERFACE}=="?*", RUN+="/sbin/initqueue --onetime --unique --name cmsifup-$env{INTERFACE} /sbin/cmsifup $env{INTERFACE}"\n' "$driver" "$devbusid" > /etc/udev/rules.d/99-cms.rules ++ # remove the default net rules ++ rm -f -- /etc/udev/rules.d/91-default-net.rules ++ [[ -f /etc/udev/rules.d/90-net.rules ]] \ ++ || printf 'SUBSYSTEM=="net", ACTION=="online", RUN+="/sbin/initqueue --onetime --env netif=$env{INTERFACE} source_hook initqueue/online"\n' >> /etc/udev/rules.d/99-cms.rules ++ udevadm control --reload ++ znet_cio_free ++ fi ++ ++ if [[ $DASD ]]; then ++ echo $DASD | normalize_dasd_arg > /etc/dasd.conf ++ echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf ++ dasd_cio_free ++ fi ++ ++ unset _do_zfcp ++ for i in ${!FCP_*}; do ++ echo "${!i}" | while read port rest; do ++ case $port in + *.*.*) + ;; + *.*) +@@ -193,23 +193,23 @@ function dasd_settle_all() { + *) + port="0.0.$port" + ;; +- esac +- echo $port $rest >> /etc/zfcp.conf +- done +- _do_zfcp=1 ++ esac ++ echo $port $rest >> /etc/zfcp.conf + done +- [[ $_do_zfcp ]] && zfcp_cio_free +- unset _do_zfcp +- } ++ _do_zfcp=1 ++ done ++ [[ $_do_zfcp ]] && zfcp_cio_free ++ unset _do_zfcp ++} + +- [[ $CMSDASD ]] || CMSDASD=$(getarg "CMSDASD=") +- [[ $CMSCONFFILE ]] || CMSCONFFILE=$(getarg "CMSCONFFILE=") ++[[ $CMSDASD ]] || CMSDASD=$(getarg "CMSDASD=") ++[[ $CMSCONFFILE ]] || CMSCONFFILE=$(getarg "CMSCONFFILE=") + + # Parse configuration +- if [ -n "$CMSDASD" -a -n "$CMSCONFFILE" ]; then +- if readcmsfile $CMSDASD $CMSCONFFILE; then +- ln -s /run/initramfs/$CMSCONFFILE /tmp/$CMSCONFFILE +- ln -s /run/initramfs/$CMSCONFFILE /tmp/cms.conf +- processcmsfile +- fi ++if [ -n "$CMSDASD" -a -n "$CMSCONFFILE" ]; then ++ if readcmsfile $CMSDASD $CMSCONFFILE; then ++ ln -s /run/initramfs/$CMSCONFFILE /tmp/$CMSCONFFILE ++ ln -s /run/initramfs/$CMSCONFFILE /tmp/cms.conf ++ processcmsfile + fi ++fi diff --git a/SOURCES/0220-cms-cmssetup.sh-understand-DASD-none.patch b/SOURCES/0220-cms-cmssetup.sh-understand-DASD-none.patch new file mode 100644 index 0000000..4135eed --- /dev/null +++ b/SOURCES/0220-cms-cmssetup.sh-understand-DASD-none.patch @@ -0,0 +1,26 @@ +From b44b3ed0363e138117f3b16565e4d8b79eeb76c8 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 12 Sep 2014 09:59:03 +0200 +Subject: [PATCH] cms/cmssetup.sh: understand DASD="none" + +Treat DASD="none" as unset. + +https://bugzilla.redhat.com/show_bug.cgi?id=1096979 +(cherry picked from commit 2f954621ccde0bc9160cd90142865e7586e25b00) +--- + modules.d/80cms/cmssetup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh +index 7dd481b..6259ff4 100755 +--- a/modules.d/80cms/cmssetup.sh ++++ b/modules.d/80cms/cmssetup.sh +@@ -175,7 +175,7 @@ processcmsfile() + znet_cio_free + fi + +- if [[ $DASD ]]; then ++ if [[ $DASD ]] && [[ $DASD != "none" ]]; then + echo $DASD | normalize_dasd_arg > /etc/dasd.conf + echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf + dasd_cio_free diff --git a/SOURCES/0221-qemu-install-virtio_console-kernel-module.patch b/SOURCES/0221-qemu-install-virtio_console-kernel-module.patch new file mode 100644 index 0000000..e749b9c --- /dev/null +++ b/SOURCES/0221-qemu-install-virtio_console-kernel-module.patch @@ -0,0 +1,25 @@ +From c5c57f3f19aea96ab99636d35e2c901cc0b5b8d0 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 12 Sep 2014 10:03:59 +0200 +Subject: [PATCH] qemu: install virtio_console kernel module + +https://bugzilla.redhat.com/show_bug.cgi?id=1097999 +(cherry picked from commit 5058ae2d295cfd68a6b99e7f6c75227164ca7722) +--- + modules.d/90qemu/module-setup.sh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh +index 0dbf081..6779642 100755 +--- a/modules.d/90qemu/module-setup.sh ++++ b/modules.d/90qemu/module-setup.sh +@@ -22,5 +22,8 @@ check() { + + installkernel() { + # qemu specific modules +- hostonly='' instmods virtio_blk virtio virtio_ring virtio_pci ata_piix ata_generic pata_acpi cdrom sr_mod ahci virtio_scsi ++ hostonly='' instmods \ ++ ata_piix ata_generic pata_acpi cdrom sr_mod ahci \ ++ virtio_blk virtio virtio_ring virtio_pci \ ++ virtio_scsi virtio_console + } diff --git a/SOURCES/0222-dracut-functions.sh-exit-for-missing-force-add-or-ad.patch b/SOURCES/0222-dracut-functions.sh-exit-for-missing-force-add-or-ad.patch new file mode 100644 index 0000000..49f0962 --- /dev/null +++ b/SOURCES/0222-dracut-functions.sh-exit-for-missing-force-add-or-ad.patch @@ -0,0 +1,37 @@ +From 815ab93fe9f57aa3e17066d9564ce5350f95b35a Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 12 Sep 2014 10:19:28 +0200 +Subject: [PATCH] dracut-functions.sh: exit for missing --force-add or --add + dracut modules + +Better exit with fail early, so there is no surprise on reboot. + +(cherry picked from commit a49cac2e65eb1beb8b0442b74aaa4851d184c0ce) +--- + dracut-functions.sh | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 8a0cd30..6e0b44a 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -1314,11 +1314,17 @@ for_each_module_dir() { + + # Report any missing dracut modules, the user has specified + _modcheck="$add_dracutmodules $force_add_dracutmodules" +- [[ $dracutmodules != all ]] && _modcheck="$m $dracutmodules" ++ [[ $dracutmodules != all ]] && _modcheck="$_modcheck $dracutmodules" + for _mod in $_modcheck; do + [[ " $mods_to_load " == *\ $_mod\ * ]] && continue +- [[ " $omit_dracutmodules " == *\ $_mod\ * ]] && continue ++ ++ [[ " $force_add_dracutmodules " != *\ $_mod\ * ]] \ ++ && [[ " $omit_dracutmodules " == *\ $_mod\ * ]] \ ++ && continue ++ + derror "dracut module '$_mod' cannot be found or installed." ++ [[ " $force_add_dracutmodules " == *\ $_mod\ * ]] && exit 1 ++ [[ " $add_dracutmodules " == *\ $_mod\ * ]] && exit 1 + done + } + diff --git a/SOURCES/0223-do-ip-route-replace-default-instead-of-add.patch b/SOURCES/0223-do-ip-route-replace-default-instead-of-add.patch new file mode 100644 index 0000000..4cb8c64 --- /dev/null +++ b/SOURCES/0223-do-ip-route-replace-default-instead-of-add.patch @@ -0,0 +1,47 @@ +From aa5313ca0e17bb08dd0629c3f9385672408caceb Mon Sep 17 00:00:00 2001 +From: Will Woods +Date: Thu, 28 Aug 2014 13:44:47 -0400 +Subject: [PATCH] do 'ip route replace default' instead of 'add' + +When you define the gateway for an interface, dracut sets it up with: + + ip route add default via $gw dev $netif + +If a default route is already set (e.g. if you have multiple NICs), this +will fail with the message "RTNETLINK answers: File exists". + +So, if your first NIC isn't usable as a default route + +Using "ip route replace default" instead allows ifup/dhclient-script to +correctly change the default route to the new interface. +--- + modules.d/40network/dhclient-script.sh | 2 +- + modules.d/40network/ifup.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh +index ba05250..885303a 100755 +--- a/modules.d/40network/dhclient-script.sh ++++ b/modules.d/40network/dhclient-script.sh +@@ -45,7 +45,7 @@ setup_interface() { + valid_lft ${lease_time} preferred_lft ${lease_time} \ + dev $netif + +- [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw ++ [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw + + [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf + if [ -n "$namesrv" ] ; then +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index 43e84a2..67b1d9f 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -145,7 +145,7 @@ do_static() { + ip addr add $ip/$mask ${srv:+peer $srv} brd + dev $netif + fi + +- [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw ++ [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw + [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname + + return 0 diff --git a/SOURCES/0224-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch b/SOURCES/0224-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch new file mode 100644 index 0000000..873c41b --- /dev/null +++ b/SOURCES/0224-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch @@ -0,0 +1,25 @@ +From 0630273048326cb7cc51b67f0f134b6badb7b6c7 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 23 Oct 2014 14:34:33 +0200 +Subject: [PATCH] network/net-lib.sh:is_persistent_ethernet_name() eth* is not + +eth* is _not_ a persistent ethernet name... tsk, tsk, tsk + +(cherry picked from commit 05065741f01e78119f1883f199820b804460c58d) +--- + modules.d/40network/net-lib.sh | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index e2901da..22f7754 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -555,8 +555,6 @@ find_iface_with_link() { + is_persistent_ethernet_name() { + case "$1" in + # udev persistent interface names +- eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*) +- ;; + eno[0-9]|eno[0-9][0-9]|eno[0-9][0-9][0-9]*) + ;; + ens[0-9]|ens[0-9][0-9]|ens[0-9][0-9][0-9]*) diff --git a/SOURCES/0225-ifcfg-write-ifcfg-only-write-DEVICE-for-non-kernel-n.patch b/SOURCES/0225-ifcfg-write-ifcfg-only-write-DEVICE-for-non-kernel-n.patch new file mode 100644 index 0000000..6a78d93 --- /dev/null +++ b/SOURCES/0225-ifcfg-write-ifcfg-only-write-DEVICE-for-non-kernel-n.patch @@ -0,0 +1,189 @@ +From c4c24171bfbffd7bb75a75b8ceae18ce7296cac6 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 24 Oct 2014 15:47:24 +0200 +Subject: [PATCH] ifcfg/write-ifcfg: only write DEVICE for non-kernel names + +Rename an interface to the kernel namespace is not allowed, so don't add +DEVICE="", if HWADDR is given. + +(cherry picked from commit 3947f07d93cde5e1cf0d788537e93b135d6c27b0) +--- + modules.d/40network/net-lib.sh | 46 ++++++++++++++++++++++++++++++- + modules.d/45ifcfg/write-ifcfg.sh | 59 ++++++++++++++++++++++++++-------------- + 2 files changed, 84 insertions(+), 21 deletions(-) + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index 22f7754..337817e 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -553,7 +553,19 @@ find_iface_with_link() { + } + + is_persistent_ethernet_name() { +- case "$1" in ++ local _netif="$1" ++ local _name_assign_type="0" ++ ++ [ -f "/sys/class/net/$_netif/name_assign_type" ] \ ++ && _name_assign_type=$(cat "/sys/class/net/$_netif/name_assign_type") ++ ++ # NET_NAME_ENUM 1 ++ [ "$_name_assign_type" = "1" ] && return 1 ++ ++ # NET_NAME_PREDICTABLE 2 ++ [ "$_name_assign_type" = "2" ] && return 0 ++ ++ case "$_netif" in + # udev persistent interface names + eno[0-9]|eno[0-9][0-9]|eno[0-9][0-9][0-9]*) + ;; +@@ -573,3 +585,35 @@ is_persistent_ethernet_name() { + esac + return 0 + } ++ ++is_kernel_ethernet_name() { ++ local _netif="$1" ++ local _name_assign_type="1" ++ ++ if [ -e "/sys/class/net/$_netif/name_assign_type" ]; then ++ _name_assign_type=$(cat "/sys/class/net/$_netif/name_assign_type") ++ ++ case "$_name_assign_type" in ++ 2|3|4) ++ # NET_NAME_PREDICTABLE 2 ++ # NET_NAME_USER 3 ++ # NET_NAME_RENAMED 4 ++ return 1 ++ ;; ++ 1|*) ++ # NET_NAME_ENUM 1 ++ return 0 ++ ;; ++ esac ++ fi ++ ++ # fallback to error prone manual name check ++ case "$_netif" in ++ eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*) ++ return 0 ++ ;; ++ *) ++ return 1 ++ esac ++ ++} +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index aed3069..a1bae72 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -82,18 +82,41 @@ print_s390() { + return 0 + } + ++hw_bind() { ++ local _netif="$1" ++ local _macaddr="$2" ++ ++ [ -n "$_macaddr" ] \ ++ && echo "MACADDR=\"$_macaddr\"" ++ ++ print_s390 "$_netif" \ ++ && return 0 ++ ++ [ -n "$_macaddr" ] && return 0 ++ ++ is_persistent_ethernet_name "$_netif" && return 0 ++ ++ [ -f "/sys/class/net/$_netif/addr_assign_type" ] \ ++ && [ "$(cat "/sys/class/net/$_netif/addr_assign_type")" != "0" ] \ ++ && return 1 ++ ++ [ -f "/sys/class/net/$_netif/address" ] \ ++ || return 1 ++ ++ echo "HWADDR=\"$(cat /sys/class/net/$_netif/address)\"" ++} ++ + interface_bind() { +- local netif="$1" +- local macaddr="$2" +- if ! print_s390 $netif; then +- if [ -z "$macaddr" ] && \ +- ! is_persistent_ethernet_name "$netif" && \ +- [ -f /sys/class/net/$netif/addr_assign_type ] && \ +- [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] && \ +- [ -f /sys/class/net/$netif/address ]; then +- echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" +- fi ++ local _netif="$1" ++ local _macaddr="$2" ++ ++ # see, if we can bind it to some hw parms ++ if hw_bind "$_netif" "$_macaddr"; then ++ # only print out DEVICE, if it's user assigned ++ is_kernel_ethernet_name "$_netif" && return 0 + fi ++ ++ echo "DEVICE=\"$_netif\"" + } + + for netup in /tmp/net.*.did-setup ; do +@@ -131,7 +154,8 @@ for netup in /tmp/net.*.did-setup ; do + + { + echo "# Generated by dracut initrd" +- echo "DEVICE=\"$netif\"" ++ echo "NAME=\"$netif\"" ++ interface_bind "$netif" "$macaddr" + echo "ONBOOT=yes" + echo "NETBOOT=yes" + echo "UUID=\"$uuid\"" +@@ -177,10 +201,7 @@ for netup in /tmp/net.*.did-setup ; do + if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ]; then + # standard interface + { +- [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" +- interface_bind "$netif" "$macaddr" + echo "TYPE=Ethernet" +- echo "NAME=\"$netif\"" + [ -n "$mtu" ] && echo "MTU=\"$mtu\"" + } >> /tmp/ifcfg/ifcfg-$netif + fi +@@ -207,16 +228,15 @@ for netup in /tmp/net.*.did-setup ; do + # write separate ifcfg file for the raw eth interface + ( + echo "# Generated by dracut initrd" +- echo "DEVICE=\"$slave\"" ++ echo "NAME=\"$slave\"" + echo "TYPE=Ethernet" + echo "ONBOOT=yes" + echo "NETBOOT=yes" + echo "SLAVE=yes" + echo "MASTER=\"$netif\"" +- echo "NAME=\"$slave\"" + echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" ++ unset macaddr + [ -e /tmp/net.$slave.override ] && . /tmp/net.$slave.override +- [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" + interface_bind "$slave" "$macaddr" + ) >> /tmp/ifcfg/ifcfg-$slave + done +@@ -232,15 +252,14 @@ for netup in /tmp/net.*.did-setup ; do + # write separate ifcfg file for the raw eth interface + ( + echo "# Generated by dracut initrd" +- echo "DEVICE=\"$slave\"" ++ echo "NAME=\"$slave\"" + echo "TYPE=Ethernet" + echo "ONBOOT=yes" + echo "NETBOOT=yes" + echo "BRIDGE=\"$bridgename\"" +- echo "NAME=\"$slave\"" + echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\"" ++ unset macaddr + [ -e /tmp/net.$slave.override ] && . /tmp/net.$slave.override +- [ -n "$macaddr" ] && echo "MACADDR=\"$macaddr\"" + interface_bind "$slave" "$macaddr" + ) >> /tmp/ifcfg/ifcfg-$slave + done diff --git a/SOURCES/0226-fips-add-libfreeblpriv3.so-and-libfreeblpriv3.chk.patch b/SOURCES/0226-fips-add-libfreeblpriv3.so-and-libfreeblpriv3.chk.patch new file mode 100644 index 0000000..1939747 --- /dev/null +++ b/SOURCES/0226-fips-add-libfreeblpriv3.so-and-libfreeblpriv3.chk.patch @@ -0,0 +1,24 @@ +From eeb68f0a160dddd1e841b19a76d604bfe5569b9d Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 28 Nov 2014 15:32:17 +0100 +Subject: [PATCH] fips: add libfreeblpriv3.so and libfreeblpriv3.chk + +(cherry picked from commit 3659d64df3fe87e2ec2ca6a55c8f456dabb953db) +--- + modules.d/01fips/module-setup.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh +index 35cfdc5..2b0e836 100755 +--- a/modules.d/01fips/module-setup.sh ++++ b/modules.d/01fips/module-setup.sh +@@ -38,7 +38,8 @@ install() { + + inst_libdir_file libsoftokn3.so libsoftokn3.so \ + libsoftokn3.chk libfreebl3.so libfreebl3.chk \ +- libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 ++ libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \ ++ libfreeblpriv3.so and libfreeblpriv3.chk + + inst_multiple -o prelink + inst_simple /etc/system-fips diff --git a/SOURCES/0227-fips-remove-c-p-and.patch b/SOURCES/0227-fips-remove-c-p-and.patch new file mode 100644 index 0000000..865c19f --- /dev/null +++ b/SOURCES/0227-fips-remove-c-p-and.patch @@ -0,0 +1,23 @@ +From 8964abbd4033516f8763248ca426f8ee7bbf868c Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 9 Jan 2015 14:53:42 +0100 +Subject: [PATCH] fips: remove c&p "and" + +(cherry picked from commit 40899490330574487e7e3ea2c448a521b36bb40a) +--- + modules.d/01fips/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh +index 2b0e836..906b49f 100755 +--- a/modules.d/01fips/module-setup.sh ++++ b/modules.d/01fips/module-setup.sh +@@ -39,7 +39,7 @@ install() { + inst_libdir_file libsoftokn3.so libsoftokn3.so \ + libsoftokn3.chk libfreebl3.so libfreebl3.chk \ + libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \ +- libfreeblpriv3.so and libfreeblpriv3.chk ++ libfreeblpriv3.so libfreeblpriv3.chk + + inst_multiple -o prelink + inst_simple /etc/system-fips diff --git a/SOURCES/0228-net-lib.sh-parse_iscsi_root-fix-target-parsing.patch b/SOURCES/0228-net-lib.sh-parse_iscsi_root-fix-target-parsing.patch new file mode 100644 index 0000000..2e7a081 --- /dev/null +++ b/SOURCES/0228-net-lib.sh-parse_iscsi_root-fix-target-parsing.patch @@ -0,0 +1,93 @@ +From 20700e3dea3c10aa2c9d4a724ec3d671455d556f Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 12 Jan 2015 14:06:10 +0100 +Subject: [PATCH] net-lib.sh:parse_iscsi_root() fix target parsing + +For targets with colons in the iSCSI target name: + "iqn.2000-09.com.foo:storage-system.e2000:00000001cm1p1" + +the parser was confused with the optional iscsi_iface_name and +iscsi_netdev_name. + +This patch reintroduces the old IQN, EUI and NAA parsing and enhances +the fallback parser by checking the LUN for a numerical value. + +(cherry picked from commit 36e8ce4fb01824b49697bd0e7ad3ca3c4cfd4297) +--- + modules.d/40network/net-lib.sh | 50 ++++++++++++++++++++++++++++++++---------- + 1 file changed, 38 insertions(+), 12 deletions(-) + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index 337817e..f085020 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -310,6 +310,23 @@ parse_iscsi_root() + ;; + esac + ++ unset iscsi_target_name ++ # extract target name ++ case "$v" in ++ *:iqn.*) ++ iscsi_target_name=iqn.${v##*:iqn.} ++ v=${v%:iqn.*}: ++ ;; ++ *:eui.*) ++ iscsi_target_name=iqn.${v##*:eui.} ++ v=${v%:iqn.*}: ++ ;; ++ *:naa.*) ++ iscsi_target_name=iqn.${v##*:naa.} ++ v=${v%:iqn.*}: ++ ;; ++ esac ++ + # parse the rest + OLDIFS="$IFS" + IFS=: +@@ -319,24 +336,33 @@ parse_iscsi_root() + iscsi_protocol=$1; shift # ignored + iscsi_target_port=$1; shift + +- if [ $# -gt 3 ] && [ -n "$1$2" ]; then +- iscsi_iface_name=$1; shift +- iscsi_netdev_name=$1; shift ++ if [ -n "$iscsi_target_name" ]; then ++ if [ $# -eq 3 ]; then ++ iscsi_iface_name=$1; shift ++ fi ++ if [ $# -eq 2 ]; then ++ iscsi_netdev_name=$1; shift ++ fi ++ iscsi_lun=$1; shift ++ if [ $# -ne 0 ]; then ++ warn "Invalid parameter in iscsi: parameter!" ++ return 1 ++ fi ++ return 0 + fi + +- iscsi_lun=$1; shift + +- if [ $# -gt 2 ]; then +- warn "Invalid parameter in iscsi: parameter!" +- return 1 ++ if [ $# -gt 3 ] && [ -n "$1$2" ]; then ++ if [ -z "$3" ] || [ "$3" -ge 0 ] 2>/dev/null ; then ++ iscsi_iface_name=$1; shift ++ iscsi_netdev_name=$1; shift ++ fi + fi + +- if [ $# -eq 2 ]; then +- iscsi_target_name="$1:$2" +- else +- iscsi_target_name="$1" +- fi ++ iscsi_lun=$1; shift + ++ iscsi_target_name=$(printf "%s:" "$@") ++ iscsi_target_name=${iscsi_target_name%:} + } + + ip_to_var() { diff --git a/SOURCES/0229-ssh-client-s-key-key.patch b/SOURCES/0229-ssh-client-s-key-key.patch new file mode 100644 index 0000000..f36c98d --- /dev/null +++ b/SOURCES/0229-ssh-client-s-key-key.patch @@ -0,0 +1,27 @@ +From 509a3b2c3354d6ea83bc61a83ac35f64c1c32103 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 12 Jan 2015 14:20:42 +0100 +Subject: [PATCH] ssh-client: s/key/$key + +GlobalKnownHostsFile was not installed, because key was not $key + +Thanks Jan Stodola! + +(cherry picked from commit 4ba44e899cbc58e7cee0ff66c8ac4a96f502b972) +--- + modules.d/95ssh-client/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/95ssh-client/module-setup.sh b/modules.d/95ssh-client/module-setup.sh +index f60e963..c7d8ee2 100755 +--- a/modules.d/95ssh-client/module-setup.sh ++++ b/modules.d/95ssh-client/module-setup.sh +@@ -45,7 +45,7 @@ inst_sshenv() + inst_simple /etc/ssh/ssh_config + sed -i -e 's/\(^[[:space:]]*\)ProxyCommand/\1# ProxyCommand/' ${initdir}/etc/ssh/ssh_config + while read key val; do +- [[ key != "GlobalKnownHostsFile" ]] && continue ++ [[ $key != "GlobalKnownHostsFile" ]] && continue + inst_simple "$val" + break + done < /etc/ssh/ssh_config diff --git a/SOURCES/0230-cms-cms-write-ifcfg.sh-turn-SUBCHANNELS-into-lowerca.patch b/SOURCES/0230-cms-cms-write-ifcfg.sh-turn-SUBCHANNELS-into-lowerca.patch new file mode 100644 index 0000000..75cdc6e --- /dev/null +++ b/SOURCES/0230-cms-cms-write-ifcfg.sh-turn-SUBCHANNELS-into-lowerca.patch @@ -0,0 +1,22 @@ +From b96ce4a6fdd61e5b268772ce5a09fcb2ca45c762 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 1 Dec 2014 15:04:53 +0100 +Subject: [PATCH] cms/cms-write-ifcfg.sh: turn SUBCHANNELS into lowercase + +(cherry picked from commit 3ae03005b85a702256ead058375c9fab2e53950e) +--- + modules.d/80cms/cms-write-ifcfg.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/80cms/cms-write-ifcfg.sh b/modules.d/80cms/cms-write-ifcfg.sh +index c0623a4..7846996 100755 +--- a/modules.d/80cms/cms-write-ifcfg.sh ++++ b/modules.d/80cms/cms-write-ifcfg.sh +@@ -9,6 +9,7 @@ mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts + function cms_write_config() + { + . /tmp/cms.conf ++ SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')" + OLDIFS=$IFS + IFS=, + read -a subch_array <<< "indexzero,$SUBCHANNELS" diff --git a/SOURCES/0231-40network-Fix-the-syntax-to-correct-the-judgment-sen.patch b/SOURCES/0231-40network-Fix-the-syntax-to-correct-the-judgment-sen.patch new file mode 100644 index 0000000..d88273e --- /dev/null +++ b/SOURCES/0231-40network-Fix-the-syntax-to-correct-the-judgment-sen.patch @@ -0,0 +1,29 @@ +From 0b7fad28375c6156ad2d8159c3adbedef0b53740 Mon Sep 17 00:00:00 2001 +From: Minfei Huang +Date: Mon, 1 Dec 2014 12:37:06 +0800 +Subject: [PATCH] 40network: Fix the syntax to correct the judgment sentence + +In the judgment sentence, it will print the following warning message, +becasuse of lacking the blank on the left of ']'. + +/lib/net-lib.sh: line 110: [: missing `]' + +Signed-off-by: Minfei Huang +(cherry picked from commit c440d302f1cdfc0336e9086c7b9016356f961936) +--- + modules.d/40network/net-lib.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index f085020..9c6b9da 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -107,7 +107,7 @@ setup_net() { + # add static route + for _p in $(getargs rd.route); do + route_to_var "$_p" || continue +- [ -n "$route_dev" ] && [ "$route_dev" != "$netif"] && continue ++ [ -n "$route_dev" ] && [ "$route_dev" != "$netif" ] && continue + ip route add "$route_mask" ${route_gw:+via "$route_gw"} ${route_dev:+dev "$route_dev"} + if strstr ":" "$route_mask"; then + printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \ diff --git a/SOURCES/0232-systemd-add-90-vconsole.rules.patch b/SOURCES/0232-systemd-add-90-vconsole.rules.patch new file mode 100644 index 0000000..e12008d --- /dev/null +++ b/SOURCES/0232-systemd-add-90-vconsole.rules.patch @@ -0,0 +1,30 @@ +From 7bbee6ac49f46319f8bda222ae67377252346704 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 6 Nov 2014 10:44:33 +0100 +Subject: [PATCH] systemd: add 90-vconsole.rules + +run systemd-vconsole-setup if fbcon device shows up + +(cherry picked from commit 027565d0233f76edf434b63a847a717185d267e2) +--- + modules.d/98systemd/module-setup.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh +index 015597f..f62f551 100755 +--- a/modules.d/98systemd/module-setup.sh ++++ b/modules.d/98systemd/module-setup.sh +@@ -196,7 +196,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 \ diff --git a/SOURCES/0233-network-add-support-for-comma-separated-autoconf-opt.patch b/SOURCES/0233-network-add-support-for-comma-separated-autoconf-opt.patch new file mode 100644 index 0000000..d88b133 --- /dev/null +++ b/SOURCES/0233-network-add-support-for-comma-separated-autoconf-opt.patch @@ -0,0 +1,97 @@ +From 368f08cb7efca9738292859e179da269597412e4 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 14 Jan 2015 11:28:16 +0100 +Subject: [PATCH] network: add support for comma separated autoconf options + +ip=eth0:auto6,dhcp + +might work now +--- + modules.d/40network/ifup.sh | 24 ++++++++++++----------- + modules.d/40network/parse-ip-opts.sh | 38 +++++++++++++++++++----------------- + 2 files changed, 33 insertions(+), 29 deletions(-) + +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index 67b1d9f..8749c4c 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -326,17 +326,19 @@ for p in $(getargs ip=); do + eval '[ "$'$i'" ] && echo '$i'="$'$i'"' + done > /tmp/net.$netif.override + +- case $autoconf in +- dhcp|on|any) +- do_dhcp -4 ;; +- dhcp6) +- load_ipv6 +- do_dhcp -6 ;; +- auto6) +- do_ipv6auto ;; +- *) +- do_static ;; +- esac ++ for autoopt in $(str_replace "$autoconf" "," " "); do ++ case $autoopt in ++ dhcp|on|any) ++ do_dhcp -4 ;; ++ dhcp6) ++ load_ipv6 ++ do_dhcp -6 ;; ++ auto6) ++ do_ipv6auto ;; ++ *) ++ do_static ;; ++ esac ++ done + + > /tmp/net.${netif}.up + +diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh +index b029d00..5b96e06 100755 +--- a/modules.d/40network/parse-ip-opts.sh ++++ b/modules.d/40network/parse-ip-opts.sh +@@ -66,24 +66,26 @@ for p in $(getargs ip=); do + fi + + # Error checking for autoconf in combination with other values +- case $autoconf in +- error) die "Error parsing option 'ip=$p'";; +- bootp|rarp|both) die "Sorry, ip=$autoconf is currenty unsupported";; +- none|off) +- [ -z "$ip" ] && \ +- die "For argument 'ip=$p'\nValue '$autoconf' without static configuration does not make sense" +- [ -z "$mask" ] && \ +- die "Sorry, automatic calculation of netmask is not yet supported" +- ;; +- auto6);; +- dhcp|dhcp6|on|any) \ +- [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \ +- die "Sorry, 'ip=$p' does not make sense for multiple interface configurations" +- [ -n "$ip" ] && \ +- die "For argument 'ip=$p'\nSorry, setting client-ip does not make sense for '$autoconf'" +- ;; +- *) die "For argument 'ip=$p'\nSorry, unknown value '$autoconf'";; +- esac ++ for autoopt in $(str_replace "$autoconf" "," " "); do ++ case $autoopt in ++ error) die "Error parsing option 'ip=$p'";; ++ bootp|rarp|both) die "Sorry, ip=$autoopt is currenty unsupported";; ++ none|off) ++ [ -z "$ip" ] && \ ++ die "For argument 'ip=$p'\nValue '$autoopt' without static configuration does not make sense" ++ [ -z "$mask" ] && \ ++ die "Sorry, automatic calculation of netmask is not yet supported" ++ ;; ++ auto6);; ++ dhcp|dhcp6|on|any) \ ++ [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \ ++ die "Sorry, 'ip=$p' does not make sense for multiple interface configurations" ++ [ -n "$ip" ] && \ ++ die "For argument 'ip=$p'\nSorry, setting client-ip does not make sense for '$autoopt'" ++ ;; ++ *) die "For argument 'ip=$p'\nSorry, unknown value '$autoopt'";; ++ esac ++ done + + if [ -n "$dev" ] ; then + # We don't like duplicate device configs diff --git a/SOURCES/0234-test-add-fs-lib-to-dracut-module-list.patch b/SOURCES/0234-test-add-fs-lib-to-dracut-module-list.patch new file mode 100644 index 0000000..cc7cc2c --- /dev/null +++ b/SOURCES/0234-test-add-fs-lib-to-dracut-module-list.patch @@ -0,0 +1,223 @@ +From c984ddda6a41c57f579c6d06fdc7e767395e41ac Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 24 Oct 2014 13:19:34 +0200 +Subject: [PATCH] test: add "fs-lib" to dracut module list + +(cherry picked from commit eda73c0ad2cfc6a9bc8dc429b1a6fcd873e3e1c2) +--- + test/TEST-01-BASIC/test.sh | 2 +- + test/TEST-02-SYSTEMD/test.sh | 2 +- + test/TEST-03-USR-MOUNT/test.sh | 2 +- + test/TEST-04-FULL-SYSTEMD/test.sh | 2 +- + test/TEST-10-RAID/test.sh | 4 ++-- + test/TEST-11-LVM/test.sh | 2 +- + test/TEST-12-RAID-DEG/test.sh | 2 +- + test/TEST-13-ENC-RAID-LVM/test.sh | 2 +- + test/TEST-14-IMSM/test.sh | 2 +- + test/TEST-15-BTRFSRAID/test.sh | 2 +- + test/TEST-17-LVM-THIN/test.sh | 2 +- + test/TEST-20-NFS/test.sh | 2 +- + test/TEST-40-NBD/test.sh | 4 ++-- + test/TEST-50-MULTINIC/test.sh | 2 +- + 14 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh +index 5ee6d23..02ebc23 100755 +--- a/test/TEST-01-BASIC/test.sh ++++ b/test/TEST-01-BASIC/test.sh +@@ -62,7 +62,7 @@ test_setup() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash udev-rules base rootfs-block kernel-modules" \ ++ -m "dash udev-rules base rootfs-block fs-lib kernel-modules fs-lib" \ + -d "piix ide-gd_mod ata_piix ext3 sd_mod" \ + --nomdadmconf \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 +diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh +index 2ccf8e6..2a8ed6b 100755 +--- a/test/TEST-02-SYSTEMD/test.sh ++++ b/test/TEST-02-SYSTEMD/test.sh +@@ -58,7 +58,7 @@ test_setup() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash udev-rules base rootfs-block kernel-modules" \ ++ -m "dash udev-rules base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix ext3 sd_mod" \ + --nomdadmconf \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 +diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh +index ef74d40..b8231fe 100755 +--- a/test/TEST-03-USR-MOUNT/test.sh ++++ b/test/TEST-03-USR-MOUNT/test.sh +@@ -89,7 +89,7 @@ test_setup() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash udev-rules btrfs base rootfs-block kernel-modules" \ ++ -m "dash udev-rules btrfs base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix btrfs sd_mod" \ + --nomdadmconf \ + --nohardlink \ +diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh +index 3eeb840..aa83122 100755 +--- a/test/TEST-04-FULL-SYSTEMD/test.sh ++++ b/test/TEST-04-FULL-SYSTEMD/test.sh +@@ -232,7 +232,7 @@ EOF + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash udev-rules btrfs base rootfs-block kernel-modules" \ ++ -m "dash udev-rules btrfs base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix btrfs sd_mod" \ + --nomdadmconf \ + --nohardlink \ +diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh +index b17e912..d79d5cd 100755 +--- a/test/TEST-10-RAID/test.sh ++++ b/test/TEST-10-RAID/test.sh +@@ -5,7 +5,7 @@ KVERSION=${KVERSION-$(uname -r)} + + # Uncomment this to debug failures + #DEBUGFAIL="rd.shell rd.udev.log-priority=debug loglevel=70 systemd.log_target=kmsg" +-#DEBUGFAIL="rd.break rd.shell" ++#DEBUGFAIL="rd.break rd.shell rd.debug debug" + test_run() { + DISKIMAGE=$TESTDIR/TEST-10-RAID-root.img + $testdir/run-qemu \ +@@ -60,7 +60,7 @@ test_setup() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \ ++ -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix ext2 sd_mod" \ + --nomdadmconf \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 +diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh +index 6f2461c..732d0c8 100755 +--- a/test/TEST-11-LVM/test.sh ++++ b/test/TEST-11-LVM/test.sh +@@ -57,7 +57,7 @@ test_setup() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash lvm mdraid udev-rules base rootfs-block kernel-modules" \ ++ -m "dash lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix ext2 sd_mod" \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 + rm -rf -- $TESTDIR/overlay +diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh +index 2631621..87fe542 100755 +--- a/test/TEST-12-RAID-DEG/test.sh ++++ b/test/TEST-12-RAID-DEG/test.sh +@@ -98,7 +98,7 @@ test_setup() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \ ++ -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix ext2 sd_mod" \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 + rm -rf -- $TESTDIR/overlay +diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh +index 5102142..129620b 100755 +--- a/test/TEST-13-ENC-RAID-LVM/test.sh ++++ b/test/TEST-13-ENC-RAID-LVM/test.sh +@@ -94,7 +94,7 @@ test_setup() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \ ++ -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix ext2 sd_mod" \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 + rm -rf -- $TESTDIR/overlay +diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh +index 532c348..ad0cf7b 100755 +--- a/test/TEST-14-IMSM/test.sh ++++ b/test/TEST-14-IMSM/test.sh +@@ -86,7 +86,7 @@ test_setup() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash lvm mdraid dmraid udev-rules base rootfs-block kernel-modules" \ ++ -m "dash lvm mdraid dmraid udev-rules base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix ext2 sd_mod dm-multipath dm-crypt dm-round-robin faulty linear multipath raid0 raid10 raid1 raid456" \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 + rm -rf -- $TESTDIR/overlay +diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh +index 3fc1d45..71f5703 100755 +--- a/test/TEST-15-BTRFSRAID/test.sh ++++ b/test/TEST-15-BTRFSRAID/test.sh +@@ -58,7 +58,7 @@ test_setup() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash btrfs udev-rules base rootfs-block kernel-modules" \ ++ -m "dash btrfs udev-rules base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix btrfs sd_mod" \ + --nomdadmconf \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 +diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh +index 0cfce19..4c904b0 100755 +--- a/test/TEST-17-LVM-THIN/test.sh ++++ b/test/TEST-17-LVM-THIN/test.sh +@@ -57,7 +57,7 @@ test_setup() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash lvm mdraid udev-rules base rootfs-block kernel-modules" \ ++ -m "dash lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix ext2 sd_mod" \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 + rm -rf -- $TESTDIR/overlay +diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh +index 4f21d45..7b5e3c5 100755 +--- a/test/TEST-20-NFS/test.sh ++++ b/test/TEST-20-NFS/test.sh +@@ -340,7 +340,7 @@ test_setup() { + + # Make server's dracut image + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash udev-rules base rootfs-block debug kernel-modules watchdog" \ ++ -m "dash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \ + -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod e1000 i6300esb" \ + -f $TESTDIR/initramfs.server $KVERSION || return 1 + +diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh +index 7cf64b1..59494ed 100755 +--- a/test/TEST-40-NBD/test.sh ++++ b/test/TEST-40-NBD/test.sh +@@ -226,7 +226,7 @@ make_encrypted_root() { + # We do it this way so that we do not risk trashing the host mdraid + # devices, volume groups, encrypted partitions, etc. + $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \ ++ -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ + -d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod" \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 + rm -rf -- $TESTDIR/overlay +@@ -352,7 +352,7 @@ test_setup() { + ) + + sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ +- -m "dash udev-rules rootfs-block base debug kernel-modules" \ ++ -m "dash udev-rules rootfs-block fs-lib base debug kernel-modules" \ + -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \ + -f $TESTDIR/initramfs.server $KVERSION || return 1 + +diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh +index add849c..3c6003b 100755 +--- a/test/TEST-50-MULTINIC/test.sh ++++ b/test/TEST-50-MULTINIC/test.sh +@@ -264,7 +264,7 @@ test_setup() { + + # Make server's dracut image + $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \ +- -m "dash udev-rules base rootfs-block debug kernel-modules watchdog" \ ++ -m "dash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \ + -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd e1000 i6300esb ib700wdt" \ + -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1 + diff --git a/SOURCES/0235-network-enhance-team-support.patch b/SOURCES/0235-network-enhance-team-support.patch new file mode 100644 index 0000000..6512b59 --- /dev/null +++ b/SOURCES/0235-network-enhance-team-support.patch @@ -0,0 +1,291 @@ +From 4c88c2859e3f974b2dc3c7726409c83076df8985 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 13 Jan 2015 15:06:48 +0100 +Subject: [PATCH] network: enhance team support + +Install ifcfg-* files with team configuration in the initramfs. + +Improve the slave configuration of the team interface, by looking up +ifcfg files in the initramfs. + +Create a default loadbalance team config, if none present in the +initramfs. +--- + modules.d/40network/ifup.sh | 38 ++++++++++++++++++++++++++++--------- + modules.d/40network/module-setup.sh | 37 ++++++++++++++++++++++++++++++++++++ + modules.d/40network/net-genrules.sh | 9 ++++++--- + modules.d/40network/net-lib.sh | 18 ++++++++++++++++++ + modules.d/40network/parse-team.sh | 30 +++++++++++++++++++---------- + modules.d/45ifcfg/write-ifcfg.sh | 10 +++++++++- + 6 files changed, 119 insertions(+), 23 deletions(-) + +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index 8749c4c..7836a6b 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -34,14 +34,16 @@ for i in /tmp/bond.*.info; do + done + done + +-if [ -e /tmp/team.info ]; then +- . /tmp/team.info ++for i in /tmp/team.*.info; do ++ [ -e "$i" ] || continue ++ unset teamslaves ++ unset teammaster + for slave in $teamslaves ; do + if [ "$netif" = "$slave" ] ; then + netif=$teammaster + fi + done +-fi ++done + + if [ -e /tmp/vlan.info ]; then + . /tmp/vlan.info +@@ -205,26 +207,44 @@ if [ -e /tmp/bond.${netif}.info ]; then + fi + fi + +-if [ -e /tmp/team.info ]; then +- . /tmp/team.info ++if [ -e /tmp/team.${netif}.info ]; then ++ . /tmp/team.${netif}.info + if [ "$netif" = "$teammaster" ] && [ ! -e /tmp/net.$teammaster.up ] ; then + # We shall only bring up those _can_ come up + # in case of some slave is gone in active-backup mode + working_slaves="" + for slave in $teamslaves ; do +- ip link set $slave up 2>/dev/null ++ teamdctl ${teammaster} port present ${slave} 2>/dev/null \ ++ && continue ++ ip link set dev $slave up 2>/dev/null + if wait_for_if_up $slave; then + working_slaves+="$slave " + fi + done + # Do not add slaves now +- teamd -d -U -n -t $teammaster -f /etc/teamd/$teammaster.conf ++ teamd -d -U -n -t $teammaster -f /etc/teamd/${teammaster}.conf + for slave in $working_slaves; do + # team requires the slaves to be down before joining team +- ip link set $slave down ++ ip link set dev $slave down ++ ( ++ unset TEAM_PORT_CONFIG ++ _hwaddr=$(cat /sys/class/net/$slave/address) ++ _subchannels=$(iface_get_subchannels "$slave") ++ if [ -n "$_hwaddr" ] && [ -e "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then ++ . "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ++ elif [ -n "$_subchannels" ] && [ -e "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ]; then ++ . "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ++ elif [ -e "/etc/sysconfig/network-scripts/ifcfg-${slave}" ]; then ++ . "/etc/sysconfig/network-scripts/ifcfg-${slave}" ++ fi ++ ++ if [ -n "${TEAM_PORT_CONFIG}" ]; then ++ /usr/bin/teamdctl ${teammaster} port config update ${slave} "${TEAM_PORT_CONFIG}" ++ fi ++ ) + teamdctl $teammaster port add $slave + done +- ip link set $teammaster up ++ ip link set dev $teammaster up + fi + fi + +diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh +index a5e796f..a52e881 100755 +--- a/modules.d/40network/module-setup.sh ++++ b/modules.d/40network/module-setup.sh +@@ -95,6 +95,43 @@ install() { + inst_hook cmdline 99 "$moddir/parse-ifname.sh" + inst_hook cleanup 10 "$moddir/kill-dhclient.sh" + ++ # install all config files for teaming ++ unset TEAM_MASTER ++ unset TEAM_CONFIG ++ unset TEAM_PORT_CONFIG ++ unset HWADDR ++ unset SUBCHANNELS ++ for i in /etc/sysconfig/network-scripts/ifcfg-*; do ++ [ -e "$i" ] || continue ++ case "$i" in ++ *~ | *.bak | *.orig | *.rpmnew | *.rpmorig | *.rpmsave) ++ continue ++ ;; ++ esac ++ ( ++ . "$i" ++ if ! [ "${ONBOOT}" = "no" -o "${ONBOOT}" = "NO" ] \ ++ && [ -n "${TEAM_MASTER}${TEAM_CONFIG}${TEAM_PORT_CONFIG}" ]; then ++ if [ -n "$TEAM_CONFIG" ] && [ -n "$DEVICE" ]; then ++ mkdir -p $initdir/etc/teamd ++ printf -- "%s" "$TEAM_CONFIG" > "$initdir/etc/teamd/${DEVICE}.conf" ++ elif [ -n "$TEAM_PORT_CONFIG" ]; then ++ inst_simple "$i" ++ ++ HWADDR="$(echo $HWADDR | sed 'y/ABCDEF/abcdef/')" ++ if [ -n "$HWADDR" ]; then ++ ln_r "$i" "/etc/sysconfig/network-scripts/mac-${HWADDR}.conf" ++ fi ++ ++ SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')" ++ if [ -n "$SUBCHANNELS" ]; then ++ ln_r "$i" "/etc/sysconfig/network-scripts/ccw-${SUBCHANNELS}.conf" ++ fi ++ fi ++ fi ++ ) ++ done ++ + _arch=$(uname -m) + + inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \ +diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh +index a43e3df..3664984 100755 +--- a/modules.d/40network/net-genrules.sh ++++ b/modules.d/40network/net-genrules.sh +@@ -31,11 +31,14 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh + MASTER_IFACES="$MASTER_IFACES ${bondname}" + done + +- if [ -e /tmp/team.info ]; then +- . /tmp/team.info ++ for i in /tmp/team.*.info; do ++ [ -e "$i" ] || continue ++ unset teamslaves ++ unset teammaster ++ . "$i" + IFACES="$IFACES ${teamslaves}" + MASTER_IFACES="$MASTER_IFACES ${teammaster}" +- fi ++ done + + if [ -e /tmp/vlan.info ]; then + . /tmp/vlan.info +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index 9c6b9da..82827b6 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -643,3 +643,21 @@ is_kernel_ethernet_name() { + esac + + } ++ ++iface_get_subchannels() { ++ local _netif ++ local _subchannels ++ ++ _netif="$1" ++ ++ _subchannels=$({ ++ for i in /sys/class/net/$_netif/device/cdev[0-9]*; do ++ [ -e $i ] || continue ++ channel=$(readlink -f $i) ++ printf -- "%s" "${channel##*/}," ++ done ++ }) ++ [ -n "$_subchannels" ] || return 1 ++ ++ printf -- "%s" ${_subchannels%,} ++} +diff --git a/modules.d/40network/parse-team.sh b/modules.d/40network/parse-team.sh +index 318c0e1..a836d68 100755 +--- a/modules.d/40network/parse-team.sh ++++ b/modules.d/40network/parse-team.sh +@@ -24,21 +24,31 @@ parseteam() { + + unset teammaster teamslaves + case $# in +- 2) teammaster=$1; teamslaves=$(str_replace "$2" "," " ") ;; +- *) die "team= requires two parameters" ;; ++ 2) teammaster=$1; teamslaves=$(str_replace "$2" "," " ") ;; ++ *) warn "team= requires two parameters"; return 1;; + esac ++ return 0 + } + + unset teammaster teamslaves + + if getarg team>/dev/null; then + # Read team= parameters if they exist +- team="$(getarg team=)" +- if [ ! "$team" = "team" ]; then +- parseteam "$(getarg team=)" +- fi +- +- echo "teammaster=$teammaster" > /tmp/team.info +- echo "teamslaves=\"$teamslaves\"" >> /tmp/team.info +- return ++ for team in $(getargs team); do ++ [ "$team" = "team" ] && continue ++ ++ unset teammaster ++ unset teamslaves ++ ++ parseteam "$team" || continue ++ ++ echo "teammaster=$teammaster" > /tmp/team.${teammaster}.info ++ echo "teamslaves=\"$teamslaves\"" >> /tmp/team.${teammaster}.info ++ ++ if ! [ -e /etc/teamd/${teammaster}.conf ]; then ++ warn "Team master $teammaster specified, but no /etc/teamd/$teammaster.conf present. Using activebackup." ++ mkdir -p /etc/teamd ++ printf -- "%s" '{"runner": {"name": "activebackup"}, "link_watch": {"name": "ethtool"}}' > "/etc/teamd/${teammaster}.conf" ++ fi ++ done + fi +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index a1bae72..b2462da 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -128,6 +128,7 @@ for netup in /tmp/net.*.did-setup ; do + [ -e /tmp/ifcfg/ifcfg-$netif ] && continue + unset bridge + unset bond ++ unset team + unset bondslaves + unset bondname + unset bondoptions +@@ -140,10 +141,13 @@ for netup in /tmp/net.*.did-setup ; do + unset slave + unset ethname + [ -e /tmp/bond.${netif}.info ] && . /tmp/bond.${netif}.info ++ [ -e /tmp/team.${netif}.info ] && . /tmp/team.${netif}.info + + uuid=$(cat /proc/sys/kernel/random/uuid) + if [ "$netif" = "$bridgename" ]; then + bridge=yes ++ elif [ "$netif" = "$teammaster" ]; then ++ team=yes + elif [ "$netif" = "$bondname" ]; then + # $netif can't be bridge and bond at the same time + bond=yes +@@ -152,6 +156,9 @@ for netup in /tmp/net.*.did-setup ; do + vlan=yes + fi + ++ # skip team interfaces for now, the host config must be in sync ++ [ "$netif" = "$teammaster" ] && continue ++ + { + echo "# Generated by dracut initrd" + echo "NAME=\"$netif\"" +@@ -198,7 +205,7 @@ for netup in /tmp/net.*.did-setup ; do + } > /tmp/ifcfg/ifcfg-$netif + + # bridge needs different things written to ifcfg +- if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ]; then ++ if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ] && [ -z "$team" ]; then + # standard interface + { + echo "TYPE=Ethernet" +@@ -264,6 +271,7 @@ for netup in /tmp/net.*.did-setup ; do + ) >> /tmp/ifcfg/ifcfg-$slave + done + fi ++ + i=1 + for ns in $(getargs nameserver); do + echo "DNS${i}=\"${ns}\"" >> /tmp/ifcfg/ifcfg-$netif diff --git a/SOURCES/0236-dracut-fixed-module-dependency-handling.patch b/SOURCES/0236-dracut-fixed-module-dependency-handling.patch new file mode 100644 index 0000000..feda7d2 --- /dev/null +++ b/SOURCES/0236-dracut-fixed-module-dependency-handling.patch @@ -0,0 +1,112 @@ +From 6914b67545633d23063d5c5812591c67df56c0cf Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 24 Oct 2014 13:19:58 +0200 +Subject: [PATCH] dracut: fixed module dependency handling + +Fail for "--modules" and "--force-add" dracut modules, if they or their +dependencies cannot be included. + +(cherry picked from commit ab2f95e45ed9803c5cbee23f41201a0f934f8043) +--- + dracut-functions.sh | 37 ++++++++++++++++++++++++++----------- + dracut.sh | 4 +++- + 2 files changed, 29 insertions(+), 12 deletions(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 6e0b44a..89438b2 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -1215,13 +1215,17 @@ check_mount() { + fi + fi + +- + for _moddep in $(module_depends $_mod); do + # handle deps as if they were manually added +- [[ " $add_dracutmodules " == *\ $_moddep\ * ]] || \ +- add_dracutmodules+=" $_moddep " +- [[ " $force_add_dracutmodules " == *\ $_moddep\ * ]] || \ +- force_add_dracutmodules+=" $_moddep " ++ [[ " $dracutmodules " == *\ $_mod\ * ]] \ ++ && [[ " $dracutmodules " != *\ $_moddep\ * ]] \ ++ && dracutmodules+=" $_moddep " ++ [[ " $add_dracutmodules " == *\ $_mod\ * ]] \ ++ && [[ " $add_dracutmodules " != *\ $_moddep\ * ]] \ ++ && add_dracutmodules+=" $_moddep " ++ [[ " $force_add_dracutmodules " == *\ $_mod\ * ]] \ ++ && [[ " $force_add_dracutmodules " != *\ $_moddep\ * ]] \ ++ && force_add_dracutmodules+=" $_moddep " + # if a module we depend on fail, fail also + if ! check_module $_moddep; then + derror "dracut module '$_mod' depends on '$_moddep', which can't be installed" +@@ -1259,7 +1263,7 @@ check_module() { + fi + + if [[ " $dracutmodules $add_dracutmodules $force_add_dracutmodules" == *\ $_mod\ * ]]; then +- if [[ " $force_add_dracutmodules " == *\ $_mod\ * ]]; then ++ if [[ " $dracutmodules $force_add_dracutmodules " == *\ $_mod\ * ]]; then + module_check $_mod 1; ret=$? + else + module_check $_mod 0; ret=$? +@@ -1270,7 +1274,11 @@ check_module() { + # module not in our list + if [[ $dracutmodules = all ]]; then + # check, if we can and should install this module +- module_check $_mod || return 1 ++ module_check $_mod; ret=$? ++ if [[ $ret != 0 ]]; then ++ [[ $2 ]] && return 1 ++ [[ $ret != 255 ]] && return 1 ++ fi + else + # skip this module + return 1 +@@ -1279,10 +1287,15 @@ check_module() { + + for _moddep in $(module_depends $_mod); do + # handle deps as if they were manually added +- [[ " $add_dracutmodules " == *\ $_moddep\ * ]] || \ +- add_dracutmodules+=" $_moddep " +- [[ " $force_add_dracutmodules " == *\ $_moddep\ * ]] || \ +- force_add_dracutmodules+=" $_moddep " ++ [[ " $dracutmodules " == *\ $_mod\ * ]] \ ++ && [[ " $dracutmodules " != *\ $_moddep\ * ]] \ ++ && dracutmodules+=" $_moddep " ++ [[ " $add_dracutmodules " == *\ $_mod\ * ]] \ ++ && [[ " $add_dracutmodules " != *\ $_moddep\ * ]] \ ++ && add_dracutmodules+=" $_moddep " ++ [[ " $force_add_dracutmodules " == *\ $_mod\ * ]] \ ++ && [[ " $force_add_dracutmodules " != *\ $_moddep\ * ]] \ ++ && force_add_dracutmodules+=" $_moddep " + # if a module we depend on fail, fail also + if ! check_module $_moddep; then + derror "dracut module '$_mod' depends on '$_moddep', which can't be installed" +@@ -1319,11 +1332,13 @@ for_each_module_dir() { + [[ " $mods_to_load " == *\ $_mod\ * ]] && continue + + [[ " $force_add_dracutmodules " != *\ $_mod\ * ]] \ ++ && [[ " $dracutmodules " != *\ $_mod\ * ]] \ + && [[ " $omit_dracutmodules " == *\ $_mod\ * ]] \ + && continue + + derror "dracut module '$_mod' cannot be found or installed." + [[ " $force_add_dracutmodules " == *\ $_mod\ * ]] && exit 1 ++ [[ " $dracutmodules " == *\ $_mod\ * ]] && exit 1 + [[ " $add_dracutmodules " == *\ $_mod\ * ]] && exit 1 + done + } +diff --git a/dracut.sh b/dracut.sh +index eff096e..74c59a0 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1152,7 +1152,9 @@ fi + + [[ -d "$systemdsystemconfdir" ]] || systemdsystemconfdir=/etc/systemd/system + +-export initdir dracutbasedir dracutmodules \ ++export initdir dracutbasedir \ ++ dracutmodules force_add_dracutmodules add_dracutmodules omit_dracutmodules \ ++ mods_to_load \ + fw_dir drivers_dir debug no_kernel kernel_only \ + omit_drivers mdadmconf lvmconf root_dev \ + use_fstab fstab_lines libdirs fscks nofscks ro_mnt \ diff --git a/SOURCES/0237-network-net-lib.sh-parse_iscsi_root-fix-c-p-bug.patch b/SOURCES/0237-network-net-lib.sh-parse_iscsi_root-fix-c-p-bug.patch new file mode 100644 index 0000000..ec2af4a --- /dev/null +++ b/SOURCES/0237-network-net-lib.sh-parse_iscsi_root-fix-c-p-bug.patch @@ -0,0 +1,33 @@ +From 4f992675aeff74281ff72b6f7b764c3f5240dfc6 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 15 Jan 2015 10:33:50 +0100 +Subject: [PATCH] network/net-lib.sh:parse_iscsi_root(): fix c&p bug + +fix iscsi_target_name for eui.* and naa.* target names + +(cherry picked from commit 7cddd7b838941cc2608da8641a84031d696e18e0) +--- + modules.d/40network/net-lib.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index 82827b6..89b1101 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -318,12 +318,12 @@ parse_iscsi_root() + v=${v%:iqn.*}: + ;; + *:eui.*) +- iscsi_target_name=iqn.${v##*:eui.} +- v=${v%:iqn.*}: ++ iscsi_target_name=eui.${v##*:eui.} ++ v=${v%:eui.*}: + ;; + *:naa.*) +- iscsi_target_name=iqn.${v##*:naa.} +- v=${v%:iqn.*}: ++ iscsi_target_name=naa.${v##*:naa.} ++ v=${v%:naa.*}: + ;; + esac + diff --git a/SOURCES/0238-network-ifup-source-team-info-if-present.patch b/SOURCES/0238-network-ifup-source-team-info-if-present.patch new file mode 100644 index 0000000..2cc22a3 --- /dev/null +++ b/SOURCES/0238-network-ifup-source-team-info-if-present.patch @@ -0,0 +1,21 @@ +From b9372137fd224ec57d44a4ba5cff0622e20fcab5 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 21 Jan 2015 13:39:28 +0100 +Subject: [PATCH] network:ifup source team info if present + +--- + modules.d/40network/ifup.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index 7836a6b..524a3fb 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -38,6 +38,7 @@ for i in /tmp/team.*.info; do + [ -e "$i" ] || continue + unset teamslaves + unset teammaster ++ . "$i" + for slave in $teamslaves ; do + if [ "$netif" = "$slave" ] ; then + netif=$teammaster diff --git a/SOURCES/0239-network-do-not-destroy-the-team-interface-on-teamd-s.patch b/SOURCES/0239-network-do-not-destroy-the-team-interface-on-teamd-s.patch new file mode 100644 index 0000000..1ed4044 --- /dev/null +++ b/SOURCES/0239-network-do-not-destroy-the-team-interface-on-teamd-s.patch @@ -0,0 +1,26 @@ +From e7f59d71ae180ed519b83115d9b41f9b3ba000e4 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 26 Jan 2015 15:12:08 +0000 +Subject: [PATCH] network: do not destroy the team interface on teamd shutdown + +when doing switch-root teamd gets killed, which tears down the team +interface, if teamd is not started with "-N". + +(cherry picked from commit 2a12e9747524dc719e0da9a9d8c382f957cc13de) +--- + modules.d/40network/ifup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index 524a3fb..bd7db02 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -223,7 +223,7 @@ if [ -e /tmp/team.${netif}.info ]; then + fi + done + # Do not add slaves now +- teamd -d -U -n -t $teammaster -f /etc/teamd/${teammaster}.conf ++ teamd -d -U -n -N -t $teammaster -f /etc/teamd/$teammaster.conf + for slave in $working_slaves; do + # team requires the slaves to be down before joining team + ip link set dev $slave down diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec index cad2a0e..8bfab89 100644 --- a/SPECS/dracut.spec +++ b/SPECS/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 033 -Release: 161%{?dist}.173 +Release: 240%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -189,18 +189,85 @@ Patch157: 0157-Add-legacy-flag-l-to-lz4-and-update-magic-number.patch Patch158: 0158-fs-lib-always-install-fsck.-fs-if-present.patch Patch159: 0159-ifcfg-write-ifcfg.sh-turn-on-IPV6INIT-if-any-inet6-a.patch Patch160: 0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch -Patch161: 0161-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch -Patch162: 0162-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch -Patch163: 0163-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch -Patch164: 0164-Do-not-reload-systemd-with-wait_for_dev.patch -Patch165: 0165-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch -Patch166: 0166-ifcfg-depends-on-network.patch -Patch167: 0167-network-add-rd.route-parameter.patch -Patch168: 0168-fixed-bridge-setup.patch -Patch169: 0169-bridging-update-the-ifcfg-files-generated-for-bridge.patch -Patch170: 0170-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch -Patch171: 0171-ifcfg-write-ifcfg.sh-bind-bond-and-bridge-interfaces.patch -Patch172: 0172-ifcfg-write-ifcfg-only-write-DEVICE-for-non-kernel-n.patch +Patch161: 0161-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch +Patch162: 0162-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch +Patch163: 0163-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch +Patch164: 0164-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch +Patch165: 0165-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch +Patch166: 0166-dracut-lib.sh-fixed-return-value-of-pidof.patch +Patch167: 0167-Do-not-log-to-kmsg-syslog-and-files-for-print-cmdlin.patch +Patch168: 0168-ifcfg-write-ifcfg.sh-IPV6INIT-yes-check-also-for-non.patch +Patch169: 0169-cms-cmssetup.sh-convert-SUBCHANNELS-to-lowercase.patch +Patch170: 0170-mdraid-module-setup.sh-fixed-print-cmdline-for-empty.patch +Patch171: 0171-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch +Patch172: 0172-nbd-nbdroot.sh-call-nbd-client-with-systemd-mark.patch +Patch173: 0173-fcoe-uefi-parse-uefifcoe.sh-fixed-parameter-generati.patch +Patch174: 0174-dracut-functions.sh-print_vars-fix-for-values-with-s.patch +Patch175: 0175-98systemd-fixup-rootfs-generator-installation-path.patch +Patch176: 0176-dracut-pre-pivot-pulls-in-remote-fs.target.patch +Patch177: 0177-kernel-modules-Fix-storage-module-selection-for-sdhc.patch +Patch178: 0178-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch +Patch179: 0179-network-ifup.sh-Don-t-try-to-modprobe-ipv6-if-alread.patch +Patch180: 0180-iscsi-correctly-install-the-timeout-iscsiroot-dummy-.patch +Patch181: 0181-iscsi-correctly-install-the-settled-iscsiroot-dummy-.patch +Patch182: 0182-deprecate-ip-ibft-kernel-command-line-parameter.patch +Patch183: 0183-systemd-Optionally-include-efivarsfs-module.patch +Patch184: 0184-98systemd-also-install-systemd-journald-dev-log.sock.patch +Patch185: 0185-lsinitrd.sh-don-t-choke-on-LZO-compressed-images.patch +Patch186: 0186-usable_root-only-check-for-ld-.so.patch +Patch187: 0187-print-out-what-kernel-command-line-parameters-are-us.patch +Patch188: 0188-kernel-modules-add-tegra-arm-modules.patch +Patch189: 0189-Add-rd.cmdline-ask-kernel-command-line-parameter.patch +Patch190: 0190-base-init.sh-use-loop-counter-with-unique-varname.patch +Patch191: 0191-ifcfg-depends-on-network.patch +Patch192: 0192-test-add-udev-settle-after-sfdisk.patch +Patch193: 0193-TEST-15-BTRFSRAID-install-etc-os-release.patch +Patch194: 0194-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch +Patch195: 0195-dracut.sh-always-copy-prelink-files-in-FIPS-mode.patch +Patch196: 0196-dracut-functions.sh-speed-up-ldconfig_paths.patch +Patch197: 0197-Installing-an-OS-with-VLAN-enabled-to-an-ISCSI-LUN-f.patch +Patch198: 0198-ARM-update-modules-for-ARM-host-only-options.patch +Patch199: 0199-base-dracut-lib-pidof-turn-off-debugging.patch +Patch200: 0200-network-add-rd.route-parameter.patch +Patch201: 0201-udev-rules-add-uaccess-and-seat-rules.patch +Patch202: 0202-testsuite-mods-for-kvm-nested-in-kvm.patch +Patch203: 0203-add-kate-and-emacs-per-directory-config-files.patch +Patch204: 0204-ssh-client-handle-etc-ssh-ssh_config.patch +Patch205: 0205-dracut-lib.sh-cancel_wait_for_dev-fixed-double-escap.patch +Patch206: 0206-Do-not-reload-systemd-with-wait_for_dev.patch +Patch207: 0207-lsinird-Adding-option-m-mod-to-list-dracut-modules-i.patch +Patch208: 0208-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch +Patch209: 0209-dracut.sh-no-need-to-make-subdirs-in-run.patch +Patch210: 0210-dracut-functions.sh-do-not-force-require-modules.bui.patch +Patch211: 0211-Make-logfile-configurable.patch +Patch212: 0212-Dracut-Add-a-new-argument-rebuild.patch +Patch213: 0213-network-net-lib.sh-parse_iscsi_root-do-not-enforce-t.patch +Patch214: 0214-replaced-ip-auto-with-ip-dhcp-in-the-documentation.patch +Patch215: 0215-Support-spaces-in-mount_nfs-1109933.patch +Patch216: 0216-fixed-bridge-setup.patch +Patch217: 0217-bridging-update-the-ifcfg-files-generated-for-bridge.patch +Patch218: 0218-ifcfg-write-ifcfg.sh-bind-bond-and-bridge-interfaces.patch +Patch219: 0219-cms-cmssetup.sh-fixed-indention.patch +Patch220: 0220-cms-cmssetup.sh-understand-DASD-none.patch +Patch221: 0221-qemu-install-virtio_console-kernel-module.patch +Patch222: 0222-dracut-functions.sh-exit-for-missing-force-add-or-ad.patch +Patch223: 0223-do-ip-route-replace-default-instead-of-add.patch +Patch224: 0224-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch +Patch225: 0225-ifcfg-write-ifcfg-only-write-DEVICE-for-non-kernel-n.patch +Patch226: 0226-fips-add-libfreeblpriv3.so-and-libfreeblpriv3.chk.patch +Patch227: 0227-fips-remove-c-p-and.patch +Patch228: 0228-net-lib.sh-parse_iscsi_root-fix-target-parsing.patch +Patch229: 0229-ssh-client-s-key-key.patch +Patch230: 0230-cms-cms-write-ifcfg.sh-turn-SUBCHANNELS-into-lowerca.patch +Patch231: 0231-40network-Fix-the-syntax-to-correct-the-judgment-sen.patch +Patch232: 0232-systemd-add-90-vconsole.rules.patch +Patch233: 0233-network-add-support-for-comma-separated-autoconf-opt.patch +Patch234: 0234-test-add-fs-lib-to-dracut-module-list.patch +Patch235: 0235-network-enhance-team-support.patch +Patch236: 0236-dracut-fixed-module-dependency-handling.patch +Patch237: 0237-network-net-lib.sh-parse_iscsi_root-fix-c-p-bug.patch +Patch238: 0238-network-ifup-source-team-info-if-present.patch +Patch239: 0239-network-do-not-destroy-the-team-interface-on-teamd-s.patch BuildRequires: bash git @@ -627,19 +694,91 @@ rm -rf -- $RPM_BUILD_ROOT %endif %changelog -* Wed Oct 29 2014 Harald Hoyer 033-161.173 -- fixed persistent interface config file creation -Resolves:rhbz#1135478 - -* Thu Oct 23 2014 Harald Hoyer 033-161.166 -- removed "eth*" from the list of persistent interface names -Resolves:rhbz#1135478 - -* Fri Oct 17 2014 Harald Hoyer 033-165 -- do not reload systemd with wait_for_dev -Resolves:rhbz#1144066 -- do not bind persistent interface names to HWADDR -Resolves:rhbz#1135478 +* Mon Jan 26 2015 Harald Hoyer 033-240 +- fixed team implementation +Resolves: rhbz#1147521 + +* Wed Jan 21 2015 Harald Hoyer 033-239 +- fixed team implementation +Resolves: rhbz#1147521 + +* Thu Jan 15 2015 Harald Hoyer 033-238 +- fixed more iscsi_target parsing +Resolves: rhbz#1176534 + +* Wed Jan 14 2015 Harald Hoyer 033-237 +- add support for multiple autoconf options ip=eth0:auto6,dhcp +Resolves: rhbz#1069270 +- fixed team implementation +Resolves: rhbz#1147521 + +* Tue Jan 13 2015 Harald Hoyer 033-233 +- fips: corrected previous fix +Resolves: rhbz#1165603 +- fixed iscsi_target parsing +Resolves: rhbz#1176534 +- skip GlobalKnownHostsFile for ssh_config +Resolves: rhbz#1086778 +- cms-write-ifcfg.sh: turn SUBCHANNELS into lowercase +Resolves: rhbz#1169384 +- fixed static routes execution +Resolves: rhbz#1101412 +- add 90-vconsole.rules +Resolves: rhbz#1162177 + +* Fri Nov 28 2014 Harald Hoyer 033-227 +- fips: add libfreeblpriv3.so and libfreeblpriv3.chk +Resolves: rhbz#1165603 + +* Wed Oct 29 2014 Harald Hoyer 033-226 +- fixed ifcfg generation for persistent interface names +Resolves: rhbz#1087945 + +* Fri Sep 12 2014 Harald Hoyer 033-224 +- don't enforce iSCSI target name policy +Resolves: rhbz#1078867 +- replaced "ip=auto" with "ip=dhcp" in the documentation +Resolves: rhbz#1086931 +- bind bonding and bridge interfaces to SUBCHANNELS on s390(x) +Resolves: rhbz#1090524 +- turn on ipv6, if configured +Resolves: rhbz#1091410 +- parse DASD="none" as empty +Resolves: rhbz#1096979 +- add virtio-console for qemu +Resolves: rhbz#1097999 +- fail on missing dracut modules +Resolves: rhbz#1121362 +- replace the default route +Resolves: rhbz#1137022 + +* Fri Sep 05 2014 Harald Hoyer 033-213 +- add "-m" option to lsinitrd to list the modules used +Resolves: rhbz#1122806 +- add "--rebuild" option to dracut +Resolves: rhbz#1123900 + +* Fri Aug 29 2014 Harald Hoyer 033-207 +- only fsck from the systemd side +Resolves: rhbz#1080699 +- handle multiple fcoe devices +Resolves: rhbz#1082512 +- handle entries in ssh_config +Resolves: rhbz#1086778 +- do not bind persistent interfaces to MAC +Resolves: rhbz#1087945 +- fixed iscsiroot install in initqueue +Resolves: rhbz#1094469 +- handle upper case letters in SUBCHANNELS +Resolves: rhbz#1094773 +- add rd.route kernel command line parameter +Resolves: rhbz#1101412 +- do not reload systemd on wait_for_dev +Resolves: rhbz#1126008 + +* Tue Jul 29 2014 Harald Hoyer 033-203 +- add rd.cmdline=ask parameter +Resolves: rhbz#1070104 * Mon Apr 28 2014 Harald Hoyer 033-161 - add extra and weak-updates kernel module dirs