From e75522a005a7c41f0d9870c76d9cea7fb8419cbb Mon Sep 17 00:00:00 2001
From: Bananymous <bananymousosq@gmail.com>
Date: Fri, 8 Sep 2023 02:41:39 +0300
Subject: [PATCH] BuildSystem: Cleanup disk image creation

---
 image-full.sh | 6 +-----
 image.sh      | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/image-full.sh b/image-full.sh
index df9b0cc11d..8c05bcebc7 100755
--- a/image-full.sh
+++ b/image-full.sh
@@ -40,14 +40,10 @@ PARTITION2=${LOOP_DEV}p2
 PARTITION3=${LOOP_DEV}p3
 
 sudo mkfs.ext2 $PARTITION3 > /dev/null
-sudo mkfs.ext2 $PARTITION2 > /dev/null
+sudo mkfs.ext2 -d $SYSROOT $PARTITION2 > /dev/null
 
 sudo mount $PARTITION2 $MOUNT_DIR
-
-sudo cp -rp ${SYSROOT}/* ${MOUNT_DIR}/
-
 sudo grub-install --no-floppy --target=i386-pc --modules="normal ext2 multiboot" --boot-directory=${MOUNT_DIR}/boot $LOOP_DEV > /dev/null
-
 sudo umount $MOUNT_DIR
 
 sudo losetup -d $LOOP_DEV
diff --git a/image.sh b/image.sh
index ecf1a5bab7..18c3865626 100755
--- a/image.sh
+++ b/image.sh
@@ -15,7 +15,7 @@ ROOT_PARTITON=${LOOP_DEV}p2
 
 sudo mount $ROOT_PARTITON $MOUNT_DIR
 
-sudo cp -rp ${SYSROOT}/* ${MOUNT_DIR}/
+sudo rsync -a ${SYSROOT}/* ${MOUNT_DIR}/
 
 sudo umount $MOUNT_DIR