verita84/arch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Your Name 2024-07-24 21:30:29 -06:00
parent 320e280ac6
commit 2f96d451e9
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
debian.sh
View File

@ -175,7 +175,7 @@ live-os-restore() {
systemMounts systemMounts
echo "[Copying Boot Files ]" echo "[Copying Boot Files ]"
echo echo
rsync -a --delete /boot/ $TARGET/boot/ cp -rf /tmp/boot/ $TARGET/boot/
chmod +x $TARGET/usr/bin/debian.sh chmod +x $TARGET/usr/bin/debian.sh
chroot $TARGET /usr/bin/debian.sh bootloader $1 $5 $2 chroot $TARGET /usr/bin/debian.sh bootloader $1 $5 $2
chroot $TARGET /usr/bin/debian.sh btrfs-tweaks chroot $TARGET /usr/bin/debian.sh btrfs-tweaks
@ -183,7 +183,8 @@ live-os-restore() {
chown -R $USER:$USER $TARGET/home/$USER chown -R $USER:$USER $TARGET/home/$USER
auto_login auto_login
cd cd
unmount umount /tmp/live
#unmount
} }
os-restore() { os-restore() {
@ -210,7 +211,7 @@ os-restore() {
chown -R $USER:$USER $TARGET/home/$USER chown -R $USER:$USER $TARGET/home/$USER
auto_login auto_login
rm -f $TARGET/debian.sh rm -f $TARGET/debian.sh
unmount #unmount
} }
systemMounts() { systemMounts() {
@ -281,7 +282,7 @@ make-image() {
time tar cpzf $1/$ROOT_NAME.tgz --exclude=proc/* . time tar cpzf $1/$ROOT_NAME.tgz --exclude=proc/* .
cd $1 cd $1
du -h $1/$ROOT_NAME.tgz | tail -1 du -h $1/$ROOT_NAME.tgz | tail -1
unmount #unmount
} }
install() { install() {
@ -302,7 +303,7 @@ install() {
custom_service_files custom_service_files
setup_script "$1" setup_script "$1"
echo -e "ALGO=zstd\nPERCENT=60" | tee -a $TARGET/etc/default/zramswap echo -e "ALGO=zstd\nPERCENT=60" | tee -a $TARGET/etc/default/zramswap
unmount #unmount
} }
installStableDiffusion() { installStableDiffusion() {
@ -526,21 +527,13 @@ locale() {
echo "locale-gen" >>$TARGET/setup.sh echo "locale-gen" >>$TARGET/setup.sh
} }
partitions() { partitions() {
echo echo
echo "Setting Up Partitions....." echo "Setting Up Partitions....."
printf "$DISK_PASSWORD" | cryptsetup open ${BTRFS} $ROOT_MAPPER_NAME printf "$DISK_PASSWORD" | cryptsetup open ${BTRFS} $ROOT_MAPPER_NAME
if [[ -e "/dev/mapper/$ROOT_MAPPER_NAME" ]]; then if [[ -e "/dev/mapper/$ROOT_MAPPER_NAME" ]]; then
echo
echo "Formatting $EFI"
echo
echo y | mkfs.vfat $EFI
echo "Formatting $BOOT"
echo y | mkfs.ext4 $BOOT
if [[ $SWAP_CHOICE = *y* ]]; then
mkswap -f $SWAP
fi
mounts mounts
fstab fstab
else else
@ -674,6 +667,14 @@ initialize-disk() {
echo "Formatting....." echo "Formatting....."
echo y | mkfs.btrfs /dev/mapper/$ROOT_MAPPER_NAME --force echo y | mkfs.btrfs /dev/mapper/$ROOT_MAPPER_NAME --force
echo echo
echo "Formatting $EFI"
echo
echo y | mkfs.vfat $EFI
echo "Formatting $BOOT"
echo y | mkfs.ext4 $BOOT
if [[ $SWAP_CHOICE = *y* ]]; then
mkswap -f $SWAP
fi
echo "Initialize Complete. Please reboot your machine to avoid any issues" echo "Initialize Complete. Please reboot your machine to avoid any issues"
echo echo
} }
@ -754,7 +755,7 @@ tweaks() {
echo "error: Bash not found!" echo "error: Bash not found!"
echo echo
fi fi
unmount #unmount
elif [[ $choice = 5 ]]; then elif [[ $choice = 5 ]]; then
rm -f /tmp/disk rm -f /tmp/disk
set-devices set-devices