summaryrefslogtreecommitdiff
path: root/templates/set
diff options
context:
space:
mode:
authorTom Grennan <tgrennan@vyatta.com>2007-10-05 14:10:16 -0700
committerTom Grennan <tgrennan@vyatta.com>2007-10-05 14:10:16 -0700
commit067320a0aa36ba97d64ff5473d4ad0b3877774e4 (patch)
treea97e96bf6305b8a53d06f8e7018637a1f8fc7d6d /templates/set
parentfd141a3ac06bdbf52f38a7be6d72a392d951b67d (diff)
downloadvyatta-op-067320a0aa36ba97d64ff5473d4ad0b3877774e4.tar.gz
vyatta-op-067320a0aa36ba97d64ff5473d4ad0b3877774e4.zip
Use empty or missing "allowed:" fields in node.tag/node.def as wild
cards rather than "echo -n --". Also, discoverd a way to use an apparently blank line in help completion.
Diffstat (limited to 'templates/set')
-rw-r--r--templates/set/date/node.tag/node.def2
-rw-r--r--templates/set/date/ntp/node.tag/node.def3
-rw-r--r--templates/set/node.tag/node.def2
3 files changed, 3 insertions, 4 deletions
diff --git a/templates/set/date/node.tag/node.def b/templates/set/date/node.tag/node.def
index f508bf3..778a408 100644
--- a/templates/set/date/node.tag/node.def
+++ b/templates/set/date/node.tag/node.def
@@ -1,3 +1,3 @@
help: Set date and time: MMDDhhmm[.ss]YYYY
-allowed: echo -n --
+allowed:
run: sudo /bin/date $3
diff --git a/templates/set/date/ntp/node.tag/node.def b/templates/set/date/ntp/node.tag/node.def
index f8be449..be4de16 100644
--- a/templates/set/date/ntp/node.tag/node.def
+++ b/templates/set/date/ntp/node.tag/node.def
@@ -1,4 +1,3 @@
help: Set system date and time with given NTP server
-allowed: sed 's/#.*//; s/^[^ \t]*[ \t]//; /^$/d' ${HOSTFILE:-/dev/null} ;
- echo --
+allowed: sed 's/#.*//; s/^[^ \t]*[ \t]//; /^$/d' ${HOSTFILE:-/dev/null}
run: sudo ntpdate ${4:-ntp.vyatta.com}
diff --git a/templates/set/node.tag/node.def b/templates/set/node.tag/node.def
index dd11fb5..be8e567 100644
--- a/templates/set/node.tag/node.def
+++ b/templates/set/node.tag/node.def
@@ -1,3 +1,3 @@
help: Bash builtin set command
-allowed: echo -n --
+allowed:
run: builtin $*