[systemd-commits] 5 commits - README src/99-systemd.rules src/manager.c src/util.c TODO units/rescue.service.m4
Lennart Poettering
lennart at kemper.freedesktop.org
Wed Feb 16 10:34:49 PST 2011
README | 24 +++++++++++++++++++++---
TODO | 8 ++++++--
src/99-systemd.rules | 4 ++--
src/manager.c | 8 +++++++-
src/util.c | 2 +-
units/rescue.service.m4 | 2 +-
6 files changed, 38 insertions(+), 10 deletions(-)
New commits:
commit 70db8e3a0b68cf2eab500592ba16b2acf0737331
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Feb 16 19:34:24 2011 +0100
rescue: make 'systemctl default' fail if there is already something running when the shell exited
diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index 6e03c20..ba29f6e 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -23,7 +23,7 @@ m4_ifdef(`TARGET_FEDORA',
`EnvironmentFile=/etc/sysconfig/init
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
`ExecStart=-/sbin/sulogin')
-ExecStopPost=/bin/systemctl default
+ExecStopPost=-/bin/systemctl --fail default
StandardInput=tty-force
KillMode=process-group
commit da71f23cda946a98885cb0833d0022ff7439cef3
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Feb 16 19:33:37 2011 +0100
util: seperate welcome line from other output by empty lines
diff --git a/src/util.c b/src/util.c
index b0a01fd..16e4ab2 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3076,7 +3076,7 @@ void status_welcome(void) {
if (!ansi_color && !const_color)
const_color = "1";
- status_printf("Welcome to \x1B[%sm%s\x1B[0m!\n",
+ status_printf("\nWelcome to \x1B[%sm%s\x1B[0m!\n\n",
const_color ? const_color : ansi_color,
const_pretty ? const_pretty : pretty_name);
commit 3aea3b35979b377b7673132b601aab8a33e20cdc
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Feb 16 19:33:17 2011 +0100
manager: don't consider transaction jobs conflicting with queued jobs redundant
diff --git a/TODO b/TODO
index 1c0811e..65a102c 100644
--- a/TODO
+++ b/TODO
@@ -7,13 +7,17 @@ Bugs:
* systemctl default is started when we type "reboot" at rescue mode prompt
-* mkswap/mke2fs aus cryptsetup unit muss vor dem mounten ausgeführt werden.
-
* exclude java hsp files by default
https://bugzilla.redhat.com/show_bug.cgi?id=527425
Features:
+* add --ignore-deps to systemctl
+
+* add --failed to systemctl
+
+* increase password timeout
+
* look up crypto partition mount points via fstab to show to the user when prompting for a password
* Maybe store in unit files whether a service should be enabled by default on package installation
diff --git a/src/manager.c b/src/manager.c
index 7d0b351..b2aa8ee 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -913,7 +913,8 @@ static void transaction_drop_redundant(Manager *m) {
LIST_FOREACH(transaction, k, j) {
if (!job_is_anchor(k) &&
- (j->installed || job_type_is_redundant(k->type, unit_active_state(k->unit))))
+ (k->installed || job_type_is_redundant(k->type, unit_active_state(k->unit))) &&
+ (!k->unit->meta.job || !job_type_is_conflicting(k->type, k->unit->meta.job->type)))
continue;
changes_something = true;
@@ -1423,6 +1424,11 @@ static int transaction_add_job_and_dependencies(
assert(type < _JOB_TYPE_MAX);
assert(unit);
+ /* log_debug("Pulling in %s/%s from %s/%s", */
+ /* unit->meta.id, job_type_to_string(type), */
+ /* by ? by->unit->meta.id : "NA", */
+ /* by ? job_type_to_string(by->type) : "NA"); */
+
if (unit->meta.load_state != UNIT_LOADED &&
unit->meta.load_state != UNIT_ERROR &&
unit->meta.load_state != UNIT_MASKED) {
commit 3ede835a0486f2ecc025dede0b33e9a1edc06d30
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Feb 16 19:09:11 2011 +0100
README: update requirements
diff --git a/README b/README
index e38c19b..0e5532a 100644
--- a/README
+++ b/README
@@ -30,9 +30,27 @@ REQUIREMENTS:
Linux kernel >= 2.6.30 (with autofs4, devtmpfs, cgroups)
libudev >= 163
dbus >= 1.4.0
+ libcap
+ gtk+ >= 2.20 (optional)
+ PAM >= 1.1.2 (optional)
+ libcryptsetup (optional)
+ libaudit (optional)
+ libselinux (optional)
+ tcpwrappers (optional)
+ libnotify (optional)
+
+ When you build from git you need the following additional dependencies:
+
vala >= 0.10
+ docbook-xsl
+ xsltproc
+ automake
+ autoconf
+ libtool
+
+ During runtime you need the following dependencies:
+
util-linux > v2.18 (requires fsck -l, agetty -s)
sulogin (from sysvinit-tools)
- gtk+ >= 2.20
- libcap
- PAM >= 1.1.2 (optional)
+ plymouth (optional)
+ dracut (optional)
commit 444d9432358c7ef8d1a85d330089b0027e740612
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Feb 16 12:57:00 2011 +0100
udev: ignore block devices which no known contents, to avoid trying of mounts/swapons when devices aren't set up full yet
diff --git a/src/99-systemd.rules b/src/99-systemd.rules
index 5cdb9e0..0ac6d00 100644
--- a/src/99-systemd.rules
+++ b/src/99-systemd.rules
@@ -7,12 +7,12 @@
ACTION!="add|change", GOTO="systemd_end"
-ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
-
KERNEL=="tty[0-9]|tty1[0-2]", TAG+="systemd"
KERNEL=="ttyS*", TAG+="systemd"
SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd"
+SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
+SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
# We need a hardware independent way to identify network devices. We
# use the /sys/subsystem path for this. Current vanilla kernels don't
More information about the systemd-commits
mailing list