From 51409998e59c63a92b443f8d022a0525e72a1549 Mon Sep 17 00:00:00 2001
From: crims0n <crims0n@ya.ru>
Date: Mon, 6 Sep 2021 14:07:20 +0300
Subject: [PATCH] fix for bootstrap

---
 .gitignore             |  2 ++
 linux-live/buildconfig |  2 +-
 linux-live/config      |  2 +-
 linux-live/minioslib   | 30 +++++++++++++++---------------
 4 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5d4e924
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+rootfs/
+build/
\ No newline at end of file
diff --git a/linux-live/buildconfig b/linux-live/buildconfig
index 57991e2..86b5ebb 100644
--- a/linux-live/buildconfig
+++ b/linux-live/buildconfig
@@ -6,7 +6,7 @@ DISTRIBUTION_TYPE="debian"
 
 # distribution
 # дистрибутив
-DISTRIBUTION="stretch"
+DISTRIBUTION="buster"
 
 # distribution arch
 # note: stretch only works with amd64
diff --git a/linux-live/config b/linux-live/config
index 28eb0e9..7db526b 100644
--- a/linux-live/config
+++ b/linux-live/config
@@ -15,7 +15,7 @@
 LIVEKITNAME="minios"
 
 # note: stretch only works with xz
-COMP_TYPE="xz"
+COMP_TYPE="lz4"
 
 # Kernel file, will be copied to your Live Kit
 # Your kernel must support aufs and squashfs. Debian Jessie's kernel is ready
diff --git a/linux-live/minioslib b/linux-live/minioslib
index 71566d7..8290ec5 100644
--- a/linux-live/minioslib
+++ b/linux-live/minioslib
@@ -577,12 +577,12 @@ function build_bootstrap() {
             setup_host
         fi
     fi
-    if [ $USE_ROOTFS = "1" ] && [ ! -f $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz ]; then
-        if [ -f $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz ]; then
+    if [ $USE_ROOTFS = "1" ] && [ ! -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz ]; then
+        if [ -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz ]; then
             if [ ! -d $BUILD_DIR ]; then
                 mkdir -p $BUILD_DIR
             fi
-            tar -xzf $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD_DIR
+            tar -xzf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD_DIR
         else
             # Раскомментировать для Ubuntu, но придётся вручную подбирать пакеты до соответсвия bootstrap Debian по пакетам.
             #if [ $DISTRIBUTION_TYPE != "debian" ]; then
@@ -592,22 +592,22 @@ function build_bootstrap() {
             sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
                 debootstrap --arch=$DISTRIBUTION_ARCH $DISTRIBUTION $BUILD_DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT
             #fi
-            if [ ! -d $SCRIPT_DIR/bootstrap ]; then
-                mkdir -p $SCRIPT_DIR/bootstrap
+            if [ ! -d $SCRIPT_DIR/rootfs ]; then
+                mkdir -p $SCRIPT_DIR/rootfs
             fi
-            tar -czf $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD_DIR .
+            tar -czf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD_DIR .
         fi
-    elif [ $USE_ROOTFS = "1" ] && [ -f $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz ]; then
+    elif [ $USE_ROOTFS = "1" ] && [ -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz ]; then
         if [ ! -d $BUILD_DIR ]; then
             mkdir -p $BUILD_DIR
         fi
-        tar -xzf $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz -C $BUILD_DIR
+        tar -xzf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz -C $BUILD_DIR
     elif [ $USE_ROOTFS != "1" ] && [ $USE_BOOTSTRAP = "1" ]; then
-        if [ -f $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz ]; then
+        if [ -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz ]; then
             if [ ! -d $BUILD_DIR ]; then
                 mkdir -p $BUILD_DIR
             fi
-            tar -xzf $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD_DIR
+            tar -xzf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD_DIR
         else
             # Раскомментировать для Ubuntu, но придётся вручную подбирать пакеты до соответсвия bootstrap Debian по пакетам.
             #if [ $DISTRIBUTION_TYPE != "debian" ]; then
@@ -617,10 +617,10 @@ function build_bootstrap() {
             sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
                 debootstrap --arch=$DISTRIBUTION_ARCH $DISTRIBUTION $BUILD_DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT
             #fi
-            if [ ! -d $SCRIPT_DIR/bootstrap ]; then
-                mkdir -p $SCRIPT_DIR/bootstrap
+            if [ ! -d $SCRIPT_DIR/rootfs ]; then
+                mkdir -p $SCRIPT_DIR/rootfs
             fi
-            tar -czf $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD_DIR .
+            tar -czf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH.tar.gz -C $BUILD_DIR .
         fi
     else
         sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
@@ -636,7 +636,7 @@ function build_rootfs() {
     #current_process
 
     if [ $USE_ROOTFS = "1" ]; then
-        if [ ! -f $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz ]; then
+        if [ ! -f $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz ]; then
             if [ $CONTAINER_TYPE = "1" ]; then
                 if [ ! -f /.minios-live ]; then
                     setup_host
@@ -820,7 +820,7 @@ EOF
             fi
             chroot_umount_fs
 
-            tar -czf $SCRIPT_DIR/bootstrap/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz -C $BUILD_DIR .
+            tar -czf $SCRIPT_DIR/rootfs/$DISTRIBUTION-$DISTRIBUTION_ARCH-rootfs.tar.gz -C $BUILD_DIR .
         fi
     fi
 }