Merge pull request #2208 from justincormack/config-test-modprobe

Allow config test modprobe to fail
This commit is contained in:
Justin Cormack 2017-07-14 15:19:18 +01:00 committed by GitHub
commit 33a220ac1b
5 changed files with 5 additions and 5 deletions

View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:f5b28379fc969237e0fb11aa1ed946622150e9a0 - linuxkit/runc:f5b28379fc969237e0fb11aa1ed946622150e9a0
onboot: onboot:
- name: check-kernel-config - name: check-kernel-config
image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76
- name: poweroff - name: poweroff
image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05
command: ["/bin/sh", "/poweroff.sh", "3"] command: ["/bin/sh", "/poweroff.sh", "3"]

View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:f5b28379fc969237e0fb11aa1ed946622150e9a0 - linuxkit/runc:f5b28379fc969237e0fb11aa1ed946622150e9a0
onboot: onboot:
- name: check-kernel-config - name: check-kernel-config
image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76
- name: poweroff - name: poweroff
image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05
command: ["/bin/sh", "/poweroff.sh", "3"] command: ["/bin/sh", "/poweroff.sh", "3"]

View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:f5b28379fc969237e0fb11aa1ed946622150e9a0 - linuxkit/runc:f5b28379fc969237e0fb11aa1ed946622150e9a0
onboot: onboot:
- name: check-kernel-config - name: check-kernel-config
image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76
- name: poweroff - name: poweroff
image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05
command: ["/bin/sh", "/poweroff.sh", "3"] command: ["/bin/sh", "/poweroff.sh", "3"]

View File

@ -12,7 +12,7 @@ onboot:
image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: check-kernel-config - name: check-kernel-config
image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76
- name: poweroff - name: poweroff
image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05
command: ["/bin/sh", "/poweroff.sh", "3"] command: ["/bin/sh", "/poweroff.sh", "3"]

View File

@ -92,7 +92,7 @@ nfs \
nfsd \ nfsd \
ntfs ntfs
do do
modprobe $mod modprobe $mod 2>/dev/null || true
done done
# check filesystems that are built in # check filesystems that are built in