Commit Graph

8184 Commits

Author SHA1 Message Date
Wolfgang Bumiller
b3fc069e41
Merge pull request #2749 from brauner/2018-12-11/storage_utils
storage: src cannot be truncated
2018-12-11 14:26:11 +01:00
Christian Brauner
4f08c8d46f
storage: remove unused function
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2018-12-11 13:54:35 +01:00
Christian Brauner
be50a0d9c5
Merge pull request #2747 from ffontaine/master
configure.ac: fix build without stack-protector
2018-12-07 19:42:06 +13:00
Fabrice Fontaine
3aa7271157 configure.ac: fix build without stack-protector
Compiler based hardening (including -fstack-protector-strong) are
enabled since version 3.0.3 and
2268c27754

However, some compilers could missed the needed library (-lssp or
-lssp_nonshared) at linking step so use ax_check_link_flag instead of
ax_check_compile_flag

Fixes:
 - http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2018-12-04 21:13:47 +01:00
Christian Brauner
c1b70110c8
Merge pull request #2745 from ffontaine/master
stringutils: include stdarg for va_list
2018-12-04 14:41:24 +13:00
Fabrice Fontaine
b7df06ad14 stringutils: include stdarg for va_list
Fixes:
 - http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2018-12-03 22:18:16 +01:00
Adam Kasztenny
0e40f65d1d Add template-options to help output
Copied from the [manpage](9e42c1e3f1/doc/lxc-create.sgml.in (L175)).

Signed-off-by: Adam Kasztenny <adamkasztenny@gmail.com>
2018-11-30 12:37:24 -05:00
Christian Brauner
9e42c1e3f1
Merge pull request #2743 from 2xsec/build
fix install error when using --disable-commands option
2018-11-30 20:53:09 +13:00
Christian Brauner
ec4b01c01e
Merge pull request #2740 from CameronNemo/usernsexec
lxc-usernsexec: fix default map functionality
2018-11-30 20:37:28 +13:00
2xsec
9760cfccf2
fix install error when using --disable-commands option
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-30 15:31:31 +09:00
Cameron Nemo
c14ea11dcc
lxc-usernsexec: fix default map functionality
* Place NULL bytes at the end of strings so that
  lxc_safe_ulong() can parse them correctly

* Only free the newly created id_map on error,
  to avoid passing garbage to lxc_map_ids()

Signed-off-by: Cameron Nemo <camerontnorman@gmail.com>
2018-11-28 21:04:34 -08:00
Stéphane Graber
b8f44de376
Merge pull request #2739 from tenforward/japanese
Add allowrunning option into Japanese lxc-copy(1)
2018-11-26 11:28:04 -05:00
KATOH Yasufumi
b73cea6088 Add allowrunning option into Japanese lxc-copy(1)
Update for commit 754076f

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2018-11-27 01:16:04 +09:00
Christian Brauner
77068929d7
Merge pull request #2737 from 2xsec/docs
doc: Add -a, --allowrunning arg to Korean lxc-copy(1)
2018-11-23 22:59:58 +13:00
2xsec
1cfc8b9ab7
doc: Add -a, --allowrunning arg to Korean lxc-copy(1)
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-23 18:33:12 +09:00
Christian Brauner
137da20a4d
Merge pull request #1943 from bhelm/master
Added allowrunning command line option for snapshotting running containers
2018-11-23 11:51:47 +13:00
Stéphane Graber
f0d33515ba
Merge pull request #2732 from brauner/2018-11-21/remove_freezer_requirement
cgfsng: remove freezer requirement
2018-11-20 12:27:16 -05:00
Christian Brauner
4143c201d1
cgfsng: remove freezer requirement
The freezer controller has been made optional in all other codepaths so
don't require it.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2018-11-20 18:06:43 +01:00
Christian Brauner
4d2ec4c460
Merge pull request #2731 from rst0git/master
autotools: fix lxc-{create,copy} build
2018-11-20 15:19:22 +13:00
Radostin Stoyanov
04fe051213 autotools: fix lxc-{create,copy} build
After commit 2b670df lxc-create and lxc-copy fails with "undefined
symbol: get_fssize".

Closes #2730

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
2018-11-20 01:12:50 +00:00
Stéphane Graber
7b9e865413
Merge pull request #2728 from brauner/2018-11-19/keyctl_non_fatal
utils: make keyring allocation failure non-fatal
2018-11-18 18:43:42 -08:00
Christian Brauner
6af699fc0e
utils: make keyring allocation failure non-fatal
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2018-11-19 03:26:58 +01:00
Christian Brauner
ac71480501
Merge pull request #2727 from Blub/2018-11-16/apparmor.ro-bind-remount-combinations
apparmor: allow various remount,bind options
2018-11-16 08:18:35 -08:00
Wolfgang Bumiller
e6ec0a9e71 apparmor: allow various remount,bind options
RW bind mounts need to be restricted for some paths in
order to avoid MAC restriction bypasses, but read-only bind
mounts shouldn't have that problem.

Additionally, combinations of 'nosuid', 'nodev' and
'noexec' flags shouldn't be a problem either and are
required with newer systemd versions, so let's allow those
as long as they're combined with 'ro,remount,bind'.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
2018-11-16 12:17:30 +01:00
Christian Brauner
c891ab355b
Merge pull request #2725 from tomponline/tp-lvcreate
Adds -qq flags to lvcreate commands
2018-11-15 10:48:17 -08:00
tomponline
d1acfd5471 Adds -qq flags to lvcreate commands to avoid answer 'no' to ant questions the LVM subsystem asks to avoid hanging lxc-create command
Signed-off-by: tomponline <tomp@tomp.uk>
2018-11-15 09:12:34 +00:00
Christian Brauner
d25dcf18df
Merge pull request #2723 from 2xsec/bugfix
pam_cgfs: remove dependency & redundancy functions
2018-11-09 11:22:19 +01:00
2xsec
2f32e37ef4
utils: add errno logs for exception case
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-09 16:10:15 +09:00
2xsec
7be6bcd523
utils: fix coding styles
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-09 16:08:37 +09:00
2xsec
c4a090bebf
pam_cgfs: remove dependency from cap & log
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-09 16:06:33 +09:00
2xsec
f25a2044bf
cgfs: remove redundancy utils
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-09 14:10:46 +09:00
2xsec
a6de11a79b
pam_cgfs: remove redundancy file utils
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-09 13:43:41 +09:00
Stéphane Graber
72da60a6e5
Merge pull request #2722 from brauner/lxc/master
conf: s/ty/tty/g
2018-11-08 14:35:09 -05:00
Christian Brauner
7d7333b3d0
conf: s/ty/tty/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2018-11-08 18:55:16 +01:00
Christian Brauner
891a355f99
Merge pull request #2720 from 2xsec/bugfix
replace read & write syscalls with nointr functions
2018-11-08 11:41:38 +01:00
Christian Brauner
30acf2823b
Merge pull request #2721 from 2xsec/tizen
dlog: move match_dlog_fds()
2018-11-08 11:40:34 +01:00
2xsec
1d5e5f26b8
dlog: move match_dlog_fds()
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-08 19:18:41 +09:00
2xsec
809d44495a
log: replace write with lxc_write_nointr
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-08 19:01:03 +09:00
2xsec
89882306f9
caps: replace read with lxc_read_nointr
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-08 19:00:19 +09:00
Christian Brauner
d2b2f6298c
Merge pull request #2719 from ssup2/master
Fix spacing error in namespace.c
2018-11-06 19:10:25 +01:00
Jungsub
6e055cceb2 Fix spacing error in namespace.c
Signed-off-by: Jungsub Shin supsup5642@tmax.co.kr
2018-11-06 14:25:11 +00:00
Stéphane Graber
acf50cfedf
Merge pull request #2717 from brauner/2018-11-02/fix_android
include: correctly include macro.h
2018-11-02 18:40:26 -04:00
Christian Brauner
a9b8dbfa95
include: correctly include macro.h
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2018-11-02 23:20:46 +01:00
Christian Brauner
e814299f2d
coverity: move to separate branch
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2018-11-02 12:35:08 +01:00
Christian Brauner
1409ee16ff
Merge pull request #2715 from 2xsec/bugfix
lxcmntent: coding rules
2018-11-02 13:57:20 +03:00
Christian Brauner
3bcfbee152
Merge pull request #2716 from 2xsec/tizen
log: fix too wide or inconsistent non-owner permissions
2018-11-02 13:56:36 +03:00
2xsec
9b681921e5
log: fix too wide or inconsistent non-owner permissions
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-02 15:25:14 +09:00
2xsec
b9bb8bbbf3
string_utils: coding rules
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-02 15:17:50 +09:00
2xsec
5f76b90f47
lxcmntent: coding rules
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
2018-11-02 15:17:14 +09:00
Stéphane Graber
a8c7d037e3
Merge pull request #2714 from brauner/2018-11-01/remove_accidental_debug_statements
confile: remove debug printf()s
2018-11-01 19:58:16 -04:00