Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

9 files changed, 1 insertions, 5 deletions

diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/module.build
index 34d954f4..34d954f4 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build
+++ b/remote/rootfs/rootfs-stage31/module.build
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/module.conf
index 4b638678..4b638678 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ b/remote/rootfs/rootfs-stage31/module.conf
diff --git a/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/openslx-log.conf b/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/openslx-log.conf
new file mode 100644
index 00000000..4d93fb9c
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/openslx-log.conf
@@ -0,0 +1 @@
+d /var/log/openslx 0777 root root
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/module.build
index 156d1afe..b12ca0a7 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/module.build
@@ -72,11 +72,6 @@ post_copy() {
 	mkdir -p "$TARGET_BUILD_DIR"/{bin,dev,proc,lib,etc,mnt,run,sys,var,opt/openslx/mnt}
 	ln -s -n -f -t "$TARGET_BUILD_DIR/var" "../run/lock" "../run"
 
-	# make openslx log directory
-	mkdir -p "${TARGET_BUILD_DIR}"/var/log/openslx
-	# make openslx log directory writable for all users
-	chmod a+w "${TARGET_BUILD_DIR}"/var/log/openslx
-
 	# copy devices from running system
 	cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,urandom,zero} \
 		"${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed."
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/module.conf
index 34d3507a..34d3507a 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/module.conf
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.debian b/remote/rootfs/rootfs-stage32/module.conf.debian
index 4b80623f..4b80623f 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.debian
+++ b/remote/rootfs/rootfs-stage32/module.conf.debian
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse b/remote/rootfs/rootfs-stage32/module.conf.opensuse
index 4b11529b..4b11529b 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse
+++ b/remote/rootfs/rootfs-stage32/module.conf.opensuse
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse.13.1 b/remote/rootfs/rootfs-stage32/module.conf.opensuse.13.1
index aa7f8afb..aa7f8afb 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse.13.1
+++ b/remote/rootfs/rootfs-stage32/module.conf.opensuse.13.1
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.ubuntu b/remote/rootfs/rootfs-stage32/module.conf.ubuntu
index 646c39a0..646c39a0 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.ubuntu
+++ b/remote/rootfs/rootfs-stage32/module.conf.ubuntu