diff --git a/config/rootfiles/common/dracut-ng b/config/rootfiles/common/dracut similarity index 90% rename from config/rootfiles/common/dracut-ng rename to config/rootfiles/common/dracut index b1760a614..baf55652a 100644 --- a/config/rootfiles/common/dracut-ng +++ b/config/rootfiles/common/dracut @@ -6,12 +6,10 @@ usr/bin/lsinitrd #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/01-ipfire.conf #usr/lib/dracut/modules.d @@ -51,8 +49,6 @@ usr/lib/dracut/modules.d/10warpclock/warpclock.sh #usr/lib/dracut/modules.d/11systemd-coredump/module-setup.sh #usr/lib/dracut/modules.d/11systemd-creds #usr/lib/dracut/modules.d/11systemd-creds/module-setup.sh -#usr/lib/dracut/modules.d/11systemd-cryptsetup -#usr/lib/dracut/modules.d/11systemd-cryptsetup/module-setup.sh #usr/lib/dracut/modules.d/11systemd-hostnamed #usr/lib/dracut/modules.d/11systemd-hostnamed/99-systemd-networkd-dracut.conf #usr/lib/dracut/modules.d/11systemd-hostnamed/module-setup.sh @@ -70,13 +66,13 @@ usr/lib/dracut/modules.d/10warpclock/warpclock.sh #usr/lib/dracut/modules.d/11systemd-modules-load #usr/lib/dracut/modules.d/11systemd-modules-load/module-setup.sh #usr/lib/dracut/modules.d/11systemd-networkd -#usr/lib/dracut/modules.d/11systemd-networkd/99-default.network #usr/lib/dracut/modules.d/11systemd-networkd/99-wait-online-dracut.conf +#usr/lib/dracut/modules.d/11systemd-networkd/dracut-default.network #usr/lib/dracut/modules.d/11systemd-networkd/module-setup.sh #usr/lib/dracut/modules.d/11systemd-networkd/networkd-config.sh #usr/lib/dracut/modules.d/11systemd-networkd/networkd-run.sh -#usr/lib/dracut/modules.d/11systemd-pcrphase -#usr/lib/dracut/modules.d/11systemd-pcrphase/module-setup.sh +#usr/lib/dracut/modules.d/11systemd-pcrextend +#usr/lib/dracut/modules.d/11systemd-pcrextend/module-setup.sh #usr/lib/dracut/modules.d/11systemd-portabled #usr/lib/dracut/modules.d/11systemd-portabled/module-setup.sh #usr/lib/dracut/modules.d/11systemd-pstore @@ -90,6 +86,9 @@ usr/lib/dracut/modules.d/10warpclock/warpclock.sh #usr/lib/dracut/modules.d/11systemd-sysctl/module-setup.sh #usr/lib/dracut/modules.d/11systemd-sysext #usr/lib/dracut/modules.d/11systemd-sysext/module-setup.sh +#usr/lib/dracut/modules.d/11systemd-sysusers-service +#usr/lib/dracut/modules.d/11systemd-sysusers-service/module-setup.sh +#usr/lib/dracut/modules.d/11systemd-sysusers-service/sysusers-dracut.conf #usr/lib/dracut/modules.d/11systemd-timedated #usr/lib/dracut/modules.d/11systemd-timedated/module-setup.sh #usr/lib/dracut/modules.d/11systemd-timesyncd @@ -142,21 +141,6 @@ usr/lib/dracut/modules.d/20i18n/parse-i18n.sh #usr/lib/dracut/modules.d/35connman/cm-run.sh #usr/lib/dracut/modules.d/35connman/cm-wait-online-initrd.service #usr/lib/dracut/modules.d/35connman/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/NetworkManager-config-initrd-dracut.conf #usr/lib/dracut/modules.d/35network-manager/NetworkManager-wait-online-initrd-dracut.conf @@ -181,18 +165,16 @@ usr/lib/dracut/modules.d/45drm/module-setup.sh #usr/lib/dracut/modules.d/45plymouth/module-setup.sh #usr/lib/dracut/modules.d/45plymouth/plymouth-emergency.sh #usr/lib/dracut/modules.d/45plymouth/plymouth-newroot.sh -#usr/lib/dracut/modules.d/45plymouth/plymouth-populate-initrd.sh #usr/lib/dracut/modules.d/45plymouth/plymouth-pretrigger.sh #usr/lib/dracut/modules.d/45simpledrm #usr/lib/dracut/modules.d/45simpledrm/module-setup.sh +#usr/lib/dracut/modules.d/45systemd-import +#usr/lib/dracut/modules.d/45systemd-import/dracut-remount-sysroot.service +#usr/lib/dracut/modules.d/45systemd-import/module-setup.sh +#usr/lib/dracut/modules.d/45systemd-import/parse-systemd-import.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/68cms -#usr/lib/dracut/modules.d/68cms/cms-write-ifcfg.sh -#usr/lib/dracut/modules.d/68cms/cmsifup.sh -#usr/lib/dracut/modules.d/68cms/cmssetup.sh -#usr/lib/dracut/modules.d/68cms/module-setup.sh #usr/lib/dracut/modules.d/68lvmmerge #usr/lib/dracut/modules.d/68lvmmerge/README.md #usr/lib/dracut/modules.d/68lvmmerge/lvmmerge.sh @@ -201,11 +183,6 @@ usr/lib/dracut/modules.d/45drm/module-setup.sh #usr/lib/dracut/modules.d/68lvmthinpool-monitor/module-setup.sh #usr/lib/dracut/modules.d/68lvmthinpool-monitor/start-thinpool-monitor.service #usr/lib/dracut/modules.d/68lvmthinpool-monitor/start-thinpool-monitor.sh -#usr/lib/dracut/modules.d/68systemd-sysusers -#usr/lib/dracut/modules.d/68systemd-sysusers/module-setup.sh -#usr/lib/dracut/modules.d/69cio_ignore -#usr/lib/dracut/modules.d/69cio_ignore/module-setup.sh -#usr/lib/dracut/modules.d/69cio_ignore/parse-cio_accept.sh #usr/lib/dracut/modules.d/70bluetooth #usr/lib/dracut/modules.d/70bluetooth/module-setup.sh usr/lib/dracut/modules.d/70btrfs @@ -215,14 +192,19 @@ usr/lib/dracut/modules.d/70btrfs/btrfs_finished.sh usr/lib/dracut/modules.d/70btrfs/btrfs_timeout.sh usr/lib/dracut/modules.d/70btrfs/module-setup.sh #usr/lib/dracut/modules.d/70crypt +#usr/lib/dracut/modules.d/70crypt-lib +#usr/lib/dracut/modules.d/70crypt-lib/crypt-lib.sh +#usr/lib/dracut/modules.d/70crypt-lib/module-setup.sh #usr/lib/dracut/modules.d/70crypt/crypt-cleanup.sh -#usr/lib/dracut/modules.d/70crypt/crypt-lib.sh +#usr/lib/dracut/modules.d/70crypt/crypt-generator.sh #usr/lib/dracut/modules.d/70crypt/crypt-run-generator.sh #usr/lib/dracut/modules.d/70crypt/cryptroot-ask.sh #usr/lib/dracut/modules.d/70crypt/module-setup.sh #usr/lib/dracut/modules.d/70crypt/parse-crypt.sh #usr/lib/dracut/modules.d/70crypt/parse-keydev.sh #usr/lib/dracut/modules.d/70crypt/probe-keydev.sh +#usr/lib/dracut/modules.d/70devicetree-firmware +#usr/lib/dracut/modules.d/70devicetree-firmware/module-setup.sh usr/lib/dracut/modules.d/70dm usr/lib/dracut/modules.d/70dm/11-dm.rules usr/lib/dracut/modules.d/70dm/dm-pre-udev.sh @@ -258,6 +240,9 @@ usr/lib/dracut/modules.d/70fs-lib/module-setup.sh #usr/lib/dracut/modules.d/70img-lib/img-lib.sh #usr/lib/dracut/modules.d/70img-lib/module-setup.sh usr/lib/dracut/modules.d/70kernel-modules +usr/lib/dracut/modules.d/70kernel-modules-export +usr/lib/dracut/modules.d/70kernel-modules-export/module-setup.sh +usr/lib/dracut/modules.d/70kernel-modules-export/modules-export.sh usr/lib/dracut/modules.d/70kernel-modules-extra usr/lib/dracut/modules.d/70kernel-modules-extra/module-setup.sh usr/lib/dracut/modules.d/70kernel-modules/module-setup.sh @@ -286,6 +271,9 @@ usr/lib/dracut/modules.d/70mdraid/mdraid-waitclean.sh usr/lib/dracut/modules.d/70mdraid/mdraid_start.sh usr/lib/dracut/modules.d/70mdraid/module-setup.sh usr/lib/dracut/modules.d/70mdraid/parse-md.sh +#usr/lib/dracut/modules.d/70memdisk +#usr/lib/dracut/modules.d/70memdisk/memdisk.sh +#usr/lib/dracut/modules.d/70memdisk/module-setup.sh #usr/lib/dracut/modules.d/70multipath #usr/lib/dracut/modules.d/70multipath/module-setup.sh #usr/lib/dracut/modules.d/70multipath/multipath-shutdown.sh @@ -302,12 +290,16 @@ usr/lib/dracut/modules.d/70mdraid/parse-md.sh #usr/lib/dracut/modules.d/70overlayfs #usr/lib/dracut/modules.d/70overlayfs/module-setup.sh #usr/lib/dracut/modules.d/70overlayfs/mount-overlayfs.sh +#usr/lib/dracut/modules.d/70overlayfs/overlayfs-lib.sh #usr/lib/dracut/modules.d/70overlayfs/prepare-overlayfs.sh #usr/lib/dracut/modules.d/70pcmcia #usr/lib/dracut/modules.d/70pcmcia/module-setup.sh #usr/lib/dracut/modules.d/70ppcmac #usr/lib/dracut/modules.d/70ppcmac/load-thermal.sh #usr/lib/dracut/modules.d/70ppcmac/module-setup.sh +#usr/lib/dracut/modules.d/70qcom-adsp +#usr/lib/dracut/modules.d/70qcom-adsp/module-setup.sh +#usr/lib/dracut/modules.d/70qcom-adsp/qcom-adsp-pre-udev.sh usr/lib/dracut/modules.d/70qemu #usr/lib/dracut/modules.d/70qemu-net #usr/lib/dracut/modules.d/70qemu-net/module-setup.sh @@ -315,6 +307,12 @@ usr/lib/dracut/modules.d/70qemu/module-setup.sh #usr/lib/dracut/modules.d/70uefi-lib #usr/lib/dracut/modules.d/70uefi-lib/module-setup.sh #usr/lib/dracut/modules.d/70uefi-lib/uefi-lib.sh +#usr/lib/dracut/modules.d/71overlayfs-crypt +#usr/lib/dracut/modules.d/71overlayfs-crypt/module-setup.sh +#usr/lib/dracut/modules.d/71overlayfs-crypt/overlayfs-crypt-lib.sh +#usr/lib/dracut/modules.d/71overlayfs-crypt/prepare-overlayfs-crypt.sh +#usr/lib/dracut/modules.d/71systemd-cryptsetup +#usr/lib/dracut/modules.d/71systemd-cryptsetup/module-setup.sh #usr/lib/dracut/modules.d/73crypt-gpg #usr/lib/dracut/modules.d/73crypt-gpg/README #usr/lib/dracut/modules.d/73crypt-gpg/crypt-gpg-lib.sh @@ -332,23 +330,18 @@ usr/lib/dracut/modules.d/70qemu/module-setup.sh #usr/lib/dracut/modules.d/73pkcs11/module-setup.sh #usr/lib/dracut/modules.d/73tpm2-tss #usr/lib/dracut/modules.d/73tpm2-tss/module-setup.sh -#usr/lib/dracut/modules.d/73zipl -#usr/lib/dracut/modules.d/73zipl/install_zipl_cmdline.sh -#usr/lib/dracut/modules.d/73zipl/module-setup.sh -#usr/lib/dracut/modules.d/73zipl/parse-zipl.sh +#usr/lib/dracut/modules.d/74chrony +#usr/lib/dracut/modules.d/74chrony/chrony-ntp-source.sh +#usr/lib/dracut/modules.d/74chrony/chrony-wait.service +#usr/lib/dracut/modules.d/74chrony/chrony.conf +#usr/lib/dracut/modules.d/74chrony/chronyd.service +#usr/lib/dracut/modules.d/74chrony/module-setup.sh +#usr/lib/dracut/modules.d/74chrony/parse-ntp.sh #usr/lib/dracut/modules.d/74cifs #usr/lib/dracut/modules.d/74cifs/cifs-lib.sh #usr/lib/dracut/modules.d/74cifs/cifsroot.sh #usr/lib/dracut/modules.d/74cifs/module-setup.sh #usr/lib/dracut/modules.d/74cifs/parse-cifsroot.sh -#usr/lib/dracut/modules.d/74dasd -#usr/lib/dracut/modules.d/74dasd/module-setup.sh -#usr/lib/dracut/modules.d/74dasd_mod -#usr/lib/dracut/modules.d/74dasd_mod/module-setup.sh -#usr/lib/dracut/modules.d/74dasd_mod/parse-dasd-mod.sh -#usr/lib/dracut/modules.d/74dcssblk -#usr/lib/dracut/modules.d/74dcssblk/module-setup.sh -#usr/lib/dracut/modules.d/74dcssblk/parse-dcssblk.sh #usr/lib/dracut/modules.d/74debug #usr/lib/dracut/modules.d/74debug/module-setup.sh #usr/lib/dracut/modules.d/74fcoe @@ -428,12 +421,6 @@ usr/lib/dracut/modules.d/74udev-rules/module-setup.sh #usr/lib/dracut/modules.d/74virtiofs/module-setup.sh #usr/lib/dracut/modules.d/74virtiofs/mount-virtiofs.sh #usr/lib/dracut/modules.d/74virtiofs/parse-virtiofs.sh -#usr/lib/dracut/modules.d/74zfcp -#usr/lib/dracut/modules.d/74zfcp/module-setup.sh -#usr/lib/dracut/modules.d/74zfcp/parse-zfcp.sh -#usr/lib/dracut/modules.d/74znet -#usr/lib/dracut/modules.d/74znet/module-setup.sh -#usr/lib/dracut/modules.d/74znet/parse-ccw.sh #usr/lib/dracut/modules.d/75securityfs #usr/lib/dracut/modules.d/75securityfs/module-setup.sh #usr/lib/dracut/modules.d/75securityfs/securityfs.sh @@ -510,6 +497,8 @@ usr/lib/dracut/modules.d/77initqueue/module-setup.sh #usr/lib/dracut/modules.d/77usrmount #usr/lib/dracut/modules.d/77usrmount/module-setup.sh #usr/lib/dracut/modules.d/77usrmount/mount-usr.sh +#usr/lib/dracut/modules.d/78systemd-sysusers +#usr/lib/dracut/modules.d/78systemd-sysusers/module-setup.sh usr/lib/dracut/modules.d/80base usr/lib/dracut/modules.d/80base/dracut-dev-lib.sh usr/lib/dracut/modules.d/80base/dracut-lib.sh diff --git a/lfs/dracut-ng b/lfs/dracut similarity index 92% rename from lfs/dracut-ng rename to lfs/dracut index 68c26adb7..e8fe2fe35 100644 --- a/lfs/dracut-ng +++ b/lfs/dracut @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2025 IPFire Team # +# Copyright (C) 2007-2026 IPFire Team # # # # 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,9 +24,9 @@ include Config -VER = 108 +VER = 112 -THISAPP = dracut-ng-$(VER) +THISAPP = dracut-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = fa5efd4039be8d2d30564a0768d2dec8c3d72b3721391d3a02bde8445cd7a5766d4b119594ebbca86dbd59bd71b64353febaaa7e2257f02d0075333dc29e9047 +$(DL_FILE)_BLAKE2 = 8affe092f6876ba52f59e08b33341c108c378f97f761b638f1d4f5520399aa87bb4bbafb362f5edc15fdabd3ebf0c7acec667ee3762535f9b780da522886f205 install : $(TARGET) diff --git a/make.sh b/make.sh index 32d26060b..35f877d64 100755 --- a/make.sh +++ b/make.sh @@ -1657,7 +1657,7 @@ build_system() { lfsmake2 systemd lfsmake2 libusb lfsmake2 mdadm - lfsmake2 dracut-ng + lfsmake2 dracut lfsmake2 lvm2 lfsmake2 multipath-tools lfsmake2 glib