summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/CONTRIBUTING.md1
-rw-r--r--HACKING68
-rw-r--r--README.md2
-rw-r--r--po/it.po45
-rw-r--r--src/core/dbus-execute.c6
-rw-r--r--src/core/namespace.c16
6 files changed, 99 insertions, 39 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 4857e94733..8a6db1f629 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -15,6 +15,7 @@ Following these guidelines makes it easier for us to process your issue, and ens
* Make sure to post PRs only relative to a very recent git master.
* Follow our [Coding Style](https://raw.githubusercontent.com/systemd/systemd/master/CODING_STYLE) when contributing code. This is a requirement for all code we merge.
+* Please make sure to test your change before submitting the PR. See [HACKING](https://raw.githubusercontent.com/systemd/systemd/master/HACKING) for details how to do this.
* Make sure to run "make check" locally, before posting your PR. We use a CI system, meaning we don't even look at your PR, if the build and tests don't pass.
* If you need to update the code in an existing PR, force-push into the same branch, overriding old commits with new versions.
* After you have pushed a new version, try to remove the `reviewed/needs-rework` label. Also add a comment about the new version (no notification is sent just for the commits, so it's easy to miss the update without an explicit comment).
diff --git a/HACKING b/HACKING
new file mode 100644
index 0000000000..3ee1c7e340
--- /dev/null
+++ b/HACKING
@@ -0,0 +1,68 @@
+HACKING ON SYSTEMD
+
+We welcome all contributions to systemd. If you notice a bug or a missing
+feature, please feel invited to fix it, and submit your work as a github Pull
+Request (PR):
+
+ https://github.com/systemd/systemd/pull/new
+
+Please make sure to follow our Coding Style when submitting patches. See
+CODING_STYLE for details. Also have a look at our Contribution Guidelines:
+
+ https://github.com/systemd/systemd/blob/master/.github/CONTRIBUTING.md
+
+Please always test your work before submitting a PR. For many of the components
+of systemd testing is straight-forward as you can simply compile systemd and
+run the relevant tool from the build directory.
+
+For some components (most importantly, systemd/PID1 itself) this is not
+possible, however. In order to simplify testing for cases like this we provide
+a set of "mkosi" build files directly in the source tree. "mkosi" is a tool for
+building clean OS images from an upstream distribution in combination with a
+fresh build of the project in the local working directory. To make use of this,
+please acquire "mkosi" from https://github.com/systemd/mkosi first, unless your
+distribution has packaged it already and you can get it from there. After the
+tool is installed it is sufficient to type "mkosi" in the systemd project
+directory to generate a disk image "image.raw" you can boot either in
+systemd-nspawn or in an UEFI-capable VM:
+
+ # systemd-nspawn -bi image.raw
+
+or:
+
+ # qemu-kvm -m 512 -smp 2 -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -hda image.raw
+
+Every time you rerun the "mkosi" command a fresh image is built, incorporating
+all current changes you made to the project tree.
+
+Alternatively, you may install the systemd version from your git check-out
+directly on top of your host system's directory tree. This mostly works fine,
+but of course you should know what you are doing as you might make your system
+unbootable in case of a bug in your changes. Also, you might step into your
+package manager's territory with this. Be careful!
+
+And never forget: most distributions provide very simple and convenient ways to
+install all development packages necessary to build systemd. For example, on
+Fedora the following command line should be sufficient to install all of
+systemd's build dependencies:
+
+ # dnf builddep systemd
+
+Putting this all together, here's a series of commands for preparing a patch
+for systemd (this example is for Fedora):
+
+ $ git clone https://github.com/systemd/systemd.git
+ $ cd systemd
+ $ vim src/core/main.c # or wherever you'd like to make your changes
+ $ dnf builddep systemd # install build dependencies
+ $ ./autogen.sh c # configure the source tree
+ $ make -j `nproc` # build it locally, see if everything compiles fine
+ $ sudo mkosi # build a test image
+ $ sudo systemd-nspawn -bi image.raw # boot up the test image
+ $ git add -p # interactively put together your patch
+ $ git commit # commit it
+ $ ...
+
+And after that, please submit your branch as PR to systemd via github.
+
+Happy hacking!
diff --git a/README.md b/README.md
index dc628e8003..35ab9663ca 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@ Information about build requirements are provided in the [README file](../master
Consult our [NEWS file](../master/NEWS) for information about what's new in the most recent systemd versions.
+Please see the [HACKING file](../master/HACKING) for information how to hack on systemd and test your modifications.
+
Please see our [Contribution Guidelines](../master/.github/CONTRIBUTING.md) for more information about filing GitHub Issues and posting GitHub Pull Requests.
When preparing patches for systemd, please follow our [Coding Style Guidelines](../master/CODING_STYLE).
diff --git a/po/it.po b/po/it.po
index 24504da42b..7afa5c3b9c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,14 +1,14 @@
# Italian translations for systemd package
# Traduzione in italiano per il pacchetto systemd
# This file is distributed under the same license as the systemd package.
-# Daniele Medri <dmedri@gmail.com>, 2013-2015.
+# Daniele Medri <dmedri@gmail.com>, 2013-2016.
#
msgid ""
msgstr ""
"Project-Id-Version: systemd\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-07 04:45+0200\n"
-"PO-Revision-Date: 2016-05-07 04:55+0200\n"
+"Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
+"POT-Creation-Date: 2016-07-15 13:11+0200\n"
+"PO-Revision-Date: 2016-07-20 10:54+0200\n"
"Last-Translator: Daniele Medri <dmedri@gmail.com>\n"
"Language-Team: Italian\n"
"Language: it\n"
@@ -63,7 +63,7 @@ msgstr ""
#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:9
msgid "Reload the systemd state"
-msgstr "Riavvia lo stato di systemd"
+msgstr "Ricarica lo stato di systemd"
#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:10
msgid "Authentication is required to reload the systemd state."
@@ -292,7 +292,7 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:27
msgid "Power off the system"
-msgstr "Spegni il sistema (power off)"
+msgstr "Spegni il sistema"
#: ../src/login/org.freedesktop.login1.policy.in.h:28
msgid "Authentication is required for powering off the system."
@@ -300,7 +300,7 @@ msgstr "Autenticazione richiesta per spegnere il sistema."
#: ../src/login/org.freedesktop.login1.policy.in.h:29
msgid "Power off the system while other users are logged in"
-msgstr "Spegni il sistema (power off) mentre altri utenti sono connessi"
+msgstr "Spegni il sistema mentre altri utenti sono connessi"
#: ../src/login/org.freedesktop.login1.policy.in.h:30
msgid ""
@@ -312,9 +312,7 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:31
msgid "Power off the system while an application asked to inhibit it"
-msgstr ""
-"Spegni il sistema (power off) mentre un'applicazione chiede di inibirne "
-"l'azione"
+msgstr "Spegni il sistema mentre un'applicazione chiede di inibirne l'azione"
#: ../src/login/org.freedesktop.login1.policy.in.h:32
msgid ""
@@ -326,7 +324,7 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:33
msgid "Reboot the system"
-msgstr "Riavvia il sistema (reboot)"
+msgstr "Riavvia il sistema"
#: ../src/login/org.freedesktop.login1.policy.in.h:34
msgid "Authentication is required for rebooting the system."
@@ -334,7 +332,7 @@ msgstr "Autenticazione richiesta per riavviare il sistema."
#: ../src/login/org.freedesktop.login1.policy.in.h:35
msgid "Reboot the system while other users are logged in"
-msgstr "Riavvia il sistema (reboot) mentre altri utenti sono connessi"
+msgstr "Riavvia il sistema mentre altri utenti sono connessi"
#: ../src/login/org.freedesktop.login1.policy.in.h:36
msgid ""
@@ -346,9 +344,7 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:37
msgid "Reboot the system while an application asked to inhibit it"
-msgstr ""
-"Riavvia il sistema (reboot) mentre un'applicazione chiede di inibirne "
-"l'azione"
+msgstr "Riavvia il sistema mentre un'applicazione chiede di inibirne l'azione"
#: ../src/login/org.freedesktop.login1.policy.in.h:38
msgid ""
@@ -360,7 +356,7 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:39
msgid "Suspend the system"
-msgstr "Sospendi il sistema (suspend)"
+msgstr "Sospendi il sistema"
#: ../src/login/org.freedesktop.login1.policy.in.h:40
msgid "Authentication is required for suspending the system."
@@ -368,7 +364,7 @@ msgstr "Autenticazione richiesta per sospendere il sistema."
#: ../src/login/org.freedesktop.login1.policy.in.h:41
msgid "Suspend the system while other users are logged in"
-msgstr "Sospendi il sistema (suspend) mentre altri utenti sono connessi"
+msgstr "Sospendi il sistema mentre altri utenti sono connessi"
#: ../src/login/org.freedesktop.login1.policy.in.h:42
msgid ""
@@ -380,9 +376,7 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:43
msgid "Suspend the system while an application asked to inhibit it"
-msgstr ""
-"Sospendi il sistema (suspend) mentre un'applicazione chiede di inibirne "
-"l'azione"
+msgstr "Sospendi il sistema mentre un'applicazione chiede di inibirne l'azione"
#: ../src/login/org.freedesktop.login1.policy.in.h:44
msgid ""
@@ -394,7 +388,7 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:45
msgid "Hibernate the system"
-msgstr "Iberna il sistema (hibernate)"
+msgstr "Iberna il sistema"
#: ../src/login/org.freedesktop.login1.policy.in.h:46
msgid "Authentication is required for hibernating the system."
@@ -402,7 +396,7 @@ msgstr "Autenticazione richiesta per ibernare il sistema."
#: ../src/login/org.freedesktop.login1.policy.in.h:47
msgid "Hibernate the system while other users are logged in"
-msgstr "Iberna il sistema (hibernate) mentre altri utenti sono connessi"
+msgstr "Iberna il sistema mentre altri utenti sono connessi"
#: ../src/login/org.freedesktop.login1.policy.in.h:48
msgid ""
@@ -414,9 +408,7 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:49
msgid "Hibernate the system while an application asked to inhibit it"
-msgstr ""
-"Iberna il sistema (hibernate) mentre un'applicazione chiede di inibirne "
-"l'azione"
+msgstr "Iberna il sistema mentre un'applicazione chiede di inibirne l'azione"
#: ../src/login/org.freedesktop.login1.policy.in.h:50
msgid ""
@@ -448,8 +440,7 @@ msgstr "Autenticazione richiesta per bloccare o sbloccare le sessioni attive."
#: ../src/login/org.freedesktop.login1.policy.in.h:55
msgid "Allow indication to the firmware to boot to setup interface"
msgstr ""
-"Permette indicazioni per il firmware per avviare l'interfaccia di "
-"configurazione"
+"Permette indicazioni al firmware per avviare l'interfaccia di configurazione"
#: ../src/login/org.freedesktop.login1.policy.in.h:56
msgid ""
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index b2ef3db491..307c3d8e7a 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -695,9 +695,9 @@ const sd_bus_vtable bus_exec_vtable[] = {
SD_BUS_PROPERTY("Group", "s", NULL, offsetof(ExecContext, group), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("SupplementaryGroups", "as", NULL, offsetof(ExecContext, supplementary_groups), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("PAMName", "s", NULL, offsetof(ExecContext, pam_name), SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_PROPERTY("ReadWriteDirectories", "as", NULL, offsetof(ExecContext, read_write_paths), SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_PROPERTY("ReadOnlyDirectories", "as", NULL, offsetof(ExecContext, read_only_paths), SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_PROPERTY("InaccessibleDirectories", "as", NULL, offsetof(ExecContext, inaccessible_paths), SD_BUS_VTABLE_PROPERTY_CONST),
+ SD_BUS_PROPERTY("ReadWriteDirectories", "as", NULL, offsetof(ExecContext, read_write_paths), SD_BUS_VTABLE_PROPERTY_CONST|SD_BUS_VTABLE_HIDDEN),
+ SD_BUS_PROPERTY("ReadOnlyDirectories", "as", NULL, offsetof(ExecContext, read_only_paths), SD_BUS_VTABLE_PROPERTY_CONST|SD_BUS_VTABLE_HIDDEN),
+ SD_BUS_PROPERTY("InaccessibleDirectories", "as", NULL, offsetof(ExecContext, inaccessible_paths), SD_BUS_VTABLE_PROPERTY_CONST|SD_BUS_VTABLE_HIDDEN),
SD_BUS_PROPERTY("ReadWritePaths", "as", NULL, offsetof(ExecContext, read_write_paths), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("ReadOnlyPaths", "as", NULL, offsetof(ExecContext, read_only_paths), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("InaccessiblePaths", "as", NULL, offsetof(ExecContext, inaccessible_paths), SD_BUS_VTABLE_PROPERTY_CONST),
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 722538caf1..4baf4750f4 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -291,16 +291,15 @@ static int apply_mount(
* inaccessible path. */
umount_recursive(m->path, 0);
- r = lstat(m->path, &target);
- if (r != 0) {
+ if (lstat(m->path, &target) < 0) {
if (m->ignore && errno == ENOENT)
return 0;
return -errno;
}
what = mode_to_inaccessible_node(target.st_mode);
- if (what == NULL) {
- log_debug("File type not supported. Note that symlinks are not allowed");
+ if (!what) {
+ log_debug("File type not supported for inaccessible mounts. Note that symlinks are not allowed");
return -ELOOP;
}
break;
@@ -331,12 +330,10 @@ static int apply_mount(
if (r >= 0) {
log_debug("Successfully mounted %s to %s", what, m->path);
return r;
- }
- else {
+ } else {
if (m->ignore && errno == ENOENT)
return 0;
- log_debug("Failed mounting %s to %s: %s", what, m->path, strerror(errno));
- return -errno;
+ return log_debug_errno(errno, "Failed to mount %s to %s: %m", what, m->path);
}
}
@@ -350,7 +347,8 @@ static int make_read_only(BindMount *m) {
else if (IN_SET(m->mode, READWRITE, PRIVATE_TMP, PRIVATE_VAR_TMP, PRIVATE_DEV)) {
r = bind_remount_recursive(m->path, false);
if (r == 0 && m->mode == PRIVATE_DEV) /* can be readonly but the submounts can't*/
- r = mount(NULL, m->path, NULL, MS_REMOUNT|DEV_MOUNT_OPTIONS|MS_RDONLY, NULL);
+ if (mount(NULL, m->path, NULL, MS_REMOUNT|DEV_MOUNT_OPTIONS|MS_RDONLY, NULL) < 0)
+ r = -errno;
} else
r = 0;