From 23e39f21f6509e6448e72f5ec7755405aa55e81c Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 22 May 2018 01:25:13 +0200 Subject: [PATCH] readd proj mods --- src/proj/desinfect.17 | 11 +++++++++++ src/remaster.sh | 5 +---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/proj/desinfect.17 b/src/proj/desinfect.17 index 18c99f3..355e2e4 100755 --- a/src/proj/desinfect.17 +++ b/src/proj/desinfect.17 @@ -250,3 +250,14 @@ function tools_add-desinfect.17() { sourcelist_desinfect_set_nomal2017 "$chroot_dir" } function tools_add() { tools_add-desinfect.17 $@; } + + +function project_mods-desinfect.17() { + #config xrdp to start xfce + [ -d "$chroot_path/etc/xrdp/" ] && { + 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 + } +} +function project_mods() { project_mods-desinfect.17 $@; } diff --git a/src/remaster.sh b/src/remaster.sh index 5230919..a2e8e5c 100755 --- a/src/remaster.sh +++ b/src/remaster.sh @@ -232,10 +232,7 @@ error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_fil #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 +project_mods # 9. Umount - Chroot Umgebung auflösen