Search
j0ke.net Open Build Service
>
Projects
>
internetx
:
kiwi
:
Appliance
>
dracut
> 0091-TEST-20-NFS-skip-root-dev-nfs-tests-with-systemd-v23.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File 0091-TEST-20-NFS-skip-root-dev-nfs-tests-with-systemd-v23.patch of Package dracut
From 7e0812ef5a62ff7e8d0bd707d8dd5aad577ad3de Mon Sep 17 00:00:00 2001 From: Harald Hoyer <harald@redhat.com> Date: Thu, 23 Jun 2016 16:36:43 +0200 Subject: [PATCH] TEST-20-NFS: skip root=/dev/nfs tests with systemd v230 --- test/TEST-20-NFS/test.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 222bd249..981cd821 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -114,14 +114,16 @@ test_nfsv3() { client_test "NFSv3 root=dhcp DHCP path only" 52:54:00:12:34:00 \ "root=dhcp" 192.168.50.1 -wsize=4096 || return 1 - client_test "NFSv3 Legacy root=/dev/nfs nfsroot=IP:path" 52:54:00:12:34:01 \ - "root=/dev/nfs nfsroot=192.168.50.1:/nfs/client" 192.168.50.1 -wsize=4096 || return 1 + if [[ "$(systemctl --version)" != *"systemd 230"* ]] 2>/dev/null; then + client_test "NFSv3 Legacy root=/dev/nfs nfsroot=IP:path" 52:54:00:12:34:01 \ + "root=/dev/nfs nfsroot=192.168.50.1:/nfs/client" 192.168.50.1 -wsize=4096 || return 1 - client_test "NFSv3 Legacy root=/dev/nfs DHCP path only" 52:54:00:12:34:00 \ - "root=/dev/nfs" 192.168.50.1 -wsize=4096 || return 1 + client_test "NFSv3 Legacy root=/dev/nfs DHCP path only" 52:54:00:12:34:00 \ + "root=/dev/nfs" 192.168.50.1 -wsize=4096 || return 1 - client_test "NFSv3 Legacy root=/dev/nfs DHCP IP:path" 52:54:00:12:34:01 \ - "root=/dev/nfs" 192.168.50.2 -wsize=4096 || return 1 + client_test "NFSv3 Legacy root=/dev/nfs DHCP IP:path" 52:54:00:12:34:01 \ + "root=/dev/nfs" 192.168.50.2 -wsize=4096 || return 1 + fi client_test "NFSv3 root=dhcp DHCP IP:path" 52:54:00:12:34:01 \ "root=dhcp" 192.168.50.2 -wsize=4096 || return 1
