[systemd-commits] 5 commits - po/fr.po po/ru.po src/core src/udev
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Thu Jan 1 11:41:01 PST 2015
po/fr.po | 33 ++++++++++++++--------------
po/ru.po | 30 +++++++++++++-------------
src/core/mount.c | 49 +++++++++++++++++++++----------------------
src/core/namespace.c | 2 -
src/core/namespace.h | 2 -
src/udev/ata_id/ata_id.c | 4 +--
src/udev/cdrom_id/cdrom_id.c | 10 ++++----
src/udev/collect/collect.c | 10 +++++---
src/udev/scsi_id/scsi_id.c | 2 -
src/udev/v4l_id/v4l_id.c | 2 -
10 files changed, 72 insertions(+), 72 deletions(-)
New commits:
commit a29fca906c32f709c7c560d5f17654e6e2c318e1
Author: Sergey Ptashnick <0comffdiz at inbox.ru>
Date: Thu Jan 1 21:42:47 2015 +0300
po: update Russian translation
By analogy with commit 4038d7502f.
diff --git a/po/ru.po b/po/ru.po
index 5319e1d..23002cd 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,13 +1,13 @@
# translation of ru.po to Rissian
# Julia Dronova <juliette.tux at gmail.com>, 2013.
-# Sergey Ptashnick <0comffdiz at inbox.ru>, 2013-2014.
+# Sergey Ptashnick <0comffdiz at inbox.ru>, 2013-2015.
#
msgid ""
msgstr ""
"Project-Id-Version: systemd\n"
"Report-Msgid-Bugs-To: 0comffdiz at inbox.ru\n"
"POT-Creation-Date: 2013-03-24 19:22+0300\n"
-"PO-Revision-Date: 2014-08-29 19:29+0400\n"
+"PO-Revision-Date: 2015-01-01 21:29+0300\n"
"Last-Translator: Sergey Ptashnick <0comffdiz at inbox.ru>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -246,6 +246,14 @@ msgstr "Перевести систему в спящий режим, несмо
msgid "Authentication is required for hibernating the system while an application asked to inhibit it."
msgstr "Чтобы перевести систему в спящий режим, несмотря на то, что приложение запросило блокировку, необходимо пройти аутентификацию."
+#: ../src/machine/org.freedesktop.machine1.policy.in.h:1
+msgid "Log into a local container"
+msgstr "Зайти в локальный контейнер"
+
+#: ../src/machine/org.freedesktop.machine1.policy.in.h:2
+msgid "Authentication is required to log into a local container."
+msgstr "Чтобы зайти в локальный контейнер, необходимо пройти аутентификацию."
+
#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:1
msgid "Set system time"
msgstr "Настроить системное время"
@@ -287,33 +295,25 @@ msgid "Authentication is required to send the entered passphrase back to the sys
msgstr "Чтобы отправить пароль системе, необходимо пройти аутентификацию."
#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3
-msgid "Privileged system and service manager access"
-msgstr "Привилегированный доступ к системному менеджеру"
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
-msgid "Authentication is required to access the system and service manager."
-msgstr "Для привилегированного доступа к системному менеджеру необходимо пройти аутентификацию."
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5
msgid "Manage system services or units"
msgstr "Управление системными службами и юнитами"
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
msgid "Authentication is required to manage system services or units."
msgstr "Для управления системными службами и юнитами, необходимо пройти аутентификацию."
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5
msgid "Manage system service or unit files"
msgstr "Управление файлами конфигурации системных служб и юнитов"
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:8
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6
msgid "Authentication is required to manage system service or unit files."
msgstr "Для управления файлами конфигурации системных служб и юнитов, необходимо пройти аутентификацию."
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:9
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
msgid "Reload the systemd state"
msgstr "Перечитать конфигурацию systemd"
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:10
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:8
msgid "Authentication is required to reload the systemd state."
msgstr "Чтобы заставить systemd перечитать конфигурацию, необходимо пройти аутентификацию."
commit 51ed3324dffc393672c39eaffc445e3fc913550c
Author: Sylvain Plantefève <sylvain.plantefeve at gmail.com>
Date: Thu Jan 1 18:02:54 2015 +0100
po: update French translation
diff --git a/po/fr.po b/po/fr.po
index 243465c..8a35822 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: systemd\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-14 17:49+0100\n"
-"PO-Revision-Date: 2014-04-29 09:17+0300\n"
+"POT-Creation-Date: 2014-12-28 13:02+0100\n"
+"PO-Revision-Date: 2014-12-28 13:04+0100\n"
"Last-Translator: Sylvain Plantefève <sylvain.plantefeve at gmail.com>\n"
"Language-Team: French\n"
"Language: fr\n"
@@ -334,6 +334,15 @@ msgstr ""
"Authentification requise pour mettre le système en hibernation alors qu'une "
"application a demandé de l'empêcher."
+#: ../src/machine/org.freedesktop.machine1.policy.in.h:1
+msgid "Log into a local container"
+msgstr "Connexion dans un conteneur local"
+
+#: ../src/machine/org.freedesktop.machine1.policy.in.h:2
+msgid "Authentication is required to log into a local container."
+msgstr ""
+"Authentification requise pour permettre la connexion dans un conteneur local."
+
#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:1
msgid "Set system time"
msgstr "Définir l'heure du système"
@@ -387,37 +396,27 @@ msgstr ""
"Authentification requise pour renvoyer la phrase secrète au système."
#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3
-msgid "Privileged system and service manager access"
-msgstr "Accès privilégié au gestionnaire du système et des services"
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
-msgid "Authentication is required to access the system and service manager."
-msgstr ""
-"Authentification requise pour accéder au gestionnaire du système et des "
-"services."
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5
msgid "Manage system services or units"
msgstr "Gérer les services système ou les unités"
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
msgid "Authentication is required to manage system services or units."
msgstr ""
"Authentification requise pour gérer les services système ou les unités."
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5
msgid "Manage system service or unit files"
msgstr "Gérer le service système ou ses fichiers unités"
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:8
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6
msgid "Authentication is required to manage system service or unit files."
msgstr ""
"Authentification requise pour gérer le service système ou ses fichiers unités."
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:9
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
msgid "Reload the systemd state"
msgstr "Recharger l'état de systemd"
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:10
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:8
msgid "Authentication is required to reload the systemd state."
msgstr "Authentification requise pour recharger l'état de systemd"
commit e86b3761c42babc190a1e1b6d4288dfa7a4208b8
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Thu Jan 1 14:25:18 2015 -0500
mount: do not use -n when running in --user mode
-n is only allowed for root. /etc/mtab is nowadays almost always a link to /proc/,
so in practice this does not really matter too much, but should allow .mount units
to work in --user mode.
https://bugs.freedesktop.org/show_bug.cgi?id=87602
diff --git a/src/core/mount.c b/src/core/mount.c
index 110eafd..13c6348 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -879,11 +879,9 @@ static void mount_enter_unmounting(Mount *m) {
m->control_command_id = MOUNT_EXEC_UNMOUNT;
m->control_command = m->exec_command + MOUNT_EXEC_UNMOUNT;
- r = exec_command_set(m->control_command,
- "/bin/umount",
- "-n",
- m->where,
- NULL);
+ r = exec_command_set(m->control_command, "/bin/umount", m->where, NULL);
+ if (r >= 0 && UNIT(m)->manager->running_as == SYSTEMD_SYSTEM)
+ r = exec_command_append(m->control_command, "-n", NULL);
if (r < 0)
goto fail;
@@ -926,17 +924,18 @@ static void mount_enter_mounting(Mount *m) {
if (r < 0)
goto fail;
- if (m->from_fragment)
- r = exec_command_set(
- m->control_command,
- "/bin/mount",
- m->sloppy_options ? "-ns" : "-n",
- m->parameters_fragment.what,
- m->where,
- "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
- m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options,
- NULL);
- else
+ if (m->from_fragment) {
+ r = exec_command_set(m->control_command, "/bin/mount",
+ m->parameters_fragment.what, m->where, NULL);
+ if (r >= 0 && UNIT(m)->manager->running_as == SYSTEMD_SYSTEM)
+ r = exec_command_append(m->control_command, "-n", NULL);
+ if (r >= 0 && m->sloppy_options)
+ r = exec_command_append(m->control_command, "-s", NULL);
+ if (r >= 0 && m->parameters_fragment.fstype)
+ r = exec_command_append(m->control_command, "-t", m->parameters_fragment.fstype, NULL);
+ if (r >= 0 && m->parameters_fragment.options)
+ r = exec_command_append(m->control_command, "-o", m->parameters_fragment.options, NULL);
+ } else
r = -ENOENT;
if (r < 0)
@@ -975,15 +974,15 @@ static void mount_enter_remounting(Mount *m) {
else
o = "remount";
- r = exec_command_set(
- m->control_command,
- "/bin/mount",
- m->sloppy_options ? "-ns" : "-n",
- m->parameters_fragment.what,
- m->where,
- "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
- "-o", o,
- NULL);
+ r = exec_command_set(m->control_command, "/bin/mount",
+ m->parameters_fragment.what, m->where,
+ "-o", o, NULL);
+ if (r >= 0 && UNIT(m)->manager->running_as == SYSTEMD_SYSTEM)
+ r = exec_command_append(m->control_command, "-n", NULL);
+ if (r >= 0 && m->sloppy_options)
+ r = exec_command_append(m->control_command, "-s", NULL);
+ if (r >= 0 && m->parameters_fragment.fstype)
+ r = exec_command_append(m->control_command, "-t", m->parameters_fragment.fstype, NULL);
} else
r = -ENOENT;
commit e65476622db43f7b9c413009072fc9603b8d6ba4
Author: Topi Miettinen <toiwoton at gmail.com>
Date: Thu Jan 1 19:40:07 2015 +0200
Type of mount(2) flags is unsigned long
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 5b408e0..4b8dbdd 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -422,7 +422,7 @@ int setup_namespace(
bool private_dev,
ProtectHome protect_home,
ProtectSystem protect_system,
- unsigned mount_flags) {
+ unsigned long mount_flags) {
BindMount *m, *mounts = NULL;
unsigned n;
diff --git a/src/core/namespace.h b/src/core/namespace.h
index 1f9d067..42b92e7 100644
--- a/src/core/namespace.h
+++ b/src/core/namespace.h
@@ -50,7 +50,7 @@ int setup_namespace(char **read_write_dirs,
bool private_dev,
ProtectHome protect_home,
ProtectSystem protect_system,
- unsigned mount_flags);
+ unsigned long mount_flags);
int setup_tmp_dirs(const char *id,
char **tmp_dir,
commit 257e968d8c726e1a7be7b455d0e6ad29b5d0756c
Author: Robert Milasan <rmilasan at suse.com>
Date: Thu Jan 1 18:11:22 2015 +0100
udev: improve help/usage for some more programs
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index e6344f9..31bc167 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -450,8 +450,8 @@ int main(int argc, char *argv[])
break;
case 'h':
printf("Usage: ata_id [--export] [--help] <device>\n"
- " --export print values as environment keys\n"
- " --help print this help text\n\n");
+ " -x,--export print values as environment keys\n"
+ " -h,--help print this help text\n\n");
return 0;
}
}
diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
index 8a41c4f..6052f6a 100644
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -891,11 +891,11 @@ int main(int argc, char *argv[])
break;
case 'h':
printf("Usage: cdrom_id [options] <device>\n"
- " --lock-media lock the media (to enable eject request events)\n"
- " --unlock-media unlock the media\n"
- " --eject-media eject the media\n"
- " --debug debug to stderr\n"
- " --help print this help text\n\n");
+ " -l,--lock-media lock the media (to enable eject request events)\n"
+ " -u,--unlock-media unlock the media\n"
+ " -e,--eject-media eject the media\n"
+ " -d,--debug debug to stderr\n"
+ " -h,--help print this help text\n\n");
goto exit;
default:
rc = 1;
diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
index 16675fb..11a618c 100644
--- a/src/udev/collect/collect.c
+++ b/src/udev/collect/collect.c
@@ -68,15 +68,17 @@ noreturn static void sig_alrm(int signo)
static void usage(void)
{
- printf("usage: collect [--add|--remove] [--debug] <checkpoint> <id> <idlist>\n"
- "\n"
+ printf("Usage: collect [options] <checkpoint> <id> <idlist>\n"
+ " -a,--add add ID <id> to the list <idlist>\n"
+ " -r,--remove remove ID <id> from the list <idlist>\n"
+ " -d,--debug debug to stderr\n"
+ " -h,--help print this help text\n\n"
" Adds ID <id> to the list governed by <checkpoint>.\n"
" <id> must be part of the list <idlist>.\n"
" If all IDs given by <idlist> are listed (ie collect has been\n"
" invoked for each ID in <idlist>) collect returns 0, the\n"
" number of missing IDs otherwise.\n"
- " On error a negative number is returned.\n"
- "\n");
+ " On error a negative number is returned.\n\n");
}
/*
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index 27adb09..5270233 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -313,7 +313,7 @@ static void help(void) {
" -g,--whitelisted treat device as whitelisted\n"
" -u,--replace-whitespace replace all whitespace by underscores\n"
" -v,--verbose verbose logging\n"
- " --version print version\n"
+ " -V,--version print version\n"
" -x,--export print values as environment keys\n"
" -h,--help print this help text\n\n");
diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c
index d5463b2..08d3efa 100644
--- a/src/udev/v4l_id/v4l_id.c
+++ b/src/udev/v4l_id/v4l_id.c
@@ -45,7 +45,7 @@ int main (int argc, char *argv[])
switch (option) {
case 'h':
- printf("Usage: v4l_id [--help] <device file>\n\n");
+ printf("Usage: v4l_id [-h,--help] <device file>\n\n");
return 0;
default:
return 1;
More information about the systemd-commits
mailing list