sa.sa.sa_family = AF_UNIX;
strncpy(sa.un.sun_path+1, "/org/freedesktop/plymouthd", sizeof(sa.un.sun_path)-1);
if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)) < 0) {
- log_error("FAILED TO CONNECT: %m");
+ log_error("Failed to connect to Plymouth: %m");
r = -errno;
goto finish;
}
struct sockaddr sa;
struct sockaddr_un un;
} sa;
- size_t packet_length;
+ size_t packet_length = 0;
assert(arg_action == ACTION_QUERY ||
arg_action == ACTION_WATCH);
}
if (arg_plymouth) {
- char **passwords;
+ char **passwords = NULL;
if ((r = ask_password_plymouth(message, not_after, filename, accept_cached, &passwords)) >= 0) {
char **p;
packet_length = strlen(packet);
}
+ if (r == -ETIME || r == -ENOENT) {
+ /* If the query went away, that's OK */
+ r = 0;
+ goto finish;
+ }
+
if (r < 0) {
+
log_error("Failed to query password: %s", strerror(-r));
goto finish;
}
int q;
char *wall;
+ /* We only support /dev on tmpfs, hence we can rely on
+ * d_type to be reliable */
+
if (de->d_type != DT_REG)
continue;
" -h --help Show this help\n"
" --list Show pending password requests\n"
" --query Process pending password requests\n"
- " --watch Continously process password requests\n"
- " --wall Continously forward password requests to wall\n"
+ " --watch Continuously process password requests\n"
+ " --wall Continuously forward password requests to wall\n"
" --plymouth Ask question with Plymouth instead of on TTY\n"
" --console Ask question on /dev/console instead of current TTY\n",
program_invocation_short_name);