6543/remaster
6543/remaster
1
1
Fork 0
Code Issues 15 Pull Requests Releases 5 Activity

Merge pull request #17 from 6543/changes-on-server

Browse Source 
2018-04-05
This commit is contained in:
6543 2018-04-27 12:07:02 +02:00 committed by GitHub
commit c28eaa1a38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/remaster.sh
View File

@ -8,6 +8,7 @@
################## S e t t i n g s ################################################## ################## S e t t i n g s ##################################################
##################################################################################### #####################################################################################



## MODUS ## MODUS
modus_default="update_pxe" modus_default="update_pxe"


@ -157,6 +158,11 @@ function main_renew() {
#chroot $chroot_path /bin/bash #chroot $chroot_path /bin/bash
#echo "Are You Finisch? Then Press [ENTER]" #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 # 9. Umount - Chroot Umgebung auflösen


chroot_umount$distro "$chroot_path" >> "$log_file" chroot_umount$distro "$chroot_path" >> "$log_file"
@ -469,6 +475,7 @@ function main_update_iso() {


chmod 666 "$iso_destination" "$filesystem_img" >> "$log_file" chmod 666 "$iso_destination" "$filesystem_img" >> "$log_file"


#11. End
workspace_erase "$iso_extr_dir/" "$chroot_path/" >> "$log_file" workspace_erase "$iso_extr_dir/" "$chroot_path/" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file" error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"


@ -810,12 +817,10 @@ function iso_create_desinfect2017() {
function chroot_initial() { function chroot_initial() {
echo -n "initial chroot ... " echo -n "initial chroot ... "


#$1 = chroot_dir

#check chroot dir #check chroot dir
chroot_dir="$1" chroot_dir="$1"
[ -d "$chroot_dir" ] || { [ -d "$chroot_dir" ] || {
echo "### ERROR ### chroot_initial: chroot directory not exist!" echo "### ERROR ### chroot_initial: chroot directory not exist"
return 12 return 12
} }


@ -847,6 +852,7 @@ function chroot_initial_desinfect2015() {
} }


#mount virus definitions #mount virus definitions
#bitdefender
mount --bind $chroot_dir/opt/BitDefender-scanner/var/lib/scan{.orig,} mount --bind $chroot_dir/opt/BitDefender-scanner/var/lib/scan{.orig,}
mount --bind $chroot_dir/var/kl/bases_rd{.orig,} mount --bind $chroot_dir/var/kl/bases_rd{.orig,}


@ -992,7 +998,7 @@ function chroot_sh() {
#check chroot dir #check chroot dir
chroot_dir="$1" chroot_dir="$1"
[ -d "$chroot_dir" ] || { [ -d "$chroot_dir" ] || {
echo "### ERROR ### chroot_umount: chroot directory not exist!" echo "### ERROR ### chroot_sh: chroot directory not exist!"
return 12 return 12
} }