summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhagbard <vyosdev@derith.de>2019-01-22 10:33:19 -0800
committerhagbard <vyosdev@derith.de>2019-01-22 10:33:19 -0800
commit44dea640c6587a3599b427da9cdf79857fb4003a (patch)
tree896912ae949f366796a18f0b1028efb0057894a0
parent58d1afe53c2ad1385b87323c899286dab276974e (diff)
downloadvyos-1x-44dea640c6587a3599b427da9cdf79857fb4003a.tar.gz
vyos-1x-44dea640c6587a3599b427da9cdf79857fb4003a.zip
Revert "Fix: T1178 - Scheduled script breaks ability to modify configuration"
This reverts commit 632893abf5c7bf935d866462a107ed1eef1747b3.
-rw-r--r--debian/changelog6
-rwxr-xr-xsrc/conf_mode/task_scheduler.py2
2 files changed, 1 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index b8e9022c0..783080a92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-vyos-1x (1.2.0-10) unstable; urgency=low
-
- * T1178: Scheduled script breaks ability to modify configuration
-
- -- hagbard <vyosdev@derith.de> Mon, 21 Jan 2019 12:54:45 -0800
-
vyos-1x (1.2.0-9) unstable; urgency=low
* T1168: Upgrade: 1,1,7 -> 1.2.0-epa2
diff --git a/src/conf_mode/task_scheduler.py b/src/conf_mode/task_scheduler.py
index 0391d3edb..285afe2b5 100755
--- a/src/conf_mode/task_scheduler.py
+++ b/src/conf_mode/task_scheduler.py
@@ -27,7 +27,7 @@ from vyos import ConfigError
crontab_file = "/etc/cron.d/vyos-crontab"
-def format_task(minute="*", hour="*", day="*", dayofweek="*", month="*", user="vyos", rawspec=None, command=""):
+def format_task(minute="*", hour="*", day="*", dayofweek="*", month="*", user="root", rawspec=None, command=""):
fmt_full = "{minute} {hour} {day} {month} {dayofweek} {user} {command}\n"
fmt_raw = "{spec} {user} {command}\n"