From c272e3042fd80e0ee1c7bed6e2482ed444f86412 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sun, 1 Nov 2015 15:21:34 +0100 Subject: [PATCH] Fix daemonization regression Commit af923d2d16e0eedc7d2c203e28a42b6af49a51f5 broke daemonization. Revert the change but get rid of the warning message when running in the foreground. --- main.go | 6 ++---- sendusr1.go | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index 780ea3c..f1fd58b 100644 --- a/main.go +++ b/main.go @@ -199,10 +199,8 @@ func main() { } fmt.Println("Filesystem ready.") - if !foreground { - // Send notification to our parent - sendUsr1() - } + // Send notification to our parent + sendUsr1() // Wait for SIGING in the background and unmount ourselves if we get it // This prevents a dangling "Transport endpoint is not connected" mountpoint handleSigint(srv, mountpoint) diff --git a/sendusr1.go b/sendusr1.go index b95e8db..eab7d11 100644 --- a/sendusr1.go +++ b/sendusr1.go @@ -34,7 +34,5 @@ func sendUsr1() { if err != nil { fmt.Printf("sendUsr1: Signal: %v\n", err) } - } else { - fmt.Printf("Not running under the gocryptfs wrapper - will not daemonize\n") } }