diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/system/linux-container.scm | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index 8e208d3a704..e9be2c9d8a4 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm | |||
| @@ -78,12 +78,13 @@ from OS that are needed on the bare metal and not in a container." | |||
| 78 | (define dummy-networking-service-type | 78 | (define dummy-networking-service-type |
| 79 | (shepherd-service-type | 79 | (shepherd-service-type |
| 80 | 'dummy-networking | 80 | 'dummy-networking |
| 81 | (const (shepherd-service | 81 | (lambda (provision) |
| 82 | (documentation "Provide loopback and networking without actually | 82 | (shepherd-service |
| 83 | (documentation "Provide loopback and networking without actually | ||
| 83 | doing anything.") | 84 | doing anything.") |
| 84 | (provision '(loopback networking)) | 85 | (provision provision) |
| 85 | (start #~(const #t)))) | 86 | (start #~(const #t)))) |
| 86 | #f | 87 | '(loopback networking) |
| 87 | (description "Provide loopback and networking without actually doing | 88 | (description "Provide loopback and networking without actually doing |
| 88 | anything. This service is used by guest systems running in containers, where | 89 | anything. This service is used by guest systems running in containers, where |
| 89 | networking support is provided by the host."))) | 90 | networking support is provided by the host."))) |
| @@ -135,7 +136,7 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file systems to add to OS." | |||
| 135 | dhcp-client-service-type | 136 | dhcp-client-service-type |
| 136 | network-manager-service-type | 137 | network-manager-service-type |
| 137 | connman-service-type) | 138 | connman-service-type) |
| 138 | (list)))) | 139 | (list static-networking-service-type)))) ;loopback |
| 139 | 140 | ||
| 140 | (define services-to-add | 141 | (define services-to-add |
| 141 | ;; Many Guix services depend on a 'networking' shepherd | 142 | ;; Many Guix services depend on a 'networking' shepherd |
| @@ -143,8 +144,10 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file systems to add to OS." | |||
| 143 | ;; service when we are sure that networking is already set up | 144 | ;; service when we are sure that networking is already set up |
| 144 | ;; in the host and can be used. That prevents double setup. | 145 | ;; in the host and can be used. That prevents double setup. |
| 145 | (if shared-network? | 146 | (if shared-network? |
| 146 | (list (service dummy-networking-service-type)) | 147 | (list (service dummy-networking-service-type |
| 147 | '())) | 148 | '(loopback networking))) |
| 149 | (list (service dummy-networking-service-type | ||
| 150 | '(loopback))))) | ||
| 148 | 151 | ||
| 149 | (define os-with-base-essential-services | 152 | (define os-with-base-essential-services |
| 150 | (operating-system | 153 | (operating-system |
