From 8b727d48cad2fb1c006873facc78e9813237c968 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 18 Oct 2017 20:50:48 -0700 Subject: [PATCH] Fix |reset. --- lib/helm.hoon | 25 ++++++++++++++++++++++++- sys/ovra.hoon | 22 ++++++++++++++++------ sys/vane/dill.hoon | 2 +- sys/zuse.hoon | 8 ++++---- 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/lib/helm.hoon b/lib/helm.hoon index 1e1fe85bb3..ff78e8764f 100644 --- a/lib/helm.hoon +++ b/lib/helm.hoon @@ -170,6 +170,29 @@ (said:talk our %helm now eny [%leaf "invited: {} at {(trip myl)}"]~) :: ++ poke-reset :: reset system + |= hood-reset =< abet + %- emil + %- flop ^- (list card) + =+ top=`path`/(scot %p our)/home/(scot %da now)/sys + :- [%flog /reset %vega (weld top /hoon) (weld top /ovra)] + %+ turn + ^- (list {p/@tas q/path}) + :~ [%$ /zuse] + [%a /vane/ames] + [%b /vane/behn] + [%c /vane/clay] + [%d /vane/dill] + [%e /vane/eyre] + [%f /vane/ford] + [%g /vane/gall] + == + |= {p/@tas q/path} + =+ way=`path`(welp top q) + =+ txt=.^(@ %cx (welp way /hoon)) + ~& [%reset-veer p way] + [%flog /reset %veer p way txt] +:: +++ poke-meset :: reset system (new) |= hood-reset =< abet %- emil %- flop ^- (list card) @@ -188,7 +211,7 @@ [%e %eyre] [%f %ford] [%g %gall] - :: [%j %jael] + [%j %jael] == |= {p/@tas q/@tas} =+ way=`path`(welp top /vane/[q]) diff --git a/sys/ovra.hoon b/sys/ovra.hoon index 2b2f6cc079..5f25562d23 100644 --- a/sys/ovra.hoon +++ b/sys/ovra.hoon @@ -486,7 +486,9 @@ ?: ?=($veer -.q.i.ova) $(ova t.ova, +>+.^$ (veer now q.i.ova)) ?: ?=($vega -.q.i.ova) - (fall (vega now t.ova (path +.q.i.ova)) [~ +>.^$]) + %+ fall + (vega now t.ova (path +<.q.i.ova) (path +>.q.i.ova)) + [~ +>.^$] ?: ?=($mass -.q.i.ova) =+ avo=$(ova t.ova) :_ +.avo @@ -550,17 +552,24 @@ [zef +>.$] :: ++ vega :: reboot kernel - |= {now/@da ova/(list ovum) hap/path} + |= {now/@da ova/(list ovum) hap/path zup/path} ^- (unit {p/(list ovum) q/*}) =- ?:(?=($| -.res) ((slog p.res) ~) `p.res) ^= res %- mule |. =+ pax=(weld hap `path`[%hoon ~]) - ~& [%vega-start hap] + =+ wax=(weld zup `path`[%hoon ~]) + ~& [%vega-start-hoon hap] =+ src=((hard @t) (need (peek now cx+pax))) - =+ saz=(shax src) + =+ arv=((hard @t) (need (peek now cx+wax))) =+ gen=(rain hap src) ~& %vega-parsed - =+ ken=.*(0 q:(~(mint ut %noun) %noun gen)) + =+ one=(~(mint ut %noun) %noun gen) + ~& %vega-compiled + ~& [%vega-arvo zup] + =+ two=(~(mint ut p.one) %noun (rain zup arv)) + ~& %vega-minted + =+ ken=.*(0 [7 q.one q.two]) + ~& [%vega-kernel `@ux`(mug ken)] =+ ^= nex =+ gat=.*(ken .*(ken [0 87])) (need ((hard (unit @)) .*([-.gat [[now ~] +>.gat]] -.gat))) @@ -569,7 +578,8 @@ =+ gat=.*(ken .*(ken [0 ?:(=(nex hoon) 86 11)])) =+ sam=[eny ova q.niz] =+ raw=.*([-.gat [sam +>.gat]] -.gat) - [[[~ %vega hap] ((list ovum) -.raw)] +.raw] + =+ yep=((list ovum) -.raw) + [[[~ %vega hap] yep] +.raw] :: ++ veer :: install vane/tang |= {now/@da fav/curd} diff --git a/sys/vane/dill.hoon b/sys/vane/dill.hoon index fe1895bb80..59732a608f 100644 --- a/sys/vane/dill.hoon +++ b/sys/vane/dill.hoon @@ -56,7 +56,7 @@ {$init p/ship} :: {$text p/tape} :: {$veer p/@ta q/path r/@t} :: install vane - {$vega p/path} :: reboot by path + {$vega p/path q/path} :: reboot by path {$velo p/@t q/@t} :: reboot by path {$verb $~} :: verbose mode == :: diff --git a/sys/zuse.hoon b/sys/zuse.hoon index a1efdc8f7a..333d6193b2 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -511,7 +511,7 @@ {$mass p/mass} :: memory usage {$send p/lane:ames q/@} :: transmit packet {$veer p/@ta q/path r/@t} :: install vane - {$vega p/path} :: old reboot + {$vega p/path q/path} :: old reboot {$velo p/@t q/@t} :: reboot {$verb $~} :: verbose mode == :: @@ -532,7 +532,7 @@ {$talk p/tank} :: {$text p/tape} :: {$veer p/@ta q/path r/@t} :: install vane - {$vega p/path} :: old reboot + {$vega p/path q/path} :: old reboot {$velo p/@t q/@t} :: reboot {$verb $~} :: verbose mode == :: @@ -593,7 +593,7 @@ {$heft $~} :: {$text p/tape} :: {$veer p/@ta q/path r/@t} :: install vane - {$vega p/path} :: old reboot + {$vega p/path q/path} :: old reboot {$velo p/@t q/@t} :: reboot {$verb $~} :: verbose mode == :: @@ -623,7 +623,7 @@ {$thou p/httr} :: raw http response {$thus p/@ud q/(unit hiss)} :: http request+cancel {$veer p/@ta q/path r/@t} :: drop-through - {$vega p/path} :: drop-through + {$vega p/path q/path} :: drop-through {$velo p/@t q/@t} :: drop-through {$mini-jael-gift *} == ::