urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-28 22:54:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'philip/fastboot' (#1663)

Browse Source 
* philip/fastboot:
  dill, helm: add lite boot option with -l
This commit is contained in:
Jared Tobin 2019-08-27 08:00:49 -02:30
commit 2a802b5a30
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4
13 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/brass.pill
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c41fe2a1aeb4c49c9148d8dfe76ad64e0a1e61ad183373e93d063dbfd2338e7
size 12724814
oid sha256:6143926c8a07a3d2a38abf2be0d3d1ef46315bf1ae13b5401113082ddbe481ec
size 12650146

4
bin/ivory.pill
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:085710dcf810d97c228e526d53779887f18750d5180ee252c5566946b31f16a1
size 5223635
oid sha256:42ae74a4f2997ff13ec9c9c19d2019ab44852dc8c69937d70d29607c4cefdf59
size 5882422

4
bin/solid.pill
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6257ddbfaefc14fce97d214350bb28d370dbc2f0c3c38e79fe61bbc3b6bf5107
size 15382912
oid sha256:ff72ecf4b531121b32625014561da540aa36693ff72066f00bd1a4b836363382
size 15210493

2
pkg/arvo/app/aqua.hoon
View File

@ -430,7 +430,7 @@
[/ %whom who.ae] :: eny
[//newt/0v1n.2m9vh %barn ~]
[//behn/0v1n.2m9vh %born ~]
:+ //term/1 %boot
:^ //term/1 %boot &
?~ keys.ae
[%fake who.ae]
[%dawn u.keys.ae]

1
pkg/arvo/app/hood.hoon
View File

@ -151,6 +151,7 @@
++ poke-drum-unlink (wrap poke-unlink):from-drum
++ poke-drum-exit (wrap poke-exit):from-drum
++ poke-drum-start (wrap poke-start):from-drum
++ poke-drum-set-boot-apps (wrap poke-set-boot-apps):from-drum
++ poke-helm-hi (wrap poke-hi):from-helm
::++ poke-helm-invite (wrap poke-invite):from-helm
++ poke-helm-mass (wrap poke-mass):from-helm

2
pkg/arvo/app/ph.hoon
View File

@ -81,7 +81,9 @@
:+ %hi
~[~bud ~dev]
;< ~ bind:m (raw-ship ~bud ~)
~& > "BUD DONE"
;< ~ bind:m (raw-ship ~dev ~)
~& > "DEV DONE"
(send-hi ~bud ~dev)
::
:+ %boot-planet

24
pkg/arvo/lib/hood/drum.hoon
View File

@ -21,9 +21,9 @@
:: ::
++ pith-2 ::
$: sys/(unit bone) :: local console
eel/(set gill:gall) :: connect to
ray/(set well:gall) ::
fur/(map dude:gall (unit server)) :: servers
eel/(set gill:gall) :: connect to
ray/(set well:gall) ::
fur/(map dude:gall (unit server)) :: servers
bin/(map bone source) :: terminals
== ::
:: :: ::
@ -73,9 +73,13 @@
:: :: ::
|%
++ deft-apes :: default servers
|= our/ship
|= [our/ship lit/?]
%- ~(gas in *(set well:gall))
^- (list well:gall)
?: lit
:~ [%home %dojo]
[%home %azimuth-tracker]
==
=+ myr=(clan:title our)
::
?: ?=($pawn myr)
@ -118,7 +122,7 @@
%2
sys=~
eel=(deft-fish our)
ray=(deft-apes our)
ray=~
fur=~
bin=~
==
@ -171,6 +175,16 @@
=< se-abet =< se-view
(se-text "[{<src.hid>}, driving {<our.hid>}]")
::
++ poke-set-boot-apps ::
|= lit/?
^- (quip move part)
:: We do not run se-abet:se-view here because that starts the apps,
:: and some apps are not ready to start (eg Talk crashes because the
:: terminal has width 0). It appears the first message to drum must
:: be the peer.
::
[~ +<+.^$(ray (deft-apes our.hid lit))]
::
++ poke-dill-belt :: terminal event
|= bet/dill-belt:dill
=< se-abet =< se-view

2
pkg/arvo/lib/pill.hoon
View File

@ -13,7 +13,7 @@
%+ pair wire
$% [%wack p=@]
[%whom p=ship]
[%boot $%($>(%fake task:able:jael) $>(%dawn task:able:jael))]
[%boot ? $%($>(%fake task:able:jael) $>(%dawn task:able:jael))]
unix-task
==
::

16
pkg/arvo/sys/vane/dill.hoon
View File

@ -12,6 +12,7 @@
$: $0 ::
hey/(unit duct) :: default duct
dug/(map duct axon) :: conversations
lit/? :: boot in lite mode
$= hef :: other weights
$: a/(unit mass) ::
b/(unit mass) ::
@ -317,6 +318,7 @@
::
(show %kids):(sync %kids our %base)
=. +> autoload
=. +> hood-set-boot-apps
=. +> peer
|- ^+ +>+
?~ myt +>+
@ -333,6 +335,7 @@
::
++ send :: send action
|= bet/dill-belt
^+ +>
?^ tem
+>(tem `[bet u.tem])
%_ +>
@ -340,6 +343,16 @@
:_ moz
[hen %pass ~ %g %deal [our our] ram %poke [%dill-belt -:!>(bet) bet]]
==
::
++ hood-set-boot-apps
%_ .
moz
:_ moz
:* hen %pass ~ %g %deal [our our]
ram %poke %drum-set-boot-apps !>(lit.all)
==
==
::
++ peer
%_ .
moz
@ -515,7 +528,8 @@
~& %dill-no-boot
~& p.task
~| invalid-boot-event+hen !!
:_(..^$ [hen %pass / %j u.boot]~)
=. lit.all lit.task
[[hen %pass / %j u.boot]~ ..^$]
:: we are subsequently initialized. single-home
::
?: ?=(%init -.task)

2
pkg/arvo/sys/zuse.hoon
View File

@ -779,7 +779,7 @@
$~ [%vega ~] ::
$% {$belt p/belt} :: terminal input
{$blew p/blew} :: terminal config
{$boot p/*} :: weird %dill boot
{$boot lit/? p/*} :: weird %dill boot
$>(%crud vane-task) :: error with trace
{$flog p/flog} :: wrapped error
{$flow p/@tas q/(list gill:gall)} :: terminal config

4
pkg/urbit/daemon/main.c
View File

@ -84,6 +84,7 @@ _main_getopt(c3_i argc, c3_c** argv)
u3_Host.ops_u.has = c3y;
u3_Host.ops_u.net = c3y;
u3_Host.ops_u.lit = c3n;
u3_Host.ops_u.nuu = c3n;
u3_Host.ops_u.pro = c3n;
u3_Host.ops_u.qui = c3n;
@ -94,7 +95,7 @@ _main_getopt(c3_i argc, c3_c** argv)
u3_Host.ops_u.kno_w = DefaultKernel;
while ( -1 != (ch_i=getopt(argc, argv,
"G:J:B:K:A:H:I:w:u:e:E:f:F:k:p:LjabcCdgqsvxPDRS")) )
"G:J:B:K:A:H:I:w:u:e:E:f:F:k:p:LljabcCdgqsvxPDRS")) )
{
switch ( ch_i ) {
case 'J': {
@ -174,6 +175,7 @@ _main_getopt(c3_i argc, c3_c** argv)
return c3y;
}
case 'L': { u3_Host.ops_u.net = c3n; break; }
case 'l': { u3_Host.ops_u.lit = c3y; break; }
case 'j': { u3_Host.ops_u.tra = c3y; break; }
case 'a': { u3_Host.ops_u.abo = c3y; break; }
case 'b': { u3_Host.ops_u.bat = c3y; break; }

1
pkg/urbit/include/vere/vere.h
View File

@ -563,6 +563,7 @@
c3_w kno_w; // -K, kernel version
c3_c* key_c; // -k, private key file
c3_o net; // -L, local-only networking
c3_o lit; // -l, lite mode
c3_o pro; // -P, profile
c3_s por_s; // -p, ames port
c3_o qui; // -q, quiet

2
pkg/urbit/vere/pier.c
View File

@ -1485,7 +1485,7 @@ _pier_boot_vent(u3_boot* bot_u)
c3_assert( c3y == u3du(bot_u->ven) );
u3_noun wir = u3nq(u3_blip, c3__term, '1', u3_nul);
u3_noun car = u3nc(c3__boot, u3k(bot_u->ven));
u3_noun car = u3nt(c3__boot, u3_Host.ops_u.lit, u3k(bot_u->ven));
u3_noun ovo = u3nc(wir, car);
_pier_writ_insert_ovum(pir_u, 0, ovo);