From c8e879595400e3485b5a075797290a1061c0b04f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 24 Sep 2013 09:35:22 +0200 Subject: [PATCH] scripts: reorganize directory layout move example scripts from dummy/ to examples/ keep scripts that can be used as-is in scripts/ Signed-off-by: Felix Fietkau --- {scripts => examples}/hotplug-cmd | 0 {dummy => examples}/proto/ppp.sh | 3 ++- {dummy => examples}/proto/pptp.sh | 3 +-- netifd.h | 4 ++-- {dummy => scripts}/netifd-proto.sh | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename {scripts => examples}/hotplug-cmd (100%) rename {dummy => examples}/proto/ppp.sh (97%) rename {dummy => examples}/proto/pptp.sh (96%) rename {dummy => scripts}/netifd-proto.sh (100%) diff --git a/scripts/hotplug-cmd b/examples/hotplug-cmd similarity index 100% rename from scripts/hotplug-cmd rename to examples/hotplug-cmd diff --git a/dummy/proto/ppp.sh b/examples/proto/ppp.sh similarity index 97% rename from dummy/proto/ppp.sh rename to examples/proto/ppp.sh index c710bf2..f0d0ca3 100755 --- a/dummy/proto/ppp.sh +++ b/examples/proto/ppp.sh @@ -1,6 +1,7 @@ #!/bin/sh +DUMMY=1 +. ../../scripts/netifd-proto.sh -. ../netifd-proto.sh init_proto "$@" ppp_generic_init_config() { diff --git a/dummy/proto/pptp.sh b/examples/proto/pptp.sh similarity index 96% rename from dummy/proto/pptp.sh rename to examples/proto/pptp.sh index 914604f..5189e95 100755 --- a/dummy/proto/pptp.sh +++ b/examples/proto/pptp.sh @@ -1,6 +1,5 @@ #!/bin/sh - -. ../netifd-proto.sh +. ../../scripts/netifd-proto.sh init_proto "$@" proto_pptp_init_config() { diff --git a/netifd.h b/netifd.h index befa2cc..1f64555 100644 --- a/netifd.h +++ b/netifd.h @@ -29,8 +29,8 @@ #include "utils.h" #ifdef DUMMY_MODE -#define DEFAULT_MAIN_PATH "./dummy" -#define DEFAULT_HOTPLUG_PATH "./scripts/hotplug-cmd" +#define DEFAULT_MAIN_PATH "./examples" +#define DEFAULT_HOTPLUG_PATH "./examples/hotplug-cmd" #define DEFAULT_RESOLV_CONF "./tmp/resolv.conf" #else #define DEFAULT_MAIN_PATH "/lib/netifd" diff --git a/dummy/netifd-proto.sh b/scripts/netifd-proto.sh similarity index 100% rename from dummy/netifd-proto.sh rename to scripts/netifd-proto.sh -- 2.30.2