hotfix-2.0.2

DEBIAN/control

@@ -1,6 +1,6 @@
 Package: remaster
 Source: remaster
-Version: 2.0.4
+Version: 2.0.2
 Architecture: all
 Maintainer: 6543 <6543@obermui.de>
 Installed-Size: <SIZE>

README.md

@@ -12,7 +12,6 @@ The aim of this Project is to create a daemon for a server, witch update live sy
 - wget
 - sed
 - sendemail
-- curl
 
 ## To Do
 

changes/remaster.md

@@ -18,15 +18,3 @@
 
 2018-05-13 - 2.0.2
  * hotfix-2.0.2 ( create release folder if not exist )
-
-2018-05-20 - 2.0.3
- * make email, proxy optional
- * change Strukture.md
- * add config check
- * some help scripts
-
-2018-05-22 - 2.0.4
- * add iso_source as URL
- * restructure code
- * use proj templates
- * some help scripts

doc/Strukture.md

@@ -1,113 +1,28 @@
-# 1. Starte "remaster"
+# Src
 
-## 1.1 Lade Grundfunctionen                                      [-> #functions]
+raw scripts ..
 
-## 1.2 Überprüfe ...
+## functions
-  * auf Updates
-  * auf Rechte
 
-## 1.3 Lade Richtige Einstellungen                               [-> #config]
+ - creat iso
-  * Lade /etc/remaster/<Conf>
+ - burn cd ...
-  * Überprüfe Conf. (Proj Exist; Mods Exist; ...)
+ - clean workspace ...
 
-## 1.4 Lade Proj-Func                                            [-> #projects]
-  * Überlade nach Abhängigkeit
-  * (z.B.  ubuntu.16.04 -> ubuntu -> debian)
-  * Prüfe Conf. (Proj Conform)
 
-## 1.5 Lade $n Mods (optional)                                   [-> #mods]
+## distros
-  * Überprüfen
-  * Spechern in MOD_LST
 
-# 2. Init Chroot
+scripts vor distros
+ - update
+ - set network settings
+ - set OS settings
 
-## 2.1 Dateien Entpacken
+## mods
-  * ISO
+ - for example: install & enable xrdp
-  * Squashfs
+ - set default passwd
+ - ...
 
-## 2.2 Config für Chroot (chroot_initial)
+## web
-  * (lxc-conf / tmpdir)
+placeholder for webfiles ...
-  * Netzwerk
 
-## 2.3 Starte Chroot
+## pxe
-  * (lxc-start / mount ...)
+placeholder for pxefiles ...
-
-# 3. Modivikationen
-
-## 3.1 Netzwerk
-
-## 3.2 Proj-Spez.
-  * (z.B. Desinfect: conky_info)
-
-## 3.3 Packet Mgr
-  * Updates
-  * Install
-  * Delete
-
-## 3.4 Weitere in $MOD_LST
-  * z.B. xrdp
-  * z.B. default pw
-
-# 4. Finish
-
-## 4.1 Aufreumen Live-Sys
-  * tmpfiles
-  * Packet Mgr
-
-## 4.2 Stop chroot
-  * Umount
-
-## 4.3. Gen ISO/PXE
-
-## 4.4. Del Chroot
-
-# 5. Send Log
-
-----
-
-## lxc
-
--> chroot_sh exec lxc-attach
-
--> chroot_dir = container name
-
-----
-
-## PXE
-
--> Install
-  * DHCP Relay
-  * NFS-Server
-  * TFTP-Server
-  * [Samba]
-
--> Setup
-  * (use <Lib>/proj/<proj> func)
-  * SMB/NFS LiveSys export
-  * TFTP (Boot Menue; Boot Loader; Kernel&Initrd)
-
--> Deinstall
-  * RM TFTP-Root
-  * RM SMB/NFS LiveSys export
-  * del DHCP Relay conf
-
-----
-
-## Jobs
-  * Read Confs -> get time interfall I
-  * Exec remaster <Conf> for I
-
-----
-
-## Web
-
-show/edit #Configs
-
-show (+live) #Logs
-
-start/stop/plan #Jobs
-
-start/stop/edit #PXE menue
-  * default
-  * all / single / none
-  * live view new clients

doc/draft_mod-pronects

@@ -1,19 +0,0 @@
-maddl@NB-Maddl:~$ function a() { echo null; }
-maddl@NB-Maddl:~$ a
-null
-maddl@NB-Maddl:~$ function a_desinfect() { echo desinfect; }
-maddl@NB-Maddl:~$ a_desinfect 
-desinfect
-maddl@NB-Maddl:~$ alias a=a_desinfect
-maddl@NB-Maddl:~$ a
-desinfect
-maddl@NB-Maddl:~$ alias --help
-bash: alias: --: Ungültige Option
-alias: Gebrauch: alias [-p] [Name[=Wert] ... ]
-maddl@NB-Maddl:~$ man alias 
-Kein Handbucheintrag für alias vorhanden
-maddl@NB-Maddl:~$ alias a=a
-maddl@NB-Maddl:~$ a
-null
-maddl@NB-Maddl:~$ 
-

doc/lib-header.txt

@@ -2,12 +2,10 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
-#<function> [param]
+#beginn func
-function <function>() {
+
-    #Code of <function>
-}
 
 #this func is standalone executable
 [ -n "$1" ] && {
-    <function> $@
+    check_user
 }

doc/notes

@@ -1,2 +0,0 @@
-initrd:
-https://help.ubuntu.com/community/LiveCDCustomization#Removing_the_.28Casper.29_Autologina

doc/proj-head

@@ -1,8 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#<PROJECT_NAME>
-#<project_relation>
-source <LIBDIR>/proj/<BASE>
-project_relation="<PROJECT_NAME> $project_relation"

script/add_function.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-#check param
-[ -z "$1" ] && { echo "$0 [name]"; exit 1; }
-name="$1"
-
-#gen function
-cp "doc/lib-head+tail" "src/func/$name"
-sed -i "s/<function>/$name/g" "src/func/$name"
-
-#open
-editor "src/func/$name"

script/add_project.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-#check param
-[ -z "$1" ] && { echo "$0 \"name\" [base]"; exit 1; }
-name="$1"
-base="$2"
-
-#gen project
-cp "doc/proj-head" "src/proj/$name"
-
-#set base_relations
-if [ -z "$base" ]; then
-  base_relations="base"
-  base="base"
-  sed -i "/project_relation=/c\project_relation=\"<PROJECT_NAME>\"" "src/proj/$name"
-else
-  [ -f "src/proj/$base" ] || {
-    echo "BASE: $base dont exist"
-    exit 1
-  }
-  #get base of $base
-  base_base=`grep '# . ->' src/proj/$base`
-  base_relations=`echo $base_base | sed "s/#\ \./$base/g"`
-fi
-
-## replace strings
-# . -> <PROJECT_PARENT> -> base
-sed -i "s/<project_relation>/\ \.\ ->\ $base_relations/g" "src/proj/$name"
-#<PROJECT_NAME>
-sed -i "s/<PROJECT_NAME>/$name/g" "src/proj/$name"
-sed -i "s/<BASE>/$base/g" "src/proj/$name"
-
-#open
-editor "src/proj/$name"

script/get_version.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-grep '@version ' src/remaster.sh | cut -d " " -f 2

script/set_version.sh

@@ -8,10 +8,10 @@ date=`date +%Y-%m-%d`
   version_sed=`echo $version | sed 's/\./\\./g'`
 
   #nummer
-  sed -i "/#@version\ /c\#@version\ $version_sed" src/remaster.sh
+  sed -i "s/@version\ .\..\../@version\ $version_sed/g" src/remaster.sh
 
   #datum
-  sed -i "/#@date\ /c\#@date\ $date" src/remaster.sh
+  sed -i "s/@date\ ....-..-../@date\ $date/g" src/remaster.sh
 }
 
 [ -e "changes/remaster.md" ] && {
@@ -22,5 +22,5 @@ date=`date +%Y-%m-%d`
 }
 
 [ -f "DEBIAN/control" ] && {
-  sed -i "/Version:\ /c\Version:\ $version_sed" "DEBIAN/control"
+  sed -i "s/Version:\ .\..\../Version:\ $version_sed/g" "DEBIAN/control"
 }

src/config.sample.cfg

@@ -4,17 +4,20 @@
 ## sample-config rename it to config.cfg after changes ##
 #########################################################
 
+## MODUS
+modus_default="update_pxe"
+
 #CD/DVD
-#entweder iso_source oder squashfs_path alls quelle
+#entweder iso_source oder filesystem_source alls quelle
 # -> bei iso gen erforderlich!
 iso_source="/data/remaster/desinfect-2017.iso"
 #destination optinal
-iso_aim="/data/remaster/result/custom_desinfect_`date '+%Y-%m-%d'`.iso"
+iso_destination="/data/remaster/result/custom_desinfect_`date '+%Y-%m-%d'`.iso"
 iso_lable="DESINFECT_`date '+%Y-%m-%d'`"
 
 #Filesystem (for pxe)
-#entweder iso_source oder squashfs_path alls quelle
+#entweder iso_source oder filesystem_source alls quelle
-squashfs_path="/data/remaster/result/filesystem.squashfs"
+filesystem_source="/data/remaster/result/filesystem.squashfs"
 
 #Network
 proxy_host="proxy.local"
@@ -23,7 +26,7 @@ domain="local"
 nameserver="10.x.x.2,10.x.x.1"
 
 #remaster_script
-project="desinfect.17"
+distro="desinfect2017"
 
 #LOG
 log_file="/data/remaster/logs/`date '+%Y-%m-%d'`.log"

src/func/check_config

@@ -1,55 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#check_config
-function check_config() {
-
-    #Project
-    [ -f "<LIBDIR>/proj/$project" ] || {
-        echo "No Project \"$project\" is not supported"
-        return 3
-    }
-
-    #live-system files
-    if [ -f "$iso_source" ]; then
-        if [ -n "$iso_aim" ] && [ -d "${iso_aim%/*}" ]; then
-            #Lable
-            [ -z "$iso_lable" ] && iso_lable="$project"
-
-            echo 'iso_source -> iso_aim'
-            echo 'iso_source -> squashfs [optinal]'
-        else
-            if [ -n "$squashfs_path" ] && [ -d "${squashfs_path%/*}" ]; then
-                echo 'iso_source -> squashfs'
-            else
-                # ERROR
-                echo "No corect AIM in Settings"
-                return 3
-            fi
-        fi
-    else
-        if [ -f "$squashfs_path" ]; then
-            if [ -n "$iso_aim" ]; then
-                # ERROR
-                echo "only Squashfs source in Settings, cant creat ISO"
-                return 3
-            else
-                echo 'squashfs -> squashfs'
-            fi
-        else
-            # ERROR
-            echo "No corect Source in Settings"
-            return 3
-        fi
-    fi
-
-
-
-
-}
-
-#this func is standalone executable
-[ -n "$1" ] && {
-    check_config $@
-}

src/func/check_dependency

@@ -5,7 +5,7 @@
 #check_dependency
 # -> 0 | -> 16
 function check_dependency() {
-	for packet in squashfs-tools xorriso lxc wget sed sendemail; do
+	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

src/func/check_update

@@ -5,9 +5,9 @@
 #check_update
 function check_update() {
     if curl https://raw.githubusercontent.com/6543/remaster/master/changes/remaster.md | diff - <(zcat <ROOTDIR>/usr/share/doc/remaster/changelog.gz ); then
-			echo 'INFO: Programm Aktuell'
+			echo 'REMASTER: Aktuell'
 	else
-			echo 'WARNUNG: Ausgeführte Version entspricht nicht dem offiziellen Release'
+			echo 'REMASTER: Warning: neue Version verfügbar'
     fi
 }
 

src/func/check_url

@@ -1,20 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#check_url [URL]
-function check_url() {
-    URL="$1"
-    if [[ `wget -S --spider "$URL"  2>&1 | grep 'HTTP/1.1 200 OK'` ]]; then
-      echo "true"
-      return 0
-    else
-      echo "false"
-      return 1
-    fi
-}
-
-#this func is standalone executable
-[ -n "$1" ] && {
-    check_url $@
-}

src/func/chroot

@@ -1,32 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-## overload chroot with lxc
-function chroot() {
-	lxc-attach -n _remaster_ -- "$2" "$3" "$4" "$5" "$6" "$7"
-}
-
-## create lxc config
-
-#chroot_config [chroot_dir]
-function chroot_config() {
-
-	chroot_dir="$1"
-
-	# Container specific configuration
-	echo "lxc.rootfs = $chroot_dir"
-	echo "lxc.rootfs.backend = dir"
-	echo "lxc.utsname = _remaster_"
-
-	# Network configuration
-	echo "lxc.network.type = veth"
-	echo "lxc.network.link = lxcbr0"
-	echo "lxc.network.flags = up"
-	echo "lxc.network.hwaddr = 00:16:3e:5a:ba:1e"
-}
-
-[ -n "$1" ] && {
-  echo param
-  $1
-}

src/func/chroot_initial

@@ -13,13 +13,11 @@ function chroot_initial() {
 		return 12
 	}
 
-	[ -d "/var/lib/lxc/_remaster_/" ] && {
+	#mount virus definitions
-		echo "### Warning ### chroot_initial: lxc container exists"
+	mount -t tmpfs tmpfs "$chroot_dir/tmp"
-		[ -f "/var/lib/lxc/_remaster_/config" ] && {
+	mount -t tmpfs tmpfs "$chroot_dir/root"
-			mv -f "/var/lib/lxc/_remaster_/config" "/var/lib/lxc/_remaster_/config.old"
+	mount --bind /dev "$chroot_dir/dev"
-		}
+	mount --bind /proc "$chroot_dir/proc"
-	}
-	mkdir -p "/var/lib/lxc/_remaster_/"
 
 	rm "$chroot_dir/etc/resolv.conf"
 	cp "/etc/resolv.conf" "$chroot_dir/etc/resolv.conf"

src/func/chroot_is_mounted

@@ -7,15 +7,12 @@
 function chroot_is_mounted() {
 	#$1 = chroot directory
 
-	#get state of _remaster from lxc
+	if [ "`mount | grep "$1"`" != "" ] ; then
-	STATE=`lxc-ls _remaster_ -f -F STATE | tail -n 1 | sed 's/ //g'`
+		#ther is smething mounted
-
-	if [ "#$STATE#" == "#STOPPED#" ] ; then
-		#nothing running
-		echo "false"
-	else
-		#container is running
 		echo "true"
+	else
+		#nothing mounted
+		echo "false"
 	fi
 }
 

src/func/filesystem_extract

@@ -2,9 +2,6 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
-#dependency
-source <LIBDIR>/func/filesystem_get_type
-
 #filesystem_extract [filesystem_img_source] [chroot_path]
 function filesystem_extract() {
 	echo "extract filesystem ..."

src/func/iso_extract

@@ -15,26 +15,18 @@ function iso_extract() {
 		return 10
 	}
 
+	iso_source="$1"
+	[ -f "$iso_source" ] || {
+		echo "### ERROR ### iso_extract: ISO \"$iso_source\" not exist!"
+		return 11
+	}
+
 	iso_extr_dir="$2"
 	[ -d "$iso_extr_dir" ] || {
 		echo "### ERROR ### iso_extract: aim directory not exist!"
 		return 12
 	}
 
-	iso_source="$1"
-	[ -f "$iso_source" ] || {
-		#if it is an url...
-		if [ "`check_url $iso_source`" == "true" ]; then
-			#dl to tmp + set iso_source
-			iso_tmp="`mktemp --suffix=.iso`"; rm "$iso_tmp"
-			wget -O "$iso_tmp" "$iso_source"
-		else
-			echo "### ERROR ### iso_extract: ISO \"$iso_source\" not exist!"
-			return 11
-		fi
-	}
-
-
 	#mace tmp mountpoint
 	tmpdir="`mktemp -d`"
 	[ -d "$iso_extr_dir" ] && {
@@ -49,7 +41,6 @@ function iso_extract() {
 	#clear tmp mountpoint
 	umount "$iso_source"
 	rm -r "$tmpdir"
-	[ -n "$iso_tmp" ] && rm "$iso_tmp"
 	tmpdir=
 
 	echo "done"

src/func/on_exit

@@ -4,31 +4,28 @@
 
 #on_exit [error_level]
 function on_exit() {
-  ### send mail
+	#send log and errorlevel[success/errorr xy]
-  [ -n "$log_mail_aim" ] && {
-    #send log and errorlevel[success/errorr xy]
-    if [ "$1" != "0" ]; then
-      log_mail_subject="$log_mail_subject [ERROR]"
-    else
-      log_mail_subject="$log_mail_subject [Success]"
-    fi
 
-    #Mail Body:
+	if [ "$1" != "0" ]; then
-    for mail_aim in `echo "$log_mail_aim" | tr "," " "`; do
+		log_mail_subject="$log_mail_subject [ERROR]"
-      {
+	else
-        echo "$log_mail_subject"
+		log_mail_subject="$log_mail_subject [Success]"
-        echo $'####################################################################################\n\n'
+	fi
-        cat "$log_file"
-      } | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
-    done
-  }
 
-  ### clean up
+	#Mail Body:
-  [ "$1" != "0" ] && {
+	for mail_aim in `echo "$log_mail_aim" | tr "," " "`; do
-    chroot_umount$distro "$chroot_path" 2> /dev/null
+		{
-    workspace_erase "$iso_extr_dir/" "$chroot_path/" 2> /dev/null
+			echo "$log_mail_subject"
-  }
+			echo $'####################################################################################\n\n'
-  exit $1
+			cat "$log_file"
+		} | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
+	done
+
+	[ "$1" != "0" ] && {
+		chroot_umount$distro "$chroot_path" 2> /dev/null
+		workspace_erase "$iso_extr_dir/" "$chroot_path/" 2> /dev/null
+	}
+	exit $1
 }
 
 #this func is standalone executable

src/func/workspace_erase

@@ -10,9 +10,6 @@ function workspace_erase() {
 		[ -d "$dir" ] && rm -r -f "$dir"
 	done
 
-	#lxc
-	[ -d /var/lib/lxc/_remaster_/ ] && rm -R /var/lib/lxc/_remaster_/
-
 	echo "done"
 }
 

src/proj/base

@@ -1,34 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-##################
-##### B a s e ####
-##################
-# .
-project_relation=""
-[ -z "$project" ] && project=base
-
-#tools_add [chroot_dir] [tools_list]
-function tools_add() {
-	echo "$project: tools_add ot available"
-}
-
-#os_update [chroot_dir]
-function os_update() {
-	echo "$project: os_update ot available"
-}
-
-#proxy_enable [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable() {
-	echo "$project: proxy_enable ot available"
-}
-
-#dns_set [chroot_dir] [domain] [nameserver]
-function dns_set() {
-	echo "$project: dns_set ot available"
-}
-
-function project_mods() {
-	echo "$project: project_mods ot available"
-}

src/proj/debian

@@ -2,18 +2,14 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
-source <LIBDIR>/proj/base
-#debian
-# . -> base
-project_relation="debian"
-
 ####################################
 ##### Base Template D E B I A N ####
 ####################################
+# .
 
 
 #tools_add [chroot_dir] [tools_list]
-function tools_add-debian() {
+function tools_add() {
 	echo "add tools ... "
 	#$1 = chroot directory
 	chroot_dir="$1"
@@ -24,10 +20,9 @@ function tools_add-debian() {
 	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"
 }
-function tools_add() { tools_add-debian $@; }
 
 #os_update [chroot_dir]
-function os_update-debian() {
+function os_update() {
 	echo "updating os ... "
 	#$1 = chroot directory
 
@@ -40,59 +35,3 @@ function os_update-debian() {
 
 	echo "done"
 }
-function os_update() { os_update-debian $@; }
-
-#proxy_enable [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable-debian() {
-  echo -n "enable proxy ... "
-
-  chroot_dir="$1"
-  proxy_host="$2"
-  proxy_port="$3"
-
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  #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
-
-    echo "done"
-  else
-    if [ "$proxy_host" == "" ] && [ "$proxy_port" == "" ] ; then
-      echo "done"
-    else
-      echo "### ERROR ### proxy_enable: wrong parameters! (\"$chroot_dir\"; \"$proxy_host\"; \"$proxy_port\")"
-      echo "proxy_enable [chroot_dir] [proxy_host] [proxy_port]"
-      return 2
-    fi
-  fi
-}
-function proxy_enable() { proxy_enable-debian $@; }
-
-#dns_set [chroot_dir] [domain] [nameserver]
-function dns_set-debian() {
-  echo -n "set dns config ... "
-
-  rm "$chroot_dir/etc/resolv.conf"
-
-  [ "$2" != "" ] && echo "domain $2" >> "$chroot_dir/etc/resolv.conf"
-  echo "search $2" >> "$chroot_dir/etc/resolv.conf"
-  for namesv in `echo "$3" | tr "," " "`; do
-    echo "nameserver $namesv" >> "$chroot_dir/etc/resolv.conf"
-  done
-
-  echo "done"
-}
-function dns_set() { dns_set-debian $@; }

src/proj/desinfect.15

@@ -1,227 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#desinfect.15
-# . -Y ubuntu.14.04 -> ubuntu -> debian
-source <LIBDIR>/proj/ubuntu.14.04
-project_relation="desinfect.15 $project_relation"
-
-
-
-#iso_create-desinfect.15 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
-function iso_create-desinfect.15() {
-  echo "prepere iso folder ... "
-
-  chroot_path="$1"
-  iso_extr_dir="$2"
-  iso_aim="$3"
-  iso_lable="$4"
-
-  #desinfect
-  rm "$iso_extr_dir/casper/initrd.lz"
-  wget http://www.heise.de/ct/projekte/desinfect/des15/initrd.lz -O "$iso_extr_dir/casper/initrd.lz"
-
-  echo "done"
-
-  iso_create-debian  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
-}
-function iso_create() { iso_create-desinfect.15 $@; }
-
-#chroot_initial-desinfect.15 [chroot_dir]
-function chroot_initial-desinfect.15() {
-  #$1 = chroot dir
-
-  chroot_initial-debian "$1"
-
-  echo -n "initial desinfect on chroot ... "
-
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_initial_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  #mount virus definitions
-  #bitdefender
-  mount --bind $chroot_dir/opt/BitDefender-scanner/var/lib/scan{.orig,}
-  mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
-
-  echo "done"
-}
-function iso_create() { iso_create-desinfect.15 $@; }
-
-#chroot_umount-desinfect.15 [chroot_dir]
-function chroot_umount-desinfect.15() {
-  #call main mount
-  chroot_umount-debian "$1"
-
-  echo -n "unmount desinfect on chroot ... "
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  for d in "$chroot_dir/opt/BitDefender-scanner/var/lib/scan" "$chroot_dir/var/kl/bases_rd" ; do
-    umount $d
-    retval=$?
-    [ "$retval" -gt 0 ] && {
-      echo "### ERROR ### chroot_umount_desinfect: can't umount \"$d\"!"
-      return 21
-    }
-  done
-
-  echo "done"
-}
-function chroot_umount() { chroot_umount-desinfect.15 $@; }
-
-#proxy_enable-desinfect.15 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable-desinfect.15() {
-
-  proxy_enable-debian $1 $2 $3
-
-  echo -n "enable proxy for desinfect's av ... "
-
-  chroot_dir="$1"
-  proxy_host="$2"
-  proxy_port="$3"
-
-  #Avast AntiVirus
-  sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-  sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-
-  #BitDefender
-  echo "ProxyEnable = Yes" >> "$chroot_dir/etc/BitDefender-scanner/bdscan.conf"
-  echo "ProxyHost = $proxy_host:$proxy_port" >> "$chroot_dir/etc/BitDefender-scanner/bdscan.conf"
-
-  #Clam AV
-  echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
-  echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
-
-  #Kaspersky
-  sed -i "s/<tDWORD name=\"UseProxy\">0<\/tDWORD>/<tDWORD name=\"UseProxy\">1<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tSTRING name=\"ProxyHost\"><\/tSTRING>/<tSTRING name=\"ProxyHost\">$proxy_host<\/tSTRING>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tDWORD name=\"ProxyPort\"><\/tDWORD>/<tDWORD name=\"ProxyPort\">$proxy_port<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-
-  echo "done"
-}
-function proxy_enable() { proxy_enable-desinfect.15 $@; }
-
-#sourcelist_desinfect_set_nomal2015 [chroot_dir]
-function sourcelist_desinfect_set_nomal2015() {
-  echo -n "build normal source.list ... "
-  #$1 = chroot directory
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2015 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2015 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "# #### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
-  echo "# deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#sourcelist_desinfect_set_extendet2015 [chroot_dir]
-function sourcelist_desinfect_set_extendet2015() {
-  echo -n "build extendet source.list ... "
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2015 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2015 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "#### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "## developers who want to ship their latest software." >> "$sourcelist"
-  echo "deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#os_update-desinfect.15 [chroot_dir]
-function os_update-desinfect.15() {
-  #$1 = chroot directory
-
-  chroot_dir="$1"
-
-  #call main os_update
-  os_update-debian "$chroot_dir"
-
-  echo "update virus definitions ... "
-
-  #BitDefender
-  chroot "$chroot_dir" /bin/bash -c "bdscan --update" | grep -v "... updated"
-
-  #Avast Avira
-  chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
-
-  #Clam AV
-  chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
-  rm -f "$chroot_dir/var/lib/clamav/daily.cld"
-
-  #Karspersky
-  echo '#!/bin/bash' > "$chroot_dir/tmp/up_kasp"
-  echo 'PATH=/usr/lib/kl:$PATH' >> "$chroot_dir/tmp/up_kasp"
-  echo 'LD_LIBRARY_PATH=/usr/lib/kl:$LD_LIBRARY_PATH' >> "$chroot_dir/tmp/up_kasp"
-  echo 'KL_PLUGINS_PATH=/usr/lib/kl' >> "$chroot_dir/tmp/up_kasp"
-  echo 'export PATH LD_LIBRARY_PATH KL_PLUGINS_PATH' >> "$chroot_dir/tmp/up_kasp"
-  echo '/usr/lib/kl/kav update' >> "$chroot_dir/tmp/up_kasp"
-  chmod +x  "$chroot_dir/tmp/up_kasp"
-  chroot "$chroot_dir" /bin/bash -c "/tmp/up_kasp" | grep -v ".kdc" | grep -v "File downloaded"
-  rm "$chroot_dir/tmp/up_kasp"
-
-
-  echo "done"
-}
-function os_update() { os_update-desinfect.15 $@; }
-
-#tools_add-desinfect.15 [chroot_dir] [tools_list]
-function tools_add-desinfect.15() {
-  #$1 = chroot directory
-  chroot_dir="$1"
-  tools_list="$2"
-
-  sourcelist_desinfect_set_extendet2015 "$chroot_dir"
-  tools_add-debian "$chroot_dir" "$tools_list"
-  sourcelist_desinfect_set_nomal2015 "$chroot_dir"
-}
-function tools_add() { tools_add-desinfect.15 $@; }

src/proj/desinfect.16

@@ -1,262 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#desinfect.16
-# . -Y ubuntu.14.04 -> ubuntu -> debian
-source <LIBDIR>/proj/ubuntu.14.04
-project_relation="desinfect.16 $project_relation"
-
-
-#chroot_initial-desinfect.16 [chroot_dir]
-function chroot_initial-desinfect.16() {
-  #$1 = chroot dir
-
-  chroot_initial-debian "$1"
-
-  echo -n "initial desinfect on chroot ... "
-
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_initial_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  #mount virus definitions
-  mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
-
-  echo "done"
-}
-function chroot_initial() { chroot_initial-desinfect.16 $@; }
-
-#chroot_umount-desinfect.16 [chroot_dir]
-function chroot_umount-desinfect.16() {
-  #call main mount
-  chroot_umount-debian "$1"
-
-  echo -n "unmount desinfect on chroot ... "
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  umount "$chroot_dir/var/kl/bases_rd"
-  [ "$?" -gt 0 ] && {
-    echo "### ERROR ### chroot_umount_desinfect: can't umount \"$chroot_dir/var/kl/bases_rd\"!"
-    #return 21
-  }
-
-  echo "done"
-}
-function chroot_umount() { chroot_umount-desinfect.16 $@; }
-
-#proxy_enable-desinfect.16 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable-desinfect.16() {
-
-  proxy_enable-debian $1 $2 $3
-
-  echo -n "enable proxy for desinfect's av ... "
-
-  chroot_dir="$1"
-  proxy_host="$2"
-  proxy_port="$3"
-  tmp_file_344532="`mktemp`"
-
-  #Avast AntiVirus
-  sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-  sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-
-  #Clam AV
-  cat "$chroot_dir/etc/clamav/freshclam.conf" | grep -v "HTTPProxyServer" | grep -v "HTTPProxyPort" > "$tmp_file_344532"
-  rm "$chroot_dir/etc/clamav/freshclam.conf"
-  cp "$tmp_file_344532" "$chroot_dir/etc/clamav/freshclam.conf"
-
-  echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
-  echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
-
-  #Eset AV
-  cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "proxy_addr" | grep -v "proxy_port" > "$tmp_file_344532"
-  rm "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-  cp "$tmp_file_344532" "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-  echo "proxy_addr = \"$proxy_host\"" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-  echo "proxy_port = $proxy_port" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-  #Kaspersky
-  sed -i "s/<tDWORD name=\"UseProxy\">0<\/tDWORD>/<tDWORD name=\"UseProxy\">1<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tSTRING name=\"ProxyHost\"><\/tSTRING>/<tSTRING name=\"ProxyHost\">$proxy_host<\/tSTRING>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tDWORD name=\"ProxyPort\"><\/tDWORD>/<tDWORD name=\"ProxyPort\">$proxy_port<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-
-  rm "$tmp_file_344532"
-  tmp_file_344532=
-
-  echo "done"
-}
-function proxy_enable() { proxy_enable-desinfect.16 $@; }
-
-#sourcelist_desinfect_set_nomal2016 [chroot_dir]
-function sourcelist_desinfect_set_nomal2016() {
-  echo -n "build normal source.list ... "
-  #$1 = chroot directory
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2016 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2016 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "# #### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
-  echo "# deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#sourcelist_desinfect_set_extendet2016 [chroot_dir]
-function sourcelist_desinfect_set_extendet2016() {
-  echo -n "build extendet source.list ... "
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2016 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2016 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "#### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "## developers who want to ship their latest software." >> "$sourcelist"
-  echo "deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#os_update-desinfect.16 [chroot_dir]
-function os_update-desinfect.16() {
-  #$1 = chroot directory
-
-  chroot_dir="$1"
-
-  #call main os_update
-  os_update-debian "$chroot_dir"
-
-  echo "update virus definitions ... "
-
-  #Avast Avira
-  {
-    echo "Avira ..."
-    chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
-    echo "Avira done"
-  }
-
-  #Clam AV
-  {
-    echo "ClamAV..."
-    chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
-    rm -f "$chroot_dir/var/lib/clamav/daily.cld"
-    echo "ClamAV done"
-  }
-
-  #Eset AV
-  {
-    echo "Eset AV ..."
-    tmp_file_23421="`mktemp`"
-    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "av_update_username" | grep -v "av_update_password" > "$tmp_file_23421"
-    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=1200
-    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"
-    sleep 2
-    chroot "$chroot_dir" /bin/bash -c "/opt/eset/esets/sbin/esets_daemon --update"
-
-    #warten auf daemon update ...
-    sleep 10m
-    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
-      av_eaet_timeout=$((av_eaet_timeout-1))
-      [ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
-    done
-
-    sleep 4
-
-    chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
-
-    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-    rm "$tmp_file_23421"
-    tmp_file_23421=
-    tmp_var_3092=
-    echo "Eset AV done"
-  }
-
-  #Karspersky
-  {
-    echo "Karspersky ..."
-    #gen update-scrypt
-    echo '#!/bin/bash' > "$chroot_dir/tmp/up_kasp"
-    echo 'PATH=/usr/lib/kl:$PATH' >> "$chroot_dir/tmp/up_kasp"
-    echo 'LD_LIBRARY_PATH=/usr/lib/kl:$LD_LIBRARY_PATH' >> "$chroot_dir/tmp/up_kasp"
-    echo 'KL_PLUGINS_PATH=/usr/lib/kl' >> "$chroot_dir/tmp/up_kasp"
-    echo 'export PATH LD_LIBRARY_PATH KL_PLUGINS_PATH' >> "$chroot_dir/tmp/up_kasp"
-    echo '/usr/lib/kl/kav update' >> "$chroot_dir/tmp/up_kasp"
-    chmod +x  "$chroot_dir/tmp/up_kasp"
-
-    chroot "$chroot_dir" /bin/bash -c "/tmp/up_kasp" | grep -v ".kdc" | grep -v "File downloaded"
-    rm "$chroot_dir/tmp/up_kasp"
-    echo "Karspersky done"
-  }
-
-  echo "update virus definitions done"
-}
-function os_update() { os_update-desinfect.16 $@; }
-
-#tools_add-desinfect.16 [chroot_dir] [tools_list]
-function tools_add-desinfect.16() {
-  #$1 = chroot directory
-  chroot_dir="$1"
-  tools_list="$2"
-
-  sourcelist_desinfect_set_extendet2016 "$chroot_dir"
-  tools_add-debian "$chroot_dir" "$tools_list"
-  sourcelist_desinfect_set_nomal2016 "$chroot_dir"
-}
-function tools_add() { tools_add-desinfect.16 $@; }

src/proj/desinfect.17

@@ -5,278 +5,5 @@
 #desinfect.17
 # . -Y ubuntu.16.04 -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu.16.04
-project_relation="desinfect.17 $project_relation"
 
-
+TEST2="na"
-#sourcelist_desinfect_set_nomal2017 [chroot_dir]
-function sourcelist_desinfect_set_nomal2017() {
-  echo -n "build normal source.list ... "
-  #$1 = chroot directory
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2017 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2017 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "# #### Ubuntu 16.04 LTS (Xenial) ####" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
-  echo "# deb http://extras.ubuntu.com/ubuntu xenial main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#sourcelist_desinfect_set_extendet2017 [chroot_dir]
-function sourcelist_desinfect_set_extendet2017() {
-  echo -n "build extendet source.list ... "
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2017 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2017 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "#### Ubuntu 16.04 LTS (Xenial) ####" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "## developers who want to ship their latest software." >> "$sourcelist"
-  echo "deb http://extras.ubuntu.com/ubuntu xenial main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#os_update-desinfect.17 [chroot_dir]
-function os_update-desinfect.17() {
-  #$1 = chroot directory
-
-  chroot_dir="$1"
-
-  #call main os_update from debian
-  os_update-debian "$chroot_dir"
-
-  echo "update virus definitions ... "
-
-  #Avast Avira
-  {
-    echo "Avira ..."
-    #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 --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"
-  }
-
-  #Eset AV
-  {
-    echo "Eset AV ..."
-    tmp_file_23421="`mktemp`"
-    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "av_update_username" | grep -v "av_update_password" > "$tmp_file_23421"
-    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"
-
-    av_eaet_timeout=300
-    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_sh "$chroot_dir" "/etc/init.d/esets restart"
-    sleep 2
-    #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 ...
-    echo "wait $((av_eaet_timeout/60))min for Eset AV update"
-    while [ "`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`" == "$tmp_var_3092" ]; do
-      sleep 10
-      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_sh "$chroot_dir" "/etc/init.d/esets stop"
-
-    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-    rm "$tmp_file_23421"
-    tmp_file_23421=
-    tmp_var_3092=
-    echo "Eset AV done"
-  }
-
-  #Sophos
-  {
-    echo "Sophos..."
-    #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"
-}
-function os_update() { os_update-desinfect.17 $@; }
-
-#proxy_enable-desinfect.17 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable-desinfect.17() {
-
-  proxy_enable-debian $1 $2 $3
-
-  echo "enable proxy for desinfect's av ... "
-
-  chroot_dir="$1"
-  proxy_host="$2"
-  proxy_port="$3"
-  tmp_file_344532="`mktemp`"
-
-  #Avast AntiVirus
-  if [ -f "$chroot_dir/AntiVirUpdate/avupdate" ]; then
-    echo "Avast AntiVirus: Found"
-    sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-    sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-  else
-    eco "Avast AntiVirus: NOT Found"
-  fi
-
-  #Eset AV
-  if [ -f "$chroot_dir/etc/opt/eset/esets/esets.cfg" ]; then
-    echo "Eset AV: Found"
-    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "proxy_addr" | grep -v "proxy_port" > "$tmp_file_344532"
-    rm "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-    cp "$tmp_file_344532" "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-    echo "proxy_addr = \"$proxy_host\"" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-    echo "proxy_port = $proxy_port" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-  else
-    eco "Eset AV: NOT Found"
-  fi
-
-  #ClamAV
-  if [ -f "$chroot_dir/etc/clamav/freshclam.conf" ]; then
-    echo "ClamAV: Found"
-    cat "$chroot_dir/etc/clamav/freshclam.conf" | grep -v "HTTPProxyServer" | grep -v "HTTPProxyPort" > "$tmp_file_344532"
-    rm "$chroot_dir/etc/clamav/freshclam.conf"
-    cp "$tmp_file_344532" "$chroot_dir/etc/clamav/freshclam.conf"
-
-    echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
-    echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
-  else
-    eco "ClamAV: NOT Found"
-  fi
-
-  #Sophos
-  if [ -f ""$chroot_dir/opt/sophos-av/etc/savd.cfg"" ]; then
-    echo "Sophos: Found"
-    echo "<Source>sophos:</Source><Proxy><Address>http://$proxy_host:$proxy_port</Proxy></Address>" >> "$chroot_dir/opt/sophos-av/etc/savd.cfg"
-  else
-    eco "Sophos: NOT Found"
-  fi
-
-  #F-Secure
-  if [ -f "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" ]; then
-    echo "F-Secure: Found"
-    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
-
-
-  rm "$tmp_file_344532"
-  tmp_file_344532=
-
-  echo "done"
-}
-function proxy_enable() { proxy_enable-desinfect.17 $@; }
-
-#tools_add-desinfect.17 [chroot_dir] [tools_list]
-function tools_add-desinfect.17() {
-  #$1 = chroot directory
-  chroot_dir="$1"
-  tools_list="$2"
-
-  sourcelist_desinfect_set_extendet2017 "$chroot_dir"
-  tools_add-debian "$chroot_dir" "$tools_list"
-  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 $@; }
-
-function chroot_initial-desinfect2017() {
-  #$1 = chroot dir
-
-  <LIBDIR>/func/chroot_initial "$1"
-
-	#LXC Start
-	config="/var/lib/lxc/_remaster_/config"
-
-	#special conf for distros:
-	echo "lxc.include = /usr/share/lxc/config/nesting.conf" > $config
-	echo "lxc.include = /usr/share/lxc/config/ubuntu.common.conf" >> $config
-	echo "lxc.arch = x86_64" >> $config
-
-	#normal config
-	chroot_config "$chroot_dir" >> $config
-	#LXC End
-}
-function chroot_initial() { chroot_initial-desinfect.17 $@; }

src/proj/ubuntu

@@ -7,4 +7,3 @@
 ####################################
 # . -> debian
 source <LIBDIR>/proj/debian
-project_relation="ubuntu $project_relation"

src/proj/ubuntu.14.04

@@ -1,8 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#ubuntu.14.04
-# . -> ubuntu -> debian
-source <LIBDIR>/proj/ubuntu
-project_relation="ubuntu.14.04 $project_relation"

src/proj/ubuntu.16.04

@@ -5,4 +5,3 @@
 #ubuntu.16.04
 # . -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu
-project_relation="ubuntu.16.04 $project_relation"