← Back to branch summary

~ubuntu-branches/ubuntu/saucy/kdebase-workspace/saucy

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_121_kdm_halt_cmd.diff

  • Committer: Bazaar Package Importer
  • Author(s): Romain Perier
  • Date: 2011-04-09 22:44:36 UTC
  • Revision ID: james.westby@ubuntu.com-20110409224436-uj2qz5oxdj3iw8i7
Tags: 4:4.6.2a-0ubuntu4
Add kubuntu_121_kdm_halt_cmd.diff imported from upstream
upstream, bugs.kde.org/270228, LP:755570

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_121_kdm_halt_cmd.diff
 
1
Author: Oswald Buddenhagen <ossi@kde.org>
 
2
KDE:270228
 
3
LP:755570
 
4
 
 
5
linux shutdown wants -P instead of -p (also -P requires -h)
 
6
 
 
7
Index: kdebase-workspace-4.6.2a/kdm/config.def
 
8
===================================================================
 
9
--- kdebase-workspace-4.6.2a.orig/kdm/config.def        2011-04-09 17:27:28.000000000 -0400
 
10
+++ kdebase-workspace-4.6.2a/kdm/config.def     2011-04-09 17:32:38.101048748 -0400
 
11
@@ -37,7 +37,10 @@
 
12
 #ifdef _AIX
 
13
 # define HALT_CMD      "/usr/sbin/shutdown -h now"
 
14
 # define REBOOT_CMD    "/usr/sbin/shutdown -r now"
 
15
-#elif defined(BSD) || defined(__linux__)
 
16
+#elif defined(__linux__)
 
17
+# define HALT_CMD     "/sbin/shutdown -h -P now"
 
18
+# define REBOOT_CMD   "/sbin/shutdown -r now"
 
19
+#elif defined(BSD)
 
20
 # define HALT_CMD      "/sbin/shutdown -p now"
 
21
 # define REBOOT_CMD    "/sbin/shutdown -r now"
 
22
 #elif defined(__SVR4)