diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/s6-frontend/live.help.txt | 1 | ||||
| -rw-r--r-- | src/s6-frontend/live_install.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/s6-frontend/live.help.txt b/src/s6-frontend/live.help.txt index 88d51ca..3d4a9aa 100644 --- a/src/s6-frontend/live.help.txt +++ b/src/s6-frontend/live.help.txt @@ -22,6 +22,7 @@ s6 live install options: -b --block on contention, wait rather than fail -K --keep-old keep the old db and write its path to stdout -f FILE --conversion-file=FILE use a conversion file from current to new set + --init install the initial db. DO NOT USE WHEN LIVE. s6 live start-everything options: -n --dry-run only show what would be done, don't do it diff --git a/src/s6-frontend/live_install.c b/src/s6-frontend/live_install.c index 6c85b96..7da1759 100644 --- a/src/s6-frontend/live_install.c +++ b/src/s6-frontend/live_install.c @@ -12,6 +12,7 @@ enum golb_e { GOLB_BLOCK = 0x01, GOLB_KEEPOLD = 0x02, + GOLB_INIT = 0x04, } ; enum gola_e @@ -26,6 +27,7 @@ void live_install (char const *const *argv) { { .so = 'b', .lo = "block", .clear = 0, .set = GOLB_BLOCK }, { .so = 'K', .lo = "keep-old", .clear = 0, .set = GOLB_KEEPOLD }, + { .so = 0, .lo = "init", .clear = 0, .set = GOLA_INIT }, } ; static gol_arg const rgola[] = { @@ -34,7 +36,7 @@ void live_install (char const *const *argv) uint64_t wgolb = 0 ; unsigned int m = 0 ; char const *wgola[GOLA_N] = { 0 } ; - char const *newargv[16] ; + char const *newargv[17] ; char fmtv[UINT_FMT] ; argv += GOL_argv(argv, rgolb, rgola, &wgolb, wgola) ; @@ -60,6 +62,7 @@ void live_install (char const *const *argv) newargv[m++] = "-f" ; newargv[m++] = wgola[GOLA_CONVFILE] ; } + if (wgolb & GOLB_INIT) newargv[m++] = "--no-update" ; newargv[m++] = "--" ; newargv[m++] = "current" ; newargv[m++] = 0 ; |