Revert "Update"

This reverts commit 3bccb8d499

linux-live/buildconfig

@@ -4,10 +4,10 @@
 DISTRIBUTION_TYPE="debian"
 
 #
-DISTRIBUTION="bullseye"
+DISTRIBUTION="buster"
 
 #
-DISTRIBUTION_ARCH="amd64"
+DISTRIBUTION_ARCH="i386"
 
 # Used when building Ubuntu
 DISTRIBUTION_VARIANT="minbase"
@@ -16,7 +16,7 @@ DISTRIBUTION_VARIANT="minbase"
 DISTRIBUTION_URL="http://ftp.ru.debian.org/debian/"
 
 #
-PACKAGE_VARIANT="minimal"
+PACKAGE_VARIANT="standard"
 
 #
 LOGPATH="/var/log"

linux-live/config

@@ -1,8 +1,8 @@
 #!/bin/bash
-# This is a config file for MiniOS-Live build script and Linux Live Kit boot script.
-# You shouldn't need to change anything expect PACKAGE_VARIANT OUTPUT COMP_TYPE
+# This is a config file for Linux Live Kit build script.
+# You shouldn't need to change anything expect LIVEKITNAME
 
-# Live Kit Name. Defaults to 'minios';
+# Live Kit Name. Defaults to 'linux';
 # This will be the name of the directory created on your CD/USB, which
 # will contain everything including boot files and such.
 # For example, Slax changes it to 'slax'
@@ -14,73 +14,6 @@
 # and you're done.
 LIVEKITNAME="minios"
 
-#
-DISTRIBUTION_TYPE="debian"
-
-#
-DISTRIBUTION="bullseye"
-
-#
-DISTRIBUTION_ARCH="amd64"
-
-# Used when building Ubuntu
-DISTRIBUTION_VARIANT="minbase"
-
-# 
-DISTRIBUTION_URL="http://ftp.ru.debian.org/debian/"
-
-#
-PACKAGE_VARIANT="minimal"
-
-#
-LOGPATH="/var/log"
-
-# default is output to log. you can use OUTPUT="/dev/stdout" if you want to route events to standard output.
-#OUTPUT="$LOGPATH/$LIVEKITNAME.log"
-OUTPUT="/dev/stdout"
-#OUTPUT="/dev/null"
-
-# if = "1", creates a second iso with a constant filename
-# если ="1", создаёт второй iso с постоянным именем файла
-BUILD_TEST_ISO="1"
-
-# удаляет старые файлы iso для данного типа сборки
-REMOVE_OLD_ISO="0"
-
-# if = "1", creates a copy of minios-live in chroot /opt
-# если ="1", создаёт копию minios-live в chroot /opt
-DEV_SYSTEM="0"
-
-# if ="1", creates backup in parent folder
-# если ="1", создаёт резервную копию в родительской папке
-CREATE_BACKUP="0"
-
-DEBIAN_FRONTEND_TYPE="noninteractive"
-#DEBIAN_FRONTEND_TYPE="dialog"
-#DEBIAN_FRONTEND_TYPE="text"
-
-APT_CMD="apt-get"
-
-APT_OPTIONS="-y"  
-APT_OPTIONS2="--no-install-recommends"
-
-#LIVE_TYPE="casper"
-LIVE_TYPE="livekit"
-
-#BOOT_TYPE="minios"
-BOOT_TYPE="slax"
-
-UNION_BUILD_TYPE="overlayfs"
-#UNION_BUILD_TYPE="aufs"
-
-INSTALL_OPTIONAL="1"
-
-# Used when assigned to the ISO name when building Minios-Live
-SYSTEMNAME="MiniOS"
-
-#
-SYSTEMVER="2021"
-
 #
 COMP_TYPE="xz"
 

linux-live/minioslib

@@ -672,6 +672,8 @@ function build_live() {
 
 	check_build_dir
 
+	#(cd /linux-live/rootcopy && cp --parents -afr * /)
+
 	chroot $BUILD_DIR mount none -t proc /proc
 	chroot $BUILD_DIR /linux-live/initrfs
 	chroot $BUILD_DIR umount /proc
@@ -688,7 +690,7 @@ function build_live() {
 	mv $BUILD_DIR/boot/initrfs.img $PARENT_DIR/image/$LIVEKITNAME/boot/initrfs.img
 
 	cp -r $SCRIPT_DIR/linux-live/bootfiles/* $PARENT_DIR/image/$LIVEKITNAME
-
+	
 	if [ $PACKAGE_VARIANT = "minimal" ]; then
 		sed -i 's/minios.flags=perch/minios.flags=perch,automount/g' $PARENT_DIR/image/$LIVEKITNAME/boot/syslinux.cfg
 		sed -i 's/minios.flags= /minios.flags=automount /g' $PARENT_DIR/image/$LIVEKITNAME/boot/syslinux.cfg
@@ -838,7 +840,6 @@ function chroot_build_cleanup() {
 	rm -f /install2 >>$OUTPUT 2>&1
 	rm -f /cleanup >>$OUTPUT 2>&1
 	rm -f /$PACKAGE_VARIANT.list >>$OUTPUT 2>&1
-	rm -f /preseed.txt >>$OUTPUT 2>&1
 	rm -f /postinstall >>$OUTPUT 2>&1
 	rm -rf /rootcopy >>$OUTPUT 2>&1
 	rm -rf /patches >>$OUTPUT 2>&1
@@ -879,11 +880,11 @@ function chroot_build_cleanup() {
 	rm -Rf /usr/share/fluxbox/nls/??* >>$OUTPUT 2>&1
 	rm -Rf /usr/share/gnome/help >>$OUTPUT 2>&1
 
-	#rm -Rf /usr/share/locale/?? >>$OUTPUT 2>&1
-	#rm -Rf /usr/share/locale/??_* >>$OUTPUT 2>&1
-	#rm -Rf /usr/share/locale/??@* >>$OUTPUT 2>&1
-	#rm -Rf /usr/share/locale/??? >>$OUTPUT 2>&1
-	#rm -Rf /usr/share/i18n/locales/*_* >>$OUTPUT 2>&1
+	rm -Rf /usr/share/locale/?? >>$OUTPUT 2>&1
+	rm -Rf /usr/share/locale/??_* >>$OUTPUT 2>&1
+	rm -Rf /usr/share/locale/??@* >>$OUTPUT 2>&1
+	rm -Rf /usr/share/locale/??? >>$OUTPUT 2>&1
+	rm -Rf /usr/share/i18n/locales/*_* >>$OUTPUT 2>&1
 	rm -Rf /usr/share/man/?? >>$OUTPUT 2>&1
 	rm -Rf /usr/share/man/*_* >>$OUTPUT 2>&1
 
@@ -986,8 +987,8 @@ function main_pkg_list() {
 			PACKAGE_VARIANT=$PACKAGE_VARIANT \
 			/linux-live/basesystem/01-core/preinstall
 	fi
-	: ' if [ "$(ls -A /linux-live/basesystem/01-core/rootcopy-install)" != "" ]; then
-        (cd /linux-live/basesystem/01-core/rootcopy-install && cp --parents -afr * /)
+	: ' if [ "$(ls -A /linux-live/basesystem/01-core/rootcopy)" != "" ]; then
+        (cd /linux-live/basesystem/01-core/rootcopy && cp --parents -afr * /)
     fi'
 	if [ -f /linux-live/basesystem/01-core/install ]; then
 		chmod +x /linux-live/basesystem/01-core/install
@@ -1059,7 +1060,7 @@ function chroot_configure() {
 	#addgroup live live >>$OUTPUT 2>&1
 	usermod -a -G sudo live
 
-	(cd /linux-live/basesystem/01-core/rootcopy-install && cp --parents -afr * /)
+	(cd /linux-live/basesystem/01-core/rootcopy && cp --parents -afr * /)
 
 	chown live:live /home/live
 	chown -R live:live /home/live
@@ -1479,9 +1480,8 @@ function module_chroot_cleanup() {
 		rm -f $MODULE_UPPER_DIR/install2
 		rm -f $MODULE_UPPER_DIR/cleanup
 		rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list
-		rm -f $MODULE_UPPER_DIR/preseed.txt
 		rm -f $MODULE_UPPER_DIR/postinstall
-		rm -rf $MODULE_UPPER_DIR/rootcopy-install
+		rm -rf $MODULE_UPPER_DIR/rootcopy
 	else
 		rm -rf $MODULE_UPPER_DIR/boot $MODULE_UPPER_DIR/dev $MODULE_UPPER_DIR/proc $MODULE_UPPER_DIR/sys $MODULE_UPPER_DIR/rmp $MODULE_UPPER_DIR/run
 		rm -f $MODULE_UPPER_DIR/root/.bash_history >>$OUTPUT 2>&1
@@ -1506,9 +1506,8 @@ function module_chroot_cleanup() {
 		rm -f $MODULE_UPPER_DIR/install2 >>$OUTPUT 2>&1
 		rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1
 		rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1
-		rm -f $MODULE_UPPER_DIR/preseed.txt >>$OUTPUT 2>&1
 		rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1
-		rm -rf $MODULE_UPPER_DIR/rootcopy-install >>$OUTPUT 2>&1
+		rm -rf $MODULE_UPPER_DIR/rootcopy >>$OUTPUT 2>&1
 	fi
 }
 
@@ -1527,9 +1526,8 @@ function module_build_cleanup() {
 		rm -f $MODULE_UPPER_DIR/install2
 		rm -f $MODULE_UPPER_DIR/cleanup
 		rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list
-		rm -f $MODULE_UPPER_DIR/preseed.txt
 		rm -f $MODULE_UPPER_DIR/postinstall
-		rm -rf $MODULE_UPPER_DIR/rootcopy-install
+		rm -rf $MODULE_UPPER_DIR/rootcopy
 		rm -rf $MODULE_UPPER_DIR/patches
 
 		rm -f $MODULE_UPPER_DIR/etc/fstab
@@ -1568,11 +1566,11 @@ function module_build_cleanup() {
 		rm -Rf $MODULE_UPPER_DIR/usr/share/fluxbox/nls/??*
 		rm -Rf $MODULE_UPPER_DIR/usr/share/gnome/help
 
-		#rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??
-		#rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??_*
-		#rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??@*
-		#rm -Rf $MODULE_UPPER_DIR/usr/share/locale/???
-		#rm -Rf $MODULE_UPPER_DIR/usr/share/i18n/locales/*_*
+		rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??
+		rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??_*
+		rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??@*
+		rm -Rf $MODULE_UPPER_DIR/usr/share/locale/???
+		rm -Rf $MODULE_UPPER_DIR/usr/share/i18n/locales/*_*
 		rm -Rf $MODULE_UPPER_DIR/usr/share/man/??
 		rm -Rf $MODULE_UPPER_DIR/usr/share/man/*_*
 
@@ -1622,9 +1620,8 @@ function module_build_cleanup() {
 		rm -f $MODULE_UPPER_DIR/install2 >>$OUTPUT 2>&1
 		rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1
 		rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1
-		rm -f $MODULE_UPPER_DIR/preseed.txt >>$OUTPUT 2>&1
 		rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1
-		rm -rf $MODULE_UPPER_DIR/rootcopy-install >>$OUTPUT 2>&1
+		rm -rf $MODULE_UPPER_DIR/rootcopy >>$OUTPUT 2>&1
 		rm -rf $MODULE_UPPER_DIR/patches >>$OUTPUT 2>&1
 
 		rm -f $MODULE_UPPER_DIR/etc/fstab >>$OUTPUT 2>&1
@@ -1770,24 +1767,24 @@ function build_modules() {
 			# copy files
 			if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
 				if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
-					if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ]; then
-						(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
+					if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ]; then
+						(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/)
 					fi
 				else
-					if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
-						(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
+					if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then
+						(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/)
 					fi
 				fi
 			else
 				if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
-					if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ]; then
-						mkdir $MODULE_MERGED_DIR/rootcopy-install
-						(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
+					if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ]; then
+						mkdir $MODULE_MERGED_DIR/rootcopy
+						(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy/)
 					fi
 				else
-					if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
-						mkdir $MODULE_MERGED_DIR/rootcopy-install
-						(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
+					if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then
+						mkdir $MODULE_MERGED_DIR/rootcopy
+						(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy/)
 					fi
 				fi
 			fi
@@ -1802,9 +1799,6 @@ function build_modules() {
 				if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/$PACKAGE_VARIANT.list ]; then
 					cp $SCRIPT_DIR/linux-live/modules/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list
 				fi
-				if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/preseed.txt ]; then
-					cp $SCRIPT_DIR/linux-live/modules/$MODULE/preseed.txt $MODULE_MERGED_DIR/preseed.txt
-				fi
 				if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
 					chroot $MODULE_MERGED_DIR /usr/bin/env \
 						OUTPUT=$OUTPUT \
@@ -1964,6 +1958,8 @@ function build_modules() {
 
 			module_chroot_finish_up
 
+			module_chroot_umount_fs
+
 			if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
 				module_build_cleanup
 			fi
@@ -1988,8 +1984,6 @@ function build_modules() {
 				fi
 			fi
 
-			module_chroot_umount_fs
-
 		fi
 	done
 }
@@ -2000,6 +1994,7 @@ function build_modules() {
 # =================================================================
 function build_modules_live() {
 	current_process
+	echo "here 2"
 	if [ $CONTAINER_TYPE = "1" ]; then
 		if [ ! -f /.minios-live ]; then
 			setup_host