From 61fbc58c46fd7776ab6cf33d3bb91c0f15136dc2 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Thu, 30 May 2024 14:45:21 +0800 Subject: [PATCH] sleep,home: clean up logs for session freezer a bit --- src/home/homework.c | 7 +++---- src/sleep/sleep.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/home/homework.c b/src/home/homework.c index 428f8329116..b5569046511 100644 --- a/src/home/homework.c +++ b/src/home/homework.c @@ -1875,12 +1875,11 @@ static int user_session_freezer(uid_t uid, bool freeze_now, UnitFreezer **ret) { r = getenv_bool("SYSTEMD_HOME_LOCK_FREEZE_SESSION"); if (r < 0 && r != -ENXIO) - log_warning_errno(r, "Cannot parse value of $SYSTEMD_HOME_LOCK_FREEZE_SESSION, ignoring."); + log_warning_errno(r, "Cannot parse value of $SYSTEMD_HOME_LOCK_FREEZE_SESSION, ignoring: %m"); else if (r == 0) { if (freeze_now) - log_notice("Session remains unfrozen on explicit request ($SYSTEMD_HOME_LOCK_FREEZE_SESSION " - "is set to false). This is not recommended, and might result in unexpected behavior " - "including data loss!"); + log_notice("Session remains unfrozen on explicit request ($SYSTEMD_HOME_LOCK_FREEZE_SESSION=0).\n" + "This is not recommended, and might result in unexpected behavior including data loss!"); *ret = NULL; return 0; diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 1911ef256e8..0402bb07f3d 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -606,10 +606,9 @@ static int run(int argc, char *argv[]) { if (r != 0) (void) unit_freezer_new_freeze(SPECIAL_USER_SLICE, &user_slice_freezer); else - log_notice("User sessions remain unfrozen on explicit request " - "($SYSTEMD_SLEEP_FREEZE_USER_SESSIONS is set to false). This is not recommended, " - "and might result in unexpected behavior, particularly in suspend-then-hibernate " - "operations or setups with encrypted home directories."); + log_notice("User sessions remain unfrozen on explicit request ($SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=0).\n" + "This is not recommended, and might result in unexpected behavior, particularly\n" + "in suspend-then-hibernate operations or setups with encrypted home directories."); switch (arg_operation) { -- 2.47.3