mirror of
https://github.com/fosrl/newt.git
synced 2026-03-02 08:46:42 +00:00
Resolve merge issues
This commit is contained in:
3
main.go
3
main.go
@@ -356,7 +356,6 @@ var (
|
|||||||
privateKey wgtypes.Key
|
privateKey wgtypes.Key
|
||||||
err error
|
err error
|
||||||
logLevel string
|
logLevel string
|
||||||
updownScript string
|
|
||||||
interfaceName string
|
interfaceName string
|
||||||
generateAndSaveKeyTo string
|
generateAndSaveKeyTo string
|
||||||
rm bool
|
rm bool
|
||||||
@@ -797,7 +796,7 @@ persistent_keepalive_interval=5`, fixKey(privateKey.String()), fixKey(wgData.Pub
|
|||||||
// Wait for interrupt signal
|
// Wait for interrupt signal
|
||||||
sigCh := make(chan os.Signal, 1)
|
sigCh := make(chan os.Signal, 1)
|
||||||
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
||||||
sigReceived := <-sigCh
|
<-sigCh
|
||||||
|
|
||||||
dev.Close()
|
dev.Close()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user