4ae8e483c0
+ 'systemctl list-jobs' got some polishing. '--type=' argument may now be passed more than once. 'systemctl list-sockets' has been added. + systemd gained a new unit 'systemd-static-nodes.service' that generates static device nodes earlier during boot, and can run in conjunction with udev. + systemd-nspawn now places all containers in the new /machine top-level cgroup directory in the name=systemd hierarchy. + bootchart can now store its data in the journal. + journactl can now take multiple --unit= and --user-unit= switches. + The cryptsetup logic now understands the "luks.key=" kernel command line switch. If a configured key file is missing, it will fallback to prompting the user. - Rebase some patches - Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch to properly handle SYSTEMCTL_OPTIONS - Fix regression in the default for tmp auto-deletion (systemd-tmp-safe-defaults.patch, FATE#314974). - Add chromebook lid switch as a power switch to logind rule to enable suspend on lid close - Update to release 202: + 'systemctl list-jobs' got some polishing. '--type=' argument may now be passed more than once. 'systemctl list-sockets' has been added. + systemd gained a new unit 'systemd-static-nodes.service' OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=365
58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
From: Stefan Seyfried <seife+obs@b1-systems.com>
|
|
Date: Thu, 16 Dec 2010 11:30:17 +0100
|
|
Subject: Add bootsplash handling for password dialogs
|
|
|
|
openSUSE uses bootsplash.org, so add a crude handling for setting the
|
|
splash screen to verbose when a password is asked...
|
|
---
|
|
src/shared/ask-password-api.c | 22 ++++++++++++++++++++++
|
|
1 file changed, 22 insertions(+)
|
|
|
|
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
|
|
index 4557155..3750f64 100644
|
|
--- a/src/shared/ask-password-api.c
|
|
+++ b/src/shared/ask-password-api.c
|
|
@@ -63,6 +63,9 @@ int ask_password_tty(
|
|
bool reset_tty = false;
|
|
bool silent_mode = false;
|
|
bool dirty = false;
|
|
+ bool splash_silent = false;
|
|
+ FILE *procsplash = NULL;
|
|
+ char *line = NULL;
|
|
enum {
|
|
POLL_TTY,
|
|
POLL_INOTIFY
|
|
@@ -106,6 +109,19 @@ int ask_password_tty(
|
|
}
|
|
|
|
reset_tty = true;
|
|
+ procsplash = fopen("/proc/splash", "r+");
|
|
+ if (procsplash) {
|
|
+ getline(&line, &p, procsplash);
|
|
+ p = 0; /* reset, just to make sure */
|
|
+ if (line &&
|
|
+ (strstr(line, "on\n") == line + strlen(line) - 3) &&
|
|
+ (strstr(line, "silent") != NULL)) {
|
|
+ splash_silent = true;
|
|
+ rewind(procsplash);
|
|
+ fprintf(procsplash, "verbose\n");
|
|
+ fflush(procsplash);
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
zero(pollfd);
|
|
@@ -239,6 +255,12 @@ finish:
|
|
close_nointr_nofail(ttyfd);
|
|
}
|
|
|
|
+ if (splash_silent) { /* only set if procsplash != NULL */
|
|
+ rewind(procsplash);
|
|
+ fprintf(procsplash, "silent\n");
|
|
+ fclose(procsplash);
|
|
+ }
|
|
+
|
|
return r;
|
|
}
|
|
|