From f7e60e7beb90b193aebd2edf43a5cbd7cc1b475d Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 2 Nov 2017 16:58:39 +0100 Subject: T437: Fixed system option "Ctrl-Alt-Delete action" broken --- templates/system/options/ctrl-alt-del-action/node.def | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'templates') diff --git a/templates/system/options/ctrl-alt-del-action/node.def b/templates/system/options/ctrl-alt-del-action/node.def index 3bbf2a81..a853b151 100644 --- a/templates/system/options/ctrl-alt-del-action/node.def +++ b/templates/system/options/ctrl-alt-del-action/node.def @@ -12,15 +12,15 @@ syntax:expression: $VAR(@) in "ignore", "reboot", "poweroff"; "Value must be ign end: if [ $VAR(@) == "ignore" ]; then - sudo sh -c "sed -i -e 's/^ca.*/ca:12345:ctrlaltdel:/' \ - /etc/inittab" + sudo sh -c "ln -sf /dev/null \ + /lib/systemd/system/ctrl-alt-del.target" elif [ $VAR(@) == "reboot" ]; then - sudo sh -c "sed -i -e 's/^ca.*/ca:12345:ctrlaltdel:\/sbin\/reboot/' \ - /etc/inittab" + sudo sh -c "ln -sf /lib/systemd/system/reboot.target \ + /lib/systemd/system/ctrl-alt-del.target" elif [ $VAR(@) == "poweroff" ]; then - sudo sh -c "sed -i -e 's/^ca.*/ca:12345:ctrlaltdel:\/sbin\/shutdown -h now/' \ - /etc/inittab" + sudo sh -c "ln -sf /lib/systemd/system/poweroff.target \ + /lib/systemd/system/ctrl-alt-del.target" fi - # Reload /etc/inittab for change to take effect - sudo /sbin/init q + # Reload systemd daemon for change to take effect + sudo /bin/systemctl daemon-reload -- cgit v1.2.3 From 890dda04895996e19cb579a322c979d410d7757d Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 2 Nov 2017 17:14:39 +0100 Subject: T438: Remove long broken popularity contest --- templates/system/options/enable-popularity-contest/node.def | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 templates/system/options/enable-popularity-contest/node.def (limited to 'templates') diff --git a/templates/system/options/enable-popularity-contest/node.def b/templates/system/options/enable-popularity-contest/node.def deleted file mode 100644 index 3f048352..00000000 --- a/templates/system/options/enable-popularity-contest/node.def +++ /dev/null @@ -1,9 +0,0 @@ -help: Send anonymous system statistic to VyOS maintainers - -create: - sudo sh -c 'echo "#!/bin/sh" > /etc/cron.weekly/01vyos-popcon' - sudo sh -c 'echo "/opt/vyatta/bin/vyos-popcon.pl 2>&1 >/var/log/popcon.log" >> /etc/cron.weekly/01vyos-popcon' - sudo sh -c 'chmod +x /etc/cron.weekly/01vyos-popcon' - -delete: - sudo rm -f /etc/cron.weekly/01vyos-popcon -- cgit v1.2.3