1.8.1

remaster.sh

@@ -1,15 +1,14 @@
 #!/bin/bash
-#@version 1.7.0
+#@version 1.8.1
-#@autor Martin.Huber@stbaro.bayern.de
+#@autor Martin.Huber@obermui.de
-#@date 2017-06-16
+#@date 2017-07-04
 
 #####################################################################################
 ################## S e t t i n g s ##################################################
 #####################################################################################
 
-## MODU
+## MODUS
-
+modus_default="update_pxe"
-modus_default=newiso
 
 #CD/DVD
 #entweder iso_source oder filesystem_source alls quelle
@@ -35,18 +34,20 @@ distro="desinfect2017"
 #LOG
 log_file="/data/remaster/logs/`date '+%Y-%m-%d'`.log"
 log_mail_source="desinfect@email.clocal"
+log_mail_smtp="smtp.mail.local:25"
 log_mail_aim="6543@email.clocal"
 log_mail_subject="Desinfect_Remaster"
 
 #Sonstiges
-tools_list="clamav nano htop nmon iftop tmux dsniff nmap openssh-server tightvncserver rsync e2fsprogs foremost gddrescue recoverjpeg safecopy sleuthkit testdisk arp-scan apt-transport-https"
+tools_list="clamav nano htop nmon iftop tmux dsniff nmap openssh-server tightvncserver rsync e2fsprogs foremost gddrescue recoverjpeg safecopy sleuthkit testdisk arp-scan"
 
 
 #####################################################################################
 ################## M o d e s ########################################################
 #####################################################################################
 
-function main_newiso() {
+#remaster.sh renew
+function main_renew() {
 
 	[ -f "$log_file" ] || touch "$log_file"
 	tail -f "$log_file" --pid="$$" &
@@ -55,7 +56,7 @@ function main_newiso() {
 	iso_extr_dir="`mktemp -d`"
 
 	echo "Remaster LOG `date '+%Y-%m-%d'`" > "$log_file"
-	echo "MODE: newiso" >> "$log_file"
+	echo "MODE: renew" >> "$log_file"
 	echo "HOST: `hostname`" >> "$log_file"
 	echo >> "$log_file"
 
@@ -82,7 +83,6 @@ function main_newiso() {
 	echo >> "$log_file"
 
 	echo "log_file=\"$log_file\""
-	echo "log_mail_source=\"$log_mail_source\""
 	echo "log_mail_aim=\"$log_mail_aim\""
 	echo "log_mail_subject=\"$log_mail_subject\""
 	echo ""
@@ -94,15 +94,17 @@ function main_newiso() {
 	echo "### Enviroment ###"
 	echo "iso_extr_dir=\"$iso_extr_dir\"" >> "$log_file"
 	echo "chroot_path=\"$chroot_path\"" >> "$log_file"
+	#env >> "$log_file"
 	echo $'\n\n' >> "$log_file"
 
 	echo $'### R U N ... ###\n' >> "$log_file"
 
-	#check root
+	#1. Set and Check Enviroment
-	[ "`whoami`" == "root" ] || {
+	check_user
-	  echo "### ERROR ### Remaster need ROOT permision!" >> "$log_file"
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-	  on_exit 10 >> "$log_file"
+
-	}
+	check_dependency
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
 	[ "$distro" != "" ] && distro="_$distro"
 
@@ -198,7 +200,8 @@ function main_newiso() {
 	on_exit 0
 }
 
-function main_desinfect_pxe_update() {
+#remaster.sh update_pxe
+function main_update_pxe() {
 
 	[ "$log_file" == "" ] && log_file="`mktemp`"
 	[ -f "$log_file" ] || touch "$log_file"
@@ -207,7 +210,7 @@ function main_desinfect_pxe_update() {
 	chroot_path="`mktemp -d`"
 
 	echo "Remaster LOG `date '+%Y-%m-%d'`" > "$log_file"
-	echo "MODE: desinfect_pxe_update" >> "$log_file"
+	echo "MODE: update_pxe" >> "$log_file"
 	echo "HOST: `hostname`" >> "$log_file"
 	echo >> "$log_file"
 
@@ -226,7 +229,6 @@ function main_desinfect_pxe_update() {
 	echo >> "$log_file"
 
 	echo "log_file=\"$log_file\""
-	echo "log_mail_source=\"$log_mail_source\""
 	echo "log_mail_aim=\"$log_mail_aim\""
 	echo "log_mail_subject=\"$log_mail_subject\""
 	echo ""
@@ -237,15 +239,17 @@ function main_desinfect_pxe_update() {
 
 	echo "### Enviroment ###"
 	echo "chroot_path=\"$chroot_path\"" >> "$log_file"
+	#env >> "$log_file"
 	echo $'\n\n' >> "$log_file"
 
 	echo $'### R U N ... ###\n' >> "$log_file"
 
-	#check root
+	#1. Set and Check Enviroment
-	[ "`whoami`" == "root" ] || {
+	check_user
-	  echo "### ERROR ### Remaster need ROOT permision!" >> "$log_file"
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-	  on_exit 10 >> "$log_file"
+
-	}
+	check_dependency
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
 	[ "$distro" != "" ] && distro="_$distro"
 
@@ -274,8 +278,9 @@ function main_desinfect_pxe_update() {
 
 	# 5. Manuelle Aktionen - deaktiviert
 
-	#echo "Now You Have TIME to do something MANUALY!"
+	echo "Now You Have TIME to do something MANUALY!"
-	#echo "enter in shell: #> chroot $chroot_path /bin/bash"
+	#echo "enter in shell:
+	chroot $chroot_path /bin/bash
 	#echo "Are You Finisch? Then Press [ENTER]"
 	#read
 
@@ -307,17 +312,16 @@ function main_desinfect_pxe_update() {
 	on_exit 0
 }
 
-function main_test() {
+#remaster.sh update_iso #in arbeit
-	[ "$log_file" == "" ] && log_file="`mktemp`"
+function main_update_iso() {
 	[ -f "$log_file" ] || touch "$log_file"
 	tail -f "$log_file" --pid="$$" &
 
 	chroot_path="`mktemp -d`"
 	iso_extr_dir="`mktemp -d`"
 
-
 	echo "Remaster LOG `date '+%Y-%m-%d'`" > "$log_file"
-	echo "MODE: main_test" >> "$log_file"
+	echo "MODE: update_iso" >> "$log_file"
 	echo "HOST: `hostname`" >> "$log_file"
 	echo >> "$log_file"
 
@@ -329,8 +333,7 @@ function main_test() {
 	echo >> "$log_file"
 
 	echo "#Filesystem (for pxe)"  >> "$log_file"
-	echo "filesystem_source=\"$filesystem_source\""
+	echo "filesystem_source=\"$filesystem_source\""  >> "$log_file"
-	echo "filesystem_source=\"$filesystem_source\""
 	echo >> "$log_file"
 
 	echo "#Network" >> "$log_file"
@@ -345,7 +348,6 @@ function main_test() {
 	echo >> "$log_file"
 
 	echo "log_file=\"$log_file\""
-	echo "log_mail_source=\"$log_mail_source\""
 	echo "log_mail_aim=\"$log_mail_aim\""
 	echo "log_mail_subject=\"$log_mail_subject\""
 	echo ""
@@ -357,58 +359,49 @@ function main_test() {
 	echo "### Enviroment ###"
 	echo "iso_extr_dir=\"$iso_extr_dir\"" >> "$log_file"
 	echo "chroot_path=\"$chroot_path\"" >> "$log_file"
+	#env >> "$log_file"
 	echo $'\n\n' >> "$log_file"
 
 	echo $'### R U N ... ###\n' >> "$log_file"
 
+	#1. Set and Check Enviroment
+	check_user
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-	### Check Settings ####
+	check_dependency
-
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-	# to ad
-	# to ad
-
-
-	# check script run with root
-	[ "`whoami`" == "root" ] || {
-	  echo "### ERROR ### Remaster need ROOT permision!" >> "$log_file"
-	  on_exit 10 >> "$log_file"
-	}
 
 	[ "$distro" != "" ] && distro="_$distro"
 
+	# 2. Entpacke ISO
+	iso_extract "$iso_source" "$iso_extr_dir"
 
-	#If iso sorce & aim: entpake
+	# 3. Checke pxe version
-	[ "$iso_source" != "" ] && [ "$iso_destination" != "" ] && {
+	# if pxe is set
-	  #Entpacke ISO
+	# 	if (date != date ); then $0 update_pxe 		#4.1
-	  iso_extract "$iso_source" "$iso_extr_dir" >> "$log_file"
+	#		filesystem = update												#4.2
-	  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+	# else
+	#  	extrakt filesystem												#5.
+	#		update																		#6.
+	# done
+	# pack iso
+
+	# 3. Entpacken der Dateien des Live-Systems
+	filesystem_img="`find  "$iso_extr_dir" -name filesystem.squashfs`"
+	[ -e "$filesystem_img" ] || {
+	  echo "### ERROR ### Image \"$iso_source\" has no \"filesystem.squashfs\"" >> "$log_file"
+	  on_exit 15 >> "$log_file"
 	}
 
-	#If file source set
-	if [ "$filesystem_source" != "" ]; then
-	  filesystem_img="$filesystem_source"
-	else
-	  filesystem_img="`find  "$iso_extr_dir" -name filesystem.squashfs`"
-	  [ -e "$filesystem_img" ] || {
-	    echo "### ERROR ### Image \"$iso_source\" has no \"filesystem.squashfs\"" >> "$log_file"
-	    on_exit 15 >> "$log_file"
-	  }
-	fi
-
-	### Normal ###
-
-	### 3. Entpacken der Dateien des Live-Systems
-
-
 	filesystem_extract "$filesystem_img" "$chroot_path" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-	### 4. Vorbereiten für chroot-Umgebung:
+	# 4. Vorbereiten für chroot-Umgebung:
 
 	chroot_initial$distro "$chroot_path" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-	### 5. Setzen der Netzwerk-Einstellungen:
+	# 5. Setzen der Netzwerk-Einstellungen:
 
 	proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
@@ -416,19 +409,29 @@ function main_test() {
 	dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-	### 6. Updaten von Desinfec't:
+	# 6. Updaten von Desinfec't:
 	os_update$distro "$chroot_path" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-	### 7. Installation optionaler Tools:
+	# 7. Installation optionaler Tools:
 
 	tools_add$distro "$chroot_path" "$tools_list" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
+	#addo ClamAV to conky_info
+	sed -i 's/# ${color white}ClamAV/ ${color white}ClamAV/g'  "$chroot_path/etc/skel/.conkyrc"
+
 	chroot_clean "$chroot_path" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-	### 8. Umount - Chroot Umgebung auflösen
+	# 8. Manuelle Aktionen - deaktiviert
+
+	#echo "Now You Have TIME to do something MANUALY!"
+	#echo "enter in shell: #> chroot $chroot_path /bin/bash"
+	#chroot $chroot_path /bin/bash
+	#echo "Are You Finisch? Then Press [ENTER]"
+
+	# 9. Umount - Chroot Umgebung auflösen
 
 	chroot_umount$distro "$chroot_path" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
@@ -439,47 +442,48 @@ function main_test() {
 	  on_exit 21 >> "$log_file"
 	}
 
-	## Normal END ##
+	# 10. Packen und Ersetzen der Dateien des Live-Systems
-
+	rm "$filesystem_img" >> "$log_file"
-	[ "$filesystem_source" != "" ] && filesystem_img="$filesystem_source"
-
-	### 9. Packen und Ersetzen der Dateien des Live-Systems
-	[ -f "$filesystem_img" ] && rm "$filesystem_img" 2>> "$log_file" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
 	filesystem_pack "$chroot_path"  "$filesystem_img" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-
+	# wenn iso gewünscht
 	[ "$iso_destination" != "" ] && {
-	  tmp_var_2143445="`find  "$iso_extr_dir" -name filesystem.squashfs`"
+			iso_create$distro "$chroot_path" "$iso_extr_dir" "$iso_destination" "$iso_lable" >> "$log_file"
-
+			error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-	  [ "$tmp_var_2143445" != "$filesystem_img" ] && {
-	    rm "$tmp_var_2143445" 2>> "$log_file" >> "$log_file"
-	    cp "$filesystem_img" "$tmp_var_2143445"
-	  }
-	  tmp_var_2143445=
-
-	  iso_create$distro "$chroot_path" "$iso_extr_dir" "$iso_destination" "$iso_lable" >> "$log_file"
-	  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-	  chmod 777 "$iso_destination"
-	  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 	}
 
-
+	# wenn filesystem gewünscht
-	# wenn filesystem gewünscht dann
 	[ "$filesystem_source" != "" ] && {
-	  chmod 777 "$filesystem_source"
+	  #wen bereits forhanden dann löschen
+	  [ -f "$filesystem_source" ] && rm "$filesystem_source"
+	  cp "$filesystem_img" "$filesystem_source" >> "$log_file"
+	  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+	  chmod 666 "$filesystem_source"
 	  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 	}
 
+	chmod 666 "$iso_destination" "$filesystem_img" >> "$log_file"
+
 	workspace_erase "$iso_extr_dir/" "$chroot_path/" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
+
 	on_exit 0
 }
 
+#remaster.sh update
+function main_update() {
+	main_update_pxe
+}
+
+#remaster.sh error_code [error_level]
+function main_error_code() {
+	error_code $1
+}
 
 #####################################################################################
 ################## F u n c t i o n s ################################################
@@ -503,7 +507,7 @@ function on_exit() {
 			echo "$log_mail_subject"
 			echo $'####################################################################################\n\n'
 			cat "$log_file"
-		} | sendemail -s mail.stbv.bybn.de -f desinfect@bayern.de -t "$mail_aim" -u "$log_mail_subject" -o tls=no
+		} | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
 	done
 
 	[ "$1" != "0" ] && {
@@ -520,7 +524,7 @@ function error_code() {
   	"")
 			echo $'ID:\tDescription\n----------------------------------------------------\n1\tAllgemeiner Fehler\n2\tNo Paramters / wrong parameters'
 			echo $'3\tWrong Settings\n4\tProgramm missing\n\n10\tno root\n11\tfile no found\n12\tdir not found\n13\tcant create/delete file/dir'
-			echo $'14\tcorrupt file (unsquashfs, mount iso, ...)\n15\twrong file (iso has no squashfs-file ...)\n\n20\tmount error\n21\tunmoun error\n22\twrong filesystem'
+			echo $'14\tcorrupt file (unsquashfs, mount iso, ...)\n15\twrong file (iso has no squashfs-file ...)\n16\trequired Packet not found\n\n20\tmount error\n21\tunmoun error\n22\twrong filesystem'
 			;;
 		1)
 			echo "Allgemeiner Fehler"
@@ -552,6 +556,9 @@ function error_code() {
   	15)
   		echo "wrong file (iso has no squashfs-file ...)"
   		;;
+		16)
+			echo "required Packet not found"
+			;;
   	20)
   		echo "tmount error"
   		;;
@@ -567,6 +574,27 @@ function error_code() {
 	esac
 }
 
+#check_user
+function check_user() {
+	#check root
+	[ "`whoami`" == "root" ] || {
+		echo "### ERROR ### Remaster need ROOT permision!"
+		return 10
+	}
+}
+
+#check_dependency
+function check_dependency() {
+	for packet in squashfs-tools xorriso wget sed sendemail; do
+		[ "`dpkg -l $packet 2>&1`" == "dpkg-query: Kein Paket gefunden, das auf $packet passt" ] && {
+			echo "### ERROR ### Packet $packet not installed"
+			return 16
+		}
+	done
+	return 0
+}
+
+
 ### Workspace ###
 
 #workspace_erase [workspace_path]
@@ -958,6 +986,27 @@ function chroot_is_mounted() {
 	fi
 }
 
+#chroot_sh [chroot_dir] [command]
+function chroot_sh() {
+	#check chroot dir
+	chroot_dir="$1"
+	[ -d "$chroot_dir" ] || {
+		echo "### ERROR ### chroot_umount: chroot directory not exist!"
+		return 12
+	}
+
+	command="$2"
+
+	[ -f "$chroot_dir/tmp/env.sh" ] || {
+		#if not exist create environment skript
+		cat "$chroot_dir/etc/environment" | grep -v "#" | grep "=" > "$chroot_dir/tmp/env"
+		while read line; do echo export $line; done < "$chroot_dir/tmp/env" > "$chroot_dir/tmp/env.sh"
+		chmod +x "$chroot_dir/tmp/env.sh" && rm "$chroot_dir/tmp/env"
+	}
+
+	chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; $command"
+}
+
 ### Settings ###
 ### proxy
 
@@ -974,12 +1023,16 @@ function proxy_enable() {
 		return 12
 	}
 
-	#Wenn alle drei Parameter gegeben
+	#Wenn alle zwei Parameter gegeben
 	if [ "$proxy_host" != "" ] && [ "$proxy_port" != "" ] ; then
 		echo "http_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
 		echo "https_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
 		echo "ftp_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
 
+		echo "HTTP_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+		echo "HTTPS_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+		echo "FTP_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+
 		echo "Acquire::http::Proxy  \"http://$proxy_host:$proxy_port\"\;" > $chroot_dir/etc/apt/apt.conf.d/90proxy
 		echo "Acquire::ftp::Proxy \"ftp://$proxy_host:$proxy_port\"\;" >> $chroot_dir/etc/apt/apt.conf.d/90proxy
 
@@ -1074,7 +1127,7 @@ function proxy_enable_desinfect2017() {
 
 	proxy_enable $1 $2 $3
 
-	echo -n "enable proxy for desinfect's av ... "
+	echo "enable proxy for desinfect's av ... "
 
 	chroot_dir="$1"
 	proxy_host="$2"
@@ -1127,8 +1180,11 @@ function proxy_enable_desinfect2017() {
 	#F-Secure
 	if [ -f "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" ]; then
 		echo "F-Secure: Found"
-		echo "update_server=http://www-proxy.bybn.de:80" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config"
+		echo "enable_fsma=no" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
-		#..
+		echo "update_servers=http://fsbwserver-direct.f-secure.com" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+		echo "update_proxies=http://$proxy_host:$proxy_port" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+		echo "http_proxies=http://$proxy_host:$proxy_port" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+		cat "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" > "$chroot_dir/etc/opt/f-secure/fsaua/fsaua_config"
 	else
 		eco "F-Secure: NOT Found"
 	fi
@@ -1505,14 +1561,16 @@ function os_update_desinfect2017() {
 	#Avast Avira
 	{
 		echo "Avira ..."
-		chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
+		#chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; /AntiVirUpdate/avupdate" | grep -v " -> "
+		chroot_sh "$chroot_dir" "/AntiVirUpdate/avupdate" | grep -v " -> "
 		echo "Avira done"
 	}
 
 	#Clam AV
 	{
 		echo "ClamAV..."
-		chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
+		#chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; freshclam" > /dev/null
+		chroot_sh "$chroot_dir" "freshclam" > /dev/null
 		rm -f "$chroot_dir/var/lib/clamav/daily.cld"
 		echo "ClamAV done"
 	}
@@ -1525,27 +1583,29 @@ function os_update_desinfect2017() {
 		cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
 		chroot "$chroot_dir" /bin/bash -c "/usr/bin/esetrand" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
 
-		echo "set timeout: 2min"
+		av_eaet_timeout=300
-		av_eaet_timeout=1200
+		echo "set timeout: $((av_eaet_timeout/60))min"
 		tmp_var_3092="`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`"
 
 		#eig. update routine
-		chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets restart"
+		#chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets restart"
+		chroot_sh "$chroot_dir" "/etc/init.d/esets restart"
 		sleep 2
-		chroot "$chroot_dir" /bin/bash -c "/opt/eset/esets/sbin/esets_daemon --update"
+		#chroot "$chroot_dir" /bin/bash --login -c "/opt/eset/esets/sbin/esets_daemon --update"
+		chroot_sh "$chroot_dir" "/opt/eset/esets/sbin/esets_daemon --update"
 
 		#warten auf daemon update ...
-		sleep 10m
+		echo "wait $((av_eaet_timeout/60))min for Eset AV update"
-		echo "wait 10min for Eset AV update"
 		while [ "`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`" == "$tmp_var_3092" ]; do
-			sleep 1
+			sleep 10
-			av_eaet_timeout=$((av_eaet_timeout-1))
+			av_eaet_timeout=$((av_eaet_timeout-10))
 			[ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
 		done
 
 		sleep 4
 
-		chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
+		#chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
+		chroot_sh "$chroot_dir" "/etc/init.d/esets stop"
 
 		cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
 
@@ -1558,13 +1618,25 @@ function os_update_desinfect2017() {
 	#Sophos
 	{
 		echo "Sophos..."
-		chroot "$chroot_dir" /bin/bash -c "/opt/sophos-av/bin/savupdate -v3"
+		#chroot "$chroot_dir" /bin/bash --login -c "/opt/sophos-av/bin/savupdate -v3"
+		chroot_sh "$chroot_dir" "/opt/sophos-av/bin/savupdate -v3"
+		chroot_sh "$chroot_dir" "/opt/sophos-av/bin/savdstatus --version"
 		#chroot "$chroot_dir" /bin/bash -c "/opt/sophos-av/bin/savupdate -v3 -a"
 		echo "Sophos done"
 	}
 
 	#F-Secure
-
+	{
+		echo "F-Secure..."
+		chroot_sh "$chroot_dir" "/etc/init.d/fsaua start"
+		chroot_sh "$chroot_dir" "/etc/init.d/fsupdate stop"
+		( sleep 1m; chroot_sh "$chroot_dir" "/etc/init.d/fsaua start" ) &
+		chroot_sh "$chroot_dir" "/opt/f-secure/fssp/bin/dbupdate_lite" && echo "Update Success"
+		sleep 1m
+		chroot_sh "$chroot_dir" "/etc/init.d/fsaua stop"
+		chroot_sh "$chroot_dir" "/etc/init.d/fsupdate stop"
+		echo "F-Secure done"
+	}
 
 	echo "update virus definitions done"
 }
@@ -1580,11 +1652,8 @@ function tools_add() {
 	tools_list="$2"
 
 	chroot "$chroot_dir" /bin/bash -c "apt-get update" > /dev/null
-	[ "$?" == "0" ] && {
+	[ "$?" == "0" ] && echo "apt-get update: success"
-		echo "apt-get update: success"
+	chroot "$chroot_dir" /bin/bash -c "apt-get install -y $tools_list" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:"
-		chroot "$chroot_dir" /bin/bash -c "apt-get install -y $tools_list" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:"
-	}
-
 	echo "done"
 }
 
@@ -1628,14 +1697,5 @@ function tools_add_desinfect2017() {
 if [ -z "$1" ]; then
 	main_$modus_default
 else
-	main_$1
+	main_$1 $2 $3 $4 $5 $6 $7 $8 $9
 fi
-
-
-#packet=plumadfd
-#[ "`dpkg -l $packet 2>&1`" == "dpkg-query: Kein Paket gefunden, das auf $packet passt" ] && {
-#	echo not installed $packet
-#}
-#Benötigte packete:
-# unsquashfs; mksquashfs; xorriso; wget; sed; chroot; sendemail;
-# apt install xorriso wget sed sendemail squashfs-tools