[systemd-commits] 3 commits - src/cryptsetup.c src/job.c src/manager.c units/emergency.service units/rescue.service.m4
Lennart Poettering
lennart at kemper.freedesktop.org
Wed Feb 23 09:47:09 PST 2011
src/cryptsetup.c | 59 +++++++++++++++++++++++++++++++++++++++++++++---
src/job.c | 2 +
src/manager.c | 1
units/emergency.service | 4 +--
units/rescue.service.m4 | 2 -
5 files changed, 61 insertions(+), 7 deletions(-)
New commits:
commit 23e1e0c4a3bc93fb841ac9575953ed5d0ef5282d
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Feb 23 18:46:57 2011 +0100
job: start job timer when we begin running the job, not already when we add it to the queue of jobs
diff --git a/src/job.c b/src/job.c
index 4700aab..ec57144 100644
--- a/src/job.c
+++ b/src/job.c
@@ -376,6 +376,7 @@ int job_run_and_invalidate(Job *j) {
j->state = JOB_RUNNING;
job_add_to_dbus_queue(j);
+ job_start_timer(j);
/* While we execute this operation the job might go away (for
* example: because it is replaced by a new, conflicting
@@ -394,6 +395,7 @@ int job_run_and_invalidate(Job *j) {
* wait */
if (r == -EBADR)
r = 0;
+
break;
case JOB_VERIFY_ACTIVE: {
diff --git a/src/manager.c b/src/manager.c
index f266aaa..6759bba 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -1216,7 +1216,6 @@ static int transaction_apply(Manager *m) {
job_add_to_run_queue(j);
job_add_to_dbus_queue(j);
- job_start_timer(j);
log_debug("Installed new job %s/%s as %u", j->unit->meta.id, job_type_to_string(j->type), (unsigned) j->id);
}
commit b61e476f510999c687d3c76193a98aa5cd1f9a73
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Feb 23 18:46:27 2011 +0100
cryptsetup: try to show the mount point for a crypto disk if we can
diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index f72a14a..506ce9b 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -22,6 +22,7 @@
#include <string.h>
#include <errno.h>
#include <sys/mman.h>
+#include <mntent.h>
#include <libcryptsetup.h>
#include <libudev.h>
@@ -164,7 +165,8 @@ static char *disk_description(const char *path) {
goto finish;
if ((model = udev_device_get_property_value(device, "ID_MODEL_FROM_DATABASE")) ||
- (model = udev_device_get_property_value(device, "ID_MODEL")))
+ (model = udev_device_get_property_value(device, "ID_MODEL")) ||
+ (model = udev_device_get_property_value(device, "DM_NAME")))
description = strdup(model);
finish:
@@ -177,12 +179,40 @@ finish:
return description;
}
+static char *disk_mount_point(const char *label) {
+ char *mp = NULL, *device = NULL;
+ FILE *f = NULL;
+ struct mntent *m;
+
+ /* Yeah, we don't support native systemd unit files here for now */
+
+ if (asprintf(&device, "/dev/mapper/%s", label) < 0)
+ goto finish;
+
+ if (!(f = setmntent("/etc/fstab", "r")))
+ goto finish;
+
+ while ((m = getmntent(f)))
+ if (path_equal(m->mnt_fsname, device)) {
+ mp = strdup(m->mnt_dir);
+ break;
+ }
+
+finish:
+ if (f)
+ endmntent(f);
+
+ free(device);
+
+ return mp;
+}
+
int main(int argc, char *argv[]) {
int r = EXIT_FAILURE;
struct crypt_device *cd = NULL;
char **passwords = NULL, *truncated_cipher = NULL;
const char *cipher = NULL, *cipher_mode = NULL, *hash = NULL, *name = NULL;
- char *description = NULL;
+ char *description = NULL, *name_buffer = NULL, *mount_point = NULL;
if (argc < 3) {
log_error("This program requires at least two arguments.");
@@ -201,6 +231,8 @@ int main(int argc, char *argv[]) {
usec_t until;
crypt_status_info status;
+ /* Arguments: systemd-cryptsetup attach VOLUME SOURCE-DEVICE [PASSWORD] [OPTIONS] */
+
if (argc < 4) {
log_error("attach requires at least two arguments.");
goto finish;
@@ -224,7 +256,24 @@ int main(int argc, char *argv[]) {
mlockall(MCL_FUTURE);
description = disk_description(argv[3]);
- name = description ? description : argv[2];
+ mount_point = disk_mount_point(argv[2]);
+
+ if (description && streq(argv[2], description)) {
+ /* If the description string is simply the
+ * volume name, then let's not show this
+ * twice */
+ free(description);
+ description = NULL;
+ }
+
+ if (mount_point && description)
+ asprintf(&name_buffer, "%s (%s) on %s", description, argv[2], mount_point);
+ else if (mount_point)
+ asprintf(&name_buffer, "%s on %s", argv[2], mount_point);
+ else if (description)
+ asprintf(&name_buffer, "%s (%s)", description, argv[2]);
+
+ name = name_buffer ? name_buffer : argv[2];
if ((k = crypt_init(&cd, argv[3]))) {
log_error("crypt_init() failed: %s", strerror(-k));
@@ -318,6 +367,8 @@ int main(int argc, char *argv[]) {
strv_free(passwords2);
}
+ strv_uniq(passwords);
+
STRV_FOREACH(p, passwords) {
char *c;
@@ -442,6 +493,8 @@ finish:
strv_free(passwords);
free(description);
+ free(mount_point);
+ free(name_buffer);
return r;
}
commit be12dd0cb89214b3b0dbffe70dd47d1db2c5d3c2
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Feb 23 18:42:08 2011 +0100
rescue: terminate plymouth entirely when going into rescue mode
diff --git a/units/emergency.service b/units/emergency.service
index aa3d985..cb28a78 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -16,10 +16,10 @@ Before=shutdown.target
[Service]
Environment=HOME=/root
WorkingDirectory=/root
-ExecStartPre=-/bin/plymouth --hide-splash
+ExecStartPre=-/bin/plymouth quit
ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to activate default mode.'
ExecStart=-/sbin/sulogin
-ExecStopPost=/bin/systemctl default
+ExecStopPost=/bin/systemctl --fail default
StandardInput=tty-force
KillMode=process-group
diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index ba29f6e..2a0d328 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -17,7 +17,7 @@ Before=shutdown.target
[Service]
Environment=HOME=/root
WorkingDirectory=/root
-ExecStartPre=-/bin/plymouth --hide-splash
+ExecStartPre=-/bin/plymouth quit
ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to activate default mode.'
m4_ifdef(`TARGET_FEDORA',
`EnvironmentFile=/etc/sysconfig/init
More information about the systemd-commits
mailing list