* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f5c9297fd7d562291280f74f364d6ef01267ab0b
@ 2022-03-14 15:25 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2022-03-14 15:25 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 55318 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via f5c9297fd7d562291280f74f364d6ef01267ab0b (commit)
via b45c52760bc7820d53d3478cf54e40f43b44f3c6 (commit)
via e77d960bacae0685e2c9fd1b93d4524771d53cd5 (commit)
via 46b8eb9e7f7b1ef02e26b2fe2e8c4689b45424ec (commit)
via 2b7c6f8e929b7a01b23a9b2e893ebc21c9c7b3cd (commit)
via d8db858769bc92178678e459e84c312e26328fd1 (commit)
via e38fb3f63a7c5c444c63d1511626ad5e5bd3cae3 (commit)
via 2f74ea9347ac73268dd349c52e6166ebde698fcc (commit)
via 34a7a97dcd01c7d2faf3500773546e0dcaa97804 (commit)
via 834227f2c8b86aac4e64eff4aa19e99272e8a9d4 (commit)
via 800290ce2a5e9414984f68d9d453801a111a80de (commit)
from 65030c233b09f5c5cb69d50ef4840ecc9671a4eb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f5c9297fd7d562291280f74f364d6ef01267ab0b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 14 15:25:12 2022 +0000
core166: Ship changes files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b45c52760bc7820d53d3478cf54e40f43b44f3c6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 14 15:24:19 2022 +0000
core166: Ship dracut
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e77d960bacae0685e2c9fd1b93d4524771d53cd5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Mar 11 14:43:11 2022 +0000
firewall: Make blocking all traffic impossible on HOSTILE
The current setup can fail and block all traffic on RED if the RETURN
rules could not be created.
This can happen when the kernel fails to load the ipset module, as it is
the case after upgrading to a new kernel. Restarting the firewall will
cause that the system is being cut off the internet.
This design now changes that if those rules cannot be created, the
DROP_HOSTILE feature is just inactive, but it would not disrupt any
traffic.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 46b8eb9e7f7b1ef02e26b2fe2e8c4689b45424ec
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Mar 11 14:43:41 2022 +0000
rebuild-initrd: Drop unused script
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2b7c6f8e929b7a01b23a9b2e893ebc21c9c7b3cd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Mar 11 14:43:40 2022 +0000
dracut: Remove hard-coded configuration from command line
This is now configured globally in dracut
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d8db858769bc92178678e459e84c312e26328fd1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Mar 11 14:43:39 2022 +0000
dracut: Install an IPFire system configuration file
This file contains our custom settings:
* Always load microcodes as early as possible
* We now compress the initrd using Zstandard which is substanstically
faster than XZ, but offers better compression ratios
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e38fb3f63a7c5c444c63d1511626ad5e5bd3cae3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Mar 11 14:43:38 2022 +0000
make.sh: Build acl/attr earlier for coreutils to link against
dracut requires the cp command to be compiled with support for extended
attributes (xattr) which we didn't have due to the required libraries
not being available to coreutils at build time.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2f74ea9347ac73268dd349c52e6166ebde698fcc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Mar 11 14:43:37 2022 +0000
dracut: Update to 056
This one was desperately in need of an upgrade, as dracut 038 was
released 8 YEARS ago. Hence, the changelog since is way too long to
include it here; refer to https://git.kernel.org/pub/scm/boot/dracut/dracut.git/tree/NEWS.md
for details.
See also: #12773
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 34a7a97dcd01c7d2faf3500773546e0dcaa97804
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Mar 12 14:27:58 2022 +0100
ids: Fixed typo in ruleset-sources
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 834227f2c8b86aac4e64eff4aa19e99272e8a9d4
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Mar 12 14:31:44 2022 +0100
ids.cgi: Added topic for ruleset actions
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 800290ce2a5e9414984f68d9d453801a111a80de
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Mar 12 14:34:00 2022 +0100
ids.cgi: Fixed trivial typos in comment
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/dracut/dracut.conf | 57 ---
config/dracut/ipfire.conf | 5 +
config/firewall/rules.pl | 12 +-
config/rootfiles/common/aarch64/stage2 | 1 -
config/rootfiles/common/armv6l/stage2 | 1 -
config/rootfiles/common/dracut | 533 ++++++++++++++++++---
config/rootfiles/common/x86_64/stage2 | 1 -
.../{oldcore/44 => core/166}/filelists/dracut | 0
config/rootfiles/core/166/filelists/files | 3 +
config/rootfiles/core/166/update.sh | 8 +
config/suricata/ruleset-sources | 2 +-
html/cgi-bin/ids.cgi | 4 +-
lfs/cdrom | 2 +-
lfs/dracut | 15 +-
lfs/linux-initrd | 2 +-
make.sh | 4 +-
src/initscripts/system/firewall | 11 +-
src/patches/dracut-038-always-enable-mdraid.patch | 55 ---
...cut-038_add_hyperv-keyboard_and_sdhci-pci.patch | 12 -
src/scripts/rebuild-initrd | 24 -
20 files changed, 501 insertions(+), 251 deletions(-)
delete mode 100644 config/dracut/dracut.conf
create mode 100644 config/dracut/ipfire.conf
copy config/rootfiles/{oldcore/44 => core/166}/filelists/dracut (100%)
create mode 100644 config/rootfiles/core/166/filelists/files
delete mode 100644 src/patches/dracut-038-always-enable-mdraid.patch
delete mode 100644 src/patches/dracut-038_add_hyperv-keyboard_and_sdhci-pci.patch
delete mode 100644 src/scripts/rebuild-initrd
Difference in files:
diff --git a/config/dracut/dracut.conf b/config/dracut/dracut.conf
deleted file mode 100644
index 74736352e..000000000
--- a/config/dracut/dracut.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-# PUT YOUR CONFIG HERE OR IN separate files named *.conf
-# in /etc/dracut.conf.d
-# SEE man dracut.conf(5)
-
-# Sample dracut config file
-
-#logfile=/var/log/dracut.log
-#fileloglvl=6
-
-# Exact list of dracut modules to use. Modules not listed here are not going
-# to be included. If you only want to add some optional modules use
-# add_dracutmodules option instead.
-#dracutmodules+=""
-
-# dracut modules to omit
-#omit_dracutmodules+=""
-
-# dracut modules to add to the default
-#add_dracutmodules+=""
-
-# additional kernel modules to the default
-add_drivers+="xen_blkfront"
-
-# skip kernel modules (marvell sdio and compat from backports)
-omit_drivers+="libertas libertas_sdio mwifiex mwifiex_sdio compat"
-
-# list of kernel filesystem modules to be included in the generic initramfs
-filesystems+="reiserfs vfat xfs"
-
-# build initrd only to boot current hardware
-#hostonly="yes"
-#
-
-# Load microcode for the CPU early
-early_microcode=yes
-
-# install local /etc/mdadm.conf
-#mdadmconf="no"
-
-# install local /etc/lvm/lvm.conf
-#lvmconf="no"
-
-# A list of fsck tools to install. If it's not specified, module's hardcoded
-# default is used, currently: "umount mount /sbin/fsck* xfs_db xfs_check
-# xfs_repair e2fsck jfs_fsck reiserfsck btrfsck". The installation is
-# opportunistic, so non-existing tools are just ignored.
-#fscks=""
-
-# inhibit installation of any fsck tools
-#nofscks="yes"
-
-# mount / and /usr read-only by default
-#ro_mnt="no"
-
-# set the directory for temporary files
-# default: /var/tmp
-#tmpdir=/tmp
diff --git a/config/dracut/ipfire.conf b/config/dracut/ipfire.conf
new file mode 100644
index 000000000..bab5c8a2e
--- /dev/null
+++ b/config/dracut/ipfire.conf
@@ -0,0 +1,5 @@
+# Load microcode for the CPU early
+early_microcode="yes"
+
+# Compress using Zstandard
+compress="zstd"
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 57f4809b4..d71304986 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -701,15 +701,9 @@ sub drop_hostile_networks () {
# Call function to load the network list of hostile networks.
&ipset_restore($HOSTILE_CCODE);
- # Setup rules to pass traffic which does not belong to a hostile network.
- run("$IPTABLES -A HOSTILE -i $RED_DEV -m set ! --match-set $HOSTILE_CCODE src -j RETURN");
- run("$IPTABLES -A HOSTILE -o $RED_DEV -m set ! --match-set $HOSTILE_CCODE dst -j RETURN");
-
- # Setup logging.
- run("$IPTABLES -A HOSTILE -m limit --limit 10/second -j LOG --log-prefix \"DROP_HOSTILE \"");
-
- # Drop traffic from/to hostile network.
- run("$IPTABLES -A HOSTILE -j DROP -m comment --comment \"DROP_HOSTILE\"");
+ # Check traffic in incoming/outgoing direction and drop if it matches
+ run("$IPTABLES -A HOSTILE -i $RED_DEV -m set --match-set $HOSTILE_CCODE src -j HOSTILE_DROP");
+ run("$IPTABLES -A HOSTILE -o $RED_DEV -m set --match-set $HOSTILE_CCODE dst -j HOSTILE_DROP");
}
sub get_protocols {
diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index e34013d42..d8dc12a7f 100644
--- a/config/rootfiles/common/aarch64/stage2
+++ b/config/rootfiles/common/aarch64/stage2
@@ -100,7 +100,6 @@ usr/local/bin/ipsec-interfaces
usr/local/bin/makegraphs
usr/local/bin/qosd
usr/local/bin/readhash
-usr/local/bin/rebuild-initrd
usr/local/bin/run-parts
usr/local/bin/scanhd
usr/local/bin/settime
diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2
index 82f028ad3..42ce447d1 100644
--- a/config/rootfiles/common/armv6l/stage2
+++ b/config/rootfiles/common/armv6l/stage2
@@ -98,7 +98,6 @@ usr/local/bin/ipsec-interfaces
usr/local/bin/makegraphs
usr/local/bin/qosd
usr/local/bin/readhash
-usr/local/bin/rebuild-initrd
usr/local/bin/run-parts
usr/local/bin/scanhd
usr/local/bin/settime
diff --git a/config/rootfiles/common/dracut b/config/rootfiles/common/dracut
index 03379b4d6..d172898ee 100644
--- a/config/rootfiles/common/dracut
+++ b/config/rootfiles/common/dracut
@@ -3,84 +3,462 @@ etc/dracut.conf.d
usr/bin/dracut
usr/bin/dracut-catimages
usr/bin/lsinitrd
-usr/bin/mkinitrd
-usr/lib/dracut
-#usr/lib/dracut/dracut-functions
-#usr/lib/dracut/dracut-functions.sh
-#usr/lib/dracut/dracut-initramfs-restore
-#usr/lib/dracut/dracut-install
-#usr/lib/dracut/dracut-logger.sh
-#usr/lib/dracut/dracut-version.sh
-#usr/lib/dracut/dracut.conf.d
+#usr/lib/dracut
+usr/lib/dracut/dracut-functions
+usr/lib/dracut/dracut-functions.sh
+usr/lib/dracut/dracut-init.sh
+usr/lib/dracut/dracut-initramfs-restore
+usr/lib/dracut/dracut-install
+usr/lib/dracut/dracut-logger.sh
+usr/lib/dracut/dracut-util
+usr/lib/dracut/dracut-version.sh
+usr/lib/dracut/dracut.conf.d
+usr/lib/dracut/dracut.conf.d/ipfire.conf
#usr/lib/dracut/modules.d
-#usr/lib/dracut/modules.d/00bash
-#usr/lib/dracut/modules.d/00bash/module-setup.sh
-#usr/lib/dracut/modules.d/02caps
-#usr/lib/dracut/modules.d/02caps/README
-#usr/lib/dracut/modules.d/02caps/caps.sh
-#usr/lib/dracut/modules.d/02caps/module-setup.sh
-#usr/lib/dracut/modules.d/03rescue
-#usr/lib/dracut/modules.d/03rescue/module-setup.sh
+usr/lib/dracut/modules.d/00bash
+usr/lib/dracut/modules.d/00bash/module-setup.sh
+#usr/lib/dracut/modules.d/00dash
+#usr/lib/dracut/modules.d/00dash/module-setup.sh
+#usr/lib/dracut/modules.d/00mksh
+#usr/lib/dracut/modules.d/00mksh/module-setup.sh
+#usr/lib/dracut/modules.d/00systemd
+#usr/lib/dracut/modules.d/00systemd-network-management
+#usr/lib/dracut/modules.d/00systemd-network-management/module-setup.sh
+#usr/lib/dracut/modules.d/00systemd/module-setup.sh
+usr/lib/dracut/modules.d/00warpclock
+usr/lib/dracut/modules.d/00warpclock/module-setup.sh
+usr/lib/dracut/modules.d/00warpclock/warpclock.sh
+#usr/lib/dracut/modules.d/01fips
+#usr/lib/dracut/modules.d/01fips/fips-boot.sh
+#usr/lib/dracut/modules.d/01fips/fips-load-crypto.sh
+#usr/lib/dracut/modules.d/01fips/fips-noboot.sh
+#usr/lib/dracut/modules.d/01fips/fips.sh
+#usr/lib/dracut/modules.d/01fips/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-ac-power
+#usr/lib/dracut/modules.d/01systemd-ac-power/99-initrd-power-targets.rules
+#usr/lib/dracut/modules.d/01systemd-ac-power/initrd-on-ac-power.target
+#usr/lib/dracut/modules.d/01systemd-ac-power/initrd-on-battery-power.target
+#usr/lib/dracut/modules.d/01systemd-ac-power/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-ask-password
+#usr/lib/dracut/modules.d/01systemd-ask-password/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-coredump
+#usr/lib/dracut/modules.d/01systemd-coredump/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-hostnamed
+#usr/lib/dracut/modules.d/01systemd-hostnamed/99-systemd-networkd-dracut.conf
+#usr/lib/dracut/modules.d/01systemd-hostnamed/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-hostnamed/org.freedesktop.hostname1_dracut.conf
+#usr/lib/dracut/modules.d/01systemd-hostnamed/systemd-hostname-dracut.conf
+#usr/lib/dracut/modules.d/01systemd-initrd
+#usr/lib/dracut/modules.d/01systemd-initrd/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-integritysetup
+#usr/lib/dracut/modules.d/01systemd-integritysetup/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-journald
+#usr/lib/dracut/modules.d/01systemd-journald/initrd.conf
+#usr/lib/dracut/modules.d/01systemd-journald/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-ldconfig
+#usr/lib/dracut/modules.d/01systemd-ldconfig/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-modules-load
+#usr/lib/dracut/modules.d/01systemd-modules-load/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-networkd
+#usr/lib/dracut/modules.d/01systemd-networkd/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-repart
+#usr/lib/dracut/modules.d/01systemd-repart/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-resolved
+#usr/lib/dracut/modules.d/01systemd-resolved/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-resolved/resolved-tmpfile-dracut.conf
+#usr/lib/dracut/modules.d/01systemd-rfkill
+#usr/lib/dracut/modules.d/01systemd-rfkill/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-sysctl
+#usr/lib/dracut/modules.d/01systemd-sysctl/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-sysext
+#usr/lib/dracut/modules.d/01systemd-sysext/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-sysusers
+#usr/lib/dracut/modules.d/01systemd-sysusers/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-sysusers/sysusers-dracut.conf
+#usr/lib/dracut/modules.d/01systemd-timedated
+#usr/lib/dracut/modules.d/01systemd-timedated/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-timesyncd
+#usr/lib/dracut/modules.d/01systemd-timesyncd/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-timesyncd/timesyncd-tmpfile-dracut.conf
+#usr/lib/dracut/modules.d/01systemd-tmpfiles
+#usr/lib/dracut/modules.d/01systemd-tmpfiles/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-udevd
+#usr/lib/dracut/modules.d/01systemd-udevd/module-setup.sh
+#usr/lib/dracut/modules.d/01systemd-veritysetup
+#usr/lib/dracut/modules.d/01systemd-veritysetup/module-setup.sh
+usr/lib/dracut/modules.d/02caps
+usr/lib/dracut/modules.d/02caps/README
+usr/lib/dracut/modules.d/02caps/caps.sh
+usr/lib/dracut/modules.d/02caps/module-setup.sh
+usr/lib/dracut/modules.d/03modsign
+usr/lib/dracut/modules.d/03modsign/load-modsign-keys.sh
+usr/lib/dracut/modules.d/03modsign/module-setup.sh
+usr/lib/dracut/modules.d/03rescue
+usr/lib/dracut/modules.d/03rescue/module-setup.sh
#usr/lib/dracut/modules.d/04watchdog
+#usr/lib/dracut/modules.d/04watchdog-modules
+#usr/lib/dracut/modules.d/04watchdog-modules/module-setup.sh
#usr/lib/dracut/modules.d/04watchdog/module-setup.sh
#usr/lib/dracut/modules.d/04watchdog/watchdog-stop.sh
#usr/lib/dracut/modules.d/04watchdog/watchdog.sh
-#usr/lib/dracut/modules.d/10i18n
-#usr/lib/dracut/modules.d/10i18n/10-console.rules
-#usr/lib/dracut/modules.d/10i18n/README
-#usr/lib/dracut/modules.d/10i18n/console_init.sh
-#usr/lib/dracut/modules.d/10i18n/module-setup.sh
-#usr/lib/dracut/modules.d/10i18n/parse-i18n.sh
-#usr/lib/dracut/modules.d/50drm
-#usr/lib/dracut/modules.d/50drm/module-setup.sh
-#usr/lib/dracut/modules.d/90kernel-modules
-#usr/lib/dracut/modules.d/90kernel-modules/insmodpost.sh
-#usr/lib/dracut/modules.d/90kernel-modules/module-setup.sh
-#usr/lib/dracut/modules.d/90kernel-modules/parse-kernel.sh
-#usr/lib/dracut/modules.d/90mdraid
-#usr/lib/dracut/modules.d/90mdraid/59-persistent-storage-md.rules
-#usr/lib/dracut/modules.d/90mdraid/65-md-incremental-imsm.rules
-#usr/lib/dracut/modules.d/90mdraid/md-noddf.sh
-#usr/lib/dracut/modules.d/90mdraid/md-noimsm.sh
-#usr/lib/dracut/modules.d/90mdraid/md-shutdown.sh
-#usr/lib/dracut/modules.d/90mdraid/mdmon-pre-shutdown.sh
-#usr/lib/dracut/modules.d/90mdraid/mdmon-pre-udev.sh
-#usr/lib/dracut/modules.d/90mdraid/mdraid-cleanup.sh
-#usr/lib/dracut/modules.d/90mdraid/mdraid-needshutdown.sh
-#usr/lib/dracut/modules.d/90mdraid/mdraid-waitclean.sh
-#usr/lib/dracut/modules.d/90mdraid/mdraid_start.sh
-#usr/lib/dracut/modules.d/90mdraid/module-setup.sh
-#usr/lib/dracut/modules.d/90mdraid/parse-md.sh
+#usr/lib/dracut/modules.d/05busybox
+#usr/lib/dracut/modules.d/05busybox/module-setup.sh
+#usr/lib/dracut/modules.d/06dbus-broker
+#usr/lib/dracut/modules.d/06dbus-broker/module-setup.sh
+#usr/lib/dracut/modules.d/06dbus-daemon
+#usr/lib/dracut/modules.d/06dbus-daemon/module-setup.sh
+#usr/lib/dracut/modules.d/06rngd
+#usr/lib/dracut/modules.d/06rngd/module-setup.sh
+#usr/lib/dracut/modules.d/06rngd/rngd.service
+usr/lib/dracut/modules.d/09dbus
+usr/lib/dracut/modules.d/09dbus/module-setup.sh
+usr/lib/dracut/modules.d/10i18n
+usr/lib/dracut/modules.d/10i18n/10-console.rules
+usr/lib/dracut/modules.d/10i18n/README
+usr/lib/dracut/modules.d/10i18n/console_init.sh
+usr/lib/dracut/modules.d/10i18n/module-setup.sh
+usr/lib/dracut/modules.d/10i18n/parse-i18n.sh
+#usr/lib/dracut/modules.d/30convertfs
+#usr/lib/dracut/modules.d/30convertfs/convertfs.sh
+#usr/lib/dracut/modules.d/30convertfs/do-convertfs.sh
+#usr/lib/dracut/modules.d/30convertfs/module-setup.sh
+#usr/lib/dracut/modules.d/35network-legacy
+#usr/lib/dracut/modules.d/35network-legacy/dhclient-script.sh
+#usr/lib/dracut/modules.d/35network-legacy/dhclient.conf
+#usr/lib/dracut/modules.d/35network-legacy/dhcp-multi.sh
+#usr/lib/dracut/modules.d/35network-legacy/ifup.sh
+#usr/lib/dracut/modules.d/35network-legacy/kill-dhclient.sh
+#usr/lib/dracut/modules.d/35network-legacy/module-setup.sh
+#usr/lib/dracut/modules.d/35network-legacy/net-genrules.sh
+#usr/lib/dracut/modules.d/35network-legacy/parse-bond.sh
+#usr/lib/dracut/modules.d/35network-legacy/parse-bridge.sh
+#usr/lib/dracut/modules.d/35network-legacy/parse-ibft.sh
+#usr/lib/dracut/modules.d/35network-legacy/parse-ifname.sh
+#usr/lib/dracut/modules.d/35network-legacy/parse-ip-opts.sh
+#usr/lib/dracut/modules.d/35network-legacy/parse-team.sh
+#usr/lib/dracut/modules.d/35network-legacy/parse-vlan.sh
+#usr/lib/dracut/modules.d/35network-manager
+#usr/lib/dracut/modules.d/35network-manager/initrd-no-auto-default.conf
+#usr/lib/dracut/modules.d/35network-manager/module-setup.sh
+#usr/lib/dracut/modules.d/35network-manager/nm-config.sh
+#usr/lib/dracut/modules.d/35network-manager/nm-initrd.service
+#usr/lib/dracut/modules.d/35network-manager/nm-lib.sh
+#usr/lib/dracut/modules.d/35network-manager/nm-run.sh
+#usr/lib/dracut/modules.d/35network-manager/nm-wait-online-initrd.service
+#usr/lib/dracut/modules.d/35network-wicked
+#usr/lib/dracut/modules.d/35network-wicked/module-setup.sh
+#usr/lib/dracut/modules.d/35network-wicked/wicked-config.sh
+#usr/lib/dracut/modules.d/35network-wicked/wicked-run.sh
+#usr/lib/dracut/modules.d/40network
+#usr/lib/dracut/modules.d/40network/dhcp-root.sh
+#usr/lib/dracut/modules.d/40network/ifname-genrules.sh
+#usr/lib/dracut/modules.d/40network/module-setup.sh
+#usr/lib/dracut/modules.d/40network/net-lib.sh
+#usr/lib/dracut/modules.d/40network/netroot.sh
+#usr/lib/dracut/modules.d/45ifcfg
+#usr/lib/dracut/modules.d/45ifcfg/module-setup.sh
+#usr/lib/dracut/modules.d/45ifcfg/write-ifcfg.sh
+#usr/lib/dracut/modules.d/45url-lib
+#usr/lib/dracut/modules.d/45url-lib/module-setup.sh
+#usr/lib/dracut/modules.d/45url-lib/url-lib.sh
+usr/lib/dracut/modules.d/50drm
+usr/lib/dracut/modules.d/50drm/module-setup.sh
+#usr/lib/dracut/modules.d/50gensplash
+#usr/lib/dracut/modules.d/50gensplash/README
+#usr/lib/dracut/modules.d/50gensplash/gensplash-emergency.sh
+#usr/lib/dracut/modules.d/50gensplash/gensplash-newroot.sh
+#usr/lib/dracut/modules.d/50gensplash/gensplash-pretrigger.sh
+#usr/lib/dracut/modules.d/50gensplash/module-setup.sh
+#usr/lib/dracut/modules.d/50plymouth
+#usr/lib/dracut/modules.d/50plymouth/module-setup.sh
+#usr/lib/dracut/modules.d/50plymouth/plymouth-emergency.sh
+#usr/lib/dracut/modules.d/50plymouth/plymouth-newroot.sh
+#usr/lib/dracut/modules.d/50plymouth/plymouth-populate-initrd.sh
+#usr/lib/dracut/modules.d/50plymouth/plymouth-pretrigger.sh
+#usr/lib/dracut/modules.d/62bluetooth
+#usr/lib/dracut/modules.d/62bluetooth/module-setup.sh
+#usr/lib/dracut/modules.d/80cms
+#usr/lib/dracut/modules.d/80cms/cms-write-ifcfg.sh
+#usr/lib/dracut/modules.d/80cms/cmsifup.sh
+#usr/lib/dracut/modules.d/80cms/cmssetup.sh
+#usr/lib/dracut/modules.d/80cms/module-setup.sh
+#usr/lib/dracut/modules.d/80lvmmerge
+#usr/lib/dracut/modules.d/80lvmmerge/README.md
+#usr/lib/dracut/modules.d/80lvmmerge/lvmmerge.sh
+#usr/lib/dracut/modules.d/80lvmmerge/module-setup.sh
+#usr/lib/dracut/modules.d/81cio_ignore
+#usr/lib/dracut/modules.d/81cio_ignore/module-setup.sh
+#usr/lib/dracut/modules.d/81cio_ignore/parse-cio_accept.sh
+#usr/lib/dracut/modules.d/90btrfs
+#usr/lib/dracut/modules.d/90btrfs/80-btrfs.rules
+#usr/lib/dracut/modules.d/90btrfs/btrfs_device_ready.sh
+#usr/lib/dracut/modules.d/90btrfs/btrfs_finished.sh
+#usr/lib/dracut/modules.d/90btrfs/btrfs_timeout.sh
+#usr/lib/dracut/modules.d/90btrfs/module-setup.sh
+#usr/lib/dracut/modules.d/90crypt
+#usr/lib/dracut/modules.d/90crypt/crypt-cleanup.sh
+#usr/lib/dracut/modules.d/90crypt/crypt-lib.sh
+#usr/lib/dracut/modules.d/90crypt/crypt-run-generator.sh
+#usr/lib/dracut/modules.d/90crypt/cryptroot-ask.sh
+#usr/lib/dracut/modules.d/90crypt/module-setup.sh
+#usr/lib/dracut/modules.d/90crypt/parse-crypt.sh
+#usr/lib/dracut/modules.d/90crypt/parse-keydev.sh
+#usr/lib/dracut/modules.d/90crypt/probe-keydev.sh
+usr/lib/dracut/modules.d/90dm
+usr/lib/dracut/modules.d/90dm/11-dm.rules
+usr/lib/dracut/modules.d/90dm/59-persistent-storage-dm.rules
+usr/lib/dracut/modules.d/90dm/dm-pre-udev.sh
+usr/lib/dracut/modules.d/90dm/dm-shutdown.sh
+usr/lib/dracut/modules.d/90dm/module-setup.sh
+#usr/lib/dracut/modules.d/90dmraid
+#usr/lib/dracut/modules.d/90dmraid/61-dmraid-imsm.rules
+#usr/lib/dracut/modules.d/90dmraid/dmraid.sh
+#usr/lib/dracut/modules.d/90dmraid/module-setup.sh
+#usr/lib/dracut/modules.d/90dmraid/parse-dm.sh
+#usr/lib/dracut/modules.d/90dmsquash-live
+#usr/lib/dracut/modules.d/90dmsquash-live-ntfs
+#usr/lib/dracut/modules.d/90dmsquash-live-ntfs/module-setup.sh
+#usr/lib/dracut/modules.d/90dmsquash-live/apply-live-updates.sh
+#usr/lib/dracut/modules.d/90dmsquash-live/checkisomd5(a).service
+#usr/lib/dracut/modules.d/90dmsquash-live/dmsquash-generator.sh
+#usr/lib/dracut/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
+#usr/lib/dracut/modules.d/90dmsquash-live/dmsquash-live-root.sh
+#usr/lib/dracut/modules.d/90dmsquash-live/dmsquash-liveiso-genrules.sh
+#usr/lib/dracut/modules.d/90dmsquash-live/iso-scan.sh
+#usr/lib/dracut/modules.d/90dmsquash-live/module-setup.sh
+#usr/lib/dracut/modules.d/90dmsquash-live/parse-dmsquash-live.sh
+#usr/lib/dracut/modules.d/90dmsquash-live/parse-iso-scan.sh
+usr/lib/dracut/modules.d/90kernel-modules
+usr/lib/dracut/modules.d/90kernel-modules-extra
+usr/lib/dracut/modules.d/90kernel-modules-extra/module-setup.sh
+usr/lib/dracut/modules.d/90kernel-modules/insmodpost.sh
+usr/lib/dracut/modules.d/90kernel-modules/module-setup.sh
+usr/lib/dracut/modules.d/90kernel-modules/parse-kernel.sh
+#usr/lib/dracut/modules.d/90kernel-network-modules
+#usr/lib/dracut/modules.d/90kernel-network-modules/module-setup.sh
+#usr/lib/dracut/modules.d/90livenet
+#usr/lib/dracut/modules.d/90livenet/fetch-liveupdate.sh
+#usr/lib/dracut/modules.d/90livenet/livenet-generator.sh
+#usr/lib/dracut/modules.d/90livenet/livenetroot.sh
+#usr/lib/dracut/modules.d/90livenet/module-setup.sh
+#usr/lib/dracut/modules.d/90livenet/parse-livenet.sh
+usr/lib/dracut/modules.d/90lvm
+usr/lib/dracut/modules.d/90lvm/64-lvm.rules
+usr/lib/dracut/modules.d/90lvm/lvm_scan.sh
+usr/lib/dracut/modules.d/90lvm/module-setup.sh
+usr/lib/dracut/modules.d/90lvm/parse-lvm.sh
+usr/lib/dracut/modules.d/90mdraid
+usr/lib/dracut/modules.d/90mdraid/59-persistent-storage-md.rules
+usr/lib/dracut/modules.d/90mdraid/65-md-incremental-imsm.rules
+usr/lib/dracut/modules.d/90mdraid/md-shutdown.sh
+usr/lib/dracut/modules.d/90mdraid/mdmon-pre-shutdown.sh
+usr/lib/dracut/modules.d/90mdraid/mdmon-pre-udev.sh
+usr/lib/dracut/modules.d/90mdraid/mdraid-cleanup.sh
+usr/lib/dracut/modules.d/90mdraid/mdraid-needshutdown.sh
+usr/lib/dracut/modules.d/90mdraid/mdraid-waitclean.sh
+usr/lib/dracut/modules.d/90mdraid/mdraid_start.sh
+usr/lib/dracut/modules.d/90mdraid/module-setup.sh
+usr/lib/dracut/modules.d/90mdraid/parse-md.sh
+#usr/lib/dracut/modules.d/90multipath
+#usr/lib/dracut/modules.d/90multipath/module-setup.sh
+#usr/lib/dracut/modules.d/90multipath/multipath-shutdown.sh
+#usr/lib/dracut/modules.d/90multipath/multipathd-configure.service
+#usr/lib/dracut/modules.d/90multipath/multipathd-needshutdown.sh
+#usr/lib/dracut/modules.d/90multipath/multipathd-stop.sh
+#usr/lib/dracut/modules.d/90multipath/multipathd.service
+#usr/lib/dracut/modules.d/90multipath/multipathd.sh
+#usr/lib/dracut/modules.d/90nvdimm
+#usr/lib/dracut/modules.d/90nvdimm/module-setup.sh
+#usr/lib/dracut/modules.d/90ppcmac
+#usr/lib/dracut/modules.d/90ppcmac/load-thermal.sh
+#usr/lib/dracut/modules.d/90ppcmac/module-setup.sh
+usr/lib/dracut/modules.d/90qemu
+#usr/lib/dracut/modules.d/90qemu-net
+#usr/lib/dracut/modules.d/90qemu-net/module-setup.sh
+usr/lib/dracut/modules.d/90qemu/module-setup.sh
+#usr/lib/dracut/modules.d/91crypt-gpg
+#usr/lib/dracut/modules.d/91crypt-gpg/README
+#usr/lib/dracut/modules.d/91crypt-gpg/crypt-gpg-lib.sh
+#usr/lib/dracut/modules.d/91crypt-gpg/module-setup.sh
+#usr/lib/dracut/modules.d/91crypt-loop
+#usr/lib/dracut/modules.d/91crypt-loop/crypt-loop-lib.sh
+#usr/lib/dracut/modules.d/91crypt-loop/module-setup.sh
+#usr/lib/dracut/modules.d/91fido2
+#usr/lib/dracut/modules.d/91fido2/module-setup.sh
+#usr/lib/dracut/modules.d/91pcsc
+#usr/lib/dracut/modules.d/91pcsc/module-setup.sh
+#usr/lib/dracut/modules.d/91pcsc/pcscd.service
+#usr/lib/dracut/modules.d/91pcsc/pcscd.socket
+#usr/lib/dracut/modules.d/91pkcs11
+#usr/lib/dracut/modules.d/91pkcs11/module-setup.sh
+#usr/lib/dracut/modules.d/91tpm2-tss
+#usr/lib/dracut/modules.d/91tpm2-tss/module-setup.sh
+#usr/lib/dracut/modules.d/91zipl
+#usr/lib/dracut/modules.d/91zipl/install_zipl_cmdline.sh
+#usr/lib/dracut/modules.d/91zipl/module-setup.sh
+#usr/lib/dracut/modules.d/91zipl/parse-zipl.sh
+#usr/lib/dracut/modules.d/95cifs
+#usr/lib/dracut/modules.d/95cifs/cifs-lib.sh
+#usr/lib/dracut/modules.d/95cifs/cifsroot.sh
+#usr/lib/dracut/modules.d/95cifs/module-setup.sh
+#usr/lib/dracut/modules.d/95cifs/parse-cifsroot.sh
+#usr/lib/dracut/modules.d/95dasd
+#usr/lib/dracut/modules.d/95dasd/module-setup.sh
+#usr/lib/dracut/modules.d/95dasd/parse-dasd.sh
+#usr/lib/dracut/modules.d/95dasd_mod
+#usr/lib/dracut/modules.d/95dasd_mod/module-setup.sh
+#usr/lib/dracut/modules.d/95dasd_mod/parse-dasd-mod.sh
+#usr/lib/dracut/modules.d/95dasd_rules
+#usr/lib/dracut/modules.d/95dasd_rules/module-setup.sh
+#usr/lib/dracut/modules.d/95dasd_rules/parse-dasd.sh
+#usr/lib/dracut/modules.d/95dcssblk
+#usr/lib/dracut/modules.d/95dcssblk/module-setup.sh
+#usr/lib/dracut/modules.d/95dcssblk/parse-dcssblk.sh
#usr/lib/dracut/modules.d/95debug
#usr/lib/dracut/modules.d/95debug/module-setup.sh
+#usr/lib/dracut/modules.d/95fcoe
+#usr/lib/dracut/modules.d/95fcoe-uefi
+#usr/lib/dracut/modules.d/95fcoe-uefi/module-setup.sh
+#usr/lib/dracut/modules.d/95fcoe-uefi/parse-uefifcoe.sh
+#usr/lib/dracut/modules.d/95fcoe/cleanup-fcoe.sh
+#usr/lib/dracut/modules.d/95fcoe/fcoe-edd.sh
+#usr/lib/dracut/modules.d/95fcoe/fcoe-up.sh
+#usr/lib/dracut/modules.d/95fcoe/lldpad.sh
+#usr/lib/dracut/modules.d/95fcoe/module-setup.sh
+#usr/lib/dracut/modules.d/95fcoe/parse-fcoe.sh
+#usr/lib/dracut/modules.d/95fcoe/stop-fcoe.sh
#usr/lib/dracut/modules.d/95fstab-sys
#usr/lib/dracut/modules.d/95fstab-sys/module-setup.sh
#usr/lib/dracut/modules.d/95fstab-sys/mount-sys.sh
-#usr/lib/dracut/modules.d/95rootfs-block
-#usr/lib/dracut/modules.d/95rootfs-block/block-genrules.sh
-#usr/lib/dracut/modules.d/95rootfs-block/module-setup.sh
-#usr/lib/dracut/modules.d/95rootfs-block/mount-root.sh
-#usr/lib/dracut/modules.d/95rootfs-block/parse-block.sh
-#usr/lib/dracut/modules.d/95rootfs-block/rootfallback.sh
-#usr/lib/dracut/modules.d/95terminfo
-#usr/lib/dracut/modules.d/95terminfo/module-setup.sh
-#usr/lib/dracut/modules.d/95udev-rules
-#usr/lib/dracut/modules.d/95udev-rules/59-persistent-storage.rules
-#usr/lib/dracut/modules.d/95udev-rules/61-persistent-storage.rules
-#usr/lib/dracut/modules.d/95udev-rules/load-modules.sh
-#usr/lib/dracut/modules.d/95udev-rules/module-setup.sh
+#usr/lib/dracut/modules.d/95iscsi
+#usr/lib/dracut/modules.d/95iscsi/cleanup-iscsi.sh
+#usr/lib/dracut/modules.d/95iscsi/iscsiroot.sh
+#usr/lib/dracut/modules.d/95iscsi/module-setup.sh
+#usr/lib/dracut/modules.d/95iscsi/mount-lun.sh
+#usr/lib/dracut/modules.d/95iscsi/parse-iscsiroot.sh
+#usr/lib/dracut/modules.d/95lunmask
+#usr/lib/dracut/modules.d/95lunmask/fc_transport_scan_lun.sh
+#usr/lib/dracut/modules.d/95lunmask/module-setup.sh
+#usr/lib/dracut/modules.d/95lunmask/parse-lunmask.sh
+#usr/lib/dracut/modules.d/95lunmask/sas_transport_scan_lun.sh
+#usr/lib/dracut/modules.d/95nbd
+#usr/lib/dracut/modules.d/95nbd/module-setup.sh
+#usr/lib/dracut/modules.d/95nbd/nbd-generator.sh
+#usr/lib/dracut/modules.d/95nbd/nbdroot.sh
+#usr/lib/dracut/modules.d/95nbd/parse-nbdroot.sh
+#usr/lib/dracut/modules.d/95nfs
+#usr/lib/dracut/modules.d/95nfs/module-setup.sh
+#usr/lib/dracut/modules.d/95nfs/nfs-lib.sh
+#usr/lib/dracut/modules.d/95nfs/nfs-start-rpc.sh
+#usr/lib/dracut/modules.d/95nfs/nfsroot-cleanup.sh
+#usr/lib/dracut/modules.d/95nfs/nfsroot.sh
+#usr/lib/dracut/modules.d/95nfs/parse-nfsroot.sh
+#usr/lib/dracut/modules.d/95nvmf
+#usr/lib/dracut/modules.d/95nvmf/95-nvmf-initqueue.rules
+#usr/lib/dracut/modules.d/95nvmf/module-setup.sh
+#usr/lib/dracut/modules.d/95nvmf/nvmf-autoconnect.sh
+#usr/lib/dracut/modules.d/95nvmf/parse-nvmf-boot-connections.sh
+#usr/lib/dracut/modules.d/95qeth_rules
+#usr/lib/dracut/modules.d/95qeth_rules/module-setup.sh
+#usr/lib/dracut/modules.d/95resume
+#usr/lib/dracut/modules.d/95resume/module-setup.sh
+#usr/lib/dracut/modules.d/95resume/parse-resume.sh
+#usr/lib/dracut/modules.d/95resume/resume.sh
+usr/lib/dracut/modules.d/95rootfs-block
+usr/lib/dracut/modules.d/95rootfs-block/block-genrules.sh
+usr/lib/dracut/modules.d/95rootfs-block/module-setup.sh
+usr/lib/dracut/modules.d/95rootfs-block/mount-root.sh
+usr/lib/dracut/modules.d/95rootfs-block/parse-block.sh
+usr/lib/dracut/modules.d/95rootfs-block/rootfallback.sh
+#usr/lib/dracut/modules.d/95ssh-client
+#usr/lib/dracut/modules.d/95ssh-client/module-setup.sh
+usr/lib/dracut/modules.d/95terminfo
+usr/lib/dracut/modules.d/95terminfo/module-setup.sh
+usr/lib/dracut/modules.d/95udev-rules
+usr/lib/dracut/modules.d/95udev-rules/59-persistent-storage.rules
+usr/lib/dracut/modules.d/95udev-rules/61-persistent-storage.rules
+usr/lib/dracut/modules.d/95udev-rules/load-modules.sh
+usr/lib/dracut/modules.d/95udev-rules/module-setup.sh
#usr/lib/dracut/modules.d/95virtfs
#usr/lib/dracut/modules.d/95virtfs/module-setup.sh
#usr/lib/dracut/modules.d/95virtfs/mount-virtfs.sh
#usr/lib/dracut/modules.d/95virtfs/parse-virtfs.sh
+#usr/lib/dracut/modules.d/95zfcp
+#usr/lib/dracut/modules.d/95zfcp/module-setup.sh
+#usr/lib/dracut/modules.d/95zfcp/parse-zfcp.sh
+#usr/lib/dracut/modules.d/95zfcp_rules
+#usr/lib/dracut/modules.d/95zfcp_rules/module-setup.sh
+#usr/lib/dracut/modules.d/95zfcp_rules/parse-zfcp.sh
+#usr/lib/dracut/modules.d/95znet
+#usr/lib/dracut/modules.d/95znet/module-setup.sh
+#usr/lib/dracut/modules.d/95znet/parse-ccw.sh
+#usr/lib/dracut/modules.d/96securityfs
+#usr/lib/dracut/modules.d/96securityfs/module-setup.sh
+#usr/lib/dracut/modules.d/96securityfs/securityfs.sh
+#usr/lib/dracut/modules.d/97biosdevname
+#usr/lib/dracut/modules.d/97biosdevname/module-setup.sh
+#usr/lib/dracut/modules.d/97biosdevname/parse-biosdevname.sh
+#usr/lib/dracut/modules.d/97masterkey
+#usr/lib/dracut/modules.d/97masterkey/README
+#usr/lib/dracut/modules.d/97masterkey/masterkey.sh
+#usr/lib/dracut/modules.d/97masterkey/module-setup.sh
+#usr/lib/dracut/modules.d/98dracut-systemd
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline-ask.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline-ask.sh
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline.service.8
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline.service.8.asc
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline.sh
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-emergency.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-emergency.sh
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-initqueue.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-initqueue.service.8
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-initqueue.service.8.asc
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-initqueue.sh
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-mount.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-mount.service.8
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-mount.service.8.asc
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-mount.sh
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.service.8
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.service.8.asc
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.sh
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-pivot.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-pivot.service.8
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-pivot.service.8.asc
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-pivot.sh
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-trigger.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-trigger.service.8
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-trigger.service.8.asc
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-trigger.sh
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.service.8
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.service.8.asc
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.sh
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown-onfailure.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service.8
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service.8.asc
+#usr/lib/dracut/modules.d/98dracut-systemd/dracut-tmpfiles.conf
+#usr/lib/dracut/modules.d/98dracut-systemd/emergency.service
+#usr/lib/dracut/modules.d/98dracut-systemd/module-setup.sh
+#usr/lib/dracut/modules.d/98dracut-systemd/rootfs-generator.sh
+#usr/lib/dracut/modules.d/98ecryptfs
+#usr/lib/dracut/modules.d/98ecryptfs/README
+#usr/lib/dracut/modules.d/98ecryptfs/ecryptfs-mount.sh
+#usr/lib/dracut/modules.d/98ecryptfs/module-setup.sh
#usr/lib/dracut/modules.d/98integrity
#usr/lib/dracut/modules.d/98integrity/README
#usr/lib/dracut/modules.d/98integrity/evm-enable.sh
+#usr/lib/dracut/modules.d/98integrity/ima-keys-load.sh
#usr/lib/dracut/modules.d/98integrity/ima-policy-load.sh
#usr/lib/dracut/modules.d/98integrity/module-setup.sh
#usr/lib/dracut/modules.d/98pollcdrom
#usr/lib/dracut/modules.d/98pollcdrom/module-setup.sh
#usr/lib/dracut/modules.d/98pollcdrom/pollcdrom.sh
+#usr/lib/dracut/modules.d/98selinux
+#usr/lib/dracut/modules.d/98selinux/module-setup.sh
+#usr/lib/dracut/modules.d/98selinux/selinux-loadpolicy.sh
#usr/lib/dracut/modules.d/98syslog
#usr/lib/dracut/modules.d/98syslog/README
#usr/lib/dracut/modules.d/98syslog/module-setup.sh
@@ -89,25 +467,39 @@ usr/lib/dracut
#usr/lib/dracut/modules.d/98syslog/rsyslogd-start.sh
#usr/lib/dracut/modules.d/98syslog/rsyslogd-stop.sh
#usr/lib/dracut/modules.d/98syslog/syslog-cleanup.sh
-#usr/lib/dracut/modules.d/98syslog/syslog-genrules.sh
-#usr/lib/dracut/modules.d/99base
-#usr/lib/dracut/modules.d/99base/dracut-lib.sh
-#usr/lib/dracut/modules.d/99base/init.sh
-#usr/lib/dracut/modules.d/99base/initqueue.sh
-#usr/lib/dracut/modules.d/99base/loginit.sh
-#usr/lib/dracut/modules.d/99base/module-setup.sh
-#usr/lib/dracut/modules.d/99base/parse-root-opts.sh
-#usr/lib/dracut/modules.d/99base/rdsosreport.sh
-#usr/lib/dracut/modules.d/99fs-lib
-#usr/lib/dracut/modules.d/99fs-lib/fs-lib.sh
-#usr/lib/dracut/modules.d/99fs-lib/module-setup.sh
+#usr/lib/dracut/modules.d/98usrmount
+#usr/lib/dracut/modules.d/98usrmount/module-setup.sh
+#usr/lib/dracut/modules.d/98usrmount/mount-usr.sh
+usr/lib/dracut/modules.d/99base
+usr/lib/dracut/modules.d/99base/dracut-dev-lib.sh
+usr/lib/dracut/modules.d/99base/dracut-lib.sh
+usr/lib/dracut/modules.d/99base/init.sh
+usr/lib/dracut/modules.d/99base/initqueue.sh
+usr/lib/dracut/modules.d/99base/loginit.sh
+usr/lib/dracut/modules.d/99base/module-setup.sh
+usr/lib/dracut/modules.d/99base/parse-root-opts.sh
+usr/lib/dracut/modules.d/99base/rdsosreport.sh
+usr/lib/dracut/modules.d/99fs-lib
+usr/lib/dracut/modules.d/99fs-lib/fs-lib.sh
+usr/lib/dracut/modules.d/99fs-lib/module-setup.sh
#usr/lib/dracut/modules.d/99img-lib
#usr/lib/dracut/modules.d/99img-lib/img-lib.sh
#usr/lib/dracut/modules.d/99img-lib/module-setup.sh
+#usr/lib/dracut/modules.d/99memstrack
+#usr/lib/dracut/modules.d/99memstrack/memstrack-report.sh
+#usr/lib/dracut/modules.d/99memstrack/memstrack-start.sh
+#usr/lib/dracut/modules.d/99memstrack/memstrack.service
+#usr/lib/dracut/modules.d/99memstrack/module-setup.sh
#usr/lib/dracut/modules.d/99shutdown
#usr/lib/dracut/modules.d/99shutdown/module-setup.sh
#usr/lib/dracut/modules.d/99shutdown/shutdown.sh
-#usr/lib/dracut/skipcpio
+#usr/lib/dracut/modules.d/99squash
+#usr/lib/dracut/modules.d/99squash/init-squash.sh
+#usr/lib/dracut/modules.d/99squash/module-setup.sh
+#usr/lib/dracut/modules.d/99uefi-lib
+#usr/lib/dracut/modules.d/99uefi-lib/module-setup.sh
+#usr/lib/dracut/modules.d/99uefi-lib/uefi-lib.sh
+usr/lib/dracut/skipcpio
#usr/lib/kernel
#usr/lib/kernel/install.d
#usr/lib/kernel/install.d/50-dracut.install
@@ -130,5 +522,4 @@ usr/lib/dracut
#usr/share/man/man8/dracut-pre-udev.service.8
#usr/share/man/man8/dracut-shutdown.service.8
#usr/share/man/man8/dracut.8
-#usr/share/man/man8/mkinitrd-suse.8
-#usr/share/man/man8/mkinitrd.8
+#usr/share/pkgconfig/dracut.pc
diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
index 3aa15bf91..70e6c6e75 100644
--- a/config/rootfiles/common/x86_64/stage2
+++ b/config/rootfiles/common/x86_64/stage2
@@ -100,7 +100,6 @@ usr/local/bin/ipsec-interfaces
usr/local/bin/makegraphs
usr/local/bin/qosd
usr/local/bin/readhash
-usr/local/bin/rebuild-initrd
usr/local/bin/run-parts
usr/local/bin/scanhd
usr/local/bin/settime
diff --git a/config/rootfiles/core/166/filelists/dracut b/config/rootfiles/core/166/filelists/dracut
new file mode 120000
index 000000000..160869946
--- /dev/null
+++ b/config/rootfiles/core/166/filelists/dracut
@@ -0,0 +1 @@
+../../../common/dracut
\ No newline at end of file
diff --git a/config/rootfiles/core/166/filelists/files b/config/rootfiles/core/166/filelists/files
new file mode 100644
index 000000000..549d2fbcd
--- /dev/null
+++ b/config/rootfiles/core/166/filelists/files
@@ -0,0 +1,3 @@
+etc/rc.d/init.d/firewall
+srv/web/ipfire/cgi-bin/ids.cgi
+usr/lib/firewall/rules.pl
diff --git a/config/rootfiles/core/166/update.sh b/config/rootfiles/core/166/update.sh
index ec0b61b41..ab31ee4f9 100644
--- a/config/rootfiles/core/166/update.sh
+++ b/config/rootfiles/core/166/update.sh
@@ -32,6 +32,11 @@ for (( i=1; i<=$core; i++ )); do
done
# Remove files
+rm -vf \
+ /etc/dracut.conf \
+ /usr/bin/mkinitrd \
+ /usr/lib/dracut \
+ /usr/local/bin/rebuild-initrd
# Stop services
@@ -47,6 +52,9 @@ ldconfig
# Filesytem cleanup
/usr/local/bin/filesystem-cleanup
+# Regenerate all initrds
+dracut --regenerate-all --force
+
# Start services
/etc/init.d/sshd restart
diff --git a/config/suricata/ruleset-sources b/config/suricata/ruleset-sources
index 58ab91aab..1d2c6e98b 100644
--- a/config/suricata/ruleset-sources
+++ b/config/suricata/ruleset-sources
@@ -78,7 +78,7 @@ our %Providers = (
},
# Etnetera Aggressive Blacklist.
- etnetera_aggresive => {
+ etnetera_aggressive => {
summary => "Etnetera Aggressive Blacklist Rules",
website => "https://security.etnetera.cz/",
tr_string => "etnetera aggressive blacklist rules",
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 722715667..76c2b99a9 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -619,7 +619,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
# Convert interface name into upper case.
my $zone_upper = uc($zone);
- # Check if the IDS is enabled for this interaces.
+ # Check if the IDS is enabled for these interfaces.
if ($cgiparams{"ENABLE_IDS_$zone_upper"}) {
# Increase count.
$monitored_zones++;
@@ -1247,7 +1247,7 @@ print <<END;
<td class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'ids provider'}</b></td>
<td class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'date'}</b></td>
<td class='base' bgcolor='$color{'color20'}' align='center'><b>$Lang::tr{'ids autoupdates'}</b></td>
- <td class='base' bgcolor='$color{'color20'}'></td>
+ <td class='base' bgcolor='$color{'color20'}' align='center'><b>$Lang::tr{'action'}</b></td>
<td class='base' colspan='3' bgcolor='$color{'color20'}'></td>
</tr>
END
diff --git a/lfs/cdrom b/lfs/cdrom
index 18c63c79b..35fe7ebe7 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -181,7 +181,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(HAS_KERNEL)" "1"
cp /boot/vmlinuz-$(KVER)-ipfire $(DIR_TMP)/cdrom/boot/isolinux/vmlinuz
- dracut --force --early-microcode -a "installer" --strip --xz $(DIR_TMP)/cdrom/boot/isolinux/instroot $(KVER)-ipfire
+ dracut --force -a "installer" --strip $(DIR_TMP)/cdrom/boot/isolinux/instroot $(KVER)-ipfire
endif
ifeq "$(HAS_ISOLINUX)" "1"
diff --git a/lfs/dracut b/lfs/dracut
index c4f7231b1..426869d20 100644
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 038
+VER = 056
THISAPP = dracut-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4487bd98000cc536c5c3839a2f112831
+$(DL_FILE)_MD5 = 17d51f3ccc3a3a790bab6da0355ca4c2
install : $(TARGET)
@@ -70,15 +70,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-038-always-enable-mdraid.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-038_add_hyperv-keyboard_and_sdhci-pci.patch
-
+ cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install sbindir=/sbin sysconfdir=/etc
- rm -rf /usr/lib/dracut/modules.d/*{biosdevname,bootchart,dash,fips*,modsign,busybox,convertfs,network,ifcfg,url-lib,gensplash,cms,plymouth,btrfs,crypt*,dm,dmraid,dmsquash-live,livenet,lvm,multipath,qemu*,cifs,dasd*,fcoe*,iscsi,nbd,nfs,resume,ssh-client,zfcp*,systemd*,znet,securityfs,masterkey,selinux,usrmount,uefi-lib}
-
- cp -vf $(DIR_SRC)/config/dracut/dracut.conf /etc/dracut.conf
+ cp -vf $(DIR_SRC)/config/dracut/ipfire.conf \
+ /usr/lib/dracut/dracut.conf.d/ipfire.conf
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/linux-initrd b/lfs/linux-initrd
index 64e08fa81..a8cd393f1 100644
--- a/lfs/linux-initrd
+++ b/lfs/linux-initrd
@@ -58,7 +58,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
depmod -a $(KVER)-$(VERSUFIX)
# Create initramfs images
- dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
+ dracut --force --verbose --strip /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
ifeq "$(BUILD_ARCH)" "armv6l"
cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
diff --git a/make.sh b/make.sh
index fda7ca1c4..85f0b274b 100755
--- a/make.sh
+++ b/make.sh
@@ -1095,6 +1095,8 @@ buildbase() {
lfsmake2 libxcrypt
lfsmake2 file
lfsmake2 gcc
+ lfsmake2 attr
+ lfsmake2 acl
lfsmake2 sed
lfsmake2 berkeley
lfsmake2 coreutils
@@ -1110,8 +1112,6 @@ buildbase() {
lfsmake2 pcre
lfsmake2 pcre2
lfsmake2 gettext
- lfsmake2 attr
- lfsmake2 acl
lfsmake2 bash
lfsmake2 diffutils
lfsmake2 ed
diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall
index 2c4d3163b..2a70feac2 100644
--- a/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@ -262,10 +262,13 @@ iptables_init() {
# Chains for networks known as being hostile, posing a technical threat to our users
# (i. e. listed at Spamhaus DROP et al.)
iptables -N HOSTILE
- iptables -A INPUT -i $IFACE -j HOSTILE
- iptables -A FORWARD -i $IFACE -j HOSTILE
- iptables -A FORWARD -o $IFACE -j HOSTILE
- iptables -A OUTPUT -o $IFACE -j HOSTILE
+ iptables -A INPUT -j HOSTILE
+ iptables -A FORWARD -j HOSTILE
+ iptables -A OUTPUT -j HOSTILE
+
+ iptables -N HOSTILE_DROP
+ iptables -A HOSTILE_DROP -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE "
+ iptables -A HOSTILE_DROP -j DROP -m comment --comment "DROP_HOSTILE"
# Tor (inbound)
iptables -N TOR_INPUT
diff --git a/src/patches/dracut-038-always-enable-mdraid.patch b/src/patches/dracut-038-always-enable-mdraid.patch
deleted file mode 100644
index a65e59a8a..000000000
--- a/src/patches/dracut-038-always-enable-mdraid.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/modules.d/90mdraid/parse-md.sh b/modules.d/90mdraid/parse-md.sh
-index dd7bda2..7bc944c 100755
---- a/modules.d/90mdraid/parse-md.sh
-+++ b/modules.d/90mdraid/parse-md.sh
-@@ -4,32 +4,26 @@
-
- MD_UUID=$(getargs rd.md.uuid -d rd_MD_UUID=)
-
--if ( ! [ -n "$MD_UUID" ] && ! getargbool 0 rd.auto ) || ! getargbool 1 rd.md -d -n rd_NO_MD; then
-- info "rd.md=0: removing MD RAID activation"
-- udevproperty rd_NO_MD=1
--else
-- # rewrite the md rules to only process the specified raid array
-- if [ -n "$MD_UUID" ]; then
-- for f in /etc/udev/rules.d/65-md-incremental*.rules; do
-- [ -e "$f" ] || continue
-- while read line; do
-- if [ "${line%%UUID CHECK}" != "$line" ]; then
-- printf 'IMPORT{program}="/sbin/mdadm --examine --export $tempnode"\n'
-- for uuid in $MD_UUID; do
-- printf 'ENV{MD_UUID}=="%s", GOTO="md_uuid_ok"\n' $uuid
-- done;
-- printf 'GOTO="md_end"\n'
-- printf 'LABEL="md_uuid_ok"\n'
-- else
-- echo "$line"
-- fi
-- done < "${f}" > "${f}.new"
-- mv "${f}.new" "$f"
-- done
-- fi
-+# rewrite the md rules to only process the specified raid array
-+if [ -n "$MD_UUID" ]; then
-+ for f in /etc/udev/rules.d/65-md-incremental*.rules; do
-+ [ -e "$f" ] || continue
-+ while read line; do
-+ if [ "${line%%UUID CHECK}" != "$line" ]; then
-+ printf 'IMPORT{program}="/sbin/mdadm --examine --export $tempnode"\n'
-+ for uuid in $MD_UUID; do
-+ printf 'ENV{MD_UUID}=="%s", GOTO="md_uuid_ok"\n' $uuid
-+ done;
-+ printf 'GOTO="md_end"\n'
-+ printf 'LABEL="md_uuid_ok"\n'
-+ else
-+ echo "$line"
-+ fi
-+ done < "${f}" > "${f}.new"
-+ mv "${f}.new" "$f"
-+ done
- fi
-
--
- if [ -e /etc/mdadm.conf ] && getargbool 1 rd.md.conf -d -n rd_NO_MDADMCONF; then
- udevproperty rd_MDADMCONF=1
- rm -f -- $hookdir/pre-pivot/*mdraid-cleanup.sh
diff --git a/src/patches/dracut-038_add_hyperv-keyboard_and_sdhci-pci.patch b/src/patches/dracut-038_add_hyperv-keyboard_and_sdhci-pci.patch
deleted file mode 100644
index 19ed15fd3..000000000
--- a/src/patches/dracut-038_add_hyperv-keyboard_and_sdhci-pci.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur dracut-038.org/modules.d/90kernel-modules/module-setup.sh dracut-038/modules.d/90kernel-modules/module-setup.sh
---- dracut-038.org/modules.d/90kernel-modules/module-setup.sh 2014-06-30 12:03:12.000000000 +0200
-+++ dracut-038/modules.d/90kernel-modules/module-setup.sh 2015-05-05 14:58:56.820197839 +0200
-@@ -47,7 +47,7 @@
- atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \
- hid-logitech-dj hid-microsoft firewire-ohci \
- pcmcia usb_storage nvme hid-hyperv hv-vmbus \
-- sdhci_acpi
-+ hyperv-keyboard sdhci_acpi sdhci_pci
-
- if [[ "$(uname -p)" == arm* ]]; then
- # arm specific modules
diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd
deleted file mode 100644
index 51265650a..000000000
--- a/src/scripts/rebuild-initrd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-KVER=`uname -r`
-
-dracut --force --early-microcode --xz /boot/initramfs-$KVER.img $KVER
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-03-14 15:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-14 15:25 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f5c9297fd7d562291280f74f364d6ef01267ab0b Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox