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

8 files changed, 9 insertions, 6 deletions

diff --git a/server/configs/freiburg/plymouth-freiburg b/server/configs/freiburg/plymouth-freiburg
new file mode 120000
index 00000000..8a14eb6a
--- /dev/null
+++ b/server/configs/freiburg/plymouth-freiburg
@@ -0,0 +1 @@
+../../modules/plymouth-freiburg
\ No newline at end of file
diff --git a/server/export_target b/server/export_target
index 3bda2ce6..e74db2d3 100755
--- a/server/export_target
+++ b/server/export_target
@@ -35,10 +35,6 @@ initial_checks() {
 
 	[ -d "${SERVER_BOOT_DIR}" ] || mkdir -p "${SERVER_BOOT_DIR}"
 
-	# check if SERVER_EXPORT_TARGET is valid
-	[ ! -z "${SERVER_EXPORT_CONFIG}" ] || perror "Server export config not given!"
-	[ -d "${SERVER_CONFIGS_DIR}/${SERVER_EXPORT_CONFIG}" ] || \
-		perror "Given export config not found: ${SERVER_CONFIGS_DIR}/${SERVER_EXPORT_CONFIG}"
 }
 
 copy_kernel() {
@@ -90,6 +86,11 @@ generate_config() {
 	local TOOL_STR="${TOOL_STR} generate_config:"
 	pinfo "Generating config.tgz for '${SERVER_CONFIG_TYPE}'"
 
+	# check if SERVER_EXPORT_TARGET is valid
+	[ ! -z "${SERVER_CONFIG_TYPE}" ] || perror "Server export config not given!"
+	[ -d "${SERVER_CONFIGS_DIR}/${SERVER_CONFIG_TYPE}" ] || \
+		perror "Given export config not found: ${SERVER_CONFIGS_DIR}/${SERVER_CONFIG_TYPE}"
+
 	# directory where the activated modules are given
 	# ex: server/configs/freiburg/
 	local TARGET_CONFIG_DIR="${SERVER_CONFIGS_DIR}/${SERVER_CONFIG_TYPE}"
@@ -115,7 +116,7 @@ generate_config() {
 		cd "${TARGET_CONFIG_DIR}/${MODULE_CONFIG}" || perror "\tCould not cd to '${TARGET_CONFIG_DIR}/${MODULE_CONFIG}'"
 
 		# check if files are already in another module config
-		for FILE in $(find . -type f); do
+		for FILE in $(find . -type f | cut -c 3-); do
 			# check for all the archives we find in TARGET_CONFIG_BUILD_DIR
 			for ARCHIV in $(ls "${TARGET_CONFIG_BUILD_DIR}/"*.tar 2>/dev/null); do
 				if [ "x$(tar tvf "${ARCHIV}" | grep "$FILE")" != "x" ]; then
@@ -130,9 +131,10 @@ generate_config() {
 		done
 
 		# no conflict, add file to archive
+		pinfo "${TARGET_CONFIG_BUILD_DIR}/${MODULE_CONFIG}.tar"
 		tar cf "${TARGET_CONFIG_BUILD_DIR}/${MODULE_CONFIG}.tar" $(ls)
 		RET=$?
-		[ "x$RET" != "x0" ] && perror "\tCould not create '${TARGET_CONFIG_BUILD_DIR}/${MODULE_CONFIG}.tgz'"
+		[ "x$RET" != "x0" ] && perror "\tCould not create '${TARGET_CONFIG_BUILD_DIR}/${MODULE_CONFIG}.tar'"
 	done
 
 	# now we have packed all configs separately and can concatenate them all together.
diff --git a/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth b/server/modules/plymouth-freiburg/share/plymouth/themes/default.plymouth
index 8499e451..8499e451 100644
--- a/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/default.plymouth
diff --git a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/rz_banner_trans.png
index 9cb68040..9cb68040 100644
--- a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/rz_banner_trans.png
diff --git a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/rz_logo_trans.png
index 16b069cc..16b069cc 100644
--- a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/rz_logo_trans.png
diff --git a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
index 0f300f6b..0f300f6b 100644
--- a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
diff --git a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/unifr-rz.script
index f2d8bd28..f2d8bd28 100644
--- a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/unifr-rz.script
diff --git a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/white_dot_small.png
index 4fd4be30..4fd4be30 100644
--- a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/white_dot_small.png