[systemd-commits] 7 commits - po/fr.po shell-completion/zsh src/boot src/import src/shared src/test src/timedate
Ronny Chevalier
rchevalier at kemper.freedesktop.org
Tue Apr 7 17:45:28 PDT 2015
po/fr.po | 20 +++++++++++++++++---
shell-completion/zsh/_hostnamectl | 12 +++++++++++-
shell-completion/zsh/_journalctl | 1 +
shell-completion/zsh/_loginctl | 5 +++--
src/boot/bootctl.c | 1 -
src/import/importd.c | 1 -
src/shared/util.c | 1 -
src/test/test-socket-util.c | 19 +++++++++++++++++++
src/timedate/timedatectl.c | 2 +-
9 files changed, 52 insertions(+), 10 deletions(-)
New commits:
commit 431c3b6bab9ceb54cd144d8df24d764a8a5f8fcc
Author: Sylvain Plantefève <sylvain.plantefeve at gmail.com>
Date: Wed Apr 8 00:40:33 2015 +0200
po: update French translation
Add strings introduced by 5bdf22430e367799dfa66c724144b624c5479518
diff --git a/po/fr.po b/po/fr.po
index f26451f..69862fb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: systemd\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-09 18:30+0100\n"
+"POT-Creation-Date: 2015-04-07 20:05+0200\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"
@@ -438,6 +438,20 @@ msgstr ""
"Authentification requise pour verrouiller ou déverrouiller des sessions "
"actives."
+#: ../src/login/org.freedesktop.login1.policy.in.h:53
+msgid "Allow indication to the firmware to boot to setup interface"
+msgstr ""
+"Permet d'indiquer au micrologiciel de démarrer sur l'interface de "
+"configuration"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:54
+msgid ""
+"Authentication is required to indicate to the firmware to boot to setup "
+"interface."
+msgstr ""
+"Authentification requise pour indiquer au micrologiciel de démarrer sur "
+"l'interface de configuration."
+
#: ../src/machine/org.freedesktop.machine1.policy.in.h:1
msgid "Log into a local container"
msgstr "Connexion dans un conteneur local"
@@ -512,13 +526,13 @@ msgstr ""
"Authentification requise pour activer ou désactiver la synchronisation de "
"l'heure avec le réseau."
-#: ../src/fsckd/fsckd.c:186
+#: ../src/fsckd/fsckd.c:297
msgid "Press Ctrl+C to cancel all filesystem checks in progress"
msgstr ""
"Appuyez sur Ctrl+C pour annuler toutes vérifications en cours du système de "
"fichiers"
-#: ../src/fsckd/fsckd.c:227
+#: ../src/fsckd/fsckd.c:343
#, c-format
msgid "Checking in progress on %d disk (%3.1f%% complete)"
msgid_plural "Checking in progress on %d disks (%3.1f%% complete)"
commit 39505e3c3b38c968396b503054a81ed9e2ea9909
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date: Wed Apr 8 01:15:32 2015 +0200
remove duplicated includes
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 001cfa7..29dcec7 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -22,7 +22,6 @@
#include <stdio.h>
#include <getopt.h>
-#include <errno.h>
#include <stdlib.h>
#include <assert.h>
#include <sys/statfs.h>
diff --git a/src/import/importd.c b/src/import/importd.c
index 018ca92..998e960 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -26,7 +26,6 @@
#include "strv.h"
#include "bus-util.h"
#include "bus-common-errors.h"
-#include "def.h"
#include "socket-util.h"
#include "mkdir.h"
#include "def.h"
diff --git a/src/shared/util.c b/src/shared/util.c
index 67f66ac..de56d98 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -25,7 +25,6 @@
#include <stdlib.h>
#include <signal.h>
#include <libintl.h>
-#include <locale.h>
#include <stdio.h>
#include <syslog.h>
#include <sched.h>
commit 3906ab4adf0aa7b952e39100262a11acd55cd79b
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date: Wed Apr 8 01:09:11 2015 +0200
timedatectl: trim --help output to 80 chars
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 58a92d3..8416bb5 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -331,7 +331,7 @@ static void help(void) {
" set-timezone ZONE Set system time zone\n"
" list-timezones Show known time zones\n"
" set-local-rtc BOOL Control whether RTC is in local time\n"
- " set-ntp BOOL Control whether network time synchronization is enabled\n",
+ " set-ntp BOOL Enable or disable network time synchronization\n",
program_invocation_short_name);
}
commit d67b1f525f488e5dfc076972cccf2a6411257fb8
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date: Tue Apr 7 20:14:28 2015 +0200
zsh-completion: update hostnamectl
diff --git a/shell-completion/zsh/_hostnamectl b/shell-completion/zsh/_hostnamectl
index a7217a1..7528e06 100644
--- a/shell-completion/zsh/_hostnamectl
+++ b/shell-completion/zsh/_hostnamectl
@@ -33,6 +33,14 @@ _hostnamectl_set-deployment() {
fi
}
+_hostnamectl_set-location() {
+ if (( CURRENT <= 3 )); then
+ _message "new location"
+ else
+ _message "no more options"
+ fi
+}
+
_hostnamectl_command() {
local -a _hostnamectl_cmds
_hostnamectl_cmds=(
@@ -40,7 +48,8 @@ _hostnamectl_command() {
"set-hostname:Set system hostname"
"set-icon-name:Set icon name for host"
"set-chassis:Set chassis type for host"
- "set-deployment:Set deployment environment"
+ "set-deployment:Set deployment environment for host"
+ "set-location:Set location for host"
)
if (( CURRENT == 1 )); then
_describe -t commands 'hostnamectl commands' _hostnamectl_cmds || compadd "$@"
@@ -67,4 +76,5 @@ _arguments -s \
'--pretty[Only set pretty hostname]' \
'--no-ask-password[Do not prompt for password]' \
{-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+ {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
'*::hostnamectl commands:_hostnamectl_command'
commit b178d279d92fdf002b18dd2f06f2353af14d0a6e
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date: Tue Apr 7 19:35:57 2015 +0200
zsh-completion: add missing -M completion for journalctl
diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
index a469bbc..863348e 100644
--- a/shell-completion/zsh/_journalctl
+++ b/shell-completion/zsh/_journalctl
@@ -76,6 +76,7 @@ _arguments -s \
{-F,--field=}'[List all values a certain field takes]:Fields:_list_fields' \
'--system[Show system and kernel messages]' \
'--user[Show messages from user services]' \
+ {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
{-D+,--directory=}'[Show journal files from directory]:directories:_directories' \
'--file=[Operate on specified journal files]:file:_files' \
'--root=[Operate on catalog hierarchy under specified directory]:directories:_directories' \
commit 8470025541039f39391815b2ac93952003b7eee8
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date: Tue Apr 7 19:35:13 2015 +0200
zsh-completion: update loginctl
diff --git a/shell-completion/zsh/_loginctl b/shell-completion/zsh/_loginctl
index 0de66e1..bd33b66 100644
--- a/shell-completion/zsh/_loginctl
+++ b/shell-completion/zsh/_loginctl
@@ -102,10 +102,11 @@ _arguments -s \
'--kill-who=[Who to send signal to]:killwho:(main control all)' \
{-s+,--signal=}'[Which signal to send]:signal:_signals' \
{-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
- {-M+,--machine=}'[Operate on local container]:machine' \
- {-P,--privileged}'[Acquire privileges before execution]' \
+ {-M+,--machine=}'[Operate on local container]:machine:_sd_machines' \
{-l,--full}'[Do not ellipsize output]' \
'--no-pager[Do not pipe output into a pager]' \
'--no-legend[Do not show the headers and footers]' \
'--no-ask-password[Do not ask for system passwords]' \
+ {-n+,--lines=}'[Number of journal entries to show]' \
+ {-o+,--output=}'[Change journal output mode]:output modes:_sd_outputmodes' \
'*::loginctl command:_loginctl_command'
commit 07916bea0708715bf9cc4c3d9010f2397dd1d62a
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date: Mon Mar 16 20:24:39 2015 +0100
test-socket-util: add test for in_addr_to_string
diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c
index 6fb4a40..f257af4 100644
--- a/src/test/test-socket-util.c
+++ b/src/test/test-socket-util.c
@@ -231,6 +231,24 @@ static void test_in_addr_prefix_next(void) {
}
+static void test_in_addr_to_string_one(int f, const char *addr) {
+ union in_addr_union ua;
+ _cleanup_free_ char *r = NULL;
+
+ assert_se(in_addr_from_string(f, addr, &ua) >= 0);
+ assert_se(in_addr_to_string(f, &ua, &r) >= 0);
+ printf("test_in_addr_to_string_one: %s == %s\n", addr, r);
+ assert_se(streq(addr, r));
+}
+
+static void test_in_addr_to_string(void) {
+ test_in_addr_to_string_one(AF_INET, "192.168.0.1");
+ test_in_addr_to_string_one(AF_INET, "10.11.12.13");
+ test_in_addr_to_string_one(AF_INET6, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff");
+ test_in_addr_to_string_one(AF_INET6, "::1");
+ test_in_addr_to_string_one(AF_INET6, "fe80::");
+}
+
static void *connect_thread(void *arg) {
union sockaddr_union *sa = arg;
_cleanup_close_ int fd = -1;
@@ -324,6 +342,7 @@ int main(int argc, char *argv[]) {
test_in_addr_prefix_intersect();
test_in_addr_prefix_next();
+ test_in_addr_to_string();
test_nameinfo_pretty();
More information about the systemd-commits
mailing list