summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorManuel Schneider2014-07-23 15:56:46 +0200
committerManuel Schneider2014-07-23 15:56:46 +0200
commitb2ca6da5c5fad2aa6bb08557e5599f67e82633d4 (patch)
tree06d6c9839a7dfcb6378e2a276de9dae1e5a89de0 /remote/rootfs
parent[pvs2] Config for pvs2 room templates containing room -100 (diff)
parent[drm] one more nvidia: 10de-0dd8: nvidia Quadro 2000 (diff)
downloadtm-scripts-b2ca6da5c5fad2aa6bb08557e5599f67e82633d4.tar.gz
tm-scripts-b2ca6da5c5fad2aa6bb08557e5599f67e82633d4.tar.xz
tm-scripts-b2ca6da5c5fad2aa6bb08557e5599f67e82633d4.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
-rw-r--r--remote/rootfs/rootfs-stage31/templates/drm.cfg7
-rw-r--r--remote/rootfs/rootfs-stage32/module.conf1
-rw-r--r--remote/rootfs/rootfs-stage32/module.conf.centos17
-rw-r--r--remote/rootfs/rootfs-stage32/module.conf.fedora1
-rw-r--r--remote/rootfs/rootfs-stage32/module.conf.ubuntu1
5 files changed, 24 insertions, 3 deletions
diff --git a/remote/rootfs/rootfs-stage31/templates/drm.cfg b/remote/rootfs/rootfs-stage31/templates/drm.cfg
index 45eda39f..fc5a16cd 100644
--- a/remote/rootfs/rootfs-stage31/templates/drm.cfg
+++ b/remote/rootfs/rootfs-stage31/templates/drm.cfg
@@ -10,3 +10,10 @@
@nvidia nvidia/nvidia.ko nvidia/nvidia-uvm.ko
@nvidia_fallback nouveau
##
+# 10de-11c0: nvidia Geforce GTX 660 (OG)
+# 10de-0fc2: nvidia GeForce GT 630 (OG)
+# 10de-0dd8: nvidia Quadro 2000
+##
+10de-11c0 @nvidia
+10de-0fc2 @nvidia
+10de-0dd8 @nvidia
diff --git a/remote/rootfs/rootfs-stage32/module.conf b/remote/rootfs/rootfs-stage32/module.conf
index 05a87d09..3a160a36 100644
--- a/remote/rootfs/rootfs-stage32/module.conf
+++ b/remote/rootfs/rootfs-stage32/module.conf
@@ -18,7 +18,6 @@ REQUIRED_BINARIES="
mkfs.xfs
mkfs.ext3
mkfs.ext4
- mkfs.jfs
blkid
modprobe
ps
diff --git a/remote/rootfs/rootfs-stage32/module.conf.centos b/remote/rootfs/rootfs-stage32/module.conf.centos
new file mode 100644
index 00000000..da290670
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/module.conf.centos
@@ -0,0 +1,17 @@
+REQUIRED_INSTALLED_PACKAGES="
+ ntpdate
+ nfs-utils
+ xfsprogs
+ squashfs-tools
+ curl
+ xvidtune
+ xterm
+"
+REQUIRED_CONTENT_PACKAGES="
+"
+REQUIRED_DIRECTORIES="
+ /usr/$LIB64/xtables
+"
+REQUIRED_FILES+="
+ /usr/share/X11/app-defaults/Xvidtune
+"
diff --git a/remote/rootfs/rootfs-stage32/module.conf.fedora b/remote/rootfs/rootfs-stage32/module.conf.fedora
index d714a2c7..da290670 100644
--- a/remote/rootfs/rootfs-stage32/module.conf.fedora
+++ b/remote/rootfs/rootfs-stage32/module.conf.fedora
@@ -3,7 +3,6 @@ REQUIRED_INSTALLED_PACKAGES="
nfs-utils
xfsprogs
squashfs-tools
- jfsutils
curl
xvidtune
xterm
diff --git a/remote/rootfs/rootfs-stage32/module.conf.ubuntu b/remote/rootfs/rootfs-stage32/module.conf.ubuntu
index 646c39a0..fce04277 100644
--- a/remote/rootfs/rootfs-stage32/module.conf.ubuntu
+++ b/remote/rootfs/rootfs-stage32/module.conf.ubuntu
@@ -4,7 +4,6 @@ REQUIRED_INSTALLED_PACKAGES="
whois
xfsprogs
ntpdate
- jfsutils
curl
"
REQUIRED_DIRECTORIES="