diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-23 10:11:29 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-23 10:11:29 +0200 |
| commit | 4c204d01d57ac7da11a5772d5d4e3254d1c2408f (patch) | |
| tree | c7e5cb013abc742734acd9613674df4ebddfdeef /gnu/services/base.scm | |
| parent | 82bdb77082fa4e100761f70086b745dfb280c3ac (diff) | |
| parent | 445a0359083388b5ee686e6e855f94a3aac5f79c (diff) | |
| download | guix-gnome-team.tar.gz | |
Merge branch 'master' into gnome-team gnome-team
Diffstat (limited to 'gnu/services/base.scm')
| -rw-r--r-- | gnu/services/base.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 636d827ff9..492cf8a693 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 John Soo <jsoo1@asu.edu> -;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2019, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 qblade <qblade@protonmail.com> @@ -2726,7 +2726,7 @@ to CONFIG." (match (static-networking-addresses config) ((and addresses (first _ ...)) `("--ipv6" "/servers/socket/26" - "--interface" ,(network-address-device first) + "--interface" ,(string-append "/dev/" (network-address-device first)) ,@(append-map (lambda (address) `(,(if (network-address-ipv6? address) "--address6" @@ -2769,7 +2769,10 @@ to CONFIG." (format #t "starting '~a~{ ~s~}'~%" #$(file-append hurd "/hurd/pfinet") options) - (apply invoke #$(file-append hurd "/bin/settrans") "-fac" + (apply invoke #$(file-append hurd "/bin/settrans") + "--active" + "--create" + "--keep-active" "/servers/socket/2" #$(file-append hurd "/hurd/pfinet") options))))))) |