From 752be3d9a82907ed79c70b003dfe4e98546133c6 Mon Sep 17 00:00:00 2001 From: Marc Date: Tue, 1 Feb 2022 23:15:46 +0100 Subject: [PATCH] made updating/building safer, should no longer fight with docker --- copyRootfsIntoTheImage.sh | 2 +- createLiveImage.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/copyRootfsIntoTheImage.sh b/copyRootfsIntoTheImage.sh index 1ddf873..e696f5c 100755 --- a/copyRootfsIntoTheImage.sh +++ b/copyRootfsIntoTheImage.sh @@ -23,7 +23,7 @@ CHIBRAX_MOUNT_POINT="/tmp/chibraxMountPoint" OFFSET=$(cat diskoffset) losetup --offset $OFFSET -f disk.img -LOOP=$(losetup -a | grep -v deleted | cut -d':' -f 1) +LOOP=$(losetup -a | grep -v deleted | grep disk.img | cut -d':' -f 1) echo ${LOOP} $CHIBRAX_MOUNT_POINT $OFFSET mkdir $CHIBRAX_MOUNT_POINT -p diff --git a/createLiveImage.sh b/createLiveImage.sh index 2409e33..963e05c 100755 --- a/createLiveImage.sh +++ b/createLiveImage.sh @@ -23,7 +23,7 @@ OFFSET=$((512*$START_SECTOR)) echo $OFFSET > diskoffset losetup --offset $OFFSET -f disk.img -LOOP=$(losetup -a | grep -v deleted | cut -d':' -f 1) +LOOP=$(losetup -a | grep -v deleted | grep disk.img | cut -d':' -f 1) losetup -f disk.img LOOP_ROOT=$(losetup -a | grep -v deleted | grep -v ${LOOP} | cut -d':' -f 1) @@ -58,7 +58,7 @@ PARTUUID=$(lsblk $LOOP --fs | awk '{print $4}' | grep -v LABEL) echo "menuentry 'Chibrax OS' {" >> $CHIBRAX_MOUNT_POINT/boot/grub/grub.cfg echo " set root='hd0,msdos1'" >> $CHIBRAX_MOUNT_POINT/boot/grub/grub.cfg -echo " linux /boot/vmlinuz rootfstype=ext4 root=/dev/sda1 rw quiet" >> $CHIBRAX_MOUNT_POINT/boot/grub/grub.cfg +echo " linux /boot/vmlinuz rootfstype=ext4 root=/dev/sda1 rw " >> $CHIBRAX_MOUNT_POINT/boot/grub/grub.cfg echo "}" >> $CHIBRAX_MOUNT_POINT/boot/grub/grub.cfg umount $CHIBRAX_MOUNT_POINT/dev -l