diff options
| -rw-r--r-- | hwdb/60-keyboard.hwdb | 16 | ||||
| -rw-r--r-- | man/systemd-ask-password.xml | 9 | ||||
| -rw-r--r-- | po/zh_CN.po | 141 | ||||
| -rw-r--r-- | src/ask-password/ask-password.c | 11 | ||||
| -rw-r--r-- | src/basic/mount-util.c | 4 | ||||
| -rw-r--r-- | src/basic/xattr-util.c | 2 | ||||
| -rw-r--r-- | src/systemctl/systemctl.c | 12 | ||||
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 4 |
8 files changed, 112 insertions, 87 deletions
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index 01213b6069..46013d3449 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -378,6 +378,7 @@ evdev:input:b0003v0458p0708* ########################################################### evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*:pvr* +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pn*:pvr* KEYBOARD_KEY_81=fn_esc KEYBOARD_KEY_89=battery # Fn+F8 KEYBOARD_KEY_8a=screenlock # Fn+F6 @@ -488,10 +489,11 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnFalco:pvr* evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPLicrice:pvr* # HP ProBook 440 G2 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP440G2:pvr* -# HP ProBook 445 G1 -evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPProBook445G1NotebookPC:pvr* -# HP ProBook 450 G0 -evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPProBook450G0:pvr* +# several HP ProBooks 4xx +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP*ProBook4*:pvr* +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHP*ProBook*4*:pvr* +# HP ZBook +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPZBook*:pvr* KEYBOARD_KEY_81=f20 # Fn+F8; Microphone mute button, should be micmute # HP ProBook 6555b @@ -500,10 +502,8 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard:pnHPProBook6555b:* # HP ProBook 440 G3 evdev:atkbd:dmi:bvn*:bvr*:svnHP*:pnHP*ProBook*440*G3* - KEYBOARD_KEY_92=brightnessdown - KEYBOARD_KEY_97=brightnessup - KEYBOARD_KEY_ee=switchvideomode - KEYBOARD_KEY_81=f20 # micmute + KEYBOARD_KEY_85=unknown # lid close; also reported via special evdev + KEYBOARD_KEY_f8=unknown # rf kill; also reported via special evdev ########################################################### # IBM diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml index 2a4d24349b..e84a15c554 100644 --- a/man/systemd-ask-password.xml +++ b/man/systemd-ask-password.xml @@ -192,6 +192,15 @@ This will output one password per line.</para></listitem> </varlistentry> + <varlistentry> + <term><option>--no-output</option></term> + + <listitem><para>Do not print passwords to standard output. + This is useful if you want to store a password in kernel + keyring with <option>--keyname</option> but do not want it + to show up on screen or in logs.</para></listitem> + </varlistentry> + <xi:include href="standard-options.xml" xpointer="help" /> </variablelist> diff --git a/po/zh_CN.po b/po/zh_CN.po index 67639620fb..10c53d4538 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,19 +4,20 @@ # # Frank Hill <hxf.prc@gmail.com>, 2014. # Boyuan Yang <073plan@gmail.com>, 2015. +# Jeff Bai <jeffbai@aosc.xyz>, 2016. msgid "" msgstr "" "Project-Id-Version: systemd\n" "Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n" "POT-Creation-Date: 2015-10-27 02:24+0000\n" -"PO-Revision-Date: 2015-10-28 15:00+0800\n" -"Last-Translator: Boyuan Yang <073plan@gmail.com>\n" +"PO-Revision-Date: 2016-03-01 20:38-0700\n" +"Last-Translator: Jeff Bai <jeffbai@aosc.xyz>\n" "Language-Team: Chinese <i18n-zh@googlegroups.com>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Poedit 1.8.7.1\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:1 @@ -26,7 +27,7 @@ msgstr "将密码发回系统" #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:2 msgid "" "Authentication is required to send the entered passphrase back to the system." -msgstr "将输入的密码发回系统需要验证。" +msgstr "将输入的密码发回系统需要认证。" #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3 msgid "Manage system services or other units" @@ -34,7 +35,7 @@ msgstr "管理系统服务或其它单元" #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4 msgid "Authentication is required to manage system services or other units." -msgstr "管理系统服务或其它单元需要验证。" +msgstr "管理系统服务或其它单元需要认证。" #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5 msgid "Manage system service or unit files" @@ -42,7 +43,7 @@ msgstr "管理系统服务或单元文件" #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6 msgid "Authentication is required to manage system service or unit files." -msgstr "管理系统服务或单元文件需要验证。" +msgstr "管理系统服务或单元文件需要认证。" #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7 msgid "Set or unset system and service manager environment variables" @@ -52,7 +53,7 @@ msgstr "设置或清除系统及服务管理器的环境变量" msgid "" "Authentication is required to set or unset system and service manager " "environment variables." -msgstr "设置或清除系统及服务管理器的环境变量需要验证。" +msgstr "设置或清除系统及服务管理器的环境变量需要认证。" #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:9 msgid "Reload the systemd state" @@ -60,7 +61,7 @@ msgstr "重新载入 systemd 状态" #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:10 msgid "Authentication is required to reload the systemd state." -msgstr "重新载入 systemd 状态需要验证。" +msgstr "重新载入 systemd 状态需要认证。" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 msgid "Set host name" @@ -68,7 +69,7 @@ msgstr "设置主机名" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 msgid "Authentication is required to set the local host name." -msgstr "设置本地主机名需要验证。" +msgstr "设置本地主机名需要认证。" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 msgid "Set static host name" @@ -82,7 +83,7 @@ msgstr "设置静态主机名" msgid "" "Authentication is required to set the statically configured local host name, " "as well as the pretty host name." -msgstr "设置静态本地主机名或漂亮的主机名需要验证。" +msgstr "设置静态本地主机名或美观主机名需要认证。" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:5 msgid "Set machine information" @@ -90,7 +91,7 @@ msgstr "设置机器信息" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:6 msgid "Authentication is required to set local machine information." -msgstr "设置本地机器信息需要验证。" +msgstr "设置本地机器信息需要认证。" #: ../src/import/org.freedesktop.import1.policy.in.h:1 msgid "Import a VM or container image" @@ -98,7 +99,7 @@ msgstr "导入虚拟机或容器镜像" #: ../src/import/org.freedesktop.import1.policy.in.h:2 msgid "Authentication is required to import a VM or container image" -msgstr "导入虚拟机或容器镜像需要验证" +msgstr "导入虚拟机或容器镜像需要认证" #: ../src/import/org.freedesktop.import1.policy.in.h:3 msgid "Export a VM or container image" @@ -106,7 +107,7 @@ msgstr "导出虚拟机或容器镜像" #: ../src/import/org.freedesktop.import1.policy.in.h:4 msgid "Authentication is required to export a VM or container image" -msgstr "导出虚拟机或容器镜像需要验证" +msgstr "导出虚拟机或容器镜像需要认证" #: ../src/import/org.freedesktop.import1.policy.in.h:5 msgid "Download a VM or container image" @@ -114,7 +115,7 @@ msgstr "下载虚拟机或容器镜像" #: ../src/import/org.freedesktop.import1.policy.in.h:6 msgid "Authentication is required to download a VM or container image" -msgstr "下载虚拟机或容器镜像需要验证。" +msgstr "下载虚拟机或容器镜像需要认证。" #: ../src/locale/org.freedesktop.locale1.policy.in.h:1 msgid "Set system locale" @@ -122,7 +123,7 @@ msgstr "设置系统区域和语言" #: ../src/locale/org.freedesktop.locale1.policy.in.h:2 msgid "Authentication is required to set the system locale." -msgstr "设置系统区域和语言需要验证。" +msgstr "设置系统区域和语言需要认证。" #: ../src/locale/org.freedesktop.locale1.policy.in.h:3 msgid "Set system keyboard settings" @@ -130,7 +131,7 @@ msgstr "设置系统键盘" #: ../src/locale/org.freedesktop.locale1.policy.in.h:4 msgid "Authentication is required to set the system keyboard settings." -msgstr "设置系统键盘需要验证。" +msgstr "设置系统键盘需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:1 msgid "Allow applications to inhibit system shutdown" @@ -139,7 +140,7 @@ msgstr "允许应用程序阻止系统关机" #: ../src/login/org.freedesktop.login1.policy.in.h:2 msgid "" "Authentication is required for an application to inhibit system shutdown." -msgstr "要允许应用程序阻止系统关机需要验证。" +msgstr "允许应用程序阻止系统关机需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:3 msgid "Allow applications to delay system shutdown" @@ -147,7 +148,7 @@ msgstr "允许应用程序延迟系统关机" #: ../src/login/org.freedesktop.login1.policy.in.h:4 msgid "Authentication is required for an application to delay system shutdown." -msgstr "要允许应用程序延迟系统关机需要验证。" +msgstr "允许应用程序延迟系统关机需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:5 msgid "Allow applications to inhibit system sleep" @@ -155,7 +156,7 @@ msgstr "允许应用程序阻止系统睡眠" #: ../src/login/org.freedesktop.login1.policy.in.h:6 msgid "Authentication is required for an application to inhibit system sleep." -msgstr "要允许应用程序阻止系统睡眠需要验证。" +msgstr "允许应用程序阻止系统睡眠需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:7 msgid "Allow applications to delay system sleep" @@ -163,7 +164,7 @@ msgstr "允许应用程序延迟系统睡眠" #: ../src/login/org.freedesktop.login1.policy.in.h:8 msgid "Authentication is required for an application to delay system sleep." -msgstr "要允许应用程序延迟系统睡眠需要验证。" +msgstr "允许应用程序延迟系统睡眠需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:9 msgid "Allow applications to inhibit automatic system suspend" @@ -173,7 +174,7 @@ msgstr "允许应用程序阻止系统自动挂起" msgid "" "Authentication is required for an application to inhibit automatic system " "suspend." -msgstr "要允许应用程序阻止系统自动挂起需要验证。" +msgstr "允许应用程序阻止系统自动挂起需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:11 msgid "Allow applications to inhibit system handling of the power key" @@ -183,7 +184,7 @@ msgstr "允许应用程序阻止系统响应电源键" msgid "" "Authentication is required for an application to inhibit system handling of " "the power key." -msgstr "要允许应用程序阻止系统响应电源键需要验证。" +msgstr "允许应用程序阻止系统响应电源键需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:13 msgid "Allow applications to inhibit system handling of the suspend key" @@ -193,7 +194,7 @@ msgstr "允许应用程序阻止系统响应挂起键" msgid "" "Authentication is required for an application to inhibit system handling of " "the suspend key." -msgstr "要允许应用程序阻止系统响应挂起键需要验证。" +msgstr "允许应用程序阻止系统响应挂起键需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:15 msgid "Allow applications to inhibit system handling of the hibernate key" @@ -203,19 +204,17 @@ msgstr "允许应用程序阻止系统响应挂起键" msgid "" "Authentication is required for an application to inhibit system handling of " "the hibernate key." -msgstr "要允许应用程序阻止系统响应挂起键需要验证。" +msgstr "允许应用程序阻止系统响应挂起键需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:17 -#, fuzzy msgid "Allow applications to inhibit system handling of the lid switch" msgstr "允许应用程序阻止系统响应笔记本上盖开关事件" #: ../src/login/org.freedesktop.login1.policy.in.h:18 -#, fuzzy msgid "" "Authentication is required for an application to inhibit system handling of " "the lid switch." -msgstr "要允许应用程序阻止系统响应笔记本上盖开关事件需要验证。" +msgstr "允许应用程序阻止系统响应笔记本上盖开关事件需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:19 msgid "Allow non-logged-in users to run programs" @@ -223,7 +222,7 @@ msgstr "允许未登录用户运行程序" #: ../src/login/org.freedesktop.login1.policy.in.h:20 msgid "Authentication is required to run programs as a non-logged-in user." -msgstr "要允许未登录用户运行程序需要验证。" +msgstr "允许未登录用户运行程序需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:21 msgid "Allow attaching devices to seats" @@ -234,7 +233,7 @@ msgstr "允许将设备附加至会话座位" # To fully understand the meaning, please refer to session management in old ConsoleKit and new systemd-logind. #: ../src/login/org.freedesktop.login1.policy.in.h:22 msgid "Authentication is required for attaching a device to a seat." -msgstr "要允许将设备附加至某个会话座位需要验证。" +msgstr "允许将设备附加至某个会话座位需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:23 msgid "Flush device to seat attachments" @@ -243,7 +242,7 @@ msgstr "刷新设备至会话座位间的连接" #: ../src/login/org.freedesktop.login1.policy.in.h:24 msgid "" "Authentication is required for resetting how devices are attached to seats." -msgstr "重新设定设备的会话座位接入方式时需要验证。" +msgstr "重新设定设备的会话座位接入方式时需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:25 msgid "Power off the system" @@ -251,7 +250,7 @@ msgstr "关闭系统" #: ../src/login/org.freedesktop.login1.policy.in.h:26 msgid "Authentication is required for powering off the system." -msgstr "关闭系统需要验证。" +msgstr "关闭系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:27 msgid "Power off the system while other users are logged in" @@ -261,7 +260,7 @@ msgstr "存在其他已登录用户时仍然关机" msgid "" "Authentication is required for powering off the system while other users are " "logged in." -msgstr "存在其他已登录用户时关闭系统需要验证。" +msgstr "存在其他已登录用户时关闭系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:29 msgid "Power off the system while an application asked to inhibit it" @@ -271,7 +270,7 @@ msgstr "有其它应用程序阻止时仍然关机" msgid "" "Authentication is required for powering off the system while an application " "asked to inhibit it." -msgstr "要在其它应用程序阻止关机时关闭系统需要验证。" +msgstr "在其它应用程序阻止关机时关闭系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:31 msgid "Reboot the system" @@ -279,7 +278,7 @@ msgstr "重启系统" #: ../src/login/org.freedesktop.login1.policy.in.h:32 msgid "Authentication is required for rebooting the system." -msgstr "重启系统需要验证。" +msgstr "重启系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:33 msgid "Reboot the system while other users are logged in" @@ -289,7 +288,7 @@ msgstr "存在其他已登录用户时仍然重启" msgid "" "Authentication is required for rebooting the system while other users are " "logged in." -msgstr "存在其他已登录用户时重启系统需要验证。" +msgstr "存在其他已登录用户时重启系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:35 msgid "Reboot the system while an application asked to inhibit it" @@ -299,7 +298,7 @@ msgstr "有其它应用程序阻止时仍然重启" msgid "" "Authentication is required for rebooting the system while an application " "asked to inhibit it." -msgstr "要在其它应用程序阻止重启时重启系统需要验证。" +msgstr "在其它应用程序阻止重启时重启系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:37 msgid "Suspend the system" @@ -307,7 +306,7 @@ msgstr "挂起系统" #: ../src/login/org.freedesktop.login1.policy.in.h:38 msgid "Authentication is required for suspending the system." -msgstr "挂起系统需要验证。" +msgstr "挂起系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:39 msgid "Suspend the system while other users are logged in" @@ -317,7 +316,7 @@ msgstr "存在其他已登录用户时仍然挂起系统" msgid "" "Authentication is required for suspending the system while other users are " "logged in." -msgstr "存在其他已登录用户时挂起系统需要验证。" +msgstr "存在其他已登录用户时挂起系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:41 msgid "Suspend the system while an application asked to inhibit it" @@ -327,15 +326,15 @@ msgstr "有其它应用程序阻止时仍然挂起系统" msgid "" "Authentication is required for suspending the system while an application " "asked to inhibit it." -msgstr "要在其它应用程序阻止挂起时挂起系统需要验证。" +msgstr "在其它应用程序阻止挂起时挂起系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:43 msgid "Hibernate the system" -msgstr "休眠" +msgstr "休眠系统" #: ../src/login/org.freedesktop.login1.policy.in.h:44 msgid "Authentication is required for hibernating the system." -msgstr "休眠需要验证。" +msgstr "休眠系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:45 msgid "Hibernate the system while other users are logged in" @@ -345,7 +344,7 @@ msgstr "存在其他已登录用户时仍然休眠" msgid "" "Authentication is required for hibernating the system while other users are " "logged in." -msgstr "存在其他已登录用户时进行休眠需要验证。" +msgstr "存在其他已登录用户时进行休眠系统需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:47 msgid "Hibernate the system while an application asked to inhibit it" @@ -355,7 +354,7 @@ msgstr "有其它应用程序阻止时仍然休眠" msgid "" "Authentication is required for hibernating the system while an application " "asked to inhibit it." -msgstr "要在其它应用程序阻止休眠时进行休眠需要验证。" +msgstr "在其它应用程序阻止休眠时进行休眠需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:49 msgid "Manage active sessions, users and seats" @@ -364,42 +363,41 @@ msgstr "管理活动会话、用户与会话座位" #: ../src/login/org.freedesktop.login1.policy.in.h:50 msgid "" "Authentication is required for managing active sessions, users and seats." -msgstr "要管理活动会话、用户与会话座位需要验证。" +msgstr "管理活动会话、用户与会话座位需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:51 msgid "Lock or unlock active sessions" -msgstr "活动会话锁定与解锁" +msgstr "锁定或解锁活动会话" #: ../src/login/org.freedesktop.login1.policy.in.h:52 msgid "Authentication is required to lock or unlock active sessions." -msgstr "要对活动会话进行锁定或解锁需要验证。" +msgstr "对活动会话进行锁定或解锁需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:53 msgid "Allow indication to the firmware to boot to setup interface" -msgstr "允许向固件发出指示以启动至固件设置界面" +msgstr "允许向固件发出指示以启动至设置界面" #: ../src/login/org.freedesktop.login1.policy.in.h:54 msgid "" "Authentication is required to indicate to the firmware to boot to setup " "interface." -msgstr "要允许向固件发出启动时进入设置界面的指令需要验证。" +msgstr "向固件发出启动时进入设置界面的指令需要认证。" #: ../src/login/org.freedesktop.login1.policy.in.h:55 msgid "Set a wall message" -msgstr "" +msgstr "设置 wall 消息" #: ../src/login/org.freedesktop.login1.policy.in.h:56 -#, fuzzy msgid "Authentication is required to set a wall message" -msgstr "" +msgstr "设置 wall 消息需要认证。" #: ../src/machine/org.freedesktop.machine1.policy.in.h:1 msgid "Log into a local container" -msgstr "登入一个本地容器" +msgstr "登入本地容器" #: ../src/machine/org.freedesktop.machine1.policy.in.h:2 msgid "Authentication is required to log into a local container." -msgstr "要登入一个本地容器需要验证。" +msgstr "登录一个本地容器需要认证。" #: ../src/machine/org.freedesktop.machine1.policy.in.h:3 msgid "Log into the local host" @@ -407,7 +405,7 @@ msgstr "登入本地主机" #: ../src/machine/org.freedesktop.machine1.policy.in.h:4 msgid "Authentication is required to log into the local host." -msgstr "要登入本地主机需要验证。" +msgstr "登入本地主机需要认证。" #: ../src/machine/org.freedesktop.machine1.policy.in.h:5 msgid "Acquire a shell in a local container" @@ -415,7 +413,7 @@ msgstr "在本地容器中获取一个 shell" #: ../src/machine/org.freedesktop.machine1.policy.in.h:6 msgid "Authentication is required to acquire a shell in a local container." -msgstr "要在本地容器中获取 shell 需要验证。" +msgstr "在本地容器中获取 shell 需要认证。" #: ../src/machine/org.freedesktop.machine1.policy.in.h:7 msgid "Acquire a shell on the local host" @@ -423,7 +421,7 @@ msgstr "在本地主机中获取一个 shell" #: ../src/machine/org.freedesktop.machine1.policy.in.h:8 msgid "Authentication is required to acquire a shell on the local host." -msgstr "要在本地主机中获取 shell 需要验证。" +msgstr "在本地主机中获取 shell 需要认证。" #: ../src/machine/org.freedesktop.machine1.policy.in.h:9 msgid "Acquire a pseudo TTY in a local container" @@ -432,7 +430,7 @@ msgstr "在本地容器中获取一个假 TTY" #: ../src/machine/org.freedesktop.machine1.policy.in.h:10 msgid "" "Authentication is required to acquire a pseudo TTY in a local container." -msgstr "要在本地容器中获取假 TTY 需要验证。" +msgstr "在本地容器中获取假 TTY 需要认证。" #: ../src/machine/org.freedesktop.machine1.policy.in.h:11 msgid "Acquire a pseudo TTY on the local host" @@ -440,7 +438,7 @@ msgstr "在本地主机中获取一个假 TTY" #: ../src/machine/org.freedesktop.machine1.policy.in.h:12 msgid "Authentication is required to acquire a pseudo TTY on the local host." -msgstr "要在本地主机中获取假 TTY 需要验证。" +msgstr "在本地主机中获取假 TTY 需要认证。" #: ../src/machine/org.freedesktop.machine1.policy.in.h:13 msgid "Manage local virtual machines and containers" @@ -449,7 +447,7 @@ msgstr "管理本地虚拟机和容器" #: ../src/machine/org.freedesktop.machine1.policy.in.h:14 msgid "" "Authentication is required to manage local virtual machines and containers." -msgstr "要管理本地虚拟机和容器需要验证。" +msgstr "管理本地虚拟机和容器需要认证。" #: ../src/machine/org.freedesktop.machine1.policy.in.h:15 msgid "Manage local virtual machine and container images" @@ -459,7 +457,7 @@ msgstr "管理本地虚拟机和容器的镜像" msgid "" "Authentication is required to manage local virtual machine and container " "images." -msgstr "要管理本地的虚拟机和容器镜像需要验证。" +msgstr "管理本地的虚拟机和容器镜像需要认证。" #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:1 msgid "Set system time" @@ -467,7 +465,7 @@ msgstr "设置系统时间" #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:2 msgid "Authentication is required to set the system time." -msgstr "设置系统时间需要验证。" +msgstr "设置系统时间需要认证。" #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:3 msgid "Set system timezone" @@ -475,7 +473,7 @@ msgstr "设置系统时区" #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:4 msgid "Authentication is required to set the system timezone." -msgstr "设置系统时区需要验证。" +msgstr "设置系统时区需要认证。" #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:5 msgid "Set RTC to local timezone or UTC" @@ -485,7 +483,7 @@ msgstr "设置硬件时钟使用本地时间或 UTC" msgid "" "Authentication is required to control whether the RTC stores the local or " "UTC time." -msgstr "设置硬件时钟使用本地时间或 UTC 需要验证。" +msgstr "设置硬件时钟使用本地时间或 UTC 需要认证。" #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:7 msgid "Turn network time synchronization on or off" @@ -495,33 +493,32 @@ msgstr "打开或关闭网络时间同步" msgid "" "Authentication is required to control whether network time synchronization " "shall be enabled." -msgstr "设置是否启用网络时间同步需要验证。" +msgstr "打开或关闭网络时间同步需要认证。" #: ../src/core/dbus-unit.c:430 msgid "Authentication is required to start '$(unit)'." -msgstr "启动“$(unit)”需要验证。" +msgstr "启动“$(unit)”需要认证。" #: ../src/core/dbus-unit.c:431 msgid "Authentication is required to stop '$(unit)'." -msgstr "停止“$(unit)”需要验证。" +msgstr "停止“$(unit)”需要认证。" #: ../src/core/dbus-unit.c:432 msgid "Authentication is required to reload '$(unit)'." -msgstr "重新载入“$(unit)”需要验证。" +msgstr "重新载入“$(unit)”需要认证。" #: ../src/core/dbus-unit.c:433 ../src/core/dbus-unit.c:434 msgid "Authentication is required to restart '$(unit)'." -msgstr "重新启动“$(unit)”需要验证。" +msgstr "重新启动“$(unit)”需要认证。" #: ../src/core/dbus-unit.c:537 msgid "Authentication is required to kill '$(unit)'." -msgstr "杀死“$(unit)”需要验证。" +msgstr "杀死“$(unit)”需要认证。" #: ../src/core/dbus-unit.c:567 msgid "Authentication is required to reset the \"failed\" state of '$(unit)'." -msgstr "重置“$(unit)”的失败（\"failed\"）状态需要验证。" +msgstr "重置“$(unit)”的失败（\"failed\"）状态需要认证。" #: ../src/core/dbus-unit.c:599 msgid "Authentication is required to set properties on '$(unit)'." -msgstr "设置“$(unit)”的属性需要验证。" - +msgstr "设置“$(unit)”的属性需要认证。" diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c index adc9286612..6d53dd982c 100644 --- a/src/ask-password/ask-password.c +++ b/src/ask-password/ask-password.c @@ -34,6 +34,7 @@ static const char *arg_keyname = NULL; static char *arg_message = NULL; static usec_t arg_timeout = DEFAULT_TIMEOUT_USEC; static bool arg_multiple = false; +static bool arg_no_output = false; static AskPasswordFlags arg_flags = ASK_PASSWORD_PUSH_CACHE; static void help(void) { @@ -48,6 +49,7 @@ static void help(void) { " --no-tty Ask question via agent even on TTY\n" " --accept-cached Accept cached passwords\n" " --multiple List multiple passwords if available\n" + " --no-output Do not print password to standard output\n" , program_invocation_short_name); } @@ -62,6 +64,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_MULTIPLE, ARG_ID, ARG_KEYNAME, + ARG_NO_OUTPUT, }; static const struct option options[] = { @@ -74,6 +77,7 @@ static int parse_argv(int argc, char *argv[]) { { "multiple", no_argument, NULL, ARG_MULTIPLE }, { "id", required_argument, NULL, ARG_ID }, { "keyname", required_argument, NULL, ARG_KEYNAME }, + { "no-output", no_argument, NULL, ARG_NO_OUTPUT }, {} }; @@ -125,6 +129,10 @@ static int parse_argv(int argc, char *argv[]) { arg_keyname = optarg; break; + case ARG_NO_OUTPUT: + arg_no_output = true; + break; + case '?': return -EINVAL; @@ -166,7 +174,8 @@ int main(int argc, char *argv[]) { } STRV_FOREACH(p, l) { - puts(*p); + if (!arg_no_output) + puts(*p); if (!arg_multiple) break; diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c index 33f2ee96d8..5faa2eba05 100644 --- a/src/basic/mount-util.c +++ b/src/basic/mount-util.c @@ -47,7 +47,7 @@ static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *mnt_id if ((flags & AT_EMPTY_PATH) && isempty(filename)) xsprintf(path, "/proc/self/fdinfo/%i", fd); else { - subfd = openat(fd, filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_PATH); + subfd = openat(fd, filename, O_CLOEXEC|O_PATH); if (subfd < 0) return -errno; @@ -230,7 +230,7 @@ int path_is_mount_point(const char *t, int flags) { if (!parent) return -ENOMEM; - fd = openat(AT_FDCWD, parent, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_PATH); + fd = openat(AT_FDCWD, parent, O_DIRECTORY|O_CLOEXEC|O_PATH); if (fd < 0) return -errno; diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c index 8d7f14f382..8256899eda 100644 --- a/src/basic/xattr-util.c +++ b/src/basic/xattr-util.c @@ -110,7 +110,7 @@ ssize_t fgetxattrat_fake(int dirfd, const char *filename, const char *attribute, /* The kernel doesn't have a fgetxattrat() command, hence let's emulate one */ - fd = openat(dirfd, filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_PATH|(flags & AT_SYMLINK_NOFOLLOW ? O_NOFOLLOW : 0)); + fd = openat(dirfd, filename, O_CLOEXEC|O_PATH|(flags & AT_SYMLINK_NOFOLLOW ? O_NOFOLLOW : 0)); if (fd < 0) return -errno; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 11e26ce737..c741baf58a 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -6162,9 +6162,19 @@ static int edit(int argc, char *argv[], void *userdata) { r = daemon_reload(argc, argv, userdata); end: - STRV_FOREACH_PAIR(original, tmp, paths) + STRV_FOREACH_PAIR(original, tmp, paths) { (void) unlink(*tmp); + /* Removing empty dropin dirs */ + if (!arg_full) { + _cleanup_free_ char *dir = dirname_malloc(*original); + /* no need to check if the dir is empty, rmdir + * does nothing if it is not the case. + */ + (void) rmdir(dir); + } + } + return r; } diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index f3487013cf..946808fbec 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -613,7 +613,7 @@ static int path_set_perms(Item *i, const char *path) { * with AT_SYMLINK_NOFOLLOW, hence we emulate it here via * O_PATH. */ - fd = open(path, O_RDONLY|O_NOFOLLOW|O_CLOEXEC|O_PATH|O_NOATIME); + fd = open(path, O_NOFOLLOW|O_CLOEXEC|O_PATH); if (fd < 0) return log_error_errno(errno, "Adjusting owner and mode for %s failed: %m", path); @@ -804,7 +804,7 @@ static int path_set_acls(Item *item, const char *path) { assert(item); assert(path); - fd = open(path, O_RDONLY|O_NOFOLLOW|O_CLOEXEC|O_PATH|O_NOATIME); + fd = open(path, O_NOFOLLOW|O_CLOEXEC|O_PATH); if (fd < 0) return log_error_errno(errno, "Adjusting ACL of %s failed: %m", path); |