From 1853dba46dab7efdd584b08e6dc87613cb3f0d21 Mon Sep 17 00:00:00 2001
From: Andrey Sokolov <keremet@altlinux.org>
Date: Wed, 25 Aug 2021 16:49:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B0=D1=80=D1=85=D0=B8=D0=B2?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rootfs_to_repo.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rootfs_to_repo.sh b/rootfs_to_repo.sh
index 3c7b7bb..63ef575 100755
--- a/rootfs_to_repo.sh
+++ b/rootfs_to_repo.sh
@@ -20,8 +20,6 @@ ROOTFS_ARCHIVE=$1
 MAIN_REPO=$2
 BRANCH=$3
 OUT_DIR=$4
-MAIN_ROOT=$TMP_DIR/root
-ACOS_ROOT=$TMP_DIR/acos_root
 VAR_ARCH=$OUT_DIR/var.tar.xz
 ROOT_ARCH=$OUT_DIR/acos_root.tar.xz
 VERSION_DATE=`basename $ROOTFS_ARCHIVE | awk -F- '{print $2;}'`
@@ -44,6 +42,8 @@ fi
 rm -f $VAR_ARCH $ROOT_ARCH
 
 TMP_DIR=`mktemp --tmpdir -d rootfs_to_repo-XXXXXX`
+MAIN_ROOT=$TMP_DIR/root
+ACOS_ROOT=$TMP_DIR/acos_root
 
 mkdir -p $MAIN_ROOT
 tar xf $ROOTFS_ARCHIVE -C $MAIN_ROOT --exclude=./dev/tty --exclude=./dev/tty0 --exclude=./dev/console  --exclude=./dev/urandom --exclude=./dev/random --exclude=./dev/full --exclude=./dev/zero --exclude=/dev/null --exclude=./dev/pts/ptmx --exclude=./dev/null
@@ -113,6 +113,6 @@ mkdir $ACOS_ROOT
 ostree admin init-fs --modern $ACOS_ROOT
 ostree pull-local --repo $ACOS_ROOT/ostree/repo $MAIN_REPO $BRANCH
 #Максимальное сжатие в многопоточном режиме
-tar -cf - -C $ACOS_ROOT `ls $ACOS_ROOT` | xz -9 -c -T0 - > $ROOT_ARCH
+tar -cf - -C $ACOS_ROOT . | xz -9 -c -T0 - > $ROOT_ARCH
 
 rm -rf $TMP_DIR