kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 11:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(resume): regenerate and realign guix script entrypoint; suffix duplicate guix package names

Browse source
This commit is contained in:
vxtls 2026-03-07 15:31:17 -05:00
parent 076a70976a
commit b18cba40b3
21 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rootfs.py
View file

@ -200,6 +200,23 @@ regen_block = (
+ 'if [ -x /script-generator ] && [ -f /steps-guix/manifest ]; then\\n'
+ '/script-generator /steps-guix/manifest /steps\\n'
+ 'fi\\n'
+ 'if [ -f /steps-guix/0.sh ] && grep -Eq "/steps-guix/[1-9][0-9]*\\\\.sh" "$0"; then\\n'
+ 'if ! bash /steps-guix/0.sh; then\\n'
+ 'status=$?\\n'
+ 'echo "bootstrap script failed with status ${status}; dropping to rescue shell" >&2\\n'
+ 'PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PREFIX}/bin:${PATH}\\n'
+ 'while true; do\\n'
+ 'if command -v bash >/dev/null 2>&1; then\\n'
+ 'env PS1="[FAIL ${status}] \\\\w # " bash -i\\n'
+ 'elif command -v sh >/dev/null 2>&1; then\\n'
+ 'env PS1="[FAIL ${status}] \\\\w # " sh -i\\n'
+ 'else\\n'
+ 'sleep 60\\n'
+ 'fi\\n'
+ 'done\\n'
+ 'fi\\n'
+ 'exit 0\\n'
+ 'fi\\n'
)
gated_network_block = (
'if [ -f /steps/env ]; then\\n'