From b9a2a36b519ccd79c4198e7dda4e657d597a14ad Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 10 Apr 2011 01:42:48 +0200 Subject: [PATCH] local-fs: invoke emergency.service mounting at boot fails --- TODO | 30 +++++++++++++++--------------- units/local-fs.target | 2 ++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/TODO b/TODO index ce08b8ac8..04c3832cb 100644 --- a/TODO +++ b/TODO @@ -21,6 +21,8 @@ F15: * be nice to ingo +* get writev() /dev/kmsg support into the F15 kernel + Features: * fix alsa mixer restore to not print error when no config is stored @@ -31,7 +33,6 @@ Features: * show enablement status in systemctl status * write blog stories about: - - chroot, nspawn and friends - the blame game: systemd-analyze - enabling dbus services - status update @@ -46,12 +47,11 @@ Features: * take BSD file lock on tty devices when using them? -* tmpfiles should allow two identical lines - https://bugzilla.redhat.com/show_bug.cgi?id=690253 - * avoid any flag files, or readahead files in /, we need to support r/o / or / on tmpfs like Android setups. +* move readahead files into /var, look for them with .path units + * teach dbus to activate all services it finds in /etc/systemd/services/org-*.service * get process transport into dbus for systemctl -P/-H @@ -63,7 +63,16 @@ Features: * Find a way to replace /var/run, /var/lock directories with symlinks during an RPM package upgrade (filesystem.rpm or systemd.rpm). - We soon want to get rid of var-run.mount var-lock.mount units. + We soon want to get rid of var-run.mount var-lock.mount units: + + if mountpoint /run ; then + umount /var/run || : + else + mount --move /var/run /run || mount --bind /var/run /run + fi + mv /var/run /var/.run.save + ln -s /run /var/run + echo "R /var/.run.save" > /etc/tmpfiles.d/remove-run-save.conf * when key file cannot be found, read it from kbd in cryptsetup @@ -73,9 +82,6 @@ Features: * reuse mkdtemp namespace dirs in /tmp? -* don't strip facility from kmsg log messages as soon as that is possible: - http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=9d90c8d9cde929cbc575098e825d7c29d9f45054 - * recreate systemd's D-Bus private socket file on SIGUSR2 * be more specific what failed: @@ -110,8 +116,6 @@ Features: * Maybe implement "systemctl mask" and "systemctl unmask", but not document it? When doing that add switch to make this temporary by placing mask links in /dev. - Consider moving the actual fs operations into systemd behind a D-Bus - interface, to make namespaces/containers/remote connections work properly. * detect LXC environment @@ -126,7 +130,7 @@ Features: * perhaps add "systemctl reenable" as combination of "systemctl disable" and "systemctl enable" * need a way to apply mount options of api vfs from systemd unit files - (or some other modern source?) instead of fstab + (or some other modern source?) instead of fstab? * maybe introduce ExecRestartPre= @@ -134,8 +138,6 @@ Features: * Patch systemd-fsck to use -C and pass console fd to it -* support remote/ssh systemctl/systemadm, and local privileged access → dbus patches need to be merged - * configurable jitter for timer events * Support ProcessNeededForShutdown=true to allow stuff like mdmon @@ -184,8 +186,6 @@ Features: * systemctl list-jobs - show dependencies -* accountsservice is borked - * auditd service files * add systemctl switch to dump transaction without executing it diff --git a/units/local-fs.target b/units/local-fs.target index 52d0e6810..79fd9b8c1 100644 --- a/units/local-fs.target +++ b/units/local-fs.target @@ -9,3 +9,5 @@ [Unit] Description=Local File Systems +OnFailure=emergency.service +OnFailureIsolate=yes -- 2.30.2