mirror of
https://github.com/urbit/shrub.git
synced 2024-12-23 10:52:12 +03:00
updates single-homing and legacy boot event
conform to current release-candidate expectations
This commit is contained in:
parent
68912c40e4
commit
ca4989784d
18
vere/pier.c
18
vere/pier.c
@ -950,13 +950,14 @@ _pier_disk_consolidate(u3_pier* pir_u,
|
|||||||
|
|
||||||
/* prepend identity event to module sequence
|
/* prepend identity event to module sequence
|
||||||
*/
|
*/
|
||||||
{
|
// {
|
||||||
u3_noun wir = u3nt(c3__name, u3dc("scot", 'p', u3k(who)), u3_nul);
|
// u3_noun wir = u3nt(c3__name, u3dc("scot", 'p', u3k(who)), u3_nul);
|
||||||
u3_noun car = u3nc(c3__veal, u3k(who));
|
// u3_noun car = u3nc(c3__veal, u3k(who));
|
||||||
u3_noun ovo = u3nc(wir, car);
|
// u3_noun ovo = u3nc(wir, car);
|
||||||
|
|
||||||
seq = u3nc(ovo, u3k(mod));
|
// seq = u3nc(ovo, u3k(mod));
|
||||||
}
|
// }
|
||||||
|
seq = mod;
|
||||||
|
|
||||||
/* insert with timestamp
|
/* insert with timestamp
|
||||||
*/
|
*/
|
||||||
@ -982,10 +983,7 @@ _pier_disk_consolidate(u3_pier* pir_u,
|
|||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
u3_noun wir = u3nq(u3_blip, c3__term, '1', u3_nul);
|
u3_noun wir = u3nq(u3_blip, c3__term, '1', u3_nul);
|
||||||
u3_noun car = u3nq(c3__boot,
|
u3_noun car = u3nt(c3__boot, c3__fake, u3k(who));
|
||||||
c3__sith,
|
|
||||||
u3k(who),
|
|
||||||
u3nc(u3k(tic), u3k(sec)));
|
|
||||||
|
|
||||||
ovo = u3nc(wir, car);
|
ovo = u3nc(wir, car);
|
||||||
}
|
}
|
||||||
|
11
vere/serf.c
11
vere/serf.c
@ -216,17 +216,18 @@ _serf_poke_live(c3_d evt_d, // event number
|
|||||||
// XX revise when real keys are supported
|
// XX revise when real keys are supported
|
||||||
// XX dispatch on evt_d, wire, or card tag?
|
// XX dispatch on evt_d, wire, or card tag?
|
||||||
//
|
//
|
||||||
if ( 6ULL == evt_d ) {
|
if ( c3__boot == u3h(u3t(ovo)) ) {
|
||||||
// vir=[[wire %veal @p] ~]
|
// ovo=[%boot *]
|
||||||
// fec=[%veal @p]
|
// vir=[[wire %init @p] ~]
|
||||||
|
// fec=[%init @p]
|
||||||
//
|
//
|
||||||
u3_noun fec = u3t(u3h(vir));
|
u3_noun fec = u3t(u3h(vir));
|
||||||
|
|
||||||
c3_assert( c3__veal == u3h(fec) );
|
c3_assert( c3__init == u3h(fec) );
|
||||||
c3_assert( u3_none == u3A->our );
|
c3_assert( u3_none == u3A->our );
|
||||||
|
|
||||||
u3A->our = u3k(u3t(fec));
|
u3A->our = u3k(u3t(fec));
|
||||||
u3A->fak = c3y;
|
u3A->fak = ( c3__fake == u3h(u3t(u3t(ovo))) ) ? c3y : c3n;
|
||||||
|
|
||||||
{
|
{
|
||||||
u3_noun nam = u3dc("scot", 'p', u3k(u3A->our));
|
u3_noun nam = u3dc("scot", 'p', u3k(u3A->our));
|
||||||
|
Loading…
Reference in New Issue
Block a user