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

s/seperate/separate/

This commit is contained in:
Lennart Poettering 2011-03-04 03:58:52 +01:00
parent 8c7be95e5a
commit ed1c99fcc1
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -63,7 +63,7 @@ WARNINGS:
systemd will warn you during boot if /usr is on a different systemd will warn you during boot if /usr is on a different
file system than /. While in systemd itself very little will file system than /. While in systemd itself very little will
break if /usr is on a seperate partition many of its break if /usr is on a separate partition many of its
dependencies very likely will break sooner or later in one dependencies very likely will break sooner or later in one
form or another. For example udev rules tend to refer to form or another. For example udev rules tend to refer to
binaries in /usr, binaries that link to libraries in /usr or binaries in /usr, binaries that link to libraries in /usr or

4
TODO
View File

@ -14,8 +14,6 @@ F15:
* hook emergency.target into local-fs.target in some way as OnFailure with isolate * hook emergency.target into local-fs.target in some way as OnFailure with isolate
* s/seperate/separate/
Features: Features:
* introduce "x-systemd-automount" as alternative to the "comment=systemd.automount" mount option * introduce "x-systemd-automount" as alternative to the "comment=systemd.automount" mount option
@ -117,7 +115,7 @@ Features:
* readahead: btrfs/LVM SSD detection * readahead: btrfs/LVM SSD detection
* add seperate man page for [Install] settings * add separate man page for [Install] settings
* only add quotacheck deps to .mount units which mention grpquota/usrquota in the mount flags * only add quotacheck deps to .mount units which mention grpquota/usrquota in the mount flags

10
src/main.c
View File

@ -942,22 +942,22 @@ static void test_mtab(void) {
static void test_usr(void) { static void test_usr(void) {
struct stat a, b; struct stat a, b;
bool seperate = false; bool separate = false;
/* Check that /usr is not a seperate fs */ /* Check that /usr is not a separate fs */
if (lstat("/", &a) >= 0 && lstat("/usr", &b) >= 0) if (lstat("/", &a) >= 0 && lstat("/usr", &b) >= 0)
if (a.st_dev != b.st_dev) if (a.st_dev != b.st_dev)
seperate = true; separate = true;
/* This check won't work usually during boot, since /usr is /* This check won't work usually during boot, since /usr is
* probably not mounted yet, hence let's add a second * probably not mounted yet, hence let's add a second
* check. We just check whether /usr is an empty directory. */ * check. We just check whether /usr is an empty directory. */
if (dir_is_empty("/usr") > 0) if (dir_is_empty("/usr") > 0)
seperate = true; separate = true;
if (!seperate) if (!separate)
return; return;
log_warning("/usr appears to be on a different file system than /. This is not supported anymore. " log_warning("/usr appears to be on a different file system than /. This is not supported anymore. "