Merge branch 'master' of simonslx:openslx-ng/tm-scripts

10 files changed, 9 insertions, 12 deletions

diff --git a/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger b/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
index d4249e29..dfed3168 100755
--- a/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
+++ b/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
@@ -84,9 +84,10 @@ fi
 if [ -n "$hostname" ]; then
 	[ -z "$fqdn" ] && fqdn="$hostname"
 	echo "..setting hostname $hostname (fqdn: $fqdn).."
-	echo "$fqdn" > "/proc/sys/kernel/hostname"
-	echo "$fqdn" > "/etc/hostname"
-	echo "$ip $fqdn $hostname" >> "/etc/hosts"
+	echo "$hostname" > "/proc/sys/kernel/hostname"
+	echo "$hostname" > "/etc/hostname"
+	echo "127.0.0.1 localhost" > "/etc/hosts"
+	echo "127.0.1.1 $fqdn $hostname" >> "/etc/hosts"
 	echo "SLX_HOSTNAME='$hostname'" >> "/run/config"
 fi
 
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/module.build
index 3711e16d..34d954f4 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build
+++ b/remote/rootfs/rootfs-stage31/module.build
@@ -20,7 +20,7 @@ build() {
 
 	# generate drm module loading database
 	pinfo "Generating PCI ID database for DRM drivers"
-	DRM_MODULES="$MODULES_DIR/kernel/build/lib/modules/$SYS_UTS_RELEASE/kernel/drivers/gpu/drm"
+	DRM_MODULES="$KERNEL_BASE_DIR/lib/modules/$SYS_UTS_RELEASE/kernel/drivers/gpu/drm"
 	PCI_FILE="$MODULE_BUILD_DIR/drm.cfg"
 	[ -d "$DRM_MODULES" ] || perror "DRM dir not found at $DRM_MODULES"
 	cp "$MODULE_DIR/templates/drm.cfg" "$PCI_FILE" || perror "Could not copy drm.cfg from templates dir"
@@ -53,7 +53,7 @@ post_copy() {
 	# copy kernel, modules and firmware
 	copy_kernel_modules
 	copy_firmware
-	copy_kernel
+	#copy_kernel
 }
 
 #
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 bd6d3106..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."
@@ -117,7 +112,7 @@ post_copy() {
 	# copy kernel, modules and firmware
 	copy_kernel_modules
 	copy_firmware
-	copy_kernel
+	#copy_kernel
 
 	# Try to fetch distro logo
 	if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/module.conf
index d55bcfa8..34d3507a 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/module.conf
@@ -3,7 +3,7 @@ REQUIRED_MODULES="
 "
 REQUIRED_BINARIES="
 	bash
-    dmesg
+	dmesg
 	curl
 	less
 	agetty
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