[debian-edu-commits] debian-edu/ 44/64: * Sync with Ubuntu version 0.8ubuntu1: - Apply patch from Mike Gabriel clarifying reasons for host(s) not shutting down. (LP: #608616) - Add ethtool as a dependency. (LP: #607021)

[Mike Gabriel]

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

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

commit 870f03efc505e37e045e5c621c8fd810ed0389af
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Jan 4 13:44:50 2012 +0000

    * Sync with Ubuntu version 0.8ubuntu1:
      - Apply patch from Mike Gabriel clarifying reasons for host(s)
        not shutting down. (LP: #608616)
      - Add ethtool as a dependency. (LP: #607021)
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/shutdown-at-night@74922 6e500793-9bee-0310-a5b0-9d0909bd054d
---
 debian/changelog  |    9 +++++++++
 debian/control    |    2 +-
 shutdown-at-night |    5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a3c2056..8e55c66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+shutdown-at-night (0.9) unstable; urgency=low
+
+  * Sync with Ubuntu version 0.8ubuntu1:
+    - Apply patch from Mike Gabriel clarifying reasons for host(s)
+      not shutting down. (LP: #608616)
+    - Add ethtool as a dependency. (LP: #607021)
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 04 Jan 2012 14:43:31 +0100
+
 shutdown-at-night (0.8) unstable; urgency=low
 
   * Make sure netgroup membership is checked using both the full and
diff --git a/debian/control b/debian/control
index 26631c8..2f8bec9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/debian-edu/trunk/src/shutdown-at-night
 Package: shutdown-at-night
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends},  cron | fcron,
- wakeonlan, ng-utils, fping
+ wakeonlan, ng-utils, fping, ethtool
 Recommends: nvram-wakeup
 Suggests: sitesummary (>= 0.0.41)
 Description: System to shut down clients at night, and wake them in the morning
diff --git a/shutdown-at-night b/shutdown-at-night
index 84ff577..598bf06 100755
--- a/shutdown-at-night
+++ b/shutdown-at-night
@@ -82,5 +82,10 @@ if enabled_for_host ; then
 	fi
 	prepare_wakeonlan || fatal "unable to enable wake-on-lan - aborting shutdown."
 	shutdown -h 5 "Unused host being turned off for the night (cron)." < /dev/null > /dev/null 2>&1 &
+    else 
+      logger -t shutdown-at-night "client $hostname is in use; shutdown sequence will NOT be initiated."
     fi
+else
+    logger -t shutdown-at-night "shutdown-at-night ist not enabled for client $hostname."
 fi
+

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