Verified Commit b03517eb authored by Bernd Paysan's avatar Bernd Paysan
Browse files

Keep old config if it's there, no need to migrate it

parent f53532fc

ip.fs

+3 −3
Original line number Diff line number Diff line
@@ -54,12 +54,12 @@ Variable host$ 
	config:host$ $@ host$ $!

    ELSE

	config:host$ $free  host$ $@ config:orighost$ $!

	[IFDEF] android 20 [ELSE] 10 [THEN] \ mobile has lower prio

	config:prio# !

    THEN ;



: default-host ( -- )

    get-host$ skip.site replace-host

    [IFDEF] android 20 [ELSE] 10 [THEN] \ mobile has lower prio

    config:prio# ! ;

    get-host$ skip.site replace-host ;



Create ip6::0 here 16 dup allot erase

: .ip6::0 ( -- )  ip6::0 $10 type ;

tools.fs

+2 −2
Original line number Diff line number Diff line
@@ -446,14 +446,14 @@ Variable configured? 
forward default-host



: ?old-config ( addr u wid -- )

    \G move from legacy config to ~/.config and ~/.cache

    \G check if we have an old config; then keep it.

    "~/.net2o/config" file-status nip no-file# <> IF

	"~/.net2o" .net2o$ $!

	"~/.net2o/config" .net2o-config$ $!

	subdir-config

	read-config

    ELSE

	?.net2o write-config

	?.net2o default-host write-config

    THEN ;



: ?.net2o-config ( -- )  true configured? !@ ?EXIT