[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: tests: networking: Use 'net.ifnames=0' for the Open vSwitch test.
From: |
guix-commits |
Subject: |
02/02: tests: networking: Use 'net.ifnames=0' for the Open vSwitch test. |
Date: |
Sat, 11 Jul 2020 17:37:39 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 54461153dac6096a018e35a1d959e45b2c9dbb82
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jul 11 23:32:28 2020 +0200
tests: networking: Use 'net.ifnames=0' for the Open vSwitch test.
* gnu/tests/networking.scm (%openvswitch-os): Override KERNEL-ARGUMENTS.
---
gnu/tests/networking.scm | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm
index ca18b2f..022663a 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