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

Remove -m option; make new boot the default.

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-12-06 11:26:04 -08:00
parent 3902c0527e
commit 7547d91100
4 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/noun/manage.h
View File

@ -7,7 +7,7 @@
/* u3m_boot(): start the u3 system. /* u3m_boot(): start the u3 system.
*/ */
void void
u3m_boot(c3_o nuu_o, c3_o bug_o, c3_o mad_o, c3_c* dir_c, c3_c *pil_c); u3m_boot(c3_o nuu_o, c3_o bug_o, c3_c* dir_c, c3_c *pil_c);
/* u3m_bail(): bail out. Does not return. /* u3m_bail(): bail out. Does not return.
** **

1
include/vere/vere.h
View File

@ -553,7 +553,6 @@
c3_o loh; // -L, local-only networking c3_o loh; // -L, local-only networking
c3_o pro; // -P, profile c3_o pro; // -P, profile
c3_o veb; // -v, verbose (inverse of -q) c3_o veb; // -v, verbose (inverse of -q)
c3_o mad; // -m, mad pill
c3_o nuu; // -c, new pier c3_o nuu; // -c, new pier
c3_o qui; // -q, quiet c3_o qui; // -q, quiet
c3_o vno; // -V, turn on +verb c3_o vno; // -V, turn on +verb

20
noun/manage.c
View File

@ -1500,9 +1500,9 @@ _cm_init(c3_o chk_o)
/* _boot_home(): create ship directory. /* _boot_home(): create ship directory.
*/ */
static void static void
_boot_home(c3_o mad_o, c3_c *dir_c, c3_c *pil_c) _boot_home(c3_c *dir_c, c3_c *pil_c)
{ {
c3_c* nam_c = _(mad_o) ? "events.pill" : "urbit.pill"; c3_c* nam_c = "urbit.pill";
c3_c ful_c[2048]; c3_c ful_c[2048];
/* Create subdirectories. */ /* Create subdirectories. */
@ -1576,7 +1576,7 @@ _boot_home(c3_o mad_o, c3_c *dir_c, c3_c *pil_c)
/* u3m_boot(): start the u3 system. /* u3m_boot(): start the u3 system.
*/ */
void void
u3m_boot(c3_o nuu_o, c3_o bug_o, c3_o mad_o, c3_c* dir_c, c3_c *pil_c) u3m_boot(c3_o nuu_o, c3_o bug_o, c3_c* dir_c, c3_c *pil_c)
{ {
/* Activate the loom. /* Activate the loom.
*/ */
@ -1603,22 +1603,14 @@ u3m_boot(c3_o nuu_o, c3_o bug_o, c3_o mad_o, c3_c* dir_c, c3_c *pil_c)
if ( _(nuu_o) ) { if ( _(nuu_o) ) {
c3_c ful_c[2048]; c3_c ful_c[2048];
_boot_home(mad_o, dir_c, pil_c); _boot_home(dir_c, pil_c);
if ( _(mad_o) ) { {
snprintf(ful_c, 2048, "%s/.urb/events.pill", dir_c); snprintf(ful_c, 2048, "%s/.urb/urbit.pill", dir_c);
printf("boot: loading %s\r\n", ful_c); printf("boot: loading %s\r\n", ful_c);
u3v_boot(ful_c); u3v_boot(ful_c);
} }
else {
snprintf(ful_c, 2048, "%s/.urb/urbit.pill", dir_c);
printf("boot: loading %s\r\n", ful_c);
u3v_make(ful_c);
u3v_jack();
}
} }
else { else {

6
vere/main.c
View File

@ -68,7 +68,6 @@ _main_getopt(c3_i argc, c3_c** argv)
u3_Host.ops_u.abo = c3n; u3_Host.ops_u.abo = c3n;
u3_Host.ops_u.bat = c3n; u3_Host.ops_u.bat = c3n;
u3_Host.ops_u.gab = c3n; u3_Host.ops_u.gab = c3n;
u3_Host.ops_u.mad = c3n;
u3_Host.ops_u.loh = c3n; u3_Host.ops_u.loh = c3n;
u3_Host.ops_u.dem = c3n; u3_Host.ops_u.dem = c3n;
u3_Host.ops_u.fog = c3n; u3_Host.ops_u.fog = c3n;
@ -118,10 +117,6 @@ _main_getopt(c3_i argc, c3_c** argv)
u3_Host.ops_u.tex = c3y; u3_Host.ops_u.tex = c3y;
break; break;
} }
case 'm': {
u3_Host.ops_u.mad = c3y;
break;
}
case 'X': { case 'X': {
u3_Host.ops_u.fog = c3y; u3_Host.ops_u.fog = c3y;
break; break;
@ -545,7 +540,6 @@ main(c3_i argc,
} }
u3m_boot(u3_Host.ops_u.nuu, u3m_boot(u3_Host.ops_u.nuu,
u3_Host.ops_u.gab, u3_Host.ops_u.gab,
u3_Host.ops_u.mad,
u3_Host.dir_c, u3_Host.dir_c,
u3_Host.ops_u.pil_c); u3_Host.ops_u.pil_c);