picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fstab-generator: Generate explicit dependencies on systemd-fsck@.service instead of using FsckPassNo 

[tomegun:
  * order all fsck instances after fsck-root
  * check for OOM
  * added notes in the manpages]
This commit is contained in:
Thomas Bächler 2013-09-30 01:34:44 +02:00 committed by Tom Gundersen
parent 7f5806d709
commit 64e70e4b86
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/systemd-fsck@.service.xml
View File

@ -62,7 +62,8 @@
system
check. <filename>systemd-fsck-root.service</filename> is
responsible for file system checks on the root
file system.</para>
file system. The root file system check is performed
before the other file systems.</para>
<para><filename>systemd-fsck</filename> will
forward file system checking progress to the

5
man/systemd-fstab-generator.xml
View File

@ -61,6 +61,11 @@
reloaded. This will instantiate mount and swap units
as necessary.</para>
<para>The <term><varname>passno</varname></term> field
is treated like a simlpe boolean, and the ordering information
is discarded. However, the root filesystem is checked
before all the other filesystems.</para>
<para>See
<citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
and

21
src/fstab-generator/fstab-generator.c
View File

@ -209,17 +209,30 @@ static int add_mount(
"Before=%s\n",
post);
if (passno > 0) {
_cleanup_free_ char *fsck = NULL;
fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
if (!fsck)
return log_oom();
fprintf(f,
"Requires=%s\n"
"After=%s\n",
fsck,
fsck);
}
fprintf(f,
"\n"
"[Mount]\n"
"What=%s\n"
"Where=%s\n"
"Type=%s\n"
"FsckPassNo=%i\n",
"Type=%s\n",
what,
where,
type,
passno);
type);
if (!isempty(opts) &&
!streq(opts, "defaults"))

2
units/systemd-fsck@.service.in
View File

@ -10,7 +10,7 @@ Description=File System Check on %f
Documentation=man:systemd-fsck@.service(8)
DefaultDependencies=no
BindsTo=%i.device
After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device
After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service
Before=shutdown.target
[Service]