diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-30 14:51:50 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-30 14:52:11 +0100 |
| commit | c7f7bb3e7182782cd904d5c2908f1fd08c0bb8e9 (patch) | |
| tree | 75fe5eeb47eda6d30fc29c345730b50a5056d5c3 | |
| parent | db9eb8428f8773763392b4ceede98df8071bf77e (diff) | |
| download | vyatta-cfg-system-c7f7bb3e7182782cd904d5c2908f1fd08c0bb8e9.tar.gz vyatta-cfg-system-c7f7bb3e7182782cd904d5c2908f1fd08c0bb8e9.zip | |
T1919: migrate 'system options' to XML/Python representation
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | cfg-version/system@15 (renamed from cfg-version/system@14) | 0 | ||||
| -rw-r--r-- | templates/system/options/ctrl-alt-del-action/node.def | 26 | ||||
| -rw-r--r-- | templates/system/options/node.def | 2 | ||||
| -rw-r--r-- | templates/system/options/reboot-on-panic/node.def | 10 |
5 files changed, 1 insertions, 39 deletions
diff --git a/Makefile.am b/Makefile.am index b9886a6e..2d9c7cd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,7 @@ rsyslogdir = /etc/rsyslog.d #rsyslog_DATA = sysconf/vyatta-log.conf curver_DATA = cfg-version/vrrp@2 -curver_DATA += cfg-version/system@14 +curver_DATA += cfg-version/system@15 curver_DATA += cfg-version/broadcast-relay@1 curver_DATA += cfg-version/mdns@1 curver_DATA += cfg-version/dhcp-server@5 diff --git a/cfg-version/system@14 b/cfg-version/system@15 index e69de29b..e69de29b 100644 --- a/cfg-version/system@14 +++ b/cfg-version/system@15 diff --git a/templates/system/options/ctrl-alt-del-action/node.def b/templates/system/options/ctrl-alt-del-action/node.def deleted file mode 100644 index a853b151..00000000 --- a/templates/system/options/ctrl-alt-del-action/node.def +++ /dev/null @@ -1,26 +0,0 @@ -type: txt - -help: Ctrl-Alt-Delete action - -default: "ignore" - -val_help: ignore; Ignore Ctrl-Alt-Delete -val_help: reboot; Reboot VyOS -val_help: poweroff; Poweroff VyOS - -syntax:expression: $VAR(@) in "ignore", "reboot", "poweroff"; "Value must be ignore, reboot, or poweroff" - -end: - if [ $VAR(@) == "ignore" ]; then - sudo sh -c "ln -sf /dev/null \ - /lib/systemd/system/ctrl-alt-del.target" - elif [ $VAR(@) == "reboot" ]; then - sudo sh -c "ln -sf /lib/systemd/system/reboot.target \ - /lib/systemd/system/ctrl-alt-del.target" - elif [ $VAR(@) == "poweroff" ]; then - sudo sh -c "ln -sf /lib/systemd/system/poweroff.target \ - /lib/systemd/system/ctrl-alt-del.target" - fi - - # Reload systemd daemon for change to take effect - sudo /bin/systemctl daemon-reload diff --git a/templates/system/options/node.def b/templates/system/options/node.def deleted file mode 100644 index a878887c..00000000 --- a/templates/system/options/node.def +++ /dev/null @@ -1,2 +0,0 @@ -priority: 400 -help: System options diff --git a/templates/system/options/reboot-on-panic/node.def b/templates/system/options/reboot-on-panic/node.def deleted file mode 100644 index f768d5ae..00000000 --- a/templates/system/options/reboot-on-panic/node.def +++ /dev/null @@ -1,10 +0,0 @@ -type: bool -help: Reboot system on kernel panic -default: true -update:expression: "sudo sh -c \"if [ x$VAR(@) == xfalse ]; \ -then \ - echo 0 > /proc/sys/kernel/panic; \ -else \ - echo 60 > /proc/sys/kernel/panic; \ -fi\" " -delete:expression: "sudo sh -c \"echo 60 > /proc/sys/kernel/panic\" " |