From de4384571a41236a918ad2a36e2dc74e342473e8 Mon Sep 17 00:00:00 2001
From: ading2210 <ading2019@gmail.com>
Date: Fri, 20 Oct 2023 23:23:39 -0700
Subject: [PATCH] switch to task-xfce-desktop, more fixes

---
 build.sh                   | 0
 build_image.sh             | 0
 build_rootfs.sh            | 4 ++--
 patch_initramfs.sh         | 0
 patch_rootfs.sh            | 0
 rootfs/opt/setup_rootfs.sh | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 build.sh
 mode change 100644 => 100755 build_image.sh
 mode change 100644 => 100755 build_rootfs.sh
 mode change 100644 => 100755 patch_initramfs.sh
 mode change 100644 => 100755 patch_rootfs.sh
 mode change 100644 => 100755 rootfs/opt/setup_rootfs.sh

diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
diff --git a/build_image.sh b/build_image.sh
old mode 100644
new mode 100755
diff --git a/build_rootfs.sh b/build_rootfs.sh
old mode 100644
new mode 100755
index 49ee94c..6f1b176
--- a/build_rootfs.sh
+++ b/build_rootfs.sh
@@ -42,7 +42,7 @@ rootfs_dir=$(realpath "${1}")
 release_name="${2}"
 
 debootstrap $release_name $rootfs_dir http://deb.debian.org/debian/
-cp -r rootfs/* $rootfs_dir
+cp -ar rootfs/* $rootfs_dir
 
 chroot_mounts="proc sys dev run"
 for mountpoint in $chroot_mounts; do
@@ -54,7 +54,7 @@ chroot $rootfs_dir /bin/bash -c "${chroot_command}"
 
 chroot_mounts="proc sys dev run"
 for mountpoint in $chroot_mounts; do
-  umount "${rootfs_dir}/$mountpoint"
+  umount -l "${rootfs_dir}/$mountpoint"
 done
 
 echo "rootfs has been created"
\ No newline at end of file
diff --git a/patch_initramfs.sh b/patch_initramfs.sh
old mode 100644
new mode 100755
diff --git a/patch_rootfs.sh b/patch_rootfs.sh
old mode 100644
new mode 100755
diff --git a/rootfs/opt/setup_rootfs.sh b/rootfs/opt/setup_rootfs.sh
old mode 100644
new mode 100755
index 0f0b981..35f1985
--- a/rootfs/opt/setup_rootfs.sh
+++ b/rootfs/opt/setup_rootfs.sh
@@ -26,7 +26,7 @@ apt-get update
 apt-get upgrade -y 
 
 #install desktop
-apt-get install -y xfce4 xfce4-goodies network-manager blueman firefox-esr sudo
+apt-get install -y task-xfce-desktop cloud-utils 
 
 #set up hostname and username
 read -p "Enter the hostname for the system: " hostname