Merge branch 'release-2.0.4'

doc/notes

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

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

@@ -7,7 +7,7 @@ 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'
 	else
-			echo 'WARNUNG: Ausgeführte Version entspricht nicht dem offiziellen Release'
+			echo 'WARNUNG: neue Version verfügbar'
     fi
 }
 

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

@@ -261,22 +261,3 @@ function project_mods-desinfect.17() {
   }
 }
 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/remaster.sh

@@ -96,9 +96,6 @@ source <LIBDIR>/func/iso_create
 
 ### chroot ###
 
-## overload chroot with lxc
-source <LIBDIR>/func/chroot
-
 #chroot_initial [chroot_dir]
 source <LIBDIR>/func/chroot_initial