diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-04-24 01:31:04 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-05-29 23:50:33 +0200 |
| commit | a5428244d969fda2b32e24b7cda589c2c65cbf7c (patch) | |
| tree | 25842738cb65cae2a94a53425a72a8fbd394f348 | |
| parent | b2adb9a7b50fd4a887b22facf6795d71a2629397 (diff) | |
| download | upstream-a5428244d969fda2b32e24b7cda589c2c65cbf7c.tar.gz upstream-a5428244d969fda2b32e24b7cda589c2c65cbf7c.tar.bz2 upstream-a5428244d969fda2b32e24b7cda589c2c65cbf7c.zip | |
base-files: add support for staged sysupgrades from failsafe mode
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
| -rw-r--r-- | package/base-files/files/lib/preinit/40_run_failsafe_hook | 6 | ||||
| -rw-r--r-- | package/base-files/files/lib/preinit/99_10_failsafe_login | 11 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/sysupgrade | 18 |
3 files changed, 25 insertions, 10 deletions
diff --git a/package/base-files/files/lib/preinit/40_run_failsafe_hook b/package/base-files/files/lib/preinit/40_run_failsafe_hook index 7301f77349..533b0a9771 100644 --- a/package/base-files/files/lib/preinit/40_run_failsafe_hook +++ b/package/base-files/files/lib/preinit/40_run_failsafe_hook @@ -5,8 +5,12 @@ run_failsafe_hook() { [ "$pi_preinit_no_failsafe" = "y" ] && return if [ "$FAILSAFE" = "true" ]; then + lock /tmp/.failsafe boot_run_hook failsafe - lock -w /tmp/.failsafe + while [ ! -e /tmp/sysupgrade ]; do + lock -w /tmp/.failsafe + done + exit fi } diff --git a/package/base-files/files/lib/preinit/99_10_failsafe_login b/package/base-files/files/lib/preinit/99_10_failsafe_login index 3147cdc5a6..728c63b2e8 100644 --- a/package/base-files/files/lib/preinit/99_10_failsafe_login +++ b/package/base-files/files/lib/preinit/99_10_failsafe_login @@ -8,10 +8,13 @@ failsafe_netlogin () { } failsafe_shell() { - lock /tmp/.failsafe - ash --login - echo "Please reboot system when done with failsafe network logins" - while true; do sleep 1; done + local console="$(sed -e 's/ /\n/g' /proc/cmdline | grep '^console=' | head -1 | sed -e 's/^console=//' -e 's/,.*//')" + [ -n "$console" ] || console=console + [ -c "/dev/$console" ] || return 0 + while true; do + ash --login <"/dev/$console" >"/dev/$console" 2>"/dev/$console" + sleep 1 + done & } boot_hook_add failsafe failsafe_netlogin diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 200a0e520b..809e789f9f 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -251,8 +251,16 @@ run_hooks "" $sysupgrade_pre_upgrade install_bin /sbin/upgraded v "Commencing upgrade. All shell sessions will be closed now." -ubus call system sysupgrade "{ - \"prefix\": \"$RAM_ROOT\", - \"path\": $(json_string "$IMAGE"), - \"command\": \". /lib/functions.sh; include /lib/upgrade; do_upgrade_stage2\" -}" + +COMMAND='. /lib/functions.sh; include /lib/upgrade; do_upgrade_stage2' + +if [ -n "$FAILSAFE" ]; then + printf '%s\x00%s\x00%s' "$RAM_ROOT" "$IMAGE" "$COMMAND" >/tmp/sysupgrade + lock -u /tmp/.failsafe +else + ubus call system sysupgrade "{ + \"prefix\": $(json_string "$RAM_ROOT"), + \"path\": $(json_string "$IMAGE"), + \"command\": $(json_string "$COMMAND") + }" +fi |