[systemd-commits] 2 commits - man/systemd-ask-password.xml man/systemd.mount.xml man/systemd.service.xml man/systemd.socket.xml man/systemd.swap.xml src/def.h src/systemctl.c TODO

[Lennart Poettering]

 TODO                         |    8 +++++++-
 man/systemd-ask-password.xml |    2 +-
 man/systemd.mount.xml        |    2 +-
 man/systemd.service.xml      |    2 +-
 man/systemd.socket.xml       |    2 +-
 man/systemd.swap.xml         |    2 +-
 src/def.h                    |    2 +-
 src/systemctl.c              |    3 +--
 8 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit e190aa0be1fa6cb1f56e036598ba90d58d16d9e8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Apr 27 22:30:28 2011 +0200

    systemctl: whitelist /etc instead of blacklisting /lib to figure out if [Install] is needed

diff --git a/src/systemctl.c b/src/systemctl.c
index d1d73bf..10c6319 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -4157,8 +4157,7 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo
         if (streq(verb, "is-enabled") &&
             strv_isempty(i->aliases) &&
             strv_isempty(i->wanted_by) &&
-            (path_startswith(filename, "/lib") ||
-             path_startswith(filename, "/usr")))
+            !path_startswith(filename, "/etc"))
                 return 1;
 
         i->path = filename;

commit ecb963cc40a0270a357c2640d368b3116e0f56b6
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Apr 27 22:29:29 2011 +0200

    def: lower default timeout to 90s
    
    Almost everybody found 3min too long, so lower it again

diff --git a/TODO b/TODO
index 8870544..a7a4fc0 100644
--- a/TODO
+++ b/TODO
@@ -30,6 +30,10 @@ F15 External:
 
 Features:
 
+* introduce dbus calls for enabling/disabling a service
+
+* support notifications for services being enabled/disabled
+
 * Maybe merge nss-myhostname into systemd?
 
 * ensure we strip empty directories from search path
@@ -38,7 +42,9 @@ Features:
 
 * GC unreferenced jobs (such as .device jobs)
 
-* support wildcard expansion in ListeStream= and friends
+* support wildcard expansion in ListenStream= and friends
+
+* support wildcard expansion in EnvironmentFile= and friends
 
 * avoid DefaultStandardOutput=syslog to have any effect on StandardInput=socket services
 
diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 50aec34..6d14223 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -129,7 +129,7 @@
 
                                 <listitem><para>Specify the query
                                 timeout in seconds. Defaults to
-                                3min.</para></listitem>
+                                90s.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 40d236b..d397c89 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -212,7 +212,7 @@
                                 a time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 logic. Defaults to
-                                3min.</para></listitem>
+                                90s.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 335169a..4f11020 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -448,7 +448,7 @@
                                 time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 logic. Defaults to
-                                3min.</para></listitem>
+                                90s.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index d651c14..3ea3154 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -541,7 +541,7 @@
                                 a time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 logic. Defaults to
-                                3min.</para></listitem>
+                                90s.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 3277ddb..954e944 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -166,7 +166,7 @@
                                 a time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 logic. Defaults to
-                                3min.</para></listitem>
+                                90s.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/src/def.h b/src/def.h
index 958d1eb..20aaa7c 100644
--- a/src/def.h
+++ b/src/def.h
@@ -24,7 +24,7 @@
 
 #include "util.h"
 
-#define DEFAULT_TIMEOUT_USEC (3*USEC_PER_MINUTE)
+#define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC)
 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
 
 #define DEFAULT_EXIT_USEC (5*USEC_PER_MINUTE)