"Fedora Support", step 1 ->

Several changes:
1) Make sure /bin /sbin /lib and /lib64 are ALWAYS symlinks to /usr/XXX,
   no matter what the current distribution does.
2) Make sure nobody and nogroup exist.
3) Fix various modules making assumptions that are not true on every
   distro.
4) Add symlinks to kdm module since fedora is looking for kdmrc in
   yet another spot.
5) Add detection of fedora, support its package manager

What still breaks: dnbd3
Other distros might not work now, they need adaption to changed logic
in some modules.

47 files changed, 307 insertions, 43 deletions

diff --git a/remote/modules/alsa/module.conf.fedora b/remote/modules/alsa/module.conf.fedora
new file mode 100644
index 00000000..4ea213db
--- /dev/null
+++ b/remote/modules/alsa/module.conf.fedora
@@ -0,0 +1,13 @@
+REQUIRED_INSTALLED_PACKAGES="
+	alsa-utils
+	alsa-lib
+"
+REQUIRED_CONTENT_PACKAGES="
+	alsa-utils
+	alsa-lib
+"
+REQUIRED_DIRECTORIES="
+	/usr/share/alsa
+"
+
+# libasound2
diff --git a/remote/modules/beamergui/module.build b/remote/modules/beamergui/module.build
index 26059615..2ff35bfc 100644
--- a/remote/modules/beamergui/module.build
+++ b/remote/modules/beamergui/module.build
@@ -13,7 +13,7 @@ build() {
 	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin"
 	cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!"
 	pinfo "Running qmake"
-	qmake "$SRCDIR/src/beamergui.pro" -r -spec linux-g++ || perror "'qmake' failed (e.g. not installed)."
+	qmake-qt4 "$SRCDIR/src/beamergui.pro" -r -spec linux-g++ || perror "'qmake-qt4' failed (e.g. not installed)."
 	pinfo "Running make"
 	make || perror "'make' failed."
 }
diff --git a/remote/modules/beamergui/module.conf.fedora b/remote/modules/beamergui/module.conf.fedora
new file mode 100644
index 00000000..8b46942d
--- /dev/null
+++ b/remote/modules/beamergui/module.conf.fedora
@@ -0,0 +1,8 @@
+REQUIRED_INSTALLED_PACKAGES="
+qt-devel
+libXrandr-devel
+"
+REQUIRED_CONTENT_PACKAGES="
+qt-devel
+libXrandr
+"
diff --git a/remote/modules/busybox/module.build b/remote/modules/busybox/module.build
index 727a334c..135ba8a1 100644
--- a/remote/modules/busybox/module.build
+++ b/remote/modules/busybox/module.build
@@ -1,8 +1,7 @@
 
 fetch_source() {
-	git clone "${REQUIRED_GIT}" src || perror "Could not clone busybox git"
+	git clone --depth 1 "${REQUIRED_GIT}" --branch "$REQUIRED_BRANCH" src || perror "Could not clone busybox git"
 	cd src || perror "Could not cd to src"
-	git checkout "$REQUIRED_BRANCH" || perror "Could not checkout requested branch"
 	# Patch image centering if not patched yet
 	if ! grep -q "bcenter_image" "miscutils/fbsplash.c"; then
 		git apply "../fbsplash-center.patch" || perror "Could not apply busybox patch for fbsplash image centering"
diff --git a/remote/modules/busybox/module.conf b/remote/modules/busybox/module.conf
index 6acfa16c..82d1731e 100644
--- a/remote/modules/busybox/module.conf
+++ b/remote/modules/busybox/module.conf
@@ -2,6 +2,6 @@ REQUIRED_GIT="git://git.busybox.net/busybox"
 REQUIRED_BRANCH="1_22_1"
 REQUIRED_BINARIES="busybox"
 REQUIRED_DIRECTORIES="
-	/bin
-	/sbin
+	/usr/bin
+	/usr/sbin
 "
diff --git a/remote/modules/cups/module.conf.fedora b/remote/modules/cups/module.conf.fedora
new file mode 100644
index 00000000..6b028b11
--- /dev/null
+++ b/remote/modules/cups/module.conf.fedora
@@ -0,0 +1,12 @@
+REQUIRED_INSTALLED_PACKAGES="
+		cups
+		cups-libs
+		foomatic-filters
+		ghostscript
+"
+REQUIRED_CONTENT_PACKAGES="
+		cups
+		cups-libs
+		foomatic-filters
+		ghostscript
+"
diff --git a/remote/modules/dbus/module.conf.fedora b/remote/modules/dbus/module.conf.fedora
new file mode 100644
index 00000000..f38f590f
--- /dev/null
+++ b/remote/modules/dbus/module.conf.fedora
@@ -0,0 +1,4 @@
+REQUIRED_CONTENT_PACKAGES="
+			dbus
+"
+
diff --git a/remote/modules/idleaction/module.conf.fedora b/remote/modules/idleaction/module.conf.fedora
new file mode 100644
index 00000000..d368cbd8
--- /dev/null
+++ b/remote/modules/idleaction/module.conf.fedora
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+	libX11-devel
+	libXScrnSaver-devel
+	xorg-x11-proto-devel
+"
+
diff --git a/remote/modules/kdm/data/etc/kde b/remote/modules/kdm/data/etc/kde
new file mode 120000
index 00000000..5a94165b
--- /dev/null
+++ b/remote/modules/kdm/data/etc/kde
@@ -0,0 +1 @@
+kde4
\ No newline at end of file
diff --git a/remote/modules/kdm/data/usr/share/config/kdm b/remote/modules/kdm/data/usr/share/config/kdm
new file mode 120000
index 00000000..8f0c47bd
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/config/kdm
@@ -0,0 +1 @@
+/etc/kde4/kdm
\ No newline at end of file
diff --git a/remote/modules/kdm/module.conf.fedora b/remote/modules/kdm/module.conf.fedora
new file mode 100644
index 00000000..59bfacb7
--- /dev/null
+++ b/remote/modules/kdm/module.conf.fedora
@@ -0,0 +1,26 @@
+REQUIRED_INSTALLED_PACKAGES="
+				kdm
+				kgreeter-plugins
+				oxygen-icon-theme
+"
+REQUIRED_CONTENT_PACKAGES="
+				kdm
+				kgreeter-plugins
+"
+REQUIRED_BINARIES=""
+REQUIRED_DIRECTORIES="
+			/usr/bin
+			/usr/share/kde4/services
+			/usr/$LIB64/kde4
+			/usr/libexec/kde4
+"
+REQUIRED_FILES=""
+REQUIRED_LIBRARIES=""
+#non-standard vars
+REQUIRED_SYSTEM_FILES="
+	/usr/share/icons/oxygen/16x16/actions/system-reboot.png
+	/usr/share/icons/oxygen/16x16/actions/system-shutdown.png
+	/usr/share/icons/oxygen/16x16/actions/dialog-cancel.png
+	/usr/share/icons/oxygen/index.theme
+"
+
diff --git a/remote/modules/kdm/module.conf.ubuntu b/remote/modules/kdm/module.conf.ubuntu
index b91d00e0..660b3a1e 100644
--- a/remote/modules/kdm/module.conf.ubuntu
+++ b/remote/modules/kdm/module.conf.ubuntu
@@ -20,7 +20,7 @@ REQUIRED_DIRECTORIES+="
 	/etc/kde4/kdm
 "
 # non-standard vars
-REQUIRED_SYSTEM_FILES+="	
+REQUIRED_SYSTEM_FILES+="
 	/usr/share/kde4/apps/kdm/pics/shutdown.png
 	/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
 	/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
diff --git a/remote/modules/kernel-system/module.build b/remote/modules/kernel-system/module.build
index 91dc4d35..d698db22 100644
--- a/remote/modules/kernel-system/module.build
+++ b/remote/modules/kernel-system/module.build
@@ -10,8 +10,14 @@ get_kernel_version(){
 	declare -rg KERNEL_NEW_VERSION="$KERNEL_CURRENT_VERSION" 2>/dev/null
 
 	# check linux headers directory
-	if [ -d "/usr/src/linux-headers-$(uname -r)" ]; then
-		declare -rg KERNEL_HEADERS_PATH="/usr/src/linux-headers-$(uname -r)" 2>/dev/null
+	if   [ -d "/lib/modules/$KERNEL_CURRENT_VERSION/build" ]; then
+		declare -rg KERNEL_HEADERS_PATH="/lib/modules/$KERNEL_CURRENT_VERSION/build" 2>/dev/null
+	elif [ -d "/lib/modules/$KERNEL_CURRENT_VERSION/source" ]; then
+		declare -rg KERNEL_HEADERS_PATH="/lib/modules/$KERNEL_CURRENT_VERSION/source" 2>/dev/null
+	elif [ -d "/usr/src/linux-headers-$KERNEL_CURRENT_VERSION" ]; then
+		declare -rg KERNEL_HEADERS_PATH="/usr/src/linux-headers-$KERNEL_CURRENT_VERSION" 2>/dev/null
+	elif [ -d "/usr/src/kernels/$KERNEL_CURRENT_VERSION" ]; then
+		declare -rg KERNEL_HEADERS_PATH="/usr/src/kernels/$KERNEL_CURRENT_VERSION" 2>/dev/null
 	else
 		# fetch source did not install the headers correctly.
 		perror "kernel headers for $KERNEL_CURRENT_VERSION not found! Re-build the kernel-system module"
@@ -19,7 +25,7 @@ get_kernel_version(){
 
 	# check kernel modules/firmware	directory
 	if [ -d "/lib/modules/${KERNEL_CURRENT_VERSION}" -a \
-		-d "/lib/firmware/${KERNEL_CURRENT_VERSION}" ]; then
+		-d "/lib/firmware" ]; then
 		# The expected paths exists, set KERNEL_BASE_DIR to /
 		declare -rg KERNEL_BASE_DIR="/" 2>/dev/null
 	else
@@ -52,11 +58,13 @@ build() {
 	# simply copy the kernel from the running system
 	# to the build directory as it is.
 	local KERNEL_SYSTEM_PATH=""
+	local BOOT_IMAGE=""
 	
 	# 1st "parse" /proc/cmdline for the kernel name
 	for i in $(cat /proc/cmdline); do
-		[[ "$i" =~ ^BOOT_IMAGE=.* ]] && local BOOT_IMAGE="$(basename $(echo $i|cut -c 12-))"
+		[[ "$i" == BOOT_IMAGE=* ]] && BOOT_IMAGE="$(basename "${i#BOOT_IMAGE=}")"
 	done
+	[ -z "${BOOT_IMAGE}" ] && local BOOT_IMAGE="$(uname -r)"
 
 	# exit if KERNEL_SYSTEM_FILENAME is empty, should not happen
 	[ -z "${BOOT_IMAGE}" ] && perror "Could not determine the full path to the running kernel..."
@@ -64,14 +72,14 @@ build() {
 	# now find it in KERNEL_SYSTEM_SEARCH_PATH
 	# NOTE: this variable should be expanded in the future if new locations are to be searched
 	local KERNEL_SYSTEM_SEARCH_PATH="/boot"
-	local KERNEL_SYSTEM_SEARCH_RESULTS="$(find "${KERNEL_SYSTEM_SEARCH_PATH}" -type f -iname "*${BOOT_IMAGE}*")"
+	local KERNEL_SYSTEM_SEARCH_RESULTS="$(find "${KERNEL_SYSTEM_SEARCH_PATH}" -type f -name "${BOOT_IMAGE}")"
 
 	if [ "$(echo $KERNEL_SYSTEM_SEARCH_RESULTS|wc -w)" -eq 1 ]; then
 		# we found the running kernel path
 		KERNEL_SYSTEM_PATH="${KERNEL_SYSTEM_SEARCH_RESULTS}"
 	else 
 		# we found more than one, shouldn't happen...
-		perror "Found more than one kernel named '${BOOT_IMAGE}' inside '${KERNEL_SYSTEM_SEARCH_PATH}'."
+		perror "Found no or more than one kernel named '${BOOT_IMAGE}' in '${KERNEL_SYSTEM_SEARCH_PATH}'."
 	fi
 
 	# at this point, we should definitly have KERNEL_SYSTEM_PATH, check just in case :)
diff --git a/remote/modules/kernel-system/module.conf.fedora b/remote/modules/kernel-system/module.conf.fedora
new file mode 100644
index 00000000..cf683784
--- /dev/null
+++ b/remote/modules/kernel-system/module.conf.fedora
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+	kernel-headers
+"
+REQUIRED_CONTENT_PACKAGES="
+	kernel-headers
+"
diff --git a/remote/modules/kernel/aufs3-standalone b/remote/modules/kernel/aufs3-standalone
new file mode 160000
+Subproject 0b4a532fc19edd562b3417914dd1346f96ea482
diff --git a/remote/modules/kernel/kernel-system b/remote/modules/kernel/kernel-system
new file mode 120000
index 00000000..041dc99f
--- /dev/null
+++ b/remote/modules/kernel/kernel-system
@@ -0,0 +1 @@
+../../modules/kernel-system
\ No newline at end of file
diff --git a/remote/modules/kernel/module.build b/remote/modules/kernel/module.build
index 979ce742..9270024d 100644
--- a/remote/modules/kernel/module.build
+++ b/remote/modules/kernel/module.build
@@ -1,6 +1,6 @@
 get_kernel_version() {
 	# determine kernel version that will be running in the generated system
-        if [ -e "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" ]; then
+	if [ -e "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" ]; then
 		# declare kernel version stuff
 		declare -rg SYS_UTS_RELEASE=$(grep 'UTS_RELEASE' "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}')
 		declare -rg SYS_KERNEL=$(echo "$SYS_UTS_RELEASE" | grep -o -E '^[0-9\.]+')
@@ -23,7 +23,7 @@ get_kernel_version() {
 fetch_source() {
 	pdebug "getting kernel sources via git ...."
 	[ -d ./ksrc ] && rm -rf ./ksrc			# slightly brutal ...
-	git clone --depth 1 ${REQUIRED_GIT} ksrc || perror "Could not clone kernel git."
+	git clone --depth 1 "${REQUIRED_GIT}" -b "${REQUIRED_GIT_BRANCH}"  ksrc || perror "Could not clone kernel git."
 	# check for aufs
 	local RSL=$(find ksrc/ -type d -name aufs)
 	if [ -z "$RSL" ]; then
diff --git a/remote/modules/kernel/module.conf.fedora b/remote/modules/kernel/module.conf.fedora
new file mode 100644
index 00000000..53e6ccb6
--- /dev/null
+++ b/remote/modules/kernel/module.conf.fedora
@@ -0,0 +1,3 @@
+REQUIRED_GIT_BRANCH="v${SYSTEM_KERNEL_SHORT}"
+REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
+
diff --git a/remote/modules/kernel/module.conf.opensuse b/remote/modules/kernel/module.conf.opensuse
index a66564fe..cdf57cc7 100644
--- a/remote/modules/kernel/module.conf.opensuse
+++ b/remote/modules/kernel/module.conf.opensuse
@@ -1,2 +1,3 @@
-REQUIRED_GIT_BRANCH="-b openSUSE-${SYS_VERSION}"
-REQUIRED_GIT="git://kernel.opensuse.org/kernel.git $REQUIRED_GIT_BRANCH"
+REQUIRED_GIT_BRANCH="openSUSE-${SYS_VERSION}"
+REQUIRED_GIT="git://kernel.opensuse.org/kernel.git"
+
diff --git a/remote/modules/nscd/module.conf.fedora b/remote/modules/nscd/module.conf.fedora
new file mode 100644
index 00000000..4a61cc19
--- /dev/null
+++ b/remote/modules/nscd/module.conf.fedora
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+	nscd
+"
+REQUIRED_CONTENT_PACKAGES="
+	nscd
+"
diff --git a/remote/modules/openbox/module.conf.fedora b/remote/modules/openbox/module.conf.fedora
new file mode 100644
index 00000000..f919f3b3
--- /dev/null
+++ b/remote/modules/openbox/module.conf.fedora
@@ -0,0 +1,11 @@
+REQUIRED_INSTALLED_PACKAGES="
+			openbox
+			pango
+"
+REQUIRED_CONTENT_PACKAGES="
+			openbox
+			pango
+"
+REQUIRED_DIRECTORIES+="	
+			/usr/$LIB64
+"
diff --git a/remote/modules/pam/module.build b/remote/modules/pam/module.build
index c6d92510..3f0d8861 100644
--- a/remote/modules/pam/module.build
+++ b/remote/modules/pam/module.build
@@ -4,7 +4,7 @@ fetch_source() {
 	# get pam-script source
 	download_untar "$REQUIRED_PAM_SCRIPT_URL" "src/"
 	# Distribution switch: openSuse 13.1 has no package nss-ldap:
-	if [[ "$SYS_DISTRIBUTION" == "opensuse" && "$SYS_VERSION" == "13.1" ]]; then
+	if [ -n "$REQUIRED_NSS_LDAPD_URL" ]; then
 		pinfo "Downloading $REQUIRED_NSS_LDAPD_URL ..."
 		download_untar "$REQUIRED_NSS_LDAPD_URL" "src/"
 	fi
@@ -35,7 +35,7 @@ build() {
 	./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$(dirname ${PAM_UNIX_LOCATION:1})" || 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 [[ "$SYS_DISTRIBUTION" == "opensuse" && "$SYS_VERSION" == "13.1" ]]; then
+	if [ -n "$REQUIRED_NSS_LDAPD_URL" ]; then
 		cd "${MODULE_DIR}/src/$REQUIRED_NSS_LDAPD_VERSION"
 		pinfo "compiling pam-nss-ldapd for openSuse 13.1 ..."
 		./configure || perror "openSuse 13.1 - pam-nss-ldapd: ./configure failed."
diff --git a/remote/modules/pam/module.conf.fedora b/remote/modules/pam/module.conf.fedora
new file mode 100644
index 00000000..b2eb3421
--- /dev/null
+++ b/remote/modules/pam/module.conf.fedora
@@ -0,0 +1,42 @@
+REQUIRED_NSS_LDAPD_VERSION="nss-pam-ldapd-0.8.13"
+REQUIRED_NSS_LDAPD_URL="http://arthurdejong.org/nss-pam-ldapd/${REQUIRED_NSS_LDAPD_VERSION}.tar.gz"
+
+REQUIRED_INSTALLED_PACKAGES="
+	pam
+	pam_krb5
+	pam-devel
+	nss-mdns
+	libnfsidmap
+	openssl-devel
+	openldap-clients
+	nfs-utils
+	glibc
+	pam-devel
+	openldap-devel
+	krb5-devel
+"
+REQUIRED_CONTENT_PACKAGES="
+	pam
+	pam_krb5
+	pam-devel
+	nss-mdns
+	libnfsidmap
+	openldap-clients
+	nfs-utils
+	glibc
+"
+REQUIRED_LIBRARIES+="
+	libnss_compat
+	libnss_db
+	libnss_dns
+	libnss_files
+	libnss_nis
+"
+REQUIRED_DIRECTORIES+="
+	/$LIB64
+	/usr/$LIB64
+"
+REQUIRED_SYSTEM_FILES+="
+	/$LIB64/security
+"
+
diff --git a/remote/modules/pam/module.conf.opensuse b/remote/modules/pam/module.conf.opensuse
index adef3174..dfc50e1e 100644
--- a/remote/modules/pam/module.conf.opensuse
+++ b/remote/modules/pam/module.conf.opensuse
@@ -3,6 +3,7 @@ REQUIRED_INSTALLED_PACKAGES="
 	pam_krb5
 	pam-devel
 	nss-pam-ldapd
+	nss-mdns
 	pam-modules
 	libopenssl-devel
 	openldap2-client
diff --git a/remote/modules/pam/module.conf.opensuse.13.1 b/remote/modules/pam/module.conf.opensuse.13.1
index 9fe1de17..d4435999 100644
--- a/remote/modules/pam/module.conf.opensuse.13.1
+++ b/remote/modules/pam/module.conf.opensuse.13.1
@@ -10,6 +10,7 @@ REQUIRED_INSTALLED_PACKAGES="
 	pam_krb5
 	pam-devel
 	pam-modules
+	nss-mdns
 	libopenssl-devel
 	openldap2-client
 	nfsidmap
diff --git a/remote/modules/polkit/module.conf.fedora b/remote/modules/polkit/module.conf.fedora
new file mode 100644
index 00000000..3d4d965d
--- /dev/null
+++ b/remote/modules/polkit/module.conf.fedora
@@ -0,0 +1,12 @@
+REQUIRED_INSTALLED_PACKAGES="
+				js-1.8.5
+"
+REQUIRED_CONTENT_PACKAGES="
+				js-1.8.5
+				polkit
+"
+REQUIRED_DIRECTORIES+="
+			/usr/lib/polkit-1
+			/var/lib/polkit
+"
+
diff --git a/remote/modules/printergui/module.conf b/remote/modules/printergui/module.conf
index 17203d3e..39e64b16 100644
--- a/remote/modules/printergui/module.conf
+++ b/remote/modules/printergui/module.conf
@@ -4,6 +4,4 @@ REQUIRED_BINARIES="
 	printergui
 	printpwgui
 "
-REQUIRED_SYSTEM_FILES="
-"
 
diff --git a/remote/modules/printergui/module.conf.fedora b/remote/modules/printergui/module.conf.fedora
new file mode 100644
index 00000000..f1f55014
--- /dev/null
+++ b/remote/modules/printergui/module.conf.fedora
@@ -0,0 +1,5 @@
+REQUIRED_INSTALLED_PACKAGES="
+	cups-devel
+	qt-devel
+"
+
diff --git a/remote/modules/printergui/module.conf.opensuse b/remote/modules/printergui/module.conf.opensuse
index 2d4c7a95..478d0a71 100644
--- a/remote/modules/printergui/module.conf.opensuse
+++ b/remote/modules/printergui/module.conf.opensuse
@@ -1,7 +1,5 @@
 REQUIRED_INSTALLED_PACKAGES="
-cups-devel
-libqt4-devel
-"
-REQUIRED_CONTENT_PACKAGES="
-cups-devel
+	cups-devel
+	libqt4-devel
 "
+
diff --git a/remote/modules/printergui/module.conf.ubuntu b/remote/modules/printergui/module.conf.ubuntu
index 54123003..73c89910 100644
--- a/remote/modules/printergui/module.conf.ubuntu
+++ b/remote/modules/printergui/module.conf.ubuntu
@@ -2,6 +2,4 @@ REQUIRED_INSTALLED_PACKAGES="
 	libcups2-dev
 	libqt4-dev
 "
-REQUIRED_CONTENT_PACKAGES="
-	libcups2-dev
-"
+
diff --git a/remote/modules/redsocks/module.conf.fedora b/remote/modules/redsocks/module.conf.fedora
new file mode 100644
index 00000000..fcc0fb45
--- /dev/null
+++ b/remote/modules/redsocks/module.conf.fedora
@@ -0,0 +1,3 @@
+REQUIRED_INSTALLED_PACKAGES="
+	libevent-devel
+"
diff --git a/remote/modules/rsyslogd/module.conf b/remote/modules/rsyslogd/module.conf
index ba36aadf..207f0a1d 100644
--- a/remote/modules/rsyslogd/module.conf
+++ b/remote/modules/rsyslogd/module.conf
@@ -4,3 +4,6 @@ REQUIRED_BINARIES="
 REQUIRED_FILES="	
 			/etc/rsyslog.conf
 "
+REQUIRED_DIRECTORIES="
+			/usr/$LIB64/rsyslog
+"
diff --git a/remote/modules/rsyslogd/module.conf.debian b/remote/modules/rsyslogd/module.conf.debian
index 79aba761..6f3cb891 100644
--- a/remote/modules/rsyslogd/module.conf.debian
+++ b/remote/modules/rsyslogd/module.conf.debian
@@ -1,6 +1,3 @@
 REQUIRED_CONTENT_PACKAGES="	
 			rsyslog
 "
-REQUIRED_DIRECTORIES="
-			/usr/lib/rsyslog
-"
diff --git a/remote/modules/rsyslogd/module.conf.fedora b/remote/modules/rsyslogd/module.conf.fedora
new file mode 100644
index 00000000..6f3cb891
--- /dev/null
+++ b/remote/modules/rsyslogd/module.conf.fedora
@@ -0,0 +1,3 @@
+REQUIRED_CONTENT_PACKAGES="	
+			rsyslog
+"
diff --git a/remote/modules/rsyslogd/module.conf.opensuse b/remote/modules/rsyslogd/module.conf.opensuse
index 51ce0e47..6d7a3c99 100644
--- a/remote/modules/rsyslogd/module.conf.opensuse
+++ b/remote/modules/rsyslogd/module.conf.opensuse
@@ -4,6 +4,3 @@ REQUIRED_CONTENT_PACKAGES="
 REQUIRED_BINARIES+="
 			rsyslog-service-prepare
 "
-REQUIRED_DIRECTORIES="
-			/usr/$LIB64/rsyslog
-"
diff --git a/remote/modules/rsyslogd/module.conf.ubuntu b/remote/modules/rsyslogd/module.conf.ubuntu
index 79aba761..ac8df362 100644
--- a/remote/modules/rsyslogd/module.conf.ubuntu
+++ b/remote/modules/rsyslogd/module.conf.ubuntu
@@ -1,6 +1,4 @@
 REQUIRED_CONTENT_PACKAGES="	
 			rsyslog
 "
-REQUIRED_DIRECTORIES="
-			/usr/lib/rsyslog
-"
+
diff --git a/remote/modules/smartctl/module.conf.fedora b/remote/modules/smartctl/module.conf.fedora
new file mode 100644
index 00000000..d699f2f0
--- /dev/null
+++ b/remote/modules/smartctl/module.conf.fedora
@@ -0,0 +1,6 @@
+REQUIRED_CONTENT_PACKAGES="
+	smartmontools
+"
+REQUIRED_INSTALLED_PACKAGES="
+	smartmontools
+"
diff --git a/remote/modules/smbclient/module.build b/remote/modules/smbclient/module.build
index dc28dd26..ec2c80fe 100644
--- a/remote/modules/smbclient/module.build
+++ b/remote/modules/smbclient/module.build
@@ -9,6 +9,7 @@ build() {
 	list_packet_files >> "$COPYLIST"
 	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
 
+	mkdir -p "${MODULE_BUILD_DIR}/usr/lib/cups/backend" || perror "Could not create '${MODULE_BUILD_DIR}/usr/lib/cups/backend'"
 	local BIN_LOCATION="$(which smbspool)"
 	if [ ! -z "${BIN_LOCATION}" -a -e "${BIN_LOCATION}" ]; then
 		ln -sf "${BIN_LOCATION}" "${MODULE_BUILD_DIR}/usr/lib/cups/backend/smb"
diff --git a/remote/modules/smbclient/module.conf.fedora b/remote/modules/smbclient/module.conf.fedora
new file mode 100644
index 00000000..f524d100
--- /dev/null
+++ b/remote/modules/smbclient/module.conf.fedora
@@ -0,0 +1,9 @@
+REQUIRED_INSTALLED_PACKAGES="
+	samba-client
+"
+REQUIRED_CONTENT_PACKAGES="
+	samba-client
+"
+REQUIRED_FILES="
+	/usr/lib/cups/backend/smb
+"
diff --git a/remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf b/remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf
index 77e6e459..ffb34ca6 100644
--- a/remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf
+++ b/remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf
@@ -1,2 +1,3 @@
 d /var/run/sshd 0755 root root
+d /var/empty/sshd 0755 root root
 
diff --git a/remote/modules/systemd/module.conf.fedora b/remote/modules/systemd/module.conf.fedora
new file mode 100644
index 00000000..9232ea5f
--- /dev/null
+++ b/remote/modules/systemd/module.conf.fedora
@@ -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/systemd/module.conf.opensuse b/remote/modules/systemd/module.conf.opensuse
index 9326a7dc..965333c4 100644
--- a/remote/modules/systemd/module.conf.opensuse
+++ b/remote/modules/systemd/module.conf.opensuse
@@ -1,7 +1,6 @@
 REQUIRED_INSTALLED_PACKAGES="
 			intltool
 			gperf
-			pkg-config
 			libcap-devel
 			libudev-devel
 			dbus-1-devel
diff --git a/remote/modules/systemd/module.conf.ubuntu b/remote/modules/systemd/module.conf.ubuntu
index 2768b51c..e5dff817 100644
--- a/remote/modules/systemd/module.conf.ubuntu
+++ b/remote/modules/systemd/module.conf.ubuntu
@@ -2,7 +2,6 @@ REQUIRED_INSTALLED_PACKAGES="
 			intltool
 			gperf
 			dbus
-			pkg-config
 			libcap-dev
 			libudev-dev
 			libdbus-1-dev
diff --git a/remote/modules/udisks/module.build b/remote/modules/udisks/module.build
index ab9df016..6a8ff7b0 100644
--- a/remote/modules/udisks/module.build
+++ b/remote/modules/udisks/module.build
@@ -7,11 +7,8 @@ build () {
 	COPYLIST="list_dpkg_output"
 	rm -f "$COPYLIST"
 
-   list_packet_files >> "$COPYLIST"
+	list_packet_files >> "$COPYLIST"
 	tarcopy "$(cat "$COPYLIST" | sort -u)" "$MODULE_BUILD_DIR"
-	if [ -d "$MODULE_BUILD_DIR/lib/udev" ]; then
-		cp -a "$MODULE_BUILD_DIR/lib/udev" "$MODULE_BUILD_DIR/usr/lib/" || perror "Could not move /lib/udev to /usr/lib/udev"
-	fi
 	mkdir -p "$MODULE_BUILD_DIR/etc/systemd/system/basic.target.wants" "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services"
 	local FOUND=no
 	local BINARY=$(find "$MODULE_BUILD_DIR" -name udisksd -executable | head -n 1)
diff --git a/remote/modules/udisks/module.conf.fedora b/remote/modules/udisks/module.conf.fedora
new file mode 100644
index 00000000..abf12be7
--- /dev/null
+++ b/remote/modules/udisks/module.conf.fedora
@@ -0,0 +1,7 @@
+REQUIRED_INSTALLED_PACKAGES="
+	udisks2
+"
+REQUIRED_CONTENT_PACKAGES="
+	udisks2
+"
+
diff --git a/remote/modules/vmchooser/module.conf.fedora b/remote/modules/vmchooser/module.conf.fedora
new file mode 100644
index 00000000..d012e561
--- /dev/null
+++ b/remote/modules/vmchooser/module.conf.fedora
@@ -0,0 +1,3 @@
+REQUIRED_INSTALLED_PACKAGES="
+				qt-devel
+"
diff --git a/remote/modules/xorg/module.conf.fedora b/remote/modules/xorg/module.conf.fedora
new file mode 100644
index 00000000..5cb5a594
--- /dev/null
+++ b/remote/modules/xorg/module.conf.fedora
@@ -0,0 +1,69 @@
+# 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-i740
+			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-i740
+			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
+"