summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-14 17:23:08 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-14 17:23:08 -0700
commit3bae7ce5e7a293afb45548dcacd5edce524ff74c (patch)
tree37d6d598150e62edf06702766c1d0b8d5a2c542e
parent0b0dd383db5ec07cc2e8550f47cc369c1c930a66 (diff)
parent55bc9f8ac50d268a33a2f9c554062a370f602355 (diff)
downloadvyatta-cfg-system-3bae7ce5e7a293afb45548dcacd5edce524ff74c.tar.gz
vyatta-cfg-system-3bae7ce5e7a293afb45548dcacd5edce524ff74c.zip
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-cfg-system into mendocino
-rw-r--r--debian/changelog16
-rw-r--r--templates/system/console/powersave/node.def8
2 files changed, 20 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 33dcc5d2..802d80bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+vyatta-cfg-system (0.17.114) unstable; urgency=low
+
+ * Add better control over console screen blanker
+ * Need sudo to change console settings
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com> Thu, 14 Oct 2010 16:58:42 -0700
+
+vyatta-cfg-system (0.17.113) unstable; urgency=low
+
+ * Turn off screen blanking on console
+ * Need to be root to write /etc/inittab
+ * Restore old motd and login banner
+ * Remove serial console before config
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com> Thu, 14 Oct 2010 16:18:35 -0700
+
vyatta-cfg-system (0.17.112) unstable; urgency=low
* Add support for setting up serial console ports
diff --git a/templates/system/console/powersave/node.def b/templates/system/console/powersave/node.def
index e863e020..da014a21 100644
--- a/templates/system/console/powersave/node.def
+++ b/templates/system/console/powersave/node.def
@@ -1,6 +1,6 @@
help: Enable screen blank powersaving on VGA console
-create: setterm -blank 15 -powersave powerdown -powerdown 60 \
- </dev/console >/dev/console 2>&1
-delete: setterm -blank 0 -powersave off -powerdown 0 \
- </dev/console >/dev/console 2>&1
+create: sudo sh -c \
+ "/usr/bin/setterm -blank 15 -powersave powerdown -powerdown 60 </dev/console >/dev/console 2>&1"
+delete: sudo sh -c \
+ "/usr/bin/setterm -blank 0 -powersave off -powerdown 0 </dev/console >/dev/console 2>&1"