Merge branch 'master' into nosocat
commit
aaeac9b852
|
@ -203,7 +203,7 @@ func d4loadConfig(d4 *d4S) bool {
|
||||||
(*d4).conf = d4params{}
|
(*d4).conf = d4params{}
|
||||||
(*d4).conf.source = string(readConfFile(d4, "source"))
|
(*d4).conf.source = string(readConfFile(d4, "source"))
|
||||||
(*d4).conf.destination = string(readConfFile(d4, "destination"))
|
(*d4).conf.destination = string(readConfFile(d4, "destination"))
|
||||||
tmpu, err := uuid.FromBytes(readConfFile(d4, "uuid"))
|
tmpu, err := uuid.FromString(string(readConfFile(d4, "uuid")))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// generate new uuid
|
// generate new uuid
|
||||||
(*d4).conf.uuid = generateUUIDv4()
|
(*d4).conf.uuid = generateUUIDv4()
|
||||||
|
|
Loading…
Reference in New Issue