[debian-edu-commits] debian-edu/ 01/01: Remove default file. Add related information to the README file instead. Thanks to Petter Reinholdtsen for advice.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository shutdown-at-night.

commit 2267e1e938d3f25846c9866803d1b24b84b2f7c1
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Oct 17 23:31:31 2015 +0200

    Remove default file. Add related information to the README file instead. Thanks to Petter Reinholdtsen for advice.
---
 README                           | 25 +++++++++++++++++++------
 debian/changelog                 |  2 +-
 debian/shutdown-at-night.default |  6 ------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/README b/README
index 9b11331..b7d0a02 100644
--- a/README
+++ b/README
@@ -14,12 +14,12 @@ There are some considerations to make when doing this:
  - To avoid breaking fuses, it is a good idea to make sure all clients
    do not start at the same time.
 
- - There are two different methods available to wake up clients.  One
-   uses a BIOS feature and require a working and correct hardware
-   clock, as well as a motherboard and BIOS version supported by
-   nvram-wakeup, The other require a server with knowledge about all
-   the clients to wake up and for all the clients to have support for
-   wake-on-lan.
+ - There are three different methods available to wake up clients.
+   Two use a BIOS feature and require a working and correct hardware
+   clock, one of it in addition a motherboard and BIOS version
+   supported by nvram-wakeup. The other requires a server with
+   knowledge about all the clients to wake up and for all the clients
+   to have support for wake-on-lan.
 
 How to set it up
 ----------------
@@ -57,6 +57,19 @@ package:
   export PATH
   netgroup -h shutdown-at-night-hosts
 
+This is an example for a /etc/default/shutdown-at-night
+configuration file, if wakeup should be configured without using a
+server.
+
+  # These are the defaults for standalone usage for wakeup. Set from
+  # "no" to "yes" to enable a wake method.
+  WAKEUPTIME="07:00"
+  # nvram-wake works only for special mother boards.
+  NVRAM_WAKE_ENABLED="no"
+  # Using the real time clock wakealarm feature should work better.
+  ACPI_WAKE_ENABLED="no"
+
+
 License
 -------
 
diff --git a/debian/changelog b/debian/changelog
index ab226e6..ba0996c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ shutdown-at-night (0.17) UNRELEASED; urgency=medium
   * Fix typos in xsession test.
   * Fix typo in acpiwakeup code.
   * Provide support for usage via flag file.
-    + Add shutdown-at-night.default to enable configuration.
+    + Add configuration information to the README file.
     + Adjust the code to make configuration possible.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Sat, 17 Oct 2015 19:25:29 +0200
diff --git a/debian/shutdown-at-night.default b/debian/shutdown-at-night.default
deleted file mode 100644
index ad2b61c..0000000
--- a/debian/shutdown-at-night.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# These are the defaults for standalone usage.
-WAKEUPTIME="07:00"
-# nvram-wake works only for special mother boards.
-NVRAM_WAKE_ENABLED="no"
-# Using the real time clock wakealarm feature should work in most cases.
-ACPI_WAKE_ENABLED="no"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/shutdown-at-night.git