[Swan-dev] set systemd variables to aovid SIGABORT

[Andrew Cagney]

Two thoughts:

- mk/config.mk, adjacent to the existing SD_TYPE code, is a better home

- I'm not understanding the need for the XXX_DEFAULT indirection, just:
  mk/config.mk:
    SD_RESTART_TYPE ?= "always"
  Makefile.inc.local:
    SD_RESTART_TYPE = xxx
will dtrt.

Andrew

diff --git a/mk/userland-cflags.mk b/mk/userland-cflags.mk
index 5b6a41c..bcc61f0 100644
--- a/mk/userland-cflags.mk
+++ b/mk/userland-cflags.mk
@@ -109,6 +109,24 @@ USERLAND_CFLAGS+=-DIPSEC_VARDIR=\"$(FINALVARDIR)\"
 USERLAND_CFLAGS+=-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\"
 USERLAND_CFLAGS+=-DIPSEC_SECRETS_FILE=\"$(IPSEC_SECRETS_FILE)\"

+ifeq ($(origin SD_RESTART_TYPE_DEFAULT),undefined)
+SD_RESTART_TYPE="always"
+else
+SD_RESTART_TYPE="$(SD_RESTART_TYPE_DEFAULT)"
+endif
+
+ifeq ($(origin SD_PLUTO_OPTIONS_DEFAULT),undefined)
+SD_PLUTO_OPTIONS="--leak-detective"
+else
+SD_PLUTO_OPTIONS="$(SD_PLUTO_OPTIONS_DEFAULT)"
+endif
+
+ifeq ($(origin SD_WATCHDOGSEC_DEFAULT),undefined)
+SD_WATCHDOGSEC=60
+else
+SD_WATCHDOGSEC="$(SD_WATCHDOGSEC_DEFAULT)"
+endif
+

On 21 July 2016 at 12:50, Antony Antony <antony at phenome.org> wrote:
> While debugging pluto, running in gdb, I noticed on F22 systemd could send sigabort. To disable it I set  WatchdogSec=0 d 0 in Makefile.inc.local I set
> SD_WATCHDOGSEC_DEFAULT=0
> While working at it I also exposed a couple of more variables in Makefile.inc.local . These are useful to developing/debugging. I would like to see this patch, or a revised one, applied. Any ideas/objections?
>
> Another recent systemd effect I notice is "intermittently", after a make install or install-base, I get this message " Run 'systemctl daemon-reload' to reload units." and ./eastinit.sh fail.
>
> [root at east basic-pluto-01]# ./eastinit.sh
> Warning: ipsec.service changed on disk. Run 'systemctl daemon-reload' to reload units.
> Redirecting to: systemctl start ipsec.service
> Failed to start ipsec.service: Unit ipsec.service is masked.
>
>
> PS: this is how SIGABRT looks like in gdb which looks like
> https://github.com/systemd/systemd/issues/917
>
> Program received signal SIGABRT, Aborted.
> 0x00007f99af0c2b93 in epoll_wait () at ../sysdeps/unix/syscall-template.S:84
> 84      T_PSEUDO (SYSCALL_SYMBOL, SYSCALL_NAME, SYSCALL_NARGS)
> (gdb) bt
> #0  0x00007f99af0c2b93 in epoll_wait ()
>     at ../sysdeps/unix/syscall-template.S:84
> #1  0x00007f99afe7f4b8 in epoll_dispatch (base=0x555850e1e1b0,
>     tv=<optimized out>) at epoll.c:407
> #2  0x00007f99afe69add in event_base_loop (base=0x555850e1e1b0, flags=0)
>     at event.c:1607
> #3  0x000055584ea49294 in main_loop ()
>     at /home/build/libreswan/programs/pluto/server.c:628
> #4  0x000055584ea49643 in call_server ()
>     at /home/build/libreswan/programs/pluto/server.c:742
>
> -antony
>
> _______________________________________________
> Swan-dev mailing list
> Swan-dev at lists.libreswan.org
> https://lists.libreswan.org/mailman/listinfo/swan-dev
>