diff options
| author | Marius Bakke <marius@gnu.org> | 2020-07-11 23:32:28 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-07-11 23:36:32 +0200 |
| commit | 54461153dac6096a018e35a1d959e45b2c9dbb82 (patch) | |
| tree | d1b38c1be8e030fa735872b8c1863c1108476e6e | |
| parent | 1abf205d11c8b941d7d89855cb55a9cfde078838 (diff) | |
| download | guix-54461153dac6096a018e35a1d959e45b2c9dbb82.tar.gz | |
tests: networking: Use 'net.ifnames=0' for the Open vSwitch test.
* gnu/tests/networking.scm (%openvswitch-os): Override KERNEL-ARGUMENTS.
| -rw-r--r-- | gnu/tests/networking.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index ca18b2f452..022663aa67 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> -;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017, 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; @@ -174,12 +174,15 @@ port 7, and a dict service on port 2628." (respawn? #f))))) (define %openvswitch-os - (simple-operating-system - (static-networking-service "ovs0" "10.1.1.1" - #:netmask "255.255.255.252" - #:requirement '(openvswitch-configuration)) - (service openvswitch-service-type) - openvswitch-configuration-service)) + (operating-system + (inherit (simple-operating-system + (static-networking-service "ovs0" "10.1.1.1" + #:netmask "255.255.255.252" + #:requirement '(openvswitch-configuration)) + (service openvswitch-service-type) + openvswitch-configuration-service)) + ;; Ensure the interface name does not change depending on the driver. + (kernel-arguments (cons "net.ifnames=0" %default-kernel-arguments)))) (define (run-openvswitch-test) (define os |