Browse code

Improve checking dummy kernel module

Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>

Stefan Scherer authored on 2016/03/11 15:55:07
Showing 2 changed files
... ...
@@ -84,16 +84,6 @@ binary: build
84 84
 	$(DOCKER_RUN_DOCKER) hack/make.sh binary
85 85
 
86 86
 build: bundles
87
-ifeq ($(DOCKER_OSARCH), linux/arm)
88
-	# A few libnetwork integration tests require that the kernel be
89
-	# configured with "dummy" network interface and has the module
90
-	# loaded. However, the dummy module is not available by default
91
-	# on arm images. This ensures that it's built and loaded.
92
-	echo "Syncing kernel modules"
93
-	oc-sync-kernel-modules
94
-	depmod
95
-	modprobe dummy
96
-endif
97 87
 	docker build ${DOCKER_BUILD_ARGS} -t "$(DOCKER_IMAGE)" -f "$(DOCKERFILE)" .
98 88
 
99 89
 bundles:
... ...
@@ -101,8 +91,8 @@ bundles:
101 101
 
102 102
 cross: build
103 103
 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross
104
-	
105
-	
104
+
105
+
106 106
 win: build
107 107
 	$(DOCKER_RUN_DOCKER) hack/make.sh win
108 108
 
... ...
@@ -28,3 +28,18 @@ So for example in order to build a Docker binary one has to
28 28
 1. clone the Docker/Docker repository on an ARM device `git clone git@github.com:docker/docker.git`  
29 29
 2. change into the checked out repository with `cd docker`  
30 30
 3. execute `make binary` to create a Docker Engine binary for ARM  
31
+
32
+## Kernel modules
33
+A few libnetwork integration tests require that the kernel be
34
+configured with "dummy" network interface and has the module
35
+loaded. However, the dummy module may be not loaded automatically.
36
+
37
+To load the kernel module permanently, run these commands as `root`.
38
+
39
+    modprobe dummy
40
+    echo "dummy" >> /etc/modules
41
+
42
+On some systems you also have to sync your kernel modules.
43
+
44
+    oc-sync-kernel-modules
45
+    depmod