diff options
| -rw-r--r-- | dracut/.footprint | 68 | ||||
| -rw-r--r-- | dracut/.signature | 9 | ||||
| -rw-r--r-- | dracut/Pkgfile | 6 | ||||
| -rwxr-xr-x | dracut/dracut-bash5.patch | 57 |
4 files changed, 53 insertions, 87 deletions
diff --git a/dracut/.footprint b/dracut/.footprint index 3cdd82616..68ebf5a38 100644 --- a/dracut/.footprint +++ b/dracut/.footprint @@ -24,10 +24,16 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/00bootchart/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/00bootchart/module-setup.sh drwxrwxr-x root/root usr/lib/dracut/modules.d/00dash/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/00dash/module-setup.sh +drwxrwxr-x root/root usr/lib/dracut/modules.d/00mksh/ +-rwxrwxr-x root/root usr/lib/dracut/modules.d/00mksh/module-setup.sh drwxrwxr-x root/root usr/lib/dracut/modules.d/00systemd/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/00systemd/module-setup.sh +drwxrwxr-x root/root usr/lib/dracut/modules.d/00warpclock/ +-rw-rw-r-- root/root usr/lib/dracut/modules.d/00warpclock/module-setup.sh +-rw-rw-r-- root/root usr/lib/dracut/modules.d/00warpclock/warpclock.sh drwxrwxr-x root/root usr/lib/dracut/modules.d/01fips/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/01fips/fips-boot.sh +-rw-rw-r-- root/root usr/lib/dracut/modules.d/01fips/fips-load-crypto.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/01fips/fips-noboot.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/01fips/fips.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/01fips/module-setup.sh @@ -49,6 +55,9 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/04watchdog/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/04watchdog/watchdog.sh drwxrwxr-x root/root usr/lib/dracut/modules.d/05busybox/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/05busybox/module-setup.sh +drwxrwxr-x root/root usr/lib/dracut/modules.d/06rngd/ +-rw-rw-r-- root/root usr/lib/dracut/modules.d/06rngd/module-setup.sh +-rw-rw-r-- root/root usr/lib/dracut/modules.d/06rngd/rngd.service drwxrwxr-x root/root usr/lib/dracut/modules.d/10i18n/ -rw-rw-r-- root/root usr/lib/dracut/modules.d/10i18n/10-console.rules -rwxrwxr-x root/root usr/lib/dracut/modules.d/10i18n/console_init.sh @@ -58,24 +67,30 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/30convertfs/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/30convertfs/convertfs.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/30convertfs/do-convertfs.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/30convertfs/module-setup.sh +drwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/ +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/dhclient-script.sh +-rw-rw-r-- root/root usr/lib/dracut/modules.d/35network-legacy/dhclient.conf +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/ifup.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/kill-dhclient.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/module-setup.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/net-genrules.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/parse-bond.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/parse-bridge.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/parse-ibft.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/parse-ifname.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/parse-ip-opts.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/parse-team.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-legacy/parse-vlan.sh +drwxrwxr-x root/root usr/lib/dracut/modules.d/35network-manager/ +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-manager/module-setup.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-manager/nm-config.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/35network-manager/nm-run.sh drwxrwxr-x root/root usr/lib/dracut/modules.d/40network/ --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/dhclient-script.sh --rw-rw-r-- root/root usr/lib/dracut/modules.d/40network/dhclient.conf -rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/dhcp-root.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/ifname-genrules.sh --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/ifup.sh --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/kill-dhclient.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/module-setup.sh --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/net-genrules.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/net-lib.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/netroot.sh --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/parse-bond.sh --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/parse-bridge.sh --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/parse-ibft.sh --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/parse-ifname.sh --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/parse-ip-opts.sh --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/parse-team.sh --rwxrwxr-x root/root usr/lib/dracut/modules.d/40network/parse-vlan.sh drwxrwxr-x root/root usr/lib/dracut/modules.d/45ifcfg/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/45ifcfg/module-setup.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/45ifcfg/write-ifcfg.sh @@ -145,6 +160,8 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/90dmsquash-live/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/90dmsquash-live/module-setup.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/90dmsquash-live/parse-dmsquash-live.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/90dmsquash-live/parse-iso-scan.sh +drwxrwxr-x root/root usr/lib/dracut/modules.d/90kernel-modules-extra/ +-rwxrwxr-x root/root usr/lib/dracut/modules.d/90kernel-modules-extra/module-setup.sh drwxrwxr-x root/root usr/lib/dracut/modules.d/90kernel-modules/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/90kernel-modules/insmodpost.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/90kernel-modules/module-setup.sh @@ -183,6 +200,9 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/90multipath/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/90multipath/multipathd-stop.sh -rw-rw-r-- root/root usr/lib/dracut/modules.d/90multipath/multipathd.service -rwxrwxr-x root/root usr/lib/dracut/modules.d/90multipath/multipathd.sh +drwxrwxr-x root/root usr/lib/dracut/modules.d/90ppcmac/ +-rw-rw-r-- root/root usr/lib/dracut/modules.d/90ppcmac/load-thermal.sh +-rw-rw-r-- root/root usr/lib/dracut/modules.d/90ppcmac/module-setup.sh drwxrwxr-x root/root usr/lib/dracut/modules.d/90qemu-net/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/90qemu-net/module-setup.sh drwxrwxr-x root/root usr/lib/dracut/modules.d/90qemu/ @@ -225,7 +245,7 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/95fcoe-uefi/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/95fcoe-uefi/module-setup.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/95fcoe-uefi/parse-uefifcoe.sh drwxrwxr-x root/root usr/lib/dracut/modules.d/95fcoe/ --rw-rw-r-- root/root usr/lib/dracut/modules.d/95fcoe/cleanup-fcoe.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/95fcoe/cleanup-fcoe.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/95fcoe/fcoe-edd.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/95fcoe/fcoe-genrules.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/95fcoe/fcoe-up.sh @@ -306,37 +326,37 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/ -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline-ask.service -rwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline-ask.sh -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline.service --rw-r--r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline.service.8 +-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline.service.8 -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline.service.8.asc -rwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-cmdline.sh -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-emergency.service -rwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-emergency.sh -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-initqueue.service --rw-r--r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-initqueue.service.8 +-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-initqueue.service.8 -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-initqueue.service.8.asc -rwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-initqueue.sh -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-mount.service --rw-r--r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-mount.service.8 +-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-mount.service.8 -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-mount.service.8.asc -rwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-mount.sh -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.service --rw-r--r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.service.8 +-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.service.8 -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.service.8.asc -rwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.sh -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-pivot.service --rw-r--r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-pivot.service.8 +-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-pivot.service.8 -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-pivot.service.8.asc -rwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-pivot.sh -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-trigger.service --rw-r--r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-trigger.service.8 +-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-trigger.service.8 -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-trigger.service.8.asc -rwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-trigger.sh -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.service --rw-r--r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.service.8 +-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.service.8 -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.service.8.asc -rwxrwxr-x root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.sh -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service --rw-r--r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service.8 +-rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service.8 -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-shutdown.service.8.asc -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/dracut-tmpfiles.conf -rw-rw-r-- root/root usr/lib/dracut/modules.d/98dracut-systemd/emergency.service @@ -384,6 +404,12 @@ drwxrwxr-x root/root usr/lib/dracut/modules.d/99img-lib/ drwxrwxr-x root/root usr/lib/dracut/modules.d/99shutdown/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/99shutdown/module-setup.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/99shutdown/shutdown.sh +drwxrwxr-x root/root usr/lib/dracut/modules.d/99squash/ +-rwxrwxr-x root/root usr/lib/dracut/modules.d/99squash/clear-squash.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/99squash/init.sh +-rw-rw-r-- root/root usr/lib/dracut/modules.d/99squash/module-setup.sh +-rwxrwxr-x root/root usr/lib/dracut/modules.d/99squash/setup-squash.sh +-rw-rw-r-- root/root usr/lib/dracut/modules.d/99squash/squash-mnt-clear.service drwxrwxr-x root/root usr/lib/dracut/modules.d/99uefi-lib/ -rwxrwxr-x root/root usr/lib/dracut/modules.d/99uefi-lib/module-setup.sh -rwxrwxr-x root/root usr/lib/dracut/modules.d/99uefi-lib/uefi-lib.sh diff --git a/dracut/.signature b/dracut/.signature index eff4db80b..9b818e0b8 100644 --- a/dracut/.signature +++ b/dracut/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36nY6irWSerb6wglmrD4QYZ6yjzEvB/DXof62kjGKhlq1E3MCVTkuXaaD6GPRQ5ptG81wZ0eenxGaZz8Yxxkngg= -SHA256 (Pkgfile) = 9d0b577db85ceaf529a34dee06f704eb36353873d202588407b676d87f40f5aa -SHA256 (.footprint) = 7c6e1a832fbee273e2981c0406fbb5874bc9a12da292fcaec0ae514f55d6700a -SHA256 (dracut-048.tar.xz) = 0750d6b71b7f95d8dfa338404372bfeb0e5c30e7fe2a21ba55c6dbf3dbcf6a79 -SHA256 (dracut-bash5.patch) = b63b67eaf3f03a69e7ed73a40b72aa6caf98c5f4703a74e30bf5dafed62c2798 +RWSagIOpLGJF33iy1v7VFRcHR7JM8a8YC4cSPvQwN3FhjHanZ5gV2O0cQBAhJH4o6U4kWe0BedKp4JCIHa7O/EzW1pfwaeFlCg4= +SHA256 (Pkgfile) = aaac68b27c78ab5ef7f4ba819e709c5e558448f65a02462e70bd33933ff1b41a +SHA256 (.footprint) = ba26bce67c40b0c5d758c259760632110674484564ffd7826fcfa94423119145 +SHA256 (dracut-050.tar.xz) = 0d6c9451b15314ca96e358a40bacd40f1fb0333ae01c386ed84c3b4b49e1cd27 diff --git a/dracut/Pkgfile b/dracut/Pkgfile index a819f7f27..129065b0b 100644 --- a/dracut/Pkgfile +++ b/dracut/Pkgfile @@ -3,14 +3,12 @@ # Maintainer: Matt Housh, jaeger at crux dot ninja name=dracut -version=048 +version=050 release=1 -source=(https://mirrors.edge.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.xz \ - $name-bash5.patch) +source=(https://mirrors.edge.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.xz) build() { cd $name-$version - patch -p1 -i $SRC/$name-bash5.patch ./configure --prefix=/usr \ --sysconfdir=/etc make diff --git a/dracut/dracut-bash5.patch b/dracut/dracut-bash5.patch deleted file mode 100755 index 1f8f29cb9..000000000 --- a/dracut/dracut-bash5.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh -index d39ca1b7..8dbc8b3c 100755 ---- ./modules.d/99fs-lib/fs-lib.sh -+++ ./modules.d/99fs-lib/fs-lib.sh -@@ -44,22 +44,22 @@ fsck_able() { - ;; - ext?) - type e2fsck >/dev/null 2>&1 && -- _drv="_drv=e2fsck fsck_drv_com" && -+ _drv="_drv=e2fsck fsck_drv_com e2fsck" && - return 0 - ;; - f2fs) - type fsck.f2fs >/dev/null 2>&1 && -- _drv="_drv=fsck.f2fs fsck_drv_com" && -+ _drv="_drv=fsck.f2fs fsck_drv_com fsck.f2fs" && - return 0 - ;; - jfs) - type jfs_fsck >/dev/null 2>&1 && -- _drv="_drv=jfs_fsck fsck_drv_com" && -+ _drv="_drv=jfs_fsck fsck_drv_com jfs_fsck" && - return 0 - ;; - reiserfs) - type reiserfsck >/dev/null 2>&1 && -- _drv="_drv=reiserfsck fsck_drv_com" && -+ _drv="_drv=reiserfsck fsck_drv_com reiserfsck" && - return 0 - ;; - btrfs) -@@ -75,7 +75,7 @@ fsck_able() { - ;; - *) - type fsck >/dev/null 2>&1 && -- _drv="_drv=fsck fsck_drv_std" && -+ _drv="_drv=fsck fsck_drv_std fsck" && - return 0 - ;; - esac -@@ -99,6 +99,7 @@ fsck_drv_btrfs() { - fsck_drv_com() { - local _ret - local _out -+ local _drv=$1 - - if ! strglobin "$_fop" "-[ynap]"; then - _fop="-a ${_fop}" -@@ -177,7 +178,7 @@ fsck_batch() { - _out="$(fsck -M -T "$@" -- -a)" - _ret=$? - -- fsck_tail -+ _drv=$_drv fsck_tail - - return $_ret - } |