From ed1c99fcc13f279eccf25fc20427eb92867da245 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Mar 2011 03:58:52 +0100 Subject: [PATCH 1/1] s/seperate/separate/ --- README | 2 +- TODO | 4 +--- src/main.c | 10 +++++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/README b/README index aed271598..a1d100c63 100644 --- a/README +++ b/README @@ -63,7 +63,7 @@ WARNINGS: systemd will warn you during boot if /usr is on a different 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 form or another. For example udev rules tend to refer to binaries in /usr, binaries that link to libraries in /usr or diff --git a/TODO b/TODO index ecf9c05fa..14060a511 100644 --- a/TODO +++ b/TODO @@ -14,8 +14,6 @@ F15: * hook emergency.target into local-fs.target in some way as OnFailure with isolate -* s/seperate/separate/ - Features: * introduce "x-systemd-automount" as alternative to the "comment=systemd.automount" mount option @@ -117,7 +115,7 @@ Features: * 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 diff --git a/src/main.c b/src/main.c index 2c02217d8..cf54c7af4 100644 --- a/src/main.c +++ b/src/main.c @@ -942,22 +942,22 @@ static void test_mtab(void) { static void test_usr(void) { 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 (a.st_dev != b.st_dev) - seperate = true; + separate = true; /* This check won't work usually during boot, since /usr is * probably not mounted yet, hence let's add a second * check. We just check whether /usr is an empty directory. */ if (dir_is_empty("/usr") > 0) - seperate = true; + separate = true; - if (!seperate) + if (!separate) return; log_warning("/usr appears to be on a different file system than /. This is not supported anymore. " -- 2.30.2