BodgeMaster
/
void-minecraft-usb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: BodgeMaster:48f01de830ee45c2ae21fce0b237c1ad61c68e35
Branches Tags
BodgeMaster:master
..
compare: BodgeMaster:b0a62aa3f19b61b75f6644a6cb9edd7f24ac3a9f
Branches Tags
BodgeMaster:master

No commits in common. "48f01de830ee45c2ae21fce0b237c1ad61c68e35" and "b0a62aa3f19b61b75f6644a6cb9edd7f24ac3a9f" have entirely different histories.
48f01de830 ... b0a62aa3f1

3 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
install-stage1.sh
View File

@ -306,8 +306,8 @@ This avoids default kernel hooks breaking the custom config." > /mnt/target/boot
# no idea if any of these are even necessary/relevant but it can’t hurt... # no idea if any of these are even necessary/relevant but it can’t hurt...
TARGET_PRELOAD_GRUB_MODULES="usb usbms uhci ehci ohci part_gpt f2fs ahci ata pata" TARGET_PRELOAD_GRUB_MODULES="usb usbms uhci ehci ohci part_gpt f2fs ahci ata pata"
run_in_target grub-install --target=i386-pc --boot-directory=/boot/efi/LOADER --disk-module=native --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'" run_in_target grub-install --target=i386-pc --boot-directory=/boot/efi/LOADER --disk-module=native --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'"
run_in_target grub-install --target=i386-efi --boot-directory=/boot/efi/LOADER --disk-module=native --efi-directory=/boot/efi --removable --no-nvram --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'" run_in_target grub-install --target=i386-efi --boot-directory=/boot/efi/LOADER --efi-directory=/boot/efi --removable --no-nvram --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'"
run_in_target grub-install --target=x86_64-efi --boot-directory=/boot/efi/LOADER --disk-module=native --efi-directory=/boot/efi --removable --no-nvram --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'" run_in_target grub-install --target=x86_64-efi --boot-directory=/boot/efi/LOADER --efi-directory=/boot/efi --removable --no-nvram --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'"
wget --output-document=/mnt/target/opt/void-usb/grub-config https://lostcave.ddnss.de/git/BodgeMaster/void-minecraft-usb/raw/branch/master/opt/grub-config wget --output-document=/mnt/target/opt/void-usb/grub-config https://lostcave.ddnss.de/git/BodgeMaster/void-minecraft-usb/raw/branch/master/opt/grub-config
chmod 744 /mnt/target/opt/void-usb/grub-config chmod 744 /mnt/target/opt/void-usb/grub-config

7
opt/backup-fs
View File

@ -3,8 +3,7 @@
function yesno { function yesno {
unset DISCARD_ME unset DISCARD_ME
while [ -z "$DISCARD_ME" ]; do while [ -z "$DISCARD_ME" ]; do
# get input from /dev/tty to work around missing stdin read -p "[y/n] " -n1 DISCARD_ME
read -p "[y/n] " -n1 DISCARD_ME < /dev/tty
case "$DISCARD_ME" in case "$DISCARD_ME" in
y) y)
return 0 return 0
@ -25,14 +24,14 @@ function yesno {
cat /proc/mounts cat /proc/mounts
read -p " read -p "
press any key" -n1 DISCARD_ME < /dev/tty press any key" -n1 DISCARD_ME
# And no services running? # And no services running?
ps aux | grep -vF "[kworker" ps aux | grep -vF "[kworker"
read -p " read -p "
press any key" -n1 DISCARD_ME < /dev/tty press any key" -n1 DISCARD_ME
#TODO: remove above debugging sanity checks #TODO: remove above debugging sanity checks

2
opt/grub-config
View File

@ -5,7 +5,7 @@ GRUB_PREFIX="/boot/efi/LOADER/grub"
CFG_CUSTOM_BEFORE="custom_before.cfg" CFG_CUSTOM_BEFORE="custom_before.cfg"
CFG_CUSTOM_AFTER="custom_after.cfg" CFG_CUSTOM_AFTER="custom_after.cfg"
CONTAINER_UUID="$(blkid --output value --match-tag UUID "$(grep " /run/void-usb/container " /proc/mounts | sed -e 's/ .*//')")" CONTAINER_UUID="$(blkid --output value --match-tag UUID "$(grep " /run/void-usb/container " /proc/mounts | sed -e 's/ .*//')")"
LINUX_CMDLINE="quiet root=/dev/loop0 ro void-usb-container=UUID=$CONTAINER_UUID" LINUX_CMDLINE="root=/dev/loop0 ro void-usb-container=UUID=$CONTAINER_UUID"
DEFAULT_LINUX=/boot/vmlinu? DEFAULT_LINUX=/boot/vmlinu?
if [ ! -f "$DEFAULT_LINUX" ]; then if [ ! -f "$DEFAULT_LINUX" ]; then