Merge branch 'restructure-mv-last-dependencys' into restructure-as-describe-in-doc

This commit is contained in:
6543 2018-05-22 01:25:35 +02:00
commit f3c3ba82f5
3 changed files with 16 additions and 4 deletions

View File

@ -28,3 +28,7 @@ function proxy_enable() {
function dns_set() {
echo "$project: dns_set ot available"
}

function project_mods() {
echo "$project: project_mods ot available"
}

View File

@ -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 $@; }

View File

@ -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