summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Schneider2014-07-23 15:56:46 +0200
committerManuel Schneider2014-07-23 15:56:46 +0200
commitb2ca6da5c5fad2aa6bb08557e5599f67e82633d4 (patch)
tree06d6c9839a7dfcb6378e2a276de9dae1e5a89de0
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
-rwxr-xr-xmltk6
-rw-r--r--remote/includes/distribution.inc2
-rw-r--r--remote/includes/paths.inc13
-rw-r--r--remote/includes/system.inc6
-rw-r--r--remote/modules/dbus/module.conf.centos4
-rwxr-xr-xremote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script4
-rw-r--r--remote/modules/idleaction/module.conf.centos6
-rw-r--r--remote/modules/kernel/module.conf.centos3
-rw-r--r--remote/modules/nscd/module.conf.centos6
-rw-r--r--remote/modules/pam/module.build9
-rw-r--r--remote/modules/pam/module.conf.centos36
-rw-r--r--remote/modules/pam/module.conf.ubuntu4
-rw-r--r--remote/modules/pam/module.conf.ubuntu.145
-rw-r--r--remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient10
-rw-r--r--remote/modules/rsyslogd/module.conf.centos3
-rw-r--r--remote/modules/smartctl/module.conf.centos6
-rw-r--r--remote/modules/systemd/module.build32
-rw-r--r--remote/modules/systemd/module.conf1
-rw-r--r--remote/modules/systemd/module.conf.centos11
-rw-r--r--remote/modules/vmchooser2/module.build2
-rw-r--r--remote/modules/xorg/module.conf.centos67
-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
l---------remote/targets/stage32-headless/cron1
l---------remote/targets/stage32-headless/dbus1
l---------remote/targets/stage32-headless/dhcpc-busybox1
l---------remote/targets/stage32-headless/dnbd31
l---------remote/targets/stage32-headless/german1
l---------remote/targets/stage32-headless/idleaction1
l---------remote/targets/stage32-headless/kernel1
l---------remote/targets/stage32-headless/nscd1
l---------remote/targets/stage32-headless/pam1
l---------remote/targets/stage32-headless/rootfs-stage321
l---------remote/targets/stage32-headless/rsyslogd1
l---------remote/targets/stage32-headless/smartctl1
l---------remote/targets/stage32-headless/sshd1
l---------remote/targets/stage32-headless/systemd1
l---------remote/targets/stage32-headless/xorg1
41 files changed, 239 insertions, 39 deletions
diff --git a/mltk b/mltk
index 0c5b2361..ffa857a6 100755
--- a/mltk
+++ b/mltk
@@ -98,7 +98,7 @@ check_devtools() {
# Checking for needed development tools, compilers etc.
# Required: m4 make gcc g++ binutils
# no qmake here, qmake (libqt4-devel) should be installed in a module!
- local DEV_TOOLS="gcc g++ make m4 strip git depmod patch pkg-config" # 'strip' as marker for binutils
+ local DEV_TOOLS="gcc g++ make cmake m4 strip git depmod patch pkg-config" # 'strip' as marker for binutils
# DEV_CHECK marks missing dev-tools
local DEV_TOOLS_MISSING=""
@@ -112,7 +112,7 @@ check_devtools() {
pinfo "For $SYS_DISTRIBUTION you probably need to run:"
case $SYS_DISTRIBUTION in
ubuntu | debian)
- pinfo "apt-get install build-essential m4 squashfs-tools pkg-config"
+ pinfo "apt-get install build-essential m4 squashfs-tools pkg-config cmake"
pinfo "to install missing development tools."
;;
# FIXME: Don't know how precise this filter works so we might want to have a better matching ...
@@ -121,7 +121,7 @@ check_devtools() {
pinfo "to install missing development tools."
;;
fedora | scientific)
- pinfo "yum install redhat-lsb gcc-c++ gcc make m4 binutils pkgconfig patch"
+ pinfo "yum install redhat-lsb gcc-c++ gcc make m4 binutils pkgconfig patch cmake"
;;
*)
perror "No installation help for $SYS_DISTRIBUTION available."
diff --git a/remote/includes/distribution.inc b/remote/includes/distribution.inc
index 137da7ef..485d1224 100644
--- a/remote/includes/distribution.inc
+++ b/remote/includes/distribution.inc
@@ -18,7 +18,7 @@ detect_distribution () {
PACKET_MANAGER="zypper"
PACKET_HANDLER="rpm"
;;
- scientific|fedora)
+ centos|scientific|fedora)
PACKET_MANAGER="yum"
PACKET_HANDLER="rpm"
;;
diff --git a/remote/includes/paths.inc b/remote/includes/paths.inc
new file mode 100644
index 00000000..8ab016df
--- /dev/null
+++ b/remote/includes/paths.inc
@@ -0,0 +1,13 @@
+#
+# This include tries to determine system paths needed by mltk-modules
+# The idea here is to have a central place to determine paths required
+# by different modules instead of each module determining them on its own.
+#
+
+
+# Location of PAM-modules
+for CANDIDATE in $(strings "$(ldd "$(which login)" | grep libpam.so | head -n 1 | awk '{print $3}')" | grep /lib); do
+ [ -f "$CANDIDATE/pam_unix.so" ] && declare -rg SYS_PAM_MODULES_PATH="$CANDIDATE" && break
+done
+
+[ -z "$SYS_PAM_MODULES_PATH" ] && perror "Failed to find pam_unix.so on this system."
diff --git a/remote/includes/system.inc b/remote/includes/system.inc
index 17a80761..23a5f18b 100644
--- a/remote/includes/system.inc
+++ b/remote/includes/system.inc
@@ -19,9 +19,8 @@ export MAKEFLAGS="-j$CPU_CORES"
if [ "$(uname -m)x" = "x86_64x" ]; then
# Setting LIB64, as openSuse differentiates but Ubuntu does not:
case $SYS_DISTRIBUTION in
- ubuntu | debian) LIB64="lib" ;;
- opensuse) LIB64="lib64" ;;
- fedora) LIB64="lib64" ;;
+ ubuntu | debian) LIB64="lib" ;;
+ opensuse | fedora | centos) LIB64="lib64" ;;
*) perror "Cannot set LIB64, SYS_DISTRIBUTION: $SYS_DISTRIBUTION unknown!" ;;
esac
AMD64_I386=amd64
@@ -35,4 +34,3 @@ else
AMD64_X86=x86
ARCHREGEX="(i[3456]86|x86[_-]32)"
fi
-
diff --git a/remote/modules/dbus/module.conf.centos b/remote/modules/dbus/module.conf.centos
new file mode 100644
index 00000000..f38f590f
--- /dev/null
+++ b/remote/modules/dbus/module.conf.centos
@@ -0,0 +1,4 @@
+REQUIRED_CONTENT_PACKAGES="
+ dbus
+"
+
diff --git a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
index 964c49c4..f034553c 100755
--- a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
+++ b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
@@ -127,5 +127,9 @@ if [ -n "$SLX_SHUTDOWN_SCHEDULE" -o -n "$SLX_REBOOT_SCHEDULE" ] && [ ! -e "$CRON
[ "$MINUTE" -lt 0 -o "$MINUTE" -gt 59 ] && invalid_time && continue
echo "$MINUTE $HOUR * * * root /opt/openslx/scripts/idleaction-scheduled_reboot" >> "$CRONFILE"
done
+ (
+ sleep 20
+ systemctl restart cron
+ ) &
fi
diff --git a/remote/modules/idleaction/module.conf.centos b/remote/modules/idleaction/module.conf.centos
new file mode 100644
index 00000000..d368cbd8
--- /dev/null
+++ b/remote/modules/idleaction/module.conf.centos
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+ libX11-devel
+ libXScrnSaver-devel
+ xorg-x11-proto-devel
+"
+
diff --git a/remote/modules/kernel/module.conf.centos b/remote/modules/kernel/module.conf.centos
new file mode 100644
index 00000000..2e958ce4
--- /dev/null
+++ b/remote/modules/kernel/module.conf.centos
@@ -0,0 +1,3 @@
+REQUIRED_GIT_BRANCH="v${SYSTEM_KERNEL_SHORT%.0}"
+REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
+
diff --git a/remote/modules/nscd/module.conf.centos b/remote/modules/nscd/module.conf.centos
new file mode 100644
index 00000000..4a61cc19
--- /dev/null
+++ b/remote/modules/nscd/module.conf.centos
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+ nscd
+"
+REQUIRED_CONTENT_PACKAGES="
+ nscd
+"
diff --git a/remote/modules/pam/module.build b/remote/modules/pam/module.build
index 3f0d8861..b678fdd6 100644
--- a/remote/modules/pam/module.build
+++ b/remote/modules/pam/module.build
@@ -28,12 +28,13 @@ build() {
tarcopy "$(cat "$COPYLIST")" "${MODULE_BUILD_DIR}"
# build pam-script separatly since we use a source tarball
+
# HACK: find pam_unix.so in MODULE_BUILD_DIR to see where to put pam_script at
- cd "$MODULE_BUILD_DIR"
- local PAM_UNIX_LOCATION=$(find . -name pam_unix.so)
cd "${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}" || perror "Could not cd to ${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}."
- ./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$(dirname ${PAM_UNIX_LOCATION:1})" || perror "pam-script: ./configure failed."
+ ./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$SYS_PAM_MODULES_PATH" || perror "pam-script: ./configure failed."
make DESTDIR="${MODULE_BUILD_DIR}" install || perror "pam-script: make install to ${MODULE_BUILD_DIR} failed."
+
+
# openSuse 13.1 has no package nss-pam-ldapd. So, we compile it.
if [ -n "$REQUIRED_NSS_LDAPD_URL" ]; then
cd "${MODULE_DIR}/src/$REQUIRED_NSS_LDAPD_VERSION"
@@ -46,7 +47,7 @@ build() {
cd "$MODULE_BUILD_DIR"
local NSLCD_PATH=$(which nslcd)
fi
- [ -z "$NSLCD_PATH" ] && perror "Could not 'which nslcd'"
+ [[ $REQUIRED_BINARIES = *nslcd* ]] && [ -z "$NSLCD_PATH" ] && perror "Could not 'which nslcd'"
# Build nslcd service file
mkdir -p "etc/systemd/system"
sed "s,%PATH%,$NSLCD_PATH,g" "$MODULE_DIR/templates/nslcd-systemd.service" > "etc/systemd/system/nslcd.service" || perror "Could not fill nslcd.service template"
diff --git a/remote/modules/pam/module.conf.centos b/remote/modules/pam/module.conf.centos
new file mode 100644
index 00000000..5dadea53
--- /dev/null
+++ b/remote/modules/pam/module.conf.centos
@@ -0,0 +1,36 @@
+# erase generic conf settings
+REQUIRED_BINARIES=""
+REQUIRED_FILES=""
+REQUIRED_INSTALLED_PACKAGES="
+ pam
+ pam-devel
+ pam_krb5
+ libnfsidmap
+ nss-mdns
+ openssl-devel
+ nfs-utils
+ glibc
+"
+REQUIRED_CONTENT_PACKAGES="
+ pam
+ pam-devel
+ pam_krb5
+ libnfsidmap
+ nss-mdns
+ nfs-utils
+ glibc
+"
+REQUIRED_LIBRARIES+="
+ libnss_compat
+ libnss_db
+ libnss_dns
+ libnss_files
+ libnss_nis
+"
+REQUIRED_DIRECTORIES+="
+ /$LIB64
+"
+REQUIRED_SYSTEM_FILES+="
+ $SYS_PAM_MODULES_PATH
+"
+
diff --git a/remote/modules/pam/module.conf.ubuntu b/remote/modules/pam/module.conf.ubuntu
index 31023197..4a3635fc 100644
--- a/remote/modules/pam/module.conf.ubuntu
+++ b/remote/modules/pam/module.conf.ubuntu
@@ -39,13 +39,11 @@ REQUIRED_BINARIES+="
mount.cifs
"
REQUIRED_DIRECTORIES+="
+ $SYS_PAM_MODULES_PATH
/lib
/usr/lib
"
REQUIRED_SYSTEM_FILES+="
/etc/pam.conf
/etc/default/locale
- /lib/security
- /lib/${ARCH_TRIPLET}/security
- /sbin/mkhomedir_helper
"
diff --git a/remote/modules/pam/module.conf.ubuntu.14 b/remote/modules/pam/module.conf.ubuntu.14
index 2f46770c..26307d84 100644
--- a/remote/modules/pam/module.conf.ubuntu.14
+++ b/remote/modules/pam/module.conf.ubuntu.14
@@ -39,20 +39,19 @@ REQUIRED_BINARIES+="
mount.cifs
"
REQUIRED_DIRECTORIES+="
+ $SYS_PAM_MODULES_PATH
/lib
/usr/lib
"
REQUIRED_SYSTEM_FILES+="
/etc/pam.conf
/etc/default/locale
- /lib/${ARCH_TRIPLET}/security
- /sbin/mkhomedir_helper
"
# For Ubuntu 14.04: Both packages were dropped from official repos. Do not change the
# order, as these packages will be installed via dpkg and depend on each other.
REQUIRED_DOWNLOAD_URLS="
- de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libncp_2.2.6-9ubuntu1_amd64.deb
+ de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libncp_2.2.6-9ubuntu1_amd64.deb
de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libpam-ncp_2.2.6-9ubuntu1_amd64.deb
de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/ncpfs_2.2.6-9ubuntu1_amd64.deb
"
diff --git a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
index 75ba0709..b33889df 100644
--- a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
+++ b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
@@ -1,11 +1,9 @@
#!/bin/ash
# If the ENV var PVS has been set by vmchooser start pvsclient
-if [ -n "$PVS" -a "$PVS" = "true" ]; then
- if [ -n "$PVS_SESSIONID" ]; then
- pvsclient --session-id "$PVS_SESSIONID" &
- else
- pvsclient &
- fi
+if [ -n "$PVS_SESSIONID" ]; then
+ pvsclient --session-id "$PVS_SESSIONID" &
+else
+ pvsclient &
fi
diff --git a/remote/modules/rsyslogd/module.conf.centos b/remote/modules/rsyslogd/module.conf.centos
new file mode 100644
index 00000000..6f3cb891
--- /dev/null
+++ b/remote/modules/rsyslogd/module.conf.centos
@@ -0,0 +1,3 @@
+REQUIRED_CONTENT_PACKAGES="
+ rsyslog
+"
diff --git a/remote/modules/smartctl/module.conf.centos b/remote/modules/smartctl/module.conf.centos
new file mode 100644
index 00000000..d699f2f0
--- /dev/null
+++ b/remote/modules/smartctl/module.conf.centos
@@ -0,0 +1,6 @@
+REQUIRED_CONTENT_PACKAGES="
+ smartmontools
+"
+REQUIRED_INSTALLED_PACKAGES="
+ smartmontools
+"
diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build
index 4851f682..6e1cf4c1 100644
--- a/remote/modules/systemd/module.build
+++ b/remote/modules/systemd/module.build
@@ -59,11 +59,28 @@ build () {
export PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/lib64/pkgconfig:${MODULE_BUILD_DIR}/usr/lib/pkgconfig"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${MODULE_BUILD_DIR}/usr/lib:${MODULE_BUILD_DIR}/usr/lib64"
- ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \
- --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \
- --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam \
- --enable-kmod \
+ ./configure \
+ --disable-manpages \
+ --enable-split-usr \
+ --sysconfdir="/etc" \
+ --enable-gtk-doc-html=no \
+ --disable-nls \
+ --disable-microhttpd \
+ --disable-bootchart \
+ --disable-quotacheck \
+ --disable-hostnamed \
+ --disable-timedated \
+ --disable-localed \
+ --disable-coredump \
+ --disable-keymap \
+ --without-python \
+ --enable-blkid \
+ --enable-acl \
+ --enable-pam \
+ --enable-kmod \
+ --with-pamlibdir="$SYS_PAM_MODULES_PATH" \
|| perror "configure failed."
+
pinfo "calling make"
make || perror "make failed."
pinfo "calling make install"
@@ -82,12 +99,5 @@ post_copy() {
if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ]; then
sed -i "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
fi
-
- # add pam_systemd.so to pam modules directory
- if [ -e "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" ]; then
- cp "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" "${TARGET_BUILD_DIR}/lib/security/"
- else
- pdebug "No such file: ${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so"
- fi
}
diff --git a/remote/modules/systemd/module.conf b/remote/modules/systemd/module.conf
index 4ca11365..1bc0165e 100644
--- a/remote/modules/systemd/module.conf
+++ b/remote/modules/systemd/module.conf
@@ -56,6 +56,7 @@ REQUIRED_BINARIES="
scsi_id
v4l_id"
REQUIRED_DIRECTORIES="
+ $SYS_PAM_MODULES_PATH
/etc
/usr/include
/usr/share/dbus-1
diff --git a/remote/modules/systemd/module.conf.centos b/remote/modules/systemd/module.conf.centos
new file mode 100644
index 00000000..9232ea5f
--- /dev/null
+++ b/remote/modules/systemd/module.conf.centos
@@ -0,0 +1,11 @@
+REQUIRED_INSTALLED_PACKAGES="
+ intltool
+ gperf
+ libcap-devel
+ libudev-devel
+ dbus-devel
+ libxslt
+ libblkid-devel
+ libacl-devel
+ glib2-devel
+"
diff --git a/remote/modules/vmchooser2/module.build b/remote/modules/vmchooser2/module.build
index e129b04e..b2f89702 100644
--- a/remote/modules/vmchooser2/module.build
+++ b/remote/modules/vmchooser2/module.build
@@ -1,6 +1,6 @@
fetch_source() {
- git clone --depth 1 "${REQUIRED_GIT}" src
+ git clone "${REQUIRED_GIT}" src
}
build() {
diff --git a/remote/modules/xorg/module.conf.centos b/remote/modules/xorg/module.conf.centos
new file mode 100644
index 00000000..ff5846e3
--- /dev/null
+++ b/remote/modules/xorg/module.conf.centos
@@ -0,0 +1,67 @@
+# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse
+REQUIRED_INSTALLED_PACKAGES="
+ xorg-x11-server-Xorg
+ xorg-x11-drv-vmware
+ xorg-x11-drv-ati
+ xorg-x11-drv-nouveau
+ xorg-x11-drv-intel
+ xorg-x11-drv-vesa
+ xorg-x11-drv-fbdev
+ xorg-x11-drv-modesetting
+ xorg-x11-drv-vmmouse
+ xorg-x11-drv-wacom
+ xorg-x11-drv-evdev
+ xorg-x11-drv-keyboard
+ xorg-x11-drv-mouse
+ xorg-x11-drv-synaptics
+ xorg-x11-drv-void
+ xkeyboard-config
+ dejavu-sans-fonts
+ libxcb
+ mesa-dri-drivers
+ mesa-libGL
+ xorg-x11-xkb-utils
+ xorg-x11-xkb-extras
+ pixman
+ xorg-x11-server-utils
+"
+REQUIRED_CONTENT_PACKAGES="
+ xorg-x11-server-Xorg
+ xorg-x11-drv-vmware
+ xorg-x11-drv-ati
+ xorg-x11-drv-nouveau
+ xorg-x11-drv-intel
+ xorg-x11-drv-vesa
+ xorg-x11-drv-fbdev
+ xorg-x11-drv-modesetting
+ xorg-x11-drv-vmmouse
+ xorg-x11-drv-wacom
+ xorg-x11-drv-evdev
+ xorg-x11-drv-keyboard
+ xorg-x11-drv-mouse
+ xorg-x11-drv-synaptics
+ xorg-x11-drv-void
+ xkeyboard-config
+ dejavu-sans-fonts
+ libxcb
+ mesa-dri-drivers
+ mesa-libGL
+ xorg-x11-xkb-utils
+ xorg-x11-xkb-extras
+ pixman
+ xorg-x11-server-utils
+"
+REQUIRED_LIBRARIES="
+ libxcb-glx
+ libIntelXvMC
+ i965_dri
+ vmwgfx_dri
+ i915_dri
+ libpixman-1
+"
+REQUIRED_DIRECTORIES+="
+ /usr/bin
+ /usr/lib/udev
+ /usr/$LIB64/xorg
+ /usr/share/fonts
+"
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="
diff --git a/remote/targets/stage32-headless/cron b/remote/targets/stage32-headless/cron
new file mode 120000
index 00000000..39164da5
--- /dev/null
+++ b/remote/targets/stage32-headless/cron
@@ -0,0 +1 @@
+../../modules/cron \ No newline at end of file
diff --git a/remote/targets/stage32-headless/dbus b/remote/targets/stage32-headless/dbus
new file mode 120000
index 00000000..dd148715
--- /dev/null
+++ b/remote/targets/stage32-headless/dbus
@@ -0,0 +1 @@
+../../modules/dbus \ No newline at end of file
diff --git a/remote/targets/stage32-headless/dhcpc-busybox b/remote/targets/stage32-headless/dhcpc-busybox
new file mode 120000
index 00000000..ea3634e6
--- /dev/null
+++ b/remote/targets/stage32-headless/dhcpc-busybox
@@ -0,0 +1 @@
+../../modules/dhcpc-busybox \ No newline at end of file
diff --git a/remote/targets/stage32-headless/dnbd3 b/remote/targets/stage32-headless/dnbd3
new file mode 120000
index 00000000..fa80b45c
--- /dev/null
+++ b/remote/targets/stage32-headless/dnbd3
@@ -0,0 +1 @@
+../../modules/dnbd3 \ No newline at end of file
diff --git a/remote/targets/stage32-headless/german b/remote/targets/stage32-headless/german
new file mode 120000
index 00000000..4469f96e
--- /dev/null
+++ b/remote/targets/stage32-headless/german
@@ -0,0 +1 @@
+../../modules/german \ No newline at end of file
diff --git a/remote/targets/stage32-headless/idleaction b/remote/targets/stage32-headless/idleaction
new file mode 120000
index 00000000..09fd9493
--- /dev/null
+++ b/remote/targets/stage32-headless/idleaction
@@ -0,0 +1 @@
+../../modules/idleaction \ No newline at end of file
diff --git a/remote/targets/stage32-headless/kernel b/remote/targets/stage32-headless/kernel
new file mode 120000
index 00000000..044f086d
--- /dev/null
+++ b/remote/targets/stage32-headless/kernel
@@ -0,0 +1 @@
+../../modules/kernel \ No newline at end of file
diff --git a/remote/targets/stage32-headless/nscd b/remote/targets/stage32-headless/nscd
new file mode 120000
index 00000000..d7e411d2
--- /dev/null
+++ b/remote/targets/stage32-headless/nscd
@@ -0,0 +1 @@
+../../modules/nscd \ No newline at end of file
diff --git a/remote/targets/stage32-headless/pam b/remote/targets/stage32-headless/pam
new file mode 120000
index 00000000..588acdbf
--- /dev/null
+++ b/remote/targets/stage32-headless/pam
@@ -0,0 +1 @@
+../../modules/pam \ No newline at end of file
diff --git a/remote/targets/stage32-headless/rootfs-stage32 b/remote/targets/stage32-headless/rootfs-stage32
new file mode 120000
index 00000000..96dcbb86
--- /dev/null
+++ b/remote/targets/stage32-headless/rootfs-stage32
@@ -0,0 +1 @@
+../../rootfs/rootfs-stage32 \ No newline at end of file
diff --git a/remote/targets/stage32-headless/rsyslogd b/remote/targets/stage32-headless/rsyslogd
new file mode 120000
index 00000000..339d02f8
--- /dev/null
+++ b/remote/targets/stage32-headless/rsyslogd
@@ -0,0 +1 @@
+../../modules/rsyslogd \ No newline at end of file
diff --git a/remote/targets/stage32-headless/smartctl b/remote/targets/stage32-headless/smartctl
new file mode 120000
index 00000000..3a48434f
--- /dev/null
+++ b/remote/targets/stage32-headless/smartctl
@@ -0,0 +1 @@
+../../modules/smartctl \ No newline at end of file
diff --git a/remote/targets/stage32-headless/sshd b/remote/targets/stage32-headless/sshd
new file mode 120000
index 00000000..56b4e4b5
--- /dev/null
+++ b/remote/targets/stage32-headless/sshd
@@ -0,0 +1 @@
+../../modules/sshd \ No newline at end of file
diff --git a/remote/targets/stage32-headless/systemd b/remote/targets/stage32-headless/systemd
new file mode 120000
index 00000000..2dc58bd3
--- /dev/null
+++ b/remote/targets/stage32-headless/systemd
@@ -0,0 +1 @@
+../../modules/systemd \ No newline at end of file
diff --git a/remote/targets/stage32-headless/xorg b/remote/targets/stage32-headless/xorg
new file mode 120000
index 00000000..a9494860
--- /dev/null
+++ b/remote/targets/stage32-headless/xorg
@@ -0,0 +1 @@
+../../modules/xorg \ No newline at end of file