/var/run -> /run

14 files changed, 20 insertions, 15 deletions

diff --git a/core/includes/packagemanager.inc b/core/includes/packagemanager.inc
index 864366eb..1a22f474 100644
--- a/core/includes/packagemanager.inc
+++ b/core/includes/packagemanager.inc
@@ -52,13 +52,14 @@ list_content_package() {
 		PACKAGECOMMAND="rpm -ql"
 	fi
 
+	local filter='share/(man|doc)|^(/var)?/run|^/var/log|^/etc/init\.d'
 	if [ -n "$REQUIRED_PACKET_FILES_BLACKLIST" ]; then
 		FILES="$($PACKAGECOMMAND "$PACKAGE" | grep "^/" | \
 			grep -v "$REQUIRED_PACKET_FILES_BLACKLIST" | \
-			grep -v -E 'share/(man|doc)|/var/run|/var/log|/etc/init\.d'; \
+			grep -v -E "$filter"; \
 			echo ":###:${PIPESTATUS[0]}")"
 	else
-		FILES="$($PACKAGECOMMAND "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log|/etc/init\.d'; echo ":###:${PIPESTATUS[0]}")"
+		FILES="$($PACKAGECOMMAND "$PACKAGE" | grep "^/" | grep -v -E "$filter"; echo ":###:${PIPESTATUS[0]}")"
 	fi
 
 	# ugly hack to get our return value
diff --git a/core/modules/busybox/openslx-busybox-config b/core/modules/busybox/openslx-busybox-config
index 3b58a9fa..cf5bad8d 100644
--- a/core/modules/busybox/openslx-busybox-config
+++ b/core/modules/busybox/openslx-busybox-config
@@ -42,7 +42,7 @@ CONFIG_FEATURE_DEVPTS=y
 CONFIG_FEATURE_UTMP=y
 # CONFIG_FEATURE_WTMP is not set
 CONFIG_FEATURE_PIDFILE=y
-CONFIG_PID_FILE_PATH="/var/run"
+CONFIG_PID_FILE_PATH="/run"
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
diff --git a/core/modules/cups/data/etc/cups/cupsd.conf b/core/modules/cups/data/etc/cups/cupsd.conf
index bd3bc179..0bc3a836 100644
--- a/core/modules/cups/data/etc/cups/cupsd.conf
+++ b/core/modules/cups/data/etc/cups/cupsd.conf
@@ -18,7 +18,7 @@ SystemGroup lpadmin
 
 # Only listen for connections from the local machine.
 Listen localhost:631
-Listen /var/run/cups/cups.sock
+Listen /run/cups/cups.sock
 
 # Show shared printers on the local network.
 Browsing Off
diff --git a/core/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc b/core/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc
index 3690c3c6..4fa3b427 100644
--- a/core/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc
+++ b/core/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc
@@ -1,5 +1,5 @@
 [General]
-PidFile=/var/run/kdm.pid
+PidFile=/run/kdm.pid
 ServerVTs=-7
 # Always spawn :0 (this is the default but it won't hurt)
 StaticServers=:0
diff --git a/core/modules/kdm/data/etc/kde4/kdm/kdmrc b/core/modules/kdm/data/etc/kde4/kdm/kdmrc
index b14a7929..a5953c2f 100644
--- a/core/modules/kdm/data/etc/kde4/kdm/kdmrc
+++ b/core/modules/kdm/data/etc/kde4/kdm/kdmrc
@@ -1,5 +1,5 @@
 [General]
-PidFile=/var/run/kdm.pid
+PidFile=/run/kdm.pid
 ServerVTs=-7
 # Always spawn :0 (this is the default but it won't hurt)
 StaticServers=:0
diff --git a/core/modules/kdm/data/etc/tmpfiles.d/kdm.conf b/core/modules/kdm/data/etc/tmpfiles.d/kdm.conf
index 9b726ba2..4e85c5ae 100644
--- a/core/modules/kdm/data/etc/tmpfiles.d/kdm.conf
+++ b/core/modules/kdm/data/etc/tmpfiles.d/kdm.conf
@@ -1,2 +1,2 @@
-d /var/run/kdm 0755 root root
+d /run/kdm 0755 root root
 
diff --git a/core/modules/libvirt-src/module.build b/core/modules/libvirt-src/module.build
index 2b380cb3..ef45f5c0 100644
--- a/core/modules/libvirt-src/module.build
+++ b/core/modules/libvirt-src/module.build
@@ -66,7 +66,9 @@ build() {
 	sed -i 's/^libdir=.*$/libdir=\/usr\/lib\/x86_64-linux-gnu/g' "${DSTDIR}/usr/lib64/pkgconfig/libvirt-qemu.pc"
 
 	# delete empty run folder to prevent mltk from stopping
-	rm -rf "${DSTDIR}/var/run"
+	if [ -d "${DSTDIR}/var/run" ] && ! [ -L "${DSTDIR}/var/run" ]; then
+		rmdir "${DSTDIR}/var/run" || perror "${DSTDIR}/var/run exists and is not empty"
+	fi
 }
 
 post_copy() {
diff --git a/core/modules/nscd/data/etc/tmpfiles.d/nscd.conf b/core/modules/nscd/data/etc/tmpfiles.d/nscd.conf
index ba48981d..8a24a785 100644
--- a/core/modules/nscd/data/etc/tmpfiles.d/nscd.conf
+++ b/core/modules/nscd/data/etc/tmpfiles.d/nscd.conf
@@ -1 +1 @@
-d /var/run/nscd 0755 root root
+d /run/nscd 0755 root root
diff --git a/core/modules/pam/data/etc/tmpfiles.d/pipefs.conf b/core/modules/pam/data/etc/tmpfiles.d/pipefs.conf
index 44e0924c..9a43b502 100644
--- a/core/modules/pam/data/etc/tmpfiles.d/pipefs.conf
+++ b/core/modules/pam/data/etc/tmpfiles.d/pipefs.conf
@@ -1,2 +1,2 @@
-d /var/run/rpc_pipefs 0755 root root
+d /run/rpc_pipefs 0755 root root
 
diff --git a/core/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf b/core/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf
index 9dfffcbe..da96818f 100644
--- a/core/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf
+++ b/core/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf
@@ -1,2 +1,2 @@
-d /var/run/plymouth 0755 root root
+d /run/plymouth 0755 root root
 
diff --git a/core/modules/qemu-src/module.build b/core/modules/qemu-src/module.build
index a5d8ce4b..9708472c 100644
--- a/core/modules/qemu-src/module.build
+++ b/core/modules/qemu-src/module.build
@@ -54,7 +54,9 @@ build() {
 	chmod +x "${DSTDIR}/usr/share/qemu/init/qemu-kvm-init"
 
 	# delete empty run folder to prevent mltk from stopping
-	rm -rf "${DSTDIR}/var/run"
+	if [ -d "${DSTDIR}/var/run" ] && ! [ -L "${DSTDIR}/var/run" ]; then
+		rmdir "${DSTDIR}/var/run" || perror "${DSTDIR}/var/run exists and is not empty"
+	fi
 }
 
 post_copy() {
diff --git a/core/modules/remote-access/data/opt/openslx/scripts/lightdm-Xvnc b/core/modules/remote-access/data/opt/openslx/scripts/lightdm-Xvnc
index 738500b0..126866d0 100755
--- a/core/modules/remote-access/data/opt/openslx/scripts/lightdm-Xvnc
+++ b/core/modules/remote-access/data/opt/openslx/scripts/lightdm-Xvnc
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Put xserver-command=<this> in lightdm-*.conf
-exec Xtigervnc :0 -rfbauth /root/.vnc/passwd -auth /var/run/lightdm/root/:0 -SecurityTypes VncAuth -geometry 1024x768 > /tmp/sasasa-$$ 2>&1
+exec Xtigervnc :0 -rfbauth /root/.vnc/passwd -auth /run/lightdm/root/:0 -SecurityTypes VncAuth -geometry 1024x768 > /tmp/sasasa-$$ 2>&1
diff --git a/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env b/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env
index b016a10e..d54b66af 100755
--- a/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env
+++ b/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env
@@ -47,7 +47,7 @@ vmnet_create() {
 	fi
 	chmod 0700 "${dev}"
 	# now bring it up
-	if ! /usr/bin/vmnet-netifup -d "/var/run/vmnet-netifup-vmnet${vmnet}.pid" "${dev}" "vmnet${vmnet}" ; then
+	if ! /usr/bin/vmnet-netifup -d "/run/vmnet-netifup-vmnet${vmnet}.pid" "${dev}" "vmnet${vmnet}" ; then
 		slxlog "vmware-netifup" "Launching /usr/bin/vmnet-netifup for vmnet${vmnet} failed."
 	fi
 	ip link set dev "vmnet${vmnet}" up
diff --git a/core/rootfs/rootfs-stage31/data/init b/core/rootfs/rootfs-stage31/data/init
index 1ae27939..cb0b70a0 100755
--- a/core/rootfs/rootfs-stage31/data/init
+++ b/core/rootfs/rootfs-stage31/data/init
@@ -38,7 +38,7 @@ HOTPLUG=$!
 busybox mount -n -t tmpfs -o 'mode=755,size=10m' run "/run"
 busybox mount -n -t tmpfs -o 'mode=755,size=50m' temp "/tmp"
 
-haveged --pidfile /tmp/haveged.pid # Tries to put it in /var/run by default, which doesn't exist so it just dies without any error message :-/
+haveged --pidfile /tmp/haveged.pid # Tries to put it in /run by default, which doesn't exist so it just dies without any error message :-/
 
 # IMPORTANT - check if kernel modules in initrams match kernel version
 BASEDIR="/lib/modules/$(uname -r)/kernel/drivers"