From a653d7e586bbbb7bce5ca34d19fa8232d0543983 Mon Sep 17 00:00:00 2001
From: crims0n <crims0n@yandex.ru>
Date: Thu, 28 Jan 2021 08:37:24 +0300
Subject: [PATCH] update

---
 cleanup                                       |  27 +++
 linux-live/buildconfig                        |   4 +-
 linux-live/config                             |   2 +-
 linux-live/minioslib                          | 165 +++++-------------
 linux-live/pkglists/other.list                |   8 +-
 linux-live/pkglists/ubuntu-gui.list           |  19 +-
 linux-live/pkglists/ubuntu-other.list         |  12 +-
 linux-live/rootcopy-ubuntu/etc/casper.conf    |   4 +-
 linux-live/rootcopy-ubuntu/etc/hostname       |   1 -
 linux-live/rootcopy-ubuntu/etc/hosts          |   7 -
 linux-live/rootcopy-ubuntu/etc/locale.nopurge |  63 -------
 .../etc/netplan/01-network-manager-all.yaml   |   4 -
 .../etc/skel/.config/Trolltech.conf           |   5 -
 .../etc/skel/.config/user-dirs.dirs           |  15 --
 .../rootcopy-ubuntu/etc/sudoers.d/casper      |   1 -
 linux-live/rootcopy/etc/locale.nopurge        |  63 -------
 16 files changed, 95 insertions(+), 305 deletions(-)
 create mode 100644 cleanup
 delete mode 100644 linux-live/rootcopy-ubuntu/etc/hostname
 delete mode 100644 linux-live/rootcopy-ubuntu/etc/hosts
 delete mode 100644 linux-live/rootcopy-ubuntu/etc/locale.nopurge
 delete mode 100644 linux-live/rootcopy-ubuntu/etc/netplan/01-network-manager-all.yaml
 delete mode 100644 linux-live/rootcopy-ubuntu/etc/skel/.config/Trolltech.conf
 delete mode 100644 linux-live/rootcopy-ubuntu/etc/skel/.config/user-dirs.dirs
 delete mode 100644 linux-live/rootcopy-ubuntu/etc/sudoers.d/casper
 delete mode 100644 linux-live/rootcopy/etc/locale.nopurge

diff --git a/cleanup b/cleanup
new file mode 100644
index 0000000..b73d53d
--- /dev/null
+++ b/cleanup
@@ -0,0 +1,27 @@
+# truncate machine id (why??)
+truncate -s 0 /etc/machine-id
+
+# remove diversion (why??)
+rm /sbin/initctl
+dpkg-divert --rename --remove /sbin/initctl
+
+# remove ssh config
+#rm -f /etc/ssh/ssh_host*
+
+# clean up useless stuff
+rm -rf /tmp/* ~/.bash_history
+find /var/log/ -type f | xargs rm -f
+rm -f /etc/ssh/ssh_host*
+rm -f /var/backups/*
+rm -f /var/cache/ldconfig/*
+rm -f /var/cache/debconf/*
+rm -f /var/cache/fontconfig/*
+rm -f /var/cache/apt/archives/*.deb
+rm -f /var/cache/apt/*.bin
+rm -f /var/cache/debconf/*-old
+rm -f /var/lib/apt/extended_states
+rm -f /var/lib/apt/lists/*Packages
+rm -f /var/lib/apt/lists/*Translation*
+rm -f /var/lib/apt/lists/*InRelease
+rm -f /var/lib/apt/lists/deb.*
+rm -f /var/lib/dpkg/*-old
diff --git a/linux-live/buildconfig b/linux-live/buildconfig
index 34835ff..663c7a1 100644
--- a/linux-live/buildconfig
+++ b/linux-live/buildconfig
@@ -21,8 +21,8 @@ DEV_SYSTEM="0"
 # если ="1", создаёт резервную копию в родительской папке
 CREATE_BACKUP="0"
 
-#DEBIAN_FRONTEND_TYPE="noninteractive"
-DEBIAN_FRONTEND_TYPE="dialog"
+DEBIAN_FRONTEND_TYPE="noninteractive"
+#DEBIAN_FRONTEND_TYPE="dialog"
 
 APT_CMD="apt-get"
 
diff --git a/linux-live/config b/linux-live/config
index d7ec40d..442a4ea 100644
--- a/linux-live/config
+++ b/linux-live/config
@@ -30,7 +30,7 @@ DISTRIBUTION_ARCH="amd64"
 DISTRIBUTION_VARIANT="minbase"
 
 #
-DISTRIBUTION_URL="http://archive.ubuntu.com/ubuntu"
+DISTRIBUTION_URL="http://ru.archive.ubuntu.com/ubuntu"
 
 #
 COMP_TYPE="lz4"
diff --git a/linux-live/minioslib b/linux-live/minioslib
index 4030c78..ef505d7 100644
--- a/linux-live/minioslib
+++ b/linux-live/minioslib
@@ -502,7 +502,7 @@ function build_bootstrap() {
 			setup_host
 		fi
 	fi
-	
+
 	sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
 		debootstrap --arch=$DISTRIBUTION_ARCH --variant=$DISTRIBUTION_VARIANT $DISTRIBUTION $BUILD_DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT
 }
@@ -998,140 +998,65 @@ EOF
 
 function prereq_pkg_list() {
 	echo -e "${YELLOW}=====> installing prerequested software for chroot system ...${ENDCOLOUR}"
-	if [ $DEBIAN_FRONTEND_TYPE = "noninteractive" ]; then
-		if [ -f $SCRIPT_DIR/pkglists/prereq.list ]; then
-			$APT_CMD update >>$OUTPUT 2>&1 &&
-				echo -e "${YELLOW}=====> upgrading chroot system ...${ENDCOLOUR}" &&
-				$APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1 &&
-				echo -e "${YELLOW}=====> installing packages ...${ENDCOLOUR}" &&
-				$APT_CMD install $APT_OPTIONS \
-					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/prereq.list | tr "\n" " ") >>$OUTPUT 2>&1
-		else
-			# we need to install systemd first, to configure machine id
-			$APT_CMD update >>$OUTPUT 2>&1 &&
-				echo -e "${YELLOW}=====> upgrading chroot system ...${ENDCOLOUR}" &&
-				$APT_CMD upgrade $APT_OPTIONS >dev/null &&
-				echo -e "${YELLOW}=====> installing packages ...${ENDCOLOUR}" &&
-				$APT_CMD install $APT_OPTIONS sudo libterm-readline-gnu-perl systemd-sysv >>$OUTPUT 2>&1
-		fi
-	elif [ $DEBIAN_FRONTEND_TYPE = "dialog" ]; then
-		if [ -f $SCRIPT_DIR/pkglists/prereq.list ]; then
-			$APT_CMD update >>$OUTPUT 2>&1 &&
-				echo -e "${YELLOW}=====> upgrading chroot system ...${ENDCOLOUR}" &&
-				$APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1 &&
-				echo -e "${YELLOW}=====> installing packages ...${ENDCOLOUR}" &&
-				$APT_CMD install $APT_OPTIONS \
-					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/prereq.list | tr "\n" " ")
-		else
-			# we need to install systemd first, to configure machine id
-			$APT_CMD update >>$OUTPUT 2>&1 &&
-				echo -e "${YELLOW}=====> upgrading chroot system ...${ENDCOLOUR}" &&
-				$APT_CMD upgrade $APT_OPTIONS >dev/null &&
-				echo -e "${YELLOW}=====> installing packages ...${ENDCOLOUR}" &&
-				$APT_CMD install $APT_OPTIONS sudo libterm-readline-gnu-perl systemd-sysv
-		fi
+
+	if [ -f $SCRIPT_DIR/pkglists/prereq.list ]; then
+		$APT_CMD update >>$OUTPUT 2>&1 &&
+			echo -e "${YELLOW}=====> upgrading chroot system ...${ENDCOLOUR}" &&
+			$APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1 &&
+			echo -e "${YELLOW}=====> installing packages ...${ENDCOLOUR}" &&
+			$APT_CMD install $APT_OPTIONS \
+				$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/prereq.list | tr "\n" " ") >>$OUTPUT 2>&1
 	fi
 }
 
 function main_pkg_list() {
 	echo -e "${YELLOW}=====> installing main packages for chroot system ...${ENDCOLOUR}"
-	if [ $DEBIAN_FRONTEND_TYPE = "noninteractive" ]; then
-		if [ -f $SCRIPT_DIR/pkglists/main.list ]; then
+
+	if [ -f $SCRIPT_DIR/pkglists/main.list ]; then
+		#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+		#	$APT_CMD update >>$OUTPUT 2>&1 &&
+		sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+			$APT_CMD install $APT_OPTIONS \
+			$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/main.list | tr "\n" " ") >>$OUTPUT 2>&1
+	fi
+	if [ $LIVE_TYPE = "ubuntu" ]; then
+		if [ -f $SCRIPT_DIR/pkglists/ubuntu-main.list ]; then
 			sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
-				$APT_CMD update >>$OUTPUT 2>&1 &&
 				$APT_CMD install $APT_OPTIONS \
-					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/main.list | tr "\n" " ") >>$OUTPUT 2>&1
-		else
-			sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
-				$APT_CMD update >>$OUTPUT 2>&1 &&
-				$APT_CMD install $APT_OPTIONS ubuntu-minimal resolvconf xz-utils linux-image-generic >>$OUTPUT 2>&1
+				$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ") >>$OUTPUT 2>&1
 		fi
-		if [ $LIVE_TYPE = "ubuntu" ]; then
-			if [ -f $SCRIPT_DIR/pkglists/ubuntu-main.list ]; then
-				sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
-					$APT_CMD install $APT_OPTIONS \
-					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ") >>$OUTPUT 2>&1
-			fi
-			if [ -f $SCRIPT_DIR/pkglists/ubuntu-gui.list ]; then
-				sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
-					$APT_CMD install $APT_OPTIONS tasksel >>$OUTPUT 2>&1 &&
-					tasksel install xubuntu-live >>$OUTPUT 2>&1 &&
-					tasksel install xubuntu-core >>$OUTPUT 2>&1 &&
-					$APT_CMD install $APT_OPTIONS \
-						$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-gui.list | tr "\n" " ") >>$OUTPUT 2>&1
-				#$APT_CMD install $APT_OPTIONS /linux-live/packages/chromium_88.0.4324.96~linuxmint1+ulyssa_amd64.deb >>$OUTPUT 2>&1
-			fi
-			if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then
-				sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
-					$APT_CMD install $APT_OPTIONS \
-					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") >>$OUTPUT 2>&1
-			fi
-		fi
-	elif [ $DEBIAN_FRONTEND_TYPE = "dialog" ]; then
-		if [ -f $SCRIPT_DIR/pkglists/main.list ]; then
-			$APT_CMD update >>$OUTPUT 2>&1 &&
+		if [ -f $SCRIPT_DIR/pkglists/ubuntu-gui.list ]; then
+			sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
 				$APT_CMD install $APT_OPTIONS \
-					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/main.list | tr "\n" " ")
-		else
-			$APT_CMD update >>$OUTPUT 2>&1 &&
-				$APT_CMD install $APT_OPTIONS ubuntu-minimal resolvconf xz-utils linux-image-generic
+				$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-gui.list | tr "\n" " ") >>$OUTPUT 2>&1
+			#$APT_CMD install $APT_OPTIONS /linux-live/packages/chromium_88.0.4324.96~linuxmint1+ulyssa_amd64.deb >>$OUTPUT 2>&1
 		fi
-		if [ $LIVE_TYPE = "ubuntu" ]; then
-			if [ -f $SCRIPT_DIR/pkglists/ubuntu-main.list ]; then
-				$APT_CMD install $APT_OPTIONS \
-					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ")
-			fi
-			if [ -f $SCRIPT_DIR/pkglists/ubuntu-gui.list ]; then
-				$APT_CMD install $APT_OPTIONS xubuntu-core^ ubiquity ubiquity-casper ubiquity-frontend-gtk ubiquity-slideshow-xubuntu ubiquity-ubuntu-artwork
-					#$APT_CMD install $APT_OPTIONS \
-						#$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-gui.list | tr "\n" " ")
-				#$APT_CMD install $APT_OPTIONS /linux-live/packages/chromium_88.0.4324.96~linuxmint1+ulyssa_amd64.deb
-			fi
-			: 'if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then
-				echo ""
+		if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then
+			sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
 				$APT_CMD install $APT_OPTIONS \
-					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ")
-			fi'
+				$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") >>$OUTPUT 2>&1
 		fi
 	fi
 }
 
 function other_pkg_list() {
 	echo -e "${YELLOW}=====> installing other packages for chroot system ...${ENDCOLOUR}"
-	if [ $DEBIAN_FRONTEND_TYPE = "noninteractive" ]; then
-		if [ $LIVE_TYPE = "ubuntu" ]; then
-			#$APT_CMD install $APT_OPTIONS tasksel >>$OUTPUT 2>&1
-			#tasksel install xubuntu-core
-			#$APT_CMD autoremove $APT_OPTIONS tasksel >>$OUTPUT 2>&1
-			if [ -f $SCRIPT_DIR/pkglists/ubuntu-other.list ]; then
-				sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
-					$APT_CMD update >>$OUTPUT 2>&1 &&
-					$APT_CMD install $APT_OPTIONS \
-						$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-other.list | tr "\n" " ") >>$OUTPUT 2>&1
-			fi
-		fi
-		if [ -f $SCRIPT_DIR/pkglists/other.list ]; then
+
+	if [ $LIVE_TYPE = "ubuntu" ]; then
+		if [ -f $SCRIPT_DIR/pkglists/ubuntu-other.list ]; then
 			sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
 				$APT_CMD update >>$OUTPUT 2>&1 &&
-				$APT_CMD install $APT_OPTIONS \
-					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/other.list | tr "\n" " ") >>$OUTPUT 2>&1
-		fi
-	elif [ $DEBIAN_FRONTEND_TYPE = "dialog" ]; then
-		if [ $LIVE_TYPE = "ubuntu" ]; then
-			#$APT_CMD install $APT_OPTIONS tasksel >>$OUTPUT 2>&1
-			#tasksel install xubuntu-core
-			#$APT_CMD autoremove $APT_OPTIONS tasksel >>$OUTPUT 2>&1
-			if [ -f $SCRIPT_DIR/pkglists/ubuntu-other.list ]; then
-				$APT_CMD update >>$OUTPUT 2>&1 &&
+				sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
 					$APT_CMD install $APT_OPTIONS \
-						$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-other.list | tr "\n" " ")
-			fi
+					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-other.list | tr "\n" " ") >>$OUTPUT 2>&1
 		fi
-		if [ -f $SCRIPT_DIR/pkglists/other.list ]; then
+	fi
+	if [ -f $SCRIPT_DIR/pkglists/other.list ]; then
+		sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
 			$APT_CMD update >>$OUTPUT 2>&1 &&
+			sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
 				$APT_CMD install $APT_OPTIONS \
-					$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/other.list | tr "\n" " ")
-		fi
+				$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/other.list | tr "\n" " ") >>$OUTPUT 2>&1
 	fi
 }
 
@@ -1145,6 +1070,7 @@ function chroot_pkg_install() {
 	if [ $LIVE_TYPE = "linux-live" ]; then
 		(cd /linux-live/rootcopy && cp --parents -afr * /)
 	elif [ $LIVE_TYPE = "ubuntu" ]; then
+		#echo ""
 		(cd /linux-live/rootcopy-ubuntu && cp --parents -afr * /)
 	fi
 
@@ -1191,7 +1117,9 @@ EOF
 			echo 'LANG="ru_RU.UTF-8"' >/etc/default/locale &&
 			dpkg-reconfigure -f noninteractive locales >>$OUTPUT 2>&1 &&
 			update-locale LANG=ru_RU.UTF-8 >>$OUTPUT 2>&1
-		#localepurge
+		echo "localepurge localepurge/nopurge multiselect en, en_US.UTF-8, ru, ru_RU, ru_RU.UTF-8" | debconf-set-selections
+		dpkg-reconfigure -f noninteractive localepurge >>$OUTPUT 2>&1
+		localepurge -v >>$OUTPUT 2>&1
 
 		# configure resolvconf
 		if grep resolvconf $SCRIPT_DIR/pkglists/main.list >>$OUTPUT 2>&1 || grep resolvconf $SCRIPT_DIR/pkglists/other.list || [ $DISTRIBUTION != "xenial" ] >>$OUTPUT 2>&1; then
@@ -1215,10 +1143,10 @@ EOF
 		#dpkg-reconfigure console-setup
 
 		# configure timezone and locale
-		dpkg-reconfigure tzdata
+		#dpkg-reconfigure tzdata
 		dpkg-reconfigure locales
 		#dpkg-reconfigure localepurge
-		localepurge
+		#localepurge -v
 
 		# configure resolvconf
 		if grep resolvconf $SCRIPT_DIR/pkglists/main.list >>$OUTPUT 2>&1 || grep resolvconf $SCRIPT_DIR/pkglists/other.list || [ $DISTRIBUTION != "xenial" ] >>$OUTPUT 2>&1; then
@@ -1378,7 +1306,7 @@ function chroot_finish_up() {
 	rm -f /etc/ssh/ssh_host*
 	rm -f /var/backups/* >>$OUTPUT 2>&1
 	rm -f /var/cache/ldconfig/* >>$OUTPUT 2>&1
-	rm -f /var/cache/debconf/* >>$OUTPUT 2>&1
+	#rm -f /var/cache/debconf/* >>$OUTPUT 2>&1
 	rm -f /var/cache/fontconfig/* >>$OUTPUT 2>&1
 	rm -f /var/cache/apt/archives/*.deb >>$OUTPUT 2>&1
 	rm -f /var/cache/apt/*.bin >>$OUTPUT 2>&1
@@ -1389,7 +1317,4 @@ function chroot_finish_up() {
 	rm -f /var/lib/apt/lists/*InRelease >>$OUTPUT 2>&1
 	rm -f /var/lib/apt/lists/deb.* >>$OUTPUT 2>&1
 	rm -f /var/lib/dpkg/*-old >>$OUTPUT 2>&1
-}
-if [ grep ]; then
-	echo
-fi
+}
\ No newline at end of file
diff --git a/linux-live/pkglists/other.list b/linux-live/pkglists/other.list
index 0789ce7..a7499d0 100644
--- a/linux-live/pkglists/other.list
+++ b/linux-live/pkglists/other.list
@@ -1,12 +1,6 @@
 # Опциональные приложения, можно удалить любое.
-bash-completion
-openssh-server
-# без этого ▼ пакета нельзя будет пересобрать запущенную систему
-squashfs-tools
-# без этого ▼ пакета нельзя будет пересобрать запущенную систему
-xorriso
 mc
 htop
 ncdu
-open-vm-tools
+#open-vm-tools
 #tasksel
\ No newline at end of file
diff --git a/linux-live/pkglists/ubuntu-gui.list b/linux-live/pkglists/ubuntu-gui.list
index 82204e5..9b7cb04 100755
--- a/linux-live/pkglists/ubuntu-gui.list
+++ b/linux-live/pkglists/ubuntu-gui.list
@@ -1,13 +1,6 @@
-# xubuntu-core ставим через tasksel, иначе он тянет за собой части gnome-desktop и gdm3
-#xubuntu-core
-mousepad
-blueman
-ristretto
-onboard
-gigolo
-gparted
-xfce4-taskmanager
-xfce4-xkb-plugin
-firefox
-firefox-locale-ru
-language-pack-gnome-ru
\ No newline at end of file
+xubuntu-core^
+ubiquity
+ubiquity-casper
+ubiquity-frontend-gtk
+ubiquity-slideshow-xubuntu
+ubiquity-ubuntu-artwork
\ No newline at end of file
diff --git a/linux-live/pkglists/ubuntu-other.list b/linux-live/pkglists/ubuntu-other.list
index 4d416c3..aba8c51 100644
--- a/linux-live/pkglists/ubuntu-other.list
+++ b/linux-live/pkglists/ubuntu-other.list
@@ -1,2 +1,12 @@
 open-vm-tools-desktop
-#samba-common
\ No newline at end of file
+mousepad
+blueman
+ristretto
+onboard
+gigolo
+gparted
+xfce4-taskmanager
+xfce4-xkb-plugin
+firefox
+firefox-locale-ru
+language-pack-gnome-ru
\ No newline at end of file
diff --git a/linux-live/rootcopy-ubuntu/etc/casper.conf b/linux-live/rootcopy-ubuntu/etc/casper.conf
index ed7594b..ae7dde1 100644
--- a/linux-live/rootcopy-ubuntu/etc/casper.conf
+++ b/linux-live/rootcopy-ubuntu/etc/casper.conf
@@ -2,9 +2,9 @@
 # Supported variables are:
 # USERNAME, USERFULLNAME, HOST, BUILD_SYSTEM, FLAVOUR
 
-export USERNAME="ubuntu"
+export USERNAME="live"
 export USERFULLNAME="Live session user"
-export HOST="ubuntu"
+export HOST="minios"
 export BUILD_SYSTEM="Ubuntu"
 
 # USERNAME and HOSTNAME as specified above won't be honoured and will be set to
diff --git a/linux-live/rootcopy-ubuntu/etc/hostname b/linux-live/rootcopy-ubuntu/etc/hostname
deleted file mode 100644
index 42942a9..0000000
--- a/linux-live/rootcopy-ubuntu/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-minios
diff --git a/linux-live/rootcopy-ubuntu/etc/hosts b/linux-live/rootcopy-ubuntu/etc/hosts
deleted file mode 100644
index 892092a..0000000
--- a/linux-live/rootcopy-ubuntu/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1	localhost
-127.0.1.1	minios
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
diff --git a/linux-live/rootcopy-ubuntu/etc/locale.nopurge b/linux-live/rootcopy-ubuntu/etc/locale.nopurge
deleted file mode 100644
index 9346c6c..0000000
--- a/linux-live/rootcopy-ubuntu/etc/locale.nopurge
+++ /dev/null
@@ -1,63 +0,0 @@
-####################################################
-# This is the configuration file for localepurge(8).
-####################################################
-
-####################################################
-# Uncommenting this string enables the use of dpkg's
-# --path-exclude feature.  In this mode, localepurge
-# will configure dpkg to exclude the desired locales
-# at unpack time.
-#
-# If enabled, the following 3 options will be
-# disabled:
-#
-#  QUICKNDIRTYCALC
-#  SHOWFREEDSPACE
-#  VERBOSE
-#
-# And the following option will be enabled and cannot
-# be disabled (unless USE_DPKG is disabled):
-#
-#  DONTBOTHERNEWLOCALE
-#
-
-USE_DPKG
-####################################################
-
-####################################################
-# Uncommenting this string enables removal of localized 
-# man pages based on the configuration information for
-# locale files defined below:
-
-MANDELETE
-
-####################################################
-# Uncommenting this string causes localepurge to simply delete
-# locales which have newly appeared on the system without
-# bothering you about it:
-
-#DONTBOTHERNEWLOCALE
-
-####################################################
-# Uncommenting this string enables display of freed disk
-# space if localepurge has purged any superfluous data:
-
-SHOWFREEDSPACE
-
-#####################################################
-# Commenting out this string enables faster but less
-# accurate calculation of freed disk space:
-
-QUICKNDIRTYCALC
-
-#####################################################
-# Commenting out this string disables verbose output:
-
-#VERBOSE
-
-#####################################################
-# Following locales won't be deleted from this system
-# after package installations done with apt-get(8):
-
-en_US.UTF-8
-ru_RU.UTF-8
diff --git a/linux-live/rootcopy-ubuntu/etc/netplan/01-network-manager-all.yaml b/linux-live/rootcopy-ubuntu/etc/netplan/01-network-manager-all.yaml
deleted file mode 100644
index 4a8fd08..0000000
--- a/linux-live/rootcopy-ubuntu/etc/netplan/01-network-manager-all.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Let NetworkManager manage all devices on this system
-network:
-  version: 2
-  renderer: NetworkManager
diff --git a/linux-live/rootcopy-ubuntu/etc/skel/.config/Trolltech.conf b/linux-live/rootcopy-ubuntu/etc/skel/.config/Trolltech.conf
deleted file mode 100644
index ebabedd..0000000
--- a/linux-live/rootcopy-ubuntu/etc/skel/.config/Trolltech.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[Qt]
-font="Noto Sans,9,-1,5,50,0,0,0,0,0"
-style=GTK+
-doubleClickInterval=400
-cursorFlashTime=1200
diff --git a/linux-live/rootcopy-ubuntu/etc/skel/.config/user-dirs.dirs b/linux-live/rootcopy-ubuntu/etc/skel/.config/user-dirs.dirs
deleted file mode 100644
index 7f9a959..0000000
--- a/linux-live/rootcopy-ubuntu/etc/skel/.config/user-dirs.dirs
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is written by xdg-user-dirs-update
-# If you want to change or add directories, just edit the line you're
-# interested in. All local changes will be retained on the next run.
-# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
-# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
-# absolute path. No other format is supported.
-# 
-XDG_DESKTOP_DIR="$HOME/Desktop"
-XDG_DOWNLOAD_DIR="$HOME/Downloads"
-XDG_TEMPLATES_DIR="$HOME/Templates"
-XDG_PUBLICSHARE_DIR="$HOME/Public"
-XDG_DOCUMENTS_DIR="$HOME/Documents"
-XDG_MUSIC_DIR="$HOME/Music"
-XDG_PICTURES_DIR="$HOME/Pictures"
-XDG_VIDEOS_DIR="$HOME/Videos"
diff --git a/linux-live/rootcopy-ubuntu/etc/sudoers.d/casper b/linux-live/rootcopy-ubuntu/etc/sudoers.d/casper
deleted file mode 100644
index 9a51fee..0000000
--- a/linux-live/rootcopy-ubuntu/etc/sudoers.d/casper
+++ /dev/null
@@ -1 +0,0 @@
-xubuntu  ALL=(ALL) NOPASSWD: ALL
diff --git a/linux-live/rootcopy/etc/locale.nopurge b/linux-live/rootcopy/etc/locale.nopurge
deleted file mode 100644
index 9346c6c..0000000
--- a/linux-live/rootcopy/etc/locale.nopurge
+++ /dev/null
@@ -1,63 +0,0 @@
-####################################################
-# This is the configuration file for localepurge(8).
-####################################################
-
-####################################################
-# Uncommenting this string enables the use of dpkg's
-# --path-exclude feature.  In this mode, localepurge
-# will configure dpkg to exclude the desired locales
-# at unpack time.
-#
-# If enabled, the following 3 options will be
-# disabled:
-#
-#  QUICKNDIRTYCALC
-#  SHOWFREEDSPACE
-#  VERBOSE
-#
-# And the following option will be enabled and cannot
-# be disabled (unless USE_DPKG is disabled):
-#
-#  DONTBOTHERNEWLOCALE
-#
-
-USE_DPKG
-####################################################
-
-####################################################
-# Uncommenting this string enables removal of localized 
-# man pages based on the configuration information for
-# locale files defined below:
-
-MANDELETE
-
-####################################################
-# Uncommenting this string causes localepurge to simply delete
-# locales which have newly appeared on the system without
-# bothering you about it:
-
-#DONTBOTHERNEWLOCALE
-
-####################################################
-# Uncommenting this string enables display of freed disk
-# space if localepurge has purged any superfluous data:
-
-SHOWFREEDSPACE
-
-#####################################################
-# Commenting out this string enables faster but less
-# accurate calculation of freed disk space:
-
-QUICKNDIRTYCALC
-
-#####################################################
-# Commenting out this string disables verbose output:
-
-#VERBOSE
-
-#####################################################
-# Following locales won't be deleted from this system
-# after package installations done with apt-get(8):
-
-en_US.UTF-8
-ru_RU.UTF-8