From 6ff8a7387f9fcbe852e35cdee394f90f52bdf96d Mon Sep 17 00:00:00 2001 From: Tycho Andersen Date: Wed, 19 Jul 2017 14:08:25 -0600 Subject: [PATCH 1/2] check-kernel-config: check for STRICT_MODULE_RWX too This is what CONFIG_DEBUG_SET_MODULE_RONX was renamed to; since we want that one, presumably we want this one too. Signed-off-by: Tycho Andersen --- test/pkg/kernel-config/check-kernel-config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/pkg/kernel-config/check-kernel-config.sh b/test/pkg/kernel-config/check-kernel-config.sh index 18f126540..dc48810d6 100755 --- a/test/pkg/kernel-config/check-kernel-config.sh +++ b/test/pkg/kernel-config/check-kernel-config.sh @@ -73,6 +73,7 @@ fi if [ "$kernelMajor" -ge 4 -a "$kernelMinor" -ge 11 ]; then echo $UNZIPPED_CONFIG | grep -q CONFIG_STRICT_KERNEL_RWX=y || fail "CONFIG_STRICT_KERNEL_RWX=y" + echo $UNZIPPED_CONFIG | grep -q CONFIG_STRICT_MODULE_RWX=y || fail "CONFIG_STRICT_MODULE_RWX=y" fi # Negative cases From 9fa06475398d1bb7fb699b7c0b622e6f94d73692 Mon Sep 17 00:00:00 2001 From: Tycho Andersen Date: Thu, 20 Jul 2017 11:26:27 -0600 Subject: [PATCH 2/2] update test-kernel-config hash Signed-off-by: Tycho Andersen --- test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index 38219bbe8..f7d76e223 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76 + image: linuxkit/test-kernel-config:9f0b6b012ad86f22d6ad488cdd870a37fa70bc75 - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index 8ceff7bff..a9c3d2b50 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76 + image: linuxkit/test-kernel-config:9f0b6b012ad86f22d6ad488cdd870a37fa70bc75 - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index fde982491..23a86a9f2 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76 + image: linuxkit/test-kernel-config:9f0b6b012ad86f22d6ad488cdd870a37fa70bc75 - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 command: ["/bin/sh", "/poweroff.sh", "3"]