diff options
author | Pacien TRAN-GIRARD | 2017-07-01 23:18:40 +0200 |
---|---|---|
committer | Pacien TRAN-GIRARD | 2017-07-01 23:18:40 +0200 |
commit | d221543bb9d6bc9b7344cc96f010a501ff35bb7f (patch) | |
tree | b86dc361ac279615ded4cbf902743d90559a39db /app/src/main/java/org/pacien/tincapp/commands/Tincd.kt | |
parent | 3e3135b0c7fba811735a30e7fd155ca1e188c787 (diff) | |
download | tincapp-d221543bb9d6bc9b7344cc96f010a501ff35bb7f.tar.gz |
Support config located on external storage with the "external/" prefix
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/commands/Tincd.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/commands/Tincd.kt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt index 19ebfbd..c54b328 100644 --- a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt +++ b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt | |||
@@ -9,12 +9,12 @@ import java.io.IOException | |||
9 | object Tincd { | 9 | object Tincd { |
10 | 10 | ||
11 | @Throws(IOException::class) | 11 | @Throws(IOException::class) |
12 | fun start(netName: String, fd: Int) { | 12 | fun start(netConf: AppPaths.NetConf, fd: Int) { |
13 | Executor.forkExec(Command(AppPaths.tincd().absolutePath) | 13 | Executor.forkExec(Command(AppPaths.tincd().absolutePath) |
14 | .withOption("no-detach") | 14 | .withOption("no-detach") |
15 | .withOption("config", AppPaths.confDir(netName).absolutePath) | 15 | .withOption("config", AppPaths.confDir(netConf).absolutePath) |
16 | .withOption("pidfile", AppPaths.pidFile(netName).absolutePath) | 16 | .withOption("pidfile", AppPaths.pidFile(netConf).absolutePath) |
17 | .withOption("logfile", AppPaths.logFile(netName).absolutePath) | 17 | .withOption("logfile", AppPaths.logFile(netConf).absolutePath) |
18 | .withOption("option", "DeviceType=fd") | 18 | .withOption("option", "DeviceType=fd") |
19 | .withOption("option", "Device=" + fd)) | 19 | .withOption("option", "Device=" + fd)) |
20 | } | 20 | } |