From ab55ed8b3d498c09db70d144e11350a7072a34c2 Mon Sep 17 00:00:00 2001
From: 6543 <git+marddl@obermui.de>
Date: Fri, 27 Apr 2018 12:04:05 +0200
Subject: [PATCH] 2018-04-05

---
 src/remaster.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/remaster.sh b/src/remaster.sh
index acd46d5..f8bf436 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -8,6 +8,7 @@
 ################## S e t t i n g s ##################################################
 #####################################################################################
 
+
 ## MODUS
 modus_default="update_pxe"
 
@@ -157,6 +158,11 @@ function main_renew() {
 	#chroot $chroot_path /bin/bash
 	#echo "Are You Finisch? Then Press [ENTER]"
 
+	#config xrdp to start xfce
+	echo '#!/bin/sh' > "$chroot_path"/etc/xrdp/startwm.sh
+	echo "export LANG=\"de_DE.UTF-8\"" >> "$chroot_path"/etc/xrdp/startwm.sh
+	echo "startxfce4" >> "$chroot_path"/etc/xrdp/startwm.sh
+
 	# 9. Umount - Chroot Umgebung auflösen
 
 	chroot_umount$distro "$chroot_path" >> "$log_file"
@@ -469,6 +475,7 @@ function main_update_iso() {
 
 	chmod 666 "$iso_destination" "$filesystem_img" >> "$log_file"
 
+	#11. End
 	workspace_erase "$iso_extr_dir/" "$chroot_path/" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
@@ -810,12 +817,10 @@ function iso_create_desinfect2017() {
 function chroot_initial() {
 	echo -n "initial chroot ... "
 
-	#$1 = chroot_dir
-
 	#check chroot dir
 	chroot_dir="$1"
 	[ -d "$chroot_dir" ] || {
-		echo "### ERROR ### chroot_initial: chroot directory not exist!"
+		echo "### ERROR ### chroot_initial: chroot directory not exist"
 		return 12
 	}
 
@@ -847,6 +852,7 @@ function chroot_initial_desinfect2015() {
 	}
 
 	#mount virus definitions
+	#bitdefender
 	mount --bind $chroot_dir/opt/BitDefender-scanner/var/lib/scan{.orig,}
 	mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
 
@@ -992,7 +998,7 @@ function chroot_sh() {
 	#check chroot dir
 	chroot_dir="$1"
 	[ -d "$chroot_dir" ] || {
-		echo "### ERROR ### chroot_umount: chroot directory not exist!"
+		echo "### ERROR ### chroot_sh: chroot directory not exist!"
 		return 12
 	}