[make-initrd] [PATCH v1 11/11] feature/procacct: Add to testing
Alexey Gladkov
gladkov.alexey at gmail.com
Thu Jun 15 20:59:20 MSK 2023
Signed-off-by: Alexey Gladkov <gladkov.alexey at gmail.com>
---
testing/packages-altlinux | 3 ++-
testing/test-root-btrfs-subvol.cfg | 2 +-
testing/test-root-efi-partition.cfg | 2 +-
testing/test-root-efi-reqpartition.cfg | 2 +-
testing/test-root-luks+crypttab+noparam.cfg | 2 +-
testing/test-root-luks+lukskey-noparam.cfg | 2 +-
testing/test-root-luks+lukskey-plain.cfg | 2 +-
testing/test-root-luks+lukskey-raw.cfg | 2 +-
testing/test-root-luks-over-lvm.cfg | 2 +-
testing/test-root-luks-over-raid1.cfg | 2 +-
testing/test-root-luks.cfg | 2 +-
testing/test-root-lvm+luks.cfg | 2 +-
testing/test-root-lvm.cfg | 2 +-
testing/test-root-partition+usr.cfg | 2 +-
testing/test-root-partition.cfg | 2 +-
testing/test-root-pipeline.cfg | 2 +-
testing/test-root-raid1+raid5.cfg | 2 +-
testing/test-root-raid1-degraded.cfg | 2 +-
testing/test-root-raid1.cfg | 2 +-
testing/test-root-raid5.cfg | 2 +-
testing/test-root-sshfs-network-dhcp.cfg | 2 +-
testing/test-root-sshfs-network-static1.cfg | 2 +-
testing/test-root-zfs-partition.cfg | 2 +-
testing/testing-altlinux-local | 9 +++++++++
testing/testing-ks-initrd.cfg | 1 +
25 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/testing/packages-altlinux b/testing/packages-altlinux
index 68472aa2..d164e5f6 100644
--- a/testing/packages-altlinux
+++ b/testing/packages-altlinux
@@ -1,11 +1,12 @@
#!/bin/bash
-MAKE_INITRD_PACKAGES="make udev libelf libkmod zlib bzlib libzstd liblzma"
+MAKE_INITRD_PACKAGES="make udev libelf libkmod zlib bzlib libzstd liblzma libbpf"
MAKE_INITRD_PACKAGES_DEVEL="$MAKE_INITRD_PACKAGES"
MAKE_INITRD_PACKAGES_DEVEL+=" gcc make automake autoconf bison flex"
MAKE_INITRD_PACKAGES_DEVEL+=" libkmod-devel zlib-devel bzlib-devel liblzma-devel"
MAKE_INITRD_PACKAGES_DEVEL+=" libzstd-devel libelf-devel libtirpc-devel libcrypt-devel"
+MAKE_INITRD_PACKAGES_DEVEL+=" llvm clang libbpf-devel"
KERNEL_PACKAGES="kernel-image$KERNEL_FLAVOR"
diff --git a/testing/test-root-btrfs-subvol.cfg b/testing/test-root-btrfs-subvol.cfg
index a33a03f9..23153a76 100644
--- a/testing/test-root-btrfs-subvol.cfg
+++ b/testing/test-root-btrfs-subvol.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=5
# param BOOT_DISKS=5
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=fs rootflags=subvol=root"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=fs rootflags=subvol=root"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-efi-partition.cfg b/testing/test-root-efi-partition.cfg
index acd0f24c..b0f58d20 100644
--- a/testing/test-root-efi-partition.cfg
+++ b/testing/test-root-efi-partition.cfg
@@ -1,7 +1,7 @@
# param KICKSTART_DISKS=1
# param BOOT_DISKS=1
# param BOOT_BIOS="efi"
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=gpt
diff --git a/testing/test-root-efi-reqpartition.cfg b/testing/test-root-efi-reqpartition.cfg
index abaa9535..2da8eb1d 100644
--- a/testing/test-root-efi-reqpartition.cfg
+++ b/testing/test-root-efi-reqpartition.cfg
@@ -1,7 +1,7 @@
# param KICKSTART_DISKS=1
# param BOOT_DISKS=1
# param BOOT_BIOS="efi"
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=gpt
diff --git a/testing/test-root-luks+crypttab+noparam.cfg b/testing/test-root-luks+crypttab+noparam.cfg
index cc249779..0e917fc4 100644
--- a/testing/test-root-luks+crypttab+noparam.cfg
+++ b/testing/test-root-luks+crypttab+noparam.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=2
# param BOOT_DISKS=2
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-luks+lukskey-noparam.cfg b/testing/test-root-luks+lukskey-noparam.cfg
index 45b83569..94e8974c 100644
--- a/testing/test-root-luks+lukskey-noparam.cfg
+++ b/testing/test-root-luks+lukskey-noparam.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=2
# param BOOT_DISKS=2
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-luks+lukskey-plain.cfg b/testing/test-root-luks+lukskey-plain.cfg
index f4cc7399..e5f9eea7 100644
--- a/testing/test-root-luks+lukskey-plain.cfg
+++ b/testing/test-root-luks+lukskey-plain.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=3
# param BOOT_DISKS=3
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT luks-key=secret:LABEL=ROOTKEY"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT luks-key=secret:LABEL=ROOTKEY"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-luks+lukskey-raw.cfg b/testing/test-root-luks+lukskey-raw.cfg
index 1bcef2a1..a5778146 100644
--- a/testing/test-root-luks+lukskey-raw.cfg
+++ b/testing/test-root-luks+lukskey-raw.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=3
# param BOOT_DISKS=3
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT luks-key=secret:LABEL=ROOTKEY luks-key-format=raw"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT luks-key=secret:LABEL=ROOTKEY luks-key-format=raw"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-luks-over-lvm.cfg b/testing/test-root-luks-over-lvm.cfg
index 284da993..f29efc13 100644
--- a/testing/test-root-luks-over-lvm.cfg
+++ b/testing/test-root-luks-over-lvm.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=4
# param BOOT_DISKS=4
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
# param BOOT_PROG=expect-password
ignoredisk --drives=LABEL=SYSIMAGE
diff --git a/testing/test-root-luks-over-raid1.cfg b/testing/test-root-luks-over-raid1.cfg
index 401ea113..70993e75 100644
--- a/testing/test-root-luks-over-raid1.cfg
+++ b/testing/test-root-luks-over-raid1.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=3
# param BOOT_DISKS=3
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
# param BOOT_PROG=expect-password
ignoredisk --drives=LABEL=SYSIMAGE
diff --git a/testing/test-root-luks.cfg b/testing/test-root-luks.cfg
index a560285e..2c2f1c82 100644
--- a/testing/test-root-luks.cfg
+++ b/testing/test-root-luks.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=2
# param BOOT_DISKS=2
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
# param BOOT_PROG=expect-password
ignoredisk --drives=LABEL=SYSIMAGE
diff --git a/testing/test-root-lvm+luks.cfg b/testing/test-root-lvm+luks.cfg
index 093b82e5..b0bff3ca 100644
--- a/testing/test-root-lvm+luks.cfg
+++ b/testing/test-root-lvm+luks.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=5
# param BOOT_DISKS=5
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-lvm.cfg b/testing/test-root-lvm.cfg
index b32cc318..f28b477b 100644
--- a/testing/test-root-lvm.cfg
+++ b/testing/test-root-lvm.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=4
# param BOOT_DISKS=4
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-partition+usr.cfg b/testing/test-root-partition+usr.cfg
index 8bc27b96..6cc15eb6 100644
--- a/testing/test-root-partition+usr.cfg
+++ b/testing/test-root-partition+usr.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=3
# param BOOT_DISKS=3
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-partition.cfg b/testing/test-root-partition.cfg
index f8b439ca..83c70c42 100644
--- a/testing/test-root-partition.cfg
+++ b/testing/test-root-partition.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=2
# param BOOT_DISKS=2
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-pipeline.cfg b/testing/test-root-pipeline.cfg
index 2daed048..9fe5cfaf 100644
--- a/testing/test-root-pipeline.cfg
+++ b/testing/test-root-pipeline.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=2
# param BOOT_DISKS=2
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0"
# param BOOT_CMDLINE="$BOOT_CMDLINE root=pipeline pipeline=waitdev,mountfs,rootfs waitdev=LABEL=ROOT mountfs=dev"
ignoredisk --drives=LABEL=SYSIMAGE
diff --git a/testing/test-root-raid1+raid5.cfg b/testing/test-root-raid1+raid5.cfg
index 66741260..eab79421 100644
--- a/testing/test-root-raid1+raid5.cfg
+++ b/testing/test-root-raid1+raid5.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=8
# param BOOT_DISKS=8
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-raid1-degraded.cfg b/testing/test-root-raid1-degraded.cfg
index a139552c..ddc126c4 100644
--- a/testing/test-root-raid1-degraded.cfg
+++ b/testing/test-root-raid1-degraded.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=3
# param BOOT_DISKS=2
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-raid1.cfg b/testing/test-root-raid1.cfg
index ad0c972f..189acb56 100644
--- a/testing/test-root-raid1.cfg
+++ b/testing/test-root-raid1.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=3
# param BOOT_DISKS=3
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-raid5.cfg b/testing/test-root-raid5.cfg
index 51e0b238..efce7354 100644
--- a/testing/test-root-raid5.cfg
+++ b/testing/test-root-raid5.cfg
@@ -1,6 +1,6 @@
# param KICKSTART_DISKS=6
# param BOOT_DISKS=6
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/test-root-sshfs-network-dhcp.cfg b/testing/test-root-sshfs-network-dhcp.cfg
index 6114ad44..67dfa803 100644
--- a/testing/test-root-sshfs-network-dhcp.cfg
+++ b/testing/test-root-sshfs-network-dhcp.cfg
@@ -2,6 +2,6 @@
# param BOOT_DISKS=0
# param SYSIMAGE_SIZE="mini"
# param BOOTLOADER_TYPE="none"
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0"
# param BOOT_CMDLINE="$BOOT_CMDLINE root=/dev/sshfs sshfsroot=sftp at 10.0.2.2:/data/incoming sshfsopts=port=2222"
# param BOOT_CMDLINE="$BOOT_CMDLINE ip=dhcp"
diff --git a/testing/test-root-sshfs-network-static1.cfg b/testing/test-root-sshfs-network-static1.cfg
index 2a285cec..8402e935 100644
--- a/testing/test-root-sshfs-network-static1.cfg
+++ b/testing/test-root-sshfs-network-static1.cfg
@@ -2,6 +2,6 @@
# param BOOT_DISKS=0
# param SYSIMAGE_SIZE="mini"
# param BOOTLOADER_TYPE="none"
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0"
# param BOOT_CMDLINE="$BOOT_CMDLINE root=/dev/sshfs sshfsroot=sftp at 10.0.2.2:/data/incoming sshfsopts=port=2222"
# param BOOT_CMDLINE="$BOOT_CMDLINE ip=10.0.2.15::10.0.2.1:255.255.255.0:localhost:eth0:none"
diff --git a/testing/test-root-zfs-partition.cfg b/testing/test-root-zfs-partition.cfg
index 729bf89b..320c9e7b 100644
--- a/testing/test-root-zfs-partition.cfg
+++ b/testing/test-root-zfs-partition.cfg
@@ -2,7 +2,7 @@
# param BOOT_DISKS=3
# param SYSIMAGE_EXTRA_PACKAGES+=" $ZFS_PACKAGES"
# param KICKSTART_PACKAGES+=" $ZFS_PACKAGES"
-# param BOOT_CMDLINE="$BOOT_CMDLINE rdlog=console rd-debug-udev=1 quiet panic=0 root=ZFS=rpool/ROOT zfs.force=1"
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=ZFS=rpool/ROOT zfs.force=1"
ignoredisk --drives=LABEL=SYSIMAGE
clearpart --all --initlabel --disklabel=mbr
diff --git a/testing/testing-altlinux-local b/testing/testing-altlinux-local
index c1f111b8..38e8f366 100755
--- a/testing/testing-altlinux-local
+++ b/testing/testing-altlinux-local
@@ -45,6 +45,15 @@ for step in "$@"; do
cd "$builddir"
rc=0
+ ALTWRAP_LLVM_VERSION="\$(
+ rpmquery -a --qf='%{name}\n' llvm\*-libs |
+ sed -e 's/^llvm//' -e 's/-libs//' |
+ sort -g |
+ tail -1
+ )"
+ [ -z "\$ALTWRAP_LLVM_VERSION" ] ||
+ export ALTWRAP_LLVM_VERSION
+
./autogen.sh
./configure \
--enable-local-build \
diff --git a/testing/testing-ks-initrd.cfg b/testing/testing-ks-initrd.cfg
index 558c060e..890cd5f5 100644
--- a/testing/testing-ks-initrd.cfg
+++ b/testing/testing-ks-initrd.cfg
@@ -21,6 +21,7 @@
tee /etc/initrd.mk <<-EOF
AUTODETECT = all
MODULES_PRELOAD += virtio-blk virtio-scsi
+ FEATURES += debug-procacct
`[ ! -f /etc/initrd.mk.addon ] || cat /etc/initrd.mk.addon`
EOF
--
2.33.8
More information about the Make-initrd
mailing list