[systemd-commits] 2 commits - man/binfmt.d.xml man/modules-load.d.xml man/systemctl.xml src/shared

[Michal Schmidt]

 man/binfmt.d.xml       |    6 +++---
 man/modules-load.d.xml |    6 +++---
 man/systemctl.xml      |    2 +-
 src/shared/install.c   |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 7cf55dd0700d2b93f18a1bdc50b3c864d0af2246
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue May 15 08:16:30 2012 +0200

    man: overwrite vs. override
    
    'overwrite' conveys the idea of the old text being destroyed.
    'override' does not. It is more similar to 'overrule'.

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index e997bcf..1cc75da 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -75,14 +75,14 @@
 
                 <para>Each configuration file is named in the style of
                 <filename>&lt;program&gt;.conf</filename>.
-                Files in <filename>/etc/</filename> overwrite
+                Files in <filename>/etc/</filename> override
                 files with the same name in <filename>/usr/lib/</filename>.
-                Files in <filename>/run</filename> overwrite files with
+                Files in <filename>/run</filename> override files with
                 the same name in <filename>/etc/</filename> and
                 <filename>/usr/lib/</filename>. Packages should install their
                 configuration files in <filename>/usr/lib/</filename>, files
                 in <filename>/etc/</filename> are reserved for the local
-                administration, which possibly decides to overwrite the
+                administration, which possibly decides to override the
                 configurations installed from packages. All files are sorted
                 by filename in alphabetical order, regardless in which of the
                 directories they reside, to ensure that a specific
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 91d230c..01013e0 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -76,14 +76,14 @@
 
                 <para>Each configuration file is named in the style of
                 <filename>&lt;program&gt;.conf</filename>.
-                Files in <filename>/etc/</filename> overwrite
+                Files in <filename>/etc/</filename> override
                 files with the same name in <filename>/usr/lib/</filename>.
-                Files in <filename>/run</filename> overwrite files with
+                Files in <filename>/run</filename> override files with
                 the same name in <filename>/etc/</filename> and
                 <filename>/usr/lib/</filename>. Packages should install their
                 configuration files in <filename>/usr/lib/</filename>, files
                 in <filename>/etc/</filename> are reserved for the local
-                administration, which possibly decides to overwrite the
+                administration, which possibly decides to override the
                 configurations installed from packages. All files are sorted
                 by filename in alphabetical order, regardless in which of the
                 directories they reside, to ensure that a specific
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 29481e7..b5ae48c 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -343,7 +343,7 @@
                                 <term><option>-f</option></term>
 
                                 <listitem><para>When used with
-                                <command>enable</command>, override any
+                                <command>enable</command>, overwrite any
                                 existing conflicting
                                 symlinks.</para></listitem>
 

commit ba49b4a1a2497b9d3372d45ee1e43aec0c0d66f1
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue May 15 08:12:49 2012 +0200

    install: fix inverted meaning of '--force' in systemctl enable

diff --git a/src/shared/install.c b/src/shared/install.c
index fc1bf96..560bb24 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1162,7 +1162,7 @@ static int create_symlink(
 
         free(dest);
 
-        if (force)
+        if (!force)
                 return -EEXIST;
 
         unlink(new_path);