summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Williams <neil.williams@linaro.org>2014-10-07 15:43:15 (GMT)
committerNeil Williams <neil.williams@linaro.org>2014-10-07 15:43:15 (GMT)
commit03f87ae8e8bc0aae32bff31a20088ad4a3ef2adc (patch)
tree154288c02f54242e7b778132f1f075a09bca6400
parent8d2aa71558f46d982839c7b03017de426e3c1398 (diff)
parent3568a5924c1f589c82de32173af8a862b7652d0e (diff)
downloadlava-dispatcher-03f87ae8e8bc0aae32bff31a20088ad4a3ef2adc.tar.gz
lava-dispatcher-03f87ae8e8bc0aae32bff31a20088ad4a3ef2adc.tar.xz
Merge branch 'staging' into release
-rw-r--r--etc/lava-modules.conf9
-rw-r--r--etc/lava-options.conf4
-rwxr-xr-xsetup.py2
3 files changed, 12 insertions, 3 deletions
diff --git a/etc/lava-modules.conf b/etc/lava-modules.conf
index 482779c..9eded7a 100644
--- a/etc/lava-modules.conf
+++ b/etc/lava-modules.conf
@@ -1,3 +1,6 @@
-# install fuse modprobe fuse
-install ipv6 modprobe ipv6
-# install loop modprobe loop
+# List of module names to be loaded at boot-time
+# Installed into /etc/modules-load.d/ as lava-modules.conf
+
+# fuse
+ipv6
+# loop
diff --git a/etc/lava-options.conf b/etc/lava-options.conf
new file mode 100644
index 0000000..9a3f4d8
--- /dev/null
+++ b/etc/lava-options.conf
@@ -0,0 +1,4 @@
+# modprobe options when loading modules
+# /etc/modprobe.d/lava-options.conf
+
+options loop max_loop=64
diff --git a/setup.py b/setup.py
index 2ce854f..f99306c 100755
--- a/setup.py
+++ b/setup.py
@@ -77,6 +77,8 @@ setup(
('/etc/exports.d',
['etc/lava-dispatcher-nfs.exports']),
('/etc/modprobe.d',
+ ['etc/lava-options.conf']),
+ ('/etc/modules-load.d/',
['etc/lava-modules.conf']),
],
scripts=[