By default, master-failover will call "herd start ganeti-wconfd" with extra arguments such as --force-node. That does not work with the Shepherd, so the Guix service has a "force-start" action for this purpose. diff --git a/lib/bootstrap.py b/lib/bootstrap.py --- a/lib/bootstrap.py +++ b/lib/bootstrap.py @@ -1011,9 +1011,7 @@ def MasterFailover(no_voting=False): try: # Forcefully start WConfd so that we can access the configuration - result = utils.RunCmd([pathutils.DAEMON_UTIL, - "start", constants.WCONFD, "--force-node", - "--no-voting", "--yes-do-it"]) + result = utils.RunCmd(["herd", "force-start", constants.WCONFD]) if result.failed: raise errors.OpPrereqError("Could not start the configuration daemon," " command %s had exitcode %s and error %s" % tch'/> Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/gnu/build/cross-toolchain.scm
AgeCommit message (Expand)Author
2019-08-29Merge branch 'master' into core-updatesMark H Weaver
2019-08-28gnu: mingw-w64: Update to 6.0.0....* gnu/packages/mingw.scm (mingw-w64): Update to 6.0.0. * gnu/packages/patches/mingw-w64-6.0.0-gcc.patch: New file. * gnu/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch: Delete it. * gnu/local.mk (dist_patch_DATA): Add new patch. Delete old patch. * gnu/build/cross-toolchain.scm (set-cross-path/mingw): Add additional autoconf-like substitutions. David Thompson
2019-08-22Merge branch 'master' into core-updatesMark H Weaver
2019-08-14gnu: mingw: Add x86_64 support....This patch parameterizes previously hard-coded instances of i686-w64-mingw32, adding support for x86_64-w64-mingw32. * gnu/packages/mingw.scm (make-mingw-w64): New procedure. (mingw-w64-i686, mingw-w64-x86_64): New variables. (%mingw-triplet): Remove. (mingw-w64): Update to point to 'mingw-w64-i686'. * gnu/packages/cross-base.scm (cross-gcc): Use 'libc' keyword argument if specified, instead of treating it as a boolean. (native-libc): Return the correct mingw-w64 depending on machine specified in target. * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add "x86_64-mingw". * gnu/build/cross-toolchain.scm (set-cross-path/mingw): Replace hardcoded 'i686-w64-mingw32' instances with 'target' keyword argument. (cross-gcc-build-phases): Update accordingly; use 'target-mingw?' implementation of target checking and add commentary. * gnu/ci.scm (%cross-targets): Add "x86_64-w64-mingw32". Carl Dong