[systemd-commits] 3 commits - man/daemon.xml src/hostnamed.c src/org.freedesktop.systemd1.policy.in

[Lennart Poettering]

 man/daemon.xml                         |    2 +-
 src/hostnamed.c                        |   11 +++++++++--
 src/org.freedesktop.systemd1.policy.in |    4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 41550d40a271e85f632cfcef8d6e972d8f5b0bf7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Apr 16 02:43:02 2011 +0200

    hostnamed: add reference to SMBIOS specs

diff --git a/src/hostnamed.c b/src/hostnamed.c
index 4ba1d4a..d7e553e 100644
--- a/src/hostnamed.c
+++ b/src/hostnamed.c
@@ -3,7 +3,7 @@
 /***
   This file is part of systemd.
 
-  Copyright 2010 Lennart Poettering
+  Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by
@@ -134,7 +134,13 @@ static const char* fallback_icon_name(void) {
 
         /* We only list the really obvious cases here. The DMI data is
            unreliable enough, so let's not do any additional guesswork
-           on top of that. */
+           on top of that.
+
+           See the SMBIOS Specification 2.7.1 section 7.4.1 for
+           details about the values listed here:
+
+           http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
+         */
 
         switch (t) {
 
@@ -150,6 +156,7 @@ static const char* fallback_icon_name(void) {
                 return "computer-laptop";
 
         case 0x11:
+        case 0x1C:
                 return "computer-server";
         }
 

commit 63415a2d2b13df368cfdd9ad50184f7b77c4af9f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Apr 16 02:42:23 2011 +0200

    man: runlevel 5 is usually more comprehensive, so use it instead of 3 to detect whether a sysv service is enabled

diff --git a/man/daemon.xml b/man/daemon.xml
index ab355cd..bf454fd 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -869,7 +869,7 @@ fi</programlisting>
                         a fragment like the following:</para>
 
                         <programlisting>%triggerun -- foobar &lt; 0.47.11-1
-if /sbin/chkconfig --level 3 foobar ; then
+if /sbin/chkconfig --level 5 foobar ; then
         /bin/systemctl --no-reload enable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
 fi</programlisting>
 

commit 0b4ebf07bcdf9ca684424b72f2e5a19cacea42c5
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Apr 16 02:41:47 2011 +0200

    polkit: follow the usual syntax for polkit actions

diff --git a/src/org.freedesktop.systemd1.policy.in b/src/org.freedesktop.systemd1.policy.in
index b8b3547..52a28d4 100644
--- a/src/org.freedesktop.systemd1.policy.in
+++ b/src/org.freedesktop.systemd1.policy.in
@@ -16,7 +16,7 @@
         <vendor>The systemd Project</vendor>
         <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
 
-        <action id="org.freedesktop.systemd1.ReplyPassword">
+        <action id="org.freedesktop.systemd1.reply-password">
                 <description>Send passphrase back to system</description>
                 <message>Authentication is required to send the entered passphrase back to the system.</message>
                 <defaults>
@@ -27,7 +27,7 @@
                 <annotate key="org.freedesktop.policykit.exec.path">@rootlibexecdir@/systemd-reply-password</annotate>
         </action>
 
-        <action id="org.freedesktop.systemd1.BusAccess">
+        <action id="org.freedesktop.systemd1.bus-access">
                 <description>Privileged system and service manager access</description>
                 <message>Authentication is required to access the system and service manager.</message>
                 <defaults>