diff options
| author | Alex Harpin <development@landsofshadow.co.uk> | 2014-12-31 15:31:15 +0000 |
|---|---|---|
| committer | Alex Harpin <development@landsofshadow.co.uk> | 2014-12-31 15:31:15 +0000 |
| commit | 5295b063d1d53802f0c33b2c8e64adbff1c6ba9d (patch) | |
| tree | 8328e131237a11d3e73245410fe422d466d9c39c | |
| parent | c25918350baad36e46cfd550e35a7630b8b074a0 (diff) | |
| download | vyatta-op-5295b063d1d53802f0c33b2c8e64adbff1c6ba9d.tar.gz vyatta-op-5295b063d1d53802f0c33b2c8e64adbff1c6ba9d.zip | |
Revert "Add an option to disable inotify to fail -f commands."
This reverts commit 75ae9d501bfdd4b264cfb0a8f1e04ae3c6a86cf7.
This change is no longer needed as inotify is now working in the
current VyOS kernel, following the commits for bug #425, so removing
this temporary workaround.
| -rwxr-xr-x | scripts/vyatta-monitor | 2 | ||||
| -rw-r--r-- | templates/monitor/log/node.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/vyatta-monitor b/scripts/vyatta-monitor index 9c846b0..22867e8 100755 --- a/scripts/vyatta-monitor +++ b/scripts/vyatta-monitor @@ -3,5 +3,5 @@ declare awkmatch="$2" for i in "${@:3}"; do awkmatch+="|$i" done -tail ---disable-inotify -f /var/log/messages \ +tail -f /var/log/messages \ | awk "/$awkmatch/{ \$5=\" $1:\"; for (f=5; f<=NF; ++f) {printf(\"%s \", \$f);}; printf(\"\n\") }" diff --git a/templates/monitor/log/node.def b/templates/monitor/log/node.def index 04995b5..3c3413d 100644 --- a/templates/monitor/log/node.def +++ b/templates/monitor/log/node.def @@ -1,2 +1,2 @@ help: Monitor last lines of messages file -run: tail ---disable-inotify --follow=name /var/log/messages +run: tail --follow=name /var/log/messages |