From: Aaron Thompson <dev@aaront.org>
Date: Sat, 1 May 2021 01:20:14 +0000 (+0000)
Subject: conf: fix console chmod error log messages
X-Git-Tag: lxc-5.0.0~181^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07020e481a0a25f0491ad2e377658ee3cebbb750;p=thirdparty%2Flxc.git

conf: fix console chmod error log messages

Signed-off-by: Aaron Thompson <dev@aaront.org>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 10b20a04b..ecac10950 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1826,7 +1826,7 @@ static int lxc_setup_dev_console(struct lxc_rootfs *rootfs,
 
 	ret = fchmod(console->pty, 0620);
 	if (ret < 0)
-		return log_error_errno(-errno, errno, "Failed to set mode \"0%o\" to \"%s\"", S_IXUSR | S_IXGRP, console->name);
+		return log_error_errno(-errno, errno, "Failed to set mode \"0%o\" to \"%s\"", 0620, console->name);
 
 	if (can_use_mount_api()) {
 		ret = lxc_bind_mount_console(console, rootfs->dfd_dev, "console");
@@ -1888,7 +1888,7 @@ static int lxc_setup_ttydir_console(struct lxc_rootfs *rootfs,
 
 	ret = fchmod(console->pty, 0620);
 	if (ret < 0)
-		return log_error_errno(-errno, errno, "Failed to set mode \"0%o\" to \"%s\"", S_IXUSR | S_IXGRP, console->name);
+		return log_error_errno(-errno, errno, "Failed to set mode \"0%o\" to \"%s\"", 0620, console->name);
 
 	/* bind mount console->name to '/dev/<ttydir>/console' */
 	if (can_use_mount_api()) {