Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

further lxc 2.1 preparations #1757

Merged
merged 17 commits into from
Aug 25, 2017
Merged

further lxc 2.1 preparations #1757

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1a0e70a
tree-wide: non-functional changes
Aug 23, 2017
4742cd9
conf: non-functional fixup
Aug 23, 2017
104cd54
cgroups: non-functional changes
Aug 23, 2017
43654d3
confile: add "lxc.cgroup.dir"
Aug 23, 2017
dae8c25
tests: add tests for lxc.cgroup.dir
Aug 23, 2017
cb0dc11
network: log cleanup thread pid for openswitch
Aug 23, 2017
ebc73a6
network: non-functional changes
Aug 23, 2017
e771c51
lxc-user-nic: non-functional changes
Aug 24, 2017
a41162a
conf: non-functional changes
Aug 24, 2017
1efc106
conf: log lxc-user-nic output
Aug 24, 2017
581c75e
openvswitch: delete ports intelligently
Aug 24, 2017
f5c0d3f
conf: refactor network deletion
Aug 24, 2017
9c538d8
conf: do not check union on wrong net type
Aug 24, 2017
736da9d
rtnl: non-functional changes
Aug 25, 2017
77b0073
af_unix: non-functional changes
Aug 25, 2017
ea0eb48
arguments: non-functional changes
Aug 25, 2017
6f4f193
attach: non-functional changes
Aug 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
conf: non-functional fixup 
Surfaced while building lxc-2.0.8 on e2k architecture with lcc,
looks like its -Wall is more pedantic than gcc's:

lcc: "conf.c", line 1514: error: unrecognized character escape sequence
          [-Werror]
        DEBUG("created directory for console and tty devices at \%s\"", path);
                                                                ^
 in expansion of macro "DEBUG" at line 1514

Another byte is a leading whitespace fix while at that.

Signed-off-by: Michael Shigorin <mike@altlinux.org>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Aug 24, 2017
commit 4742cd9a30eadcf3ef637e99e7a357b91f58b41d
2 changes: 1 addition & 1 deletion src/lxc/conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,7 +1520,7 @@ static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs,
SYSERROR("failed with errno %d to create %s", errno, path);
return -errno;
}
DEBUG("created directory for console and tty devices at \%s\"", path);
DEBUG("Created directory for console and tty devices at \"%s\"", path);

ret = snprintf(lxcpath, sizeof(lxcpath), "%s/dev/%s/console", rootfs->mount, ttydir);
if (ret < 0 || (size_t)ret >= sizeof(lxcpath))
Expand Down