[systemd-commits] 2 commits - src/pam-module.c src/systemd-analyze

[Lennart Poettering]

 src/pam-module.c    |    6 +++---
 src/systemd-analyze |    5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 84bccb47a7bbacbfc0a05ff8fa208758bef83957
Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Tue May 10 20:39:32 2011 +0200

    systemd-analyze: print hostname, kernelversion and arch at the top of the plot

diff --git a/src/systemd-analyze b/src/systemd-analyze
index 4f3e478..ae7dcfb 100755
--- a/src/systemd-analyze
+++ b/src/systemd-analyze
@@ -110,7 +110,7 @@ elif sys.argv[1] == 'blame':
                 sys.stdout.write("%6lums %s\n" % ((aet - ixt) / 1000, name))
 
 elif sys.argv[1] == 'plot':
-        import cairo
+        import cairo, os
 
         initrd_time, start_time, finish_time = acquire_start_time()
         data = acquire_time_data()
@@ -160,6 +160,9 @@ elif sys.argv[1] == 'plot':
         context.stroke()
         context.restore()
 
+        banner = "Running on %s (%s %s) %s" % (os.uname()[1], os.uname()[2], os.uname()[3], os.uname()[4])
+        draw_text(context, 0, -15, banner, hcenter = 0, vcenter = 1)
+
         for x in range(0, (finish_time - start_time)/10000, 100):
                 draw_text(context, x, -5, "%lus" % (x/100), vcenter = 0, hcenter = 0)
 

commit 53d5582fa006b0eb528f5dc3f4ba978abd8ac5a3
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon May 16 23:31:06 2011 +0200

    pam: downgrade a few log msgs

diff --git a/src/pam-module.c b/src/pam-module.c
index 93eb929..03864fe 100644
--- a/src/pam-module.c
+++ b/src/pam-module.c
@@ -505,7 +505,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
                 goto finish;
         }
 
-        pam_syslog(handle, LOG_INFO, "Moving new user session for %s into control group %s.", username, buf);
+        pam_syslog(handle, LOG_DEBUG, "Moving new user session for %s into control group %s.", username, buf);
 
         if ((r = create_user_group(handle, SYSTEMD_CGROUP_CONTROLLER, buf, pw, true, true)) != PAM_SUCCESS)
                 goto finish;
@@ -676,13 +676,13 @@ _public_ PAM_EXTERN int pam_sm_close_session(
                 }
 
                 if (kill_session && check_user_lists(handle, pw->pw_uid, kill_only_users, kill_exclude_users))  {
-                        pam_syslog(handle, LOG_INFO, "Killing remaining processes of user session %s of %s.", id, username);
+                        pam_syslog(handle, LOG_DEBUG, "Killing remaining processes of user session %s of %s.", id, username);
 
                         /* Kill processes in session cgroup, and delete it */
                         if ((r = cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, session_path, true)) < 0)
                                 pam_syslog(handle, LOG_ERR, "Failed to kill session cgroup: %s", strerror(-r));
                 } else {
-                        pam_syslog(handle, LOG_INFO, "Moving remaining processes of user session %s of %s into control group %s.", id, username, nosession_path);
+                        pam_syslog(handle, LOG_DEBUG, "Moving remaining processes of user session %s of %s into control group %s.", id, username, nosession_path);
 
                         /* Migrate processes from session to user
                          * cgroup. First, try to create the user group