Merge branch 'main' of https://git.kxtz.dev/kxtzownsu/icarus

Makefile

@@ -14,7 +14,6 @@ setup-python:
 build-packed-data:
 	mkdir -p out/PKIMetadata
 	make venv
-	make setup-python
 
 ca-keys:
 	cd httpmitm; bash generate_certs.sh

README.md

@@ -17,7 +17,7 @@ FLASH IT TO YOUR USB USING RUFUS, BALENAETCHER, OR CHROMEBOOK RECOVERY UTILITY
 
 FOLLOW THE SERVER SETUP INSTRUCTIONS
 ## Setup and installation instructions
-Clone the repo with `git clone --recursive https://github.com/fanqyxl/icarus` and change directory to it.
+Clone the repo with `git clone --recursive https://git.kxtz.dev/kxtzownsu/icarus/` and change directory to it.
 
 Set up the environment by running the following commands (Make sure you have python3, python3-venv, and protobuf installed beforehand):
 

modify.sh

@@ -74,7 +74,6 @@ echo "Script Developer: jeffplays1292@gmail.com"
 
 echo "This tool will modify your shim. There is a chance this tool will render it useless. This tool is in BETA. DO NOT SHARE THIS TOOL! "
 echo "It is recommended to make a backup of your shim before continuing (Press ctrl-c in 5 seconds to stop this tool and make a backup)"
-sleep 5
 
 losetup -fP "$1"
 echo "Using loop dev at $LOOP_DEV"
@@ -91,6 +90,8 @@ cp "$SCRIPT_DIR/scripts/inshim.sh" "$MOUNT_DIR/usr/sbin/factory_install.sh"
 chmod +x "$MOUNT_DIR/usr/sbin/factory_install.sh"
 
 umount "$MOUNT_DIR"
+e2label "$LOOP_DEV"p1 ICARUS
+
 losetup -D
 sync
 sync

scripts/inshim.sh

@@ -33,7 +33,7 @@ format_part_number() {
 	echo "$2"
 }
 
-mount /dev/disk/by-label/STATE /mnt/stateful_partition/
+mount /dev/disk/by-label/ICARUS /mnt/stateful_partition/
 cros_dev="$(get_largest_cros_blockdev)"
 if [ -z "$cros_dev" ]; then
     echo "No CrOS SSD found on device. Failing."

scripts/venv.sh

@@ -3,6 +3,7 @@ SCRIPT_DIR=$(readlink -f "$(dirname "$0")")
 if [ ! -e "${SCRIPT_DIR}/../.venv" ]; then
     python3 -m venv ${SCRIPT_DIR}/../.venv
 fi
-source ${SCRIPT_DIR}/.venv/bin/activate
+source ${SCRIPT_DIR}/../.venv/bin/activate
 pip3 install protobuf
+make setup-python
 bash