Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
steam
systemd
Commits
ed1c99fc
Commit
ed1c99fc
authored
Mar 04, 2011
by
Lennart Poettering
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
s/seperate/separate/
parent
8c7be95e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
README
README
+1
-1
TODO
TODO
+1
-3
src/main.c
src/main.c
+5
-5
No files found.
README
View file @
ed1c99fc
...
...
@@ -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 sep
e
rate partition many of its
break if /usr is on a sep
a
rate 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
...
...
TODO
View file @
ed1c99fc
...
...
@@ -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 sep
e
rate man page for [Install] settings
* add sep
a
rate man page for [Install] settings
* only add quotacheck deps to .mount units which mention grpquota/usrquota in the mount flags
...
...
src/main.c
View file @
ed1c99fc
...
...
@@ -942,22 +942,22 @@ static void test_mtab(void) {
static
void
test_usr
(
void
)
{
struct
stat
a
,
b
;
bool
sep
e
rate
=
false
;
bool
sep
a
rate
=
false
;
/* Check that /usr is not a sep
e
rate fs */
/* Check that /usr is not a sep
a
rate fs */
if
(
lstat
(
"/"
,
&
a
)
>=
0
&&
lstat
(
"/usr"
,
&
b
)
>=
0
)
if
(
a
.
st_dev
!=
b
.
st_dev
)
sep
e
rate
=
true
;
sep
a
rate
=
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
)
sep
e
rate
=
true
;
sep
a
rate
=
true
;
if
(
!
sep
e
rate
)
if
(
!
sep
a
rate
)
return
;
log_warning
(
"/usr appears to be on a different file system than /. This is not supported anymore. "
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment