diff --git a/net/fill_config.py b/net/fill_config.py index e97dab7..5374d62 100755 --- a/net/fill_config.py +++ b/net/fill_config.py @@ -96,6 +96,7 @@ idx = 0 def check_stale(src_path, target_path): if file_newer(src_path, target_path): + print() print('Stale: %r is newer than %r' % (src_path, target_path)) exit(1) diff --git a/net/tmpl_std/run.sh b/net/tmpl_std/run.sh index f31330b..03f75c1 100755 --- a/net/tmpl_std/run.sh +++ b/net/tmpl_std/run.sh @@ -1,5 +1,12 @@ #!/usr/bin/env bash -../fill_config.py --check-stale || ( echo "STALE CONFIGS. Hit enter to continue anyway."; read enter_to_continue ) + +if ! ../fill_config.py --check-stale; then + echo + echo "WARNING: STALE CONFIGS - your net configs are older than the templates they should be based on!" + echo " * Hit enter to continue, and use the stale config files" + echo " * Hit ^C and run 'make regen' to regenerate your configs" + read enter_to_continue +fi dev="${ETH_DEV}" ip2="${PUBLIC_IP2}"