Marc/Linux.js---javascript-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made updating/building safer, should no longer fight with docker

Browse Source
This commit is contained in:
Marc
2022-02-01 23:15:46 +01:00
parent ed4560829c
commit 752be3d9a8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
copyRootfsIntoTheImage.sh
+1 -1
View File
@@ -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
createLiveImage.sh
+2 -2
View File
@@ -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