开源软件构建与测试

Changes of Revision 3

_service:tar_scm:lxc.spec Changed

@@ -1,58 +1,36 @@
-%global _release 2022102422
+%global _release 9
+%global enable_isulad 1
 
 Name:           lxc
-Version:        4.0.3
+Version:        5.0.2
 Release:        %{_release}
 Summary:        Linux Containers userspace tools
 License:        LGPLv2+ and GPLv2 and GPLv3
 URL:            https://github.com/lxc/lxc
-Source0:        https://linuxcontainers.org/downloads/lxc/lxc-4.0.3.tar.gz
-
-Patch0001:	0001-refactor-patch-code-of-utils-commands-and-so-on.patch
-Patch0002:	0002-refactor-patch-code-of-isulad-for-conf-exec-attach.patch
-Patch0003:	0003-refactor-patch-code-of-isulad-for-selinux-attach.patch
-Patch0004:	0004-refactor-patch-code-of-lxccontianer-and-so-on.patch
-Patch0005:	0005-refactor-patch-code-of-attach-and-seccomp.patch
-Patch0006:	0006-refactor-patch-about-namespace-log-terminal.patch
-Patch0007:	0007-refactor-patches-on-terminal.c-start.c-and-so-on.patch
-Patch0008:	0008-refactor-patch-code-of-json.patch
-Patch0009:	0009-fix-HOME-env-of-container-unset-error.patch
-Patch0010:	0010-check-yajl-only-when-have-isulad.patch
-Patch0011:	0011-drop-security_context_t.patch
-Patch0012:	0012-only-set-user-or-image-set-non-empty-HOME.patch
-Patch0013:	0013-return-fail-if-no-args-or-no-rootfs-path-found.patch
-Patch0014:	0014-fix-tools-using-option-give-error-message.patch
-Patch0015:	0015-fix-do-mask-pathes-after-parent-mounted.patch
-Patch0016:	0016-skip-kill-cgroup-processes-if-no-hierarchies.patch
-Patch0017:	0017-lxc-Add-sw64-architecture.patch
-Patch0018:	0018-add-macro-to-adapt-musl-libc.patch
-Patch0019:	0019-add-lxc-attach-add-gids-option.patch
-Patch0020:	0020-add-sscanf-adapation-code-for-musl.patch
-Patch0021:	0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch
-Patch0022:	0022-fix-cve-CVE-2022-47952-log-leaks-root-information.patch
-Patch0023:	0023-fix-lxc-write-error-message.patch
-Patch0024:	0024-remove-process-inheritable-capability.patch
-Patch0025:	0025-fix-ops-hierarchies-cause-coredump.patch
-Patch0026:	0026-meminfo-cri-1.25.patch
-Patch0027:	0027-add-loongarch64-support-for-lxc.patch
-Patch0028:	0028-use-ocihooks-env-after-getenv.patch
-Patch0029:	0029-fix-mixed-use-of-signed-and-unsigned-type.patch
-Patch0030:	0030-remove-unused-meminfo-stats.patch
-Patch0031:	0031-lxc-attach-Fix-lost-return-codes-of-spawned-processe.patch
-Patch0032:	0032-fix-load-bpf-failed.patch
-Patch0033:	0033-fix-mount-device-path-incorrect.patch
-Patch0034:	0034-add-secure-compile-macro.patch
-Patch0035:	0035-codecheck-fix.patch
+Source0:        https://linuxcontainers.org/downloads/lxc/lxc-5.0.2.tar.gz
+
+Patch0001:	0001-iSulad-add-json-files-and-adapt-to-meson.patch
+Patch0002:	0002-iSulad-adapt-security-conf-attach-cgroup-and-start.patch
+Patch0003:	0003-iSulad-adapt-conf-network-storage-and-termianl.patch
+Patch0004:	0004-iSulad-adapt-confile-lxccontainer-and-start.patch
+Patch0005:	0005-fix-compile-error.patch
+Patch0006:	0006-remove-isulad_cgfsng.patch
+Patch0007:	0007-fix-run-container-failed-when-enable-isulad.patch
+Patch0008:	0008-bugfix-for-system-container-and-stream.patch
+Patch0009:	0009-bugfix-about-cgroup-mount-propagation-and-capabiliti.patch
+Patch0010:	0010-add-storage-block-code-for-embedded-image.patch
+Patch0011:	0011-skip-setup-console-if-disable-pty-and-fix-syscontain.patch
+Patch0012:	0012-fix-dev-mount-failed-and-skip-send-recv-devpts_fd-if.patch
 
 BuildRequires:  systemd-units git libtool graphviz docbook2X doxygen chrpath
 BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  libcap libcap-devel libselinux-devel yajl yajl-devel
-BuildRequires:  pkgconfig(bash-completion)
+BuildRequires:  pkgconfig(bash-completion) meson
 %ifarch riscv64
 BuildRequires:  libatomic_ops
 %endif
 
-Requires:       lxc-libs = 4.0.3-%{release}
+Requires:       lxc-libs = 5.0.2-%{release}
 
 %package           libs
 Summary:           Runtime library files for %{name}
@@ -70,7 +48,7 @@
 The %{name}-libs package contains libraries for running %{name} applications.
 
 
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/lxc-4.0.3}
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/lxc-5.0.2}
 
 %description
 Containers are insulated areas inside a system, which have their own namespace
@@ -84,7 +62,7 @@
 
 %package        devel
 Summary:        Development files for lxc
-Requires:       lxc = 4.0.3-%{release}
+Requires:       lxc = 5.0.2-%{release}
 Requires:       pkgconfig
 
 %description    devel
@@ -100,19 +78,18 @@
 This package contains documentation for lxc for creating containers.
 
 %prep
-%autosetup -n lxc-4.0.3 -Sgit -p1
+%autosetup -n lxc-5.0.2 -Sgit -p1
 
 %build
 %ifarch riscv64
 export LDFLAGS="%{build_ldflags} -latomic -pthread"
 %endif
-%configure --enable-doc --enable-api-docs \
-           --disable-silent-rules --docdir=%{_pkgdocdir} --disable-rpath \
-           --disable-static --disable-apparmor --enable-selinux \
-           --enable-seccomp \
-           --with-init-script=systemd --disable-werror
-
-%{make_build}
+%if 0%{?enable_isulad}
+meson setup -Disulad=true -Dtests=true -Dprefix=/usr build
+%else
+meson setup -Disulad=false -Dtests=true -Dprefix=/usr build
+%endif
+meson compile -C build
 
 %install
 %{make_install}
@@ -143,11 +120,9 @@
 chmod +x %{buildroot}/usr/lib64/liblxc.so
 %endif
 # docs
-mkdir -p %{buildroot}%{_pkgdocdir}/api
 %ifarch sw_64
 %else
-cp -a AUTHORS README %{buildroot}%{_pkgdocdir}
-cp -a doc/api/html/* %{buildroot}%{_pkgdocdir}/api/
+cp -a AUTHORS %{buildroot}%{_pkgdocdir}
 %endif
 
 # cache dir
@@ -164,7 +139,7 @@
 rm -rf %{buildroot}%{_sbindir}/init.%{name}.static
 rm -rf %{buildroot}%{_sysconfdir}/default/%{name}
 %check
-%make_build check
+meson test -C build
 
 %post
 
@@ -178,7 +153,8 @@
 %{_datadir}/%{name}/%{name}.functions
 %dir %{_datadir}/bash-completion
 %dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/lxc
+%{_datadir}/bash-completion/completions/*
+
 %files libs
 %defattr(-,root,root)
 %{_libdir}/liblxc.so
@@ -188,7 +164,6 @@
 %{_sbindir}/init.%{name}
 %{_sharedstatedir}/%{name}
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/default.conf
 %config(noreplace) %{_sysconfdir}/lxc/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
 
@@ -197,14 +172,15 @@
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}@.service
 %{_unitdir}/%{name}-net.service
+%{_unitdir}/%{name}-monitord.service
 %dir %{_localstatedir}/cache/%{name}
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/liblxc.a
 %{_includedir}/%{name}/*
 %{_libdir}/pkgconfig/%{name}.pc
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/hooks
 %{_datadir}/%{name}/lxc-patch.py*
 %{_datadir}/%{name}/selinux
 %dir %{_datadir}/%{name}/templates
@@ -213,6 +189,9 @@
 %{_datadir}/%{name}/config/*
 %dir %{_datadir}/%{name}/__pycache__
 %{_datadir}/%{name}/__pycache__/*
+%if !0%{?enable_isulad}
+%{_datadir}/%{name}/hooks
+%endif
 
 
 %files help
@@ -229,509 +208,56 @@
 %endif
 
 %changelog
-* Mon Sep 11 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102422
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: rollback to 4.0.3
-
-* Mon Jul 10 2023 mzzhou<1362843687@qq.com> - 4.0.3-2022102421
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: add secure compile macro
-
-* Fri Jun 16 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102420
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: fix mount device path incorrect
-
-* Sat May 06 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102419
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: fix load bpf failed
-
-* Thu May 04 2023 Jian Zhang<zhang_jian7@hoperun.com> - 4.0.3-2022102418
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: fix lost return codes of spawned processe
-
-* Fri Apr 21 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102417
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: remove unused meminfo stats
-
-* Mon Apr 17 2023 wangrunze<wangrunze13@huawei.com> - 4.0.3-2022102416
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: fix mixed use of signed and unsigned type
-
-* Thu Mar 30 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102415
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: use ocihooks env after getenv
-
-* Sat Mar 04 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 4.0.3-2022102414
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: add loongarch64 support for lxc
-
-* Mon Feb 27 2023 Ilya.kuksenok<ilya.kuksenok@huawei.com> - 4.0.3-2022102413
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: Add meminfo required for CRI-1.25 
-
-* Wed Feb 22 2023 wangrunze<wangrunze13@huawei.com> - 4.0.3-2022102412
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: fix ops hierarchies cause coredump 
-
-* Wed Feb 22 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.0.3-2022102411
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: fix RISC-V build errors
-
-* Fri Feb 17 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102410
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: remove process inheritable capabilities
-
-* Mon Feb 13 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 4.0.3-2022102409
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:optimize test command
-
-* Wed Feb 08 2023 huangsong<huangsong14@huawei.com> - 4.0.3-2022102408
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: fix lxc write error message
-
-* Fri Jan 13 2023 wangrunze<wangrunze13@huawei.com> - 4.0.3-2022102407
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: fix cve CVE-2022-47952 log leaks root information
-
-* Fri Dec 16 2022 huangsong<huangsong14@huawei.com> - 4.0.3-2022102406
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: change the suffi parameter in lxc attach --help output
-
-* Thu Dec 08 2022 zhongtao<zhongtao17@huawei.com> - 4.0.3-2022102405
-- Type:bugfix
+* Fri Jan 12 2024 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 5.0.2-9
+- Type: bugfix
 - ID:NA
 - SUG:NA
-- DESC: add sscanf adapation code for musl
+- DESC: fix dev mount failed and skip send/recv devpts_fd if disable_pty
 
-* Fri Dec 02 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102404
-- Type:bugfix
+* Thu Jan 04 2024 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 5.0.2-8
+- Type: bugfix
 - ID:NA
 - SUG:NA
-- DESC: add lxc-attach add-gids option
+- DESC: skip setup console if disable pty and fix syscontainer-hooks write devices rule useless
 
-* Thu Nov 24 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102403
-- Type:bugfix
+* Fri Dec 29 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 5.0.2-7
+- Type: bugfix
 - ID:NA
 - SUG:NA
-- DESC: add macro to adapt musl libc
+- DESC: add storage block code for embedded image
 
-* Wed Nov 9 2022 hejunjie<hejunjie10@huawei.com> - 4.0.3-2022102402
-- Type:bugfix
+* Thu Dec 07 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 5.0.2-6
+- Type: bugfix
 - ID:NA
 - SUG:NA
-- DESC: remove duplicated README and AUTHORS cross lxc-lib and lxc-help
+- DESC: bugfix about cgroup, mount propagation and capabilities
 
-* Mon Oct 24 2022 wuzx<wuzx1226@qq.com> - 4.0.3-2022102401
-- Type:feature
-- CVE:NA
-- SUG:NA
-- DESC:Add sw64 architecture
-
-* Mon Oct 17 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022101701
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: update version to 4.0.3-2022101701
-
-* Thu Sep 22 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022092201
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: skip kill cgroup processes if no hierarchies
-
-* Tue Sep 20 2022 Neil.wrz<wangrunze13@huawei.com> - 4.0.3-2022092001
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: do mask pathes after parent mounted 
-
-* Fri Sep 2 2022 Neil.wrz<wangrunze13@huawei.com> - 4.0.3-2022090201
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: fix tools using -? option give error 
-
-* Thu Sep 1 2022 zhongtao<zhongtao17@huawei.com> - 4.0.3-2022090101
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: add git config in apply-patches
-
-* Sat Aug 20 2022 wangfengtu<wangfengtu@huawei.com> - 4.0.3-2022082001
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: do not check rootfs.path, it may be null if rootfs is "/"
-
-* Fri Aug 19 2022 wangfengtu<wangfengtu@huawei.com> - 4.0.3-2022081901
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: return fail if no args or no rootfs path found
-
-* Tue Aug 9 2022 haozi007<liuhao27@huawei.com> - 4.0.3-2022080901
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: only set user or image set non empty HOME
-
-* Tue Jul 26 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022072601
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: drop security_context_t
-
-* Mon Jul 25 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022072502
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: check yajl only when have isulad
-
-* Mon Jul 25 2022 haozi007<liuhao27@huawei.com> - 4.0.3-2022072501
-- Type:bugfix
+* Wed Nov 01 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 5.0.2-5
+- Type: bugfix
 - ID:NA
 - SUG:NA
-- DESC: fix HOME env unset error
+- DESC: bugfix for system container and stream
 
-* Thu Jul 21 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022072104
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: add header to fix compile error with have isulad
-
-* Thu Jul 21 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022072103
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: fix compile error
-
-* Thu Jul 21 2022 chengzeruizhi<chengzeruizhi@huawei.com> - 4.0.3-2022072102
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: refactor patch code of json
-
-* Thu Jul 21 2022 chengzeruizhi<chengzeruizhi@huawei.com> - 4.0.3-2022072101
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: refactor patches on terminal.c, start.c and others
-
-* Tue Jul 19 2022 wangrunze<wangrunze13@huawei.com> - 4.0.3-2022071904
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: refactor namespace terminal log 
-
-* Tue Jul 19 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022071903
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: refactor patch code of attach and seccomp
-
-* Tue Jul 19 2022 wangfengtu<wangfengtu@huawei.com> - 4.0.3-2022071902
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: refactor patch code of lxccontainer and so on
-
-* Tue Jul 19 2022 haozi007<liuhao27@huawei.com> - 4.0.3-2022071901
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: refactor patch code of isulad for selinux/attach
-
-* Mon Jul 18 2022 haozi007<liuhao27@huawei.com> - 4.0.3-2022071801
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: refactor patch code of isulad for conf/exec/attach and so on
-
-* Fri Jul 15 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022071501
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: refactor patch code of utils commands and so on
-
-* Wed May 25 2022 hejunjie<hejunjie10@huawei.com> - 4.0.3-2022052501
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: correct license info
-
-* Mon May 23 2022 wangfengtu<wangfengtu@huawei.com> - 4.0.3-2022052301
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: do not operate playload and attach cgroup if no controller found
-
-* Sat May 21 2022 wangfengtu<wangfengtu@huawei.com> - 4.0.3-2022052101
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: add x permission when create directory
-
-* Fri Apr 15 2022 wujing<wujing50@huawei.com> - 4.0.3-2022041501
-- Type:refactor
-- ID:NA
-- SUG:NA
-- DESC: refactor the way to convert selinux label to shared mode
-
-* Sat Apr 09 2022 wujing<wujing50@huawei.com> - 4.0.3-2022040901
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: fix bug of memory free
-
-* Thu Mar 17 2022 haozi007<liuhao27@huawei.com> - 4.0.3-2022031701
-- Type:improve
-- ID:NA
-- SUG:NA
-- DESC: fix unnecessary print error message
-
-* Mon Feb 21 2022 chegJH   <hejunjie10@huawei.com> - 4.0.3-2022022101
-- Type:improve
-- ID:NA
-- SUG:NA
-- DESC: fix alwasy print and len
-
-* Tue Feb 15 2022 chegJH   <hejunjie10@huawei.com> - 4.0.3-2022021501
-- Type:improve
-- ID:NA
-- SUG:NA
-- DESC:changes for compile in android env
-
-* Mon Dec 27 2021 haozi007 <liuhao27@huawei.com> - 4.0.3-2021122701
-- Type:improve
-- ID:NA
-- SUG:NA
-- DESC:adapt upstream compiler settings
-
-* Thu Nov 25 2021 wangfengtu<wangfengtu@huawei.com> - 4.0.3-2021112501
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:fix cgroup attach cgroup creation
-
-* Fri Nov 19 2021 wangfengtu<wangfengtu@huawei.com> - 4.0.3-2021111901
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:ensure that the idmap pointer itself is freed
-
-* Thu Oct 21 2021 gaohuatao<gaohuatao@huawei.com> - 4.0.3-2021102101
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:disable lxc_keep
-
-* Sun Sep 26 2021 chengzeruizhi<chengzeruizhi@huawei.com> - 4.0.3-2021092601
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:add dependencies under require field
-
-* Fri Sep 17 2021 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2021091703
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:fix conf memory leak
-
-* Fri Sep 17 2021 haozi007<liuhao27@huawei.com> - 4.0.3-2021091702
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:just use origin loop if do not have io
-
-* Fri Sep 17 2021 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.0.3-2021091701
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:seccomp init and destroy notifier.cookie
-
-* Thu Aug 26 2021 haozi007 <liuhao27@huawei.com> - 4.0.3-2021082601
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:add help info for new arguments
-
-* Sat Jun 12 2021 lifeng <lifeng68@huawei.com> - 4.0.3-2021061201
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:fix coredump
-
-* Tue Jun 01 2021 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.0.3-2021060101
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:adjust log level
-
-* Thu May 13 2021 lifeng <lifeng68@huawei.com> - 4.0.3-2021051301
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:adjust log level
-
-* Sat May 08 2021 haozi007 <liuhao27@huawei.com> - 4.0.3-2021050802
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:support long syslog tag
-
-* Sat May 08 2021 wangfengtu <wangfengtu@huawei.com> - 4.0.3-2021050801
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:print error message if process workdir failed
-
-* Wed Apr 07 2021 wangfengtu <wangfengtu@huawei.com> - 4.0.3-2021040701
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:some patches missing in series.conf
-
-* Wed Mar 31 2021 wangfengtu <wangfengtu@huawei.com> - 4.0.3-2021033101
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: support cgroup v2
-
-* Thu Mar 11 2021 wangfengtu <wangfengtu@huawei.com> - 4.0.3-2021031102
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: support isula exec --workdir
-
-* Thu Jan 28 2021 lifeng <lifeng68@huawei.com> - 4.0.3-2021012801
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: add inactive file total metrics
-
-* Thu Jan 21 2021 lifeng <lifeng68@huawei.com> - 4.0.3-2021012001
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: fix io data miss when exec with pipes
-
-* Tue Jan 05 2021 wujing <wujing50@huawei.com> - 4.0.3-2021010501
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: fix compilation errors without libcap 
-
-* Thu Dec 24 2020 wujing <wujing50@huawei.com> - 4.0.3-2020122401
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: Streaming IO solution optimization and enhancement
-
-* Tue Dec 15 2020 lifeng <lifeng68@huawei.com> - 4.0.3-2020121501
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: add get container metrics api to get the stat
-
-* Mon Dec 07 2020 wujing <wujing50@huawei.com> - 4.0.3-2020120701
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: use path based unix domain sockets instead of abstract namespace sockets
-
-* Fri Nov 27 2020 lifeng <lifeng68@openeuler.org> - 4.0.3-2020112701
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: mount: make possible to bind mount /proc and /sys/fs.
--	1. add check whether have /proc mounts entry, if has, skip the auto
--	2. mount cgroup before do mount entrys
--	3. pass if the mount on top of /proc and the source of the mount is a proc filesystem
-
-* Fri Nov 13 2020 lifeng <lifeng68@openeuler.org> - 4.0.3-2020111701
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: add make private for root.path parent 
-
-* Fri Nov 13 2020 lifeng <lifeng68@openeuler.org> - 4.0.3-2020111301
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: adjust log level from error to warn 
-
-* Tue Nov 3 2020 lifeng <lifeng68@openeuler.org> - 4.0.3-2020110301
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: 1. fix hook root dir error and refact cgroup
-
-* Sat Oct 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.0.3-2020101001
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: add patchs to series.conf
-
-* Fri Sep 25 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.0.3-2020092501
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: Code optimization
-
-* Fri Sep 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.0.3-2020091101
-- Type:enhancement
+* Wed Oct 18 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 5.0.2-4
+- Type: bugfix
 - ID:NA
 - SUG:NA
-- DESC: modify source0 address
+- DESC: fix run container failed when enable isulad
 
-* Wed Sep 02 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.0.3-2020090101
+* Fri Aug 04 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 5.0.2-3
 - Type:enhancement
 - ID:NA
 - SUG:NA
-- DESC: modify source0 address 
+- DESC: disable isulad option
 
-* Mon Aug 03 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.0.3-2020080301
+* Tue Aug 01 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 5.0.2-2
 - Type:enhancement
 - ID:NA
 - SUG:NA
-- DESC: add debug packages
+- DESC: add isulad code and fix compile error
 
-* Mon Apr 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.0.3-2020071501
+* Thu Jul 13 2023 haozi007<liuhao27@huawei.com> - 5.0.2-1
 - Type:enhancement
 - ID:NA
 - SUG:NA
-- DESC: update lxc to 4.0.3
+- DESC: update to 5.0.2

_service:tar_scm:0001-iSulad-add-json-files-and-adapt-to-meson.patch Added

@@ -0,0 +1,7992 @@
+From 757bc66c44a58ca2d65eb4c8199ad55cba580d00 Mon Sep 17 00:00:00 2001
+From: haozi007 <liuhao27@huawei.com>
+Date: Fri, 14 Jul 2023 11:21:56 +0800
+Subject: PATCH 1/3 iSulad add json files and adapt to meson
+
+Signed-off-by: haozi007 <liuhao27@huawei.com>
+---
+ meson.build                      |   30 +-
+ meson_options.txt                |    8 +
+ src/lxc/af_unix.c                |   50 +
+ src/lxc/af_unix.h                |    5 +
+ src/lxc/cgroups/isulad_cgfsng.c  | 3229 ++++++++++++++++++++++++++++++
+ src/lxc/commands.c               |  179 ++
+ src/lxc/commands.h               |   10 +
+ src/lxc/commands_utils.c         |   57 +
+ src/lxc/commands_utils.h         |    7 +
+ src/lxc/exec_commands.c          |  477 +++++
+ src/lxc/exec_commands.h          |   77 +
+ src/lxc/isulad_utils.c           |  535 +++++
+ src/lxc/isulad_utils.h           |  102 +
+ src/lxc/json/defs.c              |  205 ++
+ src/lxc/json/defs.h              |   37 +
+ src/lxc/json/json_common.c       | 1153 +++++++++++
+ src/lxc/json/json_common.h       |  194 ++
+ src/lxc/json/logger_json_file.c  |  246 +++
+ src/lxc/json/logger_json_file.h  |   45 +
+ src/lxc/json/oci_runtime_hooks.c |   52 +
+ src/lxc/json/oci_runtime_hooks.h |   15 +
+ src/lxc/json/oci_runtime_spec.c  |  195 ++
+ src/lxc/json/oci_runtime_spec.h  |   37 +
+ src/lxc/json/read-file.c         |   95 +
+ src/lxc/json/read-file.h         |   11 +
+ src/lxc/meson.build              |   26 +-
+ src/lxc/path.c                   |  521 +++++
+ src/lxc/path.h                   |   33 +
+ 28 files changed, 7629 insertions(+), 2 deletions(-)
+ create mode 100644 src/lxc/cgroups/isulad_cgfsng.c
+ create mode 100644 src/lxc/exec_commands.c
+ create mode 100644 src/lxc/exec_commands.h
+ create mode 100644 src/lxc/isulad_utils.c
+ create mode 100644 src/lxc/isulad_utils.h
+ create mode 100644 src/lxc/json/defs.c
+ create mode 100644 src/lxc/json/defs.h
+ create mode 100755 src/lxc/json/json_common.c
+ create mode 100755 src/lxc/json/json_common.h
+ create mode 100644 src/lxc/json/logger_json_file.c
+ create mode 100644 src/lxc/json/logger_json_file.h
+ create mode 100644 src/lxc/json/oci_runtime_hooks.c
+ create mode 100644 src/lxc/json/oci_runtime_hooks.h
+ create mode 100644 src/lxc/json/oci_runtime_spec.c
+ create mode 100644 src/lxc/json/oci_runtime_spec.h
+ create mode 100644 src/lxc/json/read-file.c
+ create mode 100644 src/lxc/json/read-file.h
+ create mode 100644 src/lxc/path.c
+ create mode 100644 src/lxc/path.h
+
+diff --git a/meson.build b/meson.build
+index 1b2d673..fda8045 100644
+--- a/meson.build
++++ b/meson.build
+@@ -163,6 +163,8 @@ want_seccomp = get_option('seccomp')
+ want_thread_safety = get_option('thread-safety')
+ want_memfd_rexec = get_option('memfd-rexec')
+ want_sd_bus = get_option('sd-bus')
++want_isulad = get_option('isulad')
++want_securecomplie = get_option('securecomplie')
+ 
+ srcconf.set_quoted('DEFAULT_CGROUP_PATTERN', cgrouppattern)
+ if coverity
+@@ -228,6 +230,19 @@ possible_link_flags = 
+     '-fstack-protector-strong',
+ 
+ 
++if want_isulad
++    possible_cc_flags += '-D_FORTIFY_SOURCE=2'
++    yajldep = dependency('yajl', version : '>=2')
++    srcconf.set('HAVE_ISULAD', yajldep.found())
++    liblxc_dependencies += yajldep
++else
++    srcconf.set('HAVE_ISULAD', false)
++endif
++
++if want_isulad or want_securecomplie
++    possible_link_flags += '-Wl,-z,noexecstack'
++endif
++
+ # The gold linker fails with a bus error on sparc64
+ if build_machine.cpu_family() != 'sparc64'
+     possible_link_flags += '-Wl,-fuse-ld=gold'
+@@ -881,13 +896,24 @@ template_scripts = 
+ test_programs = 
+ 
+ # Includes.
++if want_isulad
+ liblxc_includes = include_directories(
+     '.',
+     'src',
+     'src/include',
+     'src/lxc',
++    'src/lxc/json',
+     'src/lxc/cgroups',
+     'src/lxc/storage')
++else
++liblxc_includes = include_directories(
++    '.',
++    'src',
++    'src/include',
++    'src/lxc',
++    'src/lxc/cgroups',
++    'src/lxc/storage')
++endif
+ 
+ # Our static sub-project binaries don't (and in fact can't) link to our
+ # dependencies directly, but need access to the headers when compiling (most
+@@ -942,7 +968,9 @@ subdir('doc/ja')
+ subdir('doc/ko')
+ subdir('doc/examples')
+ subdir('doc/rootfs')
+-subdir('hooks')
++if not want_isulad
++    subdir('hooks')
++endif
+ if want_commands
+     subdir('src/lxc/cmd')
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index 9803473..7146b17 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -120,3 +120,11 @@ option('memfd-rexec', type : 'boolean', value : 'true',
+ 
+ option('distrosysconfdir', type : 'string', value: '',
+        description: 'relative path to sysconfdir for distro default configuration')
++
++# was --{disable,enable}-isulad in autotools
++option('isulad', type: 'boolean', value: 'true',
++       description: 'enable adapt to iSulad')
++
++# was --{disable,enable}-securecomplie in autotools
++option('securecomplie', type: 'boolean', value: 'true',
++       description: 'enable secure compile')
+\ No newline at end of file
+diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
+index 6f05b70..6db1864 100644
+--- a/src/lxc/af_unix.c
++++ b/src/lxc/af_unix.c
+@@ -516,7 +516,11 @@ int lxc_unix_connect_type(struct sockaddr_un *addr, int type)
+ 	ret = connect(fd, (struct sockaddr *)addr,
+ 		      offsetof(struct sockaddr_un, sun_path) + len);
+ 	if (ret < 0)
++#ifdef HAVE_ISULAD
++		return syswarn("Failed to connect AF_UNIX socket");
++#else
+ 		return syserror("Failed to connect AF_UNIX socket");
++#endif
+ 
+ 	return move_fd(fd);
+ }
+@@ -545,3 +549,49 @@ int lxc_socket_set_timeout(int fd, int rcv_timeout, int snd_timeout)
+ 
+ 	return 0;
+ }
++
++#ifdef HAVE_ISULAD
++int lxc_named_unix_open(const char *path, int type, int flags)
++{
++	__do_close int fd = -EBADF;
++	int ret;
++	ssize_t len;
++	struct sockaddr_un addr;
++
++	fd = socket(PF_UNIX, type | SOCK_CLOEXEC, 0);
++	if (fd < 0)
++		return -1;
++
++	if (!path)
++		return move_fd(fd);
++
++	len = lxc_unix_sockaddr(&addr, path);
++	if (len < 0)
++		return -1;
++
++	ret = bind(fd, (struct sockaddr *)&addr, len);
++	if (ret < 0)
++		return -1;
++
++	if (chmod(path, 0600) < 0)
++		return -1;
++
++	if (type == SOCK_STREAM) {
++		ret = listen(fd, 100);
++		if (ret < 0)
++			return -1;
++	}
++
++	return move_fd(fd);
++}
++
++int lxc_named_unix_connect(const char *path)
++{
++	struct sockaddr_un addr;
++
++	if (lxc_unix_sockaddr(&addr, path) < 0)
++		return -1;
++
++	return lxc_unix_connect_type(&addr, SOCK_STREAM);
++}
++#endif
+diff --git a/src/lxc/af_unix.h b/src/lxc/af_unix.h
+index ba119cf..605afc2 100644
+--- a/src/lxc/af_unix.h
++++ b/src/lxc/af_unix.h
+@@ -168,4 +168,9 @@ static inline void put_unix_fds(struct unix_fds *fds)
+ }
+ define_cleanup_function(struct unix_fds *, put_unix_fds);
+ 
++#ifdef HAVE_ISULAD
++__hidden extern int lxc_named_unix_open(const char *path, int type, int flags);
++__hidden extern int lxc_named_unix_connect(const char *path);
++#endif
++
+ #endif /* __LXC_AF_UNIX_H */
+diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c
+new file mode 100644
+index 0000000..dcaa229
+--- /dev/null
++++ b/src/lxc/cgroups/isulad_cgfsng.c
+@@ -0,0 +1,3229 @@
++/******************************************************************************
++ * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved.
++ * Author: lifeng
++ * Create: 2020-11-02
++ * Description: provide container definition
++ * lxc: linux Container library
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++  ******************************************************************************/
++
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE 1
++#endif
++#include <ctype.h>
++#include <dirent.h>
++#include <errno.h>
++#include <grp.h>
++#include <linux/kdev_t.h>
++#include <linux/types.h>
++#include <poll.h>
++#include <signal.h>
++#include <stdint.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
++#include <unistd.h>
++
++#include "af_unix.h"
++#include "caps.h"
++#include "cgroup.h"
++#include "cgroup2_devices.h"
++#include "cgroup_utils.h"
++#include "commands.h"
++#include "conf.h"
++#include "config.h"
++#include "log.h"
++#include "macro.h"
++#include "mainloop.h"
++#include "memory_utils.h"
++#include "storage/storage.h"
++#include "utils.h"
++
++#ifndef HAVE_STRLCPY
++#include "include/strlcpy.h"
++#endif
++
++#ifndef HAVE_STRLCAT
++#include "include/strlcat.h"
++#endif
++
++lxc_log_define(isulad_cgfsng, cgroup);
++
++/* Given a pointer to a null-terminated array of pointers, realloc to add one
++ * entry, and point the new entry to NULL. Do not fail. Return the index to the
++ * second-to-last entry - that is, the one which is now available for use
++ * (keeping the list null-terminated).
++ */
++static int append_null_to_list(void ***list)
++{
++	int newentry = 0;
++
++	if (*list)
++		for (; (*list)newentry; newentry++)
++			;
++
++	*list = must_realloc(*list, (newentry + 2) * sizeof(void **));
++	(*list)newentry + 1 = NULL;
++	return newentry;
++}
++
++/* Given a null-terminated array of strings, check whether @entry is one of the
++ * strings.
++ */
++static bool string_in_list(char **list, const char *entry)
++{
++	if (!list)
++		return false;
++
++	for (int i = 0; listi; i++)
++		if (strcmp(listi, entry) == 0)
++			return true;
++
++	return false;
++}
++
++/* Return a copy of @entry prepending "name=", i.e.  turn "systemd" into
++ * "name=systemd". Do not fail.
++ */
++static char *cg_legacy_must_prefix_named(char *entry)
++{
++	size_t len;
++	char *prefixed;
++
++	len = strlen(entry);
++	prefixed = must_realloc(NULL, len + 6);
++
++	memcpy(prefixed, "name=", STRLITERALLEN("name="));
++	memcpy(prefixed + STRLITERALLEN("name="), entry, len);
++	prefixedlen + 5 = '\0';
++
++	return prefixed;
++}
++
++/* Append an entry to the clist. Do not fail. @clist must be NULL the first time
++ * we are called.
++ *
++ * We also handle named subsystems here. Any controller which is not a kernel
++ * subsystem, we prefix "name=". Any which is both a kernel and named subsystem,
++ * we refuse to use because we're not sure which we have here.
++ * (TODO: We could work around this in some cases by just remounting to be
++ * unambiguous, or by comparing mountpoint contents with current cgroup.)
++ *
++ * The last entry will always be NULL.
++ */
++static void must_append_controller(char **klist, char **nlist, char ***clist,
++				   char *entry)
++{
++	int newentry;
++	char *copy;
++
++	if (string_in_list(klist, entry) && string_in_list(nlist, entry)) {
++		ERROR("Refusing to use ambiguous controller \"%s\"", entry);
++		ERROR("It is both a named and kernel subsystem");
++		return;
++	}
++
++	newentry = append_null_to_list((void ***)clist);
++
++	if (strncmp(entry, "name=", 5) == 0)
++		copy = must_copy_string(entry);
++	else if (string_in_list(klist, entry))
++		copy = must_copy_string(entry);
++	else
++		copy = cg_legacy_must_prefix_named(entry);
++
++	(*clist)newentry = copy;
++}
++
++/* Given a handler's cgroup data, return the struct hierarchy for the controller
++ * @c, or NULL if there is none.
++ */
++struct hierarchy *get_hierarchy(struct cgroup_ops *ops, const char *controller)
++{
++	if (!ops->hierarchies)
++		return log_trace_errno(NULL, errno, "There are no useable cgroup controllers");
++
++	for (int i = 0; ops->hierarchiesi; i++) {
++		if (!controller) {
++			/* This is the empty unified hierarchy. */
++			if (ops->hierarchiesi->controllers &&
++			    !ops->hierarchiesi->controllers0)
++				return ops->hierarchiesi;
++			continue;
++		} else if (pure_unified_layout(ops) &&
++			   strcmp(controller, "devices") == 0) {
++			if (ops->unified->bpf_device_controller)
++				return ops->unified;
++			break;
++		}
++
++		if (string_in_list(ops->hierarchiesi->controllers, controller))
++			return ops->hierarchiesi;
++	}
++
++	if (controller)
++		WARN("There is no useable %s controller", controller);
++	else
++		WARN("There is no empty unified cgroup hierarchy");
++
++	return ret_set_errno(NULL, ENOENT);
++}
++
++#define BATCH_SIZE 50
++static void batch_realloc(char **mem, size_t oldlen, size_t newlen)
++{
++	int newbatches = (newlen / BATCH_SIZE) + 1;
++	int oldbatches = (oldlen / BATCH_SIZE) + 1;
++
++	if (!*mem || newbatches > oldbatches)
++		*mem = must_realloc(*mem, newbatches * BATCH_SIZE);
++}
++
++static void append_line(char **dest, size_t oldlen, char *new, size_t newlen)
++{
++	size_t full = oldlen + newlen;
++
++	batch_realloc(dest, oldlen, full + 1);
++
++	memcpy(*dest + oldlen, new, newlen + 1);
++}
++
++/* Slurp in a whole file */
++static char *read_file(const char *fnam)
++{
++	__do_free char *buf = NULL, *line = NULL;
++	__do_fclose FILE *f = NULL;
++	size_t len = 0, fulllen = 0;
++	int linelen;
++
++	f = fopen(fnam, "re");
++	if (!f)
++		return NULL;
++
++	while ((linelen = getline(&line, &len, f)) != -1) {
++		append_line(&buf, fulllen, line, linelen);
++		fulllen += linelen;
++	}
++
++	return move_ptr(buf);
++}
++
++static inline bool is_unified_hierarchy(const struct hierarchy *h)
++{
++	return h->version == CGROUP2_SUPER_MAGIC;
++}
++
++/* Given two null-terminated lists of strings, return true if any string is in
++ * both.
++ */
++static bool controller_lists_intersect(char **l1, char **l2)
++{
++	if (!l1 || !l2)
++		return false;
++
++	for (int i = 0; l1i; i++)
++		if (string_in_list(l2, l1i))
++			return true;
++
++	return false;
++}
++
++/* For a null-terminated list of controllers @clist, return true if any of those
++ * controllers is already listed the null-terminated list of hierarchies @hlist.
++ * Realistically, if one is present, all must be present.
++ */
++static bool controller_list_is_dup(struct hierarchy **hlist, char **clist)
++{
++	if (!hlist)
++		return false;
++
++	for (int i = 0; hlisti; i++)
++		if (controller_lists_intersect(hlisti->controllers, clist))
++			return true;
++
++	return false;
++}
++
++/* Return true if the controller @entry is found in the null-terminated list of
++ * hierarchies @hlist.
++ */
++static bool controller_found(struct hierarchy **hlist, char *entry)
++{
++	if (!hlist)
++		return false;
++
++	for (int i = 0; hlisti; i++)
++		if (string_in_list(hlisti->controllers, entry))
++			return true;
++
++	return false;
++}
++
++/* Return true if all of the controllers which we require have been found.  The
++ * required list is  freezer and anything in lxc.cgroup.use.
++ */
++static bool all_controllers_found(struct cgroup_ops *ops)
++{
++	struct hierarchy **hlist;
++
++	if (!ops->cgroup_use)
++		return true;
++
++	hlist = ops->hierarchies;
++	for (char **cur = ops->cgroup_use; cur && *cur; cur++)
++		if (!controller_found(hlist, *cur))
++			return log_error(false, "No %s controller mountpoint found", *cur);
++
++	return true;
++}
++
++/* Get the controllers from a mountinfo line There are other ways we could get
++ * this info. For lxcfs, field 3 is /cgroup/controller-list. For cgroupfs, we
++ * could parse the mount options. But we simply assume that the mountpoint must
++ * be /sys/fs/cgroup/controller-list
++ */
++static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
++					int type)
++{
++	/* The fourth field is /sys/fs/cgroup/comma-delimited-controller-list
++	 * for legacy hierarchies.
++	 */
++	__do_free_string_list char **aret = NULL;
++	int i;
++	char *p2, *tok;
++	char *p = line, *sep = ",";
++
++	for (i = 0; i < 4; i++) {
++		p = strchr(p, ' ');
++		if (!p)
++			return NULL;
++		p++;
++	}
++
++	/* Note, if we change how mountinfo works, then our caller will need to
++	 * verify /sys/fs/cgroup/ in this field.
++	 */
++	if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0)
++		return log_warn(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p);
++
++	p += 15;
++	p2 = strchr(p, ' ');
++	if (!p2)
++		return log_error(NULL, "Corrupt mountinfo");
++	*p2 = '\0';
++
++	if (type == CGROUP_SUPER_MAGIC) {
++		__do_free char *dup = NULL;
++
++		/* strdup() here for v1 hierarchies. Otherwise
++		 * lxc_iterate_parts() will destroy mountpoints such as
++		 * "/sys/fs/cgroup/cpu,cpuacct".
++		 */
++		dup = must_copy_string(p);
++		if (!dup)
++			return NULL;
++
++		lxc_iterate_parts (tok, dup, sep)
++			must_append_controller(klist, nlist, &aret, tok);
++	}
++	*p2 = ' ';
++
++	return move_ptr(aret);
++}
++
++static char **cg_unified_make_empty_controller(void)
++{
++	__do_free_string_list char **aret = NULL;
++	int newentry;
++
++	newentry = append_null_to_list((void ***)&aret);
++	aretnewentry = NULL;
++	return move_ptr(aret);
++}
++
++static char **cg_unified_get_controllers(const char *file)
++{
++	__do_free char *buf = NULL;
++	__do_free_string_list char **aret = NULL;
++	char *sep = " \t\n";
++	char *tok;
++
++	buf = read_file(file);
++	if (!buf)
++		return NULL;
++
++	lxc_iterate_parts(tok, buf, sep) {
++		int newentry;
++		char *copy;
++
++		newentry = append_null_to_list((void ***)&aret);
++		copy = must_copy_string(tok);
++		aretnewentry = copy;
++	}
++
++	return move_ptr(aret);
++}
++
++static struct hierarchy *add_hierarchy(struct hierarchy ***h, char **clist, char *mountpoint,
++				       char *container_base_path, int type)
++{
++	struct hierarchy *new;
++	int newentry;
++
++	new = zalloc(sizeof(*new));
++	new->controllers = clist;
++	new->mountpoint = mountpoint;
++	new->container_base_path = container_base_path;
++	new->version = type;
++	new->cgfd_con = -EBADF;
++	new->cgfd_mon = -EBADF;
++
++	newentry = append_null_to_list((void ***)h);
++	(*h)newentry = new;
++	return new;
++}
++
++/* Get a copy of the mountpoint from @line, which is a line from
++ * /proc/self/mountinfo.
++ */
++static char *cg_hybrid_get_mountpoint(char *line)
++{
++	char *p = line, *sret = NULL;
++	size_t len;
++	char *p2;
++
++	for (int i = 0; i < 4; i++) {
++		p = strchr(p, ' ');
++		if (!p)
++			return NULL;
++		p++;
++	}
++
++	if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0)
++		return NULL;
++
++	p2 = strchr(p + 15, ' ');
++	if (!p2)
++		return NULL;
++	*p2 = '\0';
++
++	len = strlen(p);
++	sret = must_realloc(NULL, len + 1);
++	memcpy(sret, p, len);
++	sretlen = '\0';
++
++	return sret;
++}
++
++/* Given a multi-line string, return a null-terminated copy of the current line. */
++static char *copy_to_eol(char *p)
++{
++	char *p2, *sret;
++	size_t len;
++
++	p2 = strchr(p, '\n');
++	if (!p2)
++		return NULL;
++
++	len = p2 - p;
++	sret = must_realloc(NULL, len + 1);
++	memcpy(sret, p, len);
++	sretlen = '\0';
++
++	return sret;
++}
++
++/* cgline: pointer to character after the first ':' in a line in a \n-terminated
++ * /proc/self/cgroup file. Check whether controller c is present.
++ */
++static bool controller_in_clist(char *cgline, char *c)
++{
++	__do_free char *tmp = NULL;
++	char *tok, *eol;
++	size_t len;
++
++	eol = strchr(cgline, ':');
++	if (!eol)
++		return false;
++
++	len = eol - cgline;
++	tmp = must_realloc(NULL, len + 1);
++	memcpy(tmp, cgline, len);
++	tmplen = '\0';
++
++	lxc_iterate_parts(tok, tmp, ",")
++		if (strcmp(tok, c) == 0)
++			return true;
++
++	return false;
++}
++
++/* @basecginfo is a copy of /proc/$$/cgroup. Return the current cgroup for
++ * @controller.
++ */
++static char *cg_hybrid_get_current_cgroup(char *basecginfo, char *controller,
++					  int type)
++{
++	char *p = basecginfo;
++
++	for (;;) {
++		bool is_cgv2_base_cgroup = false;
++
++		/* cgroup v2 entry in "/proc/<pid>/cgroup": "0::/some/path" */
++		if ((type == CGROUP2_SUPER_MAGIC) && (*p == '0'))
++			is_cgv2_base_cgroup = true;
++
++		p = strchr(p, ':');
++		if (!p)
++			return NULL;
++		p++;
++
++		if (is_cgv2_base_cgroup || (controller && controller_in_clist(p, controller))) {
++			p = strchr(p, ':');
++			if (!p)
++				return NULL;
++			p++;
++			return copy_to_eol(p);
++		}
++
++		p = strchr(p, '\n');
++		if (!p)
++			return NULL;
++		p++;
++	}
++}
++
++static void must_append_string(char ***list, char *entry)
++{
++	int newentry;
++	char *copy;
++
++	newentry = append_null_to_list((void ***)list);
++	copy = must_copy_string(entry);
++	(*list)newentry = copy;
++}
++
++static int get_existing_subsystems(char ***klist, char ***nlist)
++{
++	__do_free char *line = NULL;
++	__do_fclose FILE *f = NULL;
++	size_t len = 0;
++
++	f = fopen("/proc/self/cgroup", "re");
++	if (!f)
++		return -1;
++
++	while (getline(&line, &len, f) != -1) {
++		char *p, *p2, *tok;
++		p = strchr(line, ':');
++		if (!p)
++			continue;
++		p++;
++		p2 = strchr(p, ':');
++		if (!p2)
++			continue;
++		*p2 = '\0';
++
++		/* If the kernel has cgroup v2 support, then /proc/self/cgroup
++		 * contains an entry of the form:
++		 *
++		 *	0::/some/path
++		 *
++		 * In this case we use "cgroup2" as controller name.
++		 */
++		if ((p2 - p) == 0) {
++			must_append_string(klist, "cgroup2");
++			continue;
++		}
++
++		lxc_iterate_parts(tok, p, ",") {
++			if (strncmp(tok, "name=", 5) == 0)
++				must_append_string(nlist, tok);
++			else
++				must_append_string(klist, tok);
++		}
++	}
++
++	return 0;
++}
++
++static char *trim(char *s)
++{
++	size_t len;
++
++	len = strlen(s);
++	while ((len > 1) && (slen - 1 == '\n'))
++		s--len = '\0';
++
++	return s;
++}
++
++static void lxc_cgfsng_print_hierarchies(struct cgroup_ops *ops)
++{
++	int i;
++	struct hierarchy **it;
++
++	if (!ops->hierarchies) {
++		TRACE("  No hierarchies found");
++		return;
++	}
++
++	TRACE("  Hierarchies:");
++	for (i = 0, it = ops->hierarchies; it && *it; it++, i++) {
++		int j;
++		char **cit;
++
++		TRACE("  %d: base_cgroup: %s", i, (*it)->container_base_path ? (*it)->container_base_path : "(null)");
++		TRACE("      mountpoint:  %s", (*it)->mountpoint ? (*it)->mountpoint : "(null)");
++		TRACE("      controllers:");
++		for (j = 0, cit = (*it)->controllers; cit && *cit; cit++, j++)
++			TRACE("      %d: %s", j, *cit);
++	}
++}
++
++static void lxc_cgfsng_print_basecg_debuginfo(char *basecginfo, char **klist,
++					      char **nlist)
++{
++	int k;
++	char **it;
++
++	TRACE("basecginfo is:");
++	TRACE("%s", basecginfo);
++
++	for (k = 0, it = klist; it && *it; it++, k++)
++		TRACE("kernel subsystem %d: %s", k, *it);
++
++	for (k = 0, it = nlist; it && *it; it++, k++)
++		TRACE("named subsystem %d: %s", k, *it);
++}
++
++struct generic_userns_exec_data {
++	struct hierarchy **hierarchies;
++	const char *container_cgroup;
++	struct lxc_conf *conf;
++	uid_t origuid; /* target uid in parent namespace */
++	char *path;
++};
++
++static int isulad_cgroup_tree_remove(struct hierarchy **hierarchies,
++			const char *container_cgroup)
++{
++	if (!container_cgroup || !hierarchies)
++		return 0;
++
++	for (int i = 0; hierarchiesi; i++) {
++		struct hierarchy *h = hierarchiesi;
++		int ret;
++
++		if (!h->container_full_path) {
++			h->container_full_path = must_make_path(h->mountpoint, h->container_base_path, container_cgroup, NULL);
++		}
++
++		ret = lxc_rm_rf(h->container_full_path);
++		if (ret < 0) {
++			SYSERROR("Failed to destroy \"%s\"", h->container_full_path);
++			return -1;
++		}
++
++		free_disarm(h->container_full_path);
++	}
++
++	return 0;
++}
++
++static int isulad_cgroup_tree_remove_wrapper(void *data)
++{
++	struct generic_userns_exec_data *arg = data;
++	uid_t nsuid = (arg->conf->root_nsuid_map != NULL) ? 0 : arg->conf->init_uid;
++	gid_t nsgid = (arg->conf->root_nsgid_map != NULL) ? 0 : arg->conf->init_gid;
++	int ret;
++
++	if (!lxc_setgroups(0, NULL) && errno != EPERM)
++		return log_error_errno(-1, errno, "Failed to setgroups(0, NULL)");
++
++	ret = setresgid(nsgid, nsgid, nsgid);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to setresgid(%d, %d, %d)",
++				       (int)nsgid, (int)nsgid, (int)nsgid);
++
++	ret = setresuid(nsuid, nsuid, nsuid);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to setresuid(%d, %d, %d)",
++				       (int)nsuid, (int)nsuid, (int)nsuid);
++
++	return isulad_cgroup_tree_remove(arg->hierarchies, arg->container_cgroup);
++}
++
++__cgfsng_ops static bool isulad_cgfsng_payload_destroy(struct cgroup_ops *ops,
++						struct lxc_handler *handler)
++{
++	int ret;
++
++	if (!ops) {
++		ERROR("Called with uninitialized cgroup operations");
++		return false;
++	}
++
++	if (ops->no_controller) {
++		DEBUG("no controller found, ignore isulad_cgfsng_payload_destroy");
++		return true;
++	}
++
++	if (!ops->hierarchies) {
++		DEBUG("no hierarchies found, ignore isulad_cgfsng_payload_destroy");
++		return true;
++	}
++
++	if (!handler) {
++		ERROR("Called with uninitialized handler");
++		return false;
++	}
++
++	if (!handler->conf) {
++		ERROR("Called with uninitialized conf");
++		return false;
++	}
++
++#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
++	ret = bpf_program_cgroup_detach(handler->conf->cgroup2_devices);
++	if (ret < 0)
++		WARN("Failed to detach bpf program from cgroup");
++#endif
++
++	if (handler->conf && !lxc_list_empty(&handler->conf->id_map)) {
++		struct generic_userns_exec_data wrap = {
++			.conf			= handler->conf,
++			.container_cgroup	= ops->container_cgroup,
++			.hierarchies		= ops->hierarchies,
++			.origuid		= 0,
++		};
++		ret = userns_exec_1(handler->conf, isulad_cgroup_tree_remove_wrapper,
++				    &wrap, "cgroup_tree_remove_wrapper");
++	} else {
++		ret = isulad_cgroup_tree_remove(ops->hierarchies, ops->container_cgroup);
++	}
++	if (ret < 0) {
++		SYSWARN("Failed to destroy cgroups");
++		return false;
++	}
++
++	return true;
++}
++
++__cgfsng_ops static void isulad_cgfsng_monitor_destroy(struct cgroup_ops *ops,
++						struct lxc_handler *handler)
++{
++	return;
++}
++
++__cgfsng_ops static inline bool isulad_cgfsng_monitor_create(struct cgroup_ops *ops,
++						      struct lxc_handler *handler)
++{
++	return true;
++}
++
++static bool isulad_copy_parent_file(char *path, char *file)
++{
++	int ret;
++	int len = 0;
++	char *value = NULL;
++	char *current = NULL;
++	char *fpath = NULL;
++	char *lastslash = NULL;
++	char oldv;
++
++	fpath = must_make_path(path, file, NULL);
++	current = read_file(fpath);
++
++	if (current == NULL) {
++		SYSERROR("Failed to read file \"%s\"", fpath);
++		free(fpath);
++		return false;
++	}
++
++	if (strcmp(current, "\n") != 0) {
++		free(fpath);
++		free(current);
++		return true;
++	}
++
++	free(fpath);
++	free(current);
++
++	lastslash = strrchr(path, '/');
++	if (lastslash == NULL) {
++		ERROR("Failed to detect \"/\" in \"%s\"", path);
++		return false;
++	}
++	oldv = *lastslash;
++	*lastslash = '\0';
++	fpath = must_make_path(path, file, NULL);
++	*lastslash = oldv;
++	len = lxc_read_from_file(fpath, NULL, 0);
++	if (len <= 0)
++		goto on_error;
++
++	value = must_realloc(NULL, len + 1);
++	ret = lxc_read_from_file(fpath, value, len);
++	if (ret != len)
++		goto on_error;
++	free(fpath);
++
++	fpath = must_make_path(path, file, NULL);
++	ret = lxc_write_to_file(fpath, value, len, false, 0666);
++	if (ret < 0)
++		SYSERROR("Failed to write \"%s\" to file \"%s\"", value, fpath);
++	free(fpath);
++	free(value);
++	return ret >= 0;
++
++on_error:
++	SYSERROR("Failed to read file \"%s\"", fpath);
++	free(fpath);
++	free(value);
++	return false;
++}
++
++static bool build_sub_cpuset_cgroup_dir(char *cgpath)
++{
++	int ret;
++
++	ret = mkdir_p(cgpath, 0755);
++	if (ret < 0) {
++		if (errno != EEXIST) {
++			SYSERROR("Failed to create directory \"%s\"", cgpath);
++			return false;
++		}
++	}
++
++	/* copy parent's settings */
++	if (!isulad_copy_parent_file(cgpath, "cpuset.cpus")) {
++		SYSERROR("Failed to copy \"cpuset.cpus\" settings");
++		return false;
++	}
++
++	/* copy parent's settings */
++	if (!isulad_copy_parent_file(cgpath, "cpuset.mems")) {
++		SYSERROR("Failed to copy \"cpuset.mems\" settings");
++		return false;
++	}
++
++	return true;
++}
++
++static bool isulad_cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *cgname)
++{
++	char *cgpath, *slash;
++	bool sub_mk_success = false;
++
++	if (is_unified_hierarchy(h))
++		return true;
++
++	if (!string_in_list(h->controllers, "cpuset"))
++		return true;
++
++	cgname += strspn(cgname, "/");
++
++	slash = strchr(cgname, '/');
++
++	if (slash != NULL) {
++		while (slash) {
++			*slash = '\0';
++			cgpath = must_make_path(h->mountpoint, h->container_base_path, cgname, NULL);
++			sub_mk_success = build_sub_cpuset_cgroup_dir(cgpath);
++			free(cgpath);
++			*slash = '/';
++			if (!sub_mk_success) {
++				return false;
++			}
++			slash = strchr(slash + 1, '/');
++		}
++	}
++
++	cgpath = must_make_path(h->mountpoint, h->container_base_path, cgname, NULL);
++	sub_mk_success = build_sub_cpuset_cgroup_dir(cgpath);
++	free(cgpath);
++	if (!sub_mk_success) {
++		return false;
++	}
++
++	return true;
++}
++
++static int isulad_mkdir_eexist_on_last(const char *dir, mode_t mode)
++{
++	const char *tmp = dir;
++	const char *orig = dir;
++
++	do {
++		int ret;
++		size_t cur_len;
++		char *makeme;
++
++		dir = tmp + strspn(tmp, "/");
++		tmp = dir + strcspn(dir, "/");
++
++		errno = ENOMEM;
++		cur_len = dir - orig;
++		makeme = strndup(orig, cur_len);
++		if (!makeme)
++			return -1;
++
++		ret = mkdir(makeme, mode);
++		if (ret < 0) {
++			if (errno != EEXIST) {
++				SYSERROR("Failed to create directory \"%s\"", makeme);
++				free(makeme);
++				return -1;
++			}
++		}
++		free(makeme);
++
++	} while (tmp != dir);
++
++	return 0;
++}
++
++static bool create_path_for_hierarchy(struct hierarchy *h, char *cgname, int errfd)
++{
++	int ret;
++	__do_free char *path = NULL;
++
++	path = must_make_path(h->mountpoint, h->container_base_path, cgname, NULL);
++
++	if (file_exists(path)) { // it must not already exist
++		ERROR("Cgroup path \"%s\" already exist.", path);
++		lxc_write_error_message(errfd, "%s:%d: Cgroup path \"%s\" already exist.",
++		                        __FILE__, __LINE__, path);
++		return false;
++	}
++
++	if (!isulad_cg_legacy_handle_cpuset_hierarchy(h, cgname)) {
++		ERROR("Failed to handle legacy cpuset controller");
++		return false;
++	}
++
++	ret = isulad_mkdir_eexist_on_last(path, 0755);
++	if (ret < 0) {
++		ERROR("Failed to create cgroup \"%s\"", path);
++		return false;
++	}
++
++	h->cgfd_con = lxc_open_dirfd(path);
++	if (h->cgfd_con < 0)
++		return log_error_errno(false, errno, "Failed to open %s", path);
++
++	if (h->container_full_path == NULL) {
++		h->container_full_path = move_ptr(path);
++	}
++
++	return true;
++}
++
++/* isulad: create hierarchies path, if fail, return the error */
++__cgfsng_ops static inline bool isulad_cgfsng_payload_create(struct cgroup_ops *ops,
++						      struct lxc_handler *handler)
++{
++	int i;
++
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
++
++	char *container_cgroup = ops->container_cgroup;
++
++	if (!ops->hierarchies)
++		return true;
++
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, isgnore isulad_cgfsng_payload_create");
++		return true;
++	}
++#endif
++
++	if (!container_cgroup) {
++		ERROR("cgfsng_create container_cgroup is invalid");
++		return false;
++	}
++
++	for (i = 0; ops->hierarchiesi; i++) {
++		if (!create_path_for_hierarchy(ops->hierarchiesi, container_cgroup, ops->errfd)) {
++			SYSERROR("Failed to create %s", ops->hierarchiesi->container_full_path);
++			return false;
++		}
++	}
++
++	return true;
++}
++
++__cgfsng_ops static bool isulad_cgfsng_monitor_enter(struct cgroup_ops *ops,
++					      struct lxc_handler *handler)
++{
++	return true;
++}
++
++__cgfsng_ops static bool isulad_cgfsng_payload_enter(struct cgroup_ops *ops,
++					      struct lxc_handler *handler)
++{
++	int len;
++	char pidstrINTTYPE_TO_STRLEN(pid_t);
++
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
++
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, isgnore isulad_cgfsng_payload_enter");
++		return true;
++	}
++#endif
++
++	if (!ops->hierarchies)
++		return true;
++
++	if (!ops->container_cgroup)
++		return ret_set_errno(false, ENOENT);
++
++	if (!handler || !handler->conf)
++		return ret_set_errno(false, EINVAL);
++
++	len = snprintf(pidstr, sizeof(pidstr), "%d", handler->pid);
++
++	for (int i = 0; ops->hierarchiesi; i++) {
++		int ret;
++		char *fullpath;
++		int retry_count = 0;
++		int max_retry = 10;
++
++		fullpath = must_make_path(ops->hierarchiesi->container_full_path,
++		                          "cgroup.procs", NULL);
++retry:
++		ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666);
++		if (ret != 0) {
++			if (retry_count < max_retry) {
++				SYSERROR("Failed to enter cgroup \"%s\" with retry count:%d", fullpath, retry_count);
++				(void)isulad_cg_legacy_handle_cpuset_hierarchy(ops->hierarchiesi, ops->container_cgroup);
++				(void)isulad_mkdir_eexist_on_last(ops->hierarchiesi->container_full_path, 0755);
++				usleep(100 * 1000); /* 100 millisecond */
++				retry_count++;
++				goto retry;
++			}
++			SYSERROR("Failed to enter cgroup \"%s\"", fullpath);
++			free(fullpath);
++			return false;
++		}
++		free(fullpath);
++	}
++
++	return true;
++}
++
++static int fchowmodat(int dirfd, const char *path, uid_t chown_uid,
++		      gid_t chown_gid, mode_t chmod_mode)
++{
++	int ret;
++
++	ret = fchownat(dirfd, path, chown_uid, chown_gid,
++		       AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW);
++	if (ret < 0)
++		return log_warn_errno(-1,
++				      errno, "Failed to fchownat(%d, %s, %d, %d, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )",
++				      dirfd, path, (int)chown_uid,
++				      (int)chown_gid);
++
++	ret = fchmodat(dirfd, (*path != '\0') ? path : ".", chmod_mode, 0);
++	if (ret < 0)
++		return log_warn_errno(-1, errno, "Failed to fchmodat(%d, %s, %d, AT_SYMLINK_NOFOLLOW)",
++				      dirfd, path, (int)chmod_mode);
++
++	return 0;
++}
++
++/* chgrp the container cgroups to container group.  We leave
++ * the container owner as cgroup owner.  So we must make the
++ * directories 775 so that the container can create sub-cgroups.
++ *
++ * Also chown the tasks and cgroup.procs files.  Those may not
++ * exist depending on kernel version.
++ */
++static int chown_cgroup_wrapper(void *data)
++{
++	int ret;
++	uid_t destuid;
++	struct generic_userns_exec_data *arg = data;
++	uid_t nsuid = (arg->conf->root_nsuid_map != NULL) ? 0 : arg->conf->init_uid;
++	gid_t nsgid = (arg->conf->root_nsgid_map != NULL) ? 0 : arg->conf->init_gid;
++
++	if (!lxc_setgroups(0, NULL) && errno != EPERM)
++		return log_error_errno(-1, errno, "Failed to setgroups(0, NULL)");
++
++	ret = setresgid(nsgid, nsgid, nsgid);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to setresgid(%d, %d, %d)",
++				       (int)nsgid, (int)nsgid, (int)nsgid);
++
++	ret = setresuid(nsuid, nsuid, nsuid);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to setresuid(%d, %d, %d)",
++				       (int)nsuid, (int)nsuid, (int)nsuid);
++
++	destuid = get_ns_uid(arg->origuid);
++	if (destuid == LXC_INVALID_UID)
++		destuid = 0;
++
++	for (int i = 0; arg->hierarchiesi; i++) {
++		int dirfd = arg->hierarchiesi->cgfd_con;
++
++		(void)fchowmodat(dirfd, "", destuid, nsgid, 0775);
++
++		/*
++		 * Failures to chown() these are inconvenient but not
++		 * detrimental We leave these owned by the container launcher,
++		 * so that container root can write to the files to attach.  We
++		 * chmod() them 664 so that container systemd can write to the
++		 * files (which systemd in wily insists on doing).
++		 */
++
++		if (arg->hierarchiesi->version == CGROUP_SUPER_MAGIC)
++			(void)fchowmodat(dirfd, "tasks", destuid, nsgid, 0664);
++
++		(void)fchowmodat(dirfd, "cgroup.procs", destuid, nsgid, 0664);
++
++		if (arg->hierarchiesi->version != CGROUP2_SUPER_MAGIC)
++			continue;
++
++		for (char **p = arg->hierarchiesi->cgroup2_chown; p && *p; p++)
++			(void)fchowmodat(dirfd, *p, destuid, nsgid, 0664);
++	}
++
++	return 0;
++}
++
++__cgfsng_ops static bool isulad_cgfsng_chown(struct cgroup_ops *ops,
++				      struct lxc_conf *conf)
++{
++	struct generic_userns_exec_data wrap;
++
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
++
++	if (!ops->hierarchies)
++		return true;
++
++	if (!ops->container_cgroup)
++		return ret_set_errno(false, ENOENT);
++
++	if (!conf)
++		return ret_set_errno(false, EINVAL);
++
++	if (lxc_list_empty(&conf->id_map))
++		return true;
++
++	wrap.origuid = geteuid();
++	wrap.path = NULL;
++	wrap.hierarchies = ops->hierarchies;
++	wrap.conf = conf;
++
++	if (userns_exec_1(conf, chown_cgroup_wrapper, &wrap, "chown_cgroup_wrapper") < 0)
++		return log_error_errno(false, errno, "Error requesting cgroup chown in new user namespace");
++
++	return true;
++}
++
++__cgfsng_ops void isulad_cgfsng_payload_finalize(struct cgroup_ops *ops)
++{
++	if (!ops)
++		return;
++
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, isgnore isulad_cgfsng_payload_finalize");
++		return;
++	}
++#endif
++
++	if (!ops->hierarchies)
++		return;
++
++	for (int i = 0; ops->hierarchiesi; i++) {
++		struct hierarchy *h = ops->hierarchiesi;
++		/*
++		 * we don't keep the fds for non-unified hierarchies around
++		 * mainly because we don't make use of them anymore after the
++		 * core cgroup setup is done but also because there are quite a
++		 * lot of them.
++		 */
++		if (!is_unified_hierarchy(h))
++			close_prot_errno_disarm(h->cgfd_con);
++	}
++}
++
++/* cgroup-full:* is done, no need to create subdirs */
++static inline bool cg_mount_needs_subdirs(int type)
++{
++	return !(type >= LXC_AUTO_CGROUP_FULL_RO);
++}
++
++/* After $rootfs/sys/fs/container/controller/the/cg/path has been created,
++ * remount controller ro if needed and bindmount the cgroupfs onto
++ * control/the/cg/path.
++ */
++static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
++				       char *controllerpath, char *cgpath,
++				       const char *container_cgroup)
++{
++	__do_free char *sourcepath = NULL;
++	int ret, remount_flags;
++	int flags = MS_BIND;
++
++	if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_MIXED) {
++		ret = mount(controllerpath, controllerpath, "cgroup", MS_BIND, NULL);
++		if (ret < 0)
++			return log_error_errno(-1, errno, "Failed to bind mount \"%s\" onto \"%s\"",
++					       controllerpath, controllerpath);
++
++		remount_flags = add_required_remount_flags(controllerpath,
++							   controllerpath,
++							   flags | MS_REMOUNT);
++		ret = mount(controllerpath, controllerpath, "cgroup",
++			    remount_flags | MS_REMOUNT | MS_BIND | MS_RDONLY,
++			    NULL);
++		if (ret < 0)
++			return log_error_errno(-1, errno, "Failed to remount \"%s\" ro", controllerpath);
++
++		INFO("Remounted %s read-only", controllerpath);
++	}
++
++	sourcepath = must_make_path(h->mountpoint, h->container_base_path,
++				    container_cgroup, NULL);
++	if (type == LXC_AUTO_CGROUP_RO)
++		flags |= MS_RDONLY;
++
++	ret = mount(sourcepath, cgpath, "cgroup", flags, NULL);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to mount \"%s\" onto \"%s\"",
++				       h->controllers0, cgpath);
++	INFO("Mounted \"%s\" onto \"%s\"", h->controllers0, cgpath);
++
++	if (flags & MS_RDONLY) {
++		remount_flags = add_required_remount_flags(sourcepath, cgpath,
++							   flags | MS_REMOUNT);
++		ret = mount(sourcepath, cgpath, "cgroup", remount_flags, NULL);
++		if (ret < 0)
++			return log_error_errno(-1, errno, "Failed to remount \"%s\" ro", cgpath);
++		INFO("Remounted %s read-only", cgpath);
++	}
++
++	INFO("Completed second stage cgroup automounts for \"%s\"", cgpath);
++	return 0;
++}
++
++/* __cg_mount_direct
++ *
++ * Mount cgroup hierarchies directly without using bind-mounts. The main
++ * uses-cases are mounting cgroup hierarchies in cgroup namespaces and mounting
++ * cgroups for the LXC_AUTO_CGROUP_FULL option.
++ */
++static int __cg_mount_direct(int type, struct hierarchy *h,
++			     const char *controllerpath)
++{
++	 __do_free char *controllers = NULL;
++	 char *fstype = "cgroup2";
++	 unsigned long flags = 0;
++	 int ret;
++
++	 flags |= MS_NOSUID;
++	 flags |= MS_NOEXEC;
++	 flags |= MS_NODEV;
++	 flags |= MS_RELATIME;
++
++	 if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_FULL_RO)
++		 flags |= MS_RDONLY;
++
++	 if (h->version != CGROUP2_SUPER_MAGIC) {
++		 controllers = lxc_string_join(",", (const char **)h->controllers, false);
++		 if (!controllers)
++			 return -ENOMEM;
++		 fstype = "cgroup";
++	}
++
++	ret = mount("cgroup", controllerpath, fstype, flags, controllers);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to mount \"%s\" with cgroup filesystem type %s",
++				       controllerpath, fstype);
++
++	DEBUG("Mounted \"%s\" with cgroup filesystem type %s", controllerpath, fstype);
++	return 0;
++}
++
++static inline int cg_mount_in_cgroup_namespace(int type, struct hierarchy *h,
++					       const char *controllerpath)
++{
++	return __cg_mount_direct(type, h, controllerpath);
++}
++
++static inline int cg_mount_cgroup_full(int type, struct hierarchy *h,
++				       const char *controllerpath)
++{
++	if (type < LXC_AUTO_CGROUP_FULL_RO || type > LXC_AUTO_CGROUP_FULL_MIXED)
++		return 0;
++
++	return __cg_mount_direct(type, h, controllerpath);
++}
++
++__cgfsng_ops static bool isulad_cgfsng_mount(struct cgroup_ops *ops,
++                                      struct lxc_handler *handler,
++                                      const char *root, int type)
++{
++	int i, ret;
++	char *tmpfspath = NULL;
++	char *systemdpath = NULL;
++	char *unifiedpath = NULL;
++	bool has_cgns = false, retval = false, wants_force_mount = false;
++	char **merged = NULL;
++
++	if ((type & LXC_AUTO_CGROUP_MASK) == 0)
++		return true;
++
++	if (type & LXC_AUTO_CGROUP_FORCE) {
++		type &= ~LXC_AUTO_CGROUP_FORCE;
++		wants_force_mount = true;
++	}
++
++	if (!wants_force_mount) {
++		if (!lxc_list_empty(&handler->conf->keepcaps))
++			wants_force_mount = !in_caplist(CAP_SYS_ADMIN, &handler->conf->keepcaps);
++		else
++			wants_force_mount = in_caplist(CAP_SYS_ADMIN, &handler->conf->caps);
++	}
++
++	has_cgns = cgns_supported();
++	if (has_cgns && !wants_force_mount)
++		return true;
++
++	if (type == LXC_AUTO_CGROUP_NOSPEC)
++		type = LXC_AUTO_CGROUP_MIXED;
++	else if (type == LXC_AUTO_CGROUP_FULL_NOSPEC)
++		type = LXC_AUTO_CGROUP_FULL_MIXED;
++
++	/* Mount tmpfs */
++	tmpfspath = must_make_path(root, "/sys/fs/cgroup", NULL);
++	if (mkdir_p(tmpfspath, 0755) < 0) {
++		ERROR("Failed to create directory: %s", tmpfspath);
++		goto on_error;
++	}
++
++        if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
++                if (has_cgns && wants_force_mount) {
++                        /*
++                         * If cgroup namespaces are supported but the container
++                         * will not have CAP_SYS_ADMIN after it has started we
++                         * need to mount the cgroups manually.
++                         */
++                        return cg_mount_in_cgroup_namespace(type, ops->unified, tmpfspath) == 0;
++                }
++
++                return cg_mount_cgroup_full(type, ops->unified, tmpfspath) == 0;
++        }
++
++	ret = safe_mount(NULL, tmpfspath, "tmpfs",
++	                 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
++	                 "size=10240k,mode=755", root, handler->conf->lsm_se_mount_context);
++	if (ret < 0)
++		goto on_error;
++
++	for (i = 0; ops->hierarchiesi; i++) {
++		char *controllerpath = NULL;
++		char *path2 = NULL;
++		struct hierarchy *h = ops->hierarchiesi;
++		char *controller = strrchr(h->mountpoint, '/');
++
++		if (!controller)
++			continue;
++		controller++;
++
++		// isulad: symlink subcgroup
++		if (strchr(controller, ',') != NULL) {
++			int pret;
++			pret = lxc_append_string(&merged, controller);
++			if (pret < 0)
++				goto on_error;
++		}
++
++		controllerpath = must_make_path(tmpfspath, controller, NULL);
++		if (dir_exists(controllerpath)) {
++			free(controllerpath);
++			continue;
++		}
++
++		ret = mkdir(controllerpath, 0755);
++		if (ret < 0) {
++			SYSERROR("Error creating cgroup path: %s", controllerpath);
++			free(controllerpath);
++			goto on_error;
++		}
++
++		if (has_cgns && wants_force_mount) {
++			/* If cgroup namespaces are supported but the container
++			 * will not have CAP_SYS_ADMIN after it has started we
++			 * need to mount the cgroups manually.
++			 */
++			ret = cg_mount_in_cgroup_namespace(type, h, controllerpath);
++			free(controllerpath);
++			if (ret < 0)
++				goto on_error;
++
++			continue;
++		}
++
++		ret = cg_mount_cgroup_full(type, h, controllerpath);
++		if (ret < 0) {
++			free(controllerpath);
++			goto on_error;
++		}
++
++		if (!cg_mount_needs_subdirs(type)) {
++			free(controllerpath);
++			continue;
++		}
++
++		// isulad: ignore ops->container_cgroup so we will not see directory lxc after /sys/fs/cgroup/xxx in container,
++		// isulad: ignore h->container_base_path so we will not see subgroup of /sys/fs/cgroup/xxx/subgroup in container
++		path2 = must_make_path(controllerpath, NULL);
++		ret = mkdir_p(path2, 0755);
++		if (ret < 0) {
++			free(controllerpath);
++			free(path2);
++			goto on_error;
++		}
++
++		ret = cg_legacy_mount_controllers(type, h, controllerpath,
++		                                  path2, ops->container_cgroup);
++		free(controllerpath);
++		free(path2);
++		if (ret < 0)
++			goto on_error;
++	}
++
++	// isulad: symlink subcgroup
++	if (merged) {
++		char **mc = NULL;
++		for (mc = merged; *mc; mc++) {
++			char *token = NULL;
++			char *copy = must_copy_string(*mc);
++			lxc_iterate_parts(token, copy, ",") {
++				int mret;
++				char *link;
++				link = must_make_path(tmpfspath, token, NULL);
++				mret = symlink(*mc, link);
++				if (mret < 0 && errno != EEXIST) {
++					SYSERROR("Failed to create link %s for target %s", link, *mc);
++					free(copy);
++					free(link);
++					goto on_error;
++				}
++				free(link);
++			}
++			free(copy);
++		}
++	}
++
++
++	// isulad: remount /sys/fs/cgroup to readonly
++	if (type == LXC_AUTO_CGROUP_FULL_RO || type == LXC_AUTO_CGROUP_RO) {
++		ret = mount(tmpfspath, tmpfspath, "bind",
++		            MS_NOSUID|MS_NODEV|MS_NOEXEC|MS_RELATIME|MS_RDONLY|MS_BIND|MS_REMOUNT, NULL);
++		if (ret < 0) {
++			SYSERROR("Failed to remount /sys/fs/cgroup.");
++			goto on_error;
++		}
++	}
++
++	// isulad: remount /sys/fs/cgroup/systemd to readwrite for system container
++	if (handler->conf->systemd != NULL && strcmp(handler->conf->systemd, "true") == 0)
++	{
++		unifiedpath = must_make_path(root, "/sys/fs/cgroup/unified", NULL);
++		if (dir_exists(unifiedpath))
++		{
++			ret = umount2(unifiedpath, MNT_DETACH);
++			if (ret < 0)
++			{
++				SYSERROR("Failed to umount /sys/fs/cgroup/unified.");
++				goto on_error;
++			}
++		}
++
++		systemdpath = must_make_path(root, "/sys/fs/cgroup/systemd", NULL);
++		ret = mount(systemdpath, systemdpath, "bind",
++					MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME | MS_BIND | MS_REMOUNT, NULL);
++		if (ret < 0)
++		{
++			SYSERROR("Failed to remount /sys/fs/cgroup/systemd.");
++			goto on_error;
++		}
++	}
++
++	retval = true;
++
++on_error:
++	free(tmpfspath);
++	if (systemdpath != NULL)
++	{
++		free(systemdpath);
++	}
++	if (unifiedpath != NULL)
++	{
++		free(unifiedpath);
++	}
++	lxc_free_array((void **)merged, free);
++	return retval;
++}
++
++/* Only root needs to escape to the cgroup of its init. */
++__cgfsng_ops static bool isulad_cgfsng_escape(const struct cgroup_ops *ops,
++				       struct lxc_conf *conf)
++{
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
++
++	if (!ops->hierarchies)
++		return true;
++
++	if (!conf)
++		return ret_set_errno(false, EINVAL);
++
++	if (conf->cgroup_meta.relative || geteuid())
++		return true;
++
++	for (int i = 0; ops->hierarchiesi; i++) {
++		__do_free char *fullpath = NULL;
++		int ret;
++
++		fullpath =
++		    must_make_path(ops->hierarchiesi->mountpoint,
++				   ops->hierarchiesi->container_base_path,
++				   "cgroup.procs", NULL);
++		ret = lxc_write_to_file(fullpath, "0", 2, false, 0666);
++		if (ret != 0)
++			return log_error_errno(false, errno, "Failed to escape to cgroup \"%s\"", fullpath);
++	}
++
++	return true;
++}
++
++__cgfsng_ops static int isulad_cgfsng_num_hierarchies(struct cgroup_ops *ops)
++{
++	int i = 0;
++
++	if (!ops)
++		return ret_set_errno(-1, ENOENT);
++
++	if (!ops->hierarchies)
++		return 0;
++
++	for (; ops->hierarchiesi; i++)
++		;
++
++	return i;
++}
++
++__cgfsng_ops static bool isulad_cgfsng_get_hierarchies(struct cgroup_ops *ops, int n,
++						char ***out)
++{
++	int i;
++
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
++
++	if (!ops->hierarchies)
++		return ret_set_errno(false, ENOENT);
++
++	/* sanity check n */
++	for (i = 0; i < n; i++)
++		if (!ops->hierarchiesi)
++			return ret_set_errno(false, ENOENT);
++
++	*out = ops->hierarchiesi->controllers;
++
++	return true;
++}
++
++static bool cg_legacy_freeze(struct cgroup_ops *ops)
++{
++	struct hierarchy *h;
++
++	h = get_hierarchy(ops, "freezer");
++	if (!h)
++		return ret_set_errno(-1, ENOENT);
++
++	return lxc_write_openat(h->container_full_path, "freezer.state",
++				"FROZEN", STRLITERALLEN("FROZEN"));
++}
++
++static int freezer_cgroup_events_cb(int fd, uint32_t events, void *cbdata,
++				    struct lxc_epoll_descr *descr)
++{
++	__do_close int duped_fd = -EBADF;
++	__do_free char *line = NULL;
++	__do_fclose FILE *f = NULL;
++	int state = PTR_TO_INT(cbdata);
++	size_t len;
++	const char *state_string;
++
++	duped_fd = dup(fd);
++	if (duped_fd < 0)
++		return LXC_MAINLOOP_ERROR;
++
++	if (lseek(duped_fd, 0, SEEK_SET) < (off_t)-1)
++		return LXC_MAINLOOP_ERROR;
++
++	f = fdopen(duped_fd, "re");
++	if (!f)
++		return LXC_MAINLOOP_ERROR;
++	move_fd(duped_fd);
++
++	if (state == 1)
++		state_string = "frozen 1";
++	else
++		state_string = "frozen 0";
++
++	while (getline(&line, &len, f) != -1)
++		if (strncmp(line, state_string, STRLITERALLEN("frozen") + 2) == 0)
++			return LXC_MAINLOOP_CLOSE;
++
++	return LXC_MAINLOOP_CONTINUE;
++}
++
++static int cg_unified_freeze(struct cgroup_ops *ops, int timeout)
++{
++	__do_close int fd = -EBADF;
++	call_cleaner(lxc_mainloop_close) struct lxc_epoll_descr *descr_ptr = NULL;
++	int ret;
++	struct lxc_epoll_descr descr;
++	struct hierarchy *h;
++
++	h = ops->unified;
++	if (!h)
++		return ret_set_errno(-1, ENOENT);
++
++	if (!h->container_full_path)
++		return ret_set_errno(-1, EEXIST);
++
++	if (timeout != 0) {
++		__do_free char *events_file = NULL;
++
++		events_file = must_make_path(h->container_full_path, "cgroup.events", NULL);
++		fd = open(events_file, O_RDONLY | O_CLOEXEC);
++		if (fd < 0)
++			return log_error_errno(-1, errno, "Failed to open cgroup.events file");
++
++		ret = lxc_mainloop_open(&descr);
++		if (ret)
++			return log_error_errno(-1, errno, "Failed to create epoll instance to wait for container freeze");
++
++		/* automatically cleaned up now */
++		descr_ptr = &descr;
++
++		ret = lxc_mainloop_add_handler(&descr, fd, freezer_cgroup_events_cb, INT_TO_PTR((int){1}));
++		if (ret < 0)
++			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
++	}
++
++	ret = lxc_write_openat(h->container_full_path, "cgroup.freeze", "1", 1);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
++
++	if (timeout != 0 && lxc_mainloop(&descr, timeout))
++		return log_error_errno(-1, errno, "Failed to wait for container to be frozen");
++
++	return 0;
++}
++
++__cgfsng_ops static int isulad_cgfsng_freeze(struct cgroup_ops *ops, int timeout)
++{
++	if (!ops->hierarchies)
++		return ret_set_errno(-1, ENOENT);
++
++	if (ops->cgroup_layout != CGROUP_LAYOUT_UNIFIED)
++		return cg_legacy_freeze(ops);
++
++	return cg_unified_freeze(ops, timeout);
++}
++
++static int cg_legacy_unfreeze(struct cgroup_ops *ops)
++{
++	struct hierarchy *h;
++
++	h = get_hierarchy(ops, "freezer");
++	if (!h)
++		return ret_set_errno(-1, ENOENT);
++
++	return lxc_write_openat(h->container_full_path, "freezer.state",
++				"THAWED", STRLITERALLEN("THAWED"));
++}
++
++static int cg_unified_unfreeze(struct cgroup_ops *ops, int timeout)
++{
++	__do_close int fd = -EBADF;
++	call_cleaner(lxc_mainloop_close)struct lxc_epoll_descr *descr_ptr = NULL;
++	int ret;
++	struct lxc_epoll_descr descr;
++	struct hierarchy *h;
++
++	h = ops->unified;
++	if (!h)
++		return ret_set_errno(-1, ENOENT);
++
++	if (!h->container_full_path)
++		return ret_set_errno(-1, EEXIST);
++
++	if (timeout != 0) {
++		__do_free char *events_file = NULL;
++
++		events_file = must_make_path(h->container_full_path, "cgroup.events", NULL);
++		fd = open(events_file, O_RDONLY | O_CLOEXEC);
++		if (fd < 0)
++			return log_error_errno(-1, errno, "Failed to open cgroup.events file");
++
++		ret = lxc_mainloop_open(&descr);
++		if (ret)
++			return log_error_errno(-1, errno, "Failed to create epoll instance to wait for container unfreeze");
++
++		/* automatically cleaned up now */
++		descr_ptr = &descr;
++
++		ret = lxc_mainloop_add_handler(&descr, fd, freezer_cgroup_events_cb, INT_TO_PTR((int){0}));
++		if (ret < 0)
++			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
++	}
++
++	ret = lxc_write_openat(h->container_full_path, "cgroup.freeze", "0", 1);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
++
++	if (timeout != 0 && lxc_mainloop(&descr, timeout))
++		return log_error_errno(-1, errno, "Failed to wait for container to be unfrozen");
++
++	return 0;
++}
++
++__cgfsng_ops static int isulad_cgfsng_unfreeze(struct cgroup_ops *ops, int timeout)
++{
++	if (!ops->hierarchies)
++		return ret_set_errno(-1, ENOENT);
++
++	if (ops->cgroup_layout != CGROUP_LAYOUT_UNIFIED)
++		return cg_legacy_unfreeze(ops);
++
++	return cg_unified_unfreeze(ops, timeout);
++}
++
++__cgfsng_ops static const char *isulad_cgfsng_get_cgroup(struct cgroup_ops *ops,
++						  const char *controller)
++{
++	struct hierarchy *h;
++
++	h = get_hierarchy(ops, controller);
++	if (!h)
++		return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
++				      controller ? controller : "(null)");
++
++	if (!h->container_full_path)
++		h->container_full_path = must_make_path(h->mountpoint, h->container_base_path, ops->container_cgroup, NULL);
++
++	return h->container_full_path
++		   ? h->container_full_path + strlen(h->mountpoint)
++		   : NULL;
++}
++
++__cgfsng_ops static const char *isulad_cgfsng_get_cgroup_full_path(struct cgroup_ops *ops,
++						  const char *controller)
++{
++	struct hierarchy *h;
++
++	h = get_hierarchy(ops, controller);
++	if (!h)
++		return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
++				      controller ? controller : "(null)");
++
++	if (!h->container_full_path)
++		h->container_full_path = must_make_path(h->mountpoint, h->container_base_path, ops->container_cgroup, NULL);
++
++	return h->container_full_path;
++}
++
++/* Given a cgroup path returned from lxc_cmd_get_cgroup_path, build a full path,
++ * which must be freed by the caller.
++ */
++static inline char *build_full_cgpath_from_monitorpath(struct hierarchy *h,
++						       const char *inpath,
++						       const char *filename)
++{
++	return must_make_path(h->mountpoint, inpath, filename, NULL);
++}
++
++static int cgroup_attach_leaf(const struct lxc_conf *conf, int unified_fd, pid_t pid)
++{
++	int idx = 1;
++	int ret;
++	char pidstrINTTYPE_TO_STRLEN(int64_t) + 1;
++	size_t pidstr_len;
++
++	/* Create leaf cgroup. */
++	ret = mkdirat(unified_fd, ".lxc", 0755);
++	if (ret < 0 && errno != EEXIST)
++		return log_error_errno(-1, errno, "Failed to create leaf cgroup \".lxc\"");
++
++	pidstr_len = sprintf(pidstr, INT64_FMT, (int64_t)pid);
++	ret = lxc_writeat(unified_fd, ".lxc/cgroup.procs", pidstr, pidstr_len);
++	if (ret < 0)
++		ret = lxc_writeat(unified_fd, "cgroup.procs", pidstr, pidstr_len);
++	if (ret == 0)
++		return 0;
++
++	/* this is a non-leaf node */
++	if (errno != EBUSY)
++		return log_error_errno(-1, errno, "Failed to attach to unified cgroup");
++
++	do {
++		bool rm = false;
++		char attach_cgroupSTRLITERALLEN(".lxc-/cgroup.procs") + INTTYPE_TO_STRLEN(int) + 1;
++		char *slash;
++
++		ret = snprintf(attach_cgroup, sizeof(attach_cgroup), ".lxc-%d/cgroup.procs", idx);
++		if (ret < 0 || (size_t)ret >= sizeof(attach_cgroup))
++			return ret_errno(EIO);
++
++		/*
++		 * This shouldn't really happen but the compiler might complain
++		 * that a short write would cause a buffer overrun. So be on
++		 * the safe side.
++		 */
++		if (ret < STRLITERALLEN(".lxc-/cgroup.procs"))
++			return log_error_errno(-EINVAL, EINVAL, "Unexpected short write would cause buffer-overrun");
++
++		slash = &attach_cgroupret - STRLITERALLEN("/cgroup.procs");
++		*slash = '\0';
++
++		ret = mkdirat(unified_fd, attach_cgroup, 0755);
++		if (ret < 0 && errno != EEXIST)
++			return log_error_errno(-1, errno, "Failed to create cgroup %s", attach_cgroup);
++		if (ret == 0)
++			rm = true;
++
++		*slash = '/';
++
++		ret = lxc_writeat(unified_fd, attach_cgroup, pidstr, pidstr_len);
++		if (ret == 0)
++			return 0;
++
++		if (rm && unlinkat(unified_fd, attach_cgroup, AT_REMOVEDIR))
++			SYSERROR("Failed to remove cgroup \"%d(%s)\"", unified_fd, attach_cgroup);
++
++		/* this is a non-leaf node */
++		if (errno != EBUSY)
++			return log_error_errno(-1, errno, "Failed to attach to unified cgroup");
++
++		idx++;
++	} while (idx < 1000);
++
++	return log_error_errno(-1, errno, "Failed to attach to unified cgroup");
++}
++
++static int cgroup_attach_create_leaf(const struct lxc_conf *conf,
++				     int unified_fd, int *sk_fd)
++{
++	__do_close int sk = *sk_fd, target_fd0 = -EBADF, target_fd1 = -EBADF;
++	int target_fds2;
++	ssize_t ret;
++
++	/* Create leaf cgroup. */
++	ret = mkdirat(unified_fd, ".lxc", 0755);
++	if (ret < 0 && errno != EEXIST)
++		return log_error_errno(-1, errno, "Failed to create leaf cgroup \".lxc\"");
++
++	target_fd0 = openat(unified_fd, ".lxc/cgroup.procs", O_WRONLY | O_CLOEXEC | O_NOFOLLOW);
++	if (target_fd0 < 0)
++		return log_error_errno(-errno, errno, "Failed to open \".lxc/cgroup.procs\"");
++	target_fds0 = target_fd0;
++
++	target_fd1 = openat(unified_fd, "cgroup.procs", O_WRONLY | O_CLOEXEC | O_NOFOLLOW);
++	if (target_fd1 < 0)
++		return log_error_errno(-errno, errno, "Failed to open \".lxc/cgroup.procs\"");
++	target_fds1 = target_fd1;
++
++	ret = lxc_abstract_unix_send_fds(sk, target_fds, 2, NULL, 0);
++	if (ret <= 0)
++		return log_error_errno(-errno, errno, "Failed to send \".lxc/cgroup.procs\" fds %d and %d",
++				       target_fd0, target_fd1);
++
++	return log_debug(0, "Sent target cgroup fds %d and %d", target_fd0, target_fd1);
++}
++
++static int cgroup_attach_move_into_leaf(const struct lxc_conf *conf,
++					int *sk_fd, pid_t pid)
++{
++	__do_close int sk = *sk_fd, target_fd0 = -EBADF, target_fd1 = -EBADF;
++	int target_fds2;
++	char pidstrINTTYPE_TO_STRLEN(int64_t) + 1;
++	size_t pidstr_len;
++	ssize_t ret;
++
++	ret = lxc_abstract_unix_recv_fds(sk, target_fds, 2, NULL, 0);
++	if (ret <= 0)
++		return log_error_errno(-1, errno, "Failed to receive target cgroup fd");
++	target_fd0 = target_fds0;
++	target_fd1 = target_fds1;
++
++	pidstr_len = sprintf(pidstr, INT64_FMT, (int64_t)pid);
++
++	ret = lxc_write_nointr(target_fd0, pidstr, pidstr_len);
++	if (ret > 0 && ret == pidstr_len)
++		return log_debug(0, "Moved process into target cgroup via fd %d", target_fd0);
++
++	ret = lxc_write_nointr(target_fd1, pidstr, pidstr_len);
++	if (ret > 0 && ret == pidstr_len)
++		return log_debug(0, "Moved process into target cgroup via fd %d", target_fd1);
++
++	return log_debug_errno(-1, errno, "Failed to move process into target cgroup via fd %d and %d",
++			       target_fd0, target_fd1);
++}
++
++struct userns_exec_unified_attach_data {
++	const struct lxc_conf *conf;
++	int unified_fd;
++	int sk_pair2;
++	pid_t pid;
++};
++
++static int cgroup_unified_attach_child_wrapper(void *data)
++{
++	struct userns_exec_unified_attach_data *args = data;
++
++	if (!args->conf || args->unified_fd < 0 || args->pid <= 0 ||
++	    args->sk_pair0 < 0 || args->sk_pair1 < 0)
++		return ret_errno(EINVAL);
++
++	close_prot_errno_disarm(args->sk_pair0);
++	return cgroup_attach_create_leaf(args->conf, args->unified_fd,
++					 &args->sk_pair1);
++}
++
++static int cgroup_unified_attach_parent_wrapper(void *data)
++{
++	struct userns_exec_unified_attach_data *args = data;
++
++	if (!args->conf || args->unified_fd < 0 || args->pid <= 0 ||
++	    args->sk_pair0 < 0 || args->sk_pair1 < 0)
++		return ret_errno(EINVAL);
++
++	close_prot_errno_disarm(args->sk_pair1);
++	return cgroup_attach_move_into_leaf(args->conf, &args->sk_pair0,
++					    args->pid);
++}
++
++int cgroup_attach(const struct lxc_conf *conf, const char *name,
++		  const char *lxcpath, pid_t pid)
++{
++	__do_close int unified_fd = -EBADF;
++	int ret;
++
++	if (!conf || !name || !lxcpath || pid <= 0)
++		return ret_errno(EINVAL);
++
++	unified_fd = lxc_cmd_get_cgroup2_fd(name, lxcpath);
++	if (unified_fd < 0)
++		return ret_errno(EBADF);
++
++	if (!lxc_list_empty(&conf->id_map)) {
++		struct userns_exec_unified_attach_data args = {
++			.conf		= conf,
++			.unified_fd	= unified_fd,
++			.pid		= pid,
++		};
++
++		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
++		if (ret < 0)
++			return -errno;
++
++		ret = userns_exec_minimal(conf,
++					  cgroup_unified_attach_parent_wrapper,
++					  &args,
++					  cgroup_unified_attach_child_wrapper,
++					  &args);
++	} else {
++		ret = cgroup_attach_leaf(conf, unified_fd, pid);
++	}
++
++	return ret;
++}
++
++/* Technically, we're always at a delegation boundary here (This is especially
++ * true when cgroup namespaces are available.). The reasoning is that in order
++ * for us to have been able to start a container in the first place the root
++ * cgroup must have been a leaf node. Now, either the container's init system
++ * has populated the cgroup and kept it as a leaf node or it has created
++ * subtrees. In the former case we will simply attach to the leaf node we
++ * created when we started the container in the latter case we create our own
++ * cgroup for the attaching process.
++ */
++static int __cg_unified_attach(const struct hierarchy *h,
++			       const struct lxc_conf *conf, const char *name,
++			       const char *lxcpath, pid_t pid,
++			       const char *controller)
++{
++	__do_close int unified_fd = -EBADF;
++	__do_free char *path = NULL, *cgroup = NULL;
++	int ret;
++
++	if (!conf || !name || !lxcpath || pid <= 0)
++		return ret_errno(EINVAL);
++
++	ret = cgroup_attach(conf, name, lxcpath, pid);
++	if (ret == 0)
++		return log_trace(0, "Attached to unified cgroup via command handler");
++	if (ret != -EBADF)
++		return log_error_errno(ret, errno, "Failed to attach to unified cgroup");
++
++	/* Fall back to retrieving the path for the unified cgroup. */
++	cgroup = lxc_cmd_get_cgroup_path(name, lxcpath, controller);
++	/* not running */
++	if (!cgroup)
++		return 0;
++
++	path = must_make_path(h->mountpoint, cgroup, NULL);
++
++	unified_fd = open(path, O_PATH | O_DIRECTORY | O_CLOEXEC);
++	if (unified_fd < 0)
++		return ret_errno(EBADF);
++
++	if (!lxc_list_empty(&conf->id_map)) {
++		struct userns_exec_unified_attach_data args = {
++			.conf		= conf,
++			.unified_fd	= unified_fd,
++			.pid		= pid,
++		};
++
++		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
++		if (ret < 0)
++			return -errno;
++
++		ret = userns_exec_minimal(conf,
++					  cgroup_unified_attach_parent_wrapper,
++					  &args,
++					  cgroup_unified_attach_child_wrapper,
++					  &args);
++	} else {
++		ret = cgroup_attach_leaf(conf, unified_fd, pid);
++	}
++
++	return ret;
++}
++
++__cgfsng_ops static bool isulad_cgfsng_attach(struct cgroup_ops *ops,
++				       const struct lxc_conf *conf,
++				       const char *name, const char *lxcpath,
++				       pid_t pid)
++{
++	int len, ret;
++	char pidstrINTTYPE_TO_STRLEN(pid_t);
++
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
++
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, isgnore isulad_cgfsng_attach");
++		return true;
++	}
++#endif
++
++	if (!ops->hierarchies)
++		return true;
++
++	len = snprintf(pidstr, sizeof(pidstr), "%d", pid);
++	if (len < 0 || (size_t)len >= sizeof(pidstr))
++		return false;
++
++	for (int i = 0; ops->hierarchiesi; i++) {
++		__do_free char *fullpath = NULL, *path = NULL;
++		struct hierarchy *h = ops->hierarchiesi;
++
++		if (h->version == CGROUP2_SUPER_MAGIC) {
++			ret = __cg_unified_attach(h, conf, name, lxcpath, pid,
++						  h->controllers0);
++			if (ret < 0)
++				return false;
++
++			continue;
++		}
++
++		path = lxc_cmd_get_cgroup_path(name, lxcpath, h->controllers0);
++		/* not running */
++		if (!path)
++			return false;
++
++		fullpath = build_full_cgpath_from_monitorpath(h, path, "cgroup.procs");
++		ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666);
++		if (ret < 0)
++			return log_error_errno(false, errno, "Failed to attach %d to %s",
++					       (int)pid, fullpath);
++	}
++
++	return true;
++}
++
++__cgfsng_ops static int isulad_cgfsng_get(struct cgroup_ops *ops, const char *filename,
++                                   char *value, size_t len, const char *name,
++                                   const char *lxcpath)
++{
++	int ret = -1;
++	size_t controller_len;
++	char *controller, *p, *path;
++	struct hierarchy *h;
++
++	controller_len = strlen(filename);
++	controller = alloca(controller_len + 1);
++	(void)strlcpy(controller, filename, controller_len + 1);
++
++	p = strchr(controller, '.');
++	if (p)
++		*p = '\0';
++
++	const char *ori_path = ops->get_cgroup(ops, controller);
++	if (ori_path == NULL) {
++		ERROR("Failed to get cgroup path:%s", controller);
++		return -1;
++	}
++	path = safe_strdup(ori_path);
++
++	h = get_hierarchy(ops, controller);
++	if (h) {
++		char *fullpath;
++
++		fullpath = build_full_cgpath_from_monitorpath(h, path, filename);
++		ret = lxc_read_from_file(fullpath, value, len);
++		free(fullpath);
++	}
++	free(path);
++
++	return ret;
++}
++
++static int device_cgroup_parse_access(struct device_item *device, const char *val)
++{
++	for (int count = 0; count < 3; count++, val++) {
++		switch (*val) {
++		case 'r':
++			device->accesscount = *val;
++			break;
++		case 'w':
++			device->accesscount = *val;
++			break;
++		case 'm':
++			device->accesscount = *val;
++			break;
++		case '\n':
++		case '\0':
++			count = 3;
++			break;
++		default:
++			return ret_errno(EINVAL);
++		}
++	}
++
++	return 0;
++}
++
++int device_cgroup_rule_parse(struct device_item *device, const char *key,
++				    const char *val)
++{
++	int count, ret;
++	char temp50;
++
++	if (strcmp("devices.allow", key) == 0)
++		device->allow = 1;
++	else
++		device->allow = 0;
++
++	if (strcmp(val, "a") == 0) {
++		/* global rule */
++		device->type = 'a';
++		device->major = -1;
++		device->minor = -1;
++		device->global_rule = device->allow
++					  ? LXC_BPF_DEVICE_CGROUP_BLACKLIST
++					  : LXC_BPF_DEVICE_CGROUP_WHITELIST;
++		device->allow = -1;
++		return 0;
++	}
++
++	/* local rule */
++	device->global_rule = LXC_BPF_DEVICE_CGROUP_LOCAL_RULE;
++
++	switch (*val) {
++	case 'a':
++		__fallthrough;
++	case 'b':
++		__fallthrough;
++	case 'c':
++		device->type = *val;
++		break;
++	default:
++		return -1;
++	}
++
++	val++;
++	if (!isspace(*val))
++		return -1;
++	val++;
++	if (*val == '*') {
++		device->major = -1;
++		val++;
++	} else if (isdigit(*val)) {
++		memset(temp, 0, sizeof(temp));
++		for (count = 0; count < sizeof(temp) - 1; count++) {
++			tempcount = *val;
++			val++;
++			if (!isdigit(*val))
++				break;
++		}
++		ret = lxc_safe_int(temp, &device->major);
++		if (ret)
++			return -1;
++	} else {
++		return -1;
++	}
++	if (*val != ':')
++		return -1;
++	val++;
++
++	/* read minor */
++	if (*val == '*') {
++		device->minor = -1;
++		val++;
++	} else if (isdigit(*val)) {
++		memset(temp, 0, sizeof(temp));
++		for (count = 0; count < sizeof(temp) - 1; count++) {
++			tempcount = *val;
++			val++;
++			if (!isdigit(*val))
++				break;
++		}
++		ret = lxc_safe_int(temp, &device->minor);
++		if (ret)
++			return -1;
++	} else {
++		return -1;
++	}
++	if (!isspace(*val))
++		return -1;
++
++	return device_cgroup_parse_access(device, ++val);
++}
++
++__cgfsng_ops static int isulad_cgfsng_set(struct cgroup_ops *ops,
++                                   const char *filename, const char *value,
++                                   const char *name, const char *lxcpath)
++{
++	int ret = -1;
++	size_t controller_len;
++	char *controller, *p, *path;
++	struct hierarchy *h;
++
++	controller_len = strlen(filename);
++	controller = alloca(controller_len + 1);
++	(void)strlcpy(controller, filename, controller_len + 1);
++
++	p = strchr(controller, '.');
++	if (p)
++		*p = '\0';
++
++	const char *ori_path = ops->get_cgroup(ops, controller);
++	if (ori_path == NULL) {
++		ERROR("Failed to get cgroup path:%s", controller);
++		return -1;
++	}
++	path = safe_strdup(ori_path);
++
++	h = get_hierarchy(ops, controller);
++	if (h) {
++		char *fullpath;
++		fullpath = build_full_cgpath_from_monitorpath(h, path, filename);
++
++		if (strcmp(filename, "io.weight") == 0 || strcmp(filename, "io.bfq.weight") == 0) {
++			if (!file_exists(fullpath)) {
++				free(path);
++				free(fullpath);
++				return 0;
++			}
++		}
++
++		ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
++		free(fullpath);
++	}
++	free(path);
++
++	return ret;
++}
++
++/* take devices cgroup line
++ *    /dev/foo rwx
++ * and convert it to a valid
++ *    type major:minor mode
++ * line. Return <0 on error. Dest is a preallocated buffer long enough to hold
++ * the output.
++ */
++static int device_cgroup_rule_parse_devpath(struct device_item *device,
++					    const char *devpath)
++{
++	__do_free char *path = NULL;
++	char *mode = NULL;
++	int n_parts, ret;
++	char *p;
++	struct stat sb;
++
++	path = must_copy_string(devpath);
++
++	/*
++	 * Read path followed by mode. Ignore any trailing text.
++	 * A '    # comment' would be legal. Technically other text is not
++	 * legal, we could check for that if we cared to.
++	 */
++	for (n_parts = 1, p = path; *p; p++) {
++		if (*p != ' ')
++			continue;
++		*p = '\0';
++
++		if (n_parts != 1)
++			break;
++		p++;
++		n_parts++;
++
++		while (*p == ' ')
++			p++;
++
++		mode = p;
++
++		if (*p == '\0')
++			return ret_set_errno(-1, EINVAL);
++	}
++
++	if (device_cgroup_parse_access(device, mode) < 0)
++		return -1;
++
++	if (n_parts == 1)
++		return ret_set_errno(-1, EINVAL);
++
++	ret = stat(path, &sb);
++	if (ret < 0)
++		return ret_set_errno(-1, errno);
++
++	mode_t m = sb.st_mode & S_IFMT;
++	switch (m) {
++	case S_IFBLK:
++		device->type = 'b';
++		break;
++	case S_IFCHR:
++		device->type = 'c';
++		break;
++	default:
++		return log_error_errno(-1, EINVAL, "Unsupported device type %i for \"%s\"", m, path);
++	}
++
++	device->major = MAJOR(sb.st_rdev);
++	device->minor = MINOR(sb.st_rdev);
++	device->allow = 1;
++	device->global_rule = LXC_BPF_DEVICE_CGROUP_LOCAL_RULE;
++
++	return 0;
++}
++
++static int convert_devpath(const char *invalue, char *dest)
++{
++	struct device_item device = {0};
++	int ret;
++
++	ret = device_cgroup_rule_parse_devpath(&device, invalue);
++	if (ret < 0)
++		return -1;
++
++	ret = snprintf(dest, 50, "%c %d:%d %s", device.type, device.major,
++		       device.minor, device.access);
++	if (ret < 0 || ret >= 50)
++		return log_error_errno(-1, ENAMETOOLONG, "Error on configuration value \"%c %d:%d %s\" (max 50 chars)",
++				       device.type, device.major, device.minor, device.access);
++
++	return 0;
++}
++
++/* Called from setup_limits - here we have the container's cgroup_data because
++ * we created the cgroups.
++ */
++static int isulad_cg_legacy_get_data(struct cgroup_ops *ops, const char *filename,
++                              char *value, size_t len)
++{
++	char *fullpath = NULL;
++	char *p = NULL;
++	struct hierarchy *h = NULL;
++	int ret = 0;
++	char *controller = NULL;
++
++	len = strlen(filename);
++	if (SIZE_MAX - 1 < len) {
++		errno = EINVAL;
++		return -1;
++	}
++	controller = calloc(1, len + 1);
++	if (controller == NULL) {
++		errno = ENOMEM;
++		return -1;
++	}
++	(void)strlcpy(controller, filename, len + 1);
++
++	p = strchr(controller, '.');
++	if (p)
++		*p = '\0';
++
++
++	h = get_hierarchy(ops, controller);
++	if (!h) {
++		ERROR("Failed to setup limits for the \"%s\" controller. "
++		      "The controller seems to be unused by \"cgfsng\" cgroup "
++		      "driver or not enabled on the cgroup hierarchy",
++		      controller);
++		errno = ENOENT;
++		free(controller);
++		return -ENOENT;
++	}
++
++	fullpath = must_make_path(h->container_full_path, filename, NULL);
++	ret = lxc_read_from_file(fullpath, value, len);
++	free(fullpath);
++	free(controller);
++	return ret;
++}
++
++static int isulad_cg_legacy_set_data(struct cgroup_ops *ops, const char *filename,
++                              const char *value)
++{
++	size_t len;
++	char *fullpath, *p;
++	/* "b|c <2^64-1>:<2^64-1> r|w|m" = 47 chars max */
++	char converted_value50;
++	struct hierarchy *h;
++	int ret = 0;
++	char *controller = NULL;
++	int retry_count = 0;
++	int max_retry = 10;
++	char *container_cgroup = ops->container_cgroup;
++
++	len = strlen(filename);
++	controller = alloca(len + 1);
++	(void)strlcpy(controller, filename, len + 1);
++
++	p = strchr(controller, '.');
++	if (p)
++		*p = '\0';
++
++	if (strcmp("devices.allow", filename) == 0 && value0 == '/') {
++		ret = convert_devpath(value, converted_value);
++		if (ret < 0)
++			return ret;
++		value = converted_value;
++	}
++
++	h = get_hierarchy(ops, controller);
++	if (!h) {
++		ERROR("Failed to setup limits for the \"%s\" controller. "
++		      "The controller seems to be unused by \"cgfsng\" cgroup "
++		      "driver or not enabled on the cgroup hierarchy",
++		      controller);
++		errno = ENOENT;
++		return -ENOENT;
++	}
++
++	fullpath = must_make_path(h->container_full_path, filename, NULL);
++
++retry:
++	ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
++	if (ret != 0) {
++		if (retry_count < max_retry) {
++			SYSERROR("setting cgroup config for ready process caused \"failed to write %s to %s\".", value, fullpath);
++			(void)isulad_cg_legacy_handle_cpuset_hierarchy(h, container_cgroup);
++			(void)isulad_mkdir_eexist_on_last(h->container_full_path, 0755);
++			usleep(100 * 1000); /* 100 millisecond */
++			retry_count++;
++			goto retry;
++		}
++		lxc_write_error_message(ops->errfd,
++		                        "%s:%d: setting cgroup config for ready process caused failed to write %s to %s: %s",
++		                        __FILE__, __LINE__, value, fullpath, strerror(errno));
++	}
++	free(fullpath);
++	return ret;
++}
++
++__cgfsng_ops static bool isulad_cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
++						    struct lxc_conf *conf,
++						    bool do_devices)
++{
++	__do_free struct lxc_list *sorted_cgroup_settings = NULL;
++	struct lxc_list *cgroup_settings = &conf->cgroup;
++	struct lxc_list *iterator, *next;
++	struct lxc_cgroup *cg;
++	bool ret = false;
++	char value21 + 1 = { 0 };
++	long long int readvalue, setvalue;
++
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
++
++	if (!conf)
++		return ret_set_errno(false, EINVAL);
++
++	cgroup_settings = &conf->cgroup;
++	if (lxc_list_empty(cgroup_settings))
++		return true;
++
++	if (!ops->hierarchies)
++		return ret_set_errno(false, EINVAL);
++
++	if (pure_unified_layout(ops))
++		return true;
++
++	sorted_cgroup_settings = sort_cgroup_settings(cgroup_settings);
++	if (!sorted_cgroup_settings)
++		return false;
++
++	lxc_list_for_each(iterator, sorted_cgroup_settings) {
++		cg = iterator->elem;
++
++		if (do_devices == !strncmp("devices", cg->subsystem, 7)) {
++			const char *cgvalue = cg->value;
++			if (strcmp(cg->subsystem, "files.limit") == 0) {
++				if (lxc_safe_long_long(cgvalue, &setvalue) != 0) {
++					SYSERROR("Invalid integer value %s", cgvalue);
++					goto out;
++				}
++				if (setvalue <= 0) {
++					cgvalue = "max";
++				}
++			}
++			if (isulad_cg_legacy_set_data(ops, cg->subsystem, cgvalue)) {
++				if (do_devices && (errno == EACCES || errno == EPERM)) {
++					SYSWARN("Failed to set \"%s\" to \"%s\"", cg->subsystem, cgvalue);
++					continue;
++				}
++				SYSERROR("Failed to set \"%s\" to \"%s\"", cg->subsystem, cgvalue);
++				goto out;
++			}
++			DEBUG("Set controller \"%s\" set to \"%s\"", cg->subsystem, cgvalue);
++		}
++
++		// isulad: check cpu shares
++		if (strcmp(cg->subsystem, "cpu.shares") == 0) {
++			if (isulad_cg_legacy_get_data(ops, cg->subsystem, value, sizeof(value) - 1) < 0) {
++				SYSERROR("Error get %s", cg->subsystem);
++				goto out;
++			}
++			trim(value);
++			if (lxc_safe_long_long(cg->value, &setvalue) != 0) {
++				SYSERROR("Invalid value %s", cg->value);
++				goto out;
++			}
++			if (lxc_safe_long_long(value, &readvalue) != 0) {
++				SYSERROR("Invalid value %s", value);
++				goto out;
++			}
++			if (setvalue > readvalue) {
++				ERROR("The maximum allowed cpu-shares is %s", value);
++				lxc_write_error_message(ops->errfd,
++				                        "%s:%d: setting cgroup config for ready process caused \"The maximum allowed cpu-shares is %s\".",
++				                        __FILE__, __LINE__, value);
++				goto out;
++			} else if (setvalue < readvalue) {
++				ERROR("The minimum allowed cpu-shares is %s", value);
++				lxc_write_error_message(ops->errfd,
++				                        "%s:%d: setting cgroup config for ready process caused \"The minimum allowed cpu-shares is %s\".",
++				                        __FILE__, __LINE__, value);
++				goto out;
++			}
++		}
++	}
++
++	ret = true;
++	INFO("Limits for the legacy cgroup hierarchies have been setup");
++out:
++	lxc_list_for_each_safe(iterator, sorted_cgroup_settings, next) {
++		lxc_list_del(iterator);
++		free(iterator);
++	}
++
++	return ret;
++}
++
++/*
++ * Some of the parsing logic comes from the original cgroup device v1
++ * implementation in the kernel.
++ */
++static int bpf_device_cgroup_prepare(struct cgroup_ops *ops,
++				     struct lxc_conf *conf, const char *key,
++				     const char *val)
++{
++#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
++	struct device_item device_item = {0};
++	int ret;
++
++	if (strcmp("devices.allow", key) == 0 && *val == '/')
++		ret = device_cgroup_rule_parse_devpath(&device_item, val);
++	else
++		ret = device_cgroup_rule_parse(&device_item, key, val);
++	if (ret < 0)
++		return log_error_errno(-1, EINVAL, "Failed to parse device string %s=%s", key, val);
++
++	ret = bpf_list_add_device(conf, &device_item);
++	if (ret < 0)
++		return -1;
++#endif
++	return 0;
++}
++
++__cgfsng_ops static bool isulad_cgfsng_setup_limits(struct cgroup_ops *ops,
++					     struct lxc_handler *handler)
++{
++	__do_free char *path = NULL;
++	struct lxc_list *cgroup_settings, *iterator;
++	struct hierarchy *h;
++	struct lxc_conf *conf;
++
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
++
++	if (!ops->hierarchies)
++		return true;
++
++	if (!ops->container_cgroup)
++		return ret_set_errno(false, EINVAL);
++
++	if (!handler || !handler->conf)
++		return ret_set_errno(false, EINVAL);
++	conf = handler->conf;
++
++	if (lxc_list_empty(&conf->cgroup2))
++		return true;
++	cgroup_settings = &conf->cgroup2;
++
++	if (!pure_unified_layout(ops))
++		return true;
++
++	if (!ops->unified)
++		return false;
++	h = ops->unified;
++
++	lxc_list_for_each (iterator, cgroup_settings) {
++		struct lxc_cgroup *cg = iterator->elem;
++		int ret;
++
++		if (strncmp("devices", cg->subsystem, 7) == 0) {
++			ret = bpf_device_cgroup_prepare(ops, conf, cg->subsystem,
++							cg->value);
++		} else if (strcmp(cg->subsystem, "files.limit") == 0) {
++			long long int setvalue = 0;
++			const char *cgvalue = cg->value;
++
++			if (lxc_safe_long_long(cgvalue, &setvalue) != 0)
++				return log_error(false, "Invalid integer value %s", cgvalue);
++
++			if (setvalue <= 0)
++				cgvalue = "max";
++
++			ret = lxc_write_openat(h->container_full_path,
++					       cg->subsystem, cgvalue,
++					       strlen(cgvalue));
++			if (ret < 0)
++				return log_error_errno(false, errno, "Failed to set \"%s\" to \"%s\"",
++						       cg->subsystem, cgvalue);
++		} else {
++			if (strcmp(cg->subsystem, "io.weight") == 0 || strcmp(cg->subsystem, "io.bfq.weight") == 0) {
++				path = must_make_path(h->container_full_path, cg->subsystem, NULL);
++				if (!file_exists(path)) {
++					continue;
++				}
++			}
++			ret = lxc_write_openat(h->container_full_path,
++					       cg->subsystem, cg->value,
++					       strlen(cg->value));
++			if (ret < 0)
++				return log_error_errno(false, errno, "Failed to set \"%s\" to \"%s\"",
++						       cg->subsystem, cg->value);
++		}
++		TRACE("Set \"%s\" to \"%s\"", cg->subsystem, cg->value);
++	}
++
++	return log_info(true, "Limits for the unified cgroup hierarchy have been setup");
++}
++
++__cgfsng_ops bool isulad_cgfsng_devices_activate(struct cgroup_ops *ops,
++					  struct lxc_handler *handler)
++{
++#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
++	__do_bpf_program_free struct bpf_program *devices = NULL;
++	int ret;
++	struct lxc_conf *conf;
++	struct hierarchy *unified;
++	struct lxc_list *it;
++	struct bpf_program *devices_old;
++
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
++
++	if (!ops->hierarchies)
++		return true;
++
++	if (!ops->container_cgroup)
++		return ret_set_errno(false, EEXIST);
++
++	if (!handler || !handler->conf)
++		return ret_set_errno(false, EINVAL);
++	conf = handler->conf;
++
++	unified = ops->unified;
++	if (!unified || !unified->bpf_device_controller ||
++	    !unified->container_full_path || lxc_list_empty(&conf->devices))
++		return true;
++
++	devices = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
++	if (!devices)
++		return log_error_errno(false, ENOMEM, "Failed to create new bpf program");
++
++	ret = bpf_program_init(devices);
++	if (ret)
++		return log_error_errno(false, ENOMEM, "Failed to initialize bpf program");
++
++	lxc_list_for_each(it, &conf->devices) {
++		struct device_item *cur = it->elem;
++
++		ret = bpf_program_append_device(devices, cur);
++		if (ret)
++			return log_error_errno(false, ENOMEM, "Failed to add new rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
++					       cur->type,
++					       cur->major,
++					       cur->minor,
++					       cur->access,
++					       cur->allow,
++					       cur->global_rule);
++		TRACE("Added rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
++		      cur->type,
++		      cur->major,
++		      cur->minor,
++		      cur->access,
++		      cur->allow,
++		      cur->global_rule);
++	}
++
++	ret = bpf_program_finalize(devices);
++	if (ret)
++		return log_error_errno(false, ENOMEM, "Failed to finalize bpf program");
++
++	ret = bpf_program_cgroup_attach(devices, BPF_CGROUP_DEVICE,
++					unified->container_full_path,
++					BPF_F_ALLOW_MULTI);
++	if (ret)
++		return log_error_errno(false, ENOMEM, "Failed to attach bpf program");
++
++	/* Replace old bpf program. */
++	devices_old = move_ptr(conf->cgroup2_devices);
++	conf->cgroup2_devices = move_ptr(devices);
++	devices = move_ptr(devices_old);
++#endif
++	return true;
++}
++
++bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup)
++{
++	__do_free char *add_controllers = NULL, *base_path = NULL;
++	__do_free_string_list char **parts = NULL;
++	struct hierarchy *unified = ops->unified;
++	ssize_t parts_len;
++	char **it;
++	size_t full_len = 0;
++
++	if (!ops->hierarchies || !pure_unified_layout(ops) ||
++	    !unified->controllers0)
++		return true;
++
++	/* For now we simply enable all controllers that we have detected by
++	 * creating a string like "+memory +pids +cpu +io".
++	 * TODO: In the near future we might want to support "-<controller>"
++	 * etc. but whether supporting semantics like this make sense will need
++	 * some thinking.
++	 */
++	for (it = unified->controllers; it && *it; it++) {
++		full_len += strlen(*it) + 2;
++		add_controllers = must_realloc(add_controllers, full_len + 1);
++
++		if (unified->controllers0 == *it)
++			add_controllers0 = '\0';
++
++		(void)strlcat(add_controllers, "+", full_len + 1);
++		(void)strlcat(add_controllers, *it, full_len + 1);
++
++		if ((it + 1) && *(it + 1))
++			(void)strlcat(add_controllers, " ", full_len + 1);
++	}
++
++	parts = lxc_string_split(cgroup, '/');
++	if (!parts)
++		return false;
++
++	parts_len = lxc_array_len((void **)parts);
++	if (parts_len > 0)
++		parts_len--;
++
++	base_path = must_make_path(unified->mountpoint, unified->container_base_path, NULL);
++	for (ssize_t i = -1; i < parts_len; i++) {
++		int ret;
++		__do_free char *target = NULL;
++
++		if (i >= 0)
++			base_path = must_append_path(base_path, partsi, NULL);
++		target = must_make_path(base_path, "cgroup.subtree_control", NULL);
++		ret = lxc_writeat(-1, target, add_controllers, full_len);
++		if (ret < 0)
++			return log_error_errno(false, errno, "Could not enable \"%s\" controllers in the unified cgroup \"%s\"",
++					       add_controllers, target);
++		TRACE("Enable \"%s\" controllers in the unified cgroup \"%s\"", add_controllers, target);
++	}
++
++	return true;
++}
++
++__cgfsng_ops bool isulad_cgfsng_monitor_delegate_controllers(struct cgroup_ops *ops)
++{
++	return true;
++}
++
++__cgfsng_ops bool isulad_cgfsng_payload_delegate_controllers(struct cgroup_ops *ops)
++{
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
++
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, isgnore isulad_cgfsng_payload_delegate_controllers");
++		return true;
++	}
++#endif
++
++	return __cgfsng_delegate_controllers(ops, ops->container_cgroup);
++}
++
++static bool cgroup_use_wants_controllers(const struct cgroup_ops *ops,
++				       char **controllers)
++{
++	if (!ops->cgroup_use)
++		return true;
++
++	for (char **cur_ctrl = controllers; cur_ctrl && *cur_ctrl; cur_ctrl++) {
++		bool found = false;
++
++		for (char **cur_use = ops->cgroup_use; cur_use && *cur_use; cur_use++) {
++			if (strcmp(*cur_use, *cur_ctrl) != 0)
++				continue;
++
++			found = true;
++			break;
++		}
++
++		if (found)
++			continue;
++
++		return false;
++	}
++
++	return true;
++}
++
++static void cg_unified_delegate(char ***delegate)
++{
++	__do_free char *buf = NULL;
++	char *standard = {"cgroup.subtree_control", "cgroup.threads", NULL};
++	char *token;
++	int idx;
++
++	buf = read_file("/sys/kernel/cgroup/delegate");
++	if (!buf) {
++		for (char **p = standard; p && *p; p++) {
++			idx = append_null_to_list((void ***)delegate);
++			(*delegate)idx = must_copy_string(*p);
++		}
++		SYSWARN("Failed to read /sys/kernel/cgroup/delegate");
++		return;
++	}
++
++	lxc_iterate_parts (token, buf, " \t\n") {
++		/*
++		 * We always need to chown this for both cgroup and
++		 * cgroup2.
++		 */
++		if (strcmp(token, "cgroup.procs") == 0)
++			continue;
++
++		idx = append_null_to_list((void ***)delegate);
++		(*delegate)idx = must_copy_string(token);
++	}
++}
++
++/* At startup, parse_hierarchies finds all the info we need about cgroup
++ * mountpoints and current cgroups, and stores it in @d.
++ */
++static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileged)
++{
++	__do_free char *basecginfo = NULL, *line = NULL;
++	__do_free_string_list char **klist = NULL, **nlist = NULL;
++	__do_fclose FILE *f = NULL;
++	int ret;
++	size_t len = 0;
++
++	/* Root spawned containers escape the current cgroup, so use init's
++	 * cgroups as our base in that case.
++	 */
++	if (!relative && (geteuid() == 0))
++		basecginfo = read_file("/proc/1/cgroup");
++	else
++		basecginfo = read_file("/proc/self/cgroup");
++	if (!basecginfo)
++		return ret_set_errno(-1, ENOMEM);
++
++	ret = get_existing_subsystems(&klist, &nlist);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to retrieve available legacy cgroup controllers");
++
++	f = fopen("/proc/self/mountinfo", "re");
++	if (!f)
++		return log_error_errno(-1, errno, "Failed to open \"/proc/self/mountinfo\"");
++
++	lxc_cgfsng_print_basecg_debuginfo(basecginfo, klist, nlist);
++
++	while (getline(&line, &len, f) != -1) {
++		__do_free char *base_cgroup = NULL, *mountpoint = NULL;
++		__do_free_string_list char **controller_list = NULL;
++		int type;
++		struct hierarchy *new;
++
++		type = get_cgroup_version(line);
++		if (type == 0)
++			continue;
++
++		if (type == CGROUP2_SUPER_MAGIC && ops->unified)
++			continue;
++
++		if (ops->cgroup_layout == CGROUP_LAYOUT_UNKNOWN) {
++			if (type == CGROUP2_SUPER_MAGIC)
++				ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
++			else if (type == CGROUP_SUPER_MAGIC)
++				ops->cgroup_layout = CGROUP_LAYOUT_LEGACY;
++		} else if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
++			if (type == CGROUP_SUPER_MAGIC)
++				ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
++		} else if (ops->cgroup_layout == CGROUP_LAYOUT_LEGACY) {
++			if (type == CGROUP2_SUPER_MAGIC)
++				ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
++		}
++
++		controller_list = cg_hybrid_get_controllers(klist, nlist, line, type);
++		if (!controller_list && type == CGROUP_SUPER_MAGIC)
++			continue;
++
++		if (type == CGROUP_SUPER_MAGIC)
++			if (controller_list_is_dup(ops->hierarchies, controller_list)) {
++				TRACE("Skipping duplicating controller");
++				continue;
++			}
++
++		mountpoint = cg_hybrid_get_mountpoint(line);
++		if (!mountpoint) {
++			WARN("Failed parsing mountpoint from \"%s\"", line);
++			continue;
++		}
++
++		if (type == CGROUP_SUPER_MAGIC)
++			base_cgroup = cg_hybrid_get_current_cgroup(basecginfo, controller_list0, CGROUP_SUPER_MAGIC);
++		else
++			base_cgroup = cg_hybrid_get_current_cgroup(basecginfo, NULL, CGROUP2_SUPER_MAGIC);
++		if (!base_cgroup) {
++			WARN("Failed to find current cgroup");
++			continue;
++		}
++
++		trim(base_cgroup);
++		prune_init_scope(base_cgroup);
++
++		/* isulad: do not test writeable, if we run isulad in docker without cgroup namespace.
++		 * the base_cgroup will be docker/XXX.., mountpoint+base_cgroup may be not exist */
++
++		/*
++		 * reason:base cgroup may be started with /system.slice when cg_hybrid_init
++		 *	read /proc/1/cgroup on host, and cgroup init will set all containers
++		 *	cgroup path under /sys/fs/cgroup/<controller>/system.slice/xxx/lxc
++		 *	directory, this is not consistent with docker. The default cgroup path
++		 *	should be under /sys/fs/cgroup/<controller>/lxc directory.
++		 */
++
++		if (strlen(base_cgroup) > 1 && base_cgroup0 == '/') {
++			base_cgroup1 = '\0';
++		}
++
++		if (type == CGROUP2_SUPER_MAGIC) {
++			char *cgv2_ctrl_path;
++
++			cgv2_ctrl_path = must_make_path(mountpoint, base_cgroup,
++							"cgroup.controllers",
++							NULL);
++
++			controller_list = cg_unified_get_controllers(cgv2_ctrl_path);
++			free(cgv2_ctrl_path);
++			if (!controller_list) {
++				controller_list = cg_unified_make_empty_controller();
++				TRACE("No controllers are enabled for "
++				      "delegation in the unified hierarchy");
++			}
++		}
++
++		/* Exclude all controllers that cgroup use does not want. */
++		if (!cgroup_use_wants_controllers(ops, controller_list)) {
++			TRACE("Skipping controller");
++			continue;
++		}
++
++		new = add_hierarchy(&ops->hierarchies, move_ptr(controller_list), move_ptr(mountpoint), move_ptr(base_cgroup), type);
++		if (type == CGROUP2_SUPER_MAGIC && !ops->unified) {
++			if (unprivileged)
++				cg_unified_delegate(&new->cgroup2_chown);
++			ops->unified = new;
++		}
++	}
++
++	TRACE("Writable cgroup hierarchies:");
++	lxc_cgfsng_print_hierarchies(ops);
++
++	/* verify that all controllers in cgroup.use and all crucial
++	 * controllers are accounted for
++	 */
++	if (!all_controllers_found(ops))
++		return log_error_errno(-1, ENOENT, "Failed to find all required controllers");
++
++	return 0;
++}
++
++/* Get current cgroup from /proc/self/cgroup for the cgroupfs v2 hierarchy. */
++static char *cg_unified_get_current_cgroup(bool relative)
++{
++	__do_free char *basecginfo = NULL;
++	char *copy;
++	char *base_cgroup;
++
++	if (!relative && (geteuid() == 0))
++		basecginfo = read_file("/proc/1/cgroup");
++	else
++		basecginfo = read_file("/proc/self/cgroup");
++	if (!basecginfo)
++		return NULL;
++
++	base_cgroup = strstr(basecginfo, "0::/");
++	if (!base_cgroup)
++		return NULL;
++
++	base_cgroup = base_cgroup + 3;
++	copy = copy_to_eol(base_cgroup);
++	if (!copy)
++		return NULL;
++
++	return trim(copy);
++}
++
++static int cg_unified_init(struct cgroup_ops *ops, bool relative,
++			   bool unprivileged)
++{
++	__do_free char *subtree_path = NULL;
++	int ret;
++	char *mountpoint;
++	char **delegatable;
++	struct hierarchy *new;
++	char *base_cgroup = NULL;
++
++	ret = unified_cgroup_hierarchy();
++	if (ret == -ENOMEDIUM)
++		return ret_errno(ENOMEDIUM);
++
++	if (ret != CGROUP2_SUPER_MAGIC)
++		return 0;
++
++	base_cgroup = cg_unified_get_current_cgroup(relative);
++	if (!base_cgroup)
++		return ret_errno(EINVAL);
++	if (!relative)
++		prune_init_scope(base_cgroup);
++
++	/*
++	 * We assume that the cgroup we're currently in has been delegated to
++	 * us and we are free to further delege all of the controllers listed
++	 * in cgroup.controllers further down the hierarchy.
++	 */
++	mountpoint = must_copy_string(DEFAULT_CGROUP_MOUNTPOINT);
++	subtree_path = must_make_path(mountpoint, base_cgroup, "cgroup.controllers", NULL);
++	delegatable = cg_unified_get_controllers(subtree_path);
++	if (!delegatable)
++		delegatable = cg_unified_make_empty_controller();
++	if (!delegatable0) {
++		TRACE("No controllers are enabled for delegation");
++#ifdef HAVE_ISULAD
++		ops->no_controller = true;
++#endif
++	}
++
++	/* TODO: If the user requested specific controllers via lxc.cgroup.use
++	 * we should verify here. The reason I'm not doing it right is that I'm
++	 * not convinced that lxc.cgroup.use will be the future since it is a
++	 * global property. I much rather have an option that lets you request
++	 * controllers per container.
++	 */
++
++	new = add_hierarchy(&ops->hierarchies, delegatable, mountpoint, base_cgroup, CGROUP2_SUPER_MAGIC);
++	if (unprivileged)
++		cg_unified_delegate(&new->cgroup2_chown);
++
++	if (bpf_devices_cgroup_supported())
++		new->bpf_device_controller = 1;
++
++	ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
++	ops->unified = new;
++
++	return CGROUP2_SUPER_MAGIC;
++}
++
++static int isulad_cg_init(struct cgroup_ops *ops, struct lxc_conf *conf)
++{
++	int ret;
++	const char *tmp;
++	bool relative = conf->cgroup_meta.relative;
++
++	tmp = lxc_global_config_value("lxc.cgroup.use");
++	if (tmp) {
++		__do_free char *pin = NULL;
++		char *chop, *cur;
++
++		pin = must_copy_string(tmp);
++		chop = pin;
++
++		lxc_iterate_parts(cur, chop, ",")
++			must_append_string(&ops->cgroup_use, cur);
++	}
++
++	ret = cg_unified_init(ops, relative, !lxc_list_empty(&conf->id_map));
++	if (ret < 0)
++		return -1;
++
++	if (ret == CGROUP2_SUPER_MAGIC)
++		return 0;
++
++	return cg_hybrid_init(ops, relative, !lxc_list_empty(&conf->id_map));
++}
++
++__cgfsng_ops static int isulad_cgfsng_data_init(struct cgroup_ops *ops, struct lxc_conf *conf)
++{
++	const char *cgroup_pattern;
++	const char *cgroup_tree;
++	__do_free char *container_cgroup = NULL, *__cgroup_tree = NULL;
++	size_t len;
++
++	if (!ops)
++		return ret_set_errno(-1, ENOENT);
++
++	/* copy system-wide cgroup information */
++	cgroup_pattern = lxc_global_config_value("lxc.cgroup.pattern");
++	if (cgroup_pattern && strcmp(cgroup_pattern, "") != 0)
++		ops->cgroup_pattern = must_copy_string(cgroup_pattern);
++
++	if (conf->cgroup_meta.dir) {
++		cgroup_tree = conf->cgroup_meta.dir;
++		container_cgroup = must_concat(&len, cgroup_tree, "/", conf->name, NULL);
++	} else if (ops->cgroup_pattern) {
++		__cgroup_tree = lxc_string_replace("%n", conf->name, ops->cgroup_pattern);
++		if (!__cgroup_tree)
++			return ret_set_errno(-1, ENOMEM);
++
++		cgroup_tree = __cgroup_tree;
++		container_cgroup = must_concat(&len, cgroup_tree, NULL);
++	} else {
++		cgroup_tree = NULL;
++		container_cgroup = must_concat(&len, conf->name, NULL);
++	}
++	if (!container_cgroup)
++		return ret_set_errno(-1, ENOMEM);
++
++	ops->container_cgroup = move_ptr(container_cgroup);
++
++	return 0;
++}
++
++struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf)
++{
++	__do_free struct cgroup_ops *cgfsng_ops = NULL;
++
++	cgfsng_ops = malloc(sizeof(struct cgroup_ops));
++	if (!cgfsng_ops)
++		return ret_set_errno(NULL, ENOMEM);
++
++	memset(cgfsng_ops, 0, sizeof(struct cgroup_ops));
++	cgfsng_ops->cgroup_layout = CGROUP_LAYOUT_UNKNOWN;
++
++	if (isulad_cg_init(cgfsng_ops, conf))
++		return NULL;
++
++	cgfsng_ops->data_init = isulad_cgfsng_data_init;
++
++	cgfsng_ops->errfd = conf ? conf->errpipe1 : -1;
++	cgfsng_ops->get_cgroup_full_path = isulad_cgfsng_get_cgroup_full_path;
++	cgfsng_ops->payload_destroy = isulad_cgfsng_payload_destroy;
++	cgfsng_ops->monitor_destroy = isulad_cgfsng_monitor_destroy;
++	cgfsng_ops->monitor_create = isulad_cgfsng_monitor_create;
++	cgfsng_ops->monitor_enter = isulad_cgfsng_monitor_enter;
++	cgfsng_ops->monitor_delegate_controllers = isulad_cgfsng_monitor_delegate_controllers;
++	cgfsng_ops->payload_delegate_controllers = isulad_cgfsng_payload_delegate_controllers;
++	cgfsng_ops->payload_create = isulad_cgfsng_payload_create;
++	cgfsng_ops->payload_enter = isulad_cgfsng_payload_enter;
++	cgfsng_ops->payload_finalize = isulad_cgfsng_payload_finalize;
++	cgfsng_ops->escape = isulad_cgfsng_escape;
++	cgfsng_ops->num_hierarchies = isulad_cgfsng_num_hierarchies;
++	cgfsng_ops->get_hierarchies = isulad_cgfsng_get_hierarchies;
++	cgfsng_ops->get_cgroup = isulad_cgfsng_get_cgroup;
++	cgfsng_ops->get = isulad_cgfsng_get;
++	cgfsng_ops->set = isulad_cgfsng_set;
++	cgfsng_ops->freeze = isulad_cgfsng_freeze;
++	cgfsng_ops->unfreeze = isulad_cgfsng_unfreeze;
++	cgfsng_ops->setup_limits_legacy = isulad_cgfsng_setup_limits_legacy;
++	cgfsng_ops->setup_limits = isulad_cgfsng_setup_limits;
++	cgfsng_ops->driver = "isulad_cgfsng";
++	cgfsng_ops->version = "1.0.0";
++	cgfsng_ops->attach = isulad_cgfsng_attach;
++	cgfsng_ops->chown = isulad_cgfsng_chown;
++	cgfsng_ops->mount = isulad_cgfsng_mount;
++	cgfsng_ops->devices_activate = isulad_cgfsng_devices_activate;
++
++	return move_ptr(cgfsng_ops);
++}
+diff --git a/src/lxc/commands.c b/src/lxc/commands.c
+index 07be1d5..2188b31 100644
+--- a/src/lxc/commands.c
++++ b/src/lxc/commands.c
+@@ -90,6 +90,10 @@ static const char *lxc_cmd_str(lxc_cmd_t cmd)
+ 		LXC_CMD_GET_CGROUP_FD			= "get_cgroup_fd",
+ 		LXC_CMD_GET_LIMIT_CGROUP_FD		= "get_limit_cgroup_fd",
+ 		LXC_CMD_GET_SYSTEMD_SCOPE		= "get_systemd_scope",
++#ifdef HAVE_ISULAD
++		LXC_CMD_SET_TERMINAL_FIFOS  		= "set_terminal_fifos",
++		LXC_CMD_SET_TERMINAL_WINCH  		= "set_terminal_winch",
++#endif
+ 	};
+ 
+ 	if (cmd >= LXC_CMD_MAX)
+@@ -223,6 +227,12 @@ static ssize_t lxc_cmd_rsp_recv(int sock, struct lxc_cmd_rr *cmd)
+ 		break;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/*isulad: add timeout 3s to avoid long block due to lxc monitor error*/
++	if (lxc_socket_set_timeout(sock, 3, 3) != 0) {
++		return syserror_ret(-1, "Failed to set timeout");
++	}
++#endif
+ 	/* Receive the first response including file descriptors if any. */
+ 	bytes_recv = lxc_cmd_rsp_recv_fds(sock, fds, rsp, cur_cmdstr);
+ 	if (bytes_recv < 0)
+@@ -1576,7 +1586,12 @@ int lxc_cmd_serve_state_clients(const char *name, const char *lxcpath,
+ 
+ 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
+ 	if (ret < 0)
++#ifdef HAVE_ISULAD
++		// for check connect failed, we just log warnning
++		return log_warn_errno(-1, errno, "Failed to serve state clients");
++#else
+ 		return log_error_errno(-1, errno, "Failed to serve state clients");
++#endif
+ 
+ 	return 0;
+ }
+@@ -1916,6 +1931,125 @@ static int lxc_cmd_rsp_send_enosys(int fd, int id)
+ 	return syserror_set(-ENOSYS, "Invalid command id %d", id);
+ }
+ 
++#ifdef HAVE_ISULAD
++/*
++ * isulad: lxc_cmd_set_terminal_fifos: Set the fifos used for the container as terminal input/output
++ *
++ * @hashed_sock_name: hashed socket name
++ *
++ * Returns 0 when success, else when fail.
++ */
++int lxc_cmd_set_terminal_fifos(const char *name, const char *lxcpath, const char *in_fifo,
++				const char *out_fifo, const char *err_fifo)
++{
++	int ret = 0;
++	bool stopped = false;
++	int len = 0;
++	char *tmp = NULL;
++	const char *split = "&&&&", *none_fifo_name = "none";
++	const char *cmd_in_fifo = in_fifo ? in_fifo : none_fifo_name;
++	const char *cmd_out_fifo = out_fifo ? out_fifo : none_fifo_name;
++	const char *cmd_err_fifo = err_fifo ? err_fifo : none_fifo_name;
++
++	if (len + strlen(cmd_in_fifo) + strlen(split) + strlen(cmd_out_fifo) +
++	     strlen(split) + strlen(cmd_err_fifo) == SIZE_MAX)
++		return -1;
++	len += strlen(cmd_in_fifo) + strlen(split) + strlen(cmd_out_fifo) + strlen(split) + strlen(cmd_err_fifo) + 1;
++	tmp = malloc(len);
++	if (tmp == NULL)
++		return -1;
++	ret = snprintf(tmp, len, "%s%s%s%s%s", cmd_in_fifo, split, cmd_out_fifo, split, cmd_err_fifo);
++	if (ret < 0 || ret >= len) {
++		ERROR("Failed to snprintf in fifo of command");
++		free(tmp);
++		return -1;
++	}
++
++	struct lxc_cmd_rr cmd = {
++		.req = {
++			.cmd = LXC_CMD_SET_TERMINAL_FIFOS,
++			.datalen = strlen(tmp)+1,
++			.data = tmp,
++		},
++	};
++
++	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
++	if (ret < 0) {
++		ERROR("Failed to send command to container");
++		free(tmp);
++		return -1;
++	}
++
++	if (cmd.rsp.ret != 0) {
++		ERROR("Command response error:%d", cmd.rsp.ret);
++		free(tmp);
++		return -1;
++	}
++
++	free(tmp);
++	return 0;
++}
++
++static int lxc_cmd_set_terminal_fifos_callback(int fd, struct lxc_cmd_req *req,
++					struct lxc_handler *handler, struct lxc_epoll_descr *descr)
++{
++	struct lxc_cmd_rsp rsp;
++	memset(&rsp, 0, sizeof(rsp));
++
++	rsp.ret = lxc_terminal_add_fifos(handler->conf, req->data);;
++
++	return lxc_cmd_rsp_send_reap(fd, &rsp);
++}
++
++struct lxc_cmd_set_terminal_winch_request {
++	unsigned int height;
++	unsigned int width;
++};
++
++int lxc_cmd_set_terminal_winch(const char *name, const char *lxcpath, unsigned int height, unsigned int width)
++{
++	int ret = 0;
++	bool stopped = false;
++	struct lxc_cmd_set_terminal_winch_request data = { 0 };
++
++	data.height = height;
++	data.width = width;
++
++	struct lxc_cmd_rr cmd = {
++		.req = {
++			.cmd = LXC_CMD_SET_TERMINAL_WINCH,
++			.datalen = sizeof(struct lxc_cmd_set_terminal_winch_request),
++			.data = &data,
++		},
++	};
++
++	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
++	if (ret < 0) {
++		ERROR("Failed to send command to container");
++		return -1;
++	}
++
++	if (cmd.rsp.ret != 0) {
++		ERROR("Command response error:%d", cmd.rsp.ret);
++		return -1;
++	}
++	return 0;
++}
++
++static int lxc_cmd_set_terminal_winch_callback(int fd, struct lxc_cmd_req *req,
++					struct lxc_handler *handler, struct lxc_epoll_descr *descr)
++{
++	struct lxc_cmd_rsp rsp;
++	struct lxc_cmd_set_terminal_winch_request *data = (struct lxc_cmd_set_terminal_winch_request *)(req->data);
++	memset(&rsp, 0, sizeof(rsp));
++
++	rsp.ret = lxc_set_terminal_winsz(&handler->conf->console, data->height, data->width);;
++
++	return lxc_cmd_rsp_send_reap(fd, &rsp);
++
++}
++#endif
++
+ static int lxc_cmd_process(int fd, struct lxc_cmd_req *req,
+ 			   struct lxc_handler *handler,
+ 			   struct lxc_async_descr *descr)
+@@ -1951,6 +2085,10 @@ static int lxc_cmd_process(int fd, struct lxc_cmd_req *req,
+ 		LXC_CMD_GET_CGROUP_FD			= lxc_cmd_get_cgroup_fd_callback,
+ 		LXC_CMD_GET_LIMIT_CGROUP_FD		= lxc_cmd_get_limit_cgroup_fd_callback,
+ 		LXC_CMD_GET_SYSTEMD_SCOPE		= lxc_cmd_get_systemd_scope_callback,
++#ifdef HAVE_ISULAD
++		LXC_CMD_SET_TERMINAL_FIFOS  			= lxc_cmd_set_terminal_fifos_callback,
++		LXC_CMD_SET_TERMINAL_WINCH  			= lxc_cmd_set_terminal_winch_callback,
++#endif
+ 	};
+ 
+ 	if (req->cmd >= LXC_CMD_MAX)
+@@ -2104,6 +2242,46 @@ static int lxc_cmd_accept(int fd, uint32_t events, void *data,
+ 	return ret;
+ }
+ 
++#ifdef HAVE_ISULAD
++// isulad required named unix socket to make safe connect,
++// so need to replace abstrace unix socket
++int lxc_server_init(const char *name, const char *lxcpath, const char *suffix)
++{
++	__do_close int fd = -EBADF;
++	int ret;
++	char pathLXC_AUDS_ADDR_LEN = {0};
++	__do_free char *runtime_sock_dir = NULL;
++
++	runtime_sock_dir = generate_named_unix_sock_dir(name);
++	if (runtime_sock_dir == NULL)
++		return -1;
++
++	if (mkdir_p(runtime_sock_dir, 0700) < 0)
++		return log_error_errno(-1, errno, "Failed to create container runtime unix sock directory %s", path);
++
++	if (generate_named_unix_sock_path(name, suffix, path, sizeof(path)) != 0)
++		return -1;
++
++	fd = lxc_named_unix_open(path, SOCK_STREAM, 0);
++	if (fd < 0) {
++		if (errno == EADDRINUSE) {
++			WARN("Container \"%s\" appears to be already running", name);
++			(void)unlink(path);
++
++			fd = lxc_named_unix_open(path, SOCK_STREAM, 0);
++			if (fd < 0)
++				return log_error_errno(-1, errno, "Failed to create command socket %s", path);
++		} else
++			return log_error_errno(-1, errno, "Failed to create command socket %s", path);
++	}
++
++	ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to set FD_CLOEXEC on command socket file descriptor");
++
++	return log_trace(move_fd(fd), "Created unix socket \"%s\"", path);
++}
++#else
+ int lxc_server_init(const char *name, const char *lxcpath, const char *suffix)
+ {
+ 	__do_close int fd = -EBADF;
+@@ -2128,6 +2306,7 @@ int lxc_server_init(const char *name, const char *lxcpath, const char *suffix)
+ 
+ 	return log_trace(move_fd(fd), "Created abstract unix socket \"%s\"", &path1);
+ }
++#endif
+ 
+ int lxc_cmd_mainloop_add(const char *name, struct lxc_async_descr *descr,
+ 			 struct lxc_handler *handler)
+diff --git a/src/lxc/commands.h b/src/lxc/commands.h
+index 2a39748..d5d1a0e 100644
+--- a/src/lxc/commands.h
++++ b/src/lxc/commands.h
+@@ -53,6 +53,10 @@ typedef enum {
+ 	LXC_CMD_GET_CGROUP_FD			= 24,
+ 	LXC_CMD_GET_LIMIT_CGROUP_FD		= 25,
+ 	LXC_CMD_GET_SYSTEMD_SCOPE		= 26,
++#ifdef HAVE_ISULAD
++	LXC_CMD_SET_TERMINAL_FIFOS = 27,
++	LXC_CMD_SET_TERMINAL_WINCH = 28,
++#endif
+ 	LXC_CMD_MAX,
+ } lxc_cmd_t;
+ 
+@@ -179,4 +183,10 @@ __hidden extern int lxc_cmd_get_limit_cgroup_fd(const char *name,
+ 						struct cgroup_fd *ret_fd);
+ __hidden extern int lxc_cmd_get_devpts_fd(const char *name, const char *lxcpath);
+ 
++#ifdef HAVE_ISULAD
++__hidden extern int lxc_cmd_set_terminal_fifos(const char *name, const char *lxcpath,
++				const char *in_fifo, const char *out_fifo, const char *err_fifo);
++__hidden extern int lxc_cmd_set_terminal_winch(const char *name, const char *lxcpath, unsigned int height, unsigned int width);
++#endif
++
+ #endif /* __commands_h */
+diff --git a/src/lxc/commands_utils.c b/src/lxc/commands_utils.c
+index 3558ff7..33780dd 100644
+--- a/src/lxc/commands_utils.c
++++ b/src/lxc/commands_utils.c
+@@ -143,12 +143,69 @@ int lxc_make_abstract_socket_name(char *path, size_t pathlen,
+ 	return 0;
+ }
+ 
++#ifdef HAVE_ISULAD
++char *generate_named_unix_sock_dir(const char *name)
++{
++	__do_free char *exec_sock_dir = NULL;
++	__do_free char *rundir = NULL;
++
++	rundir = get_rundir();
++	if (!rundir)
++		rundir = strdup("/var/run");
++
++	if (asprintf(&exec_sock_dir, "%s/lxc/%s", rundir, name) < 0) {
++		return log_error_errno(NULL, errno, "Failed to allocate memory");
++	}
++
++	return move_ptr(exec_sock_dir);
++}
++
++int generate_named_unix_sock_path(const char *container_name, const char *sock_name,
++				char *out_path, size_t len)
++{
++#define MAX_SOCK_NAME_LENGTH 12
++	int ret;
++	__do_free char *sock_dir = NULL;
++	__do_free char *short_sock_name = NULL;
++
++	if (container_name == NULL || sock_name == NULL)
++		return -1;
++
++	sock_dir = generate_named_unix_sock_dir(container_name);
++	if (sock_dir == NULL)
++		return -1;
++
++	short_sock_name = strdup(sock_name);
++	if (strlen(short_sock_name) > MAX_SOCK_NAME_LENGTH)
++		short_sock_nameMAX_SOCK_NAME_LENGTH = '\0';
++
++	ret = snprintf(out_path, len, "%s/%s.sock", sock_dir, short_sock_name);
++	if (ret < 0 || (size_t)ret >= len)
++		return log_error_errno(-1, errno, "Failed to allocate memory");
++
++	return 0;
++}
++#endif
++
+ int lxc_cmd_connect(const char *name, const char *lxcpath,
+ 		    const char *hashed_sock_name, const char *suffix)
+ {
+ 	int ret, client_fd;
+ 	char pathLXC_AUDS_ADDR_LEN = {0};
+ 
++#ifdef HAVE_ISULAD
++	if (generate_named_unix_sock_path(name, suffix, path, sizeof(path)) != 0)
++		return -1;
++
++	if (file_exists(path)) {
++		client_fd = lxc_named_unix_connect(path);
++		if (client_fd < 0)
++			return -1;
++
++		return client_fd;
++	}
++#endif
++
+ 	ret = lxc_make_abstract_socket_name(path, sizeof(path), name, lxcpath,
+ 					    hashed_sock_name, suffix);
+ 	if (ret < 0)
+diff --git a/src/lxc/commands_utils.h b/src/lxc/commands_utils.h
+index 28ce490..2704ae2 100644
+--- a/src/lxc/commands_utils.h
++++ b/src/lxc/commands_utils.h
+@@ -67,4 +67,11 @@ __hidden extern int lxc_cmd_connect(const char *name, const char *lxcpath,
+ __hidden extern void lxc_cmd_notify_state_listeners(const char *name,
+                                                     const char *lxcpath,
+                                                     lxc_state_t state);
++
++#ifdef HAVE_ISULAD
++__hidden extern char *generate_named_unix_sock_dir(const char *name);
++__hidden extern int generate_named_unix_sock_path(const char *container_name, const char *sock_name,
++												  char *out_path, size_t len);
++#endif /* HAVE ISULAD */
++
+ #endif /* __LXC_COMMANDS_UTILS_H */
+diff --git a/src/lxc/exec_commands.c b/src/lxc/exec_commands.c
+new file mode 100644
+index 0000000..bd81d66
+--- /dev/null
++++ b/src/lxc/exec_commands.c
+@@ -0,0 +1,477 @@
++/******************************************************************************
++ * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved.
++ * Author: lifeng
++ * Create: 2019-12-08
++ * Description: provide container definition
++ * lxc: linux Container library
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++  ******************************************************************************/
++
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE 1
++#endif
++#include <caps.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <malloc.h>
++#include <poll.h>
++#include <signal.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <sys/param.h>
++#include <sys/socket.h>
++#include <sys/un.h>
++#include <unistd.h>
++
++#include "af_unix.h"
++#include "cgroup.h"
++#include "exec_commands.h"
++#include "commands_utils.h"
++#include "conf.h"
++#include "config.h"
++#include "confile.h"
++#include "log.h"
++#include "lxc.h"
++#include "lxclock.h"
++#include "mainloop.h"
++#include "monitor.h"
++#include "string_utils.h"
++#include "terminal.h"
++#include "utils.h"
++
++lxc_log_define(commands_exec, lxc);
++
++static const char *lxc_exec_cmd_str(lxc_exec_cmd_t cmd)
++{
++	static const char *const cmdnameLXC_EXEC_CMD_MAX = {
++		LXC_EXEC_CMD_SET_TERMINAL_WINCH  = "set_exec_terminal_winch",
++	};
++
++	if (cmd >= LXC_EXEC_CMD_MAX)
++		return "Invalid request";
++
++	return cmdnamecmd;
++}
++
++static int lxc_exec_cmd_rsp_recv(int sock, struct lxc_exec_cmd_rr *cmd)
++{
++	int ret, rspfd;
++	struct lxc_exec_cmd_rsp *rsp = &cmd->rsp;
++
++	/*isulad: add timeout 1s to avoid long block due to lxc monitor error*/
++	if (lxc_socket_set_timeout(sock, 1, 1) != 0) {
++		return syserror_ret(-1, "Failed to set timeout");
++	}
++
++	ret = lxc_cmd_rsp_recv_fds(sock, &rspfd, 1, rsp, sizeof(*rsp));
++	if (ret < 0) {
++		SYSERROR("Failed to receive response for command \"%s\"",
++		        lxc_exec_cmd_str(cmd->req.cmd));
++
++		if (errno == ECONNRESET || errno == EAGAIN || errno == EWOULDBLOCK) {
++			errno = ECONNRESET; /*isulad set errno ECONNRESET when timeout */
++			return -1;
++		}
++
++		return -1;
++	}
++	TRACE("Command \"%s\" received response", lxc_exec_cmd_str(cmd->req.cmd));
++
++	if (rsp->datalen == 0) {
++		DEBUG("Response data length for command \"%s\" is 0",
++		      lxc_exec_cmd_str(cmd->req.cmd));
++		return ret;
++	}
++
++	if (rsp->datalen > LXC_CMD_DATA_MAX) {
++		ERROR("Response data for command \"%s\" is too long: %d bytes > %d",
++		      lxc_exec_cmd_str(cmd->req.cmd), rsp->datalen, LXC_CMD_DATA_MAX);
++		return -1;
++	}
++
++	rsp->data = malloc(rsp->datalen);
++	if (!rsp->data) {
++		errno = ENOMEM;
++		ERROR("Failed to allocate response buffer for command \"%s\"",
++		      lxc_exec_cmd_str(cmd->req.cmd));
++		return -1;
++	}
++
++	ret = lxc_recv_nointr(sock, rsp->data, rsp->datalen, 0);
++	if (ret != rsp->datalen) {
++		SYSERROR("Failed to receive response data for command \"%s\"",
++		         lxc_exec_cmd_str(cmd->req.cmd));
++		return -1;
++	}
++
++	return ret;
++}
++
++static int lxc_exec_cmd_rsp_send(int fd, struct lxc_exec_cmd_rsp *rsp)
++{
++	ssize_t ret;
++
++	errno = EMSGSIZE;
++	ret = lxc_send_nointr(fd, rsp, sizeof(*rsp), MSG_NOSIGNAL);
++	if (ret < 0 || (size_t)ret != sizeof(*rsp)) {
++		SYSERROR("Failed to send command response %zd", ret);
++		return -1;
++	}
++
++	if (!rsp->data || rsp->datalen <= 0)
++		return 0;
++
++	errno = EMSGSIZE;
++	ret = lxc_send_nointr(fd, rsp->data, rsp->datalen, MSG_NOSIGNAL);
++	if (ret < 0 || ret != (ssize_t)rsp->datalen) {
++		SYSWARN("Failed to send command response data %zd", ret);
++		return -1;
++	}
++
++	return 0;
++}
++
++static int lxc_exec_cmd_send(const char *name, struct lxc_exec_cmd_rr *cmd,
++			const char *lxcpath, const char *hashed_sock_name, const char *suffix)
++{
++	int client_fd, saved_errno;
++	ssize_t ret = -1;
++
++	client_fd = lxc_cmd_connect(name, lxcpath, hashed_sock_name, suffix);
++	if (client_fd < 0)
++		return -1;
++
++	ret = lxc_abstract_unix_send_credential(client_fd, &cmd->req,
++						sizeof(cmd->req));
++	if (ret < 0 || (size_t)ret != sizeof(cmd->req))
++		goto on_error;
++
++	if (cmd->req.datalen <= 0)
++		return client_fd;
++
++	errno = EMSGSIZE;
++	ret = lxc_send_nointr(client_fd, (void *)cmd->req.data,
++			      cmd->req.datalen, MSG_NOSIGNAL);
++	if (ret < 0 || ret != (ssize_t)cmd->req.datalen)
++		goto on_error;
++
++	return client_fd;
++
++on_error:
++	saved_errno = errno;
++	close(client_fd);
++	errno = saved_errno;
++
++	return -1;
++}
++
++static int lxc_exec_cmd(const char *name, struct lxc_exec_cmd_rr *cmd, const char *lxcpath, const char *hashed_sock_name, const char *suffix)
++{
++	int client_fd = -1;
++	int saved_errno;
++	int ret = -1;
++
++	client_fd = lxc_exec_cmd_send(name, cmd, lxcpath, hashed_sock_name, suffix);
++	if (client_fd < 0) {
++		SYSTRACE("Command \"%s\" failed to connect command socket",
++		         lxc_exec_cmd_str(cmd->req.cmd));
++		return -1;
++	}
++
++	ret = lxc_exec_cmd_rsp_recv(client_fd, cmd);
++
++	saved_errno = errno;
++	close(client_fd);
++	errno = saved_errno;
++	return ret;
++}
++
++int lxc_exec_cmd_set_terminal_winch(const char *name, const char *lxcpath, const char *suffix, unsigned int height, unsigned int width)
++{
++	int ret = 0;
++	struct lxc_exec_cmd_set_terminal_winch_request data = { 0 };
++
++	data.height = height;
++	data.width = width;
++
++	struct lxc_exec_cmd_rr cmd = {
++		.req = {
++			.cmd = LXC_EXEC_CMD_SET_TERMINAL_WINCH,
++			.datalen = sizeof(struct lxc_exec_cmd_set_terminal_winch_request),
++			.data = &data,
++		},
++	};
++
++	ret = lxc_exec_cmd(name, &cmd, lxcpath, NULL, suffix);
++	if (ret < 0) {
++		ERROR("Failed to send command to container");
++		return -1;
++	}
++
++	if (cmd.rsp.ret != 0) {
++		ERROR("Command response error:%d", cmd.rsp.ret);
++		return -1;
++	}
++	return 0;
++}
++
++static int lxc_exec_cmd_set_terminal_winch_callback(int fd, struct lxc_exec_cmd_req *req,
++					struct lxc_exec_command_handler *handler)
++{
++	struct lxc_exec_cmd_rsp rsp;
++	struct lxc_exec_cmd_set_terminal_winch_request *data = (struct lxc_exec_cmd_set_terminal_winch_request *)(req->data);
++	memset(&rsp, 0, sizeof(rsp));
++
++	rsp.ret = lxc_set_terminal_winsz(handler->terminal, data->height, data->width);;
++
++	return lxc_exec_cmd_rsp_send(fd, &rsp);
++
++}
++
++static int lxc_exec_cmd_process(int fd, struct lxc_exec_cmd_req *req,
++			   struct lxc_exec_command_handler *handler)
++{
++	typedef int (*callback)(int, struct lxc_exec_cmd_req *, struct lxc_exec_command_handler *);
++
++	callback cbLXC_EXEC_CMD_MAX = {
++		LXC_EXEC_CMD_SET_TERMINAL_WINCH  = lxc_exec_cmd_set_terminal_winch_callback,
++	};
++
++	if (req->cmd >= LXC_EXEC_CMD_MAX) {
++		ERROR("Undefined command id %d", req->cmd);
++		return -1;
++	}
++	return cbreq->cmd(fd, req, handler);
++}
++
++static void lxc_exec_cmd_fd_cleanup(int fd, struct lxc_epoll_descr *descr)
++{
++	lxc_mainloop_del_handler(descr, fd);
++	close(fd);
++	return;
++}
++
++static int lxc_exec_cmd_handler(int fd, uint32_t events, void *data,
++			   struct lxc_epoll_descr *descr)
++{
++	int ret;
++	struct lxc_exec_cmd_req req;
++	void *reqdata = NULL;
++	struct lxc_exec_command_handler *handler = data;
++
++	ret = lxc_abstract_unix_rcv_credential(fd, &req, sizeof(req));
++	if (ret < 0) {
++		SYSERROR("Failed to receive data on command socket for command "
++		         "\"%s\"", lxc_exec_cmd_str(req.cmd));
++
++		if (errno == EACCES) {
++			/* We don't care for the peer, just send and close. */
++			struct lxc_exec_cmd_rsp rsp = {.ret = ret};
++
++			lxc_exec_cmd_rsp_send(fd, &rsp);
++		}
++
++		goto out_close;
++	}
++
++	if (ret == 0)
++		goto out_close;
++
++	if (ret != sizeof(req)) {
++		WARN("Failed to receive full command request. Ignoring request "
++		     "for \"%s\"", lxc_exec_cmd_str(req.cmd));
++		ret = -1;
++		goto out_close;
++	}
++
++	if (req.datalen > LXC_CMD_DATA_MAX) {
++		ERROR("Received command data length %d is too large for "
++		      "command \"%s\"", req.datalen, lxc_exec_cmd_str(req.cmd));
++		errno = EFBIG;
++		ret = -EFBIG;
++		goto out_close;
++	}
++
++	if (req.datalen > 0) {
++		reqdata = alloca(req.datalen);
++		if (!reqdata) {
++			ERROR("Failed to allocate memory for \"%s\" command",
++			      lxc_exec_cmd_str(req.cmd));
++			errno = ENOMEM;
++			ret = -ENOMEM;
++			goto out_close;
++		}
++
++		ret = lxc_recv_nointr(fd, reqdata, req.datalen, 0);
++		if (ret != req.datalen) {
++			WARN("Failed to receive full command request. Ignoring "
++			     "request for \"%s\"", lxc_exec_cmd_str(req.cmd));
++			ret = LXC_MAINLOOP_ERROR;
++			goto out_close;
++		}
++
++		req.data = reqdata;
++	}
++
++	ret = lxc_exec_cmd_process(fd, &req, handler);
++	if (ret) {
++		/* This is not an error, but only a request to close fd. */
++		ret = LXC_MAINLOOP_CONTINUE;
++		goto out_close;
++	}
++
++out:
++	return ret;
++
++out_close:
++	lxc_exec_cmd_fd_cleanup(fd, descr);
++	goto out;
++}
++
++static int lxc_exec_cmd_accept(int fd, uint32_t events, void *data,
++			  struct lxc_epoll_descr *descr)
++{
++	int connection = -1;
++	int opt = 1, ret = -1;
++
++	connection = accept(fd, NULL, 0);
++	if (connection < 0) {
++		SYSERROR("Failed to accept connection to run command");
++		return LXC_MAINLOOP_ERROR;
++	}
++
++	ret = fcntl(connection, F_SETFD, FD_CLOEXEC);
++	if (ret < 0) {
++		SYSERROR("Failed to set close-on-exec on incoming command connection");
++		goto out_close;
++	}
++
++	ret = setsockopt(connection, SOL_SOCKET, SO_PASSCRED, &opt, sizeof(opt));
++	if (ret < 0) {
++		SYSERROR("Failed to enable necessary credentials on command socket");
++		goto out_close;
++	}
++
++	ret = lxc_mainloop_add_handler(descr, connection, lxc_exec_cmd_handler, data);
++	if (ret) {
++		ERROR("Failed to add command handler");
++		goto out_close;
++	}
++
++out:
++	return ret;
++
++out_close:
++	close(connection);
++	goto out;
++}
++#ifdef HAVE_ISULAD
++int lxc_exec_unix_sock_delete(const char *name, const char *suffix)
++{
++	char pathLXC_AUDS_ADDR_LEN = {0};
++
++	if (name == NULL || suffix == NULL)
++		return -1;
++
++	if (generate_named_unix_sock_path(name, suffix, path, sizeof(path)) != 0)
++		return -1;
++
++	(void)unlink(path);
++
++	return 0;
++}
++
++int lxc_exec_cmd_init(const char *name, const char *lxcpath, const char *suffix)
++{
++	__do_close int fd = -EBADF;
++	int ret;
++	char pathLXC_AUDS_ADDR_LEN = {0};
++	__do_free char *exec_sock_dir = NULL;
++
++	exec_sock_dir = generate_named_unix_sock_dir(name);
++	if (exec_sock_dir == NULL)
++		return -1;
++
++	if (mkdir_p(exec_sock_dir, 0600) < 0)
++		return log_error_errno(-1, errno, "Failed to create exec sock directory %s", path);
++
++	if (generate_named_unix_sock_path(name, suffix, path, sizeof(path)) != 0)
++		return -1;
++
++	TRACE("Creating unix socket \"%s\"", path);
++
++	fd = lxc_named_unix_open(path, SOCK_STREAM, 0);
++	if (fd < 0) {
++		if (errno == EADDRINUSE) {
++			WARN("Container \"%s\" exec unix sock is occupied", name);
++			(void)unlink(path);
++			fd = lxc_named_unix_open(path, SOCK_STREAM, 0);
++			if (fd < 0)
++				return log_error_errno(-1, errno, "Failed to create command socket %s", path);
++		} else {
++			return log_error_errno(-1, errno, "Failed to create command socket %s", path);
++		}
++	}
++
++	ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to set FD_CLOEXEC on command socket file descriptor");
++
++	return log_trace(move_fd(fd), "Created unix socket \"%s\"", path);
++}
++#else
++int lxc_exec_cmd_init(const char *name, const char *lxcpath, const char *suffix)
++{
++	int fd, ret;
++	char pathLXC_AUDS_ADDR_LEN = {0};
++
++	ret = lxc_make_abstract_socket_name(path, sizeof(path), name, lxcpath, NULL, suffix);
++	if (ret < 0)
++		return -1;
++	TRACE("Creating abstract unix socket \"%s\"", &path1);
++
++	fd = lxc_abstract_unix_open(path, SOCK_STREAM, 0);
++	if (fd < 0) {
++		SYSERROR("Failed to create command socket %s", &path1);
++		if (errno == EADDRINUSE)
++			ERROR("Container \"%s\" appears to be already running", name);
++
++		return -1;
++	}
++
++	ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
++	if (ret < 0) {
++		SYSERROR("Failed to set FD_CLOEXEC on command socket file descriptor");
++		close(fd);
++		return -1;
++	}
++
++	return fd;
++}
++#endif
++
++int lxc_exec_cmd_mainloop_add(struct lxc_epoll_descr *descr, struct lxc_exec_command_handler *handler)
++{
++	int ret;
++	int fd = handler->maincmd_fd;
++
++	ret = lxc_mainloop_add_handler(descr, fd, lxc_exec_cmd_accept, handler);
++	if (ret < 0) {
++		ERROR("Failed to add handler for command socket");
++		close(fd);
++	}
++
++	return ret;
++}
+diff --git a/src/lxc/exec_commands.h b/src/lxc/exec_commands.h
+new file mode 100644
+index 0000000..3ec2a22
+--- /dev/null
++++ b/src/lxc/exec_commands.h
+@@ -0,0 +1,77 @@
++/******************************************************************************
++ * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved.
++ * Author: lifeng
++ * Create: 2019-12-08
++ * Description: provide container definition
++ * lxc: linux Container library
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++  ******************************************************************************/
++
++#ifndef __LXC_EXEC_COMMANDS_H
++#define __LXC_EXEC_COMMANDS_H
++
++#include <stdio.h>
++#include <sys/types.h>
++#include <unistd.h>
++
++#include "lxccontainer.h"
++#include "macro.h"
++#include "state.h"
++#include "terminal.h"
++
++struct lxc_exec_command_handler {
++	int maincmd_fd;
++	struct lxc_terminal *terminal;
++};
++
++typedef enum {
++	LXC_EXEC_CMD_SET_TERMINAL_WINCH,
++	LXC_EXEC_CMD_MAX,
++} lxc_exec_cmd_t;
++
++struct lxc_exec_cmd_req {
++	lxc_exec_cmd_t cmd;
++	int datalen;
++	const void *data;
++};
++
++struct lxc_exec_cmd_rsp {
++	int ret; /* 0 on success, -errno on failure */
++	int datalen;
++	void *data;
++};
++
++struct lxc_exec_cmd_rr {
++	struct lxc_exec_cmd_req req;
++	struct lxc_exec_cmd_rsp rsp;
++};
++
++struct lxc_exec_cmd_set_terminal_winch_request {
++	unsigned int height;
++	unsigned int width;
++};
++
++struct lxc_epoll_descr;
++struct lxc_handler;
++
++extern int lxc_exec_cmd_init(const char *name, const char *lxcpath, const char *suffix);
++extern int lxc_exec_cmd_mainloop_add(struct lxc_epoll_descr *descr, struct lxc_exec_command_handler *handler);
++extern int lxc_exec_cmd_set_terminal_winch(const char *name, const char *lxcpath, const char *suffix, unsigned int height, unsigned int width);
++
++#ifdef HAVE_ISULAD
++extern int lxc_exec_unix_sock_delete(const char *name, const char *suffix);
++#endif
++
++#endif /* __exec_commands_h */
+diff --git a/src/lxc/isulad_utils.c b/src/lxc/isulad_utils.c
+new file mode 100644
+index 0000000..ee39302
+--- /dev/null
++++ b/src/lxc/isulad_utils.c
+@@ -0,0 +1,535 @@
++/* SPDX-License-Identifier: LGPL-2.1+ */
++/******************************************************************************
++ * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved
++ * Description: isulad utils
++ * Author: lifeng
++ * Create: 2020-04-11
++******************************************************************************/
++
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE 1
++#endif
++
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <pwd.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <errno.h>
++#include <stdio_ext.h>
++
++#include "isulad_utils.h"
++#include "log.h"
++#include "path.h"
++#include "file_utils.h"
++
++lxc_log_define(isulad_utils, lxc);
++
++void *lxc_common_calloc_s(size_t size)
++{
++	if (size == 0 || size > SIZE_MAX) {
++		return NULL;
++	}
++
++	return calloc((size_t)1, size);
++}
++
++int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize)
++{
++	void *tmp = NULL;
++
++	if (newsize == 0) {
++		goto err_out;
++	}
++
++	tmp = lxc_common_calloc_s(newsize);
++	if (tmp == NULL) {
++		ERROR("Failed to malloc memory");
++		goto err_out;
++	}
++
++	if (oldptr != NULL) {
++		memcpy(tmp, oldptr, (newsize < oldsize) ? newsize : oldsize);
++
++		memset(oldptr, 0, oldsize);
++
++		free(oldptr);
++	}
++
++	*newptr = tmp;
++	return 0;
++
++err_out:
++	return -1;
++}
++
++char *safe_strdup(const char *src)
++{
++	char *dst = NULL;
++
++	if (src == NULL) {
++		return NULL;
++	}
++
++	dst = strdup(src);
++	if (dst == NULL) {
++		abort();
++	}
++
++	return dst;
++}
++
++int lxc_open(const char *filename, int flags, mode_t mode)
++{
++	char rpathPATH_MAX = {0x00};
++
++	if (cleanpath(filename, rpath, sizeof(rpath)) == NULL) {
++		return -1;
++	}
++	if (mode) {
++		return open(rpath, (int)((unsigned int)flags | O_CLOEXEC), mode);
++	} else {
++		return open(rpath, (int)((unsigned int)flags | O_CLOEXEC));
++	}
++}
++
++FILE *lxc_fopen(const char *filename, const char *mode)
++{
++	char rpathPATH_MAX = {0x00};
++
++	if (cleanpath(filename, rpath, sizeof(rpath)) == NULL) {
++		return NULL;
++	}
++
++	return fopen_cloexec(rpath, mode);
++}
++
++/* isulad: write error message */
++void lxc_write_error_message(int errfd, const char *format, ...)
++{
++	int ret;
++	char errbufBUFSIZ + 1 = {0};
++	ssize_t sret;
++	va_list argp;
++
++	if (errfd <= 0)
++		return;
++
++	va_start(argp, format);
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
++	ret = vsnprintf(errbuf, BUFSIZ, format, argp);
++#pragma GCC diagnostic pop
++	va_end(argp);
++	if (ret < 0 || ret >= BUFSIZ)
++		SYSERROR("Failed to call vsnprintf");
++	sret = write(errfd, errbuf, strlen(errbuf));
++	if (sret < 0)
++		SYSERROR("Write errbuf failed");
++}
++
++/* isulad: read file to buffer */
++int lxc_file2str(const char *filename, char ret, int cap)
++{
++    int fd, num_read;
++
++    if ((fd = lxc_open(filename, O_RDONLY | O_CLOEXEC, 0)) == -1)
++        return -1;
++    if ((num_read = read(fd, ret, cap - 1)) <= 0)
++        num_read = -1;
++    else
++        retnum_read = 0;
++    close(fd);
++
++    return num_read;
++}
++
++/* isuald: lxc_stat2proc() makes sure it can handle arbitrary executable file basenames
++ * for `cmd', i.e. those with embedded whitespace or embedded ')'s.
++ * Such names confuse %s (see scanf(3)), so the string is split and %39c
++ * is used instead. (except for embedded ')' "(%^)c)" would work.
++ */
++static proc_t *lxc_stat2proc(const char *S)
++{
++    int num;
++    proc_t *P = NULL;
++    char *tmp = NULL;
++
++    if (!S)
++        return NULL;
++
++    tmp = strrchr(S, ')');  /* split into "PID (cmd" and "<rest>" */
++    if (!tmp)
++        return NULL;
++    *tmp = '\0';            /* replace trailing ')' with NUL */
++
++    P = malloc(sizeof(proc_t));
++    if (P == NULL)
++        return NULL;
++    (void)memset(P, 0x00, sizeof(proc_t));
++
++    /* parse these two strings separately, skipping the leading "(". */
++    /* https://www.openwall.com/lists/musl/2013/11/15/5: musl's sscanf("%15c",cmd) 
++       requires exactly 15 characters; anything shorter is a matching failure. */
++#ifdef __MUSL__
++    num = sscanf(S, "%d (%15s", &P->pid, P->cmd);   /* comm16 in kernel */
++#else
++    num = sscanf(S, "%d (%15c", &P->pid, P->cmd);   /* comm16 in kernel */
++#endif
++    if (num != 2) {
++        ERROR("Call sscanf error: %s", errno ? strerror(errno) : "");
++        free(P);
++        return NULL;
++    }
++    num = sscanf(tmp + 2,           /* skip space after ')' too */
++                 "%c "
++                 "%d %d %d %d %d "
++                 "%lu %lu %lu %lu %lu "
++                 "%Lu %Lu %Lu %Lu "  /* utime stime cutime cstime */
++                 "%ld %ld %ld %ld "
++                 "%Lu "  /* start_time */
++                 "%lu "
++                 "%ld "
++                 "%lu %lu %lu %lu %lu %lu "
++                 "%*s %*s %*s %*s " /* discard, no RT signals & Linux 2.1 used hex */
++                 "%lu %lu %lu "
++                 "%d %d "
++                 "%lu %lu",
++                 &P->state,
++                 &P->ppid, &P->pgrp, &P->session, &P->tty, &P->tpgid,
++                 &P->flags, &P->min_flt, &P->cmin_flt, &P->maj_flt, &P->cmaj_flt,
++                 &P->utime, &P->stime, &P->cutime, &P->cstime,
++                 &P->priority, &P->nice, &P->timeout, &P->it_real_value,
++                 &P->start_time,
++                 &P->vsize,
++                 &P->rss,
++                 &P->rss_rlim, &P->start_code, &P->end_code, &P->start_stack, &P->kstk_esp,
++                 &P->kstk_eip,
++                 &P->wchan, &P->nswap, &P->cnswap,
++                 &P->exit_signal, &P->processor,  /* 2.2.1 ends with "exit_signal" */
++                 &P->rtprio, &P->sched  /* both added to 2.5.18 */
++                );
++    if (num != 35) {
++        ERROR("Call sscanf error: %s", errno ? strerror(errno) : "");
++        free(P);
++        return NULL;
++    }
++    if (P->tty == 0)
++        P->tty = -1;  /* the old notty val, update elsewhere bef. moving to 0 */
++    return P;
++}
++
++/* isulad: get starttime of process pid */
++unsigned long long lxc_get_process_startat(pid_t pid)
++{
++    int sret = 0;
++    unsigned long long startat = 0;
++    proc_t *pid_info = NULL;
++    char filenamePATH_MAX = {0};
++    char sbuf1024 = {0}; /* bufs for stat */
++
++    sret = snprintf(filename, sizeof(filename), "/proc/%d/stat", pid);
++    if (sret < 0 || sret >= sizeof(filename)) {
++        ERROR("Failed to sprintf filename");
++        goto out;
++    }
++
++    if ((lxc_file2str(filename, sbuf, sizeof(sbuf))) == -1) {
++        SYSERROR("Failed to read pidfile %s", filename);
++        goto out;
++    }
++
++    pid_info = lxc_stat2proc(sbuf);
++    if (!pid_info) {
++        ERROR("Failed to get proc stat info");
++        goto out;
++    }
++
++    startat = pid_info->start_time;
++out:
++    free(pid_info);
++    return startat;
++}
++
++// isulad: set env home in container
++int lxc_setup_env_home(uid_t uid)
++{
++#define __PASSWD_FILE__ "/etc/passwd"
++	char *homedir = "/"; // default home dir is /
++	FILE *stream = NULL;
++	struct passwd pw, *pwbufp = NULL;
++	char bufBUFSIZ;
++	const char *curr_home = NULL;
++
++	curr_home = getenv("HOME");
++	// if user set or image set, just use it.
++	if (curr_home != NULL && strcmp(curr_home, "") != 0) {
++		return 0;
++	}
++
++	stream = fopen_cloexec(__PASSWD_FILE__, "r");
++	if (stream == NULL) {
++		SYSWARN("Failed to open %s", __PASSWD_FILE__);
++		goto set_env;
++	}
++
++#if IS_BIONIC
++	while (util_getpwent_r(stream, &pw, buf, sizeof(buf), &pwbufp) == 0 && pwbufp != NULL) {
++#else
++	while (fgetpwent_r(stream, &pw, buf, sizeof(buf), &pwbufp) == 0 && pwbufp != NULL) {
++#endif
++		if (pwbufp->pw_uid == uid) {
++			homedir = pwbufp->pw_dir;
++			goto set_env;
++		}
++	}
++	WARN("User invalid, can not find user '%u'", uid);
++
++set_env:
++	if (stream)
++		fclose(stream);
++
++	// if we didn't configure HOME, set it based on uid;
++	// override it if reach here.
++	if (setenv("HOME", homedir, 1) < 0) {
++		SYSERROR("Unable to set env 'HOME'");
++		return -1;
++	}
++
++	NOTICE("Setted env 'HOME' to %s", homedir);
++	return 0;
++}
++
++bool lxc_process_alive(pid_t pid, unsigned long long start_time)
++{
++	int sret = 0;
++	bool alive = true;
++	proc_t *pid_info = NULL;
++	char filenamePATH_MAX = {0};
++	char sbuf1024 = {0}; /* bufs for stat */
++
++	sret = kill(pid, 0);
++	if (sret < 0 && errno == ESRCH)
++		return false;
++
++	sret = snprintf(filename, sizeof(filename), "/proc/%d/stat", pid);
++	if (sret < 0 || sret >= sizeof(filename)) {
++		ERROR("Failed to sprintf filename");
++		goto out;
++	}
++
++	if ((lxc_file2str(filename, sbuf, sizeof(sbuf))) == -1) {
++		ERROR("Failed to read pidfile %s", filename);
++		alive = false;
++		goto out;
++	}
++
++	pid_info = lxc_stat2proc(sbuf);
++	if (!pid_info) {
++		ERROR("Failed to get proc stat info");
++		alive = false;
++		goto out;
++	}
++
++	if (start_time != pid_info->start_time)
++		alive = false;
++out:
++	free(pid_info);
++	return alive;
++}
++
++bool is_non_negative_num(const char *s)
++{
++	if (!s || !strcmp(s, ""))
++		return false;
++	while(*s  != '\0') {
++		if(!isdigit(*s))
++			return false;
++		++s;
++	}
++	return true;
++}
++
++static int hold_int(const char delim, bool required, char **src, unsigned int *dst)
++{
++    unsigned long long int res = 0;
++    char *err_str = NULL;
++
++    // ensure *src not a empty string
++    if (**src == '\0') {
++        ERROR("Empty subject on given entrie is not allowed.");
++        return -1;
++    }
++
++    errno = 0;
++    // covert string to long long
++    res = strtoull(*src, &err_str, 0);
++    if (errno != 0 && errno != ERANGE) {
++        ERROR("Parse int from string failed.");
++        return -1;
++    }
++
++    // **src is not a digit
++    if (err_str == *src) {
++        if (!required) {
++            ERROR("Integer part is missing.");
++            return -1;
++        }
++        // if required, just set 0
++        *dst = 0;
++    } else {
++        if (sizeof(void *) > 4 && res > UINT_MAX) { // make sure 64-bit platform behave same as 32-bit
++            res = UINT_MAX;
++        }
++        res = res & UINT_MAX;
++        *dst = (uint32_t)res;
++    }
++
++    // normal case
++    if (*err_str == delim) {
++        err_str++;
++    } else if (*err_str != '\0') {
++        ERROR("Invalid digit string.");
++        return -1;
++    }
++
++    *src = err_str; // update src to next valid context in line.
++    return 0;
++}
++
++static void hold_string(const char delim, char **src, char **dst)
++{
++    for (*dst = *src; **src != delim; ++(*src)) {
++        if (**src == '\0') {
++            break;
++        }
++    }
++
++    if (**src == delim) {
++        **src = '\0';
++        ++(*src);
++    }
++}
++
++static int parse_line_pw(const char delim, char *line, struct passwd *result)
++{
++    int ret = 0;
++    bool required = false;
++    char *walker = NULL;
++
++    walker = strpbrk(line, "\n");
++    if (walker != NULL) {
++        // clear newline char
++        *walker = '\0';
++    }
++
++    hold_string(delim, &line, &result->pw_name);
++
++    required = (result->pw_name0 == '+' || result->pw_name0 == '-') ? true : false;
++
++    hold_string(delim, &line, &result->pw_passwd);
++
++    ret = hold_int(delim, required, &line, &result->pw_uid);
++    if (ret != 0) {
++        // a legitimate line must have uid
++        ERROR("Parse uid error.");
++        return ret;
++    }
++
++    ret = hold_int(delim, required, &line, &result->pw_gid);
++    if (ret != 0) {
++        // it's ok to not provide gid
++        ERROR("Parse gid error.");
++        return ret;
++    }
++
++    hold_string(delim, &line, &result->pw_gecos);
++
++    hold_string(delim, &line, &result->pw_dir);
++
++    result->pw_shell = line;
++    return 0;
++}
++
++char *util_left_trim_space(char *str)
++{
++    char *begin = str;
++    char *tmp = str;
++    while (isspace(*begin)) {
++        begin++;
++    }
++    while ((*tmp++ = *begin++)) {
++    }
++    return str;
++}
++
++int util_getpwent_r(FILE *stream, struct passwd *resbuf, char *buffer, size_t buflen, struct passwd **result)
++{
++    const char delim = ':';
++    char *buff_end = NULL;
++    char *walker = NULL;
++    bool got = false;
++    int ret = 0;
++
++    if (stream == NULL || resbuf == NULL || buffer == NULL || result == NULL) {
++        ERROR("Password obj, params is NULL.");
++        return -1;
++    }
++
++    if (buflen <= 1) {
++        ERROR("Inadequate buffer length was given.");
++        return -1;
++    }
++
++    buff_end = buffer + buflen - 1;
++    flockfile(stream);
++
++    while (1) {
++        *buff_end = '\xff';
++        walker = fgets_unlocked(buffer, buflen, stream);
++        // if get NULL string
++        if (walker == NULL) {
++            *result = NULL;
++            // reach end of file, return error
++            if (feof(stream)) {
++                ret = ENOENT;
++                goto out;
++            }
++            // overflow buffer
++            ret = ERANGE;
++            goto out;
++        }
++        // just overflow last char in buffer
++        if (*buff_end != '\xff') {
++            *result = NULL;
++            ret = ERANGE;
++            goto out;
++        }
++
++        (void)util_left_trim_space(buffer);
++        // skip comment line and empty line
++        if (walker0 == '#' || walker0 == '\0') {
++            continue;
++        }
++
++        if (parse_line_pw(delim, walker, resbuf) == 0) {
++            got = true;
++            break;
++        }
++    }
++    if (!got) {
++        *result = NULL;
++        ret = ERANGE;
++        goto out;
++    }
++
++    *result = resbuf;
++    ret = 0;
++out:
++    funlockfile(stream);
++    return ret;
++}
+diff --git a/src/lxc/isulad_utils.h b/src/lxc/isulad_utils.h
+new file mode 100644
+index 0000000..7a5eb89
+--- /dev/null
++++ b/src/lxc/isulad_utils.h
+@@ -0,0 +1,102 @@
++/* SPDX-License-Identifier: LGPL-2.1+ */
++/******************************************************************************
++ * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved
++ * Description: isulad utils
++ * Author: lifeng
++ * Create: 2020-04-11
++******************************************************************************/
++#ifndef __iSULAD_UTILS_H
++#define __iSULAD_UTILS_H
++
++#include <stdio.h>
++#include <stdbool.h>
++#include <pwd.h>
++
++/* isulad: replace space with SPACE_MAGIC_STR */
++#define SPACE_MAGIC_STR "#)"
++
++/* isulad:
++ ld cutime, cstime, priority, nice, timeout, it_real_value, rss,
++ c  state,
++ d  ppid, pgrp, session, tty, tpgid,
++ s  signal, blocked, sigignore, sigcatch,
++ lu flags, min_flt, cmin_flt, maj_flt, cmaj_flt, utime, stime,
++ lu rss_rlim, start_code, end_code, start_stack, kstk_esp, kstk_eip,
++ lu start_time, vsize, wchan, nswap, cnswap,
++*/
++
++/* Basic data structure which holds all information we can get about a process.
++ * (unless otherwise specified, fields are read from /proc/#/stat)
++ *
++ * Most of it comes from task_struct in linux/sched.h
++ */
++typedef struct proc_t {
++    // 1st 16 bytes
++    int pid;        /* process id */
++    int ppid;       /* pid of parent process */
++
++    char state;     /* single-char code for process state (S=sleeping) */
++
++    unsigned long long
++    utime,      /* user-mode CPU time accumulated by process */
++    stime,      /* kernel-mode CPU time accumulated by process */
++    // and so on...
++    cutime,     /* cumulative utime of process and reaped children */
++    cstime,     /* cumulative stime of process and reaped children */
++    start_time; /* start time of process -- seconds since 1-1-70 */
++
++    long
++    priority,   /* kernel scheduling priority */
++    timeout,    /* ? */
++    nice,       /* standard unix nice level of process */
++    rss,        /* resident set size from /proc/#/stat (pages) */
++    it_real_value;  /* ? */
++    unsigned long
++    rtprio,     /* real-time priority */
++    sched,      /* scheduling class */
++    vsize,      /* number of pages of virtual memory ... */
++    rss_rlim,   /* resident set size limit? */
++    flags,      /* kernel flags for the process */
++    min_flt,    /* number of minor page faults since process start */
++    maj_flt,    /* number of major page faults since process start */
++    cmin_flt,   /* cumulative min_flt of process and child processes */
++    cmaj_flt,   /* cumulative maj_flt of process and child processes */
++    nswap,      /* ? */
++    cnswap,     /* cumulative nswap ? */
++    start_code, /* address of beginning of code segment */
++    end_code,   /* address of end of code segment */
++    start_stack,    /* address of the bottom of stack for the process */
++    kstk_esp,   /* kernel stack pointer */
++    kstk_eip,   /* kernel instruction pointer */
++    wchan;      /* address of kernel wait channel proc is sleeping in */
++
++    char cmd16;   /* basename of executable file in call to exec(2) */
++    int
++    pgrp,       /* process group id */
++    session,    /* session id */
++    tty,        /* full device number of controlling terminal */
++    tpgid,      /* terminal process group id */
++    exit_signal,    /* might not be SIGCHLD */
++    processor;      /* current (or most recent?) CPU */
++} proc_t;
++
++extern int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize);
++extern void *lxc_common_calloc_s(size_t size);
++extern char *safe_strdup(const char *src);
++
++extern int lxc_open(const char *filename, int flags, mode_t mode);
++extern FILE *lxc_fopen(const char *filename, const char *mode);
++
++extern void lxc_write_error_message(int errfd, const char *format, ...);
++extern int lxc_file2str(const char *filename, char ret, int cap);
++extern int unsigned long long lxc_get_process_startat(pid_t pid);
++// set env home in container
++extern int lxc_setup_env_home(uid_t uid);
++
++extern bool lxc_process_alive(pid_t pid, unsigned long long start_time);
++
++extern bool is_non_negative_num(const char *s);
++
++int util_getpwent_r(FILE *stream, struct passwd *resbuf, char *buffer, size_t buflen, struct passwd **result);
++
++#endif
+diff --git a/src/lxc/json/defs.c b/src/lxc/json/defs.c
+new file mode 100644
+index 0000000..4bf569a
+--- /dev/null
++++ b/src/lxc/json/defs.c
+@@ -0,0 +1,205 @@
++// Generated from defs.json. Do not edit!
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++#include <string.h>
++#include <read-file.h>
++#include "defs.h"
++
++defs_hook *make_defs_hook(yajl_val tree, struct parser_context *ctx, parser_error *err) {
++    defs_hook *ret = NULL;
++    *err = 0;
++    if (tree == NULL)
++        return ret;
++    ret = safe_malloc(sizeof(*ret));
++    {
++        yajl_val val = get_val(tree, "path", yajl_t_string);
++        if (val != NULL) {
++            char *str = YAJL_GET_STRING(val);
++            ret->path = safe_strdup(str ? str : "");
++        }
++    }
++    {
++        yajl_val tmp = get_val(tree, "args", yajl_t_array);
++        if (tmp != NULL && YAJL_GET_ARRAY(tmp) != NULL && YAJL_GET_ARRAY(tmp)->len > 0) {
++            size_t i;
++            ret->args_len = YAJL_GET_ARRAY(tmp)->len;
++            if (YAJL_GET_ARRAY(tmp)->len > SIZE_MAX / sizeof(*ret->args) - 1) {
++                free_defs_hook(ret);
++                return NULL;
++            }
++            ret->args = safe_malloc((YAJL_GET_ARRAY(tmp)->len + 1) * sizeof(*ret->args));
++            for (i = 0; i < YAJL_GET_ARRAY(tmp)->len; i++) {
++                yajl_val val = YAJL_GET_ARRAY(tmp)->valuesi;
++                if (val != NULL) {
++                    char *str = YAJL_GET_STRING(val);
++                    ret->argsi = safe_strdup(str ? str : "");
++                }
++            }
++        }
++    }
++    {
++        yajl_val tmp = get_val(tree, "env", yajl_t_array);
++        if (tmp != NULL && YAJL_GET_ARRAY(tmp) != NULL && YAJL_GET_ARRAY(tmp)->len > 0) {
++            size_t i;
++            ret->env_len = YAJL_GET_ARRAY(tmp)->len;
++            if (YAJL_GET_ARRAY(tmp)->len > SIZE_MAX / sizeof(*ret->env) - 1) {
++                free_defs_hook(ret);
++                return NULL;
++            }
++            ret->env = safe_malloc((YAJL_GET_ARRAY(tmp)->len + 1) * sizeof(*ret->env));
++            for (i = 0; i < YAJL_GET_ARRAY(tmp)->len; i++) {
++                yajl_val val = YAJL_GET_ARRAY(tmp)->valuesi;
++                if (val != NULL) {
++                    char *str = YAJL_GET_STRING(val);
++                    ret->envi = safe_strdup(str ? str : "");
++                }
++            }
++        }
++    }
++    {
++        yajl_val val = get_val(tree, "timeout", yajl_t_number);
++        if (val != NULL) {
++            int invalid = common_safe_int(YAJL_GET_NUMBER(val), (int *)&ret->timeout);
++            if (invalid) {
++                if (asprintf(err, "Invalid value '%s' with type 'integer' for key 'timeout': %s", YAJL_GET_NUMBER(val), strerror(-invalid)) < 0)
++                    *err = safe_strdup("error allocating memory");
++                free_defs_hook(ret);
++                return NULL;
++            }
++        }
++    }
++    if (ret->path == NULL) {
++        if (asprintf(err, "Required field '%s' not present", "path") < 0)
++            *err = safe_strdup("error allocating memory");
++        free_defs_hook(ret);
++        return NULL;
++    }
++
++    if (tree->type == yajl_t_object && (ctx->options & PARSE_OPTIONS_STRICT)) {
++        int i;
++        for (i = 0; i < tree->u.object.len; i++)
++            if (strcmp(tree->u.object.keysi, "path") &&
++                strcmp(tree->u.object.keysi, "args") &&
++                strcmp(tree->u.object.keysi, "env") &&
++                strcmp(tree->u.object.keysi, "timeout")) {
++                if (ctx->stderr > 0)
++                    fprintf(ctx->stderr, "WARNING: unknown key found: %s\n", tree->u.object.keysi);
++            }
++        }
++    return ret;
++}
++
++void free_defs_hook(defs_hook *ptr) {
++    if (ptr == NULL)
++        return;
++    free(ptr->path);
++    ptr->path = NULL;
++    if (ptr->args != NULL) {
++        size_t i;
++        for (i = 0; i < ptr->args_len; i++) {
++            if (ptr->argsi != NULL) {
++                free(ptr->argsi);
++                ptr->argsi = NULL;
++            }
++        }
++        free(ptr->args);
++        ptr->args = NULL;
++    }
++    if (ptr->env != NULL) {
++        size_t i;
++        for (i = 0; i < ptr->env_len; i++) {
++            if (ptr->envi != NULL) {
++                free(ptr->envi);
++                ptr->envi = NULL;
++            }
++        }
++        free(ptr->env);
++        ptr->env = NULL;
++    }
++    free(ptr);
++}
++
++yajl_gen_status gen_defs_hook(yajl_gen g, defs_hook *ptr, struct parser_context *ctx, parser_error *err) {
++    yajl_gen_status stat = yajl_gen_status_ok;
++    *err = 0;
++    stat = reformat_start_map(g);
++    if (yajl_gen_status_ok != stat)
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->path != NULL)) {
++        char *str = "";
++        stat = reformat_map_key(g, "path", strlen("path"));
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        if (ptr != NULL && ptr->path != NULL) {
++            str = ptr->path;
++        }
++        stat = reformat_string(g, str, strlen(str));
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) || (ptr != NULL && ptr->args != NULL)) {
++        size_t len = 0, i;
++        stat = reformat_map_key(g, "args", strlen("args"));
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        if (ptr != NULL && ptr->args != NULL) {
++            len = ptr->args_len;
++        }
++        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
++            yajl_gen_config(g, yajl_gen_beautify, 0);
++        stat = reformat_start_array(g);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        for (i = 0; i < len; i++) {
++            stat = reformat_string(g, ptr->argsi, strlen(ptr->argsi));
++            if (yajl_gen_status_ok != stat)
++                GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_end_array(g);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
++            yajl_gen_config(g, yajl_gen_beautify, 1);
++    }
++    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) || (ptr != NULL && ptr->env != NULL)) {
++        size_t len = 0, i;
++        stat = reformat_map_key(g, "env", strlen("env"));
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        if (ptr != NULL && ptr->env != NULL) {
++            len = ptr->env_len;
++        }
++        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
++            yajl_gen_config(g, yajl_gen_beautify, 0);
++        stat = reformat_start_array(g);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        for (i = 0; i < len; i++) {
++            stat = reformat_string(g, ptr->envi, strlen(ptr->envi));
++            if (yajl_gen_status_ok != stat)
++                GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_end_array(g);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
++            yajl_gen_config(g, yajl_gen_beautify, 1);
++    }
++    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->timeout)) {
++        long long int num = 0;
++        stat = reformat_map_key(g, "timeout", strlen("timeout"));
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        if (ptr != NULL && ptr->timeout) {
++            num = (long long int)ptr->timeout;
++        }
++        stat = reformat_int(g, num);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    stat = reformat_end_map(g);
++    if (yajl_gen_status_ok != stat)
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++    return yajl_gen_status_ok;
++}
+diff --git a/src/lxc/json/defs.h b/src/lxc/json/defs.h
+new file mode 100644
+index 0000000..0bbd8ac
+--- /dev/null
++++ b/src/lxc/json/defs.h
+@@ -0,0 +1,37 @@
++// Generated from defs.json. Do not edit!
++#ifndef DEFS_SCHEMA_H
++#define DEFS_SCHEMA_H
++
++#include <sys/types.h>
++#include <stdint.h>
++#include "json_common.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef struct {
++    char *path;
++
++    char **args;
++    size_t args_len;
++
++    char **env;
++    size_t env_len;
++
++    int timeout;
++
++}
++defs_hook;
++
++void free_defs_hook(defs_hook *ptr);
++
++defs_hook *make_defs_hook(yajl_val tree, struct parser_context *ctx, parser_error *err);
++
++yajl_gen_status gen_defs_hook(yajl_gen g, defs_hook *ptr, struct parser_context *ctx, parser_error *err);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+diff --git a/src/lxc/json/json_common.c b/src/lxc/json/json_common.c
+new file mode 100755
+index 0000000..ec20c59
+--- /dev/null
++++ b/src/lxc/json/json_common.c
+@@ -0,0 +1,1153 @@
++// Auto generated file. Do not edit!
++#define _GNU_SOURCE
++#include <stdio.h>
++#include <errno.h>
++#include <limits.h>
++#include "json_common.h"
++
++#define MAX_NUM_STR_LEN 21
++
++yajl_gen_status reformat_number(void *ctx, const char *str, size_t len) {
++    yajl_gen g = (yajl_gen) ctx;
++    return yajl_gen_number(g, str, len);
++}
++
++yajl_gen_status reformat_uint(void *ctx, long long unsigned int num) {
++    char numstrMAX_NUM_STR_LEN;
++    int ret;
++
++    ret = snprintf(numstr, MAX_NUM_STR_LEN, "%llu", num);
++    if (ret < 0 || ret >= MAX_NUM_STR_LEN) {
++        return yajl_gen_in_error_state;
++    }
++    return reformat_number(ctx, (const char *)numstr, strlen(numstr));
++}
++
++yajl_gen_status reformat_int(void *ctx, long long int num) {
++    char numstrMAX_NUM_STR_LEN;
++    int ret;
++
++    ret = snprintf(numstr, MAX_NUM_STR_LEN, "%lld", num);
++    if (ret < 0 || ret >= MAX_NUM_STR_LEN) {
++        return yajl_gen_in_error_state;
++    }
++    return reformat_number(ctx, (const char *)numstr, strlen(numstr));
++}
++
++yajl_gen_status reformat_double(void *ctx, double num) {
++    yajl_gen g = (yajl_gen) ctx;
++    return yajl_gen_double(g, num);
++}
++
++yajl_gen_status reformat_string(void *ctx, const char *str, size_t len) {
++    yajl_gen g = (yajl_gen) ctx;
++    return yajl_gen_string(g, (const unsigned char *)str, len);
++}
++
++yajl_gen_status reformat_null(void *ctx) {
++    yajl_gen g = (yajl_gen) ctx;
++    return yajl_gen_null(g);
++}
++
++yajl_gen_status reformat_bool(void *ctx, int boolean) {
++    yajl_gen g = (yajl_gen) ctx;
++    return yajl_gen_bool(g, boolean);
++}
++
++yajl_gen_status reformat_map_key(void *ctx, const char *str, size_t len) {
++    yajl_gen g = (yajl_gen) ctx;
++    return yajl_gen_string(g, (const unsigned char *)str, len);
++}
++
++yajl_gen_status reformat_start_map(void *ctx) {
++    yajl_gen g = (yajl_gen) ctx;
++    return yajl_gen_map_open(g);
++}
++
++yajl_gen_status reformat_end_map(void *ctx) {
++    yajl_gen g = (yajl_gen) ctx;
++    return yajl_gen_map_close(g);
++}
++
++yajl_gen_status reformat_start_array(void *ctx) {
++    yajl_gen g = (yajl_gen) ctx;
++    return yajl_gen_array_open(g);
++}
++
++yajl_gen_status reformat_end_array(void *ctx) {
++    yajl_gen g = (yajl_gen) ctx;
++    return yajl_gen_array_close(g);
++}
++
++bool json_gen_init(yajl_gen *g, struct parser_context *ctx) {
++    *g = yajl_gen_alloc(NULL);
++    if (NULL == *g) {
++        return false;
++
++    }
++    yajl_gen_config(*g, yajl_gen_beautify, !(ctx->options & GEN_OPTIONS_SIMPLIFY));
++    yajl_gen_config(*g, yajl_gen_validate_utf8, !(ctx->options & GEN_OPTIONS_NOT_VALIDATE_UTF8));
++    return true;
++}
++
++yajl_val get_val(yajl_val tree, const char *name, yajl_type type) {
++    const char *path = { name, NULL };
++    return yajl_tree_get(tree, path, type);
++}
++
++void *safe_malloc(size_t size) {
++    void *ret = NULL;
++    if (size == 0) {
++        abort();
++    }
++    ret = calloc(1, size);
++    if (ret == NULL) {
++        abort();
++    }
++    return ret;
++}
++
++int common_safe_double(const char *numstr, double *converted) {
++    char *err_str = NULL;
++    double d;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    d = strtod(numstr, &err_str);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err_str == NULL || err_str == numstr || *err_str != '\0') {
++        return -EINVAL;
++    }
++
++    *converted = d;
++    return 0;
++}
++
++int common_safe_uint8(const char *numstr, uint8_t *converted) {
++    char *err = NULL;
++    unsigned long int uli;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    uli = strtoul(numstr, &err, 0);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err == NULL || err == numstr || *err != '\0') {
++        return -EINVAL;
++    }
++
++    if (uli > UINT8_MAX) {
++        return -ERANGE;
++    }
++
++    *converted = (uint8_t)uli;
++    return 0;
++}
++
++int common_safe_uint16(const char *numstr, uint16_t *converted) {
++    char *err = NULL;
++    unsigned long int uli;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    uli = strtoul(numstr, &err, 0);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err == NULL || err == numstr || *err != '\0') {
++        return -EINVAL;
++    }
++
++    if (uli > UINT16_MAX) {
++        return -ERANGE;
++    }
++
++    *converted = (uint16_t)uli;
++    return 0;
++}
++
++int common_safe_uint32(const char *numstr, uint32_t *converted) {
++    char *err = NULL;
++    unsigned long long int ull;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    ull = strtoull(numstr, &err, 0);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err == NULL || err == numstr || *err != '\0') {
++        return -EINVAL;
++    }
++
++    if (ull > UINT32_MAX) {
++        return -ERANGE;
++    }
++
++    *converted = (uint32_t)ull;
++    return 0;
++}
++
++int common_safe_uint64(const char *numstr, uint64_t *converted) {
++    char *err = NULL;
++    unsigned long long int ull;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    ull = strtoull(numstr, &err, 0);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err == NULL || err == numstr || *err != '\0') {
++        return -EINVAL;
++    }
++
++    *converted = (uint64_t)ull;
++    return 0;
++}
++
++int common_safe_uint(const char *numstr, unsigned int *converted) {
++    char *err = NULL;
++    unsigned long long int ull;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    ull = strtoull(numstr, &err, 0);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err == NULL || err == numstr || *err != '\0') {
++        return -EINVAL;
++    }
++
++    if (ull > UINT_MAX) {
++        return -ERANGE;
++    }
++
++    *converted = (unsigned int)ull;
++    return 0;
++}
++
++int common_safe_int8(const char *numstr, int8_t *converted) {
++    char *err = NULL;
++    long int li;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    li = strtol(numstr, &err, 0);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err == NULL || err == numstr || *err != '\0') {
++        return -EINVAL;
++    }
++
++    if (li > INT8_MAX || li < INT8_MIN) {
++        return -ERANGE;
++    }
++
++    *converted = (int8_t)li;
++    return 0;
++}
++
++int common_safe_int16(const char *numstr, int16_t *converted) {
++    char *err = NULL;
++    long int li;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    li = strtol(numstr, &err, 0);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err == NULL || err == numstr || *err != '\0') {
++        return -EINVAL;
++    }
++
++    if (li > INT16_MAX || li < INT16_MIN) {
++        return -ERANGE;
++    }
++
++    *converted = (int16_t)li;
++    return 0;
++}
++
++int common_safe_int32(const char *numstr, int32_t *converted) {
++    char *err = NULL;
++    long long int lli;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    lli = strtol(numstr, &err, 0);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err == NULL || err == numstr || *err != '\0') {
++        return -EINVAL;
++    }
++
++    if (lli > INT32_MAX || lli < INT32_MIN) {
++        return -ERANGE;
++    }
++
++    *converted = (int32_t)lli;
++    return 0;
++}
++
++int common_safe_int64(const char *numstr, int64_t *converted) {
++    char *err = NULL;
++    long long int lli;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    lli = strtoll(numstr, &err, 0);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err == NULL || err == numstr || *err != '\0') {
++        return -EINVAL;
++    }
++
++    *converted = (int64_t)lli;
++    return 0;
++}
++
++int common_safe_int(const char *numstr, int *converted) {
++    char *err = NULL;
++    long long int lli;
++
++    if (numstr == NULL) {
++        return -EINVAL;
++    }
++
++    errno = 0;
++    lli = strtol(numstr, &err, 0);
++    if (errno > 0) {
++        return -errno;
++    }
++
++    if (err == NULL || err == numstr || *err != '\0') {
++        return -EINVAL;
++    }
++
++    if (lli > INT_MAX || lli < INT_MIN) {
++        return -ERANGE;
++    }
++
++    *converted = (int)lli;
++    return 0;
++}
++
++yajl_gen_status gen_json_map_int_int(void *ctx, json_map_int_int *map, struct parser_context *ptx, parser_error *err) {
++    yajl_gen_status stat = yajl_gen_status_ok;
++    yajl_gen g = (yajl_gen) ctx;
++    size_t len = 0, i = 0;
++    if (map != NULL) {
++        len = map->len;
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 0);
++    }
++    stat = reformat_start_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++
++    }
++    for (i = 0; i < len; i++) {
++        char numstrMAX_NUM_STR_LEN;
++        int nret;
++        nret = snprintf(numstr, MAX_NUM_STR_LEN, "%lld", (long long int)map->keysi);
++        if (nret < 0 || nret >= MAX_NUM_STR_LEN) {
++            if (!*err && asprintf(err, "Error to print string") < 0) {
++                *(err) = safe_strdup("error allocating memory");
++            }
++            return yajl_gen_in_error_state;
++        }
++        stat = reformat_string(g, numstr, strlen(numstr));
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_int(g, map->valuesi);
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++    }
++
++    stat = reformat_end_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 1);
++    }
++    return yajl_gen_status_ok;
++}
++
++void free_json_map_int_int(json_map_int_int *map) {
++    if (map != NULL) {
++        size_t i;
++        for (i = 0; i < map->len; i++) {
++            // No need to free key for type int
++            // No need to free value for type int
++        }
++        free(map->keys);
++        map->keys = NULL;
++        free(map->values);
++        map->values = NULL;
++        free(map);
++    }
++}
++json_map_int_int *make_json_map_int_int(yajl_val src, struct parser_context *ctx, parser_error *err) {
++    json_map_int_int *ret = NULL;
++    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
++        size_t i;
++        size_t len = YAJL_GET_OBJECT(src)->len;
++        if (len > SIZE_MAX / sizeof(int) - 1) {
++            return NULL;
++        }
++        ret = safe_malloc(sizeof(*ret));
++        ret->len = len;
++        ret->keys = safe_malloc((len + 1) * sizeof(int));
++        ret->values = safe_malloc((len + 1) * sizeof(int));
++        for (i = 0; i < len; i++) {
++            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
++            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
++
++            if (srckey != NULL) {
++                int invalid;
++                invalid = common_safe_int(srckey, &(ret->keysi));
++                if (invalid) {
++                    if (*err == NULL && asprintf(err, "Invalid key '%s' with type 'int': %s", srckey, strerror(-invalid)) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_int_int(ret);
++                    return NULL;
++                }
++            }
++
++            if (srcval != NULL) {
++                int invalid;
++                if (!YAJL_IS_NUMBER(srcval)) {
++                    if (*err == NULL && asprintf(err, "Invalid value with type 'int' for key '%s'", srckey) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_int_int(ret);
++                    return NULL;
++                }
++                invalid = common_safe_int(YAJL_GET_NUMBER(srcval), &(ret->valuesi));
++                if (invalid) {
++                    if (*err == NULL && asprintf(err, "Invalid value with type 'int' for key '%s': %s", srckey, strerror(-invalid)) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_int_int(ret);
++                    return NULL;
++                }
++            }
++        }
++    }
++    return ret;
++}
++int append_json_map_int_int(json_map_int_int *map, int key, int val) {
++    size_t len;
++    int *keys = NULL;
++    int *vals = NULL;
++
++    if (map == NULL) {
++        return -1;
++    }
++
++    if ((SIZE_MAX / sizeof(int) - 1) < map->len) {
++        return -1;
++    }
++
++    len = map->len + 1;
++    keys = safe_malloc(len * sizeof(int));
++    vals = safe_malloc(len * sizeof(int));
++
++    if (map->len) {
++        (void)memcpy(keys, map->keys, map->len * sizeof(int));
++        (void)memcpy(vals, map->values, map->len * sizeof(int));
++    }
++    free(map->keys);
++    map->keys = keys;
++    free(map->values);
++    map->values = vals;
++    map->keysmap->len = key;
++    map->valuesmap->len = val;
++
++    map->len++;
++    return 0;
++}
++
++yajl_gen_status gen_json_map_int_bool(void *ctx, json_map_int_bool *map, struct parser_context *ptx, parser_error *err) {
++    yajl_gen_status stat = yajl_gen_status_ok;
++    yajl_gen g = (yajl_gen) ctx;
++    size_t len = 0, i = 0;
++    if (map != NULL) {
++        len = map->len;
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 0);
++    }
++    stat = reformat_start_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++
++    }
++    for (i = 0; i < len; i++) {
++        char numstrMAX_NUM_STR_LEN;
++        int nret;
++        nret = snprintf(numstr, MAX_NUM_STR_LEN, "%lld", (long long int)map->keysi);
++        if (nret < 0 || nret >= MAX_NUM_STR_LEN) {
++            if (!*err && asprintf(err, "Error to print string") < 0) {
++                *(err) = safe_strdup("error allocating memory");
++            }
++            return yajl_gen_in_error_state;
++        }
++        stat = reformat_string(g, numstr, strlen(numstr));
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_bool(g, map->valuesi);
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++    }
++
++    stat = reformat_end_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 1);
++    }
++    return yajl_gen_status_ok;
++}
++
++void free_json_map_int_bool(json_map_int_bool *map) {
++    if (map != NULL) {
++        free(map->keys);
++        map->keys = NULL;
++        free(map->values);
++        map->values = NULL;
++        free(map);
++    }
++}
++json_map_int_bool *make_json_map_int_bool(yajl_val src, struct parser_context *ctx, parser_error *err) {
++    json_map_int_bool *ret = NULL;
++    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
++        size_t i;
++        size_t len = YAJL_GET_OBJECT(src)->len;
++        if (len > SIZE_MAX / sizeof(int) - 1) {
++            return NULL;
++        }
++        ret = safe_malloc(sizeof(*ret));
++        ret->len = len;
++        ret->keys = safe_malloc((len + 1) * sizeof(int));
++        ret->values = safe_malloc((len + 1) * sizeof(bool));
++        for (i = 0; i < len; i++) {
++            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
++            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
++
++            if (srckey != NULL) {
++                int invalid;
++                invalid = common_safe_int(srckey, &(ret->keysi));
++                if (invalid) {
++                    if (*err == NULL && asprintf(err, "Invalid key '%s' with type 'int': %s", srckey, strerror(-invalid)) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_int_bool(ret);
++                    return NULL;
++                }
++            }
++
++            if (srcval != NULL) {
++                if (YAJL_IS_TRUE(srcval)) {
++                    ret->valuesi = true;
++                } else if (YAJL_IS_FALSE(srcval)) {
++                    ret->valuesi = false;
++                } else {
++                    if (*err == NULL && asprintf(err, "Invalid value with type 'bool' for key '%s'", srckey) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_int_bool(ret);
++                    return NULL;
++                }
++            }
++        }
++    }
++    return ret;
++}
++int append_json_map_int_bool(json_map_int_bool *map, int key, bool val) {
++    size_t len;
++    int *keys = NULL;
++    bool *vals = NULL;
++
++    if (map == NULL) {
++        return -1;
++    }
++
++    if ((SIZE_MAX / sizeof(int) - 1) < map->len || (SIZE_MAX / sizeof(bool) - 1) < map->len) {
++        return -1;
++    }
++
++    len = map->len + 1;
++    keys = safe_malloc(len * sizeof(int));
++    vals = safe_malloc(len * sizeof(bool));
++
++    if (map->len) {
++        (void)memcpy(keys, map->keys, map->len * sizeof(int));
++        (void)memcpy(vals, map->values, map->len * sizeof(bool));
++    }
++    free(map->keys);
++    map->keys = keys;
++    free(map->values);
++    map->values = vals;
++    map->keysmap->len = key;
++    map->valuesmap->len = val;
++
++    map->len++;
++    return 0;
++}
++
++yajl_gen_status gen_json_map_int_string(void *ctx, json_map_int_string *map, struct parser_context *ptx, parser_error *err) {
++    yajl_gen_status stat = yajl_gen_status_ok;
++    yajl_gen g = (yajl_gen) ctx;
++    size_t len = 0, i = 0;
++    if (map != NULL) {
++        len = map->len;
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 0);
++    }
++    stat = reformat_start_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++
++    }
++    for (i = 0; i < len; i++) {
++        char numstrMAX_NUM_STR_LEN;
++        int nret;
++        nret = snprintf(numstr, MAX_NUM_STR_LEN, "%lld", (long long int)map->keysi);
++        if (nret < 0 || nret >= MAX_NUM_STR_LEN) {
++            if (!*err && asprintf(err, "Error to print string") < 0) {
++                *(err) = safe_strdup("error allocating memory");
++            }
++            return yajl_gen_in_error_state;
++        }
++        stat = reformat_string(g, numstr, strlen(numstr));
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_string(g, map->valuesi, strlen(map->valuesi));;
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++    }
++
++    stat = reformat_end_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 1);
++    }
++    return yajl_gen_status_ok;
++}
++
++void free_json_map_int_string(json_map_int_string *map) {
++    if (map != NULL) {
++        size_t i;
++        for (i = 0; i < map->len; i++) {
++            // No need to free key for type int
++            free(map->valuesi);
++            map->valuesi = NULL;
++        }
++        free(map->keys);
++        map->keys = NULL;
++        free(map->values);
++        map->values = NULL;
++        free(map);
++    }
++}
++json_map_int_string *make_json_map_int_string(yajl_val src, struct parser_context *ctx, parser_error *err) {
++    json_map_int_string *ret = NULL;
++    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
++        size_t i;
++        size_t len = YAJL_GET_OBJECT(src)->len;
++        if (len > SIZE_MAX / sizeof(char *) - 1) {
++            return NULL;
++        }
++        ret = safe_malloc(sizeof(*ret));
++        ret->len = len;
++        ret->keys = safe_malloc((len + 1) * sizeof(int));
++        ret->values = safe_malloc((len + 1) * sizeof(char *));
++        for (i = 0; i < len; i++) {
++            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
++            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
++
++            if (srckey != NULL) {
++                int invalid;
++                invalid = common_safe_int(srckey, &(ret->keysi));
++                if (invalid) {
++                    if (*err == NULL && asprintf(err, "Invalid key '%s' with type 'int': %s", srckey, strerror(-invalid)) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_int_string(ret);
++                    return NULL;
++                }
++            }
++
++            if (srcval != NULL) {
++                if (!YAJL_IS_STRING(srcval)) {
++                    if (*err == NULL && asprintf(err, "Invalid value with type 'string' for key '%s'", srckey) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_int_string(ret);
++                    return NULL;
++                }
++                char *str = YAJL_GET_STRING(srcval);
++                ret->valuesi = safe_strdup(str ? str : "");
++            }
++        }
++    }
++    return ret;
++}
++int append_json_map_int_string(json_map_int_string *map, int key, const char *val) {
++    size_t len;
++    int *keys = NULL;
++    char **vals = NULL;
++
++    if (map == NULL) {
++        return -1;
++    }
++
++    if ((SIZE_MAX / sizeof(int) - 1) < map->len || (SIZE_MAX / sizeof(char *) - 1) < map->len) {
++        return -1;
++    }
++
++    len = map->len + 1;
++    keys = safe_malloc(len * sizeof(int));
++    vals = safe_malloc(len * sizeof(char *));
++
++    if (map->len) {
++        (void)memcpy(keys, map->keys, map->len * sizeof(int));
++        (void)memcpy(vals, map->values, map->len * sizeof(char *));
++    }
++    free(map->keys);
++    map->keys = keys;
++    free(map->values);
++    map->values = vals;
++    map->keysmap->len = key;
++    map->valuesmap->len = safe_strdup(val ? val : "");
++
++    map->len++;
++    return 0;
++}
++
++yajl_gen_status gen_json_map_string_int(void *ctx, json_map_string_int *map, struct parser_context *ptx, parser_error *err) {
++    yajl_gen_status stat = yajl_gen_status_ok;
++    yajl_gen g = (yajl_gen) ctx;
++    size_t len = 0, i = 0;
++    if (map != NULL) {
++        len = map->len;
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 0);
++    }
++    stat = reformat_start_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++
++    }
++    for (i = 0; i < len; i++) {
++        stat = reformat_string(g, map->keysi, strlen(map->keysi));
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_int(g, map->valuesi);
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++    }
++
++    stat = reformat_end_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 1);
++    }
++    return yajl_gen_status_ok;
++}
++
++void free_json_map_string_int(json_map_string_int *map) {
++    if (map != NULL) {
++        size_t i;
++        for (i = 0; i < map->len; i++) {
++            free(map->keysi);
++            map->keysi = NULL;
++            // No need to free value for type int
++        }
++        free(map->keys);
++        map->keys = NULL;
++        free(map->values);
++        map->values = NULL;
++        free(map);
++    }
++}
++json_map_string_int *make_json_map_string_int(yajl_val src, struct parser_context *ctx, parser_error *err) {
++    json_map_string_int *ret = NULL;
++    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
++        size_t i;
++        size_t len = YAJL_GET_OBJECT(src)->len;
++        if (len > SIZE_MAX / sizeof(char *) - 1) {
++            return NULL;
++        }
++        ret = safe_malloc(sizeof(*ret));
++        ret->len = len;
++        ret->keys = safe_malloc((len + 1) * sizeof(char *));
++        ret->values = safe_malloc((len + 1) * sizeof(int));
++        for (i = 0; i < len; i++) {
++            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
++            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
++            ret->keysi = safe_strdup(srckey ? srckey : "");
++
++            if (srcval != NULL) {
++                int invalid;
++                if (!YAJL_IS_NUMBER(srcval)) {
++                    if (*err == NULL && asprintf(err, "Invalid value with type 'int' for key '%s'", srckey) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_string_int(ret);
++                    return NULL;
++                }
++                invalid = common_safe_int(YAJL_GET_NUMBER(srcval), &(ret->valuesi));
++                if (invalid) {
++                    if (*err == NULL && asprintf(err, "Invalid value with type 'int' for key '%s': %s", srckey, strerror(-invalid)) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_string_int(ret);
++                    return NULL;
++                }
++            }
++        }
++    }
++    return ret;
++}
++int append_json_map_string_int(json_map_string_int *map, const char *key, int val) {
++    size_t len;
++    char **keys = NULL;
++    int *vals = NULL;
++
++    if (map == NULL) {
++        return -1;
++    }
++
++    if ((SIZE_MAX / sizeof(char *) - 1) < map->len || (SIZE_MAX / sizeof(int) - 1) < map->len) {
++        return -1;
++    }
++
++    len = map->len + 1;
++    keys = safe_malloc(len * sizeof(char *));
++    vals = safe_malloc(len * sizeof(int));
++
++    if (map->len) {
++        (void)memcpy(keys, map->keys, map->len * sizeof(char *));
++        (void)memcpy(vals, map->values, map->len * sizeof(int));
++    }
++    free(map->keys);
++    map->keys = keys;
++    free(map->values);
++    map->values = vals;
++    map->keysmap->len = safe_strdup(key ? key : "");
++    map->valuesmap->len = val;
++
++    map->len++;
++    return 0;
++}
++
++yajl_gen_status gen_json_map_string_bool(void *ctx, json_map_string_bool *map, struct parser_context *ptx, parser_error *err) {
++    yajl_gen_status stat = yajl_gen_status_ok;
++    yajl_gen g = (yajl_gen) ctx;
++    size_t len = 0, i = 0;
++    if (map != NULL) {
++        len = map->len;
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 0);
++    }
++    stat = reformat_start_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++
++    }
++    for (i = 0; i < len; i++) {
++        stat = reformat_string(g, map->keysi, strlen(map->keysi));
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_bool(g, map->valuesi);
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++    }
++
++    stat = reformat_end_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 1);
++    }
++    return yajl_gen_status_ok;
++}
++
++void free_json_map_string_bool(json_map_string_bool *map) {
++    if (map != NULL) {
++        size_t i;
++        for (i = 0; i < map->len; i++) {
++            free(map->keysi);
++            map->keysi = NULL;
++            // No need to free value for type bool
++        }
++        free(map->keys);
++        map->keys = NULL;
++        free(map->values);
++        map->values = NULL;
++        free(map);
++    }
++}
++json_map_string_bool *make_json_map_string_bool(yajl_val src, struct parser_context *ctx, parser_error *err) {
++    json_map_string_bool *ret = NULL;
++    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
++        size_t i;
++        size_t len = YAJL_GET_OBJECT(src)->len;
++        if (len > SIZE_MAX / sizeof(char *) - 1) {
++            return NULL;
++        }
++        ret = safe_malloc(sizeof(*ret));
++        ret->len = len;
++        ret->keys = safe_malloc((len + 1) * sizeof(char *));
++        ret->values = safe_malloc((len + 1) * sizeof(bool));
++        for (i = 0; i < len; i++) {
++            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
++            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
++            ret->keysi = safe_strdup(srckey ? srckey : "");
++
++            if (srcval != NULL) {
++                if (YAJL_IS_TRUE(srcval)) {
++                    ret->valuesi = true;
++                } else if (YAJL_IS_FALSE(srcval)) {
++                    ret->valuesi = false;
++                } else {
++                    if (*err == NULL && asprintf(err, "Invalid value with type 'bool' for key '%s'", srckey) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_string_bool(ret);
++                    return NULL;
++                }
++            }
++        }
++    }
++    return ret;
++}
++
++int append_json_map_string_bool(json_map_string_bool *map, const char *key, bool val) {
++    size_t len;
++    char **keys = NULL;
++    bool *vals = NULL;
++
++    if (map == NULL) {
++        return -1;
++    }
++
++    if ((SIZE_MAX / sizeof(char *) - 1) < map->len || (SIZE_MAX / sizeof(bool) - 1) < map->len) {
++        return -1;
++    }
++
++    len = map->len + 1;
++    keys = safe_malloc(len * sizeof(char *));
++    vals = safe_malloc(len * sizeof(bool));
++
++    if (map->len) {
++        (void)memcpy(keys, map->keys, map->len * sizeof(char *));
++        (void)memcpy(vals, map->values, map->len * sizeof(bool));
++    }
++    free(map->keys);
++    map->keys = keys;
++    free(map->values);
++    map->values = vals;
++    map->keysmap->len = safe_strdup(key ? key : "");
++    map->valuesmap->len = val;
++
++    map->len++;
++    return 0;
++}
++
++yajl_gen_status gen_json_map_string_string(void *ctx, json_map_string_string *map, struct parser_context *ptx, parser_error *err) {
++    yajl_gen_status stat = yajl_gen_status_ok;
++    yajl_gen g = (yajl_gen) ctx;
++    size_t len = 0, i = 0;
++    if (map != NULL) {
++        len = map->len;
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 0);
++    }
++    stat = reformat_start_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++
++    }
++    for (i = 0; i < len; i++) {
++        stat = reformat_string(g, map->keysi, strlen(map->keysi));
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_string(g, map->valuesi, strlen(map->valuesi));;
++        if (yajl_gen_status_ok != stat) {
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++    }
++
++    stat = reformat_end_map(g);
++    if (yajl_gen_status_ok != stat) {
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
++        yajl_gen_config(g, yajl_gen_beautify, 1);
++    }
++    return yajl_gen_status_ok;
++}
++
++void free_json_map_string_string(json_map_string_string *map) {
++    if (map != NULL) {
++        size_t i;
++        for (i = 0; i < map->len; i++) {
++            free(map->keysi);
++            map->keysi = NULL;
++            free(map->valuesi);
++            map->valuesi = NULL;
++        }
++        free(map->keys);
++        map->keys = NULL;
++        free(map->values);
++        map->values = NULL;
++        free(map);
++    }
++}
++json_map_string_string *make_json_map_string_string(yajl_val src, struct parser_context *ctx, parser_error *err) {
++    json_map_string_string *ret = NULL;
++    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
++        size_t i;
++        size_t len = YAJL_GET_OBJECT(src)->len;
++        if (len > SIZE_MAX / sizeof(char *) - 1) {
++            return NULL;
++        }
++        ret = safe_malloc(sizeof(*ret));
++        ret->len = len;
++        ret->keys = safe_malloc((len + 1) * sizeof(char *));
++        ret->values = safe_malloc((len + 1) * sizeof(char *));
++        for (i = 0; i < len; i++) {
++            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
++            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
++            ret->keysi = safe_strdup(srckey ? srckey : "");
++
++            if (srcval != NULL) {
++                if (!YAJL_IS_STRING(srcval)) {
++                    if (*err == NULL && asprintf(err, "Invalid value with type 'string' for key '%s'", srckey) < 0) {
++                        *(err) = safe_strdup("error allocating memory");
++                    }
++                    free_json_map_string_string(ret);
++                    return NULL;
++                }
++                char *str = YAJL_GET_STRING(srcval);
++                ret->valuesi = safe_strdup(str ? str : "");
++            }
++        }
++    }
++    return ret;
++}
++int append_json_map_string_string(json_map_string_string *map, const char *key, const char *val) {
++    size_t len, i;
++    char **keys = NULL;
++    char **vals = NULL;
++
++    if (map == NULL) {
++        return -1;
++    }
++
++    for (i = 0; i < map->len; i++) {
++        if (strcmp(map->keysi, key) == 0) {
++            free(map->valuesi);
++            map->valuesi = safe_strdup(val ? val : "");
++            return 0;
++        }
++    }
++
++    if ((SIZE_MAX / sizeof(char *) - 1) < map->len) {
++        return -1;
++    }
++
++    len = map->len + 1;
++    keys = safe_malloc(len * sizeof(char *));
++    vals = safe_malloc(len * sizeof(char *));
++
++    if (map->len) {
++        (void)memcpy(keys, map->keys, map->len * sizeof(char *));
++        (void)memcpy(vals, map->values, map->len * sizeof(char *));
++    }
++    free(map->keys);
++    map->keys = keys;
++    free(map->values);
++    map->values = vals;
++    map->keysmap->len = safe_strdup(key ? key : "");
++    map->valuesmap->len = safe_strdup(val ? val : "");
++
++    map->len++;
++    return 0;
++}
+diff --git a/src/lxc/json/json_common.h b/src/lxc/json/json_common.h
+new file mode 100755
+index 0000000..bcac13e
+--- /dev/null
++++ b/src/lxc/json/json_common.h
+@@ -0,0 +1,194 @@
++// Auto generated file. Do not edit!
++#ifndef _JSON_COMMON_H
++#define _JSON_COMMON_H
++
++#include <stdbool.h>
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <stdint.h>
++#include <yajl/yajl_tree.h>
++#include <yajl/yajl_gen.h>
++#include "isulad_utils.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++# undef linux
++
++#ifdef __MUSL__
++#undef stdin
++#undef stdout
++#undef stderr
++#define stdin stdin
++#define stdout stdout
++#define stderr stderr
++#endif
++
++//options to report error if there is unknown key found in json
++# define PARSE_OPTIONS_STRICT 0x01
++//options to generate all key and value
++# define GEN_OPTIONS_ALLKEYVALUE 0x02
++//options to generate simplify(no indent) json string
++# define GEN_OPTIONS_SIMPLIFY 0x04
++//options not to validate utf8 data
++# define GEN_OPTIONS_NOT_VALIDATE_UTF8 0x08
++
++#define GEN_SET_ERROR_AND_RETURN(stat, err) { \
++        if (*(err) == NULL) {\
++            if (asprintf(err, "%s: %s: %d: error generating json, errcode: %d", __FILE__, __func__, __LINE__, stat) < 0) { \
++                *(err) = safe_strdup("error allocating memory"); \
++            } \
++        }\
++        return stat; \
++    }
++
++typedef char *parser_error;
++
++struct parser_context {
++    unsigned int options;
++    FILE *stderr;
++};
++
++yajl_gen_status reformat_number(void *ctx, const char *str, size_t len);
++
++yajl_gen_status reformat_uint(void *ctx, long long unsigned int num);
++
++yajl_gen_status reformat_int(void *ctx, long long int num);
++
++yajl_gen_status reformat_double(void *ctx, double num);
++
++yajl_gen_status reformat_string(void *ctx, const char *str, size_t len);
++
++yajl_gen_status reformat_null(void *ctx);
++
++yajl_gen_status reformat_bool(void *ctx, int boolean);
++
++yajl_gen_status reformat_map_key(void *ctx, const char *str, size_t len);
++
++yajl_gen_status reformat_start_map(void *ctx);
++
++yajl_gen_status reformat_end_map(void *ctx);
++
++yajl_gen_status reformat_start_array(void *ctx);
++
++yajl_gen_status reformat_end_array(void *ctx);
++
++bool json_gen_init(yajl_gen *g, struct parser_context *ctx);
++
++yajl_val get_val(yajl_val tree, const char *name, yajl_type type);
++
++void *safe_malloc(size_t size);
++
++int common_safe_double(const char *numstr, double *converted);
++
++int common_safe_uint8(const char *numstr, uint8_t *converted);
++
++int common_safe_uint16(const char *numstr, uint16_t *converted);
++
++int common_safe_uint32(const char *numstr, uint32_t *converted);
++
++int common_safe_uint64(const char *numstr, uint64_t *converted);
++
++int common_safe_uint(const char *numstr, unsigned int *converted);
++
++int common_safe_int8(const char *numstr, int8_t *converted);
++
++int common_safe_int16(const char *numstr, int16_t *converted);
++
++int common_safe_int32(const char *numstr, int32_t *converted);
++
++int common_safe_int64(const char *numstr, int64_t *converted);
++
++int common_safe_int(const char *numstr, int *converted);
++
++typedef struct {
++    int *keys;
++    int *values;
++    size_t len;
++} json_map_int_int;
++
++void free_json_map_int_int(json_map_int_int *map);
++
++json_map_int_int *make_json_map_int_int(yajl_val src, struct parser_context *ctx, parser_error *err);
++
++yajl_gen_status gen_json_map_int_int(void *ctx, json_map_int_int *map, struct parser_context *ptx, parser_error *err);
++
++int append_json_map_int_int(json_map_int_int *map, int key, int val);
++
++typedef struct {
++    int *keys;
++    bool *values;
++    size_t len;
++} json_map_int_bool;
++
++void free_json_map_int_bool(json_map_int_bool *map);
++
++json_map_int_bool *make_json_map_int_bool(yajl_val src, struct parser_context *ctx, parser_error *err);
++
++yajl_gen_status gen_json_map_int_bool(void *ctx, json_map_int_bool *map, struct parser_context *ptx, parser_error *err);
++
++int append_json_map_int_bool(json_map_int_bool *map, int key, bool val);
++
++typedef struct {
++    int *keys;
++    char **values;
++    size_t len;
++} json_map_int_string;
++
++void free_json_map_int_string(json_map_int_string *map);
++
++json_map_int_string *make_json_map_int_string(yajl_val src, struct parser_context *ctx, parser_error *err);
++
++yajl_gen_status gen_json_map_int_string(void *ctx, json_map_int_string *map, struct parser_context *ptx, parser_error *err);
++
++int append_json_map_int_string(json_map_int_string *map, int key, const char *val);
++
++typedef struct {
++    char **keys;
++    int *values;
++    size_t len;
++} json_map_string_int;
++
++void free_json_map_string_int(json_map_string_int *map);
++
++json_map_string_int *make_json_map_string_int(yajl_val src, struct parser_context *ctx, parser_error *err);
++
++yajl_gen_status gen_json_map_string_int(void *ctx, json_map_string_int *map, struct parser_context *ptx, parser_error *err);
++
++int append_json_map_string_int(json_map_string_int *map, const char *key, int val);
++
++typedef struct {
++    char **keys;
++    bool *values;
++    size_t len;
++} json_map_string_bool;
++
++void free_json_map_string_bool(json_map_string_bool *map);
++
++json_map_string_bool *make_json_map_string_bool(yajl_val src, struct parser_context *ctx, parser_error *err);
++
++yajl_gen_status gen_json_map_string_bool(void *ctx, json_map_string_bool *map, struct parser_context *ptx, parser_error *err);
++
++int append_json_map_string_bool(json_map_string_bool *map, const char *key, bool val);
++
++typedef struct {
++    char **keys;
++    char **values;
++    size_t len;
++} json_map_string_string;
++
++void free_json_map_string_string(json_map_string_string *map);
++
++json_map_string_string *make_json_map_string_string(yajl_val src, struct parser_context *ctx, parser_error *err);
++
++yajl_gen_status gen_json_map_string_string(void *ctx, json_map_string_string *map, struct parser_context *ptx, parser_error *err);
++
++int append_json_map_string_string(json_map_string_string *map, const char *key, const char *val);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+\ No newline at end of file
+diff --git a/src/lxc/json/logger_json_file.c b/src/lxc/json/logger_json_file.c
+new file mode 100644
+index 0000000..6abeef4
+--- /dev/null
++++ b/src/lxc/json/logger_json_file.c
+@@ -0,0 +1,246 @@
++// Generated from json-file.json. Do not edit!
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++#include <string.h>
++#include <read-file.h>
++#include "logger_json_file.h"
++
++logger_json_file *make_logger_json_file(yajl_val tree, struct parser_context *ctx, parser_error *err) {
++	logger_json_file *ret = NULL;
++	*err = 0;
++	if (tree == NULL)
++		return ret;
++	ret = safe_malloc(sizeof(*ret));
++	{
++		yajl_val tmp = get_val(tree, "log", yajl_t_string);
++		if (tmp != NULL) {
++			char *str = YAJL_GET_STRING(tmp);
++			ret->log = (uint8_t *)safe_strdup(str ? str : "");
++			ret->log_len = str != NULL ? strlen(str) : 0;
++		}
++	}
++	{
++		yajl_val val = get_val(tree, "stream", yajl_t_string);
++		if (val != NULL) {
++			char *str = YAJL_GET_STRING(val);
++			ret->stream = safe_strdup(str ? str : "");
++		}
++	}
++	{
++		yajl_val val = get_val(tree, "time", yajl_t_string);
++		if (val != NULL) {
++			char *str = YAJL_GET_STRING(val);
++			ret->time = safe_strdup(str ? str : "");
++		}
++	}
++	{
++		yajl_val tmp = get_val(tree, "attrs", yajl_t_string);
++		if (tmp != NULL) {
++			char *str = YAJL_GET_STRING(tmp);
++			ret->attrs = (uint8_t *)safe_strdup(str ? str : "");
++			ret->attrs_len = str != NULL ? strlen(str) : 0;
++		}
++	}
++
++	if (tree->type == yajl_t_object && (ctx->options & PARSE_OPTIONS_STRICT)) {
++		int i;
++		for (i = 0; i < tree->u.object.len; i++)
++			if (strcmp(tree->u.object.keysi, "log") &&
++			                strcmp(tree->u.object.keysi, "stream") &&
++			                strcmp(tree->u.object.keysi, "time") &&
++			                strcmp(tree->u.object.keysi, "attrs")) {
++				if (ctx->stderr > 0)
++					fprintf(ctx->stderr, "WARNING: unknown key found: %s\n", tree->u.object.keysi);
++			}
++	}
++	return ret;
++}
++
++void free_logger_json_file(logger_json_file *ptr) {
++	if (ptr == NULL)
++		return;
++	free(ptr->log);
++	ptr->log = NULL;
++	free(ptr->stream);
++	ptr->stream = NULL;
++	free(ptr->time);
++	ptr->time = NULL;
++	free(ptr->attrs);
++	ptr->attrs = NULL;
++	free(ptr);
++}
++
++yajl_gen_status gen_logger_json_file(yajl_gen g, logger_json_file *ptr, struct parser_context *ctx, parser_error *err) {
++	yajl_gen_status stat = yajl_gen_status_ok;
++	*err = 0;
++	stat = reformat_start_map(g);
++	if (yajl_gen_status_ok != stat)
++		GEN_SET_ERROR_AND_RETURN(stat, err);
++	if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) || (ptr != NULL && ptr->log != NULL && ptr->log_len)) {
++		const char *str = "";
++		size_t len = 0;
++		stat = reformat_map_key(g, "log", strlen("log"));
++		if (yajl_gen_status_ok != stat)
++			GEN_SET_ERROR_AND_RETURN(stat, err);
++		if (ptr != NULL && ptr->log != NULL) {
++			str = (const char *)ptr->log;
++			len = ptr->log_len;
++		}
++		stat = reformat_string(g, str, len);
++		if (yajl_gen_status_ok != stat)
++			GEN_SET_ERROR_AND_RETURN(stat, err);
++	}
++	if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->stream != NULL)) {
++		char *str = "";
++		stat = reformat_map_key(g, "stream", strlen("stream"));
++		if (yajl_gen_status_ok != stat)
++			GEN_SET_ERROR_AND_RETURN(stat, err);
++		if (ptr != NULL && ptr->stream != NULL) {
++			str = ptr->stream;
++		}
++		stat = reformat_string(g, str, strlen(str));
++		if (yajl_gen_status_ok != stat)
++			GEN_SET_ERROR_AND_RETURN(stat, err);
++	}
++	if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->time != NULL)) {
++		char *str = "";
++		stat = reformat_map_key(g, "time", strlen("time"));
++		if (yajl_gen_status_ok != stat)
++			GEN_SET_ERROR_AND_RETURN(stat, err);
++		if (ptr != NULL && ptr->time != NULL) {
++			str = ptr->time;
++		}
++		stat = reformat_string(g, str, strlen(str));
++		if (yajl_gen_status_ok != stat)
++			GEN_SET_ERROR_AND_RETURN(stat, err);
++	}
++	if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) || (ptr != NULL && ptr->attrs != NULL && ptr->attrs_len)) {
++		const char *str = "";
++		size_t len = 0;
++		stat = reformat_map_key(g, "attrs", strlen("attrs"));
++		if (yajl_gen_status_ok != stat)
++			GEN_SET_ERROR_AND_RETURN(stat, err);
++		if (ptr != NULL && ptr->attrs != NULL) {
++			str = (const char *)ptr->attrs;
++			len = ptr->attrs_len;
++		}
++		stat = reformat_string(g, str, len);
++		if (yajl_gen_status_ok != stat)
++			GEN_SET_ERROR_AND_RETURN(stat, err);
++	}
++	stat = reformat_end_map(g);
++	if (yajl_gen_status_ok != stat)
++		GEN_SET_ERROR_AND_RETURN(stat, err);
++	return yajl_gen_status_ok;
++}
++
++
++logger_json_file *logger_json_file_parse_file(const char *filename, struct parser_context *ctx, parser_error *err) {
++	logger_json_file *ptr = NULL;
++	size_t filesize;
++	char *content = NULL;
++
++	if (filename == NULL || err == NULL)
++		return NULL;
++
++	*err = NULL;
++	content = read_file(filename, &filesize);
++	if (content == NULL) {
++		if (asprintf(err, "cannot read the file: %s", filename) < 0)
++			*err = safe_strdup("error allocating memory");
++		return NULL;
++	}
++	ptr = logger_json_file_parse_data(content, ctx, err);
++	free(content);
++	return ptr;
++}
++
++logger_json_file *logger_json_file_parse_file_stream(FILE *stream, struct parser_context *ctx, parser_error *err) {
++	logger_json_file *ptr = NULL;
++	size_t filesize;
++	char *content = NULL ;
++
++	if (stream == NULL || err == NULL)
++		return NULL;
++
++	*err = NULL;
++	content = fread_file(stream, &filesize);
++	if (content == NULL) {
++		*err = safe_strdup("cannot read the file");
++		return NULL;
++	}
++	ptr = logger_json_file_parse_data(content, ctx, err);
++	free(content);
++	return ptr;
++}
++
++logger_json_file *logger_json_file_parse_data(const char *jsondata, struct parser_context *ctx, parser_error *err) {
++	logger_json_file *ptr  = NULL;
++	yajl_val tree;
++	char errbuf1024;
++	struct parser_context tmp_ctx;
++
++	if (jsondata == NULL || err == NULL)
++		return NULL;
++
++	*err = NULL;
++	if (ctx == NULL) {
++		ctx = &tmp_ctx;
++		memset(&tmp_ctx, 0, sizeof(tmp_ctx));
++	}
++	tree = yajl_tree_parse(jsondata, errbuf, sizeof(errbuf));
++	if (tree == NULL) {
++		if (asprintf(err, "cannot parse the data: %s", errbuf) < 0)
++			*err = safe_strdup("error allocating memory");
++		return NULL;
++	}
++	ptr = make_logger_json_file(tree, ctx, err);
++	yajl_tree_free(tree);
++	return ptr;
++}
++char *logger_json_file_generate_json(logger_json_file *ptr, struct parser_context *ctx, parser_error *err) {
++	yajl_gen g = NULL;
++	struct parser_context tmp_ctx;
++	const unsigned char *gen_buf = NULL;
++	char *json_buf = NULL;
++	size_t gen_len = 0;
++
++	if (ptr == NULL || err == NULL)
++		return NULL;
++
++	*err = NULL;
++	if (ctx == NULL) {
++		ctx = &tmp_ctx;
++		memset(&tmp_ctx, 0, sizeof(tmp_ctx));
++	}
++
++	if (!json_gen_init(&g, ctx)) {
++		*err = safe_strdup("Json_gen init failed");
++		goto out;
++	}
++	if (yajl_gen_status_ok != gen_logger_json_file(g, ptr, ctx, err)) {
++		if (*err == NULL)
++			*err = safe_strdup("Failed to generate json");
++		goto free_out;
++	}
++	yajl_gen_get_buf(g, &gen_buf, &gen_len);
++	if (gen_buf == NULL) {
++		*err = safe_strdup("Error to get generated json");
++		goto free_out;
++	}
++
++	if (gen_len == SIZE_MAX) {
++		*err = safe_strdup("Invalid buffer length");
++		goto free_out;
++	}
++	json_buf = safe_malloc(gen_len + 1);
++	(void)memcpy(json_buf, gen_buf, gen_len);
++	json_bufgen_len = '\0';
++
++free_out:
++	yajl_gen_clear(g);
++	yajl_gen_free(g);
++out:
++	return json_buf;
++}
+diff --git a/src/lxc/json/logger_json_file.h b/src/lxc/json/logger_json_file.h
+new file mode 100644
+index 0000000..ad5af7b
+--- /dev/null
++++ b/src/lxc/json/logger_json_file.h
+@@ -0,0 +1,45 @@
++// Generated from json-file.json. Do not edit!
++#ifndef LOGGER_JSON_FILE_SCHEMA_H
++#define LOGGER_JSON_FILE_SCHEMA_H
++
++#include <sys/types.h>
++#include <stdint.h>
++#include "json_common.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef struct {
++    uint8_t *log;
++    size_t log_len;
++
++    char *stream;
++
++    char *time;
++
++    uint8_t *attrs;
++    size_t attrs_len;
++
++}
++logger_json_file;
++
++void free_logger_json_file(logger_json_file *ptr);
++
++logger_json_file *make_logger_json_file(yajl_val tree, struct parser_context *ctx, parser_error *err);
++
++yajl_gen_status gen_logger_json_file(yajl_gen g, logger_json_file *ptr, struct parser_context *ctx, parser_error *err);
++
++logger_json_file *logger_json_file_parse_file(const char *filename, struct parser_context *ctx, parser_error *err);
++
++logger_json_file *logger_json_file_parse_file_stream(FILE *stream, struct parser_context *ctx, parser_error *err);
++
++logger_json_file *logger_json_file_parse_data(const char *jsondata, struct parser_context *ctx, parser_error *err);
++
++char *logger_json_file_generate_json(logger_json_file *ptr, struct parser_context *ctx, parser_error *err);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+diff --git a/src/lxc/json/oci_runtime_hooks.c b/src/lxc/json/oci_runtime_hooks.c
+new file mode 100644
+index 0000000..41ddb67
+--- /dev/null
++++ b/src/lxc/json/oci_runtime_hooks.c
+@@ -0,0 +1,52 @@
++/******************************************************************************
++ * Copyright (C), 1988-1999, Huawei Tech. Co., Ltd.
++ * FileName: oci_runtime_hooks.c
++ * Author: maoweiyong   Version: 0.1   Date: 2018-11-07
++ * Explanation: provide oci runtime hooks functions
++ ******************************************************************************/
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++#include <read-file.h>
++#include "oci_runtime_hooks.h"
++
++#include "log.h"
++#include "utils.h"
++
++#define PARSE_ERR_BUFFER_SIZE 1024
++
++oci_runtime_spec_hooks *oci_runtime_spec_hooks_parse_file(const char *filename,
++                                                          struct parser_context *ctx, parser_error *err)
++{
++    yajl_val tree;
++    size_t filesize;
++
++    if (!filename || !err) {
++        return NULL;
++    }
++    *err = NULL;
++    struct parser_context tmp_ctx;
++    if (!ctx) {
++        ctx = &tmp_ctx;
++        memset(&tmp_ctx, 0, sizeof(tmp_ctx));
++    }
++    char *content = read_file(filename, &filesize);
++    char errbufPARSE_ERR_BUFFER_SIZE;
++    if (content == NULL) {
++        if (asprintf(err, "cannot read the file: %s", filename) < 0) {
++            *err = safe_strdup("error allocating memory");
++        }
++        return NULL;
++    }
++    tree = yajl_tree_parse(content, errbuf, sizeof(errbuf));
++    free(content);
++    if (tree == NULL) {
++        if (asprintf(err, "cannot parse the file: %s", errbuf) < 0) {
++            *err = safe_strdup("error allocating memory");
++        }
++        return NULL;
++    }
++    oci_runtime_spec_hooks *ptr = make_oci_runtime_spec_hooks(tree, ctx, err);
++    yajl_tree_free(tree);
++    return ptr;
++}
+diff --git a/src/lxc/json/oci_runtime_hooks.h b/src/lxc/json/oci_runtime_hooks.h
+new file mode 100644
+index 0000000..bf570c9
+--- /dev/null
++++ b/src/lxc/json/oci_runtime_hooks.h
+@@ -0,0 +1,15 @@
++/******************************************************************************
++ * Copyright (C), 1988-1999, Huawei Tech. Co., Ltd.
++ * FileName: oci_runtime_hooks.h
++ * Author: tanyifeng  Version: 0.1   Date: 2018-11-08
++ * Explanation: provide container oci runtime hooks function definition
++ ******************************************************************************/
++#ifndef _CONTAINER_HOOKS_H
++# define _CONTAINER_HOOKS_H
++
++# include "oci_runtime_spec.h"
++
++oci_runtime_spec_hooks *oci_runtime_spec_hooks_parse_file(const char *filename,
++                                                          struct parser_context *ctx, parser_error *err);
++
++#endif
+diff --git a/src/lxc/json/oci_runtime_spec.c b/src/lxc/json/oci_runtime_spec.c
+new file mode 100644
+index 0000000..fd342de
+--- /dev/null
++++ b/src/lxc/json/oci_runtime_spec.c
+@@ -0,0 +1,195 @@
++// Generated from spec.json. Do not edit!
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++#include <string.h>
++#include <read-file.h>
++#include "oci_runtime_spec.h"
++
++oci_runtime_spec_hooks *make_oci_runtime_spec_hooks(yajl_val tree, struct parser_context *ctx, parser_error *err) {
++    oci_runtime_spec_hooks *ret = NULL;
++    *err = 0;
++    if (tree == NULL)
++        return ret;
++    ret = safe_malloc(sizeof(*ret));
++    {
++        yajl_val tmp = get_val(tree, "prestart", yajl_t_array);
++        if (tmp != NULL && YAJL_GET_ARRAY(tmp) != NULL && YAJL_GET_ARRAY(tmp)->len > 0) {
++            size_t i;
++            ret->prestart_len = YAJL_GET_ARRAY(tmp)->len;
++            ret->prestart = safe_malloc((YAJL_GET_ARRAY(tmp)->len + 1) * sizeof(*ret->prestart));
++            for (i = 0; i < YAJL_GET_ARRAY(tmp)->len; i++) {
++                yajl_val val = YAJL_GET_ARRAY(tmp)->valuesi;
++                ret->prestarti = make_defs_hook(val, ctx, err);
++                if (ret->prestarti == NULL) {
++                    free_oci_runtime_spec_hooks(ret);
++                    return NULL;
++                }
++            }
++        }
++    }
++    {
++        yajl_val tmp = get_val(tree, "poststart", yajl_t_array);
++        if (tmp != NULL && YAJL_GET_ARRAY(tmp) != NULL && YAJL_GET_ARRAY(tmp)->len > 0) {
++            size_t i;
++            ret->poststart_len = YAJL_GET_ARRAY(tmp)->len;
++            ret->poststart = safe_malloc((YAJL_GET_ARRAY(tmp)->len + 1) * sizeof(*ret->poststart));
++            for (i = 0; i < YAJL_GET_ARRAY(tmp)->len; i++) {
++                yajl_val val = YAJL_GET_ARRAY(tmp)->valuesi;
++                ret->poststarti = make_defs_hook(val, ctx, err);
++                if (ret->poststarti == NULL) {
++                    free_oci_runtime_spec_hooks(ret);
++                    return NULL;
++                }
++            }
++        }
++    }
++    {
++        yajl_val tmp = get_val(tree, "poststop", yajl_t_array);
++        if (tmp != NULL && YAJL_GET_ARRAY(tmp) != NULL && YAJL_GET_ARRAY(tmp)->len > 0) {
++            size_t i;
++            ret->poststop_len = YAJL_GET_ARRAY(tmp)->len;
++            ret->poststop = safe_malloc((YAJL_GET_ARRAY(tmp)->len + 1) * sizeof(*ret->poststop));
++            for (i = 0; i < YAJL_GET_ARRAY(tmp)->len; i++) {
++                yajl_val val = YAJL_GET_ARRAY(tmp)->valuesi;
++                ret->poststopi = make_defs_hook(val, ctx, err);
++                if (ret->poststopi == NULL) {
++                    free_oci_runtime_spec_hooks(ret);
++                    return NULL;
++                }
++            }
++        }
++    }
++
++    if (tree->type == yajl_t_object && (ctx->options & PARSE_OPTIONS_STRICT)) {
++        int i;
++        for (i = 0; i < tree->u.object.len; i++)
++            if (strcmp(tree->u.object.keysi, "prestart") &&
++                strcmp(tree->u.object.keysi, "poststart") &&
++                strcmp(tree->u.object.keysi, "poststop")) {
++                if (ctx->stderr > 0)
++                    fprintf(ctx->stderr, "WARNING: unknown key found: %s\n", tree->u.object.keysi);
++            }
++        }
++    return ret;
++}
++
++void free_oci_runtime_spec_hooks(oci_runtime_spec_hooks *ptr) {
++    if (ptr == NULL)
++        return;
++    if (ptr->prestart != NULL) {
++        size_t i;
++        for (i = 0; i < ptr->prestart_len; i++)
++            if (ptr->prestarti != NULL) {
++                free_defs_hook(ptr->prestarti);
++                ptr->prestarti = NULL;
++            }
++        free(ptr->prestart);
++        ptr->prestart = NULL;
++    }
++    if (ptr->poststart != NULL) {
++        size_t i;
++        for (i = 0; i < ptr->poststart_len; i++)
++            if (ptr->poststarti != NULL) {
++                free_defs_hook(ptr->poststarti);
++                ptr->poststarti = NULL;
++            }
++        free(ptr->poststart);
++        ptr->poststart = NULL;
++    }
++    if (ptr->poststop != NULL) {
++        size_t i;
++        for (i = 0; i < ptr->poststop_len; i++)
++            if (ptr->poststopi != NULL) {
++                free_defs_hook(ptr->poststopi);
++                ptr->poststopi = NULL;
++            }
++        free(ptr->poststop);
++        ptr->poststop = NULL;
++    }
++    free(ptr);
++}
++
++yajl_gen_status gen_oci_runtime_spec_hooks(yajl_gen g, oci_runtime_spec_hooks *ptr, struct parser_context *ctx, parser_error *err) {
++    yajl_gen_status stat = yajl_gen_status_ok;
++    *err = 0;
++    stat = reformat_start_map(g);
++    if (yajl_gen_status_ok != stat)
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->prestart != NULL)) {
++        size_t len = 0, i;
++        stat = reformat_map_key(g, "prestart", strlen("prestart"));
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        if (ptr != NULL && ptr->prestart != NULL) {
++            len = ptr->prestart_len;
++        }
++        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
++            yajl_gen_config(g, yajl_gen_beautify, 0);
++        stat = reformat_start_array(g);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        for (i = 0; i < len; i++) {
++            stat = gen_defs_hook(g, ptr->prestarti, ctx, err);
++            if (yajl_gen_status_ok != stat)
++                GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_end_array(g);
++        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
++            yajl_gen_config(g, yajl_gen_beautify, 1);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->poststart != NULL)) {
++        size_t len = 0, i;
++        stat = reformat_map_key(g, "poststart", strlen("poststart"));
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        if (ptr != NULL && ptr->poststart != NULL) {
++            len = ptr->poststart_len;
++        }
++        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
++            yajl_gen_config(g, yajl_gen_beautify, 0);
++        stat = reformat_start_array(g);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        for (i = 0; i < len; i++) {
++            stat = gen_defs_hook(g, ptr->poststarti, ctx, err);
++            if (yajl_gen_status_ok != stat)
++                GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_end_array(g);
++        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
++            yajl_gen_config(g, yajl_gen_beautify, 1);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->poststop != NULL)) {
++        size_t len = 0, i;
++        stat = reformat_map_key(g, "poststop", strlen("poststop"));
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        if (ptr != NULL && ptr->poststop != NULL) {
++            len = ptr->poststop_len;
++        }
++        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
++            yajl_gen_config(g, yajl_gen_beautify, 0);
++        stat = reformat_start_array(g);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++        for (i = 0; i < len; i++) {
++            stat = gen_defs_hook(g, ptr->poststopi, ctx, err);
++            if (yajl_gen_status_ok != stat)
++                GEN_SET_ERROR_AND_RETURN(stat, err);
++        }
++        stat = reformat_end_array(g);
++        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
++            yajl_gen_config(g, yajl_gen_beautify, 1);
++        if (yajl_gen_status_ok != stat)
++            GEN_SET_ERROR_AND_RETURN(stat, err);
++    }
++    stat = reformat_end_map(g);
++    if (yajl_gen_status_ok != stat)
++        GEN_SET_ERROR_AND_RETURN(stat, err);
++    return yajl_gen_status_ok;
++}
+diff --git a/src/lxc/json/oci_runtime_spec.h b/src/lxc/json/oci_runtime_spec.h
+new file mode 100644
+index 0000000..ef3f161
+--- /dev/null
++++ b/src/lxc/json/oci_runtime_spec.h
+@@ -0,0 +1,37 @@
++// Generated from spec.json. Do not edit!
++#ifndef OCI_RUNTIME_SPEC_SCHEMA_H
++#define OCI_RUNTIME_SPEC_SCHEMA_H
++
++#include <sys/types.h>
++#include <stdint.h>
++#include "json_common.h"
++#include "defs.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef struct {
++    defs_hook **prestart;
++    size_t prestart_len;
++
++    defs_hook **poststart;
++    size_t poststart_len;
++
++    defs_hook **poststop;
++    size_t poststop_len;
++
++}
++oci_runtime_spec_hooks;
++
++void free_oci_runtime_spec_hooks(oci_runtime_spec_hooks *ptr);
++
++oci_runtime_spec_hooks *make_oci_runtime_spec_hooks(yajl_val tree, struct parser_context *ctx, parser_error *err);
++
++yajl_gen_status gen_oci_runtime_spec_hooks(yajl_gen g, oci_runtime_spec_hooks *ptr, struct parser_context *ctx, parser_error *err);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+diff --git a/src/lxc/json/read-file.c b/src/lxc/json/read-file.c
+new file mode 100644
+index 0000000..34ebeed
+--- /dev/null
++++ b/src/lxc/json/read-file.c
+@@ -0,0 +1,95 @@
++#include <unistd.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <errno.h>
++#include <stdlib.h>
++#include <string.h>
++#include <limits.h>
++
++#include <config.h>
++#include "read-file.h"
++
++#ifndef O_CLOEXEC
++#define O_CLOEXEC 02000000
++#endif
++
++char *fread_file(FILE *stream, size_t *length)
++{
++	char *buf = NULL, *tmpbuf = NULL;
++	size_t off = 0;
++
++	while (1) {
++		size_t ret, newsize;
++
++		newsize = off + BUFSIZ + 1;
++		tmpbuf = (char *)calloc(1, newsize);
++		if (tmpbuf == NULL) {
++			goto out;
++		}
++
++		if (buf) {
++			memcpy(tmpbuf, buf, off);
++
++			memset(buf, 0, off);
++
++			free(buf);
++		}
++
++		buf = tmpbuf;
++		ret = fread(buf + off, 1, BUFSIZ, stream);
++		if (!ret && ferror(stream)) {
++			tmpbuf = NULL;
++			goto out;
++		}
++		if (ret < BUFSIZ || feof(stream)) {
++			*length = off + ret + 1;
++			buf*length - 1 = '\0';
++			return buf;
++		}
++		off += BUFSIZ;
++	}
++out:
++	if (buf) {
++		free(buf);
++	}
++	if (tmpbuf) {
++		free(tmpbuf);
++	}
++	return NULL;
++
++}
++
++char *read_file(const char *path, size_t *length)
++{
++	char *buf = NULL;
++	char rpathPATH_MAX + 1 = {0};
++	int fd = -1;
++	int tmperrno;
++	FILE *fp = NULL;
++
++	if (!path || !length) {
++		return NULL;
++	}
++
++	if (strlen(path) > PATH_MAX || NULL == realpath(path, rpath)) {
++		return NULL;
++	}
++
++	fd = open(rpath, O_RDONLY | O_CLOEXEC);
++	if (fd < 0) {
++		return NULL;
++	}
++
++	fp = fdopen(fd, "r");
++	tmperrno = errno;
++	if (!fp) {
++		close(fd);
++		errno = tmperrno;
++		return NULL;
++	}
++
++	buf = fread_file(fp, length);
++	fclose(fp);
++	return buf;
++}
+diff --git a/src/lxc/json/read-file.h b/src/lxc/json/read-file.h
+new file mode 100644
+index 0000000..5d6e0eb
+--- /dev/null
++++ b/src/lxc/json/read-file.h
+@@ -0,0 +1,11 @@
++#ifndef READ_FILE_H
++#define READ_FILE_H
++
++#include <stddef.h>
++#include <stdio.h>
++
++extern char *fread_file(FILE *stream, size_t *length);
++
++extern char *read_file(const char *path, size_t *length);
++
++#endif
+diff --git a/src/lxc/meson.build b/src/lxc/meson.build
+index f33257c..3166401 100644
+--- a/src/lxc/meson.build
++++ b/src/lxc/meson.build
+@@ -25,7 +25,6 @@ liblxcfs_version_file = configure_file(
+ )
+ 
+ liblxc_sources = files(
+-    'cgroups/cgfsng.c',
+     'cgroups/cgroup.c',
+     'cgroups/cgroup.h',
+     'cgroups/cgroup2_devices.c',
+@@ -139,6 +138,31 @@ liblxc_sources = files(
+     'uuid.c',
+     'uuid.h')
+ 
++if want_isulad
++    liblxc_sources += files(
++        'cgroups/isulad_cgfsng.c',
++        'exec_commands.c',
++        'exec_commands.h',
++        'isulad_utils.c',
++        'isulad_utils.h',
++        'path.c',
++        'path.h',
++        'json/defs.c',
++        'json/defs.h',
++        'json/json_common.c',
++        'json/json_common.h',
++        'json/logger_json_file.c',
++        'json/logger_json_file.h',
++        'json/oci_runtime_hooks.c',
++        'json/oci_runtime_hooks.h',
++        'json/oci_runtime_spec.c',
++        'json/oci_runtime_spec.h',
++        'json/read-file.c',
++        'json/read-file.h')
++else
++    liblxc_sources += files('cgroups/cgfsng.c')
++endif
++
+ if want_apparmor and libapparmor.found()
+     liblxc_sources += files('lsm/apparmor.c')
+ endif
+diff --git a/src/lxc/path.c b/src/lxc/path.c
+new file mode 100644
+index 0000000..3881058
+--- /dev/null
++++ b/src/lxc/path.c
+@@ -0,0 +1,521 @@
++/* SPDX-License-Identifier: LGPL-2.1+ */
++/******************************************************************************
++ * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved
++ * Description: isulad utils
++ * Author: lifeng
++ * Create: 2020-04-11
++******************************************************************************/
++#include <unistd.h>
++#include <stdlib.h>
++#include <limits.h>
++#include <string.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/param.h>
++#include <libgen.h>
++
++#include "path.h"
++#include "log.h"
++#include "isulad_utils.h"
++
++lxc_log_define(lxc_path_ui, lxc);
++
++#define ISSLASH(C) ((C) == '/')
++#define IS_ABSOLUTE_FILE_NAME(F) (ISSLASH ((F)0))
++
++static bool do_clean_path_continue(const char *endpos, const char *stpos, const char *respath, char **dst)
++{
++	if (endpos - stpos == 1 && stpos0 == '.') {
++		return true;
++	} else if (endpos - stpos == 2 && stpos0 == '.' && stpos1 == '.') {
++		char *dest = *dst;
++		if (dest <= respath + 1) {
++			return true;
++		}
++		for (--dest; dest > respath && !ISSLASH(dest-1); --dest) {
++			*dst = dest;
++			return true;
++		}
++		*dst = dest;
++		return true;
++	}
++	return false;
++}
++
++int do_clean_path(const char *respath, const char *limit_respath,
++                  const char *stpos, char **dst)
++{
++	char *dest = *dst;
++	const char *endpos = NULL;
++
++	for (endpos = stpos; *stpos; stpos = endpos) {
++		while (ISSLASH(*stpos)) {
++			++stpos;
++		}
++
++		for (endpos = stpos; *endpos && !ISSLASH(*endpos); ++endpos) {
++		}
++
++		if (endpos - stpos == 0) {
++			break;
++		} else if (do_clean_path_continue(endpos, stpos, respath, &dest)) {
++			continue;
++		}
++
++		if (!ISSLASH(dest-1)) {
++			*dest++ = '/';
++		}
++
++		if (dest + (endpos - stpos) >= limit_respath) {
++			ERROR("Path is too long");
++			if (dest > respath + 1) {
++				dest--;
++			}
++			*dest = '\0';
++			return -1;
++		}
++
++		memcpy(dest, stpos, (size_t)(endpos - stpos));
++		dest += endpos - stpos;
++		*dest = '\0';
++	}
++	*dst = dest;
++	return 0;
++}
++
++char *cleanpath(const char *path, char *realpath, size_t realpath_len)
++{
++	char *respath = NULL;
++	char *dest = NULL;
++	const char *stpos = NULL;
++	const char *limit_respath = NULL;
++
++	if (path == NULL || path0 == '\0' || \
++	                realpath == NULL || (realpath_len < PATH_MAX)) {
++		return NULL;
++	}
++
++	respath = realpath;
++
++	memset(respath, 0, realpath_len);
++	limit_respath = respath + PATH_MAX;
++
++	if (!IS_ABSOLUTE_FILE_NAME(path)) {
++		if (!getcwd(respath, PATH_MAX)) {
++			ERROR("Failed to getcwd");
++			respath0 = '\0';
++			goto error;
++		}
++		dest = strchr(respath, '\0');
++		if (dest == NULL) {
++			ERROR("Failed to get the end of respath");
++			goto error;
++		}
++		if (strlen(path) > (PATH_MAX - strlen(respath) - 1)) {
++			ERROR("Path is too long");
++			goto error;
++		}
++		strcat(respath, path);
++		stpos = path;
++	} else {
++		dest = respath;
++		*dest++ = '/';
++		stpos = path;
++	}
++
++	if (do_clean_path(respath, limit_respath, stpos, &dest)) {
++		goto error;
++	}
++
++	if (dest > respath + 1 && ISSLASH(dest-1)) {
++		--dest;
++	}
++	*dest = '\0';
++
++	return respath;
++
++error:
++	return NULL;
++}
++
++static int do_path_realloc(const char *start, const char *end,
++                           char **rpath, char **dest, const char **rpath_limit)
++{
++	long long dest_offset = *dest - *rpath;
++	char *new_rpath = NULL;
++	size_t new_size;
++	int nret = 0;
++	size_t gap = 0;
++
++	if (*dest + (end - start) < *rpath_limit) {
++		return 0;
++	}
++
++	gap = (size_t)(end - start) + 1;
++	new_size = (size_t)(*rpath_limit - *rpath);
++	if (new_size > SIZE_MAX - gap) {
++		ERROR("Out of range!");
++		return -1;
++	}
++
++	if (gap > PATH_MAX) {
++		new_size += gap;
++	} else {
++		new_size += PATH_MAX;
++	}
++	nret = lxc_mem_realloc((void **)&new_rpath, new_size, *rpath, PATH_MAX);
++	if (nret) {
++		ERROR("Failed to realloc memory for files limit variables");
++		return -1;
++	}
++	*rpath = new_rpath;
++	*rpath_limit = *rpath + new_size;
++
++	*dest = *rpath + dest_offset;
++
++	return 0;
++}
++
++static int do_get_symlinks_copy_buf(const char *buf, const char *prefix, size_t prefix_len,
++                                    char **rpath, char **dest)
++{
++	if (IS_ABSOLUTE_FILE_NAME(buf)) {
++		if (prefix_len) {
++			memcpy(*rpath, prefix, prefix_len);
++		}
++		*dest = *rpath + prefix_len;
++		*(*dest)++ = '/';
++	} else {
++		if (*dest > *rpath + prefix_len + 1) {
++			for (--(*dest); *dest > *rpath && !ISSLASH((*dest)-1); --(*dest)) {
++				continue;
++			}
++		}
++	}
++	return 0;
++}
++
++static int do_get_symlinks(const char **fullpath, const char *prefix, size_t prefix_len,
++                           char **rpath, char **dest, const char **end,
++                           int *num_links, char **extra_buf)
++{
++	char *buf = NULL;
++	size_t len;
++	ssize_t n;
++	int ret = -1;
++
++	if (++(*num_links) > MAXSYMLINKS) {
++		ERROR("Too many links in '%s'", *fullpath);
++		goto out;
++	}
++
++	buf = lxc_common_calloc_s(PATH_MAX);
++	if (buf == NULL) {
++		ERROR("Out of memory");
++		goto out;
++	}
++
++	n = readlink(*rpath, buf, PATH_MAX - 1);
++	if (n < 0) {
++		goto out;
++	}
++	bufn = '\0';
++
++	if (*extra_buf == NULL) {
++		*extra_buf = lxc_common_calloc_s(PATH_MAX);
++		if (*extra_buf == NULL) {
++			ERROR("Out of memory");
++			goto out;
++		}
++	}
++
++	len = strlen(*end);
++	if (len >= (size_t)(PATH_MAX - n)) {
++		ERROR("Path is too long");
++		goto out;
++	}
++
++	memmove(&(*extra_buf)n, *end, len + 1);
++	memcpy(*extra_buf, buf, (size_t)n);
++
++	*fullpath = *end = *extra_buf;
++
++	if (do_get_symlinks_copy_buf(buf, prefix, prefix_len, rpath, dest) != 0) {
++		goto out;
++	}
++
++	ret = 0;
++out:
++	free(buf);
++	return ret;
++}
++
++static bool do_eval_symlinks_in_scope_is_symlink(const char *path)
++{
++	struct stat st;
++
++	if (lstat(path, &st) < 0) {
++		return true;
++	}
++
++	if (!S_ISLNK(st.st_mode)) {
++		return true;
++	}
++	return false;
++}
++
++static void do_eval_symlinks_skip_slash(const char **start, const char **end)
++{
++	while (ISSLASH(**start)) {
++		++(*start);
++	}
++
++	for (*end = *start; **end && !ISSLASH(**end); ++(*end)) {
++	}
++}
++
++static inline void skip_dest_traling_slash(char **dest, char **rpath, size_t prefix_len)
++{
++	if (*dest > *rpath + prefix_len + 1) {
++		for (--(*dest); *dest > *rpath && !ISSLASH((*dest)-1); --(*dest)) {
++			continue;
++		}
++	}
++}
++
++static inline bool is_current_char(const char c)
++{
++	return c == '.';
++}
++
++static inline bool is_specify_current(const char *end, const char *start)
++{
++	return (end - start == 1) && is_current_char(start0);
++}
++
++static inline bool is_specify_parent(const char *end, const char *start)
++{
++	return (end - start == 2) && is_current_char(start0) && is_current_char(start1);
++}
++
++static int do_eval_symlinks_in_scope(const char *fullpath, const char *prefix,
++                                     size_t prefix_len,
++                                     char **rpath, char **dest, const char *rpath_limit)
++{
++	const char *start = NULL;
++	const char *end = NULL;
++	char *extra_buf = NULL;
++	int nret = 0;
++	int num_links = 0;
++
++	start = fullpath + prefix_len;
++	for (end = start; *start; start = end) {
++		do_eval_symlinks_skip_slash(&start, &end);
++		if (end - start == 0) {
++			break;
++		} else if (is_specify_current(end, start)) {
++			;
++		} else if (is_specify_parent(end, start)) {
++			skip_dest_traling_slash(dest, rpath, prefix_len);
++		} else {
++			if (!ISSLASH((*dest)-1)) {
++				*(*dest)++ = '/';
++			}
++
++			nret = do_path_realloc(start, end, rpath, dest, &rpath_limit);
++			if (nret != 0) {
++				nret = -1;
++				goto out;
++			}
++
++			memcpy(*dest, start, (size_t)(end - start));
++			*dest += end - start;
++			**dest = '\0';
++
++			if (do_eval_symlinks_in_scope_is_symlink(*rpath)) {
++				continue;
++			}
++
++			nret = do_get_symlinks(&fullpath, prefix, prefix_len, rpath, dest, &end, &num_links, &extra_buf);
++			if (nret != 0) {
++				nret = -1;
++				goto out;
++			}
++		}
++	}
++out:
++	free(extra_buf);
++	return nret;
++}
++
++static char *eval_symlinks_in_scope(const char *fullpath, const char *rootpath)
++{
++	char resrootPATH_MAX = {0};
++	char *root = NULL;
++	char *rpath = NULL;
++	char *dest = NULL;
++	char *prefix = NULL;
++	const char *rpath_limit = NULL;
++	size_t prefix_len;
++
++	if (fullpath == NULL || rootpath == NULL) {
++		return NULL;
++	}
++
++	root = cleanpath(rootpath, resroot, sizeof(resroot));
++	if (root == NULL) {
++		ERROR("Failed to get cleaned path");
++		return NULL;
++	}
++
++	if (!strcmp(fullpath, root)) {
++		return safe_strdup(fullpath);
++	}
++
++	if (strstr(fullpath, root) == NULL) {
++		ERROR("Path '%s' is not in '%s'", fullpath, root);
++		return NULL;
++	}
++
++	rpath = lxc_common_calloc_s(PATH_MAX);
++	if (rpath == NULL) {
++		ERROR("Out of memory");
++		goto out;
++	}
++	rpath_limit = rpath + PATH_MAX;
++
++	prefix = root;
++	prefix_len = (size_t)strlen(prefix);
++	if (!strcmp(prefix, "/")) {
++		prefix_len = 0;
++	}
++
++	dest = rpath;
++	if (prefix_len) {
++		memcpy(rpath, prefix, prefix_len);
++		dest += prefix_len;
++	}
++	*dest++ = '/';
++
++	if (do_eval_symlinks_in_scope(fullpath, prefix, prefix_len, &rpath, &dest,
++	                              rpath_limit)) {
++		goto out;
++	}
++
++	if (dest > rpath + prefix_len + 1 && ISSLASH(dest-1)) {
++		--dest;
++	}
++	*dest = '\0';
++	return rpath;
++
++out:
++	free(rpath);
++	return NULL;
++}
++
++// FollowSymlinkInScope is a wrapper around evalSymlinksInScope that returns an
++// absolute path. This function handles paths in a platform-agnostic manner.
++char *follow_symlink_in_scope(const char *fullpath, const char *rootpath)
++{
++	char resfullPATH_MAX = {0}, *full = NULL;
++	char resrootPATH_MAX = {0}, *root = NULL;
++
++	full = cleanpath(fullpath, resfull, PATH_MAX);
++	if (!full) {
++		ERROR("Failed to get cleaned path");
++		return NULL;
++	}
++
++	root = cleanpath(rootpath, resroot, PATH_MAX);
++	if (!root) {
++		ERROR("Failed to get cleaned path");
++		return NULL;
++	}
++
++	return eval_symlinks_in_scope(full, root);
++}
++
++// Rel returns a relative path that is lexically equivalent to targpath when
++// joined to basepath with an intervening separator. That is,
++// Join(basepath, Rel(basepath, targpath)) is equivalent to targpath itself.
++// On success, the returned path will always be relative to basepath,
++// even if basepath and targpath share no elements.
++// An error is returned if targpath can't be made relative to basepath or if
++// knowing the current working directory would be necessary to compute it.
++// Rel calls Clean on the result.
++char *path_relative(const char *basepath, const char *targpath)
++{
++	char resbasePATH_MAX = {0}, *base = NULL;
++	char restargPATH_MAX = {0}, *targ = NULL;
++	size_t bl = 0, tl = 0, b0 = 0, bi = 0, t0 = 0, ti = 0;
++
++	base = cleanpath(basepath, resbase, PATH_MAX);
++	if (!base) {
++		ERROR("Failed to get cleaned path");
++		return NULL;
++	}
++
++	targ = cleanpath(targpath, restarg, PATH_MAX);
++	if (!targ) {
++		ERROR("Failed to get cleaned path");
++		return NULL;
++	}
++
++	if (strcmp(base, targ) == 0)
++		return safe_strdup(".");
++
++	bl = strlen(base);
++	tl = strlen(targ);
++	while(true) {
++		while(bi < bl && !ISSLASH(basebi))
++			bi++;
++		while(ti < tl && !ISSLASH(targti))
++			ti++;
++		//not the same string
++		if (((bi - b0) != (ti - t0)) || strncmp(base + b0, targ + t0, bi - b0))
++			break;
++		if (bi < bl)
++			bi++;
++		if (ti < tl)
++			ti++;
++		b0 = bi;
++		t0 = ti;
++	}
++
++	if (b0 != bl) {
++		// Base elements left. Must go up before going down.
++		size_t seps = 0, i;
++		size_t ncopyed = 0, seps_size;
++		char *buf = NULL;
++
++		for (bi = b0; bi < bl; bi++) {
++			if (ISSLASH(basebi))
++				seps++;
++		}
++		//strlen(..) + strlen(/..) + '\0'
++		seps_size = 2 + seps * 3 + 1;
++		if (t0 != tl)
++			seps_size += 1 + tl - t0;
++
++		buf = calloc(seps_size, 1);
++		if (!buf) {
++			ERROR("Out of memory");
++			return NULL;
++		}
++		bufncopyed++ = '.';
++		bufncopyed++ = '.';
++		for (i = 0; i < seps; i++) {
++			bufncopyed++ = '/';
++			bufncopyed++ = '.';
++			bufncopyed++ = '.';
++		}
++		if (t0 != tl) {
++			bufncopyed++ = '/';
++			memcpy(buf + ncopyed, targ + t0, tl - t0 + 1);
++		}
++		return buf;
++	}
++
++	return safe_strdup(targ + t0);
++}
+diff --git a/src/lxc/path.h b/src/lxc/path.h
+new file mode 100644
+index 0000000..59bbc59
+--- /dev/null
++++ b/src/lxc/path.h
+@@ -0,0 +1,33 @@
++/* SPDX-License-Identifier: LGPL-2.1+ */
++/******************************************************************************
++ * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved
++ * Description: isulad utils
++ * Author: lifeng
++ * Create: 2020-04-11
++******************************************************************************/
++#ifndef __ISULAD_PATH_H_
++#define __ISULAD_PATH_H_
++
++#include <stdbool.h>
++
++/*
++ * cleanpath is similar to realpath of glibc, but not expands symbolic links,
++ * and not check the existence of components of the path.
++ */
++char *cleanpath(const char *path, char *realpath, size_t realpath_len);
++
++// FollowSymlinkInScope is a wrapper around evalSymlinksInScope that returns an
++// absolute path. This function handles paths in a platform-agnostic manner.
++char *follow_symlink_in_scope(const char *fullpath, const char *rootpath);
++
++// Rel returns a relative path that is lexically equivalent to targpath when
++// joined to basepath with an intervening separator. That is,
++// Join(basepath, Rel(basepath, targpath)) is equivalent to targpath itself.
++// On success, the returned path will always be relative to basepath,
++// even if basepath and targpath share no elements.
++// An error is returned if targpath can't be made relative to basepath or if
++// knowing the current working directory would be necessary to compute it.
++// Rel calls Clean on the result.
++char *path_relative(const char *basepath, const char *targpath);
++
++#endif
+-- 
+2.25.1
+

_service:tar_scm:0001-refactor-patch-code-of-utils-commands-and-so-on.patch Deleted

@@ -1,2368 +0,0 @@
-From d6745a42729f4704a0d9913676bf6d8b03c21903 Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Fri, 15 Jul 2022 17:06:09 +0800
-Subject: PATCH refactor patch code of utils commands and so on
-
-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
----
- src/lxc/cgroups/isulad_cgroup2_devices.c | 575 +++++++++++++++++++++++
- src/lxc/commands.c                       | 185 +++++++-
- src/lxc/commands.h                       |  10 +
- src/lxc/conf.h                           |  95 ++++
- src/lxc/isulad_utils.c                   | 319 +++++++++++++
- src/lxc/isulad_utils.h                   |  99 ++++
- src/lxc/lsm/lsm.c                        |  20 +
- src/lxc/lxc.h                            |  19 +
- src/lxc/lxccontainer.h                   | 194 ++++++++
- src/lxc/network.c                        |   8 +
- src/lxc/tools/lxc_ls.c                   |   8 +
- src/lxc/tools/lxc_start.c                | 109 ++++-
- src/lxc/utils.c                          | 173 +++++++
- src/lxc/utils.h                          |  11 +
- 14 files changed, 1822 insertions(+), 3 deletions(-)
- create mode 100644 src/lxc/cgroups/isulad_cgroup2_devices.c
- create mode 100644 src/lxc/isulad_utils.c
- create mode 100644 src/lxc/isulad_utils.h
-
-diff --git a/src/lxc/cgroups/isulad_cgroup2_devices.c b/src/lxc/cgroups/isulad_cgroup2_devices.c
-new file mode 100644
-index 0000000..05613c5
---- /dev/null
-+++ b/src/lxc/cgroups/isulad_cgroup2_devices.c
-@@ -0,0 +1,575 @@
-+/* SPDX-License-Identifier: LGPL-2.1+ */
-+
-+/* Parts of this taken from systemd's implementation. */
-+
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE 1
-+#endif
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <stdbool.h>
-+#include <stddef.h>
-+#include <stdint.h>
-+#include <sys/stat.h>
-+#include <sys/syscall.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+#include "cgroup2_devices.h"
-+#include "config.h"
-+#include "log.h"
-+#include "macro.h"
-+#include "memory_utils.h"
-+
-+#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-+#include <linux/bpf.h>
-+#include <linux/filter.h>
-+
-+#define BPF_LOG_BUF_SIZE (1 << 23) /* 8MB */
-+#ifndef BPF_LOG_LEVEL1
-+#define BPF_LOG_LEVEL1 1
-+#endif
-+
-+#ifndef BPF_LOG_LEVEL2
-+#define BPF_LOG_LEVEL2 2
-+#endif
-+
-+#ifndef BPF_LOG_LEVEL
-+#define BPF_LOG_LEVEL (BPF_LOG_LEVEL1 | BPF_LOG_LEVEL2)
-+#endif
-+
-+lxc_log_define(cgroup2_devices, cgroup);
-+
-+static int bpf_program_add_instructions(struct bpf_program *prog,
-+					const struct bpf_insn *instructions,
-+					size_t count)
-+{
-+
-+	struct bpf_insn *new_insn;
-+
-+	if (prog->kernel_fd >= 0)
-+		return log_error_errno(-1, EBUSY, "Refusing to update bpf cgroup program that's already loaded");
-+
-+	new_insn = realloc(prog->instructions, sizeof(struct bpf_insn) * (count + prog->n_instructions));
-+	if (!new_insn)
-+		return log_error_errno(-1, ENOMEM, "Failed to reallocate bpf cgroup program");
-+
-+	prog->instructions = new_insn;
-+	memset(prog->instructions + prog->n_instructions, 0,
-+	       sizeof(struct bpf_insn) * count);
-+	memcpy(prog->instructions + prog->n_instructions, instructions,
-+	       sizeof(struct bpf_insn) * count);
-+	prog->n_instructions += count;
-+
-+	return 0;
-+}
-+
-+void bpf_program_free(struct bpf_program *prog)
-+{
-+	if (!prog)
-+		return;
-+
-+	(void)bpf_program_cgroup_detach(prog);
-+
-+	if (prog->kernel_fd >= 0)
-+		close(prog->kernel_fd);
-+	free(prog->instructions);
-+	free(prog->attached_path);
-+	free(prog);
-+}
-+
-+/* Memory load, dst_reg = *(uint *) (src_reg + off16) */
-+#define BPF_LDX_MEM(SIZE, DST, SRC, OFF)                               \
-+	((struct bpf_insn){.code = BPF_LDX | BPF_SIZE(SIZE) | BPF_MEM, \
-+			   .dst_reg = DST,                             \
-+			   .src_reg = SRC,                             \
-+			   .off = OFF,                                 \
-+			   .imm = 0})
-+
-+/* ALU ops on immediates, bpf_add|sub|...: dst_reg += imm32 */
-+#define BPF_ALU32_IMM(OP, DST, IMM)                              \
-+	((struct bpf_insn){.code = BPF_ALU | BPF_OP(OP) | BPF_K, \
-+			   .dst_reg = DST,                       \
-+			   .src_reg = 0,                         \
-+			   .off = 0,                             \
-+			   .imm = IMM})
-+
-+/* Short form of mov, dst_reg = src_reg */
-+#define BPF_MOV64_IMM(DST, IMM)                                 \
-+	((struct bpf_insn){.code = BPF_ALU64 | BPF_MOV | BPF_K, \
-+			   .dst_reg = DST,                      \
-+			   .src_reg = 0,                        \
-+			   .off = 0,                            \
-+			   .imm = IMM})
-+
-+#define BPF_MOV32_REG(DST, SRC)                               \
-+	((struct bpf_insn){.code = BPF_ALU | BPF_MOV | BPF_X, \
-+			   .dst_reg = DST,                    \
-+			   .src_reg = SRC,                    \
-+			   .off = 0,                          \
-+			   .imm = 0})
-+
-+/* Conditional jumps against registers, if (dst_reg 'op' src_reg) goto pc + off16 */
-+#define BPF_JMP_REG(OP, DST, SRC, OFF)                           \
-+	((struct bpf_insn){.code = BPF_JMP | BPF_OP(OP) | BPF_X, \
-+			   .dst_reg = DST,                       \
-+			   .src_reg = SRC,                       \
-+			   .off = OFF,                           \
-+			   .imm = 0})
-+
-+/* Conditional jumps against immediates, if (dst_reg 'op' imm32) goto pc + off16 */
-+#define BPF_JMP_IMM(OP, DST, IMM, OFF)                           \
-+	((struct bpf_insn){.code = BPF_JMP | BPF_OP(OP) | BPF_K, \
-+			   .dst_reg = DST,                       \
-+			   .src_reg = 0,                         \
-+			   .off = OFF,                           \
-+			   .imm = IMM})
-+
-+/* Program exit */
-+#define BPF_EXIT_INSN()                                \
-+	((struct bpf_insn){.code = BPF_JMP | BPF_EXIT, \
-+			   .dst_reg = 0,               \
-+			   .src_reg = 0,               \
-+			   .off = 0,                   \
-+			   .imm = 0})
-+
-+static int bpf_access_mask(const char *acc, __u32 *mask)
-+{
-+	if (!acc)
-+		return 0;
-+
-+	for (; *acc; acc++)
-+		switch (*acc) {
-+		case 'r':
-+			*mask |= BPF_DEVCG_ACC_READ;
-+			break;
-+		case 'w':
-+			*mask |= BPF_DEVCG_ACC_WRITE;
-+			break;
-+		case 'm':
-+			*mask |= BPF_DEVCG_ACC_MKNOD;
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+
-+	return 0;
-+}
-+
-+static int bpf_device_type(char type)
-+{
-+	switch (type) {
-+	case 'a':
-+		return 0;
-+	case 'b':
-+		return BPF_DEVCG_DEV_BLOCK;
-+	case 'c':
-+		return BPF_DEVCG_DEV_CHAR;
-+	}
-+
-+	return -1;
-+}
-+
-+static inline bool bpf_device_all_access(__u32 access_mask)
-+{
-+	return access_mask == (BPF_DEVCG_ACC_READ | BPF_DEVCG_ACC_WRITE | BPF_DEVCG_ACC_MKNOD);
-+}
-+
-+struct bpf_program *bpf_program_new(uint32_t prog_type)
-+{
-+	__do_free struct bpf_program *prog = NULL;
-+
-+	prog = zalloc(sizeof(struct bpf_program));
-+	if (!prog)
-+		return ret_set_errno(NULL, ENOMEM);
-+
-+	prog->prog_type = prog_type;
-+	prog->kernel_fd = -EBADF;
-+	/*
-+	 * By default a whitelist is used unless the user tells us otherwise.
-+	 */
-+	prog->device_list_type = LXC_BPF_DEVICE_CGROUP_WHITELIST;
-+
-+	return move_ptr(prog);
-+}
-+
-+int bpf_program_init(struct bpf_program *prog)
-+{
-+	if (!prog)
-+		return ret_set_errno(-1, EINVAL);
-+
-+	const struct bpf_insn pre_insn = {
-+	    /* load device type to r2 */
-+	    BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, access_type)),
-+	    BPF_ALU32_IMM(BPF_AND, BPF_REG_2, 0xFFFF),
-+
-+	    /* load access type to r3 */
-+	    BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, access_type)),
-+	    BPF_ALU32_IMM(BPF_RSH, BPF_REG_3, 16),
-+
-+	    /* load major number to r4 */
-+	    BPF_LDX_MEM(BPF_W, BPF_REG_4, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, major)),
-+
-+	    /* load minor number to r5 */
-+	    BPF_LDX_MEM(BPF_W, BPF_REG_5, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, minor)),
-+	};
-+
-+	return bpf_program_add_instructions(prog, pre_insn, ARRAY_SIZE(pre_insn));
-+}
-+
-+int bpf_program_append_device(struct bpf_program *prog, struct device_item *device)
-+{
-+	int ret;
-+	int jump_nr = 1;
-+	__u32 access_mask = 0;
-+	int device_type;
-+	struct bpf_insn bpf_access_decision2;
-+	bool add_exist = false;
-+
-+	if (!prog || !device)
-+		return ret_set_errno(-1, EINVAL);
-+
-+	/* This is a global rule so no need to append anything. */
-+	if (device->global_rule > LXC_BPF_DEVICE_CGROUP_LOCAL_RULE) {
-+		prog->device_list_type = device->global_rule;
-+		return 0;
-+	}
-+
-+	ret = bpf_access_mask(device->access, &access_mask);
-+	if (ret < 0)
-+		return log_error_errno(ret, -ret, "Invalid access mask specified %s", device->access);
-+
-+	if (!bpf_device_all_access(access_mask))
-+		jump_nr += 3;
-+
-+	device_type = bpf_device_type(device->type);
-+	if (device_type < 0)
-+		return log_error_errno(-1, EINVAL, "Invalid bpf cgroup device type %c", device->type);
-+
-+	if (device_type > 0)
-+		jump_nr++;
-+
-+	if (device->major >= 0)
-+		jump_nr++;
-+
-+	if (device->minor >= 0)
-+		jump_nr++;
-+
-+	if (device_type > 0) {
-+		struct bpf_insn ins = {
-+			BPF_JMP_IMM(BPF_JNE, BPF_REG_2, device_type, jump_nr--),
-+		};
-+
-+		ret = bpf_program_add_instructions(prog, ins, ARRAY_SIZE(ins));
-+		if (ret)
-+			return log_error_errno(-1, errno, "Failed to add instructions to bpf cgroup program");
-+		add_exist = true;
-+	}
-+
-+	if (!bpf_device_all_access(access_mask)) {
-+		struct bpf_insn ins = {
-+			BPF_MOV32_REG(BPF_REG_1, BPF_REG_3),
-+			BPF_ALU32_IMM(BPF_AND, BPF_REG_1, access_mask),
-+			BPF_JMP_REG(BPF_JNE, BPF_REG_1, BPF_REG_3, jump_nr-2),
-+		};
-+
-+		jump_nr -= 3;
-+		ret = bpf_program_add_instructions(prog, ins, ARRAY_SIZE(ins));
-+		if (ret)
-+			return log_error_errno(-1, errno, "Failed to add instructions to bpf cgroup program");
-+		add_exist = true;
-+	}
-+
-+	if (device->major >= 0) {
-+		struct bpf_insn ins = {
-+			BPF_JMP_IMM(BPF_JNE, BPF_REG_4, device->major, jump_nr--),
-+		};
-+
-+		ret = bpf_program_add_instructions(prog, ins, ARRAY_SIZE(ins));
-+		if (ret)
-+			return log_error_errno(-1, errno, "Failed to add instructions to bpf cgroup program");
-+		add_exist = true;
-+	}
-+
-+	if (device->minor >= 0) {
-+		struct bpf_insn ins = {
-+			BPF_JMP_IMM(BPF_JNE, BPF_REG_5, device->minor, jump_nr--),
-+		};
-+
-+		ret = bpf_program_add_instructions(prog, ins, ARRAY_SIZE(ins));
-+		if (ret)
-+			return log_error_errno(-1, errno, "Failed to add instructions to bpf cgroup program");
-+		add_exist = true;
-+	}
-+
-+	if (add_exist) {
-+		bpf_access_decision0 = BPF_MOV64_IMM(BPF_REG_0, device->allow);
-+		bpf_access_decision1 = BPF_EXIT_INSN();
-+		ret = bpf_program_add_instructions(prog, bpf_access_decision,
-+					   ARRAY_SIZE(bpf_access_decision));
-+		if (ret)
-+			return log_error_errno(-1, errno, "Failed to add instructions to bpf cgroup program");
-+	}
-+
-+	return 0;
-+}
-+
-+int bpf_program_finalize(struct bpf_program *prog)
-+{
-+	struct bpf_insn ins = {
-+	    BPF_MOV64_IMM(BPF_REG_0, prog->device_list_type),
-+	    BPF_EXIT_INSN(),
-+	};
-+
-+	if (!prog)
-+		return ret_set_errno(-1, EINVAL);
-+
-+	TRACE("Implementing %s bpf device cgroup program",
-+	      prog->device_list_type == LXC_BPF_DEVICE_CGROUP_BLACKLIST
-+		  ? "blacklist"
-+		  : "whitelist");
-+	return bpf_program_add_instructions(prog, ins, ARRAY_SIZE(ins));
-+}
-+
-+static int bpf_program_load_kernel(struct bpf_program *prog)
-+{
-+	__do_free char *log_buf = NULL;
-+	__u32 log_level = 0;
-+	__u32 log_size = 0;
-+	union bpf_attr attr;
-+	struct rlimit limit = {
-+		.rlim_cur = RLIM_INFINITY,
-+		.rlim_max = RLIM_INFINITY,
-+	};
-+
-+	if (prog->kernel_fd >= 0) {
-+		return 0;
-+	}
-+
-+	if (lxc_log_get_level() <= LXC_LOG_LEVEL_DEBUG) {
-+		log_buf = zalloc(BPF_LOG_BUF_SIZE);
-+		if (!log_buf) {
-+			WARN("Failed to allocate bpf log buffer");
-+		} else {
-+			log_level = BPF_LOG_LEVEL;
-+			log_size = BPF_LOG_BUF_SIZE;
-+		}
-+	}
-+
-+	if (setrlimit(RLIMIT_MEMLOCK, &limit) < 0)
-+		return log_error_errno(-1, errno, "Failed to set rlimit memlock to unlimited");
-+
-+	attr = (union bpf_attr){
-+	    .prog_type	= prog->prog_type,
-+	    .insns	= PTR_TO_UINT64(prog->instructions),
-+	    .insn_cnt	= prog->n_instructions,
-+	    .license	= PTR_TO_UINT64("GPL"),
-+	    .log_buf	= PTR_TO_UINT64(log_buf),
-+	    .log_level	= log_level,
-+	    .log_size	= log_size,
-+	};
-+
-+	prog->kernel_fd = bpf(BPF_PROG_LOAD, &attr, sizeof(attr));
-+	if (prog->kernel_fd < 0)
-+		return log_error_errno(-1, errno, "Failed to load bpf program: %s", log_buf);
-+
-+	TRACE("Loaded bpf program: %s", log_buf ?: "(null)");
-+	return 0;
-+}
-+
-+int bpf_program_cgroup_attach(struct bpf_program *prog, int type,
-+			      const char *path, uint32_t flags)
-+{
-+	__do_free char *copy = NULL;
-+	__do_close int fd = -EBADF;
-+	union bpf_attr attr;
-+	int ret;
-+
-+	if (!prog)
-+		return ret_set_errno(-1, EINVAL);
-+
-+	if (flags & ~(BPF_F_ALLOW_OVERRIDE | BPF_F_ALLOW_MULTI))
-+		return log_error_errno(-1, EINVAL, "Invalid flags for bpf program");
-+
-+	if (prog->attached_path) {
-+		if (prog->attached_type != type)
-+			return log_error_errno(-1, EBUSY, "Wrong type for bpf program");
-+
-+		if (prog->attached_flags != flags)
-+			return log_error_errno(-1, EBUSY, "Wrong flags for bpf program");
-+
-+		if (flags != BPF_F_ALLOW_OVERRIDE)
-+			return true;
-+	}
-+
-+	ret = bpf_program_load_kernel(prog);
-+	if (ret < 0)
-+		return log_error_errno(-1, ret, "Failed to load bpf program");
-+
-+	copy = strdup(path);
-+	if (!copy)
-+		return log_error_errno(-1, ENOMEM, "Failed to duplicate cgroup path %s", path);
-+
-+	fd = open(path, O_DIRECTORY | O_RDONLY | O_CLOEXEC);
-+	if (fd < 0)
-+		return log_error_errno(-1, errno, "Failed to open cgroup path %s", path);
-+
-+	attr = (union bpf_attr){
-+	    .attach_type	= type,
-+	    .target_fd		= fd,
-+	    .attach_bpf_fd	= prog->kernel_fd,
-+	    .attach_flags	= flags,
-+	};
-+
-+	ret = bpf(BPF_PROG_ATTACH, &attr, sizeof(attr));
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to attach bpf program");
-+
-+	free_move_ptr(prog->attached_path, copy);
-+	prog->attached_type = type;
-+	prog->attached_flags = flags;
-+
-+	TRACE("Loaded and attached bpf program to cgroup %s", prog->attached_path);
-+	return 0;
-+}
-+
-+int bpf_program_cgroup_detach(struct bpf_program *prog)
-+{
-+	int ret;
-+	__do_close int fd = -EBADF;
-+
-+	if (!prog)
-+		return 0;
-+
-+	if (!prog->attached_path)
-+		return 0;
-+
-+	fd = open(prog->attached_path, O_DIRECTORY | O_RDONLY | O_CLOEXEC);
-+	if (fd < 0) {
-+		if (errno != ENOENT)
-+			return log_error_errno(-1, errno, "Failed to open attach cgroup %s",
-+					       prog->attached_path);
-+	} else {
-+		union bpf_attr attr;
-+
-+		attr = (union bpf_attr){
-+		    .attach_type	= prog->attached_type,
-+		    .target_fd		= fd,
-+		    .attach_bpf_fd	= prog->kernel_fd,
-+		};
-+
-+		ret = bpf(BPF_PROG_DETACH, &attr, sizeof(attr));
-+		if (ret < 0)
-+			return log_error_errno(-1, errno, "Failed to detach bpf program from cgroup %s",
-+					       prog->attached_path);
-+	}
-+
-+	free(prog->attached_path);
-+	prog->attached_path = NULL;
-+
-+	return 0;
-+}
-+
-+void lxc_clear_cgroup2_devices(struct lxc_conf *conf)
-+{
-+	if (conf->cgroup2_devices) {
-+		(void)bpf_program_cgroup_detach(conf->cgroup2_devices);
-+		(void)bpf_program_free(conf->cgroup2_devices);
-+	}
-+}
-+
-+int bpf_list_add_device(struct lxc_conf *conf, struct device_item *device)
-+{
-+	__do_free struct lxc_list *list_elem = NULL;
-+	__do_free struct device_item *new_device = NULL;
-+	struct lxc_list *it;
-+
-+	lxc_list_for_each(it, &conf->devices) {
-+		struct device_item *cur = it->elem;
-+
-+		if (cur->global_rule > LXC_BPF_DEVICE_CGROUP_LOCAL_RULE &&
-+		    device->global_rule > LXC_BPF_DEVICE_CGROUP_LOCAL_RULE) {
-+			TRACE("Switched from %s to %s",
-+			      cur->global_rule == LXC_BPF_DEVICE_CGROUP_WHITELIST
-+				  ? "whitelist"
-+				  : "blacklist",
-+			      device->global_rule == LXC_BPF_DEVICE_CGROUP_WHITELIST
-+				  ? "whitelist"
-+				  : "blacklist");
-+			cur->global_rule = device->global_rule;
-+			return 1;
-+		}
-+
-+		if (cur->type != device->type)
-+			continue;
-+		if (cur->major != device->major)
-+			continue;
-+		if (cur->minor != device->minor)
-+			continue;
-+		if (strcmp(cur->access, device->access))
-+			continue;
-+
-+		/*
-+		 * The rule is switched from allow to deny or vica versa so
-+		 * don't bother allocating just flip the existing one.
-+		 */
-+		if (cur->allow != device->allow) {
-+			cur->allow = device->allow;
-+			return log_trace(0, "Switched existing rule of bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
-+					 cur->type, cur->major, cur->minor,
-+					 cur->access, cur->allow,
-+					 cur->global_rule);
-+		}
-+
-+		return log_trace(1, "Reusing existing rule of bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
-+				 cur->type, cur->major, cur->minor, cur->access,
-+				 cur->allow, cur->global_rule);
-+	}
-+
-+	list_elem = malloc(sizeof(*list_elem));
-+	if (!list_elem)
-+		return log_error_errno(-1, ENOMEM, "Failed to allocate new device list");
-+
-+	new_device = memdup(device, sizeof(struct device_item));
-+	if (!new_device)
-+		return log_error_errno(-1, ENOMEM, "Failed to allocate new device item");
-+
-+	lxc_list_add_elem(list_elem, move_ptr(new_device));
-+	lxc_list_add_tail(&conf->devices, move_ptr(list_elem));
-+
-+	return 0;
-+}
-+
-+bool bpf_devices_cgroup_supported(void)
-+{
-+	const struct bpf_insn dummy = {
-+	    BPF_MOV64_IMM(BPF_REG_0, 1),
-+	    BPF_EXIT_INSN(),
-+	};
-+
-+	__do_bpf_program_free struct bpf_program *prog = NULL;
-+	int ret;
-+
-+	if (geteuid() != 0)
-+		return log_trace(false,
-+				 "The bpf device cgroup requires real root");
-+
-+	prog = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
-+	if (prog < 0)
-+		return log_trace(false, "Failed to allocate new bpf device cgroup program");
-+
-+	ret = bpf_program_init(prog);
-+	if (ret)
-+		return log_error_errno(false, ENOMEM, "Failed to initialize bpf program");
-+
-+	ret = bpf_program_add_instructions(prog, dummy, ARRAY_SIZE(dummy));
-+	if (ret < 0)
-+		return log_trace(false, "Failed to add new instructions to bpf device cgroup program");
-+
-+	ret = bpf_program_load_kernel(prog);
-+	if (ret < 0)
-+		return log_trace(false, "Failed to load new bpf device cgroup program");
-+
-+	return log_trace(true, "The bpf device cgroup is supported");
-+}
-+#endif
-diff --git a/src/lxc/commands.c b/src/lxc/commands.c
-index b6ae101..c2a5665 100644
---- a/src/lxc/commands.c
-+++ b/src/lxc/commands.c
-@@ -86,6 +86,10 @@ static const char *lxc_cmd_str(lxc_cmd_t cmd)
- 		LXC_CMD_GET_INIT_PIDFD        	= "get_init_pidfd",
- 		LXC_CMD_GET_LIMITING_CGROUP		= "get_limiting_cgroup",
- 		LXC_CMD_GET_LIMITING_CGROUP2_FD	= "get_limiting_cgroup2_fd",
-+#ifdef HAVE_ISULAD
-+		LXC_CMD_SET_TERMINAL_FIFOS  		= "set_terminal_fifos",
-+		LXC_CMD_SET_TERMINAL_WINCH  		= "set_terminal_winch",
-+#endif
- 	};
- 
- 	if (cmd >= LXC_CMD_MAX)
-@@ -117,7 +121,15 @@ static int lxc_cmd_rsp_recv(int sock, struct lxc_cmd_rr *cmd)
- 	int ret;
- 	struct lxc_cmd_rsp *rsp = &cmd->rsp;
- 
-+#ifdef HAVE_ISULAD
-+	/*isulad: add timeout 1s to avoid long block due to lxc monitor error*/
-+	ret = lxc_abstract_unix_recv_fds_timeout(sock, &fd_rsp, 1, rsp, sizeof(*rsp), 1000 * 1000);
-+	if (ret < 0 && (errno == ECONNRESET || errno == EAGAIN || errno == EWOULDBLOCK)) {
-+		errno = ECONNRESET; /*isulad set errno ECONNRESET when timeout */
-+	}
-+#else
- 	ret = lxc_abstract_unix_recv_fds(sock, &fd_rsp, 1, rsp, sizeof(*rsp));
-+#endif
- 	if (ret < 0)
- 		return log_warn_errno(-1,
- 				      errno, "Failed to receive response for command \"%s\"",
-@@ -592,8 +604,9 @@ static int lxc_cmd_get_cgroup_callback_do(int fd, struct lxc_cmd_req *req,
- 		reqdata = NULL;
- 	}
- 
--	get_fn = (limiting_cgroup ? cgroup_ops->get_cgroup
--				  : cgroup_ops->get_limiting_cgroup);
-+	// bugfix in newer version
-+	get_fn = (limiting_cgroup ? cgroup_ops->get_limiting_cgroup
-+				  : cgroup_ops->get_cgroup);
- 
- 	path = get_fn(cgroup_ops, reqdata);
- 
-@@ -1260,7 +1273,11 @@ int lxc_cmd_serve_state_clients(const char *name, const char *lxcpath,
- 
- 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
- 	if (ret < 0)
-+#ifdef HAVE_ISULAD
-+		return log_warn_errno(-1, errno, "Failed to serve state clients");
-+#else
- 		return log_error_errno(-1, errno, "Failed to serve state clients");
-+#endif
- 
- 	return 0;
- }
-@@ -1475,6 +1492,123 @@ static int lxc_cmd_get_limiting_cgroup2_fd_callback(int fd,
- 	return ret_errno(ENOSYS);
- }
- 
-+#ifdef HAVE_ISULAD
-+/*
-+ * isulad: lxc_cmd_set_terminal_fifos: Set the fifos used for the container as terminal input/output
-+ *
-+ * @hashed_sock_name: hashed socket name
-+ *
-+ * Returns 0 when success, else when fail.
-+ */
-+int lxc_cmd_set_terminal_fifos(const char *name, const char *lxcpath, const char *in_fifo,
-+				const char *out_fifo, const char *err_fifo)
-+{
-+	int ret = 0, stopped = 0;
-+	int len = 0;
-+	char *tmp = NULL;
-+	const char *split = "&&&&", *none_fifo_name = "none";
-+	const char *cmd_in_fifo = in_fifo ? in_fifo : none_fifo_name;
-+	const char *cmd_out_fifo = out_fifo ? out_fifo : none_fifo_name;
-+	const char *cmd_err_fifo = err_fifo ? err_fifo : none_fifo_name;
-+
-+	if (len + strlen(cmd_in_fifo) + strlen(split) + strlen(cmd_out_fifo) +
-+	     strlen(split) + strlen(cmd_err_fifo) == SIZE_MAX)
-+		return -1;
-+	len += strlen(cmd_in_fifo) + strlen(split) + strlen(cmd_out_fifo) + strlen(split) + strlen(cmd_err_fifo) + 1;
-+	tmp = malloc(len);
-+	if (tmp == NULL)
-+		return -1;
-+	ret = snprintf(tmp, len, "%s%s%s%s%s", cmd_in_fifo, split, cmd_out_fifo, split, cmd_err_fifo);
-+	if (ret < 0 || ret >= len) {
-+		ERROR("Failed to snprintf in fifo of command");
-+		free(tmp);
-+		return -1;
-+	}
-+
-+	struct lxc_cmd_rr cmd = {
-+		.req = {
-+			.cmd = LXC_CMD_SET_TERMINAL_FIFOS,
-+			.datalen = strlen(tmp)+1,
-+			.data = tmp,
-+		},
-+	};
-+
-+	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
-+	if (ret < 0) {
-+		ERROR("Failed to send command to container");
-+		free(tmp);
-+		return -1;
-+	}
-+
-+	if (cmd.rsp.ret != 0) {
-+		ERROR("Command response error:%d", cmd.rsp.ret);
-+		free(tmp);
-+		return -1;
-+	}
-+
-+	free(tmp);
-+	return 0;
-+}
-+
-+static int lxc_cmd_set_terminal_fifos_callback(int fd, struct lxc_cmd_req *req,
-+					struct lxc_handler *handler, struct lxc_epoll_descr *descr)
-+{
-+	struct lxc_cmd_rsp rsp;
-+	memset(&rsp, 0, sizeof(rsp));
-+
-+	rsp.ret = lxc_terminal_add_fifos(handler->conf, req->data);;
-+
-+	return lxc_cmd_rsp_send(fd, &rsp);
-+}
-+
-+struct lxc_cmd_set_terminal_winch_request {
-+	unsigned int height;
-+	unsigned int width;
-+};
-+
-+int lxc_cmd_set_terminal_winch(const char *name, const char *lxcpath, unsigned int height, unsigned int width)
-+{
-+	int ret = 0, stopped = 0;
-+	struct lxc_cmd_set_terminal_winch_request data = { 0 };
-+
-+	data.height = height;
-+	data.width = width;
-+
-+	struct lxc_cmd_rr cmd = {
-+		.req = {
-+			.cmd = LXC_CMD_SET_TERMINAL_WINCH,
-+			.datalen = sizeof(struct lxc_cmd_set_terminal_winch_request),
-+			.data = &data,
-+		},
-+	};
-+
-+	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
-+	if (ret < 0) {
-+		ERROR("Failed to send command to container");
-+		return -1;
-+	}
-+
-+	if (cmd.rsp.ret != 0) {
-+		ERROR("Command response error:%d", cmd.rsp.ret);
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static int lxc_cmd_set_terminal_winch_callback(int fd, struct lxc_cmd_req *req,
-+					struct lxc_handler *handler, struct lxc_epoll_descr *descr)
-+{
-+	struct lxc_cmd_rsp rsp;
-+	struct lxc_cmd_set_terminal_winch_request *data = (struct lxc_cmd_set_terminal_winch_request *)(req->data);
-+	memset(&rsp, 0, sizeof(rsp));
-+
-+	rsp.ret = lxc_set_terminal_winsz(&handler->conf->console, data->height, data->width);;
-+
-+	return lxc_cmd_rsp_send(fd, &rsp);
-+
-+}
-+#endif
-+
- static int lxc_cmd_process(int fd, struct lxc_cmd_req *req,
- 			   struct lxc_handler *handler,
- 			   struct lxc_epoll_descr *descr)
-@@ -1504,10 +1638,18 @@ static int lxc_cmd_process(int fd, struct lxc_cmd_req *req,
- 		LXC_CMD_GET_INIT_PIDFD                = lxc_cmd_get_init_pidfd_callback,
- 		LXC_CMD_GET_LIMITING_CGROUP           = lxc_cmd_get_limiting_cgroup_callback,
- 		LXC_CMD_GET_LIMITING_CGROUP2_FD       = lxc_cmd_get_limiting_cgroup2_fd_callback,
-+#ifdef HAVE_ISULAD
-+		LXC_CMD_SET_TERMINAL_FIFOS  			= lxc_cmd_set_terminal_fifos_callback,
-+		LXC_CMD_SET_TERMINAL_WINCH  			= lxc_cmd_set_terminal_winch_callback,
-+#endif
- 	};
- 
- 	if (req->cmd >= LXC_CMD_MAX)
-+#ifdef HAVE_ISULAD
-+		return log_error_errno(-1, ENOENT, "Undefined command id %d", req->cmd);
-+#else
- 		return log_trace_errno(-1, EINVAL, "Invalid command id %d", req->cmd);
-+#endif
- 
- 	return cbreq->cmd(fd, req, handler, descr);
- }
-@@ -1646,6 +1788,44 @@ static int lxc_cmd_accept(int fd, uint32_t events, void *data,
- 	return ret;
- }
- 
-+#ifdef HAVE_ISULAD
-+int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix)
-+{
-+	__do_close int fd = -EBADF;
-+	int ret;
-+	char pathLXC_AUDS_ADDR_LEN = {0};
-+	__do_free char *runtime_sock_dir = NULL;
-+
-+	runtime_sock_dir = generate_named_unix_sock_dir(name);
-+	if (runtime_sock_dir == NULL)
-+		return -1;
-+
-+	if (mkdir_p(runtime_sock_dir, 0700) < 0)
-+		return log_error_errno(-1, errno, "Failed to create container runtime unix sock directory %s", path);
-+
-+	if (generate_named_unix_sock_path(name, suffix, path, sizeof(path)) != 0)
-+		return -1;
-+
-+	fd = lxc_named_unix_open(path, SOCK_STREAM, 0);
-+	if (fd < 0) {
-+		if (errno == EADDRINUSE) {
-+			WARN("Container \"%s\" appears to be already running", name);
-+			(void)unlink(path);
-+
-+			fd = lxc_named_unix_open(path, SOCK_STREAM, 0);
-+			if (fd < 0)
-+				return log_error_errno(-1, errno, "Failed to create command socket %s", path);
-+		} else
-+			return log_error_errno(-1, errno, "Failed to create command socket %s", path);
-+	}
-+
-+	ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to set FD_CLOEXEC on command socket file descriptor");
-+
-+	return log_trace(move_fd(fd), "Created unix socket \"%s\"", path);
-+}
-+#else
- int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix)
- {
- 	__do_close int fd = -EBADF;
-@@ -1670,6 +1850,7 @@ int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix)
- 
- 	return log_trace(move_fd(fd), "Created abstract unix socket \"%s\"", &path1);
- }
-+#endif
- 
- int lxc_cmd_mainloop_add(const char *name, struct lxc_epoll_descr *descr,
- 			 struct lxc_handler *handler)
-diff --git a/src/lxc/commands.h b/src/lxc/commands.h
-index 3624a14..f6371fd 100644
---- a/src/lxc/commands.h
-+++ b/src/lxc/commands.h
-@@ -40,6 +40,10 @@ typedef enum {
- 	LXC_CMD_GET_INIT_PIDFD,
- 	LXC_CMD_GET_LIMITING_CGROUP,
- 	LXC_CMD_GET_LIMITING_CGROUP2_FD,
-+#ifdef HAVE_ISULAD
-+	LXC_CMD_SET_TERMINAL_FIFOS,
-+	LXC_CMD_SET_TERMINAL_WINCH,
-+#endif
- 	LXC_CMD_MAX,
- } lxc_cmd_t;
- 
-@@ -136,4 +140,10 @@ extern char *lxc_cmd_get_limiting_cgroup_path(const char *name,
- 					      const char *subsystem);
- extern int lxc_cmd_get_limiting_cgroup2_fd(const char *name, const char *lxcpath);
- 
-+#ifdef HAVE_ISULAD
-+extern int lxc_cmd_set_terminal_fifos(const char *name, const char *lxcpath,
-+				const char *in_fifo, const char *out_fifo, const char *err_fifo);
-+extern int lxc_cmd_set_terminal_winch(const char *name, const char *lxcpath, unsigned int height, unsigned int width);
-+#endif
-+
- #endif /* __commands_h */
-diff --git a/src/lxc/conf.h b/src/lxc/conf.h
-index b72afba..0478eb1 100644
---- a/src/lxc/conf.h
-+++ b/src/lxc/conf.h
-@@ -23,6 +23,10 @@
- #include "start.h"
- #include "terminal.h"
- 
-+#ifdef HAVE_ISULAD
-+#include "oci_runtime_hooks.h"
-+#endif
-+
- #if HAVE_SYS_RESOURCE_H
- #include <sys/resource.h>
- #endif
-@@ -146,6 +150,8 @@ struct lxc_tty_info {
-  * @mountflags : the portion of @options that are flags
-  * @data       : the portion of @options that are not flags
-  * @managed    : whether it is managed by LXC
-+ * @maskedpaths: A list of paths to be msked over inside the container
-+ * @ropaths    : A list of paths to be remounted with readonly inside the container
-  */
- struct lxc_rootfs {
- 	char *path;
-@@ -155,6 +161,14 @@ struct lxc_rootfs {
- 	unsigned long mountflags;
- 	char *data;
- 	bool managed;
-+#ifdef HAVE_ISULAD
-+	/* isulad: maskedpaths */
-+	struct lxc_list maskedpaths;
-+	/* isulad: ropaths */
-+	struct lxc_list ropaths;
-+	/* isulad: errfd */
-+	int errfd;
-+#endif
- };
- 
- /*
-@@ -203,6 +217,11 @@ enum lxchooks {
- 	LXCHOOK_CLONE,
- 	LXCHOOK_DESTROY,
- 	LXCHOOK_START_HOST,
-+#ifdef HAVE_ISULAD
-+	OCI_HOOK_PRESTART,
-+	OCI_HOOK_POSTSTART,
-+	OCI_HOOK_POSTSTOP,
-+#endif
- 	NUM_LXC_HOOKS
- };
- 
-@@ -233,6 +252,27 @@ struct device_item {
- 	int global_rule;
- };
- 
-+#ifdef HAVE_ISULAD
-+/*
-+ * iSulad: Defines a structure to store the devices which will
-+ * be attached in container
-+ * @name       : the target device name in container
-+ * @type       : the type of target device "c" or "b"
-+ * @mode       : file mode for the device
-+ * @maj        : major number for the device
-+ * @min        : minor number for the device
-+ */
-+struct lxc_populate_devs {
-+	char *name;
-+	char *type;
-+	mode_t file_mode;
-+	int maj;
-+	int min;
-+	uid_t uid;
-+	gid_t gid;
-+};
-+#endif
-+
- struct lxc_conf {
- 	/* Pointer to the name of the container. Do not free! */
- 	const char *name;
-@@ -401,6 +441,40 @@ struct lxc_conf {
- 		/* Absolute path (in the container) to the shared mount point */
- 		char *path_cont;
- 	} shmount;
-+
-+#ifdef HAVE_ISULAD
-+	/* support oci hook */
-+	oci_runtime_spec_hooks *ocihooks;
-+
-+	/* init args used to repalce init_cmd */
-+	char **init_argv;
-+	size_t init_argc;
-+
-+	gid_t *init_groups;
-+	size_t init_groups_len;
-+
-+	/* populate devices */
-+	struct lxc_list populate_devs;
-+	mode_t umask;  // umask value
-+
-+	char *container_info_file;
-+
-+  /* exit fifo fd*/
-+	int exit_fd;
-+
-+  /* record error messages */
-+	char *errmsg;
-+
-+  /* pipdfd for get error message of child or grandchild process */
-+	int errpipe2;
-+
-+  /* systemd value */
-+	char *systemd;
-+
-+  /* Linux Security Modules SELinux context for device mount */
-+	char *lsm_se_mount_context;
-+#endif
-+
- };
- 
- extern int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf,
-@@ -439,7 +513,11 @@ extern int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf,
- 					 const char *name, const char *lxcpath);
- extern int lxc_setup(struct lxc_handler *handler);
- extern int lxc_setup_parent(struct lxc_handler *handler);
-+#ifdef HAVE_ISULAD
-+extern int setup_resource_limits(struct lxc_list *limits, pid_t pid, int errfd);
-+#else
- extern int setup_resource_limits(struct lxc_list *limits, pid_t pid);
-+#endif
- extern int find_unmapped_nsid(const struct lxc_conf *conf, enum idtype idtype);
- extern int mapped_hostid(unsigned id, const struct lxc_conf *conf,
- 			 enum idtype idtype);
-@@ -447,8 +525,14 @@ extern int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *),
- 			 void *data, const char *fn_name);
- extern int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *),
- 			    void *data, const char *fn_name);
-+#ifdef HAVE_ISULAD
-+// isulad modify
-+extern int parse_mntopts(const char *mntopts, unsigned long *mntflags,
-+			unsigned long *pflags, char **mntdata);
-+#else
- extern int parse_mntopts(const char *mntopts, unsigned long *mntflags,
- 			 char **mntdata);
-+#endif
- extern int parse_propagationopts(const char *mntopts, unsigned long *pflags);
- extern void tmp_proc_unmount(struct lxc_conf *lxc_conf);
- extern void turn_into_dependent_mounts(void);
-@@ -480,4 +564,15 @@ static inline int chown_mapped_root(const char *path, const struct lxc_conf *con
- 	return userns_exec_mapped_root(path, -EBADF, conf);
- }
- 
-+#ifdef HAVE_ISULAD
-+// isulad add
-+int lxc_clear_init_args(struct lxc_conf *lxc_conf);
-+int lxc_clear_init_groups(struct lxc_conf *lxc_conf);
-+int lxc_clear_populate_devices(struct lxc_conf *c);
-+int lxc_clear_rootfs_masked_paths(struct lxc_conf *c);
-+int lxc_clear_rootfs_ro_paths(struct lxc_conf *c);
-+int lxc_drop_caps(struct lxc_conf *conf);
-+int run_oci_hooks(const char *name, const char *hookname, struct lxc_conf *conf, const char *lxcpath);
-+void lxc_close_error_pipe(int *errpipe);
-+#endif
- #endif /* __LXC_CONF_H */
-diff --git a/src/lxc/isulad_utils.c b/src/lxc/isulad_utils.c
-new file mode 100644
-index 0000000..15d9323
---- /dev/null
-+++ b/src/lxc/isulad_utils.c
-@@ -0,0 +1,319 @@
-+/* SPDX-License-Identifier: LGPL-2.1+ */
-+/******************************************************************************
-+ * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved
-+ * Description: isulad utils
-+ * Author: lifeng
-+ * Create: 2020-04-11
-+******************************************************************************/
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <pwd.h>
-+#include <ctype.h>
-+
-+#include "isulad_utils.h"
-+#include "log.h"
-+#include "path.h"
-+#include "file_utils.h"
-+
-+lxc_log_define(isulad_utils, lxc);
-+
-+void *lxc_common_calloc_s(size_t size)
-+{
-+	if (size == 0 || size > SIZE_MAX) {
-+		return NULL;
-+	}
-+
-+	return calloc((size_t)1, size);
-+}
-+
-+int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize)
-+{
-+	void *tmp = NULL;
-+
-+	if (newsize == 0) {
-+		goto err_out;
-+	}
-+
-+	tmp = lxc_common_calloc_s(newsize);
-+	if (tmp == NULL) {
-+		ERROR("Failed to malloc memory");
-+		goto err_out;
-+	}
-+
-+	if (oldptr != NULL) {
-+		memcpy(tmp, oldptr, (newsize < oldsize) ? newsize : oldsize);
-+
-+		memset(oldptr, 0, oldsize);
-+
-+		free(oldptr);
-+	}
-+
-+	*newptr = tmp;
-+	return 0;
-+
-+err_out:
-+	return -1;
-+}
-+
-+char *safe_strdup(const char *src)
-+{
-+	char *dst = NULL;
-+
-+	if (src == NULL) {
-+		return NULL;
-+	}
-+
-+	dst = strdup(src);
-+	if (dst == NULL) {
-+		abort();
-+	}
-+
-+	return dst;
-+}
-+
-+int lxc_open(const char *filename, int flags, mode_t mode)
-+{
-+	char rpathPATH_MAX = {0x00};
-+
-+	if (cleanpath(filename, rpath, sizeof(rpath)) == NULL) {
-+		return -1;
-+	}
-+	if (mode) {
-+		return open(rpath, (int)((unsigned int)flags | O_CLOEXEC), mode);
-+	} else {
-+		return open(rpath, (int)((unsigned int)flags | O_CLOEXEC));
-+	}
-+}
-+
-+FILE *lxc_fopen(const char *filename, const char *mode)
-+{
-+	char rpathPATH_MAX = {0x00};
-+
-+	if (cleanpath(filename, rpath, sizeof(rpath)) == NULL) {
-+		return NULL;
-+	}
-+
-+	return fopen_cloexec(rpath, mode);
-+}
-+
-+/* isulad: write error message */
-+void lxc_write_error_message(int errfd, const char *format, ...)
-+{
-+	int ret;
-+	char errbufBUFSIZ + 1 = {0};
-+	ssize_t sret;
-+	va_list argp;
-+
-+	if (errfd <= 0)
-+		return;
-+
-+	va_start(argp, format);
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-+	ret = vsnprintf(errbuf, BUFSIZ, format, argp);
-+#pragma GCC diagnostic pop
-+	va_end(argp);
-+	if (ret < 0 || ret >= BUFSIZ)
-+		SYSERROR("Failed to call vsnprintf");
-+	sret = write(errfd, errbuf, strlen(errbuf));
-+	if (sret < 0)
-+		SYSERROR("Write errbuf failed");
-+}
-+
-+/* isulad: read file to buffer */
-+int lxc_file2str(const char *filename, char ret, int cap)
-+{
-+    int fd, num_read;
-+
-+    if ((fd = lxc_open(filename, O_RDONLY | O_CLOEXEC, 0)) == -1)
-+        return -1;
-+    if ((num_read = read(fd, ret, cap - 1)) <= 0)
-+        num_read = -1;
-+    else
-+        retnum_read = 0;
-+    close(fd);
-+
-+    return num_read;
-+}
-+
-+/* isuald: lxc_stat2proc() makes sure it can handle arbitrary executable file basenames
-+ * for `cmd', i.e. those with embedded whitespace or embedded ')'s.
-+ * Such names confuse %s (see scanf(3)), so the string is split and %39c
-+ * is used instead. (except for embedded ')' "(%^)c)" would work.
-+ */
-+static proc_t *lxc_stat2proc(const char *S)
-+{
-+    int num;
-+    proc_t *P = NULL;
-+    char *tmp = NULL;
-+
-+    if (!S)
-+        return NULL;
-+
-+    tmp = strrchr(S, ')');  /* split into "PID (cmd" and "<rest>" */
-+    if (!tmp)
-+        return NULL;
-+    *tmp = '\0';            /* replace trailing ')' with NUL */
-+
-+    P = malloc(sizeof(proc_t));
-+    if (P == NULL)
-+        return NULL;
-+    (void)memset(P, 0x00, sizeof(proc_t));
-+
-+    /* parse these two strings separately, skipping the leading "(". */
-+    num = sscanf(S, "%d (%15c", &P->pid, P->cmd);   /* comm16 in kernel */
-+    if (num != 2) {
-+        ERROR("Call sscanf error: %s", errno ? strerror(errno) : "");
-+        free(P);
-+        return NULL;
-+    }
-+    num = sscanf(tmp + 2,           /* skip space after ')' too */
-+                 "%c "
-+                 "%d %d %d %d %d "
-+                 "%lu %lu %lu %lu %lu "
-+                 "%Lu %Lu %Lu %Lu "  /* utime stime cutime cstime */
-+                 "%ld %ld %ld %ld "
-+                 "%Lu "  /* start_time */
-+                 "%lu "
-+                 "%ld "
-+                 "%lu %lu %lu %lu %lu %lu "
-+                 "%*s %*s %*s %*s " /* discard, no RT signals & Linux 2.1 used hex */
-+                 "%lu %lu %lu "
-+                 "%d %d "
-+                 "%lu %lu",
-+                 &P->state,
-+                 &P->ppid, &P->pgrp, &P->session, &P->tty, &P->tpgid,
-+                 &P->flags, &P->min_flt, &P->cmin_flt, &P->maj_flt, &P->cmaj_flt,
-+                 &P->utime, &P->stime, &P->cutime, &P->cstime,
-+                 &P->priority, &P->nice, &P->timeout, &P->it_real_value,
-+                 &P->start_time,
-+                 &P->vsize,
-+                 &P->rss,
-+                 &P->rss_rlim, &P->start_code, &P->end_code, &P->start_stack, &P->kstk_esp,
-+                 &P->kstk_eip,
-+                 &P->wchan, &P->nswap, &P->cnswap,
-+                 &P->exit_signal, &P->processor,  /* 2.2.1 ends with "exit_signal" */
-+                 &P->rtprio, &P->sched  /* both added to 2.5.18 */
-+                );
-+    if (num != 35) {
-+        ERROR("Call sscanf error: %s", errno ? strerror(errno) : "");
-+        free(P);
-+        return NULL;
-+    }
-+    if (P->tty == 0)
-+        P->tty = -1;  /* the old notty val, update elsewhere bef. moving to 0 */
-+    return P;
-+}
-+
-+/* isulad: get starttime of process pid */
-+unsigned long long lxc_get_process_startat(pid_t pid)
-+{
-+    int sret = 0;
-+    unsigned long long startat = 0;
-+    proc_t *pid_info = NULL;
-+    char filenamePATH_MAX = {0};
-+    char sbuf1024 = {0}; /* bufs for stat */
-+
-+    sret = snprintf(filename, sizeof(filename), "/proc/%d/stat", pid);
-+    if (sret < 0 || sret >= sizeof(filename)) {
-+        ERROR("Failed to sprintf filename");
-+        goto out;
-+    }
-+
-+    if ((lxc_file2str(filename, sbuf, sizeof(sbuf))) == -1) {
-+        SYSERROR("Failed to read pidfile %s", filename);
-+        goto out;
-+    }
-+
-+    pid_info = lxc_stat2proc(sbuf);
-+    if (!pid_info) {
-+        ERROR("Failed to get proc stat info");
-+        goto out;
-+    }
-+
-+    startat = pid_info->start_time;
-+out:
-+    free(pid_info);
-+    return startat;
-+}
-+
-+// isulad: set env home in container
-+int lxc_setup_env_home(uid_t uid)
-+{
-+	char *homedir = "/"; // default home dir is /
-+	struct passwd pw, *pwbufp = NULL;
-+	char bufBUFSIZ;
-+	int ret;
-+
-+	ret = getpwuid_r(uid, &pw, buf, sizeof(buf), &pwbufp);
-+	if ((ret == 0) && (pwbufp != NULL) && (pwbufp->pw_uid == uid)) {
-+		homedir = pwbufp->pw_dir;
-+		goto set_env;
-+	}
-+
-+	WARN("User invalid, can not find user '%u'", uid);
-+
-+set_env:
-+	// if we didn't configure HOME, set it based on uid
-+	if (setenv("HOME", homedir, 0) < 0) {
-+		SYSERROR("Unable to set env 'HOME'");
-+		return -1;
-+	}
-+
-+	NOTICE("Setted env 'HOME' to %s", homedir);
-+	return 0;
-+}
-+
-+bool lxc_process_alive(pid_t pid, unsigned long long start_time)
-+{
-+	int sret = 0;
-+	bool alive = true;
-+	proc_t *pid_info = NULL;
-+	char filenamePATH_MAX = {0};
-+	char sbuf1024 = {0}; /* bufs for stat */
-+
-+	sret = kill(pid, 0);
-+	if (sret < 0 && errno == ESRCH)
-+		return false;
-+
-+	sret = snprintf(filename, sizeof(filename), "/proc/%d/stat", pid);
-+	if (sret < 0 || sret >= sizeof(filename)) {
-+		ERROR("Failed to sprintf filename");
-+		goto out;
-+	}
-+
-+	if ((lxc_file2str(filename, sbuf, sizeof(sbuf))) == -1) {
-+		ERROR("Failed to read pidfile %s", filename);
-+		alive = false;
-+		goto out;
-+	}
-+
-+	pid_info = lxc_stat2proc(sbuf);
-+	if (!pid_info) {
-+		ERROR("Failed to get proc stat info");
-+		alive = false;
-+		goto out;
-+	}
-+
-+	if (start_time != pid_info->start_time)
-+		alive = false;
-+out:
-+	free(pid_info);
-+	return alive;
-+}
-+
-+bool is_non_negative_num(const char *s)
-+{
-+	if (!s || !strcmp(s, ""))
-+		return false;
-+	while(*s  != '\0') {
-+		if(!isdigit(*s))
-+			return false;
-+		++s;
-+	}
-+	return true;
-+}
-diff --git a/src/lxc/isulad_utils.h b/src/lxc/isulad_utils.h
-new file mode 100644
-index 0000000..345f511
---- /dev/null
-+++ b/src/lxc/isulad_utils.h
-@@ -0,0 +1,99 @@
-+/* SPDX-License-Identifier: LGPL-2.1+ */
-+/******************************************************************************
-+ * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved
-+ * Description: isulad utils
-+ * Author: lifeng
-+ * Create: 2020-04-11
-+******************************************************************************/
-+#ifndef __iSULAD_UTILS_H
-+#define __iSULAD_UTILS_H
-+
-+#include <stdio.h>
-+#include <stdbool.h>
-+
-+/* isulad: replace space with SPACE_MAGIC_STR */
-+#define SPACE_MAGIC_STR "#)"
-+
-+/* isulad:
-+ ld cutime, cstime, priority, nice, timeout, it_real_value, rss,
-+ c  state,
-+ d  ppid, pgrp, session, tty, tpgid,
-+ s  signal, blocked, sigignore, sigcatch,
-+ lu flags, min_flt, cmin_flt, maj_flt, cmaj_flt, utime, stime,
-+ lu rss_rlim, start_code, end_code, start_stack, kstk_esp, kstk_eip,
-+ lu start_time, vsize, wchan, nswap, cnswap,
-+*/
-+
-+/* Basic data structure which holds all information we can get about a process.
-+ * (unless otherwise specified, fields are read from /proc/#/stat)
-+ *
-+ * Most of it comes from task_struct in linux/sched.h
-+ */
-+typedef struct proc_t {
-+    // 1st 16 bytes
-+    int pid;        /* process id */
-+    int ppid;       /* pid of parent process */
-+
-+    char state;     /* single-char code for process state (S=sleeping) */
-+
-+    unsigned long long
-+    utime,      /* user-mode CPU time accumulated by process */
-+    stime,      /* kernel-mode CPU time accumulated by process */
-+    // and so on...
-+    cutime,     /* cumulative utime of process and reaped children */
-+    cstime,     /* cumulative stime of process and reaped children */
-+    start_time; /* start time of process -- seconds since 1-1-70 */
-+
-+    long
-+    priority,   /* kernel scheduling priority */
-+    timeout,    /* ? */
-+    nice,       /* standard unix nice level of process */
-+    rss,        /* resident set size from /proc/#/stat (pages) */
-+    it_real_value;  /* ? */
-+    unsigned long
-+    rtprio,     /* real-time priority */
-+    sched,      /* scheduling class */
-+    vsize,      /* number of pages of virtual memory ... */
-+    rss_rlim,   /* resident set size limit? */
-+    flags,      /* kernel flags for the process */
-+    min_flt,    /* number of minor page faults since process start */
-+    maj_flt,    /* number of major page faults since process start */
-+    cmin_flt,   /* cumulative min_flt of process and child processes */
-+    cmaj_flt,   /* cumulative maj_flt of process and child processes */
-+    nswap,      /* ? */
-+    cnswap,     /* cumulative nswap ? */
-+    start_code, /* address of beginning of code segment */
-+    end_code,   /* address of end of code segment */
-+    start_stack,    /* address of the bottom of stack for the process */
-+    kstk_esp,   /* kernel stack pointer */
-+    kstk_eip,   /* kernel instruction pointer */
-+    wchan;      /* address of kernel wait channel proc is sleeping in */
-+
-+    char cmd16;   /* basename of executable file in call to exec(2) */
-+    int
-+    pgrp,       /* process group id */
-+    session,    /* session id */
-+    tty,        /* full device number of controlling terminal */
-+    tpgid,      /* terminal process group id */
-+    exit_signal,    /* might not be SIGCHLD */
-+    processor;      /* current (or most recent?) CPU */
-+} proc_t;
-+
-+extern int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize);
-+extern void *lxc_common_calloc_s(size_t size);
-+extern char *safe_strdup(const char *src);
-+
-+extern int lxc_open(const char *filename, int flags, mode_t mode);
-+extern FILE *lxc_fopen(const char *filename, const char *mode);
-+
-+extern void lxc_write_error_message(int errfd, const char *format, ...);
-+extern int lxc_file2str(const char *filename, char ret, int cap);
-+extern int unsigned long long lxc_get_process_startat(pid_t pid);
-+// set env home in container
-+extern int lxc_setup_env_home(uid_t uid);
-+
-+extern bool lxc_process_alive(pid_t pid, unsigned long long start_time);
-+
-+extern bool is_non_negative_num(const char *s);
-+
-+#endif
-diff --git a/src/lxc/lsm/lsm.c b/src/lxc/lsm/lsm.c
-index 553e0c9..2f87dd6 100644
---- a/src/lxc/lsm/lsm.c
-+++ b/src/lxc/lsm/lsm.c
-@@ -168,6 +168,26 @@ int lsm_process_label_set(const char *label, struct lxc_conf *conf,
- 	return drv->process_label_set(label, conf, on_exec);
- }
- 
-+#ifdef HAVE_ISULAD
-+int lsm_file_label_set(const char *path, const char *label)
-+{
-+	if (!drv) {
-+		ERROR("LSM driver not inited");
-+		return -1;
-+	}
-+	return drv->file_label_set(path, label);
-+}
-+
-+int lsm_relabel(const char *path, const char *label, bool share)
-+{
-+	if (!drv) {
-+		ERROR("LSM driver not inited");
-+		return -1;
-+	}
-+	return drv->relabel(path, label, share);
-+}
-+#endif
-+
- int lsm_process_prepare(struct lxc_conf *conf, const char *lxcpath)
- {
- 	if (!drv) {
-diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
-index 630eff0..fb57083 100644
---- a/src/lxc/lxc.h
-+++ b/src/lxc/lxc.h
-@@ -32,8 +32,14 @@ struct lxc_handler;
-  * @daemonize    : whether or not the container is daemonized
-  * Returns 0 on success, < 0 otherwise
-  */
-+#ifdef HAVE_ISULAD
-+extern int lxc_start(char *const argv, struct lxc_handler *handler,
-+		     const char *lxcpath, bool daemonize, int *error_num,
-+		     unsigned int start_timeout);
-+#else
- extern int lxc_start(char *const argv, struct lxc_handler *handler,
- 		     const char *lxcpath, bool daemonize, int *error_num);
-+#endif
- 
- /*
-  * Start the specified command inside an application container
-@@ -44,9 +50,15 @@ extern int lxc_start(char *const argv, struct lxc_handler *handler,
-  * @daemonize    : whether or not the container is daemonized
-  * Returns 0 on success, < 0 otherwise
-  */
-+#ifdef HAVE_ISULAD
-+extern int lxc_execute(const char *name, char *const argv, int quiet,
-+		       struct lxc_handler *handler, const char *lxcpath,
-+		       bool daemonize, int *error_num, unsigned int start_timeout);
-+#else
- extern int lxc_execute(const char *name, char *const argv, int quiet,
- 		       struct lxc_handler *handler, const char *lxcpath,
- 		       bool daemonize, int *error_num);
-+#endif
- 
- /*
-  * Close the fd associated with the monitoring
-@@ -83,6 +95,13 @@ extern lxc_state_t lxc_state(const char *name, const char *lxcpath);
-  */
- extern struct lxc_container *lxc_container_new(const char *name, const char *configpath);
- 
-+#ifdef HAVE_ISULAD
-+/*
-+ * Create a new container without loading config.
-+ */
-+extern struct lxc_container *lxc_container_without_config_new(const char *name, const char *configpath);
-+#endif
-+
- /*
-  * Returns 1 on success, 0 on failure.
-  */
-diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
-index b4ec1d6..3680ade 100644
---- a/src/lxc/lxccontainer.h
-+++ b/src/lxc/lxccontainer.h
-@@ -26,6 +26,10 @@ extern "C" {
- #define LXC_CREATE_MAXFLAGS       (1 << 1) /*!< Number of \c LXC_CREATE* flags */
- #define LXC_MOUNT_API_V1		   1
- 
-+#ifdef HAVE_ISULAD
-+#define LXC_IMAGE_OCI_KEY "lxc.imagetype.oci"
-+#endif
-+
- struct bdev_specs;
- 
- struct lxc_snapshot;
-@@ -40,6 +44,41 @@ struct lxc_mount {
- 	int version;
- };
- 
-+#ifdef HAVE_ISULAD
-+struct lxc_blkio_metrics {
-+	uint64_t read;
-+	uint64_t write;
-+	uint64_t total;
-+};
-+
-+struct lxc_container_metrics {
-+    /* State of container */
-+    const char *state;
-+    /* The process ID of the init container */
-+    pid_t init;
-+    /* Current pids */
-+    uint64_t pids_current;
-+    /* CPU usage */
-+    uint64_t cpu_use_nanos;
-+    uint64_t cpu_use_user;
-+    uint64_t cpu_use_sys;
-+    /* BlkIO usage */
-+    struct lxc_blkio_metrics io_service_bytes;
-+    struct lxc_blkio_metrics io_serviced;
-+    /* Memory usage */
-+    uint64_t mem_used;
-+    uint64_t mem_limit;
-+    /* Kernel Memory usage */
-+    uint64_t kmem_used;
-+    uint64_t kmem_limit;
-+    /* Cache usage */
-+    uint64_t cache;
-+    uint64_t cache_total;
-+    /* total inactive file */
-+    uint64_t inactive_file_total;
-+};
-+#endif
-+
- /*!
-  * An LXC container.
-  *
-@@ -107,6 +146,38 @@ struct lxc_container {
- 	/*! Full path to configuration file */
- 	char *config_path;
- 
-+#ifdef HAVE_ISULAD
-+	/*! isulad:
-+	 * \private
-+	 * exit FIFO File to open used monitor the state of lxc monitor process.
-+	 */
-+	char *exit_fifo;
-+	/*! Whether container wishes to create pty or pipes for console log */
-+	bool disable_pty;
-+
-+	/*! Whether container wishes to keep stdin active */
-+	bool open_stdin;
-+
-+	/*!
-+	 * \private
-+	 * isulad: support oci hook from json file
-+	 * full path of json file
-+	 * */
-+	char *ocihookfile;
-+
-+	/*! isulad:
-+	 * \private
-+	 * start_timeout.
-+	 */
-+	unsigned int start_timeout;
-+
-+	/*! isulad:
-+	 * \private
-+	 *  image_type_oci
-+	 */
-+	bool image_type_oci;
-+#endif
-+
- 	/*!
- 	 * \brief Determine if \c /var/lib/lxc/$name/config exists.
- 	 *
-@@ -865,6 +936,115 @@ struct lxc_container {
- 	 * \return pidfd of init process of the container.
- 	 */
- 	int (*init_pidfd)(struct lxc_container *c);
-+
-+#ifdef HAVE_ISULAD
-+	/*! isulad add
-+	 * \brief An API call to set the path of info file
-+	 *
-+	 * \param c Container.
-+	 * \param info_file Value of the path of info file.
-+	 *
-+	 * \return \c true on success, else \c false.
-+	 */
-+	bool (*set_container_info_file) (struct lxc_container *c, const char *info_file);
-+
-+	/*! isulad add
-+	 * \brief An API call to change the path of the console default fifos
-+	 *
-+	 * \param c Container.
-+	 * \param path Value of the console path.
-+	 *
-+	 * \return \c true on success, else \c false.
-+	 */
-+	bool (*set_terminal_init_fifos)(struct lxc_container *c, const char *in, const char *out, const char *err);
-+
-+	/*! isulad add
-+	 * \brief An API call to add the path of terminal fifos
-+	 *
-+	 * \param c Container.
-+	 * \param path Value of the console path..
-+	 *
-+	 * \return \c true on success, else \c false.
-+	 */
-+	bool (*add_terminal_fifos)(struct lxc_container *c, const char *in, const char *out, const char *err);
-+
-+	bool (*set_terminal_winch)(struct lxc_container *c, unsigned int height, unsigned int width);
-+
-+	bool (*set_exec_terminal_winch)(struct lxc_container *c, const char *suffix, unsigned int height, unsigned int width);
-+
-+	/*!
-+	 * \brief Change whether the container wants to create pty or pipes
-+	 * from the console log.
-+	 *
-+	 * \param c Container.
-+	 * \param state Value for the disable pty bit (0 or 1).
-+	 *
-+	 * \return \c true on success, else \c false.
-+	 */
-+	bool (*want_disable_pty)(struct lxc_container *c, bool state);
-+
-+	/*!
-+	 * \brief Change whether the container wants to keep stdin active
-+	 * for parent process of container
-+	 *
-+	 * \param c Container.
-+	 * \param state Value for the open_stdin bit (0 or 1).
-+	 *
-+	 * \return \c true on success, else \c false.
-+	 */
-+	bool (*want_open_stdin)(struct lxc_container *c, bool state);
-+
-+	/*! isulad add
-+	 * \brief An API call to clean resources of container
-+	 *
-+	 * \param c Container.
-+	 * \param pid Value of container process.
-+	 *
-+	 * \return \c true on success, else \c false.
-+	 */
-+	bool (*clean_container_resource) (struct lxc_container *c, pid_t pid);
-+
-+	/*! isulad add
-+	 * \brief An API call to get container pids
-+	 *
-+	 * \param c Container.
-+	 * \param pids Value of container pids.
-+	 * \param pids_len Value of container pids len.
-+	 * \param pid Value of container pid.
-+	 * \return \c true on success, else \c false.
-+	 */
-+	bool (*get_container_pids)(struct lxc_container *c,pid_t **pids,size_t *pids_len);
-+
-+	/*! isulad add
-+	 * \brief An API call to set start timeout
-+	 *
-+	 * \param c Container.
-+	 * \param start_timeout Value of start timeout.
-+	 *
-+	 * \return \c true on success, else \c false.
-+	 */
-+	bool (*set_start_timeout)(struct lxc_container *c, unsigned int start_timeout);
-+
-+	/*! isulad add
-+	 * \brief An API call to set oci type
-+	 *
-+	 * \param c Container.
-+	 * \param image_type_oci image oci type.
-+	 *
-+	 * \return \c true on success, else \c false.
-+	 */
-+	bool (*set_oci_type)(struct lxc_container *c, bool image_type_oci);
-+	
-+	/*! isulad add
-+	 * \brief An API call to set start timeout
-+	 *
-+	 * \param c Container.
-+	 * \param start_timeout Value of start timeout.
-+	 *
-+	 * \return \c true on success, else \c false.
-+	 */
-+	bool (*get_container_metrics)(struct lxc_container *c, struct lxc_container_metrics *metrics);
-+#endif
- };
- 
- /*!
-@@ -998,6 +1178,20 @@ struct lxc_console_log {
-  */
- struct lxc_container *lxc_container_new(const char *name, const char *configpath);
- 
-+#ifdef HAVE_ISULAD
-+/*!
-+ * \brief Create a new container without loading config.
-+ *
-+ * \param name Name to use for container.
-+ * \param configpath Full path to configuration file to use.
-+ *
-+ * \return Newly-allocated container, or \c NULL on error.
-+ *
-+ * \note This function can only used for listing container.
-+ */
-+struct lxc_container *lxc_container_without_config_new(const char *name, const char *configpath);
-+#endif
-+
- /*!
-  * \brief Add a reference to the specified container.
-  *
-diff --git a/src/lxc/network.c b/src/lxc/network.c
-index bca0440..56efa4b 100644
---- a/src/lxc/network.c
-+++ b/src/lxc/network.c
-@@ -3441,9 +3441,17 @@ static int lxc_network_setup_in_child_namespaces_common(struct lxc_netdev *netde
- 
- 	/* set the network device up */
- 	if (netdev->flags & IFF_UP) {
-+#ifdef HAVE_ISULAD
-+		if (netdev->name0 != '\0') {
-+			err = lxc_netdev_up(netdev->name);
-+			if (err)
-+				return log_error_errno(-1, -err, "Failed to set network device \"%s\" up", netdev->name);
-+		}
-+#else
- 		err = lxc_netdev_up(netdev->name);
- 		if (err)
- 			return log_error_errno(-1, -err, "Failed to set network device \"%s\" up", netdev->name);
-+#endif
- 
- 		/* the network is up, make the loopback up too */
- 		err = lxc_netdev_up("lo");
-diff --git a/src/lxc/tools/lxc_ls.c b/src/lxc/tools/lxc_ls.c
-index 0abcd7a..7c0b69c 100644
---- a/src/lxc/tools/lxc_ls.c
-+++ b/src/lxc/tools/lxc_ls.c
-@@ -106,7 +106,11 @@ struct wrapargs {
- /*
-  * Takes struct wrapargs as argument.
-  */
-+#ifdef HAVE_ISULAD
-+static int ls_get_wrapper(void *wrap, int msgfd);
-+#else
- static int ls_get_wrapper(void *wrap);
-+#endif
- 
- /*
-  * To calculate swap usage we should not simply check memory.usage_in_bytes and
-@@ -1005,7 +1009,11 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
- 	return 0;
- }
- 
-+#ifdef HAVE_ISULAD
-+static int ls_get_wrapper(void *wrap, int msgfd)
-+#else
- static int ls_get_wrapper(void *wrap)
-+#endif
- {
- 	int ret = -1;
- 	size_t len = 0;
-diff --git a/src/lxc/tools/lxc_start.c b/src/lxc/tools/lxc_start.c
-index 459b867..3ef5961 100644
---- a/src/lxc/tools/lxc_start.c
-+++ b/src/lxc/tools/lxc_start.c
-@@ -28,6 +28,11 @@
- #include "confile.h"
- #include "log.h"
- 
-+#ifdef HAVE_ISULAD
-+#include <ctype.h>
-+#include "isulad_utils.h"
-+#endif
-+
- lxc_log_define(lxc_start, lxc);
- 
- static int my_parser(struct lxc_arguments *args, int c, char *arg);
-@@ -48,6 +53,16 @@ static const struct option my_longopts = {
- 	{"share-ipc", required_argument, 0, OPT_SHARE_IPC},
- 	{"share-uts", required_argument, 0, OPT_SHARE_UTS},
- 	{"share-pid", required_argument, 0, OPT_SHARE_PID},
-+#ifdef HAVE_ISULAD
-+	{"in-fifo", required_argument, 0, OPT_INPUT_FIFO},
-+	{"out-fifo", required_argument, 0, OPT_OUTPUT_FIFO},
-+	{"err-fifo", required_argument, 0, OPT_STDERR_FIFO},
-+	{"container-pidfile", required_argument, 0, OPT_CONTAINER_INFO},
-+	{"exit-fifo", required_argument, 0, OPT_EXIT_FIFO},
-+	{"start-timeout", required_argument, 0, OPT_START_TIMEOUT},
-+	{"disable-pty", no_argument, 0, OPT_DISABLE_PTY},
-+	{"open-stdin", no_argument, 0, OPT_OPEN_STDIN},
-+#endif
- 	LXC_COMMON_OPTIONS
- };
- 
-@@ -70,7 +85,20 @@ Options :\n\
-                          Note: --daemon implies --close-all-fds\n\
-   -s, --define KEY=VAL   Assign VAL to configuration variable KEY\n\
-       --share-net|ipc|uts|pid=NAME Share a namespace with another container or pid\n\
--",
-+"
-+#ifdef HAVE_ISULAD
-+"\
-+      --in-fifo           Stdin fifo path\n\
-+      --out-fifo          Stdout fifo path\n\
-+      --err-fifo          Stderr fifo path\n\
-+      --container-pidfile File path for container pid\n\
-+      --exit-fifo         Fifo path to save exit code\n\
-+      --start-timeout     Timeout for start container\n\
-+      --disable-pty       Disable pty for attach\n\
-+      --open-stdin        Open stdin for attach\n\
-+"
-+#endif
-+,
- 	.options      = my_longopts,
- 	.parser       = my_parser,
- 	.checker      = NULL,
-@@ -118,6 +146,38 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
- 	case OPT_SHARE_PID:
- 		args->share_nsLXC_NS_PID = arg;
- 		break;
-+
-+#ifdef HAVE_ISULAD
-+	case OPT_CONTAINER_INFO:
-+		args->container_info = arg;
-+		break;
-+	case OPT_INPUT_FIFO:
-+		args->terminal_fifos0 = arg;
-+		break;
-+	case OPT_OUTPUT_FIFO:
-+		args->terminal_fifos1 = arg;
-+		break;
-+	case OPT_STDERR_FIFO:
-+		args->terminal_fifos2 = arg;
-+		break;
-+	case OPT_EXIT_FIFO:
-+		args->exit_monitor_fifo = arg;
-+		break;
-+	case OPT_DISABLE_PTY:
-+		args->disable_pty = 1;
-+		break;
-+	case OPT_OPEN_STDIN:
-+		args->open_stdin = 1;
-+		break;
-+	case OPT_START_TIMEOUT:
-+		if(!is_non_negative_num(arg)) {
-+			fprintf(stderr, "Error start timeout parameter:%s.\n", arg);
-+			return -1;
-+		}
-+		args->start_timeout = (unsigned int)atoi(arg);
-+		break;
-+#endif
-+
- 	}
- 	return 0;
- }
-@@ -163,6 +223,9 @@ int main(int argc, char *argv)
- 		"/sbin/init",
- 		NULL,
- 	};
-+#ifdef HAVE_ISULAD
-+	char *container_info_file = NULL;
-+#endif
- 
- 	lxc_list_init(&defines);
- 
-@@ -283,6 +346,42 @@ int main(int argc, char *argv)
- 			goto out;
- 		}
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: container info file used to store pid and ppid info of container*/
-+	if (my_args.container_info != NULL) {
-+		if (ensure_path(&container_info_file, my_args.container_info) < 0) {
-+			ERROR("Failed to ensure container's piddile '%s'", my_args.container_info);
-+			goto out;
-+		}
-+		if (!c->set_container_info_file(c, container_info_file)) {
-+			ERROR("Failed to set container's piddile '%s'", container_info_file);
-+			goto out;
-+		}
-+	}
-+
-+	if (my_args.terminal_fifos0 || my_args.terminal_fifos1 || my_args.terminal_fifos2) {
-+		c->set_terminal_init_fifos(c, my_args.terminal_fifos0, my_args.terminal_fifos1, my_args.terminal_fifos2);
-+	}
-+
-+	/* isulad: fifo used to monitor state of monitor process */
-+	if (my_args.exit_monitor_fifo != NULL) {
-+		c->exit_fifo = safe_strdup(my_args.exit_monitor_fifo);
-+	}
-+
-+	if (my_args.disable_pty) {
-+		c->want_disable_pty(c, true);
-+	}
-+
-+	if (my_args.open_stdin) {
-+		c->want_open_stdin(c, true);
-+	}
-+
-+	/* isulad: add start timeout */
-+	if(my_args.start_timeout) {
-+		c->set_start_timeout(c, my_args.start_timeout);
-+	}
-+#endif
-+
- 	if (my_args.console)
- 		if (!c->set_config_item(c, "lxc.console.path", my_args.console))
- 			goto out;
-@@ -305,6 +404,11 @@ int main(int argc, char *argv)
- 	else
- 		err = c->start(c, 0, args) ? EXIT_SUCCESS : EXIT_FAILURE;
- 	if (err) {
-+#ifdef HAVE_ISULAD
-+		if (c->lxc_conf->errmsg)
-+			fprintf(stderr, "%s:%s:%s:%d starting container process caused \"%s\"", c->name,
-+					__FILE__, __func__, __LINE__, c->lxc_conf->errmsg);
-+#endif
- 		ERROR("The container failed to start");
- 
- 		if (my_args.daemonize)
-@@ -320,5 +424,8 @@ int main(int argc, char *argv)
- 
- out:
- 	lxc_container_put(c);
-+#ifdef HAVE_ISULAD
-+	free(container_info_file);
-+#endif
- 	exit(err);
- }
-diff --git a/src/lxc/utils.c b/src/lxc/utils.c
-index 88d0f85..ab351d8 100644
---- a/src/lxc/utils.c
-+++ b/src/lxc/utils.c
-@@ -27,6 +27,9 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
-+#ifdef HAVE_ISULAD
-+#include <sys/sysmacros.h>
-+#endif
- 
- #include "config.h"
- #include "log.h"
-@@ -71,6 +74,9 @@ static int _recursive_rmdir(const char *dirname, dev_t pdev,
- 	int ret;
- 	struct dirent *direntp;
- 	char pathnamePATH_MAX;
-+#ifdef HAVE_ISULAD
-+	int saved_errno = 0;
-+#endif
- 
- 	dir = opendir(dirname);
- 	if (!dir)
-@@ -133,6 +139,11 @@ static int _recursive_rmdir(const char *dirname, dev_t pdev,
- 		} else {
- 			ret = unlink(pathname);
- 			if (ret < 0) {
-+#ifdef HAVE_ISULAD
-+				if (saved_errno == 0) {
-+					saved_errno = errno;
-+				}
-+#endif
- 				__do_close int fd = -EBADF;
- 
- 				fd = open(pathname, O_RDONLY | O_CLOEXEC | O_NONBLOCK);
-@@ -158,10 +169,18 @@ static int _recursive_rmdir(const char *dirname, dev_t pdev,
- 	}
- 
- 	if (rmdir(dirname) < 0 && !btrfs_try_remove_subvol(dirname) && !hadexclude) {
-+#ifdef HAVE_ISULAD
-+		if (saved_errno == 0) {
-+			saved_errno = errno;
-+		}
-+#endif
- 		SYSERROR("Failed to delete \"%s\"", dirname);
- 		failed = 1;
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	errno = saved_errno;
-+#endif
- 	return failed ? -1 : 0;
- }
- 
-@@ -1008,7 +1027,11 @@ static int open_if_safe(int dirfd, const char *nextpath)
-  *
-  * Return an open fd for the path, or <0 on error.
-  */
-+#ifdef HAVE_ISULAD
-+int open_without_symlink(const char *target, const char *prefix_skip)
-+#else
- static int open_without_symlink(const char *target, const char *prefix_skip)
-+#endif
- {
- 	int curlen = 0, dirfd, fulllen, i;
- 	char *dup;
-@@ -1079,6 +1102,65 @@ out:
- 	return dirfd;
- }
- 
-+#ifdef HAVE_ISULAD
-+static int format_mount_label(const char *data, const char *mount_label, char **mnt_opts)
-+{
-+	int ret = 0;
-+
-+	if (mount_label != NULL) {
-+		if (data != NULL) {
-+			ret = asprintf(mnt_opts, "%s,context=\"%s\"", data, mount_label);
-+		} else {
-+			ret = asprintf(mnt_opts, "context=\"%s\"", mount_label);
-+		}
-+
-+		return ret < 0 ? -1 : 0;
-+	}
-+
-+	*mnt_opts = data != NULL ? strdup(data) : NULL;
-+	return 0;
-+}
-+
-+static int receive_mount_options(const char *data, const char *mount_label,
-+    const char *fstype, char **mnt_opts)
-+{
-+	// SELinux kernels don't support labeling of /proc or /sys
-+	if (fstype != NULL && (strcmp(fstype, "proc") == 0 || strcmp(fstype, "sysfs") == 0)) {
-+		return format_mount_label(data, NULL, mnt_opts);
-+	}
-+
-+	return format_mount_label(data, mount_label, mnt_opts);
-+}
-+
-+static int relabel_bind_mount_source(const char *src, const char *fstype, const char *data, const char *mount_label)
-+{
-+	__do_free_string_list char **parts = NULL;
-+	ssize_t parts_len;
-+	ssize_t i;
-+
-+	if (data == NULL) {
-+		return lsm_relabel(src, mount_label, false);
-+	}
-+
-+	parts = lxc_string_split(data, ',');
-+	if (parts == NULL) {
-+		return -1;
-+	}
-+
-+	parts_len = lxc_array_len((void **)parts);
-+	for (i = 0; i < parts_len; i++) {
-+		if (strcmp(partsi, "z") == 0) {
-+			return lsm_relabel(src, mount_label, true);
-+		} else if (strcmp(partsi, "Z") == 0) {
-+			return lsm_relabel(src, mount_label, false);
-+		}
-+	}
-+
-+	return lsm_relabel(src, mount_label, false);
-+}
-+
-+#endif
-+
- /*
-  * Safely mount a path into a container, ensuring that the mount target
-  * is under the container's @rootfs.  (If @rootfs is NULL, then the container
-@@ -1087,14 +1169,22 @@ out:
-  * CAVEAT: This function must not be used for other purposes than container
-  * setup before executing the container's init
-  */
-+#ifdef HAVE_ISULAD
-+int safe_mount(const char *src, const char *dest, const char *fstype,
-+		unsigned long flags, const void *data, const char *rootfs, const char *mount_label)
-+#else
- int safe_mount(const char *src, const char *dest, const char *fstype,
- 		unsigned long flags, const void *data, const char *rootfs)
-+#endif
- {
- 	int destfd, ret, saved_errno;
- 	/* Only needs enough for /proc/self/fd/<fd>. */
- 	char srcbuf50, destbuf50;
- 	int srcfd = -1;
- 	const char *mntsrc = src;
-+#ifdef HAVE_ISULAD
-+  __do_free char *mnt_opts = NULL;
-+#endif
- 
- 	if (!rootfs)
- 		rootfs = "";
-@@ -1137,8 +1227,23 @@ int safe_mount(const char *src, const char *dest, const char *fstype,
- 		return -EINVAL;
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	if (receive_mount_options(data, mount_label, fstype, &mnt_opts) != 0) {
-+		ERROR("Failed to receive mount options");
-+		return -EINVAL;
-+	}
-+
-+	ret = mount(mntsrc, destbuf, fstype, flags, mnt_opts);
-+	saved_errno = errno;
-+	if (ret < 0 && fstype != NULL && strcmp(fstype, "mqueue") == 0) {
-+		INFO("older kernels don't support labeling of /dev/mqueue, retry without selinux context");
-+		ret = mount(mntsrc, destbuf, fstype, flags, data);
-+		saved_errno = errno;
-+	}
-+#else
- 	ret = mount(mntsrc, destbuf, fstype, flags, data);
- 	saved_errno = errno;
-+#endif
- 	if (srcfd != -1)
- 		close(srcfd);
- 
-@@ -1149,6 +1254,19 @@ int safe_mount(const char *src, const char *dest, const char *fstype,
- 		return ret;
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	if (fstype != NULL && strcmp(fstype, "mqueue") == 0 && lsm_file_label_set(dest, mount_label) != 0) {
-+		ERROR("Failed to set file label on %s", dest);
-+		return -EINVAL;
-+	}
-+
-+	if (fstype != NULL && strcmp(fstype, "bind") == 0 &&
-+		    relabel_bind_mount_source(src, fstype, (const char *)data, mount_label) != 0) {
-+		ERROR("Failed to reabel %s with %s", src, mount_label);
-+		return -EINVAL;
-+	}
-+#endif
-+
- 	return 0;
- }
- 
-@@ -1215,7 +1333,11 @@ domount:
- 	if (!strcmp(rootfs, ""))
- 		ret = mount("proc", path, "proc", 0, NULL);
- 	else
-+#ifdef HAVE_ISULAD
-+		ret = safe_mount("proc", path, "proc", 0, NULL, rootfs, NULL);
-+#else
- 		ret = safe_mount("proc", path, "proc", 0, NULL, rootfs);
-+#endif
- 	if (ret < 0)
- 		return -1;
- 
-@@ -1425,6 +1547,11 @@ static int lxc_get_unused_loop_dev(char *name_loop)
- {
- 	int loop_nr, ret;
- 	int fd_ctl = -1, fd_tmp = -1;
-+#ifdef HAVE_ISULAD
-+	// isulad: retry and try mknod
-+	int max_retry = 200;
-+	bool try_mknod = true;
-+#endif
- 
- 	fd_ctl = open("/dev/loop-control", O_RDWR | O_CLOEXEC);
- 	if (fd_ctl < 0) {
-@@ -1442,8 +1569,37 @@ static int lxc_get_unused_loop_dev(char *name_loop)
- 	if (ret < 0 || ret >= LO_NAME_SIZE)
- 		goto on_error;
- 
-+#ifdef HAVE_ISULAD
-+retry:
-+#endif
- 	fd_tmp = open(name_loop, O_RDWR | O_CLOEXEC);
- 	if (fd_tmp < 0) {
-+#ifdef HAVE_ISULAD
-+		/* Success of LOOP_CTL_GET_FREE doesn't mean /dev/loop$i is ready,
-+		* we try to make node by ourself to avoid wait. */
-+		if (try_mknod) {
-+			/* Do not check result of mknod because LOOP_CTL_GET_FREE
-+			* alse do mknod, so this mknod may fail as node already
-+			* exist. If we can open the node without error, we can
-+			* say that it's be created successfully.
-+			*
-+			* note: 7 is the major device number of loopback devices
-+			*	 in kernel.
-+			*/
-+			mknod(name_loop, S_IFBLK | 0640, makedev(7, loop_nr));
-+			try_mknod = false;
-+			goto retry;
-+		}
-+		/* we need to wait some time to make sure it's ready for open if
-+		* it can't open even if we have already try to make node by ourself. */
-+		if (max_retry > 0) {
-+			max_retry--;
-+			usleep(5000); /* 5 millisecond */
-+			goto retry;
-+		}
-+		SYSERROR("Failed to open loop \"%s\"", name_loop);
-+		goto on_error;
-+#else
- 		/* on Android loop devices are moved under /dev/block, give it a shot */
- 		ret = snprintf(name_loop, LO_NAME_SIZE, "/dev/block/loop%d", loop_nr);
-                 if (ret < 0 || ret >= LO_NAME_SIZE)
-@@ -1452,6 +1608,7 @@ static int lxc_get_unused_loop_dev(char *name_loop)
- 		fd_tmp = open(name_loop, O_RDWR | O_CLOEXEC);
- 		if (fd_tmp < 0)
- 			SYSERROR("Failed to open loop \"%s\"", name_loop);
-+#endif
- 	}
- 
- on_error:
-@@ -1661,6 +1818,7 @@ uint64_t lxc_find_next_power2(uint64_t n)
- 	return n;
- }
- 
-+#ifndef HAVE_ISULAD
- static int process_dead(/* takes */ int status_fd)
- {
- 	__do_close int dupfd = -EBADF;
-@@ -1698,15 +1856,19 @@ static int process_dead(/* takes */ int status_fd)
- 
- 	return ret;
- }
-+#endif
- 
- int lxc_set_death_signal(int signal, pid_t parent, int parent_status_fd)
- {
- 	int ret;
-+#ifndef HAVE_ISULAD
- 	pid_t ppid;
-+#endif
- 
- 	ret = prctl(PR_SET_PDEATHSIG, prctl_arg(signal), prctl_arg(0),
- 		    prctl_arg(0), prctl_arg(0));
- 
-+#ifndef HAVE_ISULAD
- 	/* verify that we haven't been orphaned in the meantime */
- 	ppid = (pid_t)syscall(SYS_getppid);
- 	if (ppid == 0) { /* parent outside our pidns */
-@@ -1718,6 +1880,7 @@ int lxc_set_death_signal(int signal, pid_t parent, int parent_status_fd)
- 	} else if (ppid != parent) {
- 		return raise(SIGKILL);
- 	}
-+#endif
- 
- 	if (ret < 0)
- 		return -1;
-@@ -1755,8 +1918,18 @@ int lxc_rm_rf(const char *dirname)
- 	struct dirent *direntp;
- 
- 	dir = opendir(dirname);
-+#ifdef HAVE_ISULAD
-+	if (!dir) {
-+		if (errno == ENOENT) {
-+			WARN("Destroy path: \"%s\" do not exist", dirname);
-+			return 0;
-+		}
-+		return log_error_errno(-1, errno, "Failed to open dir \"%s\"", dirname);
-+	}
-+#else
- 	if (!dir)
- 		return log_error_errno(-1, errno, "Failed to open dir \"%s\"", dirname);
-+#endif
- 
- 	while ((direntp = readdir(dir))) {
- 		__do_free char *pathname = NULL;
-diff --git a/src/lxc/utils.h b/src/lxc/utils.h
-index cf2c042..917a086 100644
---- a/src/lxc/utils.h
-+++ b/src/lxc/utils.h
-@@ -28,6 +28,10 @@
- #include "process_utils.h"
- #include "string_utils.h"
- 
-+#ifdef HAVE_ISULAD
-+#include "isulad_utils.h"
-+#endif
-+
- /* returns 1 on success, 0 if there were any failures */
- extern int lxc_rmdir_onedev(const char *path, const char *exclude);
- extern int get_u16(unsigned short *val, const char *arg, int base);
-@@ -145,9 +149,16 @@ extern bool cgns_supported(void);
- extern char *choose_init(const char *rootfs);
- extern bool switch_to_ns(pid_t pid, const char *ns);
- extern char *get_template_path(const char *t);
-+#ifdef HAVE_ISULAD
-+extern int open_without_symlink(const char *target, const char *prefix_skip);
-+extern int safe_mount(const char *src, const char *dest, const char *fstype,
-+		      unsigned long flags, const void *data,
-+		      const char *rootfs, const char *mount_label);
-+#else
- extern int safe_mount(const char *src, const char *dest, const char *fstype,
- 		      unsigned long flags, const void *data,
- 		      const char *rootfs);
-+#endif
- extern int lxc_mount_proc_if_needed(const char *rootfs);
- extern int open_devnull(void);
- extern int set_stdfds(int fd);
--- 
-2.25.1
-

_service:tar_scm:0002-iSulad-adapt-security-conf-attach-cgroup-and-start.patch Added

@@ -0,0 +1,4485 @@
+From ef27d69db952dc64fc3c476a89c3e822c891e663 Mon Sep 17 00:00:00 2001
+From: haozi007 <liuhao27@huawei.com>
+Date: Mon, 17 Jul 2023 20:40:48 +0800
+Subject: PATCH 2/3 iSulad adapt security conf attach cgroup and start
+
+Signed-off-by: haozi007 <liuhao27@huawei.com>
+---
+ src/lxc/attach.c           |  503 ++++++++++-
+ src/lxc/attach.h           |    6 +
+ src/lxc/attach_options.h   |   25 +
+ src/lxc/cgroups/cgroup.c   |    5 +-
+ src/lxc/cgroups/cgroup.h   |    7 +
+ src/lxc/conf.c             | 1703 +++++++++++++++++++++++++++++++++++-
+ src/lxc/conf.h             |   82 ++
+ src/lxc/isulad_utils.c     |   25 +
+ src/lxc/isulad_utils.h     |   26 +-
+ src/lxc/lsm/apparmor.c     |   14 +
+ src/lxc/lsm/lsm.h          |    4 +
+ src/lxc/lsm/nop.c          |   14 +
+ src/lxc/lsm/selinux.c      |  256 ++++++
+ src/lxc/lxc.h              |    7 +
+ src/lxc/lxclock.c          |   27 +
+ src/lxc/lxclock.h          |    4 +
+ src/lxc/mainloop.c         |   16 +
+ src/lxc/mainloop.h         |    4 +
+ src/lxc/mount_utils.c      |    5 +
+ src/lxc/seccomp.c          |   32 +
+ src/lxc/start.h            |   11 +
+ src/lxc/tools/arguments.h  |   28 +
+ src/lxc/tools/lxc_attach.c |  490 ++++++++++-
+ src/lxc/tools/lxc_start.c  |  107 ++-
+ 24 files changed, 3376 insertions(+), 25 deletions(-)
+
+diff --git a/src/lxc/attach.c b/src/lxc/attach.c
+index f086e96..1a89001 100644
+--- a/src/lxc/attach.c
++++ b/src/lxc/attach.c
+@@ -47,6 +47,24 @@
+ #include "terminal.h"
+ #include "utils.h"
+ 
++#ifdef HAVE_ISULAD
++#include "exec_commands.h"
++
++typedef enum {
++	ATTACH_INIT,
++	ATTACH_TIMEOUT,
++	ATTACH_MAX,
++} attach_timeout_t;
++
++static volatile attach_timeout_t g_attach_timeout_state = ATTACH_INIT;
++
++struct attach_timeout_conf {
++	int64_t timeout;
++	unsigned long long start_time;
++	pid_t pid;
++};
++#endif
++
+ lxc_log_define(attach, lxc);
+ 
+ /* Define default options if no options are supplied by the user. */
+@@ -1115,6 +1133,9 @@ struct attach_payload {
+ 	struct attach_context *ctx;
+ 	lxc_attach_exec_t exec_function;
+ 	void *exec_payload;
++#ifdef HAVE_ISULAD
++	struct lxc_terminal *terminal;
++#endif
+ };
+ 
+ static void put_attach_payload(struct attach_payload *p)
+@@ -1127,6 +1148,48 @@ static void put_attach_payload(struct attach_payload *p)
+ 	}
+ }
+ 
++#ifdef HAVE_ISULAD
++static int isulad_set_attach_pipes(struct lxc_terminal *terminal)
++{
++	int ret = 0;
++	if (terminal->pipes01 >= 0) {
++		close(terminal->pipes01);
++		terminal->pipes01 = -1;
++	}
++
++	if (terminal->pipes00 >= 0) {
++		ret = dup2(terminal->pipes00, STDIN_FILENO);
++		if (ret < 0)
++			goto out;
++	}
++
++	if (terminal->pipes10 >= 0) {
++		close(terminal->pipes10);
++		terminal->pipes10 = -1;
++	}
++
++	if (terminal->pipes11 >= 0) {
++		ret = dup2(terminal->pipes11, STDOUT_FILENO);
++		if (ret < 0)
++			goto out;
++	}
++	if (terminal->pipes20 >= 0) {
++		close(terminal->pipes20);
++		terminal->pipes20 = -1;
++	}
++
++	if (terminal->pipes21 >= 0) {
++		ret = dup2(terminal->pipes21, STDERR_FILENO);
++		if (ret < 0)
++			goto out;
++	}
++
++	setsid();
++out:
++	return ret;
++}
++#endif
++
+ __noreturn static void do_attach(struct attach_payload *ap)
+ {
+ 	lxc_attach_exec_t attach_function = move_ptr(ap->exec_function);
+@@ -1135,6 +1198,31 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 	lxc_attach_options_t* options = ap->options;
+         struct attach_context *ctx = ap->ctx;
+         struct lxc_conf *conf = ctx->container->lxc_conf;
++#ifdef HAVE_ISULAD
++	int msg_fd = -1;
++	sigset_t mask;
++
++	/*isulad: record errpipe fd*/
++	msg_fd = init_ctx->container->lxc_conf->errpipe1;
++	init_ctx->container->lxc_conf->errpipe1 = -1;
++	/*isulad: set system umask */
++	umask(init_ctx->container->lxc_conf->umask);
++
++	/*isulad: restore default signal handlers and unblock all signals*/
++	for (int i = 1; i < NSIG; i++)
++		signal(i, SIG_DFL);
++
++	ret = sigfillset(&mask);
++	if (ret < 0) {
++		SYSERROR("Failed to fill signal mask");
++		goto on_error;;
++	}
++	ret = sigprocmask(SIG_UNBLOCK, &mask, NULL);
++	if (ret < 0) {
++		SYSERROR("Failed to set signal mask");
++		goto on_error;
++	}
++#endif
+ 
+ 	/*
+ 	 * We currently artificially restrict core scheduling to be a pid
+@@ -1209,6 +1297,27 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 		TRACE("Dropped capabilities");
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: set workdir */
++	if (options->initial_cwd || conf->init_cwd) {
++		char *init_cwd;
++		init_cwd = options->initial_cwd ? options->initial_cwd : conf->init_cwd;
++		/* try to create workdir if not exist */
++		struct stat st;
++		if (stat(init_cwd, &st) < 0 && mkdir_p(init_cwd, 0750) < 0) {
++			SYSERROR("Try to create directory \"%s\" as workdir failed when attach", init_cwd);
++			lxc_write_error_message(msg_fd, "Try to create directory \"%s\" as workdir failed when attach: %s",
++						init_cwd, strerror(errno));
++			goto on_error;
++		}
++		if (chdir(init_cwd)) {
++			SYSERROR("Could not change directory to \"%s\" when attach", init_cwd);
++			lxc_write_error_message(msg_fd, "Could not change directory to \"%s\" when attach: %s",
++						init_cwd, strerror(errno));
++			goto on_error;
++		}
++	}
++#endif
+ 	/* Always set the environment (specify (LXC_ATTACH_KEEP_ENV, NULL, NULL)
+ 	 * if you want this to be a no-op).
+ 	 */
+@@ -1248,6 +1357,7 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 			goto on_error;
+ 	}
+ 
++#ifndef HAVE_ISULAD
+ 	if ((options->attach_flags & LXC_ATTACH_SETGROUPS) &&
+ 	    options->groups.size > 0) {
+ 		if (!lxc_setgroups(options->groups.list, options->groups.size))
+@@ -1256,6 +1366,7 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 		if (!lxc_drop_groups() && errno != EPERM)
+ 			goto on_error;
+ 	}
++#endif
+ 
+ 	if (options->namespaces & CLONE_NEWUSER)
+ 		if (!lxc_switch_uid_gid(ctx->setup_ns_uid, ctx->setup_ns_gid))
+@@ -1274,6 +1385,13 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 		TRACE("Set %s LSM label to \"%s\"", ctx->lsm_ops->name, ctx->lsm_label);
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	// isulad: set env home in container
++	if (lxc_setup_env_home(ctx->setup_ns_uid != LXC_INVALID_UID ? ctx->setup_ns_uid : 0) < 0) {
++		goto on_error;
++	}
++#endif
++
+ 	if (conf->no_new_privs || (options->attach_flags & LXC_ATTACH_NO_NEW_PRIVS)) {
+ 		ret = prctl(PR_SET_NO_NEW_PRIVS, prctl_arg(1), prctl_arg(0),
+ 			    prctl_arg(0), prctl_arg(0));
+@@ -1327,7 +1445,21 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 	}
+ 
+ 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
++#ifdef HAVE_ISULAD
++		/* isulad: dup2 pipe00 to container stdin, pipe11 to container stdout, pipe21 to container stderr */
++		if (ap->terminal->disable_pty) {
++			ret = isulad_set_attach_pipes(ap->terminal);
++			if (ret < 0) {
++				SYSERROR("Failed to prepare terminal file pipes");
++				goto on_error;
++			}
++		} else {
++#else
+ 		ret = lxc_terminal_prepare_login(ap->terminal_pts_fd);
++#endif
++#ifdef HAVE_ISULAD
++		}
++#endif
+ 		if (ret < 0) {
+ 			SYSERROR("Failed to prepare terminal file descriptor %d", ap->terminal_pts_fd);
+ 			goto on_error;
+@@ -1343,6 +1475,20 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 	if (ctx->setup_ns_gid == ctx->target_ns_gid)
+ 		ctx->target_ns_gid = LXC_INVALID_GID;
+ 
++#ifdef HAVE_ISULAD
++	if (prctl(PR_SET_KEEPCAPS, 1) < 0) {
++		SYSERROR("Failed to keep permitted capabilities");
++		goto on_error;
++	}
++	if ((options->attach_flags & LXC_ATTACH_SETGROUPS) &&
++	    options->groups.size > 0) {
++		if (!lxc_setgroups(options->groups.list, options->groups.size))
++			goto on_error;
++	} else {
++		if (!lxc_drop_groups() && errno != EPERM)
++			goto on_error;
++	}
++#endif
+ 	/*
+ 	 * Make sure that the processes STDIO is correctly owned by the user
+ 	 * that we are switching to.
+@@ -1367,6 +1513,18 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 	if (!lxc_switch_uid_gid(ctx->target_ns_uid, ctx->target_ns_gid))
+ 		goto on_error;
+ 
++#ifdef HAVE_ISULAD
++	if (prctl(PR_SET_KEEPCAPS, 0) < 0) {
++		SYSERROR("Failed to clear permitted capabilities");
++		goto on_error;
++	}
++
++	if (lxc_drop_caps(conf) != 0) {
++		ERROR("Failed to drop caps.");
++		goto on_error;
++	}
++#endif
++
+ 	put_attach_payload(ap);
+ 
+ 	/* We're done, so we can now do whatever the user intended us to do. */
+@@ -1378,13 +1536,37 @@ on_error:
+ 	_exit(EXIT_FAILURE);
+ }
+ 
++#ifdef HAVE_ISULAD
++static int lxc_attach_terminal(const char *name, const char *lxcpath, struct lxc_conf *conf,
++			       struct lxc_terminal *terminal, lxc_attach_options_t *options)
++#else
+ static int lxc_attach_terminal(const char *name, const char *lxcpath, struct lxc_conf *conf,
+ 			       struct lxc_terminal *terminal)
++#endif
+ {
+ 	int ret;
+ 
+ 	lxc_terminal_init(terminal);
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: if we pass fifo in option, use them as init fifos */
++	if (options->init_fifo0) {
++		free(terminal->init_fifo0);
++		terminal->init_fifo0 = safe_strdup(options->init_fifo0);
++	}
++	if (options->init_fifo1) {
++		free(terminal->init_fifo1);
++		terminal->init_fifo1 = safe_strdup(options->init_fifo1);
++	}
++	if (options->init_fifo2) {
++		free(terminal->init_fifo2);
++		terminal->init_fifo2 = safe_strdup(options->init_fifo2);
++	}
++
++	terminal->disable_pty = options->disable_pty;
++	terminal->open_stdin = options->open_stdin;
++#endif
++
+ 	ret = lxc_terminal_create(name, lxcpath, conf, terminal);
+ 	if (ret < 0)
+ 		return syserror("Failed to create terminal");
+@@ -1430,9 +1612,128 @@ static inline void lxc_attach_terminal_close_log(struct lxc_terminal *terminal)
+ 	close_prot_errno_disarm(terminal->log_fd);
+ }
+ 
++#ifdef HAVE_ISULAD
++/* isulad: attach timeout thread function */
++static void* wait_attach_timeout(void *arg)
++{
++	struct attach_timeout_conf *conf = (struct attach_timeout_conf *)arg;
++
++	if (!conf || conf->timeout < 1)
++		goto out;
++	sleep(conf->timeout);
++	if (lxc_process_alive(conf->pid, conf->start_time)) {
++		g_attach_timeout_state = ATTACH_TIMEOUT;
++		if (kill(conf->pid, SIGKILL) < 0) {
++			ERROR("Failed to send signal %d to pid %d", SIGKILL, conf->pid);
++		}
++	}
++
++out:
++	free(conf);
++	return ((void *)0);
++}
++
++/* isulad: create attach timeout thread */
++static int create_attach_timeout_thread(int64_t attach_timeout, pid_t pid)
++{
++	int ret = 0;
++	pthread_t ptid;
++	pthread_attr_t attr;
++	struct attach_timeout_conf *timeout_conf = NULL;
++
++	timeout_conf = malloc(sizeof(struct attach_timeout_conf));
++	if (timeout_conf == NULL) {
++		ERROR("Failed to malloc attach timeout conf");
++		ret = -1;
++		goto out;
++	}
++
++	memset(timeout_conf, 0, sizeof(struct attach_timeout_conf));
++	timeout_conf->timeout = attach_timeout;
++	timeout_conf->pid = pid;
++	timeout_conf->start_time = lxc_get_process_startat(pid);
++
++	pthread_attr_init(&attr);
++	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
++	ret = pthread_create(&ptid, &attr, wait_attach_timeout, timeout_conf);
++	pthread_attr_destroy(&attr);
++	if (ret != 0) {
++		ERROR("Create attach wait timeout thread failed");
++		free(timeout_conf);
++		goto out;
++	}
++
++out:
++	return ret;
++}
++
++static int attach_signal_handler(int fd, uint32_t events, void *data,
++			  struct lxc_epoll_descr *descr)
++{
++	int ret;
++	siginfo_t info;
++	struct signalfd_siginfo siginfo;
++	pid_t *pid = data;
++
++	ret = lxc_read_nointr(fd, &siginfo, sizeof(siginfo));
++	if (ret < 0)
++		return log_error(LXC_MAINLOOP_ERROR, "Failed to read signal info from signal file descriptor %d", fd);
++
++	if (ret != sizeof(siginfo))
++		return log_error(LXC_MAINLOOP_ERROR, "Unexpected size for struct signalfd_siginfo");
++
++	/* Check whether init is running. */
++	info.si_pid = 0;
++	ret = waitid(P_PID, *pid, &info, WEXITED | WNOWAIT | WNOHANG);
++	if (ret == 0 && info.si_pid == *pid) {
++		return log_warn(LXC_MAINLOOP_CLOSE, "Container attach init process %d exited", *pid);
++	}
++
++	return LXC_MAINLOOP_CONTINUE;
++}
++
++static int isulad_setup_signal_fd(sigset_t *oldmask)
++{
++	int ret;
++	sigset_t mask;
++	const int signals = {SIGBUS, SIGILL, SIGSEGV, SIGWINCH, SIGTERM};
++
++	/* Block everything except serious error signals. */
++	ret = sigfillset(&mask);
++	if (ret < 0)
++		return -EBADF;
++
++	for (int sig = 0; sig < (sizeof(signals) / sizeof(signals0)); sig++) {
++		ret = sigdelset(&mask, signalssig);
++		if (ret < 0)
++			return -EBADF;
++	}
++
++	ret = pthread_sigmask(SIG_BLOCK, &mask, oldmask);
++	if (ret < 0)
++		return log_error_errno(-EBADF, errno,
++				       "Failed to set signal mask");
++
++	ret = signalfd(-1, &mask, SFD_CLOEXEC);
++	if (ret < 0)
++		return log_error_errno(-EBADF,
++				       errno, "Failed to create signal file descriptor");
++
++	TRACE("Created signal file descriptor %d", ret);
++
++	return ret;
++}
++#endif
++
++#ifdef HAVE_ISULAD
++int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
++	       void *exec_payload, lxc_attach_options_t *options,
++	       pid_t *attached_process, char **err_msg)
++#else
+ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 	       void *exec_payload, lxc_attach_options_t *options,
+ 	       pid_t *attached_process)
++#endif
+ {
+ 	int ret_parent = -1;
+ 	struct lxc_async_descr descr = {};
+@@ -1443,6 +1744,17 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 	struct attach_context *ctx;
+ 	struct lxc_terminal terminal;
+ 	struct lxc_conf *conf;
++#ifdef HAVE_ISULAD
++	struct lxc_exec_command_handler exec_command;
++	const char *suffix = options->suffix;
++
++	exec_command.maincmd_fd = -1;
++	exec_command.terminal = &terminal;
++
++	int isulad_sigfd;
++	sigset_t isulad_oldmask;
++	struct lxc_epoll_descr isulad_descr = {0};
++#endif
+ 
+ 	if (!container)
+ 		return ret_errno(EINVAL);
+@@ -1472,6 +1784,14 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 
+ 	conf = ctx->container->lxc_conf;
+ 
++#ifdef HAVE_ISULAD
++	// always switch uid and gid for attach
++	if (options->uid == -1)
++		options->uid = conf->init_uid;
++	if (options->gid == -1)
++		options->gid = conf->init_gid;
++#endif
++
+ 	if (!fetch_seccomp(ctx->container, options))
+ 		WARN("Failed to get seccomp policy");
+ 
+@@ -1485,13 +1805,23 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 	}
+ 
+ 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
++#ifdef HAVE_ISULAD
++		ret = lxc_attach_terminal(name, lxcpath, conf, &terminal, options);
++#else
+ 		ret = lxc_attach_terminal(name, lxcpath, conf, &terminal);
++#endif
+ 		if (ret < 0) {
+ 			put_attach_context(ctx);
+ 			return syserror("Failed to setup new terminal");
+ 		}
+ 
+ 		terminal.log_fd = options->log_fd;
++#ifdef HAVE_ISULAD
++		if (suffix != NULL) {
++			exec_command.maincmd_fd = lxc_exec_cmd_init(name, lxcpath, suffix);
++			exec_command.terminal = &terminal;
++		}
++#endif
+ 	} else {
+ 		lxc_terminal_init(&terminal);
+ 	}
+@@ -1531,10 +1861,38 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 	 */
+ 	ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);
+ 	if (ret < 0) {
++#ifdef HAVE_ISULAD
++		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
++			lxc_terminal_delete(&terminal);
++			lxc_terminal_conf_free(&terminal);
++			if (exec_command.maincmd_fd != -1) {
++				close(exec_command.maincmd_fd);
++			}
++			lxc_exec_unix_sock_delete(name, suffix);
++		}
++#endif
+ 		put_attach_context(ctx);
+ 		return syserror("Could not set up required IPC mechanism for attaching");
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: pipdfd for get error message of child or grandchild process. */
++	if (pipe2(conf->errpipe, O_CLOEXEC) != 0) {
++		SYSERROR("Failed to init errpipe");
++		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
++			lxc_terminal_delete(&terminal);
++			lxc_terminal_conf_free(&terminal);
++			if (exec_command.maincmd_fd != -1) {
++				close(exec_command.maincmd_fd);
++			}
++			lxc_exec_unix_sock_delete(name, suffix);
++		}
++		close(ipc_sockets0);
++		close(ipc_sockets1);
++		put_attach_context(ctx);
++		return -1;
++	}
++#endif
+ 	/* Create transient process, two reasons:
+ 	 *       1. We can't setns() in the child itself, since we want to make
+ 	 *          sure we are properly attached to the pidns.
+@@ -1544,6 +1902,18 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 	 */
+ 	pid = fork();
+ 	if (pid < 0) {
++#ifdef HAVE_ISULAD
++		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
++			lxc_terminal_delete(&terminal);
++			lxc_terminal_conf_free(&terminal);
++			if (exec_command.maincmd_fd != -1) {
++				close(exec_command.maincmd_fd);
++			}
++			lxc_exec_unix_sock_delete(name, suffix);
++		}
++		close(ipc_sockets0);
++		close(ipc_sockets1);
++#endif
+ 		put_attach_context(ctx);
+ 		return syserror("Failed to create first subprocess");
+ 	}
+@@ -1551,6 +1921,11 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 	if (pid == 0) {
+ 		char *cwd, *new_cwd;
+ 
++#ifdef HAVE_ISULAD
++		/* isulad: close errpipe */
++		close_prot_errno_disarm(conf->errpipe0);
++		conf->errpipe0 = -1;
++#endif
+ 		/* close unneeded file descriptors */
+ 		close_prot_errno_disarm(ipc_sockets0);
+ 
+@@ -1558,6 +1933,11 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 			lxc_attach_terminal_close_ptx(&terminal);
+ 			lxc_attach_terminal_close_peer(&terminal);
+ 			lxc_attach_terminal_close_log(&terminal);
++#ifdef HAVE_ISULAD
++			if (exec_command.maincmd_fd != -1) {
++				close_prot_errno_disarm(exec_command.maincmd_fd);
++			}
++#endif
+ 		}
+ 
+ 		/* Wait for the parent to have setup cgroups. */
+@@ -1622,9 +2002,15 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 				.terminal_pts_fd	= terminal.pty,
+ 				.exec_function		= exec_function,
+ 				.exec_payload		= exec_payload,
++#ifdef HAVE_ISULAD
++				.terminal = &terminal,
++#endif
+ 			};
+-
++#ifdef HAVE_ISULAD
++			if (options->attach_flags & LXC_ATTACH_TERMINAL && terminal.tty_state) {
++#else
+ 			if (options->attach_flags & LXC_ATTACH_TERMINAL) {
++#endif
+ 				ret = lxc_terminal_signal_sigmask_safe_blocked(&terminal);
+ 				if (ret < 0) {
+ 					SYSERROR("Failed to reset signal mask");
+@@ -1663,6 +2049,26 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 
+ 	/* close unneeded file descriptors */
+ 	close_prot_errno_disarm(ipc_sockets1);
++#ifdef HAVE_ISULAD
++		/* isulad: close errpipe */
++		close_prot_errno_disarm(conf->errpipe1);
++		conf->errpipe1 = -1;
++		/* isulad: close pipe after clone */
++		if (terminal.pipes00 >= 0) {
++			close_prot_errno_disarm(terminal.pipes00);
++			terminal.pipes00 = -1;
++		}
++
++		if (terminal.pipes11 >= 0) {
++			close_prot_errno_disarm(terminal.pipes11);
++			terminal.pipes11 = -1;
++		}
++
++		if (terminal.pipes21 >= 0) {
++			close_prot_errno_disarm(terminal.pipes21);
++			terminal.pipes21 = -1;
++		}
++#endif
+ 	put_namespaces(ctx);
+ 	if (options->attach_flags & LXC_ATTACH_TERMINAL)
+ 		lxc_attach_terminal_close_pts(&terminal);
+@@ -1714,9 +2120,28 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 		if (ret < 0)
+ 			goto on_error;
+ 
++#ifdef HAVE_ISULAD
++		ret = lxc_attach_terminal_mainloop_init(&terminal, &isulad_descr);
++		if (ret < 0)
++			goto on_error;
++
++		if (suffix != NULL) {
++			(void)lxc_exec_cmd_mainloop_add(&descr, &exec_command);
++		}
++#endif
+ 		TRACE("Initialized terminal mainloop");
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* The signal fd has to be created before forking otherwise if the child
++	* process exits before we setup the signal fd, the event will be lost
++	* and the command will be stuck.
++	*/
++	isulad_sigfd = isulad_setup_signal_fd(&isulad_oldmask);
++	if (isulad_sigfd < 0)
++		goto close_mainloop;
++#endif
++
+ 	/* Let the child process know to go ahead. */
+ 	if (!sync_wake(ipc_sockets0, ATTACH_SYNC_CGROUP))
+ 		goto close_mainloop;
+@@ -1783,6 +2208,34 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 
+ 	*attached_process = attached_pid;
+ 
++#ifdef HAVE_ISULAD
++	if (options->timeout > 0) {
++		ret = create_attach_timeout_thread(options->timeout, *attached_process);
++		if (ret) {
++			ERROR("Failed to create attach timeout thread for container.");
++			goto close_mainloop;
++		}
++	}
++	/* isulad: read error msg from pipe */
++	ssize_t size_read;
++	char errbufBUFSIZ + 1 = {0};
++	pid_t tmp_pid = *attached_process;
++
++	size_read = read(conf->errpipe0, errbuf, BUFSIZ);
++	if (size_read > 0) {
++		if (err_msg)
++			*err_msg = safe_strdup(errbuf);
++		goto close_mainloop;
++	}
++	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
++		ret = lxc_mainloop_add_handler(&descr, isulad_sigfd, attach_signal_handler, &tmp_pid);
++		if (ret < 0) {
++			ERROR("Failed to add signal handler for %d to mainloop", tmp_pid);
++			goto close_mainloop;
++		}
++	}
++#endif
++
+ 	/* Now shut down communication with child, we're done. */
+ 	shutdown(ipc_sockets0, SHUT_RDWR);
+ 	close_prot_errno_disarm(ipc_sockets0);
+@@ -1790,17 +2243,46 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 	ret_parent = 0;
+ 	to_cleanup_pid = -1;
+ 
++#ifdef HAVE_ISULAD
++	// iSulad: close stdin pipe if we do not want open_stdin with container stdin
++	if (!terminal.open_stdin) {
++		if (terminal.pipes01 > 0) {
++			close_prot_errno_disarm(terminal.pipes01);
++			terminal.pipes01 = -1;
++		}
++	}
++#endif
++
+ 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
++#ifdef HAVE_ISULAD
++			ret = isulad_safe_mainloop(&descr, -1);
++#else
+ 		ret = lxc_mainloop(&descr, -1);
++#endif
+ 		if (ret < 0) {
+ 			ret_parent = -1;
+ 			to_cleanup_pid = attached_pid;
+ 		}
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	// do lxc_mainloop to make sure we do not lose any output
++	(void)isulad_safe_mainloop(&isulad_descr, 100);
++	if (g_attach_timeout_state == ATTACH_TIMEOUT && err_msg != NULL && *err_msg == NULL) {
++		*err_msg = safe_strdup("Attach exceeded timeout");
++	}
++#endif
++
+ close_mainloop:
++#ifdef HAVE_ISULAD
++	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
++		lxc_mainloop_close(&isulad_descr);
++		lxc_mainloop_close(&descr);
++	}
++#else
+ 	if (options->attach_flags & LXC_ATTACH_TERMINAL)
+ 		lxc_mainloop_close(&descr);
++#endif
+ 
+ on_error:
+ 	if (ipc_sockets0 >= 0) {
+@@ -1814,13 +2296,23 @@ on_error:
+ 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+ 		lxc_terminal_delete(&terminal);
+ 		lxc_terminal_conf_free(&terminal);
++#ifdef HAVE_ISULAD
++		if (exec_command.maincmd_fd != -1) {
++			close_prot_errno_disarm(exec_command.maincmd_fd);
++		}
++		lxc_exec_unix_sock_delete(name, suffix);
++#endif
+ 	}
+ 
+ 	put_attach_context(ctx);
+ 	return ret_parent;
+ }
+ 
++#ifdef HAVE_ISULAD
++int lxc_attach_run_command(void *payload, int msg_fd)
++#else
+ int lxc_attach_run_command(void *payload)
++#endif
+ {
+ 	int ret = -1;
+ 	lxc_attach_command_t *cmd = payload;
+@@ -1838,10 +2330,19 @@ int lxc_attach_run_command(void *payload)
+ 		}
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: write error messages */
++	lxc_write_error_message(msg_fd, "exec: \"%s\": %s.", cmd->program, strerror(errno));
++#endif
++
+ 	return syserror_ret(ret, "Failed to exec \"%s\"", cmd->program);
+ }
+ 
++#ifdef HAVE_ISULAD
++int lxc_attach_run_shell(void* payload, int msg_fd)
++#else
+ int lxc_attach_run_shell(void* payload)
++#endif
+ {
+ 	__do_free char *buf = NULL;
+ 	uid_t uid;
+diff --git a/src/lxc/attach.h b/src/lxc/attach.h
+index c85b84f..7ba0ff8 100644
+--- a/src/lxc/attach.h
++++ b/src/lxc/attach.h
+@@ -16,9 +16,15 @@
+ struct lxc_conf;
+ struct lxc_container;
+ 
++#ifdef HAVE_ISULAD
++__hidden extern int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
++			       void *exec_payload, lxc_attach_options_t *options,
++			       pid_t *attached_process, char **err_msg);
++#else
+ __hidden extern int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 			       void *exec_payload, lxc_attach_options_t *options,
+ 			       pid_t *attached_process);
++#endif
+ 
+ __hidden extern int lxc_attach_remount_sys_proc(void);
+ 
+diff --git a/src/lxc/attach_options.h b/src/lxc/attach_options.h
+index 8187eca..d09dfce 100644
+--- a/src/lxc/attach_options.h
++++ b/src/lxc/attach_options.h
+@@ -75,7 +75,11 @@ enum {
+  *
+  * \return Function should return \c 0 on success, and any other value to denote failure.
+  */
++#ifdef HAVE_ISULAD
++typedef int (*lxc_attach_exec_t)(void* payload, int msg_fd);
++#else
+ typedef int (*lxc_attach_exec_t)(void* payload);
++#endif
+ 
+ typedef struct lxc_groups_t {
+ 	size_t size;
+@@ -155,6 +159,16 @@ typedef struct lxc_attach_options_t {
+ 	 * If unset all additional groups are dropped.
+ 	 */
+ 	lxc_groups_t groups;
++
++#ifdef HAVE_ISULAD
++	char *init_fifo3; /* isulad: default fifos for the start */
++	int64_t timeout;/* isulad: Seconds for waiting on a container to attach/exec before it is killed*/
++	const char *suffix;
++	bool disable_pty;
++	bool open_stdin;
++	gid_t *add_gids; /* attach user additional gids */
++	size_t add_gids_len; // iSulad TODO: shoud replace by lxc_groups_t groups;
++#endif
+ } lxc_attach_options_t;
+ 
+ /*! Default attach options to use */
+@@ -175,6 +189,9 @@ typedef struct lxc_attach_options_t {
+ 		.log_fd		= -EBADF,               		\
+ 		.lsm_label	= NULL,					\
+ 		.groups		= {},					\
++#ifdef HAVE_ISULAD
++		/* .init_fifo = */  	{NULL, NULL, NULL},  \
++#endif
+ 	}
+ 
+ /*!
+@@ -192,7 +209,11 @@ typedef struct lxc_attach_command_t {
+  *
+  * \return \c -1 on error, exit code of lxc_attach_command_t program on success.
+  */
++#ifdef HAVE_ISULAD
++extern int lxc_attach_run_command(void* payload, int msg_fd);
++#else
+ extern int lxc_attach_run_command(void* payload);
++#endif
+ 
+ /*!
+  * \brief Run a shell command in the container.
+@@ -201,7 +222,11 @@ extern int lxc_attach_run_command(void* payload);
+  *
+  * \return Exit code of shell.
+  */
++#ifdef HAVE_ISULAD
++extern int lxc_attach_run_shell(void* payload, int msg_fd);
++#else
+ extern int lxc_attach_run_shell(void* payload);
++#endif
+ 
+ #ifdef  __cplusplus
+ }
+diff --git a/src/lxc/cgroups/cgroup.c b/src/lxc/cgroups/cgroup.c
+index 5e2a7d0..5de88e3 100644
+--- a/src/lxc/cgroups/cgroup.c
++++ b/src/lxc/cgroups/cgroup.c
+@@ -32,8 +32,11 @@ struct cgroup_ops *cgroup_init(struct lxc_conf *conf)
+ 	cgroup_ops = cgroup_ops_init(conf);
+ 	if (!cgroup_ops)
+ 		return log_error_errno(NULL, errno, "Failed to initialize cgroup driver");
+-
++#ifdef HAVE_ISULAD
++	if (cgroup_ops->data_init(cgroup_ops, conf)) {
++#else
+ 	if (cgroup_ops->data_init(cgroup_ops)) {
++#endif
+ 		cgroup_exit(cgroup_ops);
+ 		return log_error_errno(NULL, errno, "Failed to initialize cgroup data");
+ 	}
+diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h
+index 108e5d8..ebfd3a1 100644
+--- a/src/lxc/cgroups/cgroup.h
++++ b/src/lxc/cgroups/cgroup.h
+@@ -245,8 +245,15 @@ struct cgroup_ops {
+ 	 */
+ 	cgroup_layout_t cgroup_layout;
+ 
++#ifdef HAVE_ISULAD
++	int (*data_init)(struct cgroup_ops *ops, struct lxc_conf *conf);
++	bool (*payload_destroy)(struct cgroup_ops *ops, struct lxc_handler *handler);
++	// different with get_cgroup(), which return relative path
++	const char *(*get_cgroup_full_path)(struct cgroup_ops *ops, const char *controller);
++#else
+ 	int (*data_init)(struct cgroup_ops *ops);
+ 	void (*payload_destroy)(struct cgroup_ops *ops, struct lxc_handler *handler);
++#endif
+ 	void (*monitor_destroy)(struct cgroup_ops *ops, struct lxc_handler *handler);
+ 	bool (*monitor_create)(struct cgroup_ops *ops, struct lxc_handler *handler);
+ 	bool (*monitor_enter)(struct cgroup_ops *ops, struct lxc_handler *handler);
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index 9158713..23783db 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -103,6 +103,12 @@
+ #include "strchrnul.h"
+ #endif
+ 
++#ifdef HAVE_ISULAD
++#include <pthread.h>
++#include "path.h"
++#include "loop.h"
++#endif
++
+ lxc_log_define(conf, lxc);
+ 
+ /*
+@@ -122,6 +128,11 @@ char *lxchook_namesNUM_LXC_HOOKS = {
+ 	"clone",
+ 	"destroy",
+ 	"start-host"
++#ifdef HAVE_ISULAD
++	, "oci-prestart",
++	"oci-poststart",
++	"oci-poststop"
++#endif
+ };
+ 
+ struct mount_opt {
+@@ -284,6 +295,21 @@ static struct limit_opt limit_opt = {
+ #endif
+ };
+ 
++#ifdef HAVE_ISULAD
++static int rootfs_parent_mount_private(char *rootfs);
++static int setup_rootfs_ropaths(struct lxc_list *ropaths);
++static int setup_rootfs_maskedpaths(struct lxc_list *maskedpaths);
++static int remount_proc_sys_mount_entries(struct lxc_list *mount_list, bool lsm_aa_allow_nesting);
++static int check_mount_destination(const char *rootfs, const char *dest, const char *src);
++static int mount_entry_with_loop_dev(const char *src, const char *dest, const char *fstype,
++		char *mnt_opts, const char *rootfs);
++static bool need_setup_proc(const struct lxc_conf *conf, struct lxc_list *mount);
++static bool need_setup_dev(const struct lxc_conf *conf, struct lxc_list *mount);
++static int setup_populate_devs(const struct lxc_rootfs *rootfs, struct lxc_list *devs, const char *mount_label);
++static int setup_rootfs_mountopts(const struct lxc_rootfs *rootfs);
++static int create_mtab_link();
++#endif
++
+ static int run_buffer(char *buffer)
+ {
+ 	__do_free char *output = NULL;
+@@ -707,8 +733,13 @@ static int lxc_mount_auto_mounts(struct lxc_handler *handler, int flags)
+ 		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "%r/proc/sysrq-trigger",                          "%r/proc/sysrq-trigger",      NULL,    MS_BIND,                                         NULL, false },
+ 		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, NULL,                                             "%r/proc/sysrq-trigger",      NULL,    MS_REMOUNT|MS_BIND|MS_RDONLY,                    NULL, false },
+ 		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_RW,    "proc",                                           "%r/proc",                    "proc",  MS_NODEV|MS_NOEXEC|MS_NOSUID,                    NULL, false },
++#ifdef HAVE_ISULAD
++		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RW,     "sysfs",                                          "%r/sys",                     "sysfs", MS_NODEV|MS_NOEXEC|MS_NOSUID,                    NULL, false },
++		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RO,     "sysfs",                                          "%r/sys",                     "sysfs", MS_RDONLY|MS_NODEV|MS_NOEXEC|MS_NOSUID,          NULL, false },
++#else
+ 		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RW,     "sysfs",                                          "%r/sys",                     "sysfs", 0,                                               NULL, false },
+ 		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RO,     "sysfs",                                          "%r/sys",                     "sysfs", MS_RDONLY,                                       NULL, false },
++#endif
+ 		/* /proc/sys is used as a temporary staging directory for the read-write sysfs mount and unmounted after binding net */
+ 		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "sysfs",                                          "%r/proc/sys",                "sysfs", MS_NOSUID|MS_NODEV|MS_NOEXEC,                    NULL, false },
+ 		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "sysfs",                                          "%r/sys",                     "sysfs", MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC,          NULL, false },
+@@ -801,11 +832,25 @@ static int lxc_mount_auto_mounts(struct lxc_handler *handler, int flags)
+ 		if (!destination)
+ 			return syserror_set(-ENOMEM, "Failed to create target path");
+ 
++#ifdef HAVE_ISULAD
++		if (mkdir_p(destination, 0755) < 0) {
++			SYSERROR("Failed to create mount target '%s'", destination);
++			return log_error(-1, "Failed to mkdir destination %s", destination);
++		}
++
++		// add selinux label for safe mount
++		ret = safe_mount(source, destination,
++				 default_mountsi.fstype,
++				 mflags,
++				 default_mountsi.options,
++				 rootfs->path ? rootfs->mount : NULL, NULL);
++#else
+ 		ret = safe_mount(source, destination,
+ 				 default_mountsi.fstype,
+ 				 mflags,
+ 				 default_mountsi.options,
+ 				 rootfs->path ? rootfs->mount : NULL);
++#endif
+ 		if (ret < 0) {
+ 			if (errno != ENOENT)
+ 				return syserror("Failed to mount \"%s\" on \"%s\" with flags %lu", source, destination, mflags);
+@@ -1210,7 +1255,9 @@ static int lxc_send_ttys_to_parent(struct lxc_handler *handler)
+ static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
+ 			 int autodevtmpfssize, const char *lxcpath)
+ {
++#ifndef HAVE_ISULAD
+ 	__do_close int fd_fs = -EBADF;
++#endif
+ 	const char *path = rootfs->path ? rootfs->mount : NULL;
+ 	size_t tmpfs_size = (autodevtmpfssize != 0) ? autodevtmpfssize : 500000;
+ 	int ret;
+@@ -1227,6 +1274,10 @@ static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
+ 		goto reset_umask;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	if (systemd != NULL && !strcmp(systemd, "true")) {
++		ret = mount(path, path, "", MS_BIND, NULL);
++#else
+ 	if (can_use_mount_api()) {
+ 		fd_fs = fs_prepare("tmpfs", -EBADF, "", 0, 0);
+ 		if (fd_fs < 0)
+@@ -1245,6 +1296,7 @@ static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
+ 		ret = fs_attach(fd_fs, rootfs->dfd_mnt, "dev",
+ 				PROTECT_OPATH_DIRECTORY,
+ 				PROTECT_LOOKUP_BENEATH_XDEV, 0);
++#endif
+ 	} else {
+ 		__do_free char *fallback_path = NULL;
+ 
+@@ -1253,9 +1305,17 @@ static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
+ 
+ 		if (path) {
+ 			fallback_path = must_make_path(path, "/dev", NULL);
++#ifdef HAVE_ISULAD
++			ret = safe_mount("none", fallback_path, "tmpfs", 0, mount_options, path, rootfs->lsm_se_mount_context);
++#else
+ 			ret = safe_mount("none", fallback_path, "tmpfs", 0, mount_options, path);
++#endif
+ 		} else {
++#ifdef HAVE_ISULAD
++			ret = safe_mount("none", "dev", "tmpfs", 0, mount_options, NULL, rootfs->lsm_se_mount_context);
++#else
+ 			ret = safe_mount("none", "dev", "tmpfs", 0, mount_options, NULL);
++#endif
+ 		}
+ 	}
+ 	if (ret < 0) {
+@@ -1392,7 +1452,11 @@ static int lxc_fill_autodev(struct lxc_rootfs *rootfs)
+ 			if (ret < 0)
+ 				return log_error(-1, "Failed to create device path for %s", device->name);
+ 
++#ifdef HAVE_ISULAD
++			ret = safe_mount(rootfs->buf, path, 0, MS_BIND, NULL, get_rootfs_mnt(rootfs), rootfs->lsm_se_mount_context);
++#else
+ 			ret = safe_mount(rootfs->buf, path, 0, MS_BIND, NULL, get_rootfs_mnt(rootfs));
++#endif
+ 			if (ret < 0)
+ 				return log_error_errno(-1, errno, "Failed to bind mount host device node \"%s\" to \"%s\"", rootfs->buf, path);
+ 
+@@ -1410,12 +1474,23 @@ static int lxc_fill_autodev(struct lxc_rootfs *rootfs)
+ static int lxc_mount_rootfs(struct lxc_rootfs *rootfs)
+ {
+ 	int ret;
++#ifdef HAVE_ISULAD
++	unsigned long flags;
++#endif
+ 
+ 	if (!rootfs->path) {
+ 		ret = mount("", "/", NULL, MS_SLAVE | MS_REC, 0);
+ 		if (ret < 0)
+ 			return log_error_errno(-1, errno, "Failed to recursively turn root mount tree into dependent mount");
+ 
++#ifdef HAVE_ISULAD
++		if (!access(rootfs->mount, F_OK)) {
++			rootfs->path = safe_strdup("/");
++			if (mount("/", rootfs->mount, NULL, MS_BIND, 0)) {
++				return log_error_errno(-1, errno, "Failed to mount \"/\" to %s", rootfs->mount);
++			}
++		}
++#endif
+ 		rootfs->dfd_mnt = open_at(-EBADF, "/", PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE, 0);
+ 		if (rootfs->dfd_mnt < 0)
+ 			return -errno;
+@@ -1428,6 +1503,42 @@ static int lxc_mount_rootfs(struct lxc_rootfs *rootfs)
+ 		return log_error_errno(-1, errno, "Failed to access to \"%s\". Check it is present",
+ 				       rootfs->mount);
+ 
++#ifdef HAVE_ISULAD
++	// Support mount propagations of rootfs
++	// Get rootfs mnt propagation options, such as slave or shared
++	flags = MS_SLAVE | MS_REC;
++	if (rootfs->mnt_opts.prop_flags)
++		flags = rootfs->mnt_opts.prop_flags;
++
++	/* Mount propagation inside container can not greater than host.
++	* So we must change propagation of root according to flags, default is rslave.
++	* That means shared propagation inside container is disabled by default.
++	*/
++	ret = mount("", "/", NULL, flags, NULL);
++	if (ret < 0) {
++		return log_error_errno(-1, errno, "Failed to make / to propagation flags %lu.", flags);
++	}
++
++	/* Make parent mount private to make sure following bind mount does
++	* not propagate in other namespaces. Also it will help with kernel
++	* check pass in pivot_root. (IS_SHARED(new_mnt->mnt_parent))
++	*/
++	ret = rootfs_parent_mount_private(rootfs->path);
++	if (ret != 0) {
++		return log_error(-1, "Failed to make parent of rootfs %s to private.", rootfs->path);
++	}
++	ret = rootfs_parent_mount_private(rootfs->mount);
++	if (ret != 0) {
++		return log_error(-1, "Failed to make parent of rootfs %s to private.", rootfs->mount);
++	}
++
++	ret = mount(rootfs->mount, rootfs->mount, "bind", MS_BIND | MS_REC, NULL);
++	if (ret < 0) {
++		SYSERROR("Failed to mount rootfs %s", rootfs->mount);
++		return -1;
++	}
++#endif
++
+ 	ret = rootfs->storage->ops->mount(rootfs->storage);
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to mount rootfs \"%s\" onto \"%s\" with options \"%s\"",
+@@ -1780,7 +1891,11 @@ static int lxc_setup_devpts_child(struct lxc_handler *handler)
+ 		DEBUG("Attached detached devpts mount %d to %d/pts", devpts_fd, rootfs->dfd_dev);
+ 	} else {
+ 		char **opts;
++#ifdef HAVE_ISULAD
++		__do_free char *devpts_mntopts = NULL;
++#else
+ 		char devpts_mntopts256;
++#endif
+ 		char *mntopt_sets5;
+ 		char default_devpts_mntopts256 = "gid=5,newinstance,ptmxmode=0666,mode=0620";
+ 
+@@ -1788,9 +1903,18 @@ static int lxc_setup_devpts_child(struct lxc_handler *handler)
+ 		 * Fallback codepath in case the new mount API can't be used to
+ 		 * create detached mounts.
+ 		 */
+-
++#ifdef HAVE_ISULAD
++		if (rootfs->lsm_se_mount_context != NULL) {
++			ret = strnprintf(devpts_mntopts, sizeof(devpts_mntopts), "%s,max=%zu,context=\"%s\"",
++					default_devpts_mntopts, pty_max, rootfs->lsm_se_mount_context);
++		} else {
++#else
+ 		ret = strnprintf(devpts_mntopts, sizeof(devpts_mntopts), "%s,max=%zu",
+ 				default_devpts_mntopts, pty_max);
++#endif
++#ifdef HAVE_ISULAD
++		}
++#endif
+ 		if (ret < 0)
+ 			return -1;
+ 
+@@ -1951,6 +2075,15 @@ static int bind_mount_console(int fd_devpts, struct lxc_rootfs *rootfs,
+ 			      struct lxc_terminal *console, int fd_to)
+ {
+ 	__do_close int fd_pty = -EBADF;
++#ifdef HAVE_ISULAD
++	__do_free char *mnt_opts = NULL;
++
++	if (rootfs->lsm_se_mount_context != NULL) {
++		if (asprintf(mnt_opts, "context=\"%s\"", rootfs->lsm_se_mount_context) < 0) {
++			return syserror("Out of memory");
++		}
++	}
++#endif
+ 
+ 	if (is_empty_string(console->name))
+ 		return ret_errno(EINVAL);
+@@ -1981,7 +2114,11 @@ static int bind_mount_console(int fd_devpts, struct lxc_rootfs *rootfs,
+ 	if (can_use_mount_api())
+ 		return fd_bind_mount(fd_pty, "", 0, 0, fd_to, "", 0, 0, 0, 0, 0, false);
+ 
++#ifdef HAVE_ISULAD
++	return mount_fd(fd_pty, fd_to, "none", MS_BIND, mnt_opts);
++#else
+ 	return mount_fd(fd_pty, fd_to, "none", MS_BIND, 0);
++#endif
+ }
+ 
+ static int lxc_setup_dev_console(int fd_devpts, struct lxc_rootfs *rootfs,
+@@ -2040,6 +2177,15 @@ static int lxc_setup_ttydir_console(int fd_devpts, struct lxc_rootfs *rootfs,
+ 	__do_close int fd_ttydir = -EBADF, fd_dev_console = -EBADF,
+ 		       fd_reg_console = -EBADF, fd_reg_ttydir_console = -EBADF;
+ 	int ret;
++#ifdef HAVE_ISULAD
++	__do_free char *mnt_opts = NULL;
++
++	if (rootfs->lsm_se_mount_context != NULL) {
++		if (asprintf(mnt_opts, "context=\"%s\"", rootfs->lsm_se_mount_context) < 0) {
++			return syserror("Out of memory");
++		}
++	}
++#endif
+ 
+ 	/* create dev/<ttydir> */
+ 	ret = mkdirat(rootfs->dfd_dev, ttydir, 0755);
+@@ -2124,7 +2270,11 @@ static int lxc_setup_ttydir_console(int fd_devpts, struct lxc_rootfs *rootfs,
+ 				    0,
+ 				    false);
+ 	else
++#ifdef HAVE_ISULAD
++		ret = mount_fd(fd_dev_console, fd_reg_console, "none", MS_BIND, mnt_opts);
++#else
+ 		ret = mount_fd(fd_dev_console, fd_reg_console, "none", MS_BIND, 0);
++#endif
+ 	if (ret < 0)
+ 		return syserror("Failed to mount \"%d\" on \"%d\"",
+ 				fd_dev_console, fd_reg_console);
+@@ -2410,10 +2560,17 @@ static char *get_field(char *src, int nfields)
+ 	return p;
+ }
+ 
++#ifdef HAVE_ISULAD
++static int mount_entry(const char *fsname, const char *target,
++		       const char *fstype, unsigned long mountflags,
++		       unsigned long pflags, const char *data, bool optional,
++		       bool dev, bool relative, const char *rootfs, const char *mount_label)
++#else
+ static int mount_entry(const char *fsname, const char *target,
+ 		       const char *fstype, unsigned long mountflags,
+ 		       unsigned long pflags, const char *data, bool optional,
+ 		       bool dev, bool relative, const char *rootfs)
++#endif
+ {
+ 	int ret;
+ 	char srcbufPATH_MAX;
+@@ -2428,9 +2585,13 @@ static int mount_entry(const char *fsname, const char *target,
+ 			return log_error_errno(-1, errno, "source path is too long");
+ 		srcpath = srcbuf;
+ 	}
+-
++#ifdef HAVE_ISULAD
++	ret = safe_mount(srcpath, target, fstype, mountflags & ~MS_REMOUNT, data,
++			 rootfs, mount_label);
++#else
+ 	ret = safe_mount(srcpath, target, fstype, mountflags & ~MS_REMOUNT, data,
+ 			 rootfs);
++#endif
+ 	if (ret < 0) {
+ 		if (optional)
+ 			return log_info_errno(0, errno, "Failed to mount \"%s\" on \"%s\" (optional)",
+@@ -2639,6 +2800,10 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
+ 	int ret;
+ 	bool dev, optional, relative;
+ 	struct lxc_mount_options opts = {};
++#ifdef HAVE_ISULAD
++	const char *dest = path;
++	__do_free char *rpath = NULL;
++#endif
+ 
+ 	optional = hasmntopt(mntent, "optional") != NULL;
+ 	dev = hasmntopt(mntent, "dev") != NULL;
+@@ -2647,8 +2812,31 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
+ 	if (rootfs && rootfs->path)
+ 		rootfs_path = rootfs->mount;
+ 
++#ifdef HAVE_ISULAD
++	// isulad: ensure that the destination of the bind mount is resolved of symlinks at mount time because
++	// any previous mounts can invalidate the next mount's destination.
++	// this can happen when a user specifies mounts within other mounts to cause breakouts or other
++	// evil stuff to try to escape the container's rootfs.
++	if (rootfs_path) {
++		rpath = follow_symlink_in_scope(path, rootfs_path);
++		if (!rpath) {
++			ERROR("Failed to get real path of '%s' in scope '%s'.", path, rootfs_path);
++			return -1;
++		}
++		dest = rpath;
++
++		ret = check_mount_destination(rootfs_path, dest, mntent->mnt_fsname);
++		if (ret) {
++			ERROR("Mount destination is invalid: '%s'", dest);
++			return -1;
++		}
++	}
++	ret = mount_entry_create_dir_file(mntent, dest, rootfs, lxc_name,
++					  lxc_path);
++#else
+ 	ret = mount_entry_create_dir_file(mntent, path, rootfs, lxc_name,
+ 					  lxc_path);
++#endif
+ 	if (ret < 0) {
+ 		if (optional)
+ 			return 0;
+@@ -2673,7 +2861,24 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
+ 	ret = parse_mount_attrs(&opts, mntent->mnt_opts);
+ 	if (ret < 0)
+ 		return -1;
+-
++#ifdef HAVE_ISULAD
++	// support squashfs
++	if (strcmp(mntent->mnt_type, "squashfs") == 0) {
++		ret = mount_entry_with_loop_dev(mntent->mnt_fsname, dest, mntent->mnt_type,
++						mntent->mnt_opts, rootfs_path);
++	} else {
++		ret = mount_entry(mntent->mnt_fsname,
++				dest,
++				mntent->mnt_type,
++				opts.mnt_flags,
++				opts.prop_flags,
++				opts.data,
++				optional,
++				dev,
++				relative,
++				rootfs_path, rootfs != NULL ? rootfs->lsm_se_mount_context : NULL);
++	}
++#else
+ 	ret = mount_entry(mntent->mnt_fsname,
+ 			  path,
+ 			  mntent->mnt_type,
+@@ -2684,6 +2889,7 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
+ 			  dev,
+ 			  relative,
+ 			  rootfs_path);
++#endif
+ 
+ 	return ret;
+ }
+@@ -2771,6 +2977,27 @@ static int mount_file_entries(struct lxc_rootfs *rootfs, FILE *file,
+ 	while (getmntent_r(file, &mntent, buf, sizeof(buf))) {
+ 		int ret;
+ 
++#ifdef HAVE_ISULAD
++		//isulad, system contaienr, skip "proc/sys/xxx" path
++		if (conf->systemd != NULL && strcmp(conf->systemd, "true") == 0) {
++			if (strstr(mntent.mnt_dir, "proc/sys") != NULL) {
++				continue;
++			}
++		}
++
++		/* Note: Workaround for volume file path with space*/
++		mntent.mnt_fsname = lxc_string_replace(SPACE_MAGIC_STR, " ", mntent.mnt_fsname);
++		if(!mntent.mnt_fsname) {
++			SYSERROR("memory allocation error");
++			return -1;
++		}
++		mntent.mnt_dir = lxc_string_replace(SPACE_MAGIC_STR, " ", mntent.mnt_dir);
++		if(!mntent.mnt_dir) {
++			SYSERROR("memory allocation error");
++			free(mntent.mnt_fsname);
++			return -1;
++		}
++#endif
+ 		if (!rootfs->path)
+ 			ret = mount_entry_on_systemfs(rootfs, &mntent);
+ 		else if (mntent.mnt_dir0 != '/')
+@@ -2779,6 +3006,12 @@ static int mount_file_entries(struct lxc_rootfs *rootfs, FILE *file,
+ 		else
+ 			ret = mount_entry_on_absolute_rootfs(&mntent, rootfs,
+ 							     lxc_name, lxc_path);
++#ifdef HAVE_ISULAD
++		free(mntent.mnt_fsname);
++		mntent.mnt_fsname = NULL;
++		free(mntent.mnt_dir);
++		mntent.mnt_dir = NULL;
++#endif
+ 		if (ret < 0)
+ 			return -1;
+ 	}
+@@ -3255,6 +3488,17 @@ static int capabilities_allow(struct lxc_conf *conf)
+ 		if (cap->cap > last_cap)
+ 			continue;
+ 
++#ifdef HAVE_ISULAD
++		/* Do not keep any cap*/
++		if (strcmp(cap->cap_name, "ISULAD_KEEP_NONE") == 0) {
++			DEBUG("Do not keep any capability");
++			__u32 i;
++			for(i = 0; i < nr_u32; i++) {
++				keep_bitsi = 0;
++			}
++			break;
++		}
++#endif
+ 		set_bit(cap->cap, keep_bits);
+ 		DEBUG("Keeping %s (%d) capability", cap->cap_name, cap->cap);
+ 	}
+@@ -3473,6 +3717,27 @@ struct lxc_conf *lxc_conf_init(void)
+ 
+ 	INIT_LIST_HEAD(&new->netdevs);
+ 
++#ifdef HAVE_ISULAD
++	lxc_list_init(&new->populate_devs);
++	lxc_list_init(&new->rootfs.maskedpaths);
++	lxc_list_init(&new->rootfs.ropaths);
++	new->exit_fd = -1;
++	new->umask = 0027; /*default umask 0027*/
++	new->console.init_fifo0 = NULL;
++	new->console.init_fifo1 = NULL;
++	new->console.init_fifo2 = NULL;
++	new->console.pipes00 = -1;
++	new->console.pipes01 = -1;
++	new->console.pipes10 = -1;
++	new->console.pipes11 = -1;
++	new->console.pipes20 = -1;
++	new->console.pipes21 = -1;
++	lxc_list_init(&new->console.fifos);
++	new->errmsg = NULL;
++	new->errpipe0 = -1;
++	new->errpipe1 = -1;
++#endif
++
+ 	return new;
+ }
+ 
+@@ -3945,7 +4210,11 @@ static void turn_into_dependent_mounts(const struct lxc_rootfs *rootfs)
+ 		null_endofword(target);
+ 		ret = mount(NULL, target, NULL, MS_SLAVE, NULL);
+ 		if (ret < 0) {
++#ifdef HAVE_ISULAD
++			SYSERROR("Failed to recursively turn old root mount tree: %s into dependent mount. Continuing...", target);
++#else
+ 			SYSERROR("Failed to recursively turn old root mount tree into dependent mount. Continuing...");
++#endif
+ 			continue;
+ 		}
+ 	}
+@@ -3964,6 +4233,10 @@ int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
+ 	if (conf->rootfs.dfd_host < 0)
+ 		return log_error_errno(-errno, errno, "Failed to open \"/\"");
+ 
++#ifdef HAVE_ISULAD
++	// iSulad: will remount all mounts when we setted propagation flags
++	if (conf->rootfs.mnt_opts.prop_flags == 0)
++#endif
+ 	turn_into_dependent_mounts(&conf->rootfs);
+ 
+ 	if (conf->rootfs_setup) {
+@@ -4358,10 +4631,22 @@ int lxc_setup(struct lxc_handler *handler)
+ 	int ret;
+ 	const char *lxcpath = handler->lxcpath, *name = handler->name;
+ 	struct lxc_conf *lxc_conf = handler->conf;
++#ifdef HAVE_ISULAD
++	bool setup_dev = true;
++	bool setup_proc = true;
++#endif
+ 
+ 	ret = lxc_rootfs_prepare_child(handler);
+ 	if (ret < 0)
++#ifdef HAVE_ISULAD
++	{
++		lxc_write_error_message(lxc_conf->errpipe1, "%s:%d: failed to setup rootfs %s.",
++				__FILE__, __LINE__, lxc_conf->rootfs.path);
++		return syserror("Failed to prepare rootfs");
++	}
++#else
+ 		return syserror("Failed to prepare rootfs");
++#endif
+ 
+ 	ret = lxc_setup_rootfs_prepare_root(lxc_conf, name, lxcpath);
+ 	if (ret < 0)
+@@ -4402,6 +4687,16 @@ int lxc_setup(struct lxc_handler *handler)
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to setup first automatic mounts");
+ 
++#ifdef HAVE_ISULAD
++	/* Now mount only cgroups, if wanted. Before, /sys could not have been
++	 * mounted. It is guaranteed to be mounted now either through
++	 * automatically or via fstab entries.
++	 */
++	ret = lxc_mount_auto_mounts(handler, lxc_conf->auto_mounts & LXC_AUTO_CGROUP_MASK);
++	if (ret < 0)
++		return log_error(-1, "Failed to setup remaining automatic mounts");
++#endif
++
+ 	ret = setup_mount_fstab(&lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath);
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to setup mounts");
+@@ -4410,6 +4705,10 @@ int lxc_setup(struct lxc_handler *handler)
+ 		ret = setup_mount_entries(lxc_conf, &lxc_conf->rootfs, name, lxcpath);
+ 		if (ret < 0)
+ 			return log_error(-1, "Failed to setup mount entries");
++#ifdef HAVE_ISULAD
++		setup_dev = need_setup_dev(lxc_conf, &lxc_conf->mount_entries);
++		setup_proc = need_setup_proc(lxc_conf, &lxc_conf->mount_entries);
++#endif
+ 	}
+ 
+ 	if (!lxc_sync_wake_parent(handler, START_SYNC_IDMAPPED_MOUNTS))
+@@ -4424,6 +4723,7 @@ int lxc_setup(struct lxc_handler *handler)
+ 	if (lxc_conf->rootfs.dfd_dev < 0 && errno != ENOENT)
+ 		return log_error_errno(-errno, errno, "Failed to open \"/dev\"");
+ 
++#ifndef HAVE_ISULAD
+ 	/* Now mount only cgroups, if wanted. Before, /sys could not have been
+ 	 * mounted. It is guaranteed to be mounted now either through
+ 	 * automatically or via fstab entries.
+@@ -4431,6 +4731,7 @@ int lxc_setup(struct lxc_handler *handler)
+ 	ret = lxc_mount_auto_mounts(handler, lxc_conf->auto_mounts & LXC_AUTO_CGROUP_MASK);
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to setup remaining automatic mounts");
++#endif
+ 
+ 	ret = run_lxc_hooks(name, "mount", lxc_conf, NULL);
+ 	if (ret < 0)
+@@ -4453,13 +4754,28 @@ int lxc_setup(struct lxc_handler *handler)
+ 	if (!verify_start_hooks(lxc_conf))
+ 		return log_error(-1, "Failed to verify start hooks");
+ 
++#ifdef HAVE_ISULAD
++	if (setup_proc)
++#endif
+ 	ret = lxc_create_tmp_proc_mount(lxc_conf);
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to mount transient procfs instance for LSMs");
+ 
++#ifdef HAVE_ISULAD
++	if (setup_rootfs_mountopts(&lxc_conf->rootfs)) {
++			return log_error(-1, "failed to set rootfs for '%s'", name);
++	}
++	if (lxc_conf->rootfs.path != NULL && setup_dev) {
++		ret = lxc_setup_devpts_child(handler);
++		if (ret < 0) {
++			return log_error(-1, "Failed to setup new devpts instance for '%s'", name);
++		}
++	}
++#else
+ 	ret = lxc_setup_devpts_child(handler);
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to prepare new devpts instance");
++#endif
+ 
+ 	ret = lxc_finish_devpts_child(handler);
+ 	if (ret < 0)
+@@ -4478,6 +4794,12 @@ int lxc_setup(struct lxc_handler *handler)
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to setup \"/dev\" symlinks");
+ 
++#ifdef HAVE_ISULAD
++	/* Ask father to run oci prestart hooks and wait for him to finish. */
++	if (lxc_sync_barrier_parent(handler, LXC_SYNC_OCI_PRESTART_HOOK)) {
++		return log_error(-1, "Failed to sync parent to start host hook");
++	}
++#endif
+ 	ret = lxc_setup_rootfs_switch_root(&lxc_conf->rootfs);
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to pivot root into rootfs");
+@@ -4491,6 +4813,11 @@ int lxc_setup(struct lxc_handler *handler)
+ 	if (lxc_conf->autodev > 0)
+ 		(void)lxc_setup_boot_id();
+ 
++#ifdef HAVE_ISULAD
++	/*isulad: set system umask */
++	umask(lxc_conf->umask);
++#endif
++
+ 	ret = setup_personality(lxc_conf->personality);
+ 	if (ret < 0)
+ 		return syserror("Failed to set personality");
+@@ -4503,6 +4830,37 @@ int lxc_setup(struct lxc_handler *handler)
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to setup sysctl parameters");
+ 
++#ifdef HAVE_ISULAD
++	// isulad: setup rootfs ro paths
++	if (!lxc_list_empty(&lxc_conf->rootfs.ropaths)) {
++		if (setup_rootfs_ropaths(&lxc_conf->rootfs.ropaths)) {
++			return log_error(-1, "failed to setup readonlypaths");
++		}
++	}
++	
++	// isulad: setup rootfs masked paths
++	if (!lxc_list_empty(&lxc_conf->rootfs.maskedpaths)) {
++		if (setup_rootfs_maskedpaths(&lxc_conf->rootfs.maskedpaths)) {
++			return log_error(-1, "failed to setup maskedpaths");
++		}
++	}
++
++	//isulad: system container, remount /proc/sys/xxx by mount_list
++	if (lxc_conf->systemd != NULL && strcmp(lxc_conf->systemd, "true") == 0) {
++		if (!lxc_list_empty(&lxc_conf->mount_list)) {
++			if (remount_proc_sys_mount_entries(&lxc_conf->mount_list,
++							   lxc_conf->lsm_aa_allow_nesting)) {
++				return log_error(-1, "failed to remount /proc/sys");
++			}
++		}
++        }
++
++	// isulad: create link /etc/mtab for /proc/mounts
++	if (create_mtab_link() != 0) {
++		return log_error(-1, "failed to create link /etc/mtab for target /proc/mounts");
++	}
++#endif
++
+ 	ret = setup_capabilities(lxc_conf);
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to setup capabilities");
+@@ -4876,6 +5234,27 @@ void lxc_conf_free(struct lxc_conf *conf)
+ 	free(conf->cgroup_meta.systemd_scope);
+ 	free(conf->shmount.path_host);
+ 	free(conf->shmount.path_cont);
++
++#ifdef HAVE_ISULAD
++	free(conf->container_info_file);
++	if (conf->exit_fd != -1) {
++		close(conf->exit_fd);
++	}
++	free(conf->systemd);
++	lxc_clear_init_args(conf);
++	lxc_clear_init_groups(conf);
++	lxc_clear_populate_devices(conf);
++	lxc_clear_rootfs_masked_paths(conf);
++	lxc_clear_rootfs_ro_paths(conf);
++	free(conf->errmsg);
++	lxc_close_error_pipe(conf->errpipe);
++	if (conf->ocihooks) {
++		free_oci_runtime_spec_hooks(conf->ocihooks);
++	}
++	free(conf->lsm_se_mount_context);
++	free(conf->lsm_se_keyring_context);
++#endif
++
+ 	free(conf);
+ }
+ 
+@@ -5798,3 +6177,1321 @@ int lxc_set_environment(const struct lxc_conf *conf)
+ 
+ 	return 0;
+ }
++
++#ifdef HAVE_ISULAD
++/* isulad drop caps for container*/
++int lxc_drop_caps(struct lxc_conf *conf)
++{
++#define __DEF_CAP_TO_MASK(x) (1U << ((x) & 31))
++#if HAVE_LIBCAP
++	int ret = 0;
++	struct lxc_list *iterator = NULL;
++	char *keep_entry = NULL;
++	size_t i = 0;
++	int capid;
++	size_t numcaps = (size_t)lxc_caps_last_cap() + 1;
++	struct lxc_list *caps = NULL;
++	int *caplist = NULL;
++
++	if (lxc_list_empty(&conf->keepcaps))
++		return 0;
++
++	caps = &conf->keepcaps;
++
++	if (numcaps <= 0 || numcaps > 200)
++		return -1;
++
++	// caplisti is 1 if we keep capability i
++	caplist = malloc(numcaps * sizeof(int));
++	if (caplist == NULL) {
++		ERROR("Out of memory");
++		return -1;
++	}
++	(void)memset(caplist, 0, numcaps * sizeof(int));
++
++	lxc_list_for_each(iterator, caps) {
++
++		keep_entry = iterator->elem;
++		/* isulad: Do not keep any cap*/
++		if (strcmp(keep_entry, "ISULAD_KEEP_NONE") == 0) {
++			DEBUG("Do not keep any capability");
++			for(i = 0; i < numcaps; i++) {
++				caplisti = 0;
++			}
++			break;
++		}
++
++		capid = parse_cap(keep_entry);
++
++		if (capid == -2)
++			continue;
++
++		if (capid < 0) {
++			ERROR("unknown capability %s", keep_entry);
++			ret = -1;
++			goto out;
++		}
++
++		DEBUG("keep capability '%s' (%d)", keep_entry, capid);
++
++		caplistcapid = 1;
++	}
++
++	struct __user_cap_header_struct cap_header_data;
++	struct __user_cap_data_struct cap_data_data2;
++
++	cap_user_header_t cap_header = &cap_header_data;
++	cap_user_data_t cap_data = &cap_data_data0;
++
++	memset(cap_header, 0,sizeof(struct __user_cap_header_struct));
++	memset(cap_data, 0, sizeof(struct __user_cap_data_struct) * 2);
++
++	cap_header->pid = 0;
++	cap_header->version = _LINUX_CAPABILITY_VERSION_3;
++
++	for (i = 0; i < numcaps; i++) {
++		if (caplisti) {
++			cap_dataCAP_TO_INDEX(i).effective = cap_dataCAP_TO_INDEX(i).effective | (i > 31 ? __DEF_CAP_TO_MASK(i % 32) : __DEF_CAP_TO_MASK(i));
++			cap_dataCAP_TO_INDEX(i).permitted = cap_dataCAP_TO_INDEX(i).permitted | (i > 31 ? __DEF_CAP_TO_MASK(i % 32) : __DEF_CAP_TO_MASK(i));
++			// fix CVE-2022-24769
++			// inheritable capability should be empty
++		}
++	}
++
++	if (capset(cap_header, cap_data)) {
++		SYSERROR("Failed to set capabilitys");
++		ret = -1;
++		goto out;
++	}
++
++out:
++	free(caplist);
++	return ret;
++#else
++	return 0;
++#endif
++}
++
++static bool have_dev_bind_mount_entry(FILE *file)
++{
++	bool have_bind_dev = false;
++	char bufPATH_MAX;
++	struct mntent mntent;
++
++	while (getmntent_r(file, &mntent, buf, sizeof(buf))) {
++		mntent.mnt_dir = lxc_string_replace(SPACE_MAGIC_STR, " ", mntent.mnt_dir);
++		if(!mntent.mnt_dir) {
++			SYSERROR("memory allocation error");
++			continue;
++		}
++
++		if (strcmp(mntent.mnt_dir, "dev") == 0 && strcmp(mntent.mnt_type, "bind") == 0) {
++			have_bind_dev = true;
++		}
++
++		free(mntent.mnt_dir);
++		mntent.mnt_dir = NULL;
++
++		if (have_bind_dev)
++			return true;
++	}
++
++	return false;
++}
++
++// returns true if /dev needs to be set up.
++static bool need_setup_dev(const struct lxc_conf *conf, struct lxc_list *mount)
++{
++	__do_fclose FILE *f = NULL;
++
++	f = make_anonymous_mount_file(mount, conf->lsm_aa_allow_nesting);
++	if (!f)
++		return true;
++
++	if (have_dev_bind_mount_entry(f)) {
++		return false;
++	} else {
++		return true;
++	}
++}
++
++static bool have_proc_bind_mount_entry(FILE *file)
++{
++	bool have_bind_proc = false;
++	char bufPATH_MAX = { 0 };
++	struct mntent mntent;
++
++	while (getmntent_r(file, &mntent, buf, sizeof(buf))) {
++		mntent.mnt_dir = lxc_string_replace(SPACE_MAGIC_STR, " ", mntent.mnt_dir);
++		if(mntent.mnt_dir == NULL) {
++			SYSERROR("memory allocation error");
++			continue;
++		}
++
++		DEBUG("parsed mnt %s, %s, %s", mntent.mnt_fsname, mntent.mnt_dir, mntent.mnt_type);
++
++		if (strcmp(mntent.mnt_dir, "proc") == 0 && strcmp(mntent.mnt_type, "bind") == 0) {
++			have_bind_proc = true;
++		}
++
++		free(mntent.mnt_dir);
++		mntent.mnt_dir = NULL;
++
++		if (have_bind_proc)
++			return true;
++	}
++
++	return false;
++}
++
++// returns true if /proc needs to be set up.
++static bool need_setup_proc(const struct lxc_conf *conf, struct lxc_list *mount)
++{
++	__do_fclose FILE *f = NULL;
++
++	f = make_anonymous_mount_file(mount, conf->lsm_aa_allow_nesting);
++	if (f == NULL)
++		return true;
++
++	if (have_proc_bind_mount_entry(f)) {
++		return false;
++	} else {
++		return true;
++	}
++}
++
++static int mount_entry_with_loop_dev(const char *src, const char *dest, const char *fstype,
++		char *mnt_opts, const char *rootfs)
++{
++	int srcfd = -1, destfd, ret, saved_errno;
++	char srcbuf50, destbuf50; // only needs enough for /proc/self/fd/<fd>
++	const char *mntsrc = src;
++	int max_retry = 5;
++	struct lxc_storage loop;
++
++	if (!rootfs)
++		rootfs = "";
++
++	/* todo - allow symlinks for relative paths if 'allowsymlinks' option is passed */
++	if (src && src0 != '/') {
++		INFO("this is a relative mount");
++		srcfd = open_without_symlink(src, NULL);
++		if (srcfd < 0)
++			return srcfd;
++		ret = snprintf(srcbuf, sizeof(srcbuf), "/proc/self/fd/%d", srcfd);
++		if (ret < 0 || ret > sizeof(srcbuf)) {
++			close(srcfd);
++			ERROR("Failed to print string");
++			return -EINVAL;
++		}
++		mntsrc = srcbuf;
++	}
++
++	destfd = open_without_symlink(dest, rootfs);
++	if (destfd < 0) {
++		if (srcfd != -1) {
++			saved_errno = errno;
++			close(srcfd);
++			errno = saved_errno;
++		}
++		return destfd;
++	}
++
++	ret = snprintf(destbuf, sizeof(destbuf), "/proc/self/fd/%d", destfd);
++	if (ret < 0 || ret > sizeof(destbuf)) {
++		if (srcfd != -1)
++			close(srcfd);
++		close(destfd);
++		ERROR("Out of memory");
++		return -EINVAL;
++	}
++
++retry:
++	loop.src = (char *)mntsrc;
++	loop.dest = destbuf;
++	loop.mntopts = mnt_opts;
++	loop.type = "loop";
++	loop.lofd = -1;
++	ret = loop_mount(&loop);
++	if (ret < 0) {
++		/* If loop is used by other program, mount may fail. So
++		 * we do retry to ensure mount ok */
++		if (max_retry > 0) {
++			max_retry--;
++			DEBUG("mount entry with loop dev failed, retry mount."
++			      "retry count left %d", max_retry);
++			goto retry;
++		}
++	}
++	if (loop.lofd != -1)
++		close(loop.lofd);
++	if (srcfd != -1)
++		close(srcfd);
++	close(destfd);
++	if (ret < 0) {
++		SYSERROR("Failed to mount %s onto %s", src, dest);
++		return ret;
++	}
++
++	return 0;
++}
++
++/* isulad: checkMountDestination checks to ensure that the mount destination is not over the top of /proc.
++ * dest is required to be an abs path and have any symlinks resolved before calling this function. */
++static int check_mount_destination(const char *rootfs, const char *dest, const char *src)
++{
++	const char *invalid_destinations = {
++		"/proc",
++		NULL
++	};
++	// White list, it should be sub directories of invalid destinations
++	const char *valid_destinations = {
++		// These entries can be bind mounted by files emulated by fuse,
++		// so commands like top, free displays stats in container.
++		"/proc/cpuinfo",
++		"/proc/diskstats",
++		"/proc/meminfo",
++		"/proc/stat",
++		"/proc/swaps",
++		"/proc/uptime",
++		"/proc/net/dev",
++		NULL
++	};
++	const char **valid = NULL;
++	const char **invalid = NULL;
++
++	for(valid = valid_destinations; *valid != NULL; valid++) {
++		__do_free char *fullpath = NULL;
++		__do_free char *relpath = NULL;
++		const char *parts3 = {
++			rootfs,
++			*valid,
++			NULL
++		};
++		fullpath = lxc_string_join("/", parts, false);
++		if (fullpath == NULL) {
++			ERROR("Out of memory");
++			return -1;
++		}
++		relpath = path_relative(fullpath, dest);
++		if (relpath == NULL) {
++			ERROR("Failed to get relpath for %s related to %s", dest, fullpath);
++			return -1;
++		}
++		if (!strcmp(relpath, ".")) {
++			return 0;
++		}
++	}
++
++	for(invalid = invalid_destinations; *invalid != NULL; invalid++) {
++		__do_free char *fullpath = NULL;
++		__do_free char *relpath = NULL;
++		const char *parts3 = {
++			rootfs,
++			*invalid,
++			NULL
++		};
++		fullpath = lxc_string_join("/", parts, false);
++		if (fullpath == NULL) {
++			ERROR("Out of memory");
++			return -1;
++		}
++		relpath = path_relative(fullpath, dest);
++		DEBUG("dst path %s get relative path %s with full path %s,src:%s", dest, relpath, fullpath, src);
++		if (relpath == NULL) {
++			ERROR("Failed to get relpath for %s related to %s", dest, fullpath);
++			return -1;
++		}
++		// pass if the mount path is outside of invalid proc
++		if (strncmp(relpath, "..", 2) == 0) {
++			continue;
++		}
++		if (strcmp(relpath, ".") == 0) {
++			if (src == NULL) {
++				continue;
++			}
++			// pass if the mount on top of /proc and the source of the mount is a proc filesystem
++			if (has_fs_type(src, PROC_SUPER_MAGIC)) {
++				WARN("src %s is proc allow mount on-top of %s", src, *invalid);
++				continue;
++			}
++			ERROR("%s cannot be mounted because it is located inside %s", dest, *invalid);
++			return -1;
++		}
++	}
++
++	return 0;
++}
++
++// maskPath masks the top of the specified path inside a container to avoid
++// security issues from processes reading information from non-namespace aware
++// mounts ( proc/kcore ).
++static bool mask_path(const char *path)
++{
++	int ret;
++
++	if (!path)
++		return true;
++
++	ret = mount("/dev/null", path, "", MS_BIND, "");
++	if (ret < 0 && errno != ENOENT) {
++		if (errno == ENOTDIR) {
++			ret = mount("tmpfs", path, "tmpfs", MS_RDONLY, "");
++			if (ret < 0)
++				goto error;
++			return true;
++		}
++		goto error;
++	}
++	return true;
++
++error:
++	SYSERROR("Failed to mask path \"%s\": %s", path, strerror(errno));
++	return false;
++}
++
++static bool remount_readwrite(const char *path)
++{
++	int ret, i;
++
++	if (!path)
++		return true;
++
++	for (i = 0; i < 5; i++) {
++		ret = mount("", path, "", MS_REMOUNT, "");
++		if (ret < 0 && errno != ENOENT) {
++			if (errno == EINVAL) {
++				// Probably not a mountpoint, use bind-mount
++				ret = mount(path, path, "", MS_BIND, "");
++				if (ret < 0)
++					goto on_error;
++				ret = mount(path, path, "", MS_BIND | MS_REMOUNT | MS_REC | \
++					    MS_NOEXEC | MS_NOSUID | MS_NODEV, "");
++				if (ret < 0)
++					goto on_error;
++			} else if (errno == EBUSY) {
++				DEBUG("Try to mount \"%s\" to readonly after 100ms.", path);
++				usleep(100 * 1000);
++				continue;
++			} else {
++				goto on_error;
++			}
++		}
++		return true;
++	}
++
++on_error:
++	SYSERROR("Unable to mount \"%s\" to readwrite", path);
++	return false;
++}
++
++static int remount_proc_sys_mount_entries(struct lxc_list *mount_list, bool lsm_aa_allow_nesting)
++{
++	char buf4096;
++	FILE *file;
++	struct mntent mntent;
++
++	file = make_anonymous_mount_file(mount_list, lsm_aa_allow_nesting);
++	if (!file)
++		return -1;
++
++	while (getmntent_r(file, &mntent, buf, sizeof(buf))) {
++		if (strstr(mntent.mnt_dir, "proc/sys") == NULL) {
++			continue;
++		}
++
++		if (!remount_readwrite((const char*)mntent.mnt_dir)) {
++			fclose(file);
++			return -1;
++		}
++	}
++
++	fclose(file);
++	return 0;
++}
++
++// remount_readonly will bind over the top of an existing path and ensure that it is read-only.
++static bool remount_readonly(const char *path)
++{
++	int ret, i;
++
++	if (!path)
++		return true;
++
++	for (i = 0; i < 5; i++) {
++		ret = mount("", path, "", MS_REMOUNT | MS_RDONLY, "");
++		if (ret < 0 && errno != ENOENT) {
++			if (errno == EINVAL) {
++				// Probably not a mountpoint, use bind-mount
++				ret = mount(path, path, "", MS_BIND, "");
++				if (ret < 0)
++					goto on_error;
++				ret = mount(path, path, "", MS_BIND | MS_REMOUNT | MS_RDONLY | MS_REC | \
++				            MS_NOEXEC | MS_NOSUID | MS_NODEV, "");
++				if (ret < 0)
++					goto on_error;
++			} else if (errno == EBUSY) {
++				DEBUG("Try to mount \"%s\" to readonly after 100ms.", path);
++				usleep(100 * 1000);
++				continue;
++			} else {
++				goto on_error;
++			}
++		}
++		return true;
++	}
++
++on_error:
++	SYSERROR("Unable to mount \"%s\" to readonly", path);
++	return false;
++}
++
++// isulad: setup rootfs masked paths
++static int setup_rootfs_maskedpaths(struct lxc_list *maskedpaths)
++{
++	struct lxc_list *it;
++
++	lxc_list_for_each(it, maskedpaths) {
++		if (!mask_path((char *)it->elem))
++			return -1;
++	}
++
++	return 0;
++}
++// isulad: setup rootfs ro paths
++static int setup_rootfs_ropaths(struct lxc_list *ropaths)
++{
++	struct lxc_list *it;
++
++	lxc_list_for_each(it, ropaths) {
++		if (!remount_readonly((char *)it->elem))
++			return -1;
++	}
++
++	return 0;
++}
++
++static int rootfs_parent_mount_private(char *rootfs)
++{
++	/* walk /proc/self/mountinfo and change parent of rootfs to private */
++	FILE *f = fopen("/proc/self/mountinfo", "r");
++	char *line = NULL;
++	char *parent = NULL, *options = NULL;
++	size_t len = 0;
++	int ret = 0;
++
++	if (!f) {
++		SYSERROR("Failed to open /proc/self/mountinfo to make parent of rootfs to private");
++		return -1;
++	}
++
++	while (getline(&line, &len, f) != -1) {
++		char *target = NULL;
++		char *opts = NULL;
++		char *tmptarget = NULL;
++		target = get_field(line, 4);
++		if (!target)
++			continue;
++		tmptarget = safe_strdup(target);
++		null_endofword(tmptarget);
++		if (!strstr(rootfs, tmptarget)) {
++			free(tmptarget);
++			continue;
++		}
++		if (!parent || strlen(tmptarget) > strlen(parent)) {
++			free(parent);
++			parent = tmptarget;
++		} else {
++			free(tmptarget);
++			continue;
++		}
++		opts = get_field(target, 2);
++		if (!opts)
++			continue;
++		null_endofword(opts);
++		free(options);
++		options = safe_strdup(opts);
++	}
++
++	if (!parent || !options) {
++		ERROR("Could not find parent mount of %s", rootfs);
++		ret = -1;
++	} else {
++		if (strstr(options, "shared")) {
++			if (mount(NULL, parent, NULL, MS_PRIVATE, NULL)) {
++				SYSERROR("Failed to make %s private", parent);
++				ret = -1;
++			}
++			DEBUG("Mounted parent %s of rootfs %s to private", parent, rootfs);
++		}
++	}
++	free(parent);
++	free(options);
++	fclose(f);
++	free(line);
++	return ret;
++}
++
++/* isulad: setup devices which will be populated in the container.*/
++static int setup_populate_devs(const struct lxc_rootfs *rootfs, struct lxc_list *devs, const char *mount_label)
++{
++	int ret = 0;
++	char *pathdirname = NULL;
++	char pathMAXPATHLEN;
++	mode_t file_mode = 0;
++	struct lxc_populate_devs *dev_elem = NULL;
++	struct lxc_list *it = NULL;
++	mode_t cur_mask;
++
++	INFO("Populating devices into container");
++	cur_mask = umask(0000);
++	lxc_list_for_each(it, devs) {
++		__do_free char *tmp_path = NULL;
++		ret = 0;
++		dev_elem = it->elem;
++
++		ret = snprintf(path, MAXPATHLEN, "%s/%s", rootfs->path ? rootfs->mount : "", dev_elem->name);
++		if (ret < 0 || ret >= MAXPATHLEN) {
++			ret = -1;
++			goto reset_umask;
++		}
++
++		/* create any missing directories */
++		tmp_path = safe_strdup(path);
++		pathdirname = dirname(tmp_path);
++		ret = mkdir_p(pathdirname, 0755);
++		if (ret < 0) {
++			WARN("Failed to create target directory");
++			ret = -1;
++			goto reset_umask;
++		}
++
++		if (!strcmp(dev_elem->type, "c")) {
++			file_mode = dev_elem->file_mode | S_IFCHR;
++		} else if (!strcmp(dev_elem->type, "b")) {
++			file_mode = dev_elem->file_mode | S_IFBLK;
++		} else {
++			ERROR("Failed to parse devices type '%s'", dev_elem->type);
++			ret = -1;
++			goto reset_umask;
++		}
++
++		DEBUG("Try to mknod '%s':'%d':'%d':'%d'\n", path,
++		      file_mode, dev_elem->maj, dev_elem->min);
++
++		ret = mknod(path, file_mode, makedev(dev_elem->maj, dev_elem->min));
++		if (ret && errno != EEXIST) {
++			SYSERROR("Failed to mknod '%s':'%d':'%d':'%d'", dev_elem->name,
++			         file_mode, dev_elem->maj, dev_elem->min);
++
++			char hostpathMAXPATHLEN;
++			FILE *pathfile = NULL;
++
++			// Unprivileged containers cannot create devices, so
++			// try to bind mount the device from the host
++			// dev_elem name is the device path
++			ret = snprintf(hostpath, MAXPATHLEN, "%s", dev_elem->name);
++			if (ret < 0 || ret >= MAXPATHLEN) {
++				ret = -1;
++				goto reset_umask;
++			}
++			pathfile = lxc_fopen(path, "wb");
++			if (!pathfile) {
++				SYSERROR("Failed to create device mount target '%s'", path);
++				ret = -1;
++				goto reset_umask;
++			}
++			fclose(pathfile);
++			if (safe_mount(hostpath, path, 0, MS_BIND, NULL,
++			                rootfs->path ? rootfs->mount : NULL, mount_label) != 0) {
++				SYSERROR("Failed bind mounting device %s from host into container",
++				         dev_elem->name);
++				ret = -1;
++				goto reset_umask;
++			}
++		}
++		if (chown(path, dev_elem->uid, dev_elem->gid) < 0) {
++			ERROR("Error chowning %s", path);
++			ret = -1;
++			goto reset_umask;
++		}
++		ret = 0;
++	}
++
++reset_umask:
++	(void)umask(cur_mask);
++
++	INFO("Populated devices into container /dev");
++	return ret;
++}
++
++// isulad: setup rootfs mountopts
++static int setup_rootfs_mountopts(const struct lxc_rootfs *rootfs)
++{
++	unsigned long mflags, mntflags, pflags;
++	__do_free char *mntdata = NULL;
++
++	if(!rootfs || !rootfs->options)
++		return 0;
++
++	if (parse_mntopts_legacy(rootfs->options, &mntflags, &mntdata) < 0) {
++		return -1;
++	}
++
++	ret = parse_propagationopts(rootfs->options, &pflags);
++	if (ret < 0) {
++		return -EINVAL;
++	}
++
++	if (mntflags & MS_RDONLY) {
++		mflags = add_required_remount_flags("/", NULL, MS_BIND | MS_REC | mntflags | pflags | MS_REMOUNT);
++		DEBUG("remounting / as readonly");
++		if (mount("/", "/", NULL, mflags, 0) < 0) {
++			SYSERROR("Failed to make / readonly.");
++			return -1;
++		}
++	}
++	return 0;
++}
++
++static int create_mtab_link()
++{
++	ssize_t ret;
++	int mret;
++	struct stat sbuf;
++	const char *pathname = "/proc/mounts";
++	const char *slink = "/etc/mtab";
++
++	if (file_exists(slink)) {
++		return 0;
++	}
++
++	ret = stat(pathname, &sbuf);
++	if (ret < 0) {
++		SYSERROR("Failed to stat %s: %s", pathname, strerror(errno));
++		return -1;
++	}
++
++	mret = symlink(pathname, slink);
++	if (mret < 0 && errno != EEXIST) {
++		if (errno == EROFS) {
++			WARN("Failed to create link %s for target %s. Read-only filesystem", slink, pathname);
++		} else {
++			SYSERROR("Failed to create \"%s\"", slink);
++			return -1;
++		}
++	}
++
++	return 0;
++}
++
++struct oci_hook_conf {
++	defs_hook *ocihook;
++
++	int errfd;
++	int which;
++};
++
++struct wait_conf {
++	pid_t pid;
++	unsigned long long startat;
++	int timeout;
++	int errfd;
++	int which;
++};
++
++static char* generate_json_str(const char *name, const char *lxcpath, const char *rootfs)
++{
++	char *cpid = NULL;
++	char *inmsg = NULL;
++	int rc = 0, ret = 0;
++	size_t size;
++
++	if (!name || !lxcpath || !rootfs) {
++		ERROR("Invalid arguments");
++		return NULL;
++	}
++	cpid = getenv("LXC_PID");
++	if (!cpid) {
++		ERROR("Get container %s pid failed: %s", name, strerror(errno));
++		cpid = "-1";
++	}
++
++	if ((strlen(name) + strlen(cpid) + strlen(rootfs) + strlen(lxcpath) + strlen(name)) >
++	       SIZE_MAX - (strlen("{\"ociVersion\":\"\",\"id\":\"\",\"pid\":,\"root\":\"\",\"bundle\":\"\"}") - 1 - 1)) {
++		ERROR("Out of memory");
++		ret = -1;
++		goto out_free;
++	}
++
++	// {"ociVersion":"","id":"xxx","pid":777,"root":"xxx","bundle":"xxx"}
++	size = strlen("{\"ociVersion\":\"\",\"id\":\"\",\"pid\":,\"root\":\"\",\"bundle\":\"\"}") +
++	       strlen(name) + strlen(cpid) + strlen(rootfs) + strlen(lxcpath) + 1 + strlen(name) + 1;
++	inmsg = malloc(size);
++	if (inmsg == NULL) {
++		ERROR("Out of memory");
++		ret = -1;
++		goto out_free;
++	}
++	rc = snprintf(inmsg, size,
++	              "{\"ociVersion\":\"\",\"id\":\"%s\",\"pid\":%s,\"root\":\"%s\",\"bundle\":\"%s/%s\"}",
++	              name, cpid, rootfs, lxcpath, name);
++	if (rc < 0 || rc >= size) {
++		ERROR("Create json string failed");
++		ret = -1;
++	}
++
++out_free:
++	if (ret) {
++		free(inmsg);
++		inmsg = NULL;
++	}
++	return inmsg;
++}
++
++static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_env_len)
++{
++	char **result  = NULL;
++	size_t result_len = env_len;
++	size_t i = 0;
++	size_t j, k;
++	char *tmpenv = NULL;
++	char *lxc_envs = {"LD_LIBRARY_PATH", "PATH", "LXC_CGNS_AWARE", "LXC_PID", "LXC_ROOTFS_MOUNT",
++	                    "LXC_CONFIG_FILE", "LXC_CGROUP_PATH", "LXC_ROOTFS_PATH", "LXC_NAME"
++	                   };
++	char *lxcenv_buf = NULL;
++
++	if (result_len > SIZE_MAX - (sizeof(lxc_envs) / sizeof(char *)) - 1)
++		return NULL;
++	result_len += (sizeof(lxc_envs) / sizeof(char *)) + 1;
++	result = malloc(sizeof(char *) * result_len);
++	if (result == NULL)
++		return NULL;
++	memset(result, 0, sizeof(char *) * result_len);
++
++	for(j = 0; j < (sizeof(lxc_envs) / sizeof(char *)); j++) {
++		size_t env_buf_len = 0;
++		tmpenv = getenv(lxc_envsj);
++		if (tmpenv && i < (result_len - 1)) {
++			if (strlen(tmpenv) > (SIZE_MAX - 1 - 1 - strlen(lxc_envsj))) {
++				lxc_free_array((void **)result, free);
++				return NULL;
++			}
++			env_buf_len = ((strlen(tmpenv) + 1) + strlen(lxc_envsj)) + 1;
++			lxcenv_buf = malloc(env_buf_len);
++			if (lxcenv_buf == NULL) {
++				lxc_free_array((void **)result, free);
++				return NULL;
++			}
++			if (snprintf(lxcenv_buf, env_buf_len, "%s=%s", lxc_envsj, tmpenv) < 0) {
++				free(lxcenv_buf);
++				continue;
++			}
++			resulti++ = lxcenv_buf;
++			lxcenv_buf = NULL;
++		}
++	}
++
++	for(k = 0; k < env_len; k++) {
++		if (oldenvsk && i < (result_len - 1))
++			resulti++ = safe_strdup(oldenvsk);
++	}
++
++	*merge_env_len = i;
++	return result;
++}
++
++static struct lxc_popen_FILE *lxc_popen_ocihook(const char *commandpath, char **args, int args_len,
++                char **envs, int env_len, const char *instr)
++{
++	int ret;
++	struct lxc_popen_FILE *fp = NULL;
++	int pipe_fds2 = {-1, -1};
++	int pipe_msg2 = {-1, -1};
++	pid_t child_pid;
++
++	ret = pipe2(pipe_fds, O_CLOEXEC | O_NONBLOCK);
++	if (ret < 0)
++		return NULL;
++
++	ret = pipe2(pipe_msg, O_CLOEXEC | O_NONBLOCK);
++	if (ret < 0) {
++		ERROR("Pipe msg failure");
++		close(pipe_fds0);
++		close(pipe_fds1);
++		return NULL;
++	}
++
++	child_pid = fork();
++	if (child_pid < 0)
++		goto on_error;
++
++	if (child_pid == 0) {
++		close(pipe_msg1);
++		if (pipe_msg0 != STDIN_FILENO)
++			dup2(pipe_msg0, STDIN_FILENO);
++		else {
++			if (fcntl(pipe_msg0, F_SETFD, 0) != 0) {
++				fprintf(stderr, "Failed to remove FD_CLOEXEC from fd.");
++				exit(127);
++			}
++		}
++		close(pipe_msg0);
++
++		close(pipe_fds0);
++
++		/* duplicate stdout */
++		if (pipe_fds1 != STDOUT_FILENO)
++			ret = dup2(pipe_fds1, STDOUT_FILENO);
++		else
++			ret = fcntl(pipe_fds1, F_SETFD, 0);
++		if (ret < 0) {
++			close(pipe_fds1);
++			_exit(EXIT_FAILURE);
++		}
++
++		/* duplicate stderr */
++		if (pipe_fds1 != STDERR_FILENO)
++			ret = dup2(pipe_fds1, STDERR_FILENO);
++		else
++			ret = fcntl(pipe_fds1, F_SETFD, 0);
++		close(pipe_fds1);
++		if (ret < 0)
++			_exit(EXIT_FAILURE);
++
++		if (lxc_check_inherited(NULL, true, NULL, 0) != 0) {
++			fprintf(stderr, "check inherited fd failed");
++			exit(127);
++		}
++
++		/*
++		 * Unblock signals.
++		 * This is the main/only reason
++		 * why we do our lousy popen() emulation.
++		 */
++		{
++			sigset_t mask;
++			sigfillset(&mask);
++			sigprocmask(SIG_UNBLOCK, &mask, NULL);
++		}
++
++		if (env_len > 0)
++			execvpe(commandpath, args, envs);
++		else
++			execvp(commandpath, args);
++		fprintf(stderr, "fork/exec %s: %s", commandpath, strerror(errno));
++		exit(127);
++	}
++
++	/* parent */
++
++	close(pipe_fds1);
++	pipe_fds1 = -1;
++
++	close(pipe_msg0);
++	pipe_msg0= -1;
++	if (instr) {
++		size_t len = strlen(instr);
++		if (lxc_write_nointr(pipe_msg1, instr, len) != len) {
++			WARN("Write instr: %s failed", instr);
++		}
++	}
++	close(pipe_msg1);
++	pipe_msg1= -1;
++
++	fp = calloc(1, sizeof(*fp));
++	if (!fp) {
++		ERROR("Failed to allocate memory");
++		goto on_error;
++	}
++
++	fp->child_pid = child_pid;
++	fp->pipe = pipe_fds0;
++
++	return fp;
++
++on_error:
++
++	if (pipe_fds0 >= 0)
++		close(pipe_fds0);
++
++	if (pipe_fds1 >= 0)
++		close(pipe_fds1);
++
++	if (pipe_msg0 >= 0)
++		close(pipe_msg0);
++
++	if (pipe_msg1 >= 0)
++		close(pipe_msg1);
++
++	if (fp)
++		free(fp);
++
++	return NULL;
++}
++
++void* wait_ocihook_timeout(void *arg)
++{
++	bool alive = false;
++	struct wait_conf *conf = (struct wait_conf *)arg;
++
++	if (!conf || conf->timeout < 1)
++		goto out;
++
++	sleep(conf->timeout);
++
++	alive = lxc_process_alive(conf->pid, conf->startat);
++
++	if (alive) {
++		ERROR("%s:%d: running %s hook caused \"hook ran past specified timeout of %.1fs\"",
++		      __FILE__, __LINE__, lxchook_namesconf->which,
++		      (double)conf->timeout);
++
++		lxc_write_error_message(conf->errfd, "%s:%d: running %s hook caused \"hook ran past specified timeout of %.1fs\".",
++		                        __FILE__, __LINE__, lxchook_namesconf->which,
++		                        (double)conf->timeout);
++
++		if (kill(conf->pid, SIGKILL) && errno != ESRCH) {
++			ERROR("Send kill signal failed");
++			goto out;
++		}
++	}
++
++out:
++	free(conf);
++	return ((void *)0);
++}
++
++static int run_ocihook_buffer(struct oci_hook_conf *oconf, const char *inmsg)
++{
++	struct lxc_popen_FILE *f;
++	char outputLXC_LOG_BUFFER_SIZE = {0};
++	int ret;
++	pthread_t ptid;
++	int err;
++	struct wait_conf *conf = NULL;
++	pthread_attr_t attr;
++	char *buffer = oconf->ocihook->path;
++	char *err_args_msg = NULL;
++	char *err_envs_msg = NULL;
++	char **hookenvs = NULL;
++	size_t hookenvs_len = 0;
++
++	hookenvs = merge_ocihook_env(oconf->ocihook->env, oconf->ocihook->env_len, &hookenvs_len);
++	if (!hookenvs) {
++		ERROR("Out of memory.");
++		return -1;
++	}
++
++	f = lxc_popen_ocihook(buffer, oconf->ocihook->args, oconf->ocihook->args_len, hookenvs, hookenvs_len, inmsg);
++	lxc_free_array((void **)hookenvs, free);
++	if (!f) {
++		SYSERROR("Failed to popen() %s.", buffer);
++		return -1;
++	}
++
++	conf = malloc(sizeof(struct wait_conf));
++	if (conf == NULL) {
++		SYSERROR("Failed to malloc.");
++		goto on_error;
++	}
++
++	memset(conf, 0x00, sizeof(struct wait_conf));
++
++	conf->pid = f->child_pid;
++	conf->startat = lxc_get_process_startat(conf->pid);
++
++	INFO("hook_conf timeout %d", oconf->ocihook->timeout);
++	if(oconf->ocihook->timeout > 0)
++		conf->timeout = oconf->ocihook->timeout;
++	else {
++		conf->timeout = 30;
++		INFO("Set hook timeout 30s");
++	}
++	conf->errfd = oconf->errfd;
++	conf->which = oconf->which;
++
++	pthread_attr_init(&attr);
++	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
++	err = pthread_create(&ptid, &attr, wait_ocihook_timeout, conf);
++	pthread_attr_destroy(&attr);
++	if (err != 0) {
++		ERROR("Create wait timeout thread failed");
++		free(conf);
++		goto on_error;
++	}
++
++	ret = lxc_wait_for_pid_status(f->child_pid);
++
++	lxc_read_nointr(f->pipe, output, sizeof(output) - 1);
++	close(f->pipe);
++	free(f);
++
++	if (ret == -1) {
++		SYSERROR("Script exited with error.");
++		goto print_hook;
++	} else if (WIFEXITED(ret) && WEXITSTATUS(ret) != 0) {
++		ERROR("Script exited with status %d. output: %s", WEXITSTATUS(ret), output);
++		lxc_write_error_message(oconf->errfd, "%s:%d: running %s hook caused \"error running hook: exit status %d, output: %s\".",
++		                        __FILE__, __LINE__,
++		                        (oconf->which >= NUM_LXC_HOOKS) ? "invalid type" : lxchook_namesoconf->which,
++		                        WEXITSTATUS(ret), output);
++
++		goto print_hook;
++	} else if (WIFSIGNALED(ret)) {
++		ERROR("Script terminated by signal %d.", WTERMSIG(ret));
++		lxc_write_error_message(oconf->errfd, "%s:%d: running %s hook caused \"error running hook: Script terminated by signal %d\".",
++		                        __FILE__, __LINE__,
++		                        (oconf->which >= NUM_LXC_HOOKS) ? "invalid type" : lxchook_namesoconf->which,
++		                        WTERMSIG(ret));
++
++		goto print_hook;
++	}
++
++	return 0;
++
++on_error:
++	if (f) {
++		if (f->pipe >= 0)
++			close(f->pipe);
++		free(f);
++	}
++
++print_hook:
++	if (oconf->ocihook->args)
++		err_args_msg = lxc_string_join(" ", (const char **)oconf->ocihook->args, false);
++	if (oconf->ocihook->env)
++		err_envs_msg = lxc_string_join(" ", (const char **)oconf->ocihook->env, false);
++	ERROR("Hook script command: \"%s\", args: \"%s\", envs: \"%s\", timeout: %d.",
++	      buffer, err_args_msg ? err_args_msg : "",
++	      err_envs_msg ? err_envs_msg : "", oconf->ocihook->timeout);
++
++	free(err_args_msg);
++	free(err_envs_msg);
++	return -1;
++}
++
++static int run_ocihook_script_argv(const char *name, const char *section,
++                                   struct oci_hook_conf *oconf,
++                                   const char *lxcpath, const char *rootfs)
++{
++	int ret;
++	const char *script = oconf->ocihook->path;
++	char *inmsg = NULL;
++
++	INFO("Executing script \"%s\" for container \"%s\", config section \"%s\".",
++	     script, name, section);
++
++	inmsg = generate_json_str(name, lxcpath, rootfs);
++	if (!inmsg) {
++		return -1;
++	}
++
++	ret = run_ocihook_buffer(oconf, inmsg);
++	free(inmsg);
++	inmsg = NULL;
++	return ret;
++}
++
++static char *get_root_path(const char *path, const char *backend)
++{
++	char *ret = NULL;
++	char *tmp = NULL;
++
++	if (!path) {
++		ret = safe_strdup("/");
++		return ret;
++	}
++	if (!backend) {
++		goto default_out;
++	}
++
++	if (strcmp(backend, "aufs") == 0 ||
++	                strcmp(backend, "overlayfs") == 0 ||
++	                strcmp(backend, "loop") == 0) {
++		tmp = strrchr(path, ':');
++		if (tmp == NULL) {
++			ERROR("Invalid root path format");
++			return NULL;
++		}
++		tmp++;
++		ret = safe_strdup(tmp);
++		return ret;
++	}
++
++default_out:
++	ret = safe_strdup(path);
++	return ret;
++}
++
++static int do_run_oci_hooks(const char *name, const char *lxcpath, struct lxc_conf *lc, int which, int errfd)
++{
++	struct oci_hook_conf work_conf = {0};
++	size_t i;
++	int ret = 0;
++	int nret = 0;
++	char *rootpath = NULL;
++
++	if (!lc) {
++		return -1;
++	}
++	if (!lc->ocihooks) {
++		return 0;
++	}
++
++	rootpath = get_root_path(lc->rootfs.path ? lc->rootfs.mount : NULL, lc->rootfs.bdev_type);
++	if (!rootpath) {
++		ERROR("Get container %s rootpath failed.", name);
++		return -1;
++	}
++
++	work_conf.errfd = errfd;
++	work_conf.which = which;
++	switch (which) {
++	case OCI_HOOK_PRESTART:
++		for (i = 0; i < lc->ocihooks->prestart_len; i++) {
++			work_conf.ocihook = lc->ocihooks->prestarti;
++			ret = run_ocihook_script_argv(name, "lxc", &work_conf, lxcpath, rootpath);
++			if (ret != 0)
++				break;
++		}
++		break;
++	case OCI_HOOK_POSTSTART:
++		for (i = 0; i < lc->ocihooks->poststart_len; i++) {
++			work_conf.ocihook = lc->ocihooks->poststarti;
++			nret = run_ocihook_script_argv(name, "lxc", &work_conf, lxcpath, rootpath);
++			if (nret != 0)
++				WARN("running poststart hook %zu failed, ContainerId: %s", i, name);
++		}
++		break;
++	case OCI_HOOK_POSTSTOP:
++		for (i = 0; i < lc->ocihooks->poststop_len; i++) {
++			work_conf.ocihook = lc->ocihooks->poststopi;
++			nret = run_ocihook_script_argv(name, "lxc", &work_conf, lxcpath, rootpath);
++			if (nret != 0)
++				WARN("running poststart hook %zu failed, ContainerId: %s", i, name);
++		}
++		break;
++	default:
++		ret = -1;
++	}
++	if (rootpath)
++		free(rootpath);
++	return ret;
++}
++
++int run_oci_hooks(const char *name, const char *hookname, struct lxc_conf *conf, const char *lxcpath)
++{
++	int which = -1;
++
++	if (strcmp(hookname, "oci-prestart") == 0) {
++		which = OCI_HOOK_PRESTART;
++		if (!lxcpath) {
++			ERROR("oci hook require lxcpath");
++			return -1;
++		}
++		return do_run_oci_hooks(name, lxcpath, conf, which, conf->errpipe1);
++	} else if (strcmp(hookname, "oci-poststart") == 0) {
++		which = OCI_HOOK_POSTSTART;
++		if (!lxcpath) {
++			ERROR("oci hook require lxcpath");
++			return -1;
++		}
++		return do_run_oci_hooks(name, lxcpath, conf, which, conf->errpipe1);
++	} else if (strcmp(hookname, "oci-poststop") == 0) {
++		which = OCI_HOOK_POSTSTOP;
++		if (!lxcpath) {
++			ERROR("oci hook require lxcpath");
++			return -1;
++		}
++		return do_run_oci_hooks(name, lxcpath, conf, which, conf->errpipe1);
++	} else
++		return -1;
++
++	return 0;
++}
++
++/*isulad clear init args*/
++int lxc_clear_init_args(struct lxc_conf *lxc_conf)
++{
++	int i;
++
++	for (i = 0; i < lxc_conf->init_argc; i++) {
++		free(lxc_conf->init_argvi);
++		lxc_conf->init_argvi = NULL;
++	}
++	free(lxc_conf->init_argv);
++	lxc_conf->init_argv = NULL;
++	lxc_conf->init_argc = 0;
++
++	return 0;
++}
++
++/*isulad clear init groups*/
++int lxc_clear_init_groups(struct lxc_conf *lxc_conf)
++{
++	free(lxc_conf->init_groups);
++	lxc_conf->init_groups = NULL;
++	lxc_conf->init_groups_len = 0;
++
++	return 0;
++}
++
++/*isulad: clear populate devices*/
++int lxc_clear_populate_devices(struct lxc_conf *c)
++{
++	struct lxc_list *it = NULL;
++	struct lxc_list *next = NULL;
++
++	lxc_list_for_each_safe(it, &c->populate_devs, next) {
++		struct lxc_populate_devs *dev_elem = it->elem;
++		lxc_list_del(it);
++		free(dev_elem->name);
++		free(dev_elem->type);
++		free(dev_elem);
++		free(it);
++	}
++	return 0;
++}
++
++/*isulad: clear rootfs masked paths*/
++int lxc_clear_rootfs_masked_paths(struct lxc_conf *c)
++{
++	struct lxc_list *it = NULL;
++	struct lxc_list *next = NULL;
++
++	lxc_list_for_each_safe(it, &c->rootfs.maskedpaths, next) {
++		lxc_list_del(it);
++		free(it->elem);
++		free(it);
++	}
++	return 0;
++}
++
++/*isulad: clear rootfs ro paths*/
++int lxc_clear_rootfs_ro_paths(struct lxc_conf *c)
++{
++	struct lxc_list *it = NULL;
++	struct lxc_list *next = NULL;
++
++	lxc_list_for_each_safe(it, &c->rootfs.ropaths, next) {
++		lxc_list_del(it);
++		free(it->elem);
++		free(it);
++	}
++	return 0;
++}
++
++/*isulad: close error pipe */
++void lxc_close_error_pipe(int *errpipe)
++{
++	if (errpipe0 >= 0) {
++		close(errpipe0);
++		errpipe0 = -1;
++	}
++	if (errpipe1 >= 0) {
++		close(errpipe1);
++		errpipe1 = -1;
++	}
++}
++#endif
+diff --git a/src/lxc/conf.h b/src/lxc/conf.h
+index 82cb66a..683b8ba 100644
+--- a/src/lxc/conf.h
++++ b/src/lxc/conf.h
+@@ -31,6 +31,10 @@
+ #include "syscall_wrappers.h"
+ #include "terminal.h"
+ 
++#ifdef HAVE_ISULAD
++#include "oci_runtime_hooks.h"
++#endif
++
+ #if HAVE_SYS_RESOURCE_H
+ #include <sys/resource.h>
+ #endif
+@@ -255,6 +259,15 @@ struct lxc_rootfs {
+ 	bool managed;
+ 	struct lxc_mount_options mnt_opts;
+ 	struct lxc_storage *storage;
++#ifdef HAVE_ISULAD
++	/* isulad: maskedpaths */
++	struct lxc_list maskedpaths;
++	/* isulad: ropaths */
++	struct lxc_list ropaths;
++
++	/* Linux Security Modules SELinux context for device mount */
++	char *lsm_se_mount_context;
++#endif
+ };
+ 
+ /*
+@@ -345,6 +358,11 @@ enum lxchooks {
+ 	LXCHOOK_CLONE,
+ 	LXCHOOK_DESTROY,
+ 	LXCHOOK_START_HOST,
++#ifdef HAVE_ISULAD
++	OCI_HOOK_PRESTART,
++	OCI_HOOK_POSTSTART,
++	OCI_HOOK_POSTSTOP,
++#endif
+ 	NUM_LXC_HOOKS
+ };
+ 
+@@ -407,6 +425,27 @@ struct string_entry {
+ 	struct list_head head;
+ };
+ 
++#ifdef HAVE_ISULAD
++/*
++ * iSulad: Defines a structure to store the devices which will
++ * be attached in container
++ * @name       : the target device name in container
++ * @type       : the type of target device "c" or "b"
++ * @mode       : file mode for the device
++ * @maj        : major number for the device
++ * @min        : minor number for the device
++ */
++struct lxc_populate_devs {
++	char *name;
++	char *type;
++	mode_t file_mode;
++	int maj;
++	int min;
++	uid_t uid;
++	gid_t gid;
++};
++#endif
++
+ struct lxc_conf {
+ 	/* Pointer to the name of the container. Do not free! */
+ 	const char *name;
+@@ -574,6 +613,37 @@ struct lxc_conf {
+ 
+ 	struct timens_offsets timens;
+ 
++
++#ifdef HAVE_ISULAD
++	/* support oci hook */
++	oci_runtime_spec_hooks *ocihooks;
++
++	/* init args used to repalce init_cmd */
++	char **init_argv;
++	size_t init_argc;
++
++	gid_t *init_groups;
++	size_t init_groups_len;
++
++	/* populate devices */
++	struct lxc_list populate_devs;
++	mode_t umask;  // umask value
++
++	char *container_info_file;
++
++  /* exit fifo fd*/
++	int exit_fd;
++
++  /* record error messages */
++	char *errmsg;
++
++  /* pipdfd for get error message of child or grandchild process */
++	int errpipe2;
++
++  /* systemd value */
++	char *systemd;
++#endif
++
+ 	bool sched_core;
+ 	__u64 sched_core_cookie;
+ };
+@@ -721,4 +791,16 @@ static inline int lxc_personality(personality_t persona)
+ __hidden extern int lxc_set_environment(const struct lxc_conf *conf);
+ __hidden extern int parse_cap(const char *cap_name, __u32 *cap);
+ 
++#ifdef HAVE_ISULAD
++// isulad add
++__hidden int lxc_clear_init_args(struct lxc_conf *lxc_conf);
++__hidden int lxc_clear_init_groups(struct lxc_conf *lxc_conf);
++__hidden int lxc_clear_populate_devices(struct lxc_conf *c);
++__hidden int lxc_clear_rootfs_masked_paths(struct lxc_conf *c);
++__hidden int lxc_clear_rootfs_ro_paths(struct lxc_conf *c);
++__hidden int lxc_drop_caps(struct lxc_conf *conf);
++__hidden int run_oci_hooks(const char *name, const char *hookname, struct lxc_conf *conf, const char *lxcpath);
++__hidden void lxc_close_error_pipe(int *errpipe);
++#endif
++
+ #endif /* __LXC_CONF_H */
+diff --git a/src/lxc/isulad_utils.c b/src/lxc/isulad_utils.c
+index ee39302..889d912 100644
+--- a/src/lxc/isulad_utils.c
++++ b/src/lxc/isulad_utils.c
+@@ -533,3 +533,28 @@ out:
+     funlockfile(stream);
+     return ret;
+ }
++
++ssize_t lxc_write_nointr_for_fifo(int fd, const char *buf, size_t count)
++{
++    ssize_t nret = 0;
++    ssize_t nwritten;
++
++    if (buf == NULL) {
++        return -1;
++    }
++
++    for (nwritten = 0; nwritten < count;) {
++        nret = write(fd, buf + nwritten, count - nwritten);
++        if (nret < 0) {
++                if (errno == EINTR || errno == EAGAIN) {
++                        continue;
++                } else {
++                        return nret;
++                }
++        } else {
++                nwritten += nret;
++        }
++    }
++
++    return nwritten;
++}
+diff --git a/src/lxc/isulad_utils.h b/src/lxc/isulad_utils.h
+index 7a5eb89..93174ae 100644
+--- a/src/lxc/isulad_utils.h
++++ b/src/lxc/isulad_utils.h
+@@ -80,23 +80,25 @@ typedef struct proc_t {
+     processor;      /* current (or most recent?) CPU */
+ } proc_t;
+ 
+-extern int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize);
+-extern void *lxc_common_calloc_s(size_t size);
+-extern char *safe_strdup(const char *src);
++__hidden extern int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize);
++__hidden extern void *lxc_common_calloc_s(size_t size);
++__hidden extern char *safe_strdup(const char *src);
+ 
+-extern int lxc_open(const char *filename, int flags, mode_t mode);
+-extern FILE *lxc_fopen(const char *filename, const char *mode);
++__hidden extern int lxc_open(const char *filename, int flags, mode_t mode);
++__hidden extern FILE *lxc_fopen(const char *filename, const char *mode);
+ 
+-extern void lxc_write_error_message(int errfd, const char *format, ...);
+-extern int lxc_file2str(const char *filename, char ret, int cap);
+-extern int unsigned long long lxc_get_process_startat(pid_t pid);
++__hidden extern void lxc_write_error_message(int errfd, const char *format, ...);
++__hidden extern int lxc_file2str(const char *filename, char ret, int cap);
++__hidden extern int unsigned long long lxc_get_process_startat(pid_t pid);
+ // set env home in container
+-extern int lxc_setup_env_home(uid_t uid);
++__hidden extern int lxc_setup_env_home(uid_t uid);
+ 
+-extern bool lxc_process_alive(pid_t pid, unsigned long long start_time);
++__hidden extern bool lxc_process_alive(pid_t pid, unsigned long long start_time);
+ 
+-extern bool is_non_negative_num(const char *s);
++__hidden extern bool is_non_negative_num(const char *s);
+ 
+-int util_getpwent_r(FILE *stream, struct passwd *resbuf, char *buffer, size_t buflen, struct passwd **result);
++__hidden int util_getpwent_r(FILE *stream, struct passwd *resbuf, char *buffer, size_t buflen, struct passwd **result);
++
++__hidden extern ssize_t lxc_write_nointr_for_fifo(int fd, const char *buf, size_t count);
+ 
+ #endif
+diff --git a/src/lxc/lsm/apparmor.c b/src/lxc/lsm/apparmor.c
+index 23af021..7ff5ba1 100644
+--- a/src/lxc/lsm/apparmor.c
++++ b/src/lxc/lsm/apparmor.c
+@@ -1232,6 +1232,16 @@ static int apparmor_process_label_set(struct lsm_ops *ops, const char *inlabel,
+ 	return log_info(0, "Changed AppArmor profile to %s", label);
+ }
+ 
++#ifdef HAVE_ISULAD
++static int apparmor_file_label_set(const char *path, const char *label) {
++	return 0;
++}
++
++static int apparmor_relabel(const char *path, const char *label, bool shared) {
++	return 0;
++}
++#endif
++
+ static struct lsm_ops apparmor_ops = {
+ 	.name				= "AppArmor",
+ 	.aa_admin			= -1,
+@@ -1250,6 +1260,10 @@ static struct lsm_ops apparmor_ops = {
+ 	.process_label_set 		= apparmor_process_label_set,
+ 	.process_label_get_at 		= apparmor_process_label_get_at,
+ 	.process_label_set_at		= apparmor_process_label_set_at,
++#ifdef HAVE_ISULAD
++	.file_label_set    = apparmor_file_label_set,
++	.relabel           = apparmor_relabel,
++#endif
+ };
+ 
+ struct lsm_ops *lsm_apparmor_ops_init(void)
+diff --git a/src/lxc/lsm/lsm.h b/src/lxc/lsm/lsm.h
+index a26abb8..93e1a99 100644
+--- a/src/lxc/lsm/lsm.h
++++ b/src/lxc/lsm/lsm.h
+@@ -34,6 +34,10 @@ struct lsm_ops {
+ 	int (*process_label_fd_get)(struct lsm_ops *ops, pid_t pid, bool on_exec);
+ 	char *(*process_label_get_at)(struct lsm_ops *ops, int fd_pid);
+ 	int (*process_label_set_at)(struct lsm_ops *ops, int label_fd, const char *label, bool on_exec);
++#ifdef HAVE_ISULAD
++	int (*file_label_set)(const char *path, const char *label);
++	int (*relabel)(const char *path, const char *label, bool share);
++#endif
+ };
+ 
+ __hidden extern struct lsm_ops *lsm_init_static(void);
+diff --git a/src/lxc/lsm/nop.c b/src/lxc/lsm/nop.c
+index 56b97aa..d3f4081 100644
+--- a/src/lxc/lsm/nop.c
++++ b/src/lxc/lsm/nop.c
+@@ -51,6 +51,16 @@ static int nop_process_label_set_at(struct lsm_ops *ops, int label_fd, const cha
+ 	return 0;
+ }
+ 
++#ifdef HAVE_ISULAD
++static int nop_file_label_set(const char *path, const char *label) {
++	return 0;
++}
++
++static int nop_relabel(const char *path, const char *label, bool shared) {
++	return 0;
++}
++#endif
++
+ static struct lsm_ops nop_ops = {
+ 	.name				= "nop",
+ 	.aa_admin			= -1,
+@@ -69,6 +79,10 @@ static struct lsm_ops nop_ops = {
+ 	.process_label_set		= nop_process_label_set,
+ 	.process_label_get_at		= nop_process_label_get_at,
+ 	.process_label_set_at		= nop_process_label_set_at,
++#ifdef HAVE_ISULAD
++	.file_label_set    = nop_file_label_set,
++	.relabel           = nop_relabel,
++#endif
+ };
+ 
+ struct lsm_ops *lsm_nop_ops_init(void)
+diff --git a/src/lxc/lsm/selinux.c b/src/lxc/lsm/selinux.c
+index 9c131ee..5190110 100644
+--- a/src/lxc/lsm/selinux.c
++++ b/src/lxc/lsm/selinux.c
+@@ -9,6 +9,9 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#ifdef HAVE_ISULAD
++#include <selinux/context.h>
++#endif
+ 
+ #include "conf.h"
+ #include "file_utils.h"
+@@ -165,6 +168,255 @@ static int selinux_enabled(struct lsm_ops *ops)
+ 	return is_selinux_enabled();
+ }
+ 
++#ifdef HAVE_ISULAD
++/*
++ * selinux_file_label_set: Set SELinux context of a file
++ *
++ * @path    : a file
++ * @label   : label string
++ *
++ * Returns 0 on success, < 0 on failure
++ */
++static int selinux_file_label_set(const char *path, const char *label)
++{
++	if (path == NULL || label == NULL || strcmp(label, "unconfined_t") == 0) {
++		return 0;
++	}
++
++	if (!is_selinux_enabled()) {
++		return 0;
++	}
++
++	if (lsetfilecon(path, label) != 0) {
++		SYSERROR("Failed to setSELinux context to \"%s\": %s", label, path);
++		return -1;
++	}
++
++	INFO("Changed SELinux context to \"%s\": %s", label, path);
++	return 0;
++}
++
++/*
++ * is_exclude_relabel_path: Determine whether it is a excluded path to label
++ *
++ * @path    : a file or directory
++ *
++ * Returns 0 on success, < 0 on failure
++ */
++static bool is_exclude_relabel_path(const char *path)
++{
++	const char *exclude_path = { "/", "/usr", "/etc", "/tmp", "/home", "/run", "/var", "/root" };
++	size_t i;
++
++	for (i = 0; i < sizeof(exclude_path) / sizeof(char *); i++) {
++		if (strcmp(path, exclude_pathi) == 0) {
++			return true;
++		}
++	}
++
++	return false;
++}
++
++/*
++ * bad_prefix: Prevent users from relabing system files
++ *
++ * @path    : a file or directory
++ *
++ * Returns 0 on success, < 0 on failure
++ */
++static int bad_prefix(const char *fpath)
++{
++	const char *bad_prefixes = "/usr";
++
++	if (fpath == NULL) {
++		ERROR("Empty file path");
++		return -1;
++	}
++
++	if (strncmp(fpath, bad_prefixes, strlen(bad_prefixes)) == 0) {
++		ERROR("relabeling content in %s is not allowed", bad_prefixes);
++		return -1;
++	}
++
++	return 0;
++}
++
++/*
++ * recurse_set_file_label: Recursively label files or folders
++ *
++ * @path    : a file or directory
++ * @label   : label string
++ *
++ * Returns 0 on success, < 0 on failure
++ */
++static int recurse_set_file_label(const char *basePath, const char *label)
++{
++	int ret = 0;
++	__do_closedir DIR *dir = NULL;
++	struct dirent *ptr = NULL;
++	char basePATH_MAX = { 0 };
++
++	if ((dir = opendir(basePath)) == NULL) {
++		ERROR("Failed to Open dir: %s", basePath);
++		return -1;
++	}
++
++	ret = lsetfilecon(basePath, label);
++	if (ret != 0) {
++		ERROR("Failed to set file label");
++		return ret;
++	}
++
++	while ((ptr = readdir(dir)) != NULL) {
++		if (strcmp(ptr->d_name, ".") == 0 || strcmp(ptr->d_name, "..") == 0) {
++			continue;
++		} else {
++			int nret = snprintf(base, sizeof(base), "%s/%s", basePath, ptr->d_name);
++			if (nret < 0 || nret >= sizeof(base)) {
++				ERROR("Failed to get path");
++				return -1;
++			}
++			if (ptr->d_type == DT_DIR) {
++				ret = recurse_set_file_label(base, label);
++				if (ret != 0) {
++					ERROR("Failed to set dir label");
++					return ret;
++				}
++			} else {
++				ret = lsetfilecon(base, label);
++				if (ret != 0) {
++					ERROR("Failed to set file label");
++					return ret;
++				}
++			}
++		}
++	}
++
++	return 0;
++}
++
++/*
++ * selinux_chcon: Chcon changes the `fpath` file object to the SELinux label `label`.
++ * If `fpath` is a directory and `recurse`` is true, Chcon will walk the
++ * directory tree setting the label.
++ *
++ * @fpath   : a file or directory
++ * @label   : label string
++ * @recurse : whether to recurse
++ *
++ * Returns 0 on success, < 0 on failure
++ */
++static int selinux_chcon(const char *fpath, const char *label, bool recurse)
++{
++	struct stat s_buf;
++
++	if (fpath == NULL || label == NULL) {
++		ERROR("Invalid parameters!");
++		return -1;
++	}
++
++	if (bad_prefix(fpath) != 0) {
++		return -1;
++	}
++	if (stat(fpath, &s_buf) != 0) {
++		return -1;
++	}
++	if (recurse && S_ISDIR(s_buf.st_mode)) {
++		return recurse_set_file_label(fpath, label);
++	}
++
++	if (lsetfilecon(fpath, label) != 0) {
++		ERROR("Failed to set file label");
++		return -1;
++	}
++
++	return 0;
++}
++
++/*
++ * convert_context_to_share_mode: set sensitivity to s0 and remove categories
++ * user:role:type:sensitivity:categories => user:role:type:s0
++ *
++ * @label   : label string
++ *
++ * Returns label with share mode on success, NULL on failure
++ */
++static char *convert_context_to_share_mode(const char *label) {
++	__do_free char *converted_label = strdup(label);
++	char *s = converted_label;
++	const char *shared_level = "s0";
++	int cnt = 0;
++
++	// selinux label format: user:role:type:sensitivity:categories
++	// locates the ":" position in front of the sensitivity
++	while (cnt++ < 3 && (s = strchr(s, ':')) != NULL) {
++		s++;
++	}
++
++	// make sure sensitivity can set s0 value
++	if (s == NULL || strlen(s) < strlen(shared_level)) {
++		ERROR("Invalid selinux file context: %s", label);
++		return NULL;
++	}
++
++	if (strcmp(s, shared_level) == 0) {
++		return move_ptr(converted_label);
++	}
++
++	*s = '\0';
++	strcat(converted_label, shared_level);
++
++	return move_ptr(converted_label);
++}
++
++/*
++ * selinux_relabel: Relabel changes the label of path to the filelabel string.
++ * It changes the MCS label to s0 if shared is true.
++ * This will allow all containers to share the content.
++ *
++ * @path    : a file or directory
++ * @label   : label string
++ * @shared  : whether to use share mode
++ *
++ * Returns 0 on success, < 0 on failure
++ */
++static int selinux_relabel(const char *path, const char *label, bool shared)
++{
++	__do_free char *tmp_file_label = NULL;
++
++	if (path == NULL || label == NULL) {
++		return 0;
++	}
++
++	if (!is_selinux_enabled()) {
++		return 0;
++	}
++
++	if (is_exclude_relabel_path(path)) {
++		ERROR("SELinux relabeling of %s is not allowed", path);
++		return -1;
++	}
++
++	if (shared) {
++		tmp_file_label = convert_context_to_share_mode(label);
++		if (tmp_file_label == NULL) {
++			ERROR("Failed to convert context to share mode: %s", label);
++			return -1;
++		}
++	} else {
++		tmp_file_label = strdup(label);
++	}
++
++
++	if (selinux_chcon(path, tmp_file_label, true) != 0) {
++		ERROR("Failed to modify %s's selinux context: %s", path, tmp_file_label);
++		return -1;
++	}
++
++	return 0;
++}
++#endif
++
+ static struct lsm_ops selinux_ops = {
+ 	.name				= "SELinux",
+ 	.aa_admin			= -1,
+@@ -183,6 +435,10 @@ static struct lsm_ops selinux_ops = {
+ 	.process_label_set		= selinux_process_label_set,
+ 	.process_label_get_at		= selinux_process_label_get_at,
+ 	.process_label_set_at		= selinux_process_label_set_at,
++#ifdef HAVE_ISULAD
++	.file_label_set    = selinux_file_label_set,
++	.relabel           = selinux_relabel,
++#endif
+ };
+ 
+ struct lsm_ops *lsm_selinux_ops_init(void)
+diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
+index e58fb21..879e899 100644
+--- a/src/lxc/lxc.h
++++ b/src/lxc/lxc.h
+@@ -88,6 +88,13 @@ __hidden extern lxc_state_t lxc_state(const char *name, const char *lxcpath);
+  */
+ extern struct lxc_container *lxc_container_new(const char *name, const char *configpath);
+ 
++#ifdef HAVE_ISULAD
++/*
++ * Create a new container without loading config.
++ */
++extern struct lxc_container *lxc_container_without_config_new(const char *name, const char *configpath);
++#endif
++
+ /*
+  * Returns 1 on success, 0 on failure.
+  */
+diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
+index acddc13..2c15daf 100644
+--- a/src/lxc/lxclock.c
++++ b/src/lxc/lxclock.c
+@@ -310,3 +310,30 @@ void container_disk_unlock(struct lxc_container *c)
+ 	lxcunlock(c->slock);
+ 	lxcunlock(c->privlock);
+ }
++
++#ifdef HAVE_ISULAD
++static int lxc_removelock(struct lxc_lock *l)
++{
++	int ret = 0;
++
++	if (l->type == LXC_LOCK_FLOCK) {
++		ret = unlink(l->u.f.fname);
++		if (ret && errno != ENOENT) {
++			SYSERROR("Error unlink %s", l->u.f.fname);
++			return ret;
++		}
++	}
++
++	return ret;
++}
++
++int container_disk_removelock(struct lxc_container *c)
++{
++	int ret;
++
++	ret = lxc_removelock(c->slock);
++	if (ret)
++		return ret;
++	return lxc_removelock(c->privlock);
++}
++#endif
+\ No newline at end of file
+diff --git a/src/lxc/lxclock.h b/src/lxc/lxclock.h
+index a20d356..987c3e5 100644
+--- a/src/lxc/lxclock.h
++++ b/src/lxc/lxclock.h
+@@ -158,4 +158,8 @@ __hidden extern int container_disk_lock(struct lxc_container *c);
+  */
+ __hidden extern void container_disk_unlock(struct lxc_container *c);
+ 
++#ifdef HAVE_ISULAD
++__hidden int container_disk_removelock(struct lxc_container *c);
++#endif
++
+ #endif
+diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c
+index a98e21a..765240e 100644
+--- a/src/lxc/mainloop.c
++++ b/src/lxc/mainloop.c
+@@ -532,3 +532,19 @@ void lxc_mainloop_close(struct lxc_async_descr *descr)
+ 
+ 	INIT_LIST_HEAD(&descr->handlers);
+ }
++
++#ifdef HAVE_ISULAD
++int isulad_safe_mainloop(struct lxc_epoll_descr *descr, int timeout_ms)
++{
++    int ret;
++
++    ret = lxc_mainloop(descr, timeout_ms);
++
++    // There are stdout and stderr channels, and two epolls should be performed to prevent
++    // one of the channels from exiting first, causing the other channel to not receive data,
++    // resulting in data loss
++    (void)lxc_mainloop(descr, 100);
++
++    return ret;
++}
++#endif
+diff --git a/src/lxc/mainloop.h b/src/lxc/mainloop.h
+index 7d644b7..e8ce082 100644
+--- a/src/lxc/mainloop.h
++++ b/src/lxc/mainloop.h
+@@ -65,4 +65,8 @@ __hidden extern void lxc_mainloop_close(struct lxc_async_descr *descr);
+ 
+ define_cleanup_function(struct lxc_async_descr *, lxc_mainloop_close);
+ 
++#ifdef HAVE_ISULAD
++__hidden extern int isulad_safe_mainloop(struct lxc_epoll_descr *descr, int timeout_ms);
++#endif
++
+ #endif
+diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c
+index fe8da82..be154af 100644
+--- a/src/lxc/mount_utils.c
++++ b/src/lxc/mount_utils.c
+@@ -539,6 +539,11 @@ bool can_use_mount_api(void)
+ {
+ 	static int supported = -1;
+ 
++#ifdef HAVE_ISULAD
++	// isulad just use save_mount()
++	return supported == 1;
++#endif
++
+ 	if (supported == -1) {
+ 		__do_close int fd = -EBADF;
+ 
+diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
+index 5a725f6..f0fa297 100644
+--- a/src/lxc/seccomp.c
++++ b/src/lxc/seccomp.c
+@@ -352,8 +352,13 @@ static int get_hostarch(void)
+ 	return lxc_seccomp_arch_unknown;
+ }
+ 
++#ifdef HAVE_ISULAD
++static scmp_filter_ctx get_new_ctx(enum lxc_hostarch_t n_arch, uint32_t default_policy_action,
++				   uint32_t *architectures)
++#else
+ static scmp_filter_ctx get_new_ctx(enum lxc_hostarch_t n_arch, uint32_t default_policy_action,
+ 				   bool *needs_merge)
++#endif
+ {
+ 	int ret;
+ 	uint32_t arch;
+@@ -477,9 +482,17 @@ static scmp_filter_ctx get_new_ctx(enum lxc_hostarch_t n_arch, uint32_t default_
+ 		}
+ 		TRACE("Removed native arch from main seccomp context");
+ 
++#ifdef HAVE_ISULAD
++		*architectures = arch;
++#else
+ 		*needs_merge = true;
++#endif
+ 	} else {
++#ifdef HAVE_ISULAD
++		*architectures = SCMP_ARCH_NATIVE;
++#else
+ 		*needs_merge = false;
++#endif
+ 		TRACE("Arch %d already present in main seccomp context", (int)n_arch);
+ 	}
+ 
+@@ -517,8 +530,13 @@ static enum lxc_seccomp_rule_status_t do_resolve_add_rule(uint32_t arch, char *l
+ 					     SCMP_A1(SCMP_CMP_MASKED_EQ, MNT_FORCE, MNT_FORCE));
+ 		if (ret < 0) {
+ 			errno = -ret;
++#ifdef HAVE_ISULAD
++			SYSWARN("Failed loading rule to reject force umount");
++			return lxc_seccomp_rule_added;
++#else
+ 			SYSERROR("Failed loading rule to reject force umount");
+ 			return lxc_seccomp_rule_err;
++#endif
+ 		}
+ 
+ 		INFO("Set seccomp rule to reject force umounts");
+@@ -544,11 +562,19 @@ static enum lxc_seccomp_rule_status_t do_resolve_add_rule(uint32_t arch, char *l
+ 
+ 	memset(&arg_cmp, 0, sizeof(arg_cmp));
+ 	for (size_t i = 0; i < rule->args_num; i++) {
++#ifdef HAVE_ISULAD
++		DEBUG("arg_cmp%zu: SCMP_CMP(%u, %llu, %llu, %llu)", i,
++		     rule->args_valuei.index,
++		     (long long unsigned int)rule->args_valuei.op,
++		     (long long unsigned int)rule->args_valuei.mask,
++		     (long long unsigned int)rule->args_valuei.value);
++#else
+ 		INFO("arg_cmp%zu: SCMP_CMP(%u, %llu, %llu, %llu)", i,
+ 		     rule->args_valuei.index,
+ 		     (long long unsigned int)rule->args_valuei.op,
+ 		     (long long unsigned int)rule->args_valuei.mask,
+ 		     (long long unsigned int)rule->args_valuei.value);
++#endif
+ 
+ 		if (SCMP_CMP_MASKED_EQ == rule->args_valuei.op)
+ 			arg_cmpi = SCMP_CMP(rule->args_valuei.index,
+@@ -569,9 +595,15 @@ static enum lxc_seccomp_rule_status_t do_resolve_add_rule(uint32_t arch, char *l
+ 					   rule->args_num, arg_cmp);
+ 	if (ret < 0) {
+ 		errno = -ret;
++#ifdef HAVE_ISULAD
++		SYSDEBUG("Failed to add rule for syscall%d:%s action%d:%s arch%u",
++		         nr, line, rule->action, get_action_name(rule->action), arch);
++		return lxc_seccomp_rule_added;
++#else
+ 		SYSERROR("Failed to add rule for syscall%d:%s action%d:%s arch%u",
+ 		         nr, line, rule->action, get_action_name(rule->action), arch);
+ 		return lxc_seccomp_rule_err;
++#endif
+ 	}
+ 
+ 	return lxc_seccomp_rule_added;
+diff --git a/src/lxc/start.h b/src/lxc/start.h
+index cd36bc5..bbd1a83 100644
+--- a/src/lxc/start.h
++++ b/src/lxc/start.h
+@@ -123,6 +123,17 @@ struct lxc_handler {
+ 
+ 	struct cgroup_ops *cgroup_ops;
+ 
++#ifdef HAVE_ISULAD
++	int exit_code;/* isulad: record the exit code of container */
++	/* Indicates whether should we using pipes or pty dup to std{in,out,err} for console log. */
++	bool disable_pty;
++	/* Indicates whether should we keep stdin active. */
++	bool open_stdin;
++	bool image_type_oci;
++	// isulad need timeout in __lxc_start
++	unsigned int start_timeout;
++#endif
++
+ 	/* Internal fds that always need to stay open. */
+ 	int keep_fds3;
+ 
+diff --git a/src/lxc/tools/arguments.h b/src/lxc/tools/arguments.h
+index 92510ec..d5c9169 100644
+--- a/src/lxc/tools/arguments.h
++++ b/src/lxc/tools/arguments.h
+@@ -126,6 +126,20 @@ struct lxc_arguments {
+ 	const char *want_hostname;
+ 	bool setuid;
+ 
++#ifdef HAVE_ISULAD
++	char *workdir;
++	const char *container_info; /* isulad: file used to store pid and ppid info of container */
++	char *terminal_fifos3; /* isulad add, fifos used to redirct stdin/out/err */
++	const char *exit_monitor_fifo; /* isulad: fifo used to monitor state of monitor process */
++	const char *suffix; /* isulad add, suffix used for connect with parent of execed process*/
++	int disable_pty;
++	int open_stdin;
++	unsigned int start_timeout; /* isulad: Seconds for waiting on a container to start before it is killed*/
++	int64_t attach_timeout; /* for lxc-attach */
++	gid_t *add_gids;
++	size_t add_gids_len;
++#endif
++
+ 	/* remaining arguments */
+ 	char *const *argv;
+ 	int argc;
+@@ -156,6 +170,20 @@ struct lxc_arguments {
+ #define OPT_SHARE_UTS OPT_USAGE - 5
+ #define OPT_SHARE_PID OPT_USAGE - 6
+ 
++#ifdef HAVE_ISULAD
++#define OPT_INPUT_FIFO OPT_USAGE - 7
++#define OPT_OUTPUT_FIFO OPT_USAGE - 8
++#define OPT_STDERR_FIFO OPT_USAGE - 9
++#define OPT_CONTAINER_INFO OPT_USAGE - 10
++#define OPT_EXIT_FIFO OPT_USAGE - 11
++#define OPT_START_TIMEOUT OPT_USAGE - 12
++#define OPT_DISABLE_PTY OPT_USAGE - 13
++#define OPT_OPEN_STDIN OPT_USAGE - 14
++#define OPT_ATTACH_TIMEOUT OPT_USAGE - 15
++#define OPT_ATTACH_SUFFIX OPT_USAGE - 16
++#define OPT_ADDITIONAL_GIDS OPT_USAGE - 17
++#endif
++
+ __hidden extern int lxc_arguments_parse(struct lxc_arguments *args, int argc, char *const argv);
+ 
+ __hidden extern int lxc_arguments_str_to_int(struct lxc_arguments *args, const char *str);
+diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
+index 8c519f1..1283bcf 100644
+--- a/src/lxc/tools/lxc_attach.c
++++ b/src/lxc/tools/lxc_attach.c
+@@ -73,9 +73,22 @@ static const struct option my_longopts = {
+ 	{"set-var", required_argument, 0, 'v'},
+ 	{"pty-log", required_argument, 0, 'L'},
+ 	{"rcfile", required_argument, 0, 'f'},
++	{"context", required_argument, 0, 'c'},
++#ifndef HAVE_ISULAD
+ 	{"uid", required_argument, 0, 'u'},
+ 	{"gid", required_argument, 0, 'g'},
+-        {"context", required_argument, 0, 'c'},
++#else
++	{"workdir", required_argument, 0, 'w'},
++	{"user", required_argument, 0, 'u'},
++	{"add-gids", required_argument, 0, OPT_ADDITIONAL_GIDS},
++	{"in-fifo", required_argument, 0, OPT_INPUT_FIFO}, /* isulad add terminal fifos*/
++	{"out-fifo", required_argument, 0, OPT_OUTPUT_FIFO},
++	{"err-fifo", required_argument, 0, OPT_STDERR_FIFO},
++	{"suffix", required_argument, 0, OPT_ATTACH_SUFFIX},
++	{"timeout", required_argument, 0, OPT_ATTACH_TIMEOUT},
++	{"disable-pty", no_argument, 0, OPT_DISABLE_PTY},
++	{"open-stdin", no_argument, 0, OPT_OPEN_STDIN},
++#endif
+ 	LXC_COMMON_OPTIONS
+ };
+ 
+@@ -126,11 +139,29 @@ Options :\n\
+                     multiple times.\n\
+   -f, --rcfile=FILE\n\
+                     Load configuration file FILE\n\
+-  -u, --uid=UID     Execute COMMAND with UID inside the container\n\
+-  -g, --gid=GID     Execute COMMAND with GID inside the container\n\
+   -c, --context=context\n\
+                     SELinux Context to transition into\n\
+-",
++"
++#ifndef HAVE_ISULAD
++"\
++  -u, --uid=UID     Execute COMMAND with UID inside the container\n\
++  -g, --gid=GID     Execute COMMAND with GID inside the container\n\
++"
++#else
++"\
++  -w, --workdir     Working directory inside the container.\n\
++  -u, --user        User ID (format: UID:GID)\n\
++      --add-gids    Additional gids (format: GID,GID)\n\
++      --in-fifo     Stdin fifo path\n\
++      --out-fifo    Stdout fifo path\n\
++      --err-fifo    Stderr fifo path\n\
++      --suffix      ID for mutli-attach on one container\n\
++      --timeout     Timeout in seconds (default: 0)\n\
++      --disable-pty Disable pty for attach\n\
++      --open-stdin  Open stdin for attach\n\
++"
++#endif
++,
+ 	.options      = my_longopts,
+ 	.parser       = my_parser,
+ 	.checker      = NULL,
+@@ -140,6 +171,123 @@ Options :\n\
+ 	.gid          = LXC_INVALID_GID,
+ };
+ 
++#ifdef HAVE_ISULAD
++static int parse_user_id(const char *username, char **uid, char **gid, char **tmp_dup)
++{
++	char *tmp = NULL;
++	char *pdot = NULL;
++
++	if (uid == NULL || gid == NULL || tmp_dup == NULL) {
++		return -1;
++	}
++
++	if (username != NULL) {
++		tmp = strdup(username);
++		if (tmp == NULL) {
++			ERROR("Failed to duplicate user name");
++			return -1;
++		}
++
++		// for free tmp in caller
++		*tmp_dup = tmp;
++		pdot = strstr(tmp, ":");
++		if (pdot != NULL) {
++			*pdot = '\0';
++			if (pdot != tmp) {
++				// uid found
++				*uid = tmp;
++			}
++
++			if (*(pdot + 1) != '\0') {
++				// gid found
++				*gid = pdot + 1;
++			}
++		} else {
++			// No : found
++			if (*tmp != '\0') {
++				*uid = tmp;
++			}
++		}
++	}
++
++	return 0;
++}
++
++static int get_attach_uid_gid(const char *username, uid_t *user_id, gid_t *group_id)
++{
++	char *tmp = NULL;
++	char *uid = NULL;
++	char *gid = NULL;
++
++	// parse uid and gid by username
++	if (parse_user_id(username, &uid, &gid, &tmp) != 0) {
++		return -1;
++	}
++
++	if (uid != NULL) {
++		*user_id = (unsigned int)atoll(uid);
++	}
++	if (gid != NULL) {
++		*group_id = (unsigned int)atoll(gid);
++	}
++
++	free(tmp);
++	return 0;
++}
++
++static int get_attach_add_gids(const char *add_gids, gid_t **gids, size_t *gids_len)
++{
++	long long int readvalue;
++	size_t i, len;
++	const size_t max_gids = 100;
++	gid_t *g = NULL;
++	__do_free_string_list char **gids_str = NULL;
++
++	if (add_gids == NULL || strlen(add_gids) == 0) {
++		ERROR("None additional gids");
++		return -1;
++	}
++
++	gids_str = lxc_string_split(add_gids, ',');
++	if (gids_str == NULL) {
++		ERROR("Failed to split additional gids");
++		return -1;
++	}
++
++	len = lxc_array_len((void **)gids_str);
++	if (len > max_gids) {
++		ERROR("Too many gids");
++		return -1;
++	}
++
++	g = calloc(len, sizeof(gid_t));
++	if (g == NULL) {
++		ERROR("Out of memory");
++		return -1;
++	}
++
++	for (i = 0; i < len; i++) {
++		if (lxc_safe_long_long(gids_stri, &readvalue) != 0) {
++			SYSERROR("Invalid gid value %s", gids_stri);
++			goto err_out;
++		}
++		if (readvalue < 0) {
++			ERROR("Invalid gid value: %lld", readvalue);
++			goto err_out;
++		}
++		gi = (unsigned int)readvalue;
++	}
++
++	*gids = g;
++	*gids_len = len;
++	return 0;
++
++err_out:
++	free(g);
++	return -1;
++}
++#endif
++
+ static int my_parser(struct lxc_arguments *args, int c, char *arg)
+ {
+ 	int ret;
+@@ -197,6 +345,10 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
+ 	case 'f':
+ 		args->rcfile = arg;
+ 		break;
++    case 'c':
++        selinux_context = arg;
++        break;
++#ifndef HAVE_ISULAD
+ 	case 'u':
+ 		if (lxc_safe_uint(arg, &args->uid) < 0)
+ 			return -1;
+@@ -205,9 +357,48 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
+ 		if (lxc_safe_uint(arg, &args->gid) < 0)
+ 			return -1;
+ 		break;
+-        case 'c':
+-                selinux_context = arg;
+-                break;
++#else
++	case 'u':
++		if (get_attach_uid_gid(arg, &args->uid, &args->gid) != 0) {
++			ERROR("Failed to get attach user U/GID");
++			return -1;
++		}
++		break;
++	case 'w':
++		args->workdir=arg;
++		break;
++	case OPT_INPUT_FIFO:
++		args->terminal_fifos0 = arg;
++		break;
++	case OPT_OUTPUT_FIFO:
++		args->terminal_fifos1 = arg;
++		break;
++	case OPT_STDERR_FIFO:
++		args->terminal_fifos2 = arg;
++		break;
++	case OPT_ATTACH_SUFFIX:
++		args->suffix = arg;
++		break;
++	case OPT_ATTACH_TIMEOUT:
++		if(!is_non_negative_num(arg)) {
++			ERROR("Error attach timeout parameter:%s.\n", arg);
++			return -1;
++		}
++		args->attach_timeout = (unsigned int)atoll(arg);
++		break;
++	case OPT_DISABLE_PTY:
++		args->disable_pty = 1;
++		break;
++	case OPT_OPEN_STDIN:
++		args->open_stdin = 1;
++		break;
++	case OPT_ADDITIONAL_GIDS:
++		if (get_attach_add_gids(arg, &args->add_gids, &args->add_gids_len) != 0) {
++			ERROR("Failed to get attach additional gids");
++			return -1;
++		}
++		break;
++#endif
+ 	}
+ 
+ 	return 0;
+@@ -271,6 +462,290 @@ static int lxc_attach_create_log_file(const char *log_file)
+ 	return fd;
+ }
+ 
++#ifdef HAVE_ISULAD
++// isulad: send '128 + signal' if container is killed by signal.
++#define EXIT_SIGNAL_OFFSET 128
++
++/*isulad: attach with terminal*/
++static int do_attach_foreground(struct lxc_container *c, lxc_attach_command_t *command,
++				lxc_attach_options_t *attach_options,
++				char **errmsg)
++{
++	int ret = 0;
++	pid_t pid;
++	int wexit = -1;
++	int signal;
++
++	if (command->program)
++		ret = c->attach(c, lxc_attach_run_command, command, attach_options, &pid);
++	else
++		ret = c->attach(c, lxc_attach_run_shell, NULL, attach_options, &pid);
++	if (ret < 0) {
++		*errmsg = safe_strdup("Internal error, failed to call attach");
++		goto out;
++	}
++
++	ret = lxc_wait_for_pid_status(pid);
++	if (ret < 0) {
++		free(*errmsg);
++		*errmsg = safe_strdup("Internal error, failed to wait attached process");
++		goto out;
++	}
++
++	if (WIFEXITED(ret))
++		wexit = WEXITSTATUS(ret);
++	else
++		wexit = -1;
++
++	if (WIFSIGNALED(ret)) {
++		signal = WTERMSIG(ret);
++		wexit = EXIT_SIGNAL_OFFSET + signal;
++	}
++
++	WARN("Execd pid %d exit with %d", pid, wexit);
++
++out:
++	if (c->lxc_conf->errmsg) {
++		free(*errmsg);
++		*errmsg = safe_strdup(c->lxc_conf->errmsg);
++	}
++	return wexit;
++}
++
++static void close_msg_pipe(int *errpipe)
++{
++	if (errpipe0 >= 0) {
++		close(errpipe0);
++		errpipe0 = -1;
++	}
++	if (errpipe1 >= 0) {
++		close(errpipe1);
++		errpipe1 = -1;
++	}
++}
++
++/*isulad: attach without terminal in background */
++static int do_attach_background(struct lxc_container *c, lxc_attach_command_t *command,
++				lxc_attach_options_t *attach_options,
++				char **errmsg)
++{
++	int ret = 0;
++	int msgpipe2;
++	pid_t pid = 0;
++	ssize_t size_read;
++	char msgbufBUFSIZ + 1 = {0};
++
++	//pipdfd for get error message of child or grandchild process.
++	if (pipe2(msgpipe, O_CLOEXEC) != 0) {
++		SYSERROR("Failed to init msgpipe");
++		return -1;
++	}
++
++	pid = fork();
++	if (pid < 0) {
++		close_msg_pipe(msgpipe);
++		return -1;
++	}
++
++	if (pid != 0) {
++		close(msgpipe1);
++		msgpipe1 = -1;
++		size_read = read(msgpipe0, msgbuf, BUFSIZ);
++		if (size_read > 0) {
++			*errmsg = safe_strdup(msgbuf);
++			ret = -1;
++		}
++
++		close(msgpipe0);
++		msgpipe0 = -1;
++
++		return ret;
++	}
++
++	/* second fork to be reparented by init */
++	pid = fork();
++	if (pid < 0) {
++		SYSERROR("Error doing dual-fork");
++		close_msg_pipe(msgpipe);
++		exit(1);
++	}
++	if (pid != 0) {
++		close_msg_pipe(msgpipe);
++		exit(0);
++	}
++
++	close(msgpipe0);
++	msgpipe0 = -1;
++
++	if (null_stdfds() < 0) {
++		ERROR("failed to close fds");
++		exit(1);
++	}
++	setsid();
++
++	if (command->program)
++		ret = c->attach(c, lxc_attach_run_command, command, attach_options, &pid);
++	else
++		ret = c->attach(c, lxc_attach_run_shell, NULL, attach_options, &pid);
++	if (ret < 0) {
++		if (c->lxc_conf->errmsg)
++			lxc_write_error_message(msgpipe1, "%s", c->lxc_conf->errmsg);
++		else
++			lxc_write_error_message(msgpipe1, "Failed to attach container");
++		close(msgpipe1);
++		msgpipe1 = -1;
++		ret = -1;
++		goto out;
++	}
++
++	close(msgpipe1);
++	msgpipe1 = -1;
++
++	ret = wait_for_pid(pid);
++out:
++	lxc_container_put(c);
++	if (ret)
++		exit(EXIT_FAILURE);
++	else
++		exit(0);
++}
++
++int main(int argc, char *argv)
++{
++	int wexit = 0;
++	struct lxc_log log;
++	char *errmsg = NULL;
++	lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT;
++	lxc_attach_command_t command = (lxc_attach_command_t){.program = NULL};
++
++	if (lxc_caps_init())
++		exit(EXIT_FAILURE);
++
++	if (lxc_arguments_parse(&my_args, argc, argv))
++		exit(EXIT_FAILURE);
++
++	log.name = my_args.name;
++	log.file = my_args.log_file;
++	log.level = my_args.log_priority;
++	log.prefix = my_args.progname;
++	log.quiet = my_args.quiet;
++	log.lxcpath = my_args.lxcpath0;
++
++	if (lxc_log_init(&log))
++		exit(EXIT_FAILURE);
++
++	if (geteuid())
++		if (access(my_args.lxcpath0, O_RDONLY) < 0) {
++			ERROR("You lack access to %s", my_args.lxcpath0);
++			exit(EXIT_FAILURE);
++		}
++
++	struct lxc_container *c = lxc_container_new(my_args.name, my_args.lxcpath0);
++	if (!c)
++		exit(EXIT_FAILURE);
++
++	if (my_args.rcfile) {
++		c->clear_config(c);
++		if (!c->load_config(c, my_args.rcfile)) {
++			ERROR("Failed to load rcfile");
++			lxc_container_put(c);
++			exit(EXIT_FAILURE);
++		}
++
++		c->configfile = strdup(my_args.rcfile);
++		if (!c->configfile) {
++			ERROR("Out of memory setting new config filename");
++			lxc_container_put(c);
++			exit(EXIT_FAILURE);
++		}
++	}
++
++	if (!c->may_control(c)) {
++		ERROR("Insufficent privileges to control %s", c->name);
++		lxc_container_put(c);
++		exit(EXIT_FAILURE);
++	}
++
++	if (remount_sys_proc)
++		attach_options.attach_flags |= LXC_ATTACH_REMOUNT_PROC_SYS;
++
++	if (elevated_privileges)
++		attach_options.attach_flags &= ~(elevated_privileges);
++
++	if (my_args.terminal_fifos0 || my_args.terminal_fifos1 || my_args.terminal_fifos2) {
++		attach_options.init_fifo0 = my_args.terminal_fifos0;
++		attach_options.init_fifo1 = my_args.terminal_fifos1;
++		attach_options.init_fifo2 = my_args.terminal_fifos2;
++		attach_options.attach_flags |= LXC_ATTACH_TERMINAL;
++	} else if (stdfd_is_pty()) {
++		attach_options.attach_flags |= LXC_ATTACH_TERMINAL;
++	}
++
++	attach_options.namespaces = namespace_flags;
++	attach_options.personality = new_personality;
++	attach_options.env_policy = env_policy;
++	attach_options.extra_env_vars = extra_env;
++	attach_options.extra_keep_env = extra_keep;
++	attach_options.timeout = my_args.attach_timeout;
++
++	if (my_args.argc > 0) {
++		command.program = my_args.argv0;
++		command.argv = (char**)my_args.argv;
++	}
++
++	if (my_args.console_log) {
++		attach_options.log_fd = lxc_attach_create_log_file(my_args.console_log);
++		if (attach_options.log_fd < 0) {
++			ERROR("Failed to create log file for %s", c->name);
++			lxc_container_put(c);
++			exit(EXIT_FAILURE);
++		}
++	}
++
++	if (my_args.uid != LXC_INVALID_UID)
++		attach_options.uid = my_args.uid;
++
++	if (my_args.gid != LXC_INVALID_GID)
++		attach_options.gid = my_args.gid;
++
++	attach_options.suffix = my_args.suffix;
++
++	if (my_args.disable_pty) {
++		attach_options.disable_pty = true;
++	}
++
++	if (my_args.open_stdin) {
++		attach_options.open_stdin = true;
++	}
++
++	if (my_args.workdir) {
++		attach_options.initial_cwd = my_args.workdir;
++	}
++
++	if (my_args.add_gids) {
++		attach_options.add_gids = my_args.add_gids;
++		attach_options.add_gids_len = my_args.add_gids_len;
++	}
++
++	/* isulad: add do attach background */
++	if (attach_options.attach_flags & LXC_ATTACH_TERMINAL)
++		wexit = do_attach_foreground(c, &command, &attach_options, &errmsg);
++	else
++		wexit = do_attach_background(c, &command, &attach_options, &errmsg);
++
++	if (errmsg) {
++		fprintf(stderr, "%s:%s:%s:%d starting container process caused \"%s\"", c->name,
++		__FILE__, __func__, __LINE__, errmsg);
++		free(errmsg);
++	}
++
++	lxc_container_put(c);
++	if (wexit >= 0)
++		exit(wexit);
++
++	exit(EXIT_FAILURE);
++}
++#else
+ int main(int argc, char *argv)
+ {
+ 	int ret = -1;
+@@ -408,3 +883,4 @@ out:
+ 
+ 	exit(EXIT_FAILURE);
+ }
++#endif
+\ No newline at end of file
+diff --git a/src/lxc/tools/lxc_start.c b/src/lxc/tools/lxc_start.c
+index 6d2c0ae..d30d8b8 100644
+--- a/src/lxc/tools/lxc_start.c
++++ b/src/lxc/tools/lxc_start.c
+@@ -26,6 +26,11 @@
+ #include "confile.h"
+ #include "log.h"
+ 
++#ifdef HAVE_ISULAD
++#include <ctype.h>
++#include "isulad_utils.h"
++#endif
++
+ lxc_log_define(lxc_start, lxc);
+ 
+ static int my_parser(struct lxc_arguments *args, int c, char *arg);
+@@ -46,6 +51,16 @@ static const struct option my_longopts = {
+ 	{"share-ipc", required_argument, 0, OPT_SHARE_IPC},
+ 	{"share-uts", required_argument, 0, OPT_SHARE_UTS},
+ 	{"share-pid", required_argument, 0, OPT_SHARE_PID},
++#ifdef HAVE_ISULAD
++	{"in-fifo", required_argument, 0, OPT_INPUT_FIFO},
++	{"out-fifo", required_argument, 0, OPT_OUTPUT_FIFO},
++	{"err-fifo", required_argument, 0, OPT_STDERR_FIFO},
++	{"container-pidfile", required_argument, 0, OPT_CONTAINER_INFO},
++	{"exit-fifo", required_argument, 0, OPT_EXIT_FIFO},
++	{"start-timeout", required_argument, 0, OPT_START_TIMEOUT},
++	{"disable-pty", no_argument, 0, OPT_DISABLE_PTY},
++	{"open-stdin", no_argument, 0, OPT_OPEN_STDIN},
++#endif
+ 	LXC_COMMON_OPTIONS
+ };
+ 
+@@ -68,7 +83,20 @@ Options :\n\
+                          Note: --daemon implies --close-all-fds\n\
+   -s, --define KEY=VAL   Assign VAL to configuration variable KEY\n\
+       --share-net|ipc|uts|pid=NAME Share a namespace with another container or pid\n\
+-",
++"
++#ifdef HAVE_ISULAD
++"\
++      --in-fifo           Stdin fifo path\n\
++      --out-fifo          Stdout fifo path\n\
++      --err-fifo          Stderr fifo path\n\
++      --container-pidfile File path for container pid\n\
++      --exit-fifo         Fifo path to save exit code\n\
++      --start-timeout     Timeout for start container\n\
++      --disable-pty       Disable pty for attach\n\
++      --open-stdin        Open stdin for attach\n\
++"
++#endif
++,
+ 	.options      = my_longopts,
+ 	.parser       = my_parser,
+ 	.checker      = NULL,
+@@ -116,6 +144,36 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
+ 	case OPT_SHARE_PID:
+ 		args->share_nsLXC_NS_PID = arg;
+ 		break;
++#ifdef HAVE_ISULAD
++	case OPT_CONTAINER_INFO:
++		args->container_info = arg;
++		break;
++	case OPT_INPUT_FIFO:
++		args->terminal_fifos0 = arg;
++		break;
++	case OPT_OUTPUT_FIFO:
++		args->terminal_fifos1 = arg;
++		break;
++	case OPT_STDERR_FIFO:
++		args->terminal_fifos2 = arg;
++		break;
++	case OPT_EXIT_FIFO:
++		args->exit_monitor_fifo = arg;
++		break;
++	case OPT_DISABLE_PTY:
++		args->disable_pty = 1;
++		break;
++	case OPT_OPEN_STDIN:
++		args->open_stdin = 1;
++		break;
++	case OPT_START_TIMEOUT:
++		if(!is_non_negative_num(arg)) {
++			fprintf(stderr, "Error start timeout parameter:%s.\n", arg);
++			return -1;
++		}
++		args->start_timeout = (unsigned int)atoi(arg);
++		break;
++#endif
+ 	}
+ 	return 0;
+ }
+@@ -161,6 +219,9 @@ int main(int argc, char *argv)
+ 		"/sbin/init",
+ 		NULL,
+ 	};
++#ifdef HAVE_ISULAD
++	char *container_info_file = NULL;
++#endif
+ 
+ 	lxc_list_init(&defines);
+ 
+@@ -281,6 +342,42 @@ int main(int argc, char *argv)
+ 			goto out;
+ 		}
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: container info file used to store pid and ppid info of container*/
++	if (my_args.container_info != NULL) {
++		if (ensure_path(&container_info_file, my_args.container_info) < 0) {
++			ERROR("Failed to ensure container's piddile '%s'", my_args.container_info);
++			goto out;
++		}
++		if (!c->set_container_info_file(c, container_info_file)) {
++			ERROR("Failed to set container's piddile '%s'", container_info_file);
++			goto out;
++		}
++	}
++
++	if (my_args.terminal_fifos0 || my_args.terminal_fifos1 || my_args.terminal_fifos2) {
++		c->set_terminal_init_fifos(c, my_args.terminal_fifos0, my_args.terminal_fifos1, my_args.terminal_fifos2);
++	}
++
++	/* isulad: fifo used to monitor state of monitor process */
++	if (my_args.exit_monitor_fifo != NULL) {
++		c->exit_fifo = safe_strdup(my_args.exit_monitor_fifo);
++	}
++
++	if (my_args.disable_pty) {
++		c->want_disable_pty(c, true);
++	}
++
++	if (my_args.open_stdin) {
++		c->want_open_stdin(c, true);
++	}
++
++	/* isulad: add start timeout */
++	if(my_args.start_timeout) {
++		c->set_start_timeout(c, my_args.start_timeout);
++	}
++#endif
++
+ 	if (my_args.console)
+ 		if (!c->set_config_item(c, "lxc.console.path", my_args.console))
+ 			goto out;
+@@ -303,6 +400,11 @@ int main(int argc, char *argv)
+ 	else
+ 		err = c->start(c, 0, args) ? EXIT_SUCCESS : EXIT_FAILURE;
+ 	if (err) {
++#ifdef HAVE_ISULAD
++		if (c->lxc_conf->errmsg)
++			fprintf(stderr, "%s:%s:%s:%d starting container process caused \"%s\"", c->name,
++					__FILE__, __func__, __LINE__, c->lxc_conf->errmsg);
++#endif
+ 		ERROR("The container failed to start");
+ 
+ 		if (my_args.daemonize)
+@@ -318,5 +420,8 @@ int main(int argc, char *argv)
+ 
+ out:
+ 	lxc_container_put(c);
++#ifdef HAVE_ISULAD
++	free(container_info_file);
++#endif
+ 	exit(err);
+ }
+-- 
+2.25.1
+

_service:tar_scm:0002-refactor-patch-code-of-isulad-for-conf-exec-attach.patch Deleted

@@ -1,2856 +0,0 @@
-From 7166cf40250f00544e204a33da668b56ed4b13ca Mon Sep 17 00:00:00 2001
-From: haozi007 <liuhao27@huawei.com>
-Date: Mon, 18 Jul 2022 11:30:33 +0800
-Subject: PATCH refactor patch code of isulad for conf/exec/attach
-
-Signed-off-by: haozi007 <liuhao27@huawei.com>
----
- src/lxc/attach_options.h  |   41 +-
- src/lxc/conf.c            | 1993 ++++++++++++++++++++++++++++++++++++-
- src/lxc/criu.c            |    8 +-
- src/lxc/execute.c         |   19 +
- src/lxc/file_utils.c      |   27 +
- src/lxc/lsm/apparmor.c    |   14 +
- src/lxc/tools/arguments.h |   24 +
- 7 files changed, 2122 insertions(+), 4 deletions(-)
-
-diff --git a/src/lxc/attach_options.h b/src/lxc/attach_options.h
-index 63e62d4..16b4e21 100644
---- a/src/lxc/attach_options.h
-+++ b/src/lxc/attach_options.h
-@@ -49,7 +49,11 @@ enum {
-  *
-  * \return Function should return \c 0 on success, and any other value to denote failure.
-  */
-+#ifdef HAVE_ISULAD
-+typedef int (*lxc_attach_exec_t)(void* payload, int msg_fd);
-+#else
- typedef int (*lxc_attach_exec_t)(void* payload);
-+#endif
- 
- /*!
-  * LXC attach options for \ref lxc_container \c attach().
-@@ -113,9 +117,18 @@ typedef struct lxc_attach_options_t {
- 
- 	/*! File descriptor to log output. */
- 	int log_fd;
-+
-+#ifdef HAVE_ISULAD
-+	char *init_fifo3; /* isulad: default fifos for the start */
-+	int64_t timeout;/* isulad: Seconds for waiting on a container to attach/exec before it is killed*/
-+	const char *suffix;
-+	bool disable_pty;
-+	bool open_stdin;
-+#endif
- } lxc_attach_options_t;
- 
- /*! Default attach options to use */
-+#ifndef HAVE_ISULAD
- #define LXC_ATTACH_OPTIONS_DEFAULT                                             \
- 	{                                                                      \
- 		/* .attach_flags = */   LXC_ATTACH_DEFAULT,                    \
-@@ -132,7 +145,25 @@ typedef struct lxc_attach_options_t {
- 		/* .stderr_fd = */      2,                                     \
- 		/* .log_fd    = */      -EBADF,                                \
- 	}
--
-+#else
-+#define LXC_ATTACH_OPTIONS_DEFAULT                                             \
-+	{                                                                      \
-+		/* .attach_flags = */   LXC_ATTACH_DEFAULT,                    \
-+		/* .namespaces = */     -1,                                    \
-+		/* .personality = */    -1,                                    \
-+		/* .initial_cwd = */    NULL,                                  \
-+		/* .uid = */            (uid_t)-1,                             \
-+		/* .gid = */            (gid_t)-1,                             \
-+		/* .env_policy = */     LXC_ATTACH_KEEP_ENV,                   \
-+		/* .extra_env_vars = */ NULL,                                  \
-+		/* .extra_keep_env = */ NULL,                                  \
-+		/* .stdin_fd = */       0,                                     \
-+		/* .stdout_fd = */      1,                                     \
-+		/* .stderr_fd = */      2,                                     \
-+		/* .log_fd    = */      -EBADF,                                \
-+		/* .init_fifo = */  	{NULL, NULL, NULL},                    \
-+	}
-+#endif
- /*!
-  * Representation of a command to run in a container.
-  */
-@@ -148,7 +179,11 @@ typedef struct lxc_attach_command_t {
-  *
-  * \return \c -1 on error, exit code of lxc_attach_command_t program on success.
-  */
-+#ifdef HAVE_ISULAD
-+extern int lxc_attach_run_command(void* payload, int msg_fd);
-+#else
- extern int lxc_attach_run_command(void* payload);
-+#endif
- 
- /*!
-  * \brief Run a shell command in the container.
-@@ -157,7 +192,11 @@ extern int lxc_attach_run_command(void* payload);
-  *
-  * \return Exit code of shell.
-  */
-+#ifdef HAVE_ISULAD
-+extern int lxc_attach_run_shell(void* payload, int msg_fd);
-+#else
- extern int lxc_attach_run_shell(void* payload);
-+#endif
- 
- #ifdef  __cplusplus
- }
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index 0078996..378cf9f 100644
---- a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -33,6 +33,14 @@
- #include <time.h>
- #include <unistd.h>
- 
-+#ifdef HAVE_ISULAD
-+#include <pthread.h>
-+#include "sync.h"
-+#include "path.h"
-+#include "utils.h"
-+#include "loop.h"
-+#endif
-+
- #include "af_unix.h"
- #include "caps.h"
- #include "cgroup.h"
-@@ -118,7 +126,14 @@ char *lxchook_namesNUM_LXC_HOOKS = {
- 	"post-stop",
- 	"clone",
- 	"destroy",
-+#ifdef HAVE_ISULAD
-+	"start-host",
-+	"oci-prestart",
-+	"oci-poststart",
-+	"oci-poststop"
-+#else
- 	"start-host"
-+#endif
- };
- 
- struct mount_opt {
-@@ -285,6 +300,22 @@ static struct limit_opt limit_opt = {
- #endif
- };
- 
-+#ifdef HAVE_ISULAD
-+static int rootfs_parent_mount_private(char *rootfs);
-+static int setup_rootfs_ropaths(struct lxc_list *ropaths);
-+static int setup_rootfs_maskedpaths(struct lxc_list *maskedpaths);
-+static int remount_proc_sys_mount_entries(struct lxc_list *mount_list, bool lsm_aa_allow_nesting);
-+static int check_mount_destination(const char *rootfs, const char *dest, const char *src);
-+static int mount_entry_with_loop_dev(const char *src, const char *dest, const char *fstype,
-+		char *mnt_opts, const char *rootfs);
-+static bool need_setup_proc(const struct lxc_conf *conf, struct lxc_list *mount);
-+static bool need_setup_dev(const struct lxc_conf *conf, struct lxc_list *mount);
-+static int setup_populate_devs(const struct lxc_rootfs *rootfs, struct lxc_list *devs, const char *mount_label);
-+static int setup_rootfs_mountopts(const struct lxc_rootfs *rootfs);
-+static int create_mtab_link();
-+
-+#endif
-+
- static int run_buffer(char *buffer)
- {
- 	__do_free char *output = NULL;
-@@ -637,8 +668,13 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha
- 		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "%r/proc/sysrq-trigger",                          "%r/proc/sysrq-trigger",      NULL,    MS_BIND,                                         NULL },
- 		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, NULL,                                             "%r/proc/sysrq-trigger",      NULL,    MS_REMOUNT|MS_BIND|MS_RDONLY,                    NULL },
- 		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_RW,    "proc",                                           "%r/proc",                    "proc",  MS_NODEV|MS_NOEXEC|MS_NOSUID,                    NULL },
-+#ifdef HAVE_ISULAD
-+		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RW,     "sysfs",                                          "%r/sys",                     "sysfs", MS_NODEV|MS_NOEXEC|MS_NOSUID,                    NULL },
-+		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RO,     "sysfs",                                          "%r/sys",                     "sysfs", MS_RDONLY|MS_NODEV|MS_NOEXEC|MS_NOSUID,          NULL },
-+#else
- 		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RW,     "sysfs",                                          "%r/sys",                     "sysfs", 0,                                               NULL },
- 		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RO,     "sysfs",                                          "%r/sys",                     "sysfs", MS_RDONLY,                                       NULL },
-+#endif
- 		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "sysfs",                                          "%r/sys",                     "sysfs", MS_NODEV|MS_NOEXEC|MS_NOSUID,                    NULL },
- 		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "%r/sys",                                         "%r/sys",                     NULL,    MS_BIND,                                         NULL },
- 		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  NULL,                                             "%r/sys",                     NULL,    MS_REMOUNT|MS_BIND|MS_RDONLY,                    NULL },
-@@ -670,11 +706,24 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha
- 		if (!destination)
- 			return -1;
- 
-+#ifdef HAVE_ISULAD
-+		if (mkdir_p(destination, 0755) < 0) {
-+			SYSERROR("Failed to create mount target '%s'", destination);
-+			return log_error(-1, "Failed to mkdir destination %s", destination);
-+		}
-+#endif
-+
- 		mflags = add_required_remount_flags(source, destination,
- 						    default_mountsi.flags);
-+#ifdef HAVE_ISULAD
-+		r = safe_mount(source, destination, default_mountsi.fstype,
-+			       mflags, default_mountsi.options,
-+			       conf->rootfs.path ? conf->rootfs.mount : NULL, NULL);
-+#else
- 		r = safe_mount(source, destination, default_mountsi.fstype,
- 			       mflags, default_mountsi.options,
- 			       conf->rootfs.path ? conf->rootfs.mount : NULL);
-+#endif
- 		saved_errno = errno;
- 		if (r < 0 && errno == ENOENT) {
- 			INFO("Mount source or target for \"%s\" on \"%s\" does not exist. Skipping", source, destination);
-@@ -1047,8 +1096,13 @@ on_error:
- /* Just create a path for /dev under $lxcpath/$name and in rootfs If we hit an
-  * error, log it but don't fail yet.
-  */
-+#ifdef HAVE_ISULAD
-+static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
-+			 int autodevtmpfssize, const char *lxcpath, char *systemd, const char *mount_label)
-+#else
- static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
- 			 int autodevtmpfssize, const char *lxcpath)
-+#endif
- {
- 	__do_free char *path = NULL;
- 	int ret;
-@@ -1076,6 +1130,23 @@ static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
- 		goto reset_umask;
- 	}
- 
-+#ifdef HAVE_ISULAD
-+        if (systemd != NULL && !strcmp(systemd, "true")) {
-+                ret = mount(path, path, "", MS_BIND, NULL);
-+                if (ret < 0) {
-+		        SYSERROR("Failed to bind mount path \"%s\"", path);
-+		        goto reset_umask;
-+                }
-+        } else {
-+	        ret = safe_mount("none", path, "tmpfs", 0, mount_options,
-+			rootfs->path ? rootfs->mount : NULL, mount_label);
-+	        if (ret < 0) {
-+		        SYSERROR("Failed to mount tmpfs on \"%s\"", path);
-+		        goto reset_umask;
-+	        }
-+	        TRACE("Mounted tmpfs on \"%s\"", path);
-+        }
-+#else
- 	ret = safe_mount("none", path, "tmpfs", 0, mount_options,
- 			 rootfs->path ? rootfs->mount : NULL );
- 	if (ret < 0) {
-@@ -1083,6 +1154,7 @@ static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
- 		goto reset_umask;
- 	}
- 	TRACE("Mounted tmpfs on \"%s\"", path);
-+#endif
- 
- 	ret = snprintf(path, clen, "%s/dev/pts", rootfs->path ? rootfs->mount : "");
- 	if (ret < 0 || (size_t)ret >= clen) {
-@@ -1132,8 +1204,11 @@ enum {
- 	LXC_DEVNODE_PARTIAL,
- 	LXC_DEVNODE_OPEN,
- };
--
-+#ifdef HAVE_ISULAD
-+static int lxc_fill_autodev(const struct lxc_rootfs *rootfs, const char *mount_label)
-+#else
- static int lxc_fill_autodev(const struct lxc_rootfs *rootfs)
-+#endif
- {
- 	int i, ret;
- 	char pathPATH_MAX;
-@@ -1209,9 +1284,13 @@ static int lxc_fill_autodev(const struct lxc_rootfs *rootfs)
- 		ret = snprintf(hostpath, PATH_MAX, "/dev/%s", device->name);
- 		if (ret < 0 || ret >= PATH_MAX)
- 			return -1;
--
-+#ifdef HAVE_ISULAD
-+		ret = safe_mount(hostpath, path, 0, MS_BIND, NULL,
-+				 rootfs->path ? rootfs->mount : NULL, mount_label);
-+#else
- 		ret = safe_mount(hostpath, path, 0, MS_BIND, NULL,
- 				 rootfs->path ? rootfs->mount : NULL);
-+#endif
- 		if (ret < 0)
- 			return log_error_errno(-1, errno, "Failed to bind mount host device node \"%s\" onto \"%s\"",
- 					       hostpath, path);
-@@ -1227,12 +1306,29 @@ static int lxc_mount_rootfs(struct lxc_conf *conf)
- {
- 	int ret;
- 	struct lxc_storage *bdev;
-+#ifdef HAVE_ISULAD
-+	struct lxc_rootfs *rootfs = &conf->rootfs;
-+#else
- 	const struct lxc_rootfs *rootfs = &conf->rootfs;
-+#endif
-+
-+#ifdef HAVE_ISULAD
-+	unsigned long flags, mntflags, pflags;
-+	char *mntdata = NULL;
-+#endif
- 
- 	if (!rootfs->path) {
- 		ret = mount("", "/", NULL, MS_SLAVE | MS_REC, 0);
- 		if (ret < 0)
- 			return log_error_errno(-1, errno, "Failed to recursively turn root mount tree into dependent mount");
-+#ifdef HAVE_ISULAD
-+		if (!access(rootfs->mount, F_OK)) {
-+			rootfs->path = safe_strdup("/");
-+			if (mount("/", rootfs->mount, NULL, MS_BIND, 0)) {
-+				return log_error_errno(-1, errno, "Failed to mount \"/\" to %s", rootfs->mount);
-+			}
-+		}
-+#endif
- 
- 		return 0;
- 	}
-@@ -1242,6 +1338,48 @@ static int lxc_mount_rootfs(struct lxc_conf *conf)
- 		return log_error_errno(-1, errno, "Failed to access to \"%s\". Check it is present",
- 				       rootfs->mount);
- 
-+#ifdef HAVE_ISULAD
-+	// Support mount propagations of rootfs
-+	// Get rootfs mnt propagation options, such as slave or shared
-+	if (parse_mntopts(conf->rootfs.options, &mntflags, &pflags, &mntdata) < 0) {
-+		free(mntdata);
-+		return -1;
-+	}
-+	free(mntdata);
-+
-+	flags = MS_SLAVE | MS_REC;
-+	if (pflags)
-+		flags = pflags;
-+
-+	/* Mount propagation inside container can not greater than host.
-+	* So we must change propagation of root according to flags, default is rslave.
-+	* That means shared propagation inside container is disabled by default.
-+	*/
-+	ret = mount("", "/", NULL, flags, NULL);
-+	if (ret < 0) {
-+		return log_error_errno(-1, errno, "Failed to make / to propagation flags %lu.", flags);
-+	}
-+
-+	/* Make parent mount private to make sure following bind mount does
-+	* not propagate in other namespaces. Also it will help with kernel
-+	* check pass in pivot_root. (IS_SHARED(new_mnt->mnt_parent))
-+	*/
-+	ret = rootfs_parent_mount_private(conf->rootfs.path);
-+	if (ret != 0) {
-+		return log_error(-1, "Failed to make parent of rootfs %s to private.", conf->rootfs.path);
-+	}
-+	ret = rootfs_parent_mount_private(conf->rootfs.mount);
-+	if (ret != 0) {
-+		return log_error(-1, "Failed to make parent of rootfs %s to private.", conf->rootfs.mount);
-+	}
-+
-+	ret = mount(conf->rootfs.mount, conf->rootfs.mount, "bind", MS_BIND | MS_REC, NULL);
-+	if (ret < 0) {
-+		SYSERROR("Failed to mount rootfs %s", conf->rootfs.mount);
-+		return -1;
-+	}
-+#endif
-+
- 	bdev = storage_init(conf);
- 	if (!bdev)
- 		return log_error(-1, "Failed to mount rootfs \"%s\" onto \"%s\" with options \"%s\"",
-@@ -1475,17 +1613,34 @@ static int lxc_setup_devpts(struct lxc_conf *conf)
- {
- 	int ret;
- 	char **opts;
-+#ifdef HAVE_ISULAD
-+	__do_free char *devpts_mntopts = NULL;
-+#else
- 	char devpts_mntopts256;
-+#endif
- 	char *mntopt_sets5;
- 	char default_devpts_mntopts256 = "gid=5,newinstance,ptmxmode=0666,mode=0620";
- 
- 	if (conf->pty_max <= 0)
- 		return log_debug(0, "No new devpts instance will be mounted since no pts devices are requested");
- 
-+#ifdef HAVE_ISULAD
-+	if (conf->lsm_se_mount_context != NULL) {
-+		if (asprintf(&devpts_mntopts, "%s,max=%zu,context=\"%s\"",
-+		      default_devpts_mntopts, conf->pty_max, conf->lsm_se_mount_context) < 0) {
-+			return -1;
-+		}
-+	} else {
-+		if (asprintf(&devpts_mntopts, "%s,max=%zu", default_devpts_mntopts, conf->pty_max) < 0) {
-+			return -1;
-+		}
-+	}
-+#else
- 	ret = snprintf(devpts_mntopts, sizeof(devpts_mntopts), "%s,max=%zu",
- 		       default_devpts_mntopts, conf->pty_max);
- 	if (ret < 0 || (size_t)ret >= sizeof(devpts_mntopts))
- 		return -1;
-+#endif
- 
- 	(void)umount2("/dev/pts", MNT_DETACH);
- 
-@@ -1580,9 +1735,14 @@ static inline bool wants_console(const struct lxc_terminal *terminal)
- 	return !terminal->path || strcmp(terminal->path, "none");
- }
- 
-+#ifdef HAVE_ISULAD
-+static int lxc_setup_dev_console(const struct lxc_rootfs *rootfs,
-+				 const struct lxc_terminal *console, const char *mount_label)
-+#else
- static int lxc_setup_dev_console(const struct lxc_rootfs *rootfs,
- 				 const struct lxc_terminal *console,
- 				 int pts_mnt_fd)
-+#endif
- {
- 	int ret;
- 	char pathPATH_MAX;
-@@ -1615,10 +1775,14 @@ static int lxc_setup_dev_console(const struct lxc_rootfs *rootfs,
- 	if (ret < 0 && errno != EEXIST)
- 		return log_error_errno(-errno, errno, "Failed to create console");
- 
-+#ifdef HAVE_ISULAD
-+	if (console->pts > 0) {
-+#endif
- 	ret = fchmod(console->pts, S_IXUSR | S_IXGRP);
- 	if (ret < 0)
- 		return log_error_errno(-errno, errno, "Failed to set mode \"0%o\" to \"%s\"", S_IXUSR | S_IXGRP, console->name);
- 
-+#ifndef HAVE_ISULAD
- 	if (pts_mnt_fd >= 0) {
- 		ret = move_mount(pts_mnt_fd, "", -EBADF, path, MOVE_MOUNT_F_EMPTY_PATH);
- 		if (!ret) {
-@@ -1633,17 +1797,35 @@ static int lxc_setup_dev_console(const struct lxc_rootfs *rootfs,
- 	}
- 
- 	ret = safe_mount(console->name, path, "none", MS_BIND, 0, rootfs_path);
-+
- 	if (ret < 0)
- 		return log_error_errno(-1, errno, "Failed to mount %d(%s) on \"%s\"", pts_mnt_fd, console->name, path);
- 
- finish:
- 	DEBUG("Mounted pts device %d(%s) onto \"%s\"", pts_mnt_fd, console->name, path);
-+#else
-+    // add mount lable for console
-+    ret = safe_mount(console->name, path, "bind", MS_BIND, 0, rootfs_path, mount_label);
-+
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to mount \"%s\" on \"%s\"", console->name, path);
-+
-+	}
-+	DEBUG("Mounted pts device \"%s\" onto \"%s\"", console->name, path);
-+#endif
-+
- 	return 0;
- }
- 
-+#ifdef HAVE_ISULAD
-+static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs,
-+				    const struct lxc_terminal *console,
-+				    char *ttydir, const char *mount_label)
-+#else
- static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs,
- 				    const struct lxc_terminal *console,
- 				    char *ttydir, int pts_mnt_fd)
-+#endif
- {
- 	int ret;
- 	char pathPATH_MAX, lxcpathPATH_MAX;
-@@ -1686,11 +1868,15 @@ static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs,
- 	if (ret < 0 && errno != EEXIST)
- 		return log_error_errno(-errno, errno, "Failed to create console");
- 
-+#ifdef HAVE_ISULAD
-+	if (console->pts > 0) {
-+#endif
- 	ret = fchmod(console->pts, S_IXUSR | S_IXGRP);
- 	if (ret < 0)
- 		return log_error_errno(-errno, errno, "Failed to set mode \"0%o\" to \"%s\"", S_IXUSR | S_IXGRP, console->name);
- 
- 	/* bind mount console->name to '/dev/<ttydir>/console' */
-+#ifndef HAVE_ISULAD
- 	if (pts_mnt_fd >= 0) {
- 		ret = move_mount(pts_mnt_fd, "", -EBADF, lxcpath, MOVE_MOUNT_F_EMPTY_PATH);
- 		if (!ret) {
-@@ -1707,11 +1893,23 @@ static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs,
- 	ret = safe_mount(console->name, lxcpath, "none", MS_BIND, 0, rootfs_path);
- 	if (ret < 0)
- 		return log_error_errno(-1, errno, "Failed to mount %d(%s) on \"%s\"", pts_mnt_fd, console->name, lxcpath);
-+#else
-+	ret = safe_mount(console->name, lxcpath, "none", MS_BIND, 0, rootfs_path, mount_label);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to mount \"%s\" on \"%s\"", console->name, lxcpath);
-+#endif
- 	DEBUG("Mounted \"%s\" onto \"%s\"", console->name, lxcpath);
-+#ifdef HAVE_ISULAD
-+	}
-+#endif
- 
-+#ifndef HAVE_ISULAD
- finish:
- 	/* bind mount '/dev/<ttydir>/console'  to '/dev/console'  */
- 	ret = safe_mount(lxcpath, path, "none", MS_BIND, 0, rootfs_path);
-+#else
-+	ret = safe_mount(lxcpath, path, "none", MS_BIND, 0, rootfs_path, mount_label);
-+#endif
- 	if (ret < 0)
- 		return log_error_errno(-1, errno, "Failed to mount \"%s\" on \"%s\"", console->name, lxcpath);
- 	DEBUG("Mounted \"%s\" onto \"%s\"", console->name, lxcpath);
-@@ -1720,6 +1918,7 @@ finish:
- 	return 0;
- }
- 
-+#ifndef HAVE_ISULAD
- static int lxc_setup_console(const struct lxc_rootfs *rootfs,
- 			     const struct lxc_terminal *console, char *ttydir,
- 			     int pts_mnt_fd)
-@@ -1730,7 +1929,18 @@ static int lxc_setup_console(const struct lxc_rootfs *rootfs,
- 
- 	return lxc_setup_ttydir_console(rootfs, console, ttydir, pts_mnt_fd);
- }
-+#else
-+static int lxc_setup_console(const struct lxc_rootfs *rootfs,
-+			     const struct lxc_terminal *console, char *ttydir, const char *mount_label)
-+{
-+	if (!ttydir)
-+		return lxc_setup_dev_console(rootfs, console, mount_label);
- 
-+	return lxc_setup_ttydir_console(rootfs, console, ttydir, mount_label);
-+}
-+#endif
-+
-+#ifndef HAVE_ISULAD
- static int parse_mntopt(char *opt, unsigned long *flags, char **data, size_t size)
- {
- 	ssize_t ret;
-@@ -1798,6 +2008,77 @@ int parse_mntopts(const char *mntopts, unsigned long *mntflags, char **mntdata)
- 
- 	return 0;
- }
-+#else
-+static void parse_mntopt(char *opt, unsigned long *mflags, unsigned long *pflags, char **data, size_t size)
-+{
-+	struct mount_opt *mo;
-+
-+	/* If opt is found in mount_opt, set or clear flags.
-+	 * Otherwise append it to data. */
-+
-+	for (mo = &mount_opt0; mo->name != NULL; mo++) {
-+		if (strncmp(opt, mo->name, strlen(mo->name)) == 0) {
-+			if (mo->clear)
-+				*mflags &= ~mo->flag;
-+			else
-+				*mflags |= mo->flag;
-+			return;
-+		}
-+	}
-+
-+	/* If opt is found in propagation_opt, set or clear flags. */
-+	for (mo = &propagation_opt0; mo->name != NULL; mo++) {
-+		if (strncmp(opt, mo->name, strlen(mo->name)) != 0)
-+			continue;
-+
-+		if (mo->clear)
-+			*pflags &= ~mo->flag;
-+		else
-+			*pflags |= mo->flag;
-+
-+		return;
-+	}
-+
-+	if (strlen(*data))
-+		(void)strlcat(*data, ",", size);
-+
-+	(void)strlcat(*data, opt, size);
-+}
-+
-+int parse_mntopts(const char *mntopts, unsigned long *mntflags, unsigned long *pflags, char **mntdata)
-+{
-+	char *data, *p, *s;
-+	size_t size;
-+
-+	*mntdata = NULL;
-+	*mntflags = 0L;
-+	*pflags = 0L;
-+
-+	if (!mntopts)
-+		return 0;
-+
-+	s = safe_strdup(mntopts);
-+
-+	size = strlen(s) + 1;
-+	data = malloc(size);
-+	if (!data) {
-+		free(s);
-+		return -1;
-+	}
-+	*data = 0;
-+
-+	lxc_iterate_parts(p, s, ",")
-+	parse_mntopt(p, mntflags, pflags, &data, size);
-+
-+	if (*data)
-+		*mntdata = data;
-+	else
-+		free(data);
-+	free(s);
-+
-+	return 0;
-+}
-+#endif
- 
- static void parse_propagationopt(char *opt, unsigned long *flags)
- {
-@@ -1862,10 +2143,17 @@ static char *get_field(char *src, int nfields)
- 	return p;
- }
- 
-+#ifdef HAVE_ISULAD
-+static int mount_entry(const char *fsname, const char *target,
-+		       const char *fstype, unsigned long mountflags,
-+		       unsigned long pflags, const char *data, bool optional,
-+		       bool dev, bool relative, const char *rootfs, const char *mount_label)
-+#else
- static int mount_entry(const char *fsname, const char *target,
- 		       const char *fstype, unsigned long mountflags,
- 		       unsigned long pflags, const char *data, bool optional,
- 		       bool dev, bool relative, const char *rootfs)
-+#endif
- {
- 	int ret;
- 	char srcbufPATH_MAX;
-@@ -1881,8 +2169,13 @@ static int mount_entry(const char *fsname, const char *target,
- 		srcpath = srcbuf;
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	ret = safe_mount(srcpath, target, fstype, mountflags & ~MS_REMOUNT, data,
-+			 rootfs, mount_label);
-+#else
- 	ret = safe_mount(srcpath, target, fstype, mountflags & ~MS_REMOUNT, data,
- 			 rootfs);
-+#endif
- 	if (ret < 0) {
- 		if (optional)
- 			return log_info_errno(0, errno, "Failed to mount \"%s\" on \"%s\" (optional)",
-@@ -2010,8 +2303,15 @@ static int mount_entry_create_dir_file(const struct mntent *mntent,
- 
- 	if (hasmntopt(mntent, "create=dir")) {
- 		ret = mkdir_p(path, 0755);
-+#ifdef HAVE_ISULAD
-+		if (ret < 0 && errno != EEXIST) {
-+			lxc_write_error_message(rootfs->errfd, "%s:%d: mkdir %s: %s.", __FILE__, __LINE__, path, strerror(errno));
-+			return log_error_errno(-1, errno, "Failed to create directory \"%s\"", path);
-+		}
-+#else
- 		if (ret < 0 && errno != EEXIST)
- 			return log_error_errno(-1, errno, "Failed to create directory \"%s\"", path);
-+#endif
- 	}
- 
- 	if (!hasmntopt(mntent, "create=file"))
-@@ -2028,29 +2328,56 @@ static int mount_entry_create_dir_file(const struct mntent *mntent,
- 	p2 = dirname(p1);
- 
- 	ret = mkdir_p(p2, 0755);
-+#ifdef HAVE_ISULAD
-+	if (ret < 0 && errno != EEXIST) {
-+		lxc_write_error_message(rootfs->errfd, "%s:%d: mkdir %s: %s.", __FILE__, __LINE__, path, strerror(errno));
-+		return log_error_errno(-1, errno, "Failed to create directory \"%s\"", path);
-+	}
-+#else
- 	if (ret < 0 && errno != EEXIST)
- 		return log_error_errno(-1, errno, "Failed to create directory \"%s\"", path);
-+#endif
- 
- 	ret = mknod(path, S_IFREG | 0000, 0);
-+#ifdef HAVE_ISULAD
-+	if (ret < 0 && errno != EEXIST) {
-+		lxc_write_error_message(rootfs->errfd, "%s:%d: open %s: %s.", __FILE__, __LINE__, path, strerror(errno));
-+		return -errno;
-+	}
-+#else
- 	if (ret < 0 && errno != EEXIST)
- 		return -errno;
-+#endif
- 
- 	return 0;
- }
- 
- /* rootfs, lxc_name, and lxc_path can be NULL when the container is created
-  * without a rootfs. */
-+#ifdef HAVE_ISULAD
-+static inline int mount_entry_on_generic(struct mntent *mntent,
-+					 const char *path,
-+					 const struct lxc_rootfs *rootfs,
-+					 const char *lxc_name,
-+					 const char *lxc_path,
-+					 const char *mount_label)
-+#else
- static inline int mount_entry_on_generic(struct mntent *mntent,
- 					 const char *path,
- 					 const struct lxc_rootfs *rootfs,
- 					 const char *lxc_name,
- 					 const char *lxc_path)
-+#endif
- {
- 	__do_free char *mntdata = NULL;
- 	unsigned long mntflags = 0, pflags = 0;
- 	char *rootfs_path = NULL;
- 	int ret;
- 	bool dev, optional, relative;
-+#ifdef HAVE_ISULAD
-+	const char *dest = path;
-+	char *rpath = NULL;
-+#endif
- 
- 	optional = hasmntopt(mntent, "optional") != NULL;
- 	dev = hasmntopt(mntent, "dev") != NULL;
-@@ -2059,9 +2386,41 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
- 	if (rootfs && rootfs->path)
- 		rootfs_path = rootfs->mount;
- 
-+#ifndef HAVE_ISULAD
- 	ret = mount_entry_create_dir_file(mntent, path, rootfs, lxc_name,
- 					  lxc_path);
-+#else
-+	// isulad: ensure that the destination of the bind mount is resolved of symlinks at mount time because
-+	// any previous mounts can invalidate the next mount's destination.
-+	// this can happen when a user specifies mounts within other mounts to cause breakouts or other
-+	// evil stuff to try to escape the container's rootfs.
-+	if (rootfs_path) {
-+		rpath = follow_symlink_in_scope(path, rootfs_path);
-+		if (!rpath) {
-+			ERROR("Failed to get real path of '%s' in scope '%s'.", path, rootfs_path);
-+			lxc_write_error_message(rootfs->errfd, "%s:%d: failed to get real path of '%s' in scope '%s'.",
-+			                        __FILE__, __LINE__, path, rootfs_path);
-+			return -1;
-+		}
-+		dest = rpath;
-+
-+		ret = check_mount_destination(rootfs_path, dest, mntent->mnt_fsname);
-+		if (ret) {
-+			ERROR("Mount destination is invalid: '%s'", dest);
-+			lxc_write_error_message(rootfs->errfd, "%s:%d: mount destination is invalid: '%s'.",
-+			                        __FILE__, __LINE__, dest);
-+			free(rpath);
-+			return -1;
-+		}
-+	}
-+	ret = mount_entry_create_dir_file(mntent, dest, rootfs, lxc_name,
-+					  lxc_path);
-+#endif
-+
- 	if (ret < 0) {
-+#ifdef HAVE_ISULAD
-+		free(rpath);
-+#endif
- 		if (optional)
- 			return 0;
- 
-@@ -2069,6 +2428,29 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
- 	}
- 	cull_mntent_opt(mntent);
- 
-+#ifdef HAVE_ISULAD
-+	ret = parse_mntopts(mntent->mnt_opts, &mntflags, &pflags, &mntdata);
-+	if (ret < 0) {
-+		free(rpath);
-+		return -1;
-+	}
-+
-+	// support squashfs
-+	if (strcmp(mntent->mnt_type, "squashfs") == 0) {
-+		ret = mount_entry_with_loop_dev(mntent->mnt_fsname, dest, mntent->mnt_type,
-+						mntent->mnt_opts, rootfs_path);
-+	} else {
-+		ret = mount_entry(mntent->mnt_fsname, dest, mntent->mnt_type, mntflags,
-+					pflags, mntdata, optional, dev, relative, rootfs_path, mount_label);
-+	}
-+
-+	if (ret < 0) {
-+		lxc_write_error_message(rootfs->errfd, "%s:%d: failed to mount %s as type %s.",
-+		                        __FILE__, __LINE__, mntent->mnt_fsname, mntent->mnt_type);
-+	}
-+
-+	free(rpath);
-+#else
- 	ret = parse_propagationopts(mntent->mnt_opts, &pflags);
- 	if (ret < 0)
- 		return -1;
-@@ -2079,6 +2461,7 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
- 
- 	ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type, mntflags,
- 			  pflags, mntdata, optional, dev, relative, rootfs_path);
-+#endif
- 
- 	return ret;
- }
-@@ -2098,13 +2481,25 @@ static inline int mount_entry_on_systemfs(struct mntent *mntent)
- 	if (ret < 0 || ret >= sizeof(path))
- 		return -1;
- 
-+#ifdef HAVE_ISULAD
-+	return mount_entry_on_generic(mntent, path, NULL, NULL, NULL, NULL);
-+#else
- 	return mount_entry_on_generic(mntent, path, NULL, NULL, NULL);
-+#endif
- }
- 
-+#ifdef HAVE_ISULAD
-+static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
-+					  const struct lxc_rootfs *rootfs,
-+					  const char *lxc_name,
-+					  const char *lxc_path,
-+					  const char *mount_label)
-+#else
- static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
- 					  const struct lxc_rootfs *rootfs,
- 					  const char *lxc_name,
- 					  const char *lxc_path)
-+#endif
- {
- 	int offset;
- 	char *aux;
-@@ -2140,13 +2535,25 @@ skipabs:
- 	if (ret < 0 || ret >= PATH_MAX)
- 		return -1;
- 
-+#ifdef HAVE_ISULAD
-+	return mount_entry_on_generic(mntent, path, rootfs, lxc_name, lxc_path, mount_label);
-+#else
- 	return mount_entry_on_generic(mntent, path, rootfs, lxc_name, lxc_path);
-+#endif
- }
- 
-+#ifdef HAVE_ISULAD
-+static int mount_entry_on_relative_rootfs(struct mntent *mntent,
-+					  const struct lxc_rootfs *rootfs,
-+					  const char *lxc_name,
-+					  const char *lxc_path,
-+					  const char *mount_label)
-+#else
- static int mount_entry_on_relative_rootfs(struct mntent *mntent,
- 					  const struct lxc_rootfs *rootfs,
- 					  const char *lxc_name,
- 					  const char *lxc_path)
-+#endif
- {
- 	int ret;
- 	char pathPATH_MAX;
-@@ -2156,12 +2563,22 @@ static int mount_entry_on_relative_rootfs(struct mntent *mntent,
- 	if (ret < 0 || (size_t)ret >= sizeof(path))
- 		return -1;
- 
-+#ifdef HAVE_ISULAD
-+	return mount_entry_on_generic(mntent, path, rootfs, lxc_name, lxc_path, mount_label);
-+#else
- 	return mount_entry_on_generic(mntent, path, rootfs, lxc_name, lxc_path);
-+#endif
- }
- 
-+#ifdef HAVE_ISULAD
-+static int mount_file_entries(const struct lxc_conf *conf,
-+			      const struct lxc_rootfs *rootfs, FILE *file,
-+			      const char *lxc_name, const char *lxc_path, const char *mount_label)
-+#else
- static int mount_file_entries(const struct lxc_conf *conf,
- 			      const struct lxc_rootfs *rootfs, FILE *file,
- 			      const char *lxc_name, const char *lxc_path)
-+#endif
- {
- 	char bufPATH_MAX;
- 	struct mntent mntent;
-@@ -2169,6 +2586,42 @@ static int mount_file_entries(const struct lxc_conf *conf,
- 	while (getmntent_r(file, &mntent, buf, sizeof(buf))) {
- 		int ret;
- 
-+#ifdef HAVE_ISULAD
-+		//isulad, system contaienr, skip "proc/sys/xxx" path
-+		if (conf->systemd != NULL && strcmp(conf->systemd, "true") == 0) {
-+			if (strstr(mntent.mnt_dir, "proc/sys") != NULL) {
-+				continue;
-+			}
-+		}
-+
-+		/* Note: Workaround for volume file path with space*/
-+		mntent.mnt_fsname = lxc_string_replace(SPACE_MAGIC_STR, " ", mntent.mnt_fsname);
-+		if(!mntent.mnt_fsname) {
-+			SYSERROR("memory allocation error");
-+			return -1;
-+		}
-+		mntent.mnt_dir = lxc_string_replace(SPACE_MAGIC_STR, " ", mntent.mnt_dir);
-+		if(!mntent.mnt_dir) {
-+			SYSERROR("memory allocation error");
-+			free(mntent.mnt_fsname);
-+			return -1;
-+		}
-+
-+		if (!rootfs->path)
-+			ret = mount_entry_on_systemfs(&mntent);
-+		else if (mntent.mnt_dir0 != '/')
-+			ret = mount_entry_on_relative_rootfs(&mntent, rootfs,
-+							     lxc_name, lxc_path, mount_label);
-+		else
-+			ret = mount_entry_on_absolute_rootfs(&mntent, rootfs,
-+							     lxc_name, lxc_path, mount_label);
-+
-+		free(mntent.mnt_fsname);
-+		mntent.mnt_fsname = NULL;
-+		free(mntent.mnt_dir);
-+		mntent.mnt_dir = NULL;
-+#else
-+
- 		if (!rootfs->path)
- 			ret = mount_entry_on_systemfs(&mntent);
- 		else if (mntent.mnt_dir0 != '/')
-@@ -2177,6 +2630,8 @@ static int mount_file_entries(const struct lxc_conf *conf,
- 		else
- 			ret = mount_entry_on_absolute_rootfs(&mntent, rootfs,
- 							     lxc_name, lxc_path);
-+#endif
-+
- 		if (ret < 0)
- 			return -1;
- 	}
-@@ -2195,9 +2650,15 @@ static inline void __auto_endmntent__(FILE **f)
- 
- #define __do_endmntent __attribute__((__cleanup__(__auto_endmntent__)))
- 
-+#ifdef HAVE_ISULAD
-+static int setup_mount(const struct lxc_conf *conf,
-+		       const struct lxc_rootfs *rootfs, const char *fstab,
-+		       const char *lxc_name, const char *lxc_path, const char *mount_label)
-+#else
- static int setup_mount(const struct lxc_conf *conf,
- 		       const struct lxc_rootfs *rootfs, const char *fstab,
- 		       const char *lxc_name, const char *lxc_path)
-+#endif
- {
- 	__do_endmntent FILE *f = NULL;
- 	int ret;
-@@ -2209,7 +2670,11 @@ static int setup_mount(const struct lxc_conf *conf,
- 	if (!f)
- 		return log_error_errno(-1, errno, "Failed to open \"%s\"", fstab);
- 
-+#ifdef HAVE_ISULAD
-+	ret = mount_file_entries(conf, rootfs, f, lxc_name, lxc_path, mount_label);
-+#else
- 	ret = mount_file_entries(conf, rootfs, f, lxc_name, lxc_path);
-+#endif
- 	if (ret < 0)
- 		ERROR("Failed to set up mount entries");
- 
-@@ -2285,10 +2750,17 @@ FILE *make_anonymous_mount_file(struct lxc_list *mount,
- 	return f;
- }
- 
-+#ifdef HAVE_ISULAD
-+static int setup_mount_entries(const struct lxc_conf *conf,
-+			       const struct lxc_rootfs *rootfs,
-+			       struct lxc_list *mount, const char *lxc_name,
-+			       const char *lxc_path, const char *mount_label)
-+#else
- static int setup_mount_entries(const struct lxc_conf *conf,
- 			       const struct lxc_rootfs *rootfs,
- 			       struct lxc_list *mount, const char *lxc_name,
- 			       const char *lxc_path)
-+#endif
- {
- 	__do_fclose FILE *f = NULL;
- 
-@@ -2296,7 +2768,11 @@ static int setup_mount_entries(const struct lxc_conf *conf,
- 	if (!f)
- 		return -1;
- 
-+#ifdef HAVE_ISULAD
-+	return mount_file_entries(conf, rootfs, f, lxc_name, lxc_path, mount_label);
-+#else
- 	return mount_file_entries(conf, rootfs, f, lxc_name, lxc_path);
-+#endif
- }
- 
- static int parse_cap(const char *cap)
-@@ -2395,6 +2871,16 @@ static int dropcaps_except(struct lxc_list *caps)
- 	lxc_list_for_each (iterator, caps) {
- 		keep_entry = iterator->elem;
- 
-+#ifdef HAVE_ISULAD
-+		/* Do not keep any cap*/
-+		if (strcmp(keep_entry, "ISULAD_KEEP_NONE") == 0) {
-+			DEBUG("Do not keep any capability");
-+			for(i = 0; i < numcaps; i++) {
-+				caplisti = 0;
-+			}
-+			break;
-+		}
-+#endif
- 		capid = parse_cap(keep_entry);
- 		if (capid == -2)
- 			continue;
-@@ -2443,7 +2929,11 @@ static int parse_resource(const char *res)
- 	return resid;
- }
- 
-+#ifdef HAVE_ISULAD
-+int setup_resource_limits(struct lxc_list *limits, pid_t pid, int errfd)
-+#else
- int setup_resource_limits(struct lxc_list *limits, pid_t pid)
-+#endif
- {
- 	int resid;
- 	struct lxc_list *it;
-@@ -2457,8 +2947,17 @@ int setup_resource_limits(struct lxc_list *limits, pid_t pid)
- 			return log_error(-1, "Unknown resource %s", lim->resource);
- 
- #if HAVE_PRLIMIT || HAVE_PRLIMIT64
-+#ifdef HAVE_ISULAD
-+		if (prlimit(pid, resid, &lim->limit, NULL) != 0) {
-+			lxc_write_error_message(errfd, "%s:%d: Failed to set limit %s %lu %lu: %s.",
-+					__FILE__, __LINE__, lim->resource,
-+					lim->limit.rlim_cur, lim->limit.rlim_max, strerror(errno));
-+			return log_error_errno(-1, errno, "Failed to set limit %s", lim->resource);
-+		}
-+#else
- 		if (prlimit(pid, resid, &lim->limit, NULL) != 0)
- 			return log_error_errno(-1, errno, "Failed to set limit %s", lim->resource);
-+#endif
- 
- 		TRACE("Setup \"%s\" limit", lim->resource);
- #else
-@@ -2601,6 +3100,27 @@ struct lxc_conf *lxc_conf_init(void)
- 	memset(&new->ns_share, 0, sizeof(char *) * LXC_NS_MAX);
- 	seccomp_conf_init(new);
- 
-+#ifdef HAVE_ISULAD
-+	lxc_list_init(&new->populate_devs);
-+	lxc_list_init(&new->rootfs.maskedpaths);
-+	lxc_list_init(&new->rootfs.ropaths);
-+	new->exit_fd = -1;
-+	new->umask = 0027; /*default umask 0027*/
-+	new->console.init_fifo0 = NULL;
-+	new->console.init_fifo1 = NULL;
-+	new->console.init_fifo2 = NULL;
-+	new->console.pipes00 = -1;
-+	new->console.pipes01 = -1;
-+	new->console.pipes10 = -1;
-+	new->console.pipes11 = -1;
-+	new->console.pipes20 = -1;
-+	new->console.pipes21 = -1;
-+	lxc_list_init(&new->console.fifos);
-+	new->errmsg = NULL;
-+	new->errpipe0 = -1;
-+	new->errpipe1 = -1;
-+#endif
-+
- 	return new;
- }
- 
-@@ -3001,7 +3521,11 @@ again:
- 		null_endofword(target);
- 		ret = mount(NULL, target, NULL, MS_SLAVE, NULL);
- 		if (ret < 0) {
-+#ifdef HAVE_ISULAD
-+			SYSERROR("Failed to recursively turn old root mount tree: %s into dependent mount. Continuing...", target);
-+#else
- 			SYSERROR("Failed to recursively turn old root mount tree into dependent mount. Continuing...");
-+#endif
- 			continue;
- 		}
- 		TRACE("Recursively turned old root mount tree into dependent mount");
-@@ -3046,7 +3570,11 @@ static int lxc_execute_bind_init(struct lxc_handler *handler)
- 			return log_error_errno(-1, errno, "Failed to create dummy \"%s\" file as bind mount target", destpath);
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	ret = safe_mount(path, destpath, "none", MS_BIND, NULL, conf->rootfs.mount, conf->lsm_se_mount_context);
-+#else
- 	ret = safe_mount(path, destpath, "none", MS_BIND, NULL, conf->rootfs.mount);
-+#endif
- 	if (ret < 0)
- 		return log_error_errno(-1, errno, "Failed to bind mount lxc.init.static into container");
- 
-@@ -3082,7 +3610,13 @@ int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
- 		return log_trace(0, "Bind mounted container / onto itself");
- 	}
- 
-+#ifndef HAVE_ISULAD
- 	turn_into_dependent_mounts();
-+#else
-+	if (!conf->rootfs.options) {
-+		turn_into_dependent_mounts();
-+	}
-+#endif
- 
- 	ret = run_lxc_hooks(name, "pre-mount", conf, NULL);
- 	if (ret < 0)
-@@ -3182,15 +3716,29 @@ static int lxc_setup_boot_id(void)
- 
- int lxc_setup(struct lxc_handler *handler)
- {
-+#ifndef HAVE_ISULAD
- 	__do_close int pts_mnt_fd = -EBADF;
-+#endif
- 	int ret;
- 	const char *lxcpath = handler->lxcpath, *name = handler->name;
- 	struct lxc_conf *lxc_conf = handler->conf;
- 	char *keyring_context = NULL;
-+#ifdef HAVE_ISULAD
-+	bool setup_dev = true;
-+	bool setup_proc = true;
-+#endif
- 
- 	ret = lxc_setup_rootfs_prepare_root(lxc_conf, name, lxcpath);
- 	if (ret < 0)
-+#ifdef HAVE_ISULAD
-+	{
-+		lxc_write_error_message(lxc_conf->errpipe1, "%s:%d: failed to setup rootfs %s.",
-+				__FILE__, __LINE__, lxc_conf->rootfs.path);
-+		return log_error(-1, "Failed to setup rootfs");
-+	}
-+#else
- 		return log_error(-1, "Failed to setup rootfs");
-+#endif
- 
- 	if (handler->nsfdLXC_NS_UTS == -EBADF) {
- 		ret = setup_utsname(lxc_conf->utsname);
-@@ -3221,6 +3769,7 @@ int lxc_setup(struct lxc_handler *handler)
- 			return log_error(-1, "Failed to send network device names and ifindices to parent");
- 	}
- 
-+#ifndef HAVE_ISULAD
- 	if (wants_console(&lxc_conf->console)) {
- 		pts_mnt_fd = open_tree(-EBADF, lxc_conf->console.name,
- 				       OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC | AT_EMPTY_PATH);
-@@ -3231,9 +3780,15 @@ int lxc_setup(struct lxc_handler *handler)
- 			TRACE("Created detached mount for container's console \"%s\"",
- 			      lxc_conf->console.name);
- 	}
-+#endif
- 
- 	if (lxc_conf->autodev > 0) {
-+#ifdef HAVE_ISULAD
-+		ret = mount_autodev(name, &lxc_conf->rootfs, lxc_conf->autodevtmpfssize, lxcpath,
-+		 lxc_conf->systemd, lxc_conf->lsm_se_mount_context);
-+#else
- 		ret = mount_autodev(name, &lxc_conf->rootfs, lxc_conf->autodevtmpfssize, lxcpath);
-+#endif
- 		if (ret < 0)
- 			return log_error(-1, "Failed to mount \"/dev\"");
- 	}
-@@ -3245,15 +3800,38 @@ int lxc_setup(struct lxc_handler *handler)
- 	if (ret < 0)
- 		return log_error(-1, "Failed to setup first automatic mounts");
- 
-+#ifdef HAVE_ISULAD
-+	/* Now mount only cgroups, if wanted. Before, /sys could not have been
-+	 * mounted. It is guaranteed to be mounted now either through
-+	 * automatically or via fstab entries.
-+	 */
-+	ret = lxc_mount_auto_mounts(lxc_conf, lxc_conf->auto_mounts & LXC_AUTO_CGROUP_MASK, handler);
-+	if (ret < 0)
-+		return log_error(-1, "Failed to setup remaining automatic mounts");
-+#endif
-+
-+#ifdef HAVE_ISULAD
-+	ret = setup_mount(lxc_conf, &lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath, lxc_conf->lsm_se_mount_context);
-+#else
- 	ret = setup_mount(lxc_conf, &lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath);
-+#endif
- 	if (ret < 0)
- 		return log_error(-1, "Failed to setup mounts");
- 
- 	if (!lxc_list_empty(&lxc_conf->mount_list)) {
-+#ifdef HAVE_ISULAD
-+		ret = setup_mount_entries(lxc_conf, &lxc_conf->rootfs,
-+					  &lxc_conf->mount_list, name, lxcpath, lxc_conf->lsm_se_mount_context);
-+#else
- 		ret = setup_mount_entries(lxc_conf, &lxc_conf->rootfs,
- 					  &lxc_conf->mount_list, name, lxcpath);
-+#endif
- 		if (ret < 0)
- 			return log_error(-1, "Failed to setup mount entries");
-+#ifdef HAVE_ISULAD
-+		setup_dev = need_setup_dev(lxc_conf, &lxc_conf->mount_list);
-+		setup_proc = need_setup_proc(lxc_conf, &lxc_conf->mount_list);
-+#endif
- 	}
- 
- 	if (lxc_conf->is_execute) {
-@@ -3278,6 +3856,7 @@ int lxc_setup(struct lxc_handler *handler)
- 		}
- 	}
- 
-+#ifndef HAVE_ISULAD
- 	/* Now mount only cgroups, if wanted. Before, /sys could not have been
- 	 * mounted. It is guaranteed to be mounted now either through
- 	 * automatically or via fstab entries.
-@@ -3285,6 +3864,7 @@ int lxc_setup(struct lxc_handler *handler)
- 	ret = lxc_mount_auto_mounts(lxc_conf, lxc_conf->auto_mounts & LXC_AUTO_CGROUP_MASK, handler);
- 	if (ret < 0)
- 		return log_error(-1, "Failed to setup remaining automatic mounts");
-+#endif
- 
- 	ret = run_lxc_hooks(name, "mount", lxc_conf, NULL);
- 	if (ret < 0)
-@@ -3295,21 +3875,45 @@ int lxc_setup(struct lxc_handler *handler)
- 		if (ret < 0)
- 			return log_error(-1, "Failed to run autodev hooks");
- 
-+#ifdef HAVE_ISULAD
-+		ret = lxc_fill_autodev(&lxc_conf->rootfs, lxc_conf->lsm_se_mount_context);
-+#else
- 		ret = lxc_fill_autodev(&lxc_conf->rootfs);
-+#endif
- 		if (ret < 0)
- 			return log_error(-1, "Failed to populate \"/dev\"");
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: setup devices which will be populated in the container. */
-+	if (!lxc_list_empty(&lxc_conf->populate_devs) && setup_dev) {
-+		if (setup_populate_devs(&lxc_conf->rootfs, &lxc_conf->populate_devs, lxc_conf->lsm_se_mount_context) != 0) {
-+			return log_error(-1, "Failed to setup devices in the container");
-+		}
-+	}
-+#endif
-+
- 	/* Make sure any start hooks are in the container */
- 	if (!verify_start_hooks(lxc_conf))
- 		return log_error(-1, "Failed to verify start hooks");
- 
-+#ifndef HAVE_ISULAD
- 	ret = lxc_create_tmp_proc_mount(lxc_conf);
- 	if (ret < 0)
- 		return log_error(-1, "Failed to \"/proc\" LSMs");
- 
- 	ret = lxc_setup_console(&lxc_conf->rootfs, &lxc_conf->console,
- 				lxc_conf->ttys.dir, pts_mnt_fd);
-+#else
-+	if (setup_proc) {
-+		ret = lxc_create_tmp_proc_mount(lxc_conf);
-+		if (ret < 0)
-+			return log_error(-1, "Failed to \"/proc\" LSMs");
-+	}
-+
-+	ret = lxc_setup_console(&lxc_conf->rootfs, &lxc_conf->console,
-+				lxc_conf->ttys.dir, lxc_conf->lsm_se_mount_context);
-+#endif
- 	if (ret < 0)
- 		return log_error(-1, "Failed to setup console");
- 
-@@ -3317,6 +3921,12 @@ int lxc_setup(struct lxc_handler *handler)
- 	if (ret < 0)
- 		return log_error(-1, "Failed to setup \"/dev\" symlinks");
- 
-+#ifdef HAVE_ISULAD
-+	/* Ask father to run oci prestart hooks and wait for him to finish. */
-+	if (lxc_sync_barrier_parent(handler, LXC_SYNC_OCI_PRESTART_HOOK)) {
-+		return log_error(-1, "Failed to sync parent to start host hook");
-+	}
-+#endif
- 	ret = lxc_setup_rootfs_switch_root(&lxc_conf->rootfs);
- 	if (ret < 0)
- 		return log_error(-1, "Failed to pivot root into rootfs");
-@@ -3325,14 +3935,31 @@ int lxc_setup(struct lxc_handler *handler)
- 	if (lxc_conf->autodev > 0)
- 		(void)lxc_setup_boot_id();
- 
-+#ifdef HAVE_ISULAD
-+	if (setup_rootfs_mountopts(&lxc_conf->rootfs)) {
-+			return log_error(-1, "failed to set rootfs for '%s'", name);
-+	}
-+	if (lxc_conf->rootfs.path != NULL && setup_dev) {
-+		ret = lxc_setup_devpts(lxc_conf);
-+		if (ret < 0) {
-+			return log_error(-1, "Failed to setup new devpts instance for '%s'", name);
-+		}
-+	}
-+#else
- 	ret = lxc_setup_devpts(lxc_conf);
- 	if (ret < 0)
- 		return log_error(-1, "Failed to setup new devpts instance");
-+#endif
- 
- 	ret = lxc_create_ttys(handler);
- 	if (ret < 0)
- 		return -1;
- 
-+#ifdef HAVE_ISULAD
-+	/*isulad: set system umask */
-+	umask(lxc_conf->umask);
-+#endif
-+
- 	ret = setup_personality(lxc_conf->personality);
- 	if (ret < 0)
- 		return log_error(-1, "Failed to set personality");
-@@ -3347,6 +3974,37 @@ int lxc_setup(struct lxc_handler *handler)
- 			return log_error(-1, "Failed to setup sysctl parameters");
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	// isulad: setup rootfs masked paths
-+	if (!lxc_list_empty(&lxc_conf->rootfs.maskedpaths)) {
-+		if (setup_rootfs_maskedpaths(&lxc_conf->rootfs.maskedpaths)) {
-+			return log_error(-1, "failed to setup maskedpaths");
-+		}
-+	}
-+
-+	// isulad: setup rootfs ro paths
-+	if (!lxc_list_empty(&lxc_conf->rootfs.ropaths)) {
-+		if (setup_rootfs_ropaths(&lxc_conf->rootfs.ropaths)) {
-+			return log_error(-1, "failed to setup readonlypaths");
-+		}
-+	}
-+
-+	//isulad: system container, remount /proc/sys/xxx by mount_list
-+	if (lxc_conf->systemd != NULL && strcmp(lxc_conf->systemd, "true") == 0) {
-+		if (!lxc_list_empty(&lxc_conf->mount_list)) {
-+			if (remount_proc_sys_mount_entries(&lxc_conf->mount_list,
-+							   lxc_conf->lsm_aa_allow_nesting)) {
-+				return log_error(-1, "failed to remount /proc/sys");
-+			}
-+		}
-+        }
-+
-+	// isulad: create link /etc/mtab for /proc/mounts
-+	if (create_mtab_link() != 0) {
-+		return log_error(-1, "failed to create link /etc/mtab for target /proc/mounts");
-+	}
-+#endif
-+
- 	if (!lxc_list_empty(&lxc_conf->keepcaps)) {
- 		if (!lxc_list_empty(&lxc_conf->caps))
- 			return log_error(-1, "Container requests lxc.cap.drop and lxc.cap.keep: either use lxc.cap.drop or lxc.cap.keep, not both");
-@@ -3753,6 +4411,25 @@ void lxc_conf_free(struct lxc_conf *conf)
- 	free(conf->cgroup_meta.controllers);
- 	free(conf->shmount.path_host);
- 	free(conf->shmount.path_cont);
-+#ifdef HAVE_ISULAD
-+	free(conf->container_info_file);
-+	if (conf->exit_fd != -1) {
-+		close(conf->exit_fd);
-+	}
-+	free(conf->systemd);
-+	lxc_clear_init_args(conf);
-+	lxc_clear_init_groups(conf);
-+	lxc_clear_populate_devices(conf);
-+	lxc_clear_rootfs_masked_paths(conf);
-+	lxc_clear_rootfs_ro_paths(conf);
-+	free(conf->errmsg);
-+	lxc_close_error_pipe(conf->errpipe);
-+	if (conf->ocihooks) {
-+		free_oci_runtime_spec_hooks(conf->ocihooks);
-+	}
-+	free(conf->lsm_se_mount_context);
-+	free(conf->lsm_se_keyring_context);
-+#endif
- 	free(conf);
- }
- 
-@@ -4775,3 +5452,1315 @@ struct lxc_list *sort_cgroup_settings(struct lxc_list *cgroup_settings)
- 
- 	return result;
- }
-+
-+#ifdef HAVE_ISULAD
-+/* isulad drop caps for container*/
-+int lxc_drop_caps(struct lxc_conf *conf)
-+{
-+#define __DEF_CAP_TO_MASK(x) (1U << ((x) & 31))
-+#if HAVE_LIBCAP
-+	int ret = 0;
-+	struct lxc_list *iterator = NULL;
-+	char *keep_entry = NULL;
-+	size_t i = 0;
-+	int capid;
-+	size_t numcaps = (size_t)lxc_caps_last_cap() + 1;
-+	struct lxc_list *caps = NULL;
-+	int *caplist = NULL;
-+
-+	if (lxc_list_empty(&conf->keepcaps))
-+		return 0;
-+
-+	caps = &conf->keepcaps;
-+
-+	if (numcaps <= 0 || numcaps > 200)
-+		return -1;
-+
-+	// caplisti is 1 if we keep capability i
-+	caplist = malloc(numcaps * sizeof(int));
-+	if (caplist == NULL) {
-+		ERROR("Out of memory");
-+		return -1;
-+	}
-+	(void)memset(caplist, 0, numcaps * sizeof(int));
-+
-+	lxc_list_for_each(iterator, caps) {
-+
-+		keep_entry = iterator->elem;
-+		/* isulad: Do not keep any cap*/
-+		if (strcmp(keep_entry, "ISULAD_KEEP_NONE") == 0) {
-+			DEBUG("Do not keep any capability");
-+			for(i = 0; i < numcaps; i++) {
-+				caplisti = 0;
-+			}
-+			break;
-+		}
-+
-+		capid = parse_cap(keep_entry);
-+
-+		if (capid == -2)
-+			continue;
-+
-+		if (capid < 0) {
-+			ERROR("unknown capability %s", keep_entry);
-+			ret = -1;
-+			goto out;
-+		}
-+
-+		DEBUG("keep capability '%s' (%d)", keep_entry, capid);
-+
-+		caplistcapid = 1;
-+	}
-+
-+	struct __user_cap_header_struct cap_header_data;
-+	struct __user_cap_data_struct cap_data_data2;
-+
-+	cap_user_header_t cap_header = &cap_header_data;
-+	cap_user_data_t cap_data = &cap_data_data0;
-+
-+	memset(cap_header, 0,sizeof(struct __user_cap_header_struct));
-+	memset(cap_data, 0, sizeof(struct __user_cap_data_struct) * 2);
-+
-+	cap_header->pid = 0;
-+	cap_header->version = _LINUX_CAPABILITY_VERSION_3;
-+
-+	for (i = 0; i < numcaps; i++) {
-+		if (caplisti) {
-+			cap_dataCAP_TO_INDEX(i).effective = cap_dataCAP_TO_INDEX(i).effective | (i > 31 ? __DEF_CAP_TO_MASK(i % 32) : __DEF_CAP_TO_MASK(i));
-+			cap_dataCAP_TO_INDEX(i).permitted = cap_dataCAP_TO_INDEX(i).permitted | (i > 31 ? __DEF_CAP_TO_MASK(i % 32) : __DEF_CAP_TO_MASK(i));
-+			cap_dataCAP_TO_INDEX(i).inheritable = cap_dataCAP_TO_INDEX(i).inheritable | (i > 31 ? __DEF_CAP_TO_MASK(i % 32) : __DEF_CAP_TO_MASK(i));
-+		}
-+	}
-+
-+	if (capset(cap_header, cap_data)) {
-+		SYSERROR("Failed to set capabilitys");
-+		ret = -1;
-+		goto out;
-+	}
-+
-+out:
-+	free(caplist);
-+	return ret;
-+#else
-+	return 0;
-+#endif
-+}
-+
-+static bool have_dev_bind_mount_entry(FILE *file)
-+{
-+	bool have_bind_dev = false;
-+	char bufPATH_MAX;
-+	struct mntent mntent;
-+
-+	while (getmntent_r(file, &mntent, buf, sizeof(buf))) {
-+		mntent.mnt_dir = lxc_string_replace(SPACE_MAGIC_STR, " ", mntent.mnt_dir);
-+		if(!mntent.mnt_dir) {
-+			SYSERROR("memory allocation error");
-+			continue;
-+		}
-+
-+		if (strcmp(mntent.mnt_dir, "dev") == 0 && strcmp(mntent.mnt_type, "bind") == 0) {
-+			have_bind_dev = true;
-+		}
-+
-+		free(mntent.mnt_dir);
-+		mntent.mnt_dir = NULL;
-+
-+		if (have_bind_dev)
-+			return true;
-+	}
-+
-+	return false;
-+}
-+
-+// returns true if /dev needs to be set up.
-+static bool need_setup_dev(const struct lxc_conf *conf, struct lxc_list *mount)
-+{
-+	__do_fclose FILE *f = NULL;
-+
-+	f = make_anonymous_mount_file(mount, conf->lsm_aa_allow_nesting);
-+	if (!f)
-+		return true;
-+
-+	if (have_dev_bind_mount_entry(f)) {
-+		return false;
-+	} else {
-+		return true;
-+	}
-+}
-+
-+static bool have_proc_bind_mount_entry(FILE *file)
-+{
-+	bool have_bind_proc = false;
-+	char bufPATH_MAX = { 0 };
-+	struct mntent mntent;
-+
-+	while (getmntent_r(file, &mntent, buf, sizeof(buf))) {
-+		mntent.mnt_dir = lxc_string_replace(SPACE_MAGIC_STR, " ", mntent.mnt_dir);
-+		if(mntent.mnt_dir == NULL) {
-+			SYSERROR("memory allocation error");
-+			continue;
-+		}
-+
-+		DEBUG("parsed mnt %s, %s, %s", mntent.mnt_fsname, mntent.mnt_dir, mntent.mnt_type);
-+
-+		if (strcmp(mntent.mnt_dir, "proc") == 0 && strcmp(mntent.mnt_type, "bind") == 0) {
-+			have_bind_proc = true;
-+		}
-+
-+		free(mntent.mnt_dir);
-+		mntent.mnt_dir = NULL;
-+
-+		if (have_bind_proc)
-+			return true;
-+	}
-+
-+	return false;
-+}
-+
-+// returns true if /proc needs to be set up.
-+static bool need_setup_proc(const struct lxc_conf *conf, struct lxc_list *mount)
-+{
-+	__do_fclose FILE *f = NULL;
-+
-+	f = make_anonymous_mount_file(mount, conf->lsm_aa_allow_nesting);
-+	if (f == NULL)
-+		return true;
-+
-+	if (have_proc_bind_mount_entry(f)) {
-+		return false;
-+	} else {
-+		return true;
-+	}
-+}
-+
-+static int mount_entry_with_loop_dev(const char *src, const char *dest, const char *fstype,
-+		char *mnt_opts, const char *rootfs)
-+{
-+	int srcfd = -1, destfd, ret, saved_errno;
-+	char srcbuf50, destbuf50; // only needs enough for /proc/self/fd/<fd>
-+	const char *mntsrc = src;
-+	int max_retry = 5;
-+	struct lxc_storage loop;
-+
-+	if (!rootfs)
-+		rootfs = "";
-+
-+	/* todo - allow symlinks for relative paths if 'allowsymlinks' option is passed */
-+	if (src && src0 != '/') {
-+		INFO("this is a relative mount");
-+		srcfd = open_without_symlink(src, NULL);
-+		if (srcfd < 0)
-+			return srcfd;
-+		ret = snprintf(srcbuf, sizeof(srcbuf), "/proc/self/fd/%d", srcfd);
-+		if (ret < 0 || ret > sizeof(srcbuf)) {
-+			close(srcfd);
-+			ERROR("Failed to print string");
-+			return -EINVAL;
-+		}
-+		mntsrc = srcbuf;
-+	}
-+
-+	destfd = open_without_symlink(dest, rootfs);
-+	if (destfd < 0) {
-+		if (srcfd != -1) {
-+			saved_errno = errno;
-+			close(srcfd);
-+			errno = saved_errno;
-+		}
-+		return destfd;
-+	}
-+
-+	ret = snprintf(destbuf, sizeof(destbuf), "/proc/self/fd/%d", destfd);
-+	if (ret < 0 || ret > sizeof(destbuf)) {
-+		if (srcfd != -1)
-+			close(srcfd);
-+		close(destfd);
-+		ERROR("Out of memory");
-+		return -EINVAL;
-+	}
-+
-+retry:
-+	loop.src = (char *)mntsrc;
-+	loop.dest = destbuf;
-+	loop.mntopts = mnt_opts;
-+	loop.type = "loop";
-+	loop.lofd = -1;
-+	ret = loop_mount(&loop);
-+	if (ret < 0) {
-+		/* If loop is used by other program, mount may fail. So
-+		 * we do retry to ensure mount ok */
-+		if (max_retry > 0) {
-+			max_retry--;
-+			DEBUG("mount entry with loop dev failed, retry mount."
-+			      "retry count left %d", max_retry);
-+			goto retry;
-+		}
-+	}
-+	if (loop.lofd != -1)
-+		close(loop.lofd);
-+	if (srcfd != -1)
-+		close(srcfd);
-+	close(destfd);
-+	if (ret < 0) {
-+		SYSERROR("Failed to mount %s onto %s", src, dest);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+/* isulad: checkMountDestination checks to ensure that the mount destination is not over the top of /proc.
-+ * dest is required to be an abs path and have any symlinks resolved before calling this function. */
-+static int check_mount_destination(const char *rootfs, const char *dest, const char *src)
-+{
-+	const char *invalid_destinations = {
-+		"/proc",
-+		NULL
-+	};
-+	// White list, it should be sub directories of invalid destinations
-+	const char *valid_destinations = {
-+		// These entries can be bind mounted by files emulated by fuse,
-+		// so commands like top, free displays stats in container.
-+		"/proc/cpuinfo",
-+		"/proc/diskstats",
-+		"/proc/meminfo",
-+		"/proc/stat",
-+		"/proc/swaps",
-+		"/proc/uptime",
-+		"/proc/net/dev",
-+		NULL
-+	};
-+	const char **valid = NULL;
-+	const char **invalid = NULL;
-+
-+	for(valid = valid_destinations; *valid != NULL; valid++) {
-+		__do_free char *fullpath = NULL;
-+		__do_free char *relpath = NULL;
-+		const char *parts3 = {
-+			rootfs,
-+			*valid,
-+			NULL
-+		};
-+		fullpath = lxc_string_join("/", parts, false);
-+		if (fullpath == NULL) {
-+			ERROR("Out of memory");
-+			return -1;
-+		}
-+		relpath = path_relative(fullpath, dest);
-+		if (relpath == NULL) {
-+			ERROR("Failed to get relpath for %s related to %s", dest, fullpath);
-+			return -1;
-+		}
-+		if (!strcmp(relpath, ".")) {
-+			return 0;
-+		}
-+	}
-+
-+	for(invalid = invalid_destinations; *invalid != NULL; invalid++) {
-+		__do_free char *fullpath = NULL;
-+		__do_free char *relpath = NULL;
-+		const char *parts3 = {
-+			rootfs,
-+			*invalid,
-+			NULL
-+		};
-+		fullpath = lxc_string_join("/", parts, false);
-+		if (fullpath == NULL) {
-+			ERROR("Out of memory");
-+			return -1;
-+		}
-+		relpath = path_relative(fullpath, dest);
-+		DEBUG("dst path %s get relative path %s with full path %s,src:%s", dest, relpath, fullpath, src);
-+		if (relpath == NULL) {
-+			ERROR("Failed to get relpath for %s related to %s", dest, fullpath);
-+			return -1;
-+		}
-+		// pass if the mount path is outside of invalid proc
-+		if (strncmp(relpath, "..", 2) == 0) {
-+			continue;
-+		}
-+		if (strcmp(relpath, ".") == 0) {
-+			if (src == NULL) {
-+				continue;
-+			}
-+			// pass if the mount on top of /proc and the source of the mount is a proc filesystem
-+			if (has_fs_type(src, PROC_SUPER_MAGIC)) {
-+				WARN("src %s is proc allow mount on-top of %s", src, *invalid);
-+				continue;
-+			}
-+			ERROR("%s cannot be mounted because it is located inside %s", dest, *invalid);
-+			return -1;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+// maskPath masks the top of the specified path inside a container to avoid
-+// security issues from processes reading information from non-namespace aware
-+// mounts ( proc/kcore ).
-+static bool mask_path(const char *path)
-+{
-+	int ret;
-+
-+	if (!path)
-+		return true;
-+
-+	ret = mount("/dev/null", path, "", MS_BIND, "");
-+	if (ret < 0 && errno != ENOENT) {
-+		if (errno == ENOTDIR) {
-+			ret = mount("tmpfs", path, "tmpfs", MS_RDONLY, "");
-+			if (ret < 0)
-+				goto error;
-+			return true;
-+		}
-+		goto error;
-+	}
-+	return true;
-+
-+error:
-+	SYSERROR("Failed to mask path \"%s\": %s", path, strerror(errno));
-+	return false;
-+}
-+
-+static bool remount_readwrite(const char *path)
-+{
-+	int ret, i;
-+
-+	if (!path)
-+		return true;
-+
-+	for (i = 0; i < 5; i++) {
-+		ret = mount("", path, "", MS_REMOUNT, "");
-+		if (ret < 0 && errno != ENOENT) {
-+			if (errno == EINVAL) {
-+				// Probably not a mountpoint, use bind-mount
-+				ret = mount(path, path, "", MS_BIND, "");
-+				if (ret < 0)
-+					goto on_error;
-+				ret = mount(path, path, "", MS_BIND | MS_REMOUNT | MS_REC | \
-+					    MS_NOEXEC | MS_NOSUID | MS_NODEV, "");
-+				if (ret < 0)
-+					goto on_error;
-+			} else if (errno == EBUSY) {
-+				DEBUG("Try to mount \"%s\" to readonly after 100ms.", path);
-+				usleep(100 * 1000);
-+				continue;
-+			} else {
-+				goto on_error;
-+			}
-+		}
-+		return true;
-+	}
-+
-+on_error:
-+	SYSERROR("Unable to mount \"%s\" to readwrite", path);
-+	return false;
-+}
-+
-+static int remount_proc_sys_mount_entries(struct lxc_list *mount_list, bool lsm_aa_allow_nesting)
-+{
-+	char buf4096;
-+	FILE *file;
-+	struct mntent mntent;
-+
-+	file = make_anonymous_mount_file(mount_list, lsm_aa_allow_nesting);
-+	if (!file)
-+		return -1;
-+
-+	while (getmntent_r(file, &mntent, buf, sizeof(buf))) {
-+		if (strstr(mntent.mnt_dir, "proc/sys") == NULL) {
-+			continue;
-+		}
-+
-+		if (!remount_readwrite((const char*)mntent.mnt_dir)) {
-+			fclose(file);
-+			return -1;
-+		}
-+	}
-+
-+	fclose(file);
-+	return 0;
-+}
-+
-+// remount_readonly will bind over the top of an existing path and ensure that it is read-only.
-+static bool remount_readonly(const char *path)
-+{
-+	int ret, i;
-+
-+	if (!path)
-+		return true;
-+
-+	for (i = 0; i < 5; i++) {
-+		ret = mount("", path, "", MS_REMOUNT | MS_RDONLY, "");
-+		if (ret < 0 && errno != ENOENT) {
-+			if (errno == EINVAL) {
-+				// Probably not a mountpoint, use bind-mount
-+				ret = mount(path, path, "", MS_BIND, "");
-+				if (ret < 0)
-+					goto on_error;
-+				ret = mount(path, path, "", MS_BIND | MS_REMOUNT | MS_RDONLY | MS_REC | \
-+				            MS_NOEXEC | MS_NOSUID | MS_NODEV, "");
-+				if (ret < 0)
-+					goto on_error;
-+			} else if (errno == EBUSY) {
-+				DEBUG("Try to mount \"%s\" to readonly after 100ms.", path);
-+				usleep(100 * 1000);
-+				continue;
-+			} else {
-+				goto on_error;
-+			}
-+		}
-+		return true;
-+	}
-+
-+on_error:
-+	SYSERROR("Unable to mount \"%s\" to readonly", path);
-+	return false;
-+}
-+
-+// isulad: setup rootfs masked paths
-+static int setup_rootfs_maskedpaths(struct lxc_list *maskedpaths)
-+{
-+	struct lxc_list *it;
-+
-+	lxc_list_for_each(it, maskedpaths) {
-+		if (!mask_path((char *)it->elem))
-+			return -1;
-+	}
-+
-+	return 0;
-+}
-+// isulad: setup rootfs ro paths
-+static int setup_rootfs_ropaths(struct lxc_list *ropaths)
-+{
-+	struct lxc_list *it;
-+
-+	lxc_list_for_each(it, ropaths) {
-+		if (!remount_readonly((char *)it->elem))
-+			return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int rootfs_parent_mount_private(char *rootfs)
-+{
-+	/* walk /proc/self/mountinfo and change parent of rootfs to private */
-+	FILE *f = fopen("/proc/self/mountinfo", "r");
-+	char *line = NULL;
-+	char *parent = NULL, *options = NULL;
-+	size_t len = 0;
-+	int ret = 0;
-+
-+	if (!f) {
-+		SYSERROR("Failed to open /proc/self/mountinfo to make parent of rootfs to private");
-+		return -1;
-+	}
-+
-+	while (getline(&line, &len, f) != -1) {
-+		char *target = NULL;
-+		char *opts = NULL;
-+		char *tmptarget = NULL;
-+		target = get_field(line, 4);
-+		if (!target)
-+			continue;
-+		tmptarget = safe_strdup(target);
-+		null_endofword(tmptarget);
-+		if (!strstr(rootfs, tmptarget)) {
-+			free(tmptarget);
-+			continue;
-+		}
-+		if (!parent || strlen(tmptarget) > strlen(parent)) {
-+			free(parent);
-+			parent = tmptarget;
-+		} else {
-+			free(tmptarget);
-+			continue;
-+		}
-+		opts = get_field(target, 2);
-+		if (!opts)
-+			continue;
-+		null_endofword(opts);
-+		free(options);
-+		options = safe_strdup(opts);
-+	}
-+
-+	if (!parent || !options) {
-+		ERROR("Could not find parent mount of %s", rootfs);
-+		ret = -1;
-+	} else {
-+		if (strstr(options, "shared")) {
-+			if (mount(NULL, parent, NULL, MS_PRIVATE, NULL)) {
-+				SYSERROR("Failed to make %s private", parent);
-+				ret = -1;
-+			}
-+			DEBUG("Mounted parent %s of rootfs %s to private", parent, rootfs);
-+		}
-+	}
-+	free(parent);
-+	free(options);
-+	fclose(f);
-+	free(line);
-+	return ret;
-+}
-+
-+/* isulad: setup devices which will be populated in the container.*/
-+static int setup_populate_devs(const struct lxc_rootfs *rootfs, struct lxc_list *devs, const char *mount_label)
-+{
-+	int ret = 0;
-+	char *pathdirname = NULL;
-+	char pathMAXPATHLEN;
-+	mode_t file_mode = 0;
-+	struct lxc_populate_devs *dev_elem = NULL;
-+	struct lxc_list *it = NULL;
-+	mode_t cur_mask;
-+
-+	INFO("Populating devices into container");
-+	cur_mask = umask(0000);
-+	lxc_list_for_each(it, devs) {
-+		__do_free char *tmp_path = NULL;
-+		ret = 0;
-+		dev_elem = it->elem;
-+
-+		ret = snprintf(path, MAXPATHLEN, "%s/%s", rootfs->path ? rootfs->mount : "", dev_elem->name);
-+		if (ret < 0 || ret >= MAXPATHLEN) {
-+			ret = -1;
-+			goto reset_umask;
-+		}
-+
-+		/* create any missing directories */
-+		tmp_path = safe_strdup(path);
-+		pathdirname = dirname(tmp_path);
-+		ret = mkdir_p(pathdirname, 0755);
-+		if (ret < 0) {
-+			WARN("Failed to create target directory");
-+			ret = -1;
-+			goto reset_umask;
-+		}
-+
-+		if (!strcmp(dev_elem->type, "c")) {
-+			file_mode = dev_elem->file_mode | S_IFCHR;
-+		} else if (!strcmp(dev_elem->type, "b")) {
-+			file_mode = dev_elem->file_mode | S_IFBLK;
-+		} else {
-+			ERROR("Failed to parse devices type '%s'", dev_elem->type);
-+			ret = -1;
-+			goto reset_umask;
-+		}
-+
-+		DEBUG("Try to mknod '%s':'%d':'%d':'%d'\n", path,
-+		      file_mode, dev_elem->maj, dev_elem->min);
-+
-+		ret = mknod(path, file_mode, makedev(dev_elem->maj, dev_elem->min));
-+		if (ret && errno != EEXIST) {
-+			SYSERROR("Failed to mknod '%s':'%d':'%d':'%d'", dev_elem->name,
-+			         file_mode, dev_elem->maj, dev_elem->min);
-+
-+			char hostpathMAXPATHLEN;
-+			FILE *pathfile = NULL;
-+
-+			// Unprivileged containers cannot create devices, so
-+			// try to bind mount the device from the host
-+			ret = snprintf(hostpath, MAXPATHLEN, "/dev/%s", dev_elem->name);
-+			if (ret < 0 || ret >= MAXPATHLEN) {
-+				ret = -1;
-+				goto reset_umask;
-+			}
-+			pathfile = lxc_fopen(path, "wb");
-+			if (!pathfile) {
-+				SYSERROR("Failed to create device mount target '%s'", path);
-+				ret = -1;
-+				goto reset_umask;
-+			}
-+			fclose(pathfile);
-+			if (safe_mount(hostpath, path, 0, MS_BIND, NULL,
-+			                rootfs->path ? rootfs->mount : NULL, mount_label) != 0) {
-+				SYSERROR("Failed bind mounting device %s from host into container",
-+				         dev_elem->name);
-+				ret = -1;
-+				goto reset_umask;
-+			}
-+		}
-+		if (chown(path, dev_elem->uid, dev_elem->gid) < 0) {
-+			ERROR("Error chowning %s", path);
-+			ret = -1;
-+			goto reset_umask;
-+		}
-+		ret = 0;
-+	}
-+
-+reset_umask:
-+	(void)umask(cur_mask);
-+
-+	INFO("Populated devices into container /dev");
-+	return ret;
-+}
-+
-+// isulad: setup rootfs mountopts
-+static int setup_rootfs_mountopts(const struct lxc_rootfs *rootfs)
-+{
-+	unsigned long mflags, mntflags, pflags;
-+	char *mntdata = NULL;
-+
-+	if(!rootfs || !rootfs->options)
-+		return 0;
-+
-+	if (parse_mntopts(rootfs->options, &mntflags, &pflags, &mntdata) < 0) {
-+		free(mntdata);
-+		return -1;
-+	}
-+	free(mntdata);
-+
-+	if (mntflags & MS_RDONLY) {
-+		mflags = add_required_remount_flags("/", NULL, MS_BIND | MS_REC | mntflags | pflags | MS_REMOUNT);
-+		DEBUG("remounting / as readonly");
-+		if (mount("/", "/", NULL, mflags, 0) < 0) {
-+			SYSERROR("Failed to make / readonly.");
-+			return -1;
-+		}
-+	}
-+	return 0;
-+}
-+
-+static int create_mtab_link()
-+{
-+	ssize_t ret;
-+	int mret;
-+	struct stat sbuf;
-+	const char *pathname = "/proc/mounts";
-+	const char *slink = "/etc/mtab";
-+
-+	if (file_exists(slink)) {
-+		return 0;
-+	}
-+
-+	ret = stat(pathname, &sbuf);
-+	if (ret < 0) {
-+		SYSERROR("Failed to stat %s: %s", pathname, strerror(errno));
-+		return -1;
-+	}
-+
-+	mret = symlink(pathname, slink);
-+	if (mret < 0 && errno != EEXIST) {
-+		if (errno == EROFS) {
-+			WARN("Failed to create link %s for target %s. Read-only filesystem", slink, pathname);
-+		} else {
-+			SYSERROR("Failed to create \"%s\"", slink);
-+			return -1;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+struct oci_hook_conf {
-+	defs_hook *ocihook;
-+
-+	int errfd;
-+	int which;
-+};
-+
-+struct wait_conf {
-+	pid_t pid;
-+	unsigned long long startat;
-+	int timeout;
-+	int errfd;
-+	int which;
-+};
-+
-+static char* generate_json_str(const char *name, const char *lxcpath, const char *rootfs)
-+{
-+	char *cpid = NULL;
-+	char *inmsg = NULL;
-+	int rc = 0, ret = 0;
-+	size_t size;
-+
-+	if (!name || !lxcpath || !rootfs) {
-+		ERROR("Invalid arguments");
-+		return NULL;
-+	}
-+	cpid = getenv("LXC_PID");
-+	if (!cpid) {
-+		ERROR("Get container %s pid failed: %s", name, strerror(errno));
-+		cpid = "-1";
-+	}
-+
-+	if ((strlen(name) + strlen(cpid) + strlen(rootfs) + strlen(lxcpath) + strlen(name)) >
-+	       SIZE_MAX - (strlen("{\"ociVersion\":\"\",\"id\":\"\",\"pid\":,\"root\":\"\",\"bundle\":\"\"}") - 1 - 1)) {
-+		ERROR("Out of memory");
-+		ret = -1;
-+		goto out_free;
-+	}
-+
-+	// {"ociVersion":"","id":"xxx","pid":777,"root":"xxx","bundle":"xxx"}
-+	size = strlen("{\"ociVersion\":\"\",\"id\":\"\",\"pid\":,\"root\":\"\",\"bundle\":\"\"}") +
-+	       strlen(name) + strlen(cpid) + strlen(rootfs) + strlen(lxcpath) + 1 + strlen(name) + 1;
-+	inmsg = malloc(size);
-+	if (inmsg == NULL) {
-+		ERROR("Out of memory");
-+		ret = -1;
-+		goto out_free;
-+	}
-+	rc = snprintf(inmsg, size,
-+	              "{\"ociVersion\":\"\",\"id\":\"%s\",\"pid\":%s,\"root\":\"%s\",\"bundle\":\"%s/%s\"}",
-+	              name, cpid, rootfs, lxcpath, name);
-+	if (rc < 0 || rc >= size) {
-+		ERROR("Create json string failed");
-+		ret = -1;
-+	}
-+
-+out_free:
-+	if (ret) {
-+		free(inmsg);
-+		inmsg = NULL;
-+	}
-+	return inmsg;
-+}
-+
-+static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_env_len)
-+{
-+	char **result  = NULL;
-+	size_t result_len = env_len;
-+	size_t i, j;
-+	char *tmpenv = NULL;
-+	char *lxc_envs = {"LD_LIBRARY_PATH", "PATH", "LXC_CGNS_AWARE", "LXC_PID", "LXC_ROOTFS_MOUNT",
-+	                    "LXC_CONFIG_FILE", "LXC_CGROUP_PATH", "LXC_ROOTFS_PATH", "LXC_NAME"
-+	                   };
-+	char *lxcenv_buf = NULL;
-+
-+	if (result_len > SIZE_MAX - (sizeof(lxc_envs) / sizeof(char *)) - 1)
-+		return NULL;
-+	result_len += (sizeof(lxc_envs) / sizeof(char *)) + 1;
-+	result = malloc(sizeof(char *) * result_len);
-+	if (result == NULL)
-+		return NULL;
-+	memset(result, 0, sizeof(char *) * result_len);
-+
-+	for(i = 0; i < env_len; i++) {
-+		if (oldenvsi)
-+			resulti = safe_strdup(oldenvsi);
-+	}
-+
-+	for(j = 0; j < (sizeof(lxc_envs) / sizeof(char *)); j++) {
-+		size_t env_buf_len = 0;
-+		tmpenv = getenv(lxc_envsj);
-+		if (tmpenv && i < (result_len - 1)) {
-+			if (strlen(tmpenv) > (SIZE_MAX - 1 - 1 - strlen(lxc_envsj))) {
-+				lxc_free_array((void **)result, free);
-+				return NULL;
-+			}
-+			env_buf_len = ((strlen(tmpenv) + 1) + strlen(lxc_envsj)) + 1;
-+			lxcenv_buf = malloc(env_buf_len);
-+			if (lxcenv_buf == NULL) {
-+				lxc_free_array((void **)result, free);
-+				return NULL;
-+			}
-+			if (snprintf(lxcenv_buf, env_buf_len, "%s=%s", lxc_envsj, tmpenv) < 0) {
-+				free(lxcenv_buf);
-+				continue;
-+			}
-+			resulti++ = lxcenv_buf;
-+			lxcenv_buf = NULL;
-+		}
-+	}
-+
-+	*merge_env_len = i;
-+	return result;
-+}
-+
-+static struct lxc_popen_FILE *lxc_popen_ocihook(const char *commandpath, char **args, int args_len,
-+                char **envs, int env_len, const char *instr)
-+{
-+	int ret;
-+	struct lxc_popen_FILE *fp = NULL;
-+	int pipe_fds2 = {-1, -1};
-+	int pipe_msg2 = {-1, -1};
-+	pid_t child_pid;
-+
-+	ret = pipe2(pipe_fds, O_CLOEXEC | O_NONBLOCK);
-+	if (ret < 0)
-+		return NULL;
-+
-+	ret = pipe2(pipe_msg, O_CLOEXEC | O_NONBLOCK);
-+	if (ret < 0) {
-+		ERROR("Pipe msg failure");
-+		close(pipe_fds0);
-+		close(pipe_fds1);
-+		return NULL;
-+	}
-+
-+	child_pid = fork();
-+	if (child_pid < 0)
-+		goto on_error;
-+
-+	if (child_pid == 0) {
-+		close(pipe_msg1);
-+		if (pipe_msg0 != STDIN_FILENO)
-+			dup2(pipe_msg0, STDIN_FILENO);
-+		else {
-+			if (fcntl(pipe_msg0, F_SETFD, 0) != 0) {
-+				fprintf(stderr, "Failed to remove FD_CLOEXEC from fd.");
-+				exit(127);
-+			}
-+		}
-+		close(pipe_msg0);
-+
-+		close(pipe_fds0);
-+
-+		/* duplicate stdout */
-+		if (pipe_fds1 != STDOUT_FILENO)
-+			ret = dup2(pipe_fds1, STDOUT_FILENO);
-+		else
-+			ret = fcntl(pipe_fds1, F_SETFD, 0);
-+		if (ret < 0) {
-+			close(pipe_fds1);
-+			_exit(EXIT_FAILURE);
-+		}
-+
-+		/* duplicate stderr */
-+		if (pipe_fds1 != STDERR_FILENO)
-+			ret = dup2(pipe_fds1, STDERR_FILENO);
-+		else
-+			ret = fcntl(pipe_fds1, F_SETFD, 0);
-+		close(pipe_fds1);
-+		if (ret < 0)
-+			_exit(EXIT_FAILURE);
-+
-+		if (lxc_check_inherited(NULL, true, NULL, 0) != 0) {
-+			fprintf(stderr, "check inherited fd failed");
-+			exit(127);
-+		}
-+
-+		/*
-+		 * Unblock signals.
-+		 * This is the main/only reason
-+		 * why we do our lousy popen() emulation.
-+		 */
-+		{
-+			sigset_t mask;
-+			sigfillset(&mask);
-+			sigprocmask(SIG_UNBLOCK, &mask, NULL);
-+		}
-+
-+		if (env_len > 0)
-+			execvpe(commandpath, args, envs);
-+		else
-+			execvp(commandpath, args);
-+		fprintf(stderr, "fork/exec %s: %s", commandpath, strerror(errno));
-+		exit(127);
-+	}
-+
-+	/* parent */
-+
-+	close(pipe_fds1);
-+	pipe_fds1 = -1;
-+
-+	close(pipe_msg0);
-+	pipe_msg0= -1;
-+	if (instr) {
-+		size_t len = strlen(instr);
-+		if (lxc_write_nointr(pipe_msg1, instr, len) != len) {
-+			WARN("Write instr: %s failed", instr);
-+		}
-+	}
-+	close(pipe_msg1);
-+	pipe_msg1= -1;
-+
-+	fp = calloc(1, sizeof(*fp));
-+	if (!fp) {
-+		ERROR("Failed to allocate memory");
-+		goto on_error;
-+	}
-+
-+	fp->child_pid = child_pid;
-+	fp->pipe = pipe_fds0;
-+
-+	return fp;
-+
-+on_error:
-+
-+	if (pipe_fds0 >= 0)
-+		close(pipe_fds0);
-+
-+	if (pipe_fds1 >= 0)
-+		close(pipe_fds1);
-+
-+	if (pipe_msg0 >= 0)
-+		close(pipe_msg0);
-+
-+	if (pipe_msg1 >= 0)
-+		close(pipe_msg1);
-+
-+	if (fp)
-+		free(fp);
-+
-+	return NULL;
-+}
-+
-+void* wait_ocihook_timeout(void *arg)
-+{
-+	bool alive = false;
-+	struct wait_conf *conf = (struct wait_conf *)arg;
-+
-+	if (!conf || conf->timeout < 1)
-+		goto out;
-+
-+	sleep(conf->timeout);
-+
-+	alive = lxc_process_alive(conf->pid, conf->startat);
-+
-+	if (alive) {
-+		ERROR("%s:%d: running %s hook caused \"hook ran past specified timeout of %.1fs\"",
-+		      __FILE__, __LINE__, lxchook_namesconf->which,
-+		      (double)conf->timeout);
-+
-+		lxc_write_error_message(conf->errfd, "%s:%d: running %s hook caused \"hook ran past specified timeout of %.1fs\".",
-+		                        __FILE__, __LINE__, lxchook_namesconf->which,
-+		                        (double)conf->timeout);
-+
-+		if (kill(conf->pid, SIGKILL) && errno != ESRCH) {
-+			ERROR("Send kill signal failed");
-+			goto out;
-+		}
-+	}
-+
-+out:
-+	free(conf);
-+	return ((void *)0);
-+}
-+
-+static int run_ocihook_buffer(struct oci_hook_conf *oconf, const char *inmsg)
-+{
-+	struct lxc_popen_FILE *f;
-+	char outputLXC_LOG_BUFFER_SIZE = {0};
-+	int ret;
-+	pthread_t ptid;
-+	int err;
-+	struct wait_conf *conf = NULL;
-+	pthread_attr_t attr;
-+	char *buffer = oconf->ocihook->path;
-+	char *err_args_msg = NULL;
-+	char *err_envs_msg = NULL;
-+	char **hookenvs = NULL;
-+	size_t hookenvs_len = 0;
-+
-+	hookenvs = merge_ocihook_env(oconf->ocihook->env, oconf->ocihook->env_len, &hookenvs_len);
-+	if (!hookenvs) {
-+		ERROR("Out of memory.");
-+		return -1;
-+	}
-+
-+	f = lxc_popen_ocihook(buffer, oconf->ocihook->args, oconf->ocihook->args_len, hookenvs, hookenvs_len, inmsg);
-+	lxc_free_array((void **)hookenvs, free);
-+	if (!f) {
-+		SYSERROR("Failed to popen() %s.", buffer);
-+		return -1;
-+	}
-+
-+	conf = malloc(sizeof(struct wait_conf));
-+	if (conf == NULL) {
-+		SYSERROR("Failed to malloc.");
-+		goto on_error;
-+	}
-+
-+	memset(conf, 0x00, sizeof(struct wait_conf));
-+
-+	conf->pid = f->child_pid;
-+	conf->startat = lxc_get_process_startat(conf->pid);
-+
-+	INFO("hook_conf timeout %d", oconf->ocihook->timeout);
-+	if(oconf->ocihook->timeout > 0)
-+		conf->timeout = oconf->ocihook->timeout;
-+	else {
-+		conf->timeout = 30;
-+		INFO("Set hook timeout 30s");
-+	}
-+	conf->errfd = oconf->errfd;
-+	conf->which = oconf->which;
-+
-+	pthread_attr_init(&attr);
-+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-+	err = pthread_create(&ptid, &attr, wait_ocihook_timeout, conf);
-+	pthread_attr_destroy(&attr);
-+	if (err != 0) {
-+		ERROR("Create wait timeout thread failed");
-+		free(conf);
-+		goto on_error;
-+	}
-+
-+	ret = lxc_wait_for_pid_status(f->child_pid);
-+
-+	lxc_read_nointr(f->pipe, output, sizeof(output) - 1);
-+	close(f->pipe);
-+	free(f);
-+
-+	if (ret == -1) {
-+		SYSERROR("Script exited with error.");
-+		goto print_hook;
-+	} else if (WIFEXITED(ret) && WEXITSTATUS(ret) != 0) {
-+		ERROR("Script exited with status %d. output: %s", WEXITSTATUS(ret), output);
-+		lxc_write_error_message(oconf->errfd, "%s:%d: running %s hook caused \"error running hook: exit status %d, output: %s\".",
-+		                        __FILE__, __LINE__,
-+		                        (oconf->which >= NUM_LXC_HOOKS) ? "invalid type" : lxchook_namesoconf->which,
-+		                        WEXITSTATUS(ret), output);
-+
-+		goto print_hook;
-+	} else if (WIFSIGNALED(ret)) {
-+		ERROR("Script terminated by signal %d.", WTERMSIG(ret));
-+		lxc_write_error_message(oconf->errfd, "%s:%d: running %s hook caused \"error running hook: Script terminated by signal %d\".",
-+		                        __FILE__, __LINE__,
-+		                        (oconf->which >= NUM_LXC_HOOKS) ? "invalid type" : lxchook_namesoconf->which,
-+		                        WTERMSIG(ret));
-+
-+		goto print_hook;
-+	}
-+
-+	return 0;
-+
-+on_error:
-+	if (f) {
-+		if (f->pipe >= 0)
-+			close(f->pipe);
-+		free(f);
-+	}
-+
-+print_hook:
-+	if (oconf->ocihook->args)
-+		err_args_msg = lxc_string_join(" ", (const char **)oconf->ocihook->args, false);
-+	if (oconf->ocihook->env)
-+		err_envs_msg = lxc_string_join(" ", (const char **)oconf->ocihook->env, false);
-+	ERROR("Hook script command: \"%s\", args: \"%s\", envs: \"%s\", timeout: %d.",
-+	      buffer, err_args_msg ? err_args_msg : "",
-+	      err_envs_msg ? err_envs_msg : "", oconf->ocihook->timeout);
-+
-+	free(err_args_msg);
-+	free(err_envs_msg);
-+	return -1;
-+}
-+
-+static int run_ocihook_script_argv(const char *name, const char *section,
-+                                   struct oci_hook_conf *oconf,
-+                                   const char *lxcpath, const char *rootfs)
-+{
-+	int ret;
-+	const char *script = oconf->ocihook->path;
-+	char *inmsg = NULL;
-+
-+	INFO("Executing script \"%s\" for container \"%s\", config section \"%s\".",
-+	     script, name, section);
-+
-+	inmsg = generate_json_str(name, lxcpath, rootfs);
-+	if (!inmsg) {
-+		return -1;
-+	}
-+
-+	ret = run_ocihook_buffer(oconf, inmsg);
-+	free(inmsg);
-+	inmsg = NULL;
-+	return ret;
-+}
-+
-+static char *get_root_path(const char *path, const char *backend)
-+{
-+	char *ret = NULL;
-+	char *tmp = NULL;
-+
-+	if (!path) {
-+		ret = safe_strdup("/");
-+		return ret;
-+	}
-+	if (!backend) {
-+		goto default_out;
-+	}
-+
-+	if (strcmp(backend, "aufs") == 0 ||
-+	                strcmp(backend, "overlayfs") == 0 ||
-+	                strcmp(backend, "loop") == 0) {
-+		tmp = strrchr(path, ':');
-+		if (tmp == NULL) {
-+			ERROR("Invalid root path format");
-+			return NULL;
-+		}
-+		tmp++;
-+		ret = safe_strdup(tmp);
-+		return ret;
-+	}
-+
-+default_out:
-+	ret = safe_strdup(path);
-+	return ret;
-+}
-+
-+static int do_run_oci_hooks(const char *name, const char *lxcpath, struct lxc_conf *lc, int which, int errfd)
-+{
-+	struct oci_hook_conf work_conf = {0};
-+	size_t i;
-+	int ret = 0;
-+	int nret = 0;
-+	char *rootpath = NULL;
-+
-+	if (!lc) {
-+		return -1;
-+	}
-+	if (!lc->ocihooks) {
-+		return 0;
-+	}
-+
-+	rootpath = get_root_path(lc->rootfs.path ? lc->rootfs.mount : NULL, lc->rootfs.bdev_type);
-+	if (!rootpath) {
-+		ERROR("Get container %s rootpath failed.", name);
-+		return -1;
-+	}
-+
-+	work_conf.errfd = errfd;
-+	work_conf.which = which;
-+	switch (which) {
-+	case OCI_HOOK_PRESTART:
-+		for (i = 0; i < lc->ocihooks->prestart_len; i++) {
-+			work_conf.ocihook = lc->ocihooks->prestarti;
-+			ret = run_ocihook_script_argv(name, "lxc", &work_conf, lxcpath, rootpath);
-+			if (ret != 0)
-+				break;
-+		}
-+		break;
-+	case OCI_HOOK_POSTSTART:
-+		for (i = 0; i < lc->ocihooks->poststart_len; i++) {
-+			work_conf.ocihook = lc->ocihooks->poststarti;
-+			nret = run_ocihook_script_argv(name, "lxc", &work_conf, lxcpath, rootpath);
-+			if (nret != 0)
-+				WARN("running poststart hook %zu failed, ContainerId: %s", i, name);
-+		}
-+		break;
-+	case OCI_HOOK_POSTSTOP:
-+		for (i = 0; i < lc->ocihooks->poststop_len; i++) {
-+			work_conf.ocihook = lc->ocihooks->poststopi;
-+			nret = run_ocihook_script_argv(name, "lxc", &work_conf, lxcpath, rootpath);
-+			if (nret != 0)
-+				WARN("running poststart hook %zu failed, ContainerId: %s", i, name);
-+		}
-+		break;
-+	default:
-+		ret = -1;
-+	}
-+	if (rootpath)
-+		free(rootpath);
-+	return ret;
-+}
-+
-+int run_oci_hooks(const char *name, const char *hookname, struct lxc_conf *conf, const char *lxcpath)
-+{
-+	int which = -1;
-+
-+	if (strcmp(hookname, "oci-prestart") == 0) {
-+		which = OCI_HOOK_PRESTART;
-+		if (!lxcpath) {
-+			ERROR("oci hook require lxcpath");
-+			return -1;
-+		}
-+		return do_run_oci_hooks(name, lxcpath, conf, which, conf->errpipe1);
-+	} else if (strcmp(hookname, "oci-poststart") == 0) {
-+		which = OCI_HOOK_POSTSTART;
-+		if (!lxcpath) {
-+			ERROR("oci hook require lxcpath");
-+			return -1;
-+		}
-+		return do_run_oci_hooks(name, lxcpath, conf, which, conf->errpipe1);
-+	} else if (strcmp(hookname, "oci-poststop") == 0) {
-+		which = OCI_HOOK_POSTSTOP;
-+		if (!lxcpath) {
-+			ERROR("oci hook require lxcpath");
-+			return -1;
-+		}
-+		return do_run_oci_hooks(name, lxcpath, conf, which, conf->errpipe1);
-+	} else
-+		return -1;
-+
-+	return 0;
-+}
-+
-+/*isulad clear init args*/
-+int lxc_clear_init_args(struct lxc_conf *lxc_conf)
-+{
-+	int i;
-+
-+	for (i = 0; i < lxc_conf->init_argc; i++) {
-+		free(lxc_conf->init_argvi);
-+		lxc_conf->init_argvi = NULL;
-+	}
-+	free(lxc_conf->init_argv);
-+	lxc_conf->init_argv = NULL;
-+	lxc_conf->init_argc = 0;
-+
-+	return 0;
-+}
-+
-+/*isulad clear init groups*/
-+int lxc_clear_init_groups(struct lxc_conf *lxc_conf)
-+{
-+	free(lxc_conf->init_groups);
-+	lxc_conf->init_groups = NULL;
-+	lxc_conf->init_groups_len = 0;
-+
-+	return 0;
-+}
-+
-+/*isulad: clear populate devices*/
-+int lxc_clear_populate_devices(struct lxc_conf *c)
-+{
-+	struct lxc_list *it = NULL;
-+	struct lxc_list *next = NULL;
-+
-+	lxc_list_for_each_safe(it, &c->populate_devs, next) {
-+		struct lxc_populate_devs *dev_elem = it->elem;
-+		lxc_list_del(it);
-+		free(dev_elem->name);
-+		free(dev_elem->type);
-+		free(dev_elem);
-+		free(it);
-+	}
-+	return 0;
-+}
-+
-+/*isulad: clear rootfs masked paths*/
-+int lxc_clear_rootfs_masked_paths(struct lxc_conf *c)
-+{
-+	struct lxc_list *it = NULL;
-+	struct lxc_list *next = NULL;
-+
-+	lxc_list_for_each_safe(it, &c->rootfs.maskedpaths, next) {
-+		lxc_list_del(it);
-+		free(it->elem);
-+		free(it);
-+	}
-+	return 0;
-+}
-+
-+/*isulad: clear rootfs ro paths*/
-+int lxc_clear_rootfs_ro_paths(struct lxc_conf *c)
-+{
-+	struct lxc_list *it = NULL;
-+	struct lxc_list *next = NULL;
-+
-+	lxc_list_for_each_safe(it, &c->rootfs.ropaths, next) {
-+		lxc_list_del(it);
-+		free(it->elem);
-+		free(it);
-+	}
-+	return 0;
-+}
-+
-+/*isulad: close error pipe */
-+void lxc_close_error_pipe(int *errpipe)
-+{
-+	if (errpipe0 >= 0) {
-+		close(errpipe0);
-+		errpipe0 = -1;
-+	}
-+	if (errpipe1 >= 0) {
-+		close(errpipe1);
-+		errpipe1 = -1;
-+	}
-+}
-+#endif
-diff --git a/src/lxc/criu.c b/src/lxc/criu.c
-index 19f2a17..58d2351 100644
---- a/src/lxc/criu.c
-+++ b/src/lxc/criu.c
-@@ -310,7 +310,6 @@ static void exec_criu(struct cgroup_ops *cgroup_ops, struct lxc_conf *conf,
- 			}
- 		} else {
- 			const char *p;
--
- 			p = cgroup_ops->get_limiting_cgroup(cgroup_ops, controllers0);
- 			if (!p) {
- 				ERROR("failed to get cgroup path for %s", controllers0);
-@@ -371,8 +370,15 @@ static void exec_criu(struct cgroup_ops *cgroup_ops, struct lxc_conf *conf,
- 		char *mntdata = NULL;
- 		char arg2 * PATH_MAX + 2;
- 
-+#ifdef HAVE_ISULAD
-+		unsigned long pflags;
-+
-+		if (parse_mntopts(mntent.mnt_opts, &flags, &pflags, &mntdata) < 0)
-+			goto err;
-+#else
- 		if (parse_mntopts(mntent.mnt_opts, &flags, &mntdata) < 0)
- 			goto err;
-+#endif
- 
- 		free(mntdata);
- 
-diff --git a/src/lxc/execute.c b/src/lxc/execute.c
-index 7175ef2..1431b81 100644
---- a/src/lxc/execute.c
-+++ b/src/lxc/execute.c
-@@ -19,7 +19,11 @@
- 
- lxc_log_define(execute, start);
- 
-+#ifdef HAVE_ISULAD
-+static int execute_start(struct lxc_handler *handler, void* data, int fd)
-+#else
- static int execute_start(struct lxc_handler *handler, void* data)
-+#endif
- {
- 	int argc_add, j;
- 	char **argv;
-@@ -71,6 +75,9 @@ static int execute_start(struct lxc_handler *handler, void* data)
- 		execvp(argv0, argv);
- 	SYSERROR("Failed to exec %s", argv0);
- 
-+#ifdef HAVE_ISULAD
-+	lxc_write_error_message(fd, "Failed to exec: \"%s\": %s.", argv0, strerror(errno));
-+#endif
- 	free(argv);
- out1:
- 	return 1;
-@@ -88,14 +95,26 @@ static struct lxc_operations execute_start_ops = {
- 	.post_start = execute_post_start
- };
- 
-+#ifdef HAVE_ISULAD
-+int lxc_execute(const char *name, char *const argv, int quiet,
-+		struct lxc_handler *handler, const char *lxcpath,
-+		bool daemonize, int *error_num, unsigned int start_timeout)
-+#else
- int lxc_execute(const char *name, char *const argv, int quiet,
- 		struct lxc_handler *handler, const char *lxcpath,
- 		bool daemonize, int *error_num)
-+#endif
- {
-+
- 	struct execute_args args = {.argv = argv, .quiet = quiet};
- 
- 	TRACE("Doing lxc_execute");
- 	handler->conf->is_execute = true;
-+#ifdef HAVE_ISULAD
-+	return __lxc_start(handler, &execute_start_ops, &args, lxcpath,
-+			   daemonize, error_num, start_timeout);
-+#else
- 	return __lxc_start(handler, &execute_start_ops, &args, lxcpath,
- 			   daemonize, error_num);
-+#endif
- }
-diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
-index 1689cba..681207b 100644
---- a/src/lxc/file_utils.c
-+++ b/src/lxc/file_utils.c
-@@ -122,6 +122,33 @@ int lxc_read_from_file(const char *filename, void *buf, size_t count)
- 	return ret;
- }
- 
-+#ifdef HAVE_ISULAD
-+ssize_t lxc_write_nointr_for_fifo(int fd, const char *buf, size_t count)
-+{
-+    ssize_t nret = 0;
-+    ssize_t nwritten;
-+
-+    if (buf == NULL) {
-+        return -1;
-+    }
-+
-+    for (nwritten = 0; nwritten < count;) {
-+        nret = write(fd, buf + nwritten, count - nwritten);
-+        if (nret < 0) {
-+                if (errno == EINTR || errno == EAGAIN) {
-+                        continue;
-+                } else {
-+                        return nret;
-+                }
-+        } else {
-+                nwritten += nret;
-+        }
-+    }
-+
-+    return nwritten;
-+}
-+#endif
-+
- ssize_t lxc_write_nointr(int fd, const void *buf, size_t count)
- {
- 	ssize_t ret;
-diff --git a/src/lxc/lsm/apparmor.c b/src/lxc/lsm/apparmor.c
-index 02f824f..96c6728 100644
---- a/src/lxc/lsm/apparmor.c
-+++ b/src/lxc/lsm/apparmor.c
-@@ -1186,6 +1186,16 @@ static int apparmor_process_label_set(const char *inlabel, struct lxc_conf *conf
- 	return 0;
- }
- 
-+#ifdef HAVE_ISULAD
-+static int apparmor_file_label_set(const char *path, const char *label) {
-+	return 0;
-+}
-+
-+static int apparmor_relabel(const char *path, const char *label, bool shared) {
-+	return 0;
-+}
-+#endif
-+
- static struct lsm_drv apparmor_drv = {
- 	.name = "AppArmor",
- 	.enabled           = apparmor_enabled,
-@@ -1193,6 +1203,10 @@ static struct lsm_drv apparmor_drv = {
- 	.process_label_set = apparmor_process_label_set,
- 	.prepare           = apparmor_prepare,
- 	.cleanup           = apparmor_cleanup,
-+#ifdef HAVE_ISULAD
-+	.file_label_set    = apparmor_file_label_set,
-+	.relabel           = apparmor_relabel,
-+#endif
- };
- 
- struct lsm_drv *lsm_apparmor_drv_init(void)
-diff --git a/src/lxc/tools/arguments.h b/src/lxc/tools/arguments.h
-index cb0ba74..c16d99f 100644
---- a/src/lxc/tools/arguments.h
-+++ b/src/lxc/tools/arguments.h
-@@ -40,6 +40,17 @@ struct lxc_arguments {
- 
- 	/* for lxc-start */
- 	const char *share_ns32; /* size must be greater than LXC_NS_MAX */
-+#ifdef HAVE_ISULAD
-+	char *workdir;
-+	const char *container_info; /* isulad: file used to store pid and ppid info of container */
-+	char *terminal_fifos3; /* isulad add, fifos used to redirct stdin/out/err */
-+	const char *exit_monitor_fifo; /* isulad: fifo used to monitor state of monitor process */
-+	const char *suffix; /* isulad add, suffix used for connect with parent of execed process*/
-+	int disable_pty;
-+	int open_stdin;
-+	unsigned int start_timeout; /* isulad: Seconds for waiting on a container to start before it is killed*/
-+	int64_t attach_timeout; /* for lxc-attach */
-+#endif
- 
- 	/* for lxc-console */
- 	unsigned int ttynum;
-@@ -152,6 +163,19 @@ struct lxc_arguments {
- #define OPT_SHARE_UTS OPT_USAGE - 5
- #define OPT_SHARE_PID OPT_USAGE - 6
- 
-+#ifdef HAVE_ISULAD
-+#define OPT_INPUT_FIFO OPT_USAGE - 7
-+#define OPT_OUTPUT_FIFO OPT_USAGE - 8
-+#define OPT_STDERR_FIFO OPT_USAGE - 9
-+#define OPT_CONTAINER_INFO OPT_USAGE - 10
-+#define OPT_EXIT_FIFO OPT_USAGE - 11
-+#define OPT_START_TIMEOUT OPT_USAGE - 12
-+#define OPT_DISABLE_PTY OPT_USAGE - 13
-+#define OPT_OPEN_STDIN OPT_USAGE - 14
-+#define OPT_ATTACH_TIMEOUT OPT_USAGE - 15
-+#define OPT_ATTACH_SUFFIX OPT_USAGE - 16
-+#endif
-+
- extern int lxc_arguments_parse(struct lxc_arguments *args, int argc,
- 			       char *const argv);
- 
--- 
-2.25.1
-

_service:tar_scm:0003-iSulad-adapt-conf-network-storage-and-termianl.patch Added

@@ -0,0 +1,1901 @@
+From 0015fbf989f5f1837f9588f8385b16dd38dbd29f Mon Sep 17 00:00:00 2001
+From: haozi007 <liuhao27@huawei.com>
+Date: Fri, 21 Jul 2023 17:35:52 +0800
+Subject: PATCH 3/3 iSulad adapt conf network storage and termianl
+
+Signed-off-by: haozi007 <liuhao27@huawei.com>
+---
+ src/lxc/attach_options.h        |  26 +-
+ src/lxc/cgroups/isulad_cgfsng.c | 114 +++---
+ src/lxc/conf.c                  |   2 +-
+ src/lxc/log.c                   |  58 +++
+ src/lxc/network.c               |   8 +
+ src/lxc/storage/dir.c           |   4 +
+ src/lxc/storage/loop.c          |  41 +++
+ src/lxc/storage/storage.c       |   7 +
+ src/lxc/sync.h                  |   9 +
+ src/lxc/terminal.c              | 610 ++++++++++++++++++++++++++++++++
+ src/lxc/terminal.h              |  37 ++
+ src/lxc/tools/lxc_ls.c          |   8 +
+ src/lxc/utils.c                 | 143 ++++++++
+ src/lxc/utils.h                 |   7 +
+ src/tests/attach.c              |  11 +
+ 15 files changed, 1026 insertions(+), 59 deletions(-)
+
+diff --git a/src/lxc/attach_options.h b/src/lxc/attach_options.h
+index d09dfce..a4052fb 100644
+--- a/src/lxc/attach_options.h
++++ b/src/lxc/attach_options.h
+@@ -172,6 +172,28 @@ typedef struct lxc_attach_options_t {
+ } lxc_attach_options_t;
+ 
+ /*! Default attach options to use */
++
++#ifdef HAVE_ISULAD
++#define LXC_ATTACH_OPTIONS_DEFAULT					\
++	{                                               		\
++		.attach_flags	= LXC_ATTACH_DEFAULT,   		\
++		.namespaces	= -1,					\
++		.personality	= LXC_ATTACH_DETECT_PERSONALITY,	\
++		.initial_cwd	= NULL,					\
++		.uid		= (uid_t)-1,            		\
++		.gid		= (gid_t)-1,            		\
++		.env_policy	= LXC_ATTACH_KEEP_ENV,  		\
++		.extra_env_vars = NULL,                 		\
++		.extra_keep_env = NULL,                 		\
++		.stdin_fd	= 0,                    		\
++		.stdout_fd	= 1,                    		\
++		.stderr_fd	= 2,                    		\
++		.log_fd		= -EBADF,               		\
++		.lsm_label	= NULL,					\
++		.groups		= {},					\
++		.init_fifo =   {NULL, NULL, NULL},  \
++	}
++#else
+ #define LXC_ATTACH_OPTIONS_DEFAULT					\
+ 	{                                               		\
+ 		.attach_flags	= LXC_ATTACH_DEFAULT,   		\
+@@ -189,10 +211,8 @@ typedef struct lxc_attach_options_t {
+ 		.log_fd		= -EBADF,               		\
+ 		.lsm_label	= NULL,					\
+ 		.groups		= {},					\
+-#ifdef HAVE_ISULAD
+-		/* .init_fifo = */  	{NULL, NULL, NULL},  \
+-#endif
+ 	}
++#endif
+ 
+ /*!
+  * Representation of a command to run in a container.
+diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c
+index dcaa229..38ad677 100644
+--- a/src/lxc/cgroups/isulad_cgfsng.c
++++ b/src/lxc/cgroups/isulad_cgfsng.c
+@@ -385,11 +385,11 @@ static struct hierarchy *add_hierarchy(struct hierarchy ***h, char **clist, char
+ 
+ 	new = zalloc(sizeof(*new));
+ 	new->controllers = clist;
+-	new->mountpoint = mountpoint;
+-	new->container_base_path = container_base_path;
+-	new->version = type;
+-	new->cgfd_con = -EBADF;
+-	new->cgfd_mon = -EBADF;
++	new->at_mnt = mountpoint;
++	new->at_base = container_base_path;
++	new->fs_type = type;
++	new->dfd_con = -EBADF;
++	new->dfd_mon = -EBADF;
+ 
+ 	newentry = append_null_to_list((void ***)h);
+ 	(*h)newentry = new;
+@@ -586,8 +586,8 @@ static void lxc_cgfsng_print_hierarchies(struct cgroup_ops *ops)
+ 		int j;
+ 		char **cit;
+ 
+-		TRACE("  %d: base_cgroup: %s", i, (*it)->container_base_path ? (*it)->container_base_path : "(null)");
+-		TRACE("      mountpoint:  %s", (*it)->mountpoint ? (*it)->mountpoint : "(null)");
++		TRACE("  %d: base_cgroup: %s", i, (*it)->at_base ? (*it)->at_base : "(null)");
++		TRACE("      at_mnt:  %s", (*it)->at_mnt ? (*it)->at_mnt : "(null)");
+ 		TRACE("      controllers:");
+ 		for (j = 0, cit = (*it)->controllers; cit && *cit; cit++, j++)
+ 			TRACE("      %d: %s", j, *cit);
+@@ -628,17 +628,21 @@ static int isulad_cgroup_tree_remove(struct hierarchy **hierarchies,
+ 		struct hierarchy *h = hierarchiesi;
+ 		int ret;
+ 
+-		if (!h->container_full_path) {
+-			h->container_full_path = must_make_path(h->mountpoint, h->container_base_path, container_cgroup, NULL);
++		if (!h->path_con) {
++			h->path_con = must_make_path(h->at_mnt, h->at_base, container_cgroup, NULL);
+ 		}
+ 
+-		ret = lxc_rm_rf(h->container_full_path);
++		ret = lxc_rm_rf(h->path_con);
+ 		if (ret < 0) {
+-			SYSERROR("Failed to destroy \"%s\"", h->container_full_path);
++			if (errno == ENOENT) {
++				WARN("Destroy path: \"%s\" do not exist", h->path_con);
++				return 0;
++			}
++			SYSERROR("Failed to destroy \"%s\"", h->path_con);
+ 			return -1;
+ 		}
+ 
+-		free_disarm(h->container_full_path);
++		free_disarm(h->path_con);
+ 	}
+ 
+ 	return 0;
+@@ -842,7 +846,7 @@ static bool isulad_cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *
+ 	if (slash != NULL) {
+ 		while (slash) {
+ 			*slash = '\0';
+-			cgpath = must_make_path(h->mountpoint, h->container_base_path, cgname, NULL);
++			cgpath = must_make_path(h->at_mnt, h->at_base, cgname, NULL);
+ 			sub_mk_success = build_sub_cpuset_cgroup_dir(cgpath);
+ 			free(cgpath);
+ 			*slash = '/';
+@@ -853,7 +857,7 @@ static bool isulad_cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *
+ 		}
+ 	}
+ 
+-	cgpath = must_make_path(h->mountpoint, h->container_base_path, cgname, NULL);
++	cgpath = must_make_path(h->at_mnt, h->at_base, cgname, NULL);
+ 	sub_mk_success = build_sub_cpuset_cgroup_dir(cgpath);
+ 	free(cgpath);
+ 	if (!sub_mk_success) {
+@@ -902,7 +906,7 @@ static bool create_path_for_hierarchy(struct hierarchy *h, char *cgname, int err
+ 	int ret;
+ 	__do_free char *path = NULL;
+ 
+-	path = must_make_path(h->mountpoint, h->container_base_path, cgname, NULL);
++	path = must_make_path(h->at_mnt, h->at_base, cgname, NULL);
+ 
+ 	if (file_exists(path)) { // it must not already exist
+ 		ERROR("Cgroup path \"%s\" already exist.", path);
+@@ -926,8 +930,8 @@ static bool create_path_for_hierarchy(struct hierarchy *h, char *cgname, int err
+ 	if (h->cgfd_con < 0)
+ 		return log_error_errno(false, errno, "Failed to open %s", path);
+ 
+-	if (h->container_full_path == NULL) {
+-		h->container_full_path = move_ptr(path);
++	if (h->path_con == NULL) {
++		h->path_con = move_ptr(path);
+ 	}
+ 
+ 	return true;
+@@ -961,7 +965,7 @@ __cgfsng_ops static inline bool isulad_cgfsng_payload_create(struct cgroup_ops *
+ 
+ 	for (i = 0; ops->hierarchiesi; i++) {
+ 		if (!create_path_for_hierarchy(ops->hierarchiesi, container_cgroup, ops->errfd)) {
+-			SYSERROR("Failed to create %s", ops->hierarchiesi->container_full_path);
++			SYSERROR("Failed to create %s", ops->hierarchiesi->path_con);
+ 			return false;
+ 		}
+ 	}
+@@ -1008,7 +1012,7 @@ __cgfsng_ops static bool isulad_cgfsng_payload_enter(struct cgroup_ops *ops,
+ 		int retry_count = 0;
+ 		int max_retry = 10;
+ 
+-		fullpath = must_make_path(ops->hierarchiesi->container_full_path,
++		fullpath = must_make_path(ops->hierarchiesi->path_con,
+ 		                          "cgroup.procs", NULL);
+ retry:
+ 		ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666);
+@@ -1016,7 +1020,7 @@ retry:
+ 			if (retry_count < max_retry) {
+ 				SYSERROR("Failed to enter cgroup \"%s\" with retry count:%d", fullpath, retry_count);
+ 				(void)isulad_cg_legacy_handle_cpuset_hierarchy(ops->hierarchiesi, ops->container_cgroup);
+-				(void)isulad_mkdir_eexist_on_last(ops->hierarchiesi->container_full_path, 0755);
++				(void)isulad_mkdir_eexist_on_last(ops->hierarchiesi->path_con, 0755);
+ 				usleep(100 * 1000); /* 100 millisecond */
+ 				retry_count++;
+ 				goto retry;
+@@ -1097,12 +1101,12 @@ static int chown_cgroup_wrapper(void *data)
+ 		 * files (which systemd in wily insists on doing).
+ 		 */
+ 
+-		if (arg->hierarchiesi->version == CGROUP_SUPER_MAGIC)
++		if (arg->hierarchiesi->fs_type == CGROUP_SUPER_MAGIC)
+ 			(void)fchowmodat(dirfd, "tasks", destuid, nsgid, 0664);
+ 
+ 		(void)fchowmodat(dirfd, "cgroup.procs", destuid, nsgid, 0664);
+ 
+-		if (arg->hierarchiesi->version != CGROUP2_SUPER_MAGIC)
++		if (arg->hierarchiesi->fs_type != CGROUP2_SUPER_MAGIC)
+ 			continue;
+ 
+ 		for (char **p = arg->hierarchiesi->cgroup2_chown; p && *p; p++)
+@@ -1207,7 +1211,7 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
+ 		INFO("Remounted %s read-only", controllerpath);
+ 	}
+ 
+-	sourcepath = must_make_path(h->mountpoint, h->container_base_path,
++	sourcepath = must_make_path(h->at_mnt, h->at_base,
+ 				    container_cgroup, NULL);
+ 	if (type == LXC_AUTO_CGROUP_RO)
+ 		flags |= MS_RDONLY;
+@@ -1253,7 +1257,7 @@ static int __cg_mount_direct(int type, struct hierarchy *h,
+ 	 if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_FULL_RO)
+ 		 flags |= MS_RDONLY;
+ 
+-	 if (h->version != CGROUP2_SUPER_MAGIC) {
++	 if (h->fs_type != CGROUP2_SUPER_MAGIC) {
+ 		 controllers = lxc_string_join(",", (const char **)h->controllers, false);
+ 		 if (!controllers)
+ 			 return -ENOMEM;
+@@ -1349,7 +1353,7 @@ __cgfsng_ops static bool isulad_cgfsng_mount(struct cgroup_ops *ops,
+ 		char *controllerpath = NULL;
+ 		char *path2 = NULL;
+ 		struct hierarchy *h = ops->hierarchiesi;
+-		char *controller = strrchr(h->mountpoint, '/');
++		char *controller = strrchr(h->at_mnt, '/');
+ 
+ 		if (!controller)
+ 			continue;
+@@ -1401,7 +1405,7 @@ __cgfsng_ops static bool isulad_cgfsng_mount(struct cgroup_ops *ops,
+ 		}
+ 
+ 		// isulad: ignore ops->container_cgroup so we will not see directory lxc after /sys/fs/cgroup/xxx in container,
+-		// isulad: ignore h->container_base_path so we will not see subgroup of /sys/fs/cgroup/xxx/subgroup in container
++		// isulad: ignore h->at_base so we will not see subgroup of /sys/fs/cgroup/xxx/subgroup in container
+ 		path2 = must_make_path(controllerpath, NULL);
+ 		ret = mkdir_p(path2, 0755);
+ 		if (ret < 0) {
+@@ -1513,8 +1517,8 @@ __cgfsng_ops static bool isulad_cgfsng_escape(const struct cgroup_ops *ops,
+ 		int ret;
+ 
+ 		fullpath =
+-		    must_make_path(ops->hierarchiesi->mountpoint,
+-				   ops->hierarchiesi->container_base_path,
++		    must_make_path(ops->hierarchiesi->at_mnt,
++				   ops->hierarchiesi->at_base,
+ 				   "cgroup.procs", NULL);
+ 		ret = lxc_write_to_file(fullpath, "0", 2, false, 0666);
+ 		if (ret != 0)
+@@ -1569,7 +1573,7 @@ static bool cg_legacy_freeze(struct cgroup_ops *ops)
+ 	if (!h)
+ 		return ret_set_errno(-1, ENOENT);
+ 
+-	return lxc_write_openat(h->container_full_path, "freezer.state",
++	return lxc_write_openat(h->path_con, "freezer.state",
+ 				"FROZEN", STRLITERALLEN("FROZEN"));
+ }
+ 
+@@ -1619,13 +1623,13 @@ static int cg_unified_freeze(struct cgroup_ops *ops, int timeout)
+ 	if (!h)
+ 		return ret_set_errno(-1, ENOENT);
+ 
+-	if (!h->container_full_path)
++	if (!h->path_con)
+ 		return ret_set_errno(-1, EEXIST);
+ 
+ 	if (timeout != 0) {
+ 		__do_free char *events_file = NULL;
+ 
+-		events_file = must_make_path(h->container_full_path, "cgroup.events", NULL);
++		events_file = must_make_path(h->path_con, "cgroup.events", NULL);
+ 		fd = open(events_file, O_RDONLY | O_CLOEXEC);
+ 		if (fd < 0)
+ 			return log_error_errno(-1, errno, "Failed to open cgroup.events file");
+@@ -1642,7 +1646,7 @@ static int cg_unified_freeze(struct cgroup_ops *ops, int timeout)
+ 			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
+ 	}
+ 
+-	ret = lxc_write_openat(h->container_full_path, "cgroup.freeze", "1", 1);
++	ret = lxc_write_openat(h->path_con, "cgroup.freeze", "1", 1);
+ 	if (ret < 0)
+ 		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
+ 
+@@ -1671,7 +1675,7 @@ static int cg_legacy_unfreeze(struct cgroup_ops *ops)
+ 	if (!h)
+ 		return ret_set_errno(-1, ENOENT);
+ 
+-	return lxc_write_openat(h->container_full_path, "freezer.state",
++	return lxc_write_openat(h->path_con, "freezer.state",
+ 				"THAWED", STRLITERALLEN("THAWED"));
+ }
+ 
+@@ -1687,13 +1691,13 @@ static int cg_unified_unfreeze(struct cgroup_ops *ops, int timeout)
+ 	if (!h)
+ 		return ret_set_errno(-1, ENOENT);
+ 
+-	if (!h->container_full_path)
++	if (!h->path_con)
+ 		return ret_set_errno(-1, EEXIST);
+ 
+ 	if (timeout != 0) {
+ 		__do_free char *events_file = NULL;
+ 
+-		events_file = must_make_path(h->container_full_path, "cgroup.events", NULL);
++		events_file = must_make_path(h->path_con, "cgroup.events", NULL);
+ 		fd = open(events_file, O_RDONLY | O_CLOEXEC);
+ 		if (fd < 0)
+ 			return log_error_errno(-1, errno, "Failed to open cgroup.events file");
+@@ -1710,7 +1714,7 @@ static int cg_unified_unfreeze(struct cgroup_ops *ops, int timeout)
+ 			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
+ 	}
+ 
+-	ret = lxc_write_openat(h->container_full_path, "cgroup.freeze", "0", 1);
++	ret = lxc_write_openat(h->path_con, "cgroup.freeze", "0", 1);
+ 	if (ret < 0)
+ 		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
+ 
+@@ -1741,11 +1745,11 @@ __cgfsng_ops static const char *isulad_cgfsng_get_cgroup(struct cgroup_ops *ops,
+ 		return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
+ 				      controller ? controller : "(null)");
+ 
+-	if (!h->container_full_path)
+-		h->container_full_path = must_make_path(h->mountpoint, h->container_base_path, ops->container_cgroup, NULL);
++	if (!h->path_con)
++		h->path_con = must_make_path(h->at_mnt, h->at_base, ops->container_cgroup, NULL);
+ 
+-	return h->container_full_path
+-		   ? h->container_full_path + strlen(h->mountpoint)
++	return h->path_con
++		   ? h->path_con + strlen(h->at_mnt)
+ 		   : NULL;
+ }
+ 
+@@ -1759,10 +1763,10 @@ __cgfsng_ops static const char *isulad_cgfsng_get_cgroup_full_path(struct cgroup
+ 		return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
+ 				      controller ? controller : "(null)");
+ 
+-	if (!h->container_full_path)
+-		h->container_full_path = must_make_path(h->mountpoint, h->container_base_path, ops->container_cgroup, NULL);
++	if (!h->path_con)
++		h->path_con = must_make_path(h->at_mnt, h->at_base, ops->container_cgroup, NULL);
+ 
+-	return h->container_full_path;
++	return h->path_con;
+ }
+ 
+ /* Given a cgroup path returned from lxc_cmd_get_cgroup_path, build a full path,
+@@ -1772,7 +1776,7 @@ static inline char *build_full_cgpath_from_monitorpath(struct hierarchy *h,
+ 						       const char *inpath,
+ 						       const char *filename)
+ {
+-	return must_make_path(h->mountpoint, inpath, filename, NULL);
++	return must_make_path(h->at_mnt, inpath, filename, NULL);
+ }
+ 
+ static int cgroup_attach_leaf(const struct lxc_conf *conf, int unified_fd, pid_t pid)
+@@ -2004,7 +2008,7 @@ static int __cg_unified_attach(const struct hierarchy *h,
+ 	if (!cgroup)
+ 		return 0;
+ 
+-	path = must_make_path(h->mountpoint, cgroup, NULL);
++	path = must_make_path(h->at_mnt, cgroup, NULL);
+ 
+ 	unified_fd = open(path, O_PATH | O_DIRECTORY | O_CLOEXEC);
+ 	if (unified_fd < 0)
+@@ -2062,7 +2066,7 @@ __cgfsng_ops static bool isulad_cgfsng_attach(struct cgroup_ops *ops,
+ 		__do_free char *fullpath = NULL, *path = NULL;
+ 		struct hierarchy *h = ops->hierarchiesi;
+ 
+-		if (h->version == CGROUP2_SUPER_MAGIC) {
++		if (h->fs_type == CGROUP2_SUPER_MAGIC) {
+ 			ret = __cg_unified_attach(h, conf, name, lxcpath, pid,
+ 						  h->controllers0);
+ 			if (ret < 0)
+@@ -2410,7 +2414,7 @@ static int isulad_cg_legacy_get_data(struct cgroup_ops *ops, const char *filenam
+ 		return -ENOENT;
+ 	}
+ 
+-	fullpath = must_make_path(h->container_full_path, filename, NULL);
++	fullpath = must_make_path(h->path_con, filename, NULL);
+ 	ret = lxc_read_from_file(fullpath, value, len);
+ 	free(fullpath);
+ 	free(controller);
+@@ -2456,7 +2460,7 @@ static int isulad_cg_legacy_set_data(struct cgroup_ops *ops, const char *filenam
+ 		return -ENOENT;
+ 	}
+ 
+-	fullpath = must_make_path(h->container_full_path, filename, NULL);
++	fullpath = must_make_path(h->path_con, filename, NULL);
+ 
+ retry:
+ 	ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
+@@ -2464,7 +2468,7 @@ retry:
+ 		if (retry_count < max_retry) {
+ 			SYSERROR("setting cgroup config for ready process caused \"failed to write %s to %s\".", value, fullpath);
+ 			(void)isulad_cg_legacy_handle_cpuset_hierarchy(h, container_cgroup);
+-			(void)isulad_mkdir_eexist_on_last(h->container_full_path, 0755);
++			(void)isulad_mkdir_eexist_on_last(h->path_con, 0755);
+ 			usleep(100 * 1000); /* 100 millisecond */
+ 			retry_count++;
+ 			goto retry;
+@@ -2651,7 +2655,7 @@ __cgfsng_ops static bool isulad_cgfsng_setup_limits(struct cgroup_ops *ops,
+ 			if (setvalue <= 0)
+ 				cgvalue = "max";
+ 
+-			ret = lxc_write_openat(h->container_full_path,
++			ret = lxc_write_openat(h->path_con,
+ 					       cg->subsystem, cgvalue,
+ 					       strlen(cgvalue));
+ 			if (ret < 0)
+@@ -2659,12 +2663,12 @@ __cgfsng_ops static bool isulad_cgfsng_setup_limits(struct cgroup_ops *ops,
+ 						       cg->subsystem, cgvalue);
+ 		} else {
+ 			if (strcmp(cg->subsystem, "io.weight") == 0 || strcmp(cg->subsystem, "io.bfq.weight") == 0) {
+-				path = must_make_path(h->container_full_path, cg->subsystem, NULL);
++				path = must_make_path(h->path_con, cg->subsystem, NULL);
+ 				if (!file_exists(path)) {
+ 					continue;
+ 				}
+ 			}
+-			ret = lxc_write_openat(h->container_full_path,
++			ret = lxc_write_openat(h->path_con,
+ 					       cg->subsystem, cg->value,
+ 					       strlen(cg->value));
+ 			if (ret < 0)
+@@ -2703,7 +2707,7 @@ __cgfsng_ops bool isulad_cgfsng_devices_activate(struct cgroup_ops *ops,
+ 
+ 	unified = ops->unified;
+ 	if (!unified || !unified->bpf_device_controller ||
+-	    !unified->container_full_path || lxc_list_empty(&conf->devices))
++	    !unified->path_con || lxc_list_empty(&conf->devices))
+ 		return true;
+ 
+ 	devices = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
+@@ -2740,7 +2744,7 @@ __cgfsng_ops bool isulad_cgfsng_devices_activate(struct cgroup_ops *ops,
+ 		return log_error_errno(false, ENOMEM, "Failed to finalize bpf program");
+ 
+ 	ret = bpf_program_cgroup_attach(devices, BPF_CGROUP_DEVICE,
+-					unified->container_full_path,
++					unified->path_con,
+ 					BPF_F_ALLOW_MULTI);
+ 	if (ret)
+ 		return log_error_errno(false, ENOMEM, "Failed to attach bpf program");
+@@ -2794,7 +2798,7 @@ bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup)
+ 	if (parts_len > 0)
+ 		parts_len--;
+ 
+-	base_path = must_make_path(unified->mountpoint, unified->container_base_path, NULL);
++	base_path = must_make_path(unified->at_mnt, unified->at_base, NULL);
+ 	for (ssize_t i = -1; i < parts_len; i++) {
+ 		int ret;
+ 		__do_free char *target = NULL;
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index 23783db..a0e0375 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -4796,7 +4796,7 @@ int lxc_setup(struct lxc_handler *handler)
+ 
+ #ifdef HAVE_ISULAD
+ 	/* Ask father to run oci prestart hooks and wait for him to finish. */
+-	if (lxc_sync_barrier_parent(handler, LXC_SYNC_OCI_PRESTART_HOOK)) {
++	if (lxc_sync_wait_parent(handler, LXC_SYNC_OCI_PRESTART_HOOK)) {
+ 		return log_error(-1, "Failed to sync parent to start host hook");
+ 	}
+ #endif
+diff --git a/src/lxc/log.c b/src/lxc/log.c
+index cdd11ff..167725a 100644
+--- a/src/lxc/log.c
++++ b/src/lxc/log.c
+@@ -53,6 +53,39 @@ static char *log_vmname = NULL;
+ 
+ lxc_log_define(log, lxc);
+ 
++#ifdef HAVE_ISULAD
++// iSulad gather log by fifo, so lxc should support log driver of fifo
++static inline const char *isulad_get_fifo_path(const char *file)
++{
++#define ISULAD_FIFO_PREFIX "fifo:"
++
++	if (strncmp(file, ISULAD_FIFO_PREFIX, strlen(ISULAD_FIFO_PREFIX)) == 0) {
++		return (file + strlen(ISULAD_FIFO_PREFIX));
++	}
++	return NULL;
++}
++
++static int isulad_open_fifo(const char *file_path)
++{
++#define LOG_FIFO_SIZE (1024 * 1024)
++	int fd;
++
++	fd = lxc_unpriv(open(file_path, O_RDWR | O_NONBLOCK | O_CLOEXEC));
++	if (fd == -1) {
++		fprintf(stderr, "Open fifo %s failed: %s\n", file_path, strerror(errno));
++		return -1;
++	}
++
++	if (fcntl(fd, F_SETPIPE_SZ, LOG_FIFO_SIZE) == -1) {
++		printf("Set fifo buffer size failed: %s", strerror(errno));
++		close(fd);
++		return -1;
++	}
++
++	return fd;
++}
++#endif
++
+ static int lxc_log_priority_to_syslog(int priority)
+ {
+ 	switch (priority) {
+@@ -334,6 +367,13 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
+ 
+ 	log_container_name = lxc_log_get_container_name();
+ 
++#ifdef HAVE_ISULAD
++	/* use isulad log format */
++	if (log_container_name != NULL && strlen(log_container_name) > 15) {
++		log_container_name = log_container_name + (strlen(log_container_name) - 15);
++	}
++#endif
++
+ 	if (fd_to_use < 0)
+ 		fd_to_use = lxc_log_fd;
+ 
+@@ -349,9 +389,13 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
+ 	 * instead of strnprintf().
+ 	 */
+ 	n = snprintf(buffer, sizeof(buffer),
++#ifdef HAVE_ISULAD
++			 "%15s %s %-8s %s - %s:%s:%d -",
++#else
+ 		     "%s%s%s %s %-8s %s - %s:%s:%d - ",
+ 		     log_prefix,
+ 		     log_container_name ? " " : "",
++#endif
+ 		     log_container_name ? log_container_name : "",
+ 		     date_time,
+ 		     lxc_log_priority_to_string(event->priority),
+@@ -619,6 +663,13 @@ static int __lxc_log_set_file(const char *fname, int create_dirs)
+ 		return ret_errno(EINVAL);
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	fname = isulad_get_fifo_path(fname);
++	if (fname == NULL) {
++		return ret_errno(EINVAL);
++	}
++#endif
++
+ #if USE_CONFIGPATH_LOGS
+ 	/* We don't build_dir for the default if the default is i.e.
+ 	 * /var/lib/lxc/$container/$container.log.
+@@ -628,7 +679,11 @@ static int __lxc_log_set_file(const char *fname, int create_dirs)
+ 	if (build_dir(fname))
+ 		return log_error_errno(-errno, errno, "Failed to create dir for log file \"%s\"", fname);
+ 
++#ifdef HAVE_ISULAD
++	lxc_log_fd = isulad_open_fifo(fname);
++#else
+ 	lxc_log_fd = log_open(fname);
++#endif
+ 	if (lxc_log_fd < 0)
+ 		return lxc_log_fd;
+ 
+@@ -724,6 +779,9 @@ int lxc_log_init(struct lxc_log *log)
+ 
+ 	if (lxc_log_fd >= 0) {
+ 		lxc_log_category_lxc.appender = &log_appender_logfile;
++#ifdef HAVE_ISULAD
++	if (!lxc_quiet_specified && !log->quiet)
++#endif
+ 		lxc_log_category_lxc.appender->next = &log_appender_stderr;
+ 	}
+ 
+diff --git a/src/lxc/network.c b/src/lxc/network.c
+index e1ee57e..c8d0402 100644
+--- a/src/lxc/network.c
++++ b/src/lxc/network.c
+@@ -3875,10 +3875,18 @@ static int lxc_network_setup_in_child_namespaces_common(struct lxc_netdev *netde
+ 
+ 	/* set the network device up */
+ 	if (netdev->flags & IFF_UP) {
++#ifdef HAVE_ISULAD
++		// iSulad do not set net dev name, just want to setup loop dev
++		if (netdev->name0 != '\0') {
++#endif
+ 		err = lxc_netdev_up(netdev->name);
+ 		if (err)
+ 			return log_error_errno(-1, -err, "Failed to set network device \"%s\" up", netdev->name);
+ 
++#ifdef HAVE_ISULAD
++		}
++#endif
++
+ 		/* the network is up, make the loopback up too */
+ 		err = lxc_netdev_up("lo");
+ 		if (err)
+diff --git a/src/lxc/storage/dir.c b/src/lxc/storage/dir.c
+index bdf4e3f..09e08ad 100644
+--- a/src/lxc/storage/dir.c
++++ b/src/lxc/storage/dir.c
+@@ -94,6 +94,9 @@ int dir_create(struct lxc_storage *bdev, const char *dest, const char *n,
+ 
+ int dir_destroy(struct lxc_storage *orig)
+ {
++#ifdef HAVE_ISULAD
++	// isulad: do not destroy rootfs for directory, it should be managed by caller
++#else
+ 	int ret;
+ 	const char *src;
+ 
+@@ -102,6 +105,7 @@ int dir_destroy(struct lxc_storage *orig)
+ 	ret = lxc_rmdir_onedev(src, NULL);
+ 	if (ret < 0)
+ 		return log_error_errno(ret, errno, "Failed to delete \"%s\"", src);
++#endif
+ 
+ 	return 0;
+ }
+diff --git a/src/lxc/storage/loop.c b/src/lxc/storage/loop.c
+index 870b84c..17c11d5 100644
+--- a/src/lxc/storage/loop.c
++++ b/src/lxc/storage/loop.c
+@@ -19,6 +19,9 @@
+ #include "storage.h"
+ #include "storage_utils.h"
+ #include "utils.h"
++#ifdef HAVE_ISULAD
++#include "lxclock.h"
++#endif
+ 
+ lxc_log_define(loop, lxc);
+ 
+@@ -216,6 +219,10 @@ int loop_mount(struct lxc_storage *bdev)
+ 	int ret, loopfd;
+ 	char lonamePATH_MAX;
+ 	const char *src;
++#ifdef HAVE_ISULAD
++	struct lxc_lock *l = NULL;
++	ret = -1;
++#endif
+ 
+ 	if (strcmp(bdev->type, "loop"))
+ 		return -22;
+@@ -223,13 +230,32 @@ int loop_mount(struct lxc_storage *bdev)
+ 	if (!bdev->src || !bdev->dest)
+ 		return -22;
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: do lock before mount, so we can avoid use loop which is used by
++	 * other starting contianers */
++	l = lxc_newlock("mount_lock", "mount_lock");
++	if (!l) {
++		SYSERROR("create file lock error when mount fs");
++		return -1;
++	}
++
++	if (lxclock(l, 0) != 0) {
++		SYSERROR("try to lock failed when mount fs");
++		goto out;
++	}
++#endif
++
+ 	/* skip prefix */
+ 	src = lxc_storage_get_path(bdev->src, bdev->type);
+ 
+ 	loopfd = lxc_prepare_loop_dev(src, loname, LO_FLAGS_AUTOCLEAR);
+ 	if (loopfd < 0) {
+ 		ERROR("Failed to prepare loop device for loop file \"%s\"", src);
++#ifdef HAVE_ISULAD
++		goto out;
++#else
+ 		return -1;
++#endif
+ 	}
+ 	DEBUG("Prepared loop device \"%s\"", loname);
+ 
+@@ -238,14 +264,29 @@ int loop_mount(struct lxc_storage *bdev)
+ 		ERROR("Failed to mount rootfs \"%s\" on \"%s\" via loop device \"%s\"",
+ 		      bdev->src, bdev->dest, loname);
+ 		close(loopfd);
++#ifdef HAVE_ISULAD
++		goto out;
++#else
+ 		return -1;
++#endif
+ 	}
+ 
+ 	bdev->lofd = loopfd;
+ 	DEBUG("Mounted rootfs \"%s\" on \"%s\" via loop device \"%s\"",
+ 	      bdev->src, bdev->dest, loname);
+ 
++#ifdef HAVE_ISULAD
++	ret = 0;
++out:
++	if (lxcunlock(l) != 0) {
++		SYSERROR("try to unlock failed when mount fs");
++		ret = -1;
++	}
++	lxc_putlock(l);
++	return ret;
++#else
+ 	return 0;
++#endif
+ }
+ 
+ int loop_umount(struct lxc_storage *bdev)
+diff --git a/src/lxc/storage/storage.c b/src/lxc/storage/storage.c
+index c840c68..39756d0 100644
+--- a/src/lxc/storage/storage.c
++++ b/src/lxc/storage/storage.c
+@@ -587,8 +587,15 @@ bool storage_destroy(struct lxc_conf *conf)
+ 	int destroy_rv = 0;
+ 
+ 	r = storage_init(conf);
++#ifdef HAVE_ISULAD
++	if (r == NULL) {
++		WARN("%s 's storage init failed, the storage may be deleted already", conf->name);
++		return true;
++	}
++#else
+ 	if (!r)
+ 		return ret;
++#endif
+ 
+ 	destroy_rv = r->ops->destroy(r);
+ 	if (destroy_rv == 0)
+diff --git a/src/lxc/sync.h b/src/lxc/sync.h
+index 6703eda..ef03e1e 100644
+--- a/src/lxc/sync.h
++++ b/src/lxc/sync.h
+@@ -20,11 +20,20 @@ enum /* start */ {
+ 	START_SYNC_CONFIGURE		=  1,
+ 	START_SYNC_POST_CONFIGURE	=  2,
+ 	START_SYNC_IDMAPPED_MOUNTS	=  3,
++#ifdef HAVE_ISULAD
++	LXC_SYNC_OCI_PRESTART_HOOK = 4,
++	START_SYNC_CGROUP_LIMITS	=  5,
++	START_SYNC_FDS			=  6,
++	START_SYNC_READY_START		=  7,
++	START_SYNC_RESTART		=  8,
++	START_SYNC_POST_RESTART		=  9,
++#else
+ 	START_SYNC_CGROUP_LIMITS	=  4,
+ 	START_SYNC_FDS			=  5,
+ 	START_SYNC_READY_START		=  6,
+ 	START_SYNC_RESTART		=  7,
+ 	START_SYNC_POST_RESTART		=  8,
++#endif
+ };
+ 
+ enum /* attach */ {
+diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
+index a1dcc2d..8da00a9 100644
+--- a/src/lxc/terminal.c
++++ b/src/lxc/terminal.c
+@@ -28,6 +28,10 @@
+ #include "syscall_wrappers.h"
+ #include "terminal.h"
+ #include "utils.h"
++#ifdef HAVE_ISULAD
++#include "logger_json_file.h"
++#include "include/strlcpy.h"
++#endif
+ 
+ #if HAVE_OPENPTY
+ #include <pty.h>
+@@ -193,6 +197,69 @@ static int lxc_terminal_truncate_log_file(struct lxc_terminal *terminal)
+ 	return lxc_unpriv(ftruncate(terminal->log_fd, 0));
+ }
+ 
++#ifdef HAVE_ISULAD
++// change windows size API for iSulad
++int lxc_set_terminal_winsz(struct lxc_terminal *terminal, unsigned int height, unsigned int width)
++{
++	int ret = 0;
++	struct winsize wsz;
++
++	if (terminal->ptmx < 0) {
++		return 0;
++	}
++
++	ret = ioctl(terminal->ptmx, TIOCGWINSZ, &wsz);
++	if (ret < 0) {
++		WARN("Failed to get window size");
++		return -1;
++	}
++	wsz.ws_col = width;
++	wsz.ws_row = height;
++
++	ret = ioctl(terminal->ptmx, TIOCSWINSZ, &wsz);
++	if (ret < 0)
++		WARN("Failed to set window size");
++	else
++		DEBUG("Set window size to %d columns and %d rows", wsz.ws_col,
++		      wsz.ws_row);
++	return ret;
++}
++
++/*
++ * isulad: support mult-logfiles
++ * */
++static int lxc_terminal_rename_old_log_file(struct lxc_terminal *terminal)
++{
++	int ret;
++	unsigned int i;
++	char tmpPATH_MAX = {0};
++	char *rename_fname = NULL;
++
++	for (i = terminal->log_rotate - 1; i > 1; i--) {
++		ret = snprintf(tmp, PATH_MAX, "%s.%u", terminal->log_path, i);
++		if (ret < 0 || ret >= PATH_MAX) {
++			free(rename_fname);
++			return -EFBIG;
++		}
++		free(rename_fname);
++		rename_fname = safe_strdup(tmp);
++		ret = snprintf(tmp, PATH_MAX, "%s.%u", terminal->log_path, (i - 1));
++		if (ret < 0 || ret >= PATH_MAX) {
++			free(rename_fname);
++			return -EFBIG;
++		}
++		ret = lxc_unpriv(rename(tmp, rename_fname));
++		if (ret < 0 && errno != ENOENT) {
++			free(rename_fname);
++			return ret;
++		}
++	}
++
++	free(rename_fname);
++	return 0;
++}
++#endif
++
+ static int lxc_terminal_rotate_log_file(struct lxc_terminal *terminal)
+ {
+ 	__do_free char *tmp = NULL;
+@@ -206,6 +273,15 @@ static int lxc_terminal_rotate_log_file(struct lxc_terminal *terminal)
+ 	if (terminal->log_fd < 0)
+ 		return -EBADF;
+ 
++#ifdef HAVE_ISULAD
++	/* isuald: rotate old log file first */
++	ret = lxc_terminal_rename_old_log_file(terminal);
++	if(ret != 0) {
++		ERROR("Rename old log file failed");
++		return ret;
++	}
++#endif
++
+ 	len = strlen(terminal->log_path) + sizeof(".1");
+ 	tmp = must_realloc(NULL, len);
+ 
+@@ -222,6 +298,92 @@ static int lxc_terminal_rotate_log_file(struct lxc_terminal *terminal)
+ 	return lxc_terminal_create_log_file(terminal);
+ }
+ 
++#ifdef HAVE_ISULAD
++static int do_isulad_io(int fd, struct lxc_terminal *terminal)
++{
++	char bufLXC_TERMINAL_BUFFER_SIZE;
++	int r, w, w_log, w_rbuf;
++
++	w = r = lxc_read_nointr(fd, buf, sizeof(buf));
++	if (r <= 0) {
++		if (lxc_terminal_is_fifo(fd, &terminal->fifos)) {
++			// delete failure fifo, and continue io loop
++			lxc_terminal_delete_fifo(fd, &terminal->fifos);
++		} else if (fd == terminal->pipes10) {
++			// disable stdout of container
++			terminal->pipes10 = -EBADF;
++		} else if (fd == terminal->pipes20) {
++			// disable stderr of container
++			terminal->pipes20 = -EBADF;
++		} else if (fd == terminal->pipes01) {
++			terminal->pipes01 = -EBADF;
++			TRACE("closed stdin pipe of container stdin");
++		} else {
++			// other fd should break io loop
++			return -1;
++		}
++		return 0;
++	}
++
++	w_rbuf = w_log = 0;
++	if (lxc_terminal_is_fifo(fd, &terminal->fifos)) {
++		if (terminal->ptx > 0)
++			w = lxc_write_nointr(terminal->ptx, buf, r);
++		if (terminal->pipes01 > 0)
++			w = lxc_write_nointr(terminal->pipes01, buf, r);
++		if (w != r)
++			WARN("Short write on ptx/pipe r:%d != w:%d", r, w);
++	}
++
++	if (fd == terminal->pipes10 || fd == terminal->pipes20) {
++		/* write to peer first */
++		if (terminal->peer >= 0)
++			w = lxc_write_nointr(terminal->peer, buf, r);
++
++		/* isulad: forward data to fifos */
++		lxc_forward_data_to_fifo(&terminal->fifos, fd == terminal->pipes20, buf, r);
++
++		/* write to terminal ringbuffer */
++		if (terminal->buffer_size > 0)
++			w_rbuf = lxc_ringbuf_write(&terminal->ringbuf, buf, r);
++
++		/* write to terminal log */
++		if (terminal->log_fd >= 0) {
++			if (fd == terminal->pipes10)
++				w_log = isulad_lxc_terminal_write_log_file(terminal, "stdout", buf, r);
++			else
++				w_log = isulad_lxc_terminal_write_log_file(terminal, "stderr", buf, r);
++		}
++
++		if (w != r)
++			WARN("Short write on peer r:%d != w:%d", r, w);
++	}
++
++	if (w_rbuf < 0) {
++		errno = -w_rbuf;
++		SYSTRACE("Failed to write %d bytes to terminal ringbuffer", r);
++	}
++
++	if (w_log < 0)
++		TRACE("Failed to write %d bytes to terminal log", r);
++
++	return 0;
++}
++
++static int isulad_io_handler(int fd, uint32_t events, void *data,
++				       struct lxc_async_descr *descr)
++{
++	struct lxc_terminal *terminal = data;
++	int ret;
++
++	ret = do_isulad_io(fd, data);
++	if (ret < 0)
++		return log_info(LXC_MAINLOOP_CLOSE,
++				"Terminal client on fd %d has exited", fd);
++
++	return LXC_MAINLOOP_CONTINUE;
++}
++#else
+ static int lxc_terminal_write_log_file(struct lxc_terminal *terminal, char *buf,
+ 				       int bytes_read)
+ {
+@@ -327,6 +489,7 @@ static int lxc_terminal_write_log_file(struct lxc_terminal *terminal, char *buf,
+ 	bytes_read -= ret;
+ 	return bytes_read;
+ }
++#endif
+ 
+ static int lxc_terminal_ptx_io(struct lxc_terminal *terminal)
+ {
+@@ -342,13 +505,22 @@ static int lxc_terminal_ptx_io(struct lxc_terminal *terminal)
+ 	if (terminal->peer >= 0)
+ 		w = lxc_write_nointr(terminal->peer, buf, r);
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: forward data to fifos */
++	lxc_forward_data_to_fifo(&terminal->fifos, fd == terminal->pipes20, buf, r);
++#endif
++
+ 	/* write to terminal ringbuffer */
+ 	if (terminal->buffer_size > 0)
+ 		w_rbuf = lxc_ringbuf_write(&terminal->ringbuf, buf, r);
+ 
+ 	/* write to terminal log */
+ 	if (terminal->log_fd >= 0)
++#ifdef HAVE_ISULAD
++		w_log = isulad_lxc_terminal_write_log_file(terminal, "stdout", buf, r); // isulad: distinguishes between stderr and stdout
++#else
+ 		w_log = lxc_terminal_write_log_file(terminal, buf, r);
++#endif
+ 
+ 	if (w != r)
+ 		WARN("Short write on terminal r:%d != w:%d", r, w);
+@@ -368,12 +540,30 @@ static int lxc_terminal_peer_io(struct lxc_terminal *terminal)
+ {
+ 	char bufLXC_TERMINAL_BUFFER_SIZE;
+ 	int r, w;
++#ifdef HAVE_ISULAD
++	int w_pipe;
++#endif
+ 
+ 	w = r = lxc_read_nointr(terminal->peer, buf, sizeof(buf));
+ 	if (r <= 0)
++#ifdef HAVE_ISULAD
++		return 0; // isulad: do not close mainloop when peer close
++#else
+ 		return -1;
++#endif
+ 
++#ifdef HAVE_ISULAD
++	if (terminal->ptx > 0)
++		w = lxc_write_nointr(terminal->ptx, buf, r);
++	// isulad: write peer data into stdin of container
++	if (terminal->pipes01 > 0) {
++		w_pipe = lxc_write_nointr(terminal->pipes01, buf, r);
++		if (w_pipe != r)
++			WARN("Short write on pipe r:%d != w_pipe:%d", r, w_pipe);
++	}
++else
+ 	w = lxc_write_nointr(terminal->ptx, buf, r);
++#endif
+ 	if (w != r)
+ 		WARN("Short write on terminal r:%d != w:%d", r, w);
+ 
+@@ -442,6 +632,124 @@ static int lxc_terminal_mainloop_add_peer(struct lxc_terminal *terminal)
+ 	return 0;
+ }
+ 
++#ifdef HAVE_ISULAD
++/* isulad add pipes to mainloop
++*  if disable-pty setted, we use pipes to connect with isulad
++*  isulad                          lxc monitor                       container
++*  stdin/out/err   <--fifo-->       pipe3        <--pipe-->      stdin/out/err
++*/
++static int lxc_terminal_mainloop_add_pipes(struct lxc_terminal *terminal)
++{
++	int ret = 0;
++
++	// parent read data from fifo, and send to stdin of container
++	if (terminal->pipes01 > 0) {
++		ret = lxc_mainloop_add_handler(terminal->descr, terminal->pipes01,
++		                               isulad_io_handler,
++									   default_cleanup_handler, terminal, "isulad_io_handler_pipe_in");
++		if (ret) {
++			ERROR("pipe fd %d not added to mainloop", terminal->pipes01);
++			return -1;
++		}
++	}
++	// parent read data from stdout of container, and send to fifo
++	if (terminal->pipes10 > 0) {
++		ret = lxc_mainloop_add_handler(terminal->descr, terminal->pipes10,
++		                               isulad_io_handler,
++									   default_cleanup_handler, terminal, "isulad_io_handler_pipe_out");
++		if (ret) {
++			ERROR("pipe fd %d not added to mainloop", terminal->pipes10);
++			return -1;
++		}
++	}
++	// parent read data from stderr of container, and send to fifo
++	if (terminal->pipes20 > 0) {
++		ret = lxc_mainloop_add_handler(terminal->descr, terminal->pipes20,
++		                               isulad_io_handler,
++									   default_cleanup_handler, terminal, "isulad_io_handler_pipe_err");
++		if (ret) {
++			ERROR("pipe fd %d not added to mainloop", terminal->pipes20);
++			return -1;
++		}
++	}
++	return ret;
++}
++
++/* isulad add fifo to mainloop
++*  if disable-pty is false, we use pipes to connect with isulad
++*  isulad                          lxc monitor                       container
++*  stdin/out/err   <--fifo-->       pty             <------>      stdin/out/err
++*/
++static int lxc_terminal_mainloop_add_fifo(struct lxc_terminal *terminal)
++{
++	int ret = 0;
++	struct lxc_list *it = NULL;
++	struct lxc_list *next = NULL;
++	struct lxc_fifos_fd *elem = NULL;
++
++	lxc_list_for_each_safe(it, &terminal->fifos, next) {
++		elem = it->elem;
++		if (elem->in_fd >= 0) {
++			ret = lxc_mainloop_add_handler(terminal->descr, elem->in_fd,
++			                               isulad_io_handler,
++										   default_cleanup_handler, terminal, "isulad_io_handler_fifos");
++			if (ret) {
++				ERROR("console fifo %s not added to mainloop", elem->in_fifo);
++				return -1;
++			}
++		}
++	}
++	return ret;
++}
++
++int lxc_terminal_mainloop_add(struct lxc_async_descr *descr,
++			      struct lxc_terminal *terminal)
++{
++	int ret;
++
++	/* We cache the descr so that we can add an fd to it when someone
++	 * does attach to it in lxc_terminal_allocate().
++	 */
++	terminal->descr = descr;
++
++	ret = lxc_terminal_mainloop_add_peer(terminal);
++	if (ret < 0) {
++		ERROR("Failed to add handler for terminal peer to mainloop");
++		return -1;
++	}
++
++	/* isulad add pipes to mainloop */
++	ret = lxc_terminal_mainloop_add_pipes(terminal);
++	if (ret < 0) {
++		ERROR("Failed to add handler for terminal fifos to mainloop");
++		return -1;
++	}
++
++	/* isulad add fifo to mainloop */
++	ret = lxc_terminal_mainloop_add_fifo(terminal);
++	if (ret < 0) {
++		ERROR("Failed to add handler for terminal fifos to mainloop");
++		return -1;
++	}
++
++	// iSulad change: should support pipe replace to pty, this check will cause isulad fifo filed
++	if (terminal->ptx < 0) {
++		INFO("Terminal is not initialized");
++		return 0;
++	}
++
++	ret = lxc_mainloop_add_handler(descr, terminal->ptx,
++				       lxc_terminal_ptx_io_handler,
++				       default_cleanup_handler,
++				       terminal, "lxc_terminal_ptx_io_handler");
++	if (ret < 0) {
++		ERROR("Failed to add handler for terminal ptx fd %d to mainloop", terminal->ptx);
++		return -1;
++	}
++
++	return 0;
++}
++#else
+ int lxc_terminal_mainloop_add(struct lxc_async_descr *descr,
+ 			      struct lxc_terminal *terminal)
+ {
+@@ -468,6 +776,7 @@ int lxc_terminal_mainloop_add(struct lxc_async_descr *descr,
+ 
+ 	return lxc_terminal_mainloop_add_peer(terminal);
+ }
++#endif
+ 
+ int lxc_setup_tios(int fd, struct termios *oldtios)
+ {
+@@ -686,8 +995,27 @@ static int lxc_terminal_peer_default(struct lxc_terminal *terminal)
+ 
+ 	if (terminal->path)
+ 		path = terminal->path;
++#ifdef HAVE_ISULAD
++	/* isulad: if no console was given, try current controlling terminal, there
++	 * won't be one if we were started as a daemon (-d)
++	 */
++	if (!path && !access("/dev/tty", F_OK)) {
++		int fd;
++		fd = open("/dev/tty", O_RDWR);
++		if (fd >= 0) {
++			close(fd);
++			path = "/dev/tty";
++		}
++	}
++
++	if (!path) {
++		DEBUG("Not have a controlling terminal");
++		return 0;
++	}
++#else
+ 	else
+ 		path = "/dev/tty";
++#endif
+ 
+ 	terminal->peer = lxc_unpriv(open(path, O_RDWR | O_CLOEXEC));
+ 	if (terminal->peer < 0) {
+@@ -803,6 +1131,35 @@ void lxc_terminal_delete(struct lxc_terminal *terminal)
+ 	if (terminal->log_fd >= 0)
+ 		close(terminal->log_fd);
+ 	terminal->log_fd = -1;
++
++#ifdef HAVE_ISULAD
++	if (is_syslog(terminal->log_driver)) {
++		closelog();
++		free(terminal->log_driver);
++	}
++	/* isulad: close all pipes */
++	if (terminal->pipes00 >= 0)
++		close(terminal->pipes00);
++	terminal->pipes00 = -1;
++	if (terminal->pipes01 >= 0)
++		close(terminal->pipes01);
++	terminal->pipes01 = -1;
++	if (terminal->pipes10 >= 0)
++		close(terminal->pipes10);
++	terminal->pipes10 = -1;
++	if (terminal->pipes11 >= 0)
++		close(terminal->pipes11);
++	terminal->pipes11 = -1;
++	if (terminal->pipes20 >= 0)
++		close(terminal->pipes20);
++	terminal->pipes20 = -1;
++	if (terminal->pipes21 >= 0)
++		close(terminal->pipes21);
++	terminal->pipes21 = -1;
++
++	/* isulad: delete all fifos */
++	lxc_terminal_delete_fifo(-1, &terminal->fifos);
++#endif
+ }
+ 
+ /**
+@@ -895,6 +1252,176 @@ static int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *termina
+ 	return 0;
+ }
+ 
++#ifdef HAVE_ISULAD
++/* isulad: fd_nonblock */
++static int fd_nonblock(int fd)
++{
++	int flags;
++
++	flags = fcntl(fd, F_GETFL);
++
++	return fcntl(fd, F_SETFL, (int)((unsigned int)flags | O_NONBLOCK));
++}
++
++static int terminal_fifo_open(const char *fifo_path, int flags)
++{
++	int fd = -1;
++
++	fd = lxc_open(fifo_path, flags, 0);
++	if (fd < 0) {
++		WARN("Failed to open fifo %s to send message: %s.", fifo_path,
++		     strerror(errno));
++		return -1;
++	}
++
++	return fd;
++}
++
++static bool fifo_exists(const char *path)
++{
++	struct stat sb;
++	int ret;
++
++	ret = stat(path, &sb);
++	if (ret < 0)
++		// could be something other than eexist, just say no
++		return false;
++	return S_ISFIFO(sb.st_mode);
++}
++
++/* isulad: set terminal fifos */
++static int lxc_terminal_set_fifo(struct lxc_terminal *console, const char *in, const char *out, const char *err, int *input_fd)
++{
++	int fifofd_in = -1, fifofd_out = -1, fifofd_err = -1;
++	struct lxc_fifos_fd *fifo_elem = NULL;
++
++	if ((in && !fifo_exists(in)) || (out && !fifo_exists(out)) || (err && !fifo_exists(err))) {
++		ERROR("File %s or %s or %s does not refer to a FIFO", in, out, err);
++		return -1;
++	}
++
++	if (in) {
++		fifofd_in = terminal_fifo_open(in, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
++		if (fifofd_in < 0) {
++			SYSERROR("Failed to open FIFO: %s", in);
++			return -1;
++		}
++	}
++
++	if (out) {
++		fifofd_out = terminal_fifo_open(out, O_WRONLY | O_NONBLOCK | O_CLOEXEC);
++		if (fifofd_out < 0) {
++			SYSERROR("Failed to open FIFO: %s", out);
++			if (fifofd_in >= 0)
++				close(fifofd_in);
++			return -1;
++		}
++	}
++
++	if (err) {
++		fifofd_err = terminal_fifo_open(err, O_WRONLY | O_NONBLOCK | O_CLOEXEC);
++		if (fifofd_err < 0) {
++			SYSERROR("Failed to open FIFO: %s", err);
++			if (fifofd_in >= 0)
++				close(fifofd_in);
++			if (fifofd_out >= 0)
++				close(fifofd_out);
++			return -1;
++		}
++	}
++
++	fifo_elem = malloc(sizeof(*fifo_elem));
++	if (fifo_elem == NULL) {
++		if (fifofd_in >= 0)
++			close(fifofd_in);
++		if (fifofd_out >= 0)
++			close(fifofd_out);
++		if (fifofd_err >= 0)
++			close(fifofd_err);
++		return -1;
++	}
++	memset(fifo_elem, 0, sizeof(*fifo_elem));
++
++	fifo_elem->in_fifo = safe_strdup(in ? in : "");
++	fifo_elem->out_fifo = safe_strdup(out ? out : "");
++	fifo_elem->err_fifo = safe_strdup(err ? err : "");
++	fifo_elem->in_fd = fifofd_in;
++	fifo_elem->out_fd = fifofd_out;
++	fifo_elem->err_fd = fifofd_err;
++	lxc_list_add_elem(&fifo_elem->node, fifo_elem);
++	lxc_list_add_tail(&console->fifos, &fifo_elem->node);
++
++	if (input_fd)
++		*input_fd = fifofd_in;
++
++	return 0;
++}
++
++/* isulad: add default fifos */
++static int lxc_terminal_fifo_default(struct lxc_terminal *terminal)
++{
++	if (terminal->init_fifo0 || terminal->init_fifo1 || terminal->init_fifo2)
++		return lxc_terminal_set_fifo(terminal, terminal->init_fifo0, terminal->init_fifo1, terminal->init_fifo2, NULL);
++	return 0;
++}
++
++/* isulad: add fifos dynamic*/
++int lxc_terminal_add_fifos(struct lxc_conf *conf, const char *fifonames)
++{
++	int ret = 0;
++	struct lxc_terminal *terminal = &conf->console;
++	int fifofd_in = -1;
++	char *tmp = NULL, *saveptr = NULL, *in = NULL, *out = NULL, *err = NULL;
++	const char *none_fifo_name = "none";
++
++	tmp = safe_strdup(fifonames);
++
++	in = strtok_r(tmp, "&&&&", &saveptr);
++	if (!in) {
++		ret = -1;
++		goto free_out;
++	}
++	if (strcmp(in, none_fifo_name) == 0)
++		in = NULL;
++
++	out = strtok_r(NULL, "&&&&",  &saveptr);
++	if (!out) {
++		ret = -1;
++		goto free_out;
++	}
++	if (strcmp(out, none_fifo_name) == 0)
++		out = NULL;
++
++	err = strtok_r(NULL, "&&&&",  &saveptr);
++	if (!err) {
++		ret = -1;
++		goto free_out;
++	}
++	if (strcmp(err, none_fifo_name) == 0)
++		err = NULL;
++
++	ret = lxc_terminal_set_fifo(terminal, in, out, err, &fifofd_in);
++	if (ret < 0) {
++		ERROR("Faild to set fifos to console config");
++		ret = -1;
++		goto free_out;
++	}
++
++	if (lxc_mainloop_add_handler(terminal->descr, fifofd_in,
++	                             lxc_terminal_io_cb, terminal)) {
++		ERROR("console fifo not added to mainloop");
++		lxc_terminal_delete_fifo(fifofd_in, &terminal->fifos);
++		ret = -1;
++		goto free_out;
++	}
++
++free_out:
++	if (tmp)
++		free(tmp);
++	return ret;
++}
++#endif
++
+ static int lxc_terminal_create_foreign(struct lxc_conf *conf, struct lxc_terminal *terminal)
+ {
+ 	int ret;
+@@ -923,6 +1450,15 @@ static int lxc_terminal_create_foreign(struct lxc_conf *conf, struct lxc_termina
+ 		goto err;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: make ptmx NONBLOCK */
++	ret = fd_nonblock(terminal->ptx);
++	if (ret < 0) {
++		SYSERROR("Failed to set O_NONBLOCK flag on terminal ptx");
++		goto err;
++	}
++#endif
++
+ 	ret = fd_cloexec(terminal->pty, true);
+ 	if (ret < 0) {
+ 		SYSERROR("Failed to set FD_CLOEXEC flag on terminal pty");
+@@ -1095,8 +1631,42 @@ static int lxc_terminal_create_native(const char *name, const char *lxcpath,
+ int lxc_terminal_create(const char *name, const char *lxcpath,
+ 			struct lxc_conf *conf, struct lxc_terminal *terminal)
+ {
++#ifndef HAVE_ISULAD
+ 	if (!lxc_terminal_create_native(name, lxcpath, terminal))
+ 		return 0;
++#else
++	/* isulad: open default fifos */
++	ret = lxc_terminal_fifo_default(terminal);
++	if (ret < 0) {
++		ERROR("Failed to allocate fifo terminal");
++		lxc_terminal_delete(terminal);
++		return -ENODEV;
++	}
++
++	if (terminal->disable_pty) {
++		/* isulad: create 3 pipes */
++		/* for stdin */
++		if (pipe2(terminal->pipes0, O_CLOEXEC)) {
++			ERROR("Failed to create stdin pipe");
++			lxc_terminal_delete(terminal);
++			return -ENODEV;
++		}
++
++		/* for stdout */
++		if (pipe2(terminal->pipes1, O_CLOEXEC)) {
++			ERROR("Failed to create stdout pipe");
++			lxc_terminal_delete(terminal);
++			return -ENODEV;
++		}
++		/* for stderr */
++		if (pipe2(terminal->pipes2, O_CLOEXEC)) {
++			ERROR("Failed to create stderr pipe");
++			lxc_terminal_delete(terminal);
++			return -ENODEV;
++		}
++		return 0;
++	}
++#endif
+ 
+ 	return lxc_terminal_create_foreign(conf, terminal);
+ }
+@@ -1113,6 +1683,19 @@ int lxc_terminal_setup(struct lxc_conf *conf)
+ 	if (ret < 0)
+ 		goto err;
+ 
++#ifdef HAVE_ISULAD
++	if (is_syslog(terminal->log_driver)) {
++		if (terminal->log_syslog_tag == NULL) {
++				terminal->log_syslog_tag = malloc(16 * sizeof(char));
++				(void)strlcpy(terminal->log_syslog_tag, conf->name, 16);
++		}
++		if (terminal->log_syslog_facility <= 0) {
++				terminal->log_syslog_facility = LOG_DAEMON;
++		}
++		openlog(terminal->log_syslog_tag, LOG_PID, terminal->log_syslog_facility);
++	}
++#endif
++
+ 	ret = lxc_terminal_create_log_file(terminal);
+ 	if (ret < 0)
+ 		goto err;
+@@ -1356,7 +1939,11 @@ int lxc_terminal_prepare_login(int fd)
+ 	if (ret < 0)
+ 		return -1;
+ 
++#ifdef HAVE_ISULAD
++	ret = set_stdfds(fd);
++#else
+ 	ret = lxc_terminal_set_stdfds(fd);
++#endif
+ 	if (ret < 0)
+ 		return -1;
+ 
+@@ -1384,6 +1971,19 @@ void lxc_terminal_init(struct lxc_terminal *terminal)
+ 	terminal->peer = -EBADF;
+ 	terminal->log_fd = -EBADF;
+ 	lxc_terminal_info_init(&terminal->proxy);
++
++#ifdef HAVE_ISULAD
++	terminal->init_fifo0 = NULL;
++	terminal->init_fifo1 = NULL;
++	terminal->init_fifo2 = NULL;
++	terminal->pipes00 = -1;
++	terminal->pipes01 = -1;
++	terminal->pipes10 = -1;
++	terminal->pipes11 = -1;
++	terminal->pipes20 = -1;
++	terminal->pipes21 = -1;
++	lxc_list_init(&terminal->fifos);
++#endif
+ }
+ 
+ void lxc_terminal_conf_free(struct lxc_terminal *terminal)
+@@ -1393,4 +1993,14 @@ void lxc_terminal_conf_free(struct lxc_terminal *terminal)
+ 	if (terminal->buffer_size > 0 && terminal->ringbuf.addr)
+ 		lxc_ringbuf_release(&terminal->ringbuf);
+ 	lxc_terminal_signal_fini(terminal);
++
++#ifdef HAVE_ISULAD
++	/*isulad: free console fifos */
++	free(terminal->init_fifo0);
++	free(terminal->init_fifo1);
++	free(terminal->init_fifo2);
++	lxc_terminal_delete_fifo(-1, &terminal->fifos);
++	free(terminal->log_driver);
++	free(terminal->log_syslog_tag);
++#endif
+ }
+diff --git a/src/lxc/terminal.h b/src/lxc/terminal.h
+index d8e0f5c..886b8f6 100644
+--- a/src/lxc/terminal.h
++++ b/src/lxc/terminal.h
+@@ -85,6 +85,17 @@ struct lxc_terminal {
+ 
+ 		/* whether the log file will be rotated */
+ 		unsigned int log_rotate;
++
++#ifdef HAVE_ISULAD
++		/* driver of log, support file and syslog */
++		char *log_driver;
++
++		/* syslog tag for every log */
++		char *log_syslog_tag;
++
++		/* syslog facility */
++		int log_syslog_facility;
++#endif
+ 	};
+ 
+ 	struct /* lxc_terminal_ringbuf */ {
+@@ -94,8 +105,29 @@ struct lxc_terminal {
+ 		/* the in-memory ringbuffer */
+ 		struct lxc_ringbuf ringbuf;
+ 	};
++
++#ifdef HAVE_ISULAD
++	char *init_fifo3; /* isulad: default fifos for the start */
++	struct lxc_list fifos; /* isulad: fifos used to forward teminal */
++	bool disable_pty;
++	bool open_stdin;
++	int pipes32; /* isulad: pipes for dup to container fds of stdin,stdout,stderr on daemonize mode*/
++#endif
+ };
+ 
++#ifdef HAVE_ISULAD
++/* isulad: fifo struct */
++struct lxc_fifos_fd {
++	char *in_fifo;
++	char *out_fifo;
++	char *err_fifo;
++	int in_fd;
++	int out_fd;
++	int err_fd;
++	struct lxc_list node;
++};
++#endif
++
+ /**
+  * lxc_terminal_allocate: allocate the console or a tty
+  *
+@@ -265,4 +297,9 @@ static inline bool wants_console(const struct lxc_terminal *terminal)
+ 	return !terminal->path || !strequal(terminal->path, "none");
+ }
+ 
++#ifdef HAVE_ISULAD
++__hidden extern int lxc_terminal_add_fifos(struct lxc_conf *conf, const char *fifonames);
++__hidden extern int lxc_set_terminal_winsz(struct lxc_terminal *terminal, unsigned int height, unsigned int width);
++#endif
++
+ #endif /* __LXC_TERMINAL_H */
+diff --git a/src/lxc/tools/lxc_ls.c b/src/lxc/tools/lxc_ls.c
+index 23bee59..86a453d 100644
+--- a/src/lxc/tools/lxc_ls.c
++++ b/src/lxc/tools/lxc_ls.c
+@@ -104,7 +104,11 @@ struct wrapargs {
+ /*
+  * Takes struct wrapargs as argument.
+  */
++#ifdef HAVE_ISULAD
++static int ls_get_wrapper(void *wrap, int msgfd);
++#else
+ static int ls_get_wrapper(void *wrap);
++#endif
+ 
+ /*
+  * To calculate swap usage we should not simply check memory.usage_in_bytes and
+@@ -999,7 +1003,11 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
+ 	return 0;
+ }
+ 
++#ifdef HAVE_ISULAD
++static int ls_get_wrapper(void *wrap, int msgfd);
++#else
+ static int ls_get_wrapper(void *wrap)
++#endif
+ {
+ 	int ret = -1;
+ 	size_t len = 0;
+diff --git a/src/lxc/utils.c b/src/lxc/utils.c
+index d3d82e2..25cb0d1 100644
+--- a/src/lxc/utils.c
++++ b/src/lxc/utils.c
+@@ -1021,7 +1021,11 @@ static int open_if_safe(int dirfd, const char *nextpath)
+  *
+  * Return an open fd for the path, or <0 on error.
+  */
++#ifdef HAVE_ISULAD
++int open_without_symlink(const char *target, const char *prefix_skip)
++#else
+ static int open_without_symlink(const char *target, const char *prefix_skip)
++#endif
+ {
+ 	int curlen = 0, dirfd, fulllen, i;
+ 	char *dup;
+@@ -1151,6 +1155,65 @@ int safe_mount_beneath_at(int beneath_fd, const char *src, const char *dst, cons
+ 	return __safe_mount_beneath_at(beneath_fd, src, dst, fstype, flags, data);
+ }
+ 
++#ifdef HAVE_ISULAD
++static int format_mount_label(const char *data, const char *mount_label, char **mnt_opts)
++{
++	int ret = 0;
++
++	if (mount_label != NULL) {
++		if (data != NULL) {
++			ret = asprintf(mnt_opts, "%s,context=\"%s\"", data, mount_label);
++		} else {
++			ret = asprintf(mnt_opts, "context=\"%s\"", mount_label);
++		}
++
++		return ret < 0 ? -1 : 0;
++	}
++
++	*mnt_opts = data != NULL ? strdup(data) : NULL;
++	return 0;
++}
++
++static int receive_mount_options(const char *data, const char *mount_label,
++    const char *fstype, char **mnt_opts)
++{
++	// SELinux kernels don't support labeling of /proc or /sys
++	if (fstype != NULL && (strcmp(fstype, "proc") == 0 || strcmp(fstype, "sysfs") == 0)) {
++		return format_mount_label(data, NULL, mnt_opts);
++	}
++
++	return format_mount_label(data, mount_label, mnt_opts);
++}
++
++static int relabel_bind_mount_source(const char *src, const char *fstype, const char *data, const char *mount_label)
++{
++	__do_free_string_list char **parts = NULL;
++	ssize_t parts_len;
++	ssize_t i;
++
++	if (data == NULL) {
++		return lsm_relabel(src, mount_label, false);
++	}
++
++	parts = lxc_string_split(data, ',');
++	if (parts == NULL) {
++		return -1;
++	}
++
++	parts_len = lxc_array_len((void **)parts);
++	for (i = 0; i < parts_len; i++) {
++		if (strcmp(partsi, "z") == 0) {
++			return lsm_relabel(src, mount_label, true);
++		} else if (strcmp(partsi, "Z") == 0) {
++			return lsm_relabel(src, mount_label, false);
++		}
++	}
++
++	return lsm_relabel(src, mount_label, false);
++}
++
++#endif
++
+ /*
+  * Safely mount a path into a container, ensuring that the mount target
+  * is under the container's @rootfs.  (If @rootfs is NULL, then the container
+@@ -1159,14 +1222,22 @@ int safe_mount_beneath_at(int beneath_fd, const char *src, const char *dst, cons
+  * CAVEAT: This function must not be used for other purposes than container
+  * setup before executing the container's init
+  */
++#ifdef HAVE_ISULAD
++int safe_mount(const char *src, const char *dest, const char *fstype,
++		unsigned long flags, const void *data, const char *rootfs, const char *mount_label)
++#else
+ int safe_mount(const char *src, const char *dest, const char *fstype,
+ 		unsigned long flags, const void *data, const char *rootfs)
++#endif
+ {
+ 	int destfd, ret, saved_errno;
+ 	/* Only needs enough for /proc/self/fd/<fd>. */
+ 	char srcbuf50, destbuf50;
+ 	int srcfd = -1;
+ 	const char *mntsrc = src;
++#ifdef HAVE_ISULAD
++  __do_free char *mnt_opts = NULL;
++#endif
+ 
+ 	if (!rootfs)
+ 		rootfs = "";
+@@ -1209,8 +1280,23 @@ int safe_mount(const char *src, const char *dest, const char *fstype,
+ 		return -EINVAL;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	if (receive_mount_options(data, mount_label, fstype, &mnt_opts) != 0) {
++		ERROR("Failed to receive mount options");
++		return -EINVAL;
++	}
++
++	ret = mount(mntsrc, destbuf, fstype, flags, mnt_opts);
++	saved_errno = errno;
++	if (ret < 0 && fstype != NULL && strcmp(fstype, "mqueue") == 0) {
++		INFO("older kernels don't support labeling of /dev/mqueue, retry without selinux context");
++		ret = mount(mntsrc, destbuf, fstype, flags, data);
++		saved_errno = errno;
++	}
++#else
+ 	ret = mount(mntsrc, destbuf, fstype, flags, data);
+ 	saved_errno = errno;
++#endif
+ 	if (srcfd != -1)
+ 		close(srcfd);
+ 
+@@ -1221,6 +1307,18 @@ int safe_mount(const char *src, const char *dest, const char *fstype,
+ 		return ret;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	if (fstype != NULL && strcmp(fstype, "mqueue") == 0 && lsm_file_label_set(dest, mount_label) != 0) {
++		ERROR("Failed to set file label on %s", dest);
++		return -EINVAL;
++	}
++
++	if (fstype != NULL && strcmp(fstype, "bind") == 0 &&
++		    relabel_bind_mount_source(src, fstype, (const char *)data, mount_label) != 0) {
++		ERROR("Failed to reabel %s with %s", src, mount_label);
++		return -EINVAL;
++	}
++#endif
+ 	return 0;
+ }
+ 
+@@ -1442,6 +1540,11 @@ static int lxc_get_unused_loop_dev(char *name_loop)
+ {
+ 	int loop_nr, ret;
+ 	int fd_ctl = -1, fd_tmp = -1;
++#ifdef HAVE_ISULAD
++	// isulad: retry and try mknod
++	int max_retry = 200;
++	bool try_mknod = true;
++#endif
+ 
+ 	fd_ctl = open("/dev/loop-control", O_RDWR | O_CLOEXEC);
+ 	if (fd_ctl < 0) {
+@@ -1459,6 +1562,39 @@ static int lxc_get_unused_loop_dev(char *name_loop)
+ 	if (ret < 0)
+ 		goto on_error;
+ 
++#ifdef HAVE_ISULAD
++	while (max_retry > 0) {
++		max_retry--;
++		fd_tmp = open(name_loop, O_RDWR | O_CLOEXEC);
++		if (fd_tmp > 0) {
++			goto on_error;
++		}
++		/* Success of LOOP_CTL_GET_FREE doesn't mean /dev/loop$i is ready,
++		* we try to make node by ourself to avoid wait. */
++		if (try_mknod) {
++			/* Do not check result of mknod because LOOP_CTL_GET_FREE
++			* alse do mknod, so this mknod may fail as node already
++			* exist. If we can open the node without error, we can
++			* say that it's be created successfully.
++			*
++			* note: 7 is the major device number of loopback devices
++			*	 in kernel.
++			*/
++			mknod(name_loop, S_IFBLK | 0640, makedev(7, loop_nr));
++			try_mknod = false;
++			continue;
++		}
++		/* we need to wait some time to make sure it's ready for open if
++		* it can't open even if we have already try to make node by ourself. */
++		if (max_retry > 1) {
++			usleep(5000); /* 5 millisecond */
++			continue;
++		}
++		SYSERROR("Failed to open loop \"%s\"", name_loop);
++		// try more once for android
++		break;
++	}
++#endif
+ 	fd_tmp = open(name_loop, O_RDWR | O_CLOEXEC);
+ 	if (fd_tmp < 0) {
+ 		/* on Android loop devices are moved under /dev/block, give it a shot */
+@@ -1678,6 +1814,7 @@ uint64_t lxc_find_next_power2(uint64_t n)
+ 	return n;
+ }
+ 
++#ifndef HAVE_ISULAD
+ static int process_dead(/* takes */ int status_fd)
+ {
+ 	__do_close int dupfd = -EBADF;
+@@ -1715,15 +1852,20 @@ static int process_dead(/* takes */ int status_fd)
+ 
+ 	return ret;
+ }
++#endif
+ 
+ int lxc_set_death_signal(int signal, pid_t parent, int parent_status_fd)
+ {
+ 	int ret;
++#ifndef HAVE_ISULAD
+ 	pid_t ppid;
++#endif
+ 
+ 	ret = prctl(PR_SET_PDEATHSIG, prctl_arg(signal), prctl_arg(0),
+ 		    prctl_arg(0), prctl_arg(0));
+ 
++#ifndef HAVE_ISULAD
++	// isulad: delete this check, ppid will not be 0 if we shared host pid
+ 	/* verify that we haven't been orphaned in the meantime */
+ 	ppid = (pid_t)syscall(SYS_getppid);
+ 	if (ppid == 0) { /* parent outside our pidns */
+@@ -1735,6 +1877,7 @@ int lxc_set_death_signal(int signal, pid_t parent, int parent_status_fd)
+ 	} else if (ppid != parent) {
+ 		return raise(SIGKILL);
+ 	}
++#endif
+ 
+ 	if (ret < 0)
+ 		return -1;
+diff --git a/src/lxc/utils.h b/src/lxc/utils.h
+index 87feeed..0d326c0 100644
+--- a/src/lxc/utils.h
++++ b/src/lxc/utils.h
+@@ -140,8 +140,15 @@ __hidden extern char *on_path(const char *cmd, const char *rootfs);
+ __hidden extern char *choose_init(const char *rootfs);
+ __hidden extern bool switch_to_ns(pid_t pid, const char *ns);
+ __hidden extern char *get_template_path(const char *t);
++#ifdef HAVE_ISULAD
++__hidden extern int open_without_symlink(const char *target, const char *prefix_skip);
++__hidden extern int safe_mount(const char *src, const char *dest, const char *fstype,
++		      unsigned long flags, const void *data,
++		      const char *rootfs, const char *mount_label);
++#else
+ __hidden extern int safe_mount(const char *src, const char *dest, const char *fstype,
+ 			       unsigned long flags, const void *data, const char *rootfs);
++#endif
+ __hidden extern int open_devnull(void);
+ __hidden extern int set_stdfds(int fd);
+ __hidden extern int null_stdfds(void);
+diff --git a/src/tests/attach.c b/src/tests/attach.c
+index b695df3..a6698f5 100644
+--- a/src/tests/attach.c
++++ b/src/tests/attach.c
+@@ -31,6 +31,9 @@
+ #include "lxctest.h"
+ #include "utils.h"
+ #include "lsm/lsm.h"
++#ifdef HAVE_ISULAD
++#include "config.h"
++#endif
+ 
+ #include <lxc/lxccontainer.h>
+ 
+@@ -80,7 +83,11 @@ static void test_attach_lsm_set_config(struct lxc_container *ct)
+ 	ct->save_config(ct, NULL);
+ }
+ 
++#ifdef HAVE_ISULAD
++static int test_attach_lsm_func_func(void* payload, int fd)
++#else
+ static int test_attach_lsm_func_func(void* payload)
++#endif
+ {
+ 	TSTOUT("%s", lsm_ops->process_label_get(lsm_ops, syscall(SYS_getpid)));
+ 	return 0;
+@@ -191,7 +198,11 @@ static int  test_attach_lsm_func(struct lxc_container *ct) { return 0; }
+ static int  test_attach_lsm_cmd(struct lxc_container *ct) { return 0; }
+ #endif /* HAVE_APPARMOR || HAVE_SELINUX */
+ 
++#ifdef HAVE_ISULAD
++static int test_attach_func_func(void* payload, int fd)
++#else
+ static int test_attach_func_func(void* payload)
++#endif
+ {
+ 	TSTOUT("%d", (int)syscall(SYS_getpid));
+ 	return 0;
+-- 
+2.25.1
+

_service:tar_scm:0003-refactor-patch-code-of-isulad-for-selinux-attach.patch Deleted

@@ -1,1243 +0,0 @@
-From 44dd71a4d76eb464b81890ea3cfa2ac9c6c3d990 Mon Sep 17 00:00:00 2001
-From: haozi007 <liuhao27@huawei.com>
-Date: Tue, 19 Jul 2022 14:40:59 +0800
-Subject: PATCH refactor patch code of isulad for selinux/attach
-
-Signed-off-by: haozi007 <liuhao27@huawei.com>
----
- src/lxc/exec_commands.c    | 471 +++++++++++++++++++++++++++++++++++++
- src/lxc/lsm/selinux.c      | 258 ++++++++++++++++++++
- src/lxc/tools/lxc_attach.c | 413 +++++++++++++++++++++++++++++++-
- 3 files changed, 1141 insertions(+), 1 deletion(-)
- create mode 100644 src/lxc/exec_commands.c
-
-diff --git a/src/lxc/exec_commands.c b/src/lxc/exec_commands.c
-new file mode 100644
-index 0000000..50246fa
---- /dev/null
-+++ b/src/lxc/exec_commands.c
-@@ -0,0 +1,471 @@
-+/******************************************************************************
-+ * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved.
-+ * Author: lifeng
-+ * Create: 2019-12-08
-+ * Description: provide container definition
-+ * lxc: linux Container library
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+  ******************************************************************************/
-+
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE 1
-+#endif
-+#include <caps.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <malloc.h>
-+#include <poll.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <sys/param.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+#include <unistd.h>
-+
-+#include "af_unix.h"
-+#include "cgroup.h"
-+#include "exec_commands.h"
-+#include "commands_utils.h"
-+#include "conf.h"
-+#include "config.h"
-+#include "confile.h"
-+#include "log.h"
-+#include "lxc.h"
-+#include "lxclock.h"
-+#include "mainloop.h"
-+#include "monitor.h"
-+#include "terminal.h"
-+#include "utils.h"
-+
-+lxc_log_define(commands_exec, lxc);
-+
-+static const char *lxc_exec_cmd_str(lxc_exec_cmd_t cmd)
-+{
-+	static const char *const cmdnameLXC_EXEC_CMD_MAX = {
-+		LXC_EXEC_CMD_SET_TERMINAL_WINCH  = "set_exec_terminal_winch",
-+	};
-+
-+	if (cmd >= LXC_EXEC_CMD_MAX)
-+		return "Invalid request";
-+
-+	return cmdnamecmd;
-+}
-+
-+static int lxc_exec_cmd_rsp_recv(int sock, struct lxc_exec_cmd_rr *cmd)
-+{
-+	int ret, rspfd;
-+	struct lxc_exec_cmd_rsp *rsp = &cmd->rsp;
-+
-+	ret = lxc_abstract_unix_recv_fds_timeout(sock, &rspfd, 1, rsp, sizeof(*rsp), 1000 * 1000);
-+	if (ret < 0) {
-+		SYSERROR("Failed to receive response for command \"%s\"",
-+		        lxc_exec_cmd_str(cmd->req.cmd));
-+
-+		if (errno == ECONNRESET || errno == EAGAIN || errno == EWOULDBLOCK) {
-+			errno = ECONNRESET; /*isulad set errno ECONNRESET when timeout */
-+			return -1;
-+		}
-+
-+		return -1;
-+	}
-+	TRACE("Command \"%s\" received response", lxc_exec_cmd_str(cmd->req.cmd));
-+
-+	if (rsp->datalen == 0) {
-+		DEBUG("Response data length for command \"%s\" is 0",
-+		      lxc_exec_cmd_str(cmd->req.cmd));
-+		return ret;
-+	}
-+
-+	if (rsp->datalen > LXC_CMD_DATA_MAX) {
-+		ERROR("Response data for command \"%s\" is too long: %d bytes > %d",
-+		      lxc_exec_cmd_str(cmd->req.cmd), rsp->datalen, LXC_CMD_DATA_MAX);
-+		return -1;
-+	}
-+
-+	rsp->data = malloc(rsp->datalen);
-+	if (!rsp->data) {
-+		errno = ENOMEM;
-+		ERROR("Failed to allocate response buffer for command \"%s\"",
-+		      lxc_exec_cmd_str(cmd->req.cmd));
-+		return -1;
-+	}
-+
-+	ret = lxc_recv_nointr(sock, rsp->data, rsp->datalen, 0);
-+	if (ret != rsp->datalen) {
-+		SYSERROR("Failed to receive response data for command \"%s\"",
-+		         lxc_exec_cmd_str(cmd->req.cmd));
-+		return -1;
-+	}
-+
-+	return ret;
-+}
-+
-+static int lxc_exec_cmd_rsp_send(int fd, struct lxc_exec_cmd_rsp *rsp)
-+{
-+	ssize_t ret;
-+
-+	errno = EMSGSIZE;
-+	ret = lxc_send_nointr(fd, rsp, sizeof(*rsp), MSG_NOSIGNAL);
-+	if (ret < 0 || (size_t)ret != sizeof(*rsp)) {
-+		SYSERROR("Failed to send command response %zd", ret);
-+		return -1;
-+	}
-+
-+	if (!rsp->data || rsp->datalen <= 0)
-+		return 0;
-+
-+	errno = EMSGSIZE;
-+	ret = lxc_send_nointr(fd, rsp->data, rsp->datalen, MSG_NOSIGNAL);
-+	if (ret < 0 || ret != (ssize_t)rsp->datalen) {
-+		SYSWARN("Failed to send command response data %zd", ret);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int lxc_exec_cmd_send(const char *name, struct lxc_exec_cmd_rr *cmd,
-+			const char *lxcpath, const char *hashed_sock_name, const char *suffix)
-+{
-+	int client_fd, saved_errno;
-+	ssize_t ret = -1;
-+
-+	client_fd = lxc_cmd_connect(name, lxcpath, hashed_sock_name, suffix);
-+	if (client_fd < 0)
-+		return -1;
-+
-+	ret = lxc_abstract_unix_send_credential(client_fd, &cmd->req,
-+						sizeof(cmd->req));
-+	if (ret < 0 || (size_t)ret != sizeof(cmd->req))
-+		goto on_error;
-+
-+	if (cmd->req.datalen <= 0)
-+		return client_fd;
-+
-+	errno = EMSGSIZE;
-+	ret = lxc_send_nointr(client_fd, (void *)cmd->req.data,
-+			      cmd->req.datalen, MSG_NOSIGNAL);
-+	if (ret < 0 || ret != (ssize_t)cmd->req.datalen)
-+		goto on_error;
-+
-+	return client_fd;
-+
-+on_error:
-+	saved_errno = errno;
-+	close(client_fd);
-+	errno = saved_errno;
-+
-+	return -1;
-+}
-+
-+static int lxc_exec_cmd(const char *name, struct lxc_exec_cmd_rr *cmd, const char *lxcpath, const char *hashed_sock_name, const char *suffix)
-+{
-+	int client_fd = -1;
-+	int saved_errno;
-+	int ret = -1;
-+
-+	client_fd = lxc_exec_cmd_send(name, cmd, lxcpath, hashed_sock_name, suffix);
-+	if (client_fd < 0) {
-+		SYSTRACE("Command \"%s\" failed to connect command socket",
-+		         lxc_exec_cmd_str(cmd->req.cmd));
-+		return -1;
-+	}
-+
-+	ret = lxc_exec_cmd_rsp_recv(client_fd, cmd);
-+
-+	saved_errno = errno;
-+	close(client_fd);
-+	errno = saved_errno;
-+	return ret;
-+}
-+
-+int lxc_exec_cmd_set_terminal_winch(const char *name, const char *lxcpath, const char *suffix, unsigned int height, unsigned int width)
-+{
-+	int ret = 0;
-+	struct lxc_exec_cmd_set_terminal_winch_request data = { 0 };
-+
-+	data.height = height;
-+	data.width = width;
-+
-+	struct lxc_exec_cmd_rr cmd = {
-+		.req = {
-+			.cmd = LXC_EXEC_CMD_SET_TERMINAL_WINCH,
-+			.datalen = sizeof(struct lxc_exec_cmd_set_terminal_winch_request),
-+			.data = &data,
-+		},
-+	};
-+
-+	ret = lxc_exec_cmd(name, &cmd, lxcpath, NULL, suffix);
-+	if (ret < 0) {
-+		ERROR("Failed to send command to container");
-+		return -1;
-+	}
-+
-+	if (cmd.rsp.ret != 0) {
-+		ERROR("Command response error:%d", cmd.rsp.ret);
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static int lxc_exec_cmd_set_terminal_winch_callback(int fd, struct lxc_exec_cmd_req *req,
-+					struct lxc_exec_command_handler *handler)
-+{
-+	struct lxc_exec_cmd_rsp rsp;
-+	struct lxc_exec_cmd_set_terminal_winch_request *data = (struct lxc_exec_cmd_set_terminal_winch_request *)(req->data);
-+	memset(&rsp, 0, sizeof(rsp));
-+
-+	rsp.ret = lxc_set_terminal_winsz(handler->terminal, data->height, data->width);;
-+
-+	return lxc_exec_cmd_rsp_send(fd, &rsp);
-+
-+}
-+
-+static int lxc_exec_cmd_process(int fd, struct lxc_exec_cmd_req *req,
-+			   struct lxc_exec_command_handler *handler)
-+{
-+	typedef int (*callback)(int, struct lxc_exec_cmd_req *, struct lxc_exec_command_handler *);
-+
-+	callback cbLXC_EXEC_CMD_MAX = {
-+		LXC_EXEC_CMD_SET_TERMINAL_WINCH  = lxc_exec_cmd_set_terminal_winch_callback,
-+	};
-+
-+	if (req->cmd >= LXC_EXEC_CMD_MAX) {
-+		ERROR("Undefined command id %d", req->cmd);
-+		return -1;
-+	}
-+	return cbreq->cmd(fd, req, handler);
-+}
-+
-+static void lxc_exec_cmd_fd_cleanup(int fd, struct lxc_epoll_descr *descr)
-+{
-+	lxc_mainloop_del_handler(descr, fd);
-+	close(fd);
-+	return;
-+}
-+
-+static int lxc_exec_cmd_handler(int fd, uint32_t events, void *data,
-+			   struct lxc_epoll_descr *descr)
-+{
-+	int ret;
-+	struct lxc_exec_cmd_req req;
-+	void *reqdata = NULL;
-+	struct lxc_exec_command_handler *handler = data;
-+
-+	ret = lxc_abstract_unix_rcv_credential(fd, &req, sizeof(req));
-+	if (ret < 0) {
-+		SYSERROR("Failed to receive data on command socket for command "
-+		         "\"%s\"", lxc_exec_cmd_str(req.cmd));
-+
-+		if (errno == EACCES) {
-+			/* We don't care for the peer, just send and close. */
-+			struct lxc_exec_cmd_rsp rsp = {.ret = ret};
-+
-+			lxc_exec_cmd_rsp_send(fd, &rsp);
-+		}
-+
-+		goto out_close;
-+	}
-+
-+	if (ret == 0)
-+		goto out_close;
-+
-+	if (ret != sizeof(req)) {
-+		WARN("Failed to receive full command request. Ignoring request "
-+		     "for \"%s\"", lxc_exec_cmd_str(req.cmd));
-+		ret = -1;
-+		goto out_close;
-+	}
-+
-+	if (req.datalen > LXC_CMD_DATA_MAX) {
-+		ERROR("Received command data length %d is too large for "
-+		      "command \"%s\"", req.datalen, lxc_exec_cmd_str(req.cmd));
-+		errno = EFBIG;
-+		ret = -EFBIG;
-+		goto out_close;
-+	}
-+
-+	if (req.datalen > 0) {
-+		reqdata = alloca(req.datalen);
-+		if (!reqdata) {
-+			ERROR("Failed to allocate memory for \"%s\" command",
-+			      lxc_exec_cmd_str(req.cmd));
-+			errno = ENOMEM;
-+			ret = -ENOMEM;
-+			goto out_close;
-+		}
-+
-+		ret = lxc_recv_nointr(fd, reqdata, req.datalen, 0);
-+		if (ret != req.datalen) {
-+			WARN("Failed to receive full command request. Ignoring "
-+			     "request for \"%s\"", lxc_exec_cmd_str(req.cmd));
-+			ret = LXC_MAINLOOP_ERROR;
-+			goto out_close;
-+		}
-+
-+		req.data = reqdata;
-+	}
-+
-+	ret = lxc_exec_cmd_process(fd, &req, handler);
-+	if (ret) {
-+		/* This is not an error, but only a request to close fd. */
-+		ret = LXC_MAINLOOP_CONTINUE;
-+		goto out_close;
-+	}
-+
-+out:
-+	return ret;
-+
-+out_close:
-+	lxc_exec_cmd_fd_cleanup(fd, descr);
-+	goto out;
-+}
-+
-+static int lxc_exec_cmd_accept(int fd, uint32_t events, void *data,
-+			  struct lxc_epoll_descr *descr)
-+{
-+	int connection = -1;
-+	int opt = 1, ret = -1;
-+
-+	connection = accept(fd, NULL, 0);
-+	if (connection < 0) {
-+		SYSERROR("Failed to accept connection to run command");
-+		return LXC_MAINLOOP_ERROR;
-+	}
-+
-+	ret = fcntl(connection, F_SETFD, FD_CLOEXEC);
-+	if (ret < 0) {
-+		SYSERROR("Failed to set close-on-exec on incoming command connection");
-+		goto out_close;
-+	}
-+
-+	ret = setsockopt(connection, SOL_SOCKET, SO_PASSCRED, &opt, sizeof(opt));
-+	if (ret < 0) {
-+		SYSERROR("Failed to enable necessary credentials on command socket");
-+		goto out_close;
-+	}
-+
-+	ret = lxc_mainloop_add_handler(descr, connection, lxc_exec_cmd_handler, data);
-+	if (ret) {
-+		ERROR("Failed to add command handler");
-+		goto out_close;
-+	}
-+
-+out:
-+	return ret;
-+
-+out_close:
-+	close(connection);
-+	goto out;
-+}
-+#ifdef HAVE_ISULAD
-+int lxc_exec_unix_sock_delete(const char *name, const char *suffix)
-+{
-+	char pathLXC_AUDS_ADDR_LEN = {0};
-+
-+	if (name == NULL || suffix == NULL)
-+		return -1;
-+
-+	if (generate_named_unix_sock_path(name, suffix, path, sizeof(path)) != 0)
-+		return -1;
-+
-+	(void)unlink(path);
-+
-+	return 0;
-+}
-+
-+int lxc_exec_cmd_init(const char *name, const char *lxcpath, const char *suffix)
-+{
-+	__do_close int fd = -EBADF;
-+	int ret;
-+	char pathLXC_AUDS_ADDR_LEN = {0};
-+	__do_free char *exec_sock_dir = NULL;
-+
-+	exec_sock_dir = generate_named_unix_sock_dir(name);
-+	if (exec_sock_dir == NULL)
-+		return -1;
-+
-+	if (mkdir_p(exec_sock_dir, 0600) < 0)
-+		return log_error_errno(-1, errno, "Failed to create exec sock directory %s", path);
-+
-+	if (generate_named_unix_sock_path(name, suffix, path, sizeof(path)) != 0)
-+		return -1;
-+
-+	TRACE("Creating unix socket \"%s\"", path);
-+
-+	fd = lxc_named_unix_open(path, SOCK_STREAM, 0);
-+	if (fd < 0) {
-+		if (errno == EADDRINUSE) {
-+			WARN("Container \"%s\" exec unix sock is occupied", name);
-+			(void)unlink(path);
-+			fd = lxc_named_unix_open(path, SOCK_STREAM, 0);
-+			if (fd < 0)
-+				return log_error_errno(-1, errno, "Failed to create command socket %s", path);
-+		} else {
-+			return log_error_errno(-1, errno, "Failed to create command socket %s", path);
-+		}
-+	}
-+
-+	ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to set FD_CLOEXEC on command socket file descriptor");
-+
-+	return log_trace(move_fd(fd), "Created unix socket \"%s\"", path);
-+}
-+#else
-+int lxc_exec_cmd_init(const char *name, const char *lxcpath, const char *suffix)
-+{
-+	int fd, ret;
-+	char pathLXC_AUDS_ADDR_LEN = {0};
-+
-+	ret = lxc_make_abstract_socket_name(path, sizeof(path), name, lxcpath, NULL, suffix);
-+	if (ret < 0)
-+		return -1;
-+	TRACE("Creating abstract unix socket \"%s\"", &path1);
-+
-+	fd = lxc_abstract_unix_open(path, SOCK_STREAM, 0);
-+	if (fd < 0) {
-+		SYSERROR("Failed to create command socket %s", &path1);
-+		if (errno == EADDRINUSE)
-+			ERROR("Container \"%s\" appears to be already running", name);
-+
-+		return -1;
-+	}
-+
-+	ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
-+	if (ret < 0) {
-+		SYSERROR("Failed to set FD_CLOEXEC on command socket file descriptor");
-+		close(fd);
-+		return -1;
-+	}
-+
-+	return fd;
-+}
-+#endif
-+
-+int lxc_exec_cmd_mainloop_add(struct lxc_epoll_descr *descr, struct lxc_exec_command_handler *handler)
-+{
-+	int ret;
-+	int fd = handler->maincmd_fd;
-+
-+	ret = lxc_mainloop_add_handler(descr, fd, lxc_exec_cmd_accept, handler);
-+	if (ret < 0) {
-+		ERROR("Failed to add handler for command socket");
-+		close(fd);
-+	}
-+
-+	return ret;
-+}
-diff --git a/src/lxc/lsm/selinux.c b/src/lxc/lsm/selinux.c
-index dba0ab5..bd4f449 100644
---- a/src/lxc/lsm/selinux.c
-+++ b/src/lxc/lsm/selinux.c
-@@ -16,6 +16,10 @@
- #include "log.h"
- #include "lsm.h"
- 
-+#ifdef HAVE_ISULAD
-+#include <selinux/context.h>
-+#endif
-+
- #define DEFAULT_LABEL "unconfined_t"
- 
- lxc_log_define(selinux, lsm);
-@@ -85,6 +89,256 @@ static int selinux_process_label_set(const char *inlabel, struct lxc_conf *conf,
- 	return 0;
- }
- 
-+#ifdef HAVE_ISULAD
-+/*
-+ * selinux_file_label_set: Set SELinux context of a file
-+ *
-+ * @path    : a file
-+ * @label   : label string
-+ *
-+ * Returns 0 on success, < 0 on failure
-+ */
-+static int selinux_file_label_set(const char *path, const char *label)
-+{
-+	if (path == NULL || label == NULL || strcmp(label, "unconfined_t") == 0) {
-+		return 0;
-+	}
-+
-+	if (!is_selinux_enabled()) {
-+		return 0;
-+	}
-+
-+	if (lsetfilecon(path, label) != 0) {
-+		SYSERROR("Failed to setSELinux context to \"%s\": %s", label, path);
-+		return -1;
-+	}
-+
-+	INFO("Changed SELinux context to \"%s\": %s", label, path);
-+	return 0;
-+}
-+
-+/*
-+ * is_exclude_relabel_path: Determine whether it is a excluded path to label
-+ *
-+ * @path    : a file or directory
-+ *
-+ * Returns 0 on success, < 0 on failure
-+ */
-+static bool is_exclude_relabel_path(const char *path)
-+{
-+	const char *exclude_path = { "/", "/usr", "/etc", "/tmp", "/home", "/run", "/var", "/root" };
-+	size_t i;
-+
-+	for (i = 0; i < sizeof(exclude_path) / sizeof(char *); i++) {
-+		if (strcmp(path, exclude_pathi) == 0) {
-+			return true;
-+		}
-+	}
-+
-+	return false;
-+}
-+
-+/*
-+ * bad_prefix: Prevent users from relabing system files
-+ *
-+ * @path    : a file or directory
-+ *
-+ * Returns 0 on success, < 0 on failure
-+ */
-+static int bad_prefix(const char *fpath)
-+{
-+	const char *bad_prefixes = "/usr";
-+
-+	if (fpath == NULL) {
-+		ERROR("Empty file path");
-+		return -1;
-+	}
-+
-+	if (strncmp(fpath, bad_prefixes, strlen(bad_prefixes)) == 0) {
-+		ERROR("relabeling content in %s is not allowed", bad_prefixes);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * recurse_set_file_label: Recursively label files or folders
-+ *
-+ * @path    : a file or directory
-+ * @label   : label string
-+ *
-+ * Returns 0 on success, < 0 on failure
-+ */
-+static int recurse_set_file_label(const char *basePath, const char *label)
-+{
-+	int ret = 0;
-+	__do_closedir DIR *dir = NULL;
-+	struct dirent *ptr = NULL;
-+	char basePATH_MAX = { 0 };
-+
-+	if ((dir = opendir(basePath)) == NULL) {
-+		ERROR("Failed to Open dir: %s", basePath);
-+		return -1;
-+	}
-+
-+	ret = lsetfilecon(basePath, label);
-+	if (ret != 0) {
-+		ERROR("Failed to set file label");
-+		return ret;
-+	}
-+
-+	while ((ptr = readdir(dir)) != NULL) {
-+		if (strcmp(ptr->d_name, ".") == 0 || strcmp(ptr->d_name, "..") == 0) {
-+			continue;
-+		} else {
-+			int nret = snprintf(base, sizeof(base), "%s/%s", basePath, ptr->d_name);
-+			if (nret < 0 || nret >= sizeof(base)) {
-+				ERROR("Failed to get path");
-+				return -1;
-+			}
-+			if (ptr->d_type == DT_DIR) {
-+				ret = recurse_set_file_label(base, label);
-+				if (ret != 0) {
-+					ERROR("Failed to set dir label");
-+					return ret;
-+				}
-+			} else {
-+				ret = lsetfilecon(base, label);
-+				if (ret != 0) {
-+					ERROR("Failed to set file label");
-+					return ret;
-+				}
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * selinux_chcon: Chcon changes the `fpath` file object to the SELinux label `label`.
-+ * If `fpath` is a directory and `recurse`` is true, Chcon will walk the
-+ * directory tree setting the label.
-+ *
-+ * @fpath   : a file or directory
-+ * @label   : label string
-+ * @recurse : whether to recurse
-+ *
-+ * Returns 0 on success, < 0 on failure
-+ */
-+static int selinux_chcon(const char *fpath, const char *label, bool recurse)
-+{
-+	struct stat s_buf;
-+
-+	if (fpath == NULL || label == NULL) {
-+		ERROR("Invalid parameters!");
-+		return -1;
-+	}
-+
-+	if (bad_prefix(fpath) != 0) {
-+		return -1;
-+	}
-+	if (stat(fpath, &s_buf) != 0) {
-+		return -1;
-+	}
-+	if (recurse && S_ISDIR(s_buf.st_mode)) {
-+		return recurse_set_file_label(fpath, label);
-+	}
-+
-+	if (lsetfilecon(fpath, label) != 0) {
-+		ERROR("Failed to set file label");
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * convert_context_to_share_mode: set sensitivity to s0 and remove categories
-+ * user:role:type:sensitivity:categories => user:role:type:s0
-+ *
-+ * @label   : label string
-+ *
-+ * Returns label with share mode on success, NULL on failure
-+ */
-+static char *convert_context_to_share_mode(const char *label) {
-+	__do_free char *converted_label = strdup(label);
-+	char *s = converted_label;
-+	const char *shared_level = "s0";
-+	int cnt = 0;
-+
-+	// selinux label format: user:role:type:sensitivity:categories
-+	// locates the ":" position in front of the sensitivity
-+	while (cnt++ < 3 && (s = strchr(s, ':')) != NULL) {
-+		s++;
-+	}
-+
-+	// make sure sensitivity can set s0 value
-+	if (s == NULL || strlen(s) < strlen(shared_level)) {
-+		ERROR("Invalid selinux file context: %s", label);
-+		return NULL;
-+	}
-+
-+	if (strcmp(s, shared_level) == 0) {
-+		return move_ptr(converted_label);
-+	}
-+
-+	*s = '\0';
-+	strcat(converted_label, shared_level);
-+
-+	return move_ptr(converted_label);
-+}
-+
-+/*
-+ * selinux_relabel: Relabel changes the label of path to the filelabel string.
-+ * It changes the MCS label to s0 if shared is true.
-+ * This will allow all containers to share the content.
-+ *
-+ * @path    : a file or directory
-+ * @label   : label string
-+ * @shared  : whether to use share mode
-+ *
-+ * Returns 0 on success, < 0 on failure
-+ */
-+static int selinux_relabel(const char *path, const char *label, bool shared)
-+{
-+	__do_free char *tmp_file_label = NULL;
-+
-+	if (path == NULL || label == NULL) {
-+		return 0;
-+	}
-+
-+	if (!is_selinux_enabled()) {
-+		return 0;
-+	}
-+
-+	if (is_exclude_relabel_path(path)) {
-+		ERROR("SELinux relabeling of %s is not allowed", path);
-+		return -1;
-+	}
-+
-+	if (shared) {
-+		tmp_file_label = convert_context_to_share_mode(label);
-+		if (tmp_file_label == NULL) {
-+			ERROR("Failed to convert context to share mode: %s", label);
-+			return -1;
-+		}
-+	} else {
-+		tmp_file_label = strdup(label);
-+	}
-+
-+
-+	if (selinux_chcon(path, tmp_file_label, true) != 0) {
-+		ERROR("Failed to modify %s's selinux context: %s", path, tmp_file_label);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+#endif
-+
- /*
-  * selinux_keyring_label_set: Set SELinux context that will be assigned to the keyring
-  *
-@@ -103,6 +357,10 @@ static struct lsm_drv selinux_drv = {
- 	.process_label_get = selinux_process_label_get,
- 	.process_label_set = selinux_process_label_set,
- 	.keyring_label_set = selinux_keyring_label_set,
-+#ifdef HAVE_ISULAD
-+	.file_label_set    = selinux_file_label_set,
-+	.relabel           = selinux_relabel,
-+#endif
- };
- 
- struct lsm_drv *lsm_selinux_drv_init(void)
-diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
-index a8f493a..1a5a241 100644
---- a/src/lxc/tools/lxc_attach.c
-+++ b/src/lxc/tools/lxc_attach.c
-@@ -72,8 +72,20 @@ static const struct option my_longopts = {
- 	{"set-var", required_argument, 0, 'v'},
- 	{"pty-log", required_argument, 0, 'L'},
- 	{"rcfile", required_argument, 0, 'f'},
-+#ifndef HAVE_ISULAD
- 	{"uid", required_argument, 0, 'u'},
- 	{"gid", required_argument, 0, 'g'},
-+#else
-+	{"workdir", required_argument, 0, 'w'},
-+	{"user", required_argument, 0, 'u'},
-+	{"in-fifo", required_argument, 0, OPT_INPUT_FIFO}, /* isulad add terminal fifos*/
-+	{"out-fifo", required_argument, 0, OPT_OUTPUT_FIFO},
-+	{"err-fifo", required_argument, 0, OPT_STDERR_FIFO},
-+	{"suffix", required_argument, 0, OPT_ATTACH_SUFFIX},
-+	{"timeout", required_argument, 0, OPT_ATTACH_TIMEOUT},
-+	{"disable-pty", no_argument, 0, OPT_DISABLE_PTY},
-+	{"open-stdin", no_argument, 0, OPT_OPEN_STDIN},
-+#endif
- 	LXC_COMMON_OPTIONS
- };
- 
-@@ -124,9 +136,26 @@ Options :\n\
-                     multiple times.\n\
-   -f, --rcfile=FILE\n\
-                     Load configuration file FILE\n\
-+"
-+#ifndef HAVE_ISULAD
-+"\
-   -u, --uid=UID     Execute COMMAND with UID inside the container\n\
-   -g, --gid=GID     Execute COMMAND with GID inside the container\n\
--",
-+"
-+#else
-+"\
-+  -w, --workdir     Working directory inside the container.\n\
-+  -u, --user        User ID (format: UID:GID)\n\
-+      --in-fifo     Stdin fifo path\n\
-+      --out-fifo    Stdout fifo path\n\
-+      --err-fifo    Stderr fifo path\n\
-+      --suffi       ID for mutli-attach on one container\n\
-+      --timeout     Timeout in seconds (default: 0)\n\
-+      --disable-pty Disable pty for attach\n\
-+      --open-stdin  Open stdin for attach\n\
-+"
-+#endif
-+,
- 	.options      = my_longopts,
- 	.parser       = my_parser,
- 	.checker      = NULL,
-@@ -136,6 +165,71 @@ Options :\n\
- 	.gid          = LXC_INVALID_GID,
- };
- 
-+#ifdef HAVE_ISULAD
-+static int parse_user_id(const char *username, char **uid, char **gid, char **tmp_dup)
-+{
-+	char *tmp = NULL;
-+	char *pdot = NULL;
-+
-+	if (uid == NULL || gid == NULL || tmp_dup == NULL) {
-+		return -1;
-+	}
-+
-+	if (username != NULL) {
-+		tmp = strdup(username);
-+		if (tmp == NULL) {
-+			ERROR("Failed to duplicate user name");
-+			return -1;
-+		}
-+
-+		// for free tmp in caller
-+		*tmp_dup = tmp;
-+		pdot = strstr(tmp, ":");
-+		if (pdot != NULL) {
-+			*pdot = '\0';
-+			if (pdot != tmp) {
-+				// uid found
-+				*uid = tmp;
-+			}
-+
-+			if (*(pdot + 1) != '\0') {
-+				// gid found
-+				*gid = pdot + 1;
-+			}
-+		} else {
-+			// No : found
-+			if (*tmp != '\0') {
-+				*uid = tmp;
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int get_attach_uid_gid(const char *username, uid_t *user_id, gid_t *group_id)
-+{
-+	char *tmp = NULL;
-+	char *uid = NULL;
-+	char *gid = NULL;
-+
-+	// parse uid and gid by username
-+	if (parse_user_id(username, &uid, &gid, &tmp) != 0) {
-+		return -1;
-+	}
-+
-+	if (uid != NULL) {
-+		*user_id = (unsigned int)atoll(uid);
-+	}
-+	if (gid != NULL) {
-+		*group_id = (unsigned int)atoll(gid);
-+	}
-+
-+	free(tmp);
-+	return 0;
-+}
-+#endif
-+
- static int my_parser(struct lxc_arguments *args, int c, char *arg)
- {
- 	int ret;
-@@ -193,6 +287,7 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
- 	case 'f':
- 		args->rcfile = arg;
- 		break;
-+#ifndef HAVE_ISULAD
- 	case 'u':
- 		if (lxc_safe_uint(arg, &args->uid) < 0)
- 			return -1;
-@@ -201,6 +296,42 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
- 		if (lxc_safe_uint(arg, &args->gid) < 0)
- 			return -1;
- 		break;
-+#else
-+	case 'u':
-+		if (get_attach_uid_gid(arg, &args->uid, &args->gid) != 0) {
-+			ERROR("Failed to get attach user U/GID");
-+			return -1;
-+		}
-+		break;
-+	case 'w':
-+		args->workdir=arg;
-+		break;
-+	case OPT_INPUT_FIFO:
-+		args->terminal_fifos0 = arg;
-+		break;
-+	case OPT_OUTPUT_FIFO:
-+		args->terminal_fifos1 = arg;
-+		break;
-+	case OPT_STDERR_FIFO:
-+		args->terminal_fifos2 = arg;
-+		break;
-+	case OPT_ATTACH_SUFFIX:
-+		args->suffix = arg;
-+		break;
-+	case OPT_ATTACH_TIMEOUT:
-+		if(!is_non_negative_num(arg)) {
-+			ERROR("Error attach timeout parameter:%s.\n", arg);
-+			return -1;
-+		}
-+		args->attach_timeout = (unsigned int)atoll(arg);
-+		break;
-+	case OPT_DISABLE_PTY:
-+		args->disable_pty = 1;
-+		break;
-+	case OPT_OPEN_STDIN:
-+		args->open_stdin = 1;
-+		break;
-+#endif
- 	}
- 
- 	return 0;
-@@ -264,6 +395,285 @@ static int lxc_attach_create_log_file(const char *log_file)
- 	return fd;
- }
- 
-+#ifdef HAVE_ISULAD
-+// isulad: send '128 + signal' if container is killed by signal.
-+#define EXIT_SIGNAL_OFFSET 128
-+
-+/*isulad: attach with terminal*/
-+static int do_attach_foreground(struct lxc_container *c, lxc_attach_command_t *command,
-+				lxc_attach_options_t *attach_options,
-+				char **errmsg)
-+{
-+	int ret = 0;
-+	pid_t pid;
-+	int wexit = -1;
-+	int signal;
-+
-+	if (command->program)
-+		ret = c->attach(c, lxc_attach_run_command, command, attach_options, &pid);
-+	else
-+		ret = c->attach(c, lxc_attach_run_shell, NULL, attach_options, &pid);
-+	if (ret < 0) {
-+		*errmsg = safe_strdup("Internal error, failed to call attach");
-+		goto out;
-+	}
-+
-+	ret = lxc_wait_for_pid_status(pid);
-+	if (ret < 0) {
-+		free(*errmsg);
-+		*errmsg = safe_strdup("Internal error, failed to wait attached process");
-+		goto out;
-+	}
-+
-+	if (WIFEXITED(ret))
-+		wexit = WEXITSTATUS(ret);
-+	else
-+		wexit = -1;
-+
-+	if (WIFSIGNALED(ret)) {
-+		signal = WTERMSIG(ret);
-+		wexit = EXIT_SIGNAL_OFFSET + signal;
-+	}
-+
-+	WARN("Execd pid %d exit with %d", pid, wexit);
-+
-+out:
-+	if (c->lxc_conf->errmsg) {
-+		free(*errmsg);
-+		*errmsg = safe_strdup(c->lxc_conf->errmsg);
-+	}
-+	return wexit;
-+}
-+
-+static void close_msg_pipe(int *errpipe)
-+{
-+	if (errpipe0 >= 0) {
-+		close(errpipe0);
-+		errpipe0 = -1;
-+	}
-+	if (errpipe1 >= 0) {
-+		close(errpipe1);
-+		errpipe1 = -1;
-+	}
-+}
-+
-+/*isulad: attach without terminal in background */
-+static int do_attach_background(struct lxc_container *c, lxc_attach_command_t *command,
-+				lxc_attach_options_t *attach_options,
-+				char **errmsg)
-+{
-+	int ret = 0;
-+	int msgpipe2;
-+	pid_t pid = 0;
-+	ssize_t size_read;
-+	char msgbufBUFSIZ + 1 = {0};
-+
-+	//pipdfd for get error message of child or grandchild process.
-+	if (pipe2(msgpipe, O_CLOEXEC) != 0) {
-+		SYSERROR("Failed to init msgpipe");
-+		return -1;
-+	}
-+
-+	pid = fork();
-+	if (pid < 0) {
-+		close_msg_pipe(msgpipe);
-+		return -1;
-+	}
-+
-+	if (pid != 0) {
-+		close(msgpipe1);
-+		msgpipe1 = -1;
-+		size_read = read(msgpipe0, msgbuf, BUFSIZ);
-+		if (size_read > 0) {
-+			*errmsg = safe_strdup(msgbuf);
-+			ret = -1;
-+		}
-+
-+		close(msgpipe0);
-+		msgpipe0 = -1;
-+
-+		return ret;
-+	}
-+
-+	/* second fork to be reparented by init */
-+	pid = fork();
-+	if (pid < 0) {
-+		SYSERROR("Error doing dual-fork");
-+		close_msg_pipe(msgpipe);
-+		exit(1);
-+	}
-+	if (pid != 0) {
-+		close_msg_pipe(msgpipe);
-+		exit(0);
-+	}
-+
-+	close(msgpipe0);
-+	msgpipe0 = -1;
-+
-+	if (null_stdfds() < 0) {
-+		ERROR("failed to close fds");
-+		exit(1);
-+	}
-+	setsid();
-+
-+	if (command->program)
-+		ret = c->attach(c, lxc_attach_run_command, command, attach_options, &pid);
-+	else
-+		ret = c->attach(c, lxc_attach_run_shell, NULL, attach_options, &pid);
-+	if (ret < 0) {
-+		if (c->lxc_conf->errmsg)
-+			lxc_write_error_message(msgpipe1, "%s", c->lxc_conf->errmsg);
-+		else
-+			lxc_write_error_message(msgpipe1, "Failed to attach container");
-+		close(msgpipe1);
-+		msgpipe1 = -1;
-+		ret = -1;
-+		goto out;
-+	}
-+
-+	close(msgpipe1);
-+	msgpipe1 = -1;
-+
-+	ret = wait_for_pid(pid);
-+out:
-+	lxc_container_put(c);
-+	if (ret)
-+		exit(EXIT_FAILURE);
-+	else
-+		exit(0);
-+}
-+
-+int main(int argc, char *argv)
-+{
-+	int wexit = 0;
-+	struct lxc_log log;
-+	char *errmsg = NULL;
-+	lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT;
-+	lxc_attach_command_t command = (lxc_attach_command_t){.program = NULL};
-+
-+	if (lxc_caps_init())
-+		exit(EXIT_FAILURE);
-+
-+	if (lxc_arguments_parse(&my_args, argc, argv))
-+		exit(EXIT_FAILURE);
-+
-+	log.name = my_args.name;
-+	log.file = my_args.log_file;
-+	log.level = my_args.log_priority;
-+	log.prefix = my_args.progname;
-+	log.quiet = my_args.quiet;
-+	log.lxcpath = my_args.lxcpath0;
-+
-+	if (lxc_log_init(&log))
-+		exit(EXIT_FAILURE);
-+
-+	if (geteuid())
-+		if (access(my_args.lxcpath0, O_RDONLY) < 0) {
-+			ERROR("You lack access to %s", my_args.lxcpath0);
-+			exit(EXIT_FAILURE);
-+		}
-+
-+	struct lxc_container *c = lxc_container_new(my_args.name, my_args.lxcpath0);
-+	if (!c)
-+		exit(EXIT_FAILURE);
-+
-+	if (my_args.rcfile) {
-+		c->clear_config(c);
-+		if (!c->load_config(c, my_args.rcfile)) {
-+			ERROR("Failed to load rcfile");
-+			lxc_container_put(c);
-+			exit(EXIT_FAILURE);
-+		}
-+
-+		c->configfile = strdup(my_args.rcfile);
-+		if (!c->configfile) {
-+			ERROR("Out of memory setting new config filename");
-+			lxc_container_put(c);
-+			exit(EXIT_FAILURE);
-+		}
-+	}
-+
-+	if (!c->may_control(c)) {
-+		ERROR("Insufficent privileges to control %s", c->name);
-+		lxc_container_put(c);
-+		exit(EXIT_FAILURE);
-+	}
-+
-+	if (remount_sys_proc)
-+		attach_options.attach_flags |= LXC_ATTACH_REMOUNT_PROC_SYS;
-+
-+	if (elevated_privileges)
-+		attach_options.attach_flags &= ~(elevated_privileges);
-+
-+	if (my_args.terminal_fifos0 || my_args.terminal_fifos1 || my_args.terminal_fifos2) {
-+		attach_options.init_fifo0 = my_args.terminal_fifos0;
-+		attach_options.init_fifo1 = my_args.terminal_fifos1;
-+		attach_options.init_fifo2 = my_args.terminal_fifos2;
-+		attach_options.attach_flags |= LXC_ATTACH_TERMINAL;
-+	} else if (stdfd_is_pty()) {
-+		attach_options.attach_flags |= LXC_ATTACH_TERMINAL;
-+	}
-+
-+	attach_options.namespaces = namespace_flags;
-+	attach_options.personality = new_personality;
-+	attach_options.env_policy = env_policy;
-+	attach_options.extra_env_vars = extra_env;
-+	attach_options.extra_keep_env = extra_keep;
-+	attach_options.timeout = my_args.attach_timeout;
-+
-+	if (my_args.argc > 0) {
-+		command.program = my_args.argv0;
-+		command.argv = (char**)my_args.argv;
-+	}
-+
-+	if (my_args.console_log) {
-+		attach_options.log_fd = lxc_attach_create_log_file(my_args.console_log);
-+		if (attach_options.log_fd < 0) {
-+			ERROR("Failed to create log file for %s", c->name);
-+			lxc_container_put(c);
-+			exit(EXIT_FAILURE);
-+		}
-+	}
-+
-+	if (my_args.uid != LXC_INVALID_UID)
-+		attach_options.uid = my_args.uid;
-+
-+	if (my_args.gid != LXC_INVALID_GID)
-+		attach_options.gid = my_args.gid;
-+
-+	attach_options.suffix = my_args.suffix;
-+
-+	if (my_args.disable_pty) {
-+		attach_options.disable_pty = true;
-+	}
-+
-+	if (my_args.open_stdin) {
-+		attach_options.open_stdin = true;
-+	}
-+
-+	if (my_args.workdir) {
-+		attach_options.initial_cwd = my_args.workdir;
-+	}
-+
-+	/* isulad: add do attach background */
-+	if (attach_options.attach_flags & LXC_ATTACH_TERMINAL)
-+		wexit = do_attach_foreground(c, &command, &attach_options, &errmsg);
-+	else
-+		wexit = do_attach_background(c, &command, &attach_options, &errmsg);
-+
-+	if (errmsg) {
-+		fprintf(stderr, "%s:%s:%s:%d starting container process caused \"%s\"", c->name,
-+		__FILE__, __func__, __LINE__, errmsg);
-+		free(errmsg);
-+	}
-+
-+	lxc_container_put(c);
-+	if (wexit >= 0)
-+		exit(wexit);
-+
-+	exit(EXIT_FAILURE);
-+}
-+#else
- int main(int argc, char *argv)
- {
- 	int ret = -1;
-@@ -377,3 +787,4 @@ out:
- 
- 	exit(EXIT_FAILURE);
- }
-+#endif
--- 
-2.25.1
-

_service:tar_scm:0004-iSulad-adapt-confile-lxccontainer-and-start.patch Added

@@ -0,0 +1,3310 @@
+From 3e7fb35a35cff34be2bb7ace0b239d540fe0657f Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Wed, 26 Jul 2023 14:57:33 +0800
+Subject: PATCH iSulad adapt confile lxccontainer and start
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ src/lxc/conf.c         |  11 -
+ src/lxc/conf.h         |   4 -
+ src/lxc/confile.c      | 558 +++++++++++++++++++++++++
+ src/lxc/lxccontainer.c | 899 +++++++++++++++++++++++++++++++++++++++-
+ src/lxc/lxccontainer.h | 197 +++++++++
+ src/lxc/start.c        | 902 +++++++++++++++++++++++++++++++++++++++++
+ src/lxc/start.h        |  18 +
+ 7 files changed, 2573 insertions(+), 16 deletions(-)
+
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index a0e0375..187e60e 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -5242,7 +5242,6 @@ void lxc_conf_free(struct lxc_conf *conf)
+ 	}
+ 	free(conf->systemd);
+ 	lxc_clear_init_args(conf);
+-	lxc_clear_init_groups(conf);
+ 	lxc_clear_populate_devices(conf);
+ 	lxc_clear_rootfs_masked_paths(conf);
+ 	lxc_clear_rootfs_ro_paths(conf);
+@@ -7427,16 +7426,6 @@ int lxc_clear_init_args(struct lxc_conf *lxc_conf)
+ 	return 0;
+ }
+ 
+-/*isulad clear init groups*/
+-int lxc_clear_init_groups(struct lxc_conf *lxc_conf)
+-{
+-	free(lxc_conf->init_groups);
+-	lxc_conf->init_groups = NULL;
+-	lxc_conf->init_groups_len = 0;
+-
+-	return 0;
+-}
+-
+ /*isulad: clear populate devices*/
+ int lxc_clear_populate_devices(struct lxc_conf *c)
+ {
+diff --git a/src/lxc/conf.h b/src/lxc/conf.h
+index 683b8ba..108e05b 100644
+--- a/src/lxc/conf.h
++++ b/src/lxc/conf.h
+@@ -622,9 +622,6 @@ struct lxc_conf {
+ 	char **init_argv;
+ 	size_t init_argc;
+ 
+-	gid_t *init_groups;
+-	size_t init_groups_len;
+-
+ 	/* populate devices */
+ 	struct lxc_list populate_devs;
+ 	mode_t umask;  // umask value
+@@ -794,7 +791,6 @@ __hidden extern int parse_cap(const char *cap_name, __u32 *cap);
+ #ifdef HAVE_ISULAD
+ // isulad add
+ __hidden int lxc_clear_init_args(struct lxc_conf *lxc_conf);
+-__hidden int lxc_clear_init_groups(struct lxc_conf *lxc_conf);
+ __hidden int lxc_clear_populate_devices(struct lxc_conf *c);
+ __hidden int lxc_clear_rootfs_masked_paths(struct lxc_conf *c);
+ __hidden int lxc_clear_rootfs_ro_paths(struct lxc_conf *c);
+diff --git a/src/lxc/confile.c b/src/lxc/confile.c
+index 7966d32..1492776 100644
+--- a/src/lxc/confile.c
++++ b/src/lxc/confile.c
+@@ -157,6 +157,18 @@ lxc_config_define(uts_name);
+ lxc_config_define(sysctl);
+ lxc_config_define(proc);
+ lxc_config_define(sched_core);
++#ifdef HAVE_ISULAD
++lxc_config_define(init_args);
++lxc_config_define(populate_device);
++lxc_config_define(umask);
++lxc_config_define(rootfs_masked_paths);
++lxc_config_define(rootfs_ro_paths);
++lxc_config_define(systemd);
++lxc_config_define(console_log_driver);
++lxc_config_define(console_syslog_tag);
++lxc_config_define(console_syslog_facility);
++lxc_config_define(selinux_mount_context);
++#endif
+ 
+ static int set_config_unsupported_key(const char *key, const char *value,
+ 				      struct lxc_conf *lxc_conf, void *data)
+@@ -274,6 +286,18 @@ static struct lxc_config_t config_jump_table = {
+ 	{ "lxc.uts.name",                   true,  set_config_uts_name,                   get_config_uts_name,                   clr_config_uts_name,                   },
+ 	{ "lxc.sysctl",                     false, set_config_sysctl,                     get_config_sysctl,                     clr_config_sysctl,                     },
+ 	{ "lxc.proc",                       false, set_config_proc,                       get_config_proc,                       clr_config_proc,                       },
++#ifdef HAVE_ISULAD
++	{ "lxc.isulad.init.args",          set_config_init_args,                   get_config_init_args,                   clr_config_init_args,                 },
++	{ "lxc.isulad.populate.device",    set_config_populate_device,             get_config_populate_device,             clr_config_populate_device,           },
++	{ "lxc.isulad.umask",              set_config_umask,                       get_config_umask,                       clr_config_umask,                     },
++	{ "lxc.isulad.rootfs.maskedpaths", set_config_rootfs_masked_paths,         get_config_rootfs_masked_paths,         clr_config_rootfs_masked_paths,       },
++	{ "lxc.isulad.rootfs.ropaths",     set_config_rootfs_ro_paths,             get_config_rootfs_ro_paths,             clr_config_rootfs_ro_paths,           },
++	{ "lxc.isulad.systemd",            set_config_systemd,                     get_config_systemd,                     clr_config_systemd,                   },
++	{ "lxc.console.logdriver",         set_config_console_log_driver,          get_config_console_log_driver,          clr_config_console_log_driver,        },
++	{ "lxc.console.syslog_tag",        set_config_console_syslog_tag,          get_config_console_syslog_tag,          clr_config_console_syslog_tag,        },
++	{ "lxc.console.syslog_facility",   set_config_console_syslog_facility,     get_config_console_syslog_facility,     clr_config_console_syslog_facility,   },
++	{ "lxc.selinux.mount_context",     set_config_selinux_mount_context,       get_config_selinux_mount_context,       clr_config_selinux_mount_context,     },
++#endif
+ };
+ 
+ static struct lxc_config_t unsupported_config_key = {
+@@ -1588,7 +1612,12 @@ static int set_config_environment(const char *key, const char *value,
+ 	if (!new_env)
+ 		return ret_errno(ENOMEM);
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: recover space replaced by SPACE_MAGIC_STR */
++	dup = lxc_string_replace(SPACE_MAGIC_STR, " ", value);
++#else
+ 	dup = strdup(value);
++#endif
+ 	if (!dup)
+ 		return ret_errno(ENOMEM);
+ 
+@@ -2558,8 +2587,11 @@ static int set_config_console_rotate(const char *key, const char *value,
+ 	if (ret)
+ 		return ret_errno(EINVAL);
+ 
++#ifndef HAVE_ISULAD
++	/* isulad: support rotate muti-files */
+ 	if (lxc_conf->console.log_rotate > 1)
+ 		return log_error_errno(-EINVAL, EINVAL, "The \"lxc.console.rotate\" config key can only be set to 0 or 1");
++#endif
+ 
+ 	return 0;
+ }
+@@ -3049,6 +3081,54 @@ struct parse_line_conf {
+ 	bool from_include;
+ };
+ 
++#ifdef HAVE_ISULAD
++// escape_string_decode compress some escape characters
++static char *escape_string_decode(const char *src)
++{
++	size_t src_end = 0;
++	size_t dst_end = 0;
++	size_t len = 0;
++	char *dst = NULL;
++
++	if (src == NULL) {
++		return NULL;
++	}
++
++	len = strlen(src);
++	if (len == 0) {
++		return NULL;
++	}
++
++	dst = calloc(1, len + 1);
++	if (dst == NULL) {
++		ERROR("Out of memory");
++		return NULL;
++	}
++
++	while(src_end < len) {
++		if (srcsrc_end == '\\') {
++			switch (src++src_end)
++			{
++				case 'r': dstdst_end = '\r'; break;
++				case 'n': dstdst_end = '\n'; break;
++				case 'f': dstdst_end = '\f'; break;
++				case 'b': dstdst_end = '\b'; break;
++				case 't': dstdst_end = '\t'; break;
++				case '\\': dstdst_end = '\\'; break;
++				// default do not decode
++				default: dstdst_end++ = '\\'; dstdst_end = srcsrc_end; break;
++			}
++		} else {
++			dstdst_end = srcsrc_end;
++		}
++		dst_end++;
++		src_end++;
++	}
++
++	return dst;
++}
++#endif
++
+ static int parse_line(char *buffer, void *data)
+ {
+ 	__do_free char *linep = NULL;
+@@ -3058,6 +3138,9 @@ static int parse_line(char *buffer, void *data)
+ 	int ret;
+ 	char *dup = buffer;
+ 	struct parse_line_conf *plc = data;
++#ifdef HAVE_ISULAD
++	__do_free char *value_decode = NULL;
++#endif
+ 
+ 	if (!plc->conf)
+ 		return syserror_set(-EINVAL, "Missing config");
+@@ -3118,7 +3201,15 @@ static int parse_line(char *buffer, void *data)
+ 	}
+ 
+ 	config = lxc_get_config(key);
++#ifdef HAVE_ISULAD
++	value_decode = escape_string_decode(value);
++	if (value_decode == NULL) {
++		ERROR("Value %s decode failed", value);
++	}
++	ret = config->set(key, value_decode ? value_decode: value, plc->conf, NULL);
++#else
+ 	return config->set(key, value, plc->conf, NULL);
++#endif
+ }
+ 
+ static struct new_config_item *parse_new_conf_line(char *buffer)
+@@ -3222,6 +3313,12 @@ bool lxc_config_define_load(struct lxc_list *defines, struct lxc_container *c)
+ 
+ 	lxc_list_for_each(it, defines) {
+ 		struct new_config_item *new_item = it->elem;
++#ifdef HAVE_ISULAD
++		if (strcmp(new_item->key, LXC_IMAGE_OCI_KEY) == 0) {
++			c->set_oci_type(c, true);
++			continue;
++		}
++#endif
+ 		bret = c->set_config_item(c, new_item->key, new_item->val);
+ 		if (!bret)
+ 			break;
+@@ -6764,3 +6861,464 @@ static int clr_config_sched_core(const char *key, struct lxc_conf *c, void *data
+ 	c->sched_core = false;
+ 	return 0;
+ }
++
++
++#ifdef HAVE_ISULAD
++/* isulad: set config for init args */
++static int set_config_init_args(const char *key, const char *value,
++				 struct lxc_conf *lxc_conf, void *data)
++{
++	int ret = 0;
++	char **tmp = NULL;
++	char *new_value = NULL;
++
++	ret = set_config_string_item(&new_value, value);
++	if (ret || !new_value)
++		return ret;
++
++	tmp = (char **)realloc(lxc_conf->init_argv, (lxc_conf->init_argc + 1) * sizeof(char *));
++	if (!tmp) {
++		ERROR("Out of memory");
++		free(new_value);
++		return -1;
++	}
++
++	lxc_conf->init_argv = tmp;
++
++	lxc_conf->init_argvlxc_conf->init_argc = new_value;
++	lxc_conf->init_argc++;
++
++	return 0;
++}
++
++/* isulad: get config init args */
++static int get_config_init_args(const char *key, char *retv, int inlen,
++				  struct lxc_conf *c, void *data)
++{
++	int i, len, fulllen = 0;
++
++	if (!retv)
++		inlen = 0;
++	else
++		memset(retv, 0, inlen);
++
++	for (i = 0; i < c->init_argc; i++) {
++           strprint(retv, inlen, "%s", c->init_argvi);
++    }
++
++	return fulllen;
++}
++
++/* isulad: clr config init args*/
++static inline int clr_config_init_args(const char *key, struct lxc_conf *c,
++				   void *data)
++{
++	return lxc_clear_init_args(c);
++}
++
++/* isulad: set config for populate device */
++static int set_config_populate_device(const char *key, const char *value,
++                                      struct lxc_conf *lxc_conf, void *data)
++{
++	int ret = 0, major = 0, minor = 0;
++	uid_t uid = (uid_t)-1;
++	gid_t gid = (gid_t)-1;
++	char name4096 = {0}; /* MAX dev path name */
++	char type3 = {0};
++	char *replace_value = NULL;
++	mode_t filemode = 0;
++	struct lxc_list *iter = NULL;
++	struct lxc_list *dev_list = NULL;
++	struct lxc_populate_devs *dev_elem = NULL;
++
++	if (lxc_config_value_empty(value))
++		return lxc_clear_populate_devices(lxc_conf);
++
++	/* lxc.populate.device = PATH_IN_CONTAINER:DEVICETYPE:MAJOR:MINOR:MODE:UID:GID
++	 * For e.g. lxc.populate.device = /dev/sda:b:8:0:0666:0:0
++	 */
++	ret = sscanf(value, "%4095^::%2^::%i:%i:%i:%u:%u", name, type, &major, &minor, &filemode, &uid, &gid);
++	if (ret != 7)
++		return -1;
++
++	/* find existing list element */
++	lxc_list_for_each(iter, &lxc_conf->populate_devs) {
++		dev_elem = iter->elem;
++
++		if (strcmp(name, dev_elem->name) != 0)
++			continue;
++
++		replace_value = safe_strdup(type);
++
++		free(dev_elem->type);
++		dev_elem->type = replace_value;
++		dev_elem->file_mode = filemode;
++		dev_elem->maj = major;
++		dev_elem->min = minor;
++		dev_elem->uid = (uid_t)uid;
++		dev_elem->gid = (gid_t)gid;
++		return 0;
++	}
++
++	/* allocate list element */
++	dev_list = malloc(sizeof(*dev_list));
++	if (dev_list == NULL)
++		goto on_error;
++
++	lxc_list_init(dev_list);
++
++	dev_elem = malloc(sizeof(*dev_elem));
++	if (dev_elem == NULL)
++		goto on_error;
++	memset(dev_elem, 0, sizeof(*dev_elem));
++
++	dev_elem->name = safe_strdup(name);
++
++	dev_elem->type = safe_strdup(type);
++
++	dev_elem->file_mode = filemode;
++	dev_elem->maj = major;
++	dev_elem->min = minor;
++	dev_elem->uid = (uid_t)uid;
++	dev_elem->gid = (gid_t)gid;
++
++	lxc_list_add_elem(dev_list, dev_elem);
++
++	lxc_list_add_tail(&lxc_conf->populate_devs, dev_list);
++
++	return 0;
++
++on_error:
++	free(dev_list);
++	if (dev_elem) {
++		free(dev_elem->name);
++		free(dev_elem->type);
++		free(dev_elem);
++	}
++	return -1;
++}
++
++/* isulad: get config populate device
++ * If you ask for 'lxc.populate.device', then all populate device
++ * entries will be printed, in 'lxc.populate.device = path_in_container:type:major:minor:mode:uid:gid' format.
++ * For e.g. lxc.populate.device = /dev/sda:b:8:0:0666:0:0
++ */
++static int get_config_populate_device(const char *key, char *retv, int inlen,
++                                      struct lxc_conf *c, void *data)
++{
++	int len;
++	struct lxc_list *it = NULL;
++	int fulllen = 0;
++
++	if (!retv)
++		inlen = 0;
++	else
++		memset(retv, 0, inlen);
++
++	lxc_list_for_each(it, &c->populate_devs) {
++		struct lxc_populate_devs *elem = it->elem;
++		strprint(retv, inlen, "lxc.populate.device = %s:%s:%d:%d:%o:%u:%u\n",
++		         elem->name, elem->type, elem->maj,
++		         elem->min, elem->file_mode, elem->uid, elem->gid);
++	}
++
++	return fulllen;
++}
++
++/* isulad: clr config populate devices*/
++static inline int clr_config_populate_device(const char *key, struct lxc_conf *c,
++                void *data)
++{
++	return lxc_clear_populate_devices(c);
++}
++
++/* isulad: set config for umask */
++static int set_config_umask(const char *key, const char *value,
++			      struct lxc_conf *lxc_conf, void *data)
++{
++	if (lxc_config_value_empty(value)) {
++		ERROR("Empty umask");
++		return -1;
++	}
++
++	if (strcmp(value, "normal") == 0) {
++		lxc_conf->umask = 0022;
++		return 0;
++	} else if (strcmp(value, "secure") == 0) {
++		lxc_conf->umask = 0027;
++		return 0;
++	} else {
++		ERROR("Invalid native umask: %s", value);
++		return -1;
++	}
++}
++
++/* isulad add: get umask value*/
++static int get_config_umask(const char *key, char *retv, int inlen,
++			      struct lxc_conf *c, void *data)
++{
++	return lxc_get_conf_size_t(c, retv, inlen, c->umask);
++}
++
++/* isulad add: clear umask value */
++static inline int clr_config_umask(const char *key, struct lxc_conf *c,
++				     void *data)
++{
++	c->umask = 0027;
++	return 0;
++}
++
++/* isulad: set config for rootfs masked paths */
++static int set_config_rootfs_masked_paths(const char *key, const char *value,
++                struct lxc_conf *lxc_conf, void *data)
++{
++	struct lxc_list *list_item = NULL;
++
++	if (lxc_config_value_empty(value))
++		return lxc_clear_rootfs_masked_paths(lxc_conf);
++
++	list_item = malloc(sizeof(*list_item));
++	if (list_item == NULL)
++		goto on_error;
++
++	list_item->elem = safe_strdup(value);
++
++	lxc_list_add_tail(&lxc_conf->rootfs.maskedpaths, list_item);
++
++	return 0;
++
++on_error:
++	free(list_item);
++
++	return -1;
++}
++
++// isulad: get config rootfs masked paths
++static int get_config_rootfs_masked_paths(const char *key, char *retv, int inlen,
++                struct lxc_conf *c, void *data)
++{
++	int len, fulllen = 0;
++	struct lxc_list *it = NULL;
++
++	if (!retv)
++		inlen = 0;
++	else
++		memset(retv, 0, inlen);
++
++	lxc_list_for_each(it, &c->rootfs.maskedpaths) {
++		strprint(retv, inlen, "%s\n", (char *)it->elem);
++	}
++
++	return fulllen;
++}
++
++/* isulad: set config for rootfs ro paths */
++static int set_config_rootfs_ro_paths(const char *key, const char *value,
++                                      struct lxc_conf *lxc_conf, void *data)
++{
++	struct lxc_list *list_item = NULL;
++
++	if (lxc_config_value_empty(value))
++		return lxc_clear_rootfs_ro_paths(lxc_conf);
++
++	list_item = malloc(sizeof(*list_item));
++	if (list_item == NULL)
++		goto on_error;
++
++	list_item->elem = safe_strdup(value);
++
++	lxc_list_add_tail(&lxc_conf->rootfs.ropaths, list_item);
++
++	return 0;
++
++on_error:
++	free(list_item);
++
++	return -1;
++}
++
++// isulad: get config rootfs ro paths
++static int get_config_rootfs_ro_paths(const char *key, char *retv, int inlen,
++                                      struct lxc_conf *c, void *data)
++{
++	int len, fulllen = 0;
++	struct lxc_list *it = NULL;
++
++	if (!retv)
++		inlen = 0;
++	else
++		memset(retv, 0, inlen);
++
++	lxc_list_for_each(it, &c->rootfs.ropaths) {
++		strprint(retv, inlen, "%s\n", (char *)it->elem);
++	}
++
++	return fulllen;
++}
++
++/* isulad: clr config rootfs masked paths */
++static inline int clr_config_rootfs_masked_paths(const char *key, struct lxc_conf *c,
++                void *data)
++{
++	return lxc_clear_rootfs_masked_paths(c);
++}
++
++/* isulad: clr config rootfs ro paths */
++static inline int clr_config_rootfs_ro_paths(const char *key, struct lxc_conf *c,
++                void *data)
++{
++	return lxc_clear_rootfs_ro_paths(c);
++}
++
++/* isulad: set config for systemd */
++static int set_config_systemd(const char *key, const char *value,
++			      struct lxc_conf *lxc_conf, void *data)
++{
++	if (lxc_config_value_empty(value)) {
++		ERROR("Empty umask");
++		return -1;
++	}
++	lxc_conf->systemd = strdup(value);
++	return 0;
++}
++
++/* isulad add: get systemd value*/
++static int get_config_systemd(const char *key, char *retv, int inlen,
++			      struct lxc_conf *c, void *data)
++{
++	return lxc_get_conf_str(retv, inlen, c->systemd);
++}
++
++/* isulad add: clear systemd value */
++static inline int clr_config_systemd(const char *key, struct lxc_conf *c,
++				     void *data)
++{
++	free(c->systemd);
++	c->systemd = NULL;
++	return 0;
++}
++
++static int set_config_console_log_driver(const char *key, const char *value,
++        struct lxc_conf *lxc_conf, void *data)
++{
++	return set_config_string_item(&lxc_conf->console.log_driver, value);
++}
++
++static int set_config_console_syslog_tag(const char *key, const char *value,
++        struct lxc_conf *lxc_conf, void *data)
++{
++	if (value == NULL) {
++		return -1;
++	}
++	return set_config_string_item(&lxc_conf->console.log_syslog_tag, value);
++}
++
++static int parse_facility(const char *facility)
++{
++#define FACILITIES_LEN 20
++	const char *facility_keysFACILITIES_LEN = {
++		"kern", "user", "mail", "daemon", "auth",
++		"syslog", "lpr", "news", "uucp", "cron", "authpriv", "ftp",
++		"local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7"
++	};
++	const int facilitiesFACILITIES_LEN = {
++		LOG_KERN, LOG_USER, LOG_MAIL, LOG_DAEMON, LOG_AUTH, LOG_SYSLOG,
++		LOG_LPR, LOG_NEWS, LOG_UUCP, LOG_CRON, LOG_AUTHPRIV, LOG_FTP,
++		LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
++		LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7
++	};
++	int i = 0;
++
++	if (facility == NULL) {
++		return -1;
++	}
++
++	for (; i < FACILITIES_LEN; i++) {
++		if (strcmp(facility, facility_keysi) == 0) {
++			return facilitiesi;
++		}
++	}
++
++	return -1;
++}
++
++static int set_config_console_syslog_facility(const char *key, const char *value,
++        struct lxc_conf *lxc_conf, void *data)
++{
++	int facility;
++
++	facility = parse_facility(value);
++	if (facility < 0) {
++		NOTICE("Invalid facility: %s", value);
++		facility = LOG_DAEMON;
++	}
++
++	lxc_conf->console.log_syslog_facility = facility;
++	return 0;
++}
++
++static int set_config_selinux_mount_context(const char *key, const char *value,
++    struct lxc_conf *lxc_conf, void *data)
++{
++	if (value != NULL && strcmp(value, "unconfined_t") == 0) {
++		return set_config_string_item(&lxc_conf->lsm_se_mount_context, NULL);
++	}
++
++	return set_config_string_item(&lxc_conf->lsm_se_mount_context, value);
++}
++
++static int get_config_console_log_driver(const char *key, char *retv, int inlen,
++        struct lxc_conf *c, void *data)
++{
++	return lxc_get_conf_str(retv, inlen, c->console.log_driver);
++}
++
++static int get_config_console_syslog_tag(const char *key, char *retv, int inlen,
++        struct lxc_conf *c, void *data)
++{
++	return lxc_get_conf_str(retv, inlen, c->console.log_syslog_tag);
++}
++
++static int get_config_console_syslog_facility(const char *key, char *retv, int inlen,
++        struct lxc_conf *c, void *data)
++{
++	return lxc_get_conf_int(c, retv, inlen, c->console.log_syslog_facility);
++}
++
++static int get_config_selinux_mount_context(const char *key, char *retv, int inlen,
++    struct lxc_conf *c, void *data)
++{
++	return lxc_get_conf_str(retv, inlen, c->lsm_se_mount_context);
++}
++
++static inline int clr_config_console_log_driver(const char *key,
++                struct lxc_conf *c, void *data)
++{
++	free(c->console.log_driver);
++	c->console.log_driver = NULL;
++	return 0;
++}
++
++static inline int clr_config_console_syslog_tag(const char *key,
++                struct lxc_conf *c, void *data)
++{
++	free(c->console.log_syslog_tag);
++	c->console.log_syslog_tag= NULL;
++	return 0;
++}
++
++static inline int clr_config_console_syslog_facility(const char *key,
++                struct lxc_conf *c, void *data)
++{
++	c->console.log_syslog_facility = LOG_DAEMON;
++	return 0;
++}
++
++static inline int clr_config_selinux_mount_context(const char *key,
++    struct lxc_conf *c, void *data)
++{
++	free(c->lsm_se_mount_context);
++	c->lsm_se_mount_context = NULL;
++	return 0;
++}
++#endif
+diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
+index 8df6059..d4495f7 100644
+--- a/src/lxc/lxccontainer.c
++++ b/src/lxc/lxccontainer.c
+@@ -62,6 +62,10 @@
+ #include "utils.h"
+ #include "version.h"
+ 
++#ifdef HAVE_ISULAD
++#include "exec_commands.h"
++#endif
++
+ #if HAVE_OPENSSL
+ #include <openssl/evp.h>
+ #endif
+@@ -83,6 +87,11 @@
+ 
+ lxc_log_define(lxccontainer, lxc);
+ 
++#ifdef HAVE_ISULAD
++typedef bool (*func_is_io_stat_read)(const char *value);
++typedef bool (*func_is_io_stat_write)(const char *value);
++#endif
++
+ static bool do_lxcapi_destroy(struct lxc_container *c);
+ static const char *lxcapi_get_config_path(struct lxc_container *c);
+ #define do_lxcapi_get_config_path(c) lxcapi_get_config_path(c)
+@@ -272,6 +281,13 @@ static void lxc_container_free(struct lxc_container *c)
+ 	free(c->config_path);
+ 	c->config_path = NULL;
+ 
++#ifdef HAVE_ISULAD
++	free(c->exit_fifo);
++	c->exit_fifo = NULL;
++	free(c->ocihookfile);
++	c->ocihookfile = NULL;
++#endif
++
+ 	free(c);
+ }
+ 
+@@ -652,6 +668,66 @@ static bool load_config_locked(struct lxc_container *c, const char *fname)
+ 	return true;
+ }
+ 
++#ifdef HAVE_ISULAD
++static bool load_ocihooks_locked(struct lxc_container *c)
++{
++	parser_error err = NULL;
++	oci_runtime_spec_hooks *hooks = NULL;
++
++	if (!c->lxc_conf)
++		c->lxc_conf = lxc_conf_init();
++
++	if (!c->lxc_conf)
++		return false;
++
++	hooks = oci_runtime_spec_hooks_parse_file(c->ocihookfile, NULL, &err);
++	if (!hooks) {
++		fprintf(stderr, "parse oci hooks config failed: %s\n", err);
++		free(err);
++		return true;
++	}
++	c->lxc_conf->ocihooks = hooks;
++
++	if (err)
++		free(err);
++	return true;
++}
++
++/*
++ * isulad: set oci hook file path
++ * */
++static bool set_oci_hook_config_filename(struct lxc_container *c)
++{
++#define OCI_HOOK_JSON_FILE_NAME "ocihooks.json"
++	char *newpath = NULL;
++	int len, ret;
++
++	if (!c->config_path)
++		return false;
++
++	/* $lxc_path + "/" + c->name + "/" + "config" + '\0' */
++	if (strlen(c->config_path) + strlen(c->name) > SIZE_MAX - strlen(OCI_HOOK_JSON_FILE_NAME) - 3)
++		return false;
++	len = strlen(c->config_path) + strlen(c->name) + strlen(OCI_HOOK_JSON_FILE_NAME) + 3;
++
++	newpath = malloc(len);
++	if (newpath == NULL)
++		return false;
++
++	ret = snprintf(newpath, len, "%s/%s/%s", c->config_path, c->name, OCI_HOOK_JSON_FILE_NAME);
++	if (ret < 0 || ret >= len) {
++		fprintf(stderr, "Error printing out config file name\n");
++		free(newpath);
++		return false;
++	}
++
++	free(c->ocihookfile);
++	c->ocihookfile = newpath;
++
++	return true;
++}
++#endif
++
+ static bool do_lxcapi_load_config(struct lxc_container *c, const char *alt_file)
+ {
+ 	int lret;
+@@ -685,6 +761,11 @@ static bool do_lxcapi_load_config(struct lxc_container *c, const char *alt_file)
+ 
+ 	ret = load_config_locked(c, fname);
+ 
++#ifdef HAVE_ISULAD
++	if (ret && file_exists(c->ocihookfile))
++		ret = load_ocihooks_locked(c);
++#endif
++
+ 	if (need_disklock)
+ 		container_disk_unlock(c);
+ 	else
+@@ -884,6 +965,33 @@ static bool wait_on_daemonized_start(struct lxc_handler *handler, int pid)
+ 	return true;
+ }
+ 
++#ifdef HAVE_ISULAD
++/* isulad: use init argv as init cmd */
++static char **use_init_args(char **init_argv, size_t init_args)
++{
++	size_t i;
++	int nargs = 0;
++	char **argv;
++
++	if (!init_argv)
++		return NULL;
++
++	do {
++		argv = malloc(sizeof(char *));
++	} while (!argv);
++
++	argv0 = NULL;
++	for (i = 0; i < init_args; i++)
++		push_arg(&argv, init_argvi, &nargs);
++
++	if (nargs == 0) {
++		free(argv);
++		return NULL;
++	}
++	return argv;
++}
++#endif
++
+ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const argv)
+ {
+ 	int ret;
+@@ -894,6 +1002,11 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
+ 		NULL,
+ 	};
+ 	char **init_cmd = NULL;
++#ifdef HAVE_ISULAD
++	int keepfds = {-1, -1, -1, -1, -1};
++	ssize_t size_read;
++	char errbufBUFSIZ + 1 = {0};
++#endif
+ 
+ 	/* container does exist */
+ 	if (!c)
+@@ -940,6 +1053,30 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
+ 			argv = init_cmd = split_init_cmd(conf->init_cmd);
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	if (!argv) {
++		argv = init_cmd = use_init_args(conf->init_argv, conf->init_argc);
++	}
++
++	// do not allow using default rootfs path when isulad
++	if (conf->rootfs.mount == NULL) {
++		ERROR("Empty rootfs path detected");
++		lxc_put_handler(handler);
++		return false;
++	}
++
++	// do not allow using default args when isulad
++	if (!argv) {
++		ERROR("Empty args detected");
++		lxc_put_handler(handler);
++		return false;
++	}
++
++	if (c->image_type_oci) {
++		handler->image_type_oci = true;
++	}
++#endif
++
+ 	/* ... otherwise use default_args. */
+ 	if (!argv) {
+ 		if (useinit) {
+@@ -959,10 +1096,23 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
+ 		char title2048;
+ 		pid_t pid_first, pid_second;
+ 
++#ifdef HAVE_ISULAD
++		//isulad: pipdfd for get error message of child or grandchild process.
++		if (pipe2(conf->errpipe, O_CLOEXEC) != 0) {
++			SYSERROR("Failed to init errpipe");
++			free_init_cmd(init_cmd);
++			lxc_put_handler(handler);
++			return false;
++		}
++#endif
++
+ 		pid_first = fork();
+ 		if (pid_first < 0) {
+ 			free_init_cmd(init_cmd);
+ 			lxc_put_handler(handler);
++#ifdef HAVE_ISULAD
++			lxc_close_error_pipe(conf->errpipe);
++#endif
+ 			return false;
+ 		}
+ 
+@@ -972,11 +1122,25 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
+ 			 * the PID file, child will do the free and unlink.
+ 			 */
+ 			c->pidfile = NULL;
++#ifdef HAVE_ISULAD
++			close(conf->errpipe1);
++			conf->errpipe1 = -1;
++#endif
+ 
+ 			/* Wait for container to tell us whether it started
+ 			 * successfully.
+ 			 */
+ 			started = wait_on_daemonized_start(handler, pid_first);
++#ifdef HAVE_ISULAD
++			if (!started) {
++				size_read = read(conf->errpipe0, errbuf, BUFSIZ);
++				if (size_read > 0) {
++					conf->errmsg = safe_strdup(errbuf);
++				}
++			}
++			close(conf->errpipe0);
++			conf->errpipe0 = -1;
++#endif
+ 
+ 			free_init_cmd(init_cmd);
+ 			lxc_put_handler(handler);
+@@ -1012,6 +1176,9 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
+ 		if (pid_second != 0) {
+ 			free_init_cmd(init_cmd);
+ 			lxc_put_handler(handler);
++#ifdef HAVE_ISULAD
++			lxc_close_error_pipe(conf->errpipe);
++#endif
+ 			_exit(EXIT_SUCCESS);
+ 		}
+ 
+@@ -1024,7 +1191,18 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
+ 			_exit(EXIT_FAILURE);
+ 		}
+ 
++#ifdef HAVE_ISULAD
++		keepfds0 = handler->conf->maincmd_fd;
++		keepfds1 = handler->state_socket_pair0;
++		keepfds2 = handler->state_socket_pair1;
++		keepfds4 = conf->errpipe1;
++		close(conf->errpipe0);
++		conf->errpipe0 = -1;
++		ret = lxc_check_inherited(conf, true, keepfds,
++					  sizeof(keepfds) / sizeof(keepfds0));
++#else
+ 		ret = inherit_fds(handler, true);
++#endif
+ 		if (ret < 0)
+ 			_exit(EXIT_FAILURE);
+ 
+@@ -1057,6 +1235,9 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
+ 		if (w < 0) {
+ 			free_init_cmd(init_cmd);
+ 			lxc_put_handler(handler);
++#ifdef HAVE_ISULAD
++			lxc_close_error_pipe(conf->errpipe);
++#endif
+ 
+ 			SYSERROR("Failed to write monitor pid to \"%s\"", c->pidfile);
+ 
+@@ -1070,6 +1251,9 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
+ 		if (ret < 0) {
+ 			free_init_cmd(init_cmd);
+ 			lxc_put_handler(handler);
++#ifdef HAVE_ISULAD
++			lxc_close_error_pipe(conf->errpipe);
++#endif
+ 
+ 			SYSERROR("Failed to write monitor pid to \"%s\"", c->pidfile);
+ 
+@@ -1080,6 +1264,19 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
+ 		}
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: open exit fifo */
++	if (c->exit_fifo) {
++		conf->exit_fd = lxc_open(c->exit_fifo, O_WRONLY | O_NONBLOCK | O_CLOEXEC, 0);
++		if (conf->exit_fd < 0) {
++			ERROR("Failed to open exit fifo %s: %s.", c->exit_fifo, strerror(errno));
++			lxc_put_handler(handler);
++			ret = 1;
++			goto on_error;
++		}
++	}
++#endif
++
+ 	conf->reboot = REBOOT_NONE;
+ 
+ 	/* Unshare the mount namespace if requested */
+@@ -1111,19 +1308,53 @@ reboot:
+ 		}
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	keepfds0 = handler->conf->maincmd_fd;
++	keepfds1 = handler->state_socket_pair0;
++	keepfds2 = handler->state_socket_pair1;
++
++	/* keep exit fifo fd */
++	if (conf->exit_fd >= 0) {
++		keepfds3 = conf->exit_fd;
++	}
++	/* isulad: keep errpipe fd */
++	if (c->daemonize)
++		keepfds4 = conf->errpipe1;
++
++	ret = lxc_check_inherited(conf, c->daemonize, keepfds,
++				  sizeof(keepfds) / sizeof(keepfds0));
++	if (ret < 0) {
++		lxc_put_handler(handler);
++		ret = 1;
++		goto on_error;
++	}
++#else
+ 	ret = inherit_fds(handler, c->daemonize);
+ 	if (ret < 0) {
+ 		lxc_put_handler(handler);
+ 		ret = 1;
+ 		goto on_error;
+ 	}
++#endif
+ 
++#ifndef HAVE_ISULAD
+ 	if (useinit)
+ 		ret = lxc_execute(c->name, argv, 1, handler, c->config_path,
+ 				  c->daemonize, &c->error_num);
+ 	else
+ 		ret = lxc_start(argv, handler, c->config_path, c->daemonize,
+ 				&c->error_num);
++#else
++	if (useinit) {
++		ret = lxc_execute(c->name, argv, 1, handler, c->config_path,
++				  c->daemonize, &c->error_num, c->start_timeout);
++	} else {
++		handler->disable_pty = c->disable_pty;
++		handler->open_stdin = c->open_stdin;
++		ret = lxc_start(argv, handler, c->config_path, c->daemonize,
++				&c->error_num, c->start_timeout);
++	}
++#endif
+ 
+ 	if (conf->reboot == REBOOT_REQ) {
+ 		INFO("Container requested reboot");
+@@ -2065,7 +2296,12 @@ WRAP_API_1(bool, lxcapi_reboot2, int)
+ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)
+ {
+ 	__do_close int pidfd = -EBADF, state_client_fd = -EBADF;
++#ifdef HAVE_ISULAD
++	// isulad: keep default signal the same as docker
++	int haltsignal = SIGTERM;
++#else
+ 	int haltsignal = SIGPWR;
++#endif
+ 	pid_t pid = -1;
+ 	lxc_state_t statesMAX_STATE = {0};
+ 	int killret, ret;
+@@ -2084,9 +2320,10 @@ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)
+ 	/* Detect whether we should send SIGRTMIN + 3 (e.g. systemd). */
+ 	if (c->lxc_conf && c->lxc_conf->haltsignal)
+ 		haltsignal = c->lxc_conf->haltsignal;
++#ifndef HAVE_ISULAD
+ 	else if (task_blocks_signal(pid, (SIGRTMIN + 3)))
+ 		haltsignal = (SIGRTMIN + 3);
+-
++#endif
+ 
+ 	/*
+ 	 * Add a new state client before sending the shutdown signal so
+@@ -2939,6 +3176,21 @@ static int lxc_unlink_exec_wrapper(void *data)
+ 	return unlink(arg);
+ }
+ 
++#ifdef HAVE_ISULAD
++static void container_sock_dir_delete(const char *name)
++{
++	__do_free char *sock_dir = NULL;
++
++	sock_dir = generate_named_unix_sock_dir(name);
++	if (sock_dir == NULL) {
++		ERROR("Failed to generate exec unix sock dir");
++		return;
++	}
++
++	(void)lxc_rmdir_onedev(sock_dir, NULL);
++}
++#endif
++
+ static bool container_destroy(struct lxc_container *c,
+ 			      struct lxc_storage *storage)
+ {
+@@ -2949,8 +3201,19 @@ static bool container_destroy(struct lxc_container *c,
+ 	bool bret = false;
+ 	int ret = 0;
+ 
++#ifdef HAVE_ISULAD
++	if (!c)
++		return false;
++	// isulad: if container is not defined, we need to remove disk lock file
++	// which is created in lxc_container_new.
++	if (!do_lxcapi_is_defined(c)) {
++		container_disk_removelock(c);
++		return false;
++	}
++#else
+ 	if (!c || !do_lxcapi_is_defined(c))
+ 		return false;
++#endif
+ 
+ 	conf = c->lxc_conf;
+ 	if (container_disk_lock(c))
+@@ -3070,8 +3333,20 @@ static bool container_destroy(struct lxc_container *c,
+ 	if (ret < 0) {
+ 		ERROR("Failed to destroy directory \"%s\" for \"%s\"", path,
+ 		      c->name);
++#ifdef HAVE_ISULAD
++		char msgBUFSIZ = { 0 };
++		ret = snprintf(msg, BUFSIZ, "Failed to destroy directory \"%s\": %s", path, errno ? strerror(errno) : "error");
++		if (ret < 0 || ret >= BUFSIZ) {
++			ERROR("Sprintf failed");
++			goto out;
++		}
++		c->error_string = safe_strdup(msg);
++#endif
+ 		goto out;
+ 	}
++#ifdef HAVE_ISULAD
++	container_sock_dir_delete(c->name);
++#endif
+ 	INFO("Destroyed directory \"%s\" for \"%s\"", path, c->name);
+ 
+ on_success:
+@@ -3082,6 +3357,11 @@ out:
+ 		free(path);
+ 
+ 	container_disk_unlock(c);
++#ifdef HAVE_ISULAD
++	if (bret && container_disk_removelock(c)) {
++		bret = false;
++	}
++#endif
+ 	return bret;
+ }
+ 
+@@ -4042,8 +4322,13 @@ static int lxcapi_attach(struct lxc_container *c,
+ 
+ 	current_config = c->lxc_conf;
+ 
++#ifdef HAVE_ISULAD
++	ret = lxc_attach(c, exec_function, exec_payload, options,
++			 attached_process, &c->lxc_conf->errmsg);
++#else
+ 	ret = lxc_attach(c, exec_function, exec_payload, options,
+ 			 attached_process);
++#endif
+ 	current_config = NULL;
+ 	return ret;
+ }
+@@ -4063,7 +4348,11 @@ static int do_lxcapi_attach_run_wait(struct lxc_container *c,
+ 	command.program = (char *)program;
+ 	command.argv = (char **)argv;
+ 
++#ifdef HAVE_ISULAD
++	ret = lxc_attach(c, lxc_attach_run_command, &command, options, &pid, NULL);
++#else
+ 	ret = lxc_attach(c, lxc_attach_run_command, &command, options, &pid);
++#endif
+ 	if (ret < 0)
+ 		return ret;
+ 
+@@ -5257,6 +5546,560 @@ static int do_lxcapi_seccomp_notify_fd_active(struct lxc_container *c)
+ 
+ WRAP_API(int, lxcapi_seccomp_notify_fd_active)
+ 
++#ifdef HAVE_ISULAD
++/* isulad add set console fifos*/
++static bool do_lxcapi_set_terminal_default_fifos(struct lxc_container *c, const char *in, const char *out, const char *err)
++{
++	struct lxc_conf *conf = NULL;
++
++	if (!c || !c->lxc_conf)
++		return false;
++	if (container_mem_lock(c)) {
++		ERROR("Error getting mem lock");
++		return false;
++	}
++
++	conf = c->lxc_conf;
++	if (in) {
++		if (conf->console.init_fifo0)
++			free(conf->console.init_fifo0);
++		conf->console.init_fifo0 = safe_strdup(in);
++	}
++	if (out) {
++		if (conf->console.init_fifo1)
++			free(conf->console.init_fifo1);
++		conf->console.init_fifo1 = safe_strdup(out);
++	}
++	if (err) {
++		if (conf->console.init_fifo2)
++			free(conf->console.init_fifo2);
++		conf->console.init_fifo2 = safe_strdup(err);
++	}
++
++	container_mem_unlock(c);
++	return true;
++}
++
++WRAP_API_3(bool, lxcapi_set_terminal_default_fifos, const char *, const char *, const char *)
++
++/* isulad add set info file path */
++static bool do_lxcapi_set_container_info_file(struct lxc_container *c, const char *info_file)
++{
++	struct lxc_conf *conf = NULL;
++
++	if (!c || !c->lxc_conf || !info_file)
++		return false;
++	if (container_mem_lock(c)) {
++		ERROR("Error getting mem lock");
++		return false;
++	}
++
++	conf = c->lxc_conf;
++	if (conf->container_info_file)
++		free(conf->container_info_file);
++	conf->container_info_file = safe_strdup(info_file);
++
++	container_mem_unlock(c);
++	return true;
++}
++
++WRAP_API_1(bool, lxcapi_set_container_info_file, const char *)
++
++static bool do_lxcapi_want_disable_pty(struct lxc_container *c, bool state)
++{
++	if (!c || !c->lxc_conf)
++		return false;
++
++	if (container_mem_lock(c))
++		return false;
++
++	c->disable_pty = state;
++
++	container_mem_unlock(c);
++
++	return true;
++}
++
++WRAP_API_1(bool, lxcapi_want_disable_pty, bool)
++
++static bool do_lxcapi_want_open_stdin(struct lxc_container *c, bool state)
++{
++	if (!c || !c->lxc_conf)
++		return false;
++
++	if (container_mem_lock(c))
++		return false;
++
++	c->open_stdin = state;
++
++	container_mem_unlock(c);
++
++	return true;
++}
++
++WRAP_API_1(bool, lxcapi_want_open_stdin, bool)
++
++/* isulad add clean resources */
++static bool do_lxcapi_add_terminal_fifo(struct lxc_container *c, const char *in_fifo, const char *out_fifo, const char *err_fifo)
++{
++	bool ret = true;
++
++	if (!c || !c->lxc_conf)
++		return false;
++	if (container_mem_lock(c)) {
++		ERROR("Error getting mem lock");
++		return false;
++	}
++
++	if (lxc_cmd_set_terminal_fifos(c->name, c->config_path, in_fifo, out_fifo, err_fifo)) {
++		ERROR("Error set console fifos");
++		ret = false;
++	}
++
++	container_mem_unlock(c);
++	return ret;
++}
++
++WRAP_API_3(bool, lxcapi_add_terminal_fifo, const char *, const char *, const char *)
++
++static bool do_lxcapi_set_terminal_winch(struct lxc_container *c, unsigned int height, unsigned int width)
++{
++	bool ret = true;
++
++	if (!c || !c->lxc_conf)
++		return false;
++	if (container_mem_lock(c)) {
++		ERROR("Error getting mem lock");
++		return false;
++	}
++
++	if (lxc_cmd_set_terminal_winch(c->name, c->config_path, height, width)) {
++		ERROR("Error set terminal winch");
++		ret = false;
++	}
++
++	container_mem_unlock(c);
++	return ret;
++}
++
++WRAP_API_2(bool, lxcapi_set_terminal_winch, unsigned int, unsigned int)
++
++static bool do_lxcapi_set_exec_terminal_winch(struct lxc_container *c, const char *suffix, unsigned int height, unsigned int width)
++{
++	bool ret = true;
++
++	if (!c || !c->lxc_conf)
++		return false;
++	if (container_mem_lock(c)) {
++		ERROR("Error getting mem lock");
++		return false;
++	}
++
++	if (lxc_exec_cmd_set_terminal_winch(c->name, c->config_path, suffix, height, width)) {
++		ERROR("Error set terminal winch");
++		ret = false;
++	}
++
++	container_mem_unlock(c);
++	return ret;
++}
++
++WRAP_API_3(bool, lxcapi_set_exec_terminal_winch, const char *, unsigned int, unsigned int)
++
++/* isulad add clean resources */
++static bool do_lxcapi_clean_container_resource(struct lxc_container *c, pid_t pid)
++{
++	int ret;
++
++	if (!c)
++		return false;
++
++	ret = do_lxcapi_clean_resource(c->name, c->config_path, c->lxc_conf, pid);
++	if (ret)
++		ERROR("Failed to clean container %s resource", c->name);
++	return ret == 0;
++
++}
++
++WRAP_API_1(bool, lxcapi_clean_container_resource, pid_t)
++
++/* isulad get coantainer pids */
++static bool do_lxcapi_get_container_pids(struct lxc_container *c, pid_t **pids,size_t *pids_len)
++{
++	int ret;
++
++	if (!c)
++		return false;
++
++	ret = do_lxcapi_get_pids(c->name, c->config_path, c->lxc_conf, pids,pids_len);
++	if (ret)
++		ERROR("Failed to get container %s pids", c->name);
++	return ret == 0;
++
++}
++
++WRAP_API_2(bool, lxcapi_get_container_pids, pid_t **,size_t *)
++
++/* isulad add start timeout */
++static bool do_lxcapi_set_start_timeout(struct lxc_container *c,  unsigned int start_timeout)
++{
++	if (!c || !c->lxc_conf)
++		return false;
++	if (container_mem_lock(c)) {
++		ERROR("Error getting mem lock");
++		return false;
++	}
++	c->start_timeout = start_timeout;
++	container_mem_unlock(c);
++	return true;
++}
++
++WRAP_API_1(bool, lxcapi_set_start_timeout, unsigned int)
++
++/* isulad add set image type */
++static bool do_lxcapi_set_oci_type(struct lxc_container *c,  bool image_type_oci)
++{
++	if (!c || !c->lxc_conf)
++		return false;
++	if (container_mem_lock(c)) {
++		ERROR("Error getting mem lock");
++		return false;
++	}
++	c->image_type_oci = image_type_oci;
++	container_mem_unlock(c);
++	return true;
++}
++
++WRAP_API_1(bool, lxcapi_set_oci_type, bool)
++
++static uint64_t metrics_get_ull(struct lxc_container *c, struct cgroup_ops *cgroup_ops, const char *item)
++{
++    char buf81 = {0};
++    int len = 0;
++    uint64_t val = 0;
++
++    len = cgroup_ops->get(cgroup_ops, item, buf, sizeof(buf) - 1, c->name, c->config_path);
++    if (len <= 0) {
++        DEBUG("unable to read cgroup item %s", item);
++        return 0;
++    }
++
++    val = strtoull(buf, NULL, 0);
++    return val;
++}
++
++static uint64_t metrics_get_ull_with_max(struct lxc_container *c, struct cgroup_ops *cgroup_ops, const char *item)
++{
++    char buf81 = {0};
++    int len = 0;
++    uint64_t val = 0;
++
++    len = cgroup_ops->get(cgroup_ops, item, buf, sizeof(buf) - 1, c->name, c->config_path);
++    if (len <= 0) {
++        DEBUG("unable to read cgroup item %s", item);
++        return 0;
++    }
++
++    if (strcmp(buf, "max") == 0) {
++	return ULONG_MAX;
++    }
++
++    val = strtoull(buf, NULL, 0);
++    return val;
++}
++
++static inline bool is_blk_metrics_read(const char *value)
++{
++    return strcmp(value, "Read") == 0;
++}
++
++static inline bool is_blk_metrics_write(const char *value)
++{
++    return strcmp(value, "Write") == 0;
++}
++
++static inline bool is_blk_metrics_total(const char *value)
++{
++    return strcmp(value, "Total") == 0;
++}
++
++static void metrics_get_blk_stats(struct lxc_container *c, struct cgroup_ops *cgroup_ops, const char *item, struct lxc_blkio_metrics *stats)
++{
++    char *buf = NULL;
++    int i = 0;
++    int len = 0;
++    int ret = 0;
++    char **lines = NULL;
++    char **cols = NULL;
++
++    len = cgroup_ops->get(cgroup_ops, item, NULL, 0, c->name, c->config_path);
++    if (len <= 0) {
++        DEBUG("unable to read cgroup item %s", item);
++        return;
++    }
++
++    buf = malloc(len + 1);
++    (void)memset(buf, 0, len + 1);
++    ret = cgroup_ops->get(cgroup_ops, item, buf, len, c->name, c->config_path);
++    if (ret <= 0) {
++        DEBUG("unable to read cgroup item %s", item);
++        goto out;
++    }
++
++    lines = lxc_string_split_and_trim(buf, '\n');
++    if (lines == NULL) {
++        goto out;
++    }
++
++    (void)memset(stats, 0, sizeof(struct lxc_blkio_metrics));
++
++    for (i = 0; linesi; i++) {
++        cols = lxc_string_split_and_trim(linesi, ' ');
++        if (cols == NULL) {
++            goto err_out;
++        }
++        if (lxc_array_len((void **)cols) == 3) {
++            if (is_blk_metrics_read(cols1)) {
++                stats->read += strtoull(cols2, NULL, 0);
++            } else if (is_blk_metrics_write(cols1)) {
++                stats->write += strtoull(cols2, NULL, 0);
++            }
++        }
++        if (lxc_array_len((void **)cols) == 2 && is_blk_metrics_total(cols0)) {
++            stats->total = strtoull(cols1, NULL, 0);
++        }
++
++        lxc_free_array((void **)cols, free);
++    }
++err_out:
++    lxc_free_array((void **)lines, free);
++out:
++    free(buf);
++    return;
++}
++
++static void metrics_get_io_stats_v2(struct lxc_container *c, struct cgroup_ops *cgroup_ops, const char *item, struct lxc_blkio_metrics *stats, func_is_io_stat_read is_io_stat_read, func_is_io_stat_write is_io_stat_write)
++{
++    char *buf = NULL;
++    int i = 0;
++    int j = 0;
++    int len = 0;
++    int ret = 0;
++    char **lines = NULL;
++    char **cols = NULL;
++    char **kv = NULL;
++
++    len = cgroup_ops->get(cgroup_ops, item, NULL, 0, c->name, c->config_path);
++    if (len <= 0) {
++        DEBUG("unable to read cgroup item %s", item);
++        return;
++    }
++
++    buf = malloc(len + 1);
++    (void)memset(buf, 0, len + 1);
++    ret = cgroup_ops->get(cgroup_ops, item, buf, len, c->name, c->config_path);
++    if (ret <= 0) {
++        DEBUG("unable to read cgroup item %s", item);
++        goto out;
++    }
++
++    lines = lxc_string_split_and_trim(buf, '\n');
++    if (lines == NULL) {
++        goto out;
++    }
++
++    (void)memset(stats, 0, sizeof(struct lxc_blkio_metrics));
++    // line example:
++    // 259:0 rbytes=0 wbytes=12288 rios=0 wios=4 dbytes=0 dios=0
++    for (i = 0; linesi; i++) {
++        cols = lxc_string_split_and_trim(linesi, ' ');
++        if (cols == NULL || lxc_array_len((void **)cols) < 2) {
++            goto err_out;
++        }
++        len = lxc_array_len((void **)cols);
++        for (j = 1; j < len; j++) {
++            kv = lxc_string_split(colsj, '=');
++            if (kv == NULL || lxc_array_len((void **)kv) != 2) {
++                lxc_free_array((void **)kv, free);
++                continue;
++            }
++            if (is_io_stat_read(kv0)) {
++                stats->read += strtoull(kv1, NULL, 0);
++            } else if (is_io_stat_write(kv0)) {
++                stats->write += strtoull(kv1, NULL, 0);
++            }
++            lxc_free_array((void **)kv, free);
++        }
++        lxc_free_array((void **)cols, free);
++    }
++
++    stats->total = stats->read + stats->write;
++
++err_out:
++    lxc_free_array((void **)lines, free);
++out:
++    free(buf);
++    return;
++}
++
++static uint64_t metrics_match_get_ull(struct lxc_container *c, struct cgroup_ops *cgroup_ops, const char *item, const char *match, int column)
++{
++#define BUFSIZE 4096
++    char bufBUFSIZE = {0};
++    int i = 0;
++    int j = 0;
++    int len = 0;
++    uint64_t val = 0;
++    char **lines = NULL;
++    char **cols = NULL;
++    size_t matchlen = 0;
++
++    len = cgroup_ops->get(cgroup_ops, item, buf, sizeof(buf) - 1, c->name, c->config_path);
++    if (len <= 0) {
++        DEBUG("unable to read cgroup item %s", item);
++        goto err_out;
++    }
++
++    lines = lxc_string_split_and_trim(buf, '\n');
++    if (lines == NULL) {
++        goto err_out;
++    }
++
++    matchlen = strlen(match);
++    for (i = 0; linesi; i++) {
++        if (strncmp(linesi, match, matchlen) != 0) {
++            continue;
++        }
++
++        cols = lxc_string_split_and_trim(linesi, ' ');
++        if (cols == NULL) {
++            goto err1;
++        }
++        for (j = 0; colsj; j++) {
++            if (j == column) {
++                val = strtoull(colsj, NULL, 0);
++                break;
++            }
++        }
++        lxc_free_array((void **)cols, free);
++        break;
++    }
++err1:
++    lxc_free_array((void **)lines, free);
++err_out:
++    return val;
++}
++
++static bool is_io_stat_rbytes(const char *value)
++{
++    return strcmp(value, "rbytes") == 0;
++}
++
++static bool is_io_stat_wbytes(const char *value)
++{
++    return strcmp(value, "wbytes") == 0;
++}
++
++static bool is_io_stat_rios(const char *value)
++{
++    return strcmp(value, "rios") == 0;
++}
++
++static bool is_io_stat_wios(const char *value)
++{
++    return strcmp(value, "wios") == 0;
++}
++
++static bool unified_metrics_get(struct lxc_container *c, struct cgroup_ops *cgroup_ops, struct lxc_container_metrics *metrics)
++{
++	// cpu
++	metrics->cpu_use_nanos = metrics_match_get_ull(c, cgroup_ops, "cpu.stat", "usage_usec", 1) * 1000;
++	metrics->cpu_use_user = metrics_match_get_ull(c, cgroup_ops, "cpu.stat", "user_usec", 1) * 1000;
++	metrics->cpu_use_sys = metrics_match_get_ull(c, cgroup_ops, "cpu.stat", "system_usec", 1) * 1000;
++
++	// io
++	metrics_get_io_stats_v2(c, cgroup_ops, "io.stat", &metrics->io_service_bytes, is_io_stat_rbytes, is_io_stat_wbytes);
++	metrics_get_io_stats_v2(c, cgroup_ops, "io.stat", &metrics->io_serviced, is_io_stat_rios, is_io_stat_wios);
++
++	// memory
++	metrics->mem_used = metrics_get_ull(c, cgroup_ops, "memory.current");
++	metrics->mem_limit = metrics_get_ull_with_max(c, cgroup_ops, "memory.max");
++	metrics->inactive_file_total = metrics_match_get_ull(c, cgroup_ops, "memory.stat", "inactive_file", 1);
++	metrics->cache = metrics_match_get_ull(c, cgroup_ops, "memory.stat", "file", 1);
++	metrics->cache_total = metrics->cache;
++
++	// cgroup v2 does not support kernel memory
++	metrics->kmem_used = 0;
++	metrics->kmem_limit = 0;
++
++	// pids
++	metrics->pids_current = metrics_get_ull(c, cgroup_ops, "pids.current");
++
++	return true;
++}
++
++/* isulad add get container metrics */
++static bool do_lxcapi_get_container_metrics(struct lxc_container *c,  struct lxc_container_metrics *metrics)
++{
++	call_cleaner(cgroup_exit) struct cgroup_ops *cgroup_ops = NULL;
++	const char *state = NULL;
++	if (c == NULL || c->lxc_conf == NULL || metrics == NULL) {
++		return false;
++	}
++
++	state = c->state(c);
++	metrics->state = state;
++
++	if (!is_stopped(c)) {
++		metrics->init = c->init_pid(c);
++	} else {
++		metrics->init = -1;
++	}
++
++	cgroup_ops = cgroup_init(c->lxc_conf);
++	if (cgroup_ops == NULL) {
++		return false;
++	}
++
++	if (cgroup_ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
++		return unified_metrics_get(c, cgroup_ops, metrics);
++	}
++
++	metrics->cpu_use_nanos = metrics_get_ull(c, cgroup_ops, "cpuacct.usage");
++	metrics->pids_current = metrics_get_ull(c, cgroup_ops, "pids.current");
++
++	metrics->rss_bytes = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "rss", 1);
++	metrics->page_faults = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "pgfault", 1);
++	metrics->major_page_faults = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "pgmajfault", 1);
++
++	metrics->cpu_use_user = metrics_match_get_ull(c, cgroup_ops, "cpuacct.stat", "user", 1);
++	metrics->cpu_use_sys = metrics_match_get_ull(c, cgroup_ops, "cpuacct.stat", "system", 1);
++
++	// Try to read CFQ stats available on all CFQ enabled kernels first
++	metrics_get_blk_stats(c, cgroup_ops, "blkio.io_serviced_recursive", &metrics->io_serviced);
++	if (metrics->io_serviced.read == 0 && metrics->io_serviced.write == 0 && metrics->io_serviced.total == 0) {
++		metrics_get_blk_stats(c, cgroup_ops, "blkio.throttle.io_service_bytes", &metrics->io_service_bytes);
++		metrics_get_blk_stats(c, cgroup_ops, "blkio.throttle.io_serviced", &metrics->io_serviced);
++	} else {
++		metrics_get_blk_stats(c, cgroup_ops, "blkio.io_service_bytes_recursive", &metrics->io_service_bytes);
++	}
++
++	metrics->mem_used = metrics_get_ull(c, cgroup_ops, "memory.usage_in_bytes");
++	metrics->mem_limit = metrics_get_ull(c, cgroup_ops, "memory.limit_in_bytes");
++	metrics->kmem_used = metrics_get_ull(c, cgroup_ops, "memory.kmem.usage_in_bytes");
++	metrics->kmem_limit = metrics_get_ull(c, cgroup_ops, "memory.kmem.limit_in_bytes");
++
++	metrics->cache = metrics_match_get_ull(c, cgroup_ops, "memory.stat", "cache", 1);
++	metrics->cache_total = metrics_match_get_ull(c, cgroup_ops, "memory.stat", "total_cache", 1);
++	metrics->inactive_file_total = metrics_match_get_ull(c, cgroup_ops, "memory.stat", "total_inactive_file", 1);
++
++	return true;
++}
++
++WRAP_API_1(bool, lxcapi_get_container_metrics, struct lxc_container_metrics *)
++
++#endif
++
+ struct lxc_container *lxc_container_new(const char *name, const char *configpath)
+ {
+ 	struct lxc_container *c;
+@@ -5310,10 +6153,24 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath
+ 		goto err;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	if (!set_oci_hook_config_filename(c)) {
++		fprintf(stderr, "Error allocating oci hooks file pathname\n");
++		goto err;
++	}
++
++	if (load_config && file_exists(c->configfile)) {
++		if (!lxcapi_load_config(c, NULL)) {
++			fprintf(stderr, "Failed to load config for %s\n", name);
++			goto err;
++		}
++	}
++#else
+ 	if (file_exists(c->configfile) && !lxcapi_load_config(c, NULL)) {
+ 		fprintf(stderr, "Failed to load config for %s\n", name);
+ 		goto err;
+ 	}
++#endif
+ 
+ 	rc = ongoing_create(c);
+ 	switch (rc) {
+@@ -5337,6 +6194,9 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath
+ 
+ 	c->daemonize			= true;
+ 	c->pidfile			= NULL;
++#ifdef HAVE_ISULAD
++	c->image_type_oci = false;
++#endif
+ 
+ 	/* Assign the member functions. */
+ 	c->is_defined			= lxcapi_is_defined;
+@@ -5400,6 +6260,20 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath
+ 	c->umount			= lxcapi_umount;
+ 	c->seccomp_notify_fd		= lxcapi_seccomp_notify_fd;
+ 	c->seccomp_notify_fd_active	= lxcapi_seccomp_notify_fd_active;
++#ifdef HAVE_ISULAD
++	c->set_container_info_file = lxcapi_set_container_info_file;
++	c->set_terminal_init_fifos = lxcapi_set_terminal_default_fifos;
++	c->add_terminal_fifos = lxcapi_add_terminal_fifo;
++	c->set_terminal_winch = lxcapi_set_terminal_winch;
++	c->set_exec_terminal_winch = lxcapi_set_exec_terminal_winch;
++	c->want_disable_pty = lxcapi_want_disable_pty;
++	c->want_open_stdin = lxcapi_want_open_stdin;
++	c->clean_container_resource = lxcapi_clean_container_resource;
++	c->get_container_pids = lxcapi_get_container_pids;
++	c->set_start_timeout = lxcapi_set_start_timeout;
++	c->set_oci_type = lxcapi_set_oci_type;
++	c->get_container_metrics = lxcapi_get_container_metrics;
++#endif
+ 
+ 	return c;
+ 
+@@ -5408,6 +6282,19 @@ err:
+ 	return NULL;
+ }
+ 
++#ifdef HAVE_ISULAD
++// isulad: new container without load config to save time
++struct lxc_container *lxc_container_without_config_new(const char *name, const char *configpath)
++{
++	return do_lxc_container_new(name, configpath, false);
++}
++
++struct lxc_container *lxc_container_new(const char *name, const char *configpath)
++{
++	return do_lxc_container_new(name, configpath, true);
++}
++#endif
++
+ int lxc_get_wait_states(const char **states)
+ {
+ 	int i;
+@@ -5578,11 +6465,21 @@ int list_active_containers(const char *lxcpath, char ***nret,
+ 				continue;
+ 		}
+ 
++#ifdef HAVE_ISULAD
++		if (ct_name && ct_name_cnt) {
++			if (array_contains(&ct_name, p, ct_name_cnt)) {
++				if (is_hashed)
++					free(p);
++				continue;
++			}
++		}
++#else
+ 		if (array_contains(&ct_name, p, ct_name_cnt)) {
+ 			if (is_hashed)
+ 				free(p);
+ 			continue;
+ 		}
++#endif
+ 
+ 		if (!add_to_array(&ct_name, p, ct_name_cnt)) {
+ 			if (is_hashed)
+diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
+index 3386bff..06e8f0b 100644
+--- a/src/lxc/lxccontainer.h
++++ b/src/lxc/lxccontainer.h
+@@ -26,6 +26,10 @@ extern "C" {
+ #define LXC_CREATE_MAXFLAGS       (1 << 1) /*!< Number of \c LXC_CREATE* flags */
+ #define LXC_MOUNT_API_V1		   1
+ 
++#ifdef HAVE_ISULAD
++#define LXC_IMAGE_OCI_KEY "lxc.imagetype.oci"
++#endif
++
+ struct bdev_specs;
+ 
+ struct lxc_snapshot;
+@@ -40,6 +44,44 @@ struct lxc_mount {
+ 	int version;
+ };
+ 
++#ifdef HAVE_ISULAD
++struct lxc_blkio_metrics {
++	uint64_t read;
++	uint64_t write;
++	uint64_t total;
++};
++
++struct lxc_container_metrics {
++    /* State of container */
++    const char *state;
++    /* The process ID of the init container */
++    pid_t init;
++    /* Current pids */
++    uint64_t pids_current;
++    /* CPU usage */
++    uint64_t cpu_use_nanos;
++    uint64_t cpu_use_user;
++    uint64_t cpu_use_sys;
++    /* BlkIO usage */
++    struct lxc_blkio_metrics io_service_bytes;
++    struct lxc_blkio_metrics io_serviced;
++    /* Memory usage */
++    uint64_t mem_used;
++    uint64_t mem_limit;
++    uint64_t rss_bytes;
++    uint64_t page_faults;
++    uint64_t major_page_faults;
++    /* Kernel Memory usage */
++    uint64_t kmem_used;
++    uint64_t kmem_limit;
++    /* Cache usage */
++    uint64_t cache;
++    uint64_t cache_total;
++    /* total inactive file */
++    uint64_t inactive_file_total;
++};
++#endif
++
+ /*!
+  * An LXC container.
+  *
+@@ -107,6 +149,38 @@ struct lxc_container {
+ 	/*! Full path to configuration file */
+ 	char *config_path;
+ 
++#ifdef HAVE_ISULAD
++	/*! isulad:
++	 * \private
++	 * exit FIFO File to open used monitor the state of lxc monitor process.
++	 */
++	char *exit_fifo;
++	/*! Whether container wishes to create pty or pipes for console log */
++	bool disable_pty;
++
++	/*! Whether container wishes to keep stdin active */
++	bool open_stdin;
++
++	/*!
++	 * \private
++	 * isulad: support oci hook from json file
++	 * full path of json file
++	 * */
++	char *ocihookfile;
++
++	/*! isulad:
++	 * \private
++	 * start_timeout.
++	 */
++	unsigned int start_timeout;
++
++	/*! isulad:
++	 * \private
++	 *  image_type_oci
++	 */
++	bool image_type_oci;
++#endif
++
+ 	/*!
+ 	 * \brief Determine if \c /var/lib/lxc/$name/config exists.
+ 	 *
+@@ -884,6 +958,115 @@ struct lxc_container {
+ 	 * \return Mount fd of the container's devpts instance.
+ 	 */
+ 	int (*devpts_fd)(struct lxc_container *c);
++
++#ifdef HAVE_ISULAD
++	/*! isulad add
++	 * \brief An API call to set the path of info file
++	 *
++	 * \param c Container.
++	 * \param info_file Value of the path of info file.
++	 *
++	 * \return \c true on success, else \c false.
++	 */
++	bool (*set_container_info_file) (struct lxc_container *c, const char *info_file);
++
++	/*! isulad add
++	 * \brief An API call to change the path of the console default fifos
++	 *
++	 * \param c Container.
++	 * \param path Value of the console path.
++	 *
++	 * \return \c true on success, else \c false.
++	 */
++	bool (*set_terminal_init_fifos)(struct lxc_container *c, const char *in, const char *out, const char *err);
++
++	/*! isulad add
++	 * \brief An API call to add the path of terminal fifos
++	 *
++	 * \param c Container.
++	 * \param path Value of the console path..
++	 *
++	 * \return \c true on success, else \c false.
++	 */
++	bool (*add_terminal_fifos)(struct lxc_container *c, const char *in, const char *out, const char *err);
++
++	bool (*set_terminal_winch)(struct lxc_container *c, unsigned int height, unsigned int width);
++
++	bool (*set_exec_terminal_winch)(struct lxc_container *c, const char *suffix, unsigned int height, unsigned int width);
++
++	/*!
++	 * \brief Change whether the container wants to create pty or pipes
++	 * from the console log.
++	 *
++	 * \param c Container.
++	 * \param state Value for the disable pty bit (0 or 1).
++	 *
++	 * \return \c true on success, else \c false.
++	 */
++	bool (*want_disable_pty)(struct lxc_container *c, bool state);
++
++	/*!
++	 * \brief Change whether the container wants to keep stdin active
++	 * for parent process of container
++	 *
++	 * \param c Container.
++	 * \param state Value for the open_stdin bit (0 or 1).
++	 *
++	 * \return \c true on success, else \c false.
++	 */
++	bool (*want_open_stdin)(struct lxc_container *c, bool state);
++
++	/*! isulad add
++	 * \brief An API call to clean resources of container
++	 *
++	 * \param c Container.
++	 * \param pid Value of container process.
++	 *
++	 * \return \c true on success, else \c false.
++	 */
++	bool (*clean_container_resource) (struct lxc_container *c, pid_t pid);
++
++	/*! isulad add
++	 * \brief An API call to get container pids
++	 *
++	 * \param c Container.
++	 * \param pids Value of container pids.
++	 * \param pids_len Value of container pids len.
++	 * \param pid Value of container pid.
++	 * \return \c true on success, else \c false.
++	 */
++	bool (*get_container_pids)(struct lxc_container *c,pid_t **pids,size_t *pids_len);
++
++	/*! isulad add
++	 * \brief An API call to set start timeout
++	 *
++	 * \param c Container.
++	 * \param start_timeout Value of start timeout.
++	 *
++	 * \return \c true on success, else \c false.
++	 */
++	bool (*set_start_timeout)(struct lxc_container *c, unsigned int start_timeout);
++
++	/*! isulad add
++	 * \brief An API call to set oci type
++	 *
++	 * \param c Container.
++	 * \param image_type_oci image oci type.
++	 *
++	 * \return \c true on success, else \c false.
++	 */
++	bool (*set_oci_type)(struct lxc_container *c, bool image_type_oci);
++	
++	/*! isulad add
++	 * \brief An API call to set start timeout
++	 *
++	 * \param c Container.
++	 * \param start_timeout Value of start timeout.
++	 *
++	 * \return \c true on success, else \c false.
++	 */
++	bool (*get_container_metrics)(struct lxc_container *c, struct lxc_container_metrics *metrics);
++#endif
+ };
+ 
+ /*!
+@@ -1017,6 +1200,20 @@ struct lxc_console_log {
+  */
+ struct lxc_container *lxc_container_new(const char *name, const char *configpath);
+ 
++#ifdef HAVE_ISULAD
++/*!
++ * \brief Create a new container without loading config.
++ *
++ * \param name Name to use for container.
++ * \param configpath Full path to configuration file to use.
++ *
++ * \return Newly-allocated container, or \c NULL on error.
++ *
++ * \note This function can only used for listing container.
++ */
++struct lxc_container *lxc_container_without_config_new(const char *name, const char *configpath);
++#endif
++
+ /*!
+  * \brief Add a reference to the specified container.
+  *
+diff --git a/src/lxc/start.c b/src/lxc/start.c
+index 9f68304..70af128 100644
+--- a/src/lxc/start.c
++++ b/src/lxc/start.c
+@@ -344,7 +344,11 @@ static int setup_signal_fd(sigset_t *oldmask)
+ {
+ 	int ret;
+ 	sigset_t mask;
++#ifdef HAVE_ISULAD
++	const int signals = {SIGBUS, SIGILL, SIGSEGV, SIGWINCH, SIGTERM};
++#else
+ 	const int signals = {SIGBUS, SIGILL, SIGSEGV, SIGWINCH};
++#endif
+ 
+ 	/* Block everything except serious error signals. */
+ 	ret = sigfillset(&mask);
+@@ -625,6 +629,16 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
+ 
+ 	TRACE("Mainloop is ready");
+ 
++#ifdef HAVE_ISULAD
++	// iSulad: close stdin pipe if we do not want open_stdin with container stdin
++	if (!handler->conf->console.open_stdin) {
++		if (handler->conf->console.pipes01 > 0) {
++			close(handler->conf->console.pipes01);
++			handler->conf->console.pipes01 = -1;
++		}
++	}
++#endif
++
+ 	ret = lxc_mainloop(&descr, -1);
+ 	if (descr.type == LXC_MAINLOOP_EPOLL)
+ 		close_prot_errno_disarm(descr.epfd);
+@@ -634,7 +648,11 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
+ 	if (console) {
+ 		ret = lxc_terminal_mainloop_add(&descr_console, console);
+ 		if (ret == 0)
++#ifdef HAVE_ISULAD
++			ret = isulad_safe_mainloop(&descr_console, 100);
++#else
+ 			ret = lxc_mainloop(&descr_console, 0);
++#endif
+ 	}
+ 
+ out_mainloop_console:
+@@ -718,6 +736,12 @@ struct lxc_handler *lxc_init_handler(struct lxc_handler *old,
+ 	}
+ 
+ 	handler->name = name;
++
++#ifdef HAVE_ISULAD
++	handler->exit_code = -1; /* isulad: record exit code of container */
++	handler->image_type_oci = false;
++#endif
++
+ 	if (daemonize)
+ 		handler->transient_pid = lxc_raw_getpid();
+ 	else
+@@ -768,6 +792,10 @@ int lxc_init(const char *name, struct lxc_handler *handler)
+ 	int ret;
+ 	const char *loglevel;
+ 	struct lxc_conf *conf = handler->conf;
++#ifdef HAVE_ISULAD
++	conf->console.disable_pty = handler->disable_pty;
++	conf->console.open_stdin = handler->open_stdin;
++#endif
+ 
+ 	handler->monitor_pid = lxc_raw_getpid();
+ 	status_fd = open("/proc/self/status", O_RDONLY | O_CLOEXEC);
+@@ -908,6 +936,186 @@ void lxc_expose_namespace_environment(const struct lxc_handler *handler)
+ 	}
+ }
+ 
++
++#ifdef HAVE_ISULAD
++/* isulad: start timeout thread */
++typedef enum {
++	START_INIT,
++	START_TIMEOUT,
++	START_MAX,
++} start_timeout_t;
++
++static start_timeout_t global_timeout_state = START_INIT;
++static sem_t global_timeout_sem;
++
++struct start_timeout_conf {
++	unsigned int timeout;
++	int errfd;
++};
++
++void trim_line(char *s)
++{
++	size_t len;
++
++	len = strlen(s);
++	while ((len > 1) && (slen - 1 == '\n'))
++		s--len = '\0';
++}
++
++static int _read_procs_file(const char *path, pid_t **pids, size_t *len)
++{
++	FILE *f;
++	char *line = NULL;
++	size_t sz = 0;
++	pid_t *tmp_pids = NULL;
++
++	f = fopen_cloexec(path, "r");
++	if (!f)
++		return -1;
++
++	while (getline(&line, &sz, f) != -1) {
++		pid_t pid;
++		trim_line(line);
++		pid = (pid_t)atoll(line);
++		if (lxc_mem_realloc((void **)&tmp_pids, sizeof(pid_t) * (*len + 1), *pids, sizeof(pid_t) * (*len)) != 0) {
++			free(*pids);
++			*pids = NULL;
++			ERROR("out of memory");
++			free(line);
++			fclose(f);
++			return -1;
++		}
++		*pids = tmp_pids;
++
++		(*pids)*len = pid;
++		(*len)++;
++	}
++
++	free(line);
++	fclose(f);
++	return 0;
++}
++
++static int _recursive_read_cgroup_procs(const char *dirpath, pid_t **pids, size_t *len)
++{
++	struct dirent *direntp = NULL;
++	DIR *dir = NULL;
++	int ret, failed = 0;
++	char pathnamePATH_MAX;
++
++	dir = opendir(dirpath);
++	if (dir == NULL) {
++		WARN("Failed to open \"%s\"", dirpath);
++		return 0;
++	}
++
++	while ((direntp = readdir(dir))) {
++		struct stat mystat;
++		int rc;
++
++		if (!strcmp(direntp->d_name, ".") ||
++		                !strcmp(direntp->d_name, ".."))
++			continue;
++
++		rc = snprintf(pathname, PATH_MAX, "%s/%s", dirpath, direntp->d_name);
++		if (rc < 0 || rc >= PATH_MAX) {
++			failed = 1;
++			continue;
++		}
++
++		if (strcmp(direntp->d_name, "cgroup.procs") == 0) {
++			if (_read_procs_file(pathname, pids, len)) {
++				failed = 1;
++
++			}
++			continue;
++		}
++
++		ret = lstat(pathname, &mystat);
++		if (ret) {
++			failed = 1;
++			continue;
++		}
++
++		if (S_ISDIR(mystat.st_mode)) {
++			if (_recursive_read_cgroup_procs(pathname, pids, len) < 0)
++				failed = 1;
++		}
++	}
++
++	ret = closedir(dir);
++	if (ret) {
++		WARN("Failed to close directory \"%s\"", dirpath);
++		failed = 1;
++	}
++
++	return failed ? -1 : 0;
++}
++
++int get_all_pids(struct cgroup_ops *cg_ops, pid_t **pids, size_t *len)
++{
++	const char *devices_path = NULL;
++
++	devices_path = cg_ops->get_cgroup_full_path(cg_ops, "devices");
++	if (!file_exists(devices_path)) {
++		return 0;
++	}
++
++	return _recursive_read_cgroup_procs(devices_path, pids, len);
++}
++
++static int set_cgroup_freezer(struct cgroup_ops *cg_ops, const char *value)
++{
++	char *fullpath;
++	int ret;
++
++	fullpath = must_make_path(cg_ops->get_cgroup_full_path(cg_ops, "freezer"), "freezer.state", NULL);
++	ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
++	free(fullpath);
++	return ret;
++}
++
++/* isulad: kill all process in container cgroup path */
++static void signal_all_processes(struct lxc_handler *handler)
++{
++	int ret;
++	struct cgroup_ops *cg_ops = handler->cgroup_ops;
++	pid_t *pids = NULL;
++	size_t len = 0, i;
++
++	ret = set_cgroup_freezer(cg_ops, "FROZEN");
++	if (ret < 0 && errno != ENOENT) {
++		WARN("cgroup_set frozen failed");
++	}
++
++	ret = get_all_pids(cg_ops, &pids, &len);
++	if (ret < 0) {
++		WARN("failed to get all pids");
++	}
++
++	for (i = 0; i < len; i++) {
++		ret = kill(pidsi, SIGKILL);
++		if (ret < 0 && errno != ESRCH) {
++			WARN("Can not kill process (pid=%d) with SIGKILL for container %s", pidsi, handler->name);
++		}
++	}
++
++	ret = set_cgroup_freezer(cg_ops, "THAWED");
++	if (ret < 0 && errno != ENOENT) {
++		WARN("cgroup_set thawed failed");
++	}
++
++	for (i = 0; i < len; i++) {
++		ret = lxc_wait_for_pid_status(pidsi);
++		if (ret < 0 && errno != ECHILD) {
++			WARN("Failed to wait pid %d for container %s: %s", pidsi, handler->name, strerror(errno));
++		}
++	}
++
++	free(pids);
++}
++#endif
++
+ void lxc_end(struct lxc_handler *handler)
+ {
+ 	int ret;
+@@ -945,14 +1153,44 @@ void lxc_end(struct lxc_handler *handler)
+ 
+ 	handler->lsm_ops->cleanup(handler->lsm_ops, handler->conf, handler->lxcpath);
+ 
++
++#ifdef HAVE_ISULAD
++	// close maincmd fd before destroy cgroup for isulad
++	if (handler->conf->reboot == REBOOT_NONE) {
++		/* For all new state clients simply close the command socket.
++		 * This will inform all state clients that the container is
++		 * STOPPED and also prevents a race between a open()/close() on
++		 * the command socket causing a new process to get ECONNREFUSED
++		 * because we haven't yet closed the command socket.
++		 */
++		close_prot_errno_disarm(handler->conf->maincmd_fd);
++		TRACE("Closed command socket");
++	}
++	int retry_count = 0;
++	int max_retry = 10;
++retry:
++	if (cgroup_ops != NULL && !cgroup_ops->payload_destroy(cgroup_ops, handler)) {
++	        TRACE("Trying to kill all subprocess");
++	        signal_all_processes(handler);
++	        TRACE("Finished kill all subprocess");
++	        if (retry_count < max_retry) {
++				usleep(100 * 1000); /* 100 millisecond */
++				retry_count++;
++				goto retry;
++		}
++		SYSERROR("Failed to destroy cgroup path for container: \"%s\"", handler->name);
++	}
++#else
+ 	if (cgroup_ops) {
+ 		cgroup_ops->payload_destroy(cgroup_ops, handler);
+ 		cgroup_ops->monitor_destroy(cgroup_ops, handler);
+ 	}
++#endif
+ 
+ 	put_lxc_rootfs(&handler->conf->rootfs, true);
+ 
+ 	if (handler->conf->reboot == REBOOT_NONE) {
++#ifndef HAVE_ISULAD
+ 		/* For all new state clients simply close the command socket.
+ 		 * This will inform all state clients that the container is
+ 		 * STOPPED and also prevents a race between a open()/close() on
+@@ -961,12 +1199,23 @@ void lxc_end(struct lxc_handler *handler)
+ 		 */
+ 		close_prot_errno_disarm(handler->conf->maincmd_fd);
+ 		TRACE("Closed command socket");
++#endif
+ 
+ 		/* This function will try to connect to the legacy lxc-monitord
+ 		 * state server and only exists for backwards compatibility.
+ 		 */
+ 		lxc_monitor_send_state(name, STOPPED, handler->lxcpath);
+ 
++#ifdef HAVE_ISULAD
++		/* isuald: write exit code to exit fifo */
++		if (handler->conf->exit_fd >= 0) {
++			ret = write(handler->conf->exit_fd, &handler->exit_code, sizeof(int));
++			if (ret != sizeof(int)) {
++				SYSERROR("Failed to write to exit code to exit fifo.");
++			}
++		}
++#endif
++
+ 		/* The command socket is closed so no one can acces the command
+ 		 * socket anymore so there's no need to lock it.
+ 		 */
+@@ -1060,6 +1309,25 @@ static int do_start(void *data)
+ 
+ 	lxc_sync_fini_parent(handler);
+ 
++#ifdef HAVE_ISULAD
++	sigset_t mask;
++
++	/*isulad: restore default signal handlers and unblock all signals*/
++	for (int i = 1; i < NSIG; i++)
++		signal(i, SIG_DFL);
++
++	ret = sigfillset(&mask);
++	if (ret < 0) {
++		SYSERROR("Failed to fill signal mask");
++		goto out_warn_father;
++	}
++	ret = sigprocmask(SIG_UNBLOCK, &mask, NULL);
++	if (ret < 0) {
++		SYSERROR("Failed to set signal mask");
++		goto out_warn_father;
++	}
++#endif
++
+ 	if (lxc_abstract_unix_recv_one_fd(data_sock1, &status_fd, NULL, 0) < 0) {
+ 		ERROR("Failed to receive status file descriptor from parent process");
+ 		goto out_warn_father;
+@@ -1153,7 +1421,11 @@ static int do_start(void *data)
+ 	 * means that migration won't work, but at least we won't spew output
+ 	 * where it isn't wanted.
+ 	 */
++#ifdef HAVE_ISULAD
++	if (!handler->disable_pty && handler->daemonize && !handler->conf->autodev) {
++#else
+ 	if (handler->daemonize && !handler->conf->autodev) {
++#endif
+ 		char pathPATH_MAX;
+ 
+ 		ret = strnprintf(path, sizeof(path), "%s/dev/null",
+@@ -1269,6 +1541,9 @@ static int do_start(void *data)
+ 	/* Setup the container, ip, names, utsname, ... */
+ 	ret = lxc_setup(handler);
+ 	if (ret < 0) {
++#ifdef HAVE_ISULAD
++		lxc_write_error_message(handler->conf->errpipe1, "Failed to setup lxc, please check the config file.");
++#endif
+ 		ERROR("Failed to setup container \"%s\"", handler->name);
+ 		goto out_warn_father;
+ 	}
+@@ -1291,6 +1566,43 @@ static int do_start(void *data)
+ 		DEBUG("Set PR_SET_NO_NEW_PRIVS to block execve() gainable privileges");
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: dup2 pipe00 to container stdin, pipe11 to container stdout, pipe21 to container stderr */
++	if (handler->disable_pty) {
++		if (handler->conf->console.pipes01 >= 0) {
++			close(handler->conf->console.pipes01);
++			handler->conf->console.pipes01 = -1;
++		}
++
++		if (handler->conf->console.pipes00 >= 0) {
++			ret = dup2(handler->conf->console.pipes00, STDIN_FILENO);
++			if (ret < 0)
++				goto out_warn_father;
++		}
++
++		if (handler->conf->console.pipes10 >= 0) {
++			close(handler->conf->console.pipes10);
++			handler->conf->console.pipes10 = -1;
++		}
++
++		if (handler->conf->console.pipes11 >= 0) {
++			ret = dup2(handler->conf->console.pipes11, STDOUT_FILENO);
++			if (ret < 0)
++				goto out_warn_father;
++		}
++		if (handler->conf->console.pipes20 >= 0) {
++			close(handler->conf->console.pipes20);
++			handler->conf->console.pipes20 = -1;
++		}
++
++		if (handler->conf->console.pipes21 >= 0) {
++			ret = dup2(handler->conf->console.pipes21, STDERR_FILENO);
++			if (ret < 0)
++				goto out_warn_father;
++		}
++	}
++#endif
++
+ 	/* If we mounted a temporary proc, then unmount it now. */
+ 	tmp_proc_unmount(handler->conf);
+ 
+@@ -1307,7 +1619,11 @@ static int do_start(void *data)
+ 
+ 	close_prot_errno_disarm(handler->sigfd);
+ 
++#ifdef HAVE_ISULAD
++	if (!handler->disable_pty && handler->conf->console.pty < 0 && handler->daemonize) {
++#else
+ 	if (handler->conf->console.pty < 0 && handler->daemonize) {
++#endif
+ 		if (devnull_fd < 0) {
+ 			devnull_fd = open_devnull();
+ 			if (devnull_fd < 0)
+@@ -1326,6 +1642,16 @@ static int do_start(void *data)
+ 	setsid();
+ 
+ 	if (handler->conf->init_cwd) {
++#ifdef HAVE_ISULAD
++		/* try to craete workdir if not exist */
++		struct stat st;
++		if (stat(handler->conf->init_cwd, &st) < 0 && mkdir_p(handler->conf->init_cwd, 0755) < 0) {
++			SYSERROR("Try to create directory \"%s\" as workdir failed", handler->conf->init_cwd);
++			lxc_write_error_message(handler->conf->errpipe1, "%s:%d: Failed to create workdir: %s.",
++			                        __FILE__, __LINE__, strerror(errno));
++			goto out_warn_father;
++		}
++#endif
+ 		ret = chdir(handler->conf->init_cwd);
+ 		if (ret < 0) {
+ 			SYSERROR("Could not change directory to \"%s\"",
+@@ -1372,12 +1698,26 @@ static int do_start(void *data)
+ 		}
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	if (prctl(PR_SET_KEEPCAPS, 1) < 0) {
++		SYSERROR("Failed to keep permitted capabilities");
++		goto out_warn_father;
++	}
++#endif
++
+ 	/* The container has been setup. We can now switch to an unprivileged
+ 	 * uid/gid.
+ 	 */
+ 	new_uid = handler->conf->init_uid;
+ 	new_gid = handler->conf->init_gid;
+ 
++#ifdef HAVE_ISULAD
++	// isulad: set env home in container, must before "Avoid unnecessary syscalls."
++	if (lxc_setup_env_home(new_uid) < 0) {
++		goto out_warn_father;
++	}
++#endif
++
+ 	/* Avoid unnecessary syscalls. */
+ 	if (new_uid == nsuid)
+ 		new_uid = LXC_INVALID_UID;
+@@ -1419,6 +1759,19 @@ static int do_start(void *data)
+ 		goto out_warn_father;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: drop the cap of current process */
++	if (prctl(PR_SET_KEEPCAPS, 0) < 0) {
++		SYSERROR("Failed to clear permitted capabilities");
++		goto out_warn_father;
++	}
++
++	if (lxc_drop_caps(handler->conf)) {
++		SYSERROR("Failed to drop caps");
++		goto out_warn_father;
++	}
++#endif
++
+ 	if (handler->conf->monitor_signal_pdeath != SIGKILL) {
+ 		ret = lxc_set_death_signal(handler->conf->monitor_signal_pdeath,
+ 					   handler->monitor_pid, status_fd);
+@@ -1433,7 +1786,12 @@ static int do_start(void *data)
+ 	 * After this call, we are in error because this ops should not return
+ 	 * as it execs.
+ 	 */
++#ifdef HAVE_ISULAD
++	close_prot_errno_disarm(status_fd);
++	handler->ops->start(handler, handler->data, handler->daemonize ? handler->conf->errpipe1 : -1);
++#else
+ 	handler->ops->start(handler, handler->data);
++#endif
+ 
+ out_warn_father:
+ 	/*
+@@ -1604,6 +1962,94 @@ static inline void resolve_cgroup_clone_flags(struct lxc_handler *handler)
+ 	handler->ns_unshare_flags	|= CLONE_NEWCGROUP;
+ }
+ 
++#ifdef HAVE_ISULAD
++static int lxc_write_container_info(char *filename, pid_t pid, pid_t p_pid,
++		unsigned long long start_at, unsigned long long p_start_at)
++{
++	FILE *pid_fp = NULL;
++	int ret = 0;
++
++	pid_fp = lxc_fopen(filename, "w");
++	if (pid_fp == NULL) {
++		SYSERROR("Failed to create pidfile '%s'",filename);
++		ret = -1;
++		goto out;
++	}
++
++	if (fprintf(pid_fp, "%d %llu %d %llu\n", pid, start_at, p_pid, p_start_at) < 0) {
++		SYSERROR("Failed to write '%s'", filename);
++		ret = -1;
++		goto out;
++	}
++out:
++	if (pid_fp)
++		fclose(pid_fp);
++	pid_fp = NULL;
++	return ret;
++}
++
++static int lxc_check_container_info(char *filename, pid_t pid, pid_t p_pid,
++		unsigned long long start_at, unsigned long long p_start_at)
++{
++	int ret = 0;
++	int num;
++	char sbuf1024 = {0}; /* bufs for stat */
++	int saved_pid;		/* process id */
++	int saved_ppid;		/* pid of parent process */
++	unsigned long long saved_start_time;	/* start time of process -- seconds since 1-1-70 */
++	unsigned long long saved_pstart_time;	/* start time of parent process -- seconds since 1-1-70 */
++
++	if ((lxc_file2str(filename, sbuf, sizeof(sbuf))) == -1) {
++		SYSERROR("Failed to read pidfile %s", filename);
++		ret = -1;
++		goto out;
++	}
++
++	num = sscanf(sbuf, "%d %Lu %d %Lu", &saved_pid, &saved_start_time, &saved_ppid, &saved_pstart_time);
++	if (num != 4) {
++		SYSERROR("Call sscanf error");
++		ret = -1;
++		goto out;
++	}
++
++	if (pid != saved_pid || p_pid != saved_ppid
++	                || start_at != saved_start_time || p_start_at != saved_pstart_time) {
++		ERROR("Check container info failed");
++		ret = -1;
++		goto out;
++	}
++
++out:
++	return ret;
++}
++
++/* isuald: save pid/ppid info */
++static int lxc_save_container_info(char *filename, pid_t pid)
++{
++	int ret = 0;
++	pid_t p_pid = 0;
++	unsigned long long start_at = 0;
++	unsigned long long p_start_at = 0;
++
++	start_at = lxc_get_process_startat(pid);
++	p_pid = getpid();
++	p_start_at = lxc_get_process_startat(p_pid);
++
++	ret = lxc_write_container_info(filename, pid, p_pid, start_at, p_start_at);
++	if (ret != 0) {
++		goto out;
++	}
++
++	ret = lxc_check_container_info(filename, pid, p_pid, start_at, p_start_at);
++	if (ret != 0) {
++		goto out;
++	}
++
++out:
++	return ret;
++}
++#endif
++
+ /* lxc_spawn() performs crucial setup tasks and clone()s the new process which
+  * exec()s the requested container binary.
+  * Note that lxc_spawn() runs in the parent namespaces. Any operations performed
+@@ -1741,6 +2187,32 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 		handler->clone_flags &= ~CLONE_PIDFD;
+ 	TRACE("Cloned child process %d", handler->pid);
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: close pipe after clone */
++	if (handler->conf->console.pipes00 >= 0) {
++		close(handler->conf->console.pipes00);
++		handler->conf->console.pipes00 = -1;
++	}
++
++	if (handler->conf->console.pipes11 >= 0) {
++		close(handler->conf->console.pipes11);
++		handler->conf->console.pipes11 = -1;
++	}
++
++	if (handler->conf->console.pipes21 >= 0) {
++		close(handler->conf->console.pipes21);
++		handler->conf->console.pipes21 = -1;
++	}
++
++	/* isulad: save pid/ppid info into file*/
++	if (handler->conf->container_info_file) {
++		if (lxc_save_container_info(handler->conf->container_info_file, handler->pid)) {
++			ERROR("Failed to save cloned container pid");
++			goto out_delete_net;
++		}
++	}
++#endif
++
+ 	ret = core_scheduling(handler);
+ 	if (ret < 0)
+ 		goto out_delete_net;
+@@ -1757,6 +2229,13 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 	if (ret < 0)
+ 		SYSERROR("Failed to set environment variable: LXC_PID=%s", pidstr);
+ 
++#ifdef HAVE_ISULAD
++	if (handler->cgroup_ops->container_cgroup) {
++		if (setenv("LXC_CGROUP_PATH", handler->cgroup_ops->container_cgroup, 1))
++			SYSERROR("Failed to set environment variable: LXC_CGROUP_PATH=%s.", handler->cgroup_ops->container_cgroup);
++	}
++#endif
++
+ 	for (i = 0; i < LXC_NS_MAX; i++)
+ 		if (handler->ns_on_clone_flags & ns_infoi.clone_flag)
+ 			INFO("Cloned %s", ns_infoi.flag_name);
+@@ -1848,7 +2327,11 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 		goto out_delete_net;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	ret = setup_resource_limits(conf, handler->pid, conf->errpipe1);
++#else
+ 	ret = setup_resource_limits(conf, handler->pid);
++#endif
+ 	if (ret < 0) {
+ 		ERROR("Failed to setup resource limits");
+ 		goto out_delete_net;
+@@ -1911,6 +2394,27 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 		goto out_delete_net;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: Run oci prestart hook at here */
++	ret = run_oci_hooks(name, "oci-prestart", conf, lxcpath);
++	if (ret < 0) {
++		ERROR("Failed to run oci prestart hooks");
++		goto out_delete_net;
++	}
++
++	if (START_TIMEOUT == global_timeout_state) {
++		lxc_write_error_message(conf->errpipe1, "Starting the container \"%s\" timeout.", name);
++		ERROR("Starting the container \"%s\" timeout.", name);
++		goto out_delete_net;
++	}
++
++       /* Tell the child to continue its initialization. We'll get
++        * LXC_SYNC_POST_OCI_PRESTART_HOOK when it is ready for us to run oci prestart hooks.
++        */
++       if (lxc_sync_barrier_child(handler, LXC_SYNC_POST_OCI_PRESTART_HOOK))
++               goto out_delete_net;
++#endif
++
+ 	if (!lxc_sync_wake_child(handler, START_SYNC_FDS))
+ 		goto out_delete_net;
+ 
+@@ -1969,6 +2473,22 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 	if (ret < 0)
+ 		goto out_abort;
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: Run oci prestart hook at here */
++	ret = run_oci_hooks(name, "oci-poststart", conf, lxcpath);
++	if (ret < 0) {
++		ERROR("Failed to run oci poststart hooks");
++		goto out_abort;
++	}
++
++	if (START_TIMEOUT == global_timeout_state) {
++		lxc_write_error_message(conf->errpipe1, "Starting the container \"%s\" timeout.", name);
++		ERROR("Starting the container \"%s\" timeout.", name);
++		goto out_abort;
++	}
++
++#endif
++
+ 	ret = lxc_set_state(name, handler, RUNNING);
+ 	if (ret < 0) {
+ 		ERROR("Failed to set state to \"%s\"", lxc_state2str(RUNNING));
+@@ -2014,9 +2534,82 @@ static int lxc_inherit_namespaces(struct lxc_handler *handler)
+ 	return 0;
+ }
+ 
++#ifdef HAVE_ISULAD
++/* isulad: start timeout thread function */
++static void* wait_start_timeout(void *arg)
++{
++	struct start_timeout_conf *conf = (struct start_timeout_conf *)arg;
++
++	sem_post(&global_timeout_sem);
++
++	if (!conf || conf->timeout < 1)
++		goto out;
++
++	sleep(conf->timeout);
++
++	global_timeout_state = START_TIMEOUT;
++
++out:
++	free(conf);
++	return ((void *)0);
++}
++
++/* isulad: create start timeout thread */
++static int create_start_timeout_thread(struct lxc_conf *conf, unsigned int start_timeout)
++{
++	int ret = 0;
++	pthread_t ptid;
++	pthread_attr_t attr;
++	struct start_timeout_conf *timeout_conf = NULL;
++
++	if (sem_init(&global_timeout_sem, 0, 0)) {
++		ERROR("Failed to init start timeout semaphore");/*lint !e613*/
++		ret = -1;
++		return ret;
++	}
++
++	timeout_conf = malloc(sizeof(struct start_timeout_conf));
++	if (timeout_conf == NULL) {
++		ERROR("Failed to malloc start timeout conf");
++		ret = -1;
++		goto out;
++	}
++
++	memset(timeout_conf, 0, sizeof(struct start_timeout_conf));
++	timeout_conf->errfd = conf->errpipe1;
++	timeout_conf->timeout = start_timeout;
++
++	pthread_attr_init(&attr);
++	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
++	ret = pthread_create(&ptid, &attr, wait_start_timeout, timeout_conf);
++	pthread_attr_destroy(&attr);
++	if (ret != 0) {
++		ERROR("Create start wait timeout thread failed");
++		free(timeout_conf);
++		goto out;
++	}
++
++	sem_wait(&global_timeout_sem);
++out:
++	sem_destroy(&global_timeout_sem);
++	return ret;
++}
++
++// isulad: send '128 + signal' if container is killed by signal.
++#define EXIT_SIGNAL_OFFSET 128
++#endif
++
++#ifdef HAVE_ISULAD
++int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
++		void *data, const char *lxcpath, bool daemonize, int *error_num,
++		unsigned int start_timeout)
++{
++	int exit_code;
++#else
+ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
+ 		void *data, const char *lxcpath, bool daemonize, int *error_num)
+ {
++#endif
+ 	int ret, status;
+ 	const char *name = handler->name;
+ 	struct lxc_conf *conf = handler->conf;
+@@ -2032,6 +2625,17 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
+ 	handler->daemonize = daemonize;
+ 	cgroup_ops = handler->cgroup_ops;
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: add start timeout limit */
++	if (start_timeout > 0) {
++		ret = create_start_timeout_thread(conf, start_timeout);
++		if (ret) {
++			ERROR("Failed to create start timeout thread for container \"%s\".", name);
++			goto out_abort;
++		}
++	}
++#endif
++
+ 	if (!attach_block_device(handler->conf)) {
+ 		ERROR("Failed to attach block device");
+ 		ret = -1;
+@@ -2116,11 +2720,13 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
+ 		goto out_delete_network;
+ 	}
+ 
++#ifndef HAVE_ISULAD
+ 	if (!handler->init_died && handler->pid > 0) {
+ 		ERROR("Child process is not killed");
+ 		ret = -1;
+ 		goto out_delete_network;
+ 	}
++#endif
+ 
+ 	status = lxc_wait_for_pid_status(handler->pid);
+ 	if (status < 0)
+@@ -2130,6 +2736,20 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
+ 	 * reboot. This should mean it was an lxc-execute which simply exited.
+ 	 * In any case, treat it as a 'halt'.
+ 	 */
++#ifdef HAVE_ISULAD
++	// isulad: recored log for container init exit
++	if (WIFSIGNALED(status)) {
++		int signal_nr = WTERMSIG(status);
++		exit_code = EXIT_SIGNAL_OFFSET + signal_nr;
++		ERROR("Container \"%s\" init exited with signal %d", name, signal_nr);
++	} else if (WIFEXITED(status)) {
++		exit_code = WEXITSTATUS(status);
++		ERROR("Container \"%s\" init exited with status %d", name, exit_code);
++	} else {
++		exit_code = -1;
++		ERROR("Container \"%s\" init exited with unknown status", name);
++	}
++#else
+ 	if (WIFSIGNALED(status)) {
+ 		int signal_nr = WTERMSIG(status);
+ 		switch(signal_nr) {
+@@ -2148,16 +2768,25 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
+ 			break;
+ 		}
+ 	}
++#endif
+ 
+ 	ret = lxc_restore_phys_nics_to_netns(handler);
+ 	if (ret < 0)
+ 		ERROR("Failed to move physical network devices back to parent network namespace");
+ 
++#ifdef HAVE_ISULAD
++	lxc_monitor_send_exit_code(name, exit_code, handler->lxcpath);
++#else
+ 	lxc_monitor_send_exit_code(name, status, handler->lxcpath);
++#endif
+ 	lxc_error_set_and_log(handler->pid, status);
+ 	if (error_num)
+ 		*error_num = handler->exit_status;
+ 
++#ifdef HAVE_ISULAD
++	handler->exit_code = exit_code; /* record exit code */
++#endif
++
+ 	lxc_delete_network(handler);
+ 	detach_block_device(handler->conf);
+ 	lxc_end(handler);
+@@ -2187,7 +2816,11 @@ struct start_args {
+ 	char *const *argv;
+ };
+ 
++#ifdef HAVE_ISULAD
++static int start(struct lxc_handler *handler, void* data, int fd)
++#else
+ static int start(struct lxc_handler *handler, void* data)
++#endif
+ {
+ 	struct start_args *arg = data;
+ 
+@@ -2195,6 +2828,9 @@ static int start(struct lxc_handler *handler, void* data)
+ 
+ 	execvp(arg->argv0, arg->argv);
+ 	SYSERROR("Failed to exec \"%s\"", arg->argv0);
++#ifdef HAVE_ISULAD
++	lxc_write_error_message(fd, "exec: \"%s\": %s.", arg->argv0, strerror(errno));
++#endif
+ 	return 0;
+ }
+ 
+@@ -2212,14 +2848,22 @@ static struct lxc_operations start_ops = {
+ };
+ 
+ int lxc_start(char *const argv, struct lxc_handler *handler,
++#ifdef HAVE_ISULAD
++	      const char *lxcpath, bool daemonize, int *error_num, unsigned int start_timeout)
++#else
+ 	      const char *lxcpath, bool daemonize, int *error_num)
++#endif
+ {
+ 	struct start_args start_arg = {
+ 		.argv = argv,
+ 	};
+ 
+ 	TRACE("Doing lxc_start");
++#ifdef HAVE_ISULAD
++	return __lxc_start(handler, &start_ops, &start_arg, lxcpath, daemonize, error_num, start_timeout);
++#else
+ 	return __lxc_start(handler, &start_ops, &start_arg, lxcpath, daemonize, error_num);
++#endif
+ }
+ 
+ static void lxc_destroy_container_on_signal(struct lxc_handler *handler,
+@@ -2291,3 +2935,261 @@ static bool do_destroy_container(struct lxc_handler *handler)
+ 
+ 	return storage_destroy(handler->conf);
+ }
++
++#ifdef HAVE_ISULAD
++/*isulad: set env for clean resources */
++static int clean_resource_set_env(struct lxc_handler *handler)
++{
++	const char *name = handler->name;
++	struct lxc_conf *conf = handler->conf;
++	char bufstrPATH_MAX + 1;
++	int i = 0;
++	int j = 0;
++	int len = 2; //set "LXC_PID" and "LXC_CGNS_AWARE"
++
++	if (conf == NULL || conf->ocihooks == NULL || conf->ocihooks->poststop_len == 0) {
++		return 0;
++	}
++
++	if (name) {
++		len++;
++	}
++	if (conf->rcfile) {
++		len++;
++	}
++	if (conf->rootfs.mount) {
++		len++;
++	}
++	if (conf->rootfs.path) {
++		len++;
++	}
++	if (conf->console.path) {
++		len++;
++	}
++	if (conf->console.log_path) {
++		len++;
++	}
++	if (handler->cgroup_ops->container_cgroup) {
++		len++;
++	}
++
++	for (; i < conf->ocihooks->poststop_len; i++) {
++		size_t cap = conf->ocihooks->poststopi->env_len;
++		size_t newcap = cap + len + 1;
++		if (lxc_grow_array((void ***)&(conf->ocihooks->poststopi->env), &cap, newcap, 1) != 0) {
++			return -1;
++		}
++		j = conf->ocihooks->poststopi->env_len;
++		/* Start of environment variable setup for hooks. */
++		if (name) {
++			snprintf(bufstr, PATH_MAX + 1, "LXC_NAME=%s", name);
++			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
++		}
++		if (conf->rcfile) {
++			snprintf(bufstr, PATH_MAX + 1, "LXC_CONFIG_FILE=%s", conf->rcfile);
++			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
++		}
++		if (conf->rootfs.mount) {
++			snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_MOUNT=%s", conf->rootfs.mount);
++			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
++		}
++		if (conf->rootfs.path) {
++			snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_PATH=%s", conf->rootfs.path);
++			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
++		}
++		if (conf->console.path) {
++			snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE=%s", conf->console.path);
++			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
++		}
++		if (conf->console.log_path) {
++			snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE_LOGPATH=%s", conf->console.log_path);
++			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
++		}
++		conf->ocihooks->poststopi->envj++ = safe_strdup("LXC_CGNS_AWARE=1");
++
++		snprintf(bufstr, PATH_MAX + 1, "LXC_PID=%d", handler->pid);
++		conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
++		if (handler->cgroup_ops->container_cgroup) {
++			snprintf(bufstr, PATH_MAX + 1, "LXC_CGROUP_PATH=%s", handler->cgroup_ops->container_cgroup);
++			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
++		}
++		conf->ocihooks->poststopi->env_len = j;
++		/* End of environment variable setup for hooks. */
++	}
++	return 0;
++}
++
++/*isulad: init handler for clean */
++static struct lxc_handler *lxc_init_clean_handler(char *name, char *lxcpath, struct lxc_conf *conf, pid_t pid)
++{
++	int i;
++	struct lxc_handler *handler;
++
++	handler = malloc(sizeof(*handler));
++	if (handler == NULL)
++		return NULL;
++
++	memset(handler, 0, sizeof(*handler));
++
++	/* Note that am_guest_unpriv() checks the effective uid. We
++	 * probably don't care if we are real root only if we are running
++	 * as root so this should be fine.
++	 */
++	handler->am_root = !am_guest_unpriv();
++	handler->data_sock0 = handler->data_sock1 = -1;
++	handler->conf = conf;
++	handler->lxcpath = lxcpath;
++	handler->pinfd = -1;
++	handler->sigfd = -EBADF;
++	handler->pidfd = -EBADF;
++	handler->init_died = false;
++	handler->monitor_status_fd = -EBADF;
++	handler->pid = pid;
++	handler->state_socket_pair0 = handler->state_socket_pair1 = -1;
++	if (handler->conf->reboot == REBOOT_NONE)
++		lxc_list_init(&handler->conf->state_clients);
++
++	for (i = 0; i < LXC_NS_MAX; i++)
++		handler->nsfdi = -1;
++
++	handler->name = name;
++	handler->exit_code = -1; /* isulad: record exit code of container */
++
++	handler->cgroup_ops = cgroup_init(conf);
++	if (!handler->cgroup_ops) {
++		ERROR("Failed to initialize cgroup driver");
++		goto on_error;
++	}
++
++	INFO("Container \"%s\" 's clean handler is initialized.", name);
++
++	return handler;
++
++on_error:
++	lxc_put_handler(handler);
++
++	return NULL;
++}
++
++/*isulad: init handler for clean */
++static struct lxc_handler *lxc_init_pids_handler(char *name, char *lxcpath, struct lxc_conf *conf)
++{
++	int i;
++	struct lxc_handler *handler;
++
++	handler = malloc(sizeof(*handler));
++	if (handler == NULL)
++		return NULL;
++
++	memset(handler, 0, sizeof(*handler));
++
++	/* Note that am_guest_unpriv() checks the effective uid. We
++	 * probably don't care if we are real root only if we are running
++	 * as root so this should be fine.
++	 */
++	handler->am_root = !am_guest_unpriv();
++	handler->data_sock0 = handler->data_sock1 = -1;
++	handler->conf = conf;
++	handler->lxcpath = lxcpath;
++	handler->pinfd = -1;
++	handler->sigfd = -EBADF;
++	handler->init_died = false;
++	handler->state_socket_pair0 = handler->state_socket_pair1 = -1;
++	handler->monitor_status_fd = -EBADF;
++	handler->pidfd = -EBADF;
++	if (handler->conf->reboot == REBOOT_NONE)
++		lxc_list_init(&handler->conf->state_clients);
++
++	for (i = 0; i < LXC_NS_MAX; i++)
++		handler->nsfdi = -1;
++
++	handler->name = name;
++	handler->exit_code = -1; /* isulad: record exit code of container */
++
++	handler->cgroup_ops = cgroup_init(conf);
++	if (!handler->cgroup_ops) {
++		ERROR("Failed to initialize cgroup driver");
++		goto on_error;
++	}
++
++	INFO("Container \"%s\" 's clean handler is initialized.", name);
++
++	return handler;
++
++on_error:
++	lxc_put_handler(handler);
++
++	return NULL;
++}
++
++/*isulad: do_lxcapi_clean_resource */
++int do_lxcapi_clean_resource(char *name, char *lxcpath, struct lxc_conf *conf, pid_t pid)
++{
++	int ret = 0;
++	struct lxc_handler *handler = NULL;
++	int retry_count = 0;
++	int max_retry = 10;
++
++	handler = lxc_init_clean_handler(name, lxcpath, conf, pid);
++	if (!handler) {
++		ERROR("Failed to init container %s clean handler", name);
++		ret = -1;
++		goto out;
++	}
++
++	if (clean_resource_set_env(handler) != 0) {
++		ERROR("Failed to set env for poststop hooks");
++		ret = -1;
++		goto out;
++	}
++
++	if (run_oci_hooks(handler->name, "oci-poststop", handler->conf, handler->lxcpath)) {
++		ERROR("Failed to run lxc.hook.post-stop for container \"%s\".", handler->name);
++		ret = -1;
++	}
++
++retry:
++	if (!handler->cgroup_ops->payload_destroy(handler->cgroup_ops, handler)) {
++		TRACE("Trying to kill all subprocess");
++		signal_all_processes(handler);
++		TRACE("Finished kill all subprocess");
++		if (retry_count < max_retry) {
++			usleep(100 * 1000); /* 100 millisecond */
++			retry_count++;
++			goto retry;
++		}
++		SYSERROR("Failed to destroy cgroup path for container: \"%s\"", handler->name);
++		ret = -1;
++	}
++
++out:
++	lxc_put_handler(handler);
++	return ret;
++}
++
++/*isulad: do_lxcapi_get_pids */
++int do_lxcapi_get_pids(char *name, char *lxcpath, struct lxc_conf *conf, pid_t **pids,size_t *pids_len)
++{
++	int ret = 0;
++	struct lxc_handler *handler = NULL;
++	struct cgroup_ops *cg_ops = NULL;
++
++	handler = lxc_init_pids_handler(name, lxcpath, conf);
++	if (!handler) {
++		ERROR("Failed to init container %s clean handler", name);
++		ret = -1;
++		goto out;
++	}
++
++	cg_ops = handler->cgroup_ops;
++	ret = get_all_pids(cg_ops, pids, pids_len);
++	if (ret < 0) {
++		WARN("failed to get all pids");
++	}
++
++out:
++	lxc_put_handler(handler);
++	return ret;
++}
++
++#endif
+diff --git a/src/lxc/start.h b/src/lxc/start.h
+index bbd1a83..d03e5d5 100644
+--- a/src/lxc/start.h
++++ b/src/lxc/start.h
+@@ -153,7 +153,11 @@ struct execute_args {
+ };
+ 
+ struct lxc_operations {
++#ifdef HAVE_ISULAD
++	int (*start)(struct lxc_handler *, void *, int);
++#else
+ 	int (*start)(struct lxc_handler *, void *);
++#endif
+ 	int (*post_start)(struct lxc_handler *, void *);
+ };
+ 
+@@ -184,12 +188,26 @@ static inline int inherit_fds(struct lxc_handler *handler, bool closeall)
+ 				   ARRAY_SIZE(handler->keep_fds));
+ }
+ 
++#ifdef HAVE_ISULAD
++__hidden extern int __lxc_start(struct lxc_handler *handler,
++		struct lxc_operations* ops, void *data, const char *lxcpath,
++		bool daemonize, int *error_num, unsigned int start_timeout);
++#else
+ __hidden extern int __lxc_start(struct lxc_handler *, struct lxc_operations *, void *, const char *,
+ 				bool, int *);
++#endif
+ 
+ __hidden extern int resolve_clone_flags(struct lxc_handler *handler);
+ __hidden extern void lxc_expose_namespace_environment(const struct lxc_handler *handler);
+ 
++#ifdef HAVE_ISULAD
++/*isulad: do_lxcapi_clean_resource */
++extern int do_lxcapi_clean_resource(char *name, char *lxcpath, struct lxc_conf *conf, pid_t pid);
++
++/*isulad: do_lxcapi_get_pids */
++extern int do_lxcapi_get_pids(char *name, char *lxcpath, struct lxc_conf *conf, pid_t **pids,size_t *pids_len);
++#endif
++
+ static inline bool container_uses_namespace(const struct lxc_handler *handler,
+ 					    unsigned int ns_flag)
+ {
+-- 
+2.25.1
+

_service:tar_scm:0004-refactor-patch-code-of-lxccontianer-and-so-on.patch Deleted

@@ -1,2947 +0,0 @@
-From 281d09f2dcd4dfd105b41d8da558d4a126ca190b Mon Sep 17 00:00:00 2001
-From: WangFengTu <wangfengtu@huawei.com>
-Date: Mon, 18 Jul 2022 14:14:14 +0800
-Subject: PATCH refactor patch code of lxccontianer and so on
-
-Signed-off-by: WangFengTu <wangfengtu@huawei.com>
----
- src/lxc/af_unix.h         |   6 +
- src/lxc/cgroups/cgroup.h  |  13 +
- src/lxc/confile.c         | 639 +++++++++++++++++++++++++++
- src/lxc/lxccontainer.c    | 898 +++++++++++++++++++++++++++++++++++++-
- src/lxc/lxclock.c         |  31 ++
- src/lxc/mainloop.c        |  16 +
- src/lxc/path.c            | 655 +++++++++++++++++++++++++++
- src/lxc/storage/dir.c     |  34 ++
- src/lxc/storage/loop.c    |  48 +-
- src/lxc/storage/storage.c |  31 +-
- 10 files changed, 2367 insertions(+), 4 deletions(-)
- create mode 100644 src/lxc/path.c
-
-diff --git a/src/lxc/af_unix.h b/src/lxc/af_unix.h
-index 5a1482c..be26ff0 100644
---- a/src/lxc/af_unix.h
-+++ b/src/lxc/af_unix.h
-@@ -41,4 +41,10 @@ extern int lxc_unix_connect(struct sockaddr_un *addr);
- extern int lxc_unix_connect_type(struct sockaddr_un *addr, int type);
- extern int lxc_socket_set_timeout(int fd, int rcv_timeout, int snd_timeout);
- 
-+#ifdef HAVE_ISULAD
-+extern int lxc_abstract_unix_recv_fds_timeout(int fd, int *recvfds, int num_recvfds,
-+                                       void *data, size_t size, unsigned int timeout);
-+extern int lxc_named_unix_open(const char *path, int type, int flags);
-+extern int lxc_named_unix_connect(const char *path);
-+#endif
- #endif /* __LXC_AF_UNIX_H */
-diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h
-index c5bf794..4791112 100644
---- a/src/lxc/cgroups/cgroup.h
-+++ b/src/lxc/cgroups/cgroup.h
-@@ -109,6 +109,11 @@ struct cgroup_ops {
- 	char *container_cgroup;
- 	char *monitor_cgroup;
- 
-+#ifdef HAVE_ISULAD
-+	int errfd;
-+	bool no_controller;
-+#endif
-+
- 	/* @hierarchies
- 	 * - A NULL-terminated array of struct hierarchy, one per legacy
- 	 *   hierarchy. No duplicates. First sufficient, writeable mounted
-@@ -146,14 +151,22 @@ struct cgroup_ops {
- 	 */
- 	cgroup_layout_t cgroup_layout;
- 
-+#ifdef HAVE_ISULAD
-+	int (*data_init)(struct cgroup_ops *ops, struct lxc_conf *conf);
-+	bool (*payload_destroy)(struct cgroup_ops *ops, struct lxc_handler *handler);
-+#else
- 	int (*data_init)(struct cgroup_ops *ops);
- 	void (*payload_destroy)(struct cgroup_ops *ops, struct lxc_handler *handler);
-+#endif
- 	void (*monitor_destroy)(struct cgroup_ops *ops, struct lxc_handler *handler);
- 	bool (*monitor_create)(struct cgroup_ops *ops, struct lxc_handler *handler);
- 	bool (*monitor_enter)(struct cgroup_ops *ops, struct lxc_handler *handler);
- 	bool (*payload_create)(struct cgroup_ops *ops, struct lxc_handler *handler);
- 	bool (*payload_enter)(struct cgroup_ops *ops, struct lxc_handler *handler);
- 	const char *(*get_cgroup)(struct cgroup_ops *ops, const char *controller);
-+#ifdef HAVE_ISULAD
-+	const char *(*get_cgroup_full_path)(struct cgroup_ops *ops, const char *controller);
-+#endif
- 	bool (*escape)(const struct cgroup_ops *ops, struct lxc_conf *conf);
- 	int (*num_hierarchies)(struct cgroup_ops *ops);
- 	bool (*get_hierarchies)(struct cgroup_ops *ops, int n, char ***out);
-diff --git a/src/lxc/confile.c b/src/lxc/confile.c
-index 4c27e7d..22d7255 100644
---- a/src/lxc/confile.c
-+++ b/src/lxc/confile.c
-@@ -147,6 +147,19 @@ lxc_config_define(tty_dir);
- lxc_config_define(uts_name);
- lxc_config_define(sysctl);
- lxc_config_define(proc);
-+#ifdef HAVE_ISULAD
-+lxc_config_define(init_args);
-+lxc_config_define(init_groups);
-+lxc_config_define(populate_device);
-+lxc_config_define(umask);
-+lxc_config_define(rootfs_masked_paths);
-+lxc_config_define(rootfs_ro_paths);
-+lxc_config_define(systemd);
-+lxc_config_define(console_log_driver);
-+lxc_config_define(console_syslog_tag);
-+lxc_config_define(console_syslog_facility);
-+lxc_config_define(selinux_mount_context);
-+#endif
- 
- /*
-  * Important Note:
-@@ -259,6 +272,19 @@ static struct lxc_config_t config_jump_table = {
- 	{ "lxc.uts.name",                  set_config_uts_name,                    get_config_uts_name,                    clr_config_uts_name,                  },
- 	{ "lxc.sysctl",                    set_config_sysctl,                      get_config_sysctl,                      clr_config_sysctl,                    },
- 	{ "lxc.proc",                      set_config_proc,                        get_config_proc,                        clr_config_proc,                      },
-+#ifdef HAVE_ISULAD
-+	{ "lxc.isulad.init.args",          set_config_init_args,                   get_config_init_args,                   clr_config_init_args,                 },
-+	{ "lxc.isulad.init.groups",        set_config_init_groups,                 get_config_init_groups,                 clr_config_init_groups,               },
-+	{ "lxc.isulad.populate.device",    set_config_populate_device,             get_config_populate_device,             clr_config_populate_device,           },
-+	{ "lxc.isulad.umask",              set_config_umask,                       get_config_umask,                       clr_config_umask,                     },
-+	{ "lxc.isulad.rootfs.maskedpaths", set_config_rootfs_masked_paths,         get_config_rootfs_masked_paths,         clr_config_rootfs_masked_paths,       },
-+	{ "lxc.isulad.rootfs.ropaths",     set_config_rootfs_ro_paths,             get_config_rootfs_ro_paths,             clr_config_rootfs_ro_paths,           },
-+	{ "lxc.isulad.systemd",            set_config_systemd,                     get_config_systemd,                     clr_config_systemd,                   },
-+	{ "lxc.console.logdriver",         set_config_console_log_driver,          get_config_console_log_driver,          clr_config_console_log_driver,        },
-+	{ "lxc.console.syslog_tag",        set_config_console_syslog_tag,          get_config_console_syslog_tag,          clr_config_console_syslog_tag,        },
-+	{ "lxc.console.syslog_facility",   set_config_console_syslog_facility,     get_config_console_syslog_facility,     clr_config_console_syslog_facility,   },
-+	{ "lxc.selinux.mount_context",     set_config_selinux_mount_context,       get_config_selinux_mount_context,       clr_config_selinux_mount_context,     },
-+#endif
- };
- 
- static const size_t config_jump_table_size = sizeof(config_jump_table) / sizeof(struct lxc_config_t);
-@@ -1348,6 +1374,10 @@ static int set_config_environment(const char *key, const char *value,
- {
- 	struct lxc_list *list_item = NULL;
- 
-+#ifdef HAVE_ISULAD
-+	char *replaced = NULL;
-+#endif
-+
- 	if (lxc_config_value_empty(value))
- 		return lxc_clear_environment(lxc_conf);
- 
-@@ -1368,7 +1398,16 @@ static int set_config_environment(const char *key, const char *value,
- 		env_var1 = env_val;
- 		list_item->elem = lxc_string_join("=", env_var, false);
- 	} else {
-+#ifdef HAVE_ISULAD
-+		/* isulad: recover space replaced by SPACE_MAGIC_STR */
-+		replaced = lxc_string_replace(SPACE_MAGIC_STR, " ", value);
-+		if(!replaced)
-+			goto on_error;
-+
-+		list_item->elem = replaced;
-+#else
- 		list_item->elem = strdup(value);
-+#endif
- 	}
- 
- 	if (!list_item->elem)
-@@ -2291,11 +2330,14 @@ static int set_config_console_rotate(const char *key, const char *value,
- 	if (lxc_safe_uint(value, &lxc_conf->console.log_rotate) < 0)
- 		return -1;
- 
-+#ifndef HAVE_ISULAD
-+	/* isulad: support rotate muti-files */
- 	if (lxc_conf->console.log_rotate > 1) {
- 		ERROR("The \"lxc.console.rotate\" config key can only be set "
- 		      "to 0 or 1");
- 		return -1;
- 	}
-+#endif
- 
- 	return 0;
- }
-@@ -2581,6 +2623,11 @@ static int set_config_rootfs_options(const char *key, const char *value,
- 	int ret;
- 	struct lxc_rootfs *rootfs = &lxc_conf->rootfs;
- 
-+#ifdef HAVE_ISULAD
-+	ret = parse_mntopts(value, &mflags, &pflags, &mdata);
-+	if (ret < 0)
-+		return -EINVAL;
-+#else
- 	ret = parse_mntopts(value, &mflags, &mdata);
- 	if (ret < 0)
- 		return -EINVAL;
-@@ -2590,6 +2637,7 @@ static int set_config_rootfs_options(const char *key, const char *value,
- 		free(mdata);
- 		return -EINVAL;
- 	}
-+#endif
- 
- 	ret = set_config_string_item(&opts, value);
- 	if (ret < 0) {
-@@ -2722,6 +2770,54 @@ struct parse_line_conf {
- 	bool from_include;
- };
- 
-+#ifdef HAVE_ISULAD
-+// escape_string_decode compress some escape characters
-+static char *escape_string_decode(const char *src)
-+{
-+	size_t src_end = 0;
-+	size_t dst_end = 0;
-+	size_t len = 0;
-+	char *dst = NULL;
-+
-+	if (src == NULL) {
-+		return NULL;
-+	}
-+
-+	len = strlen(src);
-+	if (len == 0) {
-+		return NULL;
-+	}
-+
-+	dst = calloc(1, len + 1);
-+	if (dst == NULL) {
-+		ERROR("Out of memory");
-+		return NULL;
-+	}
-+
-+	while(src_end < len) {
-+		if (srcsrc_end == '\\') {
-+			switch (src++src_end)
-+			{
-+				case 'r': dstdst_end = '\r'; break;
-+				case 'n': dstdst_end = '\n'; break;
-+				case 'f': dstdst_end = '\f'; break;
-+				case 'b': dstdst_end = '\b'; break;
-+				case 't': dstdst_end = '\t'; break;
-+				case '\\': dstdst_end = '\\'; break;
-+				// default do not decode
-+				default: dstdst_end++ = '\\'; dstdst_end = srcsrc_end; break;
-+			}
-+		} else {
-+			dstdst_end = srcsrc_end;
-+		}
-+		dst_end++;
-+		src_end++;
-+	}
-+
-+	return dst;
-+}
-+#endif
-+
- static int parse_line(char *buffer, void *data)
- {
- 	char *dot, *key, *line, *linep, *value;
-@@ -2730,6 +2826,9 @@ static int parse_line(char *buffer, void *data)
- 	int ret = 0;
- 	char *dup = buffer;
- 	struct parse_line_conf *plc = data;
-+#ifdef HAVE_ISULAD
-+	char *value_decode = NULL;
-+#endif
- 
- 	/* If there are newlines in the config file we should keep them. */
- 	empty_line = lxc_is_line_empty(dup);
-@@ -2796,10 +2895,21 @@ static int parse_line(char *buffer, void *data)
- 		goto on_error;
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	value_decode = escape_string_decode(value);
-+	if (value_decode == NULL) {
-+		ERROR("Value %s decode failed", value);
-+	}
-+	ret = config->set(key, value_decode ? value_decode: value, plc->conf, NULL);
-+#else
- 	ret = config->set(key, value, plc->conf, NULL);
-+#endif
- 
- on_error:
- 	free(linep);
-+#ifdef HAVE_ISULAD
-+	free(value_decode);
-+#endif
- 
- 	return ret;
- }
-@@ -2912,6 +3022,12 @@ bool lxc_config_define_load(struct lxc_list *defines, struct lxc_container *c)
- 
- 	lxc_list_for_each(it, defines) {
- 		struct new_config_item *new_item = it->elem;
-+#ifdef HAVE_ISULAD
-+		if (strcmp(new_item->key, LXC_IMAGE_OCI_KEY) == 0) {
-+			c->set_oci_type(c, true);
-+			continue;
-+		}
-+#endif
- 		bret = c->set_config_item(c, new_item->key, new_item->val);
- 		if (!bret)
- 			break;
-@@ -6098,3 +6214,526 @@ int lxc_list_net(struct lxc_conf *c, const char *key, char *retv, int inlen)
- 
- 	return fulllen;
- }
-+
-+#ifdef HAVE_ISULAD
-+/* isulad: set config for init args */
-+static int set_config_init_args(const char *key, const char *value,
-+				 struct lxc_conf *lxc_conf, void *data)
-+{
-+	int ret = 0;
-+	char **tmp = NULL;
-+	char *new_value = NULL;
-+
-+	ret = set_config_string_item(&new_value, value);
-+	if (ret || !new_value)
-+		return ret;
-+
-+	tmp = (char **)realloc(lxc_conf->init_argv, (lxc_conf->init_argc + 1) * sizeof(char *));
-+	if (!tmp) {
-+		ERROR("Out of memory");
-+		free(new_value);
-+		return -1;
-+	}
-+
-+	lxc_conf->init_argv = tmp;
-+
-+	lxc_conf->init_argvlxc_conf->init_argc = new_value;
-+	lxc_conf->init_argc++;
-+
-+	return 0;
-+}
-+
-+/* isulad: get config init args */
-+static int get_config_init_args(const char *key, char *retv, int inlen,
-+				  struct lxc_conf *c, void *data)
-+{
-+	int i, len, fulllen = 0;
-+
-+	if (!retv)
-+		inlen = 0;
-+	else
-+		memset(retv, 0, inlen);
-+
-+	for (i = 0; i < c->init_argc; i++) {
-+           strprint(retv, inlen, "%s", c->init_argvi);
-+    }
-+
-+	return fulllen;
-+}
-+
-+/* isulad: clr config init args*/
-+static inline int clr_config_init_args(const char *key, struct lxc_conf *c,
-+				   void *data)
-+{
-+	return lxc_clear_init_args(c);
-+}
-+
-+/* isulad: set config for init groups */
-+static int set_config_init_groups(const char *key, const char *value,
-+                                  struct lxc_conf *lxc_conf, void *data)
-+{
-+	char *groups = NULL;
-+	char *token = NULL;
-+	int ret = -1;
-+
-+	if (lxc_config_value_empty(value))
-+		return lxc_clear_init_groups(lxc_conf);
-+
-+	groups = strdup(value);
-+	if (!groups)
-+		return -1;
-+
-+	/* In case several capability keep is specified in a single line
-+	 * split these caps in a single element for the list.
-+	 */
-+	lxc_iterate_parts(token, groups, " \t") {
-+		gid_t *tmp = NULL;
-+		if (lxc_mem_realloc((void **)&tmp, (lxc_conf->init_groups_len + 1) * sizeof(gid_t), lxc_conf->init_groups,
-+		                    (lxc_conf->init_groups_len) * sizeof(gid_t)) != 0) {
-+			ERROR("Out of memory");
-+			goto on_error;
-+		}
-+		lxc_conf->init_groups = tmp;
-+		tmplxc_conf->init_groups_len = atoll(token);
-+		lxc_conf->init_groups_len++;
-+	}
-+
-+	ret = 0;
-+
-+on_error:
-+	free(groups);
-+
-+	return ret;
-+}
-+
-+/* isulad: get config init groups */
-+static int get_config_init_groups(const char *key, char *retv, int inlen,
-+                                  struct lxc_conf *c, void *data)
-+{
-+	int i, len, fulllen = 0;
-+
-+	if (!retv)
-+		inlen = 0;
-+	else
-+		memset(retv, 0, inlen);
-+
-+	for (i = 0; i < c->init_groups_len; i++) {
-+		strprint(retv, inlen, "%u\n", c->init_groupsi);
-+	}
-+
-+	return fulllen;
-+}
-+
-+/* isulad: clr config init args*/
-+static inline int clr_config_init_groups(const char *key, struct lxc_conf *c,
-+                void *data)
-+{
-+	return lxc_clear_init_groups(c);
-+}
-+
-+/* isulad: set config for populate device */
-+static int set_config_populate_device(const char *key, const char *value,
-+                                      struct lxc_conf *lxc_conf, void *data)
-+{
-+	int ret = 0, major = 0, minor = 0;
-+	uid_t uid = (uid_t)-1;
-+	gid_t gid = (gid_t)-1;
-+	char name4096 = {0}; /* MAX dev path name */
-+	char type3 = {0};
-+	char *replace_value = NULL;
-+	mode_t filemode = 0;
-+	struct lxc_list *iter = NULL;
-+	struct lxc_list *dev_list = NULL;
-+	struct lxc_populate_devs *dev_elem = NULL;
-+
-+	if (lxc_config_value_empty(value))
-+		return lxc_clear_populate_devices(lxc_conf);
-+
-+	/* lxc.populate.device = PATH_IN_CONTAINER:DEVICETYPE:MAJOR:MINOR:MODE:UID:GID
-+	 * For e.g. lxc.populate.device = /dev/sda:b:8:0:0666:0:0
-+	 */
-+	ret = sscanf(value, "%4095^::%2^::%i:%i:%i:%u:%u", name, type, &major, &minor, &filemode, &uid, &gid);
-+	if (ret != 7)
-+		return -1;
-+
-+	/* find existing list element */
-+	lxc_list_for_each(iter, &lxc_conf->populate_devs) {
-+		dev_elem = iter->elem;
-+
-+		if (strcmp(name, dev_elem->name) != 0)
-+			continue;
-+
-+		replace_value = safe_strdup(type);
-+
-+		free(dev_elem->type);
-+		dev_elem->type = replace_value;
-+		dev_elem->file_mode = filemode;
-+		dev_elem->maj = major;
-+		dev_elem->min = minor;
-+		dev_elem->uid = (uid_t)uid;
-+		dev_elem->gid = (gid_t)gid;
-+		return 0;
-+	}
-+
-+	/* allocate list element */
-+	dev_list = malloc(sizeof(*dev_list));
-+	if (dev_list == NULL)
-+		goto on_error;
-+
-+	lxc_list_init(dev_list);
-+
-+	dev_elem = malloc(sizeof(*dev_elem));
-+	if (dev_elem == NULL)
-+		goto on_error;
-+	memset(dev_elem, 0, sizeof(*dev_elem));
-+
-+	dev_elem->name = safe_strdup(name);
-+
-+	dev_elem->type = safe_strdup(type);
-+
-+	dev_elem->file_mode = filemode;
-+	dev_elem->maj = major;
-+	dev_elem->min = minor;
-+	dev_elem->uid = (uid_t)uid;
-+	dev_elem->gid = (gid_t)gid;
-+
-+	lxc_list_add_elem(dev_list, dev_elem);
-+
-+	lxc_list_add_tail(&lxc_conf->populate_devs, dev_list);
-+
-+	return 0;
-+
-+on_error:
-+	free(dev_list);
-+	if (dev_elem) {
-+		free(dev_elem->name);
-+		free(dev_elem->type);
-+		free(dev_elem);
-+	}
-+	return -1;
-+}
-+
-+/* isulad: get config populate device
-+ * If you ask for 'lxc.populate.device', then all populate device
-+ * entries will be printed, in 'lxc.populate.device = path_in_container:type:major:minor:mode:uid:gid' format.
-+ * For e.g. lxc.populate.device = /dev/sda:b:8:0:0666:0:0
-+ */
-+static int get_config_populate_device(const char *key, char *retv, int inlen,
-+                                      struct lxc_conf *c, void *data)
-+{
-+	int len;
-+	struct lxc_list *it = NULL;
-+	int fulllen = 0;
-+
-+	if (!retv)
-+		inlen = 0;
-+	else
-+		memset(retv, 0, inlen);
-+
-+	lxc_list_for_each(it, &c->populate_devs) {
-+		struct lxc_populate_devs *elem = it->elem;
-+		strprint(retv, inlen, "lxc.populate.device = %s:%s:%d:%d:%o:%u:%u\n",
-+		         elem->name, elem->type, elem->maj,
-+		         elem->min, elem->file_mode, elem->uid, elem->gid);
-+	}
-+
-+	return fulllen;
-+}
-+
-+/* isulad: clr config populate devices*/
-+static inline int clr_config_populate_device(const char *key, struct lxc_conf *c,
-+                void *data)
-+{
-+	return lxc_clear_populate_devices(c);
-+}
-+
-+/* isulad: set config for umask */
-+static int set_config_umask(const char *key, const char *value,
-+			      struct lxc_conf *lxc_conf, void *data)
-+{
-+	if (lxc_config_value_empty(value)) {
-+		ERROR("Empty umask");
-+		return -1;
-+	}
-+
-+	if (strcmp(value, "normal") == 0) {
-+		lxc_conf->umask = 0022;
-+		return 0;
-+	} else if (strcmp(value, "secure") == 0) {
-+		lxc_conf->umask = 0027;
-+		return 0;
-+	} else {
-+		ERROR("Invalid native umask: %s", value);
-+		return -1;
-+	}
-+}
-+
-+/* isulad add: get umask value*/
-+static int get_config_umask(const char *key, char *retv, int inlen,
-+			      struct lxc_conf *c, void *data)
-+{
-+	return lxc_get_conf_size_t(c, retv, inlen, c->umask);
-+}
-+
-+/* isulad add: clear umask value */
-+static inline int clr_config_umask(const char *key, struct lxc_conf *c,
-+				     void *data)
-+{
-+	c->umask = 0027;
-+	return 0;
-+}
-+
-+/* isulad: set config for rootfs masked paths */
-+static int set_config_rootfs_masked_paths(const char *key, const char *value,
-+                struct lxc_conf *lxc_conf, void *data)
-+{
-+	struct lxc_list *list_item = NULL;
-+
-+	if (lxc_config_value_empty(value))
-+		return lxc_clear_rootfs_masked_paths(lxc_conf);
-+
-+	list_item = malloc(sizeof(*list_item));
-+	if (list_item == NULL)
-+		goto on_error;
-+
-+	list_item->elem = safe_strdup(value);
-+
-+	lxc_list_add_tail(&lxc_conf->rootfs.maskedpaths, list_item);
-+
-+	return 0;
-+
-+on_error:
-+	free(list_item);
-+
-+	return -1;
-+}
-+
-+// isulad: get config rootfs masked paths
-+static int get_config_rootfs_masked_paths(const char *key, char *retv, int inlen,
-+                struct lxc_conf *c, void *data)
-+{
-+	int len, fulllen = 0;
-+	struct lxc_list *it = NULL;
-+
-+	if (!retv)
-+		inlen = 0;
-+	else
-+		memset(retv, 0, inlen);
-+
-+	lxc_list_for_each(it, &c->rootfs.maskedpaths) {
-+		strprint(retv, inlen, "%s\n", (char *)it->elem);
-+	}
-+
-+	return fulllen;
-+}
-+
-+/* isulad: set config for rootfs ro paths */
-+static int set_config_rootfs_ro_paths(const char *key, const char *value,
-+                                      struct lxc_conf *lxc_conf, void *data)
-+{
-+	struct lxc_list *list_item = NULL;
-+
-+	if (lxc_config_value_empty(value))
-+		return lxc_clear_rootfs_ro_paths(lxc_conf);
-+
-+	list_item = malloc(sizeof(*list_item));
-+	if (list_item == NULL)
-+		goto on_error;
-+
-+	list_item->elem = safe_strdup(value);
-+
-+	lxc_list_add_tail(&lxc_conf->rootfs.ropaths, list_item);
-+
-+	return 0;
-+
-+on_error:
-+	free(list_item);
-+
-+	return -1;
-+}
-+
-+// isulad: get config rootfs ro paths
-+static int get_config_rootfs_ro_paths(const char *key, char *retv, int inlen,
-+                                      struct lxc_conf *c, void *data)
-+{
-+	int len, fulllen = 0;
-+	struct lxc_list *it = NULL;
-+
-+	if (!retv)
-+		inlen = 0;
-+	else
-+		memset(retv, 0, inlen);
-+
-+	lxc_list_for_each(it, &c->rootfs.ropaths) {
-+		strprint(retv, inlen, "%s\n", (char *)it->elem);
-+	}
-+
-+	return fulllen;
-+}
-+
-+/* isulad: clr config rootfs masked paths */
-+static inline int clr_config_rootfs_masked_paths(const char *key, struct lxc_conf *c,
-+                void *data)
-+{
-+	return lxc_clear_rootfs_masked_paths(c);
-+}
-+
-+/* isulad: clr config rootfs ro paths */
-+static inline int clr_config_rootfs_ro_paths(const char *key, struct lxc_conf *c,
-+                void *data)
-+{
-+	return lxc_clear_rootfs_ro_paths(c);
-+}
-+
-+/* isulad: set config for systemd */
-+static int set_config_systemd(const char *key, const char *value,
-+			      struct lxc_conf *lxc_conf, void *data)
-+{
-+	if (lxc_config_value_empty(value)) {
-+		ERROR("Empty umask");
-+		return -1;
-+	}
-+	lxc_conf->systemd = strdup(value);
-+	return 0;
-+}
-+
-+/* isulad add: get systemd value*/
-+static int get_config_systemd(const char *key, char *retv, int inlen,
-+			      struct lxc_conf *c, void *data)
-+{
-+	return lxc_get_conf_str(retv, inlen, c->systemd);
-+}
-+
-+/* isulad add: clear systemd value */
-+static inline int clr_config_systemd(const char *key, struct lxc_conf *c,
-+				     void *data)
-+{
-+	free(c->systemd);
-+	c->systemd = NULL;
-+	return 0;
-+}
-+
-+static int set_config_console_log_driver(const char *key, const char *value,
-+        struct lxc_conf *lxc_conf, void *data)
-+{
-+	return set_config_string_item(&lxc_conf->console.log_driver, value);
-+}
-+
-+static int set_config_console_syslog_tag(const char *key, const char *value,
-+        struct lxc_conf *lxc_conf, void *data)
-+{
-+	if (value == NULL) {
-+		return -1;
-+	}
-+	return set_config_string_item(&lxc_conf->console.log_syslog_tag, value);
-+}
-+
-+static int parse_facility(const char *facility)
-+{
-+#define FACILITIES_LEN 20
-+	const char *facility_keysFACILITIES_LEN = {
-+		"kern", "user", "mail", "daemon", "auth",
-+		"syslog", "lpr", "news", "uucp", "cron", "authpriv", "ftp",
-+		"local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7"
-+	};
-+	const int facilitiesFACILITIES_LEN = {
-+		LOG_KERN, LOG_USER, LOG_MAIL, LOG_DAEMON, LOG_AUTH, LOG_SYSLOG,
-+		LOG_LPR, LOG_NEWS, LOG_UUCP, LOG_CRON, LOG_AUTHPRIV, LOG_FTP,
-+		LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
-+		LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7
-+	};
-+	int i = 0;
-+
-+	if (facility == NULL) {
-+		return -1;
-+	}
-+
-+	for (; i < FACILITIES_LEN; i++) {
-+		if (strcmp(facility, facility_keysi) == 0) {
-+			return facilitiesi;
-+		}
-+	}
-+
-+	return -1;
-+}
-+
-+static int set_config_console_syslog_facility(const char *key, const char *value,
-+        struct lxc_conf *lxc_conf, void *data)
-+{
-+	int facility;
-+
-+	facility = parse_facility(value);
-+	if (facility < 0) {
-+		NOTICE("Invalid facility: %s", value);
-+		facility = LOG_DAEMON;
-+	}
-+
-+	lxc_conf->console.log_syslog_facility = facility;
-+	return 0;
-+}
-+
-+static int set_config_selinux_mount_context(const char *key, const char *value,
-+    struct lxc_conf *lxc_conf, void *data)
-+{
-+	if (value != NULL && strcmp(value, "unconfined_t") == 0) {
-+		return set_config_string_item(&lxc_conf->lsm_se_mount_context, NULL);
-+	}
-+
-+	return set_config_string_item(&lxc_conf->lsm_se_mount_context, value);
-+}
-+
-+static int get_config_console_log_driver(const char *key, char *retv, int inlen,
-+        struct lxc_conf *c, void *data)
-+{
-+	return lxc_get_conf_str(retv, inlen, c->console.log_driver);
-+}
-+
-+static int get_config_console_syslog_tag(const char *key, char *retv, int inlen,
-+        struct lxc_conf *c, void *data)
-+{
-+	return lxc_get_conf_str(retv, inlen, c->console.log_syslog_tag);
-+}
-+
-+static int get_config_console_syslog_facility(const char *key, char *retv, int inlen,
-+        struct lxc_conf *c, void *data)
-+{
-+	return lxc_get_conf_int(c, retv, inlen, c->console.log_syslog_facility);
-+}
-+
-+static int get_config_selinux_mount_context(const char *key, char *retv, int inlen,
-+    struct lxc_conf *c, void *data)
-+{
-+	return lxc_get_conf_str(retv, inlen, c->lsm_se_mount_context);
-+}
-+
-+static inline int clr_config_console_log_driver(const char *key,
-+                struct lxc_conf *c, void *data)
-+{
-+	free(c->console.log_driver);
-+	c->console.log_driver = NULL;
-+	return 0;
-+}
-+
-+static inline int clr_config_console_syslog_tag(const char *key,
-+                struct lxc_conf *c, void *data)
-+{
-+	free(c->console.log_syslog_tag);
-+	c->console.log_syslog_tag= NULL;
-+	return 0;
-+}
-+
-+static inline int clr_config_console_syslog_facility(const char *key,
-+                struct lxc_conf *c, void *data)
-+{
-+	c->console.log_syslog_facility = LOG_DAEMON;
-+	return 0;
-+}
-+
-+static inline int clr_config_selinux_mount_context(const char *key,
-+    struct lxc_conf *c, void *data)
-+{
-+	free(c->lsm_se_mount_context);
-+	c->lsm_se_mount_context = NULL;
-+	return 0;
-+}
-+#endif
-diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
-index aac6214..3f75184 100644
---- a/src/lxc/lxccontainer.c
-+++ b/src/lxc/lxccontainer.c
-@@ -62,6 +62,10 @@
- #include "utils.h"
- #include "version.h"
- 
-+#ifdef HAVE_ISULAD
-+#include "exec_commands.h"
-+#endif
-+
- #if HAVE_OPENSSL
- #include <openssl/evp.h>
- #endif
-@@ -83,6 +87,11 @@
- 
- lxc_log_define(lxccontainer, lxc);
- 
-+#ifdef HAVE_ISULAD
-+typedef bool (*func_is_io_stat_read)(const char *value);
-+typedef bool (*func_is_io_stat_write)(const char *value);
-+#endif
-+
- static bool do_lxcapi_destroy(struct lxc_container *c);
- static const char *lxcapi_get_config_path(struct lxc_container *c);
- #define do_lxcapi_get_config_path(c) lxcapi_get_config_path(c)
-@@ -281,6 +290,13 @@ static void lxc_container_free(struct lxc_container *c)
- 	free(c->config_path);
- 	c->config_path = NULL;
- 
-+#ifdef HAVE_ISULAD
-+	free(c->exit_fifo);
-+	c->exit_fifo = NULL;
-+	free(c->ocihookfile);
-+	c->ocihookfile = NULL;
-+#endif
-+
- 	free(c);
- }
- 
-@@ -519,6 +535,7 @@ static bool do_lxcapi_freeze(struct lxc_container *c)
- 	return true;
- }
- 
-+
- WRAP_API(bool, lxcapi_freeze)
- 
- static bool do_lxcapi_unfreeze(struct lxc_container *c)
-@@ -623,6 +640,66 @@ static bool load_config_locked(struct lxc_container *c, const char *fname)
- 	return true;
- }
- 
-+#ifdef HAVE_ISULAD
-+static bool load_ocihooks_locked(struct lxc_container *c)
-+{
-+	parser_error err = NULL;
-+	oci_runtime_spec_hooks *hooks = NULL;
-+
-+	if (!c->lxc_conf)
-+		c->lxc_conf = lxc_conf_init();
-+
-+	if (!c->lxc_conf)
-+		return false;
-+
-+	hooks = oci_runtime_spec_hooks_parse_file(c->ocihookfile, NULL, &err);
-+	if (!hooks) {
-+		fprintf(stderr, "parse oci hooks config failed: %s\n", err);
-+		free(err);
-+		return true;
-+	}
-+	c->lxc_conf->ocihooks = hooks;
-+
-+	if (err)
-+		free(err);
-+	return true;
-+}
-+
-+/*
-+ * isulad: set oci hook file path
-+ * */
-+static bool set_oci_hook_config_filename(struct lxc_container *c)
-+{
-+#define OCI_HOOK_JSON_FILE_NAME "ocihooks.json"
-+	char *newpath = NULL;
-+	int len, ret;
-+
-+	if (!c->config_path)
-+		return false;
-+
-+	/* $lxc_path + "/" + c->name + "/" + "config" + '\0' */
-+	if (strlen(c->config_path) + strlen(c->name) > SIZE_MAX - strlen(OCI_HOOK_JSON_FILE_NAME) - 3)
-+		return false;
-+	len = strlen(c->config_path) + strlen(c->name) + strlen(OCI_HOOK_JSON_FILE_NAME) + 3;
-+
-+	newpath = malloc(len);
-+	if (newpath == NULL)
-+		return false;
-+
-+	ret = snprintf(newpath, len, "%s/%s/%s", c->config_path, c->name, OCI_HOOK_JSON_FILE_NAME);
-+	if (ret < 0 || ret >= len) {
-+		fprintf(stderr, "Error printing out config file name\n");
-+		free(newpath);
-+		return false;
-+	}
-+
-+	free(c->ocihookfile);
-+	c->ocihookfile = newpath;
-+
-+	return true;
-+}
-+#endif
-+
- static bool do_lxcapi_load_config(struct lxc_container *c, const char *alt_file)
- {
- 	int lret;
-@@ -656,6 +733,11 @@ static bool do_lxcapi_load_config(struct lxc_container *c, const char *alt_file)
- 
- 	ret = load_config_locked(c, fname);
- 
-+#ifdef HAVE_ISULAD
-+	if (ret && file_exists(c->ocihookfile))
-+		ret = load_ocihooks_locked(c);
-+#endif
-+
- 	if (need_disklock)
- 		container_disk_unlock(c);
- 	else
-@@ -855,6 +937,33 @@ static bool wait_on_daemonized_start(struct lxc_handler *handler, int pid)
- 	return true;
- }
- 
-+#ifdef HAVE_ISULAD
-+/* isulad: use init argv as init cmd */
-+static char **use_init_args(char **init_argv, size_t init_args)
-+{
-+	size_t i;
-+	int nargs = 0;
-+	char **argv;
-+
-+	if (!init_argv)
-+		return NULL;
-+
-+	do {
-+		argv = malloc(sizeof(char *));
-+	} while (!argv);
-+
-+	argv0 = NULL;
-+	for (i = 0; i < init_args; i++)
-+		push_arg(&argv, init_argvi, &nargs);
-+
-+	if (nargs == 0) {
-+		free(argv);
-+		return NULL;
-+	}
-+	return argv;
-+}
-+#endif
-+
- static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const argv)
- {
- 	int ret;
-@@ -865,6 +974,11 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
- 		NULL,
- 	};
- 	char **init_cmd = NULL;
-+#ifdef HAVE_ISULAD
-+	int keepfds = {-1, -1, -1, -1, -1};
-+	ssize_t size_read;
-+	char errbufBUFSIZ + 1 = {0};
-+#endif
- 
- 	/* container does exist */
- 	if (!c)
-@@ -911,6 +1025,16 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
- 			argv = init_cmd = split_init_cmd(conf->init_cmd);
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	if (!argv) {
-+		argv = init_cmd = use_init_args(conf->init_argv, conf->init_argc);
-+	}
-+
-+	if (c->image_type_oci) {
-+		handler->image_type_oci = true;
-+	}
-+#endif
-+
- 	/* ... otherwise use default_args. */
- 	if (!argv) {
- 		if (useinit) {
-@@ -930,10 +1054,23 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
- 		char title2048;
- 		pid_t pid_first, pid_second;
- 
-+#ifdef HAVE_ISULAD
-+		//isulad: pipdfd for get error message of child or grandchild process.
-+		if (pipe2(conf->errpipe, O_CLOEXEC) != 0) {
-+			SYSERROR("Failed to init errpipe");
-+			free_init_cmd(init_cmd);
-+			lxc_put_handler(handler);
-+			return false;
-+		}
-+#endif
-+
- 		pid_first = fork();
- 		if (pid_first < 0) {
- 			free_init_cmd(init_cmd);
- 			lxc_put_handler(handler);
-+#ifdef HAVE_ISULAD
-+			lxc_close_error_pipe(conf->errpipe);
-+#endif
- 			return false;
- 		}
- 
-@@ -943,11 +1080,25 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
- 			 * the PID file, child will do the free and unlink.
- 			 */
- 			c->pidfile = NULL;
-+#ifdef HAVE_ISULAD
-+			close(conf->errpipe1);
-+			conf->errpipe1 = -1;
-+#endif
- 
- 			/* Wait for container to tell us whether it started
- 			 * successfully.
- 			 */
- 			started = wait_on_daemonized_start(handler, pid_first);
-+#ifdef HAVE_ISULAD
-+			if (!started) {
-+				size_read = read(conf->errpipe0, errbuf, BUFSIZ);
-+				if (size_read > 0) {
-+					conf->errmsg = safe_strdup(errbuf);
-+				}
-+			}
-+			close(conf->errpipe0);
-+			conf->errpipe0 = -1;
-+#endif
- 
- 			free_init_cmd(init_cmd);
- 			lxc_put_handler(handler);
-@@ -983,6 +1134,9 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
- 		if (pid_second != 0) {
- 			free_init_cmd(init_cmd);
- 			lxc_put_handler(handler);
-+#ifdef HAVE_ISULAD
-+			lxc_close_error_pipe(conf->errpipe);
-+#endif
- 			_exit(EXIT_SUCCESS);
- 		}
- 
-@@ -995,7 +1149,18 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
- 			_exit(EXIT_FAILURE);
- 		}
- 
-+#ifdef HAVE_ISULAD
-+		keepfds0 = handler->conf->maincmd_fd;
-+		keepfds1 = handler->state_socket_pair0;
-+		keepfds2 = handler->state_socket_pair1;
-+		keepfds4 = conf->errpipe1;
-+		close(conf->errpipe0);
-+		conf->errpipe0 = -1;
-+		ret = lxc_check_inherited(conf, true, keepfds,
-+					  sizeof(keepfds) / sizeof(keepfds0));
-+#else
- 		ret = inherit_fds(handler, true);
-+#endif
- 		if (ret < 0)
- 			_exit(EXIT_FAILURE);
- 
-@@ -1028,6 +1193,9 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
- 		if (w < 0 || (size_t)w >= sizeof(pidstr)) {
- 			free_init_cmd(init_cmd);
- 			lxc_put_handler(handler);
-+#ifdef HAVE_ISULAD
-+			lxc_close_error_pipe(conf->errpipe);
-+#endif
- 
- 			SYSERROR("Failed to write monitor pid to \"%s\"", c->pidfile);
- 
-@@ -1041,6 +1209,9 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
- 		if (ret < 0) {
- 			free_init_cmd(init_cmd);
- 			lxc_put_handler(handler);
-+#ifdef HAVE_ISULAD
-+			lxc_close_error_pipe(conf->errpipe);
-+#endif
- 
- 			SYSERROR("Failed to write monitor pid to \"%s\"", c->pidfile);
- 
-@@ -1051,6 +1222,19 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
- 		}
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: open exit fifo */
-+	if (c->exit_fifo) {
-+		conf->exit_fd = lxc_open(c->exit_fifo, O_WRONLY | O_NONBLOCK | O_CLOEXEC, 0);
-+		if (conf->exit_fd < 0) {
-+			ERROR("Failed to open exit fifo %s: %s.", c->exit_fifo, strerror(errno));
-+			lxc_put_handler(handler);
-+			ret = 1;
-+			goto on_error;
-+		}
-+	}
-+#endif
-+
- 	conf->reboot = REBOOT_NONE;
- 
- 	/* Unshare the mount namespace if requested */
-@@ -1082,19 +1266,53 @@ reboot:
- 		}
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	keepfds0 = handler->conf->maincmd_fd;
-+	keepfds1 = handler->state_socket_pair0;
-+	keepfds2 = handler->state_socket_pair1;
-+
-+	/* keep exit fifo fd */
-+	if (conf->exit_fd >= 0) {
-+		keepfds3 = conf->exit_fd;
-+	}
-+	/* isulad: keep errpipe fd */
-+	if (c->daemonize)
-+		keepfds4 = conf->errpipe1;
-+
-+	ret = lxc_check_inherited(conf, c->daemonize, keepfds,
-+				  sizeof(keepfds) / sizeof(keepfds0));
-+	if (ret < 0) {
-+		lxc_put_handler(handler);
-+		ret = 1;
-+		goto on_error;
-+	}
-+#else
- 	ret = inherit_fds(handler, c->daemonize);
- 	if (ret < 0) {
- 		lxc_put_handler(handler);
- 		ret = 1;
- 		goto on_error;
- 	}
-+#endif
- 
-+#ifndef HAVE_ISULAD
- 	if (useinit)
- 		ret = lxc_execute(c->name, argv, 1, handler, c->config_path,
- 				  c->daemonize, &c->error_num);
- 	else
- 		ret = lxc_start(argv, handler, c->config_path, c->daemonize,
- 				&c->error_num);
-+#else
-+	if (useinit) {
-+		ret = lxc_execute(c->name, argv, 1, handler, c->config_path,
-+				  c->daemonize, &c->error_num, c->start_timeout);
-+	} else {
-+		handler->disable_pty = c->disable_pty;
-+		handler->open_stdin = c->open_stdin;
-+		ret = lxc_start(argv, handler, c->config_path, c->daemonize,
-+				&c->error_num, c->start_timeout);
-+	}
-+#endif
- 
- 	if (conf->reboot == REBOOT_REQ) {
- 		INFO("Container requested reboot");
-@@ -1185,6 +1403,9 @@ WRAP_API(bool, lxcapi_stop)
- 
- static int do_create_container_dir(const char *path, struct lxc_conf *conf)
- {
-+#ifdef HAVE_ISULAD
-+	__do_free char *p = NULL;
-+#endif
- 	int lasterr;
- 	int ret = -1;
- 
-@@ -1200,8 +1421,16 @@ static int do_create_container_dir(const char *path, struct lxc_conf *conf)
- 		ret = 0;
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	p = must_copy_string(path);
-+#endif
-+
- 	if (!lxc_list_empty(&conf->id_map)) {
-+#ifdef HAVE_ISULAD
-+		ret = chown_mapped_root(p, conf);
-+#else
- 		ret = chown_mapped_root(path, conf);
-+#endif
- 		if (ret < 0)
- 			ret = -1;
- 	}
-@@ -2048,7 +2277,12 @@ WRAP_API_1(bool, lxcapi_reboot2, int)
- static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)
- {
- 	__do_close int pidfd = -EBADF, state_client_fd = -EBADF;
-+#ifdef HAVE_ISULAD
-+	// isulad: keep default signal the same as docker
-+	int haltsignal = SIGTERM;
-+#else
- 	int haltsignal = SIGPWR;
-+#endif
- 	pid_t pid = -1;
- 	lxc_state_t statesMAX_STATE = {0};
- 	int killret, ret;
-@@ -2067,9 +2301,10 @@ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)
- 	/* Detect whether we should send SIGRTMIN + 3 (e.g. systemd). */
- 	if (c->lxc_conf && c->lxc_conf->haltsignal)
- 		haltsignal = c->lxc_conf->haltsignal;
-+#ifndef HAVE_ISULAD
- 	else if (task_blocks_signal(pid, (SIGRTMIN + 3)))
- 		haltsignal = (SIGRTMIN + 3);
--
-+#endif
- 
- 	/*
- 	 * Add a new state client before sending the shutdown signal so
-@@ -2938,6 +3173,21 @@ static int lxc_unlink_exec_wrapper(void *data)
- 	return unlink(arg);
- }
- 
-+#ifdef HAVE_ISULAD
-+static void container_sock_dir_delete(const char *name)
-+{
-+	__do_free char *sock_dir = NULL;
-+
-+	sock_dir = generate_named_unix_sock_dir(name);
-+	if (sock_dir == NULL) {
-+		ERROR("Failed to generate exec unix sock dir");
-+		return;
-+	}
-+
-+	(void)lxc_rmdir_onedev(sock_dir, NULL);
-+}
-+#endif
-+
- static bool container_destroy(struct lxc_container *c,
- 			      struct lxc_storage *storage)
- {
-@@ -2948,8 +3198,19 @@ static bool container_destroy(struct lxc_container *c,
- 	bool bret = false;
- 	int ret = 0;
- 
-+#ifdef HAVE_ISULAD
-+	if (!c)
-+		return false;
-+	// isulad: if container is not defined, we need to remove disk lock file
-+	// which is created in lxc_container_new.
-+	if (!do_lxcapi_is_defined(c)) {
-+		container_disk_removelock(c);
-+		return false;
-+	}
-+#else
- 	if (!c || !do_lxcapi_is_defined(c))
- 		return false;
-+#endif
- 
- 	conf = c->lxc_conf;
- 	if (container_disk_lock(c))
-@@ -3069,8 +3330,20 @@ static bool container_destroy(struct lxc_container *c,
- 	if (ret < 0) {
- 		ERROR("Failed to destroy directory \"%s\" for \"%s\"", path,
- 		      c->name);
-+#ifdef HAVE_ISULAD
-+		char msgBUFSIZ = { 0 };
-+		ret = snprintf(msg, BUFSIZ, "Failed to destroy directory \"%s\": %s", path, errno ? strerror(errno) : "error");
-+		if (ret < 0 || ret >= BUFSIZ) {
-+			ERROR("Sprintf failed");
-+			goto out;
-+		}
-+		c->error_string = safe_strdup(msg);
-+#endif
- 		goto out;
- 	}
-+#ifdef HAVE_ISULAD
-+	container_sock_dir_delete(c->name);
-+#endif
- 	INFO("Destroyed directory \"%s\" for \"%s\"", path, c->name);
- 
- on_success:
-@@ -3081,6 +3354,11 @@ out:
- 		free(path);
- 
- 	container_disk_unlock(c);
-+#ifdef HAVE_ISULAD
-+	if (bret && container_disk_removelock(c)) {
-+		bret = false;
-+	}
-+#endif
- 	return bret;
- }
- 
-@@ -4030,8 +4308,13 @@ static int lxcapi_attach(struct lxc_container *c,
- 
- 	current_config = c->lxc_conf;
- 
-+#ifdef HAVE_ISULAD
-+	ret = lxc_attach(c, exec_function, exec_payload, options,
-+			 attached_process, &c->lxc_conf->errmsg);
-+#else
- 	ret = lxc_attach(c, exec_function, exec_payload, options,
- 			 attached_process);
-+#endif
- 	current_config = NULL;
- 	return ret;
- }
-@@ -4051,7 +4334,11 @@ static int do_lxcapi_attach_run_wait(struct lxc_container *c,
- 	command.program = (char *)program;
- 	command.argv = (char **)argv;
- 
-+#ifdef HAVE_ISULAD
-+	ret = lxc_attach(c, lxc_attach_run_command, &command, options, &pid, NULL);
-+#else
- 	ret = lxc_attach(c, lxc_attach_run_command, &command, options, &pid);
-+#endif
- 	if (ret < 0)
- 		return ret;
- 
-@@ -5230,7 +5517,561 @@ static int do_lxcapi_seccomp_notify_fd(struct lxc_container *c)
- 
- WRAP_API(int, lxcapi_seccomp_notify_fd)
- 
-+#ifdef HAVE_ISULAD
-+/* isulad add set console fifos*/
-+static bool do_lxcapi_set_terminal_default_fifos(struct lxc_container *c, const char *in, const char *out, const char *err)
-+{
-+	struct lxc_conf *conf = NULL;
-+
-+	if (!c || !c->lxc_conf)
-+		return false;
-+	if (container_mem_lock(c)) {
-+		ERROR("Error getting mem lock");
-+		return false;
-+	}
-+
-+	conf = c->lxc_conf;
-+	if (in) {
-+		if (conf->console.init_fifo0)
-+			free(conf->console.init_fifo0);
-+		conf->console.init_fifo0 = safe_strdup(in);
-+	}
-+	if (out) {
-+		if (conf->console.init_fifo1)
-+			free(conf->console.init_fifo1);
-+		conf->console.init_fifo1 = safe_strdup(out);
-+	}
-+	if (err) {
-+		if (conf->console.init_fifo2)
-+			free(conf->console.init_fifo2);
-+		conf->console.init_fifo2 = safe_strdup(err);
-+	}
-+
-+	container_mem_unlock(c);
-+	return true;
-+}
-+
-+WRAP_API_3(bool, lxcapi_set_terminal_default_fifos, const char *, const char *, const char *)
-+
-+/* isulad add set info file path */
-+static bool do_lxcapi_set_container_info_file(struct lxc_container *c, const char *info_file)
-+{
-+	struct lxc_conf *conf = NULL;
-+
-+	if (!c || !c->lxc_conf || !info_file)
-+		return false;
-+	if (container_mem_lock(c)) {
-+		ERROR("Error getting mem lock");
-+		return false;
-+	}
-+
-+	conf = c->lxc_conf;
-+	if (conf->container_info_file)
-+		free(conf->container_info_file);
-+	conf->container_info_file = safe_strdup(info_file);
-+
-+	container_mem_unlock(c);
-+	return true;
-+}
-+
-+WRAP_API_1(bool, lxcapi_set_container_info_file, const char *)
-+
-+static bool do_lxcapi_want_disable_pty(struct lxc_container *c, bool state)
-+{
-+	if (!c || !c->lxc_conf)
-+		return false;
-+
-+	if (container_mem_lock(c))
-+		return false;
-+
-+	c->disable_pty = state;
-+
-+	container_mem_unlock(c);
-+
-+	return true;
-+}
-+
-+WRAP_API_1(bool, lxcapi_want_disable_pty, bool)
-+
-+static bool do_lxcapi_want_open_stdin(struct lxc_container *c, bool state)
-+{
-+	if (!c || !c->lxc_conf)
-+		return false;
-+
-+	if (container_mem_lock(c))
-+		return false;
-+
-+	c->open_stdin = state;
-+
-+	container_mem_unlock(c);
-+
-+	return true;
-+}
-+
-+WRAP_API_1(bool, lxcapi_want_open_stdin, bool)
-+
-+/* isulad add clean resources */
-+static bool do_lxcapi_add_terminal_fifo(struct lxc_container *c, const char *in_fifo, const char *out_fifo, const char *err_fifo)
-+{
-+	bool ret = true;
-+
-+	if (!c || !c->lxc_conf)
-+		return false;
-+	if (container_mem_lock(c)) {
-+		ERROR("Error getting mem lock");
-+		return false;
-+	}
-+
-+	if (lxc_cmd_set_terminal_fifos(c->name, c->config_path, in_fifo, out_fifo, err_fifo)) {
-+		ERROR("Error set console fifos");
-+		ret = false;
-+	}
-+
-+	container_mem_unlock(c);
-+	return ret;
-+}
-+
-+WRAP_API_3(bool, lxcapi_add_terminal_fifo, const char *, const char *, const char *)
-+
-+static bool do_lxcapi_set_terminal_winch(struct lxc_container *c, unsigned int height, unsigned int width)
-+{
-+	bool ret = true;
-+
-+	if (!c || !c->lxc_conf)
-+		return false;
-+	if (container_mem_lock(c)) {
-+		ERROR("Error getting mem lock");
-+		return false;
-+	}
-+
-+	if (lxc_cmd_set_terminal_winch(c->name, c->config_path, height, width)) {
-+		ERROR("Error set terminal winch");
-+		ret = false;
-+	}
-+
-+	container_mem_unlock(c);
-+	return ret;
-+}
-+
-+WRAP_API_2(bool, lxcapi_set_terminal_winch, unsigned int, unsigned int)
-+
-+static bool do_lxcapi_set_exec_terminal_winch(struct lxc_container *c, const char *suffix, unsigned int height, unsigned int width)
-+{
-+	bool ret = true;
-+
-+	if (!c || !c->lxc_conf)
-+		return false;
-+	if (container_mem_lock(c)) {
-+		ERROR("Error getting mem lock");
-+		return false;
-+	}
-+
-+	if (lxc_exec_cmd_set_terminal_winch(c->name, c->config_path, suffix, height, width)) {
-+		ERROR("Error set terminal winch");
-+		ret = false;
-+	}
-+
-+	container_mem_unlock(c);
-+	return ret;
-+}
-+
-+WRAP_API_3(bool, lxcapi_set_exec_terminal_winch, const char *, unsigned int, unsigned int)
-+
-+/* isulad add clean resources */
-+static bool do_lxcapi_clean_container_resource(struct lxc_container *c, pid_t pid)
-+{
-+	int ret;
-+
-+	if (!c)
-+		return false;
-+
-+	ret = do_lxcapi_clean_resource(c->name, c->config_path, c->lxc_conf, pid);
-+	if (ret)
-+		ERROR("Failed to clean container %s resource", c->name);
-+	return ret == 0;
-+
-+}
-+
-+WRAP_API_1(bool, lxcapi_clean_container_resource, pid_t)
-+
-+/* isulad get coantainer pids */
-+static bool do_lxcapi_get_container_pids(struct lxc_container *c, pid_t **pids,size_t *pids_len)
-+{
-+	int ret;
-+
-+	if (!c)
-+		return false;
-+
-+	ret = do_lxcapi_get_pids(c->name, c->config_path, c->lxc_conf, pids,pids_len);
-+	if (ret)
-+		ERROR("Failed to get container %s pids", c->name);
-+	return ret == 0;
-+
-+}
-+
-+WRAP_API_2(bool, lxcapi_get_container_pids, pid_t **,size_t *)
-+
-+/* isulad add start timeout */
-+static bool do_lxcapi_set_start_timeout(struct lxc_container *c,  unsigned int start_timeout)
-+{
-+	if (!c || !c->lxc_conf)
-+		return false;
-+	if (container_mem_lock(c)) {
-+		ERROR("Error getting mem lock");
-+		return false;
-+	}
-+	c->start_timeout = start_timeout;
-+	container_mem_unlock(c);
-+	return true;
-+}
-+
-+WRAP_API_1(bool, lxcapi_set_start_timeout, unsigned int)
-+
-+/* isulad add set image type */
-+static bool do_lxcapi_set_oci_type(struct lxc_container *c,  bool image_type_oci)
-+{
-+	if (!c || !c->lxc_conf)
-+		return false;
-+	if (container_mem_lock(c)) {
-+		ERROR("Error getting mem lock");
-+		return false;
-+	}
-+	c->image_type_oci = image_type_oci;
-+	container_mem_unlock(c);
-+	return true;
-+}
-+
-+WRAP_API_1(bool, lxcapi_set_oci_type, bool)
-+
-+static uint64_t metrics_get_ull(struct lxc_container *c, struct cgroup_ops *cgroup_ops, const char *item)
-+{
-+    char buf81 = {0};
-+    int len = 0;
-+    uint64_t val = 0;
-+
-+    len = cgroup_ops->get(cgroup_ops, item, buf, sizeof(buf) - 1, c->name, c->config_path);
-+    if (len <= 0) {
-+        DEBUG("unable to read cgroup item %s", item);
-+        return 0;
-+    }
-+
-+    val = strtoull(buf, NULL, 0);
-+    return val;
-+}
-+
-+static uint64_t metrics_get_ull_with_max(struct lxc_container *c, struct cgroup_ops *cgroup_ops, const char *item)
-+{
-+    char buf81 = {0};
-+    int len = 0;
-+    uint64_t val = 0;
-+
-+    len = cgroup_ops->get(cgroup_ops, item, buf, sizeof(buf) - 1, c->name, c->config_path);
-+    if (len <= 0) {
-+        DEBUG("unable to read cgroup item %s", item);
-+        return 0;
-+    }
-+
-+    if (strcmp(buf, "max") == 0) {
-+	return ULONG_MAX;
-+    }
-+
-+    val = strtoull(buf, NULL, 0);
-+    return val;
-+}
-+
-+static inline bool is_blk_metrics_read(const char *value)
-+{
-+    return strcmp(value, "Read") == 0;
-+}
-+
-+static inline bool is_blk_metrics_write(const char *value)
-+{
-+    return strcmp(value, "Write") == 0;
-+}
-+
-+static inline bool is_blk_metrics_total(const char *value)
-+{
-+    return strcmp(value, "Total") == 0;
-+}
-+
-+static void metrics_get_blk_stats(struct lxc_container *c, struct cgroup_ops *cgroup_ops, const char *item, struct lxc_blkio_metrics *stats)
-+{
-+    char *buf = NULL;
-+    int i = 0;
-+    int len = 0;
-+    int ret = 0;
-+    char **lines = NULL;
-+    char **cols = NULL;
-+
-+    len = cgroup_ops->get(cgroup_ops, item, NULL, 0, c->name, c->config_path);
-+    if (len <= 0) {
-+        DEBUG("unable to read cgroup item %s", item);
-+        return;
-+    }
-+
-+    buf = malloc(len + 1);
-+    (void)memset(buf, 0, len + 1);
-+    ret = cgroup_ops->get(cgroup_ops, item, buf, len, c->name, c->config_path);
-+    if (ret <= 0) {
-+        DEBUG("unable to read cgroup item %s", item);
-+        goto out;
-+    }
-+
-+    lines = lxc_string_split_and_trim(buf, '\n');
-+    if (lines == NULL) {
-+        goto out;
-+    }
-+
-+    (void)memset(stats, 0, sizeof(struct lxc_blkio_metrics));
-+
-+    for (i = 0; linesi; i++) {
-+        cols = lxc_string_split_and_trim(linesi, ' ');
-+        if (cols == NULL) {
-+            goto err_out;
-+        }
-+        if (lxc_array_len((void **)cols) == 3) {
-+            if (is_blk_metrics_read(cols1)) {
-+                stats->read += strtoull(cols2, NULL, 0);
-+            } else if (is_blk_metrics_write(cols1)) {
-+                stats->write += strtoull(cols2, NULL, 0);
-+            }
-+        }
-+        if (lxc_array_len((void **)cols) == 2 && is_blk_metrics_total(cols0)) {
-+            stats->total = strtoull(cols1, NULL, 0);
-+        }
-+
-+        lxc_free_array((void **)cols, free);
-+    }
-+err_out:
-+    lxc_free_array((void **)lines, free);
-+out:
-+    free(buf);
-+    return;
-+}
-+
-+static void metrics_get_io_stats_v2(struct lxc_container *c, struct cgroup_ops *cgroup_ops, const char *item, struct lxc_blkio_metrics *stats, func_is_io_stat_read is_io_stat_read, func_is_io_stat_write is_io_stat_write)
-+{
-+    char *buf = NULL;
-+    int i = 0;
-+    int j = 0;
-+    int len = 0;
-+    int ret = 0;
-+    char **lines = NULL;
-+    char **cols = NULL;
-+    char **kv = NULL;
-+
-+    len = cgroup_ops->get(cgroup_ops, item, NULL, 0, c->name, c->config_path);
-+    if (len <= 0) {
-+        DEBUG("unable to read cgroup item %s", item);
-+        return;
-+    }
-+
-+    buf = malloc(len + 1);
-+    (void)memset(buf, 0, len + 1);
-+    ret = cgroup_ops->get(cgroup_ops, item, buf, len, c->name, c->config_path);
-+    if (ret <= 0) {
-+        DEBUG("unable to read cgroup item %s", item);
-+        goto out;
-+    }
-+
-+    lines = lxc_string_split_and_trim(buf, '\n');
-+    if (lines == NULL) {
-+        goto out;
-+    }
-+
-+    (void)memset(stats, 0, sizeof(struct lxc_blkio_metrics));
-+    // line example:
-+    // 259:0 rbytes=0 wbytes=12288 rios=0 wios=4 dbytes=0 dios=0
-+    for (i = 0; linesi; i++) {
-+        cols = lxc_string_split_and_trim(linesi, ' ');
-+        if (cols == NULL || lxc_array_len((void **)cols) < 2) {
-+            goto err_out;
-+        }
-+        len = lxc_array_len((void **)cols);
-+        for (j = 1; j < len; j++) {
-+            kv = lxc_string_split(colsj, '=');
-+            if (kv == NULL || lxc_array_len((void **)kv) != 2) {
-+                lxc_free_array((void **)kv, free);
-+                continue;
-+            }
-+            if (is_io_stat_read(kv0)) {
-+                stats->read += strtoull(kv1, NULL, 0);
-+            } else if (is_io_stat_write(kv0)) {
-+                stats->write += strtoull(kv1, NULL, 0);
-+            }
-+            lxc_free_array((void **)kv, free);
-+        }
-+        lxc_free_array((void **)cols, free);
-+    }
-+
-+    stats->total = stats->read + stats->write;
-+
-+err_out:
-+    lxc_free_array((void **)lines, free);
-+out:
-+    free(buf);
-+    return;
-+}
-+
-+static uint64_t metrics_match_get_ull(struct lxc_container *c, struct cgroup_ops *cgroup_ops, const char *item, const char *match, int column)
-+{
-+#define BUFSIZE 4096
-+    char bufBUFSIZE = {0};
-+    int i = 0;
-+    int j = 0;
-+    int len = 0;
-+    uint64_t val = 0;
-+    char **lines = NULL;
-+    char **cols = NULL;
-+    size_t matchlen = 0;
-+
-+    len = cgroup_ops->get(cgroup_ops, item, buf, sizeof(buf) - 1, c->name, c->config_path);
-+    if (len <= 0) {
-+        DEBUG("unable to read cgroup item %s", item);
-+        goto err_out;
-+    }
-+
-+    lines = lxc_string_split_and_trim(buf, '\n');
-+    if (lines == NULL) {
-+        goto err_out;
-+    }
-+
-+    matchlen = strlen(match);
-+    for (i = 0; linesi; i++) {
-+        if (strncmp(linesi, match, matchlen) != 0) {
-+            continue;
-+        }
-+
-+        cols = lxc_string_split_and_trim(linesi, ' ');
-+        if (cols == NULL) {
-+            goto err1;
-+        }
-+        for (j = 0; colsj; j++) {
-+            if (j == column) {
-+                val = strtoull(colsj, NULL, 0);
-+                break;
-+            }
-+        }
-+        lxc_free_array((void **)cols, free);
-+        break;
-+    }
-+err1:
-+    lxc_free_array((void **)lines, free);
-+err_out:
-+    return val;
-+}
-+
-+static bool is_io_stat_rbytes(const char *value)
-+{
-+    return strcmp(value, "rbytes") == 0;
-+}
-+
-+static bool is_io_stat_wbytes(const char *value)
-+{
-+    return strcmp(value, "wbytes") == 0;
-+}
-+
-+static bool is_io_stat_rios(const char *value)
-+{
-+    return strcmp(value, "rios") == 0;
-+}
-+
-+static bool is_io_stat_wios(const char *value)
-+{
-+    return strcmp(value, "wios") == 0;
-+}
-+
-+static bool unified_metrics_get(struct lxc_container *c, struct cgroup_ops *cgroup_ops, struct lxc_container_metrics *metrics)
-+{
-+	// cpu
-+	metrics->cpu_use_nanos = metrics_match_get_ull(c, cgroup_ops, "cpu.stat", "usage_usec", 1) * 1000;
-+	metrics->cpu_use_user = metrics_match_get_ull(c, cgroup_ops, "cpu.stat", "user_usec", 1) * 1000;
-+	metrics->cpu_use_sys = metrics_match_get_ull(c, cgroup_ops, "cpu.stat", "system_usec", 1) * 1000;
-+
-+	// io
-+	metrics_get_io_stats_v2(c, cgroup_ops, "io.stat", &metrics->io_service_bytes, is_io_stat_rbytes, is_io_stat_wbytes);
-+	metrics_get_io_stats_v2(c, cgroup_ops, "io.stat", &metrics->io_serviced, is_io_stat_rios, is_io_stat_wios);
-+
-+	// memory
-+	metrics->mem_used = metrics_get_ull(c, cgroup_ops, "memory.current");
-+	metrics->mem_limit = metrics_get_ull_with_max(c, cgroup_ops, "memory.max");
-+	metrics->inactive_file_total = metrics_match_get_ull(c, cgroup_ops, "memory.stat", "inactive_file", 1);
-+	metrics->cache = metrics_match_get_ull(c, cgroup_ops, "memory.stat", "file", 1);
-+	metrics->cache_total = metrics->cache;
-+
-+	// cgroup v2 does not support kernel memory
-+	metrics->kmem_used = 0;
-+	metrics->kmem_limit = 0;
-+
-+	// pids
-+	metrics->pids_current = metrics_get_ull(c, cgroup_ops, "pids.current");
-+
-+	return true;
-+}
-+
-+/* isulad add get container metrics */
-+static bool do_lxcapi_get_container_metrics(struct lxc_container *c,  struct lxc_container_metrics *metrics)
-+{
-+	call_cleaner(cgroup_exit) struct cgroup_ops *cgroup_ops = NULL;
-+	const char *state = NULL;
-+	if (c == NULL || c->lxc_conf == NULL || metrics == NULL) {
-+		return false;
-+	}
-+
-+	state = c->state(c);
-+	metrics->state = state;
-+
-+	if (!is_stopped(c)) {
-+		metrics->init = c->init_pid(c);
-+	} else {
-+		metrics->init = -1;
-+	}
-+
-+	cgroup_ops = cgroup_init(c->lxc_conf);
-+	if (cgroup_ops == NULL) {
-+		return false;
-+	}
-+
-+	if (cgroup_ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
-+		return unified_metrics_get(c, cgroup_ops, metrics);
-+	}
-+
-+	metrics->cpu_use_nanos = metrics_get_ull(c, cgroup_ops, "cpuacct.usage");
-+	metrics->pids_current = metrics_get_ull(c, cgroup_ops, "pids.current");
-+
-+	metrics->cpu_use_user = metrics_match_get_ull(c, cgroup_ops, "cpuacct.stat", "user", 1);
-+	metrics->cpu_use_sys = metrics_match_get_ull(c, cgroup_ops, "cpuacct.stat", "system", 1);
-+
-+	// Try to read CFQ stats available on all CFQ enabled kernels first
-+	metrics_get_blk_stats(c, cgroup_ops, "blkio.io_serviced_recursive", &metrics->io_serviced);
-+	if (metrics->io_serviced.read == 0 && metrics->io_serviced.write == 0 && metrics->io_serviced.total == 0) {
-+		metrics_get_blk_stats(c, cgroup_ops, "blkio.throttle.io_service_bytes", &metrics->io_service_bytes);
-+		metrics_get_blk_stats(c, cgroup_ops, "blkio.throttle.io_serviced", &metrics->io_serviced);
-+	} else {
-+		metrics_get_blk_stats(c, cgroup_ops, "blkio.io_service_bytes_recursive", &metrics->io_service_bytes);
-+	}
-+
-+	metrics->mem_used = metrics_get_ull(c, cgroup_ops, "memory.usage_in_bytes");
-+	metrics->mem_limit = metrics_get_ull(c, cgroup_ops, "memory.limit_in_bytes");
-+	metrics->kmem_used = metrics_get_ull(c, cgroup_ops, "memory.kmem.usage_in_bytes");
-+	metrics->kmem_limit = metrics_get_ull(c, cgroup_ops, "memory.kmem.limit_in_bytes");
-+
-+	metrics->cache = metrics_match_get_ull(c, cgroup_ops, "memory.stat", "cache", 1);
-+	metrics->cache_total = metrics_match_get_ull(c, cgroup_ops, "memory.stat", "total_cache", 1);
-+	metrics->inactive_file_total = metrics_match_get_ull(c, cgroup_ops, "memory.stat", "total_inactive_file", 1);
-+
-+	return true;
-+}
-+
-+WRAP_API_1(bool, lxcapi_get_container_metrics, struct lxc_container_metrics *)
-+
-+#endif
-+
-+#ifdef HAVE_ISULAD
-+static struct lxc_container *do_lxc_container_new(const char *name, const char *configpath, bool load_config)
-+#else
- struct lxc_container *lxc_container_new(const char *name, const char *configpath)
-+#endif
- {
- 	struct lxc_container *c;
- 	size_t len;
-@@ -5283,10 +6124,24 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath
- 		goto err;
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	if (!set_oci_hook_config_filename(c)) {
-+		fprintf(stderr, "Error allocating oci hooks file pathname\n");
-+		goto err;
-+	}
-+
-+	if (load_config && file_exists(c->configfile)) {
-+		if (!lxcapi_load_config(c, NULL)) {
-+			fprintf(stderr, "Failed to load config for %s\n", name);
-+			goto err;
-+		}
-+	}
-+#else
- 	if (file_exists(c->configfile) && !lxcapi_load_config(c, NULL)) {
- 		fprintf(stderr, "Failed to load config for %s\n", name);
- 		goto err;
- 	}
-+#endif
- 
- 	rc = ongoing_create(c);
- 	switch (rc) {
-@@ -5310,6 +6165,9 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath
- 
- 	c->daemonize = true;
- 	c->pidfile = NULL;
-+#ifdef HAVE_ISULAD
-+	c->image_type_oci = false;
-+#endif
- 
- 	/* Assign the member functions. */
- 	c->is_defined = lxcapi_is_defined;
-@@ -5371,7 +6229,20 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath
- 	c->mount = lxcapi_mount;
- 	c->umount = lxcapi_umount;
- 	c->seccomp_notify_fd = lxcapi_seccomp_notify_fd;
--
-+#ifdef HAVE_ISULAD
-+	c->set_container_info_file = lxcapi_set_container_info_file;
-+	c->set_terminal_init_fifos = lxcapi_set_terminal_default_fifos;
-+	c->add_terminal_fifos = lxcapi_add_terminal_fifo;
-+	c->set_terminal_winch = lxcapi_set_terminal_winch;
-+	c->set_exec_terminal_winch = lxcapi_set_exec_terminal_winch;
-+	c->want_disable_pty = lxcapi_want_disable_pty;
-+	c->want_open_stdin = lxcapi_want_open_stdin;
-+	c->clean_container_resource = lxcapi_clean_container_resource;
-+	c->get_container_pids = lxcapi_get_container_pids;
-+	c->set_start_timeout = lxcapi_set_start_timeout;
-+	c->set_oci_type = lxcapi_set_oci_type;
-+	c->get_container_metrics = lxcapi_get_container_metrics;
-+#endif
- 	return c;
- 
- err:
-@@ -5379,6 +6250,19 @@ err:
- 	return NULL;
- }
- 
-+#ifdef HAVE_ISULAD
-+// isulad: new container without load config to save time
-+struct lxc_container *lxc_container_without_config_new(const char *name, const char *configpath)
-+{
-+	return do_lxc_container_new(name, configpath, false);
-+}
-+
-+struct lxc_container *lxc_container_new(const char *name, const char *configpath)
-+{
-+	return do_lxc_container_new(name, configpath, true);
-+}
-+#endif
-+
- int lxc_get_wait_states(const char **states)
- {
- 	int i;
-@@ -5557,11 +6441,21 @@ int list_active_containers(const char *lxcpath, char ***nret,
- 				continue;
- 		}
- 
-+#ifdef HAVE_ISULAD
-+		if (ct_name && ct_name_cnt) {
-+			if (array_contains(&ct_name, p, ct_name_cnt)) {
-+				if (is_hashed)
-+					free(p);
-+				continue;
-+			}
-+		}
-+#else
- 		if (array_contains(&ct_name, p, ct_name_cnt)) {
- 			if (is_hashed)
- 				free(p);
- 			continue;
- 		}
-+#endif
- 
- 		if (!add_to_array(&ct_name, p, ct_name_cnt)) {
- 			if (is_hashed)
-diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
-index 318e5bf..ce6f889 100644
---- a/src/lxc/lxclock.c
-+++ b/src/lxc/lxclock.c
-@@ -179,6 +179,10 @@ struct lxc_lock *lxc_newlock(const char *lxcpath, const char *name)
- 	l->u.f.fd = -1;
- 
- on_error:
-+#ifdef HAVE_ISULAD
-+	if (l == NULL)
-+		fprintf(stderr, "Failed to create lock for %s, path %s\n", name, lxcpath);
-+#endif
- 	return l;
- }
- 
-@@ -370,3 +374,30 @@ void container_disk_unlock(struct lxc_container *c)
- 	lxcunlock(c->slock);
- 	lxcunlock(c->privlock);
- }
-+
-+#ifdef HAVE_ISULAD
-+static int lxc_removelock(struct lxc_lock *l)
-+{
-+	int ret = 0;
-+
-+	if (l->type == LXC_LOCK_FLOCK) {
-+		ret = unlink(l->u.f.fname);
-+		if (ret && errno != ENOENT) {
-+			SYSERROR("Error unlink %s", l->u.f.fname);
-+			return ret;
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+int container_disk_removelock(struct lxc_container *c)
-+{
-+	int ret;
-+
-+	ret = lxc_removelock(c->slock);
-+	if (ret)
-+		return ret;
-+	return lxc_removelock(c->privlock);
-+}
-+#endif
-diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c
-index d5ae2a6..c47f31b 100644
---- a/src/lxc/mainloop.c
-+++ b/src/lxc/mainloop.c
-@@ -150,3 +150,19 @@ void lxc_mainloop_close(struct lxc_epoll_descr *descr)
- 
- 	close_prot_errno_disarm(descr->epfd);
- }
-+
-+#ifdef HAVE_ISULAD
-+int isulad_safe_mainloop(struct lxc_epoll_descr *descr, int timeout_ms)
-+{
-+    int ret;
-+
-+    ret = lxc_mainloop(descr, timeout_ms);
-+
-+    // There are stdout and stderr channels, and two epolls should be performed to prevent
-+    // one of the channels from exiting first, causing the other channel to not receive data,
-+    // resulting in data loss
-+    (void)lxc_mainloop(descr, 100);
-+
-+    return ret;
-+}
-+#endif
-diff --git a/src/lxc/path.c b/src/lxc/path.c
-new file mode 100644
-index 0000000..46256cb
---- /dev/null
-+++ b/src/lxc/path.c
-@@ -0,0 +1,655 @@
-+/* SPDX-License-Identifier: LGPL-2.1+ */
-+/******************************************************************************
-+ * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved
-+ * Description: isulad utils
-+ * Author: lifeng
-+ * Create: 2020-04-11
-+******************************************************************************/
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/param.h>
-+#include <libgen.h>
-+
-+#include "path.h"
-+#include "log.h"
-+#include "isulad_utils.h"
-+
-+lxc_log_define(lxc_path_ui, lxc);
-+
-+#define ISSLASH(C) ((C) == '/')
-+#define IS_ABSOLUTE_FILE_NAME(F) (ISSLASH ((F)0))
-+#define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F))
-+
-+bool specify_current_dir(const char *path)
-+{
-+	char *basec = NULL, *bname = NULL;
-+	bool res = false;
-+
-+	basec = safe_strdup(path);
-+
-+	bname = basename(basec);
-+	if (bname == NULL) {
-+		free(basec);
-+		ERROR("Out of memory");
-+		return false;
-+	}
-+	res = !strcmp(bname, ".");
-+	free(basec);
-+	return res;
-+}
-+
-+bool has_traling_path_separator(const char *path)
-+{
-+	return path && strlen(path) && (pathstrlen(path) - 1 == '/');
-+}
-+
-+// PreserveTrailingDotOrSeparator returns the given cleaned path
-+// and appends a trailing `/.` or `/` if its corresponding  original
-+// path ends with a trailing `/.` or `/`. If the cleaned
-+// path already ends in a `.` path segment, then another is not added. If the
-+// clean path already ends in a path separator, then another is not added.
-+char *preserve_trailing_dot_or_separator(const char *cleanedpath,
-+                const char *originalpath)
-+{
-+	char *respath = NULL;
-+	size_t len;
-+
-+	if (strlen(cleanedpath) > (SIZE_MAX - 3)) {
-+		return NULL;
-+	}
-+
-+	len = strlen(cleanedpath) + 3;
-+	respath = malloc(len);
-+	if (respath == NULL) {
-+		ERROR("Out of memory");
-+		return NULL;
-+	}
-+	memset(respath, 0x00, len);
-+	strcat(respath, cleanedpath);
-+
-+	if (!specify_current_dir(cleanedpath) && specify_current_dir(originalpath)) {
-+		if (!has_traling_path_separator(respath))
-+			strcat(respath, "/");
-+		strcat(respath, ".");
-+	}
-+
-+	if (!has_traling_path_separator(respath) &&
-+	                has_traling_path_separator(originalpath))
-+		strcat(respath, "/");
-+
-+	return respath;
-+}
-+
-+
-+// Split splits path immediately following the final Separator,
-+// separating it into a directory and file name component.
-+// If there is no Separator in path, Split returns an empty dir
-+// and file set to path.
-+// The returned values have the property that path = dir+file.
-+bool filepath_split(const char *path, char **dir, char **base)
-+{
-+	ssize_t i;
-+	size_t len;
-+
-+	len = strlen(path);
-+	if (len >= PATH_MAX) {
-+		ERROR("Invalid path");
-+		return false;
-+	}
-+	i = len - 1;
-+	while (i >= 0 && pathi != '/')
-+		i--;
-+
-+	*dir = malloc(i + 2);
-+	if (*dir == NULL) {
-+		ERROR("Out of memory");
-+		return false;
-+	}
-+	memcpy(*dir, path, i + 1);
-+	*(*dir + i + 1) = '\0';
-+
-+	*base = safe_strdup(path + i + 1);
-+
-+	return true;
-+}
-+
-+
-+static bool do_clean_path_continue(const char *endpos, const char *stpos, const char *respath, char **dst)
-+{
-+	if (endpos - stpos == 1 && stpos0 == '.') {
-+		return true;
-+	} else if (endpos - stpos == 2 && stpos0 == '.' && stpos1 == '.') {
-+		char *dest = *dst;
-+		if (dest <= respath + 1) {
-+			return true;
-+		}
-+		for (--dest; dest > respath && !ISSLASH(dest-1); --dest) {
-+			*dst = dest;
-+			return true;
-+		}
-+		*dst = dest;
-+		return true;
-+	}
-+	return false;
-+}
-+
-+int do_clean_path(const char *respath, const char *limit_respath,
-+                  const char *stpos, char **dst)
-+{
-+	char *dest = *dst;
-+	const char *endpos = NULL;
-+
-+	for (endpos = stpos; *stpos; stpos = endpos) {
-+		while (ISSLASH(*stpos)) {
-+			++stpos;
-+		}
-+
-+		for (endpos = stpos; *endpos && !ISSLASH(*endpos); ++endpos) {
-+		}
-+
-+		if (endpos - stpos == 0) {
-+			break;
-+		} else if (do_clean_path_continue(endpos, stpos, respath, &dest)) {
-+			continue;
-+		}
-+
-+		if (!ISSLASH(dest-1)) {
-+			*dest++ = '/';
-+		}
-+
-+		if (dest + (endpos - stpos) >= limit_respath) {
-+			ERROR("Path is too long");
-+			if (dest > respath + 1) {
-+				dest--;
-+			}
-+			*dest = '\0';
-+			return -1;
-+		}
-+
-+		memcpy(dest, stpos, (size_t)(endpos - stpos));
-+		dest += endpos - stpos;
-+		*dest = '\0';
-+	}
-+	*dst = dest;
-+	return 0;
-+}
-+
-+char *cleanpath(const char *path, char *realpath, size_t realpath_len)
-+{
-+	char *respath = NULL;
-+	char *dest = NULL;
-+	const char *stpos = NULL;
-+	const char *limit_respath = NULL;
-+
-+	if (path == NULL || path0 == '\0' || \
-+	                realpath == NULL || (realpath_len < PATH_MAX)) {
-+		return NULL;
-+	}
-+
-+	respath = realpath;
-+
-+	memset(respath, 0, realpath_len);
-+	limit_respath = respath + PATH_MAX;
-+
-+	if (!IS_ABSOLUTE_FILE_NAME(path)) {
-+		if (!getcwd(respath, PATH_MAX)) {
-+			ERROR("Failed to getcwd");
-+			respath0 = '\0';
-+			goto error;
-+		}
-+		dest = strchr(respath, '\0');
-+		if (dest == NULL) {
-+			ERROR("Failed to get the end of respath");
-+			goto error;
-+		}
-+		if (strlen(path) > (PATH_MAX - strlen(respath) - 1)) {
-+			ERROR("Path is too long");
-+			goto error;
-+		}
-+		strcat(respath, path);
-+		stpos = path;
-+	} else {
-+		dest = respath;
-+		*dest++ = '/';
-+		stpos = path;
-+	}
-+
-+	if (do_clean_path(respath, limit_respath, stpos, &dest)) {
-+		goto error;
-+	}
-+
-+	if (dest > respath + 1 && ISSLASH(dest-1)) {
-+		--dest;
-+	}
-+	*dest = '\0';
-+
-+	return respath;
-+
-+error:
-+	return NULL;
-+}
-+
-+static int do_path_realloc(const char *start, const char *end,
-+                           char **rpath, char **dest, const char **rpath_limit)
-+{
-+	long long dest_offset = *dest - *rpath;
-+	char *new_rpath = NULL;
-+	size_t new_size;
-+	int nret = 0;
-+	size_t gap = 0;
-+
-+	if (*dest + (end - start) < *rpath_limit) {
-+		return 0;
-+	}
-+
-+	gap = (size_t)(end - start) + 1;
-+	new_size = (size_t)(*rpath_limit - *rpath);
-+	if (new_size > SIZE_MAX - gap) {
-+		ERROR("Out of range!");
-+		return -1;
-+	}
-+
-+	if (gap > PATH_MAX) {
-+		new_size += gap;
-+	} else {
-+		new_size += PATH_MAX;
-+	}
-+	nret = lxc_mem_realloc((void **)&new_rpath, new_size, *rpath, PATH_MAX);
-+	if (nret) {
-+		ERROR("Failed to realloc memory for files limit variables");
-+		return -1;
-+	}
-+	*rpath = new_rpath;
-+	*rpath_limit = *rpath + new_size;
-+
-+	*dest = *rpath + dest_offset;
-+
-+	return 0;
-+}
-+
-+static int do_get_symlinks_copy_buf(const char *buf, const char *prefix, size_t prefix_len,
-+                                    char **rpath, char **dest)
-+{
-+	if (IS_ABSOLUTE_FILE_NAME(buf)) {
-+		if (prefix_len) {
-+			memcpy(*rpath, prefix, prefix_len);
-+		}
-+		*dest = *rpath + prefix_len;
-+		*(*dest)++ = '/';
-+	} else {
-+		if (*dest > *rpath + prefix_len + 1) {
-+			for (--(*dest); *dest > *rpath && !ISSLASH((*dest)-1); --(*dest)) {
-+				continue;
-+			}
-+		}
-+	}
-+	return 0;
-+}
-+
-+static int do_get_symlinks(const char **fullpath, const char *prefix, size_t prefix_len,
-+                           char **rpath, char **dest, const char **end,
-+                           int *num_links, char **extra_buf)
-+{
-+	char *buf = NULL;
-+	size_t len;
-+	ssize_t n;
-+	int ret = -1;
-+
-+	if (++(*num_links) > MAXSYMLINKS) {
-+		ERROR("Too many links in '%s'", *fullpath);
-+		goto out;
-+	}
-+
-+	buf = lxc_common_calloc_s(PATH_MAX);
-+	if (buf == NULL) {
-+		ERROR("Out of memory");
-+		goto out;
-+	}
-+
-+	n = readlink(*rpath, buf, PATH_MAX - 1);
-+	if (n < 0) {
-+		goto out;
-+	}
-+	bufn = '\0';
-+
-+	if (*extra_buf == NULL) {
-+		*extra_buf = lxc_common_calloc_s(PATH_MAX);
-+		if (*extra_buf == NULL) {
-+			ERROR("Out of memory");
-+			goto out;
-+		}
-+	}
-+
-+	len = strlen(*end);
-+	if (len >= PATH_MAX - n) {
-+		ERROR("Path is too long");
-+		goto out;
-+	}
-+
-+	memmove(&(*extra_buf)n, *end, len + 1);
-+	memcpy(*extra_buf, buf, (size_t)n);
-+
-+	*fullpath = *end = *extra_buf;
-+
-+	if (do_get_symlinks_copy_buf(buf, prefix, prefix_len, rpath, dest) != 0) {
-+		goto out;
-+	}
-+
-+	ret = 0;
-+out:
-+	free(buf);
-+	return ret;
-+}
-+
-+static bool do_eval_symlinks_in_scope_is_symlink(const char *path)
-+{
-+	struct stat st;
-+
-+	if (lstat(path, &st) < 0) {
-+		return true;
-+	}
-+
-+	if (!S_ISLNK(st.st_mode)) {
-+		return true;
-+	}
-+	return false;
-+}
-+
-+static void do_eval_symlinks_skip_slash(const char **start, const char **end)
-+{
-+	while (ISSLASH(**start)) {
-+		++(*start);
-+	}
-+
-+	for (*end = *start; **end && !ISSLASH(**end); ++(*end)) {
-+	}
-+}
-+
-+static inline void skip_dest_traling_slash(char **dest, char **rpath, size_t prefix_len)
-+{
-+	if (*dest > *rpath + prefix_len + 1) {
-+		for (--(*dest); *dest > *rpath && !ISSLASH((*dest)-1); --(*dest)) {
-+			continue;
-+		}
-+	}
-+}
-+
-+static inline bool is_current_char(const char c)
-+{
-+	return c == '.';
-+}
-+
-+static inline bool is_specify_current(const char *end, const char *start)
-+{
-+	return (end - start == 1) && is_current_char(start0);
-+}
-+
-+static inline bool is_specify_parent(const char *end, const char *start)
-+{
-+	return (end - start == 2) && is_current_char(start0) && is_current_char(start1);
-+}
-+
-+static int do_eval_symlinks_in_scope(const char *fullpath, const char *prefix,
-+                                     size_t prefix_len,
-+                                     char **rpath, char **dest, const char *rpath_limit)
-+{
-+	const char *start = NULL;
-+	const char *end = NULL;
-+	char *extra_buf = NULL;
-+	int nret = 0;
-+	int num_links = 0;
-+
-+	start = fullpath + prefix_len;
-+	for (end = start; *start; start = end) {
-+		do_eval_symlinks_skip_slash(&start, &end);
-+		if (end - start == 0) {
-+			break;
-+		} else if (is_specify_current(end, start)) {
-+			;
-+		} else if (is_specify_parent(end, start)) {
-+			skip_dest_traling_slash(dest, rpath, prefix_len);
-+		} else {
-+			if (!ISSLASH((*dest)-1)) {
-+				*(*dest)++ = '/';
-+			}
-+
-+			nret = do_path_realloc(start, end, rpath, dest, &rpath_limit);
-+			if (nret != 0) {
-+				nret = -1;
-+				goto out;
-+			}
-+
-+			memcpy(*dest, start, (size_t)(end - start));
-+			*dest += end - start;
-+			**dest = '\0';
-+
-+			if (do_eval_symlinks_in_scope_is_symlink(*rpath)) {
-+				continue;
-+			}
-+
-+			nret = do_get_symlinks(&fullpath, prefix, prefix_len, rpath, dest, &end, &num_links, &extra_buf);
-+			if (nret != 0) {
-+				nret = -1;
-+				goto out;
-+			}
-+		}
-+	}
-+out:
-+	free(extra_buf);
-+	return nret;
-+}
-+static char *eval_symlinks_in_scope(const char *fullpath, const char *rootpath)
-+{
-+	char resrootPATH_MAX = {0};
-+	char *root = NULL;
-+	char *rpath = NULL;
-+	char *dest = NULL;
-+	char *prefix = NULL;
-+	const char *rpath_limit = NULL;
-+	size_t prefix_len;
-+
-+	if (fullpath == NULL || rootpath == NULL) {
-+		return NULL;
-+	}
-+
-+	root = cleanpath(rootpath, resroot, sizeof(resroot));
-+	if (root == NULL) {
-+		ERROR("Failed to get cleaned path");
-+		return NULL;
-+	}
-+
-+	if (!strcmp(fullpath, root)) {
-+		return safe_strdup(fullpath);
-+	}
-+
-+	if (strstr(fullpath, root) == NULL) {
-+		ERROR("Path '%s' is not in '%s'", fullpath, root);
-+		return NULL;
-+	}
-+
-+	rpath = lxc_common_calloc_s(PATH_MAX);
-+	if (rpath == NULL) {
-+		ERROR("Out of memory");
-+		goto out;
-+	}
-+	rpath_limit = rpath + PATH_MAX;
-+
-+	prefix = root;
-+	prefix_len = (size_t)strlen(prefix);
-+	if (!strcmp(prefix, "/")) {
-+		prefix_len = 0;
-+	}
-+
-+	dest = rpath;
-+	if (prefix_len) {
-+		memcpy(rpath, prefix, prefix_len);
-+		dest += prefix_len;
-+	}
-+	*dest++ = '/';
-+
-+	if (do_eval_symlinks_in_scope(fullpath, prefix, prefix_len, &rpath, &dest,
-+	                              rpath_limit)) {
-+		goto out;
-+	}
-+
-+	if (dest > rpath + prefix_len + 1 && ISSLASH(dest-1)) {
-+		--dest;
-+	}
-+	*dest = '\0';
-+	return rpath;
-+
-+out:
-+	free(rpath);
-+	return NULL;
-+}
-+
-+// FollowSymlinkInScope is a wrapper around evalSymlinksInScope that returns an
-+// absolute path. This function handles paths in a platform-agnostic manner.
-+char *follow_symlink_in_scope(const char *fullpath, const char *rootpath)
-+{
-+	char resfullPATH_MAX = {0}, *full = NULL;
-+	char resrootPATH_MAX = {0}, *root = NULL;
-+
-+	full = cleanpath(fullpath, resfull, PATH_MAX);
-+	if (!full) {
-+		ERROR("Failed to get cleaned path");
-+		return NULL;
-+	}
-+
-+	root = cleanpath(rootpath, resroot, PATH_MAX);
-+	if (!root) {
-+		ERROR("Failed to get cleaned path");
-+		return NULL;
-+	}
-+
-+	return eval_symlinks_in_scope(full, root);
-+}
-+
-+// GetResourcePath evaluates `path` in the scope of the container's rootpath, with proper path
-+// sanitisation. Symlinks are all scoped to the rootpath of the container, as
-+// though the container's rootpath was `/`.
-+//
-+// The BaseFS of a container is the host-facing path which is bind-mounted as
-+// `/` inside the container. This method is essentially used to access a
-+// particular path inside the container as though you were a process in that
-+// container.
-+int get_resource_path(const char *rootpath, const char *path,
-+                      char **scopepath)
-+{
-+	char resolvedPATH_MAX = {0}, *cleanedpath = NULL;
-+	char *fullpath = NULL;
-+	size_t len;
-+
-+	if (!rootpath || !path || !scopepath)
-+		return -1;
-+
-+	*scopepath = NULL;
-+
-+	cleanedpath = cleanpath(path, resolved, PATH_MAX);
-+	if (!cleanedpath) {
-+		ERROR("Failed to get cleaned path");
-+		return -1;
-+	}
-+
-+	len = strlen(rootpath) + strlen(cleanedpath) + 1;
-+	fullpath = malloc(len);
-+	if (!fullpath) {
-+		ERROR("Out of memory");
-+		return -1;
-+	}
-+	snprintf(fullpath, len, "%s%s", rootpath, cleanedpath);
-+
-+	*scopepath = follow_symlink_in_scope(fullpath, rootpath);
-+
-+	free(fullpath);
-+	return 0;
-+}
-+
-+// Rel returns a relative path that is lexically equivalent to targpath when
-+// joined to basepath with an intervening separator. That is,
-+// Join(basepath, Rel(basepath, targpath)) is equivalent to targpath itself.
-+// On success, the returned path will always be relative to basepath,
-+// even if basepath and targpath share no elements.
-+// An error is returned if targpath can't be made relative to basepath or if
-+// knowing the current working directory would be necessary to compute it.
-+// Rel calls Clean on the result.
-+char *path_relative(const char *basepath, const char *targpath)
-+{
-+	char resbasePATH_MAX = {0}, *base = NULL;
-+	char restargPATH_MAX = {0}, *targ = NULL;
-+	size_t bl = 0, tl = 0, b0 = 0, bi = 0, t0 = 0, ti = 0;
-+
-+	base = cleanpath(basepath, resbase, PATH_MAX);
-+	if (!base) {
-+		ERROR("Failed to get cleaned path");
-+		return NULL;
-+	}
-+
-+	targ = cleanpath(targpath, restarg, PATH_MAX);
-+	if (!targ) {
-+		ERROR("Failed to get cleaned path");
-+		return NULL;
-+	}
-+
-+	if (strcmp(base, targ) == 0)
-+		return safe_strdup(".");
-+
-+	bl = strlen(base);
-+	tl = strlen(targ);
-+	while(true) {
-+		while(bi < bl && !ISSLASH(basebi))
-+			bi++;
-+		while(ti < tl && !ISSLASH(targti))
-+			ti++;
-+		//not the same string
-+		if (((bi - b0) != (ti - t0)) || strncmp(base + b0, targ + t0, bi - b0))
-+			break;
-+		if (bi < bl)
-+			bi++;
-+		if (ti < tl)
-+			ti++;
-+		b0 = bi;
-+		t0 = ti;
-+	}
-+
-+	if (b0 != bl) {
-+		// Base elements left. Must go up before going down.
-+		int seps = 0, i;
-+		size_t ncopyed = 0, seps_size;
-+		char *buf = NULL;
-+
-+		for (bi = b0; bi < bl; bi++) {
-+			if (ISSLASH(basebi))
-+				seps++;
-+		}
-+		//strlen(..) + strlen(/..) + '\0'
-+		seps_size = 2 + seps * 3 + 1;
-+		if (t0 != tl)
-+			seps_size += 1 + tl - t0;
-+
-+		buf = calloc(seps_size, 1);
-+		if (!buf) {
-+			ERROR("Out of memory");
-+			return NULL;
-+		}
-+		bufncopyed++ = '.';
-+		bufncopyed++ = '.';
-+		for (i = 0; i < seps; i++) {
-+			bufncopyed++ = '/';
-+			bufncopyed++ = '.';
-+			bufncopyed++ = '.';
-+		}
-+		if (t0 != tl) {
-+			bufncopyed++ = '/';
-+			memcpy(buf + ncopyed, targ + t0, tl - t0 + 1);
-+		}
-+		return buf;
-+	}
-+
-+	return safe_strdup(targ + t0);
-+}
-\ No newline at end of file
-diff --git a/src/lxc/storage/dir.c b/src/lxc/storage/dir.c
-index 18a10a4..dc642a4 100644
---- a/src/lxc/storage/dir.c
-+++ b/src/lxc/storage/dir.c
-@@ -94,6 +94,9 @@ int dir_create(struct lxc_storage *bdev, const char *dest, const char *n,
- 
- int dir_destroy(struct lxc_storage *orig)
- {
-+#ifdef HAVE_ISULAD
-+	// isulad: do not destroy rootfs for directory, it should be managed by caller
-+#else
- 	int ret;
- 	const char *src;
- 
-@@ -102,6 +105,7 @@ int dir_destroy(struct lxc_storage *orig)
- 	ret = lxc_rmdir_onedev(src, NULL);
- 	if (ret < 0)
- 		return log_error_errno(ret, errno, "Failed to delete \"%s\"", src);
-+#endif
- 
- 	return 0;
- }
-@@ -124,6 +128,35 @@ bool dir_detect(const char *path)
- 	return false;
- }
- 
-+#ifdef HAVE_ISULAD
-+int dir_mount(struct lxc_storage *bdev)
-+{
-+	__do_free char *mntdata = NULL;
-+	unsigned long mntflags = 0, pflags = 0;
-+	int ret;
-+	const char *src;
-+
-+	if (strcmp(bdev->type, "dir"))
-+		return -22;
-+
-+	if (!bdev->src || !bdev->dest)
-+		return -22;
-+
-+	ret = parse_mntopts(bdev->mntopts, &mntflags, &pflags, &mntdata);
-+	if (ret < 0)
-+		return log_error_errno(ret, errno, "Failed to parse mount options \"%s\"", bdev->mntopts);
-+
-+	src = lxc_storage_get_path(bdev->src, bdev->type);
-+
-+	ret = mount(src, bdev->dest, "bind", MS_BIND | MS_REC | (mntflags & ~MS_RDONLY) | pflags, mntdata);
-+	if (ret < 0) {
-+		return log_error_errno(-errno, errno, "Failed to mount \"%s\" on \"%s\"", src, bdev->dest);
-+	}
-+	TRACE("Mounted \"%s\" on \"%s\"", src, bdev->dest);
-+
-+	return 0;
-+}
-+#else
- int dir_mount(struct lxc_storage *bdev)
- {
- 	__do_free char *mntdata = NULL;
-@@ -166,6 +199,7 @@ int dir_mount(struct lxc_storage *bdev)
- 	      src ? src : "(none)", bdev->dest ? bdev->dest : "(none)", mntdata, mflags, pflags);
- 	return 0;
- }
-+#endif
- 
- int dir_umount(struct lxc_storage *bdev)
- {
-diff --git a/src/lxc/storage/loop.c b/src/lxc/storage/loop.c
-index eebc1b6..3a97c1d 100644
---- a/src/lxc/storage/loop.c
-+++ b/src/lxc/storage/loop.c
-@@ -21,6 +21,9 @@
- #include "memory_utils.h"
- #include "storage.h"
- #include "storage_utils.h"
-+#ifdef HAVE_ISULAD
-+#include "lxclock.h"
-+#endif
- #include "utils.h"
- 
- lxc_log_define(loop, lxc);
-@@ -216,7 +219,13 @@ bool loop_detect(const char *path)
- 
- int loop_mount(struct lxc_storage *bdev)
- {
-+#ifdef HAVE_ISULAD
-+	int ret = 0;
-+	int loopfd, lret;
-+	struct lxc_lock *l = NULL;
-+#else
- 	int ret, loopfd;
-+#endif
- 	char lonamePATH_MAX;
- 	const char *src;
- 
-@@ -226,13 +235,35 @@ int loop_mount(struct lxc_storage *bdev)
- 	if (!bdev->src || !bdev->dest)
- 		return -22;
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: do lock before mount, so we can avoid use loop which is used by
-+	 * other starting contianers */
-+	l = lxc_newlock("mount_lock", "mount_lock");
-+	if (!l) {
-+		SYSERROR("create file lock error when mount fs");
-+		return -1;
-+	}
-+
-+	lret = lxclock(l, 0);
-+	if (lret) {
-+		SYSERROR("try to lock failed when mount fs");
-+		ret = -1;
-+		goto out;
-+	}
-+#endif
-+
- 	/* skip prefix */
- 	src = lxc_storage_get_path(bdev->src, bdev->type);
- 
- 	loopfd = lxc_prepare_loop_dev(src, loname, LO_FLAGS_AUTOCLEAR);
- 	if (loopfd < 0) {
- 		ERROR("Failed to prepare loop device for loop file \"%s\"", src);
-+#ifdef HAVE_ISULAD
-+		ret = -1;
-+		goto out;
-+#else
- 		return -1;
-+#endif
- 	}
- 	DEBUG("Prepared loop device \"%s\"", loname);
- 
-@@ -241,14 +272,29 @@ int loop_mount(struct lxc_storage *bdev)
- 		ERROR("Failed to mount rootfs \"%s\" on \"%s\" via loop device \"%s\"",
- 		      bdev->src, bdev->dest, loname);
- 		close(loopfd);
-+#ifdef HAVE_ISULAD
-+		ret = -1;
-+		goto out;
-+#else
- 		return -1;
-+#endif
- 	}
- 
- 	bdev->lofd = loopfd;
- 	DEBUG("Mounted rootfs \"%s\" on \"%s\" via loop device \"%s\"",
- 	      bdev->src, bdev->dest, loname);
--
-+#ifdef HAVE_ISULAD
-+out:
-+	lret = lxcunlock(l);
-+	if (lret) {
-+		SYSERROR("try to unlock failed when mount fs");
-+		ret = -1;
-+	}
-+	lxc_putlock(l);
-+	return ret;
-+#else
- 	return 0;
-+#endif
- }
- 
- int loop_umount(struct lxc_storage *bdev)
-diff --git a/src/lxc/storage/storage.c b/src/lxc/storage/storage.c
-index 3f1b713..371513d 100644
---- a/src/lxc/storage/storage.c
-+++ b/src/lxc/storage/storage.c
-@@ -41,6 +41,9 @@
- #include "storage_utils.h"
- #include "utils.h"
- #include "zfs.h"
-+#ifdef HAVE_ISULAD
-+#include "block.h"
-+#endif
- 
- #ifndef HAVE_STRLCPY
- #include "include/strlcpy.h"
-@@ -94,6 +97,22 @@ static const struct lxc_storage_ops loop_ops = {
-     .can_backup = true,
- };
- 
-+#ifdef HAVE_ISULAD
-+/* block */
-+static const struct lxc_storage_ops blk_ops = {
-+    .detect = &blk_detect,
-+    .mount = &blk_mount,
-+    .umount = &blk_umount,
-+    .clone_paths = NULL,
-+    .destroy = &blk_destroy,
-+    .create = NULL,
-+    .copy = NULL,
-+    .snapshot = NULL,
-+    .can_snapshot = false,
-+    .can_backup = true,
-+};
-+#endif
-+
- /* lvm */
- static const struct lxc_storage_ops lvm_ops = {
-     .detect = &lvm_detect,
-@@ -179,6 +198,10 @@ static const struct lxc_storage_type bdevs = {
- 	{ .name = "overlayfs", .ops = &ovl_ops,   },
- 	{ .name = "loop",      .ops = &loop_ops,  },
- 	{ .name = "nbd",       .ops = &nbd_ops,   },
-+#ifdef HAVE_ISULAD
-+	//isulad: block device
-+	{ .name = "blk",       .ops = &blk_ops,   }
-+#endif
- };
- 
- static const size_t numbdevs = sizeof(bdevs) / sizeof(struct lxc_storage_type);
-@@ -570,9 +593,15 @@ bool storage_destroy(struct lxc_conf *conf)
- 	int destroy_rv = 0;
- 
- 	r = storage_init(conf);
-+#ifdef HAVE_ISULAD
-+	if (r == NULL) {
-+		WARN("%s 's storage init failed, the storage may be deleted already", conf->name);
-+		return true;
-+	}
-+#else
- 	if (!r)
- 		return ret;
--
-+#endif
- 	destroy_rv = r->ops->destroy(r);
- 	if (destroy_rv == 0)
- 		ret = true;
--- 
-2.25.1
-

_service:tar_scm:0005-fix-compile-error.patch Added

@@ -0,0 +1,5774 @@
+From edc766541e03d457ce61cda5f4e8e201a6d2a738 Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Tue, 1 Aug 2023 09:36:57 +0800
+Subject: PATCH fix compile error
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ meson.build                     |    2 +-
+ src/lxc/af_unix.c               |   66 +
+ src/lxc/af_unix.h               |    2 +
+ src/lxc/attach.c                |   27 +-
+ src/lxc/attach_options.h        |    3 +
+ src/lxc/cgroups/cgfsng.c        |    3 +
+ src/lxc/cgroups/cgroup.h        |    5 +
+ src/lxc/cgroups/isulad_cgfsng.c | 2784 ++++++++++++++++++++-----------
+ src/lxc/commands.c              |    4 +-
+ src/lxc/conf.c                  |  197 ++-
+ src/lxc/conf.h                  |    4 +
+ src/lxc/confile.c               |   35 +-
+ src/lxc/exec_commands.c         |   23 +-
+ src/lxc/exec_commands.h         |    4 +-
+ src/lxc/execute.c               |   15 +
+ src/lxc/isulad_utils.c          |    6 +-
+ src/lxc/isulad_utils.h          |    8 +-
+ src/lxc/lsm/lsm.c               |   28 +
+ src/lxc/lsm/lsm.h               |    5 +
+ src/lxc/lsm/selinux.c           |    2 +-
+ src/lxc/lxc.h                   |   11 +
+ src/lxc/lxccontainer.c          |    4 +
+ src/lxc/mainloop.c              |    2 +-
+ src/lxc/mainloop.h              |    2 +-
+ src/lxc/seccomp.c               |   52 +
+ src/lxc/start.c                 |   56 +-
+ src/lxc/sync.c                  |    6 +
+ src/lxc/sync.h                  |   13 +-
+ src/lxc/terminal.c              |  373 ++++-
+ src/lxc/tools/lxc_ls.c          |    2 +-
+ src/lxc/utils.c                 |    3 +
+ src/tests/aa.c                  |    4 +
+ src/tests/capabilities.c        |   12 +
+ src/tests/mount_injection.c     |    4 +
+ src/tests/proc_pid.c            |    4 +
+ src/tests/rootfs_options.c      |    4 +
+ src/tests/sys_mixed.c           |    4 +
+ src/tests/sysctls.c             |    4 +
+ 38 files changed, 2700 insertions(+), 1083 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fda8045..05bcbb2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -231,7 +231,7 @@ possible_link_flags = 
+ 
+ 
+ if want_isulad
+-    possible_cc_flags += '-D_FORTIFY_SOURCE=2'
++    possible_cc_flags += '-D_FORTIFY_SOURCE=2', '-O2'
+     yajldep = dependency('yajl', version : '>=2')
+     srcconf.set('HAVE_ISULAD', yajldep.found())
+     liblxc_dependencies += yajldep
+diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
+index 6db1864..e0a4892 100644
+--- a/src/lxc/af_unix.c
++++ b/src/lxc/af_unix.c
+@@ -175,10 +175,18 @@ int __lxc_abstract_unix_send_two_fds(int fd, int fd_first, int fd_second,
+ 	return lxc_abstract_unix_send_fds(fd, fd_send, 2, data, size);
+ }
+ 
++#ifdef HAVE_ISULAD
++static ssize_t lxc_abstract_unix_recv_fds_iov(int fd,
++					      struct unix_fds *ret_fds,
++					      struct iovec *ret_iov,
++					      size_t size_ret_iov,
++						  unsigned int timeout)
++#else
+ static ssize_t lxc_abstract_unix_recv_fds_iov(int fd,
+ 					      struct unix_fds *ret_fds,
+ 					      struct iovec *ret_iov,
+ 					      size_t size_ret_iov)
++#endif
+ {
+ 	__do_free char *cmsgbuf = NULL;
+ 	ssize_t ret;
+@@ -209,6 +217,22 @@ static ssize_t lxc_abstract_unix_recv_fds_iov(int fd,
+ 	msg.msg_iov	= ret_iov;
+ 	msg.msg_iovlen	= size_ret_iov;
+ 
++#ifdef HAVE_ISULAD
++	struct timeval out;
++	if (timeout > 0) {
++		memset(&out, 0, sizeof(out));
++		out.tv_sec = timeout / 1000000;
++		out.tv_usec = timeout % 1000000;
++		ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO,
++		                 (const void *)&out, sizeof(out));
++		if (ret < 0) {
++			ERROR("Failed to set %u timeout on containter "
++			      "state socket", timeout);
++			return -1;
++		}
++	}
++#endif
++
+ again:
+ 	ret = recvmsg(fd, &msg, MSG_CMSG_CLOEXEC);
+ 	if (ret < 0) {
+@@ -329,7 +353,11 @@ ssize_t lxc_abstract_unix_recv_fds(int fd, struct unix_fds *ret_fds,
+ 	};
+ 	ssize_t ret;
+ 
++#ifdef HAVE_ISULAD
++	ret = lxc_abstract_unix_recv_fds_iov(fd, ret_fds, &iov, 1, 0);
++#else
+ 	ret = lxc_abstract_unix_recv_fds_iov(fd, ret_fds, &iov, 1);
++#endif
+ 	if (ret < 0)
+ 		return ret;
+ 
+@@ -351,7 +379,11 @@ ssize_t lxc_abstract_unix_recv_one_fd(int fd, int *ret_fd, void *ret_data,
+ 		.fd_count_max = 1,
+ 	};
+ 
++#ifdef HAVE_ISULAD
++	ret = lxc_abstract_unix_recv_fds_iov(fd, fds, &iov, 1, 0);
++#else
+ 	ret = lxc_abstract_unix_recv_fds_iov(fd, fds, &iov, 1);
++#endif
+ 	if (ret < 0)
+ 		return ret;
+ 
+@@ -381,7 +413,11 @@ ssize_t __lxc_abstract_unix_recv_two_fds(int fd, int *fd_first, int *fd_second,
+ 		.fd_count_max = 2,
+ 	};
+ 
++#ifdef HAVE_ISULAD
++	ret = lxc_abstract_unix_recv_fds_iov(fd, fds, &iov, 1, 0);
++#else
+ 	ret = lxc_abstract_unix_recv_fds_iov(fd, fds, &iov, 1);
++#endif
+ 	if (ret < 0)
+ 		return ret;
+ 
+@@ -551,6 +587,36 @@ int lxc_socket_set_timeout(int fd, int rcv_timeout, int snd_timeout)
+ }
+ 
+ #ifdef HAVE_ISULAD
++ssize_t lxc_abstract_unix_recv_one_fd_timeout(int fd, int *ret_fd, void *ret_data,
++				      size_t size_ret_data, unsigned int timeout)
++{
++	call_cleaner(put_unix_fds) struct unix_fds *fds = NULL;
++	char buf1 = {};
++	struct iovec iov = {
++		.iov_base	= ret_data ? ret_data : buf,
++		.iov_len	= ret_data ? size_ret_data : sizeof(buf),
++	};
++	ssize_t ret;
++
++	fds = &(struct unix_fds){
++		.fd_count_max = 1,
++	};
++
++	ret = lxc_abstract_unix_recv_fds_iov(fd, fds, &iov, 1, timeout);
++	if (ret < 0)
++		return ret;
++
++	if (ret == 0)
++		return ret_errno(ENODATA);
++
++	if (fds->fd_count_ret != fds->fd_count_max)
++		*ret_fd = -EBADF;
++	else
++		*ret_fd = move_fd(fds->fd0);
++
++	return ret;
++}
++
+ int lxc_named_unix_open(const char *path, int type, int flags)
+ {
+ 	__do_close int fd = -EBADF;
+diff --git a/src/lxc/af_unix.h b/src/lxc/af_unix.h
+index 605afc2..de5731f 100644
+--- a/src/lxc/af_unix.h
++++ b/src/lxc/af_unix.h
+@@ -169,6 +169,8 @@ static inline void put_unix_fds(struct unix_fds *fds)
+ define_cleanup_function(struct unix_fds *, put_unix_fds);
+ 
+ #ifdef HAVE_ISULAD
++__hidden extern ssize_t lxc_abstract_unix_recv_one_fd_timeout(int fd, int *ret_fd, void *ret_data,
++				     			 							  size_t size_ret_data, unsigned int timeout);
+ __hidden extern int lxc_named_unix_open(const char *path, int type, int flags);
+ __hidden extern int lxc_named_unix_connect(const char *path);
+ #endif
+diff --git a/src/lxc/attach.c b/src/lxc/attach.c
+index 1a89001..066eb5c 100644
+--- a/src/lxc/attach.c
++++ b/src/lxc/attach.c
+@@ -1203,10 +1203,10 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 	sigset_t mask;
+ 
+ 	/*isulad: record errpipe fd*/
+-	msg_fd = init_ctx->container->lxc_conf->errpipe1;
+-	init_ctx->container->lxc_conf->errpipe1 = -1;
++	msg_fd = ctx->container->lxc_conf->errpipe1;
++	ctx->container->lxc_conf->errpipe1 = -1;
+ 	/*isulad: set system umask */
+-	umask(init_ctx->container->lxc_conf->umask);
++	umask(ctx->container->lxc_conf->umask);
+ 
+ 	/*isulad: restore default signal handlers and unblock all signals*/
+ 	for (int i = 1; i < NSIG; i++)
+@@ -1528,7 +1528,11 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 	put_attach_payload(ap);
+ 
+ 	/* We're done, so we can now do whatever the user intended us to do. */
++#ifdef HAVE_ISULAD
++	_exit(attach_function(attach_function_args, msg_fd));
++#else
+ 	_exit(attach_function(attach_function_args));
++#endif
+ 
+ on_error:
+ 	ERROR("Failed to attach to container");
+@@ -1668,7 +1672,7 @@ out:
+ }
+ 
+ static int attach_signal_handler(int fd, uint32_t events, void *data,
+-			  struct lxc_epoll_descr *descr)
++			  struct lxc_async_descr *descr)
+ {
+ 	int ret;
+ 	siginfo_t info;
+@@ -1703,7 +1707,7 @@ static int isulad_setup_signal_fd(sigset_t *oldmask)
+ 	if (ret < 0)
+ 		return -EBADF;
+ 
+-	for (int sig = 0; sig < (sizeof(signals) / sizeof(signals0)); sig++) {
++	for (size_t sig = 0; sig < (sizeof(signals) / sizeof(signals0)); sig++) {
+ 		ret = sigdelset(&mask, signalssig);
+ 		if (ret < 0)
+ 			return -EBADF;
+@@ -1753,7 +1757,7 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 
+ 	int isulad_sigfd;
+ 	sigset_t isulad_oldmask;
+-	struct lxc_epoll_descr isulad_descr = {0};
++	struct lxc_async_descr isulad_descr = {0};
+ #endif
+ 
+ 	if (!container)
+@@ -1786,9 +1790,9 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 
+ #ifdef HAVE_ISULAD
+ 	// always switch uid and gid for attach
+-	if (options->uid == -1)
++	if (options->uid == (uid_t)-1)
+ 		options->uid = conf->init_uid;
+-	if (options->gid == -1)
++	if (options->gid == (gid_t)-1)
+ 		options->gid = conf->init_gid;
+ #endif
+ 
+@@ -2111,7 +2115,11 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 		goto on_error;
+ 
+ 	/* Setup resource limits */
++#ifdef HAVE_ISULAD
++	ret = setup_resource_limits(conf, pid, -1);
++#else
+ 	ret = setup_resource_limits(conf, pid);
++#endif
+ 	if (ret < 0)
+ 		goto on_error;
+ 
+@@ -2228,7 +2236,8 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 		goto close_mainloop;
+ 	}
+ 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+-		ret = lxc_mainloop_add_handler(&descr, isulad_sigfd, attach_signal_handler, &tmp_pid);
++		ret = lxc_mainloop_add_handler(&descr, isulad_sigfd, attach_signal_handler, default_cleanup_handler, &tmp_pid,
++									   "attach_signal_handler");
+ 		if (ret < 0) {
+ 			ERROR("Failed to add signal handler for %d to mainloop", tmp_pid);
+ 			goto close_mainloop;
+diff --git a/src/lxc/attach_options.h b/src/lxc/attach_options.h
+index a4052fb..fe8bf6d 100644
+--- a/src/lxc/attach_options.h
++++ b/src/lxc/attach_options.h
+@@ -4,6 +4,9 @@
+ #define __LXC_ATTACH_OPTIONS_H
+ 
+ #include <sys/types.h>
++#ifdef HAVE_ISULAD
++#include <stdbool.h>
++#endif
+ 
+ #ifdef  __cplusplus
+ extern "C" {
+diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
+index cecc9bc..4e4ae0c 100644
+--- a/src/lxc/cgroups/cgfsng.c
++++ b/src/lxc/cgroups/cgfsng.c
+@@ -3634,6 +3634,9 @@ static int __initialize_cgroups(struct cgroup_ops *ops, bool relative,
+ 			controller_list = unified_controllers(dfd, "cgroup.controllers");
+ 			if (!controller_list) {
+ 				TRACE("No controllers are enabled for delegation in the unified hierarchy");
++#ifdef HAVE_ISULAD
++				ops->no_controller = true;
++#endif
+ 				controller_list = list_new();
+ 				if (!controller_list)
+ 					return syserror_set(-ENOMEM, "Failed to create empty controller list");
+diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h
+index ebfd3a1..d9159f4 100644
+--- a/src/lxc/cgroups/cgroup.h
++++ b/src/lxc/cgroups/cgroup.h
+@@ -208,6 +208,11 @@ struct cgroup_ops {
+ 	char *container_limit_cgroup;
+ 	char *monitor_cgroup;
+ 
++#ifdef HAVE_ISULAD
++	int errfd;
++	bool no_controller;
++#endif
++
+ 	/* @hierarchies
+ 	 * - A NULL-terminated array of struct hierarchy, one per legacy
+ 	 *   hierarchy. No duplicates. First sufficient, writeable mounted
+diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c
+index 38ad677..1160af5 100644
+--- a/src/lxc/cgroups/isulad_cgfsng.c
++++ b/src/lxc/cgroups/isulad_cgfsng.c
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/epoll.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
+@@ -43,41 +44,55 @@
+ #include "cgroup2_devices.h"
+ #include "cgroup_utils.h"
+ #include "commands.h"
++#include "commands_utils.h"
+ #include "conf.h"
+ #include "config.h"
+ #include "log.h"
+ #include "macro.h"
+ #include "mainloop.h"
+ #include "memory_utils.h"
++#include "open_utils.h"
+ #include "storage/storage.h"
+ #include "utils.h"
+ 
+-#ifndef HAVE_STRLCPY
++#if !HAVE_STRLCPY
+ #include "include/strlcpy.h"
+ #endif
+ 
+-#ifndef HAVE_STRLCAT
++#if !HAVE_STRLCAT
+ #include "include/strlcat.h"
+ #endif
+ 
++#if HAVE_LIBSYSTEMD
++#include <systemd/sd-bus.h>
++#include <systemd/sd-event.h>
++#endif
++
+ lxc_log_define(isulad_cgfsng, cgroup);
+ 
+-/* Given a pointer to a null-terminated array of pointers, realloc to add one
++/*
++ * Given a pointer to a null-terminated array of pointers, realloc to add one
+  * entry, and point the new entry to NULL. Do not fail. Return the index to the
+  * second-to-last entry - that is, the one which is now available for use
+  * (keeping the list null-terminated).
+  */
+-static int append_null_to_list(void ***list)
++static int cg_list_add(void ***list)
+ {
+-	int newentry = 0;
++	int idx = 0;
++	void **p;
+ 
+ 	if (*list)
+-		for (; (*list)newentry; newentry++)
++		for (; (*list)idx; idx++)
+ 			;
+ 
+-	*list = must_realloc(*list, (newentry + 2) * sizeof(void **));
+-	(*list)newentry + 1 = NULL;
+-	return newentry;
++	p = realloc(*list, (idx + 2) * sizeof(void **));
++	if (!p)
++		return ret_errno(ENOMEM);
++
++	pidx + 1 = NULL;
++	*list = p;
++
++	return idx;
+ }
+ 
+ /* Given a null-terminated array of strings, check whether @entry is one of the
+@@ -95,63 +110,10 @@ static bool string_in_list(char **list, const char *entry)
+ 	return false;
+ }
+ 
+-/* Return a copy of @entry prepending "name=", i.e.  turn "systemd" into
+- * "name=systemd". Do not fail.
+- */
+-static char *cg_legacy_must_prefix_named(char *entry)
+-{
+-	size_t len;
+-	char *prefixed;
+-
+-	len = strlen(entry);
+-	prefixed = must_realloc(NULL, len + 6);
+-
+-	memcpy(prefixed, "name=", STRLITERALLEN("name="));
+-	memcpy(prefixed + STRLITERALLEN("name="), entry, len);
+-	prefixedlen + 5 = '\0';
+-
+-	return prefixed;
+-}
+-
+-/* Append an entry to the clist. Do not fail. @clist must be NULL the first time
+- * we are called.
+- *
+- * We also handle named subsystems here. Any controller which is not a kernel
+- * subsystem, we prefix "name=". Any which is both a kernel and named subsystem,
+- * we refuse to use because we're not sure which we have here.
+- * (TODO: We could work around this in some cases by just remounting to be
+- * unambiguous, or by comparing mountpoint contents with current cgroup.)
+- *
+- * The last entry will always be NULL.
+- */
+-static void must_append_controller(char **klist, char **nlist, char ***clist,
+-				   char *entry)
+-{
+-	int newentry;
+-	char *copy;
+-
+-	if (string_in_list(klist, entry) && string_in_list(nlist, entry)) {
+-		ERROR("Refusing to use ambiguous controller \"%s\"", entry);
+-		ERROR("It is both a named and kernel subsystem");
+-		return;
+-	}
+-
+-	newentry = append_null_to_list((void ***)clist);
+-
+-	if (strncmp(entry, "name=", 5) == 0)
+-		copy = must_copy_string(entry);
+-	else if (string_in_list(klist, entry))
+-		copy = must_copy_string(entry);
+-	else
+-		copy = cg_legacy_must_prefix_named(entry);
+-
+-	(*clist)newentry = copy;
+-}
+-
+ /* Given a handler's cgroup data, return the struct hierarchy for the controller
+  * @c, or NULL if there is none.
+  */
+-struct hierarchy *get_hierarchy(struct cgroup_ops *ops, const char *controller)
++static struct hierarchy *get_hierarchy(const struct cgroup_ops *ops, const char *controller)
+ {
+ 	if (!ops->hierarchies)
+ 		return log_trace_errno(NULL, errno, "There are no useable cgroup controllers");
+@@ -159,15 +121,28 @@ struct hierarchy *get_hierarchy(struct cgroup_ops *ops, const char *controller)
+ 	for (int i = 0; ops->hierarchiesi; i++) {
+ 		if (!controller) {
+ 			/* This is the empty unified hierarchy. */
+-			if (ops->hierarchiesi->controllers &&
+-			    !ops->hierarchiesi->controllers0)
++			if (ops->hierarchiesi->controllers && !ops->hierarchiesi->controllers0)
+ 				return ops->hierarchiesi;
++
+ 			continue;
+-		} else if (pure_unified_layout(ops) &&
+-			   strcmp(controller, "devices") == 0) {
+-			if (ops->unified->bpf_device_controller)
+-				return ops->unified;
+-			break;
++		}
++
++		/*
++		 * Handle controllers with significant implementation changes
++		 * from cgroup to cgroup2.
++		 */
++		if (pure_unified_layout(ops)) {
++			if (strequal(controller, "devices")) {
++				if (device_utility_controller(ops->unified))
++					return ops->unified;
++
++				break;
++			} else if (strequal(controller, "freezer")) {
++				if (freezer_utility_controller(ops->unified))
++					return ops->unified;
++
++				break;
++			}
+ 		}
+ 
+ 		if (string_in_list(ops->hierarchiesi->controllers, controller))
+@@ -182,6 +157,38 @@ struct hierarchy *get_hierarchy(struct cgroup_ops *ops, const char *controller)
+ 	return ret_set_errno(NULL, ENOENT);
+ }
+ 
++int prepare_cgroup_fd(const struct cgroup_ops *ops, struct cgroup_fd *fd, bool limit)
++{
++	int dfd;
++	const struct hierarchy *h;
++
++	h = get_hierarchy(ops, fd->controller);
++	if (!h)
++		return ret_errno(ENOENT);
++
++	/*
++	 * The client requested that the controller must be in a specific
++	 * cgroup version.
++	 */
++	if (fd->type != 0 && (cgroupfs_type_magic_t)fd->type != h->fs_type)
++		return ret_errno(EINVAL);
++
++	if (limit)
++		dfd = h->dfd_con;
++	else
++		dfd = h->dfd_lim;
++	if (dfd < 0)
++		return ret_errno(EBADF);
++
++	fd->layout = ops->cgroup_layout;
++	fd->type = h->fs_type;
++	if (fd->type == UNIFIED_HIERARCHY)
++		fd->utilities = h->utilities;
++	fd->fd = dfd;
++
++	return 0;
++}
++
+ #define BATCH_SIZE 50
+ static void batch_realloc(char **mem, size_t oldlen, size_t newlen)
+ {
+@@ -223,44 +230,24 @@ static char *read_file(const char *fnam)
+ 
+ static inline bool is_unified_hierarchy(const struct hierarchy *h)
+ {
+-	return h->version == CGROUP2_SUPER_MAGIC;
+-}
+-
+-/* Given two null-terminated lists of strings, return true if any string is in
+- * both.
+- */
+-static bool controller_lists_intersect(char **l1, char **l2)
+-{
+-	if (!l1 || !l2)
+-		return false;
+-
+-	for (int i = 0; l1i; i++)
+-		if (string_in_list(l2, l1i))
+-			return true;
+-
+-	return false;
++	return h->fs_type == UNIFIED_HIERARCHY;
+ }
+ 
+-/* For a null-terminated list of controllers @clist, return true if any of those
+- * controllers is already listed the null-terminated list of hierarchies @hlist.
+- * Realistically, if one is present, all must be present.
+- */
+-static bool controller_list_is_dup(struct hierarchy **hlist, char **clist)
++static char *trim(char *s)
+ {
+-	if (!hlist)
+-		return false;
++	size_t len;
+ 
+-	for (int i = 0; hlisti; i++)
+-		if (controller_lists_intersect(hlisti->controllers, clist))
+-			return true;
++	len = strlen(s);
++	while ((len > 1) && (slen - 1 == '\n'))
++		s--len = '\0';
+ 
+-	return false;
++	return s;
+ }
+ 
+ /* Return true if the controller @entry is found in the null-terminated list of
+  * hierarchies @hlist.
+  */
+-static bool controller_found(struct hierarchy **hlist, char *entry)
++static bool controller_available(struct hierarchy **hlist, char *entry)
+ {
+ 	if (!hlist)
+ 		return false;
+@@ -272,10 +259,7 @@ static bool controller_found(struct hierarchy **hlist, char *entry)
+ 	return false;
+ }
+ 
+-/* Return true if all of the controllers which we require have been found.  The
+- * required list is  freezer and anything in lxc.cgroup.use.
+- */
+-static bool all_controllers_found(struct cgroup_ops *ops)
++static bool controllers_available(struct cgroup_ops *ops)
+ {
+ 	struct hierarchy **hlist;
+ 
+@@ -284,335 +268,139 @@ static bool all_controllers_found(struct cgroup_ops *ops)
+ 
+ 	hlist = ops->hierarchies;
+ 	for (char **cur = ops->cgroup_use; cur && *cur; cur++)
+-		if (!controller_found(hlist, *cur))
+-			return log_error(false, "No %s controller mountpoint found", *cur);
++		if (!controller_available(hlist, *cur))
++			return log_error(false, "The %s controller found", *cur);
+ 
+ 	return true;
+ }
+ 
+-/* Get the controllers from a mountinfo line There are other ways we could get
+- * this info. For lxcfs, field 3 is /cgroup/controller-list. For cgroupfs, we
+- * could parse the mount options. But we simply assume that the mountpoint must
+- * be /sys/fs/cgroup/controller-list
+- */
+-static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
+-					int type)
++static char **list_new(void)
+ {
+-	/* The fourth field is /sys/fs/cgroup/comma-delimited-controller-list
+-	 * for legacy hierarchies.
+-	 */
+-	__do_free_string_list char **aret = NULL;
+-	int i;
+-	char *p2, *tok;
+-	char *p = line, *sep = ",";
+-
+-	for (i = 0; i < 4; i++) {
+-		p = strchr(p, ' ');
+-		if (!p)
+-			return NULL;
+-		p++;
+-	}
+-
+-	/* Note, if we change how mountinfo works, then our caller will need to
+-	 * verify /sys/fs/cgroup/ in this field.
+-	 */
+-	if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0)
+-		return log_warn(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p);
+-
+-	p += 15;
+-	p2 = strchr(p, ' ');
+-	if (!p2)
+-		return log_error(NULL, "Corrupt mountinfo");
+-	*p2 = '\0';
+-
+-	if (type == CGROUP_SUPER_MAGIC) {
+-		__do_free char *dup = NULL;
+-
+-		/* strdup() here for v1 hierarchies. Otherwise
+-		 * lxc_iterate_parts() will destroy mountpoints such as
+-		 * "/sys/fs/cgroup/cpu,cpuacct".
+-		 */
+-		dup = must_copy_string(p);
+-		if (!dup)
+-			return NULL;
+-
+-		lxc_iterate_parts (tok, dup, sep)
+-			must_append_controller(klist, nlist, &aret, tok);
+-	}
+-	*p2 = ' ';
+-
+-	return move_ptr(aret);
+-}
++	__do_free_string_list char **list = NULL;
++	int idx;
+ 
+-static char **cg_unified_make_empty_controller(void)
+-{
+-	__do_free_string_list char **aret = NULL;
+-	int newentry;
++	idx = cg_list_add((void ***)&list);
++	if (idx < 0)
++		return NULL;
+ 
+-	newentry = append_null_to_list((void ***)&aret);
+-	aretnewentry = NULL;
+-	return move_ptr(aret);
++	listidx = NULL;
++	return move_ptr(list);
+ }
+ 
+-static char **cg_unified_get_controllers(const char *file)
++static int list_add_string(char ***list, char *entry)
+ {
+-	__do_free char *buf = NULL;
+-	__do_free_string_list char **aret = NULL;
+-	char *sep = " \t\n";
+-	char *tok;
+-
+-	buf = read_file(file);
+-	if (!buf)
+-		return NULL;
++	__do_free char *dup = NULL;
++	int idx;
+ 
+-	lxc_iterate_parts(tok, buf, sep) {
+-		int newentry;
+-		char *copy;
++	dup = strdup(entry);
++	if (!dup)
++		return ret_errno(ENOMEM);
+ 
+-		newentry = append_null_to_list((void ***)&aret);
+-		copy = must_copy_string(tok);
+-		aretnewentry = copy;
+-	}
++	idx = cg_list_add((void ***)list);
++	if (idx < 0)
++		return idx;
+ 
+-	return move_ptr(aret);
++	(*list)idx = move_ptr(dup);
++	return 0;
+ }
+ 
+-static struct hierarchy *add_hierarchy(struct hierarchy ***h, char **clist, char *mountpoint,
+-				       char *container_base_path, int type)
++static char **list_add_controllers(char *controllers)
+ {
+-	struct hierarchy *new;
+-	int newentry;
++	__do_free_string_list char **list = NULL;
++	char *it;
+ 
+-	new = zalloc(sizeof(*new));
+-	new->controllers = clist;
+-	new->at_mnt = mountpoint;
+-	new->at_base = container_base_path;
+-	new->fs_type = type;
+-	new->dfd_con = -EBADF;
+-	new->dfd_mon = -EBADF;
+-
+-	newentry = append_null_to_list((void ***)h);
+-	(*h)newentry = new;
+-	return new;
+-}
+-
+-/* Get a copy of the mountpoint from @line, which is a line from
+- * /proc/self/mountinfo.
+- */
+-static char *cg_hybrid_get_mountpoint(char *line)
+-{
+-	char *p = line, *sret = NULL;
+-	size_t len;
+-	char *p2;
++	lxc_iterate_parts(it, controllers, ", \t\n") {
++		int ret;
+ 
+-	for (int i = 0; i < 4; i++) {
+-		p = strchr(p, ' ');
+-		if (!p)
++		ret = list_add_string(&list, it);
++		if (ret < 0)
+ 			return NULL;
+-		p++;
+ 	}
+ 
+-	if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0)
+-		return NULL;
+-
+-	p2 = strchr(p + 15, ' ');
+-	if (!p2)
+-		return NULL;
+-	*p2 = '\0';
+-
+-	len = strlen(p);
+-	sret = must_realloc(NULL, len + 1);
+-	memcpy(sret, p, len);
+-	sretlen = '\0';
+-
+-	return sret;
++	return move_ptr(list);
+ }
+ 
+-/* Given a multi-line string, return a null-terminated copy of the current line. */
+-static char *copy_to_eol(char *p)
++static char **unified_controllers(int dfd, const char *file)
+ {
+-	char *p2, *sret;
+-	size_t len;
++	__do_free char *buf = NULL;
+ 
+-	p2 = strchr(p, '\n');
+-	if (!p2)
++	buf = read_file_at(dfd, file, PROTECT_OPEN, 0);
++	if (!buf)
+ 		return NULL;
+ 
+-	len = p2 - p;
+-	sret = must_realloc(NULL, len + 1);
+-	memcpy(sret, p, len);
+-	sretlen = '\0';
+-
+-	return sret;
++	return list_add_controllers(buf);
+ }
+ 
+-/* cgline: pointer to character after the first ':' in a line in a \n-terminated
+- * /proc/self/cgroup file. Check whether controller c is present.
+- */
+-static bool controller_in_clist(char *cgline, char *c)
++static bool skip_hierarchy(const struct cgroup_ops *ops, char **controllers)
+ {
+-	__do_free char *tmp = NULL;
+-	char *tok, *eol;
+-	size_t len;
+-
+-	eol = strchr(cgline, ':');
+-	if (!eol)
++	if (!ops->cgroup_use)
+ 		return false;
+ 
+-	len = eol - cgline;
+-	tmp = must_realloc(NULL, len + 1);
+-	memcpy(tmp, cgline, len);
+-	tmplen = '\0';
+-
+-	lxc_iterate_parts(tok, tmp, ",")
+-		if (strcmp(tok, c) == 0)
+-			return true;
+-
+-	return false;
+-}
+-
+-/* @basecginfo is a copy of /proc/$$/cgroup. Return the current cgroup for
+- * @controller.
+- */
+-static char *cg_hybrid_get_current_cgroup(char *basecginfo, char *controller,
+-					  int type)
+-{
+-	char *p = basecginfo;
+-
+-	for (;;) {
+-		bool is_cgv2_base_cgroup = false;
+-
+-		/* cgroup v2 entry in "/proc/<pid>/cgroup": "0::/some/path" */
+-		if ((type == CGROUP2_SUPER_MAGIC) && (*p == '0'))
+-			is_cgv2_base_cgroup = true;
++	for (char **cur_ctrl = controllers; cur_ctrl && *cur_ctrl; cur_ctrl++) {
++		bool found = false;
+ 
+-		p = strchr(p, ':');
+-		if (!p)
+-			return NULL;
+-		p++;
++		for (char **cur_use = ops->cgroup_use; cur_use && *cur_use; cur_use++) {
++			if (!strequal(*cur_use, *cur_ctrl))
++				continue;
+ 
+-		if (is_cgv2_base_cgroup || (controller && controller_in_clist(p, controller))) {
+-			p = strchr(p, ':');
+-			if (!p)
+-				return NULL;
+-			p++;
+-			return copy_to_eol(p);
++			found = true;
++			break;
+ 		}
+ 
+-		p = strchr(p, '\n');
+-		if (!p)
+-			return NULL;
+-		p++;
+-	}
+-}
+-
+-static void must_append_string(char ***list, char *entry)
+-{
+-	int newentry;
+-	char *copy;
+-
+-	newentry = append_null_to_list((void ***)list);
+-	copy = must_copy_string(entry);
+-	(*list)newentry = copy;
+-}
+-
+-static int get_existing_subsystems(char ***klist, char ***nlist)
+-{
+-	__do_free char *line = NULL;
+-	__do_fclose FILE *f = NULL;
+-	size_t len = 0;
+-
+-	f = fopen("/proc/self/cgroup", "re");
+-	if (!f)
+-		return -1;
+-
+-	while (getline(&line, &len, f) != -1) {
+-		char *p, *p2, *tok;
+-		p = strchr(line, ':');
+-		if (!p)
+-			continue;
+-		p++;
+-		p2 = strchr(p, ':');
+-		if (!p2)
+-			continue;
+-		*p2 = '\0';
+-
+-		/* If the kernel has cgroup v2 support, then /proc/self/cgroup
+-		 * contains an entry of the form:
+-		 *
+-		 *	0::/some/path
+-		 *
+-		 * In this case we use "cgroup2" as controller name.
+-		 */
+-		if ((p2 - p) == 0) {
+-			must_append_string(klist, "cgroup2");
++		if (found)
+ 			continue;
+-		}
+ 
+-		lxc_iterate_parts(tok, p, ",") {
+-			if (strncmp(tok, "name=", 5) == 0)
+-				must_append_string(nlist, tok);
+-			else
+-				must_append_string(klist, tok);
+-		}
++		return true;
+ 	}
+ 
+-	return 0;
++	return false;
+ }
+ 
+-static char *trim(char *s)
++static int cgroup_hierarchy_add(struct cgroup_ops *ops, int dfd_mnt, char *mnt,
++				int dfd_base, char *base_cgroup,
++				char **controllers, cgroupfs_type_magic_t fs_type)
+ {
+-	size_t len;
+-
+-	len = strlen(s);
+-	while ((len > 1) && (slen - 1 == '\n'))
+-		s--len = '\0';
++	__do_free struct hierarchy *new = NULL;
++	int idx;
+ 
+-	return s;
+-}
++	if (abspath(base_cgroup))
++		return syserror_set(-EINVAL, "Container base path must be relative to controller mount");
+ 
+-static void lxc_cgfsng_print_hierarchies(struct cgroup_ops *ops)
+-{
+-	int i;
+-	struct hierarchy **it;
++	new = zalloc(sizeof(*new));
++	if (!new)
++		return ret_errno(ENOMEM);
+ 
+-	if (!ops->hierarchies) {
+-		TRACE("  No hierarchies found");
+-		return;
+-	}
++	new->dfd_con		= -EBADF;
++	new->dfd_lim		= -EBADF;
++	new->dfd_mon		= -EBADF;
+ 
+-	TRACE("  Hierarchies:");
+-	for (i = 0, it = ops->hierarchies; it && *it; it++, i++) {
+-		int j;
+-		char **cit;
++	new->fs_type		= fs_type;
++	new->controllers	= controllers;
++	new->at_mnt		= mnt;
++	new->at_base		= base_cgroup;
+ 
+-		TRACE("  %d: base_cgroup: %s", i, (*it)->at_base ? (*it)->at_base : "(null)");
+-		TRACE("      at_mnt:  %s", (*it)->at_mnt ? (*it)->at_mnt : "(null)");
+-		TRACE("      controllers:");
+-		for (j = 0, cit = (*it)->controllers; cit && *cit; cit++, j++)
+-			TRACE("      %d: %s", j, *cit);
+-	}
+-}
++	new->dfd_mnt		= dfd_mnt;
++	new->dfd_base		= dfd_base;
+ 
+-static void lxc_cgfsng_print_basecg_debuginfo(char *basecginfo, char **klist,
+-					      char **nlist)
+-{
+-	int k;
+-	char **it;
++	TRACE("Adding cgroup hierarchy mounted at %s and base cgroup %s",
++	      mnt, maybe_empty(base_cgroup));
++	for (char *const *it = new->controllers; it && *it; it++)
++		TRACE("The hierarchy contains the %s controller", *it);
+ 
+-	TRACE("basecginfo is:");
+-	TRACE("%s", basecginfo);
++	idx = cg_list_add((void ***)&ops->hierarchies);
++	if (idx < 0)
++		return ret_errno(idx);
+ 
+-	for (k = 0, it = klist; it && *it; it++, k++)
+-		TRACE("kernel subsystem %d: %s", k, *it);
++	if (fs_type == UNIFIED_HIERARCHY)
++		ops->unified = new;
++	(ops->hierarchies)idx = move_ptr(new);
+ 
+-	for (k = 0, it = nlist; it && *it; it++, k++)
+-		TRACE("named subsystem %d: %s", k, *it);
++	return 0;
+ }
+ 
+ struct generic_userns_exec_data {
+ 	struct hierarchy **hierarchies;
+-	const char *container_cgroup;
++	const char *path_prune;
+ 	struct lxc_conf *conf;
+ 	uid_t origuid; /* target uid in parent namespace */
+ 	char *path;
+@@ -655,7 +443,7 @@ static int isulad_cgroup_tree_remove_wrapper(void *data)
+ 	gid_t nsgid = (arg->conf->root_nsgid_map != NULL) ? 0 : arg->conf->init_gid;
+ 	int ret;
+ 
+-	if (!lxc_setgroups(0, NULL) && errno != EPERM)
++	if (!lxc_drop_groups() && errno != EPERM)
+ 		return log_error_errno(-1, errno, "Failed to setgroups(0, NULL)");
+ 
+ 	ret = setresgid(nsgid, nsgid, nsgid);
+@@ -668,7 +456,7 @@ static int isulad_cgroup_tree_remove_wrapper(void *data)
+ 		return log_error_errno(-1, errno, "Failed to setresuid(%d, %d, %d)",
+ 				       (int)nsuid, (int)nsuid, (int)nsuid);
+ 
+-	return isulad_cgroup_tree_remove(arg->hierarchies, arg->container_cgroup);
++	return isulad_cgroup_tree_remove(arg->hierarchies, arg->path_prune);
+ }
+ 
+ __cgfsng_ops static bool isulad_cgfsng_payload_destroy(struct cgroup_ops *ops,
+@@ -707,10 +495,10 @@ __cgfsng_ops static bool isulad_cgfsng_payload_destroy(struct cgroup_ops *ops,
+ 		WARN("Failed to detach bpf program from cgroup");
+ #endif
+ 
+-	if (handler->conf && !lxc_list_empty(&handler->conf->id_map)) {
++	if (!list_empty(&handler->conf->id_map) && !handler->am_root) {
+ 		struct generic_userns_exec_data wrap = {
+ 			.conf			= handler->conf,
+-			.container_cgroup	= ops->container_cgroup,
++			.path_prune		= ops->container_limit_cgroup,
+ 			.hierarchies		= ops->hierarchies,
+ 			.origuid		= 0,
+ 		};
+@@ -733,58 +521,408 @@ __cgfsng_ops static void isulad_cgfsng_monitor_destroy(struct cgroup_ops *ops,
+ 	return;
+ }
+ 
+-__cgfsng_ops static inline bool isulad_cgfsng_monitor_create(struct cgroup_ops *ops,
+-						      struct lxc_handler *handler)
++#define SYSTEMD_SCOPE_FAILED 2
++#define SYSTEMD_SCOPE_UNSUPP 1
++#define SYSTEMD_SCOPE_SUCCESS 0
++
++#if HAVE_LIBSYSTEMD
++struct sd_callback_data {
++	char *scope_name;
++	bool job_complete;
++};
++
++static int systemd_jobremoved_callback(sd_bus_message *m, void *userdata, sd_bus_error *error)
+ {
+-	return true;
++	char *path, *unit, *result;
++	struct sd_callback_data *sd_data = userdata;
++	uint32_t id;
++	int r;
++
++	r = sd_bus_message_read(m, "uoss", &id, &path, &unit, &result);
++	if (r < 0)
++		return log_error(-1, "bad message received in callback: %s", strerror(-r));
++
++	if (sd_data->scope_name && strcmp(unit, sd_data->scope_name) != 0)
++		return log_trace(-1, "unit was '%s' not '%s'", unit, sd_data->scope_name);
++	if (strcmp(result, "done") == 0) {
++		sd_data->job_complete = true;
++		return log_info(1, "job is done");
++	}
++	return log_debug(0, "result was '%s', not 'done'", result);
+ }
+ 
+-static bool isulad_copy_parent_file(char *path, char *file)
++#define DESTINATION "org.freedesktop.systemd1"
++#define PATH "/org/freedesktop/systemd1"
++#define INTERFACE "org.freedesktop.systemd1.Manager"
++#define MEMBER "StartTransientUnit"
++static bool start_scope(sd_bus *bus, struct sd_callback_data *data, struct sd_event *event)
+ {
+-	int ret;
+-	int len = 0;
+-	char *value = NULL;
+-	char *current = NULL;
+-	char *fpath = NULL;
+-	char *lastslash = NULL;
+-	char oldv;
+-
+-	fpath = must_make_path(path, file, NULL);
+-	current = read_file(fpath);
+-
+-	if (current == NULL) {
+-		SYSERROR("Failed to read file \"%s\"", fpath);
+-		free(fpath);
+-		return false;
++	__attribute__((__cleanup__(sd_bus_error_free))) sd_bus_error error = SD_BUS_ERROR_NULL;;
++	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *reply = NULL;
++	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *m = NULL;
++	char *path = NULL;
++	int r;
++
++	r = sd_bus_message_new_method_call(bus, &m,
++		DESTINATION, PATH, INTERFACE, MEMBER);
++	if (r < 0)
++		return log_error(false, "Failed creating sdbus message");
++
++	r = sd_bus_message_append(m, "ss", data->scope_name, "fail");
++	if (r < 0)
++		return log_error(false, "Failed setting systemd scope name");
++
++	r = sd_bus_message_open_container(m, 'a', "(sv)");
++	if (r < 0)
++		return log_error(false, "Failed allocating sdbus msg properties");
++
++	r = sd_bus_message_append(m, "(sv)(sv)(sv)",
++		"PIDs", "au", 1, getpid(),
++		"Delegate", "b", 1,
++		"CollectMode", "s", "inactive-or-failed");
++	if (r < 0)
++		return log_error(false, "Failed setting properties on sdbus message");
++
++	r = sd_bus_message_close_container(m);
++	if (r < 0)
++		return log_error(false, "Failed closing sdbus message properties");
++
++	r = sd_bus_message_append(m, "a(sa(sv))", 0);
++	if (r < 0)
++		return log_error(false, "Failed appending aux boilerplate\n");
++
++	r = sd_bus_call(NULL, m, 0, &error, &reply);
++	if (r < 0)
++		return log_error(false,  "Failed sending sdbus message: %s", error.message);
++
++	/* Parse the response message */
++	r = sd_bus_message_read(reply, "o", &path);
++	if (r < 0)
++		return log_error(false, "Failed to parse response message: %s", strerror(-r));
++
++	/* Now spin up a mini-event-loop to wait for the "job completed" message */
++	int tries = 0;
++
++	while (!data->job_complete) {
++		r = sd_event_run(event, 1000 * 1000);
++		if (r < 0) {
++			log_debug(stderr, "Error waiting for JobRemoved: %s\n", strerror(-r));
++			continue;
++		}
++		if (data->job_complete || tries == 5)
++			break;
++		if (r > 0) {
++			log_trace(stderr, "Debug: we processed an event (%d), but not the one we wanted\n", r);
++			continue;
++		}
++		if (r == 0) // timeout
++			tries++;
+ 	}
+-
+-	if (strcmp(current, "\n") != 0) {
+-		free(fpath);
+-		free(current);
+-		return true;
++	if (!data->job_complete) {
++		return log_error(false, "Error: %s job was never removed", data->scope_name);
+ 	}
++	return true;
++}
+ 
+-	free(fpath);
+-	free(current);
++static bool string_pure_unified_system(char *contents)
++{
++	char *p;
++	bool first_line_read = false;
+ 
+-	lastslash = strrchr(path, '/');
+-	if (lastslash == NULL) {
+-		ERROR("Failed to detect \"/\" in \"%s\"", path);
+-		return false;
++	lxc_iterate_parts(p, contents, "\n") {
++		if (first_line_read) // if >1 line, this is not pure unified
++			return false;
++		first_line_read = true;
++
++		if (strlen(p) > 3 && strncmp(p, "0:", 2) == 0)
++			return true;
+ 	}
+-	oldv = *lastslash;
+-	*lastslash = '\0';
+-	fpath = must_make_path(path, file, NULL);
+-	*lastslash = oldv;
+-	len = lxc_read_from_file(fpath, NULL, 0);
+-	if (len <= 0)
+-		goto on_error;
+ 
+-	value = must_realloc(NULL, len + 1);
+-	ret = lxc_read_from_file(fpath, value, len);
+-	if (ret != len)
+-		goto on_error;
+-	free(fpath);
++	return false;
++}
++
++/*
++ * Only call get_current_unified_cgroup() when we are in a pure
++ * unified (v2-only) cgroup
++ */
++static char *get_current_unified_cgroup(void)
++{
++	__do_free char *buf = NULL;
++	__do_free_string_list char **list = NULL;
++	char *p;
++
++	buf = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0);
++	if (!buf)
++		return NULL;
++
++	if (!string_pure_unified_system(buf))
++		return NULL;
++
++	// 0::/user.slice/user-1000.slice/session-136.scope
++	// Get past the "0::"
++	p = buf;
++	if (strnequal(p, "0::", STRLITERALLEN("0::")))
++		p += STRLITERALLEN("0::");
++
++	return strdup(p);
++}
++
++static bool pure_unified_system(void)
++{
++	__do_free char *buf = NULL;
++
++	buf = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0);
++	if (!buf)
++		return false;
++
++	return string_pure_unified_system(buf);
++}
++
++#define MEMBER_JOIN "AttachProcessesToUnit"
++static bool enter_scope(char *scope_name, pid_t pid)
++{
++	__attribute__((__cleanup__(sd_bus_unrefp))) sd_bus *bus = NULL;
++	__attribute__((__cleanup__(sd_bus_error_free))) sd_bus_error error = SD_BUS_ERROR_NULL;;
++	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *reply = NULL;
++	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *m = NULL;
++	int r;
++
++	r = sd_bus_open_user(&bus);
++	if (r < 0)
++		return log_error(false, "Failed to connect to user bus: %s", strerror(-r));
++
++	r = sd_bus_message_new_method_call(bus, &m,
++		DESTINATION, PATH, INTERFACE, MEMBER_JOIN);
++	if (r < 0)
++		return log_error(false, "Failed creating sdbus message");
++
++	r = sd_bus_message_append(m, "ssau", scope_name, "/init", 1, pid);
++	if (r < 0)
++		return log_error(false, "Failed setting systemd scope name");
++
++
++	r = sd_bus_call(NULL, m, 0, &error, &reply);
++	if (r < 0)
++		return log_error(false,  "Failed sending sdbus message: %s", error.message);
++
++	return true;
++}
++
++static bool enable_controllers_delegation(int fd_dir, char *cg)
++{
++	__do_free char *rbuf = NULL;
++	__do_free char *wbuf = NULL;
++	__do_free_string_list char **cpulist = NULL;
++	char *controller;
++	size_t full_len = 0;
++	bool first = true;
++	int ret;
++
++	rbuf = read_file_at(fd_dir, "cgroup.controllers", PROTECT_OPEN, 0);
++	if (!rbuf)
++		return false;
++
++	lxc_iterate_parts(controller, rbuf, " ") {
++		full_len += strlen(controller) + 2;
++		wbuf = must_realloc(wbuf, full_len + 1);
++		if (first) {
++			wbuf0 = '\0';
++			first = false;
++		} else {
++			(void)strlcat(wbuf, " ", full_len + 1);
++		}
++		strlcat(wbuf, "+", full_len + 1);
++		strlcat(wbuf, controller, full_len + 1);
++	}
++	if (!wbuf)
++		return log_debug(true, "No controllers to delegate!");
++
++	ret = lxc_writeat(fd_dir, "cgroup.subtree_control", wbuf, strlen(wbuf));
++	if (ret < 0)
++		return log_error_errno(false, errno, "Failed to write \"%s\" to %s/cgroup.subtree_control", wbuf, cg);
++
++	return true;
++}
++
++/*
++ * systemd places us in say .../lxc-1.scope.  We create lxc-1.scope/init,
++ * move ourselves to there, then enable controllers in lxc-1.scope
++ */
++static bool move_and_delegate_unified(char *parent_cgroup)
++{
++	__do_free char *buf = NULL;
++	__do_close int fd_parent = -EBADF;
++	int ret;
++
++	fd_parent = open_at(-EBADF, parent_cgroup, O_DIRECTORY, 0, 0);
++	if (fd_parent < 0)
++		return syserror_ret(false, "Failed opening cgroup dir \"%s\"", parent_cgroup);
++
++	ret = mkdirat(fd_parent, "init", 0755);
++	if (ret < 0 && errno != EEXIST)
++		return syserror_ret(false, "Failed to create \"%d/init\" cgroup", fd_parent);
++
++	buf = read_file_at(fd_parent, "cgroup.procs", PROTECT_OPEN, 0);
++	if (!buf)
++		return false;
++
++	ret = lxc_writeat(fd_parent, "init/cgroup.procs", buf, strlen(buf));
++	if (ret)
++		return syserror_ret(false, "Failed to escape to cgroup \"init/cgroup.procs\"");
++
++	/* enable controllers in parent_cgroup */
++	return enable_controllers_delegation(fd_parent, parent_cgroup);
++}
++
++static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf *conf)
++{
++	__do_free char *full_scope_name = NULL;
++	__do_free char *fs_cg_path = NULL;
++	sd_event *event = NULL;
++	__attribute__((__cleanup__(sd_bus_unrefp))) sd_bus *bus = NULL; // free the bus before the names it references, just to be sure
++	struct sd_callback_data sd_data;
++	int idx = 0;
++	size_t len;
++	int r;
++
++	if (geteuid() == 0)
++		return log_info(SYSTEMD_SCOPE_UNSUPP, "Running privileged, not using a systemd unit");
++	// Pure_unified_layout() can't be used as that info is not yet setup.  At
++	// the same time, we don't want to calculate current cgroups until after
++	// we optionally enter a new systemd user scope.  So let's just do a quick
++	// check for pure unified cgroup system: single line /proc/self/cgroup with
++	// only index '0:'
++	if (!pure_unified_system())
++		return log_info(SYSTEMD_SCOPE_UNSUPP, "Not in unified layout, not using a systemd unit");
++
++	r = sd_bus_open_user(&bus);
++	if (r < 0)
++		return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to user bus: %s", strerror(-r));
++
++	r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL);
++	if (r < 0)
++		return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to signals: %s", strerror(-r));
++
++	sd_data.job_complete = false;
++	sd_data.scope_name = NULL;
++	r = sd_bus_match_signal(bus,
++		NULL, // no slot
++		DESTINATION, PATH, INTERFACE, "JobRemoved",
++		systemd_jobremoved_callback, &sd_data);
++	if (r < 0)
++		return log_error(SYSTEMD_SCOPE_FAILED, "Failed to register systemd event loop signal handler: %s", strerror(-r));
++
++	// NEXT: create and attach event
++	r = sd_event_new(&event);
++	if (r < 0)
++		return log_error(SYSTEMD_SCOPE_FAILED, "Failed allocating new event: %s\n", strerror(-r));
++	r = sd_bus_attach_event(bus, event, SD_EVENT_PRIORITY_NORMAL);
++	if (r < 0) {
++		// bus won't clean up event since the attach failed
++		sd_event_unrefp(&event);
++		return log_error(SYSTEMD_SCOPE_FAILED, "Failed attaching event: %s\n", strerror(-r));
++	}
++
++	// "lxc-" + (conf->name) + "-NN" + ".scope" + '\0'
++	len = STRLITERALLEN("lxc-") + strlen(conf->name) + 3 + STRLITERALLEN(".scope") + 1;
++	full_scope_name = malloc(len);
++	if (!full_scope_name)
++		return syserror("Out of memory");
++
++	do {
++		r = strnprintf(full_scope_name, len, "lxc-%s-%d.scope", conf->name, idx);
++		if (r < 0)
++			return log_error_errno(-1, errno, "Failed to build scope name for \"%s\"", conf->name);
++		sd_data.scope_name = full_scope_name;
++		if (start_scope(bus, &sd_data, event)) {
++			conf->cgroup_meta.systemd_scope = get_current_unified_cgroup();
++			if (!conf->cgroup_meta.systemd_scope)
++				return log_trace(SYSTEMD_SCOPE_FAILED, "Out of memory");
++			fs_cg_path = must_make_path("/sys/fs/cgroup", conf->cgroup_meta.systemd_scope, NULL);
++			if (!move_and_delegate_unified(fs_cg_path))
++				return log_error(SYSTEMD_SCOPE_FAILED, "Failed delegating the controllers to our cgroup");
++			return log_trace(SYSTEMD_SCOPE_SUCCESS, "Created systemd scope %s", full_scope_name);
++		}
++		idx++;
++	} while (idx < 99);
++
++	return SYSTEMD_SCOPE_FAILED; // failed, let's try old-school after all
++}
++#else /* !HAVE_LIBSYSTEMD */
++static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf *conf)
++{
++	TRACE("unpriv_systemd_create_scope: no systemd support");
++	return SYSTEMD_SCOPE_UNSUPP; // not supported
++}
++#endif /* HAVE_LIBSYSTEMD */
++
++// Return a duplicate of cgroup path @cg without leading /, so
++// that caller can own+free it and be certain it's not abspath.
++static char *cgroup_relpath(char *cg)
++{
++	char *p;
++
++	if (!cg || strequal(cg, "/"))
++		return NULL;
++	p = strdup(deabs(cg));
++	if (!p)
++		return ERR_PTR(-ENOMEM);
++
++	return p;
++}
++
++__cgfsng_ops static inline bool isulad_cgfsng_monitor_create(struct cgroup_ops *ops,
++						      struct lxc_handler *handler)
++{
++	return true;
++}
++
++static bool isulad_copy_parent_file(char *path, char *file)
++{
++	int ret;
++	int len = 0;
++	char *value = NULL;
++	char *current = NULL;
++	char *fpath = NULL;
++	char *lastslash = NULL;
++	char oldv;
++
++	fpath = must_make_path(path, file, NULL);
++	current = read_file(fpath);
++
++	if (current == NULL) {
++		SYSERROR("Failed to read file \"%s\"", fpath);
++		free(fpath);
++		return false;
++	}
++
++	if (strcmp(current, "\n") != 0) {
++		free(fpath);
++		free(current);
++		return true;
++	}
++
++	free(fpath);
++	free(current);
++
++	lastslash = strrchr(path, '/');
++	if (lastslash == NULL) {
++		ERROR("Failed to detect \"/\" in \"%s\"", path);
++		return false;
++	}
++	oldv = *lastslash;
++	*lastslash = '\0';
++	fpath = must_make_path(path, file, NULL);
++	*lastslash = oldv;
++	len = lxc_read_from_file(fpath, NULL, 0);
++	if (len <= 0)
++		goto on_error;
++
++	value = must_realloc(NULL, len + 1);
++	ret = lxc_read_from_file(fpath, value, len);
++	if (ret != len)
++		goto on_error;
++	free(fpath);
+ 
+ 	fpath = must_make_path(path, file, NULL);
+ 	ret = lxc_write_to_file(fpath, value, len, false, 0666);
+@@ -926,8 +1064,8 @@ static bool create_path_for_hierarchy(struct hierarchy *h, char *cgname, int err
+ 		return false;
+ 	}
+ 
+-	h->cgfd_con = lxc_open_dirfd(path);
+-	if (h->cgfd_con < 0)
++	h->dfd_con = lxc_open_dirfd(path);
++	if (h->dfd_con < 0)
+ 		return log_error_errno(false, errno, "Failed to open %s", path);
+ 
+ 	if (h->path_con == NULL) {
+@@ -1071,7 +1209,7 @@ static int chown_cgroup_wrapper(void *data)
+ 	uid_t nsuid = (arg->conf->root_nsuid_map != NULL) ? 0 : arg->conf->init_uid;
+ 	gid_t nsgid = (arg->conf->root_nsgid_map != NULL) ? 0 : arg->conf->init_gid;
+ 
+-	if (!lxc_setgroups(0, NULL) && errno != EPERM)
++	if (!lxc_drop_groups() && errno != EPERM)
+ 		return log_error_errno(-1, errno, "Failed to setgroups(0, NULL)");
+ 
+ 	ret = setresgid(nsgid, nsgid, nsgid);
+@@ -1089,7 +1227,10 @@ static int chown_cgroup_wrapper(void *data)
+ 		destuid = 0;
+ 
+ 	for (int i = 0; arg->hierarchiesi; i++) {
+-		int dirfd = arg->hierarchiesi->cgfd_con;
++		int dirfd = arg->hierarchiesi->dfd_con;
++
++		if (dirfd < 0)
++			return syserror_set(-EBADF, "Invalid cgroup file descriptor");
+ 
+ 		(void)fchowmodat(dirfd, "", destuid, nsgid, 0775);
+ 
+@@ -1101,15 +1242,15 @@ static int chown_cgroup_wrapper(void *data)
+ 		 * files (which systemd in wily insists on doing).
+ 		 */
+ 
+-		if (arg->hierarchiesi->fs_type == CGROUP_SUPER_MAGIC)
++		if (arg->hierarchiesi->fs_type == LEGACY_HIERARCHY)
+ 			(void)fchowmodat(dirfd, "tasks", destuid, nsgid, 0664);
+ 
+ 		(void)fchowmodat(dirfd, "cgroup.procs", destuid, nsgid, 0664);
+ 
+-		if (arg->hierarchiesi->fs_type != CGROUP2_SUPER_MAGIC)
++		if (arg->hierarchiesi->fs_type != UNIFIED_HIERARCHY)
+ 			continue;
+ 
+-		for (char **p = arg->hierarchiesi->cgroup2_chown; p && *p; p++)
++		for (char **p = arg->hierarchiesi->delegate; p && *p; p++)
+ 			(void)fchowmodat(dirfd, *p, destuid, nsgid, 0664);
+ 	}
+ 
+@@ -1133,7 +1274,7 @@ __cgfsng_ops static bool isulad_cgfsng_chown(struct cgroup_ops *ops,
+ 	if (!conf)
+ 		return ret_set_errno(false, EINVAL);
+ 
+-	if (lxc_list_empty(&conf->id_map))
++	if (list_empty(&conf->id_map))
+ 		return true;
+ 
+ 	wrap.origuid = geteuid();
+@@ -1147,7 +1288,7 @@ __cgfsng_ops static bool isulad_cgfsng_chown(struct cgroup_ops *ops,
+ 	return true;
+ }
+ 
+-__cgfsng_ops void isulad_cgfsng_payload_finalize(struct cgroup_ops *ops)
++__cgfsng_ops static void isulad_cgfsng_finalize(struct cgroup_ops *ops)
+ {
+ 	if (!ops)
+ 		return;
+@@ -1164,15 +1305,33 @@ __cgfsng_ops void isulad_cgfsng_payload_finalize(struct cgroup_ops *ops)
+ 
+ 	for (int i = 0; ops->hierarchiesi; i++) {
+ 		struct hierarchy *h = ops->hierarchiesi;
+-		/*
+-		 * we don't keep the fds for non-unified hierarchies around
+-		 * mainly because we don't make use of them anymore after the
+-		 * core cgroup setup is done but also because there are quite a
+-		 * lot of them.
+-		 */
+-		if (!is_unified_hierarchy(h))
+-			close_prot_errno_disarm(h->cgfd_con);
++
++		/* Close all monitor cgroup file descriptors. */
++		close_prot_errno_disarm(h->dfd_mon);
+ 	}
++	/* Close the cgroup root file descriptor. */
++	close_prot_errno_disarm(ops->dfd_mnt);
++
++	/*
++	 * The checking for freezer support should obviously be done at cgroup
++	 * initialization time but that doesn't work reliable. The freezer
++	 * controller has been demoted (rightly so) to a simple file located in
++	 * each non-root cgroup. At the time when the container is created we
++	 * might still be located in /sys/fs/cgroup and so checking for
++	 * cgroup.freeze won't tell us anything because this file doesn't exist
++	 * in the root cgroup. We could then iterate through /sys/fs/cgroup and
++	 * find an already existing cgroup and then check within that cgroup
++	 * for the existence of cgroup.freeze but that will only work on
++	 * systemd based hosts. Other init systems might not manage cgroups and
++	 * so no cgroup will exist. So we defer until we have created cgroups
++	 * for our container which means we check here.
++	 */
++        if (pure_unified_layout(ops) &&
++            !faccessat(ops->unified->dfd_con, "cgroup.freeze", F_OK,
++                       AT_SYMLINK_NOFOLLOW)) {
++		TRACE("Unified hierarchy supports freezer");
++		ops->unified->utilities |= FREEZER_CONTROLLER;
++        }
+ }
+ 
+ /* cgroup-full:* is done, no need to create subdirs */
+@@ -1235,6 +1394,118 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
+ 	return 0;
+ }
+ 
++/* __cgroupfs_mount
++ *
++ * Mount cgroup hierarchies directly without using bind-mounts. The main
++ * uses-cases are mounting cgroup hierarchies in cgroup namespaces and mounting
++ * cgroups for the LXC_AUTO_CGROUP_FULL option.
++ */
++static int __cgroupfs_mount(int cgroup_automount_type, struct hierarchy *h,
++			    struct lxc_rootfs *rootfs, int dfd_mnt_cgroupfs,
++			    const char *hierarchy_mnt)
++{
++	__do_close int fd_fs = -EBADF;
++	unsigned int flags = 0;
++	char *fstype;
++	int ret;
++
++	if (dfd_mnt_cgroupfs < 0)
++		return ret_errno(EINVAL);
++
++	flags |= MOUNT_ATTR_NOSUID;
++	flags |= MOUNT_ATTR_NOEXEC;
++	flags |= MOUNT_ATTR_NODEV;
++	flags |= MOUNT_ATTR_RELATIME;
++
++	if ((cgroup_automount_type == LXC_AUTO_CGROUP_RO) ||
++	    (cgroup_automount_type == LXC_AUTO_CGROUP_FULL_RO) ||
++	    (cgroup_automount_type == LXC_AUTO_CGROUP2_RO))
++		flags |= MOUNT_ATTR_RDONLY;
++
++	if (is_unified_hierarchy(h))
++		fstype = "cgroup2";
++	else
++		fstype = "cgroup";
++
++	if (can_use_mount_api()) {
++		fd_fs = fs_prepare(fstype, -EBADF, "", 0, 0);
++		if (fd_fs < 0)
++			return log_error_errno(-errno, errno, "Failed to prepare filesystem context for %s", fstype);
++
++		if (!is_unified_hierarchy(h)) {
++			for (const char **it = (const char **)h->controllers; it && *it; it++) {
++				if (strnequal(*it, "name=", STRLITERALLEN("name=")))
++					ret = fs_set_property(fd_fs, "name", *it + STRLITERALLEN("name="));
++				else
++					ret = fs_set_property(fd_fs, *it, "");
++				if (ret < 0)
++					return log_error_errno(-errno, errno, "Failed to add %s controller to cgroup filesystem context %d(dev)", *it, fd_fs);
++			}
++		}
++
++		ret = fs_attach(fd_fs, dfd_mnt_cgroupfs, hierarchy_mnt,
++				PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH,
++				flags);
++	} else {
++		__do_free char *controllers = NULL, *target = NULL;
++		unsigned int old_flags = 0;
++		const char *rootfs_mnt;
++
++		if (!is_unified_hierarchy(h)) {
++			controllers = lxc_string_join(",", (const char **)h->controllers, false);
++			if (!controllers)
++				return ret_errno(ENOMEM);
++		}
++
++		rootfs_mnt = get_rootfs_mnt(rootfs);
++		ret = mnt_attributes_old(flags, &old_flags);
++		if (ret)
++			return log_error_errno(-EINVAL, EINVAL, "Unsupported mount properties specified");
++
++		target = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, hierarchy_mnt, NULL);
++#ifdef HAVE_ISULAD
++		ret = safe_mount(NULL, target, fstype, old_flags, controllers, rootfs_mnt, NULL);
++#else
++		ret = safe_mount(NULL, target, fstype, old_flags, controllers, rootfs_mnt);
++#endif
++	}
++	if (ret < 0)
++		return log_error_errno(ret, errno, "Failed to mount %s filesystem onto %d(%s)",
++				       fstype, dfd_mnt_cgroupfs, maybe_empty(hierarchy_mnt));
++
++	DEBUG("Mounted cgroup filesystem %s onto %d(%s)",
++	      fstype, dfd_mnt_cgroupfs, maybe_empty(hierarchy_mnt));
++	return 0;
++}
++
++static inline int cgroupfs_mount(int cgroup_automount_type, struct hierarchy *h,
++				 struct lxc_rootfs *rootfs,
++				 int dfd_mnt_cgroupfs, const char *hierarchy_mnt)
++{
++	return __cgroupfs_mount(cgroup_automount_type, h, rootfs,
++				dfd_mnt_cgroupfs, hierarchy_mnt);
++}
++
++static inline int cgroupfs_bind_mount(int cgroup_automount_type, struct hierarchy *h,
++				      struct lxc_rootfs *rootfs,
++				      int dfd_mnt_cgroupfs,
++				      const char *hierarchy_mnt)
++{
++	switch (cgroup_automount_type) {
++	case LXC_AUTO_CGROUP_FULL_RO:
++		break;
++	case LXC_AUTO_CGROUP_FULL_RW:
++		break;
++	case LXC_AUTO_CGROUP_FULL_MIXED:
++		break;
++	default:
++		return 0;
++	}
++
++	return __cgroupfs_mount(cgroup_automount_type, h, rootfs,
++				dfd_mnt_cgroupfs, hierarchy_mnt);
++}
++
+ /* __cg_mount_direct
+  *
+  * Mount cgroup hierarchies directly without using bind-mounts. The main
+@@ -1289,139 +1560,300 @@ static inline int cg_mount_cgroup_full(int type, struct hierarchy *h,
+ }
+ 
+ __cgfsng_ops static bool isulad_cgfsng_mount(struct cgroup_ops *ops,
+-                                      struct lxc_handler *handler,
+-                                      const char *root, int type)
+-{
+-	int i, ret;
+-	char *tmpfspath = NULL;
+-	char *systemdpath = NULL;
+-	char *unifiedpath = NULL;
+-	bool has_cgns = false, retval = false, wants_force_mount = false;
++				      struct lxc_handler *handler, int cg_flags)
++{
++	__do_close int dfd_mnt_tmpfs = -EBADF, fd_fs = -EBADF;
++	__do_free char *cgroup_root = NULL;
++	int cgroup_automount_type;
++	bool in_cgroup_ns = false, wants_force_mount = false;
++	struct lxc_conf *conf = handler->conf;
++	struct lxc_rootfs *rootfs = &conf->rootfs;
++	const char *rootfs_mnt = get_rootfs_mnt(rootfs);
++	int ret;
++#ifdef HAVE_ISULAD
+ 	char **merged = NULL;
++	__do_free char *systemdpath = NULL;
++	__do_free char *unifiedpath = NULL;
++#endif
++
++	if (!ops)
++		return ret_set_errno(false, ENOENT);
+ 
+-	if ((type & LXC_AUTO_CGROUP_MASK) == 0)
++	if (!ops->hierarchies)
+ 		return true;
+ 
+-	if (type & LXC_AUTO_CGROUP_FORCE) {
+-		type &= ~LXC_AUTO_CGROUP_FORCE;
++	if (!conf)
++		return ret_set_errno(false, EINVAL);
++
++	if ((cg_flags & LXC_AUTO_CGROUP_MASK) == 0)
++		return log_trace(true, "No cgroup mounts requested");
++
++	if (cg_flags & LXC_AUTO_CGROUP_FORCE) {
++		cg_flags &= ~LXC_AUTO_CGROUP_FORCE;
+ 		wants_force_mount = true;
+ 	}
+ 
++	switch (cg_flags) {
++	case LXC_AUTO_CGROUP_RO:
++		TRACE("Read-only cgroup mounts requested");
++		break;
++	case LXC_AUTO_CGROUP_RW:
++		TRACE("Read-write cgroup mounts requested");
++		break;
++	case LXC_AUTO_CGROUP_MIXED:
++		TRACE("Mixed cgroup mounts requested");
++		break;
++	case LXC_AUTO_CGROUP_FULL_RO:
++		TRACE("Full read-only cgroup mounts requested");
++		break;
++	case LXC_AUTO_CGROUP_FULL_RW:
++		TRACE("Full read-write cgroup mounts requested");
++		break;
++	case LXC_AUTO_CGROUP_FULL_MIXED:
++		TRACE("Full mixed cgroup mounts requested");
++		break;
++	case LXC_AUTO_CGROUP2_RW:
++		TRACE("Read-write cgroup2 mount requested");
++		break;
++	case LXC_AUTO_CGROUP2_RO:
++		TRACE("Read-only cgroup2 mount requested");
++		break;
++	default:
++		return log_error_errno(false, EINVAL, "Invalid cgroup mount options specified");
++	}
++	cgroup_automount_type = cg_flags;
++
+ 	if (!wants_force_mount) {
+-		if (!lxc_list_empty(&handler->conf->keepcaps))
+-			wants_force_mount = !in_caplist(CAP_SYS_ADMIN, &handler->conf->keepcaps);
+-		else
+-			wants_force_mount = in_caplist(CAP_SYS_ADMIN, &handler->conf->caps);
++		wants_force_mount = !lxc_wants_cap(CAP_SYS_ADMIN, conf);
++
++		/*
++		 * Most recent distro versions currently have init system that
++		 * do support cgroup2 but do not mount it by default unless
++		 * explicitly told so even if the host is cgroup2 only. That
++		 * means they often will fail to boot. Fix this by pre-mounting
++		 * cgroup2 by default. We will likely need to be doing this a
++		 * few years until all distros have switched over to cgroup2 at
++		 * which point we can safely assume that their init systems
++		 * will mount it themselves.
++		 */
++		if (pure_unified_layout(ops))
++			wants_force_mount = true;
+ 	}
+ 
+-	has_cgns = cgns_supported();
+-	if (has_cgns && !wants_force_mount)
+-		return true;
++	if (cgns_supported() && container_uses_namespace(handler, CLONE_NEWCGROUP))
++		in_cgroup_ns = true;
+ 
+-	if (type == LXC_AUTO_CGROUP_NOSPEC)
+-		type = LXC_AUTO_CGROUP_MIXED;
+-	else if (type == LXC_AUTO_CGROUP_FULL_NOSPEC)
+-		type = LXC_AUTO_CGROUP_FULL_MIXED;
++	if (in_cgroup_ns && !wants_force_mount)
++		return log_trace(true, "Mounting cgroups not requested or needed");
+ 
+-	/* Mount tmpfs */
+-	tmpfspath = must_make_path(root, "/sys/fs/cgroup", NULL);
+-	if (mkdir_p(tmpfspath, 0755) < 0) {
+-		ERROR("Failed to create directory: %s", tmpfspath);
+-		goto on_error;
++	/* This is really the codepath that we want. */
++	if (pure_unified_layout(ops) ||
++	    (cgroup_automount_type == LXC_AUTO_CGROUP2_RW) ||
++	    (cgroup_automount_type == LXC_AUTO_CGROUP2_RO)) {
++		__do_close int dfd_mnt_unified = -EBADF;
++
++		if (!ops->unified)
++			return log_error_errno(false, EINVAL, "No unified cgroup hierarchy mounted on the host");
++
++		dfd_mnt_unified = open_at(rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
++					  PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
++		if (dfd_mnt_unified < 0)
++			return syserror_ret(false, "Failed to open %d(%s)",
++					    rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
++		/*
++		 * If cgroup namespaces are supported but the container will
++		 * not have CAP_SYS_ADMIN after it has started we need to mount
++		 * the cgroups manually.
++		 *
++		 * Note that here we know that wants_force_mount is true.
++		 * Otherwise we would've returned early above.
++		 */
++		if (in_cgroup_ns) {
++			/*
++			 *  1. cgroup:rw:force    -> Mount the cgroup2 filesystem.
++			 *  2. cgroup:ro:force    -> Mount the cgroup2 filesystem read-only.
++			 *  3. cgroup:mixed:force -> See comment above how this
++			 *                           does not apply so
++			 *                           cgroup:mixed is equal to
++			 *                           cgroup:rw when cgroup
++			 *                           namespaces are supported.
++
++			 *  4. cgroup:rw    -> No-op; init system responsible for mounting.
++			 *  5. cgroup:ro    -> No-op; init system responsible for mounting.
++			 *  6. cgroup:mixed -> No-op; init system responsible for mounting.
++                         *
++			 *  7. cgroup-full:rw    -> Not supported.
++			 *  8. cgroup-full:ro    -> Not supported.
++			 *  9. cgroup-full:mixed -> Not supported.
++
++			 * 10. cgroup-full:rw:force    -> Not supported.
++			 * 11. cgroup-full:ro:force    -> Not supported.
++			 * 12. cgroup-full:mixed:force -> Not supported.
++			 *
++			 * 13. cgroup2		-> No-op; init system responsible for mounting.
++			 * 14. cgroup2:ro	-> No-op; init system responsible for mounting.
++			 * 15. cgroup2:force	-> Mount the cgroup2 filesystem read-write
++			 * 16. cgroup2:ro:force	-> Mount the cgroup2 filesystem read-only
++			 */
++			ret = cgroupfs_mount(cgroup_automount_type, ops->unified, rootfs, dfd_mnt_unified, "");
++			if (ret < 0)
++				return syserror_ret(false, "Failed to force mount cgroup filesystem in cgroup namespace");
++
++			return log_trace(true, "Force mounted cgroup filesystem in new cgroup namespace");
++		} else {
++			/*
++			 * Either no cgroup namespace supported (highly
++			 * unlikely unless we're dealing with a Frankenkernel.
++			 * Or the user requested to keep the cgroup namespace
++			 * of the host or another container.
++			 */
++			errno = EOPNOTSUPP;
++			if (wants_force_mount)
++				SYSWARN("Force-mounting the unified cgroup hierarchy without cgroup namespace support is currently not supported");
++			else
++				SYSWARN("Mounting the unified cgroup hierarchy without cgroup namespace support is currently not supported");
++		}
++
++		return syserror_ret(false, "Failed to mount cgroups");
+ 	}
+ 
+-        if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
+-                if (has_cgns && wants_force_mount) {
+-                        /*
+-                         * If cgroup namespaces are supported but the container
+-                         * will not have CAP_SYS_ADMIN after it has started we
+-                         * need to mount the cgroups manually.
+-                         */
+-                        return cg_mount_in_cgroup_namespace(type, ops->unified, tmpfspath) == 0;
+-                }
++	/*
++	 * Mount a tmpfs over DEFAULT_CGROUP_MOUNTPOINT. Note that we're
++	 * relying on RESOLVE_BENEATH so we need to skip the leading "/" in the
++	 * DEFAULT_CGROUP_MOUNTPOINT define.
++	 */
++	if (can_use_mount_api()) {
++		fd_fs = fs_prepare("tmpfs", -EBADF, "", 0, 0);
++		if (fd_fs < 0)
++			return log_error_errno(false, errno, "Failed to create new filesystem context for tmpfs");
+ 
+-                return cg_mount_cgroup_full(type, ops->unified, tmpfspath) == 0;
+-        }
++		ret = fs_set_property(fd_fs, "mode", "0755");
++		if (ret < 0)
++			return log_error_errno(false, errno, "Failed to mount tmpfs onto %d(dev)", fd_fs);
++
++		ret = fs_set_property(fd_fs, "size", "10240k");
++		if (ret < 0)
++			return log_error_errno(false, errno, "Failed to mount tmpfs onto %d(dev)", fd_fs);
+ 
+-	ret = safe_mount(NULL, tmpfspath, "tmpfs",
+-	                 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
+-	                 "size=10240k,mode=755", root, handler->conf->lsm_se_mount_context);
++		ret = fs_attach(fd_fs, rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
++				PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV,
++				MOUNT_ATTR_NOSUID | MOUNT_ATTR_NODEV |
++				MOUNT_ATTR_NOEXEC | MOUNT_ATTR_RELATIME);
++	} else {
++		cgroup_root = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, NULL);
++		ret = safe_mount(NULL, cgroup_root, "tmpfs",
++				 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
++				 "size=10240k,mode=755", rootfs_mnt, handler->conf->rootfs.lsm_se_mount_context);
++	}
+ 	if (ret < 0)
+-		goto on_error;
++		return log_error_errno(false, errno, "Failed to mount tmpfs on %s",
++				       DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
+ 
+-	for (i = 0; ops->hierarchiesi; i++) {
+-		char *controllerpath = NULL;
+-		char *path2 = NULL;
+-		struct hierarchy *h = ops->hierarchiesi;
+-		char *controller = strrchr(h->at_mnt, '/');
++	dfd_mnt_tmpfs = open_at(rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
++				PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
++	if (dfd_mnt_tmpfs < 0)
++		return syserror_ret(false, "Failed to open %d(%s)",
++				    rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
+ 
+-		if (!controller)
+-			continue;
+-		controller++;
++	for (int i = 0; ops->hierarchiesi; i++) {
++		__do_free char *hierarchy_mnt = NULL, *path2 = NULL;
++		struct hierarchy *h = ops->hierarchiesi;
+ 
++#ifdef HAVE_ISULAD
+ 		// isulad: symlink subcgroup
+-		if (strchr(controller, ',') != NULL) {
++		if (strchr(h->at_mnt, ',') != NULL) {
+ 			int pret;
+-			pret = lxc_append_string(&merged, controller);
++			pret = lxc_append_string(&merged, h->at_mnt);
+ 			if (pret < 0)
+-				goto on_error;
+-		}
+-
+-		controllerpath = must_make_path(tmpfspath, controller, NULL);
+-		if (dir_exists(controllerpath)) {
+-			free(controllerpath);
+-			continue;
++				return false;
+ 		}
++#endif
+ 
+-		ret = mkdir(controllerpath, 0755);
++		ret = mkdirat(dfd_mnt_tmpfs, h->at_mnt, 0000);
++#ifdef HAVE_ISULAD
+ 		if (ret < 0) {
+-			SYSERROR("Error creating cgroup path: %s", controllerpath);
+-			free(controllerpath);
+-			goto on_error;
++			lxc_free_array((void **)merged, free);
++			return syserror_ret(false, "Failed to create cgroup at_mnt %d(%s)", dfd_mnt_tmpfs, h->at_mnt);
+ 		}
++#else
++		if (ret < 0)
++			return syserror_ret(false, "Failed to create cgroup at_mnt %d(%s)", dfd_mnt_tmpfs, h->at_mnt);
++#endif
+ 
+-		if (has_cgns && wants_force_mount) {
+-			/* If cgroup namespaces are supported but the container
++		if (in_cgroup_ns && wants_force_mount) {
++			/*
++			 * If cgroup namespaces are supported but the container
+ 			 * will not have CAP_SYS_ADMIN after it has started we
+ 			 * need to mount the cgroups manually.
+ 			 */
+-			ret = cg_mount_in_cgroup_namespace(type, h, controllerpath);
+-			free(controllerpath);
++			ret = cgroupfs_mount(cgroup_automount_type, h, rootfs,
++					     dfd_mnt_tmpfs, h->at_mnt);
++#ifdef HAVE_ISULAD
++			if (ret < 0) {
++				lxc_free_array((void **)merged, free);
++				return false;
++			}
++#else
+ 			if (ret < 0)
+-				goto on_error;
+-
++				return false;
++#endif
+ 			continue;
+ 		}
+ 
+-		ret = cg_mount_cgroup_full(type, h, controllerpath);
++		/* Here is where the ancient kernel section begins. */
++		ret = cgroupfs_bind_mount(cgroup_automount_type, h, rootfs,
++					  dfd_mnt_tmpfs, h->at_mnt);
++#ifdef HAVE_ISULAD
+ 		if (ret < 0) {
+-			free(controllerpath);
+-			goto on_error;
++			lxc_free_array((void **)merged, free);
++			return false;
+ 		}
++#else
++		if (ret < 0)
++			return false;
++#endif
+ 
+-		if (!cg_mount_needs_subdirs(type)) {
+-			free(controllerpath);
++		if (!cg_mount_needs_subdirs(cgroup_automount_type))
+ 			continue;
+-		}
+ 
++		if (!cgroup_root)
++			cgroup_root = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, NULL);
++
++		hierarchy_mnt = must_make_path(cgroup_root, h->at_mnt, NULL);
++#ifdef HAVE_ISULAD
+ 		// isulad: ignore ops->container_cgroup so we will not see directory lxc after /sys/fs/cgroup/xxx in container,
+-		// isulad: ignore h->at_base so we will not see subgroup of /sys/fs/cgroup/xxx/subgroup in container
+-		path2 = must_make_path(controllerpath, NULL);
++		// isulad: ignore h->container_base_path so we will not see subgroup of /sys/fs/cgroup/xxx/subgroup in container
++		path2 = must_make_path(h->at_mnt, NULL);
++#else
++		path2 = must_make_path(hierarchy_mnt, h->at_base,
++				       ops->container_cgroup, NULL);
++#endif
+ 		ret = mkdir_p(path2, 0755);
+-		if (ret < 0) {
+-			free(controllerpath);
+-			free(path2);
+-			goto on_error;
++#ifdef HAVE_ISULAD
++		if (ret < 0 && (errno != EEXIST)) {
++			lxc_free_array((void **)merged, free);
++			return false;
+ 		}
++#else
++		if (ret < 0 && (errno != EEXIST))
++			return false;
++#endif
+ 
+-		ret = cg_legacy_mount_controllers(type, h, controllerpath,
+-		                                  path2, ops->container_cgroup);
+-		free(controllerpath);
+-		free(path2);
++		ret = cg_legacy_mount_controllers(cgroup_automount_type, h,
++						  hierarchy_mnt, path2,
++						  ops->container_cgroup);
++#ifdef HAVE_ISULAD
++		if (ret < 0) {
++			lxc_free_array((void **)merged, free);
++			return false;
++		}
++#else
+ 		if (ret < 0)
+-			goto on_error;
++			return false;
++#endif
+ 	}
+ 
++#ifdef HAVE_ISULAD
+ 	// isulad: symlink subcgroup
+ 	if (merged) {
+ 		char **mc = NULL;
+@@ -1431,13 +1863,14 @@ __cgfsng_ops static bool isulad_cgfsng_mount(struct cgroup_ops *ops,
+ 			lxc_iterate_parts(token, copy, ",") {
+ 				int mret;
+ 				char *link;
+-				link = must_make_path(tmpfspath, token, NULL);
++				link = must_make_path(cgroup_root, token, NULL);
+ 				mret = symlink(*mc, link);
+ 				if (mret < 0 && errno != EEXIST) {
+ 					SYSERROR("Failed to create link %s for target %s", link, *mc);
+ 					free(copy);
+ 					free(link);
+-					goto on_error;
++					lxc_free_array((void **)merged, free);
++					return false;
+ 				}
+ 				free(link);
+ 			}
+@@ -1445,59 +1878,49 @@ __cgfsng_ops static bool isulad_cgfsng_mount(struct cgroup_ops *ops,
+ 		}
+ 	}
+ 
+-
+ 	// isulad: remount /sys/fs/cgroup to readonly
+-	if (type == LXC_AUTO_CGROUP_FULL_RO || type == LXC_AUTO_CGROUP_RO) {
+-		ret = mount(tmpfspath, tmpfspath, "bind",
++	if (cg_flags == LXC_AUTO_CGROUP_FULL_RO || cg_flags == LXC_AUTO_CGROUP_RO) {
++		ret = mount(cgroup_root, cgroup_root, "bind",
+ 		            MS_NOSUID|MS_NODEV|MS_NOEXEC|MS_RELATIME|MS_RDONLY|MS_BIND|MS_REMOUNT, NULL);
+ 		if (ret < 0) {
+ 			SYSERROR("Failed to remount /sys/fs/cgroup.");
+-			goto on_error;
++			lxc_free_array((void **)merged, free);
++			return false;
+ 		}
+ 	}
+ 
+ 	// isulad: remount /sys/fs/cgroup/systemd to readwrite for system container
+ 	if (handler->conf->systemd != NULL && strcmp(handler->conf->systemd, "true") == 0)
+ 	{
+-		unifiedpath = must_make_path(root, "/sys/fs/cgroup/unified", NULL);
++		unifiedpath = must_make_path(get_rootfs_mnt(rootfs), "/sys/fs/cgroup/unified", NULL);
+ 		if (dir_exists(unifiedpath))
+ 		{
+ 			ret = umount2(unifiedpath, MNT_DETACH);
+ 			if (ret < 0)
+ 			{
+ 				SYSERROR("Failed to umount /sys/fs/cgroup/unified.");
+-				goto on_error;
++				lxc_free_array((void **)merged, free);
++				return false;
+ 			}
+ 		}
+ 
+-		systemdpath = must_make_path(root, "/sys/fs/cgroup/systemd", NULL);
++		systemdpath = must_make_path(get_rootfs_mnt(rootfs), "/sys/fs/cgroup/systemd", NULL);
+ 		ret = mount(systemdpath, systemdpath, "bind",
+ 					MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME | MS_BIND | MS_REMOUNT, NULL);
+ 		if (ret < 0)
+ 		{
+ 			SYSERROR("Failed to remount /sys/fs/cgroup/systemd.");
+-			goto on_error;
++			lxc_free_array((void **)merged, free);
++			return false;
+ 		}
+ 	}
++#endif
+ 
+-	retval = true;
+-
+-on_error:
+-	free(tmpfspath);
+-	if (systemdpath != NULL)
+-	{
+-		free(systemdpath);
+-	}
+-	if (unifiedpath != NULL)
+-	{
+-		free(unifiedpath);
+-	}
+-	lxc_free_array((void **)merged, free);
+-	return retval;
++	return true;
+ }
+ 
+ /* Only root needs to escape to the cgroup of its init. */
+-__cgfsng_ops static bool isulad_cgfsng_escape(const struct cgroup_ops *ops,
++__cgfsng_ops static bool isulad_cgfsng_criu_escape(const struct cgroup_ops *ops,
+ 				       struct lxc_conf *conf)
+ {
+ 	if (!ops)
+@@ -1528,7 +1951,7 @@ __cgfsng_ops static bool isulad_cgfsng_escape(const struct cgroup_ops *ops,
+ 	return true;
+ }
+ 
+-__cgfsng_ops static int isulad_cgfsng_num_hierarchies(struct cgroup_ops *ops)
++__cgfsng_ops static int isulad_cgfsng_criu_num_hierarchies(struct cgroup_ops *ops)
+ {
+ 	int i = 0;
+ 
+@@ -1544,7 +1967,7 @@ __cgfsng_ops static int isulad_cgfsng_num_hierarchies(struct cgroup_ops *ops)
+ 	return i;
+ }
+ 
+-__cgfsng_ops static bool isulad_cgfsng_get_hierarchies(struct cgroup_ops *ops, int n,
++__cgfsng_ops static bool isulad_cgfsng_criu_get_hierarchies(struct cgroup_ops *ops, int n,
+ 						char ***out)
+ {
+ 	int i;
+@@ -1578,7 +2001,7 @@ static bool cg_legacy_freeze(struct cgroup_ops *ops)
+ }
+ 
+ static int freezer_cgroup_events_cb(int fd, uint32_t events, void *cbdata,
+-				    struct lxc_epoll_descr *descr)
++				    struct lxc_async_descr *descr)
+ {
+ 	__do_close int duped_fd = -EBADF;
+ 	__do_free char *line = NULL;
+@@ -1614,9 +2037,9 @@ static int freezer_cgroup_events_cb(int fd, uint32_t events, void *cbdata,
+ static int cg_unified_freeze(struct cgroup_ops *ops, int timeout)
+ {
+ 	__do_close int fd = -EBADF;
+-	call_cleaner(lxc_mainloop_close) struct lxc_epoll_descr *descr_ptr = NULL;
++	call_cleaner(lxc_mainloop_close) struct lxc_async_descr *descr_ptr = NULL;
+ 	int ret;
+-	struct lxc_epoll_descr descr;
++	struct lxc_async_descr descr;
+ 	struct hierarchy *h;
+ 
+ 	h = ops->unified;
+@@ -1641,7 +2064,8 @@ static int cg_unified_freeze(struct cgroup_ops *ops, int timeout)
+ 		/* automatically cleaned up now */
+ 		descr_ptr = &descr;
+ 
+-		ret = lxc_mainloop_add_handler(&descr, fd, freezer_cgroup_events_cb, INT_TO_PTR((int){1}));
++		ret = lxc_mainloop_add_handler(&descr, fd, freezer_cgroup_events_cb, default_cleanup_handler,
++									   INT_TO_PTR((int){1}), "freezer_cgroup_events");
+ 		if (ret < 0)
+ 			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
+ 	}
+@@ -1682,9 +2106,9 @@ static int cg_legacy_unfreeze(struct cgroup_ops *ops)
+ static int cg_unified_unfreeze(struct cgroup_ops *ops, int timeout)
+ {
+ 	__do_close int fd = -EBADF;
+-	call_cleaner(lxc_mainloop_close)struct lxc_epoll_descr *descr_ptr = NULL;
++	call_cleaner(lxc_mainloop_close)struct lxc_async_descr *descr_ptr = NULL;
+ 	int ret;
+-	struct lxc_epoll_descr descr;
++	struct lxc_async_descr descr;
+ 	struct hierarchy *h;
+ 
+ 	h = ops->unified;
+@@ -1709,7 +2133,8 @@ static int cg_unified_unfreeze(struct cgroup_ops *ops, int timeout)
+ 		/* automatically cleaned up now */
+ 		descr_ptr = &descr;
+ 
+-		ret = lxc_mainloop_add_handler(&descr, fd, freezer_cgroup_events_cb, INT_TO_PTR((int){0}));
++		ret = lxc_mainloop_add_handler(&descr, fd, freezer_cgroup_events_cb, default_cleanup_handler,
++									   INT_TO_PTR((int){0}), "freezer_cgroup_events");
+ 		if (ret < 0)
+ 			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
+ 	}
+@@ -1816,7 +2241,7 @@ static int cgroup_attach_leaf(const struct lxc_conf *conf, int unified_fd, pid_t
+ 		 * that a short write would cause a buffer overrun. So be on
+ 		 * the safe side.
+ 		 */
+-		if (ret < STRLITERALLEN(".lxc-/cgroup.procs"))
++		if ((size_t)ret < STRLITERALLEN(".lxc-/cgroup.procs"))
+ 			return log_error_errno(-EINVAL, EINVAL, "Unexpected short write would cause buffer-overrun");
+ 
+ 		slash = &attach_cgroupret - STRLITERALLEN("/cgroup.procs");
+@@ -1848,7 +2273,7 @@ static int cgroup_attach_leaf(const struct lxc_conf *conf, int unified_fd, pid_t
+ }
+ 
+ static int cgroup_attach_create_leaf(const struct lxc_conf *conf,
+-				     int unified_fd, int *sk_fd)
++				     int unified_fd, int *sk_fd, bool unprivileged)
+ {
+ 	__do_close int sk = *sk_fd, target_fd0 = -EBADF, target_fd1 = -EBADF;
+ 	int target_fds2;
+@@ -1857,73 +2282,116 @@ static int cgroup_attach_create_leaf(const struct lxc_conf *conf,
+ 	/* Create leaf cgroup. */
+ 	ret = mkdirat(unified_fd, ".lxc", 0755);
+ 	if (ret < 0 && errno != EEXIST)
+-		return log_error_errno(-1, errno, "Failed to create leaf cgroup \".lxc\"");
++		return syserror("Failed to create leaf cgroup \".lxc\"");
+ 
+-	target_fd0 = openat(unified_fd, ".lxc/cgroup.procs", O_WRONLY | O_CLOEXEC | O_NOFOLLOW);
+-	if (target_fd0 < 0)
+-		return log_error_errno(-errno, errno, "Failed to open \".lxc/cgroup.procs\"");
+-	target_fds0 = target_fd0;
++	if (unprivileged) {
++		target_fd0 = open_at(unified_fd, ".lxc/cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
++		if (target_fd0 < 0)
++			return syserror("Failed to open \".lxc/cgroup.procs\"");
++		target_fds0 = target_fd0;
+ 
+-	target_fd1 = openat(unified_fd, "cgroup.procs", O_WRONLY | O_CLOEXEC | O_NOFOLLOW);
+-	if (target_fd1 < 0)
+-		return log_error_errno(-errno, errno, "Failed to open \".lxc/cgroup.procs\"");
+-	target_fds1 = target_fd1;
++		target_fd1 = open_at(unified_fd, "cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
++		if (target_fd1 < 0)
++			return syserror("Failed to open \".lxc/cgroup.procs\"");
++		target_fds1 = target_fd1;
+ 
+-	ret = lxc_abstract_unix_send_fds(sk, target_fds, 2, NULL, 0);
+-	if (ret <= 0)
+-		return log_error_errno(-errno, errno, "Failed to send \".lxc/cgroup.procs\" fds %d and %d",
+-				       target_fd0, target_fd1);
++		ret = lxc_abstract_unix_send_fds(sk, target_fds, 2, NULL, 0);
++		if (ret <= 0)
++			return syserror("Failed to send \".lxc/cgroup.procs\" fds %d and %d",
++					target_fd0, target_fd1);
+ 
+-	return log_debug(0, "Sent target cgroup fds %d and %d", target_fd0, target_fd1);
++		TRACE("Sent cgroup file descriptors %d and %d", target_fd0, target_fd1);
++	} else {
++		ret = lxc_abstract_unix_send_credential(sk, NULL, 0);
++		if (ret < 0)
++			return syserror("Failed to inform parent that we are done setting up mounts");
++
++		TRACE("Informed parent process that cgroup has been created");
++	}
++
++	return 0;
+ }
+ 
+ static int cgroup_attach_move_into_leaf(const struct lxc_conf *conf,
+-					int *sk_fd, pid_t pid)
++					const char *lxcpath,
++					int unified_fd, int *sk_fd, pid_t pid,
++					bool unprivileged)
+ {
+ 	__do_close int sk = *sk_fd, target_fd0 = -EBADF, target_fd1 = -EBADF;
+-	int target_fds2;
+ 	char pidstrINTTYPE_TO_STRLEN(int64_t) + 1;
+ 	size_t pidstr_len;
++#if HAVE_LIBSYSTEMD
++	__do_free char *scope = NULL;
++#endif
+ 	ssize_t ret;
+ 
+-	ret = lxc_abstract_unix_recv_fds(sk, target_fds, 2, NULL, 0);
+-	if (ret <= 0)
+-		return log_error_errno(-1, errno, "Failed to receive target cgroup fd");
+-	target_fd0 = target_fds0;
+-	target_fd1 = target_fds1;
++#if HAVE_LIBSYSTEMD
++	scope = lxc_cmd_get_systemd_scope(conf->name, lxcpath);
++	if (scope) {
++		TRACE("%s:%s is running under systemd-created scope '%s'.  Attaching...", lxcpath, conf->name, scope);
++		if (enter_scope(scope, pid))
++			TRACE("Successfully entered scope '%s'", scope);
++		else
++			ERROR("Failed entering scope '%s'", scope);
++	} else {
++		TRACE("%s:%s is not running under a systemd-created scope", lxcpath, conf->name);
++	}
++#endif
++	if (unprivileged) {
++		ret = lxc_abstract_unix_recv_two_fds(sk, &target_fd0, &target_fd1);
++		if (ret < 0)
++			return log_error_errno(-1, errno, "Failed to receive target cgroup fd");
++	} else {
++		ret = lxc_abstract_unix_rcv_credential(sk, NULL, 0);
++		if (ret < 0)
++			return syserror("Failed to receive notification from parent process");
++
++		TRACE("Child process informed us that cgroup has been created");
++
++		target_fd0 = open_at(unified_fd, ".lxc/cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
++		if (target_fd0 < 0)
++			return syserror("Failed to open \".lxc/cgroup.procs\"");
++
++		target_fd1 = open_at(unified_fd, "cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
++		if (target_fd1 < 0)
++			return syserror("Failed to open \".lxc/cgroup.procs\"");
++
++		TRACE("Opened target cgroup file descriptors %d and %d", target_fd0, target_fd1);
++	}
+ 
+ 	pidstr_len = sprintf(pidstr, INT64_FMT, (int64_t)pid);
+ 
+ 	ret = lxc_write_nointr(target_fd0, pidstr, pidstr_len);
+-	if (ret > 0 && ret == pidstr_len)
++	if (ret > 0 && (size_t)ret == pidstr_len)
+ 		return log_debug(0, "Moved process into target cgroup via fd %d", target_fd0);
+ 
+ 	ret = lxc_write_nointr(target_fd1, pidstr, pidstr_len);
+-	if (ret > 0 && ret == pidstr_len)
++	if (ret > 0 && (size_t)ret == pidstr_len)
+ 		return log_debug(0, "Moved process into target cgroup via fd %d", target_fd1);
+ 
+-	return log_debug_errno(-1, errno, "Failed to move process into target cgroup via fd %d and %d",
+-			       target_fd0, target_fd1);
++	return syserror("Failed to move process into target cgroup via fd %d and %d", target_fd0, target_fd1);
+ }
+ 
+ struct userns_exec_unified_attach_data {
+ 	const struct lxc_conf *conf;
++	const char *lxcpath;
+ 	int unified_fd;
+ 	int sk_pair2;
+ 	pid_t pid;
++	bool unprivileged;
+ };
+ 
+ static int cgroup_unified_attach_child_wrapper(void *data)
+ {
+ 	struct userns_exec_unified_attach_data *args = data;
+ 
+-	if (!args->conf || args->unified_fd < 0 || args->pid <= 0 ||
+-	    args->sk_pair0 < 0 || args->sk_pair1 < 0)
++	if (!args->conf || !args->lxcpath || args->unified_fd < 0 ||
++	    args->pid <= 0 || args->sk_pair0 < 0 || args->sk_pair1 < 0)
+ 		return ret_errno(EINVAL);
+ 
+ 	close_prot_errno_disarm(args->sk_pair0);
+ 	return cgroup_attach_create_leaf(args->conf, args->unified_fd,
+-					 &args->sk_pair1);
++					 &args->sk_pair1, args->unprivileged);
+ }
+ 
+ static int cgroup_unified_attach_parent_wrapper(void *data)
+@@ -1935,44 +2403,10 @@ static int cgroup_unified_attach_parent_wrapper(void *data)
+ 		return ret_errno(EINVAL);
+ 
+ 	close_prot_errno_disarm(args->sk_pair1);
+-	return cgroup_attach_move_into_leaf(args->conf, &args->sk_pair0,
+-					    args->pid);
+-}
+-
+-int cgroup_attach(const struct lxc_conf *conf, const char *name,
+-		  const char *lxcpath, pid_t pid)
+-{
+-	__do_close int unified_fd = -EBADF;
+-	int ret;
+-
+-	if (!conf || !name || !lxcpath || pid <= 0)
+-		return ret_errno(EINVAL);
+-
+-	unified_fd = lxc_cmd_get_cgroup2_fd(name, lxcpath);
+-	if (unified_fd < 0)
+-		return ret_errno(EBADF);
+-
+-	if (!lxc_list_empty(&conf->id_map)) {
+-		struct userns_exec_unified_attach_data args = {
+-			.conf		= conf,
+-			.unified_fd	= unified_fd,
+-			.pid		= pid,
+-		};
+-
+-		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
+-		if (ret < 0)
+-			return -errno;
+-
+-		ret = userns_exec_minimal(conf,
+-					  cgroup_unified_attach_parent_wrapper,
+-					  &args,
+-					  cgroup_unified_attach_child_wrapper,
+-					  &args);
+-	} else {
+-		ret = cgroup_attach_leaf(conf, unified_fd, pid);
+-	}
+-
+-	return ret;
++	return cgroup_attach_move_into_leaf(args->conf, args->lxcpath,
++					    args->unified_fd,
++					    &args->sk_pair0, args->pid,
++					    args->unprivileged);
+ }
+ 
+ /* Technically, we're always at a delegation boundary here (This is especially
+@@ -1999,7 +2433,8 @@ static int __cg_unified_attach(const struct hierarchy *h,
+ 	ret = cgroup_attach(conf, name, lxcpath, pid);
+ 	if (ret == 0)
+ 		return log_trace(0, "Attached to unified cgroup via command handler");
+-	if (ret != -EBADF)
++	TRACE("__cg_unified_attach: cgroup_attach returned %d", ret);
++	if (!ERRNO_IS_NOT_SUPPORTED(ret) && ret != -ENOCGROUP2)
+ 		return log_error_errno(ret, errno, "Failed to attach to unified cgroup");
+ 
+ 	/* Fall back to retrieving the path for the unified cgroup. */
+@@ -2007,18 +2442,21 @@ static int __cg_unified_attach(const struct hierarchy *h,
+ 	/* not running */
+ 	if (!cgroup)
+ 		return 0;
++	TRACE("lxc_cmd_get_cgroup_path returned %s", cgroup);
+ 
+-	path = must_make_path(h->at_mnt, cgroup, NULL);
++	path = make_cgroup_path(h, cgroup, NULL);
+ 
+ 	unified_fd = open(path, O_PATH | O_DIRECTORY | O_CLOEXEC);
+ 	if (unified_fd < 0)
+ 		return ret_errno(EBADF);
+ 
+-	if (!lxc_list_empty(&conf->id_map)) {
++	if (!list_empty(&conf->id_map)) {
+ 		struct userns_exec_unified_attach_data args = {
+ 			.conf		= conf,
+ 			.unified_fd	= unified_fd,
+ 			.pid		= pid,
++			.unprivileged	= am_guest_unpriv(),
++			.lxcpath	= lxcpath,
+ 		};
+ 
+ 		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
+@@ -2152,32 +2590,26 @@ static int device_cgroup_parse_access(struct device_item *device, const char *va
+ 	return 0;
+ }
+ 
+-int device_cgroup_rule_parse(struct device_item *device, const char *key,
++static int device_cgroup_rule_parse(struct device_item *device, const char *key,
+ 				    const char *val)
+ {
+-	int count, ret;
++	size_t count;
++	int ret;
+ 	char temp50;
+ 
+-	if (strcmp("devices.allow", key) == 0)
+-		device->allow = 1;
++	if (strequal("devices.allow", key))
++		device->allow = 1; /* allow the device */
+ 	else
+-		device->allow = 0;
++		device->allow = 0; /* deny the device */
+ 
+-	if (strcmp(val, "a") == 0) {
++	if (strequal(val, "a")) {
+ 		/* global rule */
+ 		device->type = 'a';
+ 		device->major = -1;
+ 		device->minor = -1;
+-		device->global_rule = device->allow
+-					  ? LXC_BPF_DEVICE_CGROUP_BLACKLIST
+-					  : LXC_BPF_DEVICE_CGROUP_WHITELIST;
+-		device->allow = -1;
+ 		return 0;
+ 	}
+ 
+-	/* local rule */
+-	device->global_rule = LXC_BPF_DEVICE_CGROUP_LOCAL_RULE;
+-
+ 	switch (*val) {
+ 	case 'a':
+ 		__fallthrough;
+@@ -2300,7 +2732,9 @@ static int device_cgroup_rule_parse_devpath(struct device_item *device,
+ 	char *p;
+ 	struct stat sb;
+ 
+-	path = must_copy_string(devpath);
++	path = strdup(devpath);
++	if (!path)
++		return ret_errno(ENOMEM);
+ 
+ 	/*
+ 	 * Read path followed by mode. Ignore any trailing text.
+@@ -2329,9 +2763,6 @@ static int device_cgroup_rule_parse_devpath(struct device_item *device,
+ 	if (device_cgroup_parse_access(device, mode) < 0)
+ 		return -1;
+ 
+-	if (n_parts == 1)
+-		return ret_set_errno(-1, EINVAL);
+-
+ 	ret = stat(path, &sb);
+ 	if (ret < 0)
+ 		return ret_set_errno(-1, errno);
+@@ -2351,7 +2782,6 @@ static int device_cgroup_rule_parse_devpath(struct device_item *device,
+ 	device->major = MAJOR(sb.st_rdev);
+ 	device->minor = MINOR(sb.st_rdev);
+ 	device->allow = 1;
+-	device->global_rule = LXC_BPF_DEVICE_CGROUP_LOCAL_RULE;
+ 
+ 	return 0;
+ }
+@@ -2481,15 +2911,38 @@ retry:
+ 	return ret;
+ }
+ 
++/*
++ * Return the list of cgroup_settings sorted according to the following rules
++ * 1. Put memory.limit_in_bytes before memory.memsw.limit_in_bytes
++ */
++static void sort_cgroup_settings(struct lxc_conf *conf)
++{
++	LIST_HEAD(memsw_list);
++	struct lxc_cgroup *cgroup, *ncgroup;
++
++	/* Iterate over the cgroup settings and copy them to the output list. */
++	list_for_each_entry_safe(cgroup, ncgroup, &conf->cgroup, head) {
++		if (!strequal(cgroup->subsystem, "memory.memsw.limit_in_bytes"))
++			continue;
++
++		/* Move the memsw entry from the cgroup settings list. */
++		list_move_tail(&cgroup->head, &memsw_list);
++	}
++
++	/*
++	 * Append all the memsw entries to the end of the cgroup settings list
++	 * to make sure they are applied after all memory limit settings.
++	 */
++	list_splice_tail(&memsw_list, &conf->cgroup);
++
++}
++
+ __cgfsng_ops static bool isulad_cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
+ 						    struct lxc_conf *conf,
+ 						    bool do_devices)
+ {
+-	__do_free struct lxc_list *sorted_cgroup_settings = NULL;
+-	struct lxc_list *cgroup_settings = &conf->cgroup;
+-	struct lxc_list *iterator, *next;
+-	struct lxc_cgroup *cg;
+-	bool ret = false;
++	struct list_head *cgroup_settings;
++	struct lxc_cgroup *cgroup;
+ 	char value21 + 1 = { 0 };
+ 	long long int readvalue, setvalue;
+ 
+@@ -2500,7 +2953,7 @@ __cgfsng_ops static bool isulad_cgfsng_setup_limits_legacy(struct cgroup_ops *op
+ 		return ret_set_errno(false, EINVAL);
+ 
+ 	cgroup_settings = &conf->cgroup;
+-	if (lxc_list_empty(cgroup_settings))
++	if (list_empty(cgroup_settings))
+ 		return true;
+ 
+ 	if (!ops->hierarchies)
+@@ -2509,75 +2962,63 @@ __cgfsng_ops static bool isulad_cgfsng_setup_limits_legacy(struct cgroup_ops *op
+ 	if (pure_unified_layout(ops))
+ 		return true;
+ 
+-	sorted_cgroup_settings = sort_cgroup_settings(cgroup_settings);
+-	if (!sorted_cgroup_settings)
+-		return false;
+-
+-	lxc_list_for_each(iterator, sorted_cgroup_settings) {
+-		cg = iterator->elem;
+-
+-		if (do_devices == !strncmp("devices", cg->subsystem, 7)) {
+-			const char *cgvalue = cg->value;
+-			if (strcmp(cg->subsystem, "files.limit") == 0) {
++	sort_cgroup_settings(conf);
++	list_for_each_entry(cgroup, cgroup_settings, head) {
++		if (do_devices == strnequal("devices", cgroup->subsystem, 7)) {
++			const char *cgvalue = cgroup->value;
++			if (strcmp(cgroup->subsystem, "files.limit") == 0) {
+ 				if (lxc_safe_long_long(cgvalue, &setvalue) != 0) {
+ 					SYSERROR("Invalid integer value %s", cgvalue);
+-					goto out;
++					return false;
+ 				}
+ 				if (setvalue <= 0) {
+ 					cgvalue = "max";
+ 				}
+ 			}
+-			if (isulad_cg_legacy_set_data(ops, cg->subsystem, cgvalue)) {
++			if (isulad_cg_legacy_set_data(ops, cgroup->subsystem, cgvalue)) {
+ 				if (do_devices && (errno == EACCES || errno == EPERM)) {
+-					SYSWARN("Failed to set \"%s\" to \"%s\"", cg->subsystem, cgvalue);
++					SYSWARN("Failed to set \"%s\" to \"%s\"", cgroup->subsystem, cgvalue);
+ 					continue;
+ 				}
+-				SYSERROR("Failed to set \"%s\" to \"%s\"", cg->subsystem, cgvalue);
+-				goto out;
++				SYSERROR("Failed to set \"%s\" to \"%s\"", cgroup->subsystem, cgvalue);
++				return false;
+ 			}
+-			DEBUG("Set controller \"%s\" set to \"%s\"", cg->subsystem, cgvalue);
++			DEBUG("Set controller \"%s\" set to \"%s\"", cgroup->subsystem, cgvalue);
+ 		}
+ 
+ 		// isulad: check cpu shares
+-		if (strcmp(cg->subsystem, "cpu.shares") == 0) {
+-			if (isulad_cg_legacy_get_data(ops, cg->subsystem, value, sizeof(value) - 1) < 0) {
+-				SYSERROR("Error get %s", cg->subsystem);
+-				goto out;
++		if (strcmp(cgroup->subsystem, "cpu.shares") == 0) {
++			if (isulad_cg_legacy_get_data(ops, cgroup->subsystem, value, sizeof(value) - 1) < 0) {
++				SYSERROR("Error get %s", cgroup->subsystem);
++				return false;
+ 			}
+ 			trim(value);
+-			if (lxc_safe_long_long(cg->value, &setvalue) != 0) {
+-				SYSERROR("Invalid value %s", cg->value);
+-				goto out;
++			if (lxc_safe_long_long(cgroup->value, &setvalue) != 0) {
++				SYSERROR("Invalid value %s", cgroup->value);
++				return false;
+ 			}
+ 			if (lxc_safe_long_long(value, &readvalue) != 0) {
+ 				SYSERROR("Invalid value %s", value);
+-				goto out;
++				return false;
+ 			}
+ 			if (setvalue > readvalue) {
+ 				ERROR("The maximum allowed cpu-shares is %s", value);
+ 				lxc_write_error_message(ops->errfd,
+ 				                        "%s:%d: setting cgroup config for ready process caused \"The maximum allowed cpu-shares is %s\".",
+ 				                        __FILE__, __LINE__, value);
+-				goto out;
++				return false;
+ 			} else if (setvalue < readvalue) {
+ 				ERROR("The minimum allowed cpu-shares is %s", value);
+ 				lxc_write_error_message(ops->errfd,
+ 				                        "%s:%d: setting cgroup config for ready process caused \"The minimum allowed cpu-shares is %s\".",
+ 				                        __FILE__, __LINE__, value);
+-				goto out;
++				return false;
+ 			}
+ 		}
+ 	}
+ 
+-	ret = true;
+ 	INFO("Limits for the legacy cgroup hierarchies have been setup");
+-out:
+-	lxc_list_for_each_safe(iterator, sorted_cgroup_settings, next) {
+-		lxc_list_del(iterator);
+-		free(iterator);
+-	}
+-
+-	return ret;
++	return true;
+ }
+ 
+ /*
+@@ -2588,31 +3029,35 @@ static int bpf_device_cgroup_prepare(struct cgroup_ops *ops,
+ 				     struct lxc_conf *conf, const char *key,
+ 				     const char *val)
+ {
+-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
+-	struct device_item device_item = {0};
++	struct device_item device_item = {};
+ 	int ret;
+ 
+-	if (strcmp("devices.allow", key) == 0 && *val == '/')
++	if (strequal("devices.allow", key) && abspath(val))
+ 		ret = device_cgroup_rule_parse_devpath(&device_item, val);
+ 	else
+ 		ret = device_cgroup_rule_parse(&device_item, key, val);
+ 	if (ret < 0)
+-		return log_error_errno(-1, EINVAL, "Failed to parse device string %s=%s", key, val);
++		return syserror_set(EINVAL, "Failed to parse device rule %s=%s", key, val);
+ 
+-	ret = bpf_list_add_device(conf, &device_item);
++	/*
++	 * Note that bpf_list_add_device() returns 1 if it altered the device
++	 * list and 0 if it didn't; both return values indicate success.
++	 * Only a negative return value indicates an error.
++	 */
++	ret = bpf_list_add_device(&conf->bpf_devices, &device_item);
+ 	if (ret < 0)
+ 		return -1;
+-#endif
++
+ 	return 0;
+ }
+-
+ __cgfsng_ops static bool isulad_cgfsng_setup_limits(struct cgroup_ops *ops,
+ 					     struct lxc_handler *handler)
+ {
+ 	__do_free char *path = NULL;
+-	struct lxc_list *cgroup_settings, *iterator;
++	struct list_head *cgroup_settings;
+ 	struct hierarchy *h;
+ 	struct lxc_conf *conf;
++	struct lxc_cgroup *cg;
+ 
+ 	if (!ops)
+ 		return ret_set_errno(false, ENOENT);
+@@ -2627,7 +3072,7 @@ __cgfsng_ops static bool isulad_cgfsng_setup_limits(struct cgroup_ops *ops,
+ 		return ret_set_errno(false, EINVAL);
+ 	conf = handler->conf;
+ 
+-	if (lxc_list_empty(&conf->cgroup2))
++	if (list_empty(&conf->cgroup2))
+ 		return true;
+ 	cgroup_settings = &conf->cgroup2;
+ 
+@@ -2638,8 +3083,7 @@ __cgfsng_ops static bool isulad_cgfsng_setup_limits(struct cgroup_ops *ops,
+ 		return false;
+ 	h = ops->unified;
+ 
+-	lxc_list_for_each (iterator, cgroup_settings) {
+-		struct lxc_cgroup *cg = iterator->elem;
++	list_for_each_entry(cg, cgroup_settings, head) {
+ 		int ret;
+ 
+ 		if (strncmp("devices", cg->subsystem, 7) == 0) {
+@@ -2786,7 +3230,7 @@ bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup)
+ 		(void)strlcat(add_controllers, "+", full_len + 1);
+ 		(void)strlcat(add_controllers, *it, full_len + 1);
+ 
+-		if ((it + 1) && *(it + 1))
++		if (*(it + 1))
+ 			(void)strlcat(add_controllers, " ", full_len + 1);
+ 	}
+ 
+@@ -2836,333 +3280,490 @@ __cgfsng_ops bool isulad_cgfsng_payload_delegate_controllers(struct cgroup_ops *
+ 	return __cgfsng_delegate_controllers(ops, ops->container_cgroup);
+ }
+ 
+-static bool cgroup_use_wants_controllers(const struct cgroup_ops *ops,
+-				       char **controllers)
++static inline bool unified_cgroup(const char *line)
+ {
+-	if (!ops->cgroup_use)
+-		return true;
++	return *line == '0';
++}
+ 
+-	for (char **cur_ctrl = controllers; cur_ctrl && *cur_ctrl; cur_ctrl++) {
+-		bool found = false;
++static inline char *current_unified_cgroup(bool relative, char *line)
++{
++	char *current_cgroup;
+ 
+-		for (char **cur_use = ops->cgroup_use; cur_use && *cur_use; cur_use++) {
+-			if (strcmp(*cur_use, *cur_ctrl) != 0)
+-				continue;
++	line += STRLITERALLEN("0::");
+ 
+-			found = true;
+-			break;
+-		}
++	if (!abspath(line))
++		return ERR_PTR(-EINVAL);
+ 
+-		if (found)
+-			continue;
++	/* remove init.scope */
++	if (!relative)
++		line = prune_init_scope(line);
+ 
+-		return false;
+-	}
++	/* create a relative path */
++	line = deabs(line);
+ 
+-	return true;
++	current_cgroup = strdup(line);
++	if (!current_cgroup)
++		return ERR_PTR(-ENOMEM);
++
++	return current_cgroup;
+ }
+ 
+-static void cg_unified_delegate(char ***delegate)
++static inline const char *unprefix(const char *controllers)
+ {
++	if (strnequal(controllers, "name=", STRLITERALLEN("name=")))
++		return controllers + STRLITERALLEN("name=");
++	return controllers;
++}
++
++static int __list_cgroup_delegate(char ***delegate)
++{
++	__do_free char **list = NULL;
+ 	__do_free char *buf = NULL;
+-	char *standard = {"cgroup.subtree_control", "cgroup.threads", NULL};
++	char *standard = {
++		"cgroup.procs",
++		"cgroup.threads",
++		"cgroup.subtree_control",
++		"memory.oom.group",
++		NULL,
++	};
+ 	char *token;
+-	int idx;
++	int ret;
+ 
+-	buf = read_file("/sys/kernel/cgroup/delegate");
++	buf = read_file_at(-EBADF, "/sys/kernel/cgroup/delegate", PROTECT_OPEN, 0);
+ 	if (!buf) {
+ 		for (char **p = standard; p && *p; p++) {
+-			idx = append_null_to_list((void ***)delegate);
+-			(*delegate)idx = must_copy_string(*p);
++			ret = list_add_string(&list, *p);
++			if (ret < 0)
++				return ret;
+ 		}
+-		SYSWARN("Failed to read /sys/kernel/cgroup/delegate");
+-		return;
++
++		*delegate = move_ptr(list);
++		return syswarn_ret(0, "Failed to read /sys/kernel/cgroup/delegate");
+ 	}
+ 
+-	lxc_iterate_parts (token, buf, " \t\n") {
++	lxc_iterate_parts(token, buf, " \t\n") {
+ 		/*
+ 		 * We always need to chown this for both cgroup and
+ 		 * cgroup2.
+ 		 */
+-		if (strcmp(token, "cgroup.procs") == 0)
++		if (strequal(token, "cgroup.procs"))
+ 			continue;
+ 
+-		idx = append_null_to_list((void ***)delegate);
+-		(*delegate)idx = must_copy_string(token);
++		ret = list_add_string(&list, token);
++		if (ret < 0)
++			return ret;
+ 	}
++
++	*delegate = move_ptr(list);
++	return 0;
+ }
+ 
+-/* At startup, parse_hierarchies finds all the info we need about cgroup
+- * mountpoints and current cgroups, and stores it in @d.
+- */
+-static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileged)
++static bool unified_hierarchy_delegated(int dfd_base, char ***ret_files)
+ {
+-	__do_free char *basecginfo = NULL, *line = NULL;
+-	__do_free_string_list char **klist = NULL, **nlist = NULL;
+-	__do_fclose FILE *f = NULL;
++	__do_free_string_list char **list = NULL;
+ 	int ret;
+-	size_t len = 0;
+ 
+-	/* Root spawned containers escape the current cgroup, so use init's
+-	 * cgroups as our base in that case.
+-	 */
+-	if (!relative && (geteuid() == 0))
+-		basecginfo = read_file("/proc/1/cgroup");
+-	else
+-		basecginfo = read_file("/proc/self/cgroup");
+-	if (!basecginfo)
+-		return ret_set_errno(-1, ENOMEM);
+-
+-	ret = get_existing_subsystems(&klist, &nlist);
++	ret = __list_cgroup_delegate(&list);
+ 	if (ret < 0)
+-		return log_error_errno(-1, errno, "Failed to retrieve available legacy cgroup controllers");
++		return syserror_ret(ret, "Failed to determine unified cgroup delegation requirements");
+ 
+-	f = fopen("/proc/self/mountinfo", "re");
+-	if (!f)
+-		return log_error_errno(-1, errno, "Failed to open \"/proc/self/mountinfo\"");
++	for (char *const *s = list; s && *s; s++) {
++		if (!faccessat(dfd_base, *s, W_OK, 0) || errno == ENOENT)
++			continue;
+ 
+-	lxc_cgfsng_print_basecg_debuginfo(basecginfo, klist, nlist);
++		return sysinfo_ret(false, "The %s file is not writable, skipping unified hierarchy", *s);
++	}
+ 
+-	while (getline(&line, &len, f) != -1) {
+-		__do_free char *base_cgroup = NULL, *mountpoint = NULL;
+-		__do_free_string_list char **controller_list = NULL;
+-		int type;
+-		struct hierarchy *new;
++	*ret_files = move_ptr(list);
++	return true;
++}
+ 
+-		type = get_cgroup_version(line);
+-		if (type == 0)
+-			continue;
++static bool legacy_hierarchy_delegated(int dfd_base)
++{
++	int ret;
+ 
+-		if (type == CGROUP2_SUPER_MAGIC && ops->unified)
+-			continue;
++	ret = faccessat(dfd_base, ".", W_OK, 0);
++	if (ret < 0 && errno != ENOENT)
++		return sysinfo_ret(false, "Legacy hierarchy not writable, skipping");
+ 
+-		if (ops->cgroup_layout == CGROUP_LAYOUT_UNKNOWN) {
+-			if (type == CGROUP2_SUPER_MAGIC)
+-				ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
+-			else if (type == CGROUP_SUPER_MAGIC)
+-				ops->cgroup_layout = CGROUP_LAYOUT_LEGACY;
+-		} else if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
+-			if (type == CGROUP_SUPER_MAGIC)
+-				ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
+-		} else if (ops->cgroup_layout == CGROUP_LAYOUT_LEGACY) {
+-			if (type == CGROUP2_SUPER_MAGIC)
+-				ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
+-		}
++	return true;
++}
+ 
+-		controller_list = cg_hybrid_get_controllers(klist, nlist, line, type);
+-		if (!controller_list && type == CGROUP_SUPER_MAGIC)
+-			continue;
++/**
++ * systemd guarantees that the order of co-mounted controllers is stable. On
++ * some systems the order of the controllers might be reversed though.
++ *
++ * For example, this is how the order is mismatched on CentOS 7:
++ *
++ *      root@localhost ~# cat /proc/self/cgroup
++ *      11:perf_event:/
++ *      10:pids:/
++ *      9:freezer:/
++ * >>>> 8:cpuacct,cpu:/
++ *      7:memory:/
++ *      6:blkio:/
++ *      5:devices:/
++ *      4:hugetlb:/
++ * >>>> 3:net_prio,net_cls:/
++ *      2:cpuset:/
++ *      1:name=systemd:/user.slice/user-0.slice/session-c1.scope
++ *
++ * whereas the mountpoint:
++ *
++ *      | |-/sys/fs/cgroup                    tmpfs         tmpfs      ro,nosuid,nodev,noexec,mode=755
++ *      | | |-/sys/fs/cgroup/systemd          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd
++ *      | | |-/sys/fs/cgroup/cpuset           cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,cpuset
++ * >>>> | | |-/sys/fs/cgroup/net_cls,net_prio cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,net_prio,net_cls
++ *      | | |-/sys/fs/cgroup/hugetlb          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,hugetlb
++ *      | | |-/sys/fs/cgroup/devices          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,devices
++ *      | | |-/sys/fs/cgroup/blkio            cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,blkio
++ *      | | |-/sys/fs/cgroup/memory           cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,memory
++ * >>>> | | |-/sys/fs/cgroup/cpu,cpuacct      cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,cpuacct,cpu
++ *      | | |-/sys/fs/cgroup/freezer          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,freezer
++ *      | | |-/sys/fs/cgroup/pids             cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,pids
++ *      | | `-/sys/fs/cgroup/perf_event       cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,perf_event
++ *
++ * Ensure that we always use the systemd-guaranteed stable order when checking
++ * for the mountpoint.
++ */
++#if HAVE_COMPILER_ATTR_NONNULL
++__attribute__((nonnull))
++#endif
++#if HAVE_COMPILER_ATTR_RETURNS_NONNULL
++__attribute__((returns_nonnull))
++#endif
++static const char *stable_order(const char *controllers)
++{
++	if (strequal(controllers, "cpuacct,cpu"))
++		return "cpu,cpuacct";
+ 
+-		if (type == CGROUP_SUPER_MAGIC)
+-			if (controller_list_is_dup(ops->hierarchies, controller_list)) {
+-				TRACE("Skipping duplicating controller");
+-				continue;
+-			}
++	if (strequal(controllers, "net_prio,net_cls"))
++		return "net_cls,net_prio";
+ 
+-		mountpoint = cg_hybrid_get_mountpoint(line);
+-		if (!mountpoint) {
+-			WARN("Failed parsing mountpoint from \"%s\"", line);
+-			continue;
+-		}
++	return unprefix(controllers);
++}
+ 
+-		if (type == CGROUP_SUPER_MAGIC)
+-			base_cgroup = cg_hybrid_get_current_cgroup(basecginfo, controller_list0, CGROUP_SUPER_MAGIC);
+-		else
+-			base_cgroup = cg_hybrid_get_current_cgroup(basecginfo, NULL, CGROUP2_SUPER_MAGIC);
+-		if (!base_cgroup) {
+-			WARN("Failed to find current cgroup");
+-			continue;
+-		}
++#define CGFSNG_LAYOUT_LEGACY	BIT(0)
++#define CGFSNG_LAYOUT_UNIFIED	BIT(1)
+ 
+-		trim(base_cgroup);
+-		prune_init_scope(base_cgroup);
++static int __initialize_cgroups(struct cgroup_ops *ops, bool relative,
++				bool unprivileged, struct lxc_conf *conf)
++{
++	__do_free char *cgroup_info = NULL;
++	unsigned int layout_mask = 0;
++	int ret;
++	char *it;
+ 
+-		/* isulad: do not test writeable, if we run isulad in docker without cgroup namespace.
+-		 * the base_cgroup will be docker/XXX.., mountpoint+base_cgroup may be not exist */
++	ret = unpriv_systemd_create_scope(ops, conf);
++	if (ret < 0)
++		return ret_set_errno(false, ret);
++	else if (ret == 0)
++		TRACE("Entered an unpriv systemd scope");
+ 
+-		/*
+-		 * reason:base cgroup may be started with /system.slice when cg_hybrid_init
+-		 *	read /proc/1/cgroup on host, and cgroup init will set all containers
+-		 *	cgroup path under /sys/fs/cgroup/<controller>/system.slice/xxx/lxc
+-		 *	directory, this is not consistent with docker. The default cgroup path
+-		 *	should be under /sys/fs/cgroup/<controller>/lxc directory.
+-		 */
++	/*
++	 * Root spawned containers escape the current cgroup, so use init's
++	 * cgroups as our base in that case.
++	 */
++	if (!relative && (geteuid() == 0))
++		cgroup_info = read_file_at(-EBADF, "/proc/1/cgroup", PROTECT_OPEN, 0);
++	else
++		cgroup_info = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0);
++	if (!cgroup_info)
++		return ret_errno(ENOMEM);
++
++	lxc_iterate_parts(it, cgroup_info, "\n") {
++		__do_close int dfd_base = -EBADF, dfd_mnt = -EBADF;
++		__do_free char *controllers = NULL, *current_cgroup = NULL;
++		__do_free_string_list char **controller_list = NULL,
++					   **delegate = NULL;
++		char *line;
++		int dfd, type;
++
++		/* Handle the unified cgroup hierarchy. */
++		line = it;
++		if (unified_cgroup(line)) {
++			char *unified_mnt;
++
++			type = UNIFIED_HIERARCHY;
++			layout_mask |= CGFSNG_LAYOUT_UNIFIED;
++
++			if (conf->cgroup_meta.systemd_scope)
++				current_cgroup = cgroup_relpath(conf->cgroup_meta.systemd_scope);
++			if (IS_ERR_OR_NULL(current_cgroup))
++				current_cgroup = current_unified_cgroup(relative, line);
++			if (IS_ERR(current_cgroup))
++				return PTR_ERR(current_cgroup);
++
++			if (unified_cgroup_fd(ops->dfd_mnt)) {
++				dfd_mnt = dup_cloexec(ops->dfd_mnt);
++				unified_mnt = "";
++			} else {
++				dfd_mnt = open_at(ops->dfd_mnt,
++						  "unified",
++						  PROTECT_OPATH_DIRECTORY,
++						  PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
++				unified_mnt = "unified";
++			}
++			if (dfd_mnt < 0) {
++				if (errno != ENOENT)
++					return syserror("Failed to open %d/unified", ops->dfd_mnt);
+ 
+-		if (strlen(base_cgroup) > 1 && base_cgroup0 == '/') {
+-			base_cgroup1 = '\0';
+-		}
++				SYSTRACE("Unified cgroup not mounted");
++				continue;
++			}
++
++			if (!fhas_fs_type(dfd_mnt, CGROUP2_SUPER_MAGIC)) {
++				SYSTRACE("Opened file descriptor %d is not a cgroup2 mountpoint", dfd_mnt);
++				continue;
++			}
+ 
+-		if (type == CGROUP2_SUPER_MAGIC) {
+-			char *cgv2_ctrl_path;
++			dfd = dfd_mnt;
++
++			if (!is_empty_string(current_cgroup)) {
++				dfd_base = open_at(dfd_mnt, current_cgroup,
++						   PROTECT_OPATH_DIRECTORY,
++						   PROTECT_LOOKUP_BENEATH_XDEV, 0);
++				if (dfd_base < 0) {
++					if (errno != ENOENT)
++						return syserror("Failed to open %d/%s",
++								dfd_mnt, current_cgroup);
++
++					SYSTRACE("Current cgroup %d/%s does not exist (funky cgroup layout?)",
++						 dfd_mnt, current_cgroup);
++					continue;
++				}
++				dfd = dfd_base;
++			}
+ 
+-			cgv2_ctrl_path = must_make_path(mountpoint, base_cgroup,
+-							"cgroup.controllers",
+-							NULL);
++			if (!unified_hierarchy_delegated(dfd, &delegate))
++				continue;
+ 
+-			controller_list = cg_unified_get_controllers(cgv2_ctrl_path);
+-			free(cgv2_ctrl_path);
++			controller_list = unified_controllers(dfd, "cgroup.controllers");
+ 			if (!controller_list) {
+-				controller_list = cg_unified_make_empty_controller();
+-				TRACE("No controllers are enabled for "
+-				      "delegation in the unified hierarchy");
++				TRACE("No controllers are enabled for delegation in the unified hierarchy");
++				controller_list = list_new();
++				if (!controller_list)
++					return syserror_set(-ENOMEM, "Failed to create empty controller list");
+ 			}
+-		}
+ 
+-		/* Exclude all controllers that cgroup use does not want. */
+-		if (!cgroup_use_wants_controllers(ops, controller_list)) {
+-			TRACE("Skipping controller");
+-			continue;
+-		}
++			controllers = strdup(unified_mnt);
++			if (!controllers)
++				return ret_errno(ENOMEM);
++		} else {
++			char *__controllers, *__current_cgroup;
++
++			type = LEGACY_HIERARCHY;
++			layout_mask |= CGFSNG_LAYOUT_LEGACY;
++
++			__controllers = strchr(line, ':');
++			if (!__controllers)
++				return ret_errno(EINVAL);
++			__controllers++;
++
++			__current_cgroup = strchr(__controllers, ':');
++			if (!__current_cgroup)
++				return ret_errno(EINVAL);
++			*__current_cgroup = '\0';
++			__current_cgroup++;
++
++			controllers = strdup(stable_order(__controllers));
++			if (!controllers)
++				return ret_errno(ENOMEM);
++
++			dfd_mnt = open_at(ops->dfd_mnt,
++					  controllers,
++					  PROTECT_OPATH_DIRECTORY,
++					  PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
++			if (dfd_mnt < 0) {
++				if (errno != ENOENT)
++					return syserror("Failed to open %d/%s",
++							ops->dfd_mnt, controllers);
++
++				SYSTRACE("%s not mounted", controllers);
++				continue;
++			}
+ 
+-		new = add_hierarchy(&ops->hierarchies, move_ptr(controller_list), move_ptr(mountpoint), move_ptr(base_cgroup), type);
+-		if (type == CGROUP2_SUPER_MAGIC && !ops->unified) {
+-			if (unprivileged)
+-				cg_unified_delegate(&new->cgroup2_chown);
+-			ops->unified = new;
+-		}
+-	}
++			if (!fhas_fs_type(dfd_mnt, CGROUP_SUPER_MAGIC)) {
++				SYSTRACE("Opened file descriptor %d is not a cgroup mountpoint", dfd_mnt);
++				continue;
++			}
+ 
+-	TRACE("Writable cgroup hierarchies:");
+-	lxc_cgfsng_print_hierarchies(ops);
++			dfd = dfd_mnt;
+ 
+-	/* verify that all controllers in cgroup.use and all crucial
+-	 * controllers are accounted for
+-	 */
+-	if (!all_controllers_found(ops))
+-		return log_error_errno(-1, ENOENT, "Failed to find all required controllers");
++			if (!abspath(__current_cgroup))
++				return ret_errno(EINVAL);
+ 
+-	return 0;
+-}
++			/* remove init.scope */
++			if (!relative)
++				__current_cgroup = prune_init_scope(__current_cgroup);
+ 
+-/* Get current cgroup from /proc/self/cgroup for the cgroupfs v2 hierarchy. */
+-static char *cg_unified_get_current_cgroup(bool relative)
+-{
+-	__do_free char *basecginfo = NULL;
+-	char *copy;
+-	char *base_cgroup;
++			/* create a relative path */
++			__current_cgroup = deabs(__current_cgroup);
+ 
+-	if (!relative && (geteuid() == 0))
+-		basecginfo = read_file("/proc/1/cgroup");
+-	else
+-		basecginfo = read_file("/proc/self/cgroup");
+-	if (!basecginfo)
+-		return NULL;
++			current_cgroup = strdup(__current_cgroup);
++			if (!current_cgroup)
++				return ret_errno(ENOMEM);
+ 
+-	base_cgroup = strstr(basecginfo, "0::/");
+-	if (!base_cgroup)
+-		return NULL;
++			if (!is_empty_string(current_cgroup)) {
++				dfd_base = open_at(dfd_mnt, current_cgroup,
++						   PROTECT_OPATH_DIRECTORY,
++						   PROTECT_LOOKUP_BENEATH_XDEV, 0);
++				if (dfd_base < 0) {
++					if (errno != ENOENT)
++						return syserror("Failed to open %d/%s",
++								dfd_mnt, current_cgroup);
+ 
+-	base_cgroup = base_cgroup + 3;
+-	copy = copy_to_eol(base_cgroup);
+-	if (!copy)
+-		return NULL;
++					SYSTRACE("Current cgroup %d/%s does not exist (funky cgroup layout?)",
++						 dfd_mnt, current_cgroup);
++					continue;
++				}
++				dfd = dfd_base;
++			}
+ 
+-	return trim(copy);
+-}
++			if (!legacy_hierarchy_delegated(dfd))
++				continue;
+ 
+-static int cg_unified_init(struct cgroup_ops *ops, bool relative,
+-			   bool unprivileged)
+-{
+-	__do_free char *subtree_path = NULL;
+-	int ret;
+-	char *mountpoint;
+-	char **delegatable;
+-	struct hierarchy *new;
+-	char *base_cgroup = NULL;
++			/*
++			 * We intentionally pass __current_cgroup here and not
++			 * controllers because we would otherwise chop the
++			 * mountpoint.
++			 */
++			controller_list = list_add_controllers(__controllers);
++			if (!controller_list)
++				return syserror_set(-ENOMEM, "Failed to create controller list from %s", __controllers);
+ 
+-	ret = unified_cgroup_hierarchy();
+-	if (ret == -ENOMEDIUM)
+-		return ret_errno(ENOMEDIUM);
++			if (skip_hierarchy(ops, controller_list))
++				continue;
+ 
+-	if (ret != CGROUP2_SUPER_MAGIC)
+-		return 0;
++			ops->cgroup_layout = CGROUP_LAYOUT_LEGACY;
++		}
+ 
+-	base_cgroup = cg_unified_get_current_cgroup(relative);
+-	if (!base_cgroup)
+-		return ret_errno(EINVAL);
+-	if (!relative)
+-		prune_init_scope(base_cgroup);
++		ret = cgroup_hierarchy_add(ops, dfd_mnt, controllers, dfd,
++					   current_cgroup, controller_list, type);
++		if (ret < 0)
++			return syserror_ret(ret, "Failed to add %s hierarchy", controllers);
++
++		/* Transfer ownership. */
++		move_fd(dfd_mnt);
++		move_fd(dfd_base);
++		move_ptr(current_cgroup);
++		move_ptr(controllers);
++		move_ptr(controller_list);
++		if (type == UNIFIED_HIERARCHY)
++			ops->unified->delegate = move_ptr(delegate);
++	}
+ 
+-	/*
+-	 * We assume that the cgroup we're currently in has been delegated to
+-	 * us and we are free to further delege all of the controllers listed
+-	 * in cgroup.controllers further down the hierarchy.
+-	 */
+-	mountpoint = must_copy_string(DEFAULT_CGROUP_MOUNTPOINT);
+-	subtree_path = must_make_path(mountpoint, base_cgroup, "cgroup.controllers", NULL);
+-	delegatable = cg_unified_get_controllers(subtree_path);
+-	if (!delegatable)
+-		delegatable = cg_unified_make_empty_controller();
+-	if (!delegatable0) {
+-		TRACE("No controllers are enabled for delegation");
+-#ifdef HAVE_ISULAD
+-		ops->no_controller = true;
+-#endif
++	/* determine cgroup layout */
++	if (ops->unified) {
++		if (ops->cgroup_layout == CGROUP_LAYOUT_LEGACY) {
++			ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
++		} else {
++			if (bpf_devices_cgroup_supported())
++				ops->unified->utilities |= DEVICES_CONTROLLER;
++			ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
++		}
+ 	}
+ 
+-	/* TODO: If the user requested specific controllers via lxc.cgroup.use
+-	 * we should verify here. The reason I'm not doing it right is that I'm
+-	 * not convinced that lxc.cgroup.use will be the future since it is a
+-	 * global property. I much rather have an option that lets you request
+-	 * controllers per container.
++	/*
++	 * If we still don't know the cgroup layout at this point it means we
++	 * have not found any writable cgroup hierarchies. Infer the layout
++	 * from the layout bitmask we created when parsing the cgroups.
++	 *
++	 * Keep the ordering in the switch otherwise the bistmask-based
++	 * matching won't work.
+ 	 */
++	if (ops->cgroup_layout == CGROUP_LAYOUT_UNKNOWN) {
++		switch (layout_mask) {
++		case (CGFSNG_LAYOUT_LEGACY | CGFSNG_LAYOUT_UNIFIED):
++			ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
++			break;
++		case CGFSNG_LAYOUT_LEGACY:
++			ops->cgroup_layout = CGROUP_LAYOUT_LEGACY;
++			break;
++		case CGFSNG_LAYOUT_UNIFIED:
++			ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
++			break;
++		}
++	}
+ 
+-	new = add_hierarchy(&ops->hierarchies, delegatable, mountpoint, base_cgroup, CGROUP2_SUPER_MAGIC);
+-	if (unprivileged)
+-		cg_unified_delegate(&new->cgroup2_chown);
+-
+-	if (bpf_devices_cgroup_supported())
+-		new->bpf_device_controller = 1;
+-
+-	ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
+-	ops->unified = new;
++	if (!controllers_available(ops))
++		return syserror_set(-ENOENT, "One or more requested controllers unavailable or not delegated");
+ 
+-	return CGROUP2_SUPER_MAGIC;
++	return 0;
+ }
+ 
+-static int isulad_cg_init(struct cgroup_ops *ops, struct lxc_conf *conf)
++static int isulad_initialize_cgroups(struct cgroup_ops *ops, struct lxc_conf *conf)
+ {
++	__do_close int dfd = -EBADF;
+ 	int ret;
+-	const char *tmp;
+-	bool relative = conf->cgroup_meta.relative;
++	const char *controllers_use;
+ 
+-	tmp = lxc_global_config_value("lxc.cgroup.use");
+-	if (tmp) {
+-		__do_free char *pin = NULL;
+-		char *chop, *cur;
++	if (ops->dfd_mnt >= 0)
++		return ret_errno(EBUSY);
++
++	/*
++	 * I don't see the need for allowing symlinks here. If users want to
++	 * have their hierarchy available in different locations I strongly
++	 * suggest bind-mounts.
++	 */
++	dfd = open_at(-EBADF, DEFAULT_CGROUP_MOUNTPOINT,
++			PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
++	if (dfd < 0)
++		return syserror("Failed to open " DEFAULT_CGROUP_MOUNTPOINT);
++
++	controllers_use = lxc_global_config_value("lxc.cgroup.use");
++	if (controllers_use) {
++		__do_free char *dup = NULL;
++		char *it;
+ 
+-		pin = must_copy_string(tmp);
+-		chop = pin;
++		dup = strdup(controllers_use);
++		if (!dup)
++			return -errno;
+ 
+-		lxc_iterate_parts(cur, chop, ",")
+-			must_append_string(&ops->cgroup_use, cur);
++		lxc_iterate_parts(it, dup, ",") {
++			ret = list_add_string(&ops->cgroup_use, it);
++			if (ret < 0)
++				return ret;
++		}
+ 	}
+ 
+-	ret = cg_unified_init(ops, relative, !lxc_list_empty(&conf->id_map));
+-	if (ret < 0)
+-		return -1;
++	/*
++	 * Keep dfd referenced by the cleanup function and actually move the fd
++	 * once we know the initialization succeeded. So if we fail we clean up
++	 * the dfd.
++	 */
++	ops->dfd_mnt = dfd;
+ 
+-	if (ret == CGROUP2_SUPER_MAGIC)
+-		return 0;
++	ret = __initialize_cgroups(ops, conf->cgroup_meta.relative, !list_empty(&conf->id_map), conf);
++	if (ret < 0)
++		return syserror_ret(ret, "Failed to initialize cgroups");
+ 
+-	return cg_hybrid_init(ops, relative, !lxc_list_empty(&conf->id_map));
++	/* Transfer ownership to cgroup_ops. */
++	move_fd(dfd);
++	return 0;
+ }
+ 
+ __cgfsng_ops static int isulad_cgfsng_data_init(struct cgroup_ops *ops, struct lxc_conf *conf)
+ {
+ 	const char *cgroup_pattern;
++#ifdef HAVE_ISULAD
+ 	const char *cgroup_tree;
+ 	__do_free char *container_cgroup = NULL, *__cgroup_tree = NULL;
+ 	size_t len;
++#endif
+ 
+ 	if (!ops)
+ 		return ret_set_errno(-1, ENOENT);
+ 
+ 	/* copy system-wide cgroup information */
+ 	cgroup_pattern = lxc_global_config_value("lxc.cgroup.pattern");
+-	if (cgroup_pattern && strcmp(cgroup_pattern, "") != 0)
+-		ops->cgroup_pattern = must_copy_string(cgroup_pattern);
++	if (cgroup_pattern && !strequal(cgroup_pattern, "")) {
++		ops->cgroup_pattern = strdup(cgroup_pattern);
++		if (!ops->cgroup_pattern)
++			return ret_errno(ENOMEM);
++	}
+ 
++#ifdef HAVE_ISULAD
+ 	if (conf->cgroup_meta.dir) {
+ 		cgroup_tree = conf->cgroup_meta.dir;
+ 		container_cgroup = must_concat(&len, cgroup_tree, "/", conf->name, NULL);
+@@ -3181,22 +3782,23 @@ __cgfsng_ops static int isulad_cgfsng_data_init(struct cgroup_ops *ops, struct l
+ 		return ret_set_errno(-1, ENOMEM);
+ 
+ 	ops->container_cgroup = move_ptr(container_cgroup);
++#endif
+ 
+ 	return 0;
+ }
+ 
+-struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf)
++struct cgroup_ops *cgroup_ops_init(struct lxc_conf *conf)
+ {
+-	__do_free struct cgroup_ops *cgfsng_ops = NULL;
++	__cleanup_cgroup_ops struct cgroup_ops *cgfsng_ops = NULL;
+ 
+-	cgfsng_ops = malloc(sizeof(struct cgroup_ops));
++	cgfsng_ops = zalloc(sizeof(struct cgroup_ops));
+ 	if (!cgfsng_ops)
+ 		return ret_set_errno(NULL, ENOMEM);
+ 
+-	memset(cgfsng_ops, 0, sizeof(struct cgroup_ops));
+-	cgfsng_ops->cgroup_layout = CGROUP_LAYOUT_UNKNOWN;
++	cgfsng_ops->cgroup_layout	= CGROUP_LAYOUT_UNKNOWN;
++	cgfsng_ops->dfd_mnt		= -EBADF;
+ 
+-	if (isulad_cg_init(cgfsng_ops, conf))
++	if (isulad_initialize_cgroups(cgfsng_ops, conf))
+ 		return NULL;
+ 
+ 	cgfsng_ops->data_init = isulad_cgfsng_data_init;
+@@ -3211,10 +3813,7 @@ struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf)
+ 	cgfsng_ops->payload_delegate_controllers = isulad_cgfsng_payload_delegate_controllers;
+ 	cgfsng_ops->payload_create = isulad_cgfsng_payload_create;
+ 	cgfsng_ops->payload_enter = isulad_cgfsng_payload_enter;
+-	cgfsng_ops->payload_finalize = isulad_cgfsng_payload_finalize;
+-	cgfsng_ops->escape = isulad_cgfsng_escape;
+-	cgfsng_ops->num_hierarchies = isulad_cgfsng_num_hierarchies;
+-	cgfsng_ops->get_hierarchies = isulad_cgfsng_get_hierarchies;
++	cgfsng_ops->finalize = isulad_cgfsng_finalize;
+ 	cgfsng_ops->get_cgroup = isulad_cgfsng_get_cgroup;
+ 	cgfsng_ops->get = isulad_cgfsng_get;
+ 	cgfsng_ops->set = isulad_cgfsng_set;
+@@ -3229,5 +3828,310 @@ struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf)
+ 	cgfsng_ops->mount = isulad_cgfsng_mount;
+ 	cgfsng_ops->devices_activate = isulad_cgfsng_devices_activate;
+ 
++	cgfsng_ops->criu_escape = isulad_cgfsng_criu_escape;
++	cgfsng_ops->criu_num_hierarchies = isulad_cgfsng_criu_num_hierarchies;
++	cgfsng_ops->criu_get_hierarchies = isulad_cgfsng_criu_get_hierarchies;
++
+ 	return move_ptr(cgfsng_ops);
+ }
++
++static int __unified_attach_fd(const struct lxc_conf *conf, const char *lxcpath, int fd_unified, pid_t pid)
++{
++	int ret;
++
++	if (!list_empty(&conf->id_map)) {
++		struct userns_exec_unified_attach_data args = {
++			.conf		= conf,
++			.unified_fd	= fd_unified,
++			.pid		= pid,
++			.unprivileged	= am_guest_unpriv(),
++			.lxcpath	= lxcpath,
++		};
++
++		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
++		if (ret < 0)
++			return -errno;
++
++		ret = userns_exec_minimal(conf,
++					  cgroup_unified_attach_parent_wrapper,
++					  &args,
++					  cgroup_unified_attach_child_wrapper,
++					  &args);
++	} else {
++		ret = cgroup_attach_leaf(conf, fd_unified, pid);
++	}
++
++	return ret;
++}
++
++static int __cgroup_attach_many(const struct lxc_conf *conf, const char *name,
++				const char *lxcpath, pid_t pid)
++{
++	call_cleaner(put_cgroup_ctx) struct cgroup_ctx *ctx = &(struct cgroup_ctx){};
++	int ret;
++	size_t idx;
++	ssize_t pidstr_len;
++	char pidstrINTTYPE_TO_STRLEN(pid_t);
++
++	ret = lxc_cmd_get_cgroup_ctx(name, lxcpath, sizeof(struct cgroup_ctx), ctx);
++	if (ret < 0)
++		return ret_errno(ENOSYS);
++
++	if (ctx->fd_len == 0)
++		return log_trace(0, "Container runs with unwritable %s cgroup layout",
++				 cgroup_layout_name(ctx->layout));
++
++	pidstr_len = strnprintf(pidstr, sizeof(pidstr), "%d", pid);
++	if (pidstr_len < 0)
++		return pidstr_len;
++
++	for (idx = 0; idx < ctx->fd_len; idx++) {
++		int dfd_con = ctx->fdidx;
++
++		if (unified_cgroup_fd(dfd_con))
++			ret = __unified_attach_fd(conf, lxcpath, dfd_con, pid);
++		else
++			ret = lxc_writeat(dfd_con, "cgroup.procs", pidstr, pidstr_len);
++		if (ret)
++			return syserror_ret(ret, "Failed to attach to cgroup fd %d", dfd_con);
++		else
++			TRACE("Attached to cgroup fd %d", dfd_con);
++	}
++
++	TRACE("Attached to %s cgroup layout", cgroup_layout_name(ctx->layout));
++	return 0;
++}
++
++static int __cgroup_attach_unified(const struct lxc_conf *conf, const char *name,
++				   const char *lxcpath, pid_t pid)
++{
++	__do_close int dfd_unified = -EBADF;
++
++	if (!conf || is_empty_string(name) || is_empty_string(lxcpath) || pid <= 0)
++		return ret_errno(EINVAL);
++
++	dfd_unified = lxc_cmd_get_cgroup2_fd(name, lxcpath);
++	if (dfd_unified < 0)
++		return ret_errno(ENOSYS);
++
++	return __unified_attach_fd(conf, lxcpath, dfd_unified, pid);
++}
++
++int cgroup_attach(const struct lxc_conf *conf, const char *name,
++		  const char *lxcpath, pid_t pid)
++{
++	int ret;
++
++	ret = __cgroup_attach_many(conf, name, lxcpath, pid);
++	if (ret < 0) {
++		if (!ERRNO_IS_NOT_SUPPORTED(ret))
++			return ret;
++
++		ret = __cgroup_attach_unified(conf, name, lxcpath, pid);
++		if (ret < 0 && ERRNO_IS_NOT_SUPPORTED(ret))
++			return ret_errno(ENOSYS);
++	}
++
++	return ret;
++}
++
++/* Connects to command socket therefore isn't callable from command handler. */
++int cgroup_get(const char *name, const char *lxcpath, const char *key, char *buf, size_t len)
++{
++	__do_close int dfd = -EBADF;
++	struct cgroup_fd fd = {
++		.fd = -EBADF,
++	};
++	size_t len_controller;
++	int ret;
++
++	if (is_empty_string(name) || is_empty_string(lxcpath) ||
++	    is_empty_string(key))
++		return ret_errno(EINVAL);
++
++	if ((buf && !len) || (len && !buf))
++		return ret_errno(EINVAL);
++
++	len_controller = strcspn(key, ".");
++	len_controller++; /* Don't forget the \0 byte. */
++	if (len_controller >= MAX_CGROUP_ROOT_NAMELEN)
++		return ret_errno(EINVAL);
++	(void)strlcpy(fd.controller, key, len_controller);
++
++	ret = lxc_cmd_get_limit_cgroup_fd(name, lxcpath, sizeof(struct cgroup_fd), &fd);
++	if (ret < 0) {
++		if (!ERRNO_IS_NOT_SUPPORTED(ret))
++			return ret;
++
++		dfd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
++		if (dfd < 0) {
++			if (!ERRNO_IS_NOT_SUPPORTED(ret))
++				return ret;
++
++			return ret_errno(ENOSYS);
++		}
++		fd.type = UNIFIED_HIERARCHY;
++		fd.fd = move_fd(dfd);
++	}
++	dfd = move_fd(fd.fd);
++
++	TRACE("Reading %s from %s cgroup hierarchy", key, cgroup_hierarchy_name(fd.type));
++
++	if (fd.type == UNIFIED_HIERARCHY && strequal(fd.controller, "devices"))
++		return ret_errno(EOPNOTSUPP);
++	else
++		ret = lxc_read_try_buf_at(dfd, key, buf, len);
++
++	return ret;
++}
++
++/* Connects to command socket therefore isn't callable from command handler. */
++int cgroup_set(const char *name, const char *lxcpath, const char *key, const char *value)
++{
++	__do_close int dfd = -EBADF;
++	struct cgroup_fd fd = {
++		.fd = -EBADF,
++	};
++	size_t len_controller;
++	int ret;
++
++	if (is_empty_string(name) || is_empty_string(lxcpath) ||
++	    is_empty_string(key) || is_empty_string(value))
++		return ret_errno(EINVAL);
++
++	len_controller = strcspn(key, ".");
++	len_controller++; /* Don't forget the \0 byte. */
++	if (len_controller >= MAX_CGROUP_ROOT_NAMELEN)
++		return ret_errno(EINVAL);
++	(void)strlcpy(fd.controller, key, len_controller);
++
++	ret = lxc_cmd_get_limit_cgroup_fd(name, lxcpath, sizeof(struct cgroup_fd), &fd);
++	if (ret < 0) {
++		if (!ERRNO_IS_NOT_SUPPORTED(ret))
++			return ret;
++
++		dfd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
++		if (dfd < 0) {
++			if (!ERRNO_IS_NOT_SUPPORTED(ret))
++				return ret;
++
++			return ret_errno(ENOSYS);
++		}
++		fd.type = UNIFIED_HIERARCHY;
++		fd.fd = move_fd(dfd);
++	}
++	dfd = move_fd(fd.fd);
++
++	TRACE("Setting %s to %s in %s cgroup hierarchy", key, value, cgroup_hierarchy_name(fd.type));
++
++	if (fd.type == UNIFIED_HIERARCHY && strequal(fd.controller, "devices")) {
++		struct device_item device = {};
++
++		ret = device_cgroup_rule_parse(&device, key, value);
++		if (ret < 0)
++			return log_error_errno(-1, EINVAL, "Failed to parse device string %s=%s",
++					       key, value);
++
++		ret = lxc_cmd_add_bpf_device_cgroup(name, lxcpath, &device);
++	} else {
++		ret = lxc_writeat(dfd, key, value, strlen(value));
++	}
++
++	return ret;
++}
++
++static int do_cgroup_freeze(int unified_fd,
++			    const char *state_string,
++			    int state_num,
++			    int timeout,
++			    const char *epoll_error,
++			    const char *wait_error)
++{
++	__do_close int events_fd = -EBADF;
++	call_cleaner(lxc_mainloop_close) struct lxc_async_descr *descr_ptr = NULL;
++	int ret;
++	struct lxc_async_descr descr = {};
++
++	if (timeout != 0) {
++		ret = lxc_mainloop_open(&descr);
++		if (ret)
++			return log_error_errno(-1, errno, "%s", epoll_error);
++
++		/* automatically cleaned up now */
++		descr_ptr = &descr;
++
++		events_fd = open_at(unified_fd, "cgroup.events", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH, 0);
++		if (events_fd < 0)
++			return log_error_errno(-errno, errno, "Failed to open cgroup.events file");
++
++		ret = lxc_mainloop_add_handler_events(&descr, events_fd, EPOLLPRI,
++						      freezer_cgroup_events_cb,
++						      default_cleanup_handler,
++						      INT_TO_PTR(state_num),
++						      "freezer_cgroup_events_cb");
++		if (ret < 0)
++			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
++	}
++
++	ret = lxc_writeat(unified_fd, "cgroup.freeze", state_string, 1);
++	if (ret < 0)
++		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
++
++	if (timeout != 0) {
++		ret = lxc_mainloop(&descr, timeout);
++		if (ret)
++			return log_error_errno(-1, errno, "%s", wait_error);
++	}
++
++	return log_trace(0, "Container now %s", (state_num == 1) ? "frozen" : "unfrozen");
++}
++
++static inline int __cgroup_freeze(int unified_fd, int timeout)
++{
++	return do_cgroup_freeze(unified_fd, "1", 1, timeout,
++			        "Failed to create epoll instance to wait for container freeze",
++			        "Failed to wait for container to be frozen");
++}
++
++int cgroup_freeze(const char *name, const char *lxcpath, int timeout)
++{
++	__do_close int unified_fd = -EBADF;
++	int ret;
++
++	if (is_empty_string(name) || is_empty_string(lxcpath))
++		return ret_errno(EINVAL);
++
++	unified_fd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
++	if (unified_fd < 0)
++		return ret_errno(ENOCGROUP2);
++
++	lxc_cmd_notify_state_listeners(name, lxcpath, FREEZING);
++	ret = __cgroup_freeze(unified_fd, timeout);
++	lxc_cmd_notify_state_listeners(name, lxcpath, !ret ? FROZEN : RUNNING);
++	return ret;
++}
++
++int __cgroup_unfreeze(int unified_fd, int timeout)
++{
++	return do_cgroup_freeze(unified_fd, "0", 0, timeout,
++			        "Failed to create epoll instance to wait for container freeze",
++			        "Failed to wait for container to be frozen");
++}
++
++int cgroup_unfreeze(const char *name, const char *lxcpath, int timeout)
++{
++	__do_close int unified_fd = -EBADF;
++	int ret;
++
++	if (is_empty_string(name) || is_empty_string(lxcpath))
++		return ret_errno(EINVAL);
++
++	unified_fd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
++	if (unified_fd < 0)
++		return ret_errno(ENOCGROUP2);
++
++	lxc_cmd_notify_state_listeners(name, lxcpath, THAWED);
++	ret = __cgroup_unfreeze(unified_fd, timeout);
++	lxc_cmd_notify_state_listeners(name, lxcpath, !ret ? RUNNING : FROZEN);
++	return ret;
++}
+diff --git a/src/lxc/commands.c b/src/lxc/commands.c
+index 2188b31..bf63cac 100644
+--- a/src/lxc/commands.c
++++ b/src/lxc/commands.c
+@@ -1991,7 +1991,7 @@ int lxc_cmd_set_terminal_fifos(const char *name, const char *lxcpath, const char
+ }
+ 
+ static int lxc_cmd_set_terminal_fifos_callback(int fd, struct lxc_cmd_req *req,
+-					struct lxc_handler *handler, struct lxc_epoll_descr *descr)
++					struct lxc_handler *handler, struct lxc_async_descr *descr)
+ {
+ 	struct lxc_cmd_rsp rsp;
+ 	memset(&rsp, 0, sizeof(rsp));
+@@ -2037,7 +2037,7 @@ int lxc_cmd_set_terminal_winch(const char *name, const char *lxcpath, unsigned i
+ }
+ 
+ static int lxc_cmd_set_terminal_winch_callback(int fd, struct lxc_cmd_req *req,
+-					struct lxc_handler *handler, struct lxc_epoll_descr *descr)
++					struct lxc_handler *handler, struct lxc_async_descr *descr)
+ {
+ 	struct lxc_cmd_rsp rsp;
+ 	struct lxc_cmd_set_terminal_winch_request *data = (struct lxc_cmd_set_terminal_winch_request *)(req->data);
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index 187e60e..34cf90a 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -299,15 +299,15 @@ static struct limit_opt limit_opt = {
+ static int rootfs_parent_mount_private(char *rootfs);
+ static int setup_rootfs_ropaths(struct lxc_list *ropaths);
+ static int setup_rootfs_maskedpaths(struct lxc_list *maskedpaths);
+-static int remount_proc_sys_mount_entries(struct lxc_list *mount_list, bool lsm_aa_allow_nesting);
++static int remount_proc_sys_mount_entries(struct list_head *mount_entries, bool lsm_aa_allow_nesting);
+ static int check_mount_destination(const char *rootfs, const char *dest, const char *src);
+ static int mount_entry_with_loop_dev(const char *src, const char *dest, const char *fstype,
+ 		char *mnt_opts, const char *rootfs);
+-static bool need_setup_proc(const struct lxc_conf *conf, struct lxc_list *mount);
+-static bool need_setup_dev(const struct lxc_conf *conf, struct lxc_list *mount);
++static bool need_setup_proc(const struct lxc_conf *conf, struct list_head *mount);
++static bool need_setup_dev(const struct lxc_conf *conf, struct list_head *mount);
+ static int setup_populate_devs(const struct lxc_rootfs *rootfs, struct lxc_list *devs, const char *mount_label);
+ static int setup_rootfs_mountopts(const struct lxc_rootfs *rootfs);
+-static int create_mtab_link();
++static int create_mtab_link(void);
+ #endif
+ 
+ static int run_buffer(char *buffer)
+@@ -1252,8 +1252,13 @@ static int lxc_send_ttys_to_parent(struct lxc_handler *handler)
+ /* Just create a path for /dev under $lxcpath/$name and in rootfs If we hit an
+  * error, log it but don't fail yet.
+  */
++#ifdef HAVE_ISULAD
++static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
++			 int autodevtmpfssize, const char *lxcpath, char *systemd, const char *mount_label)
++#else
+ static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
+ 			 int autodevtmpfssize, const char *lxcpath)
++#endif
+ {
+ #ifndef HAVE_ISULAD
+ 	__do_close int fd_fs = -EBADF;
+@@ -1905,18 +1910,21 @@ static int lxc_setup_devpts_child(struct lxc_handler *handler)
+ 		 */
+ #ifdef HAVE_ISULAD
+ 		if (rootfs->lsm_se_mount_context != NULL) {
+-			ret = strnprintf(devpts_mntopts, sizeof(devpts_mntopts), "%s,max=%zu,context=\"%s\"",
+-					default_devpts_mntopts, pty_max, rootfs->lsm_se_mount_context);
++			if (asprintf(&devpts_mntopts, "%s,max=%zu,context=\"%s\"",
++				default_devpts_mntopts, conf->pty_max, conf->rootfs.lsm_se_mount_context) < 0) {
++				return -1;
++			}
+ 		} else {
++			if (asprintf(&devpts_mntopts, "%s,max=%zu", default_devpts_mntopts, conf->pty_max) < 0) {
++				return -1;
++			}
++		}
+ #else
+ 		ret = strnprintf(devpts_mntopts, sizeof(devpts_mntopts), "%s,max=%zu",
+ 				default_devpts_mntopts, pty_max);
+-#endif
+-#ifdef HAVE_ISULAD
+-		}
+-#endif
+ 		if (ret < 0)
+ 			return -1;
++#endif
+ 
+ 		/* Create mountpoint for devpts instance. */
+ 		ret = mkdirat(rootfs->dfd_dev, "pts", 0755);
+@@ -2079,7 +2087,7 @@ static int bind_mount_console(int fd_devpts, struct lxc_rootfs *rootfs,
+ 	__do_free char *mnt_opts = NULL;
+ 
+ 	if (rootfs->lsm_se_mount_context != NULL) {
+-		if (asprintf(mnt_opts, "context=\"%s\"", rootfs->lsm_se_mount_context) < 0) {
++		if (asprintf(&mnt_opts, "context=\"%s\"", rootfs->lsm_se_mount_context) < 0) {
+ 			return syserror("Out of memory");
+ 		}
+ 	}
+@@ -2181,7 +2189,7 @@ static int lxc_setup_ttydir_console(int fd_devpts, struct lxc_rootfs *rootfs,
+ 	__do_free char *mnt_opts = NULL;
+ 
+ 	if (rootfs->lsm_se_mount_context != NULL) {
+-		if (asprintf(mnt_opts, "context=\"%s\"", rootfs->lsm_se_mount_context) < 0) {
++		if (asprintf(&mnt_opts, "context=\"%s\"", rootfs->lsm_se_mount_context) < 0) {
+ 			return syserror("Out of memory");
+ 		}
+ 	}
+@@ -2968,8 +2976,13 @@ static int mount_entry_on_relative_rootfs(struct mntent *mntent,
+ 	return mount_entry_on_generic(mntent, rootfs->buf, rootfs, lxc_name, lxc_path);
+ }
+ 
++#ifdef HAVE_ISULAD
++static int mount_file_entries(const struct lxc_conf *conf, struct lxc_rootfs *rootfs, FILE *file,
++			      const char *lxc_name, const char *lxc_path)
++#else
+ static int mount_file_entries(struct lxc_rootfs *rootfs, FILE *file,
+ 			      const char *lxc_name, const char *lxc_path)
++#endif
+ {
+ 	char bufPATH_MAX;
+ 	struct mntent mntent;
+@@ -3030,8 +3043,13 @@ static inline void __auto_endmntent__(FILE **f)
+ 
+ #define __do_endmntent __attribute__((__cleanup__(__auto_endmntent__)))
+ 
++#ifdef HAVE_ISULAD
++static int setup_mount_fstab(const struct lxc_conf *conf, struct lxc_rootfs *rootfs, const char *fstab,
++			     const char *lxc_name, const char *lxc_path)
++#else
+ static int setup_mount_fstab(struct lxc_rootfs *rootfs, const char *fstab,
+ 			     const char *lxc_name, const char *lxc_path)
++#endif
+ {
+ 	__do_endmntent FILE *f = NULL;
+ 	int ret;
+@@ -3043,7 +3061,11 @@ static int setup_mount_fstab(struct lxc_rootfs *rootfs, const char *fstab,
+ 	if (!f)
+ 		return log_error_errno(-1, errno, "Failed to open \"%s\"", fstab);
+ 
++#ifdef HAVE_ISULAD
++	ret = mount_file_entries(conf, rootfs, f, lxc_name, lxc_path);
++#else
+ 	ret = mount_file_entries(rootfs, f, lxc_name, lxc_path);
++#endif
+ 	if (ret < 0)
+ 		ERROR("Failed to set up mount entries");
+ 
+@@ -3126,8 +3148,11 @@ static int setup_mount_entries(const struct lxc_conf *conf,
+ 	f = make_anonymous_mount_file(&conf->mount_entries, conf->lsm_aa_allow_nesting);
+ 	if (!f)
+ 		return -1;
+-
++#ifdef HAVE_ISULAD
++	return mount_file_entries(conf, rootfs, f, lxc_name, lxc_path);
++#else
+ 	return mount_file_entries(rootfs, f, lxc_name, lxc_path);
++#endif
+ }
+ 
+ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f)
+@@ -3540,7 +3565,11 @@ static int parse_resource(const char *res)
+ 	return resid;
+ }
+ 
++#ifdef HAVE_ISULAD
++int setup_resource_limits(struct lxc_conf *conf, pid_t pid, int errfd)
++#else
+ int setup_resource_limits(struct lxc_conf *conf, pid_t pid)
++#endif
+ {
+ 	int resid;
+ 	struct lxc_limit *lim;
+@@ -3554,8 +3583,17 @@ int setup_resource_limits(struct lxc_conf *conf, pid_t pid)
+ 			return log_error(-1, "Unknown resource %s", lim->resource);
+ 
+ #if HAVE_PRLIMIT || HAVE_PRLIMIT64
++#ifdef HAVE_ISULAD
++		if (prlimit(pid, resid, &lim->limit, NULL) != 0) {
++			lxc_write_error_message(errfd, "%s:%d: Failed to set limit %s %lu %lu: %s.",
++					__FILE__, __LINE__, lim->resource,
++					lim->limit.rlim_cur, lim->limit.rlim_max, strerror(errno));
++			return log_error_errno(-1, errno, "Failed to set limit %s", lim->resource);
++		}
++#else
+ 		if (prlimit(pid, resid, &lim->limit, NULL) != 0)
+ 			return log_error_errno(-1, errno, "Failed to set limit %s", lim->resource);
++#endif
+ 
+ 		TRACE("Setup \"%s\" limit", lim->resource);
+ #else
+@@ -4099,8 +4137,11 @@ domount:
+ 			ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/proc", rootfs->path ? rootfs->mount : "");
+ 			if (ret < 0)
+ 				return ret_errno(EIO);
+-
++#ifdef HAVE_ISULAD
++			ret = safe_mount("proc", rootfs->buf, "proc", 0, NULL, rootfs->mount, NULL);
++#else
+ 			ret = safe_mount("proc", rootfs->buf, "proc", 0, NULL, rootfs->mount);
++#endif
+ 		}
+ 	}
+ 	if (ret < 0)
+@@ -4675,7 +4716,12 @@ int lxc_setup(struct lxc_handler *handler)
+ 	}
+ 
+ 	if (lxc_conf->autodev > 0) {
++#ifdef HAVE_ISULAD
++		ret = mount_autodev(name, &lxc_conf->rootfs, lxc_conf->autodevtmpfssize, lxcpath,
++							lxc_conf->systemd, lxc_conf->rootfs.lsm_se_mount_context);
++#else
+ 		ret = mount_autodev(name, &lxc_conf->rootfs, lxc_conf->autodevtmpfssize, lxcpath);
++#endif
+ 		if (ret < 0)
+ 			return log_error(-1, "Failed to mount \"/dev\"");
+ 	}
+@@ -4697,7 +4743,11 @@ int lxc_setup(struct lxc_handler *handler)
+ 		return log_error(-1, "Failed to setup remaining automatic mounts");
+ #endif
+ 
++#ifdef HAVE_ISULAD
++	ret = setup_mount_fstab(lxc_conf, &lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath);
++#else
+ 	ret = setup_mount_fstab(&lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath);
++#endif
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to setup mounts");
+ 
+@@ -4750,6 +4800,15 @@ int lxc_setup(struct lxc_handler *handler)
+ 			return log_error(-1, "Failed to populate \"/dev\"");
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* isulad: setup devices which will be populated in the container. */
++	if (!lxc_list_empty(&lxc_conf->populate_devs) && setup_dev) {
++		if (setup_populate_devs(&lxc_conf->rootfs, &lxc_conf->populate_devs, lxc_conf->rootfs.lsm_se_mount_context) != 0) {
++			return log_error(-1, "Failed to setup devices in the container");
++		}
++	}
++#endif
++
+ 	/* Make sure any start hooks are in the container */
+ 	if (!verify_start_hooks(lxc_conf))
+ 		return log_error(-1, "Failed to verify start hooks");
+@@ -4796,7 +4855,7 @@ int lxc_setup(struct lxc_handler *handler)
+ 
+ #ifdef HAVE_ISULAD
+ 	/* Ask father to run oci prestart hooks and wait for him to finish. */
+-	if (lxc_sync_wait_parent(handler, LXC_SYNC_OCI_PRESTART_HOOK)) {
++	if (lxc_sync_barrier_parent(handler, START_SYNC_OCI_PRESTART_HOOK)) {
+ 		return log_error(-1, "Failed to sync parent to start host hook");
+ 	}
+ #endif
+@@ -4845,10 +4904,10 @@ int lxc_setup(struct lxc_handler *handler)
+ 		}
+ 	}
+ 
+-	//isulad: system container, remount /proc/sys/xxx by mount_list
++	//isulad: system container, remount /proc/sys/xxx by mount_entries
+ 	if (lxc_conf->systemd != NULL && strcmp(lxc_conf->systemd, "true") == 0) {
+-		if (!lxc_list_empty(&lxc_conf->mount_list)) {
+-			if (remount_proc_sys_mount_entries(&lxc_conf->mount_list,
++		if (!list_empty(&lxc_conf->mount_entries)) {
++			if (remount_proc_sys_mount_entries(&lxc_conf->mount_entries,
+ 							   lxc_conf->lsm_aa_allow_nesting)) {
+ 				return log_error(-1, "failed to remount /proc/sys");
+ 			}
+@@ -5250,7 +5309,7 @@ void lxc_conf_free(struct lxc_conf *conf)
+ 	if (conf->ocihooks) {
+ 		free_oci_runtime_spec_hooks(conf->ocihooks);
+ 	}
+-	free(conf->lsm_se_mount_context);
++	free(conf->rootfs.lsm_se_mount_context);
+ 	free(conf->lsm_se_keyring_context);
+ #endif
+ 
+@@ -6184,19 +6243,22 @@ int lxc_drop_caps(struct lxc_conf *conf)
+ #define __DEF_CAP_TO_MASK(x) (1U << ((x) & 31))
+ #if HAVE_LIBCAP
+ 	int ret = 0;
+-	struct lxc_list *iterator = NULL;
+-	char *keep_entry = NULL;
++	int nret = 0;
+ 	size_t i = 0;
+-	int capid;
+-	size_t numcaps = (size_t)lxc_caps_last_cap() + 1;
+-	struct lxc_list *caps = NULL;
++	__u32 capid;
++	__u32 last_cap;
++	size_t numcaps;
++	struct cap_entry *cap_entry;
+ 	int *caplist = NULL;
+ 
+-	if (lxc_list_empty(&conf->keepcaps))
++	if (!conf->caps.keep)
+ 		return 0;
+ 
+-	caps = &conf->keepcaps;
++	ret = lxc_caps_last_cap(&last_cap);
++	if (ret)
++		return -1;
+ 
++	numcaps = (size_t)last_cap + 1;
+ 	if (numcaps <= 0 || numcaps > 200)
+ 		return -1;
+ 
+@@ -6208,11 +6270,9 @@ int lxc_drop_caps(struct lxc_conf *conf)
+ 	}
+ 	(void)memset(caplist, 0, numcaps * sizeof(int));
+ 
+-	lxc_list_for_each(iterator, caps) {
+-
+-		keep_entry = iterator->elem;
++	list_for_each_entry(cap_entry, &conf->caps.list, head) {
+ 		/* isulad: Do not keep any cap*/
+-		if (strcmp(keep_entry, "ISULAD_KEEP_NONE") == 0) {
++		if (strcmp(cap_entry->cap_name, "ISULAD_KEEP_NONE") == 0) {
+ 			DEBUG("Do not keep any capability");
+ 			for(i = 0; i < numcaps; i++) {
+ 				caplisti = 0;
+@@ -6220,18 +6280,17 @@ int lxc_drop_caps(struct lxc_conf *conf)
+ 			break;
+ 		}
+ 
+-		capid = parse_cap(keep_entry);
+-
+-		if (capid == -2)
++		nret = parse_cap(cap_entry->cap_name, &capid);
++		if (nret == -2)
+ 			continue;
+ 
+-		if (capid < 0) {
+-			ERROR("unknown capability %s", keep_entry);
++		if (nret < 0) {
++			ERROR("unknown capability %s", cap_entry->cap_name);
+ 			ret = -1;
+ 			goto out;
+ 		}
+ 
+-		DEBUG("keep capability '%s' (%d)", keep_entry, capid);
++		DEBUG("keep capability '%s' (%d)", cap_entry->cap_name, capid);
+ 
+ 		caplistcapid = 1;
+ 	}
+@@ -6299,7 +6358,7 @@ static bool have_dev_bind_mount_entry(FILE *file)
+ }
+ 
+ // returns true if /dev needs to be set up.
+-static bool need_setup_dev(const struct lxc_conf *conf, struct lxc_list *mount)
++static bool need_setup_dev(const struct lxc_conf *conf, struct list_head *mount)
+ {
+ 	__do_fclose FILE *f = NULL;
+ 
+@@ -6344,7 +6403,7 @@ static bool have_proc_bind_mount_entry(FILE *file)
+ }
+ 
+ // returns true if /proc needs to be set up.
+-static bool need_setup_proc(const struct lxc_conf *conf, struct lxc_list *mount)
++static bool need_setup_proc(const struct lxc_conf *conf, struct list_head *mount)
+ {
+ 	__do_fclose FILE *f = NULL;
+ 
+@@ -6378,7 +6437,7 @@ static int mount_entry_with_loop_dev(const char *src, const char *dest, const ch
+ 		if (srcfd < 0)
+ 			return srcfd;
+ 		ret = snprintf(srcbuf, sizeof(srcbuf), "/proc/self/fd/%d", srcfd);
+-		if (ret < 0 || ret > sizeof(srcbuf)) {
++		if (ret < 0 || (size_t)ret > sizeof(srcbuf)) {
+ 			close(srcfd);
+ 			ERROR("Failed to print string");
+ 			return -EINVAL;
+@@ -6397,7 +6456,7 @@ static int mount_entry_with_loop_dev(const char *src, const char *dest, const ch
+ 	}
+ 
+ 	ret = snprintf(destbuf, sizeof(destbuf), "/proc/self/fd/%d", destfd);
+-	if (ret < 0 || ret > sizeof(destbuf)) {
++	if (ret < 0 || (size_t)ret > sizeof(destbuf)) {
+ 		if (srcfd != -1)
+ 			close(srcfd);
+ 		close(destfd);
+@@ -6584,13 +6643,13 @@ on_error:
+ 	return false;
+ }
+ 
+-static int remount_proc_sys_mount_entries(struct lxc_list *mount_list, bool lsm_aa_allow_nesting)
++static int remount_proc_sys_mount_entries(struct list_head *mount_entries, bool lsm_aa_allow_nesting)
+ {
+ 	char buf4096;
+ 	FILE *file;
+ 	struct mntent mntent;
+ 
+-	file = make_anonymous_mount_file(mount_list, lsm_aa_allow_nesting);
++	file = make_anonymous_mount_file(mount_entries, lsm_aa_allow_nesting);
+ 	if (!file)
+ 		return -1;
+ 
+@@ -6824,21 +6883,57 @@ reset_umask:
+ 	return ret;
+ }
+ 
++static void parse_propagationopt(char *opt, unsigned long *flags)
++{
++	struct mount_opt *mo;
++
++	/* If opt is found in propagation_opt, set or clear flags. */
++	for (mo = &propagation_opt0; mo->name != NULL; mo++) {
++		if (strncmp(opt, mo->name, strlen(mo->name)) != 0)
++			continue;
++
++		if (mo->clear)
++			*flags &= ~mo->flag;
++		else
++			*flags |= mo->flag;
++
++		return;
++	}
++}
++
++int parse_propagationopts(const char *mntopts, unsigned long *pflags)
++{
++	__do_free char *s = NULL;
++	char *p;
++
++	if (!mntopts)
++		return 0;
++
++	s = strdup(mntopts);
++	if (!s)
++		return log_error_errno(-ENOMEM, errno, "Failed to allocate memory");
++
++	*pflags = 0L;
++	lxc_iterate_parts(p, s, ",")
++		parse_propagationopt(p, pflags);
++
++	return 0;
++}
++
+ // isulad: setup rootfs mountopts
+ static int setup_rootfs_mountopts(const struct lxc_rootfs *rootfs)
+ {
+ 	unsigned long mflags, mntflags, pflags;
+ 	__do_free char *mntdata = NULL;
+ 
+-	if(!rootfs || !rootfs->options)
++	if(!rootfs || !rootfs->mnt_opts.raw_options)
+ 		return 0;
+ 
+-	if (parse_mntopts_legacy(rootfs->options, &mntflags, &mntdata) < 0) {
++	if (parse_mntopts_legacy(rootfs->mnt_opts.raw_options, &mntflags, &mntdata) < 0) {
+ 		return -1;
+ 	}
+ 
+-	ret = parse_propagationopts(rootfs->options, &pflags);
+-	if (ret < 0) {
++	if (parse_propagationopts(rootfs->mnt_opts.raw_options, &pflags) < 0) {
+ 		return -EINVAL;
+ 	}
+ 
+@@ -6853,7 +6948,7 @@ static int setup_rootfs_mountopts(const struct lxc_rootfs *rootfs)
+ 	return 0;
+ }
+ 
+-static int create_mtab_link()
++static int create_mtab_link(void)
+ {
+ 	ssize_t ret;
+ 	int mret;
+@@ -6935,7 +7030,7 @@ static char* generate_json_str(const char *name, const char *lxcpath, const char
+ 	rc = snprintf(inmsg, size,
+ 	              "{\"ociVersion\":\"\",\"id\":\"%s\",\"pid\":%s,\"root\":\"%s\",\"bundle\":\"%s/%s\"}",
+ 	              name, cpid, rootfs, lxcpath, name);
+-	if (rc < 0 || rc >= size) {
++	if (rc < 0 || (size_t)rc >= size) {
+ 		ERROR("Create json string failed");
+ 		ret = -1;
+ 	}
+@@ -7090,8 +7185,8 @@ static struct lxc_popen_FILE *lxc_popen_ocihook(const char *commandpath, char **
+ 	close(pipe_msg0);
+ 	pipe_msg0= -1;
+ 	if (instr) {
+-		size_t len = strlen(instr);
+-		if (lxc_write_nointr(pipe_msg1, instr, len) != len) {
++		int len = lxc_write_nointr(pipe_msg1, instr, strlen(instr));
++		if (len < 0 || (size_t)len != strlen(instr)) {
+ 			WARN("Write instr: %s failed", instr);
+ 		}
+ 	}
+@@ -7413,7 +7508,7 @@ int run_oci_hooks(const char *name, const char *hookname, struct lxc_conf *conf,
+ /*isulad clear init args*/
+ int lxc_clear_init_args(struct lxc_conf *lxc_conf)
+ {
+-	int i;
++	size_t i;
+ 
+ 	for (i = 0; i < lxc_conf->init_argc; i++) {
+ 		free(lxc_conf->init_argvi);
+diff --git a/src/lxc/conf.h b/src/lxc/conf.h
+index 108e05b..ef4bb05 100644
+--- a/src/lxc/conf.h
++++ b/src/lxc/conf.h
+@@ -677,7 +677,11 @@ __hidden extern int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const c
+ 						  const char *lxcpath);
+ __hidden extern int lxc_setup(struct lxc_handler *handler);
+ __hidden extern int lxc_setup_parent(struct lxc_handler *handler);
++#ifdef HAVE_ISULAD
++__hidden extern int setup_resource_limits(struct lxc_conf *conf, pid_t pid, int errfd);
++#else
+ __hidden extern int setup_resource_limits(struct lxc_conf *conf, pid_t pid);
++#endif
+ __hidden extern int find_unmapped_nsid(const struct lxc_conf *conf, enum idtype idtype);
+ __hidden extern int mapped_hostid(unsigned id, const struct lxc_conf *conf, enum idtype idtype);
+ __hidden extern int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *), void *data,
+diff --git a/src/lxc/confile.c b/src/lxc/confile.c
+index 1492776..0d0d66c 100644
+--- a/src/lxc/confile.c
++++ b/src/lxc/confile.c
+@@ -287,16 +287,16 @@ static struct lxc_config_t config_jump_table = {
+ 	{ "lxc.sysctl",                     false, set_config_sysctl,                     get_config_sysctl,                     clr_config_sysctl,                     },
+ 	{ "lxc.proc",                       false, set_config_proc,                       get_config_proc,                       clr_config_proc,                       },
+ #ifdef HAVE_ISULAD
+-	{ "lxc.isulad.init.args",          set_config_init_args,                   get_config_init_args,                   clr_config_init_args,                 },
+-	{ "lxc.isulad.populate.device",    set_config_populate_device,             get_config_populate_device,             clr_config_populate_device,           },
+-	{ "lxc.isulad.umask",              set_config_umask,                       get_config_umask,                       clr_config_umask,                     },
+-	{ "lxc.isulad.rootfs.maskedpaths", set_config_rootfs_masked_paths,         get_config_rootfs_masked_paths,         clr_config_rootfs_masked_paths,       },
+-	{ "lxc.isulad.rootfs.ropaths",     set_config_rootfs_ro_paths,             get_config_rootfs_ro_paths,             clr_config_rootfs_ro_paths,           },
+-	{ "lxc.isulad.systemd",            set_config_systemd,                     get_config_systemd,                     clr_config_systemd,                   },
+-	{ "lxc.console.logdriver",         set_config_console_log_driver,          get_config_console_log_driver,          clr_config_console_log_driver,        },
+-	{ "lxc.console.syslog_tag",        set_config_console_syslog_tag,          get_config_console_syslog_tag,          clr_config_console_syslog_tag,        },
+-	{ "lxc.console.syslog_facility",   set_config_console_syslog_facility,     get_config_console_syslog_facility,     clr_config_console_syslog_facility,   },
+-	{ "lxc.selinux.mount_context",     set_config_selinux_mount_context,       get_config_selinux_mount_context,       clr_config_selinux_mount_context,     },
++	{ "lxc.isulad.init.args",          	true,	set_config_init_args,                   get_config_init_args,                   clr_config_init_args,                 },
++	{ "lxc.isulad.populate.device",    	true,	set_config_populate_device,             get_config_populate_device,             clr_config_populate_device,           },
++	{ "lxc.isulad.umask",              	true,	set_config_umask,                       get_config_umask,                       clr_config_umask,                     },
++	{ "lxc.isulad.rootfs.maskedpaths", 	true,	set_config_rootfs_masked_paths,         get_config_rootfs_masked_paths,         clr_config_rootfs_masked_paths,       },
++	{ "lxc.isulad.rootfs.ropaths",     	true,	set_config_rootfs_ro_paths,             get_config_rootfs_ro_paths,             clr_config_rootfs_ro_paths,           },
++	{ "lxc.isulad.systemd",            	true,	set_config_systemd,                     get_config_systemd,                     clr_config_systemd,                   },
++	{ "lxc.console.logdriver",         	true,	set_config_console_log_driver,          get_config_console_log_driver,          clr_config_console_log_driver,        },
++	{ "lxc.console.syslog_tag",        	true,	set_config_console_syslog_tag,          get_config_console_syslog_tag,          clr_config_console_syslog_tag,        },
++	{ "lxc.console.syslog_facility",   	true,	set_config_console_syslog_facility,     get_config_console_syslog_facility,     clr_config_console_syslog_facility,   },
++	{ "lxc.selinux.mount_context",     	true,	set_config_selinux_mount_context,       get_config_selinux_mount_context,       clr_config_selinux_mount_context,     },
+ #endif
+ };
+ 
+@@ -3206,7 +3206,7 @@ static int parse_line(char *buffer, void *data)
+ 	if (value_decode == NULL) {
+ 		ERROR("Value %s decode failed", value);
+ 	}
+-	ret = config->set(key, value_decode ? value_decode: value, plc->conf, NULL);
++	return config->set(key, value_decode ? value_decode: value, plc->conf, NULL);
+ #else
+ 	return config->set(key, value, plc->conf, NULL);
+ #endif
+@@ -6895,7 +6895,8 @@ static int set_config_init_args(const char *key, const char *value,
+ static int get_config_init_args(const char *key, char *retv, int inlen,
+ 				  struct lxc_conf *c, void *data)
+ {
+-	int i, len, fulllen = 0;
++	size_t i;
++	int len, fulllen = 0;
+ 
+ 	if (!retv)
+ 		inlen = 0;
+@@ -7261,10 +7262,10 @@ static int set_config_selinux_mount_context(const char *key, const char *value,
+     struct lxc_conf *lxc_conf, void *data)
+ {
+ 	if (value != NULL && strcmp(value, "unconfined_t") == 0) {
+-		return set_config_string_item(&lxc_conf->lsm_se_mount_context, NULL);
++		return set_config_string_item(&lxc_conf->rootfs.lsm_se_mount_context, NULL);
+ 	}
+ 
+-	return set_config_string_item(&lxc_conf->lsm_se_mount_context, value);
++	return set_config_string_item(&lxc_conf->rootfs.lsm_se_mount_context, value);
+ }
+ 
+ static int get_config_console_log_driver(const char *key, char *retv, int inlen,
+@@ -7288,7 +7289,7 @@ static int get_config_console_syslog_facility(const char *key, char *retv, int i
+ static int get_config_selinux_mount_context(const char *key, char *retv, int inlen,
+     struct lxc_conf *c, void *data)
+ {
+-	return lxc_get_conf_str(retv, inlen, c->lsm_se_mount_context);
++	return lxc_get_conf_str(retv, inlen, c->rootfs.lsm_se_mount_context);
+ }
+ 
+ static inline int clr_config_console_log_driver(const char *key,
+@@ -7317,8 +7318,8 @@ static inline int clr_config_console_syslog_facility(const char *key,
+ static inline int clr_config_selinux_mount_context(const char *key,
+     struct lxc_conf *c, void *data)
+ {
+-	free(c->lsm_se_mount_context);
+-	c->lsm_se_mount_context = NULL;
++	free(c->rootfs.lsm_se_mount_context);
++	c->rootfs.lsm_se_mount_context = NULL;
+ 	return 0;
+ }
+ #endif
+diff --git a/src/lxc/exec_commands.c b/src/lxc/exec_commands.c
+index bd81d66..5612109 100644
+--- a/src/lxc/exec_commands.c
++++ b/src/lxc/exec_commands.c
+@@ -37,6 +37,7 @@
+ 
+ #include "af_unix.h"
+ #include "cgroup.h"
++#include "string_utils.h"
+ #include "exec_commands.h"
+ #include "commands_utils.h"
+ #include "conf.h"
+@@ -47,8 +48,6 @@
+ #include "lxclock.h"
+ #include "mainloop.h"
+ #include "monitor.h"
+-#include "string_utils.h"
+-#include "terminal.h"
+ #include "utils.h"
+ 
+ lxc_log_define(commands_exec, lxc);
+@@ -70,12 +69,7 @@ static int lxc_exec_cmd_rsp_recv(int sock, struct lxc_exec_cmd_rr *cmd)
+ 	int ret, rspfd;
+ 	struct lxc_exec_cmd_rsp *rsp = &cmd->rsp;
+ 
+-	/*isulad: add timeout 1s to avoid long block due to lxc monitor error*/
+-	if (lxc_socket_set_timeout(sock, 1, 1) != 0) {
+-		return syserror_ret(-1, "Failed to set timeout");
+-	}
+-
+-	ret = lxc_cmd_rsp_recv_fds(sock, &rspfd, 1, rsp, sizeof(*rsp));
++	ret = lxc_abstract_unix_recv_one_fd_timeout(sock, &rspfd, rsp, sizeof(*rsp), 1000 * 1000);
+ 	if (ret < 0) {
+ 		SYSERROR("Failed to receive response for command \"%s\"",
+ 		        lxc_exec_cmd_str(cmd->req.cmd));
+@@ -256,7 +250,7 @@ static int lxc_exec_cmd_process(int fd, struct lxc_exec_cmd_req *req,
+ 	return cbreq->cmd(fd, req, handler);
+ }
+ 
+-static void lxc_exec_cmd_fd_cleanup(int fd, struct lxc_epoll_descr *descr)
++static void lxc_exec_cmd_fd_cleanup(int fd, struct lxc_async_descr *descr)
+ {
+ 	lxc_mainloop_del_handler(descr, fd);
+ 	close(fd);
+@@ -264,7 +258,7 @@ static void lxc_exec_cmd_fd_cleanup(int fd, struct lxc_epoll_descr *descr)
+ }
+ 
+ static int lxc_exec_cmd_handler(int fd, uint32_t events, void *data,
+-			   struct lxc_epoll_descr *descr)
++			   struct lxc_async_descr *descr)
+ {
+ 	int ret;
+ 	struct lxc_exec_cmd_req req;
+@@ -341,7 +335,7 @@ out_close:
+ }
+ 
+ static int lxc_exec_cmd_accept(int fd, uint32_t events, void *data,
+-			  struct lxc_epoll_descr *descr)
++			  struct lxc_async_descr *descr)
+ {
+ 	int connection = -1;
+ 	int opt = 1, ret = -1;
+@@ -364,7 +358,8 @@ static int lxc_exec_cmd_accept(int fd, uint32_t events, void *data,
+ 		goto out_close;
+ 	}
+ 
+-	ret = lxc_mainloop_add_handler(descr, connection, lxc_exec_cmd_handler, data);
++	ret = lxc_mainloop_add_handler(descr, connection, lxc_exec_cmd_handler, default_cleanup_handler, data,
++								   "exec_cmd_handler");
+ 	if (ret) {
+ 		ERROR("Failed to add command handler");
+ 		goto out_close;
+@@ -462,12 +457,12 @@ int lxc_exec_cmd_init(const char *name, const char *lxcpath, const char *suffix)
+ }
+ #endif
+ 
+-int lxc_exec_cmd_mainloop_add(struct lxc_epoll_descr *descr, struct lxc_exec_command_handler *handler)
++int lxc_exec_cmd_mainloop_add(struct lxc_async_descr *descr, struct lxc_exec_command_handler *handler)
+ {
+ 	int ret;
+ 	int fd = handler->maincmd_fd;
+ 
+-	ret = lxc_mainloop_add_handler(descr, fd, lxc_exec_cmd_accept, handler);
++	ret = lxc_mainloop_add_handler(descr, fd, lxc_exec_cmd_accept, default_cleanup_handler, handler, "exec_cmd_accept");
+ 	if (ret < 0) {
+ 		ERROR("Failed to add handler for command socket");
+ 		close(fd);
+diff --git a/src/lxc/exec_commands.h b/src/lxc/exec_commands.h
+index 3ec2a22..ca3a4d6 100644
+--- a/src/lxc/exec_commands.h
++++ b/src/lxc/exec_commands.h
+@@ -63,11 +63,11 @@ struct lxc_exec_cmd_set_terminal_winch_request {
+ 	unsigned int width;
+ };
+ 
+-struct lxc_epoll_descr;
++struct lxc_async_descr;
+ struct lxc_handler;
+ 
+ extern int lxc_exec_cmd_init(const char *name, const char *lxcpath, const char *suffix);
+-extern int lxc_exec_cmd_mainloop_add(struct lxc_epoll_descr *descr, struct lxc_exec_command_handler *handler);
++extern int lxc_exec_cmd_mainloop_add(struct lxc_async_descr *descr, struct lxc_exec_command_handler *handler);
+ extern int lxc_exec_cmd_set_terminal_winch(const char *name, const char *lxcpath, const char *suffix, unsigned int height, unsigned int width);
+ 
+ #ifdef HAVE_ISULAD
+diff --git a/src/lxc/execute.c b/src/lxc/execute.c
+index 6a7ae39..2960664 100644
+--- a/src/lxc/execute.c
++++ b/src/lxc/execute.c
+@@ -18,7 +18,11 @@
+ 
+ lxc_log_define(execute, start);
+ 
++#ifdef HAVE_ISULAD
++static int execute_start(struct lxc_handler *handler, void* data, int fd)
++#else
+ static int execute_start(struct lxc_handler *handler, void* data)
++#endif
+ {
+ 	int argc = 0;
+ 	struct execute_args *my_args = data;
+@@ -40,14 +44,25 @@ static struct lxc_operations execute_start_ops = {
+ 	.post_start = execute_post_start
+ };
+ 
++#ifdef HAVE_ISULAD
++int lxc_execute(const char *name, char *const argv, int quiet,
++		struct lxc_handler *handler, const char *lxcpath,
++		bool daemonize, int *error_num, unsigned int start_timeout)
++#else
+ int lxc_execute(const char *name, char *const argv, int quiet,
+ 		struct lxc_handler *handler, const char *lxcpath,
+ 		bool daemonize, int *error_num)
++#endif
+ {
+ 	struct execute_args args = {.argv = argv, .quiet = quiet};
+ 
+ 	TRACE("Doing lxc_execute");
+ 	handler->conf->is_execute = true;
++#ifdef HAVE_ISULAD
++	return __lxc_start(handler, &execute_start_ops, &args, lxcpath,
++			   daemonize, error_num, start_timeout);
++#else
+ 	return __lxc_start(handler, &execute_start_ops, &args, lxcpath,
+ 			   daemonize, error_num);
++#endif
+ }
+diff --git a/src/lxc/isulad_utils.c b/src/lxc/isulad_utils.c
+index 889d912..38dbe2a 100644
+--- a/src/lxc/isulad_utils.c
++++ b/src/lxc/isulad_utils.c
+@@ -233,7 +233,7 @@ unsigned long long lxc_get_process_startat(pid_t pid)
+     char sbuf1024 = {0}; /* bufs for stat */
+ 
+     sret = snprintf(filename, sizeof(filename), "/proc/%d/stat", pid);
+-    if (sret < 0 || sret >= sizeof(filename)) {
++    if (sret < 0 || (size_t)sret >= sizeof(filename)) {
+         ERROR("Failed to sprintf filename");
+         goto out;
+     }
+@@ -317,7 +317,7 @@ bool lxc_process_alive(pid_t pid, unsigned long long start_time)
+ 		return false;
+ 
+ 	sret = snprintf(filename, sizeof(filename), "/proc/%d/stat", pid);
+-	if (sret < 0 || sret >= sizeof(filename)) {
++	if (sret < 0 || (size_t)sret >= sizeof(filename)) {
+ 		ERROR("Failed to sprintf filename");
+ 		goto out;
+ 	}
+@@ -537,7 +537,7 @@ out:
+ ssize_t lxc_write_nointr_for_fifo(int fd, const char *buf, size_t count)
+ {
+     ssize_t nret = 0;
+-    ssize_t nwritten;
++    size_t nwritten;
+ 
+     if (buf == NULL) {
+         return -1;
+diff --git a/src/lxc/isulad_utils.h b/src/lxc/isulad_utils.h
+index 93174ae..3dfa9f7 100644
+--- a/src/lxc/isulad_utils.h
++++ b/src/lxc/isulad_utils.h
+@@ -5,13 +5,15 @@
+  * Author: lifeng
+  * Create: 2020-04-11
+ ******************************************************************************/
+-#ifndef __iSULAD_UTILS_H
+-#define __iSULAD_UTILS_H
++#ifndef __ISULAD_UTILS_H
++#define __ISULAD_UTILS_H
+ 
+ #include <stdio.h>
+ #include <stdbool.h>
+ #include <pwd.h>
+ 
++#include "compiler.h"
++
+ /* isulad: replace space with SPACE_MAGIC_STR */
+ #define SPACE_MAGIC_STR "#)"
+ 
+@@ -97,7 +99,7 @@ __hidden extern bool lxc_process_alive(pid_t pid, unsigned long long start_time)
+ 
+ __hidden extern bool is_non_negative_num(const char *s);
+ 
+-__hidden int util_getpwent_r(FILE *stream, struct passwd *resbuf, char *buffer, size_t buflen, struct passwd **result);
++__hidden extern int util_getpwent_r(FILE *stream, struct passwd *resbuf, char *buffer, size_t buflen, struct passwd **result);
+ 
+ __hidden extern ssize_t lxc_write_nointr_for_fifo(int fd, const char *buf, size_t count);
+ 
+diff --git a/src/lxc/lsm/lsm.c b/src/lxc/lsm/lsm.c
+index d9380c4..db4bb0c 100644
+--- a/src/lxc/lsm/lsm.c
++++ b/src/lxc/lsm/lsm.c
+@@ -19,6 +19,10 @@ __hidden extern struct lsm_ops *lsm_apparmor_ops_init(void);
+ __hidden extern struct lsm_ops *lsm_selinux_ops_init(void);
+ __hidden extern struct lsm_ops *lsm_nop_ops_init(void);
+ 
++#ifdef HAVE_ISULAD
++static struct lsm_ops *ops_instance = NULL;
++#endif
++
+ struct lsm_ops *lsm_init_static(void)
+ {
+ 	struct lsm_ops *ops = NULL;
+@@ -35,6 +39,30 @@ struct lsm_ops *lsm_init_static(void)
+ 	if (!ops)
+ 		ops = lsm_nop_ops_init();
+ 
++#ifdef HAVE_ISULAD
++	ops_instance = ops;
++#endif
++
+ 	INFO("Initialized LSM security driver %s", ops->name);
+ 	return ops;
+ }
++
++#ifdef HAVE_ISULAD
++int lsm_file_label_set(const char *path, const char *label)
++{
++	if (!ops_instance) {
++		ERROR("LSM driver not inited");
++		return -1;
++	}
++	return ops_instance->file_label_set(path, label);
++}
++
++int lsm_relabel(const char *path, const char *label, bool share)
++{
++	if (!ops_instance) {
++		ERROR("LSM driver not inited");
++		return -1;
++	}
++	return ops_instance->relabel(path, label, share);
++}
++#endif
+diff --git a/src/lxc/lsm/lsm.h b/src/lxc/lsm/lsm.h
+index 93e1a99..571a92d 100644
+--- a/src/lxc/lsm/lsm.h
++++ b/src/lxc/lsm/lsm.h
+@@ -42,4 +42,9 @@ struct lsm_ops {
+ 
+ __hidden extern struct lsm_ops *lsm_init_static(void);
+ 
++#ifdef HAVE_ISULAD
++__hidden extern int lsm_file_label_set(const char *path, const char *label);
++__hidden extern int lsm_relabel(const char *path, const char *label, bool share);
++#endif
++
+ #endif /* __LXC_LSM_H */
+diff --git a/src/lxc/lsm/selinux.c b/src/lxc/lsm/selinux.c
+index 5190110..0bdfcff 100644
+--- a/src/lxc/lsm/selinux.c
++++ b/src/lxc/lsm/selinux.c
+@@ -272,7 +272,7 @@ static int recurse_set_file_label(const char *basePath, const char *label)
+ 			continue;
+ 		} else {
+ 			int nret = snprintf(base, sizeof(base), "%s/%s", basePath, ptr->d_name);
+-			if (nret < 0 || nret >= sizeof(base)) {
++			if (nret < 0 || (size_t)nret >= sizeof(base)) {
+ 				ERROR("Failed to get path");
+ 				return -1;
+ 			}
+diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
+index 879e899..74c8aa8 100644
+--- a/src/lxc/lxc.h
++++ b/src/lxc/lxc.h
+@@ -39,8 +39,13 @@ struct lxc_handler;
+  * @daemonize    : whether or not the container is daemonized
+  * Returns 0 on success, < 0 otherwise
+  */
++#ifdef HAVE_ISULAD
++__hidden extern int lxc_start(char *const argv, struct lxc_handler *handler, const char *lxcpath,
++			      bool daemonize, int *error_num, unsigned int start_timeout);
++#else
+ __hidden extern int lxc_start(char *const argv, struct lxc_handler *handler, const char *lxcpath,
+ 			      bool daemonize, int *error_num);
++#endif
+ 
+ /*
+  * Start the specified command inside an application container
+@@ -51,9 +56,15 @@ __hidden extern int lxc_start(char *const argv, struct lxc_handler *handler, c
+  * @daemonize    : whether or not the container is daemonized
+  * Returns 0 on success, < 0 otherwise
+  */
++#ifdef HAVE_ISULAD
++__hidden extern int lxc_execute(const char *name, char *const argv, int quiet,
++				struct lxc_handler *handler, const char *lxcpath, bool daemonize,
++				int *error_num, unsigned int start_timeout);
++#else
+ __hidden extern int lxc_execute(const char *name, char *const argv, int quiet,
+ 				struct lxc_handler *handler, const char *lxcpath, bool daemonize,
+ 				int *error_num);
++#endif
+ 
+ /*
+  * Close the fd associated with the monitoring
+diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
+index d4495f7..5720cf7 100644
+--- a/src/lxc/lxccontainer.c
++++ b/src/lxc/lxccontainer.c
+@@ -6100,7 +6100,11 @@ WRAP_API_1(bool, lxcapi_get_container_metrics, struct lxc_container_metrics *)
+ 
+ #endif
+ 
++#ifdef HAVE_ISULAD
++static struct lxc_container *do_lxc_container_new(const char *name, const char *configpath, bool load_config)
++#else
+ struct lxc_container *lxc_container_new(const char *name, const char *configpath)
++#endif
+ {
+ 	struct lxc_container *c;
+ 	size_t len;
+diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c
+index 765240e..9522b7d 100644
+--- a/src/lxc/mainloop.c
++++ b/src/lxc/mainloop.c
+@@ -534,7 +534,7 @@ void lxc_mainloop_close(struct lxc_async_descr *descr)
+ }
+ 
+ #ifdef HAVE_ISULAD
+-int isulad_safe_mainloop(struct lxc_epoll_descr *descr, int timeout_ms)
++int isulad_safe_mainloop(struct lxc_async_descr *descr, int timeout_ms)
+ {
+     int ret;
+ 
+diff --git a/src/lxc/mainloop.h b/src/lxc/mainloop.h
+index e8ce082..f485a1f 100644
+--- a/src/lxc/mainloop.h
++++ b/src/lxc/mainloop.h
+@@ -66,7 +66,7 @@ __hidden extern void lxc_mainloop_close(struct lxc_async_descr *descr);
+ define_cleanup_function(struct lxc_async_descr *, lxc_mainloop_close);
+ 
+ #ifdef HAVE_ISULAD
+-__hidden extern int isulad_safe_mainloop(struct lxc_epoll_descr *descr, int timeout_ms);
++__hidden extern int isulad_safe_mainloop(struct lxc_async_descr *descr, int timeout_ms);
+ #endif
+ 
+ #endif
+diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
+index f0fa297..d952beb 100644
+--- a/src/lxc/seccomp.c
++++ b/src/lxc/seccomp.c
+@@ -699,21 +699,33 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
+ 		ctx.architectures0 = SCMP_ARCH_X86;
+ 		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_i386,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures0);
++#else
+ 					      &ctx.needs_merge0);
++#endif
+ 		if (!ctx.contexts0)
+ 			goto bad;
+ 
+ 		ctx.architectures1 = SCMP_ARCH_X32;
+ 		ctx.contexts1 = get_new_ctx(lxc_seccomp_arch_x32,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures1);
++#else
+ 					      &ctx.needs_merge1);
++#endif
+ 		if (!ctx.contexts1)
+ 			goto bad;
+ 
+ 		ctx.architectures2 = SCMP_ARCH_X86_64;
+ 		ctx.contexts2 = get_new_ctx(lxc_seccomp_arch_amd64,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures2);
++#else
+ 					      &ctx.needs_merge2);
++#endif
+ 		if (!ctx.contexts2)
+ 			goto bad;
+ #ifdef SCMP_ARCH_PPC
+@@ -723,14 +735,22 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
+ 		ctx.architectures0 = SCMP_ARCH_PPC;
+ 		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_ppc,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures0);
++#else
+ 					      &ctx.needs_merge0);
++#endif
+ 		if (!ctx.contexts0)
+ 			goto bad;
+ 
+ 		ctx.architectures2 = SCMP_ARCH_PPC64;
+ 		ctx.contexts2 = get_new_ctx(lxc_seccomp_arch_ppc64,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures2);
++#else
+ 					      &ctx.needs_merge2);
++#endif
+ 		if (!ctx.contexts2)
+ 			goto bad;
+ #endif
+@@ -741,7 +761,11 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
+ 		ctx.architectures0 = SCMP_ARCH_ARM;
+ 		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_arm,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures0);
++#else
+ 					      &ctx.needs_merge0);
++#endif
+ 		if (!ctx.contexts0)
+ 			goto bad;
+ 
+@@ -749,7 +773,11 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
+ 		ctx.architectures2 = SCMP_ARCH_AARCH64;
+ 		ctx.contexts2 = get_new_ctx(lxc_seccomp_arch_arm64,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures2);
++#else
+ 					      &ctx.needs_merge2);
++#endif
+ 		if (!ctx.contexts2)
+ 			goto bad;
+ #endif
+@@ -761,21 +789,33 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
+ 		ctx.architectures0 = SCMP_ARCH_MIPS;
+ 		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_mips,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures0);
++#else
+ 					      &ctx.needs_merge0);
++#endif
+ 		if (!ctx.contexts0)
+ 			goto bad;
+ 
+ 		ctx.architectures1 = SCMP_ARCH_MIPS64N32;
+ 		ctx.contexts1 = get_new_ctx(lxc_seccomp_arch_mips64n32,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures1);
++#else
+ 					      &ctx.needs_merge1);
++#endif
+ 		if (!ctx.contexts1)
+ 			goto bad;
+ 
+ 		ctx.architectures2 = SCMP_ARCH_MIPS64;
+ 		ctx.contexts2 = get_new_ctx(lxc_seccomp_arch_mips64,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures2);
++#else
+ 					      &ctx.needs_merge2);
++#endif
+ 		if (!ctx.contexts2)
+ 			goto bad;
+ 	} else if (native_arch == lxc_seccomp_arch_mipsel64) {
+@@ -784,21 +824,33 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
+ 		ctx.architectures0 = SCMP_ARCH_MIPSEL;
+ 		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_mipsel,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures0);
++#else
+ 					      &ctx.needs_merge0);
++#endif
+ 		if (!ctx.contexts0)
+ 			goto bad;
+ 
+ 		ctx.architectures1 = SCMP_ARCH_MIPSEL64N32;
+ 		ctx.contexts1 = get_new_ctx(lxc_seccomp_arch_mipsel64n32,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures1);
++#else
+ 					      &ctx.needs_merge1);
++#endif
+ 		if (!ctx.contexts1)
+ 			goto bad;
+ 
+ 		ctx.architectures2 = SCMP_ARCH_MIPSEL64;
+ 		ctx.contexts2 = get_new_ctx(lxc_seccomp_arch_mipsel64,
+ 					      default_policy_action,
++#ifdef HAVE_ISULAD
++					      &ctx.architectures2);
++#else
+ 					      &ctx.needs_merge2);
++#endif
+ 		if (!ctx.contexts2)
+ 			goto bad;
+ #endif
+diff --git a/src/lxc/start.c b/src/lxc/start.c
+index 70af128..ff9a3fa 100644
+--- a/src/lxc/start.c
++++ b/src/lxc/start.c
+@@ -2067,6 +2067,9 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 	const char *name = handler->name;
+ 	struct lxc_conf *conf = handler->conf;
+ 	struct cgroup_ops *cgroup_ops = handler->cgroup_ops;
++#ifdef HAVE_ISULAD
++	const char *lxcpath = handler->lxcpath;
++#endif
+ 
+ 	id_map = &conf->id_map;
+ 	wants_to_map_ids = !list_empty(id_map);
+@@ -2364,6 +2367,30 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 		goto out_delete_net;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	if (!lxc_sync_wait_child(handler, START_SYNC_OCI_PRESTART_HOOK))
++		goto out_delete_net;
++
++	/* isulad: Run oci prestart hook at here */
++	ret = run_oci_hooks(name, "oci-prestart", conf, lxcpath);
++	if (ret < 0) {
++		ERROR("Failed to run oci prestart hooks");
++		goto out_delete_net;
++	}
++
++	if (START_TIMEOUT == global_timeout_state) {
++		lxc_write_error_message(conf->errpipe1, "Starting the container \"%s\" timeout.", name);
++		ERROR("Starting the container \"%s\" timeout.", name);
++		goto out_delete_net;
++	}
++
++       /* Tell the child to continue its initialization. We'll get
++        * START_SYNC_POST_OCI_PRESTART_HOOK when it is ready for us to run oci prestart hooks.
++        */
++       if (lxc_sync_wake_child(handler, START_SYNC_POST_OCI_PRESTART_HOOK))
++               goto out_delete_net;
++#endif
++
+ 	if (!lxc_sync_wait_child(handler, START_SYNC_CGROUP_LIMITS))
+ 		goto out_delete_net;
+ 
+@@ -2394,27 +2421,6 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 		goto out_delete_net;
+ 	}
+ 
+-#ifdef HAVE_ISULAD
+-	/* isulad: Run oci prestart hook at here */
+-	ret = run_oci_hooks(name, "oci-prestart", conf, lxcpath);
+-	if (ret < 0) {
+-		ERROR("Failed to run oci prestart hooks");
+-		goto out_delete_net;
+-	}
+-
+-	if (START_TIMEOUT == global_timeout_state) {
+-		lxc_write_error_message(conf->errpipe1, "Starting the container \"%s\" timeout.", name);
+-		ERROR("Starting the container \"%s\" timeout.", name);
+-		goto out_delete_net;
+-	}
+-
+-       /* Tell the child to continue its initialization. We'll get
+-        * LXC_SYNC_POST_OCI_PRESTART_HOOK when it is ready for us to run oci prestart hooks.
+-        */
+-       if (lxc_sync_barrier_child(handler, LXC_SYNC_POST_OCI_PRESTART_HOOK))
+-               goto out_delete_net;
+-#endif
+-
+ 	if (!lxc_sync_wake_child(handler, START_SYNC_FDS))
+ 		goto out_delete_net;
+ 
+@@ -2943,7 +2949,7 @@ static int clean_resource_set_env(struct lxc_handler *handler)
+ 	const char *name = handler->name;
+ 	struct lxc_conf *conf = handler->conf;
+ 	char bufstrPATH_MAX + 1;
+-	int i = 0;
++	size_t i = 0;
+ 	int j = 0;
+ 	int len = 2; //set "LXC_PID" and "LXC_CGNS_AWARE"
+ 
+@@ -3039,7 +3045,6 @@ static struct lxc_handler *lxc_init_clean_handler(char *name, char *lxcpath, str
+ 	handler->data_sock0 = handler->data_sock1 = -1;
+ 	handler->conf = conf;
+ 	handler->lxcpath = lxcpath;
+-	handler->pinfd = -1;
+ 	handler->sigfd = -EBADF;
+ 	handler->pidfd = -EBADF;
+ 	handler->init_died = false;
+@@ -3047,7 +3052,7 @@ static struct lxc_handler *lxc_init_clean_handler(char *name, char *lxcpath, str
+ 	handler->pid = pid;
+ 	handler->state_socket_pair0 = handler->state_socket_pair1 = -1;
+ 	if (handler->conf->reboot == REBOOT_NONE)
+-		lxc_list_init(&handler->conf->state_clients);
++		INIT_LIST_HEAD(&handler->conf->state_clients);
+ 
+ 	for (i = 0; i < LXC_NS_MAX; i++)
+ 		handler->nsfdi = -1;
+@@ -3091,14 +3096,13 @@ static struct lxc_handler *lxc_init_pids_handler(char *name, char *lxcpath, stru
+ 	handler->data_sock0 = handler->data_sock1 = -1;
+ 	handler->conf = conf;
+ 	handler->lxcpath = lxcpath;
+-	handler->pinfd = -1;
+ 	handler->sigfd = -EBADF;
+ 	handler->init_died = false;
+ 	handler->state_socket_pair0 = handler->state_socket_pair1 = -1;
+ 	handler->monitor_status_fd = -EBADF;
+ 	handler->pidfd = -EBADF;
+ 	if (handler->conf->reboot == REBOOT_NONE)
+-		lxc_list_init(&handler->conf->state_clients);
++		INIT_LIST_HEAD(&handler->conf->state_clients);
+ 
+ 	for (i = 0; i < LXC_NS_MAX; i++)
+ 		handler->nsfdi = -1;
+diff --git a/src/lxc/sync.c b/src/lxc/sync.c
+index 1075d98..f156809 100644
+--- a/src/lxc/sync.c
++++ b/src/lxc/sync.c
+@@ -70,6 +70,12 @@ static inline const char *start_sync_to_string(int state)
+ 		return "cgroup-limits";
+ 	case START_SYNC_IDMAPPED_MOUNTS:
+ 		return "idmapped-mounts";
++#ifdef HAVE_ISULAd
++	case START_SYNC_OCI_PRESTART_HOOK:
++		return "oci-prestart-hook";
++	case START_SYNC_POST_OCI_PRESTART_HOOK:
++		return "post-oci-prestart-hook";
++#endif
+ 	case START_SYNC_FDS:
+ 		return "fds";
+ 	case START_SYNC_READY_START:
+diff --git a/src/lxc/sync.h b/src/lxc/sync.h
+index ef03e1e..6802d32 100644
+--- a/src/lxc/sync.h
++++ b/src/lxc/sync.h
+@@ -21,12 +21,13 @@ enum /* start */ {
+ 	START_SYNC_POST_CONFIGURE	=  2,
+ 	START_SYNC_IDMAPPED_MOUNTS	=  3,
+ #ifdef HAVE_ISULAD
+-	LXC_SYNC_OCI_PRESTART_HOOK = 4,
+-	START_SYNC_CGROUP_LIMITS	=  5,
+-	START_SYNC_FDS			=  6,
+-	START_SYNC_READY_START		=  7,
+-	START_SYNC_RESTART		=  8,
+-	START_SYNC_POST_RESTART		=  9,
++	START_SYNC_OCI_PRESTART_HOOK = 4,
++	START_SYNC_POST_OCI_PRESTART_HOOK = 5,
++	START_SYNC_CGROUP_LIMITS	=  6,
++	START_SYNC_FDS			=  7,
++	START_SYNC_READY_START		=  8,
++	START_SYNC_RESTART		=  9,
++	START_SYNC_POST_RESTART		=  10,
+ #else
+ 	START_SYNC_CGROUP_LIMITS	=  4,
+ 	START_SYNC_FDS			=  5,
+diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
+index 8da00a9..de7ea4f 100644
+--- a/src/lxc/terminal.c
++++ b/src/lxc/terminal.c
+@@ -204,11 +204,11 @@ int lxc_set_terminal_winsz(struct lxc_terminal *terminal, unsigned int height, u
+ 	int ret = 0;
+ 	struct winsize wsz;
+ 
+-	if (terminal->ptmx < 0) {
++	if (terminal->ptx < 0) {
+ 		return 0;
+ 	}
+ 
+-	ret = ioctl(terminal->ptmx, TIOCGWINSZ, &wsz);
++	ret = ioctl(terminal->ptx, TIOCGWINSZ, &wsz);
+ 	if (ret < 0) {
+ 		WARN("Failed to get window size");
+ 		return -1;
+@@ -216,7 +216,7 @@ int lxc_set_terminal_winsz(struct lxc_terminal *terminal, unsigned int height, u
+ 	wsz.ws_col = width;
+ 	wsz.ws_row = height;
+ 
+-	ret = ioctl(terminal->ptmx, TIOCSWINSZ, &wsz);
++	ret = ioctl(terminal->ptx, TIOCSWINSZ, &wsz);
+ 	if (ret < 0)
+ 		WARN("Failed to set window size");
+ 	else
+@@ -299,6 +299,359 @@ static int lxc_terminal_rotate_log_file(struct lxc_terminal *terminal)
+ }
+ 
+ #ifdef HAVE_ISULAD
++/* get time buffer */
++static bool get_time_buffer(struct timespec *timestamp, char *timebuffer,
++                            size_t maxsize)
++{
++	struct tm tm_utc = { 0 };
++	int32_t nanos = 0;
++	time_t seconds;
++	size_t len = 0;
++	int ret = 0;
++
++	if (!timebuffer || !maxsize) {
++		return false;
++	}
++
++	seconds = (time_t)timestamp->tv_sec;
++	gmtime_r(&seconds, &tm_utc);
++	strftime(timebuffer, maxsize, "%Y-%m-%dT%H:%M:%S", &tm_utc);
++
++	nanos = (int32_t)timestamp->tv_nsec;
++	len = strlen(timebuffer);
++	ret = snprintf(timebuffer + len, (maxsize - len), ".%09dZ", nanos);
++	if (ret < 0 || (size_t)ret >= (maxsize - len)) {
++		return false;
++	}
++
++	return true;
++}
++
++/* get now time buffer */
++static bool get_now_time_buffer(char *timebuffer, size_t maxsize)
++{
++	int err = 0;
++	struct timespec ts;
++
++	err = clock_gettime(CLOCK_REALTIME, &ts);
++	if (err != 0) {
++		ERROR("failed to get time");
++		return false;
++	}
++
++	return get_time_buffer(&ts, timebuffer, maxsize);
++}
++
++static int isulad_lxc_terminal_rotate_write_data(struct lxc_terminal *terminal, const char *buf,
++                int bytes_read)
++{
++	int ret;
++	struct stat st;
++	int64_t space_left = -1;
++
++	if (terminal->log_fd < 0)
++		return 0;
++
++	/* A log size <= 0 means that there's no limit on the size of the log
++	 * file at which point we simply ignore whether the log is supposed to
++	 * be rotated or not.
++	 */
++	if (terminal->log_size <= 0)
++		return lxc_write_nointr(terminal->log_fd, buf, bytes_read);
++
++	/* Get current size of the log file. */
++	ret = fstat(terminal->log_fd, &st);
++	if (ret < 0) {
++		SYSERROR("Failed to stat the terminal log file descriptor");
++		return -1;
++	}
++
++	/* handle non-regular files */
++	if ((st.st_mode & S_IFMT) != S_IFREG) {
++		/* This isn't a regular file. so rotating the file seems a
++		 * dangerous thing to do, size limits are also very
++		 * questionable. Let's not risk anything and tell the user that
++		 * he's requesting us to do weird stuff.
++		 */
++		if (terminal->log_rotate > 0 || terminal->log_size > 0)
++			return -EINVAL;
++
++		/* I mean, sure log wherever you want to. */
++		return lxc_write_nointr(terminal->log_fd, buf, bytes_read);
++	}
++
++	space_left = terminal->log_size - st.st_size;
++
++	/* User doesn't want to rotate the log file and there's no more space
++	 * left so simply truncate it.
++	 */
++	if (space_left <= 0 && terminal->log_rotate <= 0) {
++		ret = lxc_terminal_truncate_log_file(terminal);
++		if (ret < 0)
++			return ret;
++
++		if ((uint64_t)bytes_read <= terminal->log_size)
++			return lxc_write_nointr(terminal->log_fd, buf, bytes_read);
++
++		/* Write as much as we can into the buffer and loose the rest. */
++		return lxc_write_nointr(terminal->log_fd, buf, terminal->log_size);
++	}
++
++	/* There's enough space left. */
++	if (bytes_read <= space_left)
++		return lxc_write_nointr(terminal->log_fd, buf, bytes_read);
++
++	/* There'd be more to write but we aren't instructed to rotate the log
++	 * file so simply return. There's no error on our side here.
++	 */
++	if (terminal->log_rotate > 0)
++		ret = lxc_terminal_rotate_log_file(terminal);
++	else
++		ret = lxc_terminal_truncate_log_file(terminal);
++	if (ret < 0)
++		return ret;
++
++	if (terminal->log_size < (uint64_t)bytes_read) {
++		/* Well, this is unfortunate because it means that there is more
++		 * to write than the user has granted us space. There are
++		 * multiple ways to handle this but let's use the simplest one:
++		 * write as much as we can, tell the user that there was more
++		 * stuff to write and move on.
++		 * Note that this scenario shouldn't actually happen with the
++		 * standard pty-based terminal that LXC allocates since it will
++		 * be switched into raw mode. In raw mode only 1 byte at a time
++		 * should be read and written.
++		 */
++		WARN("Size of terminal log file is smaller than the bytes to write");
++		ret = lxc_write_nointr(terminal->log_fd, buf, terminal->log_size);
++		if (ret < 0)
++			return -1;
++		bytes_read -= ret;
++		return bytes_read;
++	}
++
++	/* Yay, we made it. */
++	ret = lxc_write_nointr(terminal->log_fd, buf, bytes_read);
++	if (ret < 0)
++		return -1;
++	bytes_read -= ret;
++	return bytes_read;
++}
++
++static ssize_t isulad_logger_json_write(struct lxc_terminal *terminal, const char *type, const char *buf,
++                                int bytes_read)
++{
++	logger_json_file *msg = NULL;
++	ssize_t ret = -1;
++	size_t len;
++	char *json = NULL;
++	char timebuffer64 = { 0 };
++	parser_error err = NULL;
++	struct parser_context ctx = { GEN_OPTIONS_SIMPLIFY | GEN_OPTIONS_NOT_VALIDATE_UTF8, stderr };
++
++	if (bytes_read < 0 || bytes_read >= INT_MAX) {
++		return -1;
++	}
++	msg = calloc(sizeof(logger_json_file), 1);
++	if (msg == NULL) {
++		return -errno;
++	}
++	msg->log = calloc(bytes_read, 1);
++	if (!msg->log) {
++		goto cleanup;
++	}
++	memcpy(msg->log, buf, bytes_read);
++	msg->log_len = bytes_read;
++	msg->stream = type ? safe_strdup(type) : safe_strdup("stdout");
++
++	get_now_time_buffer(timebuffer, sizeof(timebuffer));
++	msg->time = safe_strdup(timebuffer);
++
++	json = logger_json_file_generate_json(msg, &ctx, &err);
++	if (!json) {
++		ERROR("Failed to generate json: %s", err);
++		goto cleanup;
++	}
++	len = strlen(json);
++	jsonlen = '\n';
++	ret = isulad_lxc_terminal_rotate_write_data(terminal, json, len + 1);
++cleanup:
++	free(json);
++	free_logger_json_file(msg);
++	free(err);
++	return ret;
++}
++
++static inline bool is_syslog(const char *driver)
++{
++	if (driver == NULL) {
++		return false;
++	}
++
++	return (strcmp("syslog", driver) == 0);
++}
++
++static ssize_t isulad_logger_syslog_write(struct lxc_terminal *terminal, const char *buf)
++{
++        syslog(LOG_INFO, "%s", buf);
++        return 0;
++}
++
++static inline ssize_t isulad_logger_write(struct lxc_terminal *terminal, const char *type, const char *buf,
++                                int bytes_read)
++{
++        if (is_syslog(terminal->log_driver)) {
++                return isulad_logger_syslog_write(terminal, buf);
++        }
++
++        return isulad_logger_json_write(terminal, type, buf, bytes_read);
++}
++
++static int isulad_lxc_terminal_write_log_file(struct lxc_terminal *terminal, const char *type, char *buf,
++                                       int bytes_read)
++{
++#define __BUF_CACHE_SIZE (16 * LXC_TERMINAL_BUFFER_SIZE)
++	static char cache__BUF_CACHE_SIZE;
++	static int size = 0;
++	int upto, index;
++	int begin = 0, buf_readed = 0,  buf_left = 0;
++	int ret;
++
++	if (buf != NULL && bytes_read > 0) {
++		/* Work out how much more data we are okay with reading this time. */
++		upto = size + bytes_read;
++		if (upto > __BUF_CACHE_SIZE) {
++			upto = __BUF_CACHE_SIZE;
++		}
++
++		if (upto > size) {
++			buf_readed = upto - size;
++			memcpy(cache + size, buf, buf_readed);
++			buf_left = bytes_read - buf_readed;
++			size += buf_readed;
++		}
++	}
++
++	// If we have no data to log, and there's no more coming, we're done.
++	if (size == 0)
++		return 0;
++
++	// Break up the data that we've buffered up into lines, and log each in turn.
++	for (index = 0; index < size; index++) {
++		if (cacheindex == '\n') {
++			ret = isulad_logger_write(terminal, type, cache + begin, index - begin + 1);
++			if (ret < 0) {
++				WARN("Failed to log msg");
++			}
++			begin = index + 1;
++		}
++	}
++	/* If there's no more coming, or the buffer is full but
++	 * has no newlines, log whatever we haven't logged yet,
++	 * noting that it's a partial log line. */
++	if (buf == NULL || (begin == 0 && size == __BUF_CACHE_SIZE)) {
++		if (begin < size) {
++			ret = isulad_logger_write(terminal, type, cache + begin, size - begin);
++			if (ret < 0) {
++				WARN("Failed to log msg");
++			}
++			begin = 0;
++			size = 0;
++		}
++		if (buf == NULL) {
++			return 0;
++		}
++	}
++	/* Move any unlogged data to the front of the buffer in preparation for another read. */
++	if (begin > 0) {
++		memcpy(cache, cache + begin, size - begin);
++		size -= begin;
++	}
++	/* Move left data to cache buffer */
++	if (buf_left > 0) {
++		memcpy(cache + size, buf + buf_readed, buf_left);
++		size += buf_left;
++	}
++	return 0;
++}
++
++/* isulad: forward data to all fifos */
++static void lxc_forward_data_to_fifo(struct lxc_list *list, bool is_err, const char *buf, int r)
++{
++	struct lxc_list *it  = NULL;
++	struct lxc_list *next = NULL;
++	struct lxc_fifos_fd *elem = NULL;
++	ssize_t w = 0;
++
++	lxc_list_for_each_safe(it, list, next) {
++		elem = it->elem;
++		if (is_err) {
++			if (elem->err_fd >= 0) {
++				w = lxc_write_nointr_for_fifo(elem->err_fd, buf, r);
++				if (w != r) {
++					WARN("Failed to write to fifo fd %d with error: %s", elem->err_fd, strerror(errno));
++				}
++			}
++		} else {
++			if (elem->out_fd >= 0) {
++				w = lxc_write_nointr_for_fifo(elem->out_fd, buf, r);
++				if (w != r) {
++					WARN("Failed to write to fifo fd %d with error: %s", elem->out_fd, strerror(errno));
++				}
++			}
++		}
++	}
++
++	return;
++}
++
++/* isulad: judge the fd whether is fifo */
++static bool lxc_terminal_is_fifo(int fd, struct lxc_list *list)
++{
++	struct lxc_list *it = NULL;
++	struct lxc_list *next = NULL;
++	struct lxc_fifos_fd *elem = NULL;
++
++	lxc_list_for_each_safe(it, list, next) {
++		elem = it->elem;
++		if (elem->in_fd == fd)
++			return true;
++	}
++
++	return false;
++}
++
++/* isulad: if fd == -1, means delete all the fifos*/
++int lxc_terminal_delete_fifo(int fd, struct lxc_list *list)
++{
++	struct lxc_list *it = NULL;
++	struct lxc_list *next = NULL;
++	struct lxc_fifos_fd *elem = NULL;
++
++	lxc_list_for_each_safe(it, list, next) {
++		elem = it->elem;
++		if (elem->in_fd == fd || -1 == fd) {
++			INFO("Delete fifo fd %d", fd);
++			lxc_list_del(it);
++			if (elem->in_fifo)
++				free(elem->in_fifo);
++			if (elem->out_fifo)
++				free(elem->out_fifo);
++			if (elem->err_fifo)
++				free(elem->err_fifo);
++			if (elem->in_fd >= 0)
++				close(elem->in_fd);
++			if (elem->out_fd >= 0)
++				close(elem->out_fd);
++			if (elem->err_fd >= 0)
++				close(elem->err_fd);
++			free(elem);
++		}
++	}
++
++	return 0;
++}
++
+ static int do_isulad_io(int fd, struct lxc_terminal *terminal)
+ {
+ 	char bufLXC_TERMINAL_BUFFER_SIZE;
+@@ -373,7 +726,6 @@ static int do_isulad_io(int fd, struct lxc_terminal *terminal)
+ static int isulad_io_handler(int fd, uint32_t events, void *data,
+ 				       struct lxc_async_descr *descr)
+ {
+-	struct lxc_terminal *terminal = data;
+ 	int ret;
+ 
+ 	ret = do_isulad_io(fd, data);
+@@ -491,7 +843,11 @@ static int lxc_terminal_write_log_file(struct lxc_terminal *terminal, char *buf,
+ }
+ #endif
+ 
++#ifdef HAVE_ISULAD
++static int lxc_terminal_ptx_io(struct lxc_terminal *terminal, int fd)
++#else
+ static int lxc_terminal_ptx_io(struct lxc_terminal *terminal)
++#endif
+ {
+ 	char bufLXC_TERMINAL_BUFFER_SIZE;
+ 	int r, w, w_log, w_rbuf;
+@@ -576,7 +932,11 @@ static int lxc_terminal_ptx_io_handler(int fd, uint32_t events, void *data,
+ 	struct lxc_terminal *terminal = data;
+ 	int ret;
+ 
++#ifdef HAVE_ISULAD
++	ret = lxc_terminal_ptx_io(data, fd);
++#else
+ 	ret = lxc_terminal_ptx_io(data);
++#endif
+ 	if (ret < 0)
+ 		return log_info(LXC_MAINLOOP_CLOSE,
+ 				"Terminal client on fd %d has exited",
+@@ -1408,7 +1768,7 @@ int lxc_terminal_add_fifos(struct lxc_conf *conf, const char *fifonames)
+ 	}
+ 
+ 	if (lxc_mainloop_add_handler(terminal->descr, fifofd_in,
+-	                             lxc_terminal_io_cb, terminal)) {
++	                             lxc_terminal_ptx_cb, default_cleanup_handler, terminal, "fifofd_in")) {
+ 		ERROR("console fifo not added to mainloop");
+ 		lxc_terminal_delete_fifo(fifofd_in, &terminal->fifos);
+ 		ret = -1;
+@@ -1599,6 +1959,7 @@ int lxc_terminal_parent(struct lxc_conf *conf)
+ 	return lxc_terminal_map_ids(conf, &conf->console);
+ }
+ 
++#ifndef HAVE_ISULAD
+ static int lxc_terminal_create_native(const char *name, const char *lxcpath,
+ 				      struct lxc_terminal *terminal)
+ {
+@@ -1627,6 +1988,7 @@ static int lxc_terminal_create_native(const char *name, const char *lxcpath,
+ 
+ 	return 0;
+ }
++#endif
+ 
+ int lxc_terminal_create(const char *name, const char *lxcpath,
+ 			struct lxc_conf *conf, struct lxc_terminal *terminal)
+@@ -1635,6 +1997,7 @@ int lxc_terminal_create(const char *name, const char *lxcpath,
+ 	if (!lxc_terminal_create_native(name, lxcpath, terminal))
+ 		return 0;
+ #else
++	int ret;
+ 	/* isulad: open default fifos */
+ 	ret = lxc_terminal_fifo_default(terminal);
+ 	if (ret < 0) {
+diff --git a/src/lxc/tools/lxc_ls.c b/src/lxc/tools/lxc_ls.c
+index 86a453d..505ed95 100644
+--- a/src/lxc/tools/lxc_ls.c
++++ b/src/lxc/tools/lxc_ls.c
+@@ -1004,7 +1004,7 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
+ }
+ 
+ #ifdef HAVE_ISULAD
+-static int ls_get_wrapper(void *wrap, int msgfd);
++static int ls_get_wrapper(void *wrap, int msgfd)
+ #else
+ static int ls_get_wrapper(void *wrap)
+ #endif
+diff --git a/src/lxc/utils.c b/src/lxc/utils.c
+index 25cb0d1..397638e 100644
+--- a/src/lxc/utils.c
++++ b/src/lxc/utils.c
+@@ -37,6 +37,9 @@
+ #include "process_utils.h"
+ #include "syscall_wrappers.h"
+ #include "utils.h"
++#ifdef HAVE_ISULAD
++#include "lsm/lsm.h"
++#endif
+ 
+ #if !HAVE_STRLCPY
+ #include "strlcpy.h"
+diff --git a/src/tests/aa.c b/src/tests/aa.c
+index 417f3fc..f766640 100644
+--- a/src/tests/aa.c
++++ b/src/tests/aa.c
+@@ -40,7 +40,11 @@ static void try_to_remove(void)
+ 	}
+ }
+ 
++#ifdef HAVE_ISULAD
++static int test_attach_write_file(void* payload, int msg_fd)
++#else
+ static int test_attach_write_file(void* payload)
++#endif
+ {
+ 	char *fnam = payload;
+ 	FILE *f;
+diff --git a/src/tests/capabilities.c b/src/tests/capabilities.c
+index 5704942..c54a051 100644
+--- a/src/tests/capabilities.c
++++ b/src/tests/capabilities.c
+@@ -41,7 +41,11 @@
+ __u32 *cap_bset_bits = NULL;
+ __u32 last_cap = 0;
+ 
++#ifdef HAVE_ISULAD
++static int capabilities_allow(void *payload, int msg_fd)
++#else
+ static int capabilities_allow(void *payload)
++#endif
+ {
+ 	for (__u32 cap = 0; cap <= last_cap; cap++) {
+ 		bool bret;
+@@ -62,7 +66,11 @@ static int capabilities_allow(void *payload)
+ 	return EXIT_SUCCESS;
+ }
+ 
++#ifdef HAVE_ISULAD
++static int capabilities_deny(void *payload, int msg_fd)
++#else
+ static int capabilities_deny(void *payload)
++#endif
+ {
+ 	for (__u32 cap = 0; cap <= last_cap; cap++) {
+ 		bool bret;
+@@ -83,7 +91,11 @@ static int capabilities_deny(void *payload)
+ 	return EXIT_SUCCESS;
+ }
+ 
++#ifdef HAVE_ISULAD
++static int run(int (*test)(void *, int), bool allow)
++#else
+ static int run(int (*test)(void *), bool allow)
++#endif
+ {
+ 	int fd_log = -EBADF, fret = -1;
+ 	lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT;
+diff --git a/src/tests/mount_injection.c b/src/tests/mount_injection.c
+index f98370b..5e852eb 100644
+--- a/src/tests/mount_injection.c
++++ b/src/tests/mount_injection.c
+@@ -70,7 +70,11 @@ static int comp_field(char *line, const char *str, int nfields)
+ 	return ret;
+ }
+ 
++#ifdef HAVE_ISULAD
++static int find_in_proc_mounts(void *data, int msg_fd)
++#else
+ static int find_in_proc_mounts(void *data)
++#endif
+ {
+ 	char bufLXC_LINELEN;
+ 	FILE *f;
+diff --git a/src/tests/proc_pid.c b/src/tests/proc_pid.c
+index 9531ec2..56bbf52 100644
+--- a/src/tests/proc_pid.c
++++ b/src/tests/proc_pid.c
+@@ -15,7 +15,11 @@
+ #define PROC_INIT_PATH "/proc/1/oom_score_adj"
+ #define PROC_SELF_PATH "/proc/self/oom_score_adj"
+ 
++#ifdef HAVE_ISULAD
++static int check_oom_score_adj(void *payload, int msg_fd)
++#else
+ static int check_oom_score_adj(void *payload)
++#endif
+ {
+ 	__do_close int fd = -EBADF;
+ 	char bufINTTYPE_TO_STRLEN(__s64);
+diff --git a/src/tests/rootfs_options.c b/src/tests/rootfs_options.c
+index 55f86ab..73b88f9 100644
+--- a/src/tests/rootfs_options.c
++++ b/src/tests/rootfs_options.c
+@@ -60,7 +60,11 @@ static int has_mount_properties(const char *path, unsigned int flags)
+ #endif
+ }
+ 
++#ifdef HAVE_ISULAD
++static int rootfs_options(void *payload, int msg_fd)
++#else
+ static int rootfs_options(void *payload)
++#endif
+ {
+ 	int ret;
+ 
+diff --git a/src/tests/sys_mixed.c b/src/tests/sys_mixed.c
+index b51f28c..8a6ae53 100644
+--- a/src/tests/sys_mixed.c
++++ b/src/tests/sys_mixed.c
+@@ -56,7 +56,11 @@ static int is_read_only(const char *path)
+ #endif
+ }
+ 
++#ifdef HAVE_ISULAD
++static int sys_mixed(void *payload, int msg_fd)
++#else
+ static int sys_mixed(void *payload)
++#endif
+ {
+ 	int ret;
+ 
+diff --git a/src/tests/sysctls.c b/src/tests/sysctls.c
+index da4538f..6a715a3 100644
+--- a/src/tests/sysctls.c
++++ b/src/tests/sysctls.c
+@@ -16,7 +16,11 @@
+ #define SYSCTL_CONFIG_KEY "lxc.sysctl.net.ipv4.ip_forward"
+ #define SYSCTL_CONFIG_VALUE "1"
+ 
++#ifdef HAVE_ISULAD
++static int check_sysctls(void *payload, int msg_fd)
++#else
+ static int check_sysctls(void *payload)
++#endif
+ {
+ 	__do_close int fd = -EBADF;
+ 	char bufINTTYPE_TO_STRLEN(__u64);
+-- 
+2.25.1
+

_service:tar_scm:0005-refactor-patch-code-of-attach-and-seccomp.patch Deleted

@@ -1,1517 +0,0 @@
-From ad33756d6190df4f1aad9b6468b0b59086e916b5 Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Tue, 19 Jul 2022 15:23:34 +0800
-Subject: PATCH refactor patch code of attach and seccomp
-
-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
----
- src/lxc/attach.c      | 517 +++++++++++++++++++++++++++++++++++++++
- src/lxc/lsm/nop.c     |  14 ++
- src/lxc/seccomp.c     | 555 ++++++++++++++++++++++++++++++++++++++++++
- src/lxc/storage/zfs.c |   9 +
- 4 files changed, 1095 insertions(+)
-
-diff --git a/src/lxc/attach.c b/src/lxc/attach.c
-index 38e16f2..8a2c52a 100644
---- a/src/lxc/attach.c
-+++ b/src/lxc/attach.c
-@@ -49,6 +49,25 @@
- #include <sys/personality.h>
- #endif
- 
-+#ifdef HAVE_ISULAD
-+#include "exec_commands.h"
-+
-+typedef enum {
-+	ATTACH_INIT,
-+	ATTACH_TIMEOUT,
-+	ATTACH_MAX,
-+} attach_timeout_t;
-+
-+static volatile attach_timeout_t g_attach_timeout_state = ATTACH_INIT;
-+
-+struct attach_timeout_conf {
-+	int64_t timeout;
-+	unsigned long long start_time;
-+	pid_t pid;
-+};
-+
-+#endif
-+
- lxc_log_define(attach, lxc);
- 
- /* Define default options if no options are supplied by the user. */
-@@ -630,6 +649,9 @@ struct attach_clone_payload {
- 	struct lxc_proc_context_info *init_ctx;
- 	lxc_attach_exec_t exec_function;
- 	void *exec_payload;
-+#ifdef HAVE_ISULAD
-+	struct lxc_terminal *terminal;
-+#endif
- };
- 
- static void lxc_put_attach_clone_payload(struct attach_clone_payload *p)
-@@ -642,6 +664,48 @@ static void lxc_put_attach_clone_payload(struct attach_clone_payload *p)
- 	}
- }
- 
-+#ifdef HAVE_ISULAD
-+static int isulad_set_attach_pipes(struct lxc_terminal *terminal)
-+{
-+	int ret = 0;
-+	if (terminal->pipes01 >= 0) {
-+		close(terminal->pipes01);
-+		terminal->pipes01 = -1;
-+	}
-+
-+	if (terminal->pipes00 >= 0) {
-+		ret = dup2(terminal->pipes00, STDIN_FILENO);
-+		if (ret < 0)
-+			goto out;
-+	}
-+
-+	if (terminal->pipes10 >= 0) {
-+		close(terminal->pipes10);
-+		terminal->pipes10 = -1;
-+	}
-+
-+	if (terminal->pipes11 >= 0) {
-+		ret = dup2(terminal->pipes11, STDOUT_FILENO);
-+		if (ret < 0)
-+			goto out;
-+	}
-+	if (terminal->pipes20 >= 0) {
-+		close(terminal->pipes20);
-+		terminal->pipes20 = -1;
-+	}
-+
-+	if (terminal->pipes21 >= 0) {
-+		ret = dup2(terminal->pipes21, STDERR_FILENO);
-+		if (ret < 0)
-+			goto out;
-+	}
-+
-+	setsid();
-+out:
-+	return ret;
-+}
-+#endif
-+
- static int attach_child_main(struct attach_clone_payload *payload)
- {
- 	int lsm_fd, ret;
-@@ -654,6 +718,31 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 	bool needs_lsm = (options->namespaces & CLONE_NEWNS) &&
- 			 (options->attach_flags & LXC_ATTACH_LSM) &&
- 			 init_ctx->lsm_label;
-+#ifdef HAVE_ISULAD
-+	int msg_fd = -1;
-+	sigset_t mask;
-+
-+	/*isulad: record errpipe fd*/
-+	msg_fd = init_ctx->container->lxc_conf->errpipe1;
-+	init_ctx->container->lxc_conf->errpipe1 = -1;
-+	/*isulad: set system umask */
-+	umask(init_ctx->container->lxc_conf->umask);
-+
-+	/*isulad: restore default signal handlers and unblock all signals*/
-+	for (int i = 1; i < NSIG; i++)
-+		signal(i, SIG_DFL);
-+
-+	ret = sigfillset(&mask);
-+	if (ret < 0) {
-+		SYSERROR("Failed to fill signal mask");
-+		goto on_error;;
-+	}
-+	ret = sigprocmask(SIG_UNBLOCK, &mask, NULL);
-+	if (ret < 0) {
-+		SYSERROR("Failed to set signal mask");
-+		goto on_error;
-+	}
-+#endif
- 
- 	/* A description of the purpose of this functionality is provided in the
- 	 * lxc-attach(1) manual page. We have to remount here and not in the
-@@ -695,6 +784,28 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 		TRACE("Dropped capabilities");
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: set workdir */
-+	if (options->initial_cwd || init_ctx->container->lxc_conf->init_cwd) {
-+		char *init_cwd;
-+		init_cwd = options->initial_cwd ? options->initial_cwd : init_ctx->container->lxc_conf->init_cwd;
-+		/* try to create workdir if not exist */
-+		struct stat st;
-+		if (stat(init_cwd, &st) < 0 && mkdir_p(init_cwd, 0750) < 0) {
-+			SYSERROR("Try to create directory \"%s\" as workdir failed when attach", init_cwd);
-+			lxc_write_error_message(msg_fd, "Try to create directory \"%s\" as workdir failed when attach: %s",
-+						init_cwd, strerror(errno));
-+			goto on_error;
-+		}
-+		if (chdir(init_cwd)) {
-+			SYSERROR("Could not change directory to \"%s\" when attach", init_cwd);
-+			lxc_write_error_message(msg_fd, "Could not change directory to \"%s\" when attach: %s",
-+						init_cwd, strerror(errno));
-+			goto on_error;
-+		}
-+	}
-+#endif
-+
- 	/* Always set the environment (specify (LXC_ATTACH_KEEP_ENV, NULL, NULL)
- 	 * if you want this to be a no-op).
- 	 */
-@@ -736,8 +847,10 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 			goto on_error;
- 	}
- 
-+#ifndef HAVE_ISULAD
- 	if (!lxc_setgroups(0, NULL) && errno != EPERM)
- 		goto on_error;
-+#endif
- 
- 	if (options->namespaces & CLONE_NEWUSER) {
- 		/* Check whether nsuid 0 has a mapping. */
-@@ -770,6 +883,13 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 	else
- 		new_gid = ns_root_gid;
- 
-+#ifdef HAVE_ISULAD
-+	// isulad: set env home in container
-+	if (lxc_setup_env_home(new_uid) < 0) {
-+		goto on_error;
-+	}
-+#endif
-+
- 	if ((init_ctx->container && init_ctx->container->lxc_conf &&
- 	     init_ctx->container->lxc_conf->no_new_privs) ||
- 	    (options->attach_flags & LXC_ATTACH_NO_NEW_PRIVS)) {
-@@ -810,10 +930,12 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 			goto on_error;
- 	}
- 
-+#ifndef HAVE_ISULAD
- 	close(payload->ipc_socket);
- 	payload->ipc_socket = -EBADF;
- 	lxc_proc_put_context_info(init_ctx);
- 	payload->init_ctx = NULL;
-+#endif
- 
- 	/* The following is done after the communication socket is shut down.
- 	 * That way, all errors that might (though unlikely) occur up until this
-@@ -856,6 +978,24 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 	}
- 
- 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-+#ifdef HAVE_ISULAD
-+		/* isulad: dup2 pipe00 to container stdin, pipe11 to container stdout, pipe21 to container stderr */
-+		if (payload->terminal->disable_pty) {
-+			ret = isulad_set_attach_pipes(payload->terminal);
-+			if (ret < 0) {
-+				SYSERROR("Failed to prepare terminal file pipes");
-+				goto on_error;
-+			}
-+		}
-+
-+		if(!payload->terminal->disable_pty && payload->terminal_pts_fd >= 0) {
-+			ret = lxc_terminal_prepare_login(payload->terminal_pts_fd);
-+			if (ret < 0) {
-+				SYSERROR("Failed to prepare terminal file descriptor %d", payload->terminal_pts_fd);
-+				goto on_error;
-+			}
-+		}
-+#else
- 		ret = lxc_terminal_prepare_login(payload->terminal_pts_fd);
- 		if (ret < 0) {
- 			SYSERROR("Failed to prepare terminal file descriptor %d", payload->terminal_pts_fd);
-@@ -863,6 +1003,7 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 		}
- 
- 		TRACE("Prepared terminal file descriptor %d", payload->terminal_pts_fd);
-+#endif
- 	}
- 
- 	/* Avoid unnecessary syscalls. */
-@@ -872,6 +1013,17 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 	if (new_gid == ns_root_gid)
- 		new_gid = LXC_INVALID_GID;
- 
-+#ifdef HAVE_ISULAD
-+	if (prctl(PR_SET_KEEPCAPS, 1) < 0) {
-+		SYSERROR("Failed to keep permitted capabilities");
-+		goto on_error;
-+	}
-+
-+	if (!lxc_setgroups(init_ctx->container->lxc_conf->init_groups_len,
-+			init_ctx->container->lxc_conf->init_groups))
-+		goto on_error;
-+#endif
-+
- 	/* Make sure that the processes STDIO is correctly owned by the user that we are switching to */
- 	ret = fix_stdio_permissions(new_uid);
- 	if (ret)
-@@ -880,21 +1032,63 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 	if (!lxc_switch_uid_gid(new_uid, new_gid))
- 		goto on_error;
- 
-+#ifdef HAVE_ISULAD
-+	if (prctl(PR_SET_KEEPCAPS, 0) < 0) {
-+		SYSERROR("Failed to clear permitted capabilities");
-+		goto on_error;
-+	}
-+
-+	if (lxc_drop_caps(init_ctx->container->lxc_conf) != 0) {
-+		ERROR("Failed to drop caps.");
-+		goto on_error;
-+	}
-+
-+	close(payload->ipc_socket);
-+	payload->ipc_socket = -EBADF;
-+	lxc_proc_put_context_info(init_ctx);
-+	payload->init_ctx = NULL;
-+	_exit(payload->exec_function(payload->exec_payload, msg_fd));
-+#else
- 	/* We're done, so we can now do whatever the user intended us to do. */
- 	_exit(payload->exec_function(payload->exec_payload));
-+#endif
- 
- on_error:
- 	lxc_put_attach_clone_payload(payload);
- 	_exit(EXIT_FAILURE);
- }
- 
-+#ifdef HAVE_ISULAD
-+static int lxc_attach_terminal(struct lxc_conf *conf,
-+			       struct lxc_terminal *terminal, lxc_attach_options_t *options)
-+#else
- static int lxc_attach_terminal(struct lxc_conf *conf,
- 			       struct lxc_terminal *terminal)
-+#endif
- {
- 	int ret;
- 
- 	lxc_terminal_init(terminal);
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: if we pass fifo in option, use them as init fifos */
-+	if (options->init_fifo0) {
-+		free(terminal->init_fifo0);
-+		terminal->init_fifo0 = safe_strdup(options->init_fifo0);
-+	}
-+	if (options->init_fifo1) {
-+		free(terminal->init_fifo1);
-+		terminal->init_fifo1 = safe_strdup(options->init_fifo1);
-+	}
-+	if (options->init_fifo2) {
-+		free(terminal->init_fifo2);
-+		terminal->init_fifo2 = safe_strdup(options->init_fifo2);
-+	}
-+
-+	terminal->disable_pty = options->disable_pty;
-+	terminal->open_stdin = options->open_stdin;
-+#endif
-+
- 	ret = lxc_terminal_create(terminal);
- 	if (ret < 0)
- 		return log_error(-1, "Failed to create terminal");
-@@ -952,9 +1146,126 @@ static inline void lxc_attach_terminal_close_log(struct lxc_terminal *terminal)
- 	close_prot_errno_disarm(terminal->log_fd);
- }
- 
-+#ifdef HAVE_ISULAD
-+/* isulad: attach timeout thread function */
-+static void* wait_attach_timeout(void *arg)
-+{
-+	struct attach_timeout_conf *conf = (struct attach_timeout_conf *)arg;
-+
-+	if (!conf || conf->timeout < 1)
-+		goto out;
-+	sleep(conf->timeout);
-+	if (lxc_process_alive(conf->pid, conf->start_time)) {
-+		g_attach_timeout_state = ATTACH_TIMEOUT;
-+		if (kill(conf->pid, SIGKILL) < 0) {
-+			ERROR("Failed to send signal %d to pid %d", SIGKILL, conf->pid);
-+		}
-+	}
-+
-+out:
-+	free(conf);
-+	return ((void *)0);
-+}
-+
-+/* isulad: create attach timeout thread */
-+static int create_attach_timeout_thread(int64_t attach_timeout, pid_t pid)
-+{
-+	int ret = 0;
-+	pthread_t ptid;
-+	pthread_attr_t attr;
-+	struct attach_timeout_conf *timeout_conf = NULL;
-+
-+	timeout_conf = malloc(sizeof(struct attach_timeout_conf));
-+	if (timeout_conf == NULL) {
-+		ERROR("Failed to malloc attach timeout conf");
-+		ret = -1;
-+		goto out;
-+	}
-+
-+	memset(timeout_conf, 0, sizeof(struct attach_timeout_conf));
-+	timeout_conf->timeout = attach_timeout;
-+	timeout_conf->pid = pid;
-+	timeout_conf->start_time = lxc_get_process_startat(pid);
-+
-+	pthread_attr_init(&attr);
-+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-+	ret = pthread_create(&ptid, &attr, wait_attach_timeout, timeout_conf);
-+	pthread_attr_destroy(&attr);
-+	if (ret != 0) {
-+		ERROR("Create attach wait timeout thread failed");
-+		free(timeout_conf);
-+		goto out;
-+	}
-+
-+out:
-+	return ret;
-+}
-+
-+static int attach_signal_handler(int fd, uint32_t events, void *data,
-+			  struct lxc_epoll_descr *descr)
-+{
-+	int ret;
-+	siginfo_t info;
-+	struct signalfd_siginfo siginfo;
-+	pid_t *pid = data;
-+
-+	ret = lxc_read_nointr(fd, &siginfo, sizeof(siginfo));
-+	if (ret < 0)
-+		return log_error(LXC_MAINLOOP_ERROR, "Failed to read signal info from signal file descriptor %d", fd);
-+
-+	if (ret != sizeof(siginfo))
-+		return log_error(LXC_MAINLOOP_ERROR, "Unexpected size for struct signalfd_siginfo");
-+
-+	/* Check whether init is running. */
-+	info.si_pid = 0;
-+	ret = waitid(P_PID, *pid, &info, WEXITED | WNOWAIT | WNOHANG);
-+	if (ret == 0 && info.si_pid == *pid) {
-+		return log_warn(LXC_MAINLOOP_CLOSE, "Container attach init process %d exited", *pid);
-+	}
-+
-+	return LXC_MAINLOOP_CONTINUE;
-+}
-+
-+static int isulad_setup_signal_fd(sigset_t *oldmask)
-+{
-+	int ret;
-+	sigset_t mask;
-+	const int signals = {SIGBUS, SIGILL, SIGSEGV, SIGWINCH, SIGTERM};
-+
-+	/* Block everything except serious error signals. */
-+	ret = sigfillset(&mask);
-+	if (ret < 0)
-+		return -EBADF;
-+
-+	for (int sig = 0; sig < (sizeof(signals) / sizeof(signals0)); sig++) {
-+		ret = sigdelset(&mask, signalssig);
-+		if (ret < 0)
-+			return -EBADF;
-+	}
-+
-+	ret = pthread_sigmask(SIG_BLOCK, &mask, oldmask);
-+	if (ret < 0)
-+		return log_error_errno(-EBADF, errno,
-+				       "Failed to set signal mask");
-+
-+	ret = signalfd(-1, &mask, SFD_CLOEXEC);
-+	if (ret < 0)
-+		return log_error_errno(-EBADF,
-+				       errno, "Failed to create signal file descriptor");
-+
-+	TRACE("Created signal file descriptor %d", ret);
-+
-+	return ret;
-+}
-+
-+int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
-+	       void *exec_payload, lxc_attach_options_t *options,
-+	       pid_t *attached_process, char **err_msg)
-+#else
- int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 	       void *exec_payload, lxc_attach_options_t *options,
- 	       pid_t *attached_process)
-+#endif
- {
- 	int i, ret, status;
- 	int ipc_sockets2;
-@@ -966,6 +1277,13 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 	struct lxc_conf *conf;
- 	char *name, *lxcpath;
- 	struct attach_clone_payload payload = {0};
-+#ifdef HAVE_ISULAD
-+	struct lxc_exec_command_handler exec_command;
-+	const char *suffix = options->suffix;
-+
-+	exec_command.maincmd_fd = -1;
-+	exec_command.terminal = &terminal;
-+#endif
- 
- 	ret = access("/proc/self/ns", X_OK);
- 	if (ret)
-@@ -1017,6 +1335,14 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 	if (!conf)
- 		return log_error_errno(-EINVAL, EINVAL, "Missing container confifg");
- 
-+#ifdef HAVE_ISULAD
-+	// always switch uid and gid for attach
-+	if (options->uid == -1)
-+		options->uid = init_ctx->container->lxc_conf->init_uid;
-+	if (options->gid == -1)
-+		options->gid = init_ctx->container->lxc_conf->init_gid;
-+#endif
-+
- 	if (!fetch_seccomp(init_ctx->container, options))
- 		WARN("Failed to get seccomp policy");
- 
-@@ -1090,7 +1416,11 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 	}
- 
- 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-+#ifdef HAVE_ISULAD
-+		ret = lxc_attach_terminal(conf, &terminal, options);
-+#else
- 		ret = lxc_attach_terminal(conf, &terminal);
-+#endif
- 		if (ret < 0) {
- 			ERROR("Failed to setup new terminal");
- 			free(cwd);
-@@ -1099,6 +1429,12 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 		}
- 
- 		terminal.log_fd = options->log_fd;
-+#ifdef HAVE_ISULAD
-+		if (suffix != NULL) {
-+			exec_command.maincmd_fd = lxc_exec_cmd_init(name, lxcpath, suffix);
-+			exec_command.terminal = &terminal;
-+		}
-+#endif
- 	} else {
- 		lxc_terminal_init(&terminal);
- 	}
-@@ -1139,10 +1475,40 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 	ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);
- 	if (ret < 0) {
- 		SYSERROR("Could not set up required IPC mechanism for attaching");
-+#ifdef HAVE_ISULAD
-+		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-+			lxc_terminal_delete(&terminal);
-+			lxc_terminal_conf_free(&terminal);
-+			if (exec_command.maincmd_fd != -1) {
-+				close(exec_command.maincmd_fd);
-+			}
-+			lxc_exec_unix_sock_delete(name, suffix);
-+		}
-+#endif
-+		free(cwd);
-+		lxc_proc_put_context_info(init_ctx);
-+		return -1;
-+	}
-+
-+#ifdef HAVE_ISULAD
-+	/* isulad: pipdfd for get error message of child or grandchild process. */
-+	if (pipe2(conf->errpipe, O_CLOEXEC) != 0) {
-+		SYSERROR("Failed to init errpipe");
-+		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-+			lxc_terminal_delete(&terminal);
-+			lxc_terminal_conf_free(&terminal);
-+			if (exec_command.maincmd_fd != -1) {
-+				close(exec_command.maincmd_fd);
-+			}
-+			lxc_exec_unix_sock_delete(name, suffix);
-+		}
-+		close(ipc_sockets0);
-+		close(ipc_sockets1);
- 		free(cwd);
- 		lxc_proc_put_context_info(init_ctx);
- 		return -1;
- 	}
-+#endif
- 
- 	/* Create intermediate subprocess, two reasons:
- 	 *       1. We can't setns() in the child itself, since we want to make
-@@ -1154,6 +1520,18 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 	pid = fork();
- 	if (pid < 0) {
- 		SYSERROR("Failed to create first subprocess");
-+#ifdef HAVE_ISULAD
-+		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-+			lxc_terminal_delete(&terminal);
-+			lxc_terminal_conf_free(&terminal);
-+			if (exec_command.maincmd_fd != -1) {
-+				close(exec_command.maincmd_fd);
-+			}
-+			lxc_exec_unix_sock_delete(name, suffix);
-+		}
-+		close(ipc_sockets0);
-+		close(ipc_sockets1);
-+#endif
- 		free(cwd);
- 		lxc_proc_put_context_info(init_ctx);
- 		return -1;
-@@ -1163,10 +1541,35 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 		int ret_parent = -1;
- 		pid_t to_cleanup_pid = pid;
- 		struct lxc_epoll_descr descr = {0};
-+#ifdef HAVE_ISULAD
-+		int isulad_sigfd;
-+		sigset_t isulad_oldmask;
-+		struct lxc_epoll_descr isulad_descr = {0};
-+#endif
- 
- 		/* close unneeded file descriptors */
- 		close(ipc_sockets1);
- 		free(cwd);
-+#ifdef HAVE_ISULAD
-+		/* isulad: close errpipe */
-+		close(conf->errpipe1);
-+		conf->errpipe1 = -1;
-+		/* isulad: close pipe after clone */
-+		if (terminal.pipes00 >= 0) {
-+			close(terminal.pipes00);
-+			terminal.pipes00 = -1;
-+		}
-+
-+		if (terminal.pipes11 >= 0) {
-+			close(terminal.pipes11);
-+			terminal.pipes11 = -1;
-+		}
-+
-+		if (terminal.pipes21 >= 0) {
-+			close(terminal.pipes21);
-+			terminal.pipes21 = -1;
-+		}
-+#endif
- 		lxc_proc_close_ns_fd(init_ctx);
- 		if (options->attach_flags & LXC_ATTACH_TERMINAL)
- 			lxc_attach_terminal_close_pts(&terminal);
-@@ -1200,7 +1603,11 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 
- 		/* Setup resource limits */
- 		if (!lxc_list_empty(&conf->limits)) {
-+#ifdef HAVE_ISULAD
-+			ret = setup_resource_limits(&conf->limits, pid, -1);
-+#else
- 			ret = setup_resource_limits(&conf->limits, pid);
-+#endif
- 			if (ret < 0)
- 				goto on_error;
- 		}
-@@ -1210,9 +1617,28 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 			if (ret < 0)
- 				goto on_error;
- 
-+#ifdef HAVE_ISULAD
-+			ret = lxc_attach_terminal_mainloop_init(&terminal, &isulad_descr);
-+			if (ret < 0)
-+				goto on_error;
-+
-+			if (suffix != NULL) {
-+				(void)lxc_exec_cmd_mainloop_add(&descr, &exec_command);
-+			}
-+#endif
- 			TRACE("Initialized terminal mainloop");
- 		}
- 
-+#ifdef HAVE_ISULAD
-+		/* The signal fd has to be created before forking otherwise if the child
-+		* process exits before we setup the signal fd, the event will be lost
-+		* and the command will be stuck.
-+		*/
-+		isulad_sigfd = isulad_setup_signal_fd(&isulad_oldmask);
-+		if (isulad_sigfd < 0)
-+			goto close_mainloop;
-+#endif
-+
- 		/* Let the child process know to go ahead. */
- 		status = 0;
- 		ret = lxc_write_nointr(ipc_sockets0, &status, sizeof(status));
-@@ -1290,6 +1716,34 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 
- 		*attached_process = attached_pid;
- 
-+#ifdef HAVE_ISULAD
-+		if (options->timeout > 0) {
-+			ret = create_attach_timeout_thread(options->timeout, *attached_process);
-+			if (ret) {
-+				ERROR("Failed to create attach timeout thread for container.");
-+				goto close_mainloop;
-+			}
-+		}
-+		/* isulad: read error msg from pipe */
-+		ssize_t size_read;
-+		char errbufBUFSIZ + 1 = {0};
-+		pid_t tmp_pid = *attached_process;
-+
-+		size_read = read(conf->errpipe0, errbuf, BUFSIZ);
-+		if (size_read > 0) {
-+			if (err_msg)
-+				*err_msg = safe_strdup(errbuf);
-+			goto close_mainloop;
-+		}
-+		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-+			ret = lxc_mainloop_add_handler(&descr, isulad_sigfd, attach_signal_handler, &tmp_pid);
-+			if (ret < 0) {
-+				ERROR("Failed to add signal handler for %d to mainloop", tmp_pid);
-+				goto close_mainloop;
-+			}
-+		}
-+#endif
-+
- 		/* Now shut down communication with child, we're done. */
- 		shutdown(ipc_sockets0, SHUT_RDWR);
- 		close(ipc_sockets0);
-@@ -1298,17 +1752,44 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 		ret_parent = 0;
- 		to_cleanup_pid = -1;
- 
-+#ifdef HAVE_ISULAD
-+		// iSulad: close stdin pipe if we do not want open_stdin with container stdin
-+		if (!terminal.open_stdin) {
-+			if (terminal.pipes01 > 0) {
-+				close(terminal.pipes01);
-+				terminal.pipes01 = -1;
-+			}
-+		}
-+#endif
- 		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-+#ifdef HAVE_ISULAD
-+			ret = isulad_safe_mainloop(&descr, -1);
-+#else
- 			ret = lxc_mainloop(&descr, -1);
-+#endif
- 			if (ret < 0) {
- 				ret_parent = -1;
- 				to_cleanup_pid = attached_pid;
- 			}
- 		}
- 
-+#ifdef HAVE_ISULAD
-+		// do lxc_mainloop to make sure we do not lose any output
-+		(void)isulad_safe_mainloop(&isulad_descr, 100);
-+		if (g_attach_timeout_state == ATTACH_TIMEOUT && err_msg != NULL && *err_msg == NULL) {
-+			*err_msg = safe_strdup("Attach exceeded timeout");
-+		}
-+#endif
- 	close_mainloop:
-+#ifdef HAVE_ISULAD
-+		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-+			lxc_mainloop_close(&isulad_descr);
-+			lxc_mainloop_close(&descr);
-+		}
-+#else
- 		if (options->attach_flags & LXC_ATTACH_TERMINAL)
- 			lxc_mainloop_close(&descr);
-+#endif
- 
- 	on_error:
- 		if (ipc_sockets0 >= 0) {
-@@ -1322,6 +1803,12 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
- 			lxc_terminal_delete(&terminal);
- 			lxc_terminal_conf_free(&terminal);
-+#ifdef HAVE_ISULAD
-+			if (exec_command.maincmd_fd != -1) {
-+				close(exec_command.maincmd_fd);
-+			}
-+			lxc_exec_unix_sock_delete(name, suffix);
-+#endif
- 		}
- 
- 		lxc_proc_put_context_info(init_ctx);
-@@ -1331,10 +1818,21 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 	/* close unneeded file descriptors */
- 	close_prot_errno_disarm(ipc_sockets0);
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: close errpipe */
-+	close(conf->errpipe0);
-+	conf->errpipe0 = -1;
-+#endif
-+
- 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
- 		lxc_attach_terminal_close_ptmx(&terminal);
- 		lxc_attach_terminal_close_peer(&terminal);
- 		lxc_attach_terminal_close_log(&terminal);
-+#ifdef HAVE_ISULAD
-+		if (exec_command.maincmd_fd != -1) {
-+			close(exec_command.maincmd_fd);
-+		}
-+#endif
- 	}
- 
- 	/* Wait for the parent to have setup cgroups. */
-@@ -1380,6 +1878,9 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 	payload.terminal_pts_fd = terminal.pts;
- 	payload.exec_function = exec_function;
- 	payload.exec_payload = exec_payload;
-+#ifdef HAVE_ISULAD
-+	payload.terminal = &terminal;
-+#endif
- 
- 	pid = lxc_raw_clone(CLONE_PARENT, NULL);
- 	if (pid < 0) {
-@@ -1390,7 +1891,11 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 	}
- 
- 	if (pid == 0) {
-+#ifdef HAVE_ISULAD
-+		if (options->attach_flags & LXC_ATTACH_TERMINAL && terminal.tty_state) {
-+#else
- 		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-+#endif
- 			ret = pthread_sigmask(SIG_SETMASK,
- 					      &terminal.tty_state->oldmask, NULL);
- 			if (ret < 0) {
-@@ -1430,7 +1935,11 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
- 	_exit(EXIT_SUCCESS);
- }
- 
-+#ifdef HAVE_ISULAD
-+int lxc_attach_run_command(void *payload, int msg_fd)
-+#else
- int lxc_attach_run_command(void *payload)
-+#endif
- {
- 	int ret = -1;
- 	lxc_attach_command_t *cmd = payload;
-@@ -1446,11 +1955,19 @@ int lxc_attach_run_command(void *payload)
- 			break;
- 		}
- 	}
-+#ifdef HAVE_ISULAD
-+	/* isulad: write error messages */
-+	lxc_write_error_message(msg_fd, "exec: \"%s\": %s.", cmd->program, strerror(errno));
-+#endif
- 
- 	return log_error_errno(ret, errno, "Failed to exec \"%s\"", cmd->program);
- }
- 
-+#ifdef HAVE_ISULAD
-+int lxc_attach_run_shell(void* payload, int msg_fd)
-+#else
- int lxc_attach_run_shell(void* payload)
-+#endif
- {
- 	__do_free char *buf = NULL;
- 	uid_t uid;
-diff --git a/src/lxc/lsm/nop.c b/src/lxc/lsm/nop.c
-index 5b345b9..188945d 100644
---- a/src/lxc/lsm/nop.c
-+++ b/src/lxc/lsm/nop.c
-@@ -24,11 +24,25 @@ static int nop_enabled(void)
- 	return 0;
- }
- 
-+#ifdef HAVE_ISULAD
-+static int nop_file_label_set(const char *path, const char *label) {
-+	return 0;
-+}
-+
-+static int nop_relabel(const char *path, const char *label, bool shared) {
-+	return 0;
-+}
-+#endif
-+
- static struct lsm_drv nop_drv = {
- 	.name = "nop",
- 	.enabled           = nop_enabled,
- 	.process_label_get = nop_process_label_get,
- 	.process_label_set = nop_process_label_set,
-+#ifdef HAVE_ISULAD
-+	.file_label_set    = nop_file_label_set,
-+	.relabel           = nop_relabel,
-+#endif
- };
- 
- struct lsm_drv *lsm_nop_drv_init(void)
-diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
-index 7820db8..a6e6d42 100644
---- a/src/lxc/seccomp.c
-+++ b/src/lxc/seccomp.c
-@@ -351,8 +351,13 @@ int get_hostarch(void)
- 	return lxc_seccomp_arch_unknown;
- }
- 
-+#ifdef HAVE_ISULAD
-+scmp_filter_ctx get_new_ctx(enum lxc_hostarch_t n_arch,
-+			    uint32_t default_policy_action, uint32_t *architectures)
-+#else
- scmp_filter_ctx get_new_ctx(enum lxc_hostarch_t n_arch,
- 			    uint32_t default_policy_action, bool *needs_merge)
-+#endif
- {
- 	int ret;
- 	uint32_t arch;
-@@ -476,9 +481,17 @@ scmp_filter_ctx get_new_ctx(enum lxc_hostarch_t n_arch,
- 		}
- 		TRACE("Removed native arch from main seccomp context");
- 
-+#ifdef HAVE_ISULAD
-+		*architectures = arch;
-+#else
- 		*needs_merge = true;
-+#endif
- 	} else {
-+#ifdef HAVE_ISULAD
-+		*architectures = SCMP_ARCH_NATIVE;
-+#else
- 		*needs_merge = false;
-+#endif
- 		TRACE("Arch %d already present in main seccomp context", (int)n_arch);
- 	}
- 
-@@ -510,7 +523,11 @@ bool do_resolve_add_rule(uint32_t arch, char *line, scmp_filter_ctx ctx,
- 		if (ret < 0) {
- 			errno = -ret;
- 			SYSERROR("Failed loading rule to reject force umount");
-+#ifdef HAVE_ISULAD
-+			return true;
-+#else
- 			return false;
-+#endif
- 		}
- 
- 		INFO("Set seccomp rule to reject force umounts");
-@@ -519,24 +536,42 @@ bool do_resolve_add_rule(uint32_t arch, char *line, scmp_filter_ctx ctx,
- 
- 	nr = seccomp_syscall_resolve_name(line);
- 	if (nr == __NR_SCMP_ERROR) {
-+#ifdef HAVE_ISULAD
-+		DEBUG("Failed to resolve syscall \"%s\"", line);
-+		DEBUG("This syscall will NOT be handled by seccomp");
-+#else
- 		WARN("Failed to resolve syscall \"%s\"", line);
- 		WARN("This syscall will NOT be handled by seccomp");
-+#endif
- 		return true;
- 	}
- 
- 	if (nr < 0) {
-+#ifdef HAVE_ISULAD
-+		DEBUG("Got negative return value %d for syscall \"%s\"", nr, line);
-+		DEBUG("This syscall will NOT be handled by seccomp");
-+#else
- 		WARN("Got negative return value %d for syscall \"%s\"", nr, line);
- 		WARN("This syscall will NOT be handled by seccomp");
-+#endif
- 		return true;
- 	}
- 
- 	memset(&arg_cmp, 0, sizeof(arg_cmp));
- 	for (i = 0; i < rule->args_num; i++) {
-+#ifdef HAVE_ISULAD
-+		DEBUG("arg_cmp%d: SCMP_CMP(%u, %llu, %llu, %llu)", i,
-+		     rule->args_valuei.index,
-+		     (long long unsigned int)rule->args_valuei.op,
-+		     (long long unsigned int)rule->args_valuei.mask,
-+		     (long long unsigned int)rule->args_valuei.value);
-+#else
- 		INFO("arg_cmp%d: SCMP_CMP(%u, %llu, %llu, %llu)", i,
- 		     rule->args_valuei.index,
- 		     (long long unsigned int)rule->args_valuei.op,
- 		     (long long unsigned int)rule->args_valuei.mask,
- 		     (long long unsigned int)rule->args_valuei.value);
-+#endif
- 
- 		if (SCMP_CMP_MASKED_EQ == rule->args_valuei.op)
- 			arg_cmpi = SCMP_CMP(rule->args_valuei.index,
-@@ -553,14 +588,43 @@ bool do_resolve_add_rule(uint32_t arch, char *line, scmp_filter_ctx ctx,
- 					   rule->args_num, arg_cmp);
- 	if (ret < 0) {
- 		errno = -ret;
-+#ifdef HAVE_ISULAD
-+		DEBUG("Failed loading rule for %s (nr %d action %d (%s))",
-+		      line, nr, rule->action, get_action_name(rule->action));
-+		return true;
-+#else
- 		SYSERROR("Failed loading rule for %s (nr %d action %d (%s))",
- 		         line, nr, rule->action, get_action_name(rule->action));
- 		return false;
-+#endif
- 	}
- 
- 	return true;
- }
- 
-+#ifdef HAVE_ISULAD
-+#define SCMP_ARCH_INDEX_MAX 3
-+
-+struct scmp_ctx_info {
-+	uint32_t architecturesSCMP_ARCH_INDEX_MAX;
-+	enum lxc_hostarch_t lxc_archSCMP_ARCH_INDEX_MAX;
-+	scmp_filter_ctx contextsSCMP_ARCH_INDEX_MAX;
-+	bool needs_mergeSCMP_ARCH_INDEX_MAX;
-+};
-+
-+static int get_arch_index(enum lxc_hostarch_t arch, struct scmp_ctx_info *ctx)
-+{
-+	int i;
-+
-+	for (i = 0; i < SCMP_ARCH_INDEX_MAX; i++) {
-+		if (ctx->lxc_archi == arch)
-+			return i;
-+	}
-+
-+	return -1;
-+}
-+#endif
-+
- /*
-  * v2 consists of
-  * x86
-@@ -575,6 +639,494 @@ bool do_resolve_add_rule(uint32_t arch, char *line, scmp_filter_ctx ctx,
-  * write
-  * close
-  */
-+#ifdef HAVE_ISULAD
-+static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_conf *conf)
-+{
-+	int ret;
-+	char *p;
-+	enum lxc_hostarch_t cur_rule_arch, native_arch;
-+	bool blacklist = false;
-+	uint32_t default_policy_action = -1, default_rule_action = -1;
-+	struct seccomp_v2_rule rule;
-+	struct scmp_ctx_info ctx;
-+
-+	if (strncmp(line, "blacklist", 9) == 0)
-+		blacklist = true;
-+	else if (strncmp(line, "whitelist", 9) != 0) {
-+		ERROR("Bad seccomp policy style \"%s\"", line);
-+		return -1;
-+	}
-+
-+	p = strchr(line, ' ');
-+	if (p) {
-+		default_policy_action = get_v2_default_action(p + 1);
-+		if (default_policy_action == -2)
-+			return -1;
-+	}
-+
-+	/* for blacklist, allow any syscall which has no rule */
-+	if (blacklist) {
-+		if (default_policy_action == -1)
-+			default_policy_action = SCMP_ACT_ALLOW;
-+
-+		if (default_rule_action == -1)
-+			default_rule_action = SCMP_ACT_KILL;
-+	} else {
-+		if (default_policy_action == -1)
-+			default_policy_action = SCMP_ACT_KILL;
-+
-+		if (default_rule_action == -1)
-+			default_rule_action = SCMP_ACT_ALLOW;
-+	}
-+
-+	memset(&ctx, 0, sizeof(ctx));
-+	ctx.architectures0 = SCMP_ARCH_NATIVE;
-+	ctx.architectures1 = SCMP_ARCH_NATIVE;
-+	ctx.architectures2 = SCMP_ARCH_NATIVE;
-+	native_arch = get_hostarch();
-+	cur_rule_arch = native_arch;
-+	if (native_arch == lxc_seccomp_arch_amd64) {
-+		cur_rule_arch = lxc_seccomp_arch_all;
-+
-+		ctx.lxc_arch0 = lxc_seccomp_arch_i386;
-+		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_i386,
-+					      default_policy_action, &ctx.architectures0);
-+		if (!ctx.contexts0)
-+			goto bad;
-+
-+		ctx.lxc_arch1 = lxc_seccomp_arch_x32;
-+		ctx.contexts1 = get_new_ctx(lxc_seccomp_arch_x32,
-+					      default_policy_action, &ctx.architectures1);
-+		if (!ctx.contexts1)
-+			goto bad;
-+
-+		ctx.lxc_arch2 = lxc_seccomp_arch_amd64;
-+		ctx.contexts2 = get_new_ctx(lxc_seccomp_arch_amd64,
-+					      default_policy_action, &ctx.architectures2);
-+		if (!ctx.contexts2)
-+			goto bad;
-+#ifdef SCMP_ARCH_PPC
-+	} else if (native_arch == lxc_seccomp_arch_ppc64) {
-+		cur_rule_arch = lxc_seccomp_arch_all;
-+
-+		ctx.lxc_arch0 = lxc_seccomp_arch_ppc;
-+		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_ppc,
-+					      default_policy_action, &ctx.architectures0);
-+		if (!ctx.contexts0)
-+			goto bad;
-+
-+		ctx.lxc_arch1 = lxc_seccomp_arch_ppc64;
-+		ctx.contexts1 = get_new_ctx(lxc_seccomp_arch_ppc64,
-+					      default_policy_action, &ctx.architectures1);
-+		if (!ctx.contexts1)
-+			goto bad;
-+#endif
-+#ifdef SCMP_ARCH_ARM
-+	} else if (native_arch == lxc_seccomp_arch_arm64) {
-+		cur_rule_arch = lxc_seccomp_arch_all;
-+
-+		ctx.lxc_arch0 = lxc_seccomp_arch_arm;
-+		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_arm,
-+					      default_policy_action, &ctx.architectures0);
-+		if (!ctx.contexts0)
-+			goto bad;
-+
-+#ifdef SCMP_ARCH_AARCH64
-+		ctx.lxc_arch1 = lxc_seccomp_arch_arm64;
-+		ctx.contexts1 = get_new_ctx(lxc_seccomp_arch_arm64,
-+					      default_policy_action, &ctx.architectures1);
-+		if (!ctx.contexts1)
-+			goto bad;
-+#endif
-+#endif
-+#ifdef SCMP_ARCH_MIPS
-+	} else if (native_arch == lxc_seccomp_arch_mips64) {
-+		cur_rule_arch = lxc_seccomp_arch_all;
-+
-+		ctx.lxc_arch0 = lxc_seccomp_arch_mips;
-+		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_mips,
-+					      default_policy_action, &ctx.architectures0);
-+		if (!ctx.contexts0)
-+			goto bad;
-+
-+		ctx.lxc_arch1 = lxc_seccomp_arch_mips64n32;
-+		ctx.contexts1 = get_new_ctx(lxc_seccomp_arch_mips64n32,
-+					      default_policy_action, &ctx.architectures1);
-+		if (!ctx.contexts1)
-+			goto bad;
-+
-+		ctx.lxc_arch2 = lxc_seccomp_arch_mips64;
-+		ctx.contexts2 = get_new_ctx(lxc_seccomp_arch_mips64,
-+					      default_policy_action, &ctx.architectures2);
-+		if (!ctx.contexts2)
-+			goto bad;
-+	} else if (native_arch == lxc_seccomp_arch_mipsel64) {
-+		cur_rule_arch = lxc_seccomp_arch_all;
-+		ctx.lxc_arch0 = lxc_seccomp_arch_mipsel;
-+		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_mipsel,
-+					      default_policy_action, &ctx.architectures0);
-+		if (!ctx.contexts0)
-+			goto bad;
-+
-+		ctx.lxc_arch1 = lxc_seccomp_arch_mipsel64n32;
-+		ctx.contexts1 = get_new_ctx(lxc_seccomp_arch_mipsel64n32,
-+					      default_policy_action, &ctx.architectures1);
-+		if (!ctx.contexts1)
-+			goto bad;
-+
-+		ctx.lxc_arch2 = lxc_seccomp_arch_mipsel64;
-+		ctx.contexts2 = get_new_ctx(lxc_seccomp_arch_mipsel64,
-+					      default_policy_action, &ctx.architectures2);
-+		if (!ctx.contexts2)
-+			goto bad;
-+#endif
-+	}
-+
-+	if (default_policy_action != SCMP_ACT_KILL) {
-+		ret = seccomp_reset(conf->seccomp.seccomp_ctx, default_policy_action);
-+		if (ret != 0) {
-+			ERROR("Error re-initializing Seccomp");
-+			return -1;
-+		}
-+
-+		ret = seccomp_attr_set(conf->seccomp.seccomp_ctx, SCMP_FLTATR_CTL_NNP, 0);
-+		if (ret < 0) {
-+			errno = -ret;
-+			SYSERROR("Failed to turn off no-new-privs");
-+			return -1;
-+		}
-+
-+#ifdef SCMP_FLTATR_ATL_TSKIP
-+		ret = seccomp_attr_set(conf->seccomp.seccomp_ctx, SCMP_FLTATR_ATL_TSKIP, 1);
-+		if (ret < 0) {
-+			errno = -ret;
-+			SYSWARN("Failed to turn on seccomp nop-skip, continuing");
-+		}
-+#endif
-+	}
-+
-+	while (getline(&line, line_bufsz, f) != -1) {
-+		if (line0 == '#')
-+			continue;
-+
-+		if (line0 == '\0')
-+			continue;
-+
-+		remove_trailing_newlines(line);
-+
-+		DEBUG("Processing \"%s\"", line);
-+
-+		if (line0 == '') {
-+			/* Read the architecture for next set of rules. */
-+			if (strcmp(line, "x86") == 0 ||
-+			    strcmp(line, "X86") == 0) {
-+				if (native_arch != lxc_seccomp_arch_i386 &&
-+				    native_arch != lxc_seccomp_arch_amd64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_i386;
-+			} else if (strcmp(line, "x32") == 0 ||
-+				   strcmp(line, "X32") == 0) {
-+				if (native_arch != lxc_seccomp_arch_amd64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_x32;
-+			} else if (strcmp(line, "X86_64") == 0 ||
-+				   strcmp(line, "x86_64") == 0) {
-+				if (native_arch != lxc_seccomp_arch_amd64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_amd64;
-+			} else if (strcmp(line, "all") == 0 ||
-+				   strcmp(line, "ALL") == 0) {
-+				cur_rule_arch = lxc_seccomp_arch_all;
-+			}
-+#ifdef SCMP_ARCH_ARM
-+			else if (strcmp(line, "arm") == 0 ||
-+				 strcmp(line, "ARM") == 0) {
-+				if (native_arch != lxc_seccomp_arch_arm &&
-+				    native_arch != lxc_seccomp_arch_arm64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_arm;
-+			}
-+#endif
-+#ifdef SCMP_ARCH_AARCH64
-+			else if (strcmp(line, "arm64") == 0 ||
-+				 strcmp(line, "ARM64") == 0) {
-+				if (native_arch != lxc_seccomp_arch_arm64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_arm64;
-+			}
-+#endif
-+#ifdef SCMP_ARCH_PPC64LE
-+			else if (strcmp(line, "ppc64le") == 0 ||
-+				 strcmp(line, "PPC64LE") == 0) {
-+				if (native_arch != lxc_seccomp_arch_ppc64le) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_ppc64le;
-+			}
-+#endif
-+#ifdef SCMP_ARCH_PPC64
-+			else if (strcmp(line, "ppc64") == 0 ||
-+				 strcmp(line, "PPC64") == 0) {
-+				if (native_arch != lxc_seccomp_arch_ppc64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_ppc64;
-+			}
-+#endif
-+#ifdef SCMP_ARCH_PPC
-+			else if (strcmp(line, "ppc") == 0 ||
-+				 strcmp(line, "PPC") == 0) {
-+				if (native_arch != lxc_seccomp_arch_ppc &&
-+				    native_arch != lxc_seccomp_arch_ppc64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_ppc;
-+			}
-+#endif
-+#ifdef SCMP_ARCH_MIPS
-+			else if (strcmp(line, "mips64") == 0 ||
-+				 strcmp(line, "MIPS64") == 0) {
-+				if (native_arch != lxc_seccomp_arch_mips64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_mips64;
-+			} else if (strcmp(line, "mips64n32") == 0 ||
-+				   strcmp(line, "MIPS64N32") == 0) {
-+				if (native_arch != lxc_seccomp_arch_mips64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_mips64n32;
-+			} else if (strcmp(line, "mips") == 0 ||
-+				   strcmp(line, "MIPS") == 0) {
-+				if (native_arch != lxc_seccomp_arch_mips &&
-+				    native_arch != lxc_seccomp_arch_mips64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_mips;
-+			} else if (strcmp(line, "mipsel64") == 0 ||
-+				   strcmp(line, "MIPSEL64") == 0) {
-+				if (native_arch != lxc_seccomp_arch_mipsel64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_mipsel64;
-+			} else if (strcmp(line, "mipsel64n32") == 0 ||
-+				   strcmp(line, "MIPSEL64N32") == 0) {
-+				if (native_arch != lxc_seccomp_arch_mipsel64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_mipsel64n32;
-+			} else if (strcmp(line, "mipsel") == 0 ||
-+				   strcmp(line, "MIPSEL") == 0) {
-+				if (native_arch != lxc_seccomp_arch_mipsel &&
-+				    native_arch != lxc_seccomp_arch_mipsel64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_mipsel;
-+			}
-+#endif
-+#ifdef SCMP_ARCH_S390X
-+			else if (strcmp(line, "s390x") == 0 ||
-+				 strcmp(line, "S390X") == 0) {
-+				if (native_arch != lxc_seccomp_arch_s390x) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_s390x;
-+			}
-+#endif
-+			else {
-+				goto bad_arch;
-+			}
-+
-+			continue;
-+		}
-+
-+		/* irrelevant arch - i.e. arm on i386 */
-+		if (cur_rule_arch == lxc_seccomp_arch_unknown)
-+			continue;
-+
-+		memset(&rule, 0, sizeof(rule));
-+		/* read optional action which follows the syscall */
-+		ret = parse_v2_rules(line, default_rule_action, &rule);
-+		if (ret != 0) {
-+			ERROR("Failed to interpret seccomp rule");
-+			goto bad_rule;
-+		}
-+
-+		if (cur_rule_arch == native_arch) {
-+			/* add for native arch */
-+			if (!do_resolve_add_rule(SCMP_ARCH_NATIVE, line,
-+						 conf->seccomp.seccomp_ctx, &rule))
-+				goto bad_rule;
-+
-+			DEBUG("Added native rule for arch %d for %s action %d(%s)",
-+			     SCMP_ARCH_NATIVE, line, rule.action,
-+			     get_action_name(rule.action));
-+		} else if (cur_rule_arch != lxc_seccomp_arch_all) {
-+			/* add for compat specified arch */
-+			int arch_index = get_arch_index(cur_rule_arch, &ctx);
-+			if (arch_index < 0)
-+				goto bad_arch;
-+
-+			if (!do_resolve_add_rule(ctx.architecturesarch_index, line,
-+						 ctx.contextsarch_index, &rule))
-+				goto bad_rule;
-+
-+			DEBUG("Added compat rule for arch %d for %s action %d(%s)",
-+			     ctx.architecturesarch_index, line, rule.action,
-+			     get_action_name(rule.action));
-+			ctx.needs_mergearch_index = true;
-+		} else {
-+			/* add for all compat archs */
-+			if (!do_resolve_add_rule(SCMP_ARCH_NATIVE, line,
-+						 conf->seccomp.seccomp_ctx, &rule))
-+				goto bad_rule;
-+
-+			DEBUG("Added native rule for arch %d for %s action %d(%s)",
-+			     SCMP_ARCH_NATIVE, line, rule.action,
-+			     get_action_name(rule.action));
-+
-+			if (ctx.architectures0 != SCMP_ARCH_NATIVE) {
-+				if (!do_resolve_add_rule(ctx.architectures0, line,
-+							 ctx.contexts0, &rule))
-+					goto bad_rule;
-+
-+				DEBUG("Added compat rule for arch %d for %s action %d(%s)",
-+				     ctx.architectures0, line, rule.action,
-+				     get_action_name(rule.action));
-+				ctx.needs_merge0 = true;
-+			}
-+
-+			if (ctx.architectures1 != SCMP_ARCH_NATIVE) {
-+				if (!do_resolve_add_rule(ctx.architectures1, line,
-+							 ctx.contexts1, &rule))
-+					goto bad_rule;
-+
-+				DEBUG("Added compat rule for arch %d for %s action %d(%s)",
-+				     ctx.architectures1, line, rule.action,
-+				     get_action_name(rule.action));
-+				ctx.needs_merge1 = true;
-+			}
-+
-+			if (ctx.architectures2 != SCMP_ARCH_NATIVE) {
-+				if (!do_resolve_add_rule(ctx.architectures2, line,
-+							ctx.contexts2, &rule))
-+					goto bad_rule;
-+
-+				DEBUG("Added native rule for arch %d for %s action %d(%s)",
-+				     ctx.architectures2, line, rule.action,
-+				     get_action_name(rule.action));
-+				ctx.needs_merge2 = true;
-+			}
-+		}
-+
-+	}
-+
-+	INFO("Merging compat seccomp contexts into main context");
-+	if (ctx.contexts0) {
-+		if (ctx.needs_merge0) {
-+			ret = seccomp_merge(conf->seccomp.seccomp_ctx, ctx.contexts0);
-+			if (ret < 0) {
-+				ERROR("%s - Failed to merge first compat seccomp "
-+				      "context into main context", strerror(-ret));
-+				goto bad;
-+			}
-+
-+			TRACE("Merged first compat seccomp context into main context");
-+		} else {
-+			seccomp_release(ctx.contexts0);
-+			ctx.contexts0 = NULL;
-+		}
-+	}
-+
-+	if (ctx.contexts1) {
-+		if (ctx.needs_merge1) {
-+			ret = seccomp_merge(conf->seccomp.seccomp_ctx, ctx.contexts1);
-+			if (ret < 0) {
-+				ERROR("%s - Failed to merge second compat seccomp "
-+				      "context into main context", strerror(-ret));
-+				goto bad;
-+			}
-+
-+			TRACE("Merged second compat seccomp context into main context");
-+		} else {
-+			seccomp_release(ctx.contexts1);
-+			ctx.contexts1 = NULL;
-+		}
-+	}
-+
-+	if (ctx.contexts2) {
-+		if (ctx.needs_merge2) {
-+			ret = seccomp_merge(conf->seccomp.seccomp_ctx, ctx.contexts2);
-+			if (ret < 0) {
-+				ERROR("%s - Failed to merge third compat seccomp "
-+				      "context into main context", strerror(-ret));
-+				goto bad;
-+			}
-+
-+			TRACE("Merged third compat seccomp context into main context");
-+		} else {
-+			seccomp_release(ctx.contexts2);
-+			ctx.contexts2 = NULL;
-+		}
-+	}
-+
-+	free(line);
-+	return 0;
-+
-+bad_arch:
-+	ERROR("Unsupported architecture \"%s\"", line);
-+
-+bad_rule:
-+bad:
-+	if (ctx.contexts0)
-+		seccomp_release(ctx.contexts0);
-+
-+	if (ctx.contexts1)
-+		seccomp_release(ctx.contexts1);
-+
-+	if (ctx.contexts2)
-+		seccomp_release(ctx.contexts2);
-+
-+	free(line);
-+
-+	return -1;
-+}
-+#else
- static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_conf *conf)
- {
- 	int ret;
-@@ -1067,6 +1619,7 @@ bad:
- 
- 	return -1;
- }
-+#endif
- #else /* HAVE_DECL_SECCOMP_SYSCALL_RESOLVE_NAME_ARCH */
- static int parse_config_v2(FILE *f, char *line, struct lxc_conf *conf)
- {
-@@ -1288,6 +1841,7 @@ void lxc_seccomp_free(struct lxc_seccomp *seccomp)
- 	seccomp_notify_free(seccomp->notifier.req_buf, seccomp->notifier.rsp_buf);
- 	seccomp->notifier.req_buf = NULL;
- 	seccomp->notifier.rsp_buf = NULL;
-+	free_disarm(seccomp->notifier.cookie);
- #endif
- }
- 
-@@ -1498,6 +2052,7 @@ void seccomp_conf_init(struct lxc_conf *conf)
- 	       sizeof(conf->seccomp.notifier.proxy_addr));
- 	conf->seccomp.notifier.req_buf = NULL;
- 	conf->seccomp.notifier.rsp_buf = NULL;
-+	conf->seccomp.notifier.cookie = NULL;
- #endif
- }
- 
-diff --git a/src/lxc/storage/zfs.c b/src/lxc/storage/zfs.c
-index ee9e32d..903937a 100644
---- a/src/lxc/storage/zfs.c
-+++ b/src/lxc/storage/zfs.c
-@@ -167,13 +167,22 @@ int zfs_mount(struct lxc_storage *bdev)
- 	const char *src;
- 	char cmd_outputPATH_MAX = {0};
- 
-+#ifdef HAVE_ISULAD
-+	unsigned long pflags = 0;
-+#endif
-+
- 	if (strcmp(bdev->type, "zfs"))
- 		return -22;
- 
- 	if (!bdev->src || !bdev->dest)
- 		return -22;
- 
-+#ifdef HAVE_ISULAD
-+	ret = parse_mntopts(bdev->mntopts, &mntflags, &pflags, &mntdata);
-+#else
- 	ret = parse_mntopts(bdev->mntopts, &mntflags, &mntdata);
-+#endif
-+
- 	if (ret < 0) {
- 		ERROR("Failed to parse mount options");
- 		return -22;
--- 
-2.25.1
-

_service:tar_scm:0006-fix-run-container-failed-by-isulad.patch Deleted

@@ -1,86 +0,0 @@
-From e7fc0b635c8f964bd139aae47d9debb77c39cc3f Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Tue, 1 Aug 2023 14:59:16 +0800
-Subject: PATCH fix run container failed by isulad
-
-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
----
- src/lxc/confile.c | 34 ++++++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 12 deletions(-)
-
-diff --git a/src/lxc/confile.c b/src/lxc/confile.c
-index 0d0d66c..ae1a264 100644
---- a/src/lxc/confile.c
-+++ b/src/lxc/confile.c
-@@ -287,16 +287,18 @@ static struct lxc_config_t config_jump_table = {
- 	{ "lxc.sysctl",                     false, set_config_sysctl,                     get_config_sysctl,                     clr_config_sysctl,                     },
- 	{ "lxc.proc",                       false, set_config_proc,                       get_config_proc,                       clr_config_proc,                       },
- #ifdef HAVE_ISULAD
--	{ "lxc.isulad.init.args",          	true,	set_config_init_args,                   get_config_init_args,                   clr_config_init_args,                 },
--	{ "lxc.isulad.populate.device",    	true,	set_config_populate_device,             get_config_populate_device,             clr_config_populate_device,           },
--	{ "lxc.isulad.umask",              	true,	set_config_umask,                       get_config_umask,                       clr_config_umask,                     },
--	{ "lxc.isulad.rootfs.maskedpaths", 	true,	set_config_rootfs_masked_paths,         get_config_rootfs_masked_paths,         clr_config_rootfs_masked_paths,       },
--	{ "lxc.isulad.rootfs.ropaths",     	true,	set_config_rootfs_ro_paths,             get_config_rootfs_ro_paths,             clr_config_rootfs_ro_paths,           },
--	{ "lxc.isulad.systemd",            	true,	set_config_systemd,                     get_config_systemd,                     clr_config_systemd,                   },
--	{ "lxc.console.logdriver",         	true,	set_config_console_log_driver,          get_config_console_log_driver,          clr_config_console_log_driver,        },
--	{ "lxc.console.syslog_tag",        	true,	set_config_console_syslog_tag,          get_config_console_syslog_tag,          clr_config_console_syslog_tag,        },
--	{ "lxc.console.syslog_facility",   	true,	set_config_console_syslog_facility,     get_config_console_syslog_facility,     clr_config_console_syslog_facility,   },
--	{ "lxc.selinux.mount_context",     	true,	set_config_selinux_mount_context,       get_config_selinux_mount_context,       clr_config_selinux_mount_context,     },
-+	{ "lxc.isulad.init.args",          	true,	set_config_init_args,                   get_config_init_args,                   clr_config_init_args,       		},
-+	{ "lxc.isulad.populate.device",    	true,	set_config_populate_device,             get_config_populate_device,             clr_config_populate_device,  		},
-+	{ "lxc.isulad.umask",              	true,	set_config_umask,                       get_config_umask,                       clr_config_umask,           		},
-+	{ "lxc.isulad.rootfs.maskedpaths", 	true,	set_config_rootfs_masked_paths,         get_config_rootfs_masked_paths,         clr_config_rootfs_masked_paths, 	},
-+	{ "lxc.isulad.rootfs.ropaths",     	true,	set_config_rootfs_ro_paths,             get_config_rootfs_ro_paths,             clr_config_rootfs_ro_paths,   		},
-+	{ "lxc.isulad.systemd",            	true,	set_config_systemd,                     get_config_systemd,                     clr_config_systemd,           		},
-+	{ "lxc.console.logdriver",         	true,	set_config_console_log_driver,          get_config_console_log_driver,          clr_config_console_log_driver, 		},
-+	{ "lxc.console.syslog_tag",        	true,	set_config_console_syslog_tag,          get_config_console_syslog_tag,          clr_config_console_syslog_tag,   	},
-+	{ "lxc.console.syslog_facility",   	true,	set_config_console_syslog_facility,     get_config_console_syslog_facility,     clr_config_console_syslog_facility,	},
-+	{ "lxc.selinux.mount_context",     	true,	set_config_selinux_mount_context,       get_config_selinux_mount_context,       clr_config_selinux_mount_context,	},
-+	// same to lxc.init.groups
-+	{ "lxc.isulad.init.groups",         true,  	set_config_init_groups,          		get_config_init_groups,          		clr_config_init_groups,      		},
- #endif
- };
- 
-@@ -1343,7 +1345,11 @@ static int set_config_init_groups(const char *key, const char *value,
- 	if (!value_dup)
- 		return -ENOMEM;
- 
-+#ifdef HAVE_ISULAD
-+	lxc_iterate_parts(token, value_dup, " \t")
-+#else
- 	lxc_iterate_parts(token, value_dup, ",")
-+#endif
- 		num_groups++;
- 
- 	if (num_groups == INT_MAX)
-@@ -1368,7 +1374,11 @@ static int set_config_init_groups(const char *key, const char *value,
- 	/* Restore duplicated value so we can call lxc_iterate_parts() again. */
- 	strcpy(value_dup, value);
- 
-+#ifdef HAVE_ISULAD
-+	lxc_iterate_parts(token, value_dup, " \t") {
-+#else
- 	lxc_iterate_parts(token, value_dup, ",") {
-+#endif
- 		int ret;
- 
- 		gid_t group;
-@@ -2000,13 +2010,13 @@ static int set_config_cgroup_dir(const char *key, const char *value,
- 
- 	if (lxc_config_value_empty(value))
- 		return clr_config_cgroup_dir(key, lxc_conf, NULL);
--
-+#ifndef HAVE_ISULAD
- 	if (abspath(value))
- 		return syserror_set(-EINVAL, "%s paths may not be absolute", key);
- 
- 	if (dotdot(value))
- 		return syserror_set(-EINVAL, "%s paths may not walk upwards via \"../\"", key);
--
-+#endif
- 	return set_config_path_item(&lxc_conf->cgroup_meta.dir, value);
- }
- 
--- 
-2.25.1
-

_service:tar_scm:0006-refactor-patch-about-namespace-log-terminal.patch Deleted

@@ -1,1164 +0,0 @@
-From 2b4dbd3fc30be08459b8ab34f84935e37ceb34ec Mon Sep 17 00:00:00 2001
-From: "Neil.wrz" <wangrunze13@huawei.com>
-Date: Tue, 19 Jul 2022 04:02:57 -0700
-Subject: PATCH refactor patch about namespace log terminal
-
-Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
----
- configure.ac                    | 30 ++++++++++-
- src/lxc/Makefile.am             | 44 ++++++++++++++-
- src/lxc/af_unix.c               | 89 ++++++++++++++++++++++++++++++
- src/lxc/commands_utils.c        | 57 ++++++++++++++++++++
- src/lxc/exec_commands.h         | 77 ++++++++++++++++++++++++++
- src/lxc/file_utils.h            |  4 ++
- src/lxc/json/read-file.c        | 95 +++++++++++++++++++++++++++++++++
- src/lxc/log.c                   | 56 +++++++++++++++++++
- src/lxc/path.h                  | 65 ++++++++++++++++++++++
- src/lxc/start.h                 | 30 +++++++++++
- src/lxc/storage/block.c         | 86 +++++++++++++++++++++++++++++
- src/lxc/storage/block.h         | 41 ++++++++++++++
- src/lxc/storage/storage_utils.c | 60 +++++++++++++++++++++
- src/lxc/terminal.h              | 35 ++++++++++++
- 14 files changed, 766 insertions(+), 3 deletions(-)
- create mode 100644 src/lxc/exec_commands.h
- create mode 100644 src/lxc/json/read-file.c
- create mode 100644 src/lxc/path.h
- create mode 100644 src/lxc/storage/block.c
- create mode 100644 src/lxc/storage/block.h
-
-diff --git a/configure.ac b/configure.ac
-index 059d57d..ce8854e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,6 +43,7 @@ AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects)
- AC_CANONICAL_HOST
- AM_PROG_CC_C_O
- AC_USE_SYSTEM_EXTENSIONS
-+CFLAGS=`echo "${CFLAGS#\-g}"`
- 
- # Test if we have a new enough compiler.
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
-@@ -119,6 +120,9 @@ AM_CONDITIONAL(DISTRO_UBUNTU, test "x$with_distro" = "xubuntu")
- 
- AC_CONFIG_LINKS(config/etc/default.conf:config/etc/${distroconf})
- 
-+# Check yajl
-+PKG_CHECK_MODULES(YAJL, yajl >= 2,,AC_MSG_ERROR(You must install yajl >= 2))
-+
- # Check for init system type
- AC_MSG_CHECKING(for init system type)
- AC_ARG_WITH(init-script,
-@@ -187,6 +191,11 @@ AC_ARG_ENABLE(werror,
- 	AS_HELP_STRING(--disable-werror, do not treat warnings as errors),
- 	enable_werror=$enableval, enable_werror=yes)
- 
-+AC_ARG_ENABLE(debug,
-+	AC_HELP_STRING(--enable-debug,
-+	set -g into cflags default=no),
-+	, enable_debug=no)
-+
- # Allow disabling rpath
- AC_ARG_ENABLE(rpath,
- 	AS_HELP_STRING(--enable-rpath, set rpath in executables default=no),
-@@ -756,6 +765,7 @@ AX_CHECK_COMPILE_FLAG(-Wnested-externs, CFLAGS="$CFLAGS -Wnested-externs",,
- AX_CHECK_COMPILE_FLAG(-fasynchronous-unwind-tables, CFLAGS="$CFLAGS -fasynchronous-unwind-tables",,-Werror)
- AX_CHECK_COMPILE_FLAG(-pipe, CFLAGS="$CFLAGS -pipe",,-Werror)
- AX_CHECK_COMPILE_FLAG(-fexceptions, CFLAGS="$CFLAGS -fexceptions",,-Werror)
-+AX_CHECK_COMPILE_FLAG(-g, CFLAGS="$CFLAGS -g",,-Werror)
- AX_CHECK_COMPILE_FLAG(-Warray-bounds, CFLAGS="$CFLAGS -Warray-bounds",,-Werror)
- AX_CHECK_COMPILE_FLAG(-Wrestrict, CFLAGS="$CFLAGS -Wrestrict",,-Werror)
- AX_CHECK_COMPILE_FLAG(-Wreturn-local-addr, CFLAGS="$CFLAGS -Wreturn-local-addr",,-Werror)
-@@ -763,12 +773,18 @@ AX_CHECK_COMPILE_FLAG(-Wstringop-overflow, CFLAGS="$CFLAGS -Wstringop-overflo
- 
- AX_CHECK_LINK_FLAG(-z relro, LDFLAGS="$LDFLAGS -z relro",,)
- AX_CHECK_LINK_FLAG(-z now, LDFLAGS="$LDFLAGS -z now",,)
-+AX_CHECK_LINK_FLAG(-z noexecstack, LDFLAGS="$LDFLAGS -z noexecstack",,)
- 
--CFLAGS="$CFLAGS -Wvla -std=gnu11 -fms-extensions"
-+CFLAGS="$CFLAGS -Wvla -std=gnu11 -D_FORTIFY_SOURCE=2 -Wall -fPIC -fPIE"
-+LDFLAGS="$LDFLAGS -pie"
- if test "x$enable_werror" = "xyes"; then
- 	CFLAGS="$CFLAGS -Werror"
- fi
- 
-+if test "x$enable_debug" = "xyes"; then
-+    CFLAGS="$CFLAGS -g"
-+fi
-+
- AC_ARG_ENABLE(thread-safety,
- 	AS_HELP_STRING(--enable-thread-safety, enforce thread-safety otherwise fail the build default=yes),
- 	enable_thread_safety=$enableval, enable_thread_safety=yes)
-@@ -815,6 +831,18 @@ else
- 	AC_MSG_RESULT(no)
- fi
- 
-+AC_MSG_CHECKING(Whether adapt to iSulad)
-+AC_ARG_ENABLE(isulad,
-+	AC_HELP_STRING(--enable-isulad, enable adapt to iSulad default=yes),
-+	adapt_isulad=$enableval, adapt_isulad=yes)
-+AM_CONDITIONAL(HAVE_ISULAD, test "x$adapt_isulad" = "xyes")
-+if test "x$adapt_isulad" = "xyes"; then
-+	AC_DEFINE(HAVE_ISULAD, 1, adapt to iSulad)
-+	AC_MSG_RESULT(yes)
-+else
-+	AC_MSG_RESULT(no)
-+fi
-+
- # Files requiring some variable expansion
- AC_CONFIG_FILES(
- 	Makefile
-diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
-index d1e2364..b9a8750 100644
---- a/src/lxc/Makefile.am
-+++ b/src/lxc/Makefile.am
-@@ -52,6 +52,16 @@ noinst_HEADERS = api_extensions.h \
- 		 utils.h \
- 		 uuid.h
- 
-+if HAVE_ISULAD
-+noinst_HEADERS += isulad_utils.h path.h \
-+				  json/json_common.h json/defs.h \
-+				  json/oci_runtime_hooks.h \
-+				  json/logger_json_file.h \
-+				  json/oci_runtime_spec.h \
-+				  json/read-file.h \
-+				  exec_commands.h
-+endif
-+
- if IS_BIONIC
- noinst_HEADERS += ../include/fexecve.h \
- 		  ../include/lxcmntent.h \
-@@ -97,7 +107,6 @@ liblxc_la_SOURCES = af_unix.c af_unix.h \
- 		    api_extensions.h \
- 		    attach.c attach.h \
- 		    caps.c caps.h \
--		    cgroups/cgfsng.c \
- 		    cgroups/cgroup.c cgroups/cgroup.h \
- 		    cgroups/cgroup2_devices.c cgroups/cgroup2_devices.h \
- 		    cgroups/cgroup_utils.c cgroups/cgroup_utils.h \
-@@ -154,6 +163,22 @@ liblxc_la_SOURCES = af_unix.c af_unix.h \
- 		    version.h \
- 		    $(LSM_SOURCES)
- 
-+if HAVE_ISULAD
-+liblxc_la_SOURCES += isulad_utils.c isulad_utils.h \
-+			storage/block.c storage/block.h \
-+			path.c path.h \
-+			json/json_common.c json/json_common.h \
-+			json/defs.h json/defs.c \
-+			json/oci_runtime_hooks.c json/oci_runtime_hooks.h \
-+			json/logger_json_file.c json/logger_json_file.h \
-+			json/oci_runtime_spec.c json/oci_runtime_spec.h \
-+			json/read-file.c json/read-file.h \
-+			cgroups/isulad_cgfsng.c \
-+			exec_commands.c exec_commands.h
-+else
-+liblxc_la_SOURCES += cgroups/cgfsng.c
-+endif
-+
- if IS_BIONIC
- liblxc_la_SOURCES += ../include/fexecve.c ../include/fexecve.h \
- 		     ../include/lxcmntent.c ../include/lxcmntent.h \
-@@ -212,6 +237,10 @@ AM_CFLAGS = -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
- 	    -I $(top_srcdir)/src/lxc/storage \
- 	    -I $(top_srcdir)/src/lxc/cgroups
- 
-+if HAVE_ISULAD
-+AM_CFLAGS += -I $(top_srcdir)/src/lxc/json
-+AM_CFLAGS += -DHAVE_ISULAD
-+endif
- if ENABLE_APPARMOR
- AM_CFLAGS += -DHAVE_APPARMOR
- endif
-@@ -249,6 +278,10 @@ liblxc_la_CFLAGS += -fsanitize=address \
- 		    -fno-omit-frame-pointer
- endif
- 
-+if HAVE_ISULAD
-+liblxc_la_CFLAGS += -D_FORTIFY_SOURCE=2 -Wall
-+endif
-+
- if ENABLE_UBSAN
- liblxc_la_CFLAGS += -fsanitize=undefined
- endif
-@@ -258,6 +291,12 @@ liblxc_la_LDFLAGS = -pthread \
- 		    -Wl,-soname,liblxc.so.$(firstword $(subst ., ,@LXC_ABI@)) \
- 		    -version-info @LXC_ABI_MAJOR@
- 
-+if HAVE_ISULAD
-+liblxc_la_LDFLAGS += @YAJL_LIBS@ -Wl,-z,relro \
-+		    -Wl,-z,now \
-+		    -Wl,-z,noexecstack
-+endif
-+
- liblxc_la_LIBADD = $(CAP_LIBS) \
- 		   $(OPENSSL_LIBS) \
- 		   $(SELINUX_LIBS) \
-@@ -321,7 +360,8 @@ LDADD = liblxc.la \
- 	@OPENSSL_LIBS@ \
- 	@SECCOMP_LIBS@ \
- 	@SELINUX_LIBS@ \
--	@DLOG_LIBS@
-+	@DLOG_LIBS@ \
-+	@YAJL_LIBS@
- 
- if ENABLE_TOOLS
- lxc_attach_SOURCES = tools/lxc_attach.c \
-diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
-index 5cf5491..cb4233e 100644
---- a/src/lxc/af_unix.c
-+++ b/src/lxc/af_unix.c
-@@ -167,8 +167,13 @@ int lxc_unix_send_fds(int fd, int *sendfds, int num_sendfds, void *data,
- 	return lxc_abstract_unix_send_fds(fd, sendfds, num_sendfds, data, size);
- }
- 
-+#ifdef HAVE_ISULAD
-+static int lxc_abstract_unix_recv_fds_iov(int fd, int *recvfds, int num_recvfds,
-+			          struct iovec *iov, size_t iovlen, unsigned int timeout)
-+#else 
- static int lxc_abstract_unix_recv_fds_iov(int fd, int *recvfds, int num_recvfds,
- 					  struct iovec *iov, size_t iovlen)
-+#endif 
- {
- 	__do_free char *cmsgbuf = NULL;
- 	int ret;
-@@ -188,6 +193,22 @@ static int lxc_abstract_unix_recv_fds_iov(int fd, int *recvfds, int num_recvfds,
- 	msg.msg_iov = iov;
- 	msg.msg_iovlen = iovlen;
- 
-+#ifdef HAVE_ISULAD
-+	struct timeval out;
-+	if (timeout > 0) {
-+		memset(&out, 0, sizeof(out));
-+		out.tv_sec = timeout / 1000000;
-+		out.tv_usec = timeout % 1000000;
-+		ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO,
-+		                 (const void *)&out, sizeof(out));
-+		if (ret < 0) {
-+			ERROR("Failed to set %u timeout on containter "
-+			      "state socket", timeout);
-+			return ret;
-+		}
-+	}
-+#endif
-+
- 	do {
- 		ret = recvmsg(fd, &msg, MSG_CMSG_CLOEXEC);
- 	} while (ret < 0 && errno == EINTR);
-@@ -220,8 +241,25 @@ int lxc_abstract_unix_recv_fds(int fd, int *recvfds, int num_recvfds,
- 		.iov_base = data ? data : buf,
- 		.iov_len = data ? size : sizeof(buf),
- 	};
-+#ifdef HAVE_ISULAD
-+	return lxc_abstract_unix_recv_fds_iov(fd, recvfds, num_recvfds, &iov, 1, 0);
-+#else
- 	return lxc_abstract_unix_recv_fds_iov(fd, recvfds, num_recvfds, &iov, 1);
-+#endif 
-+}
-+
-+#ifdef HAVE_ISULAD
-+int lxc_abstract_unix_recv_fds_timeout(int fd, int *recvfds, int num_recvfds,
-+                                       void *data, size_t size, unsigned int timeout)
-+{
-+	char buf1 = {0};
-+	struct iovec iov = {
-+		.iov_base = data ? data : buf,
-+		.iov_len = data ? size : sizeof(buf),
-+	};
-+	return lxc_abstract_unix_recv_fds_iov(fd, recvfds, num_recvfds, &iov, 1, timeout);
- }
-+#endif
- 
- int lxc_abstract_unix_send_credential(int fd, void *data, size_t size)
- {
-@@ -343,12 +381,63 @@ int lxc_unix_connect_type(struct sockaddr_un *addr, int type)
- 	ret = connect(fd, (struct sockaddr *)addr,
- 		      offsetof(struct sockaddr_un, sun_path) + len);
- 	if (ret < 0)
-+#ifdef HAVE_ISULAD
-+		return log_error_errno(-1, errno,
-+				       "Failed to connect new AF_UNIX socket");
-+#else
- 		return log_error_errno(-1, errno,
- 				       "Failed to bind new AF_UNIX socket");
-+#endif
- 
- 	return move_fd(fd);
- }
- 
-+#ifdef HAVE_ISULAD
-+int lxc_named_unix_open(const char *path, int type, int flags)
-+{
-+	__do_close int fd = -EBADF;
-+	int ret;
-+	ssize_t len;
-+	struct sockaddr_un addr;
-+
-+	fd = socket(PF_UNIX, type | SOCK_CLOEXEC, 0);
-+	if (fd < 0)
-+		return -1;
-+
-+	if (!path)
-+		return move_fd(fd);
-+
-+	len = lxc_unix_sockaddr(&addr, path);
-+	if (len < 0)
-+		return -1;
-+
-+	ret = bind(fd, (struct sockaddr *)&addr, len);
-+	if (ret < 0)
-+		return -1;
-+
-+	if (chmod(path, 0600) < 0)
-+		return -1;
-+
-+	if (type == SOCK_STREAM) {
-+		ret = listen(fd, 100);
-+		if (ret < 0)
-+			return -1;
-+	}
-+
-+	return move_fd(fd);
-+}
-+
-+int lxc_named_unix_connect(const char *path)
-+{
-+	struct sockaddr_un addr;
-+
-+	if (lxc_unix_sockaddr(&addr, path) < 0)
-+		return -1;
-+
-+	return lxc_unix_connect_type(&addr, SOCK_STREAM);
-+}
-+#endif
-+
- int lxc_unix_connect(struct sockaddr_un *addr, int type)
- {
- 	return lxc_unix_connect_type(addr, SOCK_STREAM);
-diff --git a/src/lxc/commands_utils.c b/src/lxc/commands_utils.c
-index 2af722c..9de9a84 100644
---- a/src/lxc/commands_utils.c
-+++ b/src/lxc/commands_utils.c
-@@ -140,12 +140,69 @@ int lxc_make_abstract_socket_name(char *path, size_t pathlen,
- 	return 0;
- }
- 
-+#ifdef HAVE_ISULAD
-+char *generate_named_unix_sock_dir(const char *name)
-+{
-+	__do_free char *exec_sock_dir = NULL;
-+	__do_free char *rundir = NULL;
-+
-+	rundir = get_rundir();
-+	if (!rundir)
-+		rundir = strdup("/var/run");
-+
-+	if (asprintf(&exec_sock_dir, "%s/lxc/%s", rundir, name) < 0) {
-+		return log_error_errno(NULL, errno, "Failed to allocate memory");
-+	}
-+
-+	return move_ptr(exec_sock_dir);
-+}
-+
-+int generate_named_unix_sock_path(const char *container_name, const char *sock_name,
-+				char *out_path, size_t len)
-+{
-+#define MAX_SOCK_NAME_LENGTH 12
-+	int ret;
-+	__do_free char *sock_dir = NULL;
-+	__do_free char *short_sock_name = NULL;
-+
-+	if (container_name == NULL || sock_name == NULL)
-+		return -1;
-+
-+	sock_dir = generate_named_unix_sock_dir(container_name);
-+	if (sock_dir == NULL)
-+		return -1;
-+
-+	short_sock_name = strdup(sock_name);
-+	if (strlen(short_sock_name) > MAX_SOCK_NAME_LENGTH)
-+		short_sock_nameMAX_SOCK_NAME_LENGTH = '\0';
-+
-+	ret = snprintf(out_path, len, "%s/%s.sock", sock_dir, short_sock_name);
-+	if (ret < 0 || (size_t)ret >= len)
-+		return log_error_errno(-1, errno, "Failed to allocate memory");
-+
-+	return 0;
-+}
-+#endif
-+
- int lxc_cmd_connect(const char *name, const char *lxcpath,
- 		    const char *hashed_sock_name, const char *suffix)
- {
- 	int ret, client_fd;
- 	char pathLXC_AUDS_ADDR_LEN = {0};
- 
-+#ifdef HAVE_ISULAD
-+	if (generate_named_unix_sock_path(name, suffix, path, sizeof(path)) != 0)
-+		return -1;
-+
-+	if (file_exists(path)) {
-+		client_fd = lxc_named_unix_connect(path);
-+		if (client_fd < 0)
-+			return -1;
-+
-+		return client_fd;
-+	}
-+#endif
-+
- 	ret = lxc_make_abstract_socket_name(path, sizeof(path), name, lxcpath,
- 					    hashed_sock_name, suffix);
- 	if (ret < 0)
-diff --git a/src/lxc/exec_commands.h b/src/lxc/exec_commands.h
-new file mode 100644
-index 0000000..3ec2a22
---- /dev/null
-+++ b/src/lxc/exec_commands.h
-@@ -0,0 +1,77 @@
-+/******************************************************************************
-+ * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved.
-+ * Author: lifeng
-+ * Create: 2019-12-08
-+ * Description: provide container definition
-+ * lxc: linux Container library
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+  ******************************************************************************/
-+
-+#ifndef __LXC_EXEC_COMMANDS_H
-+#define __LXC_EXEC_COMMANDS_H
-+
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+#include "lxccontainer.h"
-+#include "macro.h"
-+#include "state.h"
-+#include "terminal.h"
-+
-+struct lxc_exec_command_handler {
-+	int maincmd_fd;
-+	struct lxc_terminal *terminal;
-+};
-+
-+typedef enum {
-+	LXC_EXEC_CMD_SET_TERMINAL_WINCH,
-+	LXC_EXEC_CMD_MAX,
-+} lxc_exec_cmd_t;
-+
-+struct lxc_exec_cmd_req {
-+	lxc_exec_cmd_t cmd;
-+	int datalen;
-+	const void *data;
-+};
-+
-+struct lxc_exec_cmd_rsp {
-+	int ret; /* 0 on success, -errno on failure */
-+	int datalen;
-+	void *data;
-+};
-+
-+struct lxc_exec_cmd_rr {
-+	struct lxc_exec_cmd_req req;
-+	struct lxc_exec_cmd_rsp rsp;
-+};
-+
-+struct lxc_exec_cmd_set_terminal_winch_request {
-+	unsigned int height;
-+	unsigned int width;
-+};
-+
-+struct lxc_epoll_descr;
-+struct lxc_handler;
-+
-+extern int lxc_exec_cmd_init(const char *name, const char *lxcpath, const char *suffix);
-+extern int lxc_exec_cmd_mainloop_add(struct lxc_epoll_descr *descr, struct lxc_exec_command_handler *handler);
-+extern int lxc_exec_cmd_set_terminal_winch(const char *name, const char *lxcpath, const char *suffix, unsigned int height, unsigned int width);
-+
-+#ifdef HAVE_ISULAD
-+extern int lxc_exec_unix_sock_delete(const char *name, const char *suffix);
-+#endif
-+
-+#endif /* __exec_commands_h */
-diff --git a/src/lxc/file_utils.h b/src/lxc/file_utils.h
-index f9c8abe..37cd79e 100644
---- a/src/lxc/file_utils.h
-+++ b/src/lxc/file_utils.h
-@@ -83,4 +83,8 @@ extern FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer)
- extern FILE *fopen_cached(const char *path, const char *mode,
- 			  void **caller_freed_buffer);
- 
-+#ifdef HAVE_ISULAD
-+extern ssize_t lxc_write_nointr_for_fifo(int fd, const char *buf, size_t count);
-+#endif
-+
- #endif /* __LXC_FILE_UTILS_H */
-diff --git a/src/lxc/json/read-file.c b/src/lxc/json/read-file.c
-new file mode 100644
-index 0000000..34ebeed
---- /dev/null
-+++ b/src/lxc/json/read-file.c
-@@ -0,0 +1,95 @@
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+
-+#include <config.h>
-+#include "read-file.h"
-+
-+#ifndef O_CLOEXEC
-+#define O_CLOEXEC 02000000
-+#endif
-+
-+char *fread_file(FILE *stream, size_t *length)
-+{
-+	char *buf = NULL, *tmpbuf = NULL;
-+	size_t off = 0;
-+
-+	while (1) {
-+		size_t ret, newsize;
-+
-+		newsize = off + BUFSIZ + 1;
-+		tmpbuf = (char *)calloc(1, newsize);
-+		if (tmpbuf == NULL) {
-+			goto out;
-+		}
-+
-+		if (buf) {
-+			memcpy(tmpbuf, buf, off);
-+
-+			memset(buf, 0, off);
-+
-+			free(buf);
-+		}
-+
-+		buf = tmpbuf;
-+		ret = fread(buf + off, 1, BUFSIZ, stream);
-+		if (!ret && ferror(stream)) {
-+			tmpbuf = NULL;
-+			goto out;
-+		}
-+		if (ret < BUFSIZ || feof(stream)) {
-+			*length = off + ret + 1;
-+			buf*length - 1 = '\0';
-+			return buf;
-+		}
-+		off += BUFSIZ;
-+	}
-+out:
-+	if (buf) {
-+		free(buf);
-+	}
-+	if (tmpbuf) {
-+		free(tmpbuf);
-+	}
-+	return NULL;
-+
-+}
-+
-+char *read_file(const char *path, size_t *length)
-+{
-+	char *buf = NULL;
-+	char rpathPATH_MAX + 1 = {0};
-+	int fd = -1;
-+	int tmperrno;
-+	FILE *fp = NULL;
-+
-+	if (!path || !length) {
-+		return NULL;
-+	}
-+
-+	if (strlen(path) > PATH_MAX || NULL == realpath(path, rpath)) {
-+		return NULL;
-+	}
-+
-+	fd = open(rpath, O_RDONLY | O_CLOEXEC);
-+	if (fd < 0) {
-+		return NULL;
-+	}
-+
-+	fp = fdopen(fd, "r");
-+	tmperrno = errno;
-+	if (!fp) {
-+		close(fd);
-+		errno = tmperrno;
-+		return NULL;
-+	}
-+
-+	buf = fread_file(fp, length);
-+	fclose(fp);
-+	return buf;
-+}
-diff --git a/src/lxc/log.c b/src/lxc/log.c
-index 59644aa..e643f26 100644
---- a/src/lxc/log.c
-+++ b/src/lxc/log.c
-@@ -55,6 +55,38 @@ static char *log_vmname = NULL;
- 
- lxc_log_define(log, lxc);
- 
-+#ifdef HAVE_ISULAD
-+static inline const char *isulad_get_fifo_path(const char *file)
-+{
-+#define ISULAD_FIFO_PREFIX "fifo:"
-+
-+	if (strncmp(file, ISULAD_FIFO_PREFIX, strlen(ISULAD_FIFO_PREFIX)) == 0) {
-+		return (file + strlen(ISULAD_FIFO_PREFIX));
-+	}
-+	return NULL;
-+}
-+
-+static int isulad_open_fifo(const char *file_path)
-+{
-+#define LOG_FIFO_SIZE (1024 * 1024)
-+	int fd;
-+
-+	fd = lxc_unpriv(open(file_path, O_RDWR | O_NONBLOCK | O_CLOEXEC));
-+	if (fd == -1) {
-+		fprintf(stderr, "Open fifo %s failed: %s\n", file_path, strerror(errno));
-+		return -1;
-+	}
-+
-+	if (fcntl(fd, F_SETPIPE_SZ, LOG_FIFO_SIZE) == -1) {
-+		printf("Set fifo buffer size failed: %s", strerror(errno));
-+		close(fd);
-+		return -1;
-+	}
-+
-+	return fd;
-+}
-+#endif
-+
- static int lxc_log_priority_to_syslog(int priority)
- {
- 	switch (priority) {
-@@ -321,6 +353,12 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
- #endif
- 
- 	log_container_name = lxc_log_get_container_name();
-+#ifdef HAVE_ISULAD
-+	/* use isulad log format */
-+	if (log_container_name != NULL && strlen(log_container_name) > 15) {
-+		log_container_name = log_container_name + (strlen(log_container_name) - 15);
-+	}
-+#endif
- 
- 	if (fd_to_use < 0)
- 		fd_to_use = lxc_log_fd;
-@@ -333,9 +371,13 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
- 		return ret;
- 
- 	n = snprintf(buffer, sizeof(buffer),
-+#ifdef HAVE_ISULAD
-+			 "%15s %s %-8s %s - %s:%s:%d -",
-+#else
- 		     "%s%s%s %s %-8s %s - %s:%s:%d - ",
- 		     log_prefix,
- 		     log_container_name ? " " : "",
-+#endif
- 		     log_container_name ? log_container_name : "",
- 		     date_time,
- 		     lxc_log_priority_to_string(event->priority),
-@@ -589,6 +631,13 @@ static int __lxc_log_set_file(const char *fname, int create_dirs)
- 		return ret_errno(EINVAL);
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	fname = isulad_get_fifo_path(fname);
-+	if (fname == NULL) {
-+		return ret_errno(EINVAL);
-+	}
-+#endif
-+
- #if USE_CONFIGPATH_LOGS
- 	/* We don't build_dir for the default if the default is i.e.
- 	 * /var/lib/lxc/$container/$container.log.
-@@ -598,7 +647,11 @@ static int __lxc_log_set_file(const char *fname, int create_dirs)
- 	if (build_dir(fname))
- 		return log_error_errno(-errno, errno, "Failed to create dir for log file \"%s\"", fname);
- 
-+#ifdef HAVE_ISULAD
-+	lxc_log_fd = isulad_open_fifo(fname);
-+#else
- 	lxc_log_fd = log_open(fname);
-+#endif
- 	if (lxc_log_fd < 0)
- 		return lxc_log_fd;
- 
-@@ -694,6 +747,9 @@ int lxc_log_init(struct lxc_log *log)
- 
- 	if (lxc_log_fd >= 0) {
- 		lxc_log_category_lxc.appender = &log_appender_logfile;
-+#ifdef HAVE_ISULAD
-+	if (!lxc_quiet_specified && !log->quiet)
-+#endif
- 		lxc_log_category_lxc.appender->next = &log_appender_stderr;
- 	}
- 
-diff --git a/src/lxc/path.h b/src/lxc/path.h
-new file mode 100644
-index 0000000..2c60fb9
---- /dev/null
-+++ b/src/lxc/path.h
-@@ -0,0 +1,65 @@
-+/* SPDX-License-Identifier: LGPL-2.1+ */
-+/******************************************************************************
-+ * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved
-+ * Description: isulad utils
-+ * Author: lifeng
-+ * Create: 2020-04-11
-+******************************************************************************/
-+#ifndef __ISULAD_PATH_H_
-+#define __ISULAD_PATH_H_
-+
-+#include <stdbool.h>
-+
-+bool specify_current_dir(const char *path);
-+
-+bool has_traling_path_separator(const char *path);
-+
-+// PreserveTrailingDotOrSeparator returns the given cleaned path
-+// and appends a trailing `/.` or `/` if its corresponding  original
-+// path ends with a trailing `/.` or `/`. If the cleaned
-+// path already ends in a `.` path segment, then another is not added. If the
-+// clean path already ends in a path separator, then another is not added.
-+char *preserve_trailing_dot_or_separator(const char *cleanedpath,
-+                const char *originalpath);
-+
-+
-+// Split splits path immediately following the final Separator,
-+// separating it into a directory and file name component.
-+// If there is no Separator in path, Split returns an empty dir
-+// and file set to path.
-+// The returned values have the property that path = dir+file.
-+bool filepath_split(const char *path, char **dir, char **base);
-+
-+/*
-+ * cleanpath is similar to realpath of glibc, but not expands symbolic links,
-+ * and not check the existence of components of the path.
-+ */
-+char *cleanpath(const char *path, char *realpath, size_t realpath_len);
-+
-+
-+// FollowSymlinkInScope is a wrapper around evalSymlinksInScope that returns an
-+// absolute path. This function handles paths in a platform-agnostic manner.
-+char *follow_symlink_in_scope(const char *fullpath, const char *rootpath);
-+
-+// GetResourcePath evaluates `path` in the scope of the container's rootpath, with proper path
-+// sanitisation. Symlinks are all scoped to the rootpath of the container, as
-+// though the container's rootpath was `/`.
-+//
-+// The BaseFS of a container is the host-facing path which is bind-mounted as
-+// `/` inside the container. This method is essentially used to access a
-+// particular path inside the container as though you were a process in that
-+// container.
-+int get_resource_path(const char *rootpath, const char *path,
-+                      char **scopepath);
-+
-+// Rel returns a relative path that is lexically equivalent to targpath when
-+// joined to basepath with an intervening separator. That is,
-+// Join(basepath, Rel(basepath, targpath)) is equivalent to targpath itself.
-+// On success, the returned path will always be relative to basepath,
-+// even if basepath and targpath share no elements.
-+// An error is returned if targpath can't be made relative to basepath or if
-+// knowing the current working directory would be necessary to compute it.
-+// Rel calls Clean on the result.
-+char *path_relative(const char *basepath, const char *targpath);
-+
-+#endif
-diff --git a/src/lxc/start.h b/src/lxc/start.h
-index ece4aac..c7a0a55 100644
---- a/src/lxc/start.h
-+++ b/src/lxc/start.h
-@@ -124,8 +124,17 @@ struct lxc_handler {
- 
- 	struct cgroup_ops *cgroup_ops;
- 
-+#ifdef HAVE_ISULAD
-+	int exit_code;/* isulad: record the exit code of container */
-+	/* Indicates whether should we using pipes or pty dup to std{in,out,err} for console log. */
-+	bool disable_pty;
-+	/* Indicates whether should we keep stdin active. */
-+	bool open_stdin;
-+	bool image_type_oci;
-+#else
- 	/* Internal fds that always need to stay open. */
- 	int keep_fds3;
-+#endif
- };
- 
- struct execute_args {
-@@ -136,7 +145,11 @@ struct execute_args {
- };
- 
- struct lxc_operations {
-+#ifdef HAVE_ISULAD
-+	int (*start)(struct lxc_handler *, void *, int);
-+#else
- 	int (*start)(struct lxc_handler *, void *);
-+#endif
- 	int (*post_start)(struct lxc_handler *, void *);
- };
- 
-@@ -164,14 +177,31 @@ extern void lxc_end(struct lxc_handler *handler);
-  */
- extern int lxc_check_inherited(struct lxc_conf *conf, bool closeall,
- 			       int *fds_to_ignore, size_t len_fds);
-+#ifndef HAVE_ISULAD
- static inline int inherit_fds(struct lxc_handler *handler, bool closeall)
- {
- 	return lxc_check_inherited(handler->conf, closeall, handler->keep_fds,
- 				   ARRAY_SIZE(handler->keep_fds));
- }
-+#endif
-+
-+#ifdef HAVE_ISULAD
-+extern int __lxc_start(struct lxc_handler *handler,
-+		struct lxc_operations* ops, void *data, const char *lxcpath,
-+		bool daemonize, int *error_num, unsigned int start_timeout);
-+#else
- extern int __lxc_start(struct lxc_handler *, struct lxc_operations *, void *,
- 		       const char *, bool, int *);
- 
-+#endif
- extern int resolve_clone_flags(struct lxc_handler *handler);
- 
-+#ifdef HAVE_ISULAD
-+/*isulad: do_lxcapi_clean_resource */
-+extern int do_lxcapi_clean_resource(char *name, char *lxcpath, struct lxc_conf *conf, pid_t pid);
-+
-+/*isulad: do_lxcapi_get_pids */
-+extern int do_lxcapi_get_pids(char *name, char *lxcpath, struct lxc_conf *conf, pid_t **pids,size_t *pids_len);
-+#endif
-+
- #endif
-diff --git a/src/lxc/storage/block.c b/src/lxc/storage/block.c
-new file mode 100644
-index 0000000..eb75e70
---- /dev/null
-+++ b/src/lxc/storage/block.c
-@@ -0,0 +1,86 @@
-+/*
-+ * lxc: linux Container library
-+ *
-+ * (C) Copyright IBM Corp. 2007, 2008
-+ *
-+ * Authors:
-+ * Daniel Lezcano <daniel.lezcano at free.fr>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE 1
-+#endif
-+#include <stdint.h>
-+#include <string.h>
-+
-+#include "config.h"
-+#include "log.h"
-+#include "storage.h"
-+#include "storage_utils.h"
-+#include "utils.h"
-+
-+lxc_log_define(blk, lxc);
-+
-+int blk_destroy(struct lxc_storage *orig)
-+{
-+	return 0;
-+}
-+
-+bool blk_detect(const char *path)
-+{
-+	struct stat statbuf;
-+	int ret;
-+
-+	if (!strncmp(path, "blk:", 4))
-+		return true;
-+
-+	ret = stat(path, &statbuf);
-+	if (ret == -1 && errno == EPERM) {
-+		SYSERROR("blk_detect: failed to look at \"%s\"", path);
-+		return false;
-+	}
-+
-+	if (ret == 0 && S_ISBLK(statbuf.st_mode))
-+		return true;
-+
-+	return false;
-+}
-+
-+int blk_mount(struct lxc_storage *bdev)
-+{
-+	const char *src;
-+	if (strcmp(bdev->type, "blk"))
-+		return -22;
-+
-+	if (!bdev->src || !bdev->dest)
-+		return -22;
-+
-+	src = lxc_storage_get_path(bdev->src, bdev->type);
-+
-+	return mount_unknown_fs(src, bdev->dest, bdev->mntopts);
-+}
-+
-+int blk_umount(struct lxc_storage *bdev)
-+{
-+	if (strcmp(bdev->type, "blk"))
-+		return -22;
-+
-+	if (!bdev->src || !bdev->dest)
-+		return -22;
-+
-+	return umount(bdev->dest);
-+}
-diff --git a/src/lxc/storage/block.h b/src/lxc/storage/block.h
-new file mode 100644
-index 0000000..2fa7565
---- /dev/null
-+++ b/src/lxc/storage/block.h
-@@ -0,0 +1,41 @@
-+/*
-+ * lxc: linux Container library
-+ *
-+ * (C) Copyright IBM Corp. 2007, 2008
-+ *
-+ * Authors:
-+ * Daniel Lezcano <daniel.lezcano at free.fr>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef __LXC_BLK_H
-+#define __LXC_BLK_H
-+
-+#include <stdbool.h>
-+#include <stdint.h>
-+
-+struct lxc_storage;
-+
-+struct bdev_specs;
-+
-+struct lxc_conf;
-+
-+extern int blk_destroy(struct lxc_storage *orig);
-+extern bool blk_detect(const char *path);
-+extern int blk_mount(struct lxc_storage *bdev);
-+extern int blk_umount(struct lxc_storage *bdev);
-+
-+#endif /* __LXC_BLK_H */
-diff --git a/src/lxc/storage/storage_utils.c b/src/lxc/storage/storage_utils.c
-index f96bd52..696c6e5 100644
---- a/src/lxc/storage/storage_utils.c
-+++ b/src/lxc/storage/storage_utils.c
-@@ -256,10 +256,17 @@ int is_blktype(struct lxc_storage *b)
- 	return 0;
- }
- 
-+#ifdef HAVE_ISULAD
-+static char **mount_errors = NULL;
-+#endif
-+
- int mount_unknown_fs(const char *rootfs, const char *target,
- 		     const char *options)
- {
- 	size_t i;
-+#ifdef HAVE_ISULAD
-+	char *errs = NULL;
-+#endif
- 	int ret;
- 	struct cbarg {
- 		const char *rootfs;
-@@ -288,14 +295,41 @@ int mount_unknown_fs(const char *rootfs, const char *target,
- 		ret = lxc_file_for_each_line(fsfilei, find_fstype_cb, &cbarg);
- 		if (ret < 0) {
- 			ERROR("Failed to parse \"%s\"", fsfilei);
-+#ifdef HAVE_ISULAD
-+			lxc_free_array((void**)mount_errors, free);
-+			mount_errors = NULL;
-+#endif
- 			return -1;
- 		}
- 
-+#ifdef HAVE_ISULAD
-+		if (ret) {
-+			lxc_free_array((void**)mount_errors, free);
-+			mount_errors = NULL;
-+			return 0;
-+		}
-+#else
- 		if (ret)
- 			return 0;
-+#endif
-+	}
-+
-+#ifdef HAVE_ISULAD
-+	if (mount_errors != NULL) {
-+		errs = lxc_string_join("\n", (const char **)mount_errors, false);
-+		if (errs == NULL) {
-+			ERROR("failed to join mount errors");
-+		}
- 	}
- 
-+	ERROR("Failed to determine FSType for \"%s\": %s", rootfs, errs ? errs : "unknown reason");
-+
-+	free(errs);
-+	lxc_free_array((void**)mount_errors, free);
-+	mount_errors = NULL;
-+#else
- 	ERROR("Failed to determine FSType for \"%s\"", rootfs);
-+#endif 
- 
- 	return -1;
- }
-@@ -316,6 +350,11 @@ int find_fstype_cb(char *buffer, void *data)
- 	char *mntdata = NULL;
- 	char *fstype;
- 
-+#ifdef HAVE_ISULAD
-+	char mount_errBUFSIZ = {0};
-+	int ret;
-+	unsigned long pflags = 0;
-+#endif
- 	/* we don't try 'nodev' entries */
- 	if (strstr(buffer, "nodev"))
- 		return 0;
-@@ -327,14 +366,35 @@ int find_fstype_cb(char *buffer, void *data)
- 	DEBUG("Trying to mount \"%s\"->\"%s\" with FSType \"%s\"", cbarg->rootfs,
- 	      cbarg->target, fstype);
- 
-+#ifdef HAVE_ISULAD
-+	if (parse_mntopts(cbarg->options, &mntflags, &pflags, &mntdata) < 0) {
-+#else
- 	if (parse_mntopts(cbarg->options, &mntflags, &mntdata) < 0) {
-+#endif
- 		free(mntdata);
- 		return 0;
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	if (mount(cbarg->rootfs, cbarg->target, fstype, (mntflags & ~MS_RDONLY), mntdata)) {		
-+#else
- 	if (mount(cbarg->rootfs, cbarg->target, fstype, mntflags, mntdata)) {
-+#endif
- 		SYSDEBUG("Failed to mount");
- 		free(mntdata);
-+#ifdef HAVE_ISULAD
-+		// isulad: recored error
-+		ret = snprintf(mount_err, BUFSIZ, "\t\tmount %s onto %s with FSType %s failed: %s",
-+						cbarg->rootfs, cbarg->target, fstype, strerror(errno));
-+		if (ret < 0 || (size_t)ret >= BUFSIZ) {
-+			ERROR("failed to format output mount error");
-+			return 0;
-+		}
-+
-+		if (lxc_append_string(&mount_errors, mount_err) < 0) {
-+			ERROR("failed to append mount error");
-+		}
-+#endif
- 		return 0;
- 	}
- 
-diff --git a/src/lxc/terminal.h b/src/lxc/terminal.h
-index 4d21f33..c835e9a 100644
---- a/src/lxc/terminal.h
-+++ b/src/lxc/terminal.h
-@@ -79,6 +79,16 @@ struct lxc_terminal {
- 
- 		/* whether the log file will be rotated */
- 		unsigned int log_rotate;
-+#ifdef HAVE_ISULAD
-+                /* driver of log, support file and syslog */
-+                char *log_driver;
-+
-+                /* syslog tag for every log */
-+                char *log_syslog_tag;
-+
-+                /* syslog facility */
-+                int log_syslog_facility;
-+#endif
- 	};
- 
- 	struct /* lxc_terminal_ringbuf */ {
-@@ -88,7 +98,27 @@ struct lxc_terminal {
- 		/* the in-memory ringbuffer */
- 		struct lxc_ringbuf ringbuf;
- 	};
-+#ifdef HAVE_ISULAD
-+	char *init_fifo3; /* isulad: default fifos for the start */
-+	struct lxc_list fifos; /* isulad: fifos used to forward teminal */
-+	bool disable_pty;
-+	bool open_stdin;
-+	int pipes32; /* isulad: pipes for dup to container fds of stdin,stdout,stderr on daemonize mode*/
-+#endif
-+};
-+
-+#ifdef HAVE_ISULAD
-+/* isulad: fifo struct */
-+struct lxc_fifos_fd {
-+	char *in_fifo;
-+	char *out_fifo;
-+	char *err_fifo;
-+	int in_fd;
-+	int out_fd;
-+	int err_fd;
-+	struct lxc_list node;
- };
-+#endif
- 
- /**
-  * lxc_terminal_allocate: allocate the console or a tty
-@@ -254,4 +284,9 @@ extern void lxc_terminal_init(struct lxc_terminal *terminal);
- extern int lxc_terminal_map_ids(struct lxc_conf *c,
- 				struct lxc_terminal *terminal);
- 
-+#ifdef HAVE_ISULAD
-+int lxc_terminal_add_fifos(struct lxc_conf *conf, const char *fifonames);
-+int lxc_set_terminal_winsz(struct lxc_terminal *terminal, unsigned int height, unsigned int width);
-+#endif
-+
- #endif /* __LXC_TERMINAL_H */
--- 
-2.25.1
-

_service:tar_scm:0006-remove-isulad_cgfsng.patch Added

@@ -0,0 +1,4157 @@
+From 8db83e2f87cc5377b7a0d3a895d05df37c4abba1 Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Wed, 18 Oct 2023 11:01:26 +0800
+Subject: PATCH 1/2 remove isulad_cgfsng
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ src/lxc/cgroups/isulad_cgfsng.c | 4137 -------------------------------
+ 1 file changed, 4137 deletions(-)
+ delete mode 100644 src/lxc/cgroups/isulad_cgfsng.c
+
+diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c
+deleted file mode 100644
+index 1160af5..0000000
+--- a/src/lxc/cgroups/isulad_cgfsng.c
++++ /dev/null
+@@ -1,4137 +0,0 @@
+-/******************************************************************************
+- * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved.
+- * Author: lifeng
+- * Create: 2020-11-02
+- * Description: provide container definition
+- * lxc: linux Container library
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+-  ******************************************************************************/
+-
+-#ifndef _GNU_SOURCE
+-#define _GNU_SOURCE 1
+-#endif
+-#include <ctype.h>
+-#include <dirent.h>
+-#include <errno.h>
+-#include <grp.h>
+-#include <linux/kdev_t.h>
+-#include <linux/types.h>
+-#include <poll.h>
+-#include <signal.h>
+-#include <stdint.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <sys/epoll.h>
+-#include <sys/types.h>
+-#include <unistd.h>
+-
+-#include "af_unix.h"
+-#include "caps.h"
+-#include "cgroup.h"
+-#include "cgroup2_devices.h"
+-#include "cgroup_utils.h"
+-#include "commands.h"
+-#include "commands_utils.h"
+-#include "conf.h"
+-#include "config.h"
+-#include "log.h"
+-#include "macro.h"
+-#include "mainloop.h"
+-#include "memory_utils.h"
+-#include "open_utils.h"
+-#include "storage/storage.h"
+-#include "utils.h"
+-
+-#if !HAVE_STRLCPY
+-#include "include/strlcpy.h"
+-#endif
+-
+-#if !HAVE_STRLCAT
+-#include "include/strlcat.h"
+-#endif
+-
+-#if HAVE_LIBSYSTEMD
+-#include <systemd/sd-bus.h>
+-#include <systemd/sd-event.h>
+-#endif
+-
+-lxc_log_define(isulad_cgfsng, cgroup);
+-
+-/*
+- * Given a pointer to a null-terminated array of pointers, realloc to add one
+- * entry, and point the new entry to NULL. Do not fail. Return the index to the
+- * second-to-last entry - that is, the one which is now available for use
+- * (keeping the list null-terminated).
+- */
+-static int cg_list_add(void ***list)
+-{
+-	int idx = 0;
+-	void **p;
+-
+-	if (*list)
+-		for (; (*list)idx; idx++)
+-			;
+-
+-	p = realloc(*list, (idx + 2) * sizeof(void **));
+-	if (!p)
+-		return ret_errno(ENOMEM);
+-
+-	pidx + 1 = NULL;
+-	*list = p;
+-
+-	return idx;
+-}
+-
+-/* Given a null-terminated array of strings, check whether @entry is one of the
+- * strings.
+- */
+-static bool string_in_list(char **list, const char *entry)
+-{
+-	if (!list)
+-		return false;
+-
+-	for (int i = 0; listi; i++)
+-		if (strcmp(listi, entry) == 0)
+-			return true;
+-
+-	return false;
+-}
+-
+-/* Given a handler's cgroup data, return the struct hierarchy for the controller
+- * @c, or NULL if there is none.
+- */
+-static struct hierarchy *get_hierarchy(const struct cgroup_ops *ops, const char *controller)
+-{
+-	if (!ops->hierarchies)
+-		return log_trace_errno(NULL, errno, "There are no useable cgroup controllers");
+-
+-	for (int i = 0; ops->hierarchiesi; i++) {
+-		if (!controller) {
+-			/* This is the empty unified hierarchy. */
+-			if (ops->hierarchiesi->controllers && !ops->hierarchiesi->controllers0)
+-				return ops->hierarchiesi;
+-
+-			continue;
+-		}
+-
+-		/*
+-		 * Handle controllers with significant implementation changes
+-		 * from cgroup to cgroup2.
+-		 */
+-		if (pure_unified_layout(ops)) {
+-			if (strequal(controller, "devices")) {
+-				if (device_utility_controller(ops->unified))
+-					return ops->unified;
+-
+-				break;
+-			} else if (strequal(controller, "freezer")) {
+-				if (freezer_utility_controller(ops->unified))
+-					return ops->unified;
+-
+-				break;
+-			}
+-		}
+-
+-		if (string_in_list(ops->hierarchiesi->controllers, controller))
+-			return ops->hierarchiesi;
+-	}
+-
+-	if (controller)
+-		WARN("There is no useable %s controller", controller);
+-	else
+-		WARN("There is no empty unified cgroup hierarchy");
+-
+-	return ret_set_errno(NULL, ENOENT);
+-}
+-
+-int prepare_cgroup_fd(const struct cgroup_ops *ops, struct cgroup_fd *fd, bool limit)
+-{
+-	int dfd;
+-	const struct hierarchy *h;
+-
+-	h = get_hierarchy(ops, fd->controller);
+-	if (!h)
+-		return ret_errno(ENOENT);
+-
+-	/*
+-	 * The client requested that the controller must be in a specific
+-	 * cgroup version.
+-	 */
+-	if (fd->type != 0 && (cgroupfs_type_magic_t)fd->type != h->fs_type)
+-		return ret_errno(EINVAL);
+-
+-	if (limit)
+-		dfd = h->dfd_con;
+-	else
+-		dfd = h->dfd_lim;
+-	if (dfd < 0)
+-		return ret_errno(EBADF);
+-
+-	fd->layout = ops->cgroup_layout;
+-	fd->type = h->fs_type;
+-	if (fd->type == UNIFIED_HIERARCHY)
+-		fd->utilities = h->utilities;
+-	fd->fd = dfd;
+-
+-	return 0;
+-}
+-
+-#define BATCH_SIZE 50
+-static void batch_realloc(char **mem, size_t oldlen, size_t newlen)
+-{
+-	int newbatches = (newlen / BATCH_SIZE) + 1;
+-	int oldbatches = (oldlen / BATCH_SIZE) + 1;
+-
+-	if (!*mem || newbatches > oldbatches)
+-		*mem = must_realloc(*mem, newbatches * BATCH_SIZE);
+-}
+-
+-static void append_line(char **dest, size_t oldlen, char *new, size_t newlen)
+-{
+-	size_t full = oldlen + newlen;
+-
+-	batch_realloc(dest, oldlen, full + 1);
+-
+-	memcpy(*dest + oldlen, new, newlen + 1);
+-}
+-
+-/* Slurp in a whole file */
+-static char *read_file(const char *fnam)
+-{
+-	__do_free char *buf = NULL, *line = NULL;
+-	__do_fclose FILE *f = NULL;
+-	size_t len = 0, fulllen = 0;
+-	int linelen;
+-
+-	f = fopen(fnam, "re");
+-	if (!f)
+-		return NULL;
+-
+-	while ((linelen = getline(&line, &len, f)) != -1) {
+-		append_line(&buf, fulllen, line, linelen);
+-		fulllen += linelen;
+-	}
+-
+-	return move_ptr(buf);
+-}
+-
+-static inline bool is_unified_hierarchy(const struct hierarchy *h)
+-{
+-	return h->fs_type == UNIFIED_HIERARCHY;
+-}
+-
+-static char *trim(char *s)
+-{
+-	size_t len;
+-
+-	len = strlen(s);
+-	while ((len > 1) && (slen - 1 == '\n'))
+-		s--len = '\0';
+-
+-	return s;
+-}
+-
+-/* Return true if the controller @entry is found in the null-terminated list of
+- * hierarchies @hlist.
+- */
+-static bool controller_available(struct hierarchy **hlist, char *entry)
+-{
+-	if (!hlist)
+-		return false;
+-
+-	for (int i = 0; hlisti; i++)
+-		if (string_in_list(hlisti->controllers, entry))
+-			return true;
+-
+-	return false;
+-}
+-
+-static bool controllers_available(struct cgroup_ops *ops)
+-{
+-	struct hierarchy **hlist;
+-
+-	if (!ops->cgroup_use)
+-		return true;
+-
+-	hlist = ops->hierarchies;
+-	for (char **cur = ops->cgroup_use; cur && *cur; cur++)
+-		if (!controller_available(hlist, *cur))
+-			return log_error(false, "The %s controller found", *cur);
+-
+-	return true;
+-}
+-
+-static char **list_new(void)
+-{
+-	__do_free_string_list char **list = NULL;
+-	int idx;
+-
+-	idx = cg_list_add((void ***)&list);
+-	if (idx < 0)
+-		return NULL;
+-
+-	listidx = NULL;
+-	return move_ptr(list);
+-}
+-
+-static int list_add_string(char ***list, char *entry)
+-{
+-	__do_free char *dup = NULL;
+-	int idx;
+-
+-	dup = strdup(entry);
+-	if (!dup)
+-		return ret_errno(ENOMEM);
+-
+-	idx = cg_list_add((void ***)list);
+-	if (idx < 0)
+-		return idx;
+-
+-	(*list)idx = move_ptr(dup);
+-	return 0;
+-}
+-
+-static char **list_add_controllers(char *controllers)
+-{
+-	__do_free_string_list char **list = NULL;
+-	char *it;
+-
+-	lxc_iterate_parts(it, controllers, ", \t\n") {
+-		int ret;
+-
+-		ret = list_add_string(&list, it);
+-		if (ret < 0)
+-			return NULL;
+-	}
+-
+-	return move_ptr(list);
+-}
+-
+-static char **unified_controllers(int dfd, const char *file)
+-{
+-	__do_free char *buf = NULL;
+-
+-	buf = read_file_at(dfd, file, PROTECT_OPEN, 0);
+-	if (!buf)
+-		return NULL;
+-
+-	return list_add_controllers(buf);
+-}
+-
+-static bool skip_hierarchy(const struct cgroup_ops *ops, char **controllers)
+-{
+-	if (!ops->cgroup_use)
+-		return false;
+-
+-	for (char **cur_ctrl = controllers; cur_ctrl && *cur_ctrl; cur_ctrl++) {
+-		bool found = false;
+-
+-		for (char **cur_use = ops->cgroup_use; cur_use && *cur_use; cur_use++) {
+-			if (!strequal(*cur_use, *cur_ctrl))
+-				continue;
+-
+-			found = true;
+-			break;
+-		}
+-
+-		if (found)
+-			continue;
+-
+-		return true;
+-	}
+-
+-	return false;
+-}
+-
+-static int cgroup_hierarchy_add(struct cgroup_ops *ops, int dfd_mnt, char *mnt,
+-				int dfd_base, char *base_cgroup,
+-				char **controllers, cgroupfs_type_magic_t fs_type)
+-{
+-	__do_free struct hierarchy *new = NULL;
+-	int idx;
+-
+-	if (abspath(base_cgroup))
+-		return syserror_set(-EINVAL, "Container base path must be relative to controller mount");
+-
+-	new = zalloc(sizeof(*new));
+-	if (!new)
+-		return ret_errno(ENOMEM);
+-
+-	new->dfd_con		= -EBADF;
+-	new->dfd_lim		= -EBADF;
+-	new->dfd_mon		= -EBADF;
+-
+-	new->fs_type		= fs_type;
+-	new->controllers	= controllers;
+-	new->at_mnt		= mnt;
+-	new->at_base		= base_cgroup;
+-
+-	new->dfd_mnt		= dfd_mnt;
+-	new->dfd_base		= dfd_base;
+-
+-	TRACE("Adding cgroup hierarchy mounted at %s and base cgroup %s",
+-	      mnt, maybe_empty(base_cgroup));
+-	for (char *const *it = new->controllers; it && *it; it++)
+-		TRACE("The hierarchy contains the %s controller", *it);
+-
+-	idx = cg_list_add((void ***)&ops->hierarchies);
+-	if (idx < 0)
+-		return ret_errno(idx);
+-
+-	if (fs_type == UNIFIED_HIERARCHY)
+-		ops->unified = new;
+-	(ops->hierarchies)idx = move_ptr(new);
+-
+-	return 0;
+-}
+-
+-struct generic_userns_exec_data {
+-	struct hierarchy **hierarchies;
+-	const char *path_prune;
+-	struct lxc_conf *conf;
+-	uid_t origuid; /* target uid in parent namespace */
+-	char *path;
+-};
+-
+-static int isulad_cgroup_tree_remove(struct hierarchy **hierarchies,
+-			const char *container_cgroup)
+-{
+-	if (!container_cgroup || !hierarchies)
+-		return 0;
+-
+-	for (int i = 0; hierarchiesi; i++) {
+-		struct hierarchy *h = hierarchiesi;
+-		int ret;
+-
+-		if (!h->path_con) {
+-			h->path_con = must_make_path(h->at_mnt, h->at_base, container_cgroup, NULL);
+-		}
+-
+-		ret = lxc_rm_rf(h->path_con);
+-		if (ret < 0) {
+-			if (errno == ENOENT) {
+-				WARN("Destroy path: \"%s\" do not exist", h->path_con);
+-				return 0;
+-			}
+-			SYSERROR("Failed to destroy \"%s\"", h->path_con);
+-			return -1;
+-		}
+-
+-		free_disarm(h->path_con);
+-	}
+-
+-	return 0;
+-}
+-
+-static int isulad_cgroup_tree_remove_wrapper(void *data)
+-{
+-	struct generic_userns_exec_data *arg = data;
+-	uid_t nsuid = (arg->conf->root_nsuid_map != NULL) ? 0 : arg->conf->init_uid;
+-	gid_t nsgid = (arg->conf->root_nsgid_map != NULL) ? 0 : arg->conf->init_gid;
+-	int ret;
+-
+-	if (!lxc_drop_groups() && errno != EPERM)
+-		return log_error_errno(-1, errno, "Failed to setgroups(0, NULL)");
+-
+-	ret = setresgid(nsgid, nsgid, nsgid);
+-	if (ret < 0)
+-		return log_error_errno(-1, errno, "Failed to setresgid(%d, %d, %d)",
+-				       (int)nsgid, (int)nsgid, (int)nsgid);
+-
+-	ret = setresuid(nsuid, nsuid, nsuid);
+-	if (ret < 0)
+-		return log_error_errno(-1, errno, "Failed to setresuid(%d, %d, %d)",
+-				       (int)nsuid, (int)nsuid, (int)nsuid);
+-
+-	return isulad_cgroup_tree_remove(arg->hierarchies, arg->path_prune);
+-}
+-
+-__cgfsng_ops static bool isulad_cgfsng_payload_destroy(struct cgroup_ops *ops,
+-						struct lxc_handler *handler)
+-{
+-	int ret;
+-
+-	if (!ops) {
+-		ERROR("Called with uninitialized cgroup operations");
+-		return false;
+-	}
+-
+-	if (ops->no_controller) {
+-		DEBUG("no controller found, ignore isulad_cgfsng_payload_destroy");
+-		return true;
+-	}
+-
+-	if (!ops->hierarchies) {
+-		DEBUG("no hierarchies found, ignore isulad_cgfsng_payload_destroy");
+-		return true;
+-	}
+-
+-	if (!handler) {
+-		ERROR("Called with uninitialized handler");
+-		return false;
+-	}
+-
+-	if (!handler->conf) {
+-		ERROR("Called with uninitialized conf");
+-		return false;
+-	}
+-
+-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
+-	ret = bpf_program_cgroup_detach(handler->conf->cgroup2_devices);
+-	if (ret < 0)
+-		WARN("Failed to detach bpf program from cgroup");
+-#endif
+-
+-	if (!list_empty(&handler->conf->id_map) && !handler->am_root) {
+-		struct generic_userns_exec_data wrap = {
+-			.conf			= handler->conf,
+-			.path_prune		= ops->container_limit_cgroup,
+-			.hierarchies		= ops->hierarchies,
+-			.origuid		= 0,
+-		};
+-		ret = userns_exec_1(handler->conf, isulad_cgroup_tree_remove_wrapper,
+-				    &wrap, "cgroup_tree_remove_wrapper");
+-	} else {
+-		ret = isulad_cgroup_tree_remove(ops->hierarchies, ops->container_cgroup);
+-	}
+-	if (ret < 0) {
+-		SYSWARN("Failed to destroy cgroups");
+-		return false;
+-	}
+-
+-	return true;
+-}
+-
+-__cgfsng_ops static void isulad_cgfsng_monitor_destroy(struct cgroup_ops *ops,
+-						struct lxc_handler *handler)
+-{
+-	return;
+-}
+-
+-#define SYSTEMD_SCOPE_FAILED 2
+-#define SYSTEMD_SCOPE_UNSUPP 1
+-#define SYSTEMD_SCOPE_SUCCESS 0
+-
+-#if HAVE_LIBSYSTEMD
+-struct sd_callback_data {
+-	char *scope_name;
+-	bool job_complete;
+-};
+-
+-static int systemd_jobremoved_callback(sd_bus_message *m, void *userdata, sd_bus_error *error)
+-{
+-	char *path, *unit, *result;
+-	struct sd_callback_data *sd_data = userdata;
+-	uint32_t id;
+-	int r;
+-
+-	r = sd_bus_message_read(m, "uoss", &id, &path, &unit, &result);
+-	if (r < 0)
+-		return log_error(-1, "bad message received in callback: %s", strerror(-r));
+-
+-	if (sd_data->scope_name && strcmp(unit, sd_data->scope_name) != 0)
+-		return log_trace(-1, "unit was '%s' not '%s'", unit, sd_data->scope_name);
+-	if (strcmp(result, "done") == 0) {
+-		sd_data->job_complete = true;
+-		return log_info(1, "job is done");
+-	}
+-	return log_debug(0, "result was '%s', not 'done'", result);
+-}
+-
+-#define DESTINATION "org.freedesktop.systemd1"
+-#define PATH "/org/freedesktop/systemd1"
+-#define INTERFACE "org.freedesktop.systemd1.Manager"
+-#define MEMBER "StartTransientUnit"
+-static bool start_scope(sd_bus *bus, struct sd_callback_data *data, struct sd_event *event)
+-{
+-	__attribute__((__cleanup__(sd_bus_error_free))) sd_bus_error error = SD_BUS_ERROR_NULL;;
+-	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *reply = NULL;
+-	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *m = NULL;
+-	char *path = NULL;
+-	int r;
+-
+-	r = sd_bus_message_new_method_call(bus, &m,
+-		DESTINATION, PATH, INTERFACE, MEMBER);
+-	if (r < 0)
+-		return log_error(false, "Failed creating sdbus message");
+-
+-	r = sd_bus_message_append(m, "ss", data->scope_name, "fail");
+-	if (r < 0)
+-		return log_error(false, "Failed setting systemd scope name");
+-
+-	r = sd_bus_message_open_container(m, 'a', "(sv)");
+-	if (r < 0)
+-		return log_error(false, "Failed allocating sdbus msg properties");
+-
+-	r = sd_bus_message_append(m, "(sv)(sv)(sv)",
+-		"PIDs", "au", 1, getpid(),
+-		"Delegate", "b", 1,
+-		"CollectMode", "s", "inactive-or-failed");
+-	if (r < 0)
+-		return log_error(false, "Failed setting properties on sdbus message");
+-
+-	r = sd_bus_message_close_container(m);
+-	if (r < 0)
+-		return log_error(false, "Failed closing sdbus message properties");
+-
+-	r = sd_bus_message_append(m, "a(sa(sv))", 0);
+-	if (r < 0)
+-		return log_error(false, "Failed appending aux boilerplate\n");
+-
+-	r = sd_bus_call(NULL, m, 0, &error, &reply);
+-	if (r < 0)
+-		return log_error(false,  "Failed sending sdbus message: %s", error.message);
+-
+-	/* Parse the response message */
+-	r = sd_bus_message_read(reply, "o", &path);
+-	if (r < 0)
+-		return log_error(false, "Failed to parse response message: %s", strerror(-r));
+-
+-	/* Now spin up a mini-event-loop to wait for the "job completed" message */
+-	int tries = 0;
+-
+-	while (!data->job_complete) {
+-		r = sd_event_run(event, 1000 * 1000);
+-		if (r < 0) {
+-			log_debug(stderr, "Error waiting for JobRemoved: %s\n", strerror(-r));
+-			continue;
+-		}
+-		if (data->job_complete || tries == 5)
+-			break;
+-		if (r > 0) {
+-			log_trace(stderr, "Debug: we processed an event (%d), but not the one we wanted\n", r);
+-			continue;
+-		}
+-		if (r == 0) // timeout
+-			tries++;
+-	}
+-	if (!data->job_complete) {
+-		return log_error(false, "Error: %s job was never removed", data->scope_name);
+-	}
+-	return true;
+-}
+-
+-static bool string_pure_unified_system(char *contents)
+-{
+-	char *p;
+-	bool first_line_read = false;
+-
+-	lxc_iterate_parts(p, contents, "\n") {
+-		if (first_line_read) // if >1 line, this is not pure unified
+-			return false;
+-		first_line_read = true;
+-
+-		if (strlen(p) > 3 && strncmp(p, "0:", 2) == 0)
+-			return true;
+-	}
+-
+-	return false;
+-}
+-
+-/*
+- * Only call get_current_unified_cgroup() when we are in a pure
+- * unified (v2-only) cgroup
+- */
+-static char *get_current_unified_cgroup(void)
+-{
+-	__do_free char *buf = NULL;
+-	__do_free_string_list char **list = NULL;
+-	char *p;
+-
+-	buf = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0);
+-	if (!buf)
+-		return NULL;
+-
+-	if (!string_pure_unified_system(buf))
+-		return NULL;
+-
+-	// 0::/user.slice/user-1000.slice/session-136.scope
+-	// Get past the "0::"
+-	p = buf;
+-	if (strnequal(p, "0::", STRLITERALLEN("0::")))
+-		p += STRLITERALLEN("0::");
+-
+-	return strdup(p);
+-}
+-
+-static bool pure_unified_system(void)
+-{
+-	__do_free char *buf = NULL;
+-
+-	buf = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0);
+-	if (!buf)
+-		return false;
+-
+-	return string_pure_unified_system(buf);
+-}
+-
+-#define MEMBER_JOIN "AttachProcessesToUnit"
+-static bool enter_scope(char *scope_name, pid_t pid)
+-{
+-	__attribute__((__cleanup__(sd_bus_unrefp))) sd_bus *bus = NULL;
+-	__attribute__((__cleanup__(sd_bus_error_free))) sd_bus_error error = SD_BUS_ERROR_NULL;;
+-	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *reply = NULL;
+-	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *m = NULL;
+-	int r;
+-
+-	r = sd_bus_open_user(&bus);
+-	if (r < 0)
+-		return log_error(false, "Failed to connect to user bus: %s", strerror(-r));
+-
+-	r = sd_bus_message_new_method_call(bus, &m,
+-		DESTINATION, PATH, INTERFACE, MEMBER_JOIN);
+-	if (r < 0)
+-		return log_error(false, "Failed creating sdbus message");
+-
+-	r = sd_bus_message_append(m, "ssau", scope_name, "/init", 1, pid);
+-	if (r < 0)
+-		return log_error(false, "Failed setting systemd scope name");
+-
+-
+-	r = sd_bus_call(NULL, m, 0, &error, &reply);
+-	if (r < 0)
+-		return log_error(false,  "Failed sending sdbus message: %s", error.message);
+-
+-	return true;
+-}
+-
+-static bool enable_controllers_delegation(int fd_dir, char *cg)
+-{
+-	__do_free char *rbuf = NULL;
+-	__do_free char *wbuf = NULL;
+-	__do_free_string_list char **cpulist = NULL;
+-	char *controller;
+-	size_t full_len = 0;
+-	bool first = true;
+-	int ret;
+-
+-	rbuf = read_file_at(fd_dir, "cgroup.controllers", PROTECT_OPEN, 0);
+-	if (!rbuf)
+-		return false;
+-
+-	lxc_iterate_parts(controller, rbuf, " ") {
+-		full_len += strlen(controller) + 2;
+-		wbuf = must_realloc(wbuf, full_len + 1);
+-		if (first) {
+-			wbuf0 = '\0';
+-			first = false;
+-		} else {
+-			(void)strlcat(wbuf, " ", full_len + 1);
+-		}
+-		strlcat(wbuf, "+", full_len + 1);
+-		strlcat(wbuf, controller, full_len + 1);
+-	}
+-	if (!wbuf)
+-		return log_debug(true, "No controllers to delegate!");
+-
+-	ret = lxc_writeat(fd_dir, "cgroup.subtree_control", wbuf, strlen(wbuf));
+-	if (ret < 0)
+-		return log_error_errno(false, errno, "Failed to write \"%s\" to %s/cgroup.subtree_control", wbuf, cg);
+-
+-	return true;
+-}
+-
+-/*
+- * systemd places us in say .../lxc-1.scope.  We create lxc-1.scope/init,
+- * move ourselves to there, then enable controllers in lxc-1.scope
+- */
+-static bool move_and_delegate_unified(char *parent_cgroup)
+-{
+-	__do_free char *buf = NULL;
+-	__do_close int fd_parent = -EBADF;
+-	int ret;
+-
+-	fd_parent = open_at(-EBADF, parent_cgroup, O_DIRECTORY, 0, 0);
+-	if (fd_parent < 0)
+-		return syserror_ret(false, "Failed opening cgroup dir \"%s\"", parent_cgroup);
+-
+-	ret = mkdirat(fd_parent, "init", 0755);
+-	if (ret < 0 && errno != EEXIST)
+-		return syserror_ret(false, "Failed to create \"%d/init\" cgroup", fd_parent);
+-
+-	buf = read_file_at(fd_parent, "cgroup.procs", PROTECT_OPEN, 0);
+-	if (!buf)
+-		return false;
+-
+-	ret = lxc_writeat(fd_parent, "init/cgroup.procs", buf, strlen(buf));
+-	if (ret)
+-		return syserror_ret(false, "Failed to escape to cgroup \"init/cgroup.procs\"");
+-
+-	/* enable controllers in parent_cgroup */
+-	return enable_controllers_delegation(fd_parent, parent_cgroup);
+-}
+-
+-static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf *conf)
+-{
+-	__do_free char *full_scope_name = NULL;
+-	__do_free char *fs_cg_path = NULL;
+-	sd_event *event = NULL;
+-	__attribute__((__cleanup__(sd_bus_unrefp))) sd_bus *bus = NULL; // free the bus before the names it references, just to be sure
+-	struct sd_callback_data sd_data;
+-	int idx = 0;
+-	size_t len;
+-	int r;
+-
+-	if (geteuid() == 0)
+-		return log_info(SYSTEMD_SCOPE_UNSUPP, "Running privileged, not using a systemd unit");
+-	// Pure_unified_layout() can't be used as that info is not yet setup.  At
+-	// the same time, we don't want to calculate current cgroups until after
+-	// we optionally enter a new systemd user scope.  So let's just do a quick
+-	// check for pure unified cgroup system: single line /proc/self/cgroup with
+-	// only index '0:'
+-	if (!pure_unified_system())
+-		return log_info(SYSTEMD_SCOPE_UNSUPP, "Not in unified layout, not using a systemd unit");
+-
+-	r = sd_bus_open_user(&bus);
+-	if (r < 0)
+-		return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to user bus: %s", strerror(-r));
+-
+-	r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL);
+-	if (r < 0)
+-		return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to signals: %s", strerror(-r));
+-
+-	sd_data.job_complete = false;
+-	sd_data.scope_name = NULL;
+-	r = sd_bus_match_signal(bus,
+-		NULL, // no slot
+-		DESTINATION, PATH, INTERFACE, "JobRemoved",
+-		systemd_jobremoved_callback, &sd_data);
+-	if (r < 0)
+-		return log_error(SYSTEMD_SCOPE_FAILED, "Failed to register systemd event loop signal handler: %s", strerror(-r));
+-
+-	// NEXT: create and attach event
+-	r = sd_event_new(&event);
+-	if (r < 0)
+-		return log_error(SYSTEMD_SCOPE_FAILED, "Failed allocating new event: %s\n", strerror(-r));
+-	r = sd_bus_attach_event(bus, event, SD_EVENT_PRIORITY_NORMAL);
+-	if (r < 0) {
+-		// bus won't clean up event since the attach failed
+-		sd_event_unrefp(&event);
+-		return log_error(SYSTEMD_SCOPE_FAILED, "Failed attaching event: %s\n", strerror(-r));
+-	}
+-
+-	// "lxc-" + (conf->name) + "-NN" + ".scope" + '\0'
+-	len = STRLITERALLEN("lxc-") + strlen(conf->name) + 3 + STRLITERALLEN(".scope") + 1;
+-	full_scope_name = malloc(len);
+-	if (!full_scope_name)
+-		return syserror("Out of memory");
+-
+-	do {
+-		r = strnprintf(full_scope_name, len, "lxc-%s-%d.scope", conf->name, idx);
+-		if (r < 0)
+-			return log_error_errno(-1, errno, "Failed to build scope name for \"%s\"", conf->name);
+-		sd_data.scope_name = full_scope_name;
+-		if (start_scope(bus, &sd_data, event)) {
+-			conf->cgroup_meta.systemd_scope = get_current_unified_cgroup();
+-			if (!conf->cgroup_meta.systemd_scope)
+-				return log_trace(SYSTEMD_SCOPE_FAILED, "Out of memory");
+-			fs_cg_path = must_make_path("/sys/fs/cgroup", conf->cgroup_meta.systemd_scope, NULL);
+-			if (!move_and_delegate_unified(fs_cg_path))
+-				return log_error(SYSTEMD_SCOPE_FAILED, "Failed delegating the controllers to our cgroup");
+-			return log_trace(SYSTEMD_SCOPE_SUCCESS, "Created systemd scope %s", full_scope_name);
+-		}
+-		idx++;
+-	} while (idx < 99);
+-
+-	return SYSTEMD_SCOPE_FAILED; // failed, let's try old-school after all
+-}
+-#else /* !HAVE_LIBSYSTEMD */
+-static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf *conf)
+-{
+-	TRACE("unpriv_systemd_create_scope: no systemd support");
+-	return SYSTEMD_SCOPE_UNSUPP; // not supported
+-}
+-#endif /* HAVE_LIBSYSTEMD */
+-
+-// Return a duplicate of cgroup path @cg without leading /, so
+-// that caller can own+free it and be certain it's not abspath.
+-static char *cgroup_relpath(char *cg)
+-{
+-	char *p;
+-
+-	if (!cg || strequal(cg, "/"))
+-		return NULL;
+-	p = strdup(deabs(cg));
+-	if (!p)
+-		return ERR_PTR(-ENOMEM);
+-
+-	return p;
+-}
+-
+-__cgfsng_ops static inline bool isulad_cgfsng_monitor_create(struct cgroup_ops *ops,
+-						      struct lxc_handler *handler)
+-{
+-	return true;
+-}
+-
+-static bool isulad_copy_parent_file(char *path, char *file)
+-{
+-	int ret;
+-	int len = 0;
+-	char *value = NULL;
+-	char *current = NULL;
+-	char *fpath = NULL;
+-	char *lastslash = NULL;
+-	char oldv;
+-
+-	fpath = must_make_path(path, file, NULL);
+-	current = read_file(fpath);
+-
+-	if (current == NULL) {
+-		SYSERROR("Failed to read file \"%s\"", fpath);
+-		free(fpath);
+-		return false;
+-	}
+-
+-	if (strcmp(current, "\n") != 0) {
+-		free(fpath);
+-		free(current);
+-		return true;
+-	}
+-
+-	free(fpath);
+-	free(current);
+-
+-	lastslash = strrchr(path, '/');
+-	if (lastslash == NULL) {
+-		ERROR("Failed to detect \"/\" in \"%s\"", path);
+-		return false;
+-	}
+-	oldv = *lastslash;
+-	*lastslash = '\0';
+-	fpath = must_make_path(path, file, NULL);
+-	*lastslash = oldv;
+-	len = lxc_read_from_file(fpath, NULL, 0);
+-	if (len <= 0)
+-		goto on_error;
+-
+-	value = must_realloc(NULL, len + 1);
+-	ret = lxc_read_from_file(fpath, value, len);
+-	if (ret != len)
+-		goto on_error;
+-	free(fpath);
+-
+-	fpath = must_make_path(path, file, NULL);
+-	ret = lxc_write_to_file(fpath, value, len, false, 0666);
+-	if (ret < 0)
+-		SYSERROR("Failed to write \"%s\" to file \"%s\"", value, fpath);
+-	free(fpath);
+-	free(value);
+-	return ret >= 0;
+-
+-on_error:
+-	SYSERROR("Failed to read file \"%s\"", fpath);
+-	free(fpath);
+-	free(value);
+-	return false;
+-}
+-
+-static bool build_sub_cpuset_cgroup_dir(char *cgpath)
+-{
+-	int ret;
+-
+-	ret = mkdir_p(cgpath, 0755);
+-	if (ret < 0) {
+-		if (errno != EEXIST) {
+-			SYSERROR("Failed to create directory \"%s\"", cgpath);
+-			return false;
+-		}
+-	}
+-
+-	/* copy parent's settings */
+-	if (!isulad_copy_parent_file(cgpath, "cpuset.cpus")) {
+-		SYSERROR("Failed to copy \"cpuset.cpus\" settings");
+-		return false;
+-	}
+-
+-	/* copy parent's settings */
+-	if (!isulad_copy_parent_file(cgpath, "cpuset.mems")) {
+-		SYSERROR("Failed to copy \"cpuset.mems\" settings");
+-		return false;
+-	}
+-
+-	return true;
+-}
+-
+-static bool isulad_cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *cgname)
+-{
+-	char *cgpath, *slash;
+-	bool sub_mk_success = false;
+-
+-	if (is_unified_hierarchy(h))
+-		return true;
+-
+-	if (!string_in_list(h->controllers, "cpuset"))
+-		return true;
+-
+-	cgname += strspn(cgname, "/");
+-
+-	slash = strchr(cgname, '/');
+-
+-	if (slash != NULL) {
+-		while (slash) {
+-			*slash = '\0';
+-			cgpath = must_make_path(h->at_mnt, h->at_base, cgname, NULL);
+-			sub_mk_success = build_sub_cpuset_cgroup_dir(cgpath);
+-			free(cgpath);
+-			*slash = '/';
+-			if (!sub_mk_success) {
+-				return false;
+-			}
+-			slash = strchr(slash + 1, '/');
+-		}
+-	}
+-
+-	cgpath = must_make_path(h->at_mnt, h->at_base, cgname, NULL);
+-	sub_mk_success = build_sub_cpuset_cgroup_dir(cgpath);
+-	free(cgpath);
+-	if (!sub_mk_success) {
+-		return false;
+-	}
+-
+-	return true;
+-}
+-
+-static int isulad_mkdir_eexist_on_last(const char *dir, mode_t mode)
+-{
+-	const char *tmp = dir;
+-	const char *orig = dir;
+-
+-	do {
+-		int ret;
+-		size_t cur_len;
+-		char *makeme;
+-
+-		dir = tmp + strspn(tmp, "/");
+-		tmp = dir + strcspn(dir, "/");
+-
+-		errno = ENOMEM;
+-		cur_len = dir - orig;
+-		makeme = strndup(orig, cur_len);
+-		if (!makeme)
+-			return -1;
+-
+-		ret = mkdir(makeme, mode);
+-		if (ret < 0) {
+-			if (errno != EEXIST) {
+-				SYSERROR("Failed to create directory \"%s\"", makeme);
+-				free(makeme);
+-				return -1;
+-			}
+-		}
+-		free(makeme);
+-
+-	} while (tmp != dir);
+-
+-	return 0;
+-}
+-
+-static bool create_path_for_hierarchy(struct hierarchy *h, char *cgname, int errfd)
+-{
+-	int ret;
+-	__do_free char *path = NULL;
+-
+-	path = must_make_path(h->at_mnt, h->at_base, cgname, NULL);
+-
+-	if (file_exists(path)) { // it must not already exist
+-		ERROR("Cgroup path \"%s\" already exist.", path);
+-		lxc_write_error_message(errfd, "%s:%d: Cgroup path \"%s\" already exist.",
+-		                        __FILE__, __LINE__, path);
+-		return false;
+-	}
+-
+-	if (!isulad_cg_legacy_handle_cpuset_hierarchy(h, cgname)) {
+-		ERROR("Failed to handle legacy cpuset controller");
+-		return false;
+-	}
+-
+-	ret = isulad_mkdir_eexist_on_last(path, 0755);
+-	if (ret < 0) {
+-		ERROR("Failed to create cgroup \"%s\"", path);
+-		return false;
+-	}
+-
+-	h->dfd_con = lxc_open_dirfd(path);
+-	if (h->dfd_con < 0)
+-		return log_error_errno(false, errno, "Failed to open %s", path);
+-
+-	if (h->path_con == NULL) {
+-		h->path_con = move_ptr(path);
+-	}
+-
+-	return true;
+-}
+-
+-/* isulad: create hierarchies path, if fail, return the error */
+-__cgfsng_ops static inline bool isulad_cgfsng_payload_create(struct cgroup_ops *ops,
+-						      struct lxc_handler *handler)
+-{
+-	int i;
+-
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-	char *container_cgroup = ops->container_cgroup;
+-
+-	if (!ops->hierarchies)
+-		return true;
+-
+-#ifdef HAVE_ISULAD
+-	if (ops->no_controller) {
+-		DEBUG("no controller found, isgnore isulad_cgfsng_payload_create");
+-		return true;
+-	}
+-#endif
+-
+-	if (!container_cgroup) {
+-		ERROR("cgfsng_create container_cgroup is invalid");
+-		return false;
+-	}
+-
+-	for (i = 0; ops->hierarchiesi; i++) {
+-		if (!create_path_for_hierarchy(ops->hierarchiesi, container_cgroup, ops->errfd)) {
+-			SYSERROR("Failed to create %s", ops->hierarchiesi->path_con);
+-			return false;
+-		}
+-	}
+-
+-	return true;
+-}
+-
+-__cgfsng_ops static bool isulad_cgfsng_monitor_enter(struct cgroup_ops *ops,
+-					      struct lxc_handler *handler)
+-{
+-	return true;
+-}
+-
+-__cgfsng_ops static bool isulad_cgfsng_payload_enter(struct cgroup_ops *ops,
+-					      struct lxc_handler *handler)
+-{
+-	int len;
+-	char pidstrINTTYPE_TO_STRLEN(pid_t);
+-
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-#ifdef HAVE_ISULAD
+-	if (ops->no_controller) {
+-		DEBUG("no controller found, isgnore isulad_cgfsng_payload_enter");
+-		return true;
+-	}
+-#endif
+-
+-	if (!ops->hierarchies)
+-		return true;
+-
+-	if (!ops->container_cgroup)
+-		return ret_set_errno(false, ENOENT);
+-
+-	if (!handler || !handler->conf)
+-		return ret_set_errno(false, EINVAL);
+-
+-	len = snprintf(pidstr, sizeof(pidstr), "%d", handler->pid);
+-
+-	for (int i = 0; ops->hierarchiesi; i++) {
+-		int ret;
+-		char *fullpath;
+-		int retry_count = 0;
+-		int max_retry = 10;
+-
+-		fullpath = must_make_path(ops->hierarchiesi->path_con,
+-		                          "cgroup.procs", NULL);
+-retry:
+-		ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666);
+-		if (ret != 0) {
+-			if (retry_count < max_retry) {
+-				SYSERROR("Failed to enter cgroup \"%s\" with retry count:%d", fullpath, retry_count);
+-				(void)isulad_cg_legacy_handle_cpuset_hierarchy(ops->hierarchiesi, ops->container_cgroup);
+-				(void)isulad_mkdir_eexist_on_last(ops->hierarchiesi->path_con, 0755);
+-				usleep(100 * 1000); /* 100 millisecond */
+-				retry_count++;
+-				goto retry;
+-			}
+-			SYSERROR("Failed to enter cgroup \"%s\"", fullpath);
+-			free(fullpath);
+-			return false;
+-		}
+-		free(fullpath);
+-	}
+-
+-	return true;
+-}
+-
+-static int fchowmodat(int dirfd, const char *path, uid_t chown_uid,
+-		      gid_t chown_gid, mode_t chmod_mode)
+-{
+-	int ret;
+-
+-	ret = fchownat(dirfd, path, chown_uid, chown_gid,
+-		       AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW);
+-	if (ret < 0)
+-		return log_warn_errno(-1,
+-				      errno, "Failed to fchownat(%d, %s, %d, %d, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )",
+-				      dirfd, path, (int)chown_uid,
+-				      (int)chown_gid);
+-
+-	ret = fchmodat(dirfd, (*path != '\0') ? path : ".", chmod_mode, 0);
+-	if (ret < 0)
+-		return log_warn_errno(-1, errno, "Failed to fchmodat(%d, %s, %d, AT_SYMLINK_NOFOLLOW)",
+-				      dirfd, path, (int)chmod_mode);
+-
+-	return 0;
+-}
+-
+-/* chgrp the container cgroups to container group.  We leave
+- * the container owner as cgroup owner.  So we must make the
+- * directories 775 so that the container can create sub-cgroups.
+- *
+- * Also chown the tasks and cgroup.procs files.  Those may not
+- * exist depending on kernel version.
+- */
+-static int chown_cgroup_wrapper(void *data)
+-{
+-	int ret;
+-	uid_t destuid;
+-	struct generic_userns_exec_data *arg = data;
+-	uid_t nsuid = (arg->conf->root_nsuid_map != NULL) ? 0 : arg->conf->init_uid;
+-	gid_t nsgid = (arg->conf->root_nsgid_map != NULL) ? 0 : arg->conf->init_gid;
+-
+-	if (!lxc_drop_groups() && errno != EPERM)
+-		return log_error_errno(-1, errno, "Failed to setgroups(0, NULL)");
+-
+-	ret = setresgid(nsgid, nsgid, nsgid);
+-	if (ret < 0)
+-		return log_error_errno(-1, errno, "Failed to setresgid(%d, %d, %d)",
+-				       (int)nsgid, (int)nsgid, (int)nsgid);
+-
+-	ret = setresuid(nsuid, nsuid, nsuid);
+-	if (ret < 0)
+-		return log_error_errno(-1, errno, "Failed to setresuid(%d, %d, %d)",
+-				       (int)nsuid, (int)nsuid, (int)nsuid);
+-
+-	destuid = get_ns_uid(arg->origuid);
+-	if (destuid == LXC_INVALID_UID)
+-		destuid = 0;
+-
+-	for (int i = 0; arg->hierarchiesi; i++) {
+-		int dirfd = arg->hierarchiesi->dfd_con;
+-
+-		if (dirfd < 0)
+-			return syserror_set(-EBADF, "Invalid cgroup file descriptor");
+-
+-		(void)fchowmodat(dirfd, "", destuid, nsgid, 0775);
+-
+-		/*
+-		 * Failures to chown() these are inconvenient but not
+-		 * detrimental We leave these owned by the container launcher,
+-		 * so that container root can write to the files to attach.  We
+-		 * chmod() them 664 so that container systemd can write to the
+-		 * files (which systemd in wily insists on doing).
+-		 */
+-
+-		if (arg->hierarchiesi->fs_type == LEGACY_HIERARCHY)
+-			(void)fchowmodat(dirfd, "tasks", destuid, nsgid, 0664);
+-
+-		(void)fchowmodat(dirfd, "cgroup.procs", destuid, nsgid, 0664);
+-
+-		if (arg->hierarchiesi->fs_type != UNIFIED_HIERARCHY)
+-			continue;
+-
+-		for (char **p = arg->hierarchiesi->delegate; p && *p; p++)
+-			(void)fchowmodat(dirfd, *p, destuid, nsgid, 0664);
+-	}
+-
+-	return 0;
+-}
+-
+-__cgfsng_ops static bool isulad_cgfsng_chown(struct cgroup_ops *ops,
+-				      struct lxc_conf *conf)
+-{
+-	struct generic_userns_exec_data wrap;
+-
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-	if (!ops->hierarchies)
+-		return true;
+-
+-	if (!ops->container_cgroup)
+-		return ret_set_errno(false, ENOENT);
+-
+-	if (!conf)
+-		return ret_set_errno(false, EINVAL);
+-
+-	if (list_empty(&conf->id_map))
+-		return true;
+-
+-	wrap.origuid = geteuid();
+-	wrap.path = NULL;
+-	wrap.hierarchies = ops->hierarchies;
+-	wrap.conf = conf;
+-
+-	if (userns_exec_1(conf, chown_cgroup_wrapper, &wrap, "chown_cgroup_wrapper") < 0)
+-		return log_error_errno(false, errno, "Error requesting cgroup chown in new user namespace");
+-
+-	return true;
+-}
+-
+-__cgfsng_ops static void isulad_cgfsng_finalize(struct cgroup_ops *ops)
+-{
+-	if (!ops)
+-		return;
+-
+-#ifdef HAVE_ISULAD
+-	if (ops->no_controller) {
+-		DEBUG("no controller found, isgnore isulad_cgfsng_payload_finalize");
+-		return;
+-	}
+-#endif
+-
+-	if (!ops->hierarchies)
+-		return;
+-
+-	for (int i = 0; ops->hierarchiesi; i++) {
+-		struct hierarchy *h = ops->hierarchiesi;
+-
+-		/* Close all monitor cgroup file descriptors. */
+-		close_prot_errno_disarm(h->dfd_mon);
+-	}
+-	/* Close the cgroup root file descriptor. */
+-	close_prot_errno_disarm(ops->dfd_mnt);
+-
+-	/*
+-	 * The checking for freezer support should obviously be done at cgroup
+-	 * initialization time but that doesn't work reliable. The freezer
+-	 * controller has been demoted (rightly so) to a simple file located in
+-	 * each non-root cgroup. At the time when the container is created we
+-	 * might still be located in /sys/fs/cgroup and so checking for
+-	 * cgroup.freeze won't tell us anything because this file doesn't exist
+-	 * in the root cgroup. We could then iterate through /sys/fs/cgroup and
+-	 * find an already existing cgroup and then check within that cgroup
+-	 * for the existence of cgroup.freeze but that will only work on
+-	 * systemd based hosts. Other init systems might not manage cgroups and
+-	 * so no cgroup will exist. So we defer until we have created cgroups
+-	 * for our container which means we check here.
+-	 */
+-        if (pure_unified_layout(ops) &&
+-            !faccessat(ops->unified->dfd_con, "cgroup.freeze", F_OK,
+-                       AT_SYMLINK_NOFOLLOW)) {
+-		TRACE("Unified hierarchy supports freezer");
+-		ops->unified->utilities |= FREEZER_CONTROLLER;
+-        }
+-}
+-
+-/* cgroup-full:* is done, no need to create subdirs */
+-static inline bool cg_mount_needs_subdirs(int type)
+-{
+-	return !(type >= LXC_AUTO_CGROUP_FULL_RO);
+-}
+-
+-/* After $rootfs/sys/fs/container/controller/the/cg/path has been created,
+- * remount controller ro if needed and bindmount the cgroupfs onto
+- * control/the/cg/path.
+- */
+-static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
+-				       char *controllerpath, char *cgpath,
+-				       const char *container_cgroup)
+-{
+-	__do_free char *sourcepath = NULL;
+-	int ret, remount_flags;
+-	int flags = MS_BIND;
+-
+-	if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_MIXED) {
+-		ret = mount(controllerpath, controllerpath, "cgroup", MS_BIND, NULL);
+-		if (ret < 0)
+-			return log_error_errno(-1, errno, "Failed to bind mount \"%s\" onto \"%s\"",
+-					       controllerpath, controllerpath);
+-
+-		remount_flags = add_required_remount_flags(controllerpath,
+-							   controllerpath,
+-							   flags | MS_REMOUNT);
+-		ret = mount(controllerpath, controllerpath, "cgroup",
+-			    remount_flags | MS_REMOUNT | MS_BIND | MS_RDONLY,
+-			    NULL);
+-		if (ret < 0)
+-			return log_error_errno(-1, errno, "Failed to remount \"%s\" ro", controllerpath);
+-
+-		INFO("Remounted %s read-only", controllerpath);
+-	}
+-
+-	sourcepath = must_make_path(h->at_mnt, h->at_base,
+-				    container_cgroup, NULL);
+-	if (type == LXC_AUTO_CGROUP_RO)
+-		flags |= MS_RDONLY;
+-
+-	ret = mount(sourcepath, cgpath, "cgroup", flags, NULL);
+-	if (ret < 0)
+-		return log_error_errno(-1, errno, "Failed to mount \"%s\" onto \"%s\"",
+-				       h->controllers0, cgpath);
+-	INFO("Mounted \"%s\" onto \"%s\"", h->controllers0, cgpath);
+-
+-	if (flags & MS_RDONLY) {
+-		remount_flags = add_required_remount_flags(sourcepath, cgpath,
+-							   flags | MS_REMOUNT);
+-		ret = mount(sourcepath, cgpath, "cgroup", remount_flags, NULL);
+-		if (ret < 0)
+-			return log_error_errno(-1, errno, "Failed to remount \"%s\" ro", cgpath);
+-		INFO("Remounted %s read-only", cgpath);
+-	}
+-
+-	INFO("Completed second stage cgroup automounts for \"%s\"", cgpath);
+-	return 0;
+-}
+-
+-/* __cgroupfs_mount
+- *
+- * Mount cgroup hierarchies directly without using bind-mounts. The main
+- * uses-cases are mounting cgroup hierarchies in cgroup namespaces and mounting
+- * cgroups for the LXC_AUTO_CGROUP_FULL option.
+- */
+-static int __cgroupfs_mount(int cgroup_automount_type, struct hierarchy *h,
+-			    struct lxc_rootfs *rootfs, int dfd_mnt_cgroupfs,
+-			    const char *hierarchy_mnt)
+-{
+-	__do_close int fd_fs = -EBADF;
+-	unsigned int flags = 0;
+-	char *fstype;
+-	int ret;
+-
+-	if (dfd_mnt_cgroupfs < 0)
+-		return ret_errno(EINVAL);
+-
+-	flags |= MOUNT_ATTR_NOSUID;
+-	flags |= MOUNT_ATTR_NOEXEC;
+-	flags |= MOUNT_ATTR_NODEV;
+-	flags |= MOUNT_ATTR_RELATIME;
+-
+-	if ((cgroup_automount_type == LXC_AUTO_CGROUP_RO) ||
+-	    (cgroup_automount_type == LXC_AUTO_CGROUP_FULL_RO) ||
+-	    (cgroup_automount_type == LXC_AUTO_CGROUP2_RO))
+-		flags |= MOUNT_ATTR_RDONLY;
+-
+-	if (is_unified_hierarchy(h))
+-		fstype = "cgroup2";
+-	else
+-		fstype = "cgroup";
+-
+-	if (can_use_mount_api()) {
+-		fd_fs = fs_prepare(fstype, -EBADF, "", 0, 0);
+-		if (fd_fs < 0)
+-			return log_error_errno(-errno, errno, "Failed to prepare filesystem context for %s", fstype);
+-
+-		if (!is_unified_hierarchy(h)) {
+-			for (const char **it = (const char **)h->controllers; it && *it; it++) {
+-				if (strnequal(*it, "name=", STRLITERALLEN("name=")))
+-					ret = fs_set_property(fd_fs, "name", *it + STRLITERALLEN("name="));
+-				else
+-					ret = fs_set_property(fd_fs, *it, "");
+-				if (ret < 0)
+-					return log_error_errno(-errno, errno, "Failed to add %s controller to cgroup filesystem context %d(dev)", *it, fd_fs);
+-			}
+-		}
+-
+-		ret = fs_attach(fd_fs, dfd_mnt_cgroupfs, hierarchy_mnt,
+-				PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH,
+-				flags);
+-	} else {
+-		__do_free char *controllers = NULL, *target = NULL;
+-		unsigned int old_flags = 0;
+-		const char *rootfs_mnt;
+-
+-		if (!is_unified_hierarchy(h)) {
+-			controllers = lxc_string_join(",", (const char **)h->controllers, false);
+-			if (!controllers)
+-				return ret_errno(ENOMEM);
+-		}
+-
+-		rootfs_mnt = get_rootfs_mnt(rootfs);
+-		ret = mnt_attributes_old(flags, &old_flags);
+-		if (ret)
+-			return log_error_errno(-EINVAL, EINVAL, "Unsupported mount properties specified");
+-
+-		target = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, hierarchy_mnt, NULL);
+-#ifdef HAVE_ISULAD
+-		ret = safe_mount(NULL, target, fstype, old_flags, controllers, rootfs_mnt, NULL);
+-#else
+-		ret = safe_mount(NULL, target, fstype, old_flags, controllers, rootfs_mnt);
+-#endif
+-	}
+-	if (ret < 0)
+-		return log_error_errno(ret, errno, "Failed to mount %s filesystem onto %d(%s)",
+-				       fstype, dfd_mnt_cgroupfs, maybe_empty(hierarchy_mnt));
+-
+-	DEBUG("Mounted cgroup filesystem %s onto %d(%s)",
+-	      fstype, dfd_mnt_cgroupfs, maybe_empty(hierarchy_mnt));
+-	return 0;
+-}
+-
+-static inline int cgroupfs_mount(int cgroup_automount_type, struct hierarchy *h,
+-				 struct lxc_rootfs *rootfs,
+-				 int dfd_mnt_cgroupfs, const char *hierarchy_mnt)
+-{
+-	return __cgroupfs_mount(cgroup_automount_type, h, rootfs,
+-				dfd_mnt_cgroupfs, hierarchy_mnt);
+-}
+-
+-static inline int cgroupfs_bind_mount(int cgroup_automount_type, struct hierarchy *h,
+-				      struct lxc_rootfs *rootfs,
+-				      int dfd_mnt_cgroupfs,
+-				      const char *hierarchy_mnt)
+-{
+-	switch (cgroup_automount_type) {
+-	case LXC_AUTO_CGROUP_FULL_RO:
+-		break;
+-	case LXC_AUTO_CGROUP_FULL_RW:
+-		break;
+-	case LXC_AUTO_CGROUP_FULL_MIXED:
+-		break;
+-	default:
+-		return 0;
+-	}
+-
+-	return __cgroupfs_mount(cgroup_automount_type, h, rootfs,
+-				dfd_mnt_cgroupfs, hierarchy_mnt);
+-}
+-
+-/* __cg_mount_direct
+- *
+- * Mount cgroup hierarchies directly without using bind-mounts. The main
+- * uses-cases are mounting cgroup hierarchies in cgroup namespaces and mounting
+- * cgroups for the LXC_AUTO_CGROUP_FULL option.
+- */
+-static int __cg_mount_direct(int type, struct hierarchy *h,
+-			     const char *controllerpath)
+-{
+-	 __do_free char *controllers = NULL;
+-	 char *fstype = "cgroup2";
+-	 unsigned long flags = 0;
+-	 int ret;
+-
+-	 flags |= MS_NOSUID;
+-	 flags |= MS_NOEXEC;
+-	 flags |= MS_NODEV;
+-	 flags |= MS_RELATIME;
+-
+-	 if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_FULL_RO)
+-		 flags |= MS_RDONLY;
+-
+-	 if (h->fs_type != CGROUP2_SUPER_MAGIC) {
+-		 controllers = lxc_string_join(",", (const char **)h->controllers, false);
+-		 if (!controllers)
+-			 return -ENOMEM;
+-		 fstype = "cgroup";
+-	}
+-
+-	ret = mount("cgroup", controllerpath, fstype, flags, controllers);
+-	if (ret < 0)
+-		return log_error_errno(-1, errno, "Failed to mount \"%s\" with cgroup filesystem type %s",
+-				       controllerpath, fstype);
+-
+-	DEBUG("Mounted \"%s\" with cgroup filesystem type %s", controllerpath, fstype);
+-	return 0;
+-}
+-
+-static inline int cg_mount_in_cgroup_namespace(int type, struct hierarchy *h,
+-					       const char *controllerpath)
+-{
+-	return __cg_mount_direct(type, h, controllerpath);
+-}
+-
+-static inline int cg_mount_cgroup_full(int type, struct hierarchy *h,
+-				       const char *controllerpath)
+-{
+-	if (type < LXC_AUTO_CGROUP_FULL_RO || type > LXC_AUTO_CGROUP_FULL_MIXED)
+-		return 0;
+-
+-	return __cg_mount_direct(type, h, controllerpath);
+-}
+-
+-__cgfsng_ops static bool isulad_cgfsng_mount(struct cgroup_ops *ops,
+-				      struct lxc_handler *handler, int cg_flags)
+-{
+-	__do_close int dfd_mnt_tmpfs = -EBADF, fd_fs = -EBADF;
+-	__do_free char *cgroup_root = NULL;
+-	int cgroup_automount_type;
+-	bool in_cgroup_ns = false, wants_force_mount = false;
+-	struct lxc_conf *conf = handler->conf;
+-	struct lxc_rootfs *rootfs = &conf->rootfs;
+-	const char *rootfs_mnt = get_rootfs_mnt(rootfs);
+-	int ret;
+-#ifdef HAVE_ISULAD
+-	char **merged = NULL;
+-	__do_free char *systemdpath = NULL;
+-	__do_free char *unifiedpath = NULL;
+-#endif
+-
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-	if (!ops->hierarchies)
+-		return true;
+-
+-	if (!conf)
+-		return ret_set_errno(false, EINVAL);
+-
+-	if ((cg_flags & LXC_AUTO_CGROUP_MASK) == 0)
+-		return log_trace(true, "No cgroup mounts requested");
+-
+-	if (cg_flags & LXC_AUTO_CGROUP_FORCE) {
+-		cg_flags &= ~LXC_AUTO_CGROUP_FORCE;
+-		wants_force_mount = true;
+-	}
+-
+-	switch (cg_flags) {
+-	case LXC_AUTO_CGROUP_RO:
+-		TRACE("Read-only cgroup mounts requested");
+-		break;
+-	case LXC_AUTO_CGROUP_RW:
+-		TRACE("Read-write cgroup mounts requested");
+-		break;
+-	case LXC_AUTO_CGROUP_MIXED:
+-		TRACE("Mixed cgroup mounts requested");
+-		break;
+-	case LXC_AUTO_CGROUP_FULL_RO:
+-		TRACE("Full read-only cgroup mounts requested");
+-		break;
+-	case LXC_AUTO_CGROUP_FULL_RW:
+-		TRACE("Full read-write cgroup mounts requested");
+-		break;
+-	case LXC_AUTO_CGROUP_FULL_MIXED:
+-		TRACE("Full mixed cgroup mounts requested");
+-		break;
+-	case LXC_AUTO_CGROUP2_RW:
+-		TRACE("Read-write cgroup2 mount requested");
+-		break;
+-	case LXC_AUTO_CGROUP2_RO:
+-		TRACE("Read-only cgroup2 mount requested");
+-		break;
+-	default:
+-		return log_error_errno(false, EINVAL, "Invalid cgroup mount options specified");
+-	}
+-	cgroup_automount_type = cg_flags;
+-
+-	if (!wants_force_mount) {
+-		wants_force_mount = !lxc_wants_cap(CAP_SYS_ADMIN, conf);
+-
+-		/*
+-		 * Most recent distro versions currently have init system that
+-		 * do support cgroup2 but do not mount it by default unless
+-		 * explicitly told so even if the host is cgroup2 only. That
+-		 * means they often will fail to boot. Fix this by pre-mounting
+-		 * cgroup2 by default. We will likely need to be doing this a
+-		 * few years until all distros have switched over to cgroup2 at
+-		 * which point we can safely assume that their init systems
+-		 * will mount it themselves.
+-		 */
+-		if (pure_unified_layout(ops))
+-			wants_force_mount = true;
+-	}
+-
+-	if (cgns_supported() && container_uses_namespace(handler, CLONE_NEWCGROUP))
+-		in_cgroup_ns = true;
+-
+-	if (in_cgroup_ns && !wants_force_mount)
+-		return log_trace(true, "Mounting cgroups not requested or needed");
+-
+-	/* This is really the codepath that we want. */
+-	if (pure_unified_layout(ops) ||
+-	    (cgroup_automount_type == LXC_AUTO_CGROUP2_RW) ||
+-	    (cgroup_automount_type == LXC_AUTO_CGROUP2_RO)) {
+-		__do_close int dfd_mnt_unified = -EBADF;
+-
+-		if (!ops->unified)
+-			return log_error_errno(false, EINVAL, "No unified cgroup hierarchy mounted on the host");
+-
+-		dfd_mnt_unified = open_at(rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
+-					  PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
+-		if (dfd_mnt_unified < 0)
+-			return syserror_ret(false, "Failed to open %d(%s)",
+-					    rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
+-		/*
+-		 * If cgroup namespaces are supported but the container will
+-		 * not have CAP_SYS_ADMIN after it has started we need to mount
+-		 * the cgroups manually.
+-		 *
+-		 * Note that here we know that wants_force_mount is true.
+-		 * Otherwise we would've returned early above.
+-		 */
+-		if (in_cgroup_ns) {
+-			/*
+-			 *  1. cgroup:rw:force    -> Mount the cgroup2 filesystem.
+-			 *  2. cgroup:ro:force    -> Mount the cgroup2 filesystem read-only.
+-			 *  3. cgroup:mixed:force -> See comment above how this
+-			 *                           does not apply so
+-			 *                           cgroup:mixed is equal to
+-			 *                           cgroup:rw when cgroup
+-			 *                           namespaces are supported.
+-
+-			 *  4. cgroup:rw    -> No-op; init system responsible for mounting.
+-			 *  5. cgroup:ro    -> No-op; init system responsible for mounting.
+-			 *  6. cgroup:mixed -> No-op; init system responsible for mounting.
+-                         *
+-			 *  7. cgroup-full:rw    -> Not supported.
+-			 *  8. cgroup-full:ro    -> Not supported.
+-			 *  9. cgroup-full:mixed -> Not supported.
+-
+-			 * 10. cgroup-full:rw:force    -> Not supported.
+-			 * 11. cgroup-full:ro:force    -> Not supported.
+-			 * 12. cgroup-full:mixed:force -> Not supported.
+-			 *
+-			 * 13. cgroup2		-> No-op; init system responsible for mounting.
+-			 * 14. cgroup2:ro	-> No-op; init system responsible for mounting.
+-			 * 15. cgroup2:force	-> Mount the cgroup2 filesystem read-write
+-			 * 16. cgroup2:ro:force	-> Mount the cgroup2 filesystem read-only
+-			 */
+-			ret = cgroupfs_mount(cgroup_automount_type, ops->unified, rootfs, dfd_mnt_unified, "");
+-			if (ret < 0)
+-				return syserror_ret(false, "Failed to force mount cgroup filesystem in cgroup namespace");
+-
+-			return log_trace(true, "Force mounted cgroup filesystem in new cgroup namespace");
+-		} else {
+-			/*
+-			 * Either no cgroup namespace supported (highly
+-			 * unlikely unless we're dealing with a Frankenkernel.
+-			 * Or the user requested to keep the cgroup namespace
+-			 * of the host or another container.
+-			 */
+-			errno = EOPNOTSUPP;
+-			if (wants_force_mount)
+-				SYSWARN("Force-mounting the unified cgroup hierarchy without cgroup namespace support is currently not supported");
+-			else
+-				SYSWARN("Mounting the unified cgroup hierarchy without cgroup namespace support is currently not supported");
+-		}
+-
+-		return syserror_ret(false, "Failed to mount cgroups");
+-	}
+-
+-	/*
+-	 * Mount a tmpfs over DEFAULT_CGROUP_MOUNTPOINT. Note that we're
+-	 * relying on RESOLVE_BENEATH so we need to skip the leading "/" in the
+-	 * DEFAULT_CGROUP_MOUNTPOINT define.
+-	 */
+-	if (can_use_mount_api()) {
+-		fd_fs = fs_prepare("tmpfs", -EBADF, "", 0, 0);
+-		if (fd_fs < 0)
+-			return log_error_errno(false, errno, "Failed to create new filesystem context for tmpfs");
+-
+-		ret = fs_set_property(fd_fs, "mode", "0755");
+-		if (ret < 0)
+-			return log_error_errno(false, errno, "Failed to mount tmpfs onto %d(dev)", fd_fs);
+-
+-		ret = fs_set_property(fd_fs, "size", "10240k");
+-		if (ret < 0)
+-			return log_error_errno(false, errno, "Failed to mount tmpfs onto %d(dev)", fd_fs);
+-
+-		ret = fs_attach(fd_fs, rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
+-				PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV,
+-				MOUNT_ATTR_NOSUID | MOUNT_ATTR_NODEV |
+-				MOUNT_ATTR_NOEXEC | MOUNT_ATTR_RELATIME);
+-	} else {
+-		cgroup_root = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, NULL);
+-		ret = safe_mount(NULL, cgroup_root, "tmpfs",
+-				 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
+-				 "size=10240k,mode=755", rootfs_mnt, handler->conf->rootfs.lsm_se_mount_context);
+-	}
+-	if (ret < 0)
+-		return log_error_errno(false, errno, "Failed to mount tmpfs on %s",
+-				       DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
+-
+-	dfd_mnt_tmpfs = open_at(rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
+-				PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
+-	if (dfd_mnt_tmpfs < 0)
+-		return syserror_ret(false, "Failed to open %d(%s)",
+-				    rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
+-
+-	for (int i = 0; ops->hierarchiesi; i++) {
+-		__do_free char *hierarchy_mnt = NULL, *path2 = NULL;
+-		struct hierarchy *h = ops->hierarchiesi;
+-
+-#ifdef HAVE_ISULAD
+-		// isulad: symlink subcgroup
+-		if (strchr(h->at_mnt, ',') != NULL) {
+-			int pret;
+-			pret = lxc_append_string(&merged, h->at_mnt);
+-			if (pret < 0)
+-				return false;
+-		}
+-#endif
+-
+-		ret = mkdirat(dfd_mnt_tmpfs, h->at_mnt, 0000);
+-#ifdef HAVE_ISULAD
+-		if (ret < 0) {
+-			lxc_free_array((void **)merged, free);
+-			return syserror_ret(false, "Failed to create cgroup at_mnt %d(%s)", dfd_mnt_tmpfs, h->at_mnt);
+-		}
+-#else
+-		if (ret < 0)
+-			return syserror_ret(false, "Failed to create cgroup at_mnt %d(%s)", dfd_mnt_tmpfs, h->at_mnt);
+-#endif
+-
+-		if (in_cgroup_ns && wants_force_mount) {
+-			/*
+-			 * If cgroup namespaces are supported but the container
+-			 * will not have CAP_SYS_ADMIN after it has started we
+-			 * need to mount the cgroups manually.
+-			 */
+-			ret = cgroupfs_mount(cgroup_automount_type, h, rootfs,
+-					     dfd_mnt_tmpfs, h->at_mnt);
+-#ifdef HAVE_ISULAD
+-			if (ret < 0) {
+-				lxc_free_array((void **)merged, free);
+-				return false;
+-			}
+-#else
+-			if (ret < 0)
+-				return false;
+-#endif
+-			continue;
+-		}
+-
+-		/* Here is where the ancient kernel section begins. */
+-		ret = cgroupfs_bind_mount(cgroup_automount_type, h, rootfs,
+-					  dfd_mnt_tmpfs, h->at_mnt);
+-#ifdef HAVE_ISULAD
+-		if (ret < 0) {
+-			lxc_free_array((void **)merged, free);
+-			return false;
+-		}
+-#else
+-		if (ret < 0)
+-			return false;
+-#endif
+-
+-		if (!cg_mount_needs_subdirs(cgroup_automount_type))
+-			continue;
+-
+-		if (!cgroup_root)
+-			cgroup_root = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, NULL);
+-
+-		hierarchy_mnt = must_make_path(cgroup_root, h->at_mnt, NULL);
+-#ifdef HAVE_ISULAD
+-		// isulad: ignore ops->container_cgroup so we will not see directory lxc after /sys/fs/cgroup/xxx in container,
+-		// isulad: ignore h->container_base_path so we will not see subgroup of /sys/fs/cgroup/xxx/subgroup in container
+-		path2 = must_make_path(h->at_mnt, NULL);
+-#else
+-		path2 = must_make_path(hierarchy_mnt, h->at_base,
+-				       ops->container_cgroup, NULL);
+-#endif
+-		ret = mkdir_p(path2, 0755);
+-#ifdef HAVE_ISULAD
+-		if (ret < 0 && (errno != EEXIST)) {
+-			lxc_free_array((void **)merged, free);
+-			return false;
+-		}
+-#else
+-		if (ret < 0 && (errno != EEXIST))
+-			return false;
+-#endif
+-
+-		ret = cg_legacy_mount_controllers(cgroup_automount_type, h,
+-						  hierarchy_mnt, path2,
+-						  ops->container_cgroup);
+-#ifdef HAVE_ISULAD
+-		if (ret < 0) {
+-			lxc_free_array((void **)merged, free);
+-			return false;
+-		}
+-#else
+-		if (ret < 0)
+-			return false;
+-#endif
+-	}
+-
+-#ifdef HAVE_ISULAD
+-	// isulad: symlink subcgroup
+-	if (merged) {
+-		char **mc = NULL;
+-		for (mc = merged; *mc; mc++) {
+-			char *token = NULL;
+-			char *copy = must_copy_string(*mc);
+-			lxc_iterate_parts(token, copy, ",") {
+-				int mret;
+-				char *link;
+-				link = must_make_path(cgroup_root, token, NULL);
+-				mret = symlink(*mc, link);
+-				if (mret < 0 && errno != EEXIST) {
+-					SYSERROR("Failed to create link %s for target %s", link, *mc);
+-					free(copy);
+-					free(link);
+-					lxc_free_array((void **)merged, free);
+-					return false;
+-				}
+-				free(link);
+-			}
+-			free(copy);
+-		}
+-	}
+-
+-	// isulad: remount /sys/fs/cgroup to readonly
+-	if (cg_flags == LXC_AUTO_CGROUP_FULL_RO || cg_flags == LXC_AUTO_CGROUP_RO) {
+-		ret = mount(cgroup_root, cgroup_root, "bind",
+-		            MS_NOSUID|MS_NODEV|MS_NOEXEC|MS_RELATIME|MS_RDONLY|MS_BIND|MS_REMOUNT, NULL);
+-		if (ret < 0) {
+-			SYSERROR("Failed to remount /sys/fs/cgroup.");
+-			lxc_free_array((void **)merged, free);
+-			return false;
+-		}
+-	}
+-
+-	// isulad: remount /sys/fs/cgroup/systemd to readwrite for system container
+-	if (handler->conf->systemd != NULL && strcmp(handler->conf->systemd, "true") == 0)
+-	{
+-		unifiedpath = must_make_path(get_rootfs_mnt(rootfs), "/sys/fs/cgroup/unified", NULL);
+-		if (dir_exists(unifiedpath))
+-		{
+-			ret = umount2(unifiedpath, MNT_DETACH);
+-			if (ret < 0)
+-			{
+-				SYSERROR("Failed to umount /sys/fs/cgroup/unified.");
+-				lxc_free_array((void **)merged, free);
+-				return false;
+-			}
+-		}
+-
+-		systemdpath = must_make_path(get_rootfs_mnt(rootfs), "/sys/fs/cgroup/systemd", NULL);
+-		ret = mount(systemdpath, systemdpath, "bind",
+-					MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME | MS_BIND | MS_REMOUNT, NULL);
+-		if (ret < 0)
+-		{
+-			SYSERROR("Failed to remount /sys/fs/cgroup/systemd.");
+-			lxc_free_array((void **)merged, free);
+-			return false;
+-		}
+-	}
+-#endif
+-
+-	return true;
+-}
+-
+-/* Only root needs to escape to the cgroup of its init. */
+-__cgfsng_ops static bool isulad_cgfsng_criu_escape(const struct cgroup_ops *ops,
+-				       struct lxc_conf *conf)
+-{
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-	if (!ops->hierarchies)
+-		return true;
+-
+-	if (!conf)
+-		return ret_set_errno(false, EINVAL);
+-
+-	if (conf->cgroup_meta.relative || geteuid())
+-		return true;
+-
+-	for (int i = 0; ops->hierarchiesi; i++) {
+-		__do_free char *fullpath = NULL;
+-		int ret;
+-
+-		fullpath =
+-		    must_make_path(ops->hierarchiesi->at_mnt,
+-				   ops->hierarchiesi->at_base,
+-				   "cgroup.procs", NULL);
+-		ret = lxc_write_to_file(fullpath, "0", 2, false, 0666);
+-		if (ret != 0)
+-			return log_error_errno(false, errno, "Failed to escape to cgroup \"%s\"", fullpath);
+-	}
+-
+-	return true;
+-}
+-
+-__cgfsng_ops static int isulad_cgfsng_criu_num_hierarchies(struct cgroup_ops *ops)
+-{
+-	int i = 0;
+-
+-	if (!ops)
+-		return ret_set_errno(-1, ENOENT);
+-
+-	if (!ops->hierarchies)
+-		return 0;
+-
+-	for (; ops->hierarchiesi; i++)
+-		;
+-
+-	return i;
+-}
+-
+-__cgfsng_ops static bool isulad_cgfsng_criu_get_hierarchies(struct cgroup_ops *ops, int n,
+-						char ***out)
+-{
+-	int i;
+-
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-	if (!ops->hierarchies)
+-		return ret_set_errno(false, ENOENT);
+-
+-	/* sanity check n */
+-	for (i = 0; i < n; i++)
+-		if (!ops->hierarchiesi)
+-			return ret_set_errno(false, ENOENT);
+-
+-	*out = ops->hierarchiesi->controllers;
+-
+-	return true;
+-}
+-
+-static bool cg_legacy_freeze(struct cgroup_ops *ops)
+-{
+-	struct hierarchy *h;
+-
+-	h = get_hierarchy(ops, "freezer");
+-	if (!h)
+-		return ret_set_errno(-1, ENOENT);
+-
+-	return lxc_write_openat(h->path_con, "freezer.state",
+-				"FROZEN", STRLITERALLEN("FROZEN"));
+-}
+-
+-static int freezer_cgroup_events_cb(int fd, uint32_t events, void *cbdata,
+-				    struct lxc_async_descr *descr)
+-{
+-	__do_close int duped_fd = -EBADF;
+-	__do_free char *line = NULL;
+-	__do_fclose FILE *f = NULL;
+-	int state = PTR_TO_INT(cbdata);
+-	size_t len;
+-	const char *state_string;
+-
+-	duped_fd = dup(fd);
+-	if (duped_fd < 0)
+-		return LXC_MAINLOOP_ERROR;
+-
+-	if (lseek(duped_fd, 0, SEEK_SET) < (off_t)-1)
+-		return LXC_MAINLOOP_ERROR;
+-
+-	f = fdopen(duped_fd, "re");
+-	if (!f)
+-		return LXC_MAINLOOP_ERROR;
+-	move_fd(duped_fd);
+-
+-	if (state == 1)
+-		state_string = "frozen 1";
+-	else
+-		state_string = "frozen 0";
+-
+-	while (getline(&line, &len, f) != -1)
+-		if (strncmp(line, state_string, STRLITERALLEN("frozen") + 2) == 0)
+-			return LXC_MAINLOOP_CLOSE;
+-
+-	return LXC_MAINLOOP_CONTINUE;
+-}
+-
+-static int cg_unified_freeze(struct cgroup_ops *ops, int timeout)
+-{
+-	__do_close int fd = -EBADF;
+-	call_cleaner(lxc_mainloop_close) struct lxc_async_descr *descr_ptr = NULL;
+-	int ret;
+-	struct lxc_async_descr descr;
+-	struct hierarchy *h;
+-
+-	h = ops->unified;
+-	if (!h)
+-		return ret_set_errno(-1, ENOENT);
+-
+-	if (!h->path_con)
+-		return ret_set_errno(-1, EEXIST);
+-
+-	if (timeout != 0) {
+-		__do_free char *events_file = NULL;
+-
+-		events_file = must_make_path(h->path_con, "cgroup.events", NULL);
+-		fd = open(events_file, O_RDONLY | O_CLOEXEC);
+-		if (fd < 0)
+-			return log_error_errno(-1, errno, "Failed to open cgroup.events file");
+-
+-		ret = lxc_mainloop_open(&descr);
+-		if (ret)
+-			return log_error_errno(-1, errno, "Failed to create epoll instance to wait for container freeze");
+-
+-		/* automatically cleaned up now */
+-		descr_ptr = &descr;
+-
+-		ret = lxc_mainloop_add_handler(&descr, fd, freezer_cgroup_events_cb, default_cleanup_handler,
+-									   INT_TO_PTR((int){1}), "freezer_cgroup_events");
+-		if (ret < 0)
+-			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
+-	}
+-
+-	ret = lxc_write_openat(h->path_con, "cgroup.freeze", "1", 1);
+-	if (ret < 0)
+-		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
+-
+-	if (timeout != 0 && lxc_mainloop(&descr, timeout))
+-		return log_error_errno(-1, errno, "Failed to wait for container to be frozen");
+-
+-	return 0;
+-}
+-
+-__cgfsng_ops static int isulad_cgfsng_freeze(struct cgroup_ops *ops, int timeout)
+-{
+-	if (!ops->hierarchies)
+-		return ret_set_errno(-1, ENOENT);
+-
+-	if (ops->cgroup_layout != CGROUP_LAYOUT_UNIFIED)
+-		return cg_legacy_freeze(ops);
+-
+-	return cg_unified_freeze(ops, timeout);
+-}
+-
+-static int cg_legacy_unfreeze(struct cgroup_ops *ops)
+-{
+-	struct hierarchy *h;
+-
+-	h = get_hierarchy(ops, "freezer");
+-	if (!h)
+-		return ret_set_errno(-1, ENOENT);
+-
+-	return lxc_write_openat(h->path_con, "freezer.state",
+-				"THAWED", STRLITERALLEN("THAWED"));
+-}
+-
+-static int cg_unified_unfreeze(struct cgroup_ops *ops, int timeout)
+-{
+-	__do_close int fd = -EBADF;
+-	call_cleaner(lxc_mainloop_close)struct lxc_async_descr *descr_ptr = NULL;
+-	int ret;
+-	struct lxc_async_descr descr;
+-	struct hierarchy *h;
+-
+-	h = ops->unified;
+-	if (!h)
+-		return ret_set_errno(-1, ENOENT);
+-
+-	if (!h->path_con)
+-		return ret_set_errno(-1, EEXIST);
+-
+-	if (timeout != 0) {
+-		__do_free char *events_file = NULL;
+-
+-		events_file = must_make_path(h->path_con, "cgroup.events", NULL);
+-		fd = open(events_file, O_RDONLY | O_CLOEXEC);
+-		if (fd < 0)
+-			return log_error_errno(-1, errno, "Failed to open cgroup.events file");
+-
+-		ret = lxc_mainloop_open(&descr);
+-		if (ret)
+-			return log_error_errno(-1, errno, "Failed to create epoll instance to wait for container unfreeze");
+-
+-		/* automatically cleaned up now */
+-		descr_ptr = &descr;
+-
+-		ret = lxc_mainloop_add_handler(&descr, fd, freezer_cgroup_events_cb, default_cleanup_handler,
+-									   INT_TO_PTR((int){0}), "freezer_cgroup_events");
+-		if (ret < 0)
+-			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
+-	}
+-
+-	ret = lxc_write_openat(h->path_con, "cgroup.freeze", "0", 1);
+-	if (ret < 0)
+-		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
+-
+-	if (timeout != 0 && lxc_mainloop(&descr, timeout))
+-		return log_error_errno(-1, errno, "Failed to wait for container to be unfrozen");
+-
+-	return 0;
+-}
+-
+-__cgfsng_ops static int isulad_cgfsng_unfreeze(struct cgroup_ops *ops, int timeout)
+-{
+-	if (!ops->hierarchies)
+-		return ret_set_errno(-1, ENOENT);
+-
+-	if (ops->cgroup_layout != CGROUP_LAYOUT_UNIFIED)
+-		return cg_legacy_unfreeze(ops);
+-
+-	return cg_unified_unfreeze(ops, timeout);
+-}
+-
+-__cgfsng_ops static const char *isulad_cgfsng_get_cgroup(struct cgroup_ops *ops,
+-						  const char *controller)
+-{
+-	struct hierarchy *h;
+-
+-	h = get_hierarchy(ops, controller);
+-	if (!h)
+-		return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
+-				      controller ? controller : "(null)");
+-
+-	if (!h->path_con)
+-		h->path_con = must_make_path(h->at_mnt, h->at_base, ops->container_cgroup, NULL);
+-
+-	return h->path_con
+-		   ? h->path_con + strlen(h->at_mnt)
+-		   : NULL;
+-}
+-
+-__cgfsng_ops static const char *isulad_cgfsng_get_cgroup_full_path(struct cgroup_ops *ops,
+-						  const char *controller)
+-{
+-	struct hierarchy *h;
+-
+-	h = get_hierarchy(ops, controller);
+-	if (!h)
+-		return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
+-				      controller ? controller : "(null)");
+-
+-	if (!h->path_con)
+-		h->path_con = must_make_path(h->at_mnt, h->at_base, ops->container_cgroup, NULL);
+-
+-	return h->path_con;
+-}
+-
+-/* Given a cgroup path returned from lxc_cmd_get_cgroup_path, build a full path,
+- * which must be freed by the caller.
+- */
+-static inline char *build_full_cgpath_from_monitorpath(struct hierarchy *h,
+-						       const char *inpath,
+-						       const char *filename)
+-{
+-	return must_make_path(h->at_mnt, inpath, filename, NULL);
+-}
+-
+-static int cgroup_attach_leaf(const struct lxc_conf *conf, int unified_fd, pid_t pid)
+-{
+-	int idx = 1;
+-	int ret;
+-	char pidstrINTTYPE_TO_STRLEN(int64_t) + 1;
+-	size_t pidstr_len;
+-
+-	/* Create leaf cgroup. */
+-	ret = mkdirat(unified_fd, ".lxc", 0755);
+-	if (ret < 0 && errno != EEXIST)
+-		return log_error_errno(-1, errno, "Failed to create leaf cgroup \".lxc\"");
+-
+-	pidstr_len = sprintf(pidstr, INT64_FMT, (int64_t)pid);
+-	ret = lxc_writeat(unified_fd, ".lxc/cgroup.procs", pidstr, pidstr_len);
+-	if (ret < 0)
+-		ret = lxc_writeat(unified_fd, "cgroup.procs", pidstr, pidstr_len);
+-	if (ret == 0)
+-		return 0;
+-
+-	/* this is a non-leaf node */
+-	if (errno != EBUSY)
+-		return log_error_errno(-1, errno, "Failed to attach to unified cgroup");
+-
+-	do {
+-		bool rm = false;
+-		char attach_cgroupSTRLITERALLEN(".lxc-/cgroup.procs") + INTTYPE_TO_STRLEN(int) + 1;
+-		char *slash;
+-
+-		ret = snprintf(attach_cgroup, sizeof(attach_cgroup), ".lxc-%d/cgroup.procs", idx);
+-		if (ret < 0 || (size_t)ret >= sizeof(attach_cgroup))
+-			return ret_errno(EIO);
+-
+-		/*
+-		 * This shouldn't really happen but the compiler might complain
+-		 * that a short write would cause a buffer overrun. So be on
+-		 * the safe side.
+-		 */
+-		if ((size_t)ret < STRLITERALLEN(".lxc-/cgroup.procs"))
+-			return log_error_errno(-EINVAL, EINVAL, "Unexpected short write would cause buffer-overrun");
+-
+-		slash = &attach_cgroupret - STRLITERALLEN("/cgroup.procs");
+-		*slash = '\0';
+-
+-		ret = mkdirat(unified_fd, attach_cgroup, 0755);
+-		if (ret < 0 && errno != EEXIST)
+-			return log_error_errno(-1, errno, "Failed to create cgroup %s", attach_cgroup);
+-		if (ret == 0)
+-			rm = true;
+-
+-		*slash = '/';
+-
+-		ret = lxc_writeat(unified_fd, attach_cgroup, pidstr, pidstr_len);
+-		if (ret == 0)
+-			return 0;
+-
+-		if (rm && unlinkat(unified_fd, attach_cgroup, AT_REMOVEDIR))
+-			SYSERROR("Failed to remove cgroup \"%d(%s)\"", unified_fd, attach_cgroup);
+-
+-		/* this is a non-leaf node */
+-		if (errno != EBUSY)
+-			return log_error_errno(-1, errno, "Failed to attach to unified cgroup");
+-
+-		idx++;
+-	} while (idx < 1000);
+-
+-	return log_error_errno(-1, errno, "Failed to attach to unified cgroup");
+-}
+-
+-static int cgroup_attach_create_leaf(const struct lxc_conf *conf,
+-				     int unified_fd, int *sk_fd, bool unprivileged)
+-{
+-	__do_close int sk = *sk_fd, target_fd0 = -EBADF, target_fd1 = -EBADF;
+-	int target_fds2;
+-	ssize_t ret;
+-
+-	/* Create leaf cgroup. */
+-	ret = mkdirat(unified_fd, ".lxc", 0755);
+-	if (ret < 0 && errno != EEXIST)
+-		return syserror("Failed to create leaf cgroup \".lxc\"");
+-
+-	if (unprivileged) {
+-		target_fd0 = open_at(unified_fd, ".lxc/cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
+-		if (target_fd0 < 0)
+-			return syserror("Failed to open \".lxc/cgroup.procs\"");
+-		target_fds0 = target_fd0;
+-
+-		target_fd1 = open_at(unified_fd, "cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
+-		if (target_fd1 < 0)
+-			return syserror("Failed to open \".lxc/cgroup.procs\"");
+-		target_fds1 = target_fd1;
+-
+-		ret = lxc_abstract_unix_send_fds(sk, target_fds, 2, NULL, 0);
+-		if (ret <= 0)
+-			return syserror("Failed to send \".lxc/cgroup.procs\" fds %d and %d",
+-					target_fd0, target_fd1);
+-
+-		TRACE("Sent cgroup file descriptors %d and %d", target_fd0, target_fd1);
+-	} else {
+-		ret = lxc_abstract_unix_send_credential(sk, NULL, 0);
+-		if (ret < 0)
+-			return syserror("Failed to inform parent that we are done setting up mounts");
+-
+-		TRACE("Informed parent process that cgroup has been created");
+-	}
+-
+-	return 0;
+-}
+-
+-static int cgroup_attach_move_into_leaf(const struct lxc_conf *conf,
+-					const char *lxcpath,
+-					int unified_fd, int *sk_fd, pid_t pid,
+-					bool unprivileged)
+-{
+-	__do_close int sk = *sk_fd, target_fd0 = -EBADF, target_fd1 = -EBADF;
+-	char pidstrINTTYPE_TO_STRLEN(int64_t) + 1;
+-	size_t pidstr_len;
+-#if HAVE_LIBSYSTEMD
+-	__do_free char *scope = NULL;
+-#endif
+-	ssize_t ret;
+-
+-#if HAVE_LIBSYSTEMD
+-	scope = lxc_cmd_get_systemd_scope(conf->name, lxcpath);
+-	if (scope) {
+-		TRACE("%s:%s is running under systemd-created scope '%s'.  Attaching...", lxcpath, conf->name, scope);
+-		if (enter_scope(scope, pid))
+-			TRACE("Successfully entered scope '%s'", scope);
+-		else
+-			ERROR("Failed entering scope '%s'", scope);
+-	} else {
+-		TRACE("%s:%s is not running under a systemd-created scope", lxcpath, conf->name);
+-	}
+-#endif
+-	if (unprivileged) {
+-		ret = lxc_abstract_unix_recv_two_fds(sk, &target_fd0, &target_fd1);
+-		if (ret < 0)
+-			return log_error_errno(-1, errno, "Failed to receive target cgroup fd");
+-	} else {
+-		ret = lxc_abstract_unix_rcv_credential(sk, NULL, 0);
+-		if (ret < 0)
+-			return syserror("Failed to receive notification from parent process");
+-
+-		TRACE("Child process informed us that cgroup has been created");
+-
+-		target_fd0 = open_at(unified_fd, ".lxc/cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
+-		if (target_fd0 < 0)
+-			return syserror("Failed to open \".lxc/cgroup.procs\"");
+-
+-		target_fd1 = open_at(unified_fd, "cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
+-		if (target_fd1 < 0)
+-			return syserror("Failed to open \".lxc/cgroup.procs\"");
+-
+-		TRACE("Opened target cgroup file descriptors %d and %d", target_fd0, target_fd1);
+-	}
+-
+-	pidstr_len = sprintf(pidstr, INT64_FMT, (int64_t)pid);
+-
+-	ret = lxc_write_nointr(target_fd0, pidstr, pidstr_len);
+-	if (ret > 0 && (size_t)ret == pidstr_len)
+-		return log_debug(0, "Moved process into target cgroup via fd %d", target_fd0);
+-
+-	ret = lxc_write_nointr(target_fd1, pidstr, pidstr_len);
+-	if (ret > 0 && (size_t)ret == pidstr_len)
+-		return log_debug(0, "Moved process into target cgroup via fd %d", target_fd1);
+-
+-	return syserror("Failed to move process into target cgroup via fd %d and %d", target_fd0, target_fd1);
+-}
+-
+-struct userns_exec_unified_attach_data {
+-	const struct lxc_conf *conf;
+-	const char *lxcpath;
+-	int unified_fd;
+-	int sk_pair2;
+-	pid_t pid;
+-	bool unprivileged;
+-};
+-
+-static int cgroup_unified_attach_child_wrapper(void *data)
+-{
+-	struct userns_exec_unified_attach_data *args = data;
+-
+-	if (!args->conf || !args->lxcpath || args->unified_fd < 0 ||
+-	    args->pid <= 0 || args->sk_pair0 < 0 || args->sk_pair1 < 0)
+-		return ret_errno(EINVAL);
+-
+-	close_prot_errno_disarm(args->sk_pair0);
+-	return cgroup_attach_create_leaf(args->conf, args->unified_fd,
+-					 &args->sk_pair1, args->unprivileged);
+-}
+-
+-static int cgroup_unified_attach_parent_wrapper(void *data)
+-{
+-	struct userns_exec_unified_attach_data *args = data;
+-
+-	if (!args->conf || args->unified_fd < 0 || args->pid <= 0 ||
+-	    args->sk_pair0 < 0 || args->sk_pair1 < 0)
+-		return ret_errno(EINVAL);
+-
+-	close_prot_errno_disarm(args->sk_pair1);
+-	return cgroup_attach_move_into_leaf(args->conf, args->lxcpath,
+-					    args->unified_fd,
+-					    &args->sk_pair0, args->pid,
+-					    args->unprivileged);
+-}
+-
+-/* Technically, we're always at a delegation boundary here (This is especially
+- * true when cgroup namespaces are available.). The reasoning is that in order
+- * for us to have been able to start a container in the first place the root
+- * cgroup must have been a leaf node. Now, either the container's init system
+- * has populated the cgroup and kept it as a leaf node or it has created
+- * subtrees. In the former case we will simply attach to the leaf node we
+- * created when we started the container in the latter case we create our own
+- * cgroup for the attaching process.
+- */
+-static int __cg_unified_attach(const struct hierarchy *h,
+-			       const struct lxc_conf *conf, const char *name,
+-			       const char *lxcpath, pid_t pid,
+-			       const char *controller)
+-{
+-	__do_close int unified_fd = -EBADF;
+-	__do_free char *path = NULL, *cgroup = NULL;
+-	int ret;
+-
+-	if (!conf || !name || !lxcpath || pid <= 0)
+-		return ret_errno(EINVAL);
+-
+-	ret = cgroup_attach(conf, name, lxcpath, pid);
+-	if (ret == 0)
+-		return log_trace(0, "Attached to unified cgroup via command handler");
+-	TRACE("__cg_unified_attach: cgroup_attach returned %d", ret);
+-	if (!ERRNO_IS_NOT_SUPPORTED(ret) && ret != -ENOCGROUP2)
+-		return log_error_errno(ret, errno, "Failed to attach to unified cgroup");
+-
+-	/* Fall back to retrieving the path for the unified cgroup. */
+-	cgroup = lxc_cmd_get_cgroup_path(name, lxcpath, controller);
+-	/* not running */
+-	if (!cgroup)
+-		return 0;
+-	TRACE("lxc_cmd_get_cgroup_path returned %s", cgroup);
+-
+-	path = make_cgroup_path(h, cgroup, NULL);
+-
+-	unified_fd = open(path, O_PATH | O_DIRECTORY | O_CLOEXEC);
+-	if (unified_fd < 0)
+-		return ret_errno(EBADF);
+-
+-	if (!list_empty(&conf->id_map)) {
+-		struct userns_exec_unified_attach_data args = {
+-			.conf		= conf,
+-			.unified_fd	= unified_fd,
+-			.pid		= pid,
+-			.unprivileged	= am_guest_unpriv(),
+-			.lxcpath	= lxcpath,
+-		};
+-
+-		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
+-		if (ret < 0)
+-			return -errno;
+-
+-		ret = userns_exec_minimal(conf,
+-					  cgroup_unified_attach_parent_wrapper,
+-					  &args,
+-					  cgroup_unified_attach_child_wrapper,
+-					  &args);
+-	} else {
+-		ret = cgroup_attach_leaf(conf, unified_fd, pid);
+-	}
+-
+-	return ret;
+-}
+-
+-__cgfsng_ops static bool isulad_cgfsng_attach(struct cgroup_ops *ops,
+-				       const struct lxc_conf *conf,
+-				       const char *name, const char *lxcpath,
+-				       pid_t pid)
+-{
+-	int len, ret;
+-	char pidstrINTTYPE_TO_STRLEN(pid_t);
+-
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-#ifdef HAVE_ISULAD
+-	if (ops->no_controller) {
+-		DEBUG("no controller found, isgnore isulad_cgfsng_attach");
+-		return true;
+-	}
+-#endif
+-
+-	if (!ops->hierarchies)
+-		return true;
+-
+-	len = snprintf(pidstr, sizeof(pidstr), "%d", pid);
+-	if (len < 0 || (size_t)len >= sizeof(pidstr))
+-		return false;
+-
+-	for (int i = 0; ops->hierarchiesi; i++) {
+-		__do_free char *fullpath = NULL, *path = NULL;
+-		struct hierarchy *h = ops->hierarchiesi;
+-
+-		if (h->fs_type == CGROUP2_SUPER_MAGIC) {
+-			ret = __cg_unified_attach(h, conf, name, lxcpath, pid,
+-						  h->controllers0);
+-			if (ret < 0)
+-				return false;
+-
+-			continue;
+-		}
+-
+-		path = lxc_cmd_get_cgroup_path(name, lxcpath, h->controllers0);
+-		/* not running */
+-		if (!path)
+-			return false;
+-
+-		fullpath = build_full_cgpath_from_monitorpath(h, path, "cgroup.procs");
+-		ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666);
+-		if (ret < 0)
+-			return log_error_errno(false, errno, "Failed to attach %d to %s",
+-					       (int)pid, fullpath);
+-	}
+-
+-	return true;
+-}
+-
+-__cgfsng_ops static int isulad_cgfsng_get(struct cgroup_ops *ops, const char *filename,
+-                                   char *value, size_t len, const char *name,
+-                                   const char *lxcpath)
+-{
+-	int ret = -1;
+-	size_t controller_len;
+-	char *controller, *p, *path;
+-	struct hierarchy *h;
+-
+-	controller_len = strlen(filename);
+-	controller = alloca(controller_len + 1);
+-	(void)strlcpy(controller, filename, controller_len + 1);
+-
+-	p = strchr(controller, '.');
+-	if (p)
+-		*p = '\0';
+-
+-	const char *ori_path = ops->get_cgroup(ops, controller);
+-	if (ori_path == NULL) {
+-		ERROR("Failed to get cgroup path:%s", controller);
+-		return -1;
+-	}
+-	path = safe_strdup(ori_path);
+-
+-	h = get_hierarchy(ops, controller);
+-	if (h) {
+-		char *fullpath;
+-
+-		fullpath = build_full_cgpath_from_monitorpath(h, path, filename);
+-		ret = lxc_read_from_file(fullpath, value, len);
+-		free(fullpath);
+-	}
+-	free(path);
+-
+-	return ret;
+-}
+-
+-static int device_cgroup_parse_access(struct device_item *device, const char *val)
+-{
+-	for (int count = 0; count < 3; count++, val++) {
+-		switch (*val) {
+-		case 'r':
+-			device->accesscount = *val;
+-			break;
+-		case 'w':
+-			device->accesscount = *val;
+-			break;
+-		case 'm':
+-			device->accesscount = *val;
+-			break;
+-		case '\n':
+-		case '\0':
+-			count = 3;
+-			break;
+-		default:
+-			return ret_errno(EINVAL);
+-		}
+-	}
+-
+-	return 0;
+-}
+-
+-static int device_cgroup_rule_parse(struct device_item *device, const char *key,
+-				    const char *val)
+-{
+-	size_t count;
+-	int ret;
+-	char temp50;
+-
+-	if (strequal("devices.allow", key))
+-		device->allow = 1; /* allow the device */
+-	else
+-		device->allow = 0; /* deny the device */
+-
+-	if (strequal(val, "a")) {
+-		/* global rule */
+-		device->type = 'a';
+-		device->major = -1;
+-		device->minor = -1;
+-		return 0;
+-	}
+-
+-	switch (*val) {
+-	case 'a':
+-		__fallthrough;
+-	case 'b':
+-		__fallthrough;
+-	case 'c':
+-		device->type = *val;
+-		break;
+-	default:
+-		return -1;
+-	}
+-
+-	val++;
+-	if (!isspace(*val))
+-		return -1;
+-	val++;
+-	if (*val == '*') {
+-		device->major = -1;
+-		val++;
+-	} else if (isdigit(*val)) {
+-		memset(temp, 0, sizeof(temp));
+-		for (count = 0; count < sizeof(temp) - 1; count++) {
+-			tempcount = *val;
+-			val++;
+-			if (!isdigit(*val))
+-				break;
+-		}
+-		ret = lxc_safe_int(temp, &device->major);
+-		if (ret)
+-			return -1;
+-	} else {
+-		return -1;
+-	}
+-	if (*val != ':')
+-		return -1;
+-	val++;
+-
+-	/* read minor */
+-	if (*val == '*') {
+-		device->minor = -1;
+-		val++;
+-	} else if (isdigit(*val)) {
+-		memset(temp, 0, sizeof(temp));
+-		for (count = 0; count < sizeof(temp) - 1; count++) {
+-			tempcount = *val;
+-			val++;
+-			if (!isdigit(*val))
+-				break;
+-		}
+-		ret = lxc_safe_int(temp, &device->minor);
+-		if (ret)
+-			return -1;
+-	} else {
+-		return -1;
+-	}
+-	if (!isspace(*val))
+-		return -1;
+-
+-	return device_cgroup_parse_access(device, ++val);
+-}
+-
+-__cgfsng_ops static int isulad_cgfsng_set(struct cgroup_ops *ops,
+-                                   const char *filename, const char *value,
+-                                   const char *name, const char *lxcpath)
+-{
+-	int ret = -1;
+-	size_t controller_len;
+-	char *controller, *p, *path;
+-	struct hierarchy *h;
+-
+-	controller_len = strlen(filename);
+-	controller = alloca(controller_len + 1);
+-	(void)strlcpy(controller, filename, controller_len + 1);
+-
+-	p = strchr(controller, '.');
+-	if (p)
+-		*p = '\0';
+-
+-	const char *ori_path = ops->get_cgroup(ops, controller);
+-	if (ori_path == NULL) {
+-		ERROR("Failed to get cgroup path:%s", controller);
+-		return -1;
+-	}
+-	path = safe_strdup(ori_path);
+-
+-	h = get_hierarchy(ops, controller);
+-	if (h) {
+-		char *fullpath;
+-		fullpath = build_full_cgpath_from_monitorpath(h, path, filename);
+-
+-		if (strcmp(filename, "io.weight") == 0 || strcmp(filename, "io.bfq.weight") == 0) {
+-			if (!file_exists(fullpath)) {
+-				free(path);
+-				free(fullpath);
+-				return 0;
+-			}
+-		}
+-
+-		ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
+-		free(fullpath);
+-	}
+-	free(path);
+-
+-	return ret;
+-}
+-
+-/* take devices cgroup line
+- *    /dev/foo rwx
+- * and convert it to a valid
+- *    type major:minor mode
+- * line. Return <0 on error. Dest is a preallocated buffer long enough to hold
+- * the output.
+- */
+-static int device_cgroup_rule_parse_devpath(struct device_item *device,
+-					    const char *devpath)
+-{
+-	__do_free char *path = NULL;
+-	char *mode = NULL;
+-	int n_parts, ret;
+-	char *p;
+-	struct stat sb;
+-
+-	path = strdup(devpath);
+-	if (!path)
+-		return ret_errno(ENOMEM);
+-
+-	/*
+-	 * Read path followed by mode. Ignore any trailing text.
+-	 * A '    # comment' would be legal. Technically other text is not
+-	 * legal, we could check for that if we cared to.
+-	 */
+-	for (n_parts = 1, p = path; *p; p++) {
+-		if (*p != ' ')
+-			continue;
+-		*p = '\0';
+-
+-		if (n_parts != 1)
+-			break;
+-		p++;
+-		n_parts++;
+-
+-		while (*p == ' ')
+-			p++;
+-
+-		mode = p;
+-
+-		if (*p == '\0')
+-			return ret_set_errno(-1, EINVAL);
+-	}
+-
+-	if (device_cgroup_parse_access(device, mode) < 0)
+-		return -1;
+-
+-	ret = stat(path, &sb);
+-	if (ret < 0)
+-		return ret_set_errno(-1, errno);
+-
+-	mode_t m = sb.st_mode & S_IFMT;
+-	switch (m) {
+-	case S_IFBLK:
+-		device->type = 'b';
+-		break;
+-	case S_IFCHR:
+-		device->type = 'c';
+-		break;
+-	default:
+-		return log_error_errno(-1, EINVAL, "Unsupported device type %i for \"%s\"", m, path);
+-	}
+-
+-	device->major = MAJOR(sb.st_rdev);
+-	device->minor = MINOR(sb.st_rdev);
+-	device->allow = 1;
+-
+-	return 0;
+-}
+-
+-static int convert_devpath(const char *invalue, char *dest)
+-{
+-	struct device_item device = {0};
+-	int ret;
+-
+-	ret = device_cgroup_rule_parse_devpath(&device, invalue);
+-	if (ret < 0)
+-		return -1;
+-
+-	ret = snprintf(dest, 50, "%c %d:%d %s", device.type, device.major,
+-		       device.minor, device.access);
+-	if (ret < 0 || ret >= 50)
+-		return log_error_errno(-1, ENAMETOOLONG, "Error on configuration value \"%c %d:%d %s\" (max 50 chars)",
+-				       device.type, device.major, device.minor, device.access);
+-
+-	return 0;
+-}
+-
+-/* Called from setup_limits - here we have the container's cgroup_data because
+- * we created the cgroups.
+- */
+-static int isulad_cg_legacy_get_data(struct cgroup_ops *ops, const char *filename,
+-                              char *value, size_t len)
+-{
+-	char *fullpath = NULL;
+-	char *p = NULL;
+-	struct hierarchy *h = NULL;
+-	int ret = 0;
+-	char *controller = NULL;
+-
+-	len = strlen(filename);
+-	if (SIZE_MAX - 1 < len) {
+-		errno = EINVAL;
+-		return -1;
+-	}
+-	controller = calloc(1, len + 1);
+-	if (controller == NULL) {
+-		errno = ENOMEM;
+-		return -1;
+-	}
+-	(void)strlcpy(controller, filename, len + 1);
+-
+-	p = strchr(controller, '.');
+-	if (p)
+-		*p = '\0';
+-
+-
+-	h = get_hierarchy(ops, controller);
+-	if (!h) {
+-		ERROR("Failed to setup limits for the \"%s\" controller. "
+-		      "The controller seems to be unused by \"cgfsng\" cgroup "
+-		      "driver or not enabled on the cgroup hierarchy",
+-		      controller);
+-		errno = ENOENT;
+-		free(controller);
+-		return -ENOENT;
+-	}
+-
+-	fullpath = must_make_path(h->path_con, filename, NULL);
+-	ret = lxc_read_from_file(fullpath, value, len);
+-	free(fullpath);
+-	free(controller);
+-	return ret;
+-}
+-
+-static int isulad_cg_legacy_set_data(struct cgroup_ops *ops, const char *filename,
+-                              const char *value)
+-{
+-	size_t len;
+-	char *fullpath, *p;
+-	/* "b|c <2^64-1>:<2^64-1> r|w|m" = 47 chars max */
+-	char converted_value50;
+-	struct hierarchy *h;
+-	int ret = 0;
+-	char *controller = NULL;
+-	int retry_count = 0;
+-	int max_retry = 10;
+-	char *container_cgroup = ops->container_cgroup;
+-
+-	len = strlen(filename);
+-	controller = alloca(len + 1);
+-	(void)strlcpy(controller, filename, len + 1);
+-
+-	p = strchr(controller, '.');
+-	if (p)
+-		*p = '\0';
+-
+-	if (strcmp("devices.allow", filename) == 0 && value0 == '/') {
+-		ret = convert_devpath(value, converted_value);
+-		if (ret < 0)
+-			return ret;
+-		value = converted_value;
+-	}
+-
+-	h = get_hierarchy(ops, controller);
+-	if (!h) {
+-		ERROR("Failed to setup limits for the \"%s\" controller. "
+-		      "The controller seems to be unused by \"cgfsng\" cgroup "
+-		      "driver or not enabled on the cgroup hierarchy",
+-		      controller);
+-		errno = ENOENT;
+-		return -ENOENT;
+-	}
+-
+-	fullpath = must_make_path(h->path_con, filename, NULL);
+-
+-retry:
+-	ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
+-	if (ret != 0) {
+-		if (retry_count < max_retry) {
+-			SYSERROR("setting cgroup config for ready process caused \"failed to write %s to %s\".", value, fullpath);
+-			(void)isulad_cg_legacy_handle_cpuset_hierarchy(h, container_cgroup);
+-			(void)isulad_mkdir_eexist_on_last(h->path_con, 0755);
+-			usleep(100 * 1000); /* 100 millisecond */
+-			retry_count++;
+-			goto retry;
+-		}
+-		lxc_write_error_message(ops->errfd,
+-		                        "%s:%d: setting cgroup config for ready process caused failed to write %s to %s: %s",
+-		                        __FILE__, __LINE__, value, fullpath, strerror(errno));
+-	}
+-	free(fullpath);
+-	return ret;
+-}
+-
+-/*
+- * Return the list of cgroup_settings sorted according to the following rules
+- * 1. Put memory.limit_in_bytes before memory.memsw.limit_in_bytes
+- */
+-static void sort_cgroup_settings(struct lxc_conf *conf)
+-{
+-	LIST_HEAD(memsw_list);
+-	struct lxc_cgroup *cgroup, *ncgroup;
+-
+-	/* Iterate over the cgroup settings and copy them to the output list. */
+-	list_for_each_entry_safe(cgroup, ncgroup, &conf->cgroup, head) {
+-		if (!strequal(cgroup->subsystem, "memory.memsw.limit_in_bytes"))
+-			continue;
+-
+-		/* Move the memsw entry from the cgroup settings list. */
+-		list_move_tail(&cgroup->head, &memsw_list);
+-	}
+-
+-	/*
+-	 * Append all the memsw entries to the end of the cgroup settings list
+-	 * to make sure they are applied after all memory limit settings.
+-	 */
+-	list_splice_tail(&memsw_list, &conf->cgroup);
+-
+-}
+-
+-__cgfsng_ops static bool isulad_cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
+-						    struct lxc_conf *conf,
+-						    bool do_devices)
+-{
+-	struct list_head *cgroup_settings;
+-	struct lxc_cgroup *cgroup;
+-	char value21 + 1 = { 0 };
+-	long long int readvalue, setvalue;
+-
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-	if (!conf)
+-		return ret_set_errno(false, EINVAL);
+-
+-	cgroup_settings = &conf->cgroup;
+-	if (list_empty(cgroup_settings))
+-		return true;
+-
+-	if (!ops->hierarchies)
+-		return ret_set_errno(false, EINVAL);
+-
+-	if (pure_unified_layout(ops))
+-		return true;
+-
+-	sort_cgroup_settings(conf);
+-	list_for_each_entry(cgroup, cgroup_settings, head) {
+-		if (do_devices == strnequal("devices", cgroup->subsystem, 7)) {
+-			const char *cgvalue = cgroup->value;
+-			if (strcmp(cgroup->subsystem, "files.limit") == 0) {
+-				if (lxc_safe_long_long(cgvalue, &setvalue) != 0) {
+-					SYSERROR("Invalid integer value %s", cgvalue);
+-					return false;
+-				}
+-				if (setvalue <= 0) {
+-					cgvalue = "max";
+-				}
+-			}
+-			if (isulad_cg_legacy_set_data(ops, cgroup->subsystem, cgvalue)) {
+-				if (do_devices && (errno == EACCES || errno == EPERM)) {
+-					SYSWARN("Failed to set \"%s\" to \"%s\"", cgroup->subsystem, cgvalue);
+-					continue;
+-				}
+-				SYSERROR("Failed to set \"%s\" to \"%s\"", cgroup->subsystem, cgvalue);
+-				return false;
+-			}
+-			DEBUG("Set controller \"%s\" set to \"%s\"", cgroup->subsystem, cgvalue);
+-		}
+-
+-		// isulad: check cpu shares
+-		if (strcmp(cgroup->subsystem, "cpu.shares") == 0) {
+-			if (isulad_cg_legacy_get_data(ops, cgroup->subsystem, value, sizeof(value) - 1) < 0) {
+-				SYSERROR("Error get %s", cgroup->subsystem);
+-				return false;
+-			}
+-			trim(value);
+-			if (lxc_safe_long_long(cgroup->value, &setvalue) != 0) {
+-				SYSERROR("Invalid value %s", cgroup->value);
+-				return false;
+-			}
+-			if (lxc_safe_long_long(value, &readvalue) != 0) {
+-				SYSERROR("Invalid value %s", value);
+-				return false;
+-			}
+-			if (setvalue > readvalue) {
+-				ERROR("The maximum allowed cpu-shares is %s", value);
+-				lxc_write_error_message(ops->errfd,
+-				                        "%s:%d: setting cgroup config for ready process caused \"The maximum allowed cpu-shares is %s\".",
+-				                        __FILE__, __LINE__, value);
+-				return false;
+-			} else if (setvalue < readvalue) {
+-				ERROR("The minimum allowed cpu-shares is %s", value);
+-				lxc_write_error_message(ops->errfd,
+-				                        "%s:%d: setting cgroup config for ready process caused \"The minimum allowed cpu-shares is %s\".",
+-				                        __FILE__, __LINE__, value);
+-				return false;
+-			}
+-		}
+-	}
+-
+-	INFO("Limits for the legacy cgroup hierarchies have been setup");
+-	return true;
+-}
+-
+-/*
+- * Some of the parsing logic comes from the original cgroup device v1
+- * implementation in the kernel.
+- */
+-static int bpf_device_cgroup_prepare(struct cgroup_ops *ops,
+-				     struct lxc_conf *conf, const char *key,
+-				     const char *val)
+-{
+-	struct device_item device_item = {};
+-	int ret;
+-
+-	if (strequal("devices.allow", key) && abspath(val))
+-		ret = device_cgroup_rule_parse_devpath(&device_item, val);
+-	else
+-		ret = device_cgroup_rule_parse(&device_item, key, val);
+-	if (ret < 0)
+-		return syserror_set(EINVAL, "Failed to parse device rule %s=%s", key, val);
+-
+-	/*
+-	 * Note that bpf_list_add_device() returns 1 if it altered the device
+-	 * list and 0 if it didn't; both return values indicate success.
+-	 * Only a negative return value indicates an error.
+-	 */
+-	ret = bpf_list_add_device(&conf->bpf_devices, &device_item);
+-	if (ret < 0)
+-		return -1;
+-
+-	return 0;
+-}
+-__cgfsng_ops static bool isulad_cgfsng_setup_limits(struct cgroup_ops *ops,
+-					     struct lxc_handler *handler)
+-{
+-	__do_free char *path = NULL;
+-	struct list_head *cgroup_settings;
+-	struct hierarchy *h;
+-	struct lxc_conf *conf;
+-	struct lxc_cgroup *cg;
+-
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-	if (!ops->hierarchies)
+-		return true;
+-
+-	if (!ops->container_cgroup)
+-		return ret_set_errno(false, EINVAL);
+-
+-	if (!handler || !handler->conf)
+-		return ret_set_errno(false, EINVAL);
+-	conf = handler->conf;
+-
+-	if (list_empty(&conf->cgroup2))
+-		return true;
+-	cgroup_settings = &conf->cgroup2;
+-
+-	if (!pure_unified_layout(ops))
+-		return true;
+-
+-	if (!ops->unified)
+-		return false;
+-	h = ops->unified;
+-
+-	list_for_each_entry(cg, cgroup_settings, head) {
+-		int ret;
+-
+-		if (strncmp("devices", cg->subsystem, 7) == 0) {
+-			ret = bpf_device_cgroup_prepare(ops, conf, cg->subsystem,
+-							cg->value);
+-		} else if (strcmp(cg->subsystem, "files.limit") == 0) {
+-			long long int setvalue = 0;
+-			const char *cgvalue = cg->value;
+-
+-			if (lxc_safe_long_long(cgvalue, &setvalue) != 0)
+-				return log_error(false, "Invalid integer value %s", cgvalue);
+-
+-			if (setvalue <= 0)
+-				cgvalue = "max";
+-
+-			ret = lxc_write_openat(h->path_con,
+-					       cg->subsystem, cgvalue,
+-					       strlen(cgvalue));
+-			if (ret < 0)
+-				return log_error_errno(false, errno, "Failed to set \"%s\" to \"%s\"",
+-						       cg->subsystem, cgvalue);
+-		} else {
+-			if (strcmp(cg->subsystem, "io.weight") == 0 || strcmp(cg->subsystem, "io.bfq.weight") == 0) {
+-				path = must_make_path(h->path_con, cg->subsystem, NULL);
+-				if (!file_exists(path)) {
+-					continue;
+-				}
+-			}
+-			ret = lxc_write_openat(h->path_con,
+-					       cg->subsystem, cg->value,
+-					       strlen(cg->value));
+-			if (ret < 0)
+-				return log_error_errno(false, errno, "Failed to set \"%s\" to \"%s\"",
+-						       cg->subsystem, cg->value);
+-		}
+-		TRACE("Set \"%s\" to \"%s\"", cg->subsystem, cg->value);
+-	}
+-
+-	return log_info(true, "Limits for the unified cgroup hierarchy have been setup");
+-}
+-
+-__cgfsng_ops bool isulad_cgfsng_devices_activate(struct cgroup_ops *ops,
+-					  struct lxc_handler *handler)
+-{
+-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
+-	__do_bpf_program_free struct bpf_program *devices = NULL;
+-	int ret;
+-	struct lxc_conf *conf;
+-	struct hierarchy *unified;
+-	struct lxc_list *it;
+-	struct bpf_program *devices_old;
+-
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-	if (!ops->hierarchies)
+-		return true;
+-
+-	if (!ops->container_cgroup)
+-		return ret_set_errno(false, EEXIST);
+-
+-	if (!handler || !handler->conf)
+-		return ret_set_errno(false, EINVAL);
+-	conf = handler->conf;
+-
+-	unified = ops->unified;
+-	if (!unified || !unified->bpf_device_controller ||
+-	    !unified->path_con || lxc_list_empty(&conf->devices))
+-		return true;
+-
+-	devices = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
+-	if (!devices)
+-		return log_error_errno(false, ENOMEM, "Failed to create new bpf program");
+-
+-	ret = bpf_program_init(devices);
+-	if (ret)
+-		return log_error_errno(false, ENOMEM, "Failed to initialize bpf program");
+-
+-	lxc_list_for_each(it, &conf->devices) {
+-		struct device_item *cur = it->elem;
+-
+-		ret = bpf_program_append_device(devices, cur);
+-		if (ret)
+-			return log_error_errno(false, ENOMEM, "Failed to add new rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
+-					       cur->type,
+-					       cur->major,
+-					       cur->minor,
+-					       cur->access,
+-					       cur->allow,
+-					       cur->global_rule);
+-		TRACE("Added rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
+-		      cur->type,
+-		      cur->major,
+-		      cur->minor,
+-		      cur->access,
+-		      cur->allow,
+-		      cur->global_rule);
+-	}
+-
+-	ret = bpf_program_finalize(devices);
+-	if (ret)
+-		return log_error_errno(false, ENOMEM, "Failed to finalize bpf program");
+-
+-	ret = bpf_program_cgroup_attach(devices, BPF_CGROUP_DEVICE,
+-					unified->path_con,
+-					BPF_F_ALLOW_MULTI);
+-	if (ret)
+-		return log_error_errno(false, ENOMEM, "Failed to attach bpf program");
+-
+-	/* Replace old bpf program. */
+-	devices_old = move_ptr(conf->cgroup2_devices);
+-	conf->cgroup2_devices = move_ptr(devices);
+-	devices = move_ptr(devices_old);
+-#endif
+-	return true;
+-}
+-
+-bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup)
+-{
+-	__do_free char *add_controllers = NULL, *base_path = NULL;
+-	__do_free_string_list char **parts = NULL;
+-	struct hierarchy *unified = ops->unified;
+-	ssize_t parts_len;
+-	char **it;
+-	size_t full_len = 0;
+-
+-	if (!ops->hierarchies || !pure_unified_layout(ops) ||
+-	    !unified->controllers0)
+-		return true;
+-
+-	/* For now we simply enable all controllers that we have detected by
+-	 * creating a string like "+memory +pids +cpu +io".
+-	 * TODO: In the near future we might want to support "-<controller>"
+-	 * etc. but whether supporting semantics like this make sense will need
+-	 * some thinking.
+-	 */
+-	for (it = unified->controllers; it && *it; it++) {
+-		full_len += strlen(*it) + 2;
+-		add_controllers = must_realloc(add_controllers, full_len + 1);
+-
+-		if (unified->controllers0 == *it)
+-			add_controllers0 = '\0';
+-
+-		(void)strlcat(add_controllers, "+", full_len + 1);
+-		(void)strlcat(add_controllers, *it, full_len + 1);
+-
+-		if (*(it + 1))
+-			(void)strlcat(add_controllers, " ", full_len + 1);
+-	}
+-
+-	parts = lxc_string_split(cgroup, '/');
+-	if (!parts)
+-		return false;
+-
+-	parts_len = lxc_array_len((void **)parts);
+-	if (parts_len > 0)
+-		parts_len--;
+-
+-	base_path = must_make_path(unified->at_mnt, unified->at_base, NULL);
+-	for (ssize_t i = -1; i < parts_len; i++) {
+-		int ret;
+-		__do_free char *target = NULL;
+-
+-		if (i >= 0)
+-			base_path = must_append_path(base_path, partsi, NULL);
+-		target = must_make_path(base_path, "cgroup.subtree_control", NULL);
+-		ret = lxc_writeat(-1, target, add_controllers, full_len);
+-		if (ret < 0)
+-			return log_error_errno(false, errno, "Could not enable \"%s\" controllers in the unified cgroup \"%s\"",
+-					       add_controllers, target);
+-		TRACE("Enable \"%s\" controllers in the unified cgroup \"%s\"", add_controllers, target);
+-	}
+-
+-	return true;
+-}
+-
+-__cgfsng_ops bool isulad_cgfsng_monitor_delegate_controllers(struct cgroup_ops *ops)
+-{
+-	return true;
+-}
+-
+-__cgfsng_ops bool isulad_cgfsng_payload_delegate_controllers(struct cgroup_ops *ops)
+-{
+-	if (!ops)
+-		return ret_set_errno(false, ENOENT);
+-
+-#ifdef HAVE_ISULAD
+-	if (ops->no_controller) {
+-		DEBUG("no controller found, isgnore isulad_cgfsng_payload_delegate_controllers");
+-		return true;
+-	}
+-#endif
+-
+-	return __cgfsng_delegate_controllers(ops, ops->container_cgroup);
+-}
+-
+-static inline bool unified_cgroup(const char *line)
+-{
+-	return *line == '0';
+-}
+-
+-static inline char *current_unified_cgroup(bool relative, char *line)
+-{
+-	char *current_cgroup;
+-
+-	line += STRLITERALLEN("0::");
+-
+-	if (!abspath(line))
+-		return ERR_PTR(-EINVAL);
+-
+-	/* remove init.scope */
+-	if (!relative)
+-		line = prune_init_scope(line);
+-
+-	/* create a relative path */
+-	line = deabs(line);
+-
+-	current_cgroup = strdup(line);
+-	if (!current_cgroup)
+-		return ERR_PTR(-ENOMEM);
+-
+-	return current_cgroup;
+-}
+-
+-static inline const char *unprefix(const char *controllers)
+-{
+-	if (strnequal(controllers, "name=", STRLITERALLEN("name=")))
+-		return controllers + STRLITERALLEN("name=");
+-	return controllers;
+-}
+-
+-static int __list_cgroup_delegate(char ***delegate)
+-{
+-	__do_free char **list = NULL;
+-	__do_free char *buf = NULL;
+-	char *standard = {
+-		"cgroup.procs",
+-		"cgroup.threads",
+-		"cgroup.subtree_control",
+-		"memory.oom.group",
+-		NULL,
+-	};
+-	char *token;
+-	int ret;
+-
+-	buf = read_file_at(-EBADF, "/sys/kernel/cgroup/delegate", PROTECT_OPEN, 0);
+-	if (!buf) {
+-		for (char **p = standard; p && *p; p++) {
+-			ret = list_add_string(&list, *p);
+-			if (ret < 0)
+-				return ret;
+-		}
+-
+-		*delegate = move_ptr(list);
+-		return syswarn_ret(0, "Failed to read /sys/kernel/cgroup/delegate");
+-	}
+-
+-	lxc_iterate_parts(token, buf, " \t\n") {
+-		/*
+-		 * We always need to chown this for both cgroup and
+-		 * cgroup2.
+-		 */
+-		if (strequal(token, "cgroup.procs"))
+-			continue;
+-
+-		ret = list_add_string(&list, token);
+-		if (ret < 0)
+-			return ret;
+-	}
+-
+-	*delegate = move_ptr(list);
+-	return 0;
+-}
+-
+-static bool unified_hierarchy_delegated(int dfd_base, char ***ret_files)
+-{
+-	__do_free_string_list char **list = NULL;
+-	int ret;
+-
+-	ret = __list_cgroup_delegate(&list);
+-	if (ret < 0)
+-		return syserror_ret(ret, "Failed to determine unified cgroup delegation requirements");
+-
+-	for (char *const *s = list; s && *s; s++) {
+-		if (!faccessat(dfd_base, *s, W_OK, 0) || errno == ENOENT)
+-			continue;
+-
+-		return sysinfo_ret(false, "The %s file is not writable, skipping unified hierarchy", *s);
+-	}
+-
+-	*ret_files = move_ptr(list);
+-	return true;
+-}
+-
+-static bool legacy_hierarchy_delegated(int dfd_base)
+-{
+-	int ret;
+-
+-	ret = faccessat(dfd_base, ".", W_OK, 0);
+-	if (ret < 0 && errno != ENOENT)
+-		return sysinfo_ret(false, "Legacy hierarchy not writable, skipping");
+-
+-	return true;
+-}
+-
+-/**
+- * systemd guarantees that the order of co-mounted controllers is stable. On
+- * some systems the order of the controllers might be reversed though.
+- *
+- * For example, this is how the order is mismatched on CentOS 7:
+- *
+- *      root@localhost ~# cat /proc/self/cgroup
+- *      11:perf_event:/
+- *      10:pids:/
+- *      9:freezer:/
+- * >>>> 8:cpuacct,cpu:/
+- *      7:memory:/
+- *      6:blkio:/
+- *      5:devices:/
+- *      4:hugetlb:/
+- * >>>> 3:net_prio,net_cls:/
+- *      2:cpuset:/
+- *      1:name=systemd:/user.slice/user-0.slice/session-c1.scope
+- *
+- * whereas the mountpoint:
+- *
+- *      | |-/sys/fs/cgroup                    tmpfs         tmpfs      ro,nosuid,nodev,noexec,mode=755
+- *      | | |-/sys/fs/cgroup/systemd          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd
+- *      | | |-/sys/fs/cgroup/cpuset           cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,cpuset
+- * >>>> | | |-/sys/fs/cgroup/net_cls,net_prio cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,net_prio,net_cls
+- *      | | |-/sys/fs/cgroup/hugetlb          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,hugetlb
+- *      | | |-/sys/fs/cgroup/devices          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,devices
+- *      | | |-/sys/fs/cgroup/blkio            cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,blkio
+- *      | | |-/sys/fs/cgroup/memory           cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,memory
+- * >>>> | | |-/sys/fs/cgroup/cpu,cpuacct      cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,cpuacct,cpu
+- *      | | |-/sys/fs/cgroup/freezer          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,freezer
+- *      | | |-/sys/fs/cgroup/pids             cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,pids
+- *      | | `-/sys/fs/cgroup/perf_event       cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,perf_event
+- *
+- * Ensure that we always use the systemd-guaranteed stable order when checking
+- * for the mountpoint.
+- */
+-#if HAVE_COMPILER_ATTR_NONNULL
+-__attribute__((nonnull))
+-#endif
+-#if HAVE_COMPILER_ATTR_RETURNS_NONNULL
+-__attribute__((returns_nonnull))
+-#endif
+-static const char *stable_order(const char *controllers)
+-{
+-	if (strequal(controllers, "cpuacct,cpu"))
+-		return "cpu,cpuacct";
+-
+-	if (strequal(controllers, "net_prio,net_cls"))
+-		return "net_cls,net_prio";
+-
+-	return unprefix(controllers);
+-}
+-
+-#define CGFSNG_LAYOUT_LEGACY	BIT(0)
+-#define CGFSNG_LAYOUT_UNIFIED	BIT(1)
+-
+-static int __initialize_cgroups(struct cgroup_ops *ops, bool relative,
+-				bool unprivileged, struct lxc_conf *conf)
+-{
+-	__do_free char *cgroup_info = NULL;
+-	unsigned int layout_mask = 0;
+-	int ret;
+-	char *it;
+-
+-	ret = unpriv_systemd_create_scope(ops, conf);
+-	if (ret < 0)
+-		return ret_set_errno(false, ret);
+-	else if (ret == 0)
+-		TRACE("Entered an unpriv systemd scope");
+-
+-	/*
+-	 * Root spawned containers escape the current cgroup, so use init's
+-	 * cgroups as our base in that case.
+-	 */
+-	if (!relative && (geteuid() == 0))
+-		cgroup_info = read_file_at(-EBADF, "/proc/1/cgroup", PROTECT_OPEN, 0);
+-	else
+-		cgroup_info = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0);
+-	if (!cgroup_info)
+-		return ret_errno(ENOMEM);
+-
+-	lxc_iterate_parts(it, cgroup_info, "\n") {
+-		__do_close int dfd_base = -EBADF, dfd_mnt = -EBADF;
+-		__do_free char *controllers = NULL, *current_cgroup = NULL;
+-		__do_free_string_list char **controller_list = NULL,
+-					   **delegate = NULL;
+-		char *line;
+-		int dfd, type;
+-
+-		/* Handle the unified cgroup hierarchy. */
+-		line = it;
+-		if (unified_cgroup(line)) {
+-			char *unified_mnt;
+-
+-			type = UNIFIED_HIERARCHY;
+-			layout_mask |= CGFSNG_LAYOUT_UNIFIED;
+-
+-			if (conf->cgroup_meta.systemd_scope)
+-				current_cgroup = cgroup_relpath(conf->cgroup_meta.systemd_scope);
+-			if (IS_ERR_OR_NULL(current_cgroup))
+-				current_cgroup = current_unified_cgroup(relative, line);
+-			if (IS_ERR(current_cgroup))
+-				return PTR_ERR(current_cgroup);
+-
+-			if (unified_cgroup_fd(ops->dfd_mnt)) {
+-				dfd_mnt = dup_cloexec(ops->dfd_mnt);
+-				unified_mnt = "";
+-			} else {
+-				dfd_mnt = open_at(ops->dfd_mnt,
+-						  "unified",
+-						  PROTECT_OPATH_DIRECTORY,
+-						  PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+-				unified_mnt = "unified";
+-			}
+-			if (dfd_mnt < 0) {
+-				if (errno != ENOENT)
+-					return syserror("Failed to open %d/unified", ops->dfd_mnt);
+-
+-				SYSTRACE("Unified cgroup not mounted");
+-				continue;
+-			}
+-
+-			if (!fhas_fs_type(dfd_mnt, CGROUP2_SUPER_MAGIC)) {
+-				SYSTRACE("Opened file descriptor %d is not a cgroup2 mountpoint", dfd_mnt);
+-				continue;
+-			}
+-
+-			dfd = dfd_mnt;
+-
+-			if (!is_empty_string(current_cgroup)) {
+-				dfd_base = open_at(dfd_mnt, current_cgroup,
+-						   PROTECT_OPATH_DIRECTORY,
+-						   PROTECT_LOOKUP_BENEATH_XDEV, 0);
+-				if (dfd_base < 0) {
+-					if (errno != ENOENT)
+-						return syserror("Failed to open %d/%s",
+-								dfd_mnt, current_cgroup);
+-
+-					SYSTRACE("Current cgroup %d/%s does not exist (funky cgroup layout?)",
+-						 dfd_mnt, current_cgroup);
+-					continue;
+-				}
+-				dfd = dfd_base;
+-			}
+-
+-			if (!unified_hierarchy_delegated(dfd, &delegate))
+-				continue;
+-
+-			controller_list = unified_controllers(dfd, "cgroup.controllers");
+-			if (!controller_list) {
+-				TRACE("No controllers are enabled for delegation in the unified hierarchy");
+-				controller_list = list_new();
+-				if (!controller_list)
+-					return syserror_set(-ENOMEM, "Failed to create empty controller list");
+-			}
+-
+-			controllers = strdup(unified_mnt);
+-			if (!controllers)
+-				return ret_errno(ENOMEM);
+-		} else {
+-			char *__controllers, *__current_cgroup;
+-
+-			type = LEGACY_HIERARCHY;
+-			layout_mask |= CGFSNG_LAYOUT_LEGACY;
+-
+-			__controllers = strchr(line, ':');
+-			if (!__controllers)
+-				return ret_errno(EINVAL);
+-			__controllers++;
+-
+-			__current_cgroup = strchr(__controllers, ':');
+-			if (!__current_cgroup)
+-				return ret_errno(EINVAL);
+-			*__current_cgroup = '\0';
+-			__current_cgroup++;
+-
+-			controllers = strdup(stable_order(__controllers));
+-			if (!controllers)
+-				return ret_errno(ENOMEM);
+-
+-			dfd_mnt = open_at(ops->dfd_mnt,
+-					  controllers,
+-					  PROTECT_OPATH_DIRECTORY,
+-					  PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+-			if (dfd_mnt < 0) {
+-				if (errno != ENOENT)
+-					return syserror("Failed to open %d/%s",
+-							ops->dfd_mnt, controllers);
+-
+-				SYSTRACE("%s not mounted", controllers);
+-				continue;
+-			}
+-
+-			if (!fhas_fs_type(dfd_mnt, CGROUP_SUPER_MAGIC)) {
+-				SYSTRACE("Opened file descriptor %d is not a cgroup mountpoint", dfd_mnt);
+-				continue;
+-			}
+-
+-			dfd = dfd_mnt;
+-
+-			if (!abspath(__current_cgroup))
+-				return ret_errno(EINVAL);
+-
+-			/* remove init.scope */
+-			if (!relative)
+-				__current_cgroup = prune_init_scope(__current_cgroup);
+-
+-			/* create a relative path */
+-			__current_cgroup = deabs(__current_cgroup);
+-
+-			current_cgroup = strdup(__current_cgroup);
+-			if (!current_cgroup)
+-				return ret_errno(ENOMEM);
+-
+-			if (!is_empty_string(current_cgroup)) {
+-				dfd_base = open_at(dfd_mnt, current_cgroup,
+-						   PROTECT_OPATH_DIRECTORY,
+-						   PROTECT_LOOKUP_BENEATH_XDEV, 0);
+-				if (dfd_base < 0) {
+-					if (errno != ENOENT)
+-						return syserror("Failed to open %d/%s",
+-								dfd_mnt, current_cgroup);
+-
+-					SYSTRACE("Current cgroup %d/%s does not exist (funky cgroup layout?)",
+-						 dfd_mnt, current_cgroup);
+-					continue;
+-				}
+-				dfd = dfd_base;
+-			}
+-
+-			if (!legacy_hierarchy_delegated(dfd))
+-				continue;
+-
+-			/*
+-			 * We intentionally pass __current_cgroup here and not
+-			 * controllers because we would otherwise chop the
+-			 * mountpoint.
+-			 */
+-			controller_list = list_add_controllers(__controllers);
+-			if (!controller_list)
+-				return syserror_set(-ENOMEM, "Failed to create controller list from %s", __controllers);
+-
+-			if (skip_hierarchy(ops, controller_list))
+-				continue;
+-
+-			ops->cgroup_layout = CGROUP_LAYOUT_LEGACY;
+-		}
+-
+-		ret = cgroup_hierarchy_add(ops, dfd_mnt, controllers, dfd,
+-					   current_cgroup, controller_list, type);
+-		if (ret < 0)
+-			return syserror_ret(ret, "Failed to add %s hierarchy", controllers);
+-
+-		/* Transfer ownership. */
+-		move_fd(dfd_mnt);
+-		move_fd(dfd_base);
+-		move_ptr(current_cgroup);
+-		move_ptr(controllers);
+-		move_ptr(controller_list);
+-		if (type == UNIFIED_HIERARCHY)
+-			ops->unified->delegate = move_ptr(delegate);
+-	}
+-
+-	/* determine cgroup layout */
+-	if (ops->unified) {
+-		if (ops->cgroup_layout == CGROUP_LAYOUT_LEGACY) {
+-			ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
+-		} else {
+-			if (bpf_devices_cgroup_supported())
+-				ops->unified->utilities |= DEVICES_CONTROLLER;
+-			ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
+-		}
+-	}
+-
+-	/*
+-	 * If we still don't know the cgroup layout at this point it means we
+-	 * have not found any writable cgroup hierarchies. Infer the layout
+-	 * from the layout bitmask we created when parsing the cgroups.
+-	 *
+-	 * Keep the ordering in the switch otherwise the bistmask-based
+-	 * matching won't work.
+-	 */
+-	if (ops->cgroup_layout == CGROUP_LAYOUT_UNKNOWN) {
+-		switch (layout_mask) {
+-		case (CGFSNG_LAYOUT_LEGACY | CGFSNG_LAYOUT_UNIFIED):
+-			ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
+-			break;
+-		case CGFSNG_LAYOUT_LEGACY:
+-			ops->cgroup_layout = CGROUP_LAYOUT_LEGACY;
+-			break;
+-		case CGFSNG_LAYOUT_UNIFIED:
+-			ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
+-			break;
+-		}
+-	}
+-
+-	if (!controllers_available(ops))
+-		return syserror_set(-ENOENT, "One or more requested controllers unavailable or not delegated");
+-
+-	return 0;
+-}
+-
+-static int isulad_initialize_cgroups(struct cgroup_ops *ops, struct lxc_conf *conf)
+-{
+-	__do_close int dfd = -EBADF;
+-	int ret;
+-	const char *controllers_use;
+-
+-	if (ops->dfd_mnt >= 0)
+-		return ret_errno(EBUSY);
+-
+-	/*
+-	 * I don't see the need for allowing symlinks here. If users want to
+-	 * have their hierarchy available in different locations I strongly
+-	 * suggest bind-mounts.
+-	 */
+-	dfd = open_at(-EBADF, DEFAULT_CGROUP_MOUNTPOINT,
+-			PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+-	if (dfd < 0)
+-		return syserror("Failed to open " DEFAULT_CGROUP_MOUNTPOINT);
+-
+-	controllers_use = lxc_global_config_value("lxc.cgroup.use");
+-	if (controllers_use) {
+-		__do_free char *dup = NULL;
+-		char *it;
+-
+-		dup = strdup(controllers_use);
+-		if (!dup)
+-			return -errno;
+-
+-		lxc_iterate_parts(it, dup, ",") {
+-			ret = list_add_string(&ops->cgroup_use, it);
+-			if (ret < 0)
+-				return ret;
+-		}
+-	}
+-
+-	/*
+-	 * Keep dfd referenced by the cleanup function and actually move the fd
+-	 * once we know the initialization succeeded. So if we fail we clean up
+-	 * the dfd.
+-	 */
+-	ops->dfd_mnt = dfd;
+-
+-	ret = __initialize_cgroups(ops, conf->cgroup_meta.relative, !list_empty(&conf->id_map), conf);
+-	if (ret < 0)
+-		return syserror_ret(ret, "Failed to initialize cgroups");
+-
+-	/* Transfer ownership to cgroup_ops. */
+-	move_fd(dfd);
+-	return 0;
+-}
+-
+-__cgfsng_ops static int isulad_cgfsng_data_init(struct cgroup_ops *ops, struct lxc_conf *conf)
+-{
+-	const char *cgroup_pattern;
+-#ifdef HAVE_ISULAD
+-	const char *cgroup_tree;
+-	__do_free char *container_cgroup = NULL, *__cgroup_tree = NULL;
+-	size_t len;
+-#endif
+-
+-	if (!ops)
+-		return ret_set_errno(-1, ENOENT);
+-
+-	/* copy system-wide cgroup information */
+-	cgroup_pattern = lxc_global_config_value("lxc.cgroup.pattern");
+-	if (cgroup_pattern && !strequal(cgroup_pattern, "")) {
+-		ops->cgroup_pattern = strdup(cgroup_pattern);
+-		if (!ops->cgroup_pattern)
+-			return ret_errno(ENOMEM);
+-	}
+-
+-#ifdef HAVE_ISULAD
+-	if (conf->cgroup_meta.dir) {
+-		cgroup_tree = conf->cgroup_meta.dir;
+-		container_cgroup = must_concat(&len, cgroup_tree, "/", conf->name, NULL);
+-	} else if (ops->cgroup_pattern) {
+-		__cgroup_tree = lxc_string_replace("%n", conf->name, ops->cgroup_pattern);
+-		if (!__cgroup_tree)
+-			return ret_set_errno(-1, ENOMEM);
+-
+-		cgroup_tree = __cgroup_tree;
+-		container_cgroup = must_concat(&len, cgroup_tree, NULL);
+-	} else {
+-		cgroup_tree = NULL;
+-		container_cgroup = must_concat(&len, conf->name, NULL);
+-	}
+-	if (!container_cgroup)
+-		return ret_set_errno(-1, ENOMEM);
+-
+-	ops->container_cgroup = move_ptr(container_cgroup);
+-#endif
+-
+-	return 0;
+-}
+-
+-struct cgroup_ops *cgroup_ops_init(struct lxc_conf *conf)
+-{
+-	__cleanup_cgroup_ops struct cgroup_ops *cgfsng_ops = NULL;
+-
+-	cgfsng_ops = zalloc(sizeof(struct cgroup_ops));
+-	if (!cgfsng_ops)
+-		return ret_set_errno(NULL, ENOMEM);
+-
+-	cgfsng_ops->cgroup_layout	= CGROUP_LAYOUT_UNKNOWN;
+-	cgfsng_ops->dfd_mnt		= -EBADF;
+-
+-	if (isulad_initialize_cgroups(cgfsng_ops, conf))
+-		return NULL;
+-
+-	cgfsng_ops->data_init = isulad_cgfsng_data_init;
+-
+-	cgfsng_ops->errfd = conf ? conf->errpipe1 : -1;
+-	cgfsng_ops->get_cgroup_full_path = isulad_cgfsng_get_cgroup_full_path;
+-	cgfsng_ops->payload_destroy = isulad_cgfsng_payload_destroy;
+-	cgfsng_ops->monitor_destroy = isulad_cgfsng_monitor_destroy;
+-	cgfsng_ops->monitor_create = isulad_cgfsng_monitor_create;
+-	cgfsng_ops->monitor_enter = isulad_cgfsng_monitor_enter;
+-	cgfsng_ops->monitor_delegate_controllers = isulad_cgfsng_monitor_delegate_controllers;
+-	cgfsng_ops->payload_delegate_controllers = isulad_cgfsng_payload_delegate_controllers;
+-	cgfsng_ops->payload_create = isulad_cgfsng_payload_create;
+-	cgfsng_ops->payload_enter = isulad_cgfsng_payload_enter;
+-	cgfsng_ops->finalize = isulad_cgfsng_finalize;
+-	cgfsng_ops->get_cgroup = isulad_cgfsng_get_cgroup;
+-	cgfsng_ops->get = isulad_cgfsng_get;
+-	cgfsng_ops->set = isulad_cgfsng_set;
+-	cgfsng_ops->freeze = isulad_cgfsng_freeze;
+-	cgfsng_ops->unfreeze = isulad_cgfsng_unfreeze;
+-	cgfsng_ops->setup_limits_legacy = isulad_cgfsng_setup_limits_legacy;
+-	cgfsng_ops->setup_limits = isulad_cgfsng_setup_limits;
+-	cgfsng_ops->driver = "isulad_cgfsng";
+-	cgfsng_ops->version = "1.0.0";
+-	cgfsng_ops->attach = isulad_cgfsng_attach;
+-	cgfsng_ops->chown = isulad_cgfsng_chown;
+-	cgfsng_ops->mount = isulad_cgfsng_mount;
+-	cgfsng_ops->devices_activate = isulad_cgfsng_devices_activate;
+-
+-	cgfsng_ops->criu_escape = isulad_cgfsng_criu_escape;
+-	cgfsng_ops->criu_num_hierarchies = isulad_cgfsng_criu_num_hierarchies;
+-	cgfsng_ops->criu_get_hierarchies = isulad_cgfsng_criu_get_hierarchies;
+-
+-	return move_ptr(cgfsng_ops);
+-}
+-
+-static int __unified_attach_fd(const struct lxc_conf *conf, const char *lxcpath, int fd_unified, pid_t pid)
+-{
+-	int ret;
+-
+-	if (!list_empty(&conf->id_map)) {
+-		struct userns_exec_unified_attach_data args = {
+-			.conf		= conf,
+-			.unified_fd	= fd_unified,
+-			.pid		= pid,
+-			.unprivileged	= am_guest_unpriv(),
+-			.lxcpath	= lxcpath,
+-		};
+-
+-		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
+-		if (ret < 0)
+-			return -errno;
+-
+-		ret = userns_exec_minimal(conf,
+-					  cgroup_unified_attach_parent_wrapper,
+-					  &args,
+-					  cgroup_unified_attach_child_wrapper,
+-					  &args);
+-	} else {
+-		ret = cgroup_attach_leaf(conf, fd_unified, pid);
+-	}
+-
+-	return ret;
+-}
+-
+-static int __cgroup_attach_many(const struct lxc_conf *conf, const char *name,
+-				const char *lxcpath, pid_t pid)
+-{
+-	call_cleaner(put_cgroup_ctx) struct cgroup_ctx *ctx = &(struct cgroup_ctx){};
+-	int ret;
+-	size_t idx;
+-	ssize_t pidstr_len;
+-	char pidstrINTTYPE_TO_STRLEN(pid_t);
+-
+-	ret = lxc_cmd_get_cgroup_ctx(name, lxcpath, sizeof(struct cgroup_ctx), ctx);
+-	if (ret < 0)
+-		return ret_errno(ENOSYS);
+-
+-	if (ctx->fd_len == 0)
+-		return log_trace(0, "Container runs with unwritable %s cgroup layout",
+-				 cgroup_layout_name(ctx->layout));
+-
+-	pidstr_len = strnprintf(pidstr, sizeof(pidstr), "%d", pid);
+-	if (pidstr_len < 0)
+-		return pidstr_len;
+-
+-	for (idx = 0; idx < ctx->fd_len; idx++) {
+-		int dfd_con = ctx->fdidx;
+-
+-		if (unified_cgroup_fd(dfd_con))
+-			ret = __unified_attach_fd(conf, lxcpath, dfd_con, pid);
+-		else
+-			ret = lxc_writeat(dfd_con, "cgroup.procs", pidstr, pidstr_len);
+-		if (ret)
+-			return syserror_ret(ret, "Failed to attach to cgroup fd %d", dfd_con);
+-		else
+-			TRACE("Attached to cgroup fd %d", dfd_con);
+-	}
+-
+-	TRACE("Attached to %s cgroup layout", cgroup_layout_name(ctx->layout));
+-	return 0;
+-}
+-
+-static int __cgroup_attach_unified(const struct lxc_conf *conf, const char *name,
+-				   const char *lxcpath, pid_t pid)
+-{
+-	__do_close int dfd_unified = -EBADF;
+-
+-	if (!conf || is_empty_string(name) || is_empty_string(lxcpath) || pid <= 0)
+-		return ret_errno(EINVAL);
+-
+-	dfd_unified = lxc_cmd_get_cgroup2_fd(name, lxcpath);
+-	if (dfd_unified < 0)
+-		return ret_errno(ENOSYS);
+-
+-	return __unified_attach_fd(conf, lxcpath, dfd_unified, pid);
+-}
+-
+-int cgroup_attach(const struct lxc_conf *conf, const char *name,
+-		  const char *lxcpath, pid_t pid)
+-{
+-	int ret;
+-
+-	ret = __cgroup_attach_many(conf, name, lxcpath, pid);
+-	if (ret < 0) {
+-		if (!ERRNO_IS_NOT_SUPPORTED(ret))
+-			return ret;
+-
+-		ret = __cgroup_attach_unified(conf, name, lxcpath, pid);
+-		if (ret < 0 && ERRNO_IS_NOT_SUPPORTED(ret))
+-			return ret_errno(ENOSYS);
+-	}
+-
+-	return ret;
+-}
+-
+-/* Connects to command socket therefore isn't callable from command handler. */
+-int cgroup_get(const char *name, const char *lxcpath, const char *key, char *buf, size_t len)
+-{
+-	__do_close int dfd = -EBADF;
+-	struct cgroup_fd fd = {
+-		.fd = -EBADF,
+-	};
+-	size_t len_controller;
+-	int ret;
+-
+-	if (is_empty_string(name) || is_empty_string(lxcpath) ||
+-	    is_empty_string(key))
+-		return ret_errno(EINVAL);
+-
+-	if ((buf && !len) || (len && !buf))
+-		return ret_errno(EINVAL);
+-
+-	len_controller = strcspn(key, ".");
+-	len_controller++; /* Don't forget the \0 byte. */
+-	if (len_controller >= MAX_CGROUP_ROOT_NAMELEN)
+-		return ret_errno(EINVAL);
+-	(void)strlcpy(fd.controller, key, len_controller);
+-
+-	ret = lxc_cmd_get_limit_cgroup_fd(name, lxcpath, sizeof(struct cgroup_fd), &fd);
+-	if (ret < 0) {
+-		if (!ERRNO_IS_NOT_SUPPORTED(ret))
+-			return ret;
+-
+-		dfd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
+-		if (dfd < 0) {
+-			if (!ERRNO_IS_NOT_SUPPORTED(ret))
+-				return ret;
+-
+-			return ret_errno(ENOSYS);
+-		}
+-		fd.type = UNIFIED_HIERARCHY;
+-		fd.fd = move_fd(dfd);
+-	}
+-	dfd = move_fd(fd.fd);
+-
+-	TRACE("Reading %s from %s cgroup hierarchy", key, cgroup_hierarchy_name(fd.type));
+-
+-	if (fd.type == UNIFIED_HIERARCHY && strequal(fd.controller, "devices"))
+-		return ret_errno(EOPNOTSUPP);
+-	else
+-		ret = lxc_read_try_buf_at(dfd, key, buf, len);
+-
+-	return ret;
+-}
+-
+-/* Connects to command socket therefore isn't callable from command handler. */
+-int cgroup_set(const char *name, const char *lxcpath, const char *key, const char *value)
+-{
+-	__do_close int dfd = -EBADF;
+-	struct cgroup_fd fd = {
+-		.fd = -EBADF,
+-	};
+-	size_t len_controller;
+-	int ret;
+-
+-	if (is_empty_string(name) || is_empty_string(lxcpath) ||
+-	    is_empty_string(key) || is_empty_string(value))
+-		return ret_errno(EINVAL);
+-
+-	len_controller = strcspn(key, ".");
+-	len_controller++; /* Don't forget the \0 byte. */
+-	if (len_controller >= MAX_CGROUP_ROOT_NAMELEN)
+-		return ret_errno(EINVAL);
+-	(void)strlcpy(fd.controller, key, len_controller);
+-
+-	ret = lxc_cmd_get_limit_cgroup_fd(name, lxcpath, sizeof(struct cgroup_fd), &fd);
+-	if (ret < 0) {
+-		if (!ERRNO_IS_NOT_SUPPORTED(ret))
+-			return ret;
+-
+-		dfd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
+-		if (dfd < 0) {
+-			if (!ERRNO_IS_NOT_SUPPORTED(ret))
+-				return ret;
+-
+-			return ret_errno(ENOSYS);
+-		}
+-		fd.type = UNIFIED_HIERARCHY;
+-		fd.fd = move_fd(dfd);
+-	}
+-	dfd = move_fd(fd.fd);
+-
+-	TRACE("Setting %s to %s in %s cgroup hierarchy", key, value, cgroup_hierarchy_name(fd.type));
+-
+-	if (fd.type == UNIFIED_HIERARCHY && strequal(fd.controller, "devices")) {
+-		struct device_item device = {};
+-
+-		ret = device_cgroup_rule_parse(&device, key, value);
+-		if (ret < 0)
+-			return log_error_errno(-1, EINVAL, "Failed to parse device string %s=%s",
+-					       key, value);
+-
+-		ret = lxc_cmd_add_bpf_device_cgroup(name, lxcpath, &device);
+-	} else {
+-		ret = lxc_writeat(dfd, key, value, strlen(value));
+-	}
+-
+-	return ret;
+-}
+-
+-static int do_cgroup_freeze(int unified_fd,
+-			    const char *state_string,
+-			    int state_num,
+-			    int timeout,
+-			    const char *epoll_error,
+-			    const char *wait_error)
+-{
+-	__do_close int events_fd = -EBADF;
+-	call_cleaner(lxc_mainloop_close) struct lxc_async_descr *descr_ptr = NULL;
+-	int ret;
+-	struct lxc_async_descr descr = {};
+-
+-	if (timeout != 0) {
+-		ret = lxc_mainloop_open(&descr);
+-		if (ret)
+-			return log_error_errno(-1, errno, "%s", epoll_error);
+-
+-		/* automatically cleaned up now */
+-		descr_ptr = &descr;
+-
+-		events_fd = open_at(unified_fd, "cgroup.events", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH, 0);
+-		if (events_fd < 0)
+-			return log_error_errno(-errno, errno, "Failed to open cgroup.events file");
+-
+-		ret = lxc_mainloop_add_handler_events(&descr, events_fd, EPOLLPRI,
+-						      freezer_cgroup_events_cb,
+-						      default_cleanup_handler,
+-						      INT_TO_PTR(state_num),
+-						      "freezer_cgroup_events_cb");
+-		if (ret < 0)
+-			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
+-	}
+-
+-	ret = lxc_writeat(unified_fd, "cgroup.freeze", state_string, 1);
+-	if (ret < 0)
+-		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
+-
+-	if (timeout != 0) {
+-		ret = lxc_mainloop(&descr, timeout);
+-		if (ret)
+-			return log_error_errno(-1, errno, "%s", wait_error);
+-	}
+-
+-	return log_trace(0, "Container now %s", (state_num == 1) ? "frozen" : "unfrozen");
+-}
+-
+-static inline int __cgroup_freeze(int unified_fd, int timeout)
+-{
+-	return do_cgroup_freeze(unified_fd, "1", 1, timeout,
+-			        "Failed to create epoll instance to wait for container freeze",
+-			        "Failed to wait for container to be frozen");
+-}
+-
+-int cgroup_freeze(const char *name, const char *lxcpath, int timeout)
+-{
+-	__do_close int unified_fd = -EBADF;
+-	int ret;
+-
+-	if (is_empty_string(name) || is_empty_string(lxcpath))
+-		return ret_errno(EINVAL);
+-
+-	unified_fd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
+-	if (unified_fd < 0)
+-		return ret_errno(ENOCGROUP2);
+-
+-	lxc_cmd_notify_state_listeners(name, lxcpath, FREEZING);
+-	ret = __cgroup_freeze(unified_fd, timeout);
+-	lxc_cmd_notify_state_listeners(name, lxcpath, !ret ? FROZEN : RUNNING);
+-	return ret;
+-}
+-
+-int __cgroup_unfreeze(int unified_fd, int timeout)
+-{
+-	return do_cgroup_freeze(unified_fd, "0", 0, timeout,
+-			        "Failed to create epoll instance to wait for container freeze",
+-			        "Failed to wait for container to be frozen");
+-}
+-
+-int cgroup_unfreeze(const char *name, const char *lxcpath, int timeout)
+-{
+-	__do_close int unified_fd = -EBADF;
+-	int ret;
+-
+-	if (is_empty_string(name) || is_empty_string(lxcpath))
+-		return ret_errno(EINVAL);
+-
+-	unified_fd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
+-	if (unified_fd < 0)
+-		return ret_errno(ENOCGROUP2);
+-
+-	lxc_cmd_notify_state_listeners(name, lxcpath, THAWED);
+-	ret = __cgroup_unfreeze(unified_fd, timeout);
+-	lxc_cmd_notify_state_listeners(name, lxcpath, !ret ? RUNNING : FROZEN);
+-	return ret;
+-}
+-- 
+2.25.1
+

_service:tar_scm:0007-fix-run-container-failed-when-enable-isulad.patch Added

@@ -0,0 +1,1060 @@
+From d743d299c37b71d0990d0a68ad492a0ec76a7886 Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Wed, 18 Oct 2023 11:01:49 +0800
+Subject: PATCH fix run container failed when enable isulad
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ src/lxc/attach.c         |  11 +-
+ src/lxc/cgroups/cgfsng.c | 581 +++++++++++++++++++++++++++++++++++++++
+ src/lxc/cgroups/cgroup.h |   4 +
+ src/lxc/conf.c           |  17 +-
+ src/lxc/confile.c        |  34 ++-
+ src/lxc/meson.build      |   4 +-
+ src/lxc/start.c          |  11 +-
+ 7 files changed, 628 insertions(+), 34 deletions(-)
+
+diff --git a/src/lxc/attach.c b/src/lxc/attach.c
+index 066eb5c..ae12da3 100644
+--- a/src/lxc/attach.c
++++ b/src/lxc/attach.c
+@@ -1454,18 +1454,17 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 				goto on_error;
+ 			}
+ 		} else {
+-#else
+-		ret = lxc_terminal_prepare_login(ap->terminal_pts_fd);
+-#endif
+-#ifdef HAVE_ISULAD
+-		}
+ #endif
++		ret = lxc_terminal_prepare_login(ap->terminal_pts_fd);
+ 		if (ret < 0) {
+ 			SYSERROR("Failed to prepare terminal file descriptor %d", ap->terminal_pts_fd);
+ 			goto on_error;
+ 		}
+ 
+ 		TRACE("Prepared terminal file descriptor %d", ap->terminal_pts_fd);
++#ifdef HAVE_ISULAD
++		}
++#endif
+ 	}
+ 
+ 	/* Avoid unnecessary syscalls. */
+@@ -2264,7 +2263,7 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 
+ 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+ #ifdef HAVE_ISULAD
+-			ret = isulad_safe_mainloop(&descr, -1);
++		ret = isulad_safe_mainloop(&descr, -1);
+ #else
+ 		ret = lxc_mainloop(&descr, -1);
+ #endif
+diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
+index 4e4ae0c..0aaafa8 100644
+--- a/src/lxc/cgroups/cgfsng.c
++++ b/src/lxc/cgroups/cgfsng.c
+@@ -528,32 +528,64 @@ static int cgroup_tree_remove_wrapper(void *data)
+ 	return cgroup_tree_remove(arg->hierarchies, arg->path_prune);
+ }
+ 
++#ifdef HAVE_ISULAD
++__cgfsng_ops static bool cgfsng_payload_destroy(struct cgroup_ops *ops,
++						struct lxc_handler *handler)
++#else
+ __cgfsng_ops static void cgfsng_payload_destroy(struct cgroup_ops *ops,
+ 						struct lxc_handler *handler)
++#endif
+ {
+ 	int ret;
+ 
+ 	if (!ops) {
+ 		ERROR("Called with uninitialized cgroup operations");
++#ifdef HAVE_ISULAD
++		return false;
++#else
+ 		return;
++#endif
++	}
++
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, ignore isulad_cgfsng_payload_destroy");
++		return true;
+ 	}
++#endif
+ 
+ 	if (!ops->hierarchies)
++#ifdef HAVE_ISULAD
++		return true;
++#else
+ 		return;
++#endif
+ 
+ 	if (!handler) {
+ 		ERROR("Called with uninitialized handler");
++#ifdef HAVE_ISULAD
++		return false;
++#else
+ 		return;
++#endif
+ 	}
+ 
+ 	if (!handler->conf) {
+ 		ERROR("Called with uninitialized conf");
++#ifdef HAVE_ISULAD
++		return false;
++#else
+ 		return;
++#endif
+ 	}
+ 
+ 	if (!ops->container_limit_cgroup) {
+ 		WARN("Uninitialized limit cgroup");
++#ifdef HAVE_ISULAD
++		return true;
++#else
+ 		return;
++#endif
+ 	}
+ 
+ 	ret = bpf_program_cgroup_detach(handler->cgroup_ops->cgroup2_devices);
+@@ -579,6 +611,9 @@ __cgfsng_ops static void cgfsng_payload_destroy(struct cgroup_ops *ops,
+ 	}
+ 	if (ret < 0)
+ 		SYSWARN("Failed to destroy cgroups");
++#ifdef HAVE_ISULAD
++	return ret >= 0;
++#endif
+ }
+ 
+ #define __ISOL_CPUS "/sys/devices/system/cpu/isolated"
+@@ -854,6 +889,10 @@ static void cgroup_tree_prune_leaf(struct hierarchy *h, const char *path_prune,
+ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
+ 						struct lxc_handler *handler)
+ {
++#ifdef HAVE_ISULAD
++	// ignore destroy monitor cgroup
++	return;
++#endif
+ 	int len;
+ 	char pidstrINTTYPE_TO_STRLEN(pid_t);
+ 	const struct lxc_conf *conf;
+@@ -1311,6 +1350,10 @@ static char *cgroup_relpath(char *cg)
+ 
+ __cgfsng_ops static bool cgfsng_monitor_create(struct cgroup_ops *ops, struct lxc_handler *handler)
+ {
++#ifdef HAVE_ISULAD
++	// skip create monitor cgroup
++	return true;
++#endif
+ 	__do_free char *monitor_cgroup = NULL;
+ 	int idx = 0;
+ 	int i;
+@@ -1411,6 +1454,17 @@ __cgfsng_ops static bool cgfsng_payload_create(struct cgroup_ops *ops, struct lx
+ 	if (!ops->hierarchies)
+ 		return true;
+ 
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, isgnore isulad_cgfsng_payload_create");
++		return true;
++	}
++	if (ops->container_cgroup) {
++		free(ops->container_cgroup);
++		ops->container_cgroup = NULL;
++	}
++#endif
++
+ 	if (ops->container_cgroup || ops->container_limit_cgroup)
+ 		return ret_set_errno(false, EEXIST);
+ 
+@@ -1504,6 +1558,10 @@ __cgfsng_ops static bool cgfsng_payload_create(struct cgroup_ops *ops, struct lx
+ __cgfsng_ops static bool cgfsng_monitor_enter(struct cgroup_ops *ops,
+ 					      struct lxc_handler *handler)
+ {
++#ifdef HAVE_ISULAD
++	// ignore enter monitor cgroup
++	return true;
++#endif
+ 	int monitor_len, transient_len = 0;
+ 	char monitorINTTYPE_TO_STRLEN(pid_t),
+ 	    transientINTTYPE_TO_STRLEN(pid_t);
+@@ -1577,6 +1635,13 @@ __cgfsng_ops static bool cgfsng_payload_enter(struct cgroup_ops *ops,
+ 	if (!ops)
+ 		return ret_set_errno(false, ENOENT);
+ 
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, isgnore isulad_cgfsng_payload_enter");
++		return true;
++	}
++#endif
++
+ 	if (!ops->hierarchies)
+ 		return true;
+ 
+@@ -1728,6 +1793,13 @@ __cgfsng_ops static void cgfsng_finalize(struct cgroup_ops *ops)
+ 	if (!ops)
+ 		return;
+ 
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, isgnore isulad_cgfsng_payload_finalize");
++		return;
++	}
++#endif
++
+ 	if (!ops->hierarchies)
+ 		return;
+ 
+@@ -1900,7 +1972,11 @@ static int __cgroupfs_mount(int cgroup_automount_type, struct hierarchy *h,
+ 			return log_error_errno(-EINVAL, EINVAL, "Unsupported mount properties specified");
+ 
+ 		target = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, hierarchy_mnt, NULL);
++#ifdef HAVE_ISULAD
++		ret = safe_mount(NULL, target, fstype, old_flags, controllers, rootfs_mnt, NULL);
++#else
+ 		ret = safe_mount(NULL, target, fstype, old_flags, controllers, rootfs_mnt);
++#endif
+ 	}
+ 	if (ret < 0)
+ 		return log_error_errno(ret, errno, "Failed to mount %s filesystem onto %d(%s)",
+@@ -1950,6 +2026,9 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
+ 	struct lxc_rootfs *rootfs = &conf->rootfs;
+ 	const char *rootfs_mnt = get_rootfs_mnt(rootfs);
+ 	int ret;
++#ifdef HAVE_ISULAD
++	__do_free_string_list char **merged = NULL;
++#endif
+ 
+ 	if (!ops)
+ 		return ret_set_errno(false, ENOENT);
+@@ -2116,9 +2195,15 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
+ 				MOUNT_ATTR_NOEXEC | MOUNT_ATTR_RELATIME);
+ 	} else {
+ 		cgroup_root = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, NULL);
++#ifdef HAVE_ISULAD
++		ret = safe_mount(NULL, cgroup_root, "tmpfs",
++				 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
++				 "size=10240k,mode=755", rootfs_mnt, NULL);
++#else
+ 		ret = safe_mount(NULL, cgroup_root, "tmpfs",
+ 				 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
+ 				 "size=10240k,mode=755", rootfs_mnt);
++#endif
+ 	}
+ 	if (ret < 0)
+ 		return log_error_errno(false, errno, "Failed to mount tmpfs on %s",
+@@ -2134,6 +2219,16 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
+ 		__do_free char *hierarchy_mnt = NULL, *path2 = NULL;
+ 		struct hierarchy *h = ops->hierarchiesi;
+ 
++#ifdef HAVE_ISULAD
++		// isulad: symlink subcgroup
++		if (strchr(h->at_mnt, ',') != NULL) {
++			int pret;
++			pret = lxc_append_string(&merged, h->at_mnt);
++			if (pret < 0)
++				return false;
++		}
++#endif
++
+ 		ret = mkdirat(dfd_mnt_tmpfs, h->at_mnt, 0000);
+ 		if (ret < 0)
+ 			return syserror_ret(false, "Failed to create cgroup at_mnt %d(%s)", dfd_mnt_tmpfs, h->at_mnt);
+@@ -2165,8 +2260,14 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
+ 			cgroup_root = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, NULL);
+ 
+ 		hierarchy_mnt = must_make_path(cgroup_root, h->at_mnt, NULL);
++#ifdef HAVE_ISULAD
++		// isulad: ignore ops->container_cgroup so we will not see directory lxc after /sys/fs/cgroup/xxx in container,
++		// isulad: ignore h->container_base_path so we will not see subgroup of /sys/fs/cgroup/xxx/subgroup in container
++		path2 = must_make_path(h->at_mnt, NULL);
++#else
+ 		path2 = must_make_path(hierarchy_mnt, h->at_base,
+ 				       ops->container_cgroup, NULL);
++#endif
+ 		ret = mkdir_p(path2, 0755);
+ 		if (ret < 0 && (errno != EEXIST))
+ 			return false;
+@@ -2178,6 +2279,64 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
+ 			return false;
+ 	}
+ 
++
++#ifdef HAVE_ISULAD
++	// isulad: symlink subcgroup
++	// create symlink if no merged cgroup link
++	// like cpu -> cpu,cpuacct
++	if (merged) {
++		char **mc = NULL;
++		for (mc = merged; *mc; mc++) {
++			char *token = NULL;
++			__do_free char *copy = must_copy_string(*mc);
++			lxc_iterate_parts(token, copy, ",") {
++				int mret;
++				__do_free char *link = must_make_path(cgroup_root, token, NULL);
++				mret = symlink(*mc, link);
++				if (mret < 0 && errno != EEXIST) {
++					SYSERROR("Failed to create link %s for target %s", link, *mc);
++					return false;
++				}
++			}
++		}
++	}
++
++	// isulad: remount /sys/fs/cgroup to readonly
++	if (cg_flags == LXC_AUTO_CGROUP_FULL_RO || cg_flags == LXC_AUTO_CGROUP_RO) {
++		ret = mount(cgroup_root, cgroup_root, "bind",
++		            MS_NOSUID|MS_NODEV|MS_NOEXEC|MS_RELATIME|MS_RDONLY|MS_BIND|MS_REMOUNT, NULL);
++		if (ret < 0) {
++			SYSERROR("Failed to remount /sys/fs/cgroup.");
++			return false;
++		}
++	}
++
++	// isulad: remount /sys/fs/cgroup/systemd to readwrite for system container
++	if (handler->conf->systemd != NULL && strcmp(handler->conf->systemd, "true") == 0) {
++		__do_free char *systemdpath = NULL;
++		__do_free char *unifiedpath = NULL;
++		unifiedpath = must_make_path(get_rootfs_mnt(rootfs), "/sys/fs/cgroup/unified", NULL);
++		if (dir_exists(unifiedpath))
++		{
++			ret = umount2(unifiedpath, MNT_DETACH);
++			if (ret < 0)
++			{
++				SYSERROR("Failed to umount /sys/fs/cgroup/unified.");
++				return false;
++			}
++		}
++
++		systemdpath = must_make_path(get_rootfs_mnt(rootfs), "/sys/fs/cgroup/systemd", NULL);
++		ret = mount(systemdpath, systemdpath, "bind",
++					MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME | MS_BIND | MS_REMOUNT, NULL);
++		if (ret < 0)
++		{
++			SYSERROR("Failed to remount /sys/fs/cgroup/systemd.");
++			return false;
++		}
++	}
++#endif
++
+ 	return true;
+ }
+ 
+@@ -2724,6 +2883,13 @@ __cgfsng_ops static bool cgfsng_attach(struct cgroup_ops *ops,
+ 	if (!ops)
+ 		return ret_set_errno(false, ENOENT);
+ 
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, isgnore isulad_cgfsng_attach");
++		return true;
++	}
++#endif
++
+ 	if (!ops->hierarchies)
+ 		return true;
+ 
+@@ -3064,6 +3230,209 @@ static int convert_devpath(const char *invalue, char *dest)
+ 	return 0;
+ }
+ 
++#ifdef HAVE_ISULAD
++#define BATCH_SIZE 50
++static void batch_realloc(char **mem, size_t oldlen, size_t newlen)
++{
++	int newbatches = (newlen / BATCH_SIZE) + 1;
++	int oldbatches = (oldlen / BATCH_SIZE) + 1;
++
++	if (!*mem || newbatches > oldbatches)
++		*mem = must_realloc(*mem, newbatches * BATCH_SIZE);
++}
++
++static void append_line(char **dest, size_t oldlen, char *new, size_t newlen)
++{
++	size_t full = oldlen + newlen;
++
++	batch_realloc(dest, oldlen, full + 1);
++
++	memcpy(*dest + oldlen, new, newlen + 1);
++}
++
++/* Slurp in a whole file */
++static char *read_file(const char *fnam)
++{
++	__do_free char *buf = NULL, *line = NULL;
++	__do_fclose FILE *f = NULL;
++	size_t len = 0, fulllen = 0;
++	int linelen;
++
++	f = fopen(fnam, "re");
++	if (!f)
++		return NULL;
++
++	while ((linelen = getline(&line, &len, f)) != -1) {
++		append_line(&buf, fulllen, line, linelen);
++		fulllen += linelen;
++	}
++
++	return move_ptr(buf);
++}
++
++static bool isulad_copy_parent_file(char *path, char *file)
++{
++	int ret;
++	int len = 0;
++	char *value = NULL;
++	char *current = NULL;
++	char *fpath = NULL;
++	char *lastslash = NULL;
++	char oldv;
++
++	fpath = must_make_path(path, file, NULL);
++	current = read_file(fpath);
++
++	if (current == NULL) {
++		SYSERROR("Failed to read file \"%s\"", fpath);
++		free(fpath);
++		return false;
++	}
++
++	if (strcmp(current, "\n") != 0) {
++		free(fpath);
++		free(current);
++		return true;
++	}
++
++	free(fpath);
++	free(current);
++
++	lastslash = strrchr(path, '/');
++	if (lastslash == NULL) {
++		ERROR("Failed to detect \"/\" in \"%s\"", path);
++		return false;
++	}
++	oldv = *lastslash;
++	*lastslash = '\0';
++	fpath = must_make_path(path, file, NULL);
++	*lastslash = oldv;
++	len = lxc_read_from_file(fpath, NULL, 0);
++	if (len <= 0)
++		goto on_error;
++
++	value = must_realloc(NULL, len + 1);
++	ret = lxc_read_from_file(fpath, value, len);
++	if (ret != len)
++		goto on_error;
++	free(fpath);
++
++	fpath = must_make_path(path, file, NULL);
++	ret = lxc_write_to_file(fpath, value, len, false, 0666);
++	if (ret < 0)
++		SYSERROR("Failed to write \"%s\" to file \"%s\"", value, fpath);
++	free(fpath);
++	free(value);
++	return ret >= 0;
++
++on_error:
++	SYSERROR("Failed to read file \"%s\"", fpath);
++	free(fpath);
++	free(value);
++	return false;
++}
++
++static bool build_sub_cpuset_cgroup_dir(char *cgpath)
++{
++	int ret;
++
++	ret = mkdir_p(cgpath, 0755);
++	if (ret < 0) {
++		if (errno != EEXIST) {
++			SYSERROR("Failed to create directory \"%s\"", cgpath);
++			return false;
++		}
++	}
++
++	/* copy parent's settings */
++	if (!isulad_copy_parent_file(cgpath, "cpuset.cpus")) {
++		SYSERROR("Failed to copy \"cpuset.cpus\" settings");
++		return false;
++	}
++
++	/* copy parent's settings */
++	if (!isulad_copy_parent_file(cgpath, "cpuset.mems")) {
++		SYSERROR("Failed to copy \"cpuset.mems\" settings");
++		return false;
++	}
++
++	return true;
++}
++
++static bool isulad_cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *cgname)
++{
++	char *cgpath, *slash;
++	bool sub_mk_success = false;
++
++	if (is_unified_hierarchy(h))
++		return true;
++
++	if (!string_in_list(h->controllers, "cpuset"))
++		return true;
++
++	cgname += strspn(cgname, "/");
++
++	slash = strchr(cgname, '/');
++
++	if (slash != NULL) {
++		while (slash) {
++			*slash = '\0';
++			cgpath = must_make_path(h->at_mnt, h->at_base, cgname, NULL);
++			sub_mk_success = build_sub_cpuset_cgroup_dir(cgpath);
++			free(cgpath);
++			*slash = '/';
++			if (!sub_mk_success) {
++				return false;
++			}
++			slash = strchr(slash + 1, '/');
++		}
++	}
++
++	cgpath = must_make_path(h->at_mnt, h->at_base, cgname, NULL);
++	sub_mk_success = build_sub_cpuset_cgroup_dir(cgpath);
++	free(cgpath);
++	if (!sub_mk_success) {
++		return false;
++	}
++
++	return true;
++}
++
++static int isulad_mkdir_eexist_on_last(const char *dir, mode_t mode)
++{
++	const char *tmp = dir;
++	const char *orig = dir;
++
++	do {
++		int ret;
++		size_t cur_len;
++		char *makeme;
++
++		dir = tmp + strspn(tmp, "/");
++		tmp = dir + strcspn(dir, "/");
++
++		errno = ENOMEM;
++		cur_len = dir - orig;
++		makeme = strndup(orig, cur_len);
++		if (!makeme)
++			return -1;
++
++		ret = mkdir(makeme, mode);
++		if (ret < 0) {
++			if (errno != EEXIST) {
++				SYSERROR("Failed to create directory \"%s\"", makeme);
++				free(makeme);
++				return -1;
++			}
++		}
++		free(makeme);
++
++	} while (tmp != dir);
++
++	return 0;
++}
++#endif
++
+ /* Called from setup_limits - here we have the container's cgroup_data because
+  * we created the cgroups.
+  */
+@@ -3075,6 +3444,13 @@ static int cg_legacy_set_data(struct cgroup_ops *ops, const char *filename,
+ 	/* "b|c <2^64-1>:<2^64-1> r|w|m" = 47 chars max */
+ 	char converted_value50;
+ 	struct hierarchy *h;
++#ifdef HAVE_ISULAD
++	int nret = 0;
++	int retry_count = 0;
++	int max_retry = 10;
++	char *fullpath;
++	char *container_cgroup = ops->container_cgroup;
++#endif
+ 
+ 	controller = strdup(filename);
+ 	if (!controller)
+@@ -3097,6 +3473,27 @@ static int cg_legacy_set_data(struct cgroup_ops *ops, const char *filename,
+ 	if (!h)
+ 		return log_error_errno(-ENOENT, ENOENT, "Failed to setup limits for the \"%s\" controller. The controller seems to be unused by \"cgfsng\" cgroup driver or not enabled on the cgroup hierarchy", controller);
+ 
++#ifdef HAVE_ISULAD
++	fullpath = must_make_path(h->path_con, filename, NULL);
++retry:
++	nret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
++	if (nret != 0) {
++		if (retry_count < max_retry) {
++			SYSERROR("setting cgroup config for ready process caused \"failed to write %s to %s\".", value, fullpath);
++			(void)isulad_cg_legacy_handle_cpuset_hierarchy(h, container_cgroup);
++			(void)isulad_mkdir_eexist_on_last(h->path_con, 0755);
++			usleep(100 * 1000); /* 100 millisecond */
++			retry_count++;
++			goto retry;
++		}
++		lxc_write_error_message(ops->errfd,
++		                        "%s:%d: setting cgroup config for ready process caused failed to write %s to %s: %s",
++		                        __FILE__, __LINE__, value, fullpath, strerror(errno));
++	}
++	free(fullpath);
++	return nret;
++#endif
++
+ 	if (is_cpuset) {
+ 		int ret = lxc_write_openat(h->path_con, filename, value, strlen(value));
+ 		if (ret)
+@@ -3131,12 +3528,76 @@ static void sort_cgroup_settings(struct lxc_conf *conf)
+ 
+ }
+ 
++#ifdef HAVE_ISULAD
++/* Called from setup_limits - here we have the container's cgroup_data because
++ * we created the cgroups.
++ */
++static int isulad_cg_legacy_get_data(struct cgroup_ops *ops, const char *filename,
++                              char *value, size_t len)
++{
++	char *fullpath = NULL;
++	char *p = NULL;
++	struct hierarchy *h = NULL;
++	int ret = 0;
++	char *controller = NULL;
++
++	len = strlen(filename);
++	if (SIZE_MAX - 1 < len) {
++		errno = EINVAL;
++		return -1;
++	}
++	controller = calloc(1, len + 1);
++	if (controller == NULL) {
++		errno = ENOMEM;
++		return -1;
++	}
++	(void)strlcpy(controller, filename, len + 1);
++
++	p = strchr(controller, '.');
++	if (p)
++		*p = '\0';
++
++
++	h = get_hierarchy(ops, controller);
++	if (!h) {
++		ERROR("Failed to setup limits for the \"%s\" controller. "
++		      "The controller seems to be unused by \"cgfsng\" cgroup "
++		      "driver or not enabled on the cgroup hierarchy",
++		      controller);
++		errno = ENOENT;
++		free(controller);
++		return -ENOENT;
++	}
++
++	fullpath = must_make_path(h->path_con, filename, NULL);
++	ret = lxc_read_from_file(fullpath, value, len);
++	free(fullpath);
++	free(controller);
++	return ret;
++}
++
++static char *trim(char *s)
++{
++	size_t len;
++
++	len = strlen(s);
++	while ((len > 1) && (slen - 1 == '\n'))
++		s--len = '\0';
++
++	return s;
++}
++#endif
++
+ __cgfsng_ops static bool cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
+ 						    struct lxc_conf *conf,
+ 						    bool do_devices)
+ {
+ 	struct list_head *cgroup_settings;
+ 	struct lxc_cgroup *cgroup;
++#ifdef HAVE_ISULAD
++	char value21 + 1 = { 0 };
++	long long int readvalue, setvalue;
++#endif
+ 
+ 	if (!ops)
+ 		return ret_set_errno(false, ENOENT);
+@@ -3157,6 +3618,27 @@ __cgfsng_ops static bool cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
+ 	sort_cgroup_settings(conf);
+ 	list_for_each_entry(cgroup, cgroup_settings, head) {
+ 		if (do_devices == strnequal("devices", cgroup->subsystem, 7)) {
++#ifdef HAVE_ISULAD
++			const char *cgvalue = cgroup->value;
++			if (strcmp("files.limit", cgroup->subsystem) == 0) {
++				if (lxc_safe_long_long(cgvalue, &setvalue) != 0) {
++					SYSERROR("Invalid integer value %s", cgvalue);
++					return false;
++				}
++				if (setvalue <= 0) {
++					cgvalue = "max";
++				}
++			}
++			if (cg_legacy_set_data(ops, cgroup->subsystem, cgvalue, strnequal("cpuset", cgroup->subsystem, 6))) {
++				if (do_devices && (errno == EACCES || errno == EPERM)) {
++					SYSWARN("Failed to set \"%s\" to \"%s\"", cgroup->subsystem, cgvalue);
++					continue;
++				}
++				SYSERROR("Failed to set \"%s\" to \"%s\"", cgroup->subsystem, cgvalue);
++				return false;
++			}
++			DEBUG("Set controller \"%s\" set to \"%s\"", cgroup->subsystem, cgvalue);
++#else
+ 			if (cg_legacy_set_data(ops, cgroup->subsystem, cgroup->value, strnequal("cpuset", cgroup->subsystem, 6))) {
+ 				if (do_devices && (errno == EACCES || errno == EPERM)) {
+ 					SYSWARN("Failed to set \"%s\" to \"%s\"", cgroup->subsystem, cgroup->value);
+@@ -3166,7 +3648,40 @@ __cgfsng_ops static bool cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
+ 				return false;
+ 			}
+ 			DEBUG("Set controller \"%s\" set to \"%s\"", cgroup->subsystem, cgroup->value);
++#endif
+ 		}
++
++#ifdef HAVE_ISULAD
++		// isulad: check cpu shares
++		if (strcmp(cgroup->subsystem, "cpu.shares") == 0) {
++			if (isulad_cg_legacy_get_data(ops, cgroup->subsystem, value, sizeof(value) - 1) < 0) {
++				SYSERROR("Error get %s", cgroup->subsystem);
++				return false;
++			}
++			trim(value);
++			if (lxc_safe_long_long(cgroup->value, &setvalue) != 0) {
++				SYSERROR("Invalid value %s", cgroup->value);
++				return false;
++			}
++			if (lxc_safe_long_long(value, &readvalue) != 0) {
++				SYSERROR("Invalid value %s", value);
++				return false;
++			}
++			if (setvalue > readvalue) {
++				ERROR("The maximum allowed cpu-shares is %s", value);
++				lxc_write_error_message(ops->errfd,
++				                        "%s:%d: setting cgroup config for ready process caused \"The maximum allowed cpu-shares is %s\".",
++				                        __FILE__, __LINE__, value);
++				return false;
++			} else if (setvalue < readvalue) {
++				ERROR("The minimum allowed cpu-shares is %s", value);
++				lxc_write_error_message(ops->errfd,
++				                        "%s:%d: setting cgroup config for ready process caused \"The minimum allowed cpu-shares is %s\".",
++				                        __FILE__, __LINE__, value);
++				return false;
++			}
++		}
++#endif
+ 	}
+ 
+ 	INFO("Limits for the legacy cgroup hierarchies have been setup");
+@@ -3359,6 +3874,10 @@ static bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cg
+ 
+ __cgfsng_ops static bool cgfsng_monitor_delegate_controllers(struct cgroup_ops *ops)
+ {
++#ifdef HAVE_ISULAD
++	// ignore monitor cgroup delegate controllers
++	return true;
++#endif
+ 	if (!ops)
+ 		return ret_set_errno(false, ENOENT);
+ 
+@@ -3370,6 +3889,13 @@ __cgfsng_ops static bool cgfsng_payload_delegate_controllers(struct cgroup_ops *
+ 	if (!ops)
+ 		return ret_set_errno(false, ENOENT);
+ 
++#ifdef HAVE_ISULAD
++	if (ops->no_controller) {
++		DEBUG("no controller found, isgnore isulad_cgfsng_payload_delegate_controllers");
++		return true;
++	}
++#endif
++
+ 	return __cgfsng_delegate_controllers(ops, ops->container_cgroup);
+ }
+ 
+@@ -3635,7 +4161,9 @@ static int __initialize_cgroups(struct cgroup_ops *ops, bool relative,
+ 			if (!controller_list) {
+ 				TRACE("No controllers are enabled for delegation in the unified hierarchy");
+ #ifdef HAVE_ISULAD
++			if (fhas_fs_type(ops->dfd_mnt, CGROUP2_SUPER_MAGIC)) {
+ 				ops->no_controller = true;
++			}
+ #endif
+ 				controller_list = list_new();
+ 				if (!controller_list)
+@@ -3839,9 +4367,18 @@ static int initialize_cgroups(struct cgroup_ops *ops, struct lxc_conf *conf)
+ 	return 0;
+ }
+ 
++#ifdef HAVE_ISULAD
++__cgfsng_ops static int cgfsng_data_init(struct cgroup_ops *ops, struct lxc_conf *conf)
++#else
+ __cgfsng_ops static int cgfsng_data_init(struct cgroup_ops *ops)
++#endif
+ {
+ 	const char *cgroup_pattern;
++#ifdef HAVE_ISULAD
++	const char *cgroup_tree;
++	__do_free char *container_cgroup = NULL, *__cgroup_tree = NULL;
++	size_t len;
++#endif
+ 
+ 	if (!ops)
+ 		return ret_set_errno(-1, ENOENT);
+@@ -3854,9 +4391,48 @@ __cgfsng_ops static int cgfsng_data_init(struct cgroup_ops *ops)
+ 			return ret_errno(ENOMEM);
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	if (conf->cgroup_meta.dir) {
++		cgroup_tree = conf->cgroup_meta.dir;
++		container_cgroup = must_concat(&len, cgroup_tree, "/", conf->name, NULL);
++	} else if (ops->cgroup_pattern) {
++		__cgroup_tree = lxc_string_replace("%n", conf->name, ops->cgroup_pattern);
++		if (!__cgroup_tree)
++			return ret_set_errno(-1, ENOMEM);
++
++		cgroup_tree = __cgroup_tree;
++		container_cgroup = must_concat(&len, cgroup_tree, NULL);
++	} else {
++		cgroup_tree = NULL;
++		container_cgroup = must_concat(&len, conf->name, NULL);
++	}
++	if (!container_cgroup)
++		return ret_set_errno(-1, ENOMEM);
++
++	ops->container_cgroup = move_ptr(container_cgroup);
++#endif
++
+ 	return 0;
+ }
+ 
++#ifdef HAVE_ISULAD
++__cgfsng_ops static const char *isulad_cgfsng_get_cgroup_full_path(struct cgroup_ops *ops,
++						  const char *controller)
++{
++	struct hierarchy *h;
++
++	h = get_hierarchy(ops, controller);
++	if (!h)
++		return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
++				      controller ? controller : "(null)");
++
++	if (!h->path_con)
++		h->path_con = must_make_path(h->at_mnt, h->at_base, ops->container_cgroup, NULL);
++
++	return h->path_con;
++}
++#endif
++
+ struct cgroup_ops *cgroup_ops_init(struct lxc_conf *conf)
+ {
+ 	__cleanup_cgroup_ops struct cgroup_ops *cgfsng_ops = NULL;
+@@ -3888,7 +4464,12 @@ struct cgroup_ops *cgroup_ops_init(struct lxc_conf *conf)
+ 	cgfsng_ops->unfreeze				= cgfsng_unfreeze;
+ 	cgfsng_ops->setup_limits_legacy			= cgfsng_setup_limits_legacy;
+ 	cgfsng_ops->setup_limits			= cgfsng_setup_limits;
++#ifdef HAVE_ISULAD
++	cgfsng_ops->driver 				= "isulad_cgfsng";
++	cgfsng_ops->get_cgroup_full_path = isulad_cgfsng_get_cgroup_full_path;
++#else
+ 	cgfsng_ops->driver				= "cgfsng";
++#endif
+ 	cgfsng_ops->version				= "1.0.0";
+ 	cgfsng_ops->attach				= cgfsng_attach;
+ 	cgfsng_ops->chown				= cgfsng_chown;
+diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h
+index d9159f4..0a4ce64 100644
+--- a/src/lxc/cgroups/cgroup.h
++++ b/src/lxc/cgroups/cgroup.h
+@@ -18,7 +18,11 @@
+ 
+ #define DEFAULT_CGROUP_MOUNTPOINT_RELATIVE "sys/fs/cgroup"
+ #define DEFAULT_CGROUP_MOUNTPOINT "/sys/fs/cgroup"
++#ifdef HAVE_ISULAD
++#define DEFAULT_PAYLOAD_CGROUP_PREFIX ""
++#else
+ #define DEFAULT_PAYLOAD_CGROUP_PREFIX "lxc.payload."
++#endif
+ #define DEFAULT_MONITOR_CGROUP_PREFIX "lxc.monitor."
+ #define DEFAULT_PAYLOAD_CGROUP "payload"
+ #define DEFAULT_MONITOR_CGROUP "monitor"
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index 34cf90a..ff5cefc 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -4814,13 +4814,12 @@ int lxc_setup(struct lxc_handler *handler)
+ 		return log_error(-1, "Failed to verify start hooks");
+ 
+ #ifdef HAVE_ISULAD
+-	if (setup_proc)
+-#endif
+-	ret = lxc_create_tmp_proc_mount(lxc_conf);
+-	if (ret < 0)
+-		return log_error(-1, "Failed to mount transient procfs instance for LSMs");
++	if (setup_proc) {
++		ret = lxc_create_tmp_proc_mount(lxc_conf);
++		if (ret < 0)
++			return log_error(-1, "Failed to mount transient procfs instance for LSMs");
++	}
+ 
+-#ifdef HAVE_ISULAD
+ 	if (setup_rootfs_mountopts(&lxc_conf->rootfs)) {
+ 			return log_error(-1, "failed to set rootfs for '%s'", name);
+ 	}
+@@ -4831,6 +4830,10 @@ int lxc_setup(struct lxc_handler *handler)
+ 		}
+ 	}
+ #else
++	ret = lxc_create_tmp_proc_mount(lxc_conf);
++	if (ret < 0)
++		return log_error(-1, "Failed to mount transient procfs instance for LSMs");
++
+ 	ret = lxc_setup_devpts_child(handler);
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to prepare new devpts instance");
+@@ -4855,7 +4858,7 @@ int lxc_setup(struct lxc_handler *handler)
+ 
+ #ifdef HAVE_ISULAD
+ 	/* Ask father to run oci prestart hooks and wait for him to finish. */
+-	if (lxc_sync_barrier_parent(handler, START_SYNC_OCI_PRESTART_HOOK)) {
++	if (!lxc_sync_barrier_parent(handler, START_SYNC_OCI_PRESTART_HOOK)) {
+ 		return log_error(-1, "Failed to sync parent to start host hook");
+ 	}
+ #endif
+diff --git a/src/lxc/confile.c b/src/lxc/confile.c
+index 0d0d66c..ae1a264 100644
+--- a/src/lxc/confile.c
++++ b/src/lxc/confile.c
+@@ -287,16 +287,18 @@ static struct lxc_config_t config_jump_table = {
+ 	{ "lxc.sysctl",                     false, set_config_sysctl,                     get_config_sysctl,                     clr_config_sysctl,                     },
+ 	{ "lxc.proc",                       false, set_config_proc,                       get_config_proc,                       clr_config_proc,                       },
+ #ifdef HAVE_ISULAD
+-	{ "lxc.isulad.init.args",          	true,	set_config_init_args,                   get_config_init_args,                   clr_config_init_args,                 },
+-	{ "lxc.isulad.populate.device",    	true,	set_config_populate_device,             get_config_populate_device,             clr_config_populate_device,           },
+-	{ "lxc.isulad.umask",              	true,	set_config_umask,                       get_config_umask,                       clr_config_umask,                     },
+-	{ "lxc.isulad.rootfs.maskedpaths", 	true,	set_config_rootfs_masked_paths,         get_config_rootfs_masked_paths,         clr_config_rootfs_masked_paths,       },
+-	{ "lxc.isulad.rootfs.ropaths",     	true,	set_config_rootfs_ro_paths,             get_config_rootfs_ro_paths,             clr_config_rootfs_ro_paths,           },
+-	{ "lxc.isulad.systemd",            	true,	set_config_systemd,                     get_config_systemd,                     clr_config_systemd,                   },
+-	{ "lxc.console.logdriver",         	true,	set_config_console_log_driver,          get_config_console_log_driver,          clr_config_console_log_driver,        },
+-	{ "lxc.console.syslog_tag",        	true,	set_config_console_syslog_tag,          get_config_console_syslog_tag,          clr_config_console_syslog_tag,        },
+-	{ "lxc.console.syslog_facility",   	true,	set_config_console_syslog_facility,     get_config_console_syslog_facility,     clr_config_console_syslog_facility,   },
+-	{ "lxc.selinux.mount_context",     	true,	set_config_selinux_mount_context,       get_config_selinux_mount_context,       clr_config_selinux_mount_context,     },
++	{ "lxc.isulad.init.args",          	true,	set_config_init_args,                   get_config_init_args,                   clr_config_init_args,       		},
++	{ "lxc.isulad.populate.device",    	true,	set_config_populate_device,             get_config_populate_device,             clr_config_populate_device,  		},
++	{ "lxc.isulad.umask",              	true,	set_config_umask,                       get_config_umask,                       clr_config_umask,           		},
++	{ "lxc.isulad.rootfs.maskedpaths", 	true,	set_config_rootfs_masked_paths,         get_config_rootfs_masked_paths,         clr_config_rootfs_masked_paths, 	},
++	{ "lxc.isulad.rootfs.ropaths",     	true,	set_config_rootfs_ro_paths,             get_config_rootfs_ro_paths,             clr_config_rootfs_ro_paths,   		},
++	{ "lxc.isulad.systemd",            	true,	set_config_systemd,                     get_config_systemd,                     clr_config_systemd,           		},
++	{ "lxc.console.logdriver",         	true,	set_config_console_log_driver,          get_config_console_log_driver,          clr_config_console_log_driver, 		},
++	{ "lxc.console.syslog_tag",        	true,	set_config_console_syslog_tag,          get_config_console_syslog_tag,          clr_config_console_syslog_tag,   	},
++	{ "lxc.console.syslog_facility",   	true,	set_config_console_syslog_facility,     get_config_console_syslog_facility,     clr_config_console_syslog_facility,	},
++	{ "lxc.selinux.mount_context",     	true,	set_config_selinux_mount_context,       get_config_selinux_mount_context,       clr_config_selinux_mount_context,	},
++	// same to lxc.init.groups
++	{ "lxc.isulad.init.groups",         true,  	set_config_init_groups,          		get_config_init_groups,          		clr_config_init_groups,      		},
+ #endif
+ };
+ 
+@@ -1343,7 +1345,11 @@ static int set_config_init_groups(const char *key, const char *value,
+ 	if (!value_dup)
+ 		return -ENOMEM;
+ 
++#ifdef HAVE_ISULAD
++	lxc_iterate_parts(token, value_dup, " \t")
++#else
+ 	lxc_iterate_parts(token, value_dup, ",")
++#endif
+ 		num_groups++;
+ 
+ 	if (num_groups == INT_MAX)
+@@ -1368,7 +1374,11 @@ static int set_config_init_groups(const char *key, const char *value,
+ 	/* Restore duplicated value so we can call lxc_iterate_parts() again. */
+ 	strcpy(value_dup, value);
+ 
++#ifdef HAVE_ISULAD
++	lxc_iterate_parts(token, value_dup, " \t") {
++#else
+ 	lxc_iterate_parts(token, value_dup, ",") {
++#endif
+ 		int ret;
+ 
+ 		gid_t group;
+@@ -2000,13 +2010,13 @@ static int set_config_cgroup_dir(const char *key, const char *value,
+ 
+ 	if (lxc_config_value_empty(value))
+ 		return clr_config_cgroup_dir(key, lxc_conf, NULL);
+-
++#ifndef HAVE_ISULAD
+ 	if (abspath(value))
+ 		return syserror_set(-EINVAL, "%s paths may not be absolute", key);
+ 
+ 	if (dotdot(value))
+ 		return syserror_set(-EINVAL, "%s paths may not walk upwards via \"../\"", key);
+-
++#endif
+ 	return set_config_path_item(&lxc_conf->cgroup_meta.dir, value);
+ }
+ 
+diff --git a/src/lxc/meson.build b/src/lxc/meson.build
+index 3166401..6c4ba6a 100644
+--- a/src/lxc/meson.build
++++ b/src/lxc/meson.build
+@@ -25,6 +25,7 @@ liblxcfs_version_file = configure_file(
+ )
+ 
+ liblxc_sources = files(
++    'cgroups/cgfsng.c',
+     'cgroups/cgroup.c',
+     'cgroups/cgroup.h',
+     'cgroups/cgroup2_devices.c',
+@@ -140,7 +141,6 @@ liblxc_sources = files(
+ 
+ if want_isulad
+     liblxc_sources += files(
+-        'cgroups/isulad_cgfsng.c',
+         'exec_commands.c',
+         'exec_commands.h',
+         'isulad_utils.c',
+@@ -159,8 +159,6 @@ if want_isulad
+         'json/oci_runtime_spec.h',
+         'json/read-file.c',
+         'json/read-file.h')
+-else
+-    liblxc_sources += files('cgroups/cgfsng.c')
+ endif
+ 
+ if want_apparmor and libapparmor.found()
+diff --git a/src/lxc/start.c b/src/lxc/start.c
+index ff9a3fa..a7bc2e6 100644
+--- a/src/lxc/start.c
++++ b/src/lxc/start.c
+@@ -2384,13 +2384,12 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 		goto out_delete_net;
+ 	}
+ 
+-       /* Tell the child to continue its initialization. We'll get
+-        * START_SYNC_POST_OCI_PRESTART_HOOK when it is ready for us to run oci prestart hooks.
+-        */
+-       if (lxc_sync_wake_child(handler, START_SYNC_POST_OCI_PRESTART_HOOK))
+-               goto out_delete_net;
++	/* Tell the child to continue its initialization. We'll get
++	 * START_SYNC_POST_OCI_PRESTART_HOOK when it is ready for us to run oci prestart hooks.
++	 */
++	if (!lxc_sync_wake_child(handler, START_SYNC_POST_OCI_PRESTART_HOOK))
++		goto out_delete_net;
+ #endif
+-
+ 	if (!lxc_sync_wait_child(handler, START_SYNC_CGROUP_LIMITS))
+ 		goto out_delete_net;
+ 
+-- 
+2.25.1
+

_service:tar_scm:0007-refactor-patches-on-terminal.c-start.c-and-so-on.patch Deleted

@@ -1,2726 +0,0 @@
-From 06b071d6bc7683023d3131d4e428210005333c8c Mon Sep 17 00:00:00 2001
-From: chengzrz <czrzrichard@gmail.com>
-Date: Wed, 20 Jul 2022 15:03:45 +0800
-Subject: PATCH refactor patches on terminal.c, start.c and so on
-
-Signed-off-by: chengzrz <czrzrichard@gmail.com>
----
- hooks/Makefile.am         |   3 +
- src/lxc/attach.h          |   6 +
- src/lxc/cgroups/cgroup.c  |   4 +
- src/lxc/commands_utils.h  |   6 +
- src/lxc/initutils.c       |   4 +
- src/lxc/lsm/lsm.h         |   8 +
- src/lxc/lxclock.h         |   4 +
- src/lxc/mainloop.h        |   4 +
- src/lxc/start.c           | 958 ++++++++++++++++++++++++++++++++++++
- src/lxc/storage/btrfs.c   |  11 +
- src/lxc/storage/overlay.c |   8 +
- src/lxc/sync.h            |   4 +
- src/lxc/terminal.c        | 990 ++++++++++++++++++++++++++++++++++++++
- src/tests/Makefile.am     |   4 +
- src/tests/attach.c        |  11 +
- 15 files changed, 2025 insertions(+)
-
-diff --git a/hooks/Makefile.am b/hooks/Makefile.am
-index 5ae73d7..ddfd4bc 100644
---- a/hooks/Makefile.am
-+++ b/hooks/Makefile.am
-@@ -10,6 +10,8 @@ hooks_SCRIPTS = \
- 	squid-deb-proxy-client \
- 	nvidia
- 
-+
-+if !HAVE_ISULAD
- binhooks_PROGRAMS = \
- 	unmount-namespace
- 
-@@ -20,5 +22,6 @@ if IS_BIONIC
- unmount_namespace_SOURCES += \
- 	../src/include/lxcmntent.c ../src/include/lxcmntent.h
- endif
-+endif
- 
- EXTRA_DIST=$(hooks_SCRIPTS)
-diff --git a/src/lxc/attach.h b/src/lxc/attach.h
-index ef5a6c1..8316344 100644
---- a/src/lxc/attach.h
-+++ b/src/lxc/attach.h
-@@ -20,9 +20,15 @@ struct lxc_proc_context_info {
- 	int ns_fdLXC_NS_MAX;
- };
- 
-+#ifdef HAVE_ISULAD
-+extern int lxc_attach(struct lxc_container *container,
-+		      lxc_attach_exec_t exec_function, void *exec_payload,
-+		      lxc_attach_options_t *options, pid_t *attached_process, char **err_msg);
-+#else
- extern int lxc_attach(struct lxc_container *container,
- 		      lxc_attach_exec_t exec_function, void *exec_payload,
- 		      lxc_attach_options_t *options, pid_t *attached_process);
-+#endif
- 
- extern int lxc_attach_remount_sys_proc(void);
- 
-diff --git a/src/lxc/cgroups/cgroup.c b/src/lxc/cgroups/cgroup.c
-index 7c94fd8..5aa2c3c 100644
---- a/src/lxc/cgroups/cgroup.c
-+++ b/src/lxc/cgroups/cgroup.c
-@@ -31,7 +31,11 @@ struct cgroup_ops *cgroup_init(struct lxc_conf *conf)
- 	if (!cgroup_ops)
- 		return log_error_errno(NULL, errno, "Failed to initialize cgroup driver");
- 
-+#ifdef HAVE_ISULAD
-+	if (cgroup_ops->data_init(cgroup_ops, conf)) {
-+#else
- 	if (cgroup_ops->data_init(cgroup_ops)) {
-+#endif
- 		cgroup_exit(cgroup_ops);
- 		return log_error_errno(NULL, errno,
- 				       "Failed to initialize cgroup data");
-diff --git a/src/lxc/commands_utils.h b/src/lxc/commands_utils.h
-index 3ef7920..c836ead 100644
---- a/src/lxc/commands_utils.h
-+++ b/src/lxc/commands_utils.h
-@@ -65,4 +65,10 @@ extern int lxc_add_state_client(int state_client_fd,
- extern int lxc_cmd_connect(const char *name, const char *lxcpath,
- 			   const char *hashed_sock_name, const char *suffix);
- 
-+#ifdef HAVE_ISULAD
-+extern char *generate_named_unix_sock_dir(const char *name);
-+extern int generate_named_unix_sock_path(const char *container_name,
-+				const char *sock_name, char *out_path, size_t len);
-+#endif
-+
- #endif /* __LXC_COMMANDS_UTILS_H */
-diff --git a/src/lxc/initutils.c b/src/lxc/initutils.c
-index 5549c2e..76f0048 100644
---- a/src/lxc/initutils.c
-+++ b/src/lxc/initutils.c
-@@ -54,11 +54,15 @@ const char *lxc_global_config_value(const char *option_name)
- 		{ NULL, NULL },
- 	};
- 
-+#ifdef HAVE_ISULAD
-+	static const char *valuessizeof(options) / sizeof(options0) = {0};
-+#else
- 	/* placed in the thread local storage pool for non-bionic targets */
- #ifdef HAVE_TLS
- 	static thread_local const char *valuessizeof(options) / sizeof(options0) = {0};
- #else
- 	static const char *valuessizeof(options) / sizeof(options0) = {0};
-+#endif
- #endif
- 
- 	/* user_config_path is freed as soon as it is used */
-diff --git a/src/lxc/lsm/lsm.h b/src/lxc/lsm/lsm.h
-index ee578bb..4872f55 100644
---- a/src/lxc/lsm/lsm.h
-+++ b/src/lxc/lsm/lsm.h
-@@ -17,6 +17,10 @@ struct lsm_drv {
- 	char *(*process_label_get)(pid_t pid);
- 	int (*process_label_set)(const char *label, struct lxc_conf *conf,
- 				 bool on_exec);
-+#ifdef HAVE_ISULAD
-+	int (*file_label_set)(const char *path, const char *label);
-+	int (*relabel)(const char *path, const char *label, bool share);
-+#endif
- 	int (*keyring_label_set)(char* label);
- 	int (*prepare)(struct lxc_conf *conf, const char *lxcpath);
- 	void (*cleanup)(struct lxc_conf *conf, const char *lxcpath);
-@@ -32,6 +36,10 @@ extern int lsm_process_label_set(const char *label, struct lxc_conf *conf,
- extern int lsm_process_label_fd_get(pid_t pid, bool on_exec);
- extern int lsm_process_label_set_at(int label_fd, const char *label,
- 				    bool on_exec);
-+#ifdef HAVE_ISULAD
-+extern int lsm_file_label_set(const char *path, const char *label);
-+extern int lsm_relabel(const char *path, const char *label, bool share);
-+#endif
- extern void lsm_process_cleanup(struct lxc_conf *conf, const char *lxcpath);
- extern int lsm_keyring_label_set(char *label);
- 
-diff --git a/src/lxc/lxclock.h b/src/lxc/lxclock.h
-index 9f9bc3b..6a71d7c 100644
---- a/src/lxc/lxclock.h
-+++ b/src/lxc/lxclock.h
-@@ -154,4 +154,8 @@ extern int container_disk_lock(struct lxc_container *c);
-  */
- extern void container_disk_unlock(struct lxc_container *c);
- 
-+#ifdef HAVE_ISULAD
-+int container_disk_removelock(struct lxc_container *c);
-+#endif
-+
- #endif
-diff --git a/src/lxc/mainloop.h b/src/lxc/mainloop.h
-index e6ab9a6..aa41a93 100644
---- a/src/lxc/mainloop.h
-+++ b/src/lxc/mainloop.h
-@@ -38,4 +38,8 @@ extern void lxc_mainloop_close(struct lxc_epoll_descr *descr);
- 
- define_cleanup_function(struct lxc_epoll_descr *, lxc_mainloop_close);
- 
-+#ifdef HAVE_ISULAD
-+extern int isulad_safe_mainloop(struct lxc_epoll_descr *descr, int timeout_ms);
-+#endif
-+
- #endif
-diff --git a/src/lxc/start.c b/src/lxc/start.c
-index fd969c4..f82df34 100644
---- a/src/lxc/start.c
-+++ b/src/lxc/start.c
-@@ -304,7 +304,11 @@ static int setup_signal_fd(sigset_t *oldmask)
- {
- 	int ret;
- 	sigset_t mask;
-+#ifdef HAVE_ISULAD
-+	const int signals = {SIGBUS, SIGILL, SIGSEGV, SIGWINCH, SIGTERM};
-+#else
- 	const int signals = {SIGBUS, SIGILL, SIGSEGV, SIGWINCH};
-+#endif
- 
- 	/* Block everything except serious error signals. */
- 	ret = sigfillset(&mask);
-@@ -590,13 +594,27 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
- 
- 	TRACE("Mainloop is ready");
- 
-+#ifdef HAVE_ISULAD
-+	// iSulad: close stdin pipe if we do not want open_stdin with container stdin
-+	if (!handler->conf->console.open_stdin) {
-+		if (handler->conf->console.pipes01 > 0) {
-+			close(handler->conf->console.pipes01);
-+			handler->conf->console.pipes01 = -1;
-+		}
-+	}
-+#endif
-+
- 	ret = lxc_mainloop(&descr, -1);
- 	close_prot_errno_disarm(descr.epfd);
- 	if (ret < 0 || !handler->init_died)
- 		goto out_mainloop_console;
- 
- 	if (has_console)
-+#ifdef HAVE_ISULAD
-+		ret = isulad_safe_mainloop(&descr_console, 100);
-+#else
- 		ret = lxc_mainloop(&descr_console, 0);
-+#endif
- 
- out_mainloop_console:
- 	if (has_console) {
-@@ -637,7 +655,9 @@ struct lxc_handler *lxc_init_handler(struct lxc_handler *old,
- 				     const char *name, struct lxc_conf *conf,
- 				     const char *lxcpath, bool daemonize)
- {
-+#ifndef HAVE_ISULAD
- 	int nr_keep_fds = 0;
-+#endif
- 	int ret;
- 	struct lxc_handler *handler;
- 
-@@ -671,6 +691,12 @@ struct lxc_handler *lxc_init_handler(struct lxc_handler *old,
- 		handler->nsfdi = -EBADF;
- 
- 	handler->name = name;
-+
-+#ifdef HAVE_ISULAD
-+	handler->exit_code = -1; /* isulad: record exit code of container */
-+	handler->image_type_oci = false;
-+#endif
-+
- 	if (daemonize)
- 		handler->transient_pid = lxc_raw_getpid();
- 	else
-@@ -691,8 +717,10 @@ struct lxc_handler *lxc_init_handler(struct lxc_handler *old,
- 		TRACE("Created anonymous pair {%d,%d} of unix sockets",
- 		      handler->state_socket_pair0,
- 		      handler->state_socket_pair1);
-+#ifndef HAVE_ISULAD
- 		handler->keep_fdsnr_keep_fds++ = handler->state_socket_pair0;
- 		handler->keep_fdsnr_keep_fds++ = handler->state_socket_pair1;
-+#endif
- 	}
- 
- 	if (handler->conf->reboot == REBOOT_NONE) {
-@@ -701,7 +729,9 @@ struct lxc_handler *lxc_init_handler(struct lxc_handler *old,
- 			ERROR("Failed to set up command socket");
- 			goto on_error;
- 		}
-+#ifndef HAVE_ISULAD
- 		handler->keep_fdsnr_keep_fds++ = handler->conf->maincmd_fd;
-+#endif
- 	}
- 
- 	TRACE("Unix domain socket %d for command server is ready",
-@@ -721,6 +751,10 @@ int lxc_init(const char *name, struct lxc_handler *handler)
- 	int ret;
- 	const char *loglevel;
- 	struct lxc_conf *conf = handler->conf;
-+#ifdef HAVE_ISULAD
-+	conf->console.disable_pty = handler->disable_pty;
-+	conf->console.open_stdin = handler->open_stdin;
-+#endif
- 
- 	handler->monitor_pid = lxc_raw_getpid();
- 	status_fd = open("/proc/self/status", O_RDONLY | O_CLOEXEC);
-@@ -810,6 +844,9 @@ int lxc_init(const char *name, struct lxc_handler *handler)
- 	ret = lxc_terminal_setup(conf);
- 	if (ret < 0) {
- 		ERROR("Failed to create console");
-+#ifdef HAVE_ISULAD
-+		lxc_write_error_message(conf->errpipe1, "Failed to create console for container \"%s\".", name);
-+#endif
- 		goto out_restore_sigmask;
- 	}
- 	TRACE("Created console");
-@@ -853,6 +890,185 @@ out_restore_sigmask:
- 	return -1;
- }
- 
-+#ifdef HAVE_ISULAD
-+/* isulad: start timeout thread */
-+typedef enum {
-+	START_INIT,
-+	START_TIMEOUT,
-+	START_MAX,
-+} start_timeout_t;
-+
-+static start_timeout_t global_timeout_state = START_INIT;
-+static sem_t global_timeout_sem;
-+
-+struct start_timeout_conf {
-+	unsigned int timeout;
-+	int errfd;
-+};
-+
-+void trim_line(char *s)
-+{
-+	size_t len;
-+
-+	len = strlen(s);
-+	while ((len > 1) && (slen - 1 == '\n'))
-+		s--len = '\0';
-+}
-+
-+static int _read_procs_file(const char *path, pid_t **pids, size_t *len)
-+{
-+	FILE *f;
-+	char *line = NULL;
-+	size_t sz = 0;
-+	pid_t *tmp_pids = NULL;
-+
-+	f = fopen_cloexec(path, "r");
-+	if (!f)
-+		return -1;
-+
-+	while (getline(&line, &sz, f) != -1) {
-+		pid_t pid;
-+		trim_line(line);
-+		pid = (pid_t)atoll(line);
-+		if (lxc_mem_realloc((void **)&tmp_pids, sizeof(pid_t) * (*len + 1), *pids, sizeof(pid_t) * (*len)) != 0) {
-+			free(*pids);
-+			*pids = NULL;
-+			ERROR("out of memory");
-+			free(line);
-+			fclose(f);
-+			return -1;
-+		}
-+		*pids = tmp_pids;
-+
-+		(*pids)*len = pid;
-+		(*len)++;
-+	}
-+
-+	free(line);
-+	fclose(f);
-+	return 0;
-+}
-+
-+static int _recursive_read_cgroup_procs(const char *dirpath, pid_t **pids, size_t *len)
-+{
-+	struct dirent *direntp = NULL;
-+	DIR *dir = NULL;
-+	int ret, failed = 0;
-+	char pathnamePATH_MAX;
-+
-+	dir = opendir(dirpath);
-+	if (dir == NULL) {
-+		WARN("Failed to open \"%s\"", dirpath);
-+		return 0;
-+	}
-+
-+	while ((direntp = readdir(dir))) {
-+		struct stat mystat;
-+		int rc;
-+
-+		if (!strcmp(direntp->d_name, ".") ||
-+		                !strcmp(direntp->d_name, ".."))
-+			continue;
-+
-+		rc = snprintf(pathname, PATH_MAX, "%s/%s", dirpath, direntp->d_name);
-+		if (rc < 0 || rc >= PATH_MAX) {
-+			failed = 1;
-+			continue;
-+		}
-+
-+		if (strcmp(direntp->d_name, "cgroup.procs") == 0) {
-+			if (_read_procs_file(pathname, pids, len)) {
-+				failed = 1;
-+
-+			}
-+			continue;
-+		}
-+
-+		ret = lstat(pathname, &mystat);
-+		if (ret) {
-+			failed = 1;
-+			continue;
-+		}
-+
-+		if (S_ISDIR(mystat.st_mode)) {
-+			if (_recursive_read_cgroup_procs(pathname, pids, len) < 0)
-+				failed = 1;
-+		}
-+	}
-+
-+	ret = closedir(dir);
-+	if (ret) {
-+		WARN("Failed to close directory \"%s\"", dirpath);
-+		failed = 1;
-+	}
-+
-+	return failed ? -1 : 0;
-+}
-+
-+int get_all_pids(struct cgroup_ops *cg_ops, pid_t **pids, size_t *len)
-+{
-+	const char *devices_path = NULL;
-+
-+	devices_path = cg_ops->get_cgroup_full_path(cg_ops, "devices");
-+	if (!file_exists(devices_path)) {
-+		return 0;
-+	}
-+
-+	return _recursive_read_cgroup_procs(devices_path, pids, len);
-+}
-+
-+static int set_cgroup_freezer(struct cgroup_ops *cg_ops, const char *value)
-+{
-+	char *fullpath;
-+	int ret;
-+
-+	fullpath = must_make_path(cg_ops->get_cgroup_full_path(cg_ops, "freezer"), "freezer.state", NULL);
-+	ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
-+	free(fullpath);
-+	return ret;
-+}
-+
-+/* isulad: kill all process in container cgroup path */
-+static void signal_all_processes(struct lxc_handler *handler)
-+{
-+	int ret;
-+	struct cgroup_ops *cg_ops = handler->cgroup_ops;
-+	pid_t *pids = NULL;
-+	size_t len = 0, i;
-+
-+	ret = set_cgroup_freezer(cg_ops, "FROZEN");
-+	if (ret < 0 && errno != ENOENT) {
-+		WARN("cgroup_set frozen failed");
-+	}
-+
-+	ret = get_all_pids(cg_ops, &pids, &len);
-+	if (ret < 0) {
-+		WARN("failed to get all pids");
-+	}
-+
-+	for (i = 0; i < len; i++) {
-+		ret = kill(pidsi, SIGKILL);
-+		if (ret < 0 && errno != ESRCH) {
-+			WARN("Can not kill process (pid=%d) with SIGKILL for container %s", pidsi, handler->name);
-+		}
-+	}
-+
-+	ret = set_cgroup_freezer(cg_ops, "THAWED");
-+	if (ret < 0 && errno != ENOENT) {
-+		WARN("cgroup_set thawed failed");
-+	}
-+
-+	for (i = 0; i < len; i++) {
-+		ret = lxc_wait_for_pid_status(pidsi);
-+		if (ret < 0 && errno != ECHILD) {
-+			WARN("Failed to wait pid %d for container %s: %s", pidsi, handler->name, strerror(errno));
-+		}
-+	}
-+
-+	free(pids);
-+}
-+#endif
-+
- void lxc_end(struct lxc_handler *handler)
- {
- 	int ret;
-@@ -926,6 +1142,33 @@ void lxc_end(struct lxc_handler *handler)
- 
- 	lsm_process_cleanup(handler->conf, handler->lxcpath);
- 
-+#ifdef HAVE_ISULAD
-+	// close maincmd fd before destroy cgroup for isulad
-+	if (handler->conf->reboot == REBOOT_NONE) {
-+		/* For all new state clients simply close the command socket.
-+		 * This will inform all state clients that the container is
-+		 * STOPPED and also prevents a race between a open()/close() on
-+		 * the command socket causing a new process to get ECONNREFUSED
-+		 * because we haven't yet closed the command socket.
-+		 */
-+		close_prot_errno_disarm(handler->conf->maincmd_fd);
-+		TRACE("Closed command socket");
-+	}
-+	int retry_count = 0;
-+	int max_retry = 10;
-+retry:
-+	if (cgroup_ops != NULL && !cgroup_ops->payload_destroy(cgroup_ops, handler)) {
-+	        TRACE("Trying to kill all subprocess");
-+	        signal_all_processes(handler);
-+	        TRACE("Finished kill all subprocess");
-+	        if (retry_count < max_retry) {
-+				usleep(100 * 1000); /* 100 millisecond */
-+				retry_count++;
-+				goto retry;
-+		}
-+		SYSERROR("Failed to destroy cgroup path for container: \"%s\"", handler->name);
-+	}
-+#else
- 	if (cgroup_ops) {
- 		cgroup_ops->payload_destroy(cgroup_ops, handler);
- 		cgroup_ops->monitor_destroy(cgroup_ops, handler);
-@@ -940,12 +1183,25 @@ void lxc_end(struct lxc_handler *handler)
- 		 */
- 		close_prot_errno_disarm(handler->conf->maincmd_fd);
- 		TRACE("Closed command socket");
-+	}
-+#endif
- 
-+	if (handler->conf->reboot == REBOOT_NONE) {
- 		/* This function will try to connect to the legacy lxc-monitord
- 		 * state server and only exists for backwards compatibility.
- 		 */
- 		lxc_monitor_send_state(name, STOPPED, handler->lxcpath);
- 
-+#ifdef HAVE_ISULAD
-+		/* isuald: write exit code to exit fifo */
-+		if (handler->conf->exit_fd >= 0) {
-+			ret = write(handler->conf->exit_fd, &handler->exit_code, sizeof(int));
-+			if (ret != sizeof(int)) {
-+				SYSERROR("Failed to write to exit code to exit fifo.");
-+			}
-+		}
-+#endif
-+
- 		/* The command socket is closed so no one can acces the command
- 		 * socket anymore so there's no need to lock it.
- 		 */
-@@ -1042,6 +1298,25 @@ static int do_start(void *data)
- 
- 	lxc_sync_fini_parent(handler);
- 
-+#ifdef HAVE_ISULAD
-+	sigset_t mask;
-+
-+	/*isulad: restore default signal handlers and unblock all signals*/
-+	for (int i = 1; i < NSIG; i++)
-+		signal(i, SIG_DFL);
-+
-+	ret = sigfillset(&mask);
-+	if (ret < 0) {
-+		SYSERROR("Failed to fill signal mask");
-+		goto out_warn_father;
-+	}
-+	ret = sigprocmask(SIG_UNBLOCK, &mask, NULL);
-+	if (ret < 0) {
-+		SYSERROR("Failed to set signal mask");
-+		goto out_warn_father;
-+	}
-+#endif
-+
- 	if (lxc_abstract_unix_recv_fds(data_sock1, &status_fd, 1, NULL, 0) < 0) {
- 		ERROR("Failed to receive status file descriptor to child process");
- 		goto out_warn_father;
-@@ -1155,7 +1430,11 @@ static int do_start(void *data)
- 	 * means that migration won't work, but at least we won't spew output
- 	 * where it isn't wanted.
- 	 */
-+#ifdef HAVE_ISULAD
-+	if (!handler->disable_pty && handler->daemonize && !handler->conf->autodev) {
-+#else
- 	if (handler->daemonize && !handler->conf->autodev) {
-+#endif
- 		char pathPATH_MAX;
- 
- 		ret = snprintf(path, sizeof(path), "%s/dev/null",
-@@ -1221,6 +1500,9 @@ static int do_start(void *data)
- 	/* Setup the container, ip, names, utsname, ... */
- 	ret = lxc_setup(handler);
- 	if (ret < 0) {
-+#ifdef HAVE_ISULAD
-+		lxc_write_error_message(handler->conf->errpipe1, "Failed to setup lxc, please check the config file.");
-+#endif
- 		ERROR("Failed to setup container \"%s\"", handler->name);
- 		goto out_warn_father;
- 	}
-@@ -1243,12 +1525,70 @@ static int do_start(void *data)
- 		DEBUG("Set PR_SET_NO_NEW_PRIVS to block execve() gainable privileges");
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: dup2 pipe00 to container stdin, pipe11 to container stdout, pipe21 to container stderr */
-+	if (handler->disable_pty) {
-+		if (handler->conf->console.pipes01 >= 0) {
-+			close(handler->conf->console.pipes01);
-+			handler->conf->console.pipes01 = -1;
-+		}
-+
-+		if (handler->conf->console.pipes00 >= 0) {
-+			ret = dup2(handler->conf->console.pipes00, STDIN_FILENO);
-+			if (ret < 0)
-+				goto out_warn_father;
-+		}
-+
-+		if (handler->conf->console.pipes10 >= 0) {
-+			close(handler->conf->console.pipes10);
-+			handler->conf->console.pipes10 = -1;
-+		}
-+
-+		if (handler->conf->console.pipes11 >= 0) {
-+			ret = dup2(handler->conf->console.pipes11, STDOUT_FILENO);
-+			if (ret < 0)
-+				goto out_warn_father;
-+		}
-+		if (handler->conf->console.pipes20 >= 0) {
-+			close(handler->conf->console.pipes20);
-+			handler->conf->console.pipes20 = -1;
-+		}
-+
-+		if (handler->conf->console.pipes21 >= 0) {
-+			ret = dup2(handler->conf->console.pipes21, STDERR_FILENO);
-+			if (ret < 0)
-+				goto out_warn_father;
-+		}
-+	}
-+#endif
-+
- 	/* Some init's such as busybox will set sane tty settings on stdin,
- 	 * stdout, stderr which it thinks is the console. We already set them
- 	 * the way we wanted on the real terminal, and we want init to do its
- 	 * setup on its console ie. the pty allocated in lxc_terminal_setup() so
- 	 * make sure that that pty is stdin,stdout,stderr.
- 	 */
-+#ifdef HAVE_ISULAD
-+	setsid();
-+	if (!handler->disable_pty && handler->conf->console.pts >= 0) {
-+		/* isulad:make the given terminal as controlling terminal to avoid warning
-+		* sh: cannot set terminal process group (-1): Inappropriate ioctl for device
-+		* sh: no job control in this shell */
-+		if (ioctl(handler->conf->console.pts, TIOCSCTTY, NULL) < 0) {
-+			ERROR("Faild to make the given terminal the controlling terminal of the calling process");
-+			goto out_warn_father;
-+		}
-+		if (handler->daemonize || !handler->conf->is_execute)
-+			ret = set_stdfds(handler->conf->console.pts);
-+		else
-+			ret = lxc_terminal_set_stdfds(handler->conf->console.pts);
-+		if (ret < 0) {
-+			ERROR("Failed to redirect std{in,out,err} to pty file "
-+			      "descriptor %d", handler->conf->console.pts);
-+			goto out_warn_father;
-+		}
-+	}
-+#else
- 	 if (handler->conf->console.pts >= 0) {
- 		 if (handler->daemonize || !handler->conf->is_execute)
- 			 ret = set_stdfds(handler->conf->console.pts);
-@@ -1260,6 +1600,7 @@ static int do_start(void *data)
- 			goto out_warn_father;
- 		 }
- 	 }
-+#endif
- 
- 	/* If we mounted a temporary proc, then unmount it now. */
- 	tmp_proc_unmount(handler->conf);
-@@ -1283,6 +1624,21 @@ static int do_start(void *data)
- 
- 	close_prot_errno_disarm(handler->sigfd);
- 
-+#ifdef HAVE_ISULAD
-+	if (!handler->disable_pty && handler->conf->console.pts < 0 && handler->daemonize) {
-+		if (devnull_fd < 0) {
-+			devnull_fd = open_devnull();
-+			if (devnull_fd < 0)
-+				goto out_warn_father;
-+		}
-+
-+		ret = set_stdfds(devnull_fd);
-+		if (ret < 0) {
-+			ERROR("Failed to redirect std{in,out,err} to \"/dev/null\"");
-+			goto out_warn_father;
-+		}
-+	}
-+#else
- 	if (handler->conf->console.pts < 0 && handler->daemonize) {
- 		if (devnull_fd < 0) {
- 			devnull_fd = open_devnull();
-@@ -1296,12 +1652,25 @@ static int do_start(void *data)
- 			goto out_warn_father;
- 		}
- 	}
-+#endif
- 
- 	close_prot_errno_disarm(devnull_fd);
- 
-+#ifndef HAVE_ISULAD
- 	setsid();
- 
-+#endif
- 	if (handler->conf->init_cwd) {
-+#ifdef HAVE_ISULAD
-+		/* try to craete workdir if not exist */
-+		struct stat st;
-+		if (stat(handler->conf->init_cwd, &st) < 0 && mkdir_p(handler->conf->init_cwd, 0755) < 0) {
-+			SYSERROR("Try to create directory \"%s\" as workdir failed", handler->conf->init_cwd);
-+			lxc_write_error_message(handler->conf->errpipe1, "%s:%d: Failed to create workdir: %s.",
-+			                        __FILE__, __LINE__, strerror(errno));
-+			goto out_warn_father;
-+		}
-+#endif
- 		ret = chdir(handler->conf->init_cwd);
- 		if (ret < 0) {
- 			SYSERROR("Could not change directory to \"%s\"",
-@@ -1345,6 +1714,13 @@ static int do_start(void *data)
- 		}
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	if (prctl(PR_SET_KEEPCAPS, 1) < 0) {
-+		SYSERROR("Failed to keep permitted capabilities");
-+		goto out_warn_father;
-+	}
-+#endif
-+
- 	/* The container has been setup. We can now switch to an unprivileged
- 	 * uid/gid.
- 	 */
-@@ -1358,6 +1734,13 @@ static int do_start(void *data)
- 	if (new_gid == nsgid)
- 		new_gid = LXC_INVALID_GID;
- 
-+#ifdef HAVE_ISULAD
-+	// isulad: set env home in container
-+	if (lxc_setup_env_home(new_uid) < 0) {
-+		goto out_warn_father;
-+	}
-+#endif
-+
- 	/* Make sure that the processes STDIO is correctly owned by the user that we are switching to */
- 	ret = fix_stdio_permissions(new_uid);
- 	if (ret)
-@@ -1371,8 +1754,16 @@ static int do_start(void *data)
- 		#if HAVE_LIBCAP
- 		if (lxc_proc_cap_is_set(CAP_SETGID, CAP_EFFECTIVE))
- 		#endif
-+#ifdef HAVE_ISULAD
-+			/* isulad: set groups for init process, and before we set uid and gid */
-+			if (!lxc_setgroups(handler->conf->init_groups_len, handler->conf->init_groups)) {
-+				ERROR("Can not set groups");
-+				goto out_warn_father;
-+				}
-+#else
- 			if (!lxc_setgroups(0, NULL))
- 				goto out_warn_father;
-+#endif
- 
- 	if (!lxc_switch_uid_gid(new_uid, new_gid))
- 		goto out_warn_father;
-@@ -1383,6 +1774,19 @@ static int do_start(void *data)
- 		goto out_warn_father;
- 	}
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: drop the cap of current process */
-+	if (prctl(PR_SET_KEEPCAPS, 0) < 0) {
-+		SYSERROR("Failed to clear permitted capabilities");
-+		goto out_warn_father;
-+	}
-+
-+	if (lxc_drop_caps(handler->conf)) {
-+		SYSERROR("Failed to drop caps");
-+		goto out_warn_father;
-+	}
-+#endif
-+
- 	if (handler->conf->monitor_signal_pdeath != SIGKILL) {
- 		ret = lxc_set_death_signal(handler->conf->monitor_signal_pdeath,
- 					   handler->monitor_pid, status_fd);
-@@ -1397,7 +1801,12 @@ static int do_start(void *data)
- 	 * After this call, we are in error because this ops should not return
- 	 * as it execs.
- 	 */
-+#ifdef HAVE_ISULAD
-+	close_prot_errno_disarm(status_fd);
-+	handler->ops->start(handler, handler->data, handler->daemonize ? handler->conf->errpipe1 : -1);
-+#else
- 	handler->ops->start(handler, handler->data);
-+#endif
- 
- out_warn_father:
- 	/*
-@@ -1529,6 +1938,94 @@ static inline int do_share_ns(void *arg)
- 	return 0;
- }
- 
-+#ifdef HAVE_ISULAD
-+static int lxc_write_container_info(char *filename, pid_t pid, pid_t p_pid,
-+		unsigned long long start_at, unsigned long long p_start_at)
-+{
-+	FILE *pid_fp = NULL;
-+	int ret = 0;
-+
-+	pid_fp = lxc_fopen(filename, "w");
-+	if (pid_fp == NULL) {
-+		SYSERROR("Failed to create pidfile '%s'",filename);
-+		ret = -1;
-+		goto out;
-+	}
-+
-+	if (fprintf(pid_fp, "%d %llu %d %llu\n", pid, start_at, p_pid, p_start_at) < 0) {
-+		SYSERROR("Failed to write '%s'", filename);
-+		ret = -1;
-+		goto out;
-+	}
-+out:
-+	if (pid_fp)
-+		fclose(pid_fp);
-+	pid_fp = NULL;
-+	return ret;
-+}
-+
-+static int lxc_check_container_info(char *filename, pid_t pid, pid_t p_pid,
-+		unsigned long long start_at, unsigned long long p_start_at)
-+{
-+	int ret = 0;
-+	int num;
-+	char sbuf1024 = {0}; /* bufs for stat */
-+	int saved_pid;		/* process id */
-+	int saved_ppid;		/* pid of parent process */
-+	unsigned long long saved_start_time;	/* start time of process -- seconds since 1-1-70 */
-+	unsigned long long saved_pstart_time;	/* start time of parent process -- seconds since 1-1-70 */
-+
-+	if ((lxc_file2str(filename, sbuf, sizeof(sbuf))) == -1) {
-+		SYSERROR("Failed to read pidfile %s", filename);
-+		ret = -1;
-+		goto out;
-+	}
-+
-+	num = sscanf(sbuf, "%d %Lu %d %Lu", &saved_pid, &saved_start_time, &saved_ppid, &saved_pstart_time);
-+	if (num != 4) {
-+		SYSERROR("Call sscanf error");
-+		ret = -1;
-+		goto out;
-+	}
-+
-+	if (pid != saved_pid || p_pid != saved_ppid
-+	                || start_at != saved_start_time || p_start_at != saved_pstart_time) {
-+		ERROR("Check container info failed");
-+		ret = -1;
-+		goto out;
-+	}
-+
-+out:
-+	return ret;
-+}
-+
-+/* isuald: save pid/ppid info */
-+static int lxc_save_container_info(char *filename, pid_t pid)
-+{
-+	int ret = 0;
-+	pid_t p_pid = 0;
-+	unsigned long long start_at = 0;
-+	unsigned long long p_start_at = 0;
-+
-+	start_at = lxc_get_process_startat(pid);
-+	p_pid = getpid();
-+	p_start_at = lxc_get_process_startat(p_pid);
-+
-+	ret = lxc_write_container_info(filename, pid, p_pid, start_at, p_start_at);
-+	if (ret != 0) {
-+		goto out;
-+	}
-+
-+	ret = lxc_check_container_info(filename, pid, p_pid, start_at, p_start_at);
-+	if (ret != 0) {
-+		goto out;
-+	}
-+
-+out:
-+	return ret;
-+}
-+#endif
-+
- /* lxc_spawn() performs crucial setup tasks and clone()s the new process which
-  * exec()s the requested container binary.
-  * Note that lxc_spawn() runs in the parent namespaces. Any operations performed
-@@ -1595,7 +2092,11 @@ static int lxc_spawn(struct lxc_handler *handler)
- 	 * it readonly.
- 	 * If the container is unprivileged then skip rootfs pinning.
- 	 */
-+#ifdef HAVE_ISULAD
-+	if (!wants_to_map_ids && !handler->image_type_oci) {
-+#else
- 	if (!wants_to_map_ids) {
-+#endif
- 		handler->pinfd = pin_rootfs(conf->rootfs.path);
- 		if (handler->pinfd == -EBADF)
- 			INFO("Failed to pin the rootfs for container \"%s\"", handler->name);
-@@ -1640,6 +2141,32 @@ static int lxc_spawn(struct lxc_handler *handler)
- 	}
- 	TRACE("Cloned child process %d", handler->pid);
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: close pipe after clone */
-+	if (handler->conf->console.pipes00 >= 0) {
-+		close(handler->conf->console.pipes00);
-+		handler->conf->console.pipes00 = -1;
-+	}
-+
-+	if (handler->conf->console.pipes11 >= 0) {
-+		close(handler->conf->console.pipes11);
-+		handler->conf->console.pipes11 = -1;
-+	}
-+
-+	if (handler->conf->console.pipes21 >= 0) {
-+		close(handler->conf->console.pipes21);
-+		handler->conf->console.pipes21 = -1;
-+	}
-+
-+	/* isulad: save pid/ppid info into file*/
-+	if (handler->conf->container_info_file) {
-+		if (lxc_save_container_info(handler->conf->container_info_file, handler->pid)) {
-+			ERROR("Failed to save cloned container pid");
-+			goto out_delete_net;
-+		}
-+	}
-+#endif
-+
- 	/* Verify that we can actually make use of pidfds. */
- 	if (!lxc_can_use_pidfd(handler->pidfd))
- 		close_prot_errno_disarm(handler->pidfd);
-@@ -1652,6 +2179,13 @@ static int lxc_spawn(struct lxc_handler *handler)
- 	if (ret < 0)
- 		SYSERROR("Failed to set environment variable: LXC_PID=%s", pidstr);
- 
-+#ifdef HAVE_ISULAD
-+	if (handler->cgroup_ops->container_cgroup) {
-+		if (setenv("LXC_CGROUP_PATH", handler->cgroup_ops->container_cgroup, 1))
-+			SYSERROR("Failed to set environment variable: LXC_CGROUP_PATH=%s.", handler->cgroup_ops->container_cgroup);
-+	}
-+#endif
-+
- 	for (i = 0; i < LXC_NS_MAX; i++)
- 		if (handler->ns_on_clone_flags & ns_infoi.clone_flag)
- 			INFO("Cloned %s", ns_infoi.flag_name);
-@@ -1765,7 +2299,11 @@ static int lxc_spawn(struct lxc_handler *handler)
- 		goto out_delete_net;
- 
- 	if (!lxc_list_empty(&conf->limits)) {
-+#ifdef HAVE_ISULAD
-+		ret = setup_resource_limits(&conf->limits, handler->pid, conf->errpipe1);
-+#else
- 		ret = setup_resource_limits(&conf->limits, handler->pid);
-+#endif
- 		if (ret < 0) {
- 			ERROR("Failed to setup resource limits");
- 			goto out_delete_net;
-@@ -1816,6 +2354,26 @@ static int lxc_spawn(struct lxc_handler *handler)
- 		ERROR("Failed to run lxc.hook.start-host");
- 		goto out_delete_net;
- 	}
-+#ifdef HAVE_ISULAD
-+	/* isulad: Run oci prestart hook at here */
-+	ret = run_oci_hooks(name, "oci-prestart", conf, lxcpath);
-+	if (ret < 0) {
-+		ERROR("Failed to run oci prestart hooks");
-+		goto out_delete_net;
-+	}
-+
-+	if (START_TIMEOUT == global_timeout_state) {
-+		lxc_write_error_message(conf->errpipe1, "Starting the container \"%s\" timeout.", name);
-+		ERROR("Starting the container \"%s\" timeout.", name);
-+		goto out_delete_net;
-+	}
-+
-+       /* Tell the child to continue its initialization. We'll get
-+        * LXC_SYNC_POST_OCI_PRESTART_HOOK when it is ready for us to run oci prestart hooks.
-+        */
-+       if (lxc_sync_barrier_child(handler, LXC_SYNC_POST_OCI_PRESTART_HOOK))
-+               goto out_delete_net;
-+#endif
- 
- 	/* Tell the child to complete its initialization and wait for it to exec
- 	 * or return an error. (The child will never return
-@@ -1859,6 +2417,22 @@ static int lxc_spawn(struct lxc_handler *handler)
- 	if (ret < 0)
- 		goto out_abort;
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: Run oci prestart hook at here */
-+	ret = run_oci_hooks(name, "oci-poststart", conf, lxcpath);
-+	if (ret < 0) {
-+		ERROR("Failed to run oci poststart hooks");
-+		goto out_abort;
-+	}
-+
-+	if (START_TIMEOUT == global_timeout_state) {
-+		lxc_write_error_message(conf->errpipe1, "Starting the container \"%s\" timeout.", name);
-+		ERROR("Starting the container \"%s\" timeout.", name);
-+		goto out_abort;
-+	}
-+
-+#endif
-+
- 	ret = lxc_set_state(name, handler, RUNNING);
- 	if (ret < 0) {
- 		ERROR("Failed to set state to \"%s\"", lxc_state2str(RUNNING));
-@@ -1883,9 +2457,83 @@ out_sync_fini:
- 	return -1;
- }
- 
-+#ifdef HAVE_ISULAD
-+/* isulad: start timeout thread function */
-+static void* wait_start_timeout(void *arg)
-+{
-+	struct start_timeout_conf *conf = (struct start_timeout_conf *)arg;
-+
-+	sem_post(&global_timeout_sem);
-+
-+	if (!conf || conf->timeout < 1)
-+		goto out;
-+
-+	sleep(conf->timeout);
-+
-+	global_timeout_state = START_TIMEOUT;
-+
-+out:
-+	free(conf);
-+	return ((void *)0);
-+}
-+
-+/* isulad: create start timeout thread */
-+static int create_start_timeout_thread(struct lxc_conf *conf, unsigned int start_timeout)
-+{
-+	int ret = 0;
-+	pthread_t ptid;
-+	pthread_attr_t attr;
-+	struct start_timeout_conf *timeout_conf = NULL;
-+
-+	if (sem_init(&global_timeout_sem, 0, 0)) {
-+		ERROR("Failed to init start timeout semaphore");/*lint !e613*/
-+		ret = -1;
-+		return ret;
-+	}
-+
-+	timeout_conf = malloc(sizeof(struct start_timeout_conf));
-+	if (timeout_conf == NULL) {
-+		ERROR("Failed to malloc start timeout conf");
-+		ret = -1;
-+		goto out;
-+	}
-+
-+	memset(timeout_conf, 0, sizeof(struct start_timeout_conf));
-+	timeout_conf->errfd = conf->errpipe1;
-+	timeout_conf->timeout = start_timeout;
-+
-+	pthread_attr_init(&attr);
-+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-+	ret = pthread_create(&ptid, &attr, wait_start_timeout, timeout_conf);
-+	pthread_attr_destroy(&attr);
-+	if (ret != 0) {
-+		ERROR("Create start wait timeout thread failed");
-+		free(timeout_conf);
-+		goto out;
-+	}
-+
-+	sem_wait(&global_timeout_sem);
-+out:
-+	sem_destroy(&global_timeout_sem);
-+	return ret;
-+}
-+
-+// isulad: send '128 + signal' if container is killed by signal.
-+#define EXIT_SIGNAL_OFFSET 128
-+#endif
-+
-+
-+#ifdef HAVE_ISULAD
-+int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
-+		void *data, const char *lxcpath, bool daemonize, int *error_num,
-+		unsigned int start_timeout)
-+{
-+	int exit_code;
-+#else
- int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
- 		void *data, const char *lxcpath, bool daemonize, int *error_num)
- {
-+#endif
- 	int ret, status;
- 	const char *name = handler->name;
- 	struct lxc_conf *conf = handler->conf;
-@@ -1901,6 +2549,16 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
- 	handler->daemonize = daemonize;
- 	cgroup_ops = handler->cgroup_ops;
- 
-+#ifdef HAVE_ISULAD
-+	/* isulad: add start timeout limit */
-+	if (start_timeout > 0) {
-+		ret = create_start_timeout_thread(conf, start_timeout);
-+		if (ret) {
-+			ERROR("Failed to create start timeout thread for container \"%s\".", name);
-+			goto out_abort;
-+		}
-+	}
-+#endif
- 	if (!attach_block_device(handler->conf)) {
- 		ERROR("Failed to attach block device");
- 		ret = -1;
-@@ -1959,11 +2617,13 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
- 		goto out_delete_network;
- 	}
- 
-+#ifndef HAVE_ISULAD
- 	if (!handler->init_died && handler->pid > 0) {
- 		ERROR("Child process is not killed");
- 		ret = -1;
- 		goto out_delete_network;
- 	}
-+#endif
- 
- 	status = lxc_wait_for_pid_status(handler->pid);
- 	if (status < 0)
-@@ -1973,6 +2633,21 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
- 	 * reboot. This should mean it was an lxc-execute which simply exited.
- 	 * In any case, treat it as a 'halt'.
- 	 */
-+#ifdef HAVE_ISULAD
-+	// isulad: recored log for container init exit
-+	if (WIFSIGNALED(status)) {
-+		int signal = WTERMSIG(status);
-+		signal = WTERMSIG(status);
-+		exit_code = EXIT_SIGNAL_OFFSET + signal;
-+		ERROR("Container \"%s\" init exited with signal %d", name, signal);
-+	} else if (WIFEXITED(status)) {
-+		exit_code = WEXITSTATUS(status);
-+		ERROR("Container \"%s\" init exited with status %d", name, exit_code);
-+	} else {
-+		exit_code = -1;
-+		ERROR("Container \"%s\" init exited with unknown status", name);
-+	}
-+#else
- 	if (WIFSIGNALED(status)) {
- 		switch(WTERMSIG(status)) {
- 		case SIGINT: /* halt */
-@@ -1990,6 +2665,7 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
- 			break;
- 		}
- 	}
-+#endif
- 
- 	ret = lxc_restore_phys_nics_to_netns(handler);
- 	if (ret < 0)
-@@ -1997,11 +2673,20 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
- 
- 	close_prot_errno_disarm(handler->pinfd);
- 
-+#ifdef HAVE_ISULAD
-+	lxc_monitor_send_exit_code(name, exit_code, handler->lxcpath);
-+#else
- 	lxc_monitor_send_exit_code(name, status, handler->lxcpath);
-+#endif
-+
- 	lxc_error_set_and_log(handler->pid, status);
- 	if (error_num)
- 		*error_num = handler->exit_status;
- 
-+#ifdef HAVE_ISULAD
-+	handler->exit_code = exit_code; /* record exit code */
-+#endif
-+
- /* These are not the droids you are looking for. */
- __private_goto1:
- 	lxc_delete_network(handler);
-@@ -2032,7 +2717,11 @@ struct start_args {
- 	char *const *argv;
- };
- 
-+#ifdef HAVE_ISULAD
-+static int start(struct lxc_handler *handler, void* data, int fd)
-+#else
- static int start(struct lxc_handler *handler, void* data)
-+#endif
- {
- 	struct start_args *arg = data;
- 
-@@ -2040,6 +2729,9 @@ static int start(struct lxc_handler *handler, void* data)
- 
- 	execvp(arg->argv0, arg->argv);
- 	SYSERROR("Failed to exec \"%s\"", arg->argv0);
-+#ifdef HAVE_ISULAD
-+	lxc_write_error_message(fd, "exec: \"%s\": %s.", arg->argv0, strerror(errno));
-+#endif
- 	return 0;
- }
- 
-@@ -2057,14 +2749,22 @@ static struct lxc_operations start_ops = {
- };
- 
- int lxc_start(char *const argv, struct lxc_handler *handler,
-+#ifdef HAVE_ISULAD
-+	      const char *lxcpath, bool daemonize, int *error_num, unsigned int start_timeout)
-+#else
- 	      const char *lxcpath, bool daemonize, int *error_num)
-+#endif
- {
- 	struct start_args start_arg = {
- 		.argv = argv,
- 	};
- 
- 	TRACE("Doing lxc_start");
-+#ifdef HAVE_ISULAD
-+	return __lxc_start(handler, &start_ops, &start_arg, lxcpath, daemonize, error_num, start_timeout);
-+#else
- 	return __lxc_start(handler, &start_ops, &start_arg, lxcpath, daemonize, error_num);
-+#endif
- }
- 
- static void lxc_destroy_container_on_signal(struct lxc_handler *handler,
-@@ -2136,3 +2836,261 @@ static bool do_destroy_container(struct lxc_handler *handler)
- 
- 	return storage_destroy(handler->conf);
- }
-+
-+#ifdef HAVE_ISULAD
-+/*isulad: set env for clean resources */
-+static int clean_resource_set_env(struct lxc_handler *handler)
-+{
-+	const char *name = handler->name;
-+	struct lxc_conf *conf = handler->conf;
-+	char bufstrPATH_MAX + 1;
-+	int i = 0;
-+	int j = 0;
-+	int len = 2; //set "LXC_PID" and "LXC_CGNS_AWARE"
-+
-+	if (conf == NULL || conf->ocihooks == NULL || conf->ocihooks->poststop_len == 0) {
-+		return 0;
-+	}
-+
-+	if (name) {
-+		len++;
-+	}
-+	if (conf->rcfile) {
-+		len++;
-+	}
-+	if (conf->rootfs.mount) {
-+		len++;
-+	}
-+	if (conf->rootfs.path) {
-+		len++;
-+	}
-+	if (conf->console.path) {
-+		len++;
-+	}
-+	if (conf->console.log_path) {
-+		len++;
-+	}
-+	if (handler->cgroup_ops->container_cgroup) {
-+		len++;
-+	}
-+
-+	for (; i < conf->ocihooks->poststop_len; i++) {
-+		size_t cap = conf->ocihooks->poststopi->env_len;
-+		size_t newcap = cap + len + 1;
-+		if (lxc_grow_array((void ***)&(conf->ocihooks->poststopi->env), &cap, newcap, 1) != 0) {
-+			return -1;
-+		}
-+		j = conf->ocihooks->poststopi->env_len;
-+		/* Start of environment variable setup for hooks. */
-+		if (name) {
-+			snprintf(bufstr, PATH_MAX + 1, "LXC_NAME=%s", name);
-+			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+		}
-+		if (conf->rcfile) {
-+			snprintf(bufstr, PATH_MAX + 1, "LXC_CONFIG_FILE=%s", conf->rcfile);
-+			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+		}
-+		if (conf->rootfs.mount) {
-+			snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_MOUNT=%s", conf->rootfs.mount);
-+			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+		}
-+		if (conf->rootfs.path) {
-+			snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_PATH=%s", conf->rootfs.path);
-+			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+		}
-+		if (conf->console.path) {
-+			snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE=%s", conf->console.path);
-+			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+		}
-+		if (conf->console.log_path) {
-+			snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE_LOGPATH=%s", conf->console.log_path);
-+			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+		}
-+		conf->ocihooks->poststopi->envj++ = safe_strdup("LXC_CGNS_AWARE=1");
-+
-+		snprintf(bufstr, PATH_MAX + 1, "LXC_PID=%d", handler->pid);
-+		conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+		if (handler->cgroup_ops->container_cgroup) {
-+			snprintf(bufstr, PATH_MAX + 1, "LXC_CGROUP_PATH=%s", handler->cgroup_ops->container_cgroup);
-+			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+		}
-+		conf->ocihooks->poststopi->env_len = j;
-+		/* End of environment variable setup for hooks. */
-+	}
-+	return 0;
-+}
-+
-+/*isulad: init handler for clean */
-+static struct lxc_handler *lxc_init_clean_handler(char *name, char *lxcpath, struct lxc_conf *conf, pid_t pid)
-+{
-+	int i;
-+	struct lxc_handler *handler;
-+
-+	handler = malloc(sizeof(*handler));
-+	if (handler == NULL)
-+		return NULL;
-+
-+	memset(handler, 0, sizeof(*handler));
-+
-+	/* Note that am_guest_unpriv() checks the effective uid. We
-+	 * probably don't care if we are real root only if we are running
-+	 * as root so this should be fine.
-+	 */
-+	handler->am_root = !am_guest_unpriv();
-+	handler->data_sock0 = handler->data_sock1 = -1;
-+	handler->conf = conf;
-+	handler->lxcpath = lxcpath;
-+	handler->pinfd = -1;
-+	handler->sigfd = -EBADF;
-+	handler->pidfd = -EBADF;
-+	handler->init_died = false;
-+	handler->monitor_status_fd = -EBADF;
-+	handler->pid = pid;
-+	handler->state_socket_pair0 = handler->state_socket_pair1 = -1;
-+	if (handler->conf->reboot == REBOOT_NONE)
-+		lxc_list_init(&handler->conf->state_clients);
-+
-+	for (i = 0; i < LXC_NS_MAX; i++)
-+		handler->nsfdi = -1;
-+
-+	handler->name = name;
-+	handler->exit_code = -1; /* isulad: record exit code of container */
-+
-+	handler->cgroup_ops = cgroup_init(conf);
-+	if (!handler->cgroup_ops) {
-+		ERROR("Failed to initialize cgroup driver");
-+		goto on_error;
-+	}
-+
-+	INFO("Container \"%s\" 's clean handler is initialized.", name);
-+
-+	return handler;
-+
-+on_error:
-+	lxc_put_handler(handler);
-+
-+	return NULL;
-+}
-+
-+/*isulad: init handler for clean */
-+static struct lxc_handler *lxc_init_pids_handler(char *name, char *lxcpath, struct lxc_conf *conf)
-+{
-+	int i;
-+	struct lxc_handler *handler;
-+
-+	handler = malloc(sizeof(*handler));
-+	if (handler == NULL)
-+		return NULL;
-+
-+	memset(handler, 0, sizeof(*handler));
-+
-+	/* Note that am_guest_unpriv() checks the effective uid. We
-+	 * probably don't care if we are real root only if we are running
-+	 * as root so this should be fine.
-+	 */
-+	handler->am_root = !am_guest_unpriv();
-+	handler->data_sock0 = handler->data_sock1 = -1;
-+	handler->conf = conf;
-+	handler->lxcpath = lxcpath;
-+	handler->pinfd = -1;
-+	handler->sigfd = -EBADF;
-+	handler->init_died = false;
-+	handler->state_socket_pair0 = handler->state_socket_pair1 = -1;
-+	handler->monitor_status_fd = -EBADF;
-+	handler->pidfd = -EBADF;
-+	if (handler->conf->reboot == REBOOT_NONE)
-+		lxc_list_init(&handler->conf->state_clients);
-+
-+	for (i = 0; i < LXC_NS_MAX; i++)
-+		handler->nsfdi = -1;
-+
-+	handler->name = name;
-+	handler->exit_code = -1; /* isulad: record exit code of container */
-+
-+	handler->cgroup_ops = cgroup_init(conf);
-+	if (!handler->cgroup_ops) {
-+		ERROR("Failed to initialize cgroup driver");
-+		goto on_error;
-+	}
-+
-+	INFO("Container \"%s\" 's clean handler is initialized.", name);
-+
-+	return handler;
-+
-+on_error:
-+	lxc_put_handler(handler);
-+
-+	return NULL;
-+}
-+
-+/*isulad: do_lxcapi_clean_resource */
-+int do_lxcapi_clean_resource(char *name, char *lxcpath, struct lxc_conf *conf, pid_t pid)
-+{
-+	int ret = 0;
-+	struct lxc_handler *handler = NULL;
-+	int retry_count = 0;
-+	int max_retry = 10;
-+
-+	handler = lxc_init_clean_handler(name, lxcpath, conf, pid);
-+	if (!handler) {
-+		ERROR("Failed to init container %s clean handler", name);
-+		ret = -1;
-+		goto out;
-+	}
-+
-+	if (clean_resource_set_env(handler) != 0) {
-+		ERROR("Failed to set env for poststop hooks");
-+		ret = -1;
-+		goto out;
-+	}
-+
-+	if (run_oci_hooks(handler->name, "oci-poststop", handler->conf, handler->lxcpath)) {
-+		ERROR("Failed to run lxc.hook.post-stop for container \"%s\".", handler->name);
-+		ret = -1;
-+	}
-+
-+retry:
-+	if (!handler->cgroup_ops->payload_destroy(handler->cgroup_ops, handler)) {
-+		TRACE("Trying to kill all subprocess");
-+		signal_all_processes(handler);
-+		TRACE("Finished kill all subprocess");
-+		if (retry_count < max_retry) {
-+			usleep(100 * 1000); /* 100 millisecond */
-+			retry_count++;
-+			goto retry;
-+		}
-+		SYSERROR("Failed to destroy cgroup path for container: \"%s\"", handler->name);
-+		ret = -1;
-+	}
-+
-+out:
-+	lxc_put_handler(handler);
-+	return ret;
-+}
-+
-+/*isulad: do_lxcapi_get_pids */
-+int do_lxcapi_get_pids(char *name, char *lxcpath, struct lxc_conf *conf, pid_t **pids,size_t *pids_len)
-+{
-+	int ret = 0;
-+	struct lxc_handler *handler = NULL;
-+	struct cgroup_ops *cg_ops = NULL;
-+
-+	handler = lxc_init_pids_handler(name, lxcpath, conf);
-+	if (!handler) {
-+		ERROR("Failed to init container %s clean handler", name);
-+		ret = -1;
-+		goto out;
-+	}
-+
-+	cg_ops = handler->cgroup_ops;
-+	ret = get_all_pids(cg_ops, pids, pids_len);
-+	if (ret < 0) {
-+		WARN("failed to get all pids");
-+	}
-+
-+out:
-+	lxc_put_handler(handler);
-+	return ret;
-+}
-+
-+#endif
-diff --git a/src/lxc/storage/btrfs.c b/src/lxc/storage/btrfs.c
-index 92a4a6d..069a9dd 100644
---- a/src/lxc/storage/btrfs.c
-+++ b/src/lxc/storage/btrfs.c
-@@ -197,16 +197,27 @@ int btrfs_mount(struct lxc_storage *bdev)
- 	const char *src;
- 	int ret;
- 
-+#ifdef HAVE_ISULAD
-+    unsigned long pflags = 0;
-+#endif
-+
- 	if (strcmp(bdev->type, "btrfs"))
- 		return -22;
- 
- 	if (!bdev->src || !bdev->dest)
- 		return -22;
- 
-+#ifdef HAVE_ISULAD
-+    if (parse_mntopts(bdev->mntopts, &mntflags, &pflags, &mntdata) < 0) {
-+		free(mntdata);
-+		return -22;
-+	}
-+#else
- 	if (parse_mntopts(bdev->mntopts, &mntflags, &mntdata) < 0) {
- 		free(mntdata);
- 		return -22;
- 	}
-+#endif
- 
- 	src = lxc_storage_get_path(bdev->src, "btrfs");
- 
-diff --git a/src/lxc/storage/overlay.c b/src/lxc/storage/overlay.c
-index 770785c..75a81de 100644
---- a/src/lxc/storage/overlay.c
-+++ b/src/lxc/storage/overlay.c
-@@ -349,6 +349,9 @@ int ovl_mount(struct lxc_storage *bdev)
- 	char *work, *lastslash;
- 	size_t len, len2;
- 	int ret, ret2;
-+#ifdef HAVE_ISULAD
-+	unsigned long pflags = 0;
-+#endif
- 
- 	if (strcmp(bdev->type, "overlay") && strcmp(bdev->type, "overlayfs"))
- 		return -22;
-@@ -414,7 +417,12 @@ int ovl_mount(struct lxc_storage *bdev)
- 	work = must_make_path(upper, LXC_OVERLAY_WORK_DIR, NULL);
- 	upperlastslash - upper = '/';
- 
-+#ifdef HAVE_ISULAD
-+	ret = parse_mntopts(bdev->mntopts, &mntflags, &pflags, &mntdata);
-+#else
- 	ret = parse_mntopts(bdev->mntopts, &mntflags, &mntdata);
-+#endif
-+
- 	if (ret < 0) {
- 		ERROR("Failed to parse mount options");
- 		free(mntdata);
-diff --git a/src/lxc/sync.h b/src/lxc/sync.h
-index ff7a1eb..56c1dfc 100644
---- a/src/lxc/sync.h
-+++ b/src/lxc/sync.h
-@@ -11,6 +11,10 @@ enum {
- 	LXC_SYNC_POST_CONFIGURE,
- 	LXC_SYNC_CGROUP,
- 	LXC_SYNC_CGROUP_UNSHARE,
-+#ifdef HAVE_ISULAD
-+	LXC_SYNC_OCI_PRESTART_HOOK,
-+	LXC_SYNC_POST_OCI_PRESTART_HOOK,
-+#endif
- 	LXC_SYNC_CGROUP_LIMITS,
- 	LXC_SYNC_READY_START,
- 	LXC_SYNC_RESTART,
-diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
-index e58db5c..0539eca 100644
---- a/src/lxc/terminal.c
-+++ b/src/lxc/terminal.c
-@@ -28,6 +28,10 @@
- #include "syscall_wrappers.h"
- #include "terminal.h"
- #include "utils.h"
-+#ifdef HAVE_ISULAD
-+#include "logger_json_file.h"
-+#include "include/strlcpy.h"
-+#endif
- 
- #if HAVE_PTY_H
- #include <pty.h>
-@@ -183,6 +187,69 @@ static int lxc_terminal_truncate_log_file(struct lxc_terminal *terminal)
- 	return lxc_unpriv(ftruncate(terminal->log_fd, 0));
- }
- 
-+#ifdef HAVE_ISULAD
-+
-+int lxc_set_terminal_winsz(struct lxc_terminal *terminal, unsigned int height, unsigned int width)
-+{
-+	int ret = 0;
-+	struct winsize wsz;
-+
-+	if (terminal->ptmx < 0) {
-+		return 0;
-+	}
-+
-+	ret = ioctl(terminal->ptmx, TIOCGWINSZ, &wsz);
-+	if (ret < 0) {
-+		WARN("Failed to get window size");
-+		return -1;
-+	}
-+	wsz.ws_col = width;
-+	wsz.ws_row = height;
-+
-+	ret = ioctl(terminal->ptmx, TIOCSWINSZ, &wsz);
-+	if (ret < 0)
-+		WARN("Failed to set window size");
-+	else
-+		DEBUG("Set window size to %d columns and %d rows", wsz.ws_col,
-+		      wsz.ws_row);
-+	return ret;
-+}
-+
-+/*
-+ * isulad: support mult-logfiles
-+ * */
-+static int lxc_terminal_rename_old_log_file(struct lxc_terminal *terminal)
-+{
-+	int ret;
-+	unsigned int i;
-+	char tmpPATH_MAX = {0};
-+	char *rename_fname = NULL;
-+
-+	for (i = terminal->log_rotate - 1; i > 1; i--) {
-+		ret = snprintf(tmp, PATH_MAX, "%s.%u", terminal->log_path, i);
-+		if (ret < 0 || ret >= PATH_MAX) {
-+			free(rename_fname);
-+			return -EFBIG;
-+		}
-+		free(rename_fname);
-+		rename_fname = safe_strdup(tmp);
-+		ret = snprintf(tmp, PATH_MAX, "%s.%u", terminal->log_path, (i - 1));
-+		if (ret < 0 || ret >= PATH_MAX) {
-+			free(rename_fname);
-+			return -EFBIG;
-+		}
-+		ret = lxc_unpriv(rename(tmp, rename_fname));
-+		if (ret < 0 && errno != ENOENT) {
-+			free(rename_fname);
-+			return ret;
-+		}
-+	}
-+
-+	free(rename_fname);
-+	return 0;
-+}
-+#endif
-+
- static int lxc_terminal_rotate_log_file(struct lxc_terminal *terminal)
- {
- 	__do_free char *tmp = NULL;
-@@ -196,6 +263,15 @@ static int lxc_terminal_rotate_log_file(struct lxc_terminal *terminal)
- 	if (terminal->log_fd < 0)
- 		return -EBADF;
- 
-+#ifdef HAVE_ISULAD
-+	/* isuald: rotate old log file first */
-+	ret = lxc_terminal_rename_old_log_file(terminal);
-+	if(ret != 0) {
-+		ERROR("Rename old log file failed");
-+		return ret;
-+	}
-+#endif
-+
- 	len = strlen(terminal->log_path) + sizeof(".1");
- 	tmp = must_realloc(NULL, len);
- 
-@@ -212,6 +288,7 @@ static int lxc_terminal_rotate_log_file(struct lxc_terminal *terminal)
- 	return lxc_terminal_create_log_file(terminal);
- }
- 
-+#ifndef HAVE_ISULAD
- static int lxc_terminal_write_log_file(struct lxc_terminal *terminal, char *buf,
- 				       int bytes_read)
- {
-@@ -317,7 +394,465 @@ static int lxc_terminal_write_log_file(struct lxc_terminal *terminal, char *buf,
- 	bytes_read -= ret;
- 	return bytes_read;
- }
-+#endif
-+
-+#ifdef HAVE_ISULAD
-+/* get time buffer */
-+static bool get_time_buffer(struct timespec *timestamp, char *timebuffer,
-+                            size_t maxsize)
-+{
-+	struct tm tm_utc = { 0 };
-+	int32_t nanos = 0;
-+	time_t seconds;
-+	size_t len = 0;
-+	int ret = 0;
-+
-+	if (!timebuffer || !maxsize) {
-+		return false;
-+	}
-+
-+	seconds = (time_t)timestamp->tv_sec;
-+	gmtime_r(&seconds, &tm_utc);
-+	strftime(timebuffer, maxsize, "%Y-%m-%dT%H:%M:%S", &tm_utc);
-+
-+	nanos = (int32_t)timestamp->tv_nsec;
-+	len = strlen(timebuffer);
-+	ret = snprintf(timebuffer + len, (maxsize - len), ".%09dZ", nanos);
-+	if (ret < 0 || ret >= (maxsize - len)) {
-+		return false;
-+	}
-+
-+	return true;
-+}
-+
-+/* get now time buffer */
-+static bool get_now_time_buffer(char *timebuffer, size_t maxsize)
-+{
-+	int err = 0;
-+	struct timespec ts;
-+
-+	err = clock_gettime(CLOCK_REALTIME, &ts);
-+	if (err != 0) {
-+		ERROR("failed to get time");
-+		return false;
-+	}
-+
-+	return get_time_buffer(&ts, timebuffer, maxsize);
-+}
-+
-+static int isulad_lxc_terminal_rotate_write_data(struct lxc_terminal *terminal, const char *buf,
-+                int bytes_read)
-+{
-+	int ret;
-+	struct stat st;
-+	int64_t space_left = -1;
-+
-+	if (terminal->log_fd < 0)
-+		return 0;
-+
-+	/* A log size <= 0 means that there's no limit on the size of the log
-+	 * file at which point we simply ignore whether the log is supposed to
-+	 * be rotated or not.
-+	 */
-+	if (terminal->log_size <= 0)
-+		return lxc_write_nointr(terminal->log_fd, buf, bytes_read);
-+
-+	/* Get current size of the log file. */
-+	ret = fstat(terminal->log_fd, &st);
-+	if (ret < 0) {
-+		SYSERROR("Failed to stat the terminal log file descriptor");
-+		return -1;
-+	}
-+
-+	/* handle non-regular files */
-+	if ((st.st_mode & S_IFMT) != S_IFREG) {
-+		/* This isn't a regular file. so rotating the file seems a
-+		 * dangerous thing to do, size limits are also very
-+		 * questionable. Let's not risk anything and tell the user that
-+		 * he's requesting us to do weird stuff.
-+		 */
-+		if (terminal->log_rotate > 0 || terminal->log_size > 0)
-+			return -EINVAL;
-+
-+		/* I mean, sure log wherever you want to. */
-+		return lxc_write_nointr(terminal->log_fd, buf, bytes_read);
-+	}
-+
-+	space_left = terminal->log_size - st.st_size;
-+
-+	/* User doesn't want to rotate the log file and there's no more space
-+	 * left so simply truncate it.
-+	 */
-+	if (space_left <= 0 && terminal->log_rotate <= 0) {
-+		ret = lxc_terminal_truncate_log_file(terminal);
-+		if (ret < 0)
-+			return ret;
-+
-+		if (bytes_read <= terminal->log_size)
-+			return lxc_write_nointr(terminal->log_fd, buf, bytes_read);
-+
-+		/* Write as much as we can into the buffer and loose the rest. */
-+		return lxc_write_nointr(terminal->log_fd, buf, terminal->log_size);
-+	}
-+
-+	/* There's enough space left. */
-+	if (bytes_read <= space_left)
-+		return lxc_write_nointr(terminal->log_fd, buf, bytes_read);
-+
-+	/* There'd be more to write but we aren't instructed to rotate the log
-+	 * file so simply return. There's no error on our side here.
-+	 */
-+	if (terminal->log_rotate > 0)
-+		ret = lxc_terminal_rotate_log_file(terminal);
-+	else
-+		ret = lxc_terminal_truncate_log_file(terminal);
-+	if (ret < 0)
-+		return ret;
-+
-+	if (terminal->log_size < bytes_read) {
-+		/* Well, this is unfortunate because it means that there is more
-+		 * to write than the user has granted us space. There are
-+		 * multiple ways to handle this but let's use the simplest one:
-+		 * write as much as we can, tell the user that there was more
-+		 * stuff to write and move on.
-+		 * Note that this scenario shouldn't actually happen with the
-+		 * standard pty-based terminal that LXC allocates since it will
-+		 * be switched into raw mode. In raw mode only 1 byte at a time
-+		 * should be read and written.
-+		 */
-+		WARN("Size of terminal log file is smaller than the bytes to write");
-+		ret = lxc_write_nointr(terminal->log_fd, buf, terminal->log_size);
-+		if (ret < 0)
-+			return -1;
-+		bytes_read -= ret;
-+		return bytes_read;
-+	}
-+
-+	/* Yay, we made it. */
-+	ret = lxc_write_nointr(terminal->log_fd, buf, bytes_read);
-+	if (ret < 0)
-+		return -1;
-+	bytes_read -= ret;
-+	return bytes_read;
-+}
-+
-+static ssize_t isulad_logger_json_write(struct lxc_terminal *terminal, const char *type, const char *buf,
-+                                int bytes_read)
-+{
-+	logger_json_file *msg = NULL;
-+	ssize_t ret = -1;
-+	size_t len;
-+	char *json = NULL;
-+	char timebuffer64 = { 0 };
-+	parser_error err = NULL;
-+	struct parser_context ctx = { GEN_OPTIONS_SIMPLIFY | GEN_OPTIONS_NOT_VALIDATE_UTF8, stderr };
-+
-+	if (bytes_read < 0 || bytes_read >= INT_MAX) {
-+		return -1;
-+	}
-+	msg = calloc(sizeof(logger_json_file), 1);
-+	if (msg == NULL) {
-+		return -errno;
-+	}
-+	msg->log = calloc(bytes_read, 1);
-+	if (!msg->log) {
-+		goto cleanup;
-+	}
-+	memcpy(msg->log, buf, bytes_read);
-+	msg->log_len = bytes_read;
-+	msg->stream = type ? safe_strdup(type) : safe_strdup("stdout");
-+
-+	get_now_time_buffer(timebuffer, sizeof(timebuffer));
-+	msg->time = safe_strdup(timebuffer);
-+
-+	json = logger_json_file_generate_json(msg, &ctx, &err);
-+	if (!json) {
-+		ERROR("Failed to generate json: %s", err);
-+		goto cleanup;
-+	}
-+	len = strlen(json);
-+	jsonlen = '\n';
-+	ret = isulad_lxc_terminal_rotate_write_data(terminal, json, len + 1);
-+cleanup:
-+	free(json);
-+	free_logger_json_file(msg);
-+	free(err);
-+	return ret;
-+}
-+
-+static ssize_t isulad_logger_syslog_write(struct lxc_terminal *terminal, const char *buf)
-+{
-+        syslog(LOG_INFO, "%s", buf);
-+        return 0;
-+}
-+
-+static inline bool is_syslog(const char *driver)
-+{
-+        if (driver == NULL) {
-+                return false;
-+        }
-+
-+        return (strcmp("syslog", driver) == 0);
-+}
-+
-+static inline ssize_t isulad_logger_write(struct lxc_terminal *terminal, const char *type, const char *buf,
-+                                int bytes_read)
-+{
-+        if (is_syslog(terminal->log_driver)) {
-+                return isulad_logger_syslog_write(terminal, buf);
-+        }
-+
-+        return isulad_logger_json_write(terminal, type, buf, bytes_read);
-+}
-+
-+static int isulad_lxc_terminal_write_log_file(struct lxc_terminal *terminal, const char *type, char *buf,
-+                                       int bytes_read)
-+{
-+#define __BUF_CACHE_SIZE (16 * LXC_TERMINAL_BUFFER_SIZE)
-+	static char cache__BUF_CACHE_SIZE;
-+	static int size = 0;
-+	int upto, index;
-+	int begin = 0, buf_readed = 0,  buf_left = 0;
-+	int ret;
-+
-+	if (buf != NULL && bytes_read > 0) {
-+		/* Work out how much more data we are okay with reading this time. */
-+		upto = size + bytes_read;
-+		if (upto > __BUF_CACHE_SIZE) {
-+			upto = __BUF_CACHE_SIZE;
-+		}
-+
-+		if (upto > size) {
-+			buf_readed = upto - size;
-+			memcpy(cache + size, buf, buf_readed);
-+			buf_left = bytes_read - buf_readed;
-+			size += buf_readed;
-+		}
-+	}
-+
-+	// If we have no data to log, and there's no more coming, we're done.
-+	if (size == 0)
-+		return 0;
-+
-+	// Break up the data that we've buffered up into lines, and log each in turn.
-+	for (index = 0; index < size; index++) {
-+		if (cacheindex == '\n') {
-+			ret = isulad_logger_write(terminal, type, cache + begin, index - begin + 1);
-+			if (ret < 0) {
-+				WARN("Failed to log msg");
-+			}
-+			begin = index + 1;
-+		}
-+	}
-+	/* If there's no more coming, or the buffer is full but
-+	 * has no newlines, log whatever we haven't logged yet,
-+	 * noting that it's a partial log line. */
-+	if (buf == NULL || (begin == 0 && size == __BUF_CACHE_SIZE)) {
-+		if (begin < size) {
-+			ret = isulad_logger_write(terminal, type, cache + begin, size - begin);
-+			if (ret < 0) {
-+				WARN("Failed to log msg");
-+			}
-+			begin = 0;
-+			size = 0;
-+		}
-+		if (buf == NULL) {
-+			return 0;
-+		}
-+	}
-+	/* Move any unlogged data to the front of the buffer in preparation for another read. */
-+	if (begin > 0) {
-+		memcpy(cache, cache + begin, size - begin);
-+		size -= begin;
-+	}
-+	/* Move left data to cache buffer */
-+	if (buf_left > 0) {
-+		memcpy(cache + size, buf + buf_readed, buf_left);
-+		size += buf_left;
-+	}
-+	return 0;
-+}
-+
-+/* isulad: forward data to all fifos */
-+static void lxc_forward_data_to_fifo(struct lxc_list *list, bool is_err, const char *buf, int r)
-+{
-+	struct lxc_list *it  = NULL;
-+	struct lxc_list *next = NULL;
-+	struct lxc_fifos_fd *elem = NULL;
-+	ssize_t w = 0;
-+
-+	lxc_list_for_each_safe(it, list, next) {
-+		elem = it->elem;
-+		if (is_err) {
-+			if (elem->err_fd >= 0) {
-+				w = lxc_write_nointr_for_fifo(elem->err_fd, buf, r);
-+				if (w != r) {
-+					WARN("Failed to write to fifo fd %d with error: %s", elem->err_fd, strerror(errno));
-+				}
-+			}
-+		} else {
-+			if (elem->out_fd >= 0) {
-+				w = lxc_write_nointr_for_fifo(elem->out_fd, buf, r);
-+				if (w != r) {
-+					WARN("Failed to write to fifo fd %d with error: %s", elem->out_fd, strerror(errno));
-+				}
-+			}
-+		}
-+	}
-+
-+	return;
-+}
-+
-+/* isulad: judge the fd whether is fifo */
-+static bool lxc_terminal_is_fifo(int fd, struct lxc_list *list)
-+{
-+	struct lxc_list *it = NULL;
-+	struct lxc_list *next = NULL;
-+	struct lxc_fifos_fd *elem = NULL;
-+
-+	lxc_list_for_each_safe(it, list, next) {
-+		elem = it->elem;
-+		if (elem->in_fd == fd)
-+			return true;
-+	}
-+
-+	return false;
-+}
-+
-+/* isulad: if fd == -1, means delete all the fifos*/
-+int lxc_terminal_delete_fifo(int fd, struct lxc_list *list)
-+{
-+	struct lxc_list *it = NULL;
-+	struct lxc_list *next = NULL;
-+	struct lxc_fifos_fd *elem = NULL;
-+
-+	lxc_list_for_each_safe(it, list, next) {
-+		elem = it->elem;
-+		if (elem->in_fd == fd || -1 == fd) {
-+			INFO("Delete fifo fd %d", fd);
-+			lxc_list_del(it);
-+			if (elem->in_fifo)
-+				free(elem->in_fifo);
-+			if (elem->out_fifo)
-+				free(elem->out_fifo);
-+			if (elem->err_fifo)
-+				free(elem->err_fifo);
-+			if (elem->in_fd >= 0)
-+				close(elem->in_fd);
-+			if (elem->out_fd >= 0)
-+				close(elem->out_fd);
-+			if (elem->err_fd >= 0)
-+				close(elem->err_fd);
-+			free(elem);
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+int lxc_terminal_io_cb(int fd, uint32_t events, void *data,
-+                       struct lxc_epoll_descr *descr)
-+{
-+	struct lxc_terminal *terminal = data;
-+	char buf2 * LXC_TERMINAL_BUFFER_SIZE;
-+	int r, w, w_log, w_rbuf;
-+
-+	w = r = lxc_read_nointr(fd, buf, sizeof(buf));
-+	if (r <= 0) {
-+		INFO("Terminal client on fd %d has exited", fd);
-+		lxc_mainloop_del_handler(descr, fd);
-+
-+		if (fd == terminal->ptmx) {
-+			terminal->ptmx = -EBADF;
-+			/* write remained buffer to terminal log */
-+			if (terminal->log_fd >= 0) {
-+				w_log = isulad_lxc_terminal_write_log_file(terminal, "stdout", NULL, 0);
-+				if (w_log < 0)
-+					TRACE("Failed to write %d bytes to terminal log", r);
-+			}
-+			/* notes: do not close the ptmx fd due to if we close the fd, the process may
-+			 * recive SIGHUP and the exit code will be 129 (128 + 1)
-+			 */
-+			return LXC_MAINLOOP_CLOSE;
-+		} else if (fd == terminal->peer) {
-+			lxc_terminal_signal_fini(terminal);
-+			terminal->peer = -EBADF;
-+			close(fd);
-+			return LXC_MAINLOOP_CONTINUE; /* isulad: do not close mainloop when peer close*/
-+		} else if (lxc_terminal_is_fifo(fd, &terminal->fifos)) {
-+			/* isulad: delete fifos when the client close */
-+			lxc_terminal_delete_fifo(fd, &terminal->fifos);
-+			return LXC_MAINLOOP_CONTINUE;
-+		} else if (fd == terminal->pipes10 || fd == terminal->pipes20) {
-+			if (fd == terminal->pipes10) {
-+				if (terminal->log_fd >= 0) {
-+					w_log = isulad_lxc_terminal_write_log_file(terminal, "stdout", NULL, 0);
-+				}
-+				terminal->pipes10 = -EBADF;
-+			} else if (fd == terminal->pipes20) {
-+				if (terminal->log_fd >= 0) {
-+					w_log = isulad_lxc_terminal_write_log_file(terminal, "stderr", NULL, 0);
-+				}
-+				terminal->pipes20 = -EBADF;
-+			}
-+			/* notes: do not close the ptmx fd due to if we close the fd, the process may
-+			 * recive SIGHUP and the exit code will be 141 (128 + 13)
-+			 */
-+			return LXC_MAINLOOP_CONTINUE;
-+		} else if (fd == terminal->pipes01) {
-+			TRACE("closed stdin pipe of container stdin");
-+			terminal->pipes01 = -EBADF;
-+			return LXC_MAINLOOP_CONTINUE;
-+		} else {
-+			WARN("Handler received unexpected file descriptor");
-+		}
-+		close(fd);
-+		return LXC_MAINLOOP_CLOSE;
-+	}
-+
-+	if (fd == terminal->peer || lxc_terminal_is_fifo(fd, &terminal->fifos)) {
-+		if (terminal->ptmx > 0)
-+			w = lxc_write_nointr(terminal->ptmx, buf, r);
-+		if (terminal->pipes01 > 0)
-+			w = lxc_write_nointr(terminal->pipes01, buf, r);
-+	}
-+
-+	w_rbuf = w_log = 0;
-+	if (fd == terminal->ptmx || fd == terminal->pipes10 || fd == terminal->pipes20) {
-+		/* write to peer first */
-+		if (terminal->peer >= 0)
-+			w = lxc_write_nointr(terminal->peer, buf, r);
-+
-+		/* isulad: forward data to fifos */
-+		lxc_forward_data_to_fifo(&terminal->fifos, fd == terminal->pipes20, buf, r);
-+
-+		/* write to terminal ringbuffer */
-+		if (terminal->buffer_size > 0)
-+			w_rbuf = lxc_ringbuf_write(&terminal->ringbuf, buf, r);
-+
-+		/* write to terminal log */
-+		if (terminal->log_fd >= 0) {
-+			if (fd == terminal->ptmx || fd == terminal->pipes10)
-+				w_log = isulad_lxc_terminal_write_log_file(terminal, "stdout", buf, r);
-+			else if (fd == terminal->pipes20)
-+				w_log = isulad_lxc_terminal_write_log_file(terminal, "stderr", buf, r);
-+		}
-+	}
-+
-+	if (w != r)
-+		WARN("Short write on terminal r:%d != w:%d", r, w);
-+
-+	if (w_rbuf < 0) {
-+		errno = -w_rbuf;
-+		SYSTRACE("Failed to write %d bytes to terminal ringbuffer", r);
-+	}
-+
-+	if (w_log < 0)
-+		TRACE("Failed to write %d bytes to terminal log", r);
- 
-+	return LXC_MAINLOOP_CONTINUE;
-+}
-+#else
- int lxc_terminal_io_cb(int fd, uint32_t events, void *data,
- 		       struct lxc_epoll_descr *descr)
- {
-@@ -374,6 +909,7 @@ int lxc_terminal_io_cb(int fd, uint32_t events, void *data,
- 
- 	return LXC_MAINLOOP_CONTINUE;
- }
-+#endif
- 
- static int lxc_terminal_mainloop_add_peer(struct lxc_terminal *terminal)
- {
-@@ -401,6 +937,110 @@ static int lxc_terminal_mainloop_add_peer(struct lxc_terminal *terminal)
- 	return 0;
- }
- 
-+#ifdef HAVE_ISULAD
-+/* isulad add pipes to mainloop */
-+static int lxc_terminal_mainloop_add_pipes(struct lxc_terminal *terminal)
-+{
-+	int ret = 0;
-+
-+	// parent read data from fifo, and send to stdin of container
-+	if (terminal->pipes01 > 0) {
-+		ret = lxc_mainloop_add_handler(terminal->descr, terminal->pipes01,
-+		                               lxc_terminal_io_cb, terminal);
-+		if (ret) {
-+			ERROR("pipe fd %d not added to mainloop", terminal->pipes01);
-+			return -1;
-+		}
-+	}
-+	// parent read data from stdout of container, and send to fifo
-+	if (terminal->pipes10 > 0) {
-+		ret = lxc_mainloop_add_handler(terminal->descr, terminal->pipes10,
-+		                               lxc_terminal_io_cb, terminal);
-+		if (ret) {
-+			ERROR("pipe fd %d not added to mainloop", terminal->pipes10);
-+			return -1;
-+		}
-+	}
-+	// parent read data from stderr of container, and send to fifo
-+	if (terminal->pipes20 > 0) {
-+		ret = lxc_mainloop_add_handler(terminal->descr, terminal->pipes20,
-+		                               lxc_terminal_io_cb, terminal);
-+		if (ret) {
-+			ERROR("pipe fd %d not added to mainloop", terminal->pipes20);
-+			return -1;
-+		}
-+	}
-+	return ret;
-+}
-+
-+/* isulad add fifo to mainloop */
-+static int lxc_terminal_mainloop_add_fifo(struct lxc_terminal *terminal)
-+{
-+	int ret = 0;
-+	struct lxc_list *it = NULL;
-+	struct lxc_list *next = NULL;
-+	struct lxc_fifos_fd *elem = NULL;
-+
-+	lxc_list_for_each_safe(it, &terminal->fifos, next) {
-+		elem = it->elem;
-+		if (elem->in_fd >= 0) {
-+			ret = lxc_mainloop_add_handler(terminal->descr, elem->in_fd,
-+			                               lxc_terminal_io_cb, terminal);
-+			if (ret) {
-+				ERROR("console fifo %s not added to mainloop", elem->in_fifo);
-+				return -1;
-+			}
-+		}
-+	}
-+	return ret;
-+}
-+
-+int lxc_terminal_mainloop_add(struct lxc_epoll_descr *descr,
-+                              struct lxc_terminal *terminal)
-+{
-+	int ret;
-+
-+	/* We cache the descr so that we can add an fd to it when someone
-+	 * does attach to it in lxc_terminal_allocate().
-+	 */
-+	terminal->descr = descr;
-+
-+	ret = lxc_terminal_mainloop_add_peer(terminal);
-+	if (ret < 0) {
-+		ERROR("Failed to add handler for terminal peer to mainloop");
-+		return -1;
-+	}
-+
-+	/* isulad add pipes to mainloop */
-+	ret = lxc_terminal_mainloop_add_pipes(terminal);
-+	if (ret < 0) {
-+		ERROR("Failed to add handler for terminal fifos to mainloop");
-+		return -1;
-+	}
-+
-+	/* isulad add fifo to mainloop */
-+	ret = lxc_terminal_mainloop_add_fifo(terminal);
-+	if (ret < 0) {
-+		ERROR("Failed to add handler for terminal fifos to mainloop");
-+		return -1;
-+	}
-+
-+	if (terminal->ptmx < 0) {
-+		INFO("Terminal is not initialized");
-+		return 0;
-+	}
-+
-+	ret = lxc_mainloop_add_handler(descr, terminal->ptmx,
-+	                               lxc_terminal_io_cb, terminal);
-+	if (ret < 0) {
-+		ERROR("Failed to add handler for terminal ptmx fd %d to "
-+		      "mainloop", terminal->ptmx);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+#else
- int lxc_terminal_mainloop_add(struct lxc_epoll_descr *descr,
- 			      struct lxc_terminal *terminal)
- {
-@@ -426,6 +1066,7 @@ int lxc_terminal_mainloop_add(struct lxc_epoll_descr *descr,
- 
- 	return lxc_terminal_mainloop_add_peer(terminal);
- }
-+#endif
- 
- int lxc_setup_tios(int fd, struct termios *oldtios)
- {
-@@ -639,14 +1280,39 @@ void lxc_terminal_free(struct lxc_conf *conf, int fd)
- 
- static int lxc_terminal_peer_default(struct lxc_terminal *terminal)
- {
-+#ifdef HAVE_ISULAD
-+	struct lxc_terminal_state *ts = NULL;
-+	const char *path = NULL;
-+#else
- 	struct lxc_terminal_state *ts;
- 	const char *path;
-+#endif
- 	int ret = 0;
- 
- 	if (terminal->path)
- 		path = terminal->path;
-+
-+#ifdef HAVE_ISULAD
-+	/* isulad: if no console was given, try current controlling terminal, there
-+	 * won't be one if we were started as a daemon (-d)
-+	 */
-+	if (!path && !access("/dev/tty", F_OK)) {
-+		int fd;
-+		fd = open("/dev/tty", O_RDWR);
-+		if (fd >= 0) {
-+			close(fd);
-+			path = "/dev/tty";
-+		}
-+	}
-+
-+	if (!path) {
-+		DEBUG("Not have a controlling terminal");
-+		return 0;
-+	}
-+#else
- 	else
- 		path = "/dev/tty";
-+#endif
- 
- 	terminal->peer = lxc_unpriv(open(path, O_RDWR | O_CLOEXEC));
- 	if (terminal->peer < 0) {
-@@ -760,6 +1426,35 @@ void lxc_terminal_delete(struct lxc_terminal *terminal)
- 	if (terminal->log_fd >= 0)
- 		close(terminal->log_fd);
- 	terminal->log_fd = -1;
-+
-+#ifdef HAVE_ISULAD
-+        if (is_syslog(terminal->log_driver)) {
-+                closelog();
-+                free(terminal->log_driver);
-+	}
-+	/* isulad: close all pipes */
-+	if (terminal->pipes00 >= 0)
-+		close(terminal->pipes00);
-+	terminal->pipes00 = -1;
-+	if (terminal->pipes01 >= 0)
-+		close(terminal->pipes01);
-+	terminal->pipes01 = -1;
-+	if (terminal->pipes10 >= 0)
-+		close(terminal->pipes10);
-+	terminal->pipes10 = -1;
-+	if (terminal->pipes11 >= 0)
-+		close(terminal->pipes11);
-+	terminal->pipes11 = -1;
-+	if (terminal->pipes20 >= 0)
-+		close(terminal->pipes20);
-+	terminal->pipes20 = -1;
-+	if (terminal->pipes21 >= 0)
-+		close(terminal->pipes21);
-+	terminal->pipes21 = -1;
-+
-+	/* isulad: delete all fifos */
-+	lxc_terminal_delete_fifo(-1, &terminal->fifos);
-+#endif
- }
- 
- /**
-@@ -828,6 +1523,251 @@ int lxc_terminal_create_log_file(struct lxc_terminal *terminal)
- 	return 0;
- }
- 
-+#ifdef HAVE_ISULAD
-+/* isulad: fd_nonblock */
-+static int fd_nonblock(int fd)
-+{
-+	int flags;
-+
-+	flags = fcntl(fd, F_GETFL);
-+
-+	return fcntl(fd, F_SETFL, (int)((unsigned int)flags | O_NONBLOCK));
-+}
-+
-+static int terminal_fifo_open(const char *fifo_path, int flags)
-+{
-+	int fd = -1;
-+
-+	fd = lxc_open(fifo_path, flags, 0);
-+	if (fd < 0) {
-+		WARN("Failed to open fifo %s to send message: %s.", fifo_path,
-+		     strerror(errno));
-+		return -1;
-+	}
-+
-+	return fd;
-+}
-+
-+bool fifo_exists(const char *path)
-+{
-+	struct stat sb;
-+	int ret;
-+
-+	ret = stat(path, &sb);
-+	if (ret < 0)
-+		// could be something other than eexist, just say no
-+		return false;
-+	return S_ISFIFO(sb.st_mode);
-+}
-+
-+/* isulad: set terminal fifos */
-+static int lxc_terminal_set_fifo(struct lxc_terminal *console, const char *in, const char *out, const char *err, int *input_fd)
-+{
-+	int fifofd_in = -1, fifofd_out = -1, fifofd_err = -1;
-+	struct lxc_fifos_fd *fifo_elem = NULL;
-+
-+	if ((in && !fifo_exists(in)) || (out && !fifo_exists(out)) || (err && !fifo_exists(err))) {
-+		ERROR("File %s or %s or %s does not refer to a FIFO", in, out, err);
-+		return -1;
-+	}
-+
-+	if (in) {
-+		fifofd_in = terminal_fifo_open(in, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
-+		if (fifofd_in < 0) {
-+			SYSERROR("Failed to open FIFO: %s", in);
-+			return -1;
-+		}
-+	}
-+
-+	if (out) {
-+		fifofd_out = terminal_fifo_open(out, O_WRONLY | O_NONBLOCK | O_CLOEXEC);
-+		if (fifofd_out < 0) {
-+			SYSERROR("Failed to open FIFO: %s", out);
-+			if (fifofd_in >= 0)
-+				close(fifofd_in);
-+			return -1;
-+		}
-+	}
-+
-+	if (err) {
-+		fifofd_err = terminal_fifo_open(err, O_WRONLY | O_NONBLOCK | O_CLOEXEC);
-+		if (fifofd_err < 0) {
-+			SYSERROR("Failed to open FIFO: %s", err);
-+			if (fifofd_in >= 0)
-+				close(fifofd_in);
-+			if (fifofd_out >= 0)
-+				close(fifofd_out);
-+			return -1;
-+		}
-+	}
-+
-+	fifo_elem = malloc(sizeof(*fifo_elem));
-+	if (fifo_elem == NULL) {
-+		if (fifofd_in >= 0)
-+			close(fifofd_in);
-+		if (fifofd_out >= 0)
-+			close(fifofd_out);
-+		if (fifofd_err >= 0)
-+			close(fifofd_err);
-+		return -1;
-+	}
-+	memset(fifo_elem, 0, sizeof(*fifo_elem));
-+
-+	fifo_elem->in_fifo = safe_strdup(in ? in : "");
-+	fifo_elem->out_fifo = safe_strdup(out ? out : "");
-+	fifo_elem->err_fifo = safe_strdup(err ? err : "");
-+	fifo_elem->in_fd = fifofd_in;
-+	fifo_elem->out_fd = fifofd_out;
-+	fifo_elem->err_fd = fifofd_err;
-+	lxc_list_add_elem(&fifo_elem->node, fifo_elem);
-+	lxc_list_add_tail(&console->fifos, &fifo_elem->node);
-+
-+	if (input_fd)
-+		*input_fd = fifofd_in;
-+
-+	return 0;
-+}
-+
-+/* isulad: add default fifos */
-+static int lxc_terminal_fifo_default(struct lxc_terminal *terminal)
-+{
-+	if (terminal->init_fifo0 || terminal->init_fifo1 || terminal->init_fifo2)
-+		return lxc_terminal_set_fifo(terminal, terminal->init_fifo0, terminal->init_fifo1, terminal->init_fifo2, NULL);
-+	return 0;
-+}
-+
-+int lxc_terminal_create(struct lxc_terminal *terminal)
-+{
-+	int ret;
-+
-+	if (!terminal->disable_pty) {
-+		ret = openpty(&terminal->ptmx, &terminal->pts, NULL, NULL, NULL);
-+		if (ret < 0) {
-+			SYSERROR("Failed to open terminal");
-+			return -1;
-+		}
-+
-+		ret = ttyname_r(terminal->pts, terminal->name, sizeof(terminal->name));
-+		if (ret < 0) {
-+			SYSERROR("Failed to retrieve name of terminal pts");
-+			goto err;
-+		}
-+
-+		ret = fd_cloexec(terminal->ptmx, true);
-+		if (ret < 0) {
-+			SYSERROR("Failed to set FD_CLOEXEC flag on terminal ptmx");
-+			goto err;
-+		}
-+
-+		/* isulad: make ptmx NONBLOCK */
-+		ret = fd_nonblock(terminal->ptmx);
-+		if (ret < 0) {
-+			SYSERROR("Failed to set O_NONBLOCK flag on terminal ptmx");
-+			goto err;
-+		}
-+
-+		ret = fd_cloexec(terminal->pts, true);
-+		if (ret < 0) {
-+			SYSERROR("Failed to set FD_CLOEXEC flag on terminal pts");
-+			goto err;
-+		}
-+
-+		ret = lxc_terminal_peer_default(terminal);
-+		if (ret < 0) {
-+			ERROR("Failed to allocate proxy terminal");
-+			goto err;
-+		}
-+	} else {
-+		/* isulad: create 3 pipes */
-+		/* for stdin */
-+		if (pipe2(terminal->pipes0, O_CLOEXEC)) {
-+			ERROR("Failed to create stdin pipe");
-+			goto err;
-+		}
-+
-+		/* for stdout */
-+		if (pipe2(terminal->pipes1, O_CLOEXEC)) {
-+			ERROR("Failed to create stdout pipe");
-+			goto err;
-+		}
-+		/* for stderr */
-+		if (pipe2(terminal->pipes2, O_CLOEXEC)) {
-+			ERROR("Failed to create stderr pipe");
-+			goto err;
-+		}
-+	}
-+
-+	/* isulad: open fifos */
-+	ret = lxc_terminal_fifo_default(terminal);
-+	if (ret < 0) {
-+		ERROR("Failed to allocate fifo terminal");
-+		goto err;
-+	}
-+
-+	return 0;
-+
-+err:
-+	lxc_terminal_delete(terminal);
-+	return -ENODEV;
-+}
-+
-+/* isulad: add fifos dynamic*/
-+int lxc_terminal_add_fifos(struct lxc_conf *conf, const char *fifonames)
-+{
-+	int ret = 0;
-+	struct lxc_terminal *terminal = &conf->console;
-+	int fifofd_in = -1;
-+	char *tmp = NULL, *saveptr = NULL, *in = NULL, *out = NULL, *err = NULL;
-+	const char *none_fifo_name = "none";
-+
-+	tmp = safe_strdup(fifonames);
-+
-+	in = strtok_r(tmp, "&&&&", &saveptr);
-+	if (!in) {
-+		ret = -1;
-+		goto free_out;
-+	}
-+	if (strcmp(in, none_fifo_name) == 0)
-+		in = NULL;
-+
-+	out = strtok_r(NULL, "&&&&",  &saveptr);
-+	if (!out) {
-+		ret = -1;
-+		goto free_out;
-+	}
-+	if (strcmp(out, none_fifo_name) == 0)
-+		out = NULL;
-+
-+	err = strtok_r(NULL, "&&&&",  &saveptr);
-+	if (!err) {
-+		ret = -1;
-+		goto free_out;
-+	}
-+	if (strcmp(err, none_fifo_name) == 0)
-+		err = NULL;
-+
-+	ret = lxc_terminal_set_fifo(terminal, in, out, err, &fifofd_in);
-+	if (ret < 0) {
-+		ERROR("Faild to set fifos to console config");
-+		ret = -1;
-+		goto free_out;
-+	}
-+
-+	if (lxc_mainloop_add_handler(terminal->descr, fifofd_in,
-+	                             lxc_terminal_io_cb, terminal)) {
-+		ERROR("console fifo not added to mainloop");
-+		lxc_terminal_delete_fifo(fifofd_in, &terminal->fifos);
-+		ret = -1;
-+		goto free_out;
-+	}
-+
-+free_out:
-+	if (tmp)
-+		free(tmp);
-+	return ret;
-+}
-+
-+#else
- int lxc_terminal_create(struct lxc_terminal *terminal)
- {
- 	int ret;
-@@ -868,6 +1808,7 @@ err:
- 	lxc_terminal_delete(terminal);
- 	return -ENODEV;
- }
-+#endif
- 
- int lxc_terminal_setup(struct lxc_conf *conf)
- {
-@@ -883,6 +1824,18 @@ int lxc_terminal_setup(struct lxc_conf *conf)
- 	if (ret < 0)
- 		return -1;
- 
-+#ifdef HAVE_ISULAD
-+        if (is_syslog(terminal->log_driver)) {
-+                if (terminal->log_syslog_tag == NULL) {
-+                        terminal->log_syslog_tag = malloc(16 * sizeof(char));
-+                        (void)strlcpy(terminal->log_syslog_tag, conf->name, 16);
-+                }
-+                if (terminal->log_syslog_facility <= 0) {
-+                        terminal->log_syslog_facility = LOG_DAEMON;
-+                }
-+                openlog(terminal->log_syslog_tag, LOG_PID, terminal->log_syslog_facility);
-+        }
-+#endif
- 	ret = lxc_terminal_create_log_file(terminal);
- 	if (ret < 0)
- 		goto err;
-@@ -1120,9 +2073,15 @@ int lxc_terminal_prepare_login(int fd)
- 	if (ret < 0)
- 		return -1;
- 
-+#ifdef HAVE_ISULAD
-+	ret = set_stdfds(fd);
-+	if (ret < 0)
-+		return -1;
-+#else
- 	ret = lxc_terminal_set_stdfds(fd);
- 	if (ret < 0)
- 		return -1;
-+#endif
- 
- 	if (fd > STDERR_FILENO)
- 		close(fd);
-@@ -1146,6 +2105,18 @@ void lxc_terminal_init(struct lxc_terminal *terminal)
- 	terminal->peer = -EBADF;
- 	terminal->log_fd = -EBADF;
- 	lxc_terminal_info_init(&terminal->proxy);
-+#ifdef HAVE_ISULAD
-+	terminal->init_fifo0 = NULL;
-+	terminal->init_fifo1 = NULL;
-+	terminal->init_fifo2 = NULL;
-+	terminal->pipes00 = -1;
-+	terminal->pipes01 = -1;
-+	terminal->pipes10 = -1;
-+	terminal->pipes11 = -1;
-+	terminal->pipes20 = -1;
-+	terminal->pipes21 = -1;
-+	lxc_list_init(&terminal->fifos);
-+#endif
- }
- 
- void lxc_terminal_conf_free(struct lxc_terminal *terminal)
-@@ -1155,6 +2126,15 @@ void lxc_terminal_conf_free(struct lxc_terminal *terminal)
- 	if (terminal->buffer_size > 0 && terminal->ringbuf.addr)
- 		lxc_ringbuf_release(&terminal->ringbuf);
- 	lxc_terminal_signal_fini(terminal);
-+#ifdef HAVE_ISULAD
-+	/*isulad: free console fifos */
-+	free(terminal->init_fifo0);
-+	free(terminal->init_fifo1);
-+	free(terminal->init_fifo2);
-+	lxc_terminal_delete_fifo(-1, &terminal->fifos);
-+	free(terminal->log_driver);
-+	free(terminal->log_syslog_tag);
-+#endif
- }
- 
- int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *terminal)
-@@ -1167,6 +2147,15 @@ int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *terminal)
- 	if (strcmp(terminal->name, "") == 0)
- 		return 0;
- 
-+#ifdef HAVE_ISULAD
-+	ret = chown_mapped_root(terminal->name, c);
-+	if (ret < 0) {
-+		ERROR("Failed to chown terminal \"%s\"", terminal->name);
-+		return -1;
-+	}
-+
-+	TRACE("Chowned terminal \"%s\"", terminal->name);
-+#else
- 	ret = userns_exec_mapped_root(terminal->name, terminal->pts, c);
- 	if (ret < 0) {
- 		return log_error(-1, "Failed to chown terminal %d(%s)",
-@@ -1174,6 +2163,7 @@ int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *terminal)
- 	}
- 
- 	TRACE("Chowned terminal %d(%s)", terminal->pts, terminal->name);
-+#endif
- 
- 	return 0;
- }
-diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
-index 11bba26..03bf439 100644
---- a/src/tests/Makefile.am
-+++ b/src/tests/Makefile.am
-@@ -58,6 +58,10 @@ AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
- 	  -I $(top_srcdir)/src/lxc/tools \
- 	  -pthread
- 
-+if HAVE_ISULAD
-+AM_CFLAGS += -I $(top_srcdir)/src/lxc/json
-+endif
-+
- if ENABLE_APPARMOR
- AM_CFLAGS += -DHAVE_APPARMOR
- endif
-diff --git a/src/tests/attach.c b/src/tests/attach.c
-index 07e641d..f36caac 100644
---- a/src/tests/attach.c
-+++ b/src/tests/attach.c
-@@ -29,6 +29,9 @@
- #include "lxctest.h"
- #include "utils.h"
- #include "lsm/lsm.h"
-+#ifdef HAVE_ISULAD
-+#include "config.h"
-+#endif
- 
- #include <lxc/lxccontainer.h>
- 
-@@ -76,7 +79,11 @@ static void test_attach_lsm_set_config(struct lxc_container *ct)
- 	ct->save_config(ct, NULL);
- }
- 
-+#ifdef HAVE_ISULAD
-+static int test_attach_lsm_func_func(void* payload, int fd)
-+#else
- static int test_attach_lsm_func_func(void* payload)
-+#endif
- {
- 	TSTOUT("%s", lsm_process_label_get(syscall(SYS_getpid)));
- 	return 0;
-@@ -187,7 +194,11 @@ static int  test_attach_lsm_func(struct lxc_container *ct) { return 0; }
- static int  test_attach_lsm_cmd(struct lxc_container *ct) { return 0; }
- #endif /* HAVE_APPARMOR || HAVE_SELINUX */
- 
-+#ifdef HAVE_ISULAD
-+static int test_attach_func_func(void* payload, int fd)
-+#else
- static int test_attach_func_func(void* payload)
-+#endif
- {
- 	TSTOUT("%d", (int)syscall(SYS_getpid));
- 	return 0;
--- 
-2.25.1
-

_service:tar_scm:0008-bugfix-for-system-container-and-stream.patch Added

@@ -0,0 +1,490 @@
+From 4cdfab3356a95e7bd7063adcb54604c8f1f4c439 Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Tue, 7 Nov 2023 16:24:53 +0800
+Subject: PATCH bugfix for system container and stream
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ src/lxc/attach.c         |  6 +--
+ src/lxc/cgroups/cgfsng.c |  4 +-
+ src/lxc/conf.c           | 65 ++++++++++++++++------------
+ src/lxc/confile.c        |  9 +++-
+ src/lxc/start.c          | 78 ++++++++++++++++++----------------
+ src/lxc/storage/dir.c    |  4 ++
+ src/lxc/terminal.c       | 92 +++++++++++++++++++++++++---------------
+ 7 files changed, 150 insertions(+), 108 deletions(-)
+
+diff --git a/src/lxc/attach.c b/src/lxc/attach.c
+index ae12da3..9550e6d 100644
+--- a/src/lxc/attach.c
++++ b/src/lxc/attach.c
+@@ -1453,7 +1453,7 @@ __noreturn static void do_attach(struct attach_payload *ap)
+ 				SYSERROR("Failed to prepare terminal file pipes");
+ 				goto on_error;
+ 			}
+-		} else {
++		} else if (ap->terminal_pts_fd >= 0) {
+ #endif
+ 		ret = lxc_terminal_prepare_login(ap->terminal_pts_fd);
+ 		if (ret < 0) {
+@@ -2009,11 +2009,7 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
+ 				.terminal = &terminal,
+ #endif
+ 			};
+-#ifdef HAVE_ISULAD
+-			if (options->attach_flags & LXC_ATTACH_TERMINAL && terminal.tty_state) {
+-#else
+ 			if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+-#endif
+ 				ret = lxc_terminal_signal_sigmask_safe_blocked(&terminal);
+ 				if (ret < 0) {
+ 					SYSERROR("Failed to reset signal mask");
+diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
+index 0aaafa8..a9a8f2c 100644
+--- a/src/lxc/cgroups/cgfsng.c
++++ b/src/lxc/cgroups/cgfsng.c
+@@ -612,7 +612,7 @@ __cgfsng_ops static void cgfsng_payload_destroy(struct cgroup_ops *ops,
+ 	if (ret < 0)
+ 		SYSWARN("Failed to destroy cgroups");
+ #ifdef HAVE_ISULAD
+-	return ret >= 0;
++	return ret == 0;
+ #endif
+ }
+ 
+@@ -3370,8 +3370,6 @@ static bool isulad_cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *
+ 	if (!string_in_list(h->controllers, "cpuset"))
+ 		return true;
+ 
+-	cgname += strspn(cgname, "/");
+-
+ 	slash = strchr(cgname, '/');
+ 
+ 	if (slash != NULL) {
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index ff5cefc..7a70bca 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -1281,7 +1281,13 @@ static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
+ 
+ #ifdef HAVE_ISULAD
+ 	if (systemd != NULL && !strcmp(systemd, "true")) {
+-		ret = mount(path, path, "", MS_BIND, NULL);
++		__do_free char *fallback_path = NULL;
++		if (path) {
++			fallback_path = must_make_path(path, "/dev", NULL);
++		} else {
++			fallback_path = must_make_path("dev", NULL);
++		}
++		ret = mount(fallback_path, fallback_path, "", MS_BIND, NULL);
+ #else
+ 	if (can_use_mount_api()) {
+ 		fd_fs = fs_prepare("tmpfs", -EBADF, "", 0, 0);
+@@ -2349,7 +2355,18 @@ static int lxc_setup_console(const struct lxc_handler *handler,
+ 	 * setup on its console ie. the pty allocated in lxc_terminal_setup() so
+ 	 * make sure that that pty is stdin,stdout,stderr.
+ 	 */
++#ifdef HAVE_ISULAD
++	setsid();
++	if (!handler->disable_pty && handler->conf->console.pty >= 0) {
++		/* isulad:make the given terminal as controlling terminal to avoid warning
++		* sh: cannot set terminal process group (-1): Inappropriate ioctl for device
++		* sh: no job control in this shell */
++		if (ioctl(handler->conf->console.pty, TIOCSCTTY, NULL) < 0) {
++			return syserror("Faild to make the given terminal the controlling terminal of the calling process");
++		}
++#else
+ 	if (console->pty >= 0) {
++#endif
+ 		if (handler->daemonize || !handler->conf->is_execute)
+ 			ret = set_stdfds(console->pty);
+ 		else
+@@ -4678,20 +4695,21 @@ int lxc_setup(struct lxc_handler *handler)
+ #endif
+ 
+ 	ret = lxc_rootfs_prepare_child(handler);
++	if (ret < 0)
++		return syserror("Failed to prepare rootfs");
++
++
++	ret = lxc_setup_rootfs_prepare_root(lxc_conf, name, lxcpath);
+ 	if (ret < 0)
+ #ifdef HAVE_ISULAD
+ 	{
+ 		lxc_write_error_message(lxc_conf->errpipe1, "%s:%d: failed to setup rootfs %s.",
+ 				__FILE__, __LINE__, lxc_conf->rootfs.path);
+-		return syserror("Failed to prepare rootfs");
++		return log_error(-1, "Failed to setup rootfs");
+ 	}
+ #else
+-		return syserror("Failed to prepare rootfs");
+-#endif
+-
+-	ret = lxc_setup_rootfs_prepare_root(lxc_conf, name, lxcpath);
+-	if (ret < 0)
+ 		return log_error(-1, "Failed to setup rootfs");
++#endif
+ 
+ 	if (handler->nsfdLXC_NS_UTS == -EBADF) {
+ 		ret = setup_utsname(lxc_conf->utsname);
+@@ -4820,9 +4838,6 @@ int lxc_setup(struct lxc_handler *handler)
+ 			return log_error(-1, "Failed to mount transient procfs instance for LSMs");
+ 	}
+ 
+-	if (setup_rootfs_mountopts(&lxc_conf->rootfs)) {
+-			return log_error(-1, "failed to set rootfs for '%s'", name);
+-	}
+ 	if (lxc_conf->rootfs.path != NULL && setup_dev) {
+ 		ret = lxc_setup_devpts_child(handler);
+ 		if (ret < 0) {
+@@ -4866,6 +4881,12 @@ int lxc_setup(struct lxc_handler *handler)
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to pivot root into rootfs");
+ 
++#ifdef HAVE_ISULAD
++	if (setup_rootfs_mountopts(&lxc_conf->rootfs)) {
++		return log_error(-1, "failed to set rootfs for '%s'", name);
++	}
++#endif
++
+ 	ret = make_shmount_dependent_mount(lxc_conf);
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to turn mount tunnel \"%s\" into dependent mount",
+@@ -6926,28 +6947,18 @@ int parse_propagationopts(const char *mntopts, unsigned long *pflags)
+ // isulad: setup rootfs mountopts
+ static int setup_rootfs_mountopts(const struct lxc_rootfs *rootfs)
+ {
+-	unsigned long mflags, mntflags, pflags;
+-	__do_free char *mntdata = NULL;
++	unsigned long mflags;
+ 
+-	if(!rootfs || !rootfs->mnt_opts.raw_options)
++	if(!rootfs || !(rootfs->mnt_opts.mnt_flags & MS_RDONLY))
+ 		return 0;
+ 
+-	if (parse_mntopts_legacy(rootfs->mnt_opts.raw_options, &mntflags, &mntdata) < 0) {
++	mflags = add_required_remount_flags("/", NULL, MS_BIND | MS_REC | rootfs->mnt_opts.mnt_flags |
++										rootfs->mnt_opts.prop_flags | MS_REMOUNT);
++	DEBUG("remounting / as readonly");
++	if (mount("/", "/", NULL, mflags, 0) < 0) {
++		SYSERROR("Failed to make / readonly.");
+ 		return -1;
+ 	}
+-
+-	if (parse_propagationopts(rootfs->mnt_opts.raw_options, &pflags) < 0) {
+-		return -EINVAL;
+-	}
+-
+-	if (mntflags & MS_RDONLY) {
+-		mflags = add_required_remount_flags("/", NULL, MS_BIND | MS_REC | mntflags | pflags | MS_REMOUNT);
+-		DEBUG("remounting / as readonly");
+-		if (mount("/", "/", NULL, mflags, 0) < 0) {
+-			SYSERROR("Failed to make / readonly.");
+-			return -1;
+-		}
+-	}
+ 	return 0;
+ }
+ 
+diff --git a/src/lxc/confile.c b/src/lxc/confile.c
+index ae1a264..aa5c790 100644
+--- a/src/lxc/confile.c
++++ b/src/lxc/confile.c
+@@ -2010,14 +2010,19 @@ static int set_config_cgroup_dir(const char *key, const char *value,
+ 
+ 	if (lxc_config_value_empty(value))
+ 		return clr_config_cgroup_dir(key, lxc_conf, NULL);
+-#ifndef HAVE_ISULAD
++
++#ifdef HAVE_ISULAD
++	// convert value from "/isulad" to "isulad"
++	return set_config_path_item(&lxc_conf->cgroup_meta.dir, value + strspn(value, "/"));
++#else
+ 	if (abspath(value))
+ 		return syserror_set(-EINVAL, "%s paths may not be absolute", key);
+ 
+ 	if (dotdot(value))
+ 		return syserror_set(-EINVAL, "%s paths may not walk upwards via \"../\"", key);
+-#endif
++
+ 	return set_config_path_item(&lxc_conf->cgroup_meta.dir, value);
++#endif
+ }
+ 
+ static int set_config_cgroup_monitor_dir(const char *key, const char *value,
+diff --git a/src/lxc/start.c b/src/lxc/start.c
+index a7bc2e6..b1ccdcb 100644
+--- a/src/lxc/start.c
++++ b/src/lxc/start.c
+@@ -1566,43 +1566,6 @@ static int do_start(void *data)
+ 		DEBUG("Set PR_SET_NO_NEW_PRIVS to block execve() gainable privileges");
+ 	}
+ 
+-#ifdef HAVE_ISULAD
+-	/* isulad: dup2 pipe00 to container stdin, pipe11 to container stdout, pipe21 to container stderr */
+-	if (handler->disable_pty) {
+-		if (handler->conf->console.pipes01 >= 0) {
+-			close(handler->conf->console.pipes01);
+-			handler->conf->console.pipes01 = -1;
+-		}
+-
+-		if (handler->conf->console.pipes00 >= 0) {
+-			ret = dup2(handler->conf->console.pipes00, STDIN_FILENO);
+-			if (ret < 0)
+-				goto out_warn_father;
+-		}
+-
+-		if (handler->conf->console.pipes10 >= 0) {
+-			close(handler->conf->console.pipes10);
+-			handler->conf->console.pipes10 = -1;
+-		}
+-
+-		if (handler->conf->console.pipes11 >= 0) {
+-			ret = dup2(handler->conf->console.pipes11, STDOUT_FILENO);
+-			if (ret < 0)
+-				goto out_warn_father;
+-		}
+-		if (handler->conf->console.pipes20 >= 0) {
+-			close(handler->conf->console.pipes20);
+-			handler->conf->console.pipes20 = -1;
+-		}
+-
+-		if (handler->conf->console.pipes21 >= 0) {
+-			ret = dup2(handler->conf->console.pipes21, STDERR_FILENO);
+-			if (ret < 0)
+-				goto out_warn_father;
+-		}
+-	}
+-#endif
+-
+ 	/* If we mounted a temporary proc, then unmount it now. */
+ 	tmp_proc_unmount(handler->conf);
+ 
+@@ -1639,7 +1602,10 @@ static int do_start(void *data)
+ 
+ 	close_prot_errno_disarm(devnull_fd);
+ 
++#ifndef HAVE_ISULAD
++	// setsid in lxc_setup() -> lxc_setup_console()
+ 	setsid();
++#endif
+ 
+ 	if (handler->conf->init_cwd) {
+ #ifdef HAVE_ISULAD
+@@ -1669,6 +1635,44 @@ static int do_start(void *data)
+ 		goto out_warn_father;
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	/* close pipes after sync fds */
++	/* isulad: dup2 pipe00 to container stdin, pipe11 to container stdout, pipe21 to container stderr */
++	if (handler->disable_pty) {
++		if (handler->conf->console.pipes01 >= 0) {
++			close(handler->conf->console.pipes01);
++			handler->conf->console.pipes01 = -1;
++		}
++
++		if (handler->conf->console.pipes00 >= 0) {
++			ret = dup2(handler->conf->console.pipes00, STDIN_FILENO);
++			if (ret < 0)
++				goto out_warn_father;
++		}
++
++		if (handler->conf->console.pipes10 >= 0) {
++			close(handler->conf->console.pipes10);
++			handler->conf->console.pipes10 = -1;
++		}
++
++		if (handler->conf->console.pipes11 >= 0) {
++			ret = dup2(handler->conf->console.pipes11, STDOUT_FILENO);
++			if (ret < 0)
++				goto out_warn_father;
++		}
++		if (handler->conf->console.pipes20 >= 0) {
++			close(handler->conf->console.pipes20);
++			handler->conf->console.pipes20 = -1;
++		}
++
++		if (handler->conf->console.pipes21 >= 0) {
++			ret = dup2(handler->conf->console.pipes21, STDERR_FILENO);
++			if (ret < 0)
++				goto out_warn_father;
++		}
++	}
++#endif
++
+ 	if (!lxc_sync_wait_parent(handler, START_SYNC_READY_START))
+ 		goto out_warn_father;
+ 
+diff --git a/src/lxc/storage/dir.c b/src/lxc/storage/dir.c
+index 09e08ad..57e0f04 100644
+--- a/src/lxc/storage/dir.c
++++ b/src/lxc/storage/dir.c
+@@ -178,6 +178,9 @@ int dir_mount(struct lxc_storage *bdev)
+ 					    true);
+ 		}
+ 	} else {
++#ifdef HAVE_ISULAD
++		ret = mount(source, target, "bind", MS_BIND | MS_REC | (mnt_opts->mnt_flags & ~MS_RDONLY) | mnt_opts->prop_flags, mnt_opts->data);
++#else
+ 		ret = mount(source, target, "bind", MS_BIND | MS_REC | mnt_opts->mnt_flags | mnt_opts->prop_flags, mnt_opts->data);
+ 		if (!ret && (mnt_opts->mnt_flags & MS_RDONLY)) {
+ 			unsigned long mflags;
+@@ -194,6 +197,7 @@ int dir_mount(struct lxc_storage *bdev)
+ 			else
+ 				TRACE("Remounted \"%s\" on \"%s\" read-only", source, target);
+ 		}
++#endif
+ 	}
+ 	if (ret < 0)
+ 		return syserror_set(ret, "Failed to mount \"%s\" onto \"%s\"", source, target);
+diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
+index de7ea4f..acf6785 100644
+--- a/src/lxc/terminal.c
++++ b/src/lxc/terminal.c
+@@ -673,8 +673,10 @@ static int do_isulad_io(int fd, struct lxc_terminal *terminal)
+ 			TRACE("closed stdin pipe of container stdin");
+ 		} else {
+ 			// other fd should break io loop
++			close(fd);
+ 			return -1;
+ 		}
++		close(fd);
+ 		return 0;
+ 	}
+ 
+@@ -863,7 +865,8 @@ static int lxc_terminal_ptx_io(struct lxc_terminal *terminal)
+ 
+ #ifdef HAVE_ISULAD
+ 	/* isulad: forward data to fifos */
+-	lxc_forward_data_to_fifo(&terminal->fifos, fd == terminal->pipes20, buf, r);
++	/* fd is terminal->ptx and cannot be the err_fd */
++	lxc_forward_data_to_fifo(&terminal->fifos, false, buf, r);
+ #endif
+ 
+ 	/* write to terminal ringbuffer */
+@@ -1768,7 +1771,7 @@ int lxc_terminal_add_fifos(struct lxc_conf *conf, const char *fifonames)
+ 	}
+ 
+ 	if (lxc_mainloop_add_handler(terminal->descr, fifofd_in,
+-	                             lxc_terminal_ptx_cb, default_cleanup_handler, terminal, "fifofd_in")) {
++	                             isulad_io_handler, default_cleanup_handler, terminal, "isulad_io_handler")) {
+ 		ERROR("console fifo not added to mainloop");
+ 		lxc_terminal_delete_fifo(fifofd_in, &terminal->fifos);
+ 		ret = -1;
+@@ -1933,6 +1936,41 @@ int lxc_devpts_terminal(int devpts_fd, int *ret_ptx, int *ret_pty,
+ 	return 0;
+ }
+ 
++#ifdef HAVE_ISULAD
++static int lxc_terminal_create_default(struct lxc_conf *conf, struct lxc_terminal *terminal)
++{
++	int ret;
++	/* isulad: open default fifos */
++	ret = lxc_terminal_fifo_default(terminal);
++	if (ret < 0) {
++		ERROR("Failed to allocate fifo terminal");
++		return -ENODEV;
++	}
++
++	if (terminal->disable_pty) {
++		/* isulad: create 3 pipes */
++		/* for stdin */
++		if (pipe2(terminal->pipes0, O_CLOEXEC)) {
++			ERROR("Failed to create stdin pipe");
++			return -ENODEV;
++		}
++
++		/* for stdout */
++		if (pipe2(terminal->pipes1, O_CLOEXEC)) {
++			ERROR("Failed to create stdout pipe");
++			return -ENODEV;
++		}
++		/* for stderr */
++		if (pipe2(terminal->pipes2, O_CLOEXEC)) {
++			ERROR("Failed to create stderr pipe");
++			return -ENODEV;
++		}
++
++	}
++	return 0;
++}
++#endif
++
+ int lxc_terminal_parent(struct lxc_conf *conf)
+ {
+ 	struct lxc_terminal *console = &conf->console;
+@@ -1941,6 +1979,13 @@ int lxc_terminal_parent(struct lxc_conf *conf)
+ 	if (!wants_console(&conf->console))
+ 		return 0;
+ 
++#ifdef HAVE_ISULAD
++	ret = lxc_terminal_create_default(conf, console);
++	if (ret < 0) {
++		return ret;
++	}
++#endif
++
+ 	/* Allocate console from the container's devpts. */
+ 	if (conf->pty_max > 1)
+ 		return 0;
+@@ -1993,45 +2038,24 @@ static int lxc_terminal_create_native(const char *name, const char *lxcpath,
+ int lxc_terminal_create(const char *name, const char *lxcpath,
+ 			struct lxc_conf *conf, struct lxc_terminal *terminal)
+ {
+-#ifndef HAVE_ISULAD
+-	if (!lxc_terminal_create_native(name, lxcpath, terminal))
+-		return 0;
+-#else
+-	int ret;
+-	/* isulad: open default fifos */
+-	ret = lxc_terminal_fifo_default(terminal);
+-	if (ret < 0) {
+-		ERROR("Failed to allocate fifo terminal");
++#ifdef HAVE_ISULAD
++	int ret = lxc_terminal_create_default(conf, terminal);
++	if (ret != 0) {
+ 		lxc_terminal_delete(terminal);
+-		return -ENODEV;
++		return ret;
+ 	}
+ 
+-	if (terminal->disable_pty) {
+-		/* isulad: create 3 pipes */
+-		/* for stdin */
+-		if (pipe2(terminal->pipes0, O_CLOEXEC)) {
+-			ERROR("Failed to create stdin pipe");
+-			lxc_terminal_delete(terminal);
+-			return -ENODEV;
+-		}
++	if (!terminal->disable_pty) {
++		return lxc_terminal_create_foreign(conf, terminal);
++	}
+ 
+-		/* for stdout */
+-		if (pipe2(terminal->pipes1, O_CLOEXEC)) {
+-			ERROR("Failed to create stdout pipe");
+-			lxc_terminal_delete(terminal);
+-			return -ENODEV;
+-		}
+-		/* for stderr */
+-		if (pipe2(terminal->pipes2, O_CLOEXEC)) {
+-			ERROR("Failed to create stderr pipe");
+-			lxc_terminal_delete(terminal);
+-			return -ENODEV;
+-		}
++	return 0;
++#else
++	if (!lxc_terminal_create_native(name, lxcpath, terminal))
+ 		return 0;
+-	}
+-#endif
+ 
+ 	return lxc_terminal_create_foreign(conf, terminal);
++#endif
+ }
+ 
+ int lxc_terminal_setup(struct lxc_conf *conf)
+-- 
+2.25.1
+

_service:tar_scm:0008-refactor-patch-code-of-json.patch Deleted

@@ -1,5513 +0,0 @@
-From 4c68aefb92800112f48aa73a55f80b368b09c69f Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Wed, 20 Jul 2022 11:00:13 +0800
-Subject: PATCH refactor patch code of json
-
-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
----
- src/lxc/cgroups/isulad_cgfsng.c  | 3223 ++++++++++++++++++++++++++++++
- src/lxc/json/defs.c              |  205 ++
- src/lxc/json/defs.h              |   37 +
- src/lxc/json/json_common.c       | 1153 +++++++++++
- src/lxc/json/json_common.h       |  185 ++
- src/lxc/json/logger_json_file.c  |  246 +++
- src/lxc/json/logger_json_file.h  |   45 +
- src/lxc/json/oci_runtime_hooks.c |   52 +
- src/lxc/json/oci_runtime_hooks.h |   15 +
- src/lxc/json/oci_runtime_spec.c  |  195 ++
- src/lxc/json/oci_runtime_spec.h  |   37 +
- src/lxc/json/read-file.h         |   11 +
- 12 files changed, 5404 insertions(+)
- create mode 100644 src/lxc/cgroups/isulad_cgfsng.c
- create mode 100644 src/lxc/json/defs.c
- create mode 100644 src/lxc/json/defs.h
- create mode 100755 src/lxc/json/json_common.c
- create mode 100755 src/lxc/json/json_common.h
- create mode 100644 src/lxc/json/logger_json_file.c
- create mode 100644 src/lxc/json/logger_json_file.h
- create mode 100644 src/lxc/json/oci_runtime_hooks.c
- create mode 100644 src/lxc/json/oci_runtime_hooks.h
- create mode 100644 src/lxc/json/oci_runtime_spec.c
- create mode 100644 src/lxc/json/oci_runtime_spec.h
- create mode 100644 src/lxc/json/read-file.h
-
-diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c
-new file mode 100644
-index 0000000..8a9656a
---- /dev/null
-+++ b/src/lxc/cgroups/isulad_cgfsng.c
-@@ -0,0 +1,3223 @@
-+/******************************************************************************
-+ * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved.
-+ * Author: lifeng
-+ * Create: 2020-11-02
-+ * Description: provide container definition
-+ * lxc: linux Container library
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+  ******************************************************************************/
-+
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE 1
-+#endif
-+#include <ctype.h>
-+#include <dirent.h>
-+#include <errno.h>
-+#include <grp.h>
-+#include <linux/kdev_t.h>
-+#include <linux/types.h>
-+#include <poll.h>
-+#include <signal.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+#include "af_unix.h"
-+#include "caps.h"
-+#include "cgroup.h"
-+#include "cgroup2_devices.h"
-+#include "cgroup_utils.h"
-+#include "commands.h"
-+#include "conf.h"
-+#include "config.h"
-+#include "log.h"
-+#include "macro.h"
-+#include "mainloop.h"
-+#include "memory_utils.h"
-+#include "storage/storage.h"
-+#include "utils.h"
-+
-+#ifndef HAVE_STRLCPY
-+#include "include/strlcpy.h"
-+#endif
-+
-+#ifndef HAVE_STRLCAT
-+#include "include/strlcat.h"
-+#endif
-+
-+lxc_log_define(isulad_cgfsng, cgroup);
-+
-+/* Given a pointer to a null-terminated array of pointers, realloc to add one
-+ * entry, and point the new entry to NULL. Do not fail. Return the index to the
-+ * second-to-last entry - that is, the one which is now available for use
-+ * (keeping the list null-terminated).
-+ */
-+static int append_null_to_list(void ***list)
-+{
-+	int newentry = 0;
-+
-+	if (*list)
-+		for (; (*list)newentry; newentry++)
-+			;
-+
-+	*list = must_realloc(*list, (newentry + 2) * sizeof(void **));
-+	(*list)newentry + 1 = NULL;
-+	return newentry;
-+}
-+
-+/* Given a null-terminated array of strings, check whether @entry is one of the
-+ * strings.
-+ */
-+static bool string_in_list(char **list, const char *entry)
-+{
-+	if (!list)
-+		return false;
-+
-+	for (int i = 0; listi; i++)
-+		if (strcmp(listi, entry) == 0)
-+			return true;
-+
-+	return false;
-+}
-+
-+/* Return a copy of @entry prepending "name=", i.e.  turn "systemd" into
-+ * "name=systemd". Do not fail.
-+ */
-+static char *cg_legacy_must_prefix_named(char *entry)
-+{
-+	size_t len;
-+	char *prefixed;
-+
-+	len = strlen(entry);
-+	prefixed = must_realloc(NULL, len + 6);
-+
-+	memcpy(prefixed, "name=", STRLITERALLEN("name="));
-+	memcpy(prefixed + STRLITERALLEN("name="), entry, len);
-+	prefixedlen + 5 = '\0';
-+
-+	return prefixed;
-+}
-+
-+/* Append an entry to the clist. Do not fail. @clist must be NULL the first time
-+ * we are called.
-+ *
-+ * We also handle named subsystems here. Any controller which is not a kernel
-+ * subsystem, we prefix "name=". Any which is both a kernel and named subsystem,
-+ * we refuse to use because we're not sure which we have here.
-+ * (TODO: We could work around this in some cases by just remounting to be
-+ * unambiguous, or by comparing mountpoint contents with current cgroup.)
-+ *
-+ * The last entry will always be NULL.
-+ */
-+static void must_append_controller(char **klist, char **nlist, char ***clist,
-+				   char *entry)
-+{
-+	int newentry;
-+	char *copy;
-+
-+	if (string_in_list(klist, entry) && string_in_list(nlist, entry)) {
-+		ERROR("Refusing to use ambiguous controller \"%s\"", entry);
-+		ERROR("It is both a named and kernel subsystem");
-+		return;
-+	}
-+
-+	newentry = append_null_to_list((void ***)clist);
-+
-+	if (strncmp(entry, "name=", 5) == 0)
-+		copy = must_copy_string(entry);
-+	else if (string_in_list(klist, entry))
-+		copy = must_copy_string(entry);
-+	else
-+		copy = cg_legacy_must_prefix_named(entry);
-+
-+	(*clist)newentry = copy;
-+}
-+
-+/* Given a handler's cgroup data, return the struct hierarchy for the controller
-+ * @c, or NULL if there is none.
-+ */
-+struct hierarchy *get_hierarchy(struct cgroup_ops *ops, const char *controller)
-+{
-+	if (!ops->hierarchies)
-+		return log_trace_errno(NULL, errno, "There are no useable cgroup controllers");
-+
-+	for (int i = 0; ops->hierarchiesi; i++) {
-+		if (!controller) {
-+			/* This is the empty unified hierarchy. */
-+			if (ops->hierarchiesi->controllers &&
-+			    !ops->hierarchiesi->controllers0)
-+				return ops->hierarchiesi;
-+			continue;
-+		} else if (pure_unified_layout(ops) &&
-+			   strcmp(controller, "devices") == 0) {
-+			if (ops->unified->bpf_device_controller)
-+				return ops->unified;
-+			break;
-+		}
-+
-+		if (string_in_list(ops->hierarchiesi->controllers, controller))
-+			return ops->hierarchiesi;
-+	}
-+
-+	if (controller)
-+		WARN("There is no useable %s controller", controller);
-+	else
-+		WARN("There is no empty unified cgroup hierarchy");
-+
-+	return ret_set_errno(NULL, ENOENT);
-+}
-+
-+#define BATCH_SIZE 50
-+static void batch_realloc(char **mem, size_t oldlen, size_t newlen)
-+{
-+	int newbatches = (newlen / BATCH_SIZE) + 1;
-+	int oldbatches = (oldlen / BATCH_SIZE) + 1;
-+
-+	if (!*mem || newbatches > oldbatches)
-+		*mem = must_realloc(*mem, newbatches * BATCH_SIZE);
-+}
-+
-+static void append_line(char **dest, size_t oldlen, char *new, size_t newlen)
-+{
-+	size_t full = oldlen + newlen;
-+
-+	batch_realloc(dest, oldlen, full + 1);
-+
-+	memcpy(*dest + oldlen, new, newlen + 1);
-+}
-+
-+/* Slurp in a whole file */
-+static char *read_file(const char *fnam)
-+{
-+	__do_free char *buf = NULL, *line = NULL;
-+	__do_fclose FILE *f = NULL;
-+	size_t len = 0, fulllen = 0;
-+	int linelen;
-+
-+	f = fopen(fnam, "re");
-+	if (!f)
-+		return NULL;
-+
-+	while ((linelen = getline(&line, &len, f)) != -1) {
-+		append_line(&buf, fulllen, line, linelen);
-+		fulllen += linelen;
-+	}
-+
-+	return move_ptr(buf);
-+}
-+
-+static inline bool is_unified_hierarchy(const struct hierarchy *h)
-+{
-+	return h->version == CGROUP2_SUPER_MAGIC;
-+}
-+
-+/* Given two null-terminated lists of strings, return true if any string is in
-+ * both.
-+ */
-+static bool controller_lists_intersect(char **l1, char **l2)
-+{
-+	if (!l1 || !l2)
-+		return false;
-+
-+	for (int i = 0; l1i; i++)
-+		if (string_in_list(l2, l1i))
-+			return true;
-+
-+	return false;
-+}
-+
-+/* For a null-terminated list of controllers @clist, return true if any of those
-+ * controllers is already listed the null-terminated list of hierarchies @hlist.
-+ * Realistically, if one is present, all must be present.
-+ */
-+static bool controller_list_is_dup(struct hierarchy **hlist, char **clist)
-+{
-+	if (!hlist)
-+		return false;
-+
-+	for (int i = 0; hlisti; i++)
-+		if (controller_lists_intersect(hlisti->controllers, clist))
-+			return true;
-+
-+	return false;
-+}
-+
-+/* Return true if the controller @entry is found in the null-terminated list of
-+ * hierarchies @hlist.
-+ */
-+static bool controller_found(struct hierarchy **hlist, char *entry)
-+{
-+	if (!hlist)
-+		return false;
-+
-+	for (int i = 0; hlisti; i++)
-+		if (string_in_list(hlisti->controllers, entry))
-+			return true;
-+
-+	return false;
-+}
-+
-+/* Return true if all of the controllers which we require have been found.  The
-+ * required list is  freezer and anything in lxc.cgroup.use.
-+ */
-+static bool all_controllers_found(struct cgroup_ops *ops)
-+{
-+	struct hierarchy **hlist;
-+
-+	if (!ops->cgroup_use)
-+		return true;
-+
-+	hlist = ops->hierarchies;
-+	for (char **cur = ops->cgroup_use; cur && *cur; cur++)
-+		if (!controller_found(hlist, *cur))
-+			return log_error(false, "No %s controller mountpoint found", *cur);
-+
-+	return true;
-+}
-+
-+/* Get the controllers from a mountinfo line There are other ways we could get
-+ * this info. For lxcfs, field 3 is /cgroup/controller-list. For cgroupfs, we
-+ * could parse the mount options. But we simply assume that the mountpoint must
-+ * be /sys/fs/cgroup/controller-list
-+ */
-+static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
-+					int type)
-+{
-+	/* The fourth field is /sys/fs/cgroup/comma-delimited-controller-list
-+	 * for legacy hierarchies.
-+	 */
-+	__do_free_string_list char **aret = NULL;
-+	int i;
-+	char *p2, *tok;
-+	char *p = line, *sep = ",";
-+
-+	for (i = 0; i < 4; i++) {
-+		p = strchr(p, ' ');
-+		if (!p)
-+			return NULL;
-+		p++;
-+	}
-+
-+	/* Note, if we change how mountinfo works, then our caller will need to
-+	 * verify /sys/fs/cgroup/ in this field.
-+	 */
-+	if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0)
-+		return log_warn(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p);
-+
-+	p += 15;
-+	p2 = strchr(p, ' ');
-+	if (!p2)
-+		return log_error(NULL, "Corrupt mountinfo");
-+	*p2 = '\0';
-+
-+	if (type == CGROUP_SUPER_MAGIC) {
-+		__do_free char *dup = NULL;
-+
-+		/* strdup() here for v1 hierarchies. Otherwise
-+		 * lxc_iterate_parts() will destroy mountpoints such as
-+		 * "/sys/fs/cgroup/cpu,cpuacct".
-+		 */
-+		dup = must_copy_string(p);
-+		if (!dup)
-+			return NULL;
-+
-+		lxc_iterate_parts (tok, dup, sep)
-+			must_append_controller(klist, nlist, &aret, tok);
-+	}
-+	*p2 = ' ';
-+
-+	return move_ptr(aret);
-+}
-+
-+static char **cg_unified_make_empty_controller(void)
-+{
-+	__do_free_string_list char **aret = NULL;
-+	int newentry;
-+
-+	newentry = append_null_to_list((void ***)&aret);
-+	aretnewentry = NULL;
-+	return move_ptr(aret);
-+}
-+
-+static char **cg_unified_get_controllers(const char *file)
-+{
-+	__do_free char *buf = NULL;
-+	__do_free_string_list char **aret = NULL;
-+	char *sep = " \t\n";
-+	char *tok;
-+
-+	buf = read_file(file);
-+	if (!buf)
-+		return NULL;
-+
-+	lxc_iterate_parts(tok, buf, sep) {
-+		int newentry;
-+		char *copy;
-+
-+		newentry = append_null_to_list((void ***)&aret);
-+		copy = must_copy_string(tok);
-+		aretnewentry = copy;
-+	}
-+
-+	return move_ptr(aret);
-+}
-+
-+static struct hierarchy *add_hierarchy(struct hierarchy ***h, char **clist, char *mountpoint,
-+				       char *container_base_path, int type)
-+{
-+	struct hierarchy *new;
-+	int newentry;
-+
-+	new = zalloc(sizeof(*new));
-+	new->controllers = clist;
-+	new->mountpoint = mountpoint;
-+	new->container_base_path = container_base_path;
-+	new->version = type;
-+	new->cgfd_con = -EBADF;
-+	new->cgfd_mon = -EBADF;
-+
-+	newentry = append_null_to_list((void ***)h);
-+	(*h)newentry = new;
-+	return new;
-+}
-+
-+/* Get a copy of the mountpoint from @line, which is a line from
-+ * /proc/self/mountinfo.
-+ */
-+static char *cg_hybrid_get_mountpoint(char *line)
-+{
-+	char *p = line, *sret = NULL;
-+	size_t len;
-+	char *p2;
-+
-+	for (int i = 0; i < 4; i++) {
-+		p = strchr(p, ' ');
-+		if (!p)
-+			return NULL;
-+		p++;
-+	}
-+
-+	if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0)
-+		return NULL;
-+
-+	p2 = strchr(p + 15, ' ');
-+	if (!p2)
-+		return NULL;
-+	*p2 = '\0';
-+
-+	len = strlen(p);
-+	sret = must_realloc(NULL, len + 1);
-+	memcpy(sret, p, len);
-+	sretlen = '\0';
-+
-+	return sret;
-+}
-+
-+/* Given a multi-line string, return a null-terminated copy of the current line. */
-+static char *copy_to_eol(char *p)
-+{
-+	char *p2, *sret;
-+	size_t len;
-+
-+	p2 = strchr(p, '\n');
-+	if (!p2)
-+		return NULL;
-+
-+	len = p2 - p;
-+	sret = must_realloc(NULL, len + 1);
-+	memcpy(sret, p, len);
-+	sretlen = '\0';
-+
-+	return sret;
-+}
-+
-+/* cgline: pointer to character after the first ':' in a line in a \n-terminated
-+ * /proc/self/cgroup file. Check whether controller c is present.
-+ */
-+static bool controller_in_clist(char *cgline, char *c)
-+{
-+	__do_free char *tmp = NULL;
-+	char *tok, *eol;
-+	size_t len;
-+
-+	eol = strchr(cgline, ':');
-+	if (!eol)
-+		return false;
-+
-+	len = eol - cgline;
-+	tmp = must_realloc(NULL, len + 1);
-+	memcpy(tmp, cgline, len);
-+	tmplen = '\0';
-+
-+	lxc_iterate_parts(tok, tmp, ",")
-+		if (strcmp(tok, c) == 0)
-+			return true;
-+
-+	return false;
-+}
-+
-+/* @basecginfo is a copy of /proc/$$/cgroup. Return the current cgroup for
-+ * @controller.
-+ */
-+static char *cg_hybrid_get_current_cgroup(char *basecginfo, char *controller,
-+					  int type)
-+{
-+	char *p = basecginfo;
-+
-+	for (;;) {
-+		bool is_cgv2_base_cgroup = false;
-+
-+		/* cgroup v2 entry in "/proc/<pid>/cgroup": "0::/some/path" */
-+		if ((type == CGROUP2_SUPER_MAGIC) && (*p == '0'))
-+			is_cgv2_base_cgroup = true;
-+
-+		p = strchr(p, ':');
-+		if (!p)
-+			return NULL;
-+		p++;
-+
-+		if (is_cgv2_base_cgroup || (controller && controller_in_clist(p, controller))) {
-+			p = strchr(p, ':');
-+			if (!p)
-+				return NULL;
-+			p++;
-+			return copy_to_eol(p);
-+		}
-+
-+		p = strchr(p, '\n');
-+		if (!p)
-+			return NULL;
-+		p++;
-+	}
-+}
-+
-+static void must_append_string(char ***list, char *entry)
-+{
-+	int newentry;
-+	char *copy;
-+
-+	newentry = append_null_to_list((void ***)list);
-+	copy = must_copy_string(entry);
-+	(*list)newentry = copy;
-+}
-+
-+static int get_existing_subsystems(char ***klist, char ***nlist)
-+{
-+	__do_free char *line = NULL;
-+	__do_fclose FILE *f = NULL;
-+	size_t len = 0;
-+
-+	f = fopen("/proc/self/cgroup", "re");
-+	if (!f)
-+		return -1;
-+
-+	while (getline(&line, &len, f) != -1) {
-+		char *p, *p2, *tok;
-+		p = strchr(line, ':');
-+		if (!p)
-+			continue;
-+		p++;
-+		p2 = strchr(p, ':');
-+		if (!p2)
-+			continue;
-+		*p2 = '\0';
-+
-+		/* If the kernel has cgroup v2 support, then /proc/self/cgroup
-+		 * contains an entry of the form:
-+		 *
-+		 *	0::/some/path
-+		 *
-+		 * In this case we use "cgroup2" as controller name.
-+		 */
-+		if ((p2 - p) == 0) {
-+			must_append_string(klist, "cgroup2");
-+			continue;
-+		}
-+
-+		lxc_iterate_parts(tok, p, ",") {
-+			if (strncmp(tok, "name=", 5) == 0)
-+				must_append_string(nlist, tok);
-+			else
-+				must_append_string(klist, tok);
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static char *trim(char *s)
-+{
-+	size_t len;
-+
-+	len = strlen(s);
-+	while ((len > 1) && (slen - 1 == '\n'))
-+		s--len = '\0';
-+
-+	return s;
-+}
-+
-+static void lxc_cgfsng_print_hierarchies(struct cgroup_ops *ops)
-+{
-+	int i;
-+	struct hierarchy **it;
-+
-+	if (!ops->hierarchies) {
-+		TRACE("  No hierarchies found");
-+		return;
-+	}
-+
-+	TRACE("  Hierarchies:");
-+	for (i = 0, it = ops->hierarchies; it && *it; it++, i++) {
-+		int j;
-+		char **cit;
-+
-+		TRACE("  %d: base_cgroup: %s", i, (*it)->container_base_path ? (*it)->container_base_path : "(null)");
-+		TRACE("      mountpoint:  %s", (*it)->mountpoint ? (*it)->mountpoint : "(null)");
-+		TRACE("      controllers:");
-+		for (j = 0, cit = (*it)->controllers; cit && *cit; cit++, j++)
-+			TRACE("      %d: %s", j, *cit);
-+	}
-+}
-+
-+static void lxc_cgfsng_print_basecg_debuginfo(char *basecginfo, char **klist,
-+					      char **nlist)
-+{
-+	int k;
-+	char **it;
-+
-+	TRACE("basecginfo is:");
-+	TRACE("%s", basecginfo);
-+
-+	for (k = 0, it = klist; it && *it; it++, k++)
-+		TRACE("kernel subsystem %d: %s", k, *it);
-+
-+	for (k = 0, it = nlist; it && *it; it++, k++)
-+		TRACE("named subsystem %d: %s", k, *it);
-+}
-+
-+struct generic_userns_exec_data {
-+	struct hierarchy **hierarchies;
-+	const char *container_cgroup;
-+	struct lxc_conf *conf;
-+	uid_t origuid; /* target uid in parent namespace */
-+	char *path;
-+};
-+
-+static int isulad_cgroup_tree_remove(struct hierarchy **hierarchies,
-+			const char *container_cgroup)
-+{
-+	if (!container_cgroup || !hierarchies)
-+		return 0;
-+
-+	for (int i = 0; hierarchiesi; i++) {
-+		struct hierarchy *h = hierarchiesi;
-+		int ret;
-+
-+		if (!h->container_full_path) {
-+			h->container_full_path = must_make_path(h->mountpoint, h->container_base_path, container_cgroup, NULL);
-+		}
-+
-+		ret = lxc_rm_rf(h->container_full_path);
-+		if (ret < 0) {
-+			SYSERROR("Failed to destroy \"%s\"", h->container_full_path);
-+			return -1;
-+		}
-+
-+		free_disarm(h->container_full_path);
-+	}
-+
-+	return 0;
-+}
-+
-+static int isulad_cgroup_tree_remove_wrapper(void *data)
-+{
-+	struct generic_userns_exec_data *arg = data;
-+	uid_t nsuid = (arg->conf->root_nsuid_map != NULL) ? 0 : arg->conf->init_uid;
-+	gid_t nsgid = (arg->conf->root_nsgid_map != NULL) ? 0 : arg->conf->init_gid;
-+	int ret;
-+
-+	if (!lxc_setgroups(0, NULL) && errno != EPERM)
-+		return log_error_errno(-1, errno, "Failed to setgroups(0, NULL)");
-+
-+	ret = setresgid(nsgid, nsgid, nsgid);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to setresgid(%d, %d, %d)",
-+				       (int)nsgid, (int)nsgid, (int)nsgid);
-+
-+	ret = setresuid(nsuid, nsuid, nsuid);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to setresuid(%d, %d, %d)",
-+				       (int)nsuid, (int)nsuid, (int)nsuid);
-+
-+	return isulad_cgroup_tree_remove(arg->hierarchies, arg->container_cgroup);
-+}
-+
-+__cgfsng_ops static bool isulad_cgfsng_payload_destroy(struct cgroup_ops *ops,
-+						struct lxc_handler *handler)
-+{
-+	int ret;
-+
-+	if (!ops) {
-+		ERROR("Called with uninitialized cgroup operations");
-+		return false;
-+	}
-+
-+#ifdef HAVE_ISULAD
-+	if (ops->no_controller) {
-+		DEBUG("no controller found, isgnore isulad_cgfsng_payload_destroy");
-+		return true;
-+	}
-+#endif
-+
-+	if (!ops->hierarchies) {
-+		return false;
-+	}
-+
-+	if (!handler) {
-+		ERROR("Called with uninitialized handler");
-+		return false;
-+	}
-+
-+	if (!handler->conf) {
-+		ERROR("Called with uninitialized conf");
-+		return false;
-+	}
-+
-+#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-+	ret = bpf_program_cgroup_detach(handler->conf->cgroup2_devices);
-+	if (ret < 0)
-+		WARN("Failed to detach bpf program from cgroup");
-+#endif
-+
-+	if (handler->conf && !lxc_list_empty(&handler->conf->id_map)) {
-+		struct generic_userns_exec_data wrap = {
-+			.conf			= handler->conf,
-+			.container_cgroup	= ops->container_cgroup,
-+			.hierarchies		= ops->hierarchies,
-+			.origuid		= 0,
-+		};
-+		ret = userns_exec_1(handler->conf, isulad_cgroup_tree_remove_wrapper,
-+				    &wrap, "cgroup_tree_remove_wrapper");
-+	} else {
-+		ret = isulad_cgroup_tree_remove(ops->hierarchies, ops->container_cgroup);
-+	}
-+	if (ret < 0) {
-+		SYSWARN("Failed to destroy cgroups");
-+		return false;
-+	}
-+
-+	return true;
-+}
-+
-+__cgfsng_ops static void isulad_cgfsng_monitor_destroy(struct cgroup_ops *ops,
-+						struct lxc_handler *handler)
-+{
-+	return;
-+}
-+
-+__cgfsng_ops static inline bool isulad_cgfsng_monitor_create(struct cgroup_ops *ops,
-+						      struct lxc_handler *handler)
-+{
-+	return true;
-+}
-+
-+static bool isulad_copy_parent_file(char *path, char *file)
-+{
-+	int ret;
-+	int len = 0;
-+	char *value = NULL;
-+	char *current = NULL;
-+	char *fpath = NULL;
-+	char *lastslash = NULL;
-+	char oldv;
-+
-+	fpath = must_make_path(path, file, NULL);
-+	current = read_file(fpath);
-+
-+	if (current == NULL) {
-+		SYSERROR("Failed to read file \"%s\"", fpath);
-+		free(fpath);
-+		return false;
-+	}
-+
-+	if (strcmp(current, "\n") != 0) {
-+		free(fpath);
-+		free(current);
-+		return true;
-+	}
-+
-+	free(fpath);
-+	free(current);
-+
-+	lastslash = strrchr(path, '/');
-+	if (lastslash == NULL) {
-+		ERROR("Failed to detect \"/\" in \"%s\"", path);
-+		return false;
-+	}
-+	oldv = *lastslash;
-+	*lastslash = '\0';
-+	fpath = must_make_path(path, file, NULL);
-+	*lastslash = oldv;
-+	len = lxc_read_from_file(fpath, NULL, 0);
-+	if (len <= 0)
-+		goto on_error;
-+
-+	value = must_realloc(NULL, len + 1);
-+	ret = lxc_read_from_file(fpath, value, len);
-+	if (ret != len)
-+		goto on_error;
-+	free(fpath);
-+
-+	fpath = must_make_path(path, file, NULL);
-+	ret = lxc_write_to_file(fpath, value, len, false, 0666);
-+	if (ret < 0)
-+		SYSERROR("Failed to write \"%s\" to file \"%s\"", value, fpath);
-+	free(fpath);
-+	free(value);
-+	return ret >= 0;
-+
-+on_error:
-+	SYSERROR("Failed to read file \"%s\"", fpath);
-+	free(fpath);
-+	free(value);
-+	return false;
-+}
-+
-+static bool build_sub_cpuset_cgroup_dir(char *cgpath)
-+{
-+	int ret;
-+
-+	ret = mkdir_p(cgpath, 0755);
-+	if (ret < 0) {
-+		if (errno != EEXIST) {
-+			SYSERROR("Failed to create directory \"%s\"", cgpath);
-+			return false;
-+		}
-+	}
-+
-+	/* copy parent's settings */
-+	if (!isulad_copy_parent_file(cgpath, "cpuset.cpus")) {
-+		SYSERROR("Failed to copy \"cpuset.cpus\" settings");
-+		return false;
-+	}
-+
-+	/* copy parent's settings */
-+	if (!isulad_copy_parent_file(cgpath, "cpuset.mems")) {
-+		SYSERROR("Failed to copy \"cpuset.mems\" settings");
-+		return false;
-+	}
-+
-+	return true;
-+}
-+
-+static bool isulad_cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *cgname)
-+{
-+	char *cgpath, *slash;
-+	bool sub_mk_success = false;
-+
-+	if (is_unified_hierarchy(h))
-+		return true;
-+
-+	if (!string_in_list(h->controllers, "cpuset"))
-+		return true;
-+
-+	cgname += strspn(cgname, "/");
-+
-+	slash = strchr(cgname, '/');
-+
-+	if (slash != NULL) {
-+		while (slash) {
-+			*slash = '\0';
-+			cgpath = must_make_path(h->mountpoint, h->container_base_path, cgname, NULL);
-+			sub_mk_success = build_sub_cpuset_cgroup_dir(cgpath);
-+			free(cgpath);
-+			*slash = '/';
-+			if (!sub_mk_success) {
-+				return false;
-+			}
-+			slash = strchr(slash + 1, '/');
-+		}
-+	}
-+
-+	cgpath = must_make_path(h->mountpoint, h->container_base_path, cgname, NULL);
-+	sub_mk_success = build_sub_cpuset_cgroup_dir(cgpath);
-+	free(cgpath);
-+	if (!sub_mk_success) {
-+		return false;
-+	}
-+
-+	return true;
-+}
-+
-+static int isulad_mkdir_eexist_on_last(const char *dir, mode_t mode)
-+{
-+	const char *tmp = dir;
-+	const char *orig = dir;
-+
-+	do {
-+		int ret;
-+		size_t cur_len;
-+		char *makeme;
-+
-+		dir = tmp + strspn(tmp, "/");
-+		tmp = dir + strcspn(dir, "/");
-+
-+		errno = ENOMEM;
-+		cur_len = dir - orig;
-+		makeme = strndup(orig, cur_len);
-+		if (!makeme)
-+			return -1;
-+
-+		ret = mkdir(makeme, mode);
-+		if (ret < 0) {
-+			if (errno != EEXIST) {
-+				SYSERROR("Failed to create directory \"%s\"", makeme);
-+				free(makeme);
-+				return -1;
-+			}
-+		}
-+		free(makeme);
-+
-+	} while (tmp != dir);
-+
-+	return 0;
-+}
-+
-+static bool create_path_for_hierarchy(struct hierarchy *h, char *cgname, int errfd)
-+{
-+	int ret;
-+	__do_free char *path = NULL;
-+
-+	path = must_make_path(h->mountpoint, h->container_base_path, cgname, NULL);
-+
-+	if (file_exists(path)) { // it must not already exist
-+		ERROR("Cgroup path \"%s\" already exist.", path);
-+		lxc_write_error_message(errfd, "%s:%d: Cgroup path \"%s\" already exist.",
-+		                        __FILE__, __LINE__, path);
-+		return false;
-+	}
-+
-+	if (!isulad_cg_legacy_handle_cpuset_hierarchy(h, cgname)) {
-+		ERROR("Failed to handle legacy cpuset controller");
-+		return false;
-+	}
-+
-+	ret = isulad_mkdir_eexist_on_last(path, 0755);
-+	if (ret < 0) {
-+		ERROR("Failed to create cgroup \"%s\"", path);
-+		return false;
-+	}
-+
-+	h->cgfd_con = lxc_open_dirfd(path);
-+	if (h->cgfd_con < 0)
-+		return log_error_errno(false, errno, "Failed to open %s", path);
-+
-+	if (h->container_full_path == NULL) {
-+		h->container_full_path = move_ptr(path);
-+	}
-+
-+	return true;
-+}
-+
-+/* isulad: create hierarchies path, if fail, return the error */
-+__cgfsng_ops static inline bool isulad_cgfsng_payload_create(struct cgroup_ops *ops,
-+						      struct lxc_handler *handler)
-+{
-+	int i;
-+	char *container_cgroup = ops->container_cgroup;
-+
-+#ifdef HAVE_ISULAD
-+	if (ops->no_controller) {
-+		DEBUG("no controller found, isgnore isulad_cgfsng_payload_create");
-+		return true;
-+	}
-+#endif
-+
-+	if (!container_cgroup) {
-+		ERROR("cgfsng_create container_cgroup is invalid");
-+		return false;
-+	}
-+
-+	for (i = 0; ops->hierarchiesi; i++) {
-+		if (!create_path_for_hierarchy(ops->hierarchiesi, container_cgroup, ops->errfd)) {
-+			SYSERROR("Failed to create %s", ops->hierarchiesi->container_full_path);
-+			return false;
-+		}
-+	}
-+
-+	return true;
-+}
-+
-+__cgfsng_ops static bool isulad_cgfsng_monitor_enter(struct cgroup_ops *ops,
-+					      struct lxc_handler *handler)
-+{
-+	return true;
-+}
-+
-+__cgfsng_ops static bool isulad_cgfsng_payload_enter(struct cgroup_ops *ops,
-+					      struct lxc_handler *handler)
-+{
-+	int len;
-+	char pidstrINTTYPE_TO_STRLEN(pid_t);
-+
-+	if (!ops)
-+		return ret_set_errno(false, ENOENT);
-+
-+#ifdef HAVE_ISULAD
-+	if (ops->no_controller) {
-+		DEBUG("no controller found, isgnore isulad_cgfsng_payload_enter");
-+		return true;
-+	}
-+#endif
-+
-+	if (!ops->hierarchies)
-+		return true;
-+
-+	if (!ops->container_cgroup)
-+		return ret_set_errno(false, ENOENT);
-+
-+	if (!handler || !handler->conf)
-+		return ret_set_errno(false, EINVAL);
-+
-+	len = snprintf(pidstr, sizeof(pidstr), "%d", handler->pid);
-+
-+	for (int i = 0; ops->hierarchiesi; i++) {
-+		int ret;
-+		char *fullpath;
-+		int retry_count = 0;
-+		int max_retry = 10;
-+
-+		fullpath = must_make_path(ops->hierarchiesi->container_full_path,
-+		                          "cgroup.procs", NULL);
-+retry:
-+		ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666);
-+		if (ret != 0) {
-+			if (retry_count < max_retry) {
-+				SYSERROR("Failed to enter cgroup \"%s\" with retry count:%d", fullpath, retry_count);
-+				(void)isulad_cg_legacy_handle_cpuset_hierarchy(ops->hierarchiesi, ops->container_cgroup);
-+				(void)isulad_mkdir_eexist_on_last(ops->hierarchiesi->container_full_path, 0755);
-+				usleep(100 * 1000); /* 100 millisecond */
-+				retry_count++;
-+				goto retry;
-+			}
-+			SYSERROR("Failed to enter cgroup \"%s\"", fullpath);
-+			free(fullpath);
-+			return false;
-+		}
-+		free(fullpath);
-+	}
-+
-+	return true;
-+}
-+
-+static int fchowmodat(int dirfd, const char *path, uid_t chown_uid,
-+		      gid_t chown_gid, mode_t chmod_mode)
-+{
-+	int ret;
-+
-+	ret = fchownat(dirfd, path, chown_uid, chown_gid,
-+		       AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW);
-+	if (ret < 0)
-+		return log_warn_errno(-1,
-+				      errno, "Failed to fchownat(%d, %s, %d, %d, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )",
-+				      dirfd, path, (int)chown_uid,
-+				      (int)chown_gid);
-+
-+	ret = fchmodat(dirfd, (*path != '\0') ? path : ".", chmod_mode, 0);
-+	if (ret < 0)
-+		return log_warn_errno(-1, errno, "Failed to fchmodat(%d, %s, %d, AT_SYMLINK_NOFOLLOW)",
-+				      dirfd, path, (int)chmod_mode);
-+
-+	return 0;
-+}
-+
-+/* chgrp the container cgroups to container group.  We leave
-+ * the container owner as cgroup owner.  So we must make the
-+ * directories 775 so that the container can create sub-cgroups.
-+ *
-+ * Also chown the tasks and cgroup.procs files.  Those may not
-+ * exist depending on kernel version.
-+ */
-+static int chown_cgroup_wrapper(void *data)
-+{
-+	int ret;
-+	uid_t destuid;
-+	struct generic_userns_exec_data *arg = data;
-+	uid_t nsuid = (arg->conf->root_nsuid_map != NULL) ? 0 : arg->conf->init_uid;
-+	gid_t nsgid = (arg->conf->root_nsgid_map != NULL) ? 0 : arg->conf->init_gid;
-+
-+	if (!lxc_setgroups(0, NULL) && errno != EPERM)
-+		return log_error_errno(-1, errno, "Failed to setgroups(0, NULL)");
-+
-+	ret = setresgid(nsgid, nsgid, nsgid);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to setresgid(%d, %d, %d)",
-+				       (int)nsgid, (int)nsgid, (int)nsgid);
-+
-+	ret = setresuid(nsuid, nsuid, nsuid);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to setresuid(%d, %d, %d)",
-+				       (int)nsuid, (int)nsuid, (int)nsuid);
-+
-+	destuid = get_ns_uid(arg->origuid);
-+	if (destuid == LXC_INVALID_UID)
-+		destuid = 0;
-+
-+	for (int i = 0; arg->hierarchiesi; i++) {
-+		int dirfd = arg->hierarchiesi->cgfd_con;
-+
-+		(void)fchowmodat(dirfd, "", destuid, nsgid, 0775);
-+
-+		/*
-+		 * Failures to chown() these are inconvenient but not
-+		 * detrimental We leave these owned by the container launcher,
-+		 * so that container root can write to the files to attach.  We
-+		 * chmod() them 664 so that container systemd can write to the
-+		 * files (which systemd in wily insists on doing).
-+		 */
-+
-+		if (arg->hierarchiesi->version == CGROUP_SUPER_MAGIC)
-+			(void)fchowmodat(dirfd, "tasks", destuid, nsgid, 0664);
-+
-+		(void)fchowmodat(dirfd, "cgroup.procs", destuid, nsgid, 0664);
-+
-+		if (arg->hierarchiesi->version != CGROUP2_SUPER_MAGIC)
-+			continue;
-+
-+		for (char **p = arg->hierarchiesi->cgroup2_chown; p && *p; p++)
-+			(void)fchowmodat(dirfd, *p, destuid, nsgid, 0664);
-+	}
-+
-+	return 0;
-+}
-+
-+__cgfsng_ops static bool isulad_cgfsng_chown(struct cgroup_ops *ops,
-+				      struct lxc_conf *conf)
-+{
-+	struct generic_userns_exec_data wrap;
-+
-+	if (!ops)
-+		return ret_set_errno(false, ENOENT);
-+
-+	if (!ops->hierarchies)
-+		return true;
-+
-+	if (!ops->container_cgroup)
-+		return ret_set_errno(false, ENOENT);
-+
-+	if (!conf)
-+		return ret_set_errno(false, EINVAL);
-+
-+	if (lxc_list_empty(&conf->id_map))
-+		return true;
-+
-+	wrap.origuid = geteuid();
-+	wrap.path = NULL;
-+	wrap.hierarchies = ops->hierarchies;
-+	wrap.conf = conf;
-+
-+	if (userns_exec_1(conf, chown_cgroup_wrapper, &wrap, "chown_cgroup_wrapper") < 0)
-+		return log_error_errno(false, errno, "Error requesting cgroup chown in new user namespace");
-+
-+	return true;
-+}
-+
-+__cgfsng_ops void isulad_cgfsng_payload_finalize(struct cgroup_ops *ops)
-+{
-+	if (!ops)
-+		return;
-+
-+#ifdef HAVE_ISULAD
-+	if (ops->no_controller) {
-+		DEBUG("no controller found, isgnore isulad_cgfsng_payload_finalize");
-+		return;
-+	}
-+#endif
-+
-+	if (!ops->hierarchies)
-+		return;
-+
-+	for (int i = 0; ops->hierarchiesi; i++) {
-+		struct hierarchy *h = ops->hierarchiesi;
-+		/*
-+		 * we don't keep the fds for non-unified hierarchies around
-+		 * mainly because we don't make use of them anymore after the
-+		 * core cgroup setup is done but also because there are quite a
-+		 * lot of them.
-+		 */
-+		if (!is_unified_hierarchy(h))
-+			close_prot_errno_disarm(h->cgfd_con);
-+	}
-+}
-+
-+/* cgroup-full:* is done, no need to create subdirs */
-+static inline bool cg_mount_needs_subdirs(int type)
-+{
-+	return !(type >= LXC_AUTO_CGROUP_FULL_RO);
-+}
-+
-+/* After $rootfs/sys/fs/container/controller/the/cg/path has been created,
-+ * remount controller ro if needed and bindmount the cgroupfs onto
-+ * control/the/cg/path.
-+ */
-+static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
-+				       char *controllerpath, char *cgpath,
-+				       const char *container_cgroup)
-+{
-+	__do_free char *sourcepath = NULL;
-+	int ret, remount_flags;
-+	int flags = MS_BIND;
-+
-+	if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_MIXED) {
-+		ret = mount(controllerpath, controllerpath, "cgroup", MS_BIND, NULL);
-+		if (ret < 0)
-+			return log_error_errno(-1, errno, "Failed to bind mount \"%s\" onto \"%s\"",
-+					       controllerpath, controllerpath);
-+
-+		remount_flags = add_required_remount_flags(controllerpath,
-+							   controllerpath,
-+							   flags | MS_REMOUNT);
-+		ret = mount(controllerpath, controllerpath, "cgroup",
-+			    remount_flags | MS_REMOUNT | MS_BIND | MS_RDONLY,
-+			    NULL);
-+		if (ret < 0)
-+			return log_error_errno(-1, errno, "Failed to remount \"%s\" ro", controllerpath);
-+
-+		INFO("Remounted %s read-only", controllerpath);
-+	}
-+
-+	sourcepath = must_make_path(h->mountpoint, h->container_base_path,
-+				    container_cgroup, NULL);
-+	if (type == LXC_AUTO_CGROUP_RO)
-+		flags |= MS_RDONLY;
-+
-+	ret = mount(sourcepath, cgpath, "cgroup", flags, NULL);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to mount \"%s\" onto \"%s\"",
-+				       h->controllers0, cgpath);
-+	INFO("Mounted \"%s\" onto \"%s\"", h->controllers0, cgpath);
-+
-+	if (flags & MS_RDONLY) {
-+		remount_flags = add_required_remount_flags(sourcepath, cgpath,
-+							   flags | MS_REMOUNT);
-+		ret = mount(sourcepath, cgpath, "cgroup", remount_flags, NULL);
-+		if (ret < 0)
-+			return log_error_errno(-1, errno, "Failed to remount \"%s\" ro", cgpath);
-+		INFO("Remounted %s read-only", cgpath);
-+	}
-+
-+	INFO("Completed second stage cgroup automounts for \"%s\"", cgpath);
-+	return 0;
-+}
-+
-+/* __cg_mount_direct
-+ *
-+ * Mount cgroup hierarchies directly without using bind-mounts. The main
-+ * uses-cases are mounting cgroup hierarchies in cgroup namespaces and mounting
-+ * cgroups for the LXC_AUTO_CGROUP_FULL option.
-+ */
-+static int __cg_mount_direct(int type, struct hierarchy *h,
-+			     const char *controllerpath)
-+{
-+	 __do_free char *controllers = NULL;
-+	 char *fstype = "cgroup2";
-+	 unsigned long flags = 0;
-+	 int ret;
-+
-+	 flags |= MS_NOSUID;
-+	 flags |= MS_NOEXEC;
-+	 flags |= MS_NODEV;
-+	 flags |= MS_RELATIME;
-+
-+	 if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_FULL_RO)
-+		 flags |= MS_RDONLY;
-+
-+	 if (h->version != CGROUP2_SUPER_MAGIC) {
-+		 controllers = lxc_string_join(",", (const char **)h->controllers, false);
-+		 if (!controllers)
-+			 return -ENOMEM;
-+		 fstype = "cgroup";
-+	}
-+
-+	ret = mount("cgroup", controllerpath, fstype, flags, controllers);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to mount \"%s\" with cgroup filesystem type %s",
-+				       controllerpath, fstype);
-+
-+	DEBUG("Mounted \"%s\" with cgroup filesystem type %s", controllerpath, fstype);
-+	return 0;
-+}
-+
-+static inline int cg_mount_in_cgroup_namespace(int type, struct hierarchy *h,
-+					       const char *controllerpath)
-+{
-+	return __cg_mount_direct(type, h, controllerpath);
-+}
-+
-+static inline int cg_mount_cgroup_full(int type, struct hierarchy *h,
-+				       const char *controllerpath)
-+{
-+	if (type < LXC_AUTO_CGROUP_FULL_RO || type > LXC_AUTO_CGROUP_FULL_MIXED)
-+		return 0;
-+
-+	return __cg_mount_direct(type, h, controllerpath);
-+}
-+
-+__cgfsng_ops static bool isulad_cgfsng_mount(struct cgroup_ops *ops,
-+                                      struct lxc_handler *handler,
-+                                      const char *root, int type)
-+{
-+	int i, ret;
-+	char *tmpfspath = NULL;
-+	char *systemdpath = NULL;
-+	char *unifiedpath = NULL;
-+	bool has_cgns = false, retval = false, wants_force_mount = false;
-+	char **merged = NULL;
-+
-+	if ((type & LXC_AUTO_CGROUP_MASK) == 0)
-+		return true;
-+
-+	if (type & LXC_AUTO_CGROUP_FORCE) {
-+		type &= ~LXC_AUTO_CGROUP_FORCE;
-+		wants_force_mount = true;
-+	}
-+
-+	if (!wants_force_mount) {
-+		if (!lxc_list_empty(&handler->conf->keepcaps))
-+			wants_force_mount = !in_caplist(CAP_SYS_ADMIN, &handler->conf->keepcaps);
-+		else
-+			wants_force_mount = in_caplist(CAP_SYS_ADMIN, &handler->conf->caps);
-+	}
-+
-+	has_cgns = cgns_supported();
-+	if (has_cgns && !wants_force_mount)
-+		return true;
-+
-+	if (type == LXC_AUTO_CGROUP_NOSPEC)
-+		type = LXC_AUTO_CGROUP_MIXED;
-+	else if (type == LXC_AUTO_CGROUP_FULL_NOSPEC)
-+		type = LXC_AUTO_CGROUP_FULL_MIXED;
-+
-+	/* Mount tmpfs */
-+	tmpfspath = must_make_path(root, "/sys/fs/cgroup", NULL);
-+	if (mkdir_p(tmpfspath, 0755) < 0) {
-+		ERROR("Failed to create directory: %s", tmpfspath);
-+		goto on_error;
-+	}
-+
-+        if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
-+                if (has_cgns && wants_force_mount) {
-+                        /*
-+                         * If cgroup namespaces are supported but the container
-+                         * will not have CAP_SYS_ADMIN after it has started we
-+                         * need to mount the cgroups manually.
-+                         */
-+                        return cg_mount_in_cgroup_namespace(type, ops->unified, tmpfspath) == 0;
-+                }
-+
-+                return cg_mount_cgroup_full(type, ops->unified, tmpfspath) == 0;
-+        }
-+
-+	ret = safe_mount(NULL, tmpfspath, "tmpfs",
-+	                 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
-+	                 "size=10240k,mode=755", root, handler->conf->lsm_se_mount_context);
-+	if (ret < 0)
-+		goto on_error;
-+
-+	for (i = 0; ops->hierarchiesi; i++) {
-+		char *controllerpath = NULL;
-+		char *path2 = NULL;
-+		struct hierarchy *h = ops->hierarchiesi;
-+		char *controller = strrchr(h->mountpoint, '/');
-+
-+		if (!controller)
-+			continue;
-+		controller++;
-+
-+		// isulad: symlink subcgroup
-+		if (strchr(controller, ',') != NULL) {
-+			int pret;
-+			pret = lxc_append_string(&merged, controller);
-+			if (pret < 0)
-+				goto on_error;
-+		}
-+
-+		controllerpath = must_make_path(tmpfspath, controller, NULL);
-+		if (dir_exists(controllerpath)) {
-+			free(controllerpath);
-+			continue;
-+		}
-+
-+		ret = mkdir(controllerpath, 0755);
-+		if (ret < 0) {
-+			SYSERROR("Error creating cgroup path: %s", controllerpath);
-+			free(controllerpath);
-+			goto on_error;
-+		}
-+
-+		if (has_cgns && wants_force_mount) {
-+			/* If cgroup namespaces are supported but the container
-+			 * will not have CAP_SYS_ADMIN after it has started we
-+			 * need to mount the cgroups manually.
-+			 */
-+			ret = cg_mount_in_cgroup_namespace(type, h, controllerpath);
-+			free(controllerpath);
-+			if (ret < 0)
-+				goto on_error;
-+
-+			continue;
-+		}
-+
-+		ret = cg_mount_cgroup_full(type, h, controllerpath);
-+		if (ret < 0) {
-+			free(controllerpath);
-+			goto on_error;
-+		}
-+
-+		if (!cg_mount_needs_subdirs(type)) {
-+			free(controllerpath);
-+			continue;
-+		}
-+
-+		// isulad: ignore ops->container_cgroup so we will not see directory lxc after /sys/fs/cgroup/xxx in container,
-+		// isulad: ignore h->container_base_path so we will not see subgroup of /sys/fs/cgroup/xxx/subgroup in container
-+		path2 = must_make_path(controllerpath, NULL);
-+		ret = mkdir_p(path2, 0755);
-+		if (ret < 0) {
-+			free(controllerpath);
-+			free(path2);
-+			goto on_error;
-+		}
-+
-+		ret = cg_legacy_mount_controllers(type, h, controllerpath,
-+		                                  path2, ops->container_cgroup);
-+		free(controllerpath);
-+		free(path2);
-+		if (ret < 0)
-+			goto on_error;
-+	}
-+
-+	// isulad: symlink subcgroup
-+	if (merged) {
-+		char **mc = NULL;
-+		for (mc = merged; *mc; mc++) {
-+			char *token = NULL;
-+			char *copy = must_copy_string(*mc);
-+			lxc_iterate_parts(token, copy, ",") {
-+				int mret;
-+				char *link;
-+				link = must_make_path(tmpfspath, token, NULL);
-+				mret = symlink(*mc, link);
-+				if (mret < 0 && errno != EEXIST) {
-+					SYSERROR("Failed to create link %s for target %s", link, *mc);
-+					free(copy);
-+					free(link);
-+					goto on_error;
-+				}
-+				free(link);
-+			}
-+			free(copy);
-+		}
-+	}
-+
-+
-+	// isulad: remount /sys/fs/cgroup to readonly
-+	if (type == LXC_AUTO_CGROUP_FULL_RO || type == LXC_AUTO_CGROUP_RO) {
-+		ret = mount(tmpfspath, tmpfspath, "bind",
-+		            MS_NOSUID|MS_NODEV|MS_NOEXEC|MS_RELATIME|MS_RDONLY|MS_BIND|MS_REMOUNT, NULL);
-+		if (ret < 0) {
-+			SYSERROR("Failed to remount /sys/fs/cgroup.");
-+			goto on_error;
-+		}
-+	}
-+
-+	// isulad: remount /sys/fs/cgroup/systemd to readwrite for system container
-+	if (handler->conf->systemd != NULL && strcmp(handler->conf->systemd, "true") == 0)
-+	{
-+		unifiedpath = must_make_path(root, "/sys/fs/cgroup/unified", NULL);
-+		if (dir_exists(unifiedpath))
-+		{
-+			ret = umount2(unifiedpath, MNT_DETACH);
-+			if (ret < 0)
-+			{
-+				SYSERROR("Failed to umount /sys/fs/cgroup/unified.");
-+				goto on_error;
-+			}
-+		}
-+
-+		systemdpath = must_make_path(root, "/sys/fs/cgroup/systemd", NULL);
-+		ret = mount(systemdpath, systemdpath, "bind",
-+					MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME | MS_BIND | MS_REMOUNT, NULL);
-+		if (ret < 0)
-+		{
-+			SYSERROR("Failed to remount /sys/fs/cgroup/systemd.");
-+			goto on_error;
-+		}
-+	}
-+
-+	retval = true;
-+
-+on_error:
-+	free(tmpfspath);
-+	if (systemdpath != NULL)
-+	{
-+		free(systemdpath);
-+	}
-+	if (unifiedpath != NULL)
-+	{
-+		free(unifiedpath);
-+	}
-+	lxc_free_array((void **)merged, free);
-+	return retval;
-+}
-+
-+/* Only root needs to escape to the cgroup of its init. */
-+__cgfsng_ops static bool isulad_cgfsng_escape(const struct cgroup_ops *ops,
-+				       struct lxc_conf *conf)
-+{
-+	if (!ops)
-+		return ret_set_errno(false, ENOENT);
-+
-+	if (!ops->hierarchies)
-+		return true;
-+
-+	if (!conf)
-+		return ret_set_errno(false, EINVAL);
-+
-+	if (conf->cgroup_meta.relative || geteuid())
-+		return true;
-+
-+	for (int i = 0; ops->hierarchiesi; i++) {
-+		__do_free char *fullpath = NULL;
-+		int ret;
-+
-+		fullpath =
-+		    must_make_path(ops->hierarchiesi->mountpoint,
-+				   ops->hierarchiesi->container_base_path,
-+				   "cgroup.procs", NULL);
-+		ret = lxc_write_to_file(fullpath, "0", 2, false, 0666);
-+		if (ret != 0)
-+			return log_error_errno(false, errno, "Failed to escape to cgroup \"%s\"", fullpath);
-+	}
-+
-+	return true;
-+}
-+
-+__cgfsng_ops static int isulad_cgfsng_num_hierarchies(struct cgroup_ops *ops)
-+{
-+	int i = 0;
-+
-+	if (!ops)
-+		return ret_set_errno(-1, ENOENT);
-+
-+	if (!ops->hierarchies)
-+		return 0;
-+
-+	for (; ops->hierarchiesi; i++)
-+		;
-+
-+	return i;
-+}
-+
-+__cgfsng_ops static bool isulad_cgfsng_get_hierarchies(struct cgroup_ops *ops, int n,
-+						char ***out)
-+{
-+	int i;
-+
-+	if (!ops)
-+		return ret_set_errno(false, ENOENT);
-+
-+	if (!ops->hierarchies)
-+		return ret_set_errno(false, ENOENT);
-+
-+	/* sanity check n */
-+	for (i = 0; i < n; i++)
-+		if (!ops->hierarchiesi)
-+			return ret_set_errno(false, ENOENT);
-+
-+	*out = ops->hierarchiesi->controllers;
-+
-+	return true;
-+}
-+
-+static bool cg_legacy_freeze(struct cgroup_ops *ops)
-+{
-+	struct hierarchy *h;
-+
-+	h = get_hierarchy(ops, "freezer");
-+	if (!h)
-+		return ret_set_errno(-1, ENOENT);
-+
-+	return lxc_write_openat(h->container_full_path, "freezer.state",
-+				"FROZEN", STRLITERALLEN("FROZEN"));
-+}
-+
-+static int freezer_cgroup_events_cb(int fd, uint32_t events, void *cbdata,
-+				    struct lxc_epoll_descr *descr)
-+{
-+	__do_close int duped_fd = -EBADF;
-+	__do_free char *line = NULL;
-+	__do_fclose FILE *f = NULL;
-+	int state = PTR_TO_INT(cbdata);
-+	size_t len;
-+	const char *state_string;
-+
-+	duped_fd = dup(fd);
-+	if (duped_fd < 0)
-+		return LXC_MAINLOOP_ERROR;
-+
-+	if (lseek(duped_fd, 0, SEEK_SET) < (off_t)-1)
-+		return LXC_MAINLOOP_ERROR;
-+
-+	f = fdopen(duped_fd, "re");
-+	if (!f)
-+		return LXC_MAINLOOP_ERROR;
-+	move_fd(duped_fd);
-+
-+	if (state == 1)
-+		state_string = "frozen 1";
-+	else
-+		state_string = "frozen 0";
-+
-+	while (getline(&line, &len, f) != -1)
-+		if (strncmp(line, state_string, STRLITERALLEN("frozen") + 2) == 0)
-+			return LXC_MAINLOOP_CLOSE;
-+
-+	return LXC_MAINLOOP_CONTINUE;
-+}
-+
-+static int cg_unified_freeze(struct cgroup_ops *ops, int timeout)
-+{
-+	__do_close int fd = -EBADF;
-+	call_cleaner(lxc_mainloop_close) struct lxc_epoll_descr *descr_ptr = NULL;
-+	int ret;
-+	struct lxc_epoll_descr descr;
-+	struct hierarchy *h;
-+
-+	h = ops->unified;
-+	if (!h)
-+		return ret_set_errno(-1, ENOENT);
-+
-+	if (!h->container_full_path)
-+		return ret_set_errno(-1, EEXIST);
-+
-+	if (timeout != 0) {
-+		__do_free char *events_file = NULL;
-+
-+		events_file = must_make_path(h->container_full_path, "cgroup.events", NULL);
-+		fd = open(events_file, O_RDONLY | O_CLOEXEC);
-+		if (fd < 0)
-+			return log_error_errno(-1, errno, "Failed to open cgroup.events file");
-+
-+		ret = lxc_mainloop_open(&descr);
-+		if (ret)
-+			return log_error_errno(-1, errno, "Failed to create epoll instance to wait for container freeze");
-+
-+		/* automatically cleaned up now */
-+		descr_ptr = &descr;
-+
-+		ret = lxc_mainloop_add_handler(&descr, fd, freezer_cgroup_events_cb, INT_TO_PTR((int){1}));
-+		if (ret < 0)
-+			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
-+	}
-+
-+	ret = lxc_write_openat(h->container_full_path, "cgroup.freeze", "1", 1);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
-+
-+	if (timeout != 0 && lxc_mainloop(&descr, timeout))
-+		return log_error_errno(-1, errno, "Failed to wait for container to be frozen");
-+
-+	return 0;
-+}
-+
-+__cgfsng_ops static int isulad_cgfsng_freeze(struct cgroup_ops *ops, int timeout)
-+{
-+	if (!ops->hierarchies)
-+		return ret_set_errno(-1, ENOENT);
-+
-+	if (ops->cgroup_layout != CGROUP_LAYOUT_UNIFIED)
-+		return cg_legacy_freeze(ops);
-+
-+	return cg_unified_freeze(ops, timeout);
-+}
-+
-+static int cg_legacy_unfreeze(struct cgroup_ops *ops)
-+{
-+	struct hierarchy *h;
-+
-+	h = get_hierarchy(ops, "freezer");
-+	if (!h)
-+		return ret_set_errno(-1, ENOENT);
-+
-+	return lxc_write_openat(h->container_full_path, "freezer.state",
-+				"THAWED", STRLITERALLEN("THAWED"));
-+}
-+
-+static int cg_unified_unfreeze(struct cgroup_ops *ops, int timeout)
-+{
-+	__do_close int fd = -EBADF;
-+	call_cleaner(lxc_mainloop_close)struct lxc_epoll_descr *descr_ptr = NULL;
-+	int ret;
-+	struct lxc_epoll_descr descr;
-+	struct hierarchy *h;
-+
-+	h = ops->unified;
-+	if (!h)
-+		return ret_set_errno(-1, ENOENT);
-+
-+	if (!h->container_full_path)
-+		return ret_set_errno(-1, EEXIST);
-+
-+	if (timeout != 0) {
-+		__do_free char *events_file = NULL;
-+
-+		events_file = must_make_path(h->container_full_path, "cgroup.events", NULL);
-+		fd = open(events_file, O_RDONLY | O_CLOEXEC);
-+		if (fd < 0)
-+			return log_error_errno(-1, errno, "Failed to open cgroup.events file");
-+
-+		ret = lxc_mainloop_open(&descr);
-+		if (ret)
-+			return log_error_errno(-1, errno, "Failed to create epoll instance to wait for container unfreeze");
-+
-+		/* automatically cleaned up now */
-+		descr_ptr = &descr;
-+
-+		ret = lxc_mainloop_add_handler(&descr, fd, freezer_cgroup_events_cb, INT_TO_PTR((int){0}));
-+		if (ret < 0)
-+			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
-+	}
-+
-+	ret = lxc_write_openat(h->container_full_path, "cgroup.freeze", "0", 1);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
-+
-+	if (timeout != 0 && lxc_mainloop(&descr, timeout))
-+		return log_error_errno(-1, errno, "Failed to wait for container to be unfrozen");
-+
-+	return 0;
-+}
-+
-+__cgfsng_ops static int isulad_cgfsng_unfreeze(struct cgroup_ops *ops, int timeout)
-+{
-+	if (!ops->hierarchies)
-+		return ret_set_errno(-1, ENOENT);
-+
-+	if (ops->cgroup_layout != CGROUP_LAYOUT_UNIFIED)
-+		return cg_legacy_unfreeze(ops);
-+
-+	return cg_unified_unfreeze(ops, timeout);
-+}
-+
-+__cgfsng_ops static const char *isulad_cgfsng_get_cgroup(struct cgroup_ops *ops,
-+						  const char *controller)
-+{
-+	struct hierarchy *h;
-+
-+	h = get_hierarchy(ops, controller);
-+	if (!h)
-+		return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
-+				      controller ? controller : "(null)");
-+
-+	if (!h->container_full_path)
-+		h->container_full_path = must_make_path(h->mountpoint, h->container_base_path, ops->container_cgroup, NULL);
-+
-+	return h->container_full_path
-+		   ? h->container_full_path + strlen(h->mountpoint)
-+		   : NULL;
-+}
-+
-+__cgfsng_ops static const char *isulad_cgfsng_get_cgroup_full_path(struct cgroup_ops *ops,
-+						  const char *controller)
-+{
-+	struct hierarchy *h;
-+
-+	h = get_hierarchy(ops, controller);
-+	if (!h)
-+		return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
-+				      controller ? controller : "(null)");
-+
-+	if (!h->container_full_path)
-+		h->container_full_path = must_make_path(h->mountpoint, h->container_base_path, ops->container_cgroup, NULL);
-+
-+	return h->container_full_path;
-+}
-+
-+/* Given a cgroup path returned from lxc_cmd_get_cgroup_path, build a full path,
-+ * which must be freed by the caller.
-+ */
-+static inline char *build_full_cgpath_from_monitorpath(struct hierarchy *h,
-+						       const char *inpath,
-+						       const char *filename)
-+{
-+	return must_make_path(h->mountpoint, inpath, filename, NULL);
-+}
-+
-+static int cgroup_attach_leaf(const struct lxc_conf *conf, int unified_fd, pid_t pid)
-+{
-+	int idx = 1;
-+	int ret;
-+	char pidstrINTTYPE_TO_STRLEN(int64_t) + 1;
-+	size_t pidstr_len;
-+
-+	/* Create leaf cgroup. */
-+	ret = mkdirat(unified_fd, ".lxc", 0755);
-+	if (ret < 0 && errno != EEXIST)
-+		return log_error_errno(-1, errno, "Failed to create leaf cgroup \".lxc\"");
-+
-+	pidstr_len = sprintf(pidstr, INT64_FMT, (int64_t)pid);
-+	ret = lxc_writeat(unified_fd, ".lxc/cgroup.procs", pidstr, pidstr_len);
-+	if (ret < 0)
-+		ret = lxc_writeat(unified_fd, "cgroup.procs", pidstr, pidstr_len);
-+	if (ret == 0)
-+		return 0;
-+
-+	/* this is a non-leaf node */
-+	if (errno != EBUSY)
-+		return log_error_errno(-1, errno, "Failed to attach to unified cgroup");
-+
-+	do {
-+		bool rm = false;
-+		char attach_cgroupSTRLITERALLEN(".lxc-/cgroup.procs") + INTTYPE_TO_STRLEN(int) + 1;
-+		char *slash;
-+
-+		ret = snprintf(attach_cgroup, sizeof(attach_cgroup), ".lxc-%d/cgroup.procs", idx);
-+		if (ret < 0 || (size_t)ret >= sizeof(attach_cgroup))
-+			return ret_errno(EIO);
-+
-+		/*
-+		 * This shouldn't really happen but the compiler might complain
-+		 * that a short write would cause a buffer overrun. So be on
-+		 * the safe side.
-+		 */
-+		if (ret < STRLITERALLEN(".lxc-/cgroup.procs"))
-+			return log_error_errno(-EINVAL, EINVAL, "Unexpected short write would cause buffer-overrun");
-+
-+		slash = &attach_cgroupret - STRLITERALLEN("/cgroup.procs");
-+		*slash = '\0';
-+
-+		ret = mkdirat(unified_fd, attach_cgroup, 0755);
-+		if (ret < 0 && errno != EEXIST)
-+			return log_error_errno(-1, errno, "Failed to create cgroup %s", attach_cgroup);
-+		if (ret == 0)
-+			rm = true;
-+
-+		*slash = '/';
-+
-+		ret = lxc_writeat(unified_fd, attach_cgroup, pidstr, pidstr_len);
-+		if (ret == 0)
-+			return 0;
-+
-+		if (rm && unlinkat(unified_fd, attach_cgroup, AT_REMOVEDIR))
-+			SYSERROR("Failed to remove cgroup \"%d(%s)\"", unified_fd, attach_cgroup);
-+
-+		/* this is a non-leaf node */
-+		if (errno != EBUSY)
-+			return log_error_errno(-1, errno, "Failed to attach to unified cgroup");
-+
-+		idx++;
-+	} while (idx < 1000);
-+
-+	return log_error_errno(-1, errno, "Failed to attach to unified cgroup");
-+}
-+
-+static int cgroup_attach_create_leaf(const struct lxc_conf *conf,
-+				     int unified_fd, int *sk_fd)
-+{
-+	__do_close int sk = *sk_fd, target_fd0 = -EBADF, target_fd1 = -EBADF;
-+	int target_fds2;
-+	ssize_t ret;
-+
-+	/* Create leaf cgroup. */
-+	ret = mkdirat(unified_fd, ".lxc", 0755);
-+	if (ret < 0 && errno != EEXIST)
-+		return log_error_errno(-1, errno, "Failed to create leaf cgroup \".lxc\"");
-+
-+	target_fd0 = openat(unified_fd, ".lxc/cgroup.procs", O_WRONLY | O_CLOEXEC | O_NOFOLLOW);
-+	if (target_fd0 < 0)
-+		return log_error_errno(-errno, errno, "Failed to open \".lxc/cgroup.procs\"");
-+	target_fds0 = target_fd0;
-+
-+	target_fd1 = openat(unified_fd, "cgroup.procs", O_WRONLY | O_CLOEXEC | O_NOFOLLOW);
-+	if (target_fd1 < 0)
-+		return log_error_errno(-errno, errno, "Failed to open \".lxc/cgroup.procs\"");
-+	target_fds1 = target_fd1;
-+
-+	ret = lxc_abstract_unix_send_fds(sk, target_fds, 2, NULL, 0);
-+	if (ret <= 0)
-+		return log_error_errno(-errno, errno, "Failed to send \".lxc/cgroup.procs\" fds %d and %d",
-+				       target_fd0, target_fd1);
-+
-+	return log_debug(0, "Sent target cgroup fds %d and %d", target_fd0, target_fd1);
-+}
-+
-+static int cgroup_attach_move_into_leaf(const struct lxc_conf *conf,
-+					int *sk_fd, pid_t pid)
-+{
-+	__do_close int sk = *sk_fd, target_fd0 = -EBADF, target_fd1 = -EBADF;
-+	int target_fds2;
-+	char pidstrINTTYPE_TO_STRLEN(int64_t) + 1;
-+	size_t pidstr_len;
-+	ssize_t ret;
-+
-+	ret = lxc_abstract_unix_recv_fds(sk, target_fds, 2, NULL, 0);
-+	if (ret <= 0)
-+		return log_error_errno(-1, errno, "Failed to receive target cgroup fd");
-+	target_fd0 = target_fds0;
-+	target_fd1 = target_fds1;
-+
-+	pidstr_len = sprintf(pidstr, INT64_FMT, (int64_t)pid);
-+
-+	ret = lxc_write_nointr(target_fd0, pidstr, pidstr_len);
-+	if (ret > 0 && ret == pidstr_len)
-+		return log_debug(0, "Moved process into target cgroup via fd %d", target_fd0);
-+
-+	ret = lxc_write_nointr(target_fd1, pidstr, pidstr_len);
-+	if (ret > 0 && ret == pidstr_len)
-+		return log_debug(0, "Moved process into target cgroup via fd %d", target_fd1);
-+
-+	return log_debug_errno(-1, errno, "Failed to move process into target cgroup via fd %d and %d",
-+			       target_fd0, target_fd1);
-+}
-+
-+struct userns_exec_unified_attach_data {
-+	const struct lxc_conf *conf;
-+	int unified_fd;
-+	int sk_pair2;
-+	pid_t pid;
-+};
-+
-+static int cgroup_unified_attach_child_wrapper(void *data)
-+{
-+	struct userns_exec_unified_attach_data *args = data;
-+
-+	if (!args->conf || args->unified_fd < 0 || args->pid <= 0 ||
-+	    args->sk_pair0 < 0 || args->sk_pair1 < 0)
-+		return ret_errno(EINVAL);
-+
-+	close_prot_errno_disarm(args->sk_pair0);
-+	return cgroup_attach_create_leaf(args->conf, args->unified_fd,
-+					 &args->sk_pair1);
-+}
-+
-+static int cgroup_unified_attach_parent_wrapper(void *data)
-+{
-+	struct userns_exec_unified_attach_data *args = data;
-+
-+	if (!args->conf || args->unified_fd < 0 || args->pid <= 0 ||
-+	    args->sk_pair0 < 0 || args->sk_pair1 < 0)
-+		return ret_errno(EINVAL);
-+
-+	close_prot_errno_disarm(args->sk_pair1);
-+	return cgroup_attach_move_into_leaf(args->conf, &args->sk_pair0,
-+					    args->pid);
-+}
-+
-+int cgroup_attach(const struct lxc_conf *conf, const char *name,
-+		  const char *lxcpath, pid_t pid)
-+{
-+	__do_close int unified_fd = -EBADF;
-+	int ret;
-+
-+	if (!conf || !name || !lxcpath || pid <= 0)
-+		return ret_errno(EINVAL);
-+
-+	unified_fd = lxc_cmd_get_cgroup2_fd(name, lxcpath);
-+	if (unified_fd < 0)
-+		return ret_errno(EBADF);
-+
-+	if (!lxc_list_empty(&conf->id_map)) {
-+		struct userns_exec_unified_attach_data args = {
-+			.conf		= conf,
-+			.unified_fd	= unified_fd,
-+			.pid		= pid,
-+		};
-+
-+		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
-+		if (ret < 0)
-+			return -errno;
-+
-+		ret = userns_exec_minimal(conf,
-+					  cgroup_unified_attach_parent_wrapper,
-+					  &args,
-+					  cgroup_unified_attach_child_wrapper,
-+					  &args);
-+	} else {
-+		ret = cgroup_attach_leaf(conf, unified_fd, pid);
-+	}
-+
-+	return ret;
-+}
-+
-+/* Technically, we're always at a delegation boundary here (This is especially
-+ * true when cgroup namespaces are available.). The reasoning is that in order
-+ * for us to have been able to start a container in the first place the root
-+ * cgroup must have been a leaf node. Now, either the container's init system
-+ * has populated the cgroup and kept it as a leaf node or it has created
-+ * subtrees. In the former case we will simply attach to the leaf node we
-+ * created when we started the container in the latter case we create our own
-+ * cgroup for the attaching process.
-+ */
-+static int __cg_unified_attach(const struct hierarchy *h,
-+			       const struct lxc_conf *conf, const char *name,
-+			       const char *lxcpath, pid_t pid,
-+			       const char *controller)
-+{
-+	__do_close int unified_fd = -EBADF;
-+	__do_free char *path = NULL, *cgroup = NULL;
-+	int ret;
-+
-+	if (!conf || !name || !lxcpath || pid <= 0)
-+		return ret_errno(EINVAL);
-+
-+	ret = cgroup_attach(conf, name, lxcpath, pid);
-+	if (ret == 0)
-+		return log_trace(0, "Attached to unified cgroup via command handler");
-+	if (ret != -EBADF)
-+		return log_error_errno(ret, errno, "Failed to attach to unified cgroup");
-+
-+	/* Fall back to retrieving the path for the unified cgroup. */
-+	cgroup = lxc_cmd_get_cgroup_path(name, lxcpath, controller);
-+	/* not running */
-+	if (!cgroup)
-+		return 0;
-+
-+	path = must_make_path(h->mountpoint, cgroup, NULL);
-+
-+	unified_fd = open(path, O_PATH | O_DIRECTORY | O_CLOEXEC);
-+	if (unified_fd < 0)
-+		return ret_errno(EBADF);
-+
-+	if (!lxc_list_empty(&conf->id_map)) {
-+		struct userns_exec_unified_attach_data args = {
-+			.conf		= conf,
-+			.unified_fd	= unified_fd,
-+			.pid		= pid,
-+		};
-+
-+		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
-+		if (ret < 0)
-+			return -errno;
-+
-+		ret = userns_exec_minimal(conf,
-+					  cgroup_unified_attach_parent_wrapper,
-+					  &args,
-+					  cgroup_unified_attach_child_wrapper,
-+					  &args);
-+	} else {
-+		ret = cgroup_attach_leaf(conf, unified_fd, pid);
-+	}
-+
-+	return ret;
-+}
-+
-+__cgfsng_ops static bool isulad_cgfsng_attach(struct cgroup_ops *ops,
-+				       const struct lxc_conf *conf,
-+				       const char *name, const char *lxcpath,
-+				       pid_t pid)
-+{
-+	int len, ret;
-+	char pidstrINTTYPE_TO_STRLEN(pid_t);
-+
-+	if (!ops)
-+		return ret_set_errno(false, ENOENT);
-+
-+#ifdef HAVE_ISULAD
-+	if (ops->no_controller) {
-+		DEBUG("no controller found, isgnore isulad_cgfsng_attach");
-+		return true;
-+	}
-+#endif
-+
-+	if (!ops->hierarchies)
-+		return true;
-+
-+	len = snprintf(pidstr, sizeof(pidstr), "%d", pid);
-+	if (len < 0 || (size_t)len >= sizeof(pidstr))
-+		return false;
-+
-+	for (int i = 0; ops->hierarchiesi; i++) {
-+		__do_free char *fullpath = NULL, *path = NULL;
-+		struct hierarchy *h = ops->hierarchiesi;
-+
-+		if (h->version == CGROUP2_SUPER_MAGIC) {
-+			ret = __cg_unified_attach(h, conf, name, lxcpath, pid,
-+						  h->controllers0);
-+			if (ret < 0)
-+				return false;
-+
-+			continue;
-+		}
-+
-+		path = lxc_cmd_get_cgroup_path(name, lxcpath, h->controllers0);
-+		/* not running */
-+		if (!path)
-+			return false;
-+
-+		fullpath = build_full_cgpath_from_monitorpath(h, path, "cgroup.procs");
-+		ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666);
-+		if (ret < 0)
-+			return log_error_errno(false, errno, "Failed to attach %d to %s",
-+					       (int)pid, fullpath);
-+	}
-+
-+	return true;
-+}
-+
-+__cgfsng_ops static int isulad_cgfsng_get(struct cgroup_ops *ops, const char *filename,
-+                                   char *value, size_t len, const char *name,
-+                                   const char *lxcpath)
-+{
-+	int ret = -1;
-+	size_t controller_len;
-+	char *controller, *p, *path;
-+	struct hierarchy *h;
-+
-+	controller_len = strlen(filename);
-+	controller = alloca(controller_len + 1);
-+	(void)strlcpy(controller, filename, controller_len + 1);
-+
-+	p = strchr(controller, '.');
-+	if (p)
-+		*p = '\0';
-+
-+	const char *ori_path = ops->get_cgroup(ops, controller);
-+	if (ori_path == NULL) {
-+		ERROR("Failed to get cgroup path:%s", controller);
-+		return -1;
-+	}
-+	path = safe_strdup(ori_path);
-+
-+	h = get_hierarchy(ops, controller);
-+	if (h) {
-+		char *fullpath;
-+
-+		fullpath = build_full_cgpath_from_monitorpath(h, path, filename);
-+		ret = lxc_read_from_file(fullpath, value, len);
-+		free(fullpath);
-+	}
-+	free(path);
-+
-+	return ret;
-+}
-+
-+static int device_cgroup_parse_access(struct device_item *device, const char *val)
-+{
-+	for (int count = 0; count < 3; count++, val++) {
-+		switch (*val) {
-+		case 'r':
-+			device->accesscount = *val;
-+			break;
-+		case 'w':
-+			device->accesscount = *val;
-+			break;
-+		case 'm':
-+			device->accesscount = *val;
-+			break;
-+		case '\n':
-+		case '\0':
-+			count = 3;
-+			break;
-+		default:
-+			return ret_errno(EINVAL);
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+int device_cgroup_rule_parse(struct device_item *device, const char *key,
-+				    const char *val)
-+{
-+	int count, ret;
-+	char temp50;
-+
-+	if (strcmp("devices.allow", key) == 0)
-+		device->allow = 1;
-+	else
-+		device->allow = 0;
-+
-+	if (strcmp(val, "a") == 0) {
-+		/* global rule */
-+		device->type = 'a';
-+		device->major = -1;
-+		device->minor = -1;
-+		device->global_rule = device->allow
-+					  ? LXC_BPF_DEVICE_CGROUP_BLACKLIST
-+					  : LXC_BPF_DEVICE_CGROUP_WHITELIST;
-+		device->allow = -1;
-+		return 0;
-+	}
-+
-+	/* local rule */
-+	device->global_rule = LXC_BPF_DEVICE_CGROUP_LOCAL_RULE;
-+
-+	switch (*val) {
-+	case 'a':
-+		__fallthrough;
-+	case 'b':
-+		__fallthrough;
-+	case 'c':
-+		device->type = *val;
-+		break;
-+	default:
-+		return -1;
-+	}
-+
-+	val++;
-+	if (!isspace(*val))
-+		return -1;
-+	val++;
-+	if (*val == '*') {
-+		device->major = -1;
-+		val++;
-+	} else if (isdigit(*val)) {
-+		memset(temp, 0, sizeof(temp));
-+		for (count = 0; count < sizeof(temp) - 1; count++) {
-+			tempcount = *val;
-+			val++;
-+			if (!isdigit(*val))
-+				break;
-+		}
-+		ret = lxc_safe_int(temp, &device->major);
-+		if (ret)
-+			return -1;
-+	} else {
-+		return -1;
-+	}
-+	if (*val != ':')
-+		return -1;
-+	val++;
-+
-+	/* read minor */
-+	if (*val == '*') {
-+		device->minor = -1;
-+		val++;
-+	} else if (isdigit(*val)) {
-+		memset(temp, 0, sizeof(temp));
-+		for (count = 0; count < sizeof(temp) - 1; count++) {
-+			tempcount = *val;
-+			val++;
-+			if (!isdigit(*val))
-+				break;
-+		}
-+		ret = lxc_safe_int(temp, &device->minor);
-+		if (ret)
-+			return -1;
-+	} else {
-+		return -1;
-+	}
-+	if (!isspace(*val))
-+		return -1;
-+
-+	return device_cgroup_parse_access(device, ++val);
-+}
-+
-+__cgfsng_ops static int isulad_cgfsng_set(struct cgroup_ops *ops,
-+                                   const char *filename, const char *value,
-+                                   const char *name, const char *lxcpath)
-+{
-+	int ret = -1;
-+	size_t controller_len;
-+	char *controller, *p, *path;
-+	struct hierarchy *h;
-+
-+	controller_len = strlen(filename);
-+	controller = alloca(controller_len + 1);
-+	(void)strlcpy(controller, filename, controller_len + 1);
-+
-+	p = strchr(controller, '.');
-+	if (p)
-+		*p = '\0';
-+
-+	const char *ori_path = ops->get_cgroup(ops, controller);
-+	if (ori_path == NULL) {
-+		ERROR("Failed to get cgroup path:%s", controller);
-+		return -1;
-+	}
-+	path = safe_strdup(ori_path);
-+
-+	h = get_hierarchy(ops, controller);
-+	if (h) {
-+		char *fullpath;
-+		fullpath = build_full_cgpath_from_monitorpath(h, path, filename);
-+
-+		if (strcmp(filename, "io.weight") == 0 || strcmp(filename, "io.bfq.weight") == 0) {
-+			if (!file_exists(fullpath)) {
-+				free(path);
-+				free(fullpath);
-+				return 0;
-+			}
-+		}
-+
-+		ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
-+		free(fullpath);
-+	}
-+	free(path);
-+
-+	return ret;
-+}
-+
-+/* take devices cgroup line
-+ *    /dev/foo rwx
-+ * and convert it to a valid
-+ *    type major:minor mode
-+ * line. Return <0 on error. Dest is a preallocated buffer long enough to hold
-+ * the output.
-+ */
-+static int device_cgroup_rule_parse_devpath(struct device_item *device,
-+					    const char *devpath)
-+{
-+	__do_free char *path = NULL;
-+	char *mode = NULL;
-+	int n_parts, ret;
-+	char *p;
-+	struct stat sb;
-+
-+	path = must_copy_string(devpath);
-+
-+	/*
-+	 * Read path followed by mode. Ignore any trailing text.
-+	 * A '    # comment' would be legal. Technically other text is not
-+	 * legal, we could check for that if we cared to.
-+	 */
-+	for (n_parts = 1, p = path; *p; p++) {
-+		if (*p != ' ')
-+			continue;
-+		*p = '\0';
-+
-+		if (n_parts != 1)
-+			break;
-+		p++;
-+		n_parts++;
-+
-+		while (*p == ' ')
-+			p++;
-+
-+		mode = p;
-+
-+		if (*p == '\0')
-+			return ret_set_errno(-1, EINVAL);
-+	}
-+
-+	if (device_cgroup_parse_access(device, mode) < 0)
-+		return -1;
-+
-+	if (n_parts == 1)
-+		return ret_set_errno(-1, EINVAL);
-+
-+	ret = stat(path, &sb);
-+	if (ret < 0)
-+		return ret_set_errno(-1, errno);
-+
-+	mode_t m = sb.st_mode & S_IFMT;
-+	switch (m) {
-+	case S_IFBLK:
-+		device->type = 'b';
-+		break;
-+	case S_IFCHR:
-+		device->type = 'c';
-+		break;
-+	default:
-+		return log_error_errno(-1, EINVAL, "Unsupported device type %i for \"%s\"", m, path);
-+	}
-+
-+	device->major = MAJOR(sb.st_rdev);
-+	device->minor = MINOR(sb.st_rdev);
-+	device->allow = 1;
-+	device->global_rule = LXC_BPF_DEVICE_CGROUP_LOCAL_RULE;
-+
-+	return 0;
-+}
-+
-+static int convert_devpath(const char *invalue, char *dest)
-+{
-+	struct device_item device = {0};
-+	int ret;
-+
-+	ret = device_cgroup_rule_parse_devpath(&device, invalue);
-+	if (ret < 0)
-+		return -1;
-+
-+	ret = snprintf(dest, 50, "%c %d:%d %s", device.type, device.major,
-+		       device.minor, device.access);
-+	if (ret < 0 || ret >= 50)
-+		return log_error_errno(-1, ENAMETOOLONG, "Error on configuration value \"%c %d:%d %s\" (max 50 chars)",
-+				       device.type, device.major, device.minor, device.access);
-+
-+	return 0;
-+}
-+
-+/* Called from setup_limits - here we have the container's cgroup_data because
-+ * we created the cgroups.
-+ */
-+static int isulad_cg_legacy_get_data(struct cgroup_ops *ops, const char *filename,
-+                              char *value, size_t len)
-+{
-+	char *fullpath = NULL;
-+	char *p = NULL;
-+	struct hierarchy *h = NULL;
-+	int ret = 0;
-+	char *controller = NULL;
-+
-+	len = strlen(filename);
-+	if (SIZE_MAX - 1 < len) {
-+		errno = EINVAL;
-+		return -1;
-+	}
-+	controller = calloc(1, len + 1);
-+	if (controller == NULL) {
-+		errno = ENOMEM;
-+		return -1;
-+	}
-+	(void)strlcpy(controller, filename, len + 1);
-+
-+	p = strchr(controller, '.');
-+	if (p)
-+		*p = '\0';
-+
-+
-+	h = get_hierarchy(ops, controller);
-+	if (!h) {
-+		ERROR("Failed to setup limits for the \"%s\" controller. "
-+		      "The controller seems to be unused by \"cgfsng\" cgroup "
-+		      "driver or not enabled on the cgroup hierarchy",
-+		      controller);
-+		errno = ENOENT;
-+		free(controller);
-+		return -ENOENT;
-+	}
-+
-+	fullpath = must_make_path(h->container_full_path, filename, NULL);
-+	ret = lxc_read_from_file(fullpath, value, len);
-+	free(fullpath);
-+	free(controller);
-+	return ret;
-+}
-+
-+static int isulad_cg_legacy_set_data(struct cgroup_ops *ops, const char *filename,
-+                              const char *value)
-+{
-+	size_t len;
-+	char *fullpath, *p;
-+	/* "b|c <2^64-1>:<2^64-1> r|w|m" = 47 chars max */
-+	char converted_value50;
-+	struct hierarchy *h;
-+	int ret = 0;
-+	char *controller = NULL;
-+	int retry_count = 0;
-+	int max_retry = 10;
-+	char *container_cgroup = ops->container_cgroup;
-+
-+	len = strlen(filename);
-+	controller = alloca(len + 1);
-+	(void)strlcpy(controller, filename, len + 1);
-+
-+	p = strchr(controller, '.');
-+	if (p)
-+		*p = '\0';
-+
-+	if (strcmp("devices.allow", filename) == 0 && value0 == '/') {
-+		ret = convert_devpath(value, converted_value);
-+		if (ret < 0)
-+			return ret;
-+		value = converted_value;
-+	}
-+
-+	h = get_hierarchy(ops, controller);
-+	if (!h) {
-+		ERROR("Failed to setup limits for the \"%s\" controller. "
-+		      "The controller seems to be unused by \"cgfsng\" cgroup "
-+		      "driver or not enabled on the cgroup hierarchy",
-+		      controller);
-+		errno = ENOENT;
-+		return -ENOENT;
-+	}
-+
-+	fullpath = must_make_path(h->container_full_path, filename, NULL);
-+
-+retry:
-+	ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
-+	if (ret != 0) {
-+		if (retry_count < max_retry) {
-+			SYSERROR("setting cgroup config for ready process caused \"failed to write %s to %s\".", value, fullpath);
-+			(void)isulad_cg_legacy_handle_cpuset_hierarchy(h, container_cgroup);
-+			(void)isulad_mkdir_eexist_on_last(h->container_full_path, 0755);
-+			usleep(100 * 1000); /* 100 millisecond */
-+			retry_count++;
-+			goto retry;
-+		}
-+		lxc_write_error_message(ops->errfd,
-+		                        "%s:%d: setting cgroup config for ready process caused \"failed to write %s to %s: %s\".",
-+		                        __FILE__, __LINE__, value, fullpath, strerror(errno));
-+	}
-+	free(fullpath);
-+	return ret;
-+}
-+
-+__cgfsng_ops static bool isulad_cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
-+						    struct lxc_conf *conf,
-+						    bool do_devices)
-+{
-+	__do_free struct lxc_list *sorted_cgroup_settings = NULL;
-+	struct lxc_list *cgroup_settings = &conf->cgroup;
-+	struct lxc_list *iterator, *next;
-+	struct lxc_cgroup *cg;
-+	bool ret = false;
-+	char value21 + 1 = { 0 };
-+	long long int readvalue, setvalue;
-+
-+	if (!ops)
-+		return ret_set_errno(false, ENOENT);
-+
-+	if (!conf)
-+		return ret_set_errno(false, EINVAL);
-+
-+	cgroup_settings = &conf->cgroup;
-+	if (lxc_list_empty(cgroup_settings))
-+		return true;
-+
-+	if (!ops->hierarchies)
-+		return ret_set_errno(false, EINVAL);
-+
-+	if (pure_unified_layout(ops))
-+		return true;
-+
-+	sorted_cgroup_settings = sort_cgroup_settings(cgroup_settings);
-+	if (!sorted_cgroup_settings)
-+		return false;
-+
-+	lxc_list_for_each(iterator, sorted_cgroup_settings) {
-+		cg = iterator->elem;
-+
-+		if (do_devices == !strncmp("devices", cg->subsystem, 7)) {
-+			const char *cgvalue = cg->value;
-+			if (strcmp(cg->subsystem, "files.limit") == 0) {
-+				if (lxc_safe_long_long(cgvalue, &setvalue) != 0) {
-+					SYSERROR("Invalid integer value %s", cgvalue);
-+					goto out;
-+				}
-+				if (setvalue <= 0) {
-+					cgvalue = "max";
-+				}
-+			}
-+			if (isulad_cg_legacy_set_data(ops, cg->subsystem, cgvalue)) {
-+				if (do_devices && (errno == EACCES || errno == EPERM)) {
-+					SYSWARN("Failed to set \"%s\" to \"%s\"", cg->subsystem, cgvalue);
-+					continue;
-+				}
-+				SYSERROR("Failed to set \"%s\" to \"%s\"", cg->subsystem, cgvalue);
-+				goto out;
-+			}
-+			DEBUG("Set controller \"%s\" set to \"%s\"", cg->subsystem, cgvalue);
-+		}
-+
-+		// isulad: check cpu shares
-+		if (strcmp(cg->subsystem, "cpu.shares") == 0) {
-+			if (isulad_cg_legacy_get_data(ops, cg->subsystem, value, sizeof(value) - 1) < 0) {
-+				SYSERROR("Error get %s", cg->subsystem);
-+				goto out;
-+			}
-+			trim(value);
-+			if (lxc_safe_long_long(cg->value, &setvalue) != 0) {
-+				SYSERROR("Invalid value %s", cg->value);
-+				goto out;
-+			}
-+			if (lxc_safe_long_long(value, &readvalue) != 0) {
-+				SYSERROR("Invalid value %s", value);
-+				goto out;
-+			}
-+			if (setvalue > readvalue) {
-+				ERROR("The maximum allowed cpu-shares is %s", value);
-+				lxc_write_error_message(ops->errfd,
-+				                        "%s:%d: setting cgroup config for ready process caused \"The maximum allowed cpu-shares is %s\".",
-+				                        __FILE__, __LINE__, value);
-+				goto out;
-+			} else if (setvalue < readvalue) {
-+				ERROR("The minimum allowed cpu-shares is %s", value);
-+				lxc_write_error_message(ops->errfd,
-+				                        "%s:%d: setting cgroup config for ready process caused \"The minimum allowed cpu-shares is %s\".",
-+				                        __FILE__, __LINE__, value);
-+				goto out;
-+			}
-+		}
-+	}
-+
-+	ret = true;
-+	INFO("Limits for the legacy cgroup hierarchies have been setup");
-+out:
-+	lxc_list_for_each_safe(iterator, sorted_cgroup_settings, next) {
-+		lxc_list_del(iterator);
-+		free(iterator);
-+	}
-+
-+	return ret;
-+}
-+
-+/*
-+ * Some of the parsing logic comes from the original cgroup device v1
-+ * implementation in the kernel.
-+ */
-+static int bpf_device_cgroup_prepare(struct cgroup_ops *ops,
-+				     struct lxc_conf *conf, const char *key,
-+				     const char *val)
-+{
-+#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-+	struct device_item device_item = {0};
-+	int ret;
-+
-+	if (strcmp("devices.allow", key) == 0 && *val == '/')
-+		ret = device_cgroup_rule_parse_devpath(&device_item, val);
-+	else
-+		ret = device_cgroup_rule_parse(&device_item, key, val);
-+	if (ret < 0)
-+		return log_error_errno(-1, EINVAL, "Failed to parse device string %s=%s", key, val);
-+
-+	ret = bpf_list_add_device(conf, &device_item);
-+	if (ret < 0)
-+		return -1;
-+#endif
-+	return 0;
-+}
-+
-+__cgfsng_ops static bool isulad_cgfsng_setup_limits(struct cgroup_ops *ops,
-+					     struct lxc_handler *handler)
-+{
-+	__do_free char *path = NULL;
-+	struct lxc_list *cgroup_settings, *iterator;
-+	struct hierarchy *h;
-+	struct lxc_conf *conf;
-+
-+	if (!ops)
-+		return ret_set_errno(false, ENOENT);
-+
-+	if (!ops->hierarchies)
-+		return true;
-+
-+	if (!ops->container_cgroup)
-+		return ret_set_errno(false, EINVAL);
-+
-+	if (!handler || !handler->conf)
-+		return ret_set_errno(false, EINVAL);
-+	conf = handler->conf;
-+
-+	if (lxc_list_empty(&conf->cgroup2))
-+		return true;
-+	cgroup_settings = &conf->cgroup2;
-+
-+	if (!pure_unified_layout(ops))
-+		return true;
-+
-+	if (!ops->unified)
-+		return false;
-+	h = ops->unified;
-+
-+	lxc_list_for_each (iterator, cgroup_settings) {
-+		struct lxc_cgroup *cg = iterator->elem;
-+		int ret;
-+
-+		if (strncmp("devices", cg->subsystem, 7) == 0) {
-+			ret = bpf_device_cgroup_prepare(ops, conf, cg->subsystem,
-+							cg->value);
-+		} else if (strcmp(cg->subsystem, "files.limit") == 0) {
-+			long long int setvalue = 0;
-+			const char *cgvalue = cg->value;
-+
-+			if (lxc_safe_long_long(cgvalue, &setvalue) != 0)
-+				return log_error(false, "Invalid integer value %s", cgvalue);
-+
-+			if (setvalue <= 0)
-+				cgvalue = "max";
-+
-+			ret = lxc_write_openat(h->container_full_path,
-+					       cg->subsystem, cgvalue,
-+					       strlen(cgvalue));
-+			if (ret < 0)
-+				return log_error_errno(false, errno, "Failed to set \"%s\" to \"%s\"",
-+						       cg->subsystem, cgvalue);
-+		} else {
-+			if (strcmp(cg->subsystem, "io.weight") == 0 || strcmp(cg->subsystem, "io.bfq.weight") == 0) {
-+				path = must_make_path(h->container_full_path, cg->subsystem, NULL);
-+				if (!file_exists(path)) {
-+					continue;
-+				}
-+			}
-+			ret = lxc_write_openat(h->container_full_path,
-+					       cg->subsystem, cg->value,
-+					       strlen(cg->value));
-+			if (ret < 0)
-+				return log_error_errno(false, errno, "Failed to set \"%s\" to \"%s\"",
-+						       cg->subsystem, cg->value);
-+		}
-+		TRACE("Set \"%s\" to \"%s\"", cg->subsystem, cg->value);
-+	}
-+
-+	return log_info(true, "Limits for the unified cgroup hierarchy have been setup");
-+}
-+
-+__cgfsng_ops bool isulad_cgfsng_devices_activate(struct cgroup_ops *ops,
-+					  struct lxc_handler *handler)
-+{
-+#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-+	__do_bpf_program_free struct bpf_program *devices = NULL;
-+	int ret;
-+	struct lxc_conf *conf;
-+	struct hierarchy *unified;
-+	struct lxc_list *it;
-+	struct bpf_program *devices_old;
-+
-+	if (!ops)
-+		return ret_set_errno(false, ENOENT);
-+
-+	if (!ops->hierarchies)
-+		return true;
-+
-+	if (!ops->container_cgroup)
-+		return ret_set_errno(false, EEXIST);
-+
-+	if (!handler || !handler->conf)
-+		return ret_set_errno(false, EINVAL);
-+	conf = handler->conf;
-+
-+	unified = ops->unified;
-+	if (!unified || !unified->bpf_device_controller ||
-+	    !unified->container_full_path || lxc_list_empty(&conf->devices))
-+		return true;
-+
-+	devices = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
-+	if (!devices)
-+		return log_error_errno(false, ENOMEM, "Failed to create new bpf program");
-+
-+	ret = bpf_program_init(devices);
-+	if (ret)
-+		return log_error_errno(false, ENOMEM, "Failed to initialize bpf program");
-+
-+	lxc_list_for_each(it, &conf->devices) {
-+		struct device_item *cur = it->elem;
-+
-+		ret = bpf_program_append_device(devices, cur);
-+		if (ret)
-+			return log_error_errno(false, ENOMEM, "Failed to add new rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
-+					       cur->type,
-+					       cur->major,
-+					       cur->minor,
-+					       cur->access,
-+					       cur->allow,
-+					       cur->global_rule);
-+		TRACE("Added rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
-+		      cur->type,
-+		      cur->major,
-+		      cur->minor,
-+		      cur->access,
-+		      cur->allow,
-+		      cur->global_rule);
-+	}
-+
-+	ret = bpf_program_finalize(devices);
-+	if (ret)
-+		return log_error_errno(false, ENOMEM, "Failed to finalize bpf program");
-+
-+	ret = bpf_program_cgroup_attach(devices, BPF_CGROUP_DEVICE,
-+					unified->container_full_path,
-+					BPF_F_ALLOW_MULTI);
-+	if (ret)
-+		return log_error_errno(false, ENOMEM, "Failed to attach bpf program");
-+
-+	/* Replace old bpf program. */
-+	devices_old = move_ptr(conf->cgroup2_devices);
-+	conf->cgroup2_devices = move_ptr(devices);
-+	devices = move_ptr(devices_old);
-+#endif
-+	return true;
-+}
-+
-+bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup)
-+{
-+	__do_free char *add_controllers = NULL, *base_path = NULL;
-+	__do_free_string_list char **parts = NULL;
-+	struct hierarchy *unified = ops->unified;
-+	ssize_t parts_len;
-+	char **it;
-+	size_t full_len = 0;
-+
-+	if (!ops->hierarchies || !pure_unified_layout(ops) ||
-+	    !unified->controllers0)
-+		return true;
-+
-+	/* For now we simply enable all controllers that we have detected by
-+	 * creating a string like "+memory +pids +cpu +io".
-+	 * TODO: In the near future we might want to support "-<controller>"
-+	 * etc. but whether supporting semantics like this make sense will need
-+	 * some thinking.
-+	 */
-+	for (it = unified->controllers; it && *it; it++) {
-+		full_len += strlen(*it) + 2;
-+		add_controllers = must_realloc(add_controllers, full_len + 1);
-+
-+		if (unified->controllers0 == *it)
-+			add_controllers0 = '\0';
-+
-+		(void)strlcat(add_controllers, "+", full_len + 1);
-+		(void)strlcat(add_controllers, *it, full_len + 1);
-+
-+		if ((it + 1) && *(it + 1))
-+			(void)strlcat(add_controllers, " ", full_len + 1);
-+	}
-+
-+	parts = lxc_string_split(cgroup, '/');
-+	if (!parts)
-+		return false;
-+
-+	parts_len = lxc_array_len((void **)parts);
-+	if (parts_len > 0)
-+		parts_len--;
-+
-+	base_path = must_make_path(unified->mountpoint, unified->container_base_path, NULL);
-+	for (ssize_t i = -1; i < parts_len; i++) {
-+		int ret;
-+		__do_free char *target = NULL;
-+
-+		if (i >= 0)
-+			base_path = must_append_path(base_path, partsi, NULL);
-+		target = must_make_path(base_path, "cgroup.subtree_control", NULL);
-+		ret = lxc_writeat(-1, target, add_controllers, full_len);
-+		if (ret < 0)
-+			return log_error_errno(false, errno, "Could not enable \"%s\" controllers in the unified cgroup \"%s\"",
-+					       add_controllers, target);
-+		TRACE("Enable \"%s\" controllers in the unified cgroup \"%s\"", add_controllers, target);
-+	}
-+
-+	return true;
-+}
-+
-+__cgfsng_ops bool isulad_cgfsng_monitor_delegate_controllers(struct cgroup_ops *ops)
-+{
-+	return true;
-+}
-+
-+__cgfsng_ops bool isulad_cgfsng_payload_delegate_controllers(struct cgroup_ops *ops)
-+{
-+	if (!ops)
-+		return ret_set_errno(false, ENOENT);
-+
-+#ifdef HAVE_ISULAD
-+	if (ops->no_controller) {
-+		DEBUG("no controller found, isgnore isulad_cgfsng_payload_delegate_controllers");
-+		return true;
-+	}
-+#endif
-+
-+	return __cgfsng_delegate_controllers(ops, ops->container_cgroup);
-+}
-+
-+static bool cgroup_use_wants_controllers(const struct cgroup_ops *ops,
-+				       char **controllers)
-+{
-+	if (!ops->cgroup_use)
-+		return true;
-+
-+	for (char **cur_ctrl = controllers; cur_ctrl && *cur_ctrl; cur_ctrl++) {
-+		bool found = false;
-+
-+		for (char **cur_use = ops->cgroup_use; cur_use && *cur_use; cur_use++) {
-+			if (strcmp(*cur_use, *cur_ctrl) != 0)
-+				continue;
-+
-+			found = true;
-+			break;
-+		}
-+
-+		if (found)
-+			continue;
-+
-+		return false;
-+	}
-+
-+	return true;
-+}
-+
-+static void cg_unified_delegate(char ***delegate)
-+{
-+	__do_free char *buf = NULL;
-+	char *standard = {"cgroup.subtree_control", "cgroup.threads", NULL};
-+	char *token;
-+	int idx;
-+
-+	buf = read_file("/sys/kernel/cgroup/delegate");
-+	if (!buf) {
-+		for (char **p = standard; p && *p; p++) {
-+			idx = append_null_to_list((void ***)delegate);
-+			(*delegate)idx = must_copy_string(*p);
-+		}
-+		SYSWARN("Failed to read /sys/kernel/cgroup/delegate");
-+		return;
-+	}
-+
-+	lxc_iterate_parts (token, buf, " \t\n") {
-+		/*
-+		 * We always need to chown this for both cgroup and
-+		 * cgroup2.
-+		 */
-+		if (strcmp(token, "cgroup.procs") == 0)
-+			continue;
-+
-+		idx = append_null_to_list((void ***)delegate);
-+		(*delegate)idx = must_copy_string(token);
-+	}
-+}
-+
-+/* At startup, parse_hierarchies finds all the info we need about cgroup
-+ * mountpoints and current cgroups, and stores it in @d.
-+ */
-+static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileged)
-+{
-+	__do_free char *basecginfo = NULL, *line = NULL;
-+	__do_free_string_list char **klist = NULL, **nlist = NULL;
-+	__do_fclose FILE *f = NULL;
-+	int ret;
-+	size_t len = 0;
-+
-+	/* Root spawned containers escape the current cgroup, so use init's
-+	 * cgroups as our base in that case.
-+	 */
-+	if (!relative && (geteuid() == 0))
-+		basecginfo = read_file("/proc/1/cgroup");
-+	else
-+		basecginfo = read_file("/proc/self/cgroup");
-+	if (!basecginfo)
-+		return ret_set_errno(-1, ENOMEM);
-+
-+	ret = get_existing_subsystems(&klist, &nlist);
-+	if (ret < 0)
-+		return log_error_errno(-1, errno, "Failed to retrieve available legacy cgroup controllers");
-+
-+	f = fopen("/proc/self/mountinfo", "re");
-+	if (!f)
-+		return log_error_errno(-1, errno, "Failed to open \"/proc/self/mountinfo\"");
-+
-+	lxc_cgfsng_print_basecg_debuginfo(basecginfo, klist, nlist);
-+
-+	while (getline(&line, &len, f) != -1) {
-+		__do_free char *base_cgroup = NULL, *mountpoint = NULL;
-+		__do_free_string_list char **controller_list = NULL;
-+		int type;
-+		struct hierarchy *new;
-+
-+		type = get_cgroup_version(line);
-+		if (type == 0)
-+			continue;
-+
-+		if (type == CGROUP2_SUPER_MAGIC && ops->unified)
-+			continue;
-+
-+		if (ops->cgroup_layout == CGROUP_LAYOUT_UNKNOWN) {
-+			if (type == CGROUP2_SUPER_MAGIC)
-+				ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
-+			else if (type == CGROUP_SUPER_MAGIC)
-+				ops->cgroup_layout = CGROUP_LAYOUT_LEGACY;
-+		} else if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
-+			if (type == CGROUP_SUPER_MAGIC)
-+				ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
-+		} else if (ops->cgroup_layout == CGROUP_LAYOUT_LEGACY) {
-+			if (type == CGROUP2_SUPER_MAGIC)
-+				ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
-+		}
-+
-+		controller_list = cg_hybrid_get_controllers(klist, nlist, line, type);
-+		if (!controller_list && type == CGROUP_SUPER_MAGIC)
-+			continue;
-+
-+		if (type == CGROUP_SUPER_MAGIC)
-+			if (controller_list_is_dup(ops->hierarchies, controller_list)) {
-+				TRACE("Skipping duplicating controller");
-+				continue;
-+			}
-+
-+		mountpoint = cg_hybrid_get_mountpoint(line);
-+		if (!mountpoint) {
-+			WARN("Failed parsing mountpoint from \"%s\"", line);
-+			continue;
-+		}
-+
-+		if (type == CGROUP_SUPER_MAGIC)
-+			base_cgroup = cg_hybrid_get_current_cgroup(basecginfo, controller_list0, CGROUP_SUPER_MAGIC);
-+		else
-+			base_cgroup = cg_hybrid_get_current_cgroup(basecginfo, NULL, CGROUP2_SUPER_MAGIC);
-+		if (!base_cgroup) {
-+			WARN("Failed to find current cgroup");
-+			continue;
-+		}
-+
-+		trim(base_cgroup);
-+		prune_init_scope(base_cgroup);
-+
-+		/* isulad: do not test writeable, if we run isulad in docker without cgroup namespace.
-+		 * the base_cgroup will be docker/XXX.., mountpoint+base_cgroup may be not exist */
-+
-+		/*
-+		 * reason:base cgroup may be started with /system.slice when cg_hybrid_init
-+		 *	read /proc/1/cgroup on host, and cgroup init will set all containers
-+		 *	cgroup path under /sys/fs/cgroup/<controller>/system.slice/xxx/lxc
-+		 *	directory, this is not consistent with docker. The default cgroup path
-+		 *	should be under /sys/fs/cgroup/<controller>/lxc directory.
-+		 */
-+
-+		if (strlen(base_cgroup) > 1 && base_cgroup0 == '/') {
-+			base_cgroup1 = '\0';
-+		}
-+
-+		if (type == CGROUP2_SUPER_MAGIC) {
-+			char *cgv2_ctrl_path;
-+
-+			cgv2_ctrl_path = must_make_path(mountpoint, base_cgroup,
-+							"cgroup.controllers",
-+							NULL);
-+
-+			controller_list = cg_unified_get_controllers(cgv2_ctrl_path);
-+			free(cgv2_ctrl_path);
-+			if (!controller_list) {
-+				controller_list = cg_unified_make_empty_controller();
-+				TRACE("No controllers are enabled for "
-+				      "delegation in the unified hierarchy");
-+			}
-+		}
-+
-+		/* Exclude all controllers that cgroup use does not want. */
-+		if (!cgroup_use_wants_controllers(ops, controller_list)) {
-+			TRACE("Skipping controller");
-+			continue;
-+		}
-+
-+		new = add_hierarchy(&ops->hierarchies, move_ptr(controller_list), move_ptr(mountpoint), move_ptr(base_cgroup), type);
-+		if (type == CGROUP2_SUPER_MAGIC && !ops->unified) {
-+			if (unprivileged)
-+				cg_unified_delegate(&new->cgroup2_chown);
-+			ops->unified = new;
-+		}
-+	}
-+
-+	TRACE("Writable cgroup hierarchies:");
-+	lxc_cgfsng_print_hierarchies(ops);
-+
-+	/* verify that all controllers in cgroup.use and all crucial
-+	 * controllers are accounted for
-+	 */
-+	if (!all_controllers_found(ops))
-+		return log_error_errno(-1, ENOENT, "Failed to find all required controllers");
-+
-+	return 0;
-+}
-+
-+/* Get current cgroup from /proc/self/cgroup for the cgroupfs v2 hierarchy. */
-+static char *cg_unified_get_current_cgroup(bool relative)
-+{
-+	__do_free char *basecginfo = NULL;
-+	char *copy;
-+	char *base_cgroup;
-+
-+	if (!relative && (geteuid() == 0))
-+		basecginfo = read_file("/proc/1/cgroup");
-+	else
-+		basecginfo = read_file("/proc/self/cgroup");
-+	if (!basecginfo)
-+		return NULL;
-+
-+	base_cgroup = strstr(basecginfo, "0::/");
-+	if (!base_cgroup)
-+		return NULL;
-+
-+	base_cgroup = base_cgroup + 3;
-+	copy = copy_to_eol(base_cgroup);
-+	if (!copy)
-+		return NULL;
-+
-+	return trim(copy);
-+}
-+
-+static int cg_unified_init(struct cgroup_ops *ops, bool relative,
-+			   bool unprivileged)
-+{
-+	__do_free char *subtree_path = NULL;
-+	int ret;
-+	char *mountpoint;
-+	char **delegatable;
-+	struct hierarchy *new;
-+	char *base_cgroup = NULL;
-+
-+	ret = unified_cgroup_hierarchy();
-+	if (ret == -ENOMEDIUM)
-+		return ret_errno(ENOMEDIUM);
-+
-+	if (ret != CGROUP2_SUPER_MAGIC)
-+		return 0;
-+
-+	base_cgroup = cg_unified_get_current_cgroup(relative);
-+	if (!base_cgroup)
-+		return ret_errno(EINVAL);
-+	if (!relative)
-+		prune_init_scope(base_cgroup);
-+
-+	/*
-+	 * We assume that the cgroup we're currently in has been delegated to
-+	 * us and we are free to further delege all of the controllers listed
-+	 * in cgroup.controllers further down the hierarchy.
-+	 */
-+	mountpoint = must_copy_string(DEFAULT_CGROUP_MOUNTPOINT);
-+	subtree_path = must_make_path(mountpoint, base_cgroup, "cgroup.controllers", NULL);
-+	delegatable = cg_unified_get_controllers(subtree_path);
-+	if (!delegatable)
-+		delegatable = cg_unified_make_empty_controller();
-+	if (!delegatable0) {
-+		TRACE("No controllers are enabled for delegation");
-+#ifdef HAVE_ISULAD
-+		ops->no_controller = true;
-+#endif
-+	}
-+
-+	/* TODO: If the user requested specific controllers via lxc.cgroup.use
-+	 * we should verify here. The reason I'm not doing it right is that I'm
-+	 * not convinced that lxc.cgroup.use will be the future since it is a
-+	 * global property. I much rather have an option that lets you request
-+	 * controllers per container.
-+	 */
-+
-+	new = add_hierarchy(&ops->hierarchies, delegatable, mountpoint, base_cgroup, CGROUP2_SUPER_MAGIC);
-+	if (unprivileged)
-+		cg_unified_delegate(&new->cgroup2_chown);
-+
-+	if (bpf_devices_cgroup_supported())
-+		new->bpf_device_controller = 1;
-+
-+	ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
-+	ops->unified = new;
-+
-+	return CGROUP2_SUPER_MAGIC;
-+}
-+
-+static int isulad_cg_init(struct cgroup_ops *ops, struct lxc_conf *conf)
-+{
-+	int ret;
-+	const char *tmp;
-+	bool relative = conf->cgroup_meta.relative;
-+
-+	tmp = lxc_global_config_value("lxc.cgroup.use");
-+	if (tmp) {
-+		__do_free char *pin = NULL;
-+		char *chop, *cur;
-+
-+		pin = must_copy_string(tmp);
-+		chop = pin;
-+
-+		lxc_iterate_parts(cur, chop, ",")
-+			must_append_string(&ops->cgroup_use, cur);
-+	}
-+
-+	ret = cg_unified_init(ops, relative, !lxc_list_empty(&conf->id_map));
-+	if (ret < 0)
-+		return -1;
-+
-+	if (ret == CGROUP2_SUPER_MAGIC)
-+		return 0;
-+
-+	return cg_hybrid_init(ops, relative, !lxc_list_empty(&conf->id_map));
-+}
-+
-+__cgfsng_ops static int isulad_cgfsng_data_init(struct cgroup_ops *ops, struct lxc_conf *conf)
-+{
-+	const char *cgroup_pattern;
-+	const char *cgroup_tree;
-+	__do_free char *container_cgroup = NULL, *__cgroup_tree = NULL;
-+	size_t len;
-+
-+	if (!ops)
-+		return ret_set_errno(-1, ENOENT);
-+
-+	/* copy system-wide cgroup information */
-+	cgroup_pattern = lxc_global_config_value("lxc.cgroup.pattern");
-+	if (cgroup_pattern && strcmp(cgroup_pattern, "") != 0)
-+		ops->cgroup_pattern = must_copy_string(cgroup_pattern);
-+
-+	if (conf->cgroup_meta.dir) {
-+		cgroup_tree = conf->cgroup_meta.dir;
-+		container_cgroup = must_concat(&len, cgroup_tree, "/", conf->name, NULL);
-+	} else if (ops->cgroup_pattern) {
-+		__cgroup_tree = lxc_string_replace("%n", conf->name, ops->cgroup_pattern);
-+		if (!__cgroup_tree)
-+			return ret_set_errno(-1, ENOMEM);
-+
-+		cgroup_tree = __cgroup_tree;
-+		container_cgroup = must_concat(&len, cgroup_tree, NULL);
-+	} else {
-+		cgroup_tree = NULL;
-+		container_cgroup = must_concat(&len, conf->name, NULL);
-+	}
-+	if (!container_cgroup)
-+		return ret_set_errno(-1, ENOMEM);
-+
-+	ops->container_cgroup = move_ptr(container_cgroup);
-+
-+	return 0;
-+}
-+
-+struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf)
-+{
-+	__do_free struct cgroup_ops *cgfsng_ops = NULL;
-+
-+	cgfsng_ops = malloc(sizeof(struct cgroup_ops));
-+	if (!cgfsng_ops)
-+		return ret_set_errno(NULL, ENOMEM);
-+
-+	memset(cgfsng_ops, 0, sizeof(struct cgroup_ops));
-+	cgfsng_ops->cgroup_layout = CGROUP_LAYOUT_UNKNOWN;
-+
-+	if (isulad_cg_init(cgfsng_ops, conf))
-+		return NULL;
-+
-+	cgfsng_ops->data_init = isulad_cgfsng_data_init;
-+
-+	cgfsng_ops->errfd = conf ? conf->errpipe1 : -1;
-+	cgfsng_ops->get_cgroup_full_path = isulad_cgfsng_get_cgroup_full_path;
-+	cgfsng_ops->payload_destroy = isulad_cgfsng_payload_destroy;
-+	cgfsng_ops->monitor_destroy = isulad_cgfsng_monitor_destroy;
-+	cgfsng_ops->monitor_create = isulad_cgfsng_monitor_create;
-+	cgfsng_ops->monitor_enter = isulad_cgfsng_monitor_enter;
-+	cgfsng_ops->monitor_delegate_controllers = isulad_cgfsng_monitor_delegate_controllers;
-+	cgfsng_ops->payload_delegate_controllers = isulad_cgfsng_payload_delegate_controllers;
-+	cgfsng_ops->payload_create = isulad_cgfsng_payload_create;
-+	cgfsng_ops->payload_enter = isulad_cgfsng_payload_enter;
-+	cgfsng_ops->payload_finalize = isulad_cgfsng_payload_finalize;
-+	cgfsng_ops->escape = isulad_cgfsng_escape;
-+	cgfsng_ops->num_hierarchies = isulad_cgfsng_num_hierarchies;
-+	cgfsng_ops->get_hierarchies = isulad_cgfsng_get_hierarchies;
-+	cgfsng_ops->get_cgroup = isulad_cgfsng_get_cgroup;
-+	cgfsng_ops->get = isulad_cgfsng_get;
-+	cgfsng_ops->set = isulad_cgfsng_set;
-+	cgfsng_ops->freeze = isulad_cgfsng_freeze;
-+	cgfsng_ops->unfreeze = isulad_cgfsng_unfreeze;
-+	cgfsng_ops->setup_limits_legacy = isulad_cgfsng_setup_limits_legacy;
-+	cgfsng_ops->setup_limits = isulad_cgfsng_setup_limits;
-+	cgfsng_ops->driver = "isulad_cgfsng";
-+	cgfsng_ops->version = "1.0.0";
-+	cgfsng_ops->attach = isulad_cgfsng_attach;
-+	cgfsng_ops->chown = isulad_cgfsng_chown;
-+	cgfsng_ops->mount = isulad_cgfsng_mount;
-+	cgfsng_ops->devices_activate = isulad_cgfsng_devices_activate;
-+
-+	return move_ptr(cgfsng_ops);
-+}
-diff --git a/src/lxc/json/defs.c b/src/lxc/json/defs.c
-new file mode 100644
-index 0000000..4bf569a
---- /dev/null
-+++ b/src/lxc/json/defs.c
-@@ -0,0 +1,205 @@
-+// Generated from defs.json. Do not edit!
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+#include <string.h>
-+#include <read-file.h>
-+#include "defs.h"
-+
-+defs_hook *make_defs_hook(yajl_val tree, struct parser_context *ctx, parser_error *err) {
-+    defs_hook *ret = NULL;
-+    *err = 0;
-+    if (tree == NULL)
-+        return ret;
-+    ret = safe_malloc(sizeof(*ret));
-+    {
-+        yajl_val val = get_val(tree, "path", yajl_t_string);
-+        if (val != NULL) {
-+            char *str = YAJL_GET_STRING(val);
-+            ret->path = safe_strdup(str ? str : "");
-+        }
-+    }
-+    {
-+        yajl_val tmp = get_val(tree, "args", yajl_t_array);
-+        if (tmp != NULL && YAJL_GET_ARRAY(tmp) != NULL && YAJL_GET_ARRAY(tmp)->len > 0) {
-+            size_t i;
-+            ret->args_len = YAJL_GET_ARRAY(tmp)->len;
-+            if (YAJL_GET_ARRAY(tmp)->len > SIZE_MAX / sizeof(*ret->args) - 1) {
-+                free_defs_hook(ret);
-+                return NULL;
-+            }
-+            ret->args = safe_malloc((YAJL_GET_ARRAY(tmp)->len + 1) * sizeof(*ret->args));
-+            for (i = 0; i < YAJL_GET_ARRAY(tmp)->len; i++) {
-+                yajl_val val = YAJL_GET_ARRAY(tmp)->valuesi;
-+                if (val != NULL) {
-+                    char *str = YAJL_GET_STRING(val);
-+                    ret->argsi = safe_strdup(str ? str : "");
-+                }
-+            }
-+        }
-+    }
-+    {
-+        yajl_val tmp = get_val(tree, "env", yajl_t_array);
-+        if (tmp != NULL && YAJL_GET_ARRAY(tmp) != NULL && YAJL_GET_ARRAY(tmp)->len > 0) {
-+            size_t i;
-+            ret->env_len = YAJL_GET_ARRAY(tmp)->len;
-+            if (YAJL_GET_ARRAY(tmp)->len > SIZE_MAX / sizeof(*ret->env) - 1) {
-+                free_defs_hook(ret);
-+                return NULL;
-+            }
-+            ret->env = safe_malloc((YAJL_GET_ARRAY(tmp)->len + 1) * sizeof(*ret->env));
-+            for (i = 0; i < YAJL_GET_ARRAY(tmp)->len; i++) {
-+                yajl_val val = YAJL_GET_ARRAY(tmp)->valuesi;
-+                if (val != NULL) {
-+                    char *str = YAJL_GET_STRING(val);
-+                    ret->envi = safe_strdup(str ? str : "");
-+                }
-+            }
-+        }
-+    }
-+    {
-+        yajl_val val = get_val(tree, "timeout", yajl_t_number);
-+        if (val != NULL) {
-+            int invalid = common_safe_int(YAJL_GET_NUMBER(val), (int *)&ret->timeout);
-+            if (invalid) {
-+                if (asprintf(err, "Invalid value '%s' with type 'integer' for key 'timeout': %s", YAJL_GET_NUMBER(val), strerror(-invalid)) < 0)
-+                    *err = safe_strdup("error allocating memory");
-+                free_defs_hook(ret);
-+                return NULL;
-+            }
-+        }
-+    }
-+    if (ret->path == NULL) {
-+        if (asprintf(err, "Required field '%s' not present", "path") < 0)
-+            *err = safe_strdup("error allocating memory");
-+        free_defs_hook(ret);
-+        return NULL;
-+    }
-+
-+    if (tree->type == yajl_t_object && (ctx->options & PARSE_OPTIONS_STRICT)) {
-+        int i;
-+        for (i = 0; i < tree->u.object.len; i++)
-+            if (strcmp(tree->u.object.keysi, "path") &&
-+                strcmp(tree->u.object.keysi, "args") &&
-+                strcmp(tree->u.object.keysi, "env") &&
-+                strcmp(tree->u.object.keysi, "timeout")) {
-+                if (ctx->stderr > 0)
-+                    fprintf(ctx->stderr, "WARNING: unknown key found: %s\n", tree->u.object.keysi);
-+            }
-+        }
-+    return ret;
-+}
-+
-+void free_defs_hook(defs_hook *ptr) {
-+    if (ptr == NULL)
-+        return;
-+    free(ptr->path);
-+    ptr->path = NULL;
-+    if (ptr->args != NULL) {
-+        size_t i;
-+        for (i = 0; i < ptr->args_len; i++) {
-+            if (ptr->argsi != NULL) {
-+                free(ptr->argsi);
-+                ptr->argsi = NULL;
-+            }
-+        }
-+        free(ptr->args);
-+        ptr->args = NULL;
-+    }
-+    if (ptr->env != NULL) {
-+        size_t i;
-+        for (i = 0; i < ptr->env_len; i++) {
-+            if (ptr->envi != NULL) {
-+                free(ptr->envi);
-+                ptr->envi = NULL;
-+            }
-+        }
-+        free(ptr->env);
-+        ptr->env = NULL;
-+    }
-+    free(ptr);
-+}
-+
-+yajl_gen_status gen_defs_hook(yajl_gen g, defs_hook *ptr, struct parser_context *ctx, parser_error *err) {
-+    yajl_gen_status stat = yajl_gen_status_ok;
-+    *err = 0;
-+    stat = reformat_start_map(g);
-+    if (yajl_gen_status_ok != stat)
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->path != NULL)) {
-+        char *str = "";
-+        stat = reformat_map_key(g, "path", strlen("path"));
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        if (ptr != NULL && ptr->path != NULL) {
-+            str = ptr->path;
-+        }
-+        stat = reformat_string(g, str, strlen(str));
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) || (ptr != NULL && ptr->args != NULL)) {
-+        size_t len = 0, i;
-+        stat = reformat_map_key(g, "args", strlen("args"));
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        if (ptr != NULL && ptr->args != NULL) {
-+            len = ptr->args_len;
-+        }
-+        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
-+            yajl_gen_config(g, yajl_gen_beautify, 0);
-+        stat = reformat_start_array(g);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        for (i = 0; i < len; i++) {
-+            stat = reformat_string(g, ptr->argsi, strlen(ptr->argsi));
-+            if (yajl_gen_status_ok != stat)
-+                GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_end_array(g);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
-+            yajl_gen_config(g, yajl_gen_beautify, 1);
-+    }
-+    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) || (ptr != NULL && ptr->env != NULL)) {
-+        size_t len = 0, i;
-+        stat = reformat_map_key(g, "env", strlen("env"));
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        if (ptr != NULL && ptr->env != NULL) {
-+            len = ptr->env_len;
-+        }
-+        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
-+            yajl_gen_config(g, yajl_gen_beautify, 0);
-+        stat = reformat_start_array(g);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        for (i = 0; i < len; i++) {
-+            stat = reformat_string(g, ptr->envi, strlen(ptr->envi));
-+            if (yajl_gen_status_ok != stat)
-+                GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_end_array(g);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
-+            yajl_gen_config(g, yajl_gen_beautify, 1);
-+    }
-+    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->timeout)) {
-+        long long int num = 0;
-+        stat = reformat_map_key(g, "timeout", strlen("timeout"));
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        if (ptr != NULL && ptr->timeout) {
-+            num = (long long int)ptr->timeout;
-+        }
-+        stat = reformat_int(g, num);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    stat = reformat_end_map(g);
-+    if (yajl_gen_status_ok != stat)
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+    return yajl_gen_status_ok;
-+}
-diff --git a/src/lxc/json/defs.h b/src/lxc/json/defs.h
-new file mode 100644
-index 0000000..0bbd8ac
---- /dev/null
-+++ b/src/lxc/json/defs.h
-@@ -0,0 +1,37 @@
-+// Generated from defs.json. Do not edit!
-+#ifndef DEFS_SCHEMA_H
-+#define DEFS_SCHEMA_H
-+
-+#include <sys/types.h>
-+#include <stdint.h>
-+#include "json_common.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef struct {
-+    char *path;
-+
-+    char **args;
-+    size_t args_len;
-+
-+    char **env;
-+    size_t env_len;
-+
-+    int timeout;
-+
-+}
-+defs_hook;
-+
-+void free_defs_hook(defs_hook *ptr);
-+
-+defs_hook *make_defs_hook(yajl_val tree, struct parser_context *ctx, parser_error *err);
-+
-+yajl_gen_status gen_defs_hook(yajl_gen g, defs_hook *ptr, struct parser_context *ctx, parser_error *err);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/src/lxc/json/json_common.c b/src/lxc/json/json_common.c
-new file mode 100755
-index 0000000..ec20c59
---- /dev/null
-+++ b/src/lxc/json/json_common.c
-@@ -0,0 +1,1153 @@
-+// Auto generated file. Do not edit!
-+#define _GNU_SOURCE
-+#include <stdio.h>
-+#include <errno.h>
-+#include <limits.h>
-+#include "json_common.h"
-+
-+#define MAX_NUM_STR_LEN 21
-+
-+yajl_gen_status reformat_number(void *ctx, const char *str, size_t len) {
-+    yajl_gen g = (yajl_gen) ctx;
-+    return yajl_gen_number(g, str, len);
-+}
-+
-+yajl_gen_status reformat_uint(void *ctx, long long unsigned int num) {
-+    char numstrMAX_NUM_STR_LEN;
-+    int ret;
-+
-+    ret = snprintf(numstr, MAX_NUM_STR_LEN, "%llu", num);
-+    if (ret < 0 || ret >= MAX_NUM_STR_LEN) {
-+        return yajl_gen_in_error_state;
-+    }
-+    return reformat_number(ctx, (const char *)numstr, strlen(numstr));
-+}
-+
-+yajl_gen_status reformat_int(void *ctx, long long int num) {
-+    char numstrMAX_NUM_STR_LEN;
-+    int ret;
-+
-+    ret = snprintf(numstr, MAX_NUM_STR_LEN, "%lld", num);
-+    if (ret < 0 || ret >= MAX_NUM_STR_LEN) {
-+        return yajl_gen_in_error_state;
-+    }
-+    return reformat_number(ctx, (const char *)numstr, strlen(numstr));
-+}
-+
-+yajl_gen_status reformat_double(void *ctx, double num) {
-+    yajl_gen g = (yajl_gen) ctx;
-+    return yajl_gen_double(g, num);
-+}
-+
-+yajl_gen_status reformat_string(void *ctx, const char *str, size_t len) {
-+    yajl_gen g = (yajl_gen) ctx;
-+    return yajl_gen_string(g, (const unsigned char *)str, len);
-+}
-+
-+yajl_gen_status reformat_null(void *ctx) {
-+    yajl_gen g = (yajl_gen) ctx;
-+    return yajl_gen_null(g);
-+}
-+
-+yajl_gen_status reformat_bool(void *ctx, int boolean) {
-+    yajl_gen g = (yajl_gen) ctx;
-+    return yajl_gen_bool(g, boolean);
-+}
-+
-+yajl_gen_status reformat_map_key(void *ctx, const char *str, size_t len) {
-+    yajl_gen g = (yajl_gen) ctx;
-+    return yajl_gen_string(g, (const unsigned char *)str, len);
-+}
-+
-+yajl_gen_status reformat_start_map(void *ctx) {
-+    yajl_gen g = (yajl_gen) ctx;
-+    return yajl_gen_map_open(g);
-+}
-+
-+yajl_gen_status reformat_end_map(void *ctx) {
-+    yajl_gen g = (yajl_gen) ctx;
-+    return yajl_gen_map_close(g);
-+}
-+
-+yajl_gen_status reformat_start_array(void *ctx) {
-+    yajl_gen g = (yajl_gen) ctx;
-+    return yajl_gen_array_open(g);
-+}
-+
-+yajl_gen_status reformat_end_array(void *ctx) {
-+    yajl_gen g = (yajl_gen) ctx;
-+    return yajl_gen_array_close(g);
-+}
-+
-+bool json_gen_init(yajl_gen *g, struct parser_context *ctx) {
-+    *g = yajl_gen_alloc(NULL);
-+    if (NULL == *g) {
-+        return false;
-+
-+    }
-+    yajl_gen_config(*g, yajl_gen_beautify, !(ctx->options & GEN_OPTIONS_SIMPLIFY));
-+    yajl_gen_config(*g, yajl_gen_validate_utf8, !(ctx->options & GEN_OPTIONS_NOT_VALIDATE_UTF8));
-+    return true;
-+}
-+
-+yajl_val get_val(yajl_val tree, const char *name, yajl_type type) {
-+    const char *path = { name, NULL };
-+    return yajl_tree_get(tree, path, type);
-+}
-+
-+void *safe_malloc(size_t size) {
-+    void *ret = NULL;
-+    if (size == 0) {
-+        abort();
-+    }
-+    ret = calloc(1, size);
-+    if (ret == NULL) {
-+        abort();
-+    }
-+    return ret;
-+}
-+
-+int common_safe_double(const char *numstr, double *converted) {
-+    char *err_str = NULL;
-+    double d;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    d = strtod(numstr, &err_str);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err_str == NULL || err_str == numstr || *err_str != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    *converted = d;
-+    return 0;
-+}
-+
-+int common_safe_uint8(const char *numstr, uint8_t *converted) {
-+    char *err = NULL;
-+    unsigned long int uli;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    uli = strtoul(numstr, &err, 0);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err == NULL || err == numstr || *err != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    if (uli > UINT8_MAX) {
-+        return -ERANGE;
-+    }
-+
-+    *converted = (uint8_t)uli;
-+    return 0;
-+}
-+
-+int common_safe_uint16(const char *numstr, uint16_t *converted) {
-+    char *err = NULL;
-+    unsigned long int uli;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    uli = strtoul(numstr, &err, 0);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err == NULL || err == numstr || *err != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    if (uli > UINT16_MAX) {
-+        return -ERANGE;
-+    }
-+
-+    *converted = (uint16_t)uli;
-+    return 0;
-+}
-+
-+int common_safe_uint32(const char *numstr, uint32_t *converted) {
-+    char *err = NULL;
-+    unsigned long long int ull;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    ull = strtoull(numstr, &err, 0);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err == NULL || err == numstr || *err != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    if (ull > UINT32_MAX) {
-+        return -ERANGE;
-+    }
-+
-+    *converted = (uint32_t)ull;
-+    return 0;
-+}
-+
-+int common_safe_uint64(const char *numstr, uint64_t *converted) {
-+    char *err = NULL;
-+    unsigned long long int ull;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    ull = strtoull(numstr, &err, 0);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err == NULL || err == numstr || *err != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    *converted = (uint64_t)ull;
-+    return 0;
-+}
-+
-+int common_safe_uint(const char *numstr, unsigned int *converted) {
-+    char *err = NULL;
-+    unsigned long long int ull;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    ull = strtoull(numstr, &err, 0);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err == NULL || err == numstr || *err != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    if (ull > UINT_MAX) {
-+        return -ERANGE;
-+    }
-+
-+    *converted = (unsigned int)ull;
-+    return 0;
-+}
-+
-+int common_safe_int8(const char *numstr, int8_t *converted) {
-+    char *err = NULL;
-+    long int li;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    li = strtol(numstr, &err, 0);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err == NULL || err == numstr || *err != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    if (li > INT8_MAX || li < INT8_MIN) {
-+        return -ERANGE;
-+    }
-+
-+    *converted = (int8_t)li;
-+    return 0;
-+}
-+
-+int common_safe_int16(const char *numstr, int16_t *converted) {
-+    char *err = NULL;
-+    long int li;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    li = strtol(numstr, &err, 0);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err == NULL || err == numstr || *err != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    if (li > INT16_MAX || li < INT16_MIN) {
-+        return -ERANGE;
-+    }
-+
-+    *converted = (int16_t)li;
-+    return 0;
-+}
-+
-+int common_safe_int32(const char *numstr, int32_t *converted) {
-+    char *err = NULL;
-+    long long int lli;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    lli = strtol(numstr, &err, 0);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err == NULL || err == numstr || *err != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    if (lli > INT32_MAX || lli < INT32_MIN) {
-+        return -ERANGE;
-+    }
-+
-+    *converted = (int32_t)lli;
-+    return 0;
-+}
-+
-+int common_safe_int64(const char *numstr, int64_t *converted) {
-+    char *err = NULL;
-+    long long int lli;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    lli = strtoll(numstr, &err, 0);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err == NULL || err == numstr || *err != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    *converted = (int64_t)lli;
-+    return 0;
-+}
-+
-+int common_safe_int(const char *numstr, int *converted) {
-+    char *err = NULL;
-+    long long int lli;
-+
-+    if (numstr == NULL) {
-+        return -EINVAL;
-+    }
-+
-+    errno = 0;
-+    lli = strtol(numstr, &err, 0);
-+    if (errno > 0) {
-+        return -errno;
-+    }
-+
-+    if (err == NULL || err == numstr || *err != '\0') {
-+        return -EINVAL;
-+    }
-+
-+    if (lli > INT_MAX || lli < INT_MIN) {
-+        return -ERANGE;
-+    }
-+
-+    *converted = (int)lli;
-+    return 0;
-+}
-+
-+yajl_gen_status gen_json_map_int_int(void *ctx, json_map_int_int *map, struct parser_context *ptx, parser_error *err) {
-+    yajl_gen_status stat = yajl_gen_status_ok;
-+    yajl_gen g = (yajl_gen) ctx;
-+    size_t len = 0, i = 0;
-+    if (map != NULL) {
-+        len = map->len;
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 0);
-+    }
-+    stat = reformat_start_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+
-+    }
-+    for (i = 0; i < len; i++) {
-+        char numstrMAX_NUM_STR_LEN;
-+        int nret;
-+        nret = snprintf(numstr, MAX_NUM_STR_LEN, "%lld", (long long int)map->keysi);
-+        if (nret < 0 || nret >= MAX_NUM_STR_LEN) {
-+            if (!*err && asprintf(err, "Error to print string") < 0) {
-+                *(err) = safe_strdup("error allocating memory");
-+            }
-+            return yajl_gen_in_error_state;
-+        }
-+        stat = reformat_string(g, numstr, strlen(numstr));
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_int(g, map->valuesi);
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+    }
-+
-+    stat = reformat_end_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 1);
-+    }
-+    return yajl_gen_status_ok;
-+}
-+
-+void free_json_map_int_int(json_map_int_int *map) {
-+    if (map != NULL) {
-+        size_t i;
-+        for (i = 0; i < map->len; i++) {
-+            // No need to free key for type int
-+            // No need to free value for type int
-+        }
-+        free(map->keys);
-+        map->keys = NULL;
-+        free(map->values);
-+        map->values = NULL;
-+        free(map);
-+    }
-+}
-+json_map_int_int *make_json_map_int_int(yajl_val src, struct parser_context *ctx, parser_error *err) {
-+    json_map_int_int *ret = NULL;
-+    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
-+        size_t i;
-+        size_t len = YAJL_GET_OBJECT(src)->len;
-+        if (len > SIZE_MAX / sizeof(int) - 1) {
-+            return NULL;
-+        }
-+        ret = safe_malloc(sizeof(*ret));
-+        ret->len = len;
-+        ret->keys = safe_malloc((len + 1) * sizeof(int));
-+        ret->values = safe_malloc((len + 1) * sizeof(int));
-+        for (i = 0; i < len; i++) {
-+            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
-+            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
-+
-+            if (srckey != NULL) {
-+                int invalid;
-+                invalid = common_safe_int(srckey, &(ret->keysi));
-+                if (invalid) {
-+                    if (*err == NULL && asprintf(err, "Invalid key '%s' with type 'int': %s", srckey, strerror(-invalid)) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_int_int(ret);
-+                    return NULL;
-+                }
-+            }
-+
-+            if (srcval != NULL) {
-+                int invalid;
-+                if (!YAJL_IS_NUMBER(srcval)) {
-+                    if (*err == NULL && asprintf(err, "Invalid value with type 'int' for key '%s'", srckey) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_int_int(ret);
-+                    return NULL;
-+                }
-+                invalid = common_safe_int(YAJL_GET_NUMBER(srcval), &(ret->valuesi));
-+                if (invalid) {
-+                    if (*err == NULL && asprintf(err, "Invalid value with type 'int' for key '%s': %s", srckey, strerror(-invalid)) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_int_int(ret);
-+                    return NULL;
-+                }
-+            }
-+        }
-+    }
-+    return ret;
-+}
-+int append_json_map_int_int(json_map_int_int *map, int key, int val) {
-+    size_t len;
-+    int *keys = NULL;
-+    int *vals = NULL;
-+
-+    if (map == NULL) {
-+        return -1;
-+    }
-+
-+    if ((SIZE_MAX / sizeof(int) - 1) < map->len) {
-+        return -1;
-+    }
-+
-+    len = map->len + 1;
-+    keys = safe_malloc(len * sizeof(int));
-+    vals = safe_malloc(len * sizeof(int));
-+
-+    if (map->len) {
-+        (void)memcpy(keys, map->keys, map->len * sizeof(int));
-+        (void)memcpy(vals, map->values, map->len * sizeof(int));
-+    }
-+    free(map->keys);
-+    map->keys = keys;
-+    free(map->values);
-+    map->values = vals;
-+    map->keysmap->len = key;
-+    map->valuesmap->len = val;
-+
-+    map->len++;
-+    return 0;
-+}
-+
-+yajl_gen_status gen_json_map_int_bool(void *ctx, json_map_int_bool *map, struct parser_context *ptx, parser_error *err) {
-+    yajl_gen_status stat = yajl_gen_status_ok;
-+    yajl_gen g = (yajl_gen) ctx;
-+    size_t len = 0, i = 0;
-+    if (map != NULL) {
-+        len = map->len;
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 0);
-+    }
-+    stat = reformat_start_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+
-+    }
-+    for (i = 0; i < len; i++) {
-+        char numstrMAX_NUM_STR_LEN;
-+        int nret;
-+        nret = snprintf(numstr, MAX_NUM_STR_LEN, "%lld", (long long int)map->keysi);
-+        if (nret < 0 || nret >= MAX_NUM_STR_LEN) {
-+            if (!*err && asprintf(err, "Error to print string") < 0) {
-+                *(err) = safe_strdup("error allocating memory");
-+            }
-+            return yajl_gen_in_error_state;
-+        }
-+        stat = reformat_string(g, numstr, strlen(numstr));
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_bool(g, map->valuesi);
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+    }
-+
-+    stat = reformat_end_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 1);
-+    }
-+    return yajl_gen_status_ok;
-+}
-+
-+void free_json_map_int_bool(json_map_int_bool *map) {
-+    if (map != NULL) {
-+        free(map->keys);
-+        map->keys = NULL;
-+        free(map->values);
-+        map->values = NULL;
-+        free(map);
-+    }
-+}
-+json_map_int_bool *make_json_map_int_bool(yajl_val src, struct parser_context *ctx, parser_error *err) {
-+    json_map_int_bool *ret = NULL;
-+    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
-+        size_t i;
-+        size_t len = YAJL_GET_OBJECT(src)->len;
-+        if (len > SIZE_MAX / sizeof(int) - 1) {
-+            return NULL;
-+        }
-+        ret = safe_malloc(sizeof(*ret));
-+        ret->len = len;
-+        ret->keys = safe_malloc((len + 1) * sizeof(int));
-+        ret->values = safe_malloc((len + 1) * sizeof(bool));
-+        for (i = 0; i < len; i++) {
-+            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
-+            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
-+
-+            if (srckey != NULL) {
-+                int invalid;
-+                invalid = common_safe_int(srckey, &(ret->keysi));
-+                if (invalid) {
-+                    if (*err == NULL && asprintf(err, "Invalid key '%s' with type 'int': %s", srckey, strerror(-invalid)) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_int_bool(ret);
-+                    return NULL;
-+                }
-+            }
-+
-+            if (srcval != NULL) {
-+                if (YAJL_IS_TRUE(srcval)) {
-+                    ret->valuesi = true;
-+                } else if (YAJL_IS_FALSE(srcval)) {
-+                    ret->valuesi = false;
-+                } else {
-+                    if (*err == NULL && asprintf(err, "Invalid value with type 'bool' for key '%s'", srckey) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_int_bool(ret);
-+                    return NULL;
-+                }
-+            }
-+        }
-+    }
-+    return ret;
-+}
-+int append_json_map_int_bool(json_map_int_bool *map, int key, bool val) {
-+    size_t len;
-+    int *keys = NULL;
-+    bool *vals = NULL;
-+
-+    if (map == NULL) {
-+        return -1;
-+    }
-+
-+    if ((SIZE_MAX / sizeof(int) - 1) < map->len || (SIZE_MAX / sizeof(bool) - 1) < map->len) {
-+        return -1;
-+    }
-+
-+    len = map->len + 1;
-+    keys = safe_malloc(len * sizeof(int));
-+    vals = safe_malloc(len * sizeof(bool));
-+
-+    if (map->len) {
-+        (void)memcpy(keys, map->keys, map->len * sizeof(int));
-+        (void)memcpy(vals, map->values, map->len * sizeof(bool));
-+    }
-+    free(map->keys);
-+    map->keys = keys;
-+    free(map->values);
-+    map->values = vals;
-+    map->keysmap->len = key;
-+    map->valuesmap->len = val;
-+
-+    map->len++;
-+    return 0;
-+}
-+
-+yajl_gen_status gen_json_map_int_string(void *ctx, json_map_int_string *map, struct parser_context *ptx, parser_error *err) {
-+    yajl_gen_status stat = yajl_gen_status_ok;
-+    yajl_gen g = (yajl_gen) ctx;
-+    size_t len = 0, i = 0;
-+    if (map != NULL) {
-+        len = map->len;
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 0);
-+    }
-+    stat = reformat_start_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+
-+    }
-+    for (i = 0; i < len; i++) {
-+        char numstrMAX_NUM_STR_LEN;
-+        int nret;
-+        nret = snprintf(numstr, MAX_NUM_STR_LEN, "%lld", (long long int)map->keysi);
-+        if (nret < 0 || nret >= MAX_NUM_STR_LEN) {
-+            if (!*err && asprintf(err, "Error to print string") < 0) {
-+                *(err) = safe_strdup("error allocating memory");
-+            }
-+            return yajl_gen_in_error_state;
-+        }
-+        stat = reformat_string(g, numstr, strlen(numstr));
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_string(g, map->valuesi, strlen(map->valuesi));;
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+    }
-+
-+    stat = reformat_end_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 1);
-+    }
-+    return yajl_gen_status_ok;
-+}
-+
-+void free_json_map_int_string(json_map_int_string *map) {
-+    if (map != NULL) {
-+        size_t i;
-+        for (i = 0; i < map->len; i++) {
-+            // No need to free key for type int
-+            free(map->valuesi);
-+            map->valuesi = NULL;
-+        }
-+        free(map->keys);
-+        map->keys = NULL;
-+        free(map->values);
-+        map->values = NULL;
-+        free(map);
-+    }
-+}
-+json_map_int_string *make_json_map_int_string(yajl_val src, struct parser_context *ctx, parser_error *err) {
-+    json_map_int_string *ret = NULL;
-+    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
-+        size_t i;
-+        size_t len = YAJL_GET_OBJECT(src)->len;
-+        if (len > SIZE_MAX / sizeof(char *) - 1) {
-+            return NULL;
-+        }
-+        ret = safe_malloc(sizeof(*ret));
-+        ret->len = len;
-+        ret->keys = safe_malloc((len + 1) * sizeof(int));
-+        ret->values = safe_malloc((len + 1) * sizeof(char *));
-+        for (i = 0; i < len; i++) {
-+            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
-+            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
-+
-+            if (srckey != NULL) {
-+                int invalid;
-+                invalid = common_safe_int(srckey, &(ret->keysi));
-+                if (invalid) {
-+                    if (*err == NULL && asprintf(err, "Invalid key '%s' with type 'int': %s", srckey, strerror(-invalid)) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_int_string(ret);
-+                    return NULL;
-+                }
-+            }
-+
-+            if (srcval != NULL) {
-+                if (!YAJL_IS_STRING(srcval)) {
-+                    if (*err == NULL && asprintf(err, "Invalid value with type 'string' for key '%s'", srckey) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_int_string(ret);
-+                    return NULL;
-+                }
-+                char *str = YAJL_GET_STRING(srcval);
-+                ret->valuesi = safe_strdup(str ? str : "");
-+            }
-+        }
-+    }
-+    return ret;
-+}
-+int append_json_map_int_string(json_map_int_string *map, int key, const char *val) {
-+    size_t len;
-+    int *keys = NULL;
-+    char **vals = NULL;
-+
-+    if (map == NULL) {
-+        return -1;
-+    }
-+
-+    if ((SIZE_MAX / sizeof(int) - 1) < map->len || (SIZE_MAX / sizeof(char *) - 1) < map->len) {
-+        return -1;
-+    }
-+
-+    len = map->len + 1;
-+    keys = safe_malloc(len * sizeof(int));
-+    vals = safe_malloc(len * sizeof(char *));
-+
-+    if (map->len) {
-+        (void)memcpy(keys, map->keys, map->len * sizeof(int));
-+        (void)memcpy(vals, map->values, map->len * sizeof(char *));
-+    }
-+    free(map->keys);
-+    map->keys = keys;
-+    free(map->values);
-+    map->values = vals;
-+    map->keysmap->len = key;
-+    map->valuesmap->len = safe_strdup(val ? val : "");
-+
-+    map->len++;
-+    return 0;
-+}
-+
-+yajl_gen_status gen_json_map_string_int(void *ctx, json_map_string_int *map, struct parser_context *ptx, parser_error *err) {
-+    yajl_gen_status stat = yajl_gen_status_ok;
-+    yajl_gen g = (yajl_gen) ctx;
-+    size_t len = 0, i = 0;
-+    if (map != NULL) {
-+        len = map->len;
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 0);
-+    }
-+    stat = reformat_start_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+
-+    }
-+    for (i = 0; i < len; i++) {
-+        stat = reformat_string(g, map->keysi, strlen(map->keysi));
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_int(g, map->valuesi);
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+    }
-+
-+    stat = reformat_end_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 1);
-+    }
-+    return yajl_gen_status_ok;
-+}
-+
-+void free_json_map_string_int(json_map_string_int *map) {
-+    if (map != NULL) {
-+        size_t i;
-+        for (i = 0; i < map->len; i++) {
-+            free(map->keysi);
-+            map->keysi = NULL;
-+            // No need to free value for type int
-+        }
-+        free(map->keys);
-+        map->keys = NULL;
-+        free(map->values);
-+        map->values = NULL;
-+        free(map);
-+    }
-+}
-+json_map_string_int *make_json_map_string_int(yajl_val src, struct parser_context *ctx, parser_error *err) {
-+    json_map_string_int *ret = NULL;
-+    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
-+        size_t i;
-+        size_t len = YAJL_GET_OBJECT(src)->len;
-+        if (len > SIZE_MAX / sizeof(char *) - 1) {
-+            return NULL;
-+        }
-+        ret = safe_malloc(sizeof(*ret));
-+        ret->len = len;
-+        ret->keys = safe_malloc((len + 1) * sizeof(char *));
-+        ret->values = safe_malloc((len + 1) * sizeof(int));
-+        for (i = 0; i < len; i++) {
-+            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
-+            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
-+            ret->keysi = safe_strdup(srckey ? srckey : "");
-+
-+            if (srcval != NULL) {
-+                int invalid;
-+                if (!YAJL_IS_NUMBER(srcval)) {
-+                    if (*err == NULL && asprintf(err, "Invalid value with type 'int' for key '%s'", srckey) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_string_int(ret);
-+                    return NULL;
-+                }
-+                invalid = common_safe_int(YAJL_GET_NUMBER(srcval), &(ret->valuesi));
-+                if (invalid) {
-+                    if (*err == NULL && asprintf(err, "Invalid value with type 'int' for key '%s': %s", srckey, strerror(-invalid)) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_string_int(ret);
-+                    return NULL;
-+                }
-+            }
-+        }
-+    }
-+    return ret;
-+}
-+int append_json_map_string_int(json_map_string_int *map, const char *key, int val) {
-+    size_t len;
-+    char **keys = NULL;
-+    int *vals = NULL;
-+
-+    if (map == NULL) {
-+        return -1;
-+    }
-+
-+    if ((SIZE_MAX / sizeof(char *) - 1) < map->len || (SIZE_MAX / sizeof(int) - 1) < map->len) {
-+        return -1;
-+    }
-+
-+    len = map->len + 1;
-+    keys = safe_malloc(len * sizeof(char *));
-+    vals = safe_malloc(len * sizeof(int));
-+
-+    if (map->len) {
-+        (void)memcpy(keys, map->keys, map->len * sizeof(char *));
-+        (void)memcpy(vals, map->values, map->len * sizeof(int));
-+    }
-+    free(map->keys);
-+    map->keys = keys;
-+    free(map->values);
-+    map->values = vals;
-+    map->keysmap->len = safe_strdup(key ? key : "");
-+    map->valuesmap->len = val;
-+
-+    map->len++;
-+    return 0;
-+}
-+
-+yajl_gen_status gen_json_map_string_bool(void *ctx, json_map_string_bool *map, struct parser_context *ptx, parser_error *err) {
-+    yajl_gen_status stat = yajl_gen_status_ok;
-+    yajl_gen g = (yajl_gen) ctx;
-+    size_t len = 0, i = 0;
-+    if (map != NULL) {
-+        len = map->len;
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 0);
-+    }
-+    stat = reformat_start_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+
-+    }
-+    for (i = 0; i < len; i++) {
-+        stat = reformat_string(g, map->keysi, strlen(map->keysi));
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_bool(g, map->valuesi);
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+    }
-+
-+    stat = reformat_end_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 1);
-+    }
-+    return yajl_gen_status_ok;
-+}
-+
-+void free_json_map_string_bool(json_map_string_bool *map) {
-+    if (map != NULL) {
-+        size_t i;
-+        for (i = 0; i < map->len; i++) {
-+            free(map->keysi);
-+            map->keysi = NULL;
-+            // No need to free value for type bool
-+        }
-+        free(map->keys);
-+        map->keys = NULL;
-+        free(map->values);
-+        map->values = NULL;
-+        free(map);
-+    }
-+}
-+json_map_string_bool *make_json_map_string_bool(yajl_val src, struct parser_context *ctx, parser_error *err) {
-+    json_map_string_bool *ret = NULL;
-+    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
-+        size_t i;
-+        size_t len = YAJL_GET_OBJECT(src)->len;
-+        if (len > SIZE_MAX / sizeof(char *) - 1) {
-+            return NULL;
-+        }
-+        ret = safe_malloc(sizeof(*ret));
-+        ret->len = len;
-+        ret->keys = safe_malloc((len + 1) * sizeof(char *));
-+        ret->values = safe_malloc((len + 1) * sizeof(bool));
-+        for (i = 0; i < len; i++) {
-+            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
-+            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
-+            ret->keysi = safe_strdup(srckey ? srckey : "");
-+
-+            if (srcval != NULL) {
-+                if (YAJL_IS_TRUE(srcval)) {
-+                    ret->valuesi = true;
-+                } else if (YAJL_IS_FALSE(srcval)) {
-+                    ret->valuesi = false;
-+                } else {
-+                    if (*err == NULL && asprintf(err, "Invalid value with type 'bool' for key '%s'", srckey) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_string_bool(ret);
-+                    return NULL;
-+                }
-+            }
-+        }
-+    }
-+    return ret;
-+}
-+
-+int append_json_map_string_bool(json_map_string_bool *map, const char *key, bool val) {
-+    size_t len;
-+    char **keys = NULL;
-+    bool *vals = NULL;
-+
-+    if (map == NULL) {
-+        return -1;
-+    }
-+
-+    if ((SIZE_MAX / sizeof(char *) - 1) < map->len || (SIZE_MAX / sizeof(bool) - 1) < map->len) {
-+        return -1;
-+    }
-+
-+    len = map->len + 1;
-+    keys = safe_malloc(len * sizeof(char *));
-+    vals = safe_malloc(len * sizeof(bool));
-+
-+    if (map->len) {
-+        (void)memcpy(keys, map->keys, map->len * sizeof(char *));
-+        (void)memcpy(vals, map->values, map->len * sizeof(bool));
-+    }
-+    free(map->keys);
-+    map->keys = keys;
-+    free(map->values);
-+    map->values = vals;
-+    map->keysmap->len = safe_strdup(key ? key : "");
-+    map->valuesmap->len = val;
-+
-+    map->len++;
-+    return 0;
-+}
-+
-+yajl_gen_status gen_json_map_string_string(void *ctx, json_map_string_string *map, struct parser_context *ptx, parser_error *err) {
-+    yajl_gen_status stat = yajl_gen_status_ok;
-+    yajl_gen g = (yajl_gen) ctx;
-+    size_t len = 0, i = 0;
-+    if (map != NULL) {
-+        len = map->len;
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 0);
-+    }
-+    stat = reformat_start_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+
-+    }
-+    for (i = 0; i < len; i++) {
-+        stat = reformat_string(g, map->keysi, strlen(map->keysi));
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_string(g, map->valuesi, strlen(map->valuesi));;
-+        if (yajl_gen_status_ok != stat) {
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+    }
-+
-+    stat = reformat_end_map(g);
-+    if (yajl_gen_status_ok != stat) {
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    if (!len && !(ptx->options & GEN_OPTIONS_SIMPLIFY)) {
-+        yajl_gen_config(g, yajl_gen_beautify, 1);
-+    }
-+    return yajl_gen_status_ok;
-+}
-+
-+void free_json_map_string_string(json_map_string_string *map) {
-+    if (map != NULL) {
-+        size_t i;
-+        for (i = 0; i < map->len; i++) {
-+            free(map->keysi);
-+            map->keysi = NULL;
-+            free(map->valuesi);
-+            map->valuesi = NULL;
-+        }
-+        free(map->keys);
-+        map->keys = NULL;
-+        free(map->values);
-+        map->values = NULL;
-+        free(map);
-+    }
-+}
-+json_map_string_string *make_json_map_string_string(yajl_val src, struct parser_context *ctx, parser_error *err) {
-+    json_map_string_string *ret = NULL;
-+    if (src != NULL && YAJL_GET_OBJECT(src) != NULL) {
-+        size_t i;
-+        size_t len = YAJL_GET_OBJECT(src)->len;
-+        if (len > SIZE_MAX / sizeof(char *) - 1) {
-+            return NULL;
-+        }
-+        ret = safe_malloc(sizeof(*ret));
-+        ret->len = len;
-+        ret->keys = safe_malloc((len + 1) * sizeof(char *));
-+        ret->values = safe_malloc((len + 1) * sizeof(char *));
-+        for (i = 0; i < len; i++) {
-+            const char *srckey = YAJL_GET_OBJECT(src)->keysi;
-+            yajl_val srcval = YAJL_GET_OBJECT(src)->valuesi;
-+            ret->keysi = safe_strdup(srckey ? srckey : "");
-+
-+            if (srcval != NULL) {
-+                if (!YAJL_IS_STRING(srcval)) {
-+                    if (*err == NULL && asprintf(err, "Invalid value with type 'string' for key '%s'", srckey) < 0) {
-+                        *(err) = safe_strdup("error allocating memory");
-+                    }
-+                    free_json_map_string_string(ret);
-+                    return NULL;
-+                }
-+                char *str = YAJL_GET_STRING(srcval);
-+                ret->valuesi = safe_strdup(str ? str : "");
-+            }
-+        }
-+    }
-+    return ret;
-+}
-+int append_json_map_string_string(json_map_string_string *map, const char *key, const char *val) {
-+    size_t len, i;
-+    char **keys = NULL;
-+    char **vals = NULL;
-+
-+    if (map == NULL) {
-+        return -1;
-+    }
-+
-+    for (i = 0; i < map->len; i++) {
-+        if (strcmp(map->keysi, key) == 0) {
-+            free(map->valuesi);
-+            map->valuesi = safe_strdup(val ? val : "");
-+            return 0;
-+        }
-+    }
-+
-+    if ((SIZE_MAX / sizeof(char *) - 1) < map->len) {
-+        return -1;
-+    }
-+
-+    len = map->len + 1;
-+    keys = safe_malloc(len * sizeof(char *));
-+    vals = safe_malloc(len * sizeof(char *));
-+
-+    if (map->len) {
-+        (void)memcpy(keys, map->keys, map->len * sizeof(char *));
-+        (void)memcpy(vals, map->values, map->len * sizeof(char *));
-+    }
-+    free(map->keys);
-+    map->keys = keys;
-+    free(map->values);
-+    map->values = vals;
-+    map->keysmap->len = safe_strdup(key ? key : "");
-+    map->valuesmap->len = safe_strdup(val ? val : "");
-+
-+    map->len++;
-+    return 0;
-+}
-diff --git a/src/lxc/json/json_common.h b/src/lxc/json/json_common.h
-new file mode 100755
-index 0000000..60aa5fd
---- /dev/null
-+++ b/src/lxc/json/json_common.h
-@@ -0,0 +1,185 @@
-+// Auto generated file. Do not edit!
-+#ifndef _JSON_COMMON_H
-+#define _JSON_COMMON_H
-+
-+#include <stdbool.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <yajl/yajl_tree.h>
-+#include <yajl/yajl_gen.h>
-+#include "utils.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+# undef linux
-+
-+//options to report error if there is unknown key found in json
-+# define PARSE_OPTIONS_STRICT 0x01
-+//options to generate all key and value
-+# define GEN_OPTIONS_ALLKEYVALUE 0x02
-+//options to generate simplify(no indent) json string
-+# define GEN_OPTIONS_SIMPLIFY 0x04
-+//options not to validate utf8 data
-+# define GEN_OPTIONS_NOT_VALIDATE_UTF8 0x08
-+
-+#define GEN_SET_ERROR_AND_RETURN(stat, err) { \
-+        if (*(err) == NULL) {\
-+            if (asprintf(err, "%s: %s: %d: error generating json, errcode: %d", __FILE__, __func__, __LINE__, stat) < 0) { \
-+                *(err) = safe_strdup("error allocating memory"); \
-+            } \
-+        }\
-+        return stat; \
-+    }
-+
-+typedef char *parser_error;
-+
-+struct parser_context {
-+    unsigned int options;
-+    FILE *stderr;
-+};
-+
-+yajl_gen_status reformat_number(void *ctx, const char *str, size_t len);
-+
-+yajl_gen_status reformat_uint(void *ctx, long long unsigned int num);
-+
-+yajl_gen_status reformat_int(void *ctx, long long int num);
-+
-+yajl_gen_status reformat_double(void *ctx, double num);
-+
-+yajl_gen_status reformat_string(void *ctx, const char *str, size_t len);
-+
-+yajl_gen_status reformat_null(void *ctx);
-+
-+yajl_gen_status reformat_bool(void *ctx, int boolean);
-+
-+yajl_gen_status reformat_map_key(void *ctx, const char *str, size_t len);
-+
-+yajl_gen_status reformat_start_map(void *ctx);
-+
-+yajl_gen_status reformat_end_map(void *ctx);
-+
-+yajl_gen_status reformat_start_array(void *ctx);
-+
-+yajl_gen_status reformat_end_array(void *ctx);
-+
-+bool json_gen_init(yajl_gen *g, struct parser_context *ctx);
-+
-+yajl_val get_val(yajl_val tree, const char *name, yajl_type type);
-+
-+void *safe_malloc(size_t size);
-+
-+int common_safe_double(const char *numstr, double *converted);
-+
-+int common_safe_uint8(const char *numstr, uint8_t *converted);
-+
-+int common_safe_uint16(const char *numstr, uint16_t *converted);
-+
-+int common_safe_uint32(const char *numstr, uint32_t *converted);
-+
-+int common_safe_uint64(const char *numstr, uint64_t *converted);
-+
-+int common_safe_uint(const char *numstr, unsigned int *converted);
-+
-+int common_safe_int8(const char *numstr, int8_t *converted);
-+
-+int common_safe_int16(const char *numstr, int16_t *converted);
-+
-+int common_safe_int32(const char *numstr, int32_t *converted);
-+
-+int common_safe_int64(const char *numstr, int64_t *converted);
-+
-+int common_safe_int(const char *numstr, int *converted);
-+
-+typedef struct {
-+    int *keys;
-+    int *values;
-+    size_t len;
-+} json_map_int_int;
-+
-+void free_json_map_int_int(json_map_int_int *map);
-+
-+json_map_int_int *make_json_map_int_int(yajl_val src, struct parser_context *ctx, parser_error *err);
-+
-+yajl_gen_status gen_json_map_int_int(void *ctx, json_map_int_int *map, struct parser_context *ptx, parser_error *err);
-+
-+int append_json_map_int_int(json_map_int_int *map, int key, int val);
-+
-+typedef struct {
-+    int *keys;
-+    bool *values;
-+    size_t len;
-+} json_map_int_bool;
-+
-+void free_json_map_int_bool(json_map_int_bool *map);
-+
-+json_map_int_bool *make_json_map_int_bool(yajl_val src, struct parser_context *ctx, parser_error *err);
-+
-+yajl_gen_status gen_json_map_int_bool(void *ctx, json_map_int_bool *map, struct parser_context *ptx, parser_error *err);
-+
-+int append_json_map_int_bool(json_map_int_bool *map, int key, bool val);
-+
-+typedef struct {
-+    int *keys;
-+    char **values;
-+    size_t len;
-+} json_map_int_string;
-+
-+void free_json_map_int_string(json_map_int_string *map);
-+
-+json_map_int_string *make_json_map_int_string(yajl_val src, struct parser_context *ctx, parser_error *err);
-+
-+yajl_gen_status gen_json_map_int_string(void *ctx, json_map_int_string *map, struct parser_context *ptx, parser_error *err);
-+
-+int append_json_map_int_string(json_map_int_string *map, int key, const char *val);
-+
-+typedef struct {
-+    char **keys;
-+    int *values;
-+    size_t len;
-+} json_map_string_int;
-+
-+void free_json_map_string_int(json_map_string_int *map);
-+
-+json_map_string_int *make_json_map_string_int(yajl_val src, struct parser_context *ctx, parser_error *err);
-+
-+yajl_gen_status gen_json_map_string_int(void *ctx, json_map_string_int *map, struct parser_context *ptx, parser_error *err);
-+
-+int append_json_map_string_int(json_map_string_int *map, const char *key, int val);
-+
-+typedef struct {
-+    char **keys;
-+    bool *values;
-+    size_t len;
-+} json_map_string_bool;
-+
-+void free_json_map_string_bool(json_map_string_bool *map);
-+
-+json_map_string_bool *make_json_map_string_bool(yajl_val src, struct parser_context *ctx, parser_error *err);
-+
-+yajl_gen_status gen_json_map_string_bool(void *ctx, json_map_string_bool *map, struct parser_context *ptx, parser_error *err);
-+
-+int append_json_map_string_bool(json_map_string_bool *map, const char *key, bool val);
-+
-+typedef struct {
-+    char **keys;
-+    char **values;
-+    size_t len;
-+} json_map_string_string;
-+
-+void free_json_map_string_string(json_map_string_string *map);
-+
-+json_map_string_string *make_json_map_string_string(yajl_val src, struct parser_context *ctx, parser_error *err);
-+
-+yajl_gen_status gen_json_map_string_string(void *ctx, json_map_string_string *map, struct parser_context *ptx, parser_error *err);
-+
-+int append_json_map_string_string(json_map_string_string *map, const char *key, const char *val);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-\ No newline at end of file
-diff --git a/src/lxc/json/logger_json_file.c b/src/lxc/json/logger_json_file.c
-new file mode 100644
-index 0000000..6abeef4
---- /dev/null
-+++ b/src/lxc/json/logger_json_file.c
-@@ -0,0 +1,246 @@
-+// Generated from json-file.json. Do not edit!
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+#include <string.h>
-+#include <read-file.h>
-+#include "logger_json_file.h"
-+
-+logger_json_file *make_logger_json_file(yajl_val tree, struct parser_context *ctx, parser_error *err) {
-+	logger_json_file *ret = NULL;
-+	*err = 0;
-+	if (tree == NULL)
-+		return ret;
-+	ret = safe_malloc(sizeof(*ret));
-+	{
-+		yajl_val tmp = get_val(tree, "log", yajl_t_string);
-+		if (tmp != NULL) {
-+			char *str = YAJL_GET_STRING(tmp);
-+			ret->log = (uint8_t *)safe_strdup(str ? str : "");
-+			ret->log_len = str != NULL ? strlen(str) : 0;
-+		}
-+	}
-+	{
-+		yajl_val val = get_val(tree, "stream", yajl_t_string);
-+		if (val != NULL) {
-+			char *str = YAJL_GET_STRING(val);
-+			ret->stream = safe_strdup(str ? str : "");
-+		}
-+	}
-+	{
-+		yajl_val val = get_val(tree, "time", yajl_t_string);
-+		if (val != NULL) {
-+			char *str = YAJL_GET_STRING(val);
-+			ret->time = safe_strdup(str ? str : "");
-+		}
-+	}
-+	{
-+		yajl_val tmp = get_val(tree, "attrs", yajl_t_string);
-+		if (tmp != NULL) {
-+			char *str = YAJL_GET_STRING(tmp);
-+			ret->attrs = (uint8_t *)safe_strdup(str ? str : "");
-+			ret->attrs_len = str != NULL ? strlen(str) : 0;
-+		}
-+	}
-+
-+	if (tree->type == yajl_t_object && (ctx->options & PARSE_OPTIONS_STRICT)) {
-+		int i;
-+		for (i = 0; i < tree->u.object.len; i++)
-+			if (strcmp(tree->u.object.keysi, "log") &&
-+			                strcmp(tree->u.object.keysi, "stream") &&
-+			                strcmp(tree->u.object.keysi, "time") &&
-+			                strcmp(tree->u.object.keysi, "attrs")) {
-+				if (ctx->stderr > 0)
-+					fprintf(ctx->stderr, "WARNING: unknown key found: %s\n", tree->u.object.keysi);
-+			}
-+	}
-+	return ret;
-+}
-+
-+void free_logger_json_file(logger_json_file *ptr) {
-+	if (ptr == NULL)
-+		return;
-+	free(ptr->log);
-+	ptr->log = NULL;
-+	free(ptr->stream);
-+	ptr->stream = NULL;
-+	free(ptr->time);
-+	ptr->time = NULL;
-+	free(ptr->attrs);
-+	ptr->attrs = NULL;
-+	free(ptr);
-+}
-+
-+yajl_gen_status gen_logger_json_file(yajl_gen g, logger_json_file *ptr, struct parser_context *ctx, parser_error *err) {
-+	yajl_gen_status stat = yajl_gen_status_ok;
-+	*err = 0;
-+	stat = reformat_start_map(g);
-+	if (yajl_gen_status_ok != stat)
-+		GEN_SET_ERROR_AND_RETURN(stat, err);
-+	if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) || (ptr != NULL && ptr->log != NULL && ptr->log_len)) {
-+		const char *str = "";
-+		size_t len = 0;
-+		stat = reformat_map_key(g, "log", strlen("log"));
-+		if (yajl_gen_status_ok != stat)
-+			GEN_SET_ERROR_AND_RETURN(stat, err);
-+		if (ptr != NULL && ptr->log != NULL) {
-+			str = (const char *)ptr->log;
-+			len = ptr->log_len;
-+		}
-+		stat = reformat_string(g, str, len);
-+		if (yajl_gen_status_ok != stat)
-+			GEN_SET_ERROR_AND_RETURN(stat, err);
-+	}
-+	if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->stream != NULL)) {
-+		char *str = "";
-+		stat = reformat_map_key(g, "stream", strlen("stream"));
-+		if (yajl_gen_status_ok != stat)
-+			GEN_SET_ERROR_AND_RETURN(stat, err);
-+		if (ptr != NULL && ptr->stream != NULL) {
-+			str = ptr->stream;
-+		}
-+		stat = reformat_string(g, str, strlen(str));
-+		if (yajl_gen_status_ok != stat)
-+			GEN_SET_ERROR_AND_RETURN(stat, err);
-+	}
-+	if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->time != NULL)) {
-+		char *str = "";
-+		stat = reformat_map_key(g, "time", strlen("time"));
-+		if (yajl_gen_status_ok != stat)
-+			GEN_SET_ERROR_AND_RETURN(stat, err);
-+		if (ptr != NULL && ptr->time != NULL) {
-+			str = ptr->time;
-+		}
-+		stat = reformat_string(g, str, strlen(str));
-+		if (yajl_gen_status_ok != stat)
-+			GEN_SET_ERROR_AND_RETURN(stat, err);
-+	}
-+	if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) || (ptr != NULL && ptr->attrs != NULL && ptr->attrs_len)) {
-+		const char *str = "";
-+		size_t len = 0;
-+		stat = reformat_map_key(g, "attrs", strlen("attrs"));
-+		if (yajl_gen_status_ok != stat)
-+			GEN_SET_ERROR_AND_RETURN(stat, err);
-+		if (ptr != NULL && ptr->attrs != NULL) {
-+			str = (const char *)ptr->attrs;
-+			len = ptr->attrs_len;
-+		}
-+		stat = reformat_string(g, str, len);
-+		if (yajl_gen_status_ok != stat)
-+			GEN_SET_ERROR_AND_RETURN(stat, err);
-+	}
-+	stat = reformat_end_map(g);
-+	if (yajl_gen_status_ok != stat)
-+		GEN_SET_ERROR_AND_RETURN(stat, err);
-+	return yajl_gen_status_ok;
-+}
-+
-+
-+logger_json_file *logger_json_file_parse_file(const char *filename, struct parser_context *ctx, parser_error *err) {
-+	logger_json_file *ptr = NULL;
-+	size_t filesize;
-+	char *content = NULL;
-+
-+	if (filename == NULL || err == NULL)
-+		return NULL;
-+
-+	*err = NULL;
-+	content = read_file(filename, &filesize);
-+	if (content == NULL) {
-+		if (asprintf(err, "cannot read the file: %s", filename) < 0)
-+			*err = safe_strdup("error allocating memory");
-+		return NULL;
-+	}
-+	ptr = logger_json_file_parse_data(content, ctx, err);
-+	free(content);
-+	return ptr;
-+}
-+
-+logger_json_file *logger_json_file_parse_file_stream(FILE *stream, struct parser_context *ctx, parser_error *err) {
-+	logger_json_file *ptr = NULL;
-+	size_t filesize;
-+	char *content = NULL ;
-+
-+	if (stream == NULL || err == NULL)
-+		return NULL;
-+
-+	*err = NULL;
-+	content = fread_file(stream, &filesize);
-+	if (content == NULL) {
-+		*err = safe_strdup("cannot read the file");
-+		return NULL;
-+	}
-+	ptr = logger_json_file_parse_data(content, ctx, err);
-+	free(content);
-+	return ptr;
-+}
-+
-+logger_json_file *logger_json_file_parse_data(const char *jsondata, struct parser_context *ctx, parser_error *err) {
-+	logger_json_file *ptr  = NULL;
-+	yajl_val tree;
-+	char errbuf1024;
-+	struct parser_context tmp_ctx;
-+
-+	if (jsondata == NULL || err == NULL)
-+		return NULL;
-+
-+	*err = NULL;
-+	if (ctx == NULL) {
-+		ctx = &tmp_ctx;
-+		memset(&tmp_ctx, 0, sizeof(tmp_ctx));
-+	}
-+	tree = yajl_tree_parse(jsondata, errbuf, sizeof(errbuf));
-+	if (tree == NULL) {
-+		if (asprintf(err, "cannot parse the data: %s", errbuf) < 0)
-+			*err = safe_strdup("error allocating memory");
-+		return NULL;
-+	}
-+	ptr = make_logger_json_file(tree, ctx, err);
-+	yajl_tree_free(tree);
-+	return ptr;
-+}
-+char *logger_json_file_generate_json(logger_json_file *ptr, struct parser_context *ctx, parser_error *err) {
-+	yajl_gen g = NULL;
-+	struct parser_context tmp_ctx;
-+	const unsigned char *gen_buf = NULL;
-+	char *json_buf = NULL;
-+	size_t gen_len = 0;
-+
-+	if (ptr == NULL || err == NULL)
-+		return NULL;
-+
-+	*err = NULL;
-+	if (ctx == NULL) {
-+		ctx = &tmp_ctx;
-+		memset(&tmp_ctx, 0, sizeof(tmp_ctx));
-+	}
-+
-+	if (!json_gen_init(&g, ctx)) {
-+		*err = safe_strdup("Json_gen init failed");
-+		goto out;
-+	}
-+	if (yajl_gen_status_ok != gen_logger_json_file(g, ptr, ctx, err)) {
-+		if (*err == NULL)
-+			*err = safe_strdup("Failed to generate json");
-+		goto free_out;
-+	}
-+	yajl_gen_get_buf(g, &gen_buf, &gen_len);
-+	if (gen_buf == NULL) {
-+		*err = safe_strdup("Error to get generated json");
-+		goto free_out;
-+	}
-+
-+	if (gen_len == SIZE_MAX) {
-+		*err = safe_strdup("Invalid buffer length");
-+		goto free_out;
-+	}
-+	json_buf = safe_malloc(gen_len + 1);
-+	(void)memcpy(json_buf, gen_buf, gen_len);
-+	json_bufgen_len = '\0';
-+
-+free_out:
-+	yajl_gen_clear(g);
-+	yajl_gen_free(g);
-+out:
-+	return json_buf;
-+}
-diff --git a/src/lxc/json/logger_json_file.h b/src/lxc/json/logger_json_file.h
-new file mode 100644
-index 0000000..ad5af7b
---- /dev/null
-+++ b/src/lxc/json/logger_json_file.h
-@@ -0,0 +1,45 @@
-+// Generated from json-file.json. Do not edit!
-+#ifndef LOGGER_JSON_FILE_SCHEMA_H
-+#define LOGGER_JSON_FILE_SCHEMA_H
-+
-+#include <sys/types.h>
-+#include <stdint.h>
-+#include "json_common.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef struct {
-+    uint8_t *log;
-+    size_t log_len;
-+
-+    char *stream;
-+
-+    char *time;
-+
-+    uint8_t *attrs;
-+    size_t attrs_len;
-+
-+}
-+logger_json_file;
-+
-+void free_logger_json_file(logger_json_file *ptr);
-+
-+logger_json_file *make_logger_json_file(yajl_val tree, struct parser_context *ctx, parser_error *err);
-+
-+yajl_gen_status gen_logger_json_file(yajl_gen g, logger_json_file *ptr, struct parser_context *ctx, parser_error *err);
-+
-+logger_json_file *logger_json_file_parse_file(const char *filename, struct parser_context *ctx, parser_error *err);
-+
-+logger_json_file *logger_json_file_parse_file_stream(FILE *stream, struct parser_context *ctx, parser_error *err);
-+
-+logger_json_file *logger_json_file_parse_data(const char *jsondata, struct parser_context *ctx, parser_error *err);
-+
-+char *logger_json_file_generate_json(logger_json_file *ptr, struct parser_context *ctx, parser_error *err);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/src/lxc/json/oci_runtime_hooks.c b/src/lxc/json/oci_runtime_hooks.c
-new file mode 100644
-index 0000000..41ddb67
---- /dev/null
-+++ b/src/lxc/json/oci_runtime_hooks.c
-@@ -0,0 +1,52 @@
-+/******************************************************************************
-+ * Copyright (C), 1988-1999, Huawei Tech. Co., Ltd.
-+ * FileName: oci_runtime_hooks.c
-+ * Author: maoweiyong   Version: 0.1   Date: 2018-11-07
-+ * Explanation: provide oci runtime hooks functions
-+ ******************************************************************************/
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+#include <read-file.h>
-+#include "oci_runtime_hooks.h"
-+
-+#include "log.h"
-+#include "utils.h"
-+
-+#define PARSE_ERR_BUFFER_SIZE 1024
-+
-+oci_runtime_spec_hooks *oci_runtime_spec_hooks_parse_file(const char *filename,
-+                                                          struct parser_context *ctx, parser_error *err)
-+{
-+    yajl_val tree;
-+    size_t filesize;
-+
-+    if (!filename || !err) {
-+        return NULL;
-+    }
-+    *err = NULL;
-+    struct parser_context tmp_ctx;
-+    if (!ctx) {
-+        ctx = &tmp_ctx;
-+        memset(&tmp_ctx, 0, sizeof(tmp_ctx));
-+    }
-+    char *content = read_file(filename, &filesize);
-+    char errbufPARSE_ERR_BUFFER_SIZE;
-+    if (content == NULL) {
-+        if (asprintf(err, "cannot read the file: %s", filename) < 0) {
-+            *err = safe_strdup("error allocating memory");
-+        }
-+        return NULL;
-+    }
-+    tree = yajl_tree_parse(content, errbuf, sizeof(errbuf));
-+    free(content);
-+    if (tree == NULL) {
-+        if (asprintf(err, "cannot parse the file: %s", errbuf) < 0) {
-+            *err = safe_strdup("error allocating memory");
-+        }
-+        return NULL;
-+    }
-+    oci_runtime_spec_hooks *ptr = make_oci_runtime_spec_hooks(tree, ctx, err);
-+    yajl_tree_free(tree);
-+    return ptr;
-+}
-diff --git a/src/lxc/json/oci_runtime_hooks.h b/src/lxc/json/oci_runtime_hooks.h
-new file mode 100644
-index 0000000..bf570c9
---- /dev/null
-+++ b/src/lxc/json/oci_runtime_hooks.h
-@@ -0,0 +1,15 @@
-+/******************************************************************************
-+ * Copyright (C), 1988-1999, Huawei Tech. Co., Ltd.
-+ * FileName: oci_runtime_hooks.h
-+ * Author: tanyifeng  Version: 0.1   Date: 2018-11-08
-+ * Explanation: provide container oci runtime hooks function definition
-+ ******************************************************************************/
-+#ifndef _CONTAINER_HOOKS_H
-+# define _CONTAINER_HOOKS_H
-+
-+# include "oci_runtime_spec.h"
-+
-+oci_runtime_spec_hooks *oci_runtime_spec_hooks_parse_file(const char *filename,
-+                                                          struct parser_context *ctx, parser_error *err);
-+
-+#endif
-diff --git a/src/lxc/json/oci_runtime_spec.c b/src/lxc/json/oci_runtime_spec.c
-new file mode 100644
-index 0000000..fd342de
---- /dev/null
-+++ b/src/lxc/json/oci_runtime_spec.c
-@@ -0,0 +1,195 @@
-+// Generated from spec.json. Do not edit!
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+#include <string.h>
-+#include <read-file.h>
-+#include "oci_runtime_spec.h"
-+
-+oci_runtime_spec_hooks *make_oci_runtime_spec_hooks(yajl_val tree, struct parser_context *ctx, parser_error *err) {
-+    oci_runtime_spec_hooks *ret = NULL;
-+    *err = 0;
-+    if (tree == NULL)
-+        return ret;
-+    ret = safe_malloc(sizeof(*ret));
-+    {
-+        yajl_val tmp = get_val(tree, "prestart", yajl_t_array);
-+        if (tmp != NULL && YAJL_GET_ARRAY(tmp) != NULL && YAJL_GET_ARRAY(tmp)->len > 0) {
-+            size_t i;
-+            ret->prestart_len = YAJL_GET_ARRAY(tmp)->len;
-+            ret->prestart = safe_malloc((YAJL_GET_ARRAY(tmp)->len + 1) * sizeof(*ret->prestart));
-+            for (i = 0; i < YAJL_GET_ARRAY(tmp)->len; i++) {
-+                yajl_val val = YAJL_GET_ARRAY(tmp)->valuesi;
-+                ret->prestarti = make_defs_hook(val, ctx, err);
-+                if (ret->prestarti == NULL) {
-+                    free_oci_runtime_spec_hooks(ret);
-+                    return NULL;
-+                }
-+            }
-+        }
-+    }
-+    {
-+        yajl_val tmp = get_val(tree, "poststart", yajl_t_array);
-+        if (tmp != NULL && YAJL_GET_ARRAY(tmp) != NULL && YAJL_GET_ARRAY(tmp)->len > 0) {
-+            size_t i;
-+            ret->poststart_len = YAJL_GET_ARRAY(tmp)->len;
-+            ret->poststart = safe_malloc((YAJL_GET_ARRAY(tmp)->len + 1) * sizeof(*ret->poststart));
-+            for (i = 0; i < YAJL_GET_ARRAY(tmp)->len; i++) {
-+                yajl_val val = YAJL_GET_ARRAY(tmp)->valuesi;
-+                ret->poststarti = make_defs_hook(val, ctx, err);
-+                if (ret->poststarti == NULL) {
-+                    free_oci_runtime_spec_hooks(ret);
-+                    return NULL;
-+                }
-+            }
-+        }
-+    }
-+    {
-+        yajl_val tmp = get_val(tree, "poststop", yajl_t_array);
-+        if (tmp != NULL && YAJL_GET_ARRAY(tmp) != NULL && YAJL_GET_ARRAY(tmp)->len > 0) {
-+            size_t i;
-+            ret->poststop_len = YAJL_GET_ARRAY(tmp)->len;
-+            ret->poststop = safe_malloc((YAJL_GET_ARRAY(tmp)->len + 1) * sizeof(*ret->poststop));
-+            for (i = 0; i < YAJL_GET_ARRAY(tmp)->len; i++) {
-+                yajl_val val = YAJL_GET_ARRAY(tmp)->valuesi;
-+                ret->poststopi = make_defs_hook(val, ctx, err);
-+                if (ret->poststopi == NULL) {
-+                    free_oci_runtime_spec_hooks(ret);
-+                    return NULL;
-+                }
-+            }
-+        }
-+    }
-+
-+    if (tree->type == yajl_t_object && (ctx->options & PARSE_OPTIONS_STRICT)) {
-+        int i;
-+        for (i = 0; i < tree->u.object.len; i++)
-+            if (strcmp(tree->u.object.keysi, "prestart") &&
-+                strcmp(tree->u.object.keysi, "poststart") &&
-+                strcmp(tree->u.object.keysi, "poststop")) {
-+                if (ctx->stderr > 0)
-+                    fprintf(ctx->stderr, "WARNING: unknown key found: %s\n", tree->u.object.keysi);
-+            }
-+        }
-+    return ret;
-+}
-+
-+void free_oci_runtime_spec_hooks(oci_runtime_spec_hooks *ptr) {
-+    if (ptr == NULL)
-+        return;
-+    if (ptr->prestart != NULL) {
-+        size_t i;
-+        for (i = 0; i < ptr->prestart_len; i++)
-+            if (ptr->prestarti != NULL) {
-+                free_defs_hook(ptr->prestarti);
-+                ptr->prestarti = NULL;
-+            }
-+        free(ptr->prestart);
-+        ptr->prestart = NULL;
-+    }
-+    if (ptr->poststart != NULL) {
-+        size_t i;
-+        for (i = 0; i < ptr->poststart_len; i++)
-+            if (ptr->poststarti != NULL) {
-+                free_defs_hook(ptr->poststarti);
-+                ptr->poststarti = NULL;
-+            }
-+        free(ptr->poststart);
-+        ptr->poststart = NULL;
-+    }
-+    if (ptr->poststop != NULL) {
-+        size_t i;
-+        for (i = 0; i < ptr->poststop_len; i++)
-+            if (ptr->poststopi != NULL) {
-+                free_defs_hook(ptr->poststopi);
-+                ptr->poststopi = NULL;
-+            }
-+        free(ptr->poststop);
-+        ptr->poststop = NULL;
-+    }
-+    free(ptr);
-+}
-+
-+yajl_gen_status gen_oci_runtime_spec_hooks(yajl_gen g, oci_runtime_spec_hooks *ptr, struct parser_context *ctx, parser_error *err) {
-+    yajl_gen_status stat = yajl_gen_status_ok;
-+    *err = 0;
-+    stat = reformat_start_map(g);
-+    if (yajl_gen_status_ok != stat)
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->prestart != NULL)) {
-+        size_t len = 0, i;
-+        stat = reformat_map_key(g, "prestart", strlen("prestart"));
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        if (ptr != NULL && ptr->prestart != NULL) {
-+            len = ptr->prestart_len;
-+        }
-+        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
-+            yajl_gen_config(g, yajl_gen_beautify, 0);
-+        stat = reformat_start_array(g);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        for (i = 0; i < len; i++) {
-+            stat = gen_defs_hook(g, ptr->prestarti, ctx, err);
-+            if (yajl_gen_status_ok != stat)
-+                GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_end_array(g);
-+        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
-+            yajl_gen_config(g, yajl_gen_beautify, 1);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->poststart != NULL)) {
-+        size_t len = 0, i;
-+        stat = reformat_map_key(g, "poststart", strlen("poststart"));
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        if (ptr != NULL && ptr->poststart != NULL) {
-+            len = ptr->poststart_len;
-+        }
-+        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
-+            yajl_gen_config(g, yajl_gen_beautify, 0);
-+        stat = reformat_start_array(g);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        for (i = 0; i < len; i++) {
-+            stat = gen_defs_hook(g, ptr->poststarti, ctx, err);
-+            if (yajl_gen_status_ok != stat)
-+                GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_end_array(g);
-+        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
-+            yajl_gen_config(g, yajl_gen_beautify, 1);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    if ((ctx->options & GEN_OPTIONS_ALLKEYVALUE) ||(ptr != NULL && ptr->poststop != NULL)) {
-+        size_t len = 0, i;
-+        stat = reformat_map_key(g, "poststop", strlen("poststop"));
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        if (ptr != NULL && ptr->poststop != NULL) {
-+            len = ptr->poststop_len;
-+        }
-+        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
-+            yajl_gen_config(g, yajl_gen_beautify, 0);
-+        stat = reformat_start_array(g);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+        for (i = 0; i < len; i++) {
-+            stat = gen_defs_hook(g, ptr->poststopi, ctx, err);
-+            if (yajl_gen_status_ok != stat)
-+                GEN_SET_ERROR_AND_RETURN(stat, err);
-+        }
-+        stat = reformat_end_array(g);
-+        if (!len && !(ctx->options & GEN_OPTIONS_SIMPLIFY))
-+            yajl_gen_config(g, yajl_gen_beautify, 1);
-+        if (yajl_gen_status_ok != stat)
-+            GEN_SET_ERROR_AND_RETURN(stat, err);
-+    }
-+    stat = reformat_end_map(g);
-+    if (yajl_gen_status_ok != stat)
-+        GEN_SET_ERROR_AND_RETURN(stat, err);
-+    return yajl_gen_status_ok;
-+}
-diff --git a/src/lxc/json/oci_runtime_spec.h b/src/lxc/json/oci_runtime_spec.h
-new file mode 100644
-index 0000000..ef3f161
---- /dev/null
-+++ b/src/lxc/json/oci_runtime_spec.h
-@@ -0,0 +1,37 @@
-+// Generated from spec.json. Do not edit!
-+#ifndef OCI_RUNTIME_SPEC_SCHEMA_H
-+#define OCI_RUNTIME_SPEC_SCHEMA_H
-+
-+#include <sys/types.h>
-+#include <stdint.h>
-+#include "json_common.h"
-+#include "defs.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef struct {
-+    defs_hook **prestart;
-+    size_t prestart_len;
-+
-+    defs_hook **poststart;
-+    size_t poststart_len;
-+
-+    defs_hook **poststop;
-+    size_t poststop_len;
-+
-+}
-+oci_runtime_spec_hooks;
-+
-+void free_oci_runtime_spec_hooks(oci_runtime_spec_hooks *ptr);
-+
-+oci_runtime_spec_hooks *make_oci_runtime_spec_hooks(yajl_val tree, struct parser_context *ctx, parser_error *err);
-+
-+yajl_gen_status gen_oci_runtime_spec_hooks(yajl_gen g, oci_runtime_spec_hooks *ptr, struct parser_context *ctx, parser_error *err);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/src/lxc/json/read-file.h b/src/lxc/json/read-file.h
-new file mode 100644
-index 0000000..5d6e0eb
---- /dev/null
-+++ b/src/lxc/json/read-file.h
-@@ -0,0 +1,11 @@
-+#ifndef READ_FILE_H
-+#define READ_FILE_H
-+
-+#include <stddef.h>
-+#include <stdio.h>
-+
-+extern char *fread_file(FILE *stream, size_t *length);
-+
-+extern char *read_file(const char *path, size_t *length);
-+
-+#endif
--- 
-2.25.1
-

_service:tar_scm:0009-bugfix-about-cgroup-mount-propagation-and-capabiliti.patch Added

@@ -0,0 +1,254 @@
+From a719de928649384d63b903fb0036aafd5fa78822 Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Thu, 7 Dec 2023 11:11:31 +0800
+Subject: PATCH bugfix about cgroup, mount propagation and capabilities
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ src/lxc/attach_options.h       |  2 --
+ src/lxc/cgroups/cgfsng.c       | 15 +++++++----
+ src/lxc/cgroups/cgroup_utils.c | 10 ++++++++
+ src/lxc/conf.c                 | 47 +++++++++-------------------------
+ src/lxc/confile.c              | 12 +++++++++
+ src/lxc/start.c                |  8 +++++-
+ src/lxc/tools/lxc_attach.c     |  5 ++--
+ 7 files changed, 54 insertions(+), 45 deletions(-)
+
+diff --git a/src/lxc/attach_options.h b/src/lxc/attach_options.h
+index fe8bf6d..c1627d7 100644
+--- a/src/lxc/attach_options.h
++++ b/src/lxc/attach_options.h
+@@ -169,8 +169,6 @@ typedef struct lxc_attach_options_t {
+ 	const char *suffix;
+ 	bool disable_pty;
+ 	bool open_stdin;
+-	gid_t *add_gids; /* attach user additional gids */
+-	size_t add_gids_len; // iSulad TODO: shoud replace by lxc_groups_t groups;
+ #endif
+ } lxc_attach_options_t;
+ 
+diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
+index a9a8f2c..5fd12ff 100644
+--- a/src/lxc/cgroups/cgfsng.c
++++ b/src/lxc/cgroups/cgfsng.c
+@@ -486,8 +486,15 @@ static int cgroup_tree_remove(struct hierarchy **hierarchies, const char *path_p
+ 		int ret;
+ 
+ 		ret = cgroup_tree_prune(h->dfd_base, path_prune);
++#ifdef HAVE_ISULAD
++		if (ret < 0) {
++			SYSWARN("Failed to destroy %d(%s)", h->dfd_base, path_prune);
++			return -1;
++		}
++#else
+ 		if (ret < 0)
+ 			SYSWARN("Failed to destroy %d(%s)", h->dfd_base, path_prune);
++#endif
+ 		else
+ 			TRACE("Removed cgroup tree %d(%s)", h->dfd_base, path_prune);
+ 
+@@ -1459,10 +1466,7 @@ __cgfsng_ops static bool cgfsng_payload_create(struct cgroup_ops *ops, struct lx
+ 		DEBUG("no controller found, isgnore isulad_cgfsng_payload_create");
+ 		return true;
+ 	}
+-	if (ops->container_cgroup) {
+-		free(ops->container_cgroup);
+-		ops->container_cgroup = NULL;
+-	}
++	free_equal(ops->container_cgroup, ops->container_limit_cgroup);
+ #endif
+ 
+ 	if (ops->container_cgroup || ops->container_limit_cgroup)
+@@ -4408,6 +4412,7 @@ __cgfsng_ops static int cgfsng_data_init(struct cgroup_ops *ops)
+ 		return ret_set_errno(-1, ENOMEM);
+ 
+ 	ops->container_cgroup = move_ptr(container_cgroup);
++	ops->container_limit_cgroup = ops->container_cgroup;
+ #endif
+ 
+ 	return 0;
+@@ -4425,7 +4430,7 @@ __cgfsng_ops static const char *isulad_cgfsng_get_cgroup_full_path(struct cgroup
+ 				      controller ? controller : "(null)");
+ 
+ 	if (!h->path_con)
+-		h->path_con = must_make_path(h->at_mnt, h->at_base, ops->container_cgroup, NULL);
++		h->path_con = make_cgroup_path(h, h->at_base, ops->container_cgroup, NULL);
+ 
+ 	return h->path_con;
+ }
+diff --git a/src/lxc/cgroups/cgroup_utils.c b/src/lxc/cgroups/cgroup_utils.c
+index dc2fbec..252799e 100644
+--- a/src/lxc/cgroups/cgroup_utils.c
++++ b/src/lxc/cgroups/cgroup_utils.c
+@@ -52,8 +52,18 @@ int cgroup_tree_prune(int dfd, const char *path)
+ 	 */
+ 	dfd_disown = open_at(dfd, path, PROTECT_OPEN,
+ 			     PROTECT_LOOKUP_BENEATH_WITH_SYMLINKS, 0);
++#ifdef HAVE_ISULAD
++	if (dfd_disown < 0) {
++		if (errno == ENOENT) {
++			WARN("Destroy %d(%s) do not exist", dfd, path);
++			return 0;
++		}
++		return -errno;
++	}
++#else
+ 	if (dfd_disown < 0)
+ 		return -errno;
++#endif
+ 
+ 	dfd_dup = dup_cloexec(dfd_disown);
+ 	if (dfd_dup < 0)
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index 7a70bca..84b8baf 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -590,6 +590,13 @@ int lxc_rootfs_init(struct lxc_conf *conf, bool userns)
+ 			return log_trace_errno(0, EINVAL, "Not pinning on ZFS filesystem");
+ 	}
+ 
++#ifdef HAVE_ISULAD
++	// isulad rootfs type is null
++	if (!rootfs->bdev_type) {
++		return log_trace_errno(0, EINVAL, "Not pinning on rootfs");
++	}
++#endif
++
+ 	dfd_path = open_at(-EBADF, rootfs->path, PROTECT_OPATH_FILE, 0, 0);
+ 	if (dfd_path < 0)
+ 		return syserror("Failed to open \"%s\"", rootfs->path);
+@@ -1767,9 +1774,12 @@ static int lxc_pivot_root(const struct lxc_rootfs *rootfs)
+ 	 * nearly all relevant use-cases. Instead, establish the container's
+ 	 * rootfs as a separate peer group mirroring the behavior on the host.
+ 	 */
++#ifndef HAVE_ISULAD
++	// shared mount propagation will cause maskedpath mount twice
+ 	ret = mount("", ".", "", MS_SHARED | MS_REC, NULL);
+ 	if (ret < 0)
+ 		return log_error_errno(-errno, errno, "Failed to turn new root mount tree into shared mount tree");
++#endif
+ 
+ 	TRACE("Changed into new rootfs \"%s\"", rootfs->mount);
+ 	return 0;
+@@ -3530,17 +3540,6 @@ static int capabilities_allow(struct lxc_conf *conf)
+ 		if (cap->cap > last_cap)
+ 			continue;
+ 
+-#ifdef HAVE_ISULAD
+-		/* Do not keep any cap*/
+-		if (strcmp(cap->cap_name, "ISULAD_KEEP_NONE") == 0) {
+-			DEBUG("Do not keep any capability");
+-			__u32 i;
+-			for(i = 0; i < nr_u32; i++) {
+-				keep_bitsi = 0;
+-			}
+-			break;
+-		}
+-#endif
+ 		set_bit(cap->cap, keep_bits);
+ 		DEBUG("Keeping %s (%d) capability", cap->cap_name, cap->cap);
+ 	}
+@@ -6267,9 +6266,7 @@ int lxc_drop_caps(struct lxc_conf *conf)
+ #define __DEF_CAP_TO_MASK(x) (1U << ((x) & 31))
+ #if HAVE_LIBCAP
+ 	int ret = 0;
+-	int nret = 0;
+ 	size_t i = 0;
+-	__u32 capid;
+ 	__u32 last_cap;
+ 	size_t numcaps;
+ 	struct cap_entry *cap_entry;
+@@ -6295,28 +6292,8 @@ int lxc_drop_caps(struct lxc_conf *conf)
+ 	(void)memset(caplist, 0, numcaps * sizeof(int));
+ 
+ 	list_for_each_entry(cap_entry, &conf->caps.list, head) {
+-		/* isulad: Do not keep any cap*/
+-		if (strcmp(cap_entry->cap_name, "ISULAD_KEEP_NONE") == 0) {
+-			DEBUG("Do not keep any capability");
+-			for(i = 0; i < numcaps; i++) {
+-				caplisti = 0;
+-			}
+-			break;
+-		}
+-
+-		nret = parse_cap(cap_entry->cap_name, &capid);
+-		if (nret == -2)
+-			continue;
+-
+-		if (nret < 0) {
+-			ERROR("unknown capability %s", cap_entry->cap_name);
+-			ret = -1;
+-			goto out;
+-		}
+-
+-		DEBUG("keep capability '%s' (%d)", cap_entry->cap_name, capid);
+-
+-		caplistcapid = 1;
++		DEBUG("keep capability '%s' (%d)", cap_entry->cap_name, cap_entry->cap);
++		caplistcap_entry->cap = 1;
+ 	}
+ 
+ 	struct __user_cap_header_struct cap_header_data;
+diff --git a/src/lxc/confile.c b/src/lxc/confile.c
+index aa5c790..d0984b0 100644
+--- a/src/lxc/confile.c
++++ b/src/lxc/confile.c
+@@ -2509,6 +2509,18 @@ static int add_cap_entry(struct lxc_conf *conf, char *caps, bool keep)
+ 			continue;
+ 		}
+ 
++#ifdef HAVE_ISULAD
++		/* isulad: Do not keep any cap*/
++		if (strequal(token, "ISULAD_KEEP_NONE")) {
++			if (!keep)
++				return syserror_set(-EINVAL, "The \"ISULAD_KEEP_NONE\" keyword is only valid when keeping caps");
++
++			lxc_clear_config_caps(conf);
++			conf->caps.keep = true;
++			return 0;
++		}
++#endif
++
+ 		ret = parse_cap(token, &cap);
+ 		if (ret < 0) {
+ 			if (ret != -2)
+diff --git a/src/lxc/start.c b/src/lxc/start.c
+index b1ccdcb..1c8e258 100644
+--- a/src/lxc/start.c
++++ b/src/lxc/start.c
+@@ -1067,9 +1067,15 @@ int get_all_pids(struct cgroup_ops *cg_ops, pid_t **pids, size_t *len)
+ static int set_cgroup_freezer(struct cgroup_ops *cg_ops, const char *value)
+ {
+ 	char *fullpath;
++	const char *cgroup_path;
+ 	int ret;
+ 
+-	fullpath = must_make_path(cg_ops->get_cgroup_full_path(cg_ops, "freezer"), "freezer.state", NULL);
++	cgroup_path = cg_ops->get_cgroup_full_path(cg_ops, "freezer");
++	if (cgroup_path == NULL) {
++		return -1;
++	}
++
++	fullpath = must_make_path(cgroup_path, "freezer.state", NULL);
+ 	ret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
+ 	free(fullpath);
+ 	return ret;
+diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
+index 1283bcf..edceb8c 100644
+--- a/src/lxc/tools/lxc_attach.c
++++ b/src/lxc/tools/lxc_attach.c
+@@ -723,8 +723,9 @@ int main(int argc, char *argv)
+ 	}
+ 
+ 	if (my_args.add_gids) {
+-		attach_options.add_gids = my_args.add_gids;
+-		attach_options.add_gids_len = my_args.add_gids_len;
++		attach_options.groups.list = my_args.add_gids;
++		attach_options.groups.size = my_args.add_gids_len;
++		attach_options.attach_flags |= LXC_ATTACH_SETGROUPS;
+ 	}
+ 
+ 	/* isulad: add do attach background */
+-- 
+2.25.1
+

_service:tar_scm:0009-fix-HOME-env-of-container-unset-error.patch Deleted

@@ -1,316 +0,0 @@
-From 043b2483585a2d8168e0fde8b37054733a31f263 Mon Sep 17 00:00:00 2001
-From: haozi007 <liuhao27@huawei.com>
-Date: Mon, 25 Jul 2022 15:36:23 +0800
-Subject: PATCH fix HOME env of container unset error
-
-Signed-off-by: haozi007 <liuhao27@huawei.com>
----
- src/lxc/isulad_utils.c | 210 ++++++++++++++++++++++++++++++++++++++++-
- src/lxc/isulad_utils.h |   3 +
- src/lxc/start.c        |  14 +--
- 3 files changed, 216 insertions(+), 11 deletions(-)
-
-diff --git a/src/lxc/isulad_utils.c b/src/lxc/isulad_utils.c
-index 15d9323..cd7fca8 100644
---- a/src/lxc/isulad_utils.c
-+++ b/src/lxc/isulad_utils.c
-@@ -6,6 +6,10 @@
-  * Create: 2020-04-11
- ******************************************************************************/
- 
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE 1
-+#endif
-+
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-@@ -13,6 +17,10 @@
- #include <fcntl.h>
- #include <pwd.h>
- #include <ctype.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <stdio_ext.h>
- 
- #include "isulad_utils.h"
- #include "log.h"
-@@ -244,20 +252,34 @@ out:
- // isulad: set env home in container
- int lxc_setup_env_home(uid_t uid)
- {
-+#define __PASSWD_FILE__ "/etc/passwd"
- 	char *homedir = "/"; // default home dir is /
-+	FILE *stream = NULL;
- 	struct passwd pw, *pwbufp = NULL;
- 	char bufBUFSIZ;
--	int ret;
- 
--	ret = getpwuid_r(uid, &pw, buf, sizeof(buf), &pwbufp);
--	if ((ret == 0) && (pwbufp != NULL) && (pwbufp->pw_uid == uid)) {
--		homedir = pwbufp->pw_dir;
-+	stream = fopen_cloexec(__PASSWD_FILE__, "r");
-+	if (stream == NULL) {
-+		SYSWARN("Failed to open %s", __PASSWD_FILE__);
- 		goto set_env;
- 	}
- 
-+#if IS_BIONIC
-+	while (util_getpwent_r(stream, &pw, buf, sizeof(buf), &pwbufp) == 0 && pwbufp != NULL) {
-+#else
-+	while (fgetpwent_r(stream, &pw, buf, sizeof(buf), &pwbufp) == 0 && pwbufp != NULL) {
-+#endif
-+		if (pwbufp->pw_uid == uid) {
-+			homedir = pwbufp->pw_dir;
-+			goto set_env;
-+		}
-+	}
- 	WARN("User invalid, can not find user '%u'", uid);
- 
- set_env:
-+	if (stream)
-+		fclose(stream);
-+
- 	// if we didn't configure HOME, set it based on uid
- 	if (setenv("HOME", homedir, 0) < 0) {
- 		SYSERROR("Unable to set env 'HOME'");
-@@ -317,3 +339,183 @@ bool is_non_negative_num(const char *s)
- 	}
- 	return true;
- }
-+
-+static int hold_int(const char delim, bool required, char **src, unsigned int *dst)
-+{
-+    unsigned long long int res = 0;
-+    char *err_str = NULL;
-+
-+    // ensure *src not a empty string
-+    if (**src == '\0') {
-+        ERROR("Empty subject on given entrie is not allowed.");
-+        return -1;
-+    }
-+
-+    errno = 0;
-+    // covert string to long long
-+    res = strtoull(*src, &err_str, 0);
-+    if (errno != 0 && errno != ERANGE) {
-+        ERROR("Parse int from string failed.");
-+        return -1;
-+    }
-+
-+    // **src is not a digit
-+    if (err_str == *src) {
-+        if (!required) {
-+            ERROR("Integer part is missing.");
-+            return -1;
-+        }
-+        // if required, just set 0
-+        *dst = 0;
-+    } else {
-+        if (sizeof(void *) > 4 && res > UINT_MAX) { // make sure 64-bit platform behave same as 32-bit
-+            res = UINT_MAX;
-+        }
-+        res = res & UINT_MAX;
-+        *dst = (uint32_t)res;
-+    }
-+
-+    // normal case
-+    if (*err_str == delim) {
-+        err_str++;
-+    } else if (*err_str != '\0') {
-+        ERROR("Invalid digit string.");
-+        return -1;
-+    }
-+
-+    *src = err_str; // update src to next valid context in line.
-+    return 0;
-+}
-+
-+static void hold_string(const char delim, char **src, char **dst)
-+{
-+    for (*dst = *src; **src != delim; ++(*src)) {
-+        if (**src == '\0') {
-+            break;
-+        }
-+    }
-+
-+    if (**src == delim) {
-+        **src = '\0';
-+        ++(*src);
-+    }
-+}
-+
-+static int parse_line_pw(const char delim, char *line, struct passwd *result)
-+{
-+    int ret = 0;
-+    bool required = false;
-+    char *walker = NULL;
-+
-+    walker = strpbrk(line, "\n");
-+    if (walker != NULL) {
-+        // clear newline char
-+        *walker = '\0';
-+    }
-+
-+    hold_string(delim, &line, &result->pw_name);
-+
-+    required = (result->pw_name0 == '+' || result->pw_name0 == '-') ? true : false;
-+
-+    hold_string(delim, &line, &result->pw_passwd);
-+
-+    ret = hold_int(delim, required, &line, &result->pw_uid);
-+    if (ret != 0) {
-+        // a legitimate line must have uid
-+        ERROR("Parse uid error.");
-+        return ret;
-+    }
-+
-+    ret = hold_int(delim, required, &line, &result->pw_gid);
-+    if (ret != 0) {
-+        // it's ok to not provide gid
-+        ERROR("Parse gid error.");
-+        return ret;
-+    }
-+
-+    hold_string(delim, &line, &result->pw_gecos);
-+
-+    hold_string(delim, &line, &result->pw_dir);
-+
-+    result->pw_shell = line;
-+    return 0;
-+}
-+
-+char *util_left_trim_space(char *str)
-+{
-+    char *begin = str;
-+    char *tmp = str;
-+    while (isspace(*begin)) {
-+        begin++;
-+    }
-+    while ((*tmp++ = *begin++)) {
-+    }
-+    return str;
-+}
-+
-+int util_getpwent_r(FILE *stream, struct passwd *resbuf, char *buffer, size_t buflen, struct passwd **result)
-+{
-+    const char delim = ':';
-+    char *buff_end = NULL;
-+    char *walker = NULL;
-+    bool got = false;
-+    int ret = 0;
-+
-+    if (stream == NULL || resbuf == NULL || buffer == NULL || result == NULL) {
-+        ERROR("Password obj, params is NULL.");
-+        return -1;
-+    }
-+
-+    if (buflen <= 1) {
-+        ERROR("Inadequate buffer length was given.");
-+        return -1;
-+    }
-+
-+    buff_end = buffer + buflen - 1;
-+    flockfile(stream);
-+
-+    while (1) {
-+        *buff_end = '\xff';
-+        walker = fgets_unlocked(buffer, buflen, stream);
-+        // if get NULL string
-+        if (walker == NULL) {
-+            *result = NULL;
-+            // reach end of file, return error
-+            if (feof(stream)) {
-+                ret = ENOENT;
-+                goto out;
-+            }
-+            // overflow buffer
-+            ret = ERANGE;
-+            goto out;
-+        }
-+        // just overflow last char in buffer
-+        if (*buff_end != '\xff') {
-+            *result = NULL;
-+            ret = ERANGE;
-+            goto out;
-+        }
-+
-+        (void)util_left_trim_space(buffer);
-+        // skip comment line and empty line
-+        if (walker0 == '#' || walker0 == '\0') {
-+            continue;
-+        }
-+
-+        if (parse_line_pw(delim, walker, resbuf) == 0) {
-+            got = true;
-+            break;
-+        }
-+    }
-+    if (!got) {
-+        *result = NULL;
-+        ret = ERANGE;
-+        goto out;
-+    }
-+
-+    *result = resbuf;
-+    ret = 0;
-+out:
-+    funlockfile(stream);
-+    return ret;
-+}
-\ No newline at end of file
-diff --git a/src/lxc/isulad_utils.h b/src/lxc/isulad_utils.h
-index 345f511..7a5eb89 100644
---- a/src/lxc/isulad_utils.h
-+++ b/src/lxc/isulad_utils.h
-@@ -10,6 +10,7 @@
- 
- #include <stdio.h>
- #include <stdbool.h>
-+#include <pwd.h>
- 
- /* isulad: replace space with SPACE_MAGIC_STR */
- #define SPACE_MAGIC_STR "#)"
-@@ -96,4 +97,6 @@ extern bool lxc_process_alive(pid_t pid, unsigned long long start_time);
- 
- extern bool is_non_negative_num(const char *s);
- 
-+int util_getpwent_r(FILE *stream, struct passwd *resbuf, char *buffer, size_t buflen, struct passwd **result);
-+
- #endif
-diff --git a/src/lxc/start.c b/src/lxc/start.c
-index f82df34..6fe1203 100644
---- a/src/lxc/start.c
-+++ b/src/lxc/start.c
-@@ -1727,6 +1727,13 @@ static int do_start(void *data)
- 	new_uid = handler->conf->init_uid;
- 	new_gid = handler->conf->init_gid;
- 
-+#ifdef HAVE_ISULAD
-+	// isulad: set env home in container, must before "Avoid unnecessary syscalls."
-+	if (lxc_setup_env_home(new_uid) < 0) {
-+		goto out_warn_father;
-+	}
-+#endif
-+
- 	/* Avoid unnecessary syscalls. */
- 	if (new_uid == nsuid)
- 		new_uid = LXC_INVALID_UID;
-@@ -1734,13 +1741,6 @@ static int do_start(void *data)
- 	if (new_gid == nsgid)
- 		new_gid = LXC_INVALID_GID;
- 
--#ifdef HAVE_ISULAD
--	// isulad: set env home in container
--	if (lxc_setup_env_home(new_uid) < 0) {
--		goto out_warn_father;
--	}
--#endif
--
- 	/* Make sure that the processes STDIO is correctly owned by the user that we are switching to */
- 	ret = fix_stdio_permissions(new_uid);
- 	if (ret)
--- 
-2.25.1
-

_service:tar_scm:0010-add-storage-block-code-for-embedded-image.patch Added

@@ -0,0 +1,219 @@
+From c0324e29b4494560ed68af50f7be814838e2bfc3 Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Fri, 29 Dec 2023 16:26:13 +0800
+Subject: PATCH add storage block code for embedded image
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ src/lxc/meson.build       |  2 +
+ src/lxc/storage/block.c   | 86 +++++++++++++++++++++++++++++++++++++++
+ src/lxc/storage/block.h   | 41 +++++++++++++++++++
+ src/lxc/storage/storage.c | 24 +++++++++++
+ 4 files changed, 153 insertions(+)
+ create mode 100644 src/lxc/storage/block.c
+ create mode 100644 src/lxc/storage/block.h
+
+diff --git a/src/lxc/meson.build b/src/lxc/meson.build
+index 6c4ba6a..bffed73 100644
+--- a/src/lxc/meson.build
++++ b/src/lxc/meson.build
+@@ -145,6 +145,8 @@ if want_isulad
+         'exec_commands.h',
+         'isulad_utils.c',
+         'isulad_utils.h',
++        'storage/block.c',
++        'storage/block.h',
+         'path.c',
+         'path.h',
+         'json/defs.c',
+diff --git a/src/lxc/storage/block.c b/src/lxc/storage/block.c
+new file mode 100644
+index 0000000..eb75e70
+--- /dev/null
++++ b/src/lxc/storage/block.c
+@@ -0,0 +1,86 @@
++/*
++ * lxc: linux Container library
++ *
++ * (C) Copyright IBM Corp. 2007, 2008
++ *
++ * Authors:
++ * Daniel Lezcano <daniel.lezcano at free.fr>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE 1
++#endif
++#include <stdint.h>
++#include <string.h>
++
++#include "config.h"
++#include "log.h"
++#include "storage.h"
++#include "storage_utils.h"
++#include "utils.h"
++
++lxc_log_define(blk, lxc);
++
++int blk_destroy(struct lxc_storage *orig)
++{
++	return 0;
++}
++
++bool blk_detect(const char *path)
++{
++	struct stat statbuf;
++	int ret;
++
++	if (!strncmp(path, "blk:", 4))
++		return true;
++
++	ret = stat(path, &statbuf);
++	if (ret == -1 && errno == EPERM) {
++		SYSERROR("blk_detect: failed to look at \"%s\"", path);
++		return false;
++	}
++
++	if (ret == 0 && S_ISBLK(statbuf.st_mode))
++		return true;
++
++	return false;
++}
++
++int blk_mount(struct lxc_storage *bdev)
++{
++	const char *src;
++	if (strcmp(bdev->type, "blk"))
++		return -22;
++
++	if (!bdev->src || !bdev->dest)
++		return -22;
++
++	src = lxc_storage_get_path(bdev->src, bdev->type);
++
++	return mount_unknown_fs(src, bdev->dest, bdev->mntopts);
++}
++
++int blk_umount(struct lxc_storage *bdev)
++{
++	if (strcmp(bdev->type, "blk"))
++		return -22;
++
++	if (!bdev->src || !bdev->dest)
++		return -22;
++
++	return umount(bdev->dest);
++}
+diff --git a/src/lxc/storage/block.h b/src/lxc/storage/block.h
+new file mode 100644
+index 0000000..2fa7565
+--- /dev/null
++++ b/src/lxc/storage/block.h
+@@ -0,0 +1,41 @@
++/*
++ * lxc: linux Container library
++ *
++ * (C) Copyright IBM Corp. 2007, 2008
++ *
++ * Authors:
++ * Daniel Lezcano <daniel.lezcano at free.fr>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#ifndef __LXC_BLK_H
++#define __LXC_BLK_H
++
++#include <stdbool.h>
++#include <stdint.h>
++
++struct lxc_storage;
++
++struct bdev_specs;
++
++struct lxc_conf;
++
++extern int blk_destroy(struct lxc_storage *orig);
++extern bool blk_detect(const char *path);
++extern int blk_mount(struct lxc_storage *bdev);
++extern int blk_umount(struct lxc_storage *bdev);
++
++#endif /* __LXC_BLK_H */
+diff --git a/src/lxc/storage/storage.c b/src/lxc/storage/storage.c
+index 39756d0..2aa26f9 100644
+--- a/src/lxc/storage/storage.c
++++ b/src/lxc/storage/storage.c
+@@ -39,6 +39,10 @@
+ #include "storage_utils.h"
+ #include "utils.h"
+ #include "zfs.h"
++#ifdef HAVE_ISULAD
++#include "block.h"
++#endif
++
+ 
+ #if !HAVE_STRLCPY
+ #include "strlcpy.h"
+@@ -162,6 +166,22 @@ static const struct lxc_storage_ops zfs_ops = {
+     .can_backup = true,
+ };
+ 
++#ifdef HAVE_ISULAD
++/* block */
++static const struct lxc_storage_ops blk_ops = {
++    .detect = &blk_detect,
++    .mount = &blk_mount,
++    .umount = &blk_umount,
++    .clone_paths = NULL,
++    .destroy = &blk_destroy,
++    .create = NULL,
++    .copy = NULL,
++    .snapshot = NULL,
++    .can_snapshot = false,
++    .can_backup = true,
++};
++#endif
++
+ struct lxc_storage_type {
+ 	const char *name;
+ 	const struct lxc_storage_ops *ops;
+@@ -177,6 +197,10 @@ static const struct lxc_storage_type bdevs = {
+ 	{ .name = "overlayfs", .ops = &ovl_ops,   },
+ 	{ .name = "loop",      .ops = &loop_ops,  },
+ 	{ .name = "nbd",       .ops = &nbd_ops,   },
++#ifdef HAVE_ISULAD
++	//isulad: block device
++	{ .name = "blk",       .ops = &blk_ops,   },
++#endif
+ };
+ 
+ static const size_t numbdevs = sizeof(bdevs) / sizeof(struct lxc_storage_type);
+-- 
+2.25.1
+

_service:tar_scm:0010-check-yajl-only-when-have-isulad.patch Deleted

@@ -1,70 +0,0 @@
-From d4cb8f6a8f46a3f5d72f22d7f79df83ad82215e0 Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Mon, 25 Jul 2022 16:42:03 +0800
-Subject: PATCH check yajl only when have isulad
-
-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
----
- configure.ac        | 6 +++---
- src/lxc/Makefile.am | 7 +++++--
- src/lxc/af_unix.c   | 2 +-
- 3 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ce8854e..2180586 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -120,9 +120,6 @@ AM_CONDITIONAL(DISTRO_UBUNTU, test "x$with_distro" = "xubuntu")
- 
- AC_CONFIG_LINKS(config/etc/default.conf:config/etc/${distroconf})
- 
--# Check yajl
--PKG_CHECK_MODULES(YAJL, yajl >= 2,,AC_MSG_ERROR(You must install yajl >= 2))
--
- # Check for init system type
- AC_MSG_CHECKING(for init system type)
- AC_ARG_WITH(init-script,
-@@ -839,6 +836,9 @@ AM_CONDITIONAL(HAVE_ISULAD, test "x$adapt_isulad" = "xyes")
- if test "x$adapt_isulad" = "xyes"; then
- 	AC_DEFINE(HAVE_ISULAD, 1, adapt to iSulad)
- 	AC_MSG_RESULT(yes)
-+
-+	# Check yajl
-+	PKG_CHECK_MODULES(YAJL, yajl >= 2,,AC_MSG_ERROR(You must install yajl >= 2))
- else
- 	AC_MSG_RESULT(no)
- fi
-diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
-index b9a8750..61a229f 100644
---- a/src/lxc/Makefile.am
-+++ b/src/lxc/Makefile.am
-@@ -360,8 +360,11 @@ LDADD = liblxc.la \
- 	@OPENSSL_LIBS@ \
- 	@SECCOMP_LIBS@ \
- 	@SELINUX_LIBS@ \
--	@DLOG_LIBS@ \
--	@YAJL_LIBS@
-+	@DLOG_LIBS@
-+
-+if HAVE_ISULAD
-+	LDADD += @YAJL_LIBS@
-+endif
- 
- if ENABLE_TOOLS
- lxc_attach_SOURCES = tools/lxc_attach.c \
-diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
-index cb4233e..0be9368 100644
---- a/src/lxc/af_unix.c
-+++ b/src/lxc/af_unix.c
-@@ -382,7 +382,7 @@ int lxc_unix_connect_type(struct sockaddr_un *addr, int type)
- 		      offsetof(struct sockaddr_un, sun_path) + len);
- 	if (ret < 0)
- #ifdef HAVE_ISULAD
--		return log_error_errno(-1, errno,
-+		return log_warn_errno(-1, errno,
- 				       "Failed to connect new AF_UNIX socket");
- #else
- 		return log_error_errno(-1, errno,
--- 
-2.25.1
-

_service:tar_scm:0011-drop-security_context_t.patch Deleted

_service:tar_scm:0011-skip-setup-console-if-disable-pty-and-fix-syscontain.patch Added

@@ -0,0 +1,177 @@
+From 0d4216ef2cae2cc10b755b0403bfff0f377bdf17 Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Thu, 4 Jan 2024 09:35:41 +0800
+Subject: PATCH skip setup console if disable pty and fix syscontainer-hooks
+ write devices rule useless
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ src/lxc/conf.c  | 16 +++++++++-----
+ src/lxc/start.c | 59 ++++++++++++++++++++++++++++---------------------
+ src/lxc/sync.h  | 10 ++++-----
+ 3 files changed, 48 insertions(+), 37 deletions(-)
+
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index 84b8baf..c73ba04 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -2318,6 +2318,12 @@ static int lxc_setup_console(const struct lxc_handler *handler,
+ 	if (!wants_console(console))
+ 		return log_trace(0, "Skipping console setup");
+ 
++#ifdef HAVE_ISULAD
++	if (handler->disable_pty) {
++		return 0;
++	}
++#endif
++
+ 	if (console->pty < 0)  {
+ 		/*
+ 		 * Allocate a console from the container's devpts instance. We
+@@ -4583,7 +4589,11 @@ static int lxc_recv_console_from_child(struct lxc_handler *handler)
+ 		return 0;
+ 
+ 	/* We've already allocated a console from the host's devpts instance. */
++#ifdef HAVE_ISULAD
++	if (console->disable_pty || console->pty >= 0)
++#else
+ 	if (console->pty >= 0)
++#endif
+ 		return 0;
+ 
+ 	ret = __lxc_abstract_unix_recv_two_fds(handler->data_sock1,
+@@ -4870,12 +4880,6 @@ int lxc_setup(struct lxc_handler *handler)
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to setup \"/dev\" symlinks");
+ 
+-#ifdef HAVE_ISULAD
+-	/* Ask father to run oci prestart hooks and wait for him to finish. */
+-	if (!lxc_sync_barrier_parent(handler, START_SYNC_OCI_PRESTART_HOOK)) {
+-		return log_error(-1, "Failed to sync parent to start host hook");
+-	}
+-#endif
+ 	ret = lxc_setup_rootfs_switch_root(&lxc_conf->rootfs);
+ 	if (ret < 0)
+ 		return log_error(-1, "Failed to pivot root into rootfs");
+diff --git a/src/lxc/start.c b/src/lxc/start.c
+index 1c8e258..0a5cb26 100644
+--- a/src/lxc/start.c
++++ b/src/lxc/start.c
+@@ -1608,10 +1608,11 @@ static int do_start(void *data)
+ 
+ 	close_prot_errno_disarm(devnull_fd);
+ 
+-#ifndef HAVE_ISULAD
++#ifdef HAVE_ISULAD
++	if (handler->disable_pty)
+ 	// setsid in lxc_setup() -> lxc_setup_console()
+-	setsid();
+ #endif
++	setsid();
+ 
+ 	if (handler->conf->init_cwd) {
+ #ifdef HAVE_ISULAD
+@@ -1642,6 +1643,11 @@ static int do_start(void *data)
+ 	}
+ 
+ #ifdef HAVE_ISULAD
++	/* Ask father to run oci prestart hooks and wait for him to finish. */
++	if (!lxc_sync_barrier_parent(handler, START_SYNC_OCI_PRESTART_HOOK)) {
++		return log_error(-1, "Failed to sync parent to start host hook");
++	}
++
+ 	/* close pipes after sync fds */
+ 	/* isulad: dup2 pipe00 to container stdin, pipe11 to container stdout, pipe21 to container stderr */
+ 	if (handler->disable_pty) {
+@@ -2377,29 +2383,6 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 		goto out_delete_net;
+ 	}
+ 
+-#ifdef HAVE_ISULAD
+-	if (!lxc_sync_wait_child(handler, START_SYNC_OCI_PRESTART_HOOK))
+-		goto out_delete_net;
+-
+-	/* isulad: Run oci prestart hook at here */
+-	ret = run_oci_hooks(name, "oci-prestart", conf, lxcpath);
+-	if (ret < 0) {
+-		ERROR("Failed to run oci prestart hooks");
+-		goto out_delete_net;
+-	}
+-
+-	if (START_TIMEOUT == global_timeout_state) {
+-		lxc_write_error_message(conf->errpipe1, "Starting the container \"%s\" timeout.", name);
+-		ERROR("Starting the container \"%s\" timeout.", name);
+-		goto out_delete_net;
+-	}
+-
+-	/* Tell the child to continue its initialization. We'll get
+-	 * START_SYNC_POST_OCI_PRESTART_HOOK when it is ready for us to run oci prestart hooks.
+-	 */
+-	if (!lxc_sync_wake_child(handler, START_SYNC_POST_OCI_PRESTART_HOOK))
+-		goto out_delete_net;
+-#endif
+ 	if (!lxc_sync_wait_child(handler, START_SYNC_CGROUP_LIMITS))
+ 		goto out_delete_net;
+ 
+@@ -2433,6 +2416,32 @@ static int lxc_spawn(struct lxc_handler *handler)
+ 	if (!lxc_sync_wake_child(handler, START_SYNC_FDS))
+ 		goto out_delete_net;
+ 
++#ifdef HAVE_ISULAD
++	// OCI prestart hook should run after setup_limits_legacy.
++	// Otherwise 'syscontainer-hooks' write devices rule will be useless.
++	if (!lxc_sync_wait_child(handler, START_SYNC_OCI_PRESTART_HOOK))
++		goto out_delete_net;
++
++	/* isulad: Run oci prestart hook at here */
++	ret = run_oci_hooks(name, "oci-prestart", conf, lxcpath);
++	if (ret < 0) {
++		ERROR("Failed to run oci prestart hooks");
++		goto out_delete_net;
++	}
++
++	if (START_TIMEOUT == global_timeout_state) {
++		lxc_write_error_message(conf->errpipe1, "Starting the container \"%s\" timeout.", name);
++		ERROR("Starting the container \"%s\" timeout.", name);
++		goto out_delete_net;
++	}
++
++	/* Tell the child to continue its initialization. We'll get
++	 * START_SYNC_POST_OCI_PRESTART_HOOK when it is ready for us to run oci prestart hooks.
++	 */
++	if (!lxc_sync_wake_child(handler, START_SYNC_POST_OCI_PRESTART_HOOK))
++		goto out_delete_net;
++#endif
++
+ 	if (handler->ns_unshare_flags & CLONE_NEWCGROUP) {
+ 		/* Now we're ready to preserve the cgroup namespace */
+ 		ret = lxc_try_preserve_namespace(handler, LXC_NS_CGROUP, "cgroup");
+diff --git a/src/lxc/sync.h b/src/lxc/sync.h
+index 6802d32..b6080dd 100644
+--- a/src/lxc/sync.h
++++ b/src/lxc/sync.h
+@@ -20,17 +20,15 @@ enum /* start */ {
+ 	START_SYNC_CONFIGURE		=  1,
+ 	START_SYNC_POST_CONFIGURE	=  2,
+ 	START_SYNC_IDMAPPED_MOUNTS	=  3,
++	START_SYNC_CGROUP_LIMITS	=  4,
++	START_SYNC_FDS			=  5,
+ #ifdef HAVE_ISULAD
+-	START_SYNC_OCI_PRESTART_HOOK = 4,
+-	START_SYNC_POST_OCI_PRESTART_HOOK = 5,
+-	START_SYNC_CGROUP_LIMITS	=  6,
+-	START_SYNC_FDS			=  7,
++	START_SYNC_OCI_PRESTART_HOOK = 6,
++	START_SYNC_POST_OCI_PRESTART_HOOK = 7,
+ 	START_SYNC_READY_START		=  8,
+ 	START_SYNC_RESTART		=  9,
+ 	START_SYNC_POST_RESTART		=  10,
+ #else
+-	START_SYNC_CGROUP_LIMITS	=  4,
+-	START_SYNC_FDS			=  5,
+ 	START_SYNC_READY_START		=  6,
+ 	START_SYNC_RESTART		=  7,
+ 	START_SYNC_POST_RESTART		=  8,
+-- 
+2.25.1
+

_service:tar_scm:0012-fix-dev-mount-failed-and-skip-send-recv-devpts_fd-if.patch Added

@@ -0,0 +1,56 @@
+From 47513b0bd34217bb2032285ea03ae7e4508ba24d Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Fri, 12 Jan 2024 16:40:32 +0800
+Subject: PATCH fix dev mount failed and skip send/recv devpts_fd if
+ disable_pty
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ src/lxc/conf.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index c73ba04..b61615d 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -1829,6 +1829,12 @@ static int lxc_recv_devpts_from_child(struct lxc_handler *handler)
+ {
+ 	int ret;
+ 
++#ifdef HAVE_ISULAD
++	if (handler->disable_pty) {
++		return 0;
++	}
++#endif
++
+ 	if (handler->conf->pty_max <= 0)
+ 		return 0;
+ 
+@@ -2066,6 +2072,12 @@ static int lxc_send_devpts_to_parent(struct lxc_handler *handler)
+ {
+ 	int ret;
+ 
++#ifdef HAVE_ISULAD
++	if (handler->disable_pty) {
++		return 0;
++	}
++#endif
++
+ 	if (handler->conf->pty_max <= 0)
+ 		return log_debug(0, "No devpts file descriptor will be sent since no pts devices are requested");
+ 
+@@ -4852,6 +4864,11 @@ int lxc_setup(struct lxc_handler *handler)
+ 		if (ret < 0) {
+ 			return log_error(-1, "Failed to setup new devpts instance for '%s'", name);
+ 		}
++	} else {
++		lxc_conf->devpts_fd = open_at(lxc_conf->rootfs.dfd_dev, "pts", PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
++		if (lxc_conf->devpts_fd < 0) {
++			return log_error(-1, "Failed to allocate console from container's devpts instance");
++		}
+ 	}
+ #else
+ 	ret = lxc_create_tmp_proc_mount(lxc_conf);
+-- 
+2.25.1
+

_service:tar_scm:0012-only-set-user-or-image-set-non-empty-HOME.patch Deleted

@@ -1,50 +0,0 @@
-From 7273c6631f692872384cce83cc04b4084ee98f73 Mon Sep 17 00:00:00 2001
-From: haozi007 <liuhao27@huawei.com>
-Date: Tue, 9 Aug 2022 17:30:59 +0800
-Subject: PATCH only set user or image set non-empty HOME
-
-Signed-off-by: haozi007 <liuhao27@huawei.com>
----
- src/lxc/isulad_utils.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/lxc/isulad_utils.c b/src/lxc/isulad_utils.c
-index cd7fca8..067e1c9 100644
---- a/src/lxc/isulad_utils.c
-+++ b/src/lxc/isulad_utils.c
-@@ -257,6 +257,13 @@ int lxc_setup_env_home(uid_t uid)
- 	FILE *stream = NULL;
- 	struct passwd pw, *pwbufp = NULL;
- 	char bufBUFSIZ;
-+	const char *curr_home = NULL;
-+
-+	curr_home = getenv("HOME");
-+	// if user set or image set, just use it.
-+	if (curr_home != NULL && strcmp(curr_home, "") != 0) {
-+		return 0;
-+	}
- 
- 	stream = fopen_cloexec(__PASSWD_FILE__, "r");
- 	if (stream == NULL) {
-@@ -280,8 +287,9 @@ set_env:
- 	if (stream)
- 		fclose(stream);
- 
--	// if we didn't configure HOME, set it based on uid
--	if (setenv("HOME", homedir, 0) < 0) {
-+	// if we didn't configure HOME, set it based on uid;
-+	// override it if reach here.
-+	if (setenv("HOME", homedir, 1) < 0) {
- 		SYSERROR("Unable to set env 'HOME'");
- 		return -1;
- 	}
-@@ -518,4 +526,4 @@ int util_getpwent_r(FILE *stream, struct passwd *resbuf, char *buffer, size_t bu
- out:
-     funlockfile(stream);
-     return ret;
--}
-\ No newline at end of file
-+}
--- 
-2.25.1
-

_service:tar_scm:0013-return-fail-if-no-args-or-no-rootfs-path-found.patch Deleted

@@ -1,38 +0,0 @@
-From a2aff3425a6f35bdb9f83880a1545b89606bf7c9 Mon Sep 17 00:00:00 2001
-From: WangFengTu <wangfengtu@huawei.com>
-Date: Fri, 19 Aug 2022 14:32:22 +0800
-Subject: PATCH return fail if no args or no rootfs path found
-
-Signed-off-by: WangFengTu <wangfengtu@huawei.com>
----
- src/lxc/lxccontainer.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
-index 3f75184..4b669bb 100644
---- a/src/lxc/lxccontainer.c
-+++ b/src/lxc/lxccontainer.c
-@@ -1030,6 +1030,20 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
- 		argv = init_cmd = use_init_args(conf->init_argv, conf->init_argc);
- 	}
- 
-+	// do not allow using default rootfs path when isulad
-+	if (conf->rootfs.mount == NULL) {
-+		ERROR("Empty rootfs path detected");
-+		lxc_put_handler(handler);
-+		return false;
-+	}
-+
-+	// do not allow using default args when isulad
-+	if (!argv) {
-+		ERROR("Empty args detected");
-+		lxc_put_handler(handler);
-+		return false;
-+	}
-+
- 	if (c->image_type_oci) {
- 		handler->image_type_oci = true;
- 	}
--- 
-2.25.1
-

_service:tar_scm:0014-fix-tools-using-option-give-error-message.patch Deleted

@@ -1,25 +0,0 @@
-From cce266a71a8998e17abada2a7e716298c2169208 Mon Sep 17 00:00:00 2001
-From: Neil.wrz<wangrunze13@huawei.com>
-Date: Thu, 1 Sep 2022 05:04:56 -0700
-Subject: PATCH fix tools using '-?' option give error message
-
-Signed-off-by: Neil.wrz<wangrunze13@huawei.com> 
----
- src/lxc/tools/arguments.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lxc/tools/arguments.h b/src/lxc/tools/arguments.h
-index c16d99f..80c2083 100644
---- a/src/lxc/tools/arguments.h
-+++ b/src/lxc/tools/arguments.h
-@@ -145,6 +145,7 @@ struct lxc_arguments {
- #define LXC_COMMON_OPTIONS                                                     \
- 	    { "name",        required_argument, 0, 'n'         },              \
- 	    { "help",        no_argument,       0, 'h'         },              \
-+	    { "help",        no_argument,       0, '?'         },              \
- 	    { "usage",       no_argument,       0, OPT_USAGE   },              \
- 	    { "version",     no_argument,       0, OPT_VERSION },              \
- 	    { "quiet",       no_argument,       0, 'q'         },              \
--- 
-2.25.1
-

_service:tar_scm:0015-fix-do-mask-pathes-after-parent-mounted.patch Deleted

@@ -1,44 +0,0 @@
-From 96a35e077d21a1abf1cc3819fb842b8089ee268d Mon Sep 17 00:00:00 2001
-From: isuladci <isulad@ci.com>
-Date: Tue, 20 Sep 2022 01:40:18 -0700
-Subject: PATCH fix do mask pathes after parent mounted
-
-Signed-off-by: isuladci <isulad@ci.com>
----
- src/lxc/conf.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index 378cf9f..439601a 100644
---- a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -3975,19 +3975,19 @@ int lxc_setup(struct lxc_handler *handler)
- 	}
- 
- #ifdef HAVE_ISULAD
--	// isulad: setup rootfs masked paths
--	if (!lxc_list_empty(&lxc_conf->rootfs.maskedpaths)) {
--		if (setup_rootfs_maskedpaths(&lxc_conf->rootfs.maskedpaths)) {
--			return log_error(-1, "failed to setup maskedpaths");
--		}
--	}
--
- 	// isulad: setup rootfs ro paths
- 	if (!lxc_list_empty(&lxc_conf->rootfs.ropaths)) {
- 		if (setup_rootfs_ropaths(&lxc_conf->rootfs.ropaths)) {
- 			return log_error(-1, "failed to setup readonlypaths");
- 		}
- 	}
-+	
-+	// isulad: setup rootfs masked paths
-+	if (!lxc_list_empty(&lxc_conf->rootfs.maskedpaths)) {
-+		if (setup_rootfs_maskedpaths(&lxc_conf->rootfs.maskedpaths)) {
-+			return log_error(-1, "failed to setup maskedpaths");
-+		}
-+	}
- 
- 	//isulad: system container, remount /proc/sys/xxx by mount_list
- 	if (lxc_conf->systemd != NULL && strcmp(lxc_conf->systemd, "true") == 0) {
--- 
-2.25.1
-

_service:tar_scm:0016-skip-kill-cgroup-processes-if-no-hierarchies.patch Deleted

@@ -1,36 +0,0 @@
-From 2aa9204b74c96413944a715408cfd5d2f3a34d66 Mon Sep 17 00:00:00 2001
-From: isuladci <isulad@ci.com>
-Date: Thu, 22 Sep 2022 10:44:26 +0800
-Subject: PATCH skip kill cgroup processes if no hierarchies
-
-Signed-off-by: isuladci <isulad@ci.com>
----
- src/lxc/cgroups/isulad_cgfsng.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c
-index 8a9656a..f5cf81c 100644
---- a/src/lxc/cgroups/isulad_cgfsng.c
-+++ b/src/lxc/cgroups/isulad_cgfsng.c
-@@ -677,15 +677,14 @@ __cgfsng_ops static bool isulad_cgfsng_payload_destroy(struct cgroup_ops *ops,
- 		return false;
- 	}
- 
--#ifdef HAVE_ISULAD
- 	if (ops->no_controller) {
--		DEBUG("no controller found, isgnore isulad_cgfsng_payload_destroy");
-+		DEBUG("no controller found, ignore isulad_cgfsng_payload_destroy");
- 		return true;
- 	}
--#endif
- 
- 	if (!ops->hierarchies) {
--		return false;
-+		DEBUG("no hierarchies found, ignore isulad_cgfsng_payload_destroy");
-+		return true;
- 	}
- 
- 	if (!handler) {
--- 
-2.25.1
-

_service:tar_scm:0017-lxc-Add-sw64-architecture.patch Deleted

_service:tar_scm:0018-add-macro-to-adapt-musl-libc.patch Deleted

_service:tar_scm:0019-add-lxc-attach-add-gids-option.patch Deleted

@@ -1,178 +0,0 @@
-From 90512fd67873600a490d2432e6c9429771f719be Mon Sep 17 00:00:00 2001
-From: isuladci <isulad@ci.com>
-Date: Fri, 2 Dec 2022 18:52:39 +0800
-Subject: PATCH add lxc-attach add-gids option
-
-Signed-off-by: isuladci <isulad@ci.com>
----
- src/lxc/attach.c           | 13 ++++++--
- src/lxc/attach_options.h   |  2 ++
- src/lxc/tools/arguments.h  |  3 ++
- src/lxc/tools/lxc_attach.c | 65 ++++++++++++++++++++++++++++++++++++++
- 4 files changed, 80 insertions(+), 3 deletions(-)
-
-diff --git a/src/lxc/attach.c b/src/lxc/attach.c
-index 8a2c52a..24d020d 100644
---- a/src/lxc/attach.c
-+++ b/src/lxc/attach.c
-@@ -1019,9 +1019,16 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 		goto on_error;
- 	}
- 
--	if (!lxc_setgroups(init_ctx->container->lxc_conf->init_groups_len,
--			init_ctx->container->lxc_conf->init_groups))
--		goto on_error;
-+	if (options->add_gids != NULL && options->add_gids_len != 0) {
-+		if (!lxc_setgroups(options->add_gids_len, options->add_gids)) {
-+			goto on_error;
-+		}
-+	} else {
-+		if (!lxc_setgroups(init_ctx->container->lxc_conf->init_groups_len,
-+				init_ctx->container->lxc_conf->init_groups)) {
-+			goto on_error;
-+		}
-+	}
- #endif
- 
- 	/* Make sure that the processes STDIO is correctly owned by the user that we are switching to */
-diff --git a/src/lxc/attach_options.h b/src/lxc/attach_options.h
-index 16b4e21..4591d65 100644
---- a/src/lxc/attach_options.h
-+++ b/src/lxc/attach_options.h
-@@ -124,6 +124,8 @@ typedef struct lxc_attach_options_t {
- 	const char *suffix;
- 	bool disable_pty;
- 	bool open_stdin;
-+	gid_t *add_gids; /* attach user additional gids */
-+	size_t add_gids_len;
- #endif
- } lxc_attach_options_t;
- 
-diff --git a/src/lxc/tools/arguments.h b/src/lxc/tools/arguments.h
-index 80c2083..583390a 100644
---- a/src/lxc/tools/arguments.h
-+++ b/src/lxc/tools/arguments.h
-@@ -50,6 +50,8 @@ struct lxc_arguments {
- 	int open_stdin;
- 	unsigned int start_timeout; /* isulad: Seconds for waiting on a container to start before it is killed*/
- 	int64_t attach_timeout; /* for lxc-attach */
-+	gid_t *add_gids;
-+	size_t add_gids_len;
- #endif
- 
- 	/* for lxc-console */
-@@ -175,6 +177,7 @@ struct lxc_arguments {
- #define OPT_OPEN_STDIN OPT_USAGE - 14
- #define OPT_ATTACH_TIMEOUT OPT_USAGE - 15
- #define OPT_ATTACH_SUFFIX OPT_USAGE - 16
-+#define OPT_ADDITIONAL_GIDS OPT_USAGE - 17
- #endif
- 
- extern int lxc_arguments_parse(struct lxc_arguments *args, int argc,
-diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
-index 1a5a241..f6ddf2d 100644
---- a/src/lxc/tools/lxc_attach.c
-+++ b/src/lxc/tools/lxc_attach.c
-@@ -78,6 +78,7 @@ static const struct option my_longopts = {
- #else
- 	{"workdir", required_argument, 0, 'w'},
- 	{"user", required_argument, 0, 'u'},
-+	{"add-gids", required_argument, 0, OPT_ADDITIONAL_GIDS},
- 	{"in-fifo", required_argument, 0, OPT_INPUT_FIFO}, /* isulad add terminal fifos*/
- 	{"out-fifo", required_argument, 0, OPT_OUTPUT_FIFO},
- 	{"err-fifo", required_argument, 0, OPT_STDERR_FIFO},
-@@ -146,6 +147,7 @@ Options :\n\
- "\
-   -w, --workdir     Working directory inside the container.\n\
-   -u, --user        User ID (format: UID:GID)\n\
-+      --add-gids    Additional gids (format: GID,GID)\n\
-       --in-fifo     Stdin fifo path\n\
-       --out-fifo    Stdout fifo path\n\
-       --err-fifo    Stderr fifo path\n\
-@@ -228,6 +230,58 @@ static int get_attach_uid_gid(const char *username, uid_t *user_id, gid_t *group
- 	free(tmp);
- 	return 0;
- }
-+
-+static int get_attach_add_gids(const char *add_gids, gid_t **gids, size_t *gids_len)
-+{
-+	long long int readvalue;
-+	size_t i, len;
-+	const size_t max_gids = 100;
-+	gid_t *g = NULL;
-+	__do_free_string_list char **gids_str = NULL;
-+
-+	if (add_gids == NULL || strlen(add_gids) == 0) {
-+		ERROR("None additional gids");
-+		return -1;
-+	}
-+
-+	gids_str = lxc_string_split(add_gids, ',');
-+	if (gids_str == NULL) {
-+		ERROR("Failed to split additional gids");
-+		return -1;
-+	}
-+
-+	len = lxc_array_len((void **)gids_str);
-+	if (len > max_gids) {
-+		ERROR("Too many gids");
-+		return -1;
-+	}
-+
-+	g = calloc(len, sizeof(gid_t));
-+	if (g == NULL) {
-+		ERROR("Out of memory");
-+		return -1;
-+	}
-+
-+	for (i = 0; i < len; i++) {
-+		if (lxc_safe_long_long(gids_stri, &readvalue) != 0) {
-+			SYSERROR("Invalid gid value %s", gids_stri);
-+			goto err_out;
-+		}
-+		if (readvalue < 0) {
-+			ERROR("Invalid gid value: %lld", readvalue);
-+			goto err_out;
-+		}
-+		gi = (unsigned int)readvalue;
-+	}
-+
-+	*gids = g;
-+	*gids_len = len;
-+	return 0;
-+
-+err_out:
-+	free(g);
-+	return -1;
-+}
- #endif
- 
- static int my_parser(struct lxc_arguments *args, int c, char *arg)
-@@ -331,6 +385,12 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
- 	case OPT_OPEN_STDIN:
- 		args->open_stdin = 1;
- 		break;
-+	case OPT_ADDITIONAL_GIDS:
-+		if (get_attach_add_gids(arg, &args->add_gids, &args->add_gids_len) != 0) {
-+			ERROR("Failed to get attach additional gids");
-+			return -1;
-+		}
-+		break;
- #endif
- 	}
- 
-@@ -655,6 +715,11 @@ int main(int argc, char *argv)
- 		attach_options.initial_cwd = my_args.workdir;
- 	}
- 
-+	if (my_args.add_gids) {
-+		attach_options.add_gids = my_args.add_gids;
-+		attach_options.add_gids_len = my_args.add_gids_len;
-+	}
-+
- 	/* isulad: add do attach background */
- 	if (attach_options.attach_flags & LXC_ATTACH_TERMINAL)
- 		wexit = do_attach_foreground(c, &command, &attach_options, &errmsg);
--- 
-2.25.1
-

_service:tar_scm:0020-add-sscanf-adapation-code-for-musl.patch Deleted

@@ -1,31 +0,0 @@
-From 3cefa43ec2f5f0366c470290d48bdcd88690cf90 Mon Sep 17 00:00:00 2001
-From: isuladci <isulad@ci.com>
-Date: Thu, 8 Dec 2022 09:48:29 +0800
-Subject: PATCH add sscanf adapation code for musl
-
-Signed-off-by: isuladci <isulad@ci.com>
----
- src/lxc/isulad_utils.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/lxc/isulad_utils.c b/src/lxc/isulad_utils.c
-index 067e1c9..ee39302 100644
---- a/src/lxc/isulad_utils.c
-+++ b/src/lxc/isulad_utils.c
-@@ -173,7 +173,13 @@ static proc_t *lxc_stat2proc(const char *S)
-     (void)memset(P, 0x00, sizeof(proc_t));
- 
-     /* parse these two strings separately, skipping the leading "(". */
-+    /* https://www.openwall.com/lists/musl/2013/11/15/5: musl's sscanf("%15c",cmd) 
-+       requires exactly 15 characters; anything shorter is a matching failure. */
-+#ifdef __MUSL__
-+    num = sscanf(S, "%d (%15s", &P->pid, P->cmd);   /* comm16 in kernel */
-+#else
-     num = sscanf(S, "%d (%15c", &P->pid, P->cmd);   /* comm16 in kernel */
-+#endif
-     if (num != 2) {
-         ERROR("Call sscanf error: %s", errno ? strerror(errno) : "");
-         free(P);
--- 
-2.25.1
-

_service:tar_scm:0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch Deleted

_service:tar_scm:0022-fix-cve-CVE-2022-47952-log-leaks-root-information.patch Deleted

@@ -1,51 +0,0 @@
-From 2b4d27ef9b5d9f38654277f021fabdda2d5f8e36 Mon Sep 17 00:00:00 2001
-From: isuladci <isulad@ci.com>
-Date: Thu, 12 Jan 2023 19:20:43 -0800
-Subject: PATCH fix cve CVE-2022-47952: log leaks root information
-
-Signed-off-by: isuladci <isulad@ci.com>
----
- src/lxc/cmd/lxc_user_nic.c | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c
-index 4160565..5b848da 100644
---- a/src/lxc/cmd/lxc_user_nic.c
-+++ b/src/lxc/cmd/lxc_user_nic.c
-@@ -1087,20 +1087,16 @@ int main(int argc, char *argv)
- 	} else if (request == LXC_USERNIC_DELETE) {
- 		char opathLXC_PROC_PID_FD_LEN;
- 
--		/* Open the path with O_PATH which will not trigger an actual
--		 * open(). Don't report an errno to the caller to not leak
--		 * information whether the path exists or not.
--		 * When stracing setuid is stripped so this is not a concern
--		 * either.
--		 */
-+		// Keep in mind CVE-2022-47952: It's crucial not to leak any
-+		// information whether open() succeeded or failed.
- 		netns_fd = open(args.pid, O_PATH | O_CLOEXEC);
- 		if (netns_fd < 0) {
--			usernic_error("Failed to open \"%s\"\n", args.pid);
-+			usernic_error("Failed while opening netns file for \"%s\"\n", args.pid);
- 			_exit(EXIT_FAILURE);
- 		}
- 
- 		if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) {
--			usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid);
-+			usernic_error("Failed while opening netns file for \"%s\"\n", args.pid);
- 			close(netns_fd);
- 			_exit(EXIT_FAILURE);
- 		}
-@@ -1114,7 +1110,7 @@ int main(int argc, char *argv)
- 		/* Now get an fd that we can use in setns() calls. */
- 		ret = open(opath, O_RDONLY | O_CLOEXEC);
- 		if (ret < 0) {
--			CMD_SYSERROR("Failed to open \"%s\"\n", args.pid);
-+			CMD_SYSERROR("Failed while opening netns file for \"%s\"\n", args.pid);
- 			close(netns_fd);
- 			_exit(EXIT_FAILURE);
- 		}
--- 
-2.25.1
-

_service:tar_scm:0023-fix-lxc-write-error-message.patch Deleted

_service:tar_scm:0024-remove-process-inheritable-capability.patch Deleted

@@ -1,27 +0,0 @@
-From d232c098c9a75fce2b7e6da55faa89cd546d3dc9 Mon Sep 17 00:00:00 2001
-From: isuladci <isulad@ci.com>
-Date: Tue, 31 Jan 2023 19:14:57 +0800
-Subject: PATCH remove process inheritable capability
-
-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
----
- src/lxc/conf.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index 439601a..c478bf2 100644
---- a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -5528,7 +5528,8 @@ int lxc_drop_caps(struct lxc_conf *conf)
- 		if (caplisti) {
- 			cap_dataCAP_TO_INDEX(i).effective = cap_dataCAP_TO_INDEX(i).effective | (i > 31 ? __DEF_CAP_TO_MASK(i % 32) : __DEF_CAP_TO_MASK(i));
- 			cap_dataCAP_TO_INDEX(i).permitted = cap_dataCAP_TO_INDEX(i).permitted | (i > 31 ? __DEF_CAP_TO_MASK(i % 32) : __DEF_CAP_TO_MASK(i));
--			cap_dataCAP_TO_INDEX(i).inheritable = cap_dataCAP_TO_INDEX(i).inheritable | (i > 31 ? __DEF_CAP_TO_MASK(i % 32) : __DEF_CAP_TO_MASK(i));
-+			// fix CVE-2022-24769
-+			// inheritable capability should be empty
- 		}
- 	}
- 
--- 
-2.25.1
-

_service:tar_scm:0025-fix-ops-hierarchies-cause-coredump.patch Deleted

_service:tar_scm:0026-meminfo-cri-1.25.patch Deleted

@@ -1,55 +0,0 @@
-From d8bf23cac765af4bededef26e56f7cde7bafd4fe Mon Sep 17 00:00:00 2001
-From: "ilya.kuksenok" <ilya.kuksenok@huawei.com>
-Date: Mon, 27 Feb 2023 14:39:39 +0300
-Subject: PATCH Add metrics
-
-Signed-off-by: ilya.kuksenok <ilya.kuksenok@huawei.com>
----
- src/lxc/lxccontainer.c | 14 ++++++++++++++
- src/lxc/lxccontainer.h |  5 +++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
-index 4b669bb..afbeb3c 100644
---- a/src/lxc/lxccontainer.c
-+++ b/src/lxc/lxccontainer.c
-@@ -6053,6 +6053,20 @@ static bool do_lxcapi_get_container_metrics(struct lxc_container *c,  struct lxc
- 	metrics->cpu_use_nanos = metrics_get_ull(c, cgroup_ops, "cpuacct.usage");
- 	metrics->pids_current = metrics_get_ull(c, cgroup_ops, "pids.current");
- 
-+	uint64_t usage_bytes; 
-+	uint64_t workingset;
-+	usage_bytes = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "rss", 1) +  
-+					    metrics_match_get_ull(c, cgroup_ops, "memory.stat", "cache", 1) + 
-+					    metrics_match_get_ull(c, cgroup_ops, "memory.stat", "swap", 1);
-+	// workingset = usage - inactive_file
-+	workingset = usage_bytes - metrics_match_get_ull(c, cgroup_ops, "memory.stat", "total_inactive_file", 1);
-+	// Avaliable bytes = limit - workingset 
-+	metrics->avaliable_bytes = metrics_get_ull(c, cgroup_ops, "memory.limit_in_bytes") - workingset;
-+	metrics->usage_bytes = usage_bytes;
-+	metrics->rss_bytes = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "rss", 1);
-+	metrics->page_faults = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "pgfault", 1);
-+	metrics->major_page_faults = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "pgmajfault", 1);
-+
- 	metrics->cpu_use_user = metrics_match_get_ull(c, cgroup_ops, "cpuacct.stat", "user", 1);
- 	metrics->cpu_use_sys = metrics_match_get_ull(c, cgroup_ops, "cpuacct.stat", "system", 1);
- 
-diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
-index 3680ade..68dfec9 100644
---- a/src/lxc/lxccontainer.h
-+++ b/src/lxc/lxccontainer.h
-@@ -68,6 +68,11 @@ struct lxc_container_metrics {
-     /* Memory usage */
-     uint64_t mem_used;
-     uint64_t mem_limit;
-+    uint64_t avaliable_bytes;
-+    uint64_t usage_bytes;
-+    uint64_t rss_bytes;
-+    uint64_t page_faults;
-+    uint64_t major_page_faults;
-     /* Kernel Memory usage */
-     uint64_t kmem_used;
-     uint64_t kmem_limit;
--- 
-2.34.1
-

_service:tar_scm:0027-add-loongarch64-support-for-lxc.patch Deleted

@@ -1,238 +0,0 @@
-From 477ecc390bf4d62e8e02b98699b377b848b043de Mon Sep 17 00:00:00 2001
-From: Wenlong Zhang <zhangwenlong@loongson.cn>
-Date: Thu, 9 Feb 2023 08:18:35 +0000
-Subject: PATCH add loongarch64 support for lxc
-
----
- src/lxc/seccomp.c         | 51 +++++++++++++++++++++++++++++++++++++++
- src/lxc/syscall_numbers.h | 26 ++++++++++++++++++++
- 2 files changed, 77 insertions(+)
-
-diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
-index ebbba80..94dc23a 100644
---- a/src/lxc/seccomp.c
-+++ b/src/lxc/seccomp.c
-@@ -310,6 +310,7 @@ enum lxc_hostarch_t {
- 	lxc_seccomp_arch_ppc64,
- 	lxc_seccomp_arch_ppc64le,
- 	lxc_seccomp_arch_ppc,
-+	lxc_seccomp_arch_loongarch64,
- 	lxc_seccomp_arch_mips,
- 	lxc_seccomp_arch_mips64,
- 	lxc_seccomp_arch_mips64n32,
-@@ -344,6 +345,8 @@ int get_hostarch(void)
- 		return lxc_seccomp_arch_ppc64;
- 	else if (strncmp(uts.machine, "ppc", 3) == 0)
- 		return lxc_seccomp_arch_ppc;
-+	else if (strncmp(uts.machine, "loongarch64", 11) == 0)
-+		return lxc_seccomp_arch_loongarch64;
- 	else if (strncmp(uts.machine, "mips64", 6) == 0)
- 		return MIPS_ARCH_N64;
- 	else if (strncmp(uts.machine, "mips", 4) == 0)
-@@ -400,6 +403,11 @@ scmp_filter_ctx get_new_ctx(enum lxc_hostarch_t n_arch,
- 		arch = SCMP_ARCH_PPC;
- 		break;
- #endif
-+#ifdef SCMP_ARCH_LOONGARCH64
-+        case lxc_seccomp_arch_loongarch64:
-+                arch = SCMP_ARCH_LOONGARCH64;
-+                break;
-+#endif
- #ifdef SCMP_ARCH_MIPS
- 	case lxc_seccomp_arch_mips:
- 		arch = SCMP_ARCH_MIPS;
-@@ -738,6 +746,16 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
- 			goto bad;
- #endif
- #endif
-+#ifdef SCMP_ARCH_LOONGARCH64
-+	} else if (native_arch == lxc_seccomp_arch_loongarch64) {
-+		cur_rule_arch = lxc_seccomp_arch_all;
-+
-+		ctx.lxc_arch0 = lxc_seccomp_arch_loongarch64;
-+		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_loongarch64,
-+						  default_policy_action, &ctx.architectures0);
-+		if (!ctx.contexts0)
-+			goto bad;
-+#endif
- #ifdef SCMP_ARCH_MIPS
- 	} else if (native_arch == lxc_seccomp_arch_mips64) {
- 		cur_rule_arch = lxc_seccomp_arch_all;
-@@ -906,6 +924,17 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
- 				cur_rule_arch = lxc_seccomp_arch_ppc;
- 			}
- #endif
-+#ifdef SCMP_ARCH_LOONGARCH64
-+			else if (strcmp(line, "loongarch64") == 0 ||
-+				 strcmp(line, "LOONGARCH64") == 0) {
-+				if (native_arch != lxc_seccomp_arch_loongarch64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_loongarch64;
-+			}
-+#endif
- #ifdef SCMP_ARCH_MIPS
- 			else if (strcmp(line, "mips64") == 0 ||
- 				 strcmp(line, "MIPS64") == 0) {
-@@ -1263,6 +1292,17 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
- 			goto bad;
- #endif
- #endif
-+#ifdef SCMP_ARCH_LOONGARCH64
-+	} else if (native_arch == lxc_seccomp_arch_loongarch64) {
-+		cur_rule_arch = lxc_seccomp_arch_all;
-+
-+		ctx.architectures0 = SCMP_ARCH_LOONGARCH64;
-+		ctx.contexts0 = get_new_ctx(lxc_seccomp_arch_loongarch64,
-+					      default_policy_action,
-+					      &ctx.needs_merge0);
-+		if (!ctx.contexts0)
-+			goto bad;
-+#endif
- #ifdef SCMP_ARCH_MIPS
- 	} else if (native_arch == lxc_seccomp_arch_mips64) {
- 		cur_rule_arch = lxc_seccomp_arch_all;
-@@ -1434,6 +1474,17 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
- 				cur_rule_arch = lxc_seccomp_arch_ppc;
- 			}
- #endif
-+#ifdef SCMP_ARCH_LOONGRCH64
-+			else if (strcmp(line, "loongarch64") == 0 ||
-+				 strcmp(line, "LOONGARCH64") == 0) {
-+				if (native_arch != lxc_seccomp_arch_loongarch64) {
-+					cur_rule_arch = lxc_seccomp_arch_unknown;
-+					continue;
-+				}
-+
-+				cur_rule_arch = lxc_seccomp_arch_loongarch64;
-+			}
-+#endif
- #ifdef SCMP_ARCH_MIPS
- 			else if (strcmp(line, "mips64") == 0 ||
- 				 strcmp(line, "MIPS64") == 0) {
-diff --git a/src/lxc/syscall_numbers.h b/src/lxc/syscall_numbers.h
-index c68cf24..01aa68d 100644
---- a/src/lxc/syscall_numbers.h
-+++ b/src/lxc/syscall_numbers.h
-@@ -49,6 +49,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_keyctl 5241
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_keyctl 219
- 	#else
- 		#define -1
- 		#warning "__NR_keyctl not defined for your architecture"
-@@ -84,6 +86,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64
- 			#define __NR_memfd_create 5314
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_memfd_create 279
- 	#else
- 		#define -1
- 		#warning "__NR_memfd_create not defined for your architecture"
-@@ -117,6 +121,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_pivot_root 5151
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_pivot_root 41
- 	#else
- 		#define -1
- 		#warning "__NR_pivot_root not defined for your architecture"
-@@ -150,6 +156,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_setns 5303
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_setns 268
- 	#else
- 		#define -1
- 		#warning "__NR_setns not defined for your architecture"
-@@ -183,6 +191,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_sethostname 5165
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_sethostname 161
- 	#else
- 		#define -1
- 		#warning "__NR_sethostname not defined for your architecture"
-@@ -216,6 +226,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_signalfd 5276
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_signalfd -1		/* doesn't exist in loongarch64 */
- 	#else
- 		#define -1
- 		#warning "__NR_signalfd not defined for your architecture"
-@@ -249,6 +261,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_signalfd4 5283
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_signalfd4 74
- 	#else
- 		#define -1
- 		#warning "__NR_signalfd4 not defined for your architecture"
-@@ -282,6 +296,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_unshare 5262
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_unshare 97
- 	#else
- 		#define -1
- 		#warning "__NR_unshare not defined for your architecture"
-@@ -315,6 +331,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_bpf 5315
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_bpf 280
- 	#else
- 		#define -1
- 		#warning "__NR_bpf not defined for your architecture"
-@@ -348,6 +366,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_faccessat 5259
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_faccessat 48
- 	#else
- 		#define -1
- 		#warning "__NR_faccessat not defined for your architecture"
-@@ -401,6 +421,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_seccomp 5312
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_seccomp 277
- 	#else
- 		#define -1
- 		#warning "__NR_seccomp not defined for your architecture"
-@@ -434,6 +456,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_gettid 5178
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_gettid 178
- 	#else
- 		#define -1
- 		#warning "__NR_gettid not defined for your architecture"
-@@ -471,6 +495,8 @@
- 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
- 			#define __NR_execveat 5316
- 		#endif
-+	#elif defined __loongarch64
-+		#define __NR_execveat 281
- 	#else
- 		#define -1
- 		#warning "__NR_execveat not defined for your architecture"
--- 
-2.33.0
-

_service:tar_scm:0028-use-ocihooks-env-after-getenv.patch Deleted

@@ -1,51 +0,0 @@
-From 9c82e7c0d345eba3cc0514a536eb8438f328164e Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Thu, 30 Mar 2023 11:38:45 +0800
-Subject: PATCH use ocihooks env after getenv
-
-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
----
- src/lxc/conf.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index c478bf2..3335b0d 100644
---- a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -6224,7 +6224,8 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
- {
- 	char **result  = NULL;
- 	size_t result_len = env_len;
--	size_t i, j;
-+	size_t i = 0;
-+	size_t j, k;
- 	char *tmpenv = NULL;
- 	char *lxc_envs = {"LD_LIBRARY_PATH", "PATH", "LXC_CGNS_AWARE", "LXC_PID", "LXC_ROOTFS_MOUNT",
- 	                    "LXC_CONFIG_FILE", "LXC_CGROUP_PATH", "LXC_ROOTFS_PATH", "LXC_NAME"
-@@ -6239,11 +6240,6 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
- 		return NULL;
- 	memset(result, 0, sizeof(char *) * result_len);
- 
--	for(i = 0; i < env_len; i++) {
--		if (oldenvsi)
--			resulti = safe_strdup(oldenvsi);
--	}
--
- 	for(j = 0; j < (sizeof(lxc_envs) / sizeof(char *)); j++) {
- 		size_t env_buf_len = 0;
- 		tmpenv = getenv(lxc_envsj);
-@@ -6267,6 +6263,11 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
- 		}
- 	}
- 
-+	for(k = 0; k < env_len; k++) {
-+		if (oldenvsk && i < (result_len - 1))
-+			resulti++ = safe_strdup(oldenvsk);
-+	}
-+
- 	*merge_env_len = i;
- 	return result;
- }
--- 
-2.25.1
-

_service:tar_scm:0029-fix-mixed-use-of-signed-and-unsigned-type.patch Deleted

@@ -1,51 +0,0 @@
-From 573aae0ba3b76067e76206b78c8243b34e3f40e3 Mon Sep 17 00:00:00 2001
-From: "Neil.wrz" <wangrunze13@huawei.com>
-Date: Tue, 18 Apr 2023 00:05:27 -0700
-Subject: PATCH fix mixed use of signed and unsigned type
-
-Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
----
- src/lxc/path.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/lxc/path.c b/src/lxc/path.c
-index 46256cb..c0529b7 100644
---- a/src/lxc/path.c
-+++ b/src/lxc/path.c
-@@ -101,7 +101,7 @@ bool filepath_split(const char *path, char **dir, char **base)
- 		ERROR("Invalid path");
- 		return false;
- 	}
--	i = len - 1;
-+	i = (ssize_t)(len - 1);
- 	while (i >= 0 && pathi != '/')
- 		i--;
- 
-@@ -326,7 +326,7 @@ static int do_get_symlinks(const char **fullpath, const char *prefix, size_t pre
- 	}
- 
- 	len = strlen(*end);
--	if (len >= PATH_MAX - n) {
-+	if (len >= (size_t)(PATH_MAX - n)) {
- 		ERROR("Path is too long");
- 		goto out;
- 	}
-@@ -619,7 +619,7 @@ char *path_relative(const char *basepath, const char *targpath)
- 
- 	if (b0 != bl) {
- 		// Base elements left. Must go up before going down.
--		int seps = 0, i;
-+		size_t seps = 0, i;
- 		size_t ncopyed = 0, seps_size;
- 		char *buf = NULL;
- 
-@@ -652,4 +652,4 @@ char *path_relative(const char *basepath, const char *targpath)
- 	}
- 
- 	return safe_strdup(targ + t0);
--}
-\ No newline at end of file
-+}
--- 
-2.25.1
-

_service:tar_scm:0030-remove-unused-meminfo-stats.patch Deleted

@@ -1,48 +0,0 @@
-From 4daa1572b9f129ba46cefb13683de90b49404872 Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Tue, 18 Apr 2023 15:22:21 +0800
-Subject: PATCH remove unused meminfo stats
-
-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
----
- src/lxc/lxccontainer.c | 10 ----------
- src/lxc/lxccontainer.h |  2 --
- 2 files changed, 12 deletions(-)
-
-diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
-index afbeb3c..cc6c5cd 100644
---- a/src/lxc/lxccontainer.c
-+++ b/src/lxc/lxccontainer.c
-@@ -6053,16 +6053,6 @@ static bool do_lxcapi_get_container_metrics(struct lxc_container *c,  struct lxc
- 	metrics->cpu_use_nanos = metrics_get_ull(c, cgroup_ops, "cpuacct.usage");
- 	metrics->pids_current = metrics_get_ull(c, cgroup_ops, "pids.current");
- 
--	uint64_t usage_bytes; 
--	uint64_t workingset;
--	usage_bytes = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "rss", 1) +  
--					    metrics_match_get_ull(c, cgroup_ops, "memory.stat", "cache", 1) + 
--					    metrics_match_get_ull(c, cgroup_ops, "memory.stat", "swap", 1);
--	// workingset = usage - inactive_file
--	workingset = usage_bytes - metrics_match_get_ull(c, cgroup_ops, "memory.stat", "total_inactive_file", 1);
--	// Avaliable bytes = limit - workingset 
--	metrics->avaliable_bytes = metrics_get_ull(c, cgroup_ops, "memory.limit_in_bytes") - workingset;
--	metrics->usage_bytes = usage_bytes;
- 	metrics->rss_bytes = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "rss", 1);
- 	metrics->page_faults = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "pgfault", 1);
- 	metrics->major_page_faults = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "pgmajfault", 1);
-diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
-index 68dfec9..96db5e6 100644
---- a/src/lxc/lxccontainer.h
-+++ b/src/lxc/lxccontainer.h
-@@ -68,8 +68,6 @@ struct lxc_container_metrics {
-     /* Memory usage */
-     uint64_t mem_used;
-     uint64_t mem_limit;
--    uint64_t avaliable_bytes;
--    uint64_t usage_bytes;
-     uint64_t rss_bytes;
-     uint64_t page_faults;
-     uint64_t major_page_faults;
--- 
-2.25.1
-

_service:tar_scm:0031-lxc-attach-Fix-lost-return-codes-of-spawned-processe.patch Deleted

@@ -1,39 +0,0 @@
-From 4ebca5a005afbc19c08f663e24d3e76518d12fa8 Mon Sep 17 00:00:00 2001
-From: Mohammed Ajmal Siddiqui <ajmalsiddiqui21@gmail.com>
-Date: Wed, 5 Oct 2022 12:20:58 +0530
-Subject: PATCH lxc-attach: Fix lost return codes of spawned processes that
- are killed
-
-lxc-attach swallows the return codes of processes that are terminated
-via a signal, and by default exits with a return code of 0 (i.e.
-indicating success) even if the command it tried to execute was
-terminated.
-
-This patch fixes it by explicitly checking if the process was terminated
-via a signal, and returning an appropriate exit code.
-
-Note that we add 128 to the signal value to generate the exit code
-because by convention the exit code is 128 + signal number. e.g. if a
-process is killed via signal 9, then the error code is 9 + 128 = 137.
-
-Signed-off-by: Mohammed Ajmal Siddiqui <ajmalsiddiqui21@gmail.com>
----
- src/lxc/tools/lxc_attach.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
-index fa303c7b4..6482b0aee 100644
---- a/src/lxc/tools/lxc_attach.c
-+++ b/src/lxc/tools/lxc_attach.c
-@@ -399,6 +399,8 @@ int lxc_attach_main(int argc, char *argv)
- 	}
- 	if (WIFEXITED(ret))
- 		wexit = WEXITSTATUS(ret);
-+	else if (WIFSIGNALED(ret))
-+		wexit = WTERMSIG(ret) + 128;
- 
- out:
- 	lxc_container_put(c);
--- 
-2.33.0
-

_service:tar_scm:0032-fix-load-bpf-failed.patch Deleted

_service:tar_scm:0033-fix-mount-device-path-incorrect.patch Deleted

_service:tar_scm:0034-add-secure-compile-macro.patch Deleted

@@ -1,65 +0,0 @@
-From 728d921b36f07833470a284a55cbfea4baaab268 Mon Sep 17 00:00:00 2001
-From: mzzhou <1362843687@qq.com>
-Date: Mon, 10 Jul 2023 21:28:10 +0800
-Subject: PATCH add secure compile marco
-
----
- configure.ac        | 20 ++++++++++++++++++++
- src/lxc/Makefile.am |  6 +++++-
- 2 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2180586..e66bdf1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -837,10 +837,30 @@ if test "x$adapt_isulad" = "xyes"; then
- 	AC_DEFINE(HAVE_ISULAD, 1, adapt to iSulad)
- 	AC_MSG_RESULT(yes)
- 
-+	AC_MSG_CHECKING(Whether enable secure compile)
-+	AC_ARG_ENABLE(secure-compile,
-+		AC_HELP_STRING(--enable-secure-compile, enable secure compile default=no),
-+		secure_compile=$enableval, secure_compile=yes)
-+	AM_CONDITIONAL(HAVE_SECURE_COMPILE, test "x$secure_compile" = "xyes")
-+	AC_DEFINE(HAVE_SECURE_COMPILE, 1, enable secure compile)
-+	AC_MSG_RESULT(yes)
-+
- 	# Check yajl
- 	PKG_CHECK_MODULES(YAJL, yajl >= 2,,AC_MSG_ERROR(You must install yajl >= 2))
- else
- 	AC_MSG_RESULT(no)
-+
-+	AC_MSG_CHECKING(Whether enable secure compile)
-+	AC_ARG_ENABLE(secure-compile,
-+		AC_HELP_STRING(--enable-secure-compile, enable secure compile default=no),
-+		secure_compile=$enableval, secure_compile=yes)
-+	AM_CONDITIONAL(HAVE_SECURE_COMPILE, test "x$secure_compile" = "xyes")
-+	if test "x$secure_compile" = "xyes"; then
-+		AC_DEFINE(HAVE_SECURE_COMPILE, 1, enable secure compile)
-+		AC_MSG_RESULT(yes)
-+	else
-+		AC_MSG_RESULT(no)
-+	fi
- fi
- 
- # Files requiring some variable expansion
-diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
-index 61a229f..c1d20f6 100644
---- a/src/lxc/Makefile.am
-+++ b/src/lxc/Makefile.am
-@@ -292,7 +292,11 @@ liblxc_la_LDFLAGS = -pthread \
- 		    -version-info @LXC_ABI_MAJOR@
- 
- if HAVE_ISULAD
--liblxc_la_LDFLAGS += @YAJL_LIBS@ -Wl,-z,relro \
-+liblxc_la_LDFLAGS += @YAJL_LIBS@
-+endif
-+
-+if HAVE_SECURE_COMPILE
-+liblxc_la_LDFLAGS += -Wl,-z,relro \
- 		    -Wl,-z,now \
- 		    -Wl,-z,noexecstack
- endif
--- 
-2.41.0.windows.2
-

_service:tar_scm:0035-codecheck-fix.patch Deleted

@@ -1,650 +0,0 @@
-From 103aff2c11b16a2b53b0339b0033a77b3348fec3 Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Wed, 6 Sep 2023 15:14:06 +0800
-Subject: PATCH codecheck fix
-
-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
----
- src/lxc/af_unix.c          |  4 +--
- src/lxc/attach.c           |  2 +-
- src/lxc/commands.c         | 27 +++++++++++++----
- src/lxc/conf.c             | 46 +++++++++++++++++++++++++++--
- src/lxc/exec_commands.c    |  2 +-
- src/lxc/file_utils.c       |  2 +-
- src/lxc/isulad_utils.c     | 23 ++++++++++-----
- src/lxc/json/json_common.c |  4 +--
- src/lxc/path.c             | 32 ++++++++++++++++++--
- src/lxc/start.c            | 60 +++++++++++++++++++++++++++++++-------
- src/lxc/terminal.c         | 24 ++++++++++++---
- 11 files changed, 186 insertions(+), 40 deletions(-)
-
-diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
-index 0be9368..d98a1f9 100644
---- a/src/lxc/af_unix.c
-+++ b/src/lxc/af_unix.c
-@@ -170,10 +170,10 @@ int lxc_unix_send_fds(int fd, int *sendfds, int num_sendfds, void *data,
- #ifdef HAVE_ISULAD
- static int lxc_abstract_unix_recv_fds_iov(int fd, int *recvfds, int num_recvfds,
- 			          struct iovec *iov, size_t iovlen, unsigned int timeout)
--#else 
-+#else
- static int lxc_abstract_unix_recv_fds_iov(int fd, int *recvfds, int num_recvfds,
- 					  struct iovec *iov, size_t iovlen)
--#endif 
-+#endif
- {
- 	__do_free char *cmsgbuf = NULL;
- 	int ret;
-diff --git a/src/lxc/attach.c b/src/lxc/attach.c
-index 24d020d..0ac37cc 100644
---- a/src/lxc/attach.c
-+++ b/src/lxc/attach.c
-@@ -735,7 +735,7 @@ static int attach_child_main(struct attach_clone_payload *payload)
- 	ret = sigfillset(&mask);
- 	if (ret < 0) {
- 		SYSERROR("Failed to fill signal mask");
--		goto on_error;;
-+		goto on_error;
- 	}
- 	ret = sigprocmask(SIG_UNBLOCK, &mask, NULL);
- 	if (ret < 0) {
-diff --git a/src/lxc/commands.c b/src/lxc/commands.c
-index c2a5665..d6b9939 100644
---- a/src/lxc/commands.c
-+++ b/src/lxc/commands.c
-@@ -1504,17 +1504,32 @@ int lxc_cmd_set_terminal_fifos(const char *name, const char *lxcpath, const char
- 				const char *out_fifo, const char *err_fifo)
- {
- 	int ret = 0, stopped = 0;
--	int len = 0;
-+	size_t len = 0;
- 	char *tmp = NULL;
- 	const char *split = "&&&&", *none_fifo_name = "none";
- 	const char *cmd_in_fifo = in_fifo ? in_fifo : none_fifo_name;
- 	const char *cmd_out_fifo = out_fifo ? out_fifo : none_fifo_name;
- 	const char *cmd_err_fifo = err_fifo ? err_fifo : none_fifo_name;
- 
--	if (len + strlen(cmd_in_fifo) + strlen(split) + strlen(cmd_out_fifo) +
--	     strlen(split) + strlen(cmd_err_fifo) == SIZE_MAX)
-+	if (name == NULL) {
- 		return -1;
--	len += strlen(cmd_in_fifo) + strlen(split) + strlen(cmd_out_fifo) + strlen(split) + strlen(cmd_err_fifo) + 1;
-+	}
-+
-+	// format: cmd_in_fifo + split + cmd_out_fifo + split + cmd_err_fifo + '\0'
-+	if (strlen(cmd_in_fifo) > SIZE_MAX - strlen(split) - strlen(split) - 1) {
-+		return -1;
-+	}
-+	len += strlen(cmd_in_fifo) + strlen(split) + strlen(split) + 1;
-+
-+	if (strlen(cmd_out_fifo) > SIZE_MAX - len) {
-+		return -1;
-+	}
-+	len += strlen(cmd_out_fifo);
-+
-+	if (strlen(cmd_err_fifo) > SIZE_MAX - len) {
-+		return -1;
-+	}
-+	len += strlen(cmd_err_fifo);
- 	tmp = malloc(len);
- 	if (tmp == NULL)
- 		return -1;
-@@ -1556,7 +1571,7 @@ static int lxc_cmd_set_terminal_fifos_callback(int fd, struct lxc_cmd_req *req,
- 	struct lxc_cmd_rsp rsp;
- 	memset(&rsp, 0, sizeof(rsp));
- 
--	rsp.ret = lxc_terminal_add_fifos(handler->conf, req->data);;
-+	rsp.ret = lxc_terminal_add_fifos(handler->conf, req->data);
- 
- 	return lxc_cmd_rsp_send(fd, &rsp);
- }
-@@ -1602,7 +1617,7 @@ static int lxc_cmd_set_terminal_winch_callback(int fd, struct lxc_cmd_req *req,
- 	struct lxc_cmd_set_terminal_winch_request *data = (struct lxc_cmd_set_terminal_winch_request *)(req->data);
- 	memset(&rsp, 0, sizeof(rsp));
- 
--	rsp.ret = lxc_set_terminal_winsz(&handler->conf->console, data->height, data->width);;
-+	rsp.ret = lxc_set_terminal_winsz(&handler->conf->console, data->height, data->width);
- 
- 	return lxc_cmd_rsp_send(fd, &rsp);
- 
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index a5573ac..3e31691 100644
---- a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -4640,7 +4640,11 @@ static struct lxc_list *get_minimal_idmap(const struct lxc_conf *conf,
- int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *), void *data,
- 		  const char *fn_name)
- {
-+#ifdef HAVE_ISULAD
-+	struct lxc_list *idmap = NULL;
-+#else
- 	call_cleaner(lxc_free_idmap) struct lxc_list *idmap = NULL;
-+#endif
- 	int ret = -1, status = -1;
- 	char c = '1';
- 	struct userns_fn_data d = {
-@@ -4659,8 +4663,16 @@ int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *), void *data,
- 		return ret_errno(ENOENT);
- 
- 	ret = pipe2(pipe_fds, O_CLOEXEC);
-+#ifdef HAVE_ISULAD
-+	if (ret < 0) {
-+		lxc_free_idmap(idmap);
-+		free(idmap);
-+		return -errno;
-+	}
-+#else
- 	if (ret < 0)
- 		return -errno;
-+#endif
- 
- 	d.p0		= pipe_fds0;
- 	d.p1		= pipe_fds1;
-@@ -4710,6 +4722,11 @@ on_error:
- 	if (status < 0)
- 		ret = -1;
- 
-+#ifdef HAVE_ISULAD
-+	lxc_free_idmap(idmap);
-+	free(idmap);
-+#endif
-+
- 	return ret;
- }
- 
-@@ -4717,7 +4734,11 @@ int userns_exec_minimal(const struct lxc_conf *conf,
- 			int (*fn_parent)(void *), void *fn_parent_data,
- 			int (*fn_child)(void *), void *fn_child_data)
- {
-+#ifdef HAVE_ISULAD
-+	struct lxc_list *idmap = NULL;
-+#else
- 	call_cleaner(lxc_free_idmap) struct lxc_list *idmap = NULL;
-+#endif
- 	uid_t resuid = LXC_INVALID_UID;
- 	gid_t resgid = LXC_INVALID_GID;
- 	char c = '1';
-@@ -4733,8 +4754,16 @@ int userns_exec_minimal(const struct lxc_conf *conf,
- 		return ret_errno(ENOENT);
- 
- 	ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, sock_fds);
-+#ifdef HAVE_ISULAD
-+	if (ret < 0) {
-+		lxc_free_idmap(idmap);
-+		free(idmap);
-+		return -errno;
-+	}
-+#else
- 	if (ret < 0)
- 		return -errno;
-+#endif
- 
- 	pid = fork();
- 	if (pid < 0) {
-@@ -4830,6 +4859,11 @@ on_error:
- 	close_prot_errno_disarm(sock_fds0);
- 	close_prot_errno_disarm(sock_fds1);
- 
-+#ifdef HAVE_ISULAD
-+	lxc_free_idmap(idmap);
-+	free(idmap);
-+#endif
-+
- 	/* Wait for child to finish. */
- 	if (pid < 0)
- 		return -1;
-@@ -5468,6 +5502,10 @@ int lxc_drop_caps(struct lxc_conf *conf)
- 	struct lxc_list *caps = NULL;
- 	int *caplist = NULL;
- 
-+	if (conf == NULL) {
-+		return -1;
-+	}
-+
- 	if (lxc_list_empty(&conf->keepcaps))
- 		return 0;
- 
-@@ -5654,7 +5692,7 @@ static int mount_entry_with_loop_dev(const char *src, const char *dest, const ch
- 		if (srcfd < 0)
- 			return srcfd;
- 		ret = snprintf(srcbuf, sizeof(srcbuf), "/proc/self/fd/%d", srcfd);
--		if (ret < 0 || ret > sizeof(srcbuf)) {
-+		if (ret < 0 || (size_t)ret >= sizeof(srcbuf)) {
- 			close(srcfd);
- 			ERROR("Failed to print string");
- 			return -EINVAL;
-@@ -5673,7 +5711,7 @@ static int mount_entry_with_loop_dev(const char *src, const char *dest, const ch
- 	}
- 
- 	ret = snprintf(destbuf, sizeof(destbuf), "/proc/self/fd/%d", destfd);
--	if (ret < 0 || ret > sizeof(destbuf)) {
-+	if (ret < 0 || (size_t)ret >= sizeof(destbuf)) {
- 		if (srcfd != -1)
- 			close(srcfd);
- 		close(destfd);
-@@ -6245,6 +6283,7 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
- 		size_t env_buf_len = 0;
- 		tmpenv = getenv(lxc_envsj);
- 		if (tmpenv && i < (result_len - 1)) {
-+			int nret = 0;
- 			if (strlen(tmpenv) > (SIZE_MAX - 1 - 1 - strlen(lxc_envsj))) {
- 				lxc_free_array((void **)result, free);
- 				return NULL;
-@@ -6255,7 +6294,8 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
- 				lxc_free_array((void **)result, free);
- 				return NULL;
- 			}
--			if (snprintf(lxcenv_buf, env_buf_len, "%s=%s", lxc_envsj, tmpenv) < 0) {
-+			nret = snprintf(lxcenv_buf, env_buf_len, "%s=%s", lxc_envsj, tmpenv);
-+			if (nret < 0 || nret >= env_buf_len) {
- 				free(lxcenv_buf);
- 				continue;
- 			}
-diff --git a/src/lxc/exec_commands.c b/src/lxc/exec_commands.c
-index 50246fa..52067e1 100644
---- a/src/lxc/exec_commands.c
-+++ b/src/lxc/exec_commands.c
-@@ -228,7 +228,7 @@ static int lxc_exec_cmd_set_terminal_winch_callback(int fd, struct lxc_exec_cmd_
- 	struct lxc_exec_cmd_set_terminal_winch_request *data = (struct lxc_exec_cmd_set_terminal_winch_request *)(req->data);
- 	memset(&rsp, 0, sizeof(rsp));
- 
--	rsp.ret = lxc_set_terminal_winsz(handler->terminal, data->height, data->width);;
-+	rsp.ret = lxc_set_terminal_winsz(handler->terminal, data->height, data->width);
- 
- 	return lxc_exec_cmd_rsp_send(fd, &rsp);
- 
-diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
-index 681207b..1c18769 100644
---- a/src/lxc/file_utils.c
-+++ b/src/lxc/file_utils.c
-@@ -128,7 +128,7 @@ ssize_t lxc_write_nointr_for_fifo(int fd, const char *buf, size_t count)
-     ssize_t nret = 0;
-     ssize_t nwritten;
- 
--    if (buf == NULL) {
-+    if (fd < 0 || buf == NULL) {
-         return -1;
-     }
- 
-diff --git a/src/lxc/isulad_utils.c b/src/lxc/isulad_utils.c
-index ee39302..c71bb5b 100644
---- a/src/lxc/isulad_utils.c
-+++ b/src/lxc/isulad_utils.c
-@@ -42,14 +42,14 @@ int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize)
- {
- 	void *tmp = NULL;
- 
--	if (newsize == 0) {
--		goto err_out;
-+	if (newptr == NULL || newsize == 0) {
-+		return -1;
- 	}
- 
- 	tmp = lxc_common_calloc_s(newsize);
- 	if (tmp == NULL) {
- 		ERROR("Failed to malloc memory");
--		goto err_out;
-+		return -1;
- 	}
- 
- 	if (oldptr != NULL) {
-@@ -62,9 +62,6 @@ int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize)
- 
- 	*newptr = tmp;
- 	return 0;
--
--err_out:
--	return -1;
- }
- 
- char *safe_strdup(const char *src)
-@@ -87,6 +84,10 @@ int lxc_open(const char *filename, int flags, mode_t mode)
- {
- 	char rpathPATH_MAX = {0x00};
- 
-+	if (filename == NULL) {
-+		return -1;
-+	}
-+
- 	if (cleanpath(filename, rpath, sizeof(rpath)) == NULL) {
- 		return -1;
- 	}
-@@ -101,6 +102,10 @@ FILE *lxc_fopen(const char *filename, const char *mode)
- {
- 	char rpathPATH_MAX = {0x00};
- 
-+	if (filename == NULL || mode == NULL || strlen(mode) == 0) {
-+		return NULL;
-+	}
-+
- 	if (cleanpath(filename, rpath, sizeof(rpath)) == NULL) {
- 		return NULL;
- 	}
-@@ -137,6 +142,10 @@ int lxc_file2str(const char *filename, char ret, int cap)
- {
-     int fd, num_read;
- 
-+    if (filename == NULL || ret == NULL || cap == 0) {
-+        return -1;
-+    }
-+
-     if ((fd = lxc_open(filename, O_RDONLY | O_CLOEXEC, 0)) == -1)
-         return -1;
-     if ((num_read = read(fd, ret, cap - 1)) <= 0)
-@@ -455,7 +464,7 @@ static int parse_line_pw(const char delim, char *line, struct passwd *result)
-     return 0;
- }
- 
--char *util_left_trim_space(char *str)
-+static char *util_left_trim_space(char *str)
- {
-     char *begin = str;
-     char *tmp = str;
-diff --git a/src/lxc/json/json_common.c b/src/lxc/json/json_common.c
-index ec20c59..dd4dfcd 100755
---- a/src/lxc/json/json_common.c
-+++ b/src/lxc/json/json_common.c
-@@ -682,7 +682,7 @@ yajl_gen_status gen_json_map_int_string(void *ctx, json_map_int_string *map, str
-         if (yajl_gen_status_ok != stat) {
-             GEN_SET_ERROR_AND_RETURN(stat, err);
-         }
--        stat = reformat_string(g, map->valuesi, strlen(map->valuesi));;
-+        stat = reformat_string(g, map->valuesi, strlen(map->valuesi));
-         if (yajl_gen_status_ok != stat) {
-             GEN_SET_ERROR_AND_RETURN(stat, err);
-         }
-@@ -1048,7 +1048,7 @@ yajl_gen_status gen_json_map_string_string(void *ctx, json_map_string_string *ma
-         if (yajl_gen_status_ok != stat) {
-             GEN_SET_ERROR_AND_RETURN(stat, err);
-         }
--        stat = reformat_string(g, map->valuesi, strlen(map->valuesi));;
-+        stat = reformat_string(g, map->valuesi, strlen(map->valuesi));
-         if (yajl_gen_status_ok != stat) {
-             GEN_SET_ERROR_AND_RETURN(stat, err);
-         }
-diff --git a/src/lxc/path.c b/src/lxc/path.c
-index c0529b7..25dd68d 100644
---- a/src/lxc/path.c
-+++ b/src/lxc/path.c
-@@ -30,6 +30,10 @@ bool specify_current_dir(const char *path)
- 	char *basec = NULL, *bname = NULL;
- 	bool res = false;
- 
-+	if (path == NULL) {
-+		return false;
-+	}
-+
- 	basec = safe_strdup(path);
- 
- 	bname = basename(basec);
-@@ -59,6 +63,10 @@ char *preserve_trailing_dot_or_separator(const char *cleanedpath,
- 	char *respath = NULL;
- 	size_t len;
- 
-+	if (cleanedpath == NULL || originalpath == NULL) {
-+		return NULL;
-+	}
-+
- 	if (strlen(cleanedpath) > (SIZE_MAX - 3)) {
- 		return NULL;
- 	}
-@@ -96,6 +104,10 @@ bool filepath_split(const char *path, char **dir, char **base)
- 	ssize_t i;
- 	size_t len;
- 
-+	if (path == NULL || dir == NULL || base == NULL) {
-+		return false;
-+	}
-+
- 	len = strlen(path);
- 	if (len >= PATH_MAX) {
- 		ERROR("Invalid path");
-@@ -138,7 +150,7 @@ static bool do_clean_path_continue(const char *endpos, const char *stpos, const
- 	return false;
- }
- 
--int do_clean_path(const char *respath, const char *limit_respath,
-+static int do_clean_path(const char *respath, const char *limit_respath,
-                   const char *stpos, char **dst)
- {
- 	char *dest = *dst;
-@@ -515,6 +527,11 @@ char *follow_symlink_in_scope(const char *fullpath, const char *rootpath)
- 	char resfullPATH_MAX = {0}, *full = NULL;
- 	char resrootPATH_MAX = {0}, *root = NULL;
- 
-+	if (fullpath == NULL || rootpath == NULL) {
-+		ERROR("Invalid arguments");
-+		return NULL;
-+	}
-+
- 	full = cleanpath(fullpath, resfull, PATH_MAX);
- 	if (!full) {
- 		ERROR("Failed to get cleaned path");
-@@ -544,6 +561,7 @@ int get_resource_path(const char *rootpath, const char *path,
- 	char resolvedPATH_MAX = {0}, *cleanedpath = NULL;
- 	char *fullpath = NULL;
- 	size_t len;
-+	int nret = 0;
- 
- 	if (!rootpath || !path || !scopepath)
- 		return -1;
-@@ -562,7 +580,12 @@ int get_resource_path(const char *rootpath, const char *path,
- 		ERROR("Out of memory");
- 		return -1;
- 	}
--	snprintf(fullpath, len, "%s%s", rootpath, cleanedpath);
-+	nret = snprintf(fullpath, len, "%s%s", rootpath, cleanedpath);
-+	if (nret < 0 || nret >= len) {
-+		ERROR("Failed to snprintf");
-+		free(fullpath);
-+		return -1;
-+	}
- 
- 	*scopepath = follow_symlink_in_scope(fullpath, rootpath);
- 
-@@ -584,6 +607,11 @@ char *path_relative(const char *basepath, const char *targpath)
- 	char restargPATH_MAX = {0}, *targ = NULL;
- 	size_t bl = 0, tl = 0, b0 = 0, bi = 0, t0 = 0, ti = 0;
- 
-+	if (basepath == NULL || targpath == NULL) {
-+		ERROR("Invalid arguments");
-+		return NULL;
-+	}
-+
- 	base = cleanpath(basepath, resbase, PATH_MAX);
- 	if (!base) {
- 		ERROR("Failed to get cleaned path");
-diff --git a/src/lxc/start.c b/src/lxc/start.c
-index 6fe1203..5de444d 100644
---- a/src/lxc/start.c
-+++ b/src/lxc/start.c
-@@ -906,7 +906,7 @@ struct start_timeout_conf {
- 	int errfd;
- };
- 
--void trim_line(char *s)
-+static void trim_line(char *s)
- {
- 	size_t len;
- 
-@@ -1005,7 +1005,7 @@ static int _recursive_read_cgroup_procs(const char *dirpath, pid_t **pids, size_
- 	return failed ? -1 : 0;
- }
- 
--int get_all_pids(struct cgroup_ops *cg_ops, pid_t **pids, size_t *len)
-+static int get_all_pids(struct cgroup_ops *cg_ops, pid_t **pids, size_t *len)
- {
- 	const char *devices_path = NULL;
- 
-@@ -2875,6 +2875,7 @@ static int clean_resource_set_env(struct lxc_handler *handler)
- 	}
- 
- 	for (; i < conf->ocihooks->poststop_len; i++) {
-+		int nret = 0;
- 		size_t cap = conf->ocihooks->poststopi->env_len;
- 		size_t newcap = cap + len + 1;
- 		if (lxc_grow_array((void ***)&(conf->ocihooks->poststopi->env), &cap, newcap, 1) != 0) {
-@@ -2883,38 +2884,70 @@ static int clean_resource_set_env(struct lxc_handler *handler)
- 		j = conf->ocihooks->poststopi->env_len;
- 		/* Start of environment variable setup for hooks. */
- 		if (name) {
--			snprintf(bufstr, PATH_MAX + 1, "LXC_NAME=%s", name);
-+			nret = snprintf(bufstr, PATH_MAX + 1, "LXC_NAME=%s", name);
-+			if (nret < 0 || nret > PATH_MAX) {
-+				return -1;
-+			}
- 			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+			conf->ocihooks->poststopi->env_len++;
- 		}
- 		if (conf->rcfile) {
--			snprintf(bufstr, PATH_MAX + 1, "LXC_CONFIG_FILE=%s", conf->rcfile);
-+			nret = snprintf(bufstr, PATH_MAX + 1, "LXC_CONFIG_FILE=%s", conf->rcfile);
-+			if (nret < 0 || nret > PATH_MAX) {
-+				return -1;
-+			}
- 			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+			conf->ocihooks->poststopi->env_len++;
- 		}
- 		if (conf->rootfs.mount) {
--			snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_MOUNT=%s", conf->rootfs.mount);
-+			nret = snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_MOUNT=%s", conf->rootfs.mount);
-+			if (nret < 0 || nret > PATH_MAX) {
-+				return -1;
-+			}
- 			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+			conf->ocihooks->poststopi->env_len++;
- 		}
- 		if (conf->rootfs.path) {
--			snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_PATH=%s", conf->rootfs.path);
-+			nret = snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_PATH=%s", conf->rootfs.path);
-+			if (nret < 0 || nret > PATH_MAX) {
-+				return -1;
-+			}
- 			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+			conf->ocihooks->poststopi->env_len++;
- 		}
- 		if (conf->console.path) {
--			snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE=%s", conf->console.path);
-+			nret = snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE=%s", conf->console.path);
-+			if (nret < 0 || nret > PATH_MAX) {
-+				return -1;
-+			}
- 			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+			conf->ocihooks->poststopi->env_len++;
- 		}
- 		if (conf->console.log_path) {
--			snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE_LOGPATH=%s", conf->console.log_path);
-+			nret = snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE_LOGPATH=%s", conf->console.log_path);
-+			if (nret < 0 || nret > PATH_MAX) {
-+				return -1;
-+			}
- 			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+			conf->ocihooks->poststopi->env_len++;
- 		}
- 		conf->ocihooks->poststopi->envj++ = safe_strdup("LXC_CGNS_AWARE=1");
-+		conf->ocihooks->poststopi->env_len++;
- 
--		snprintf(bufstr, PATH_MAX + 1, "LXC_PID=%d", handler->pid);
-+		nret = snprintf(bufstr, PATH_MAX + 1, "LXC_PID=%d", handler->pid);
-+		if (nret < 0 || nret > PATH_MAX) {
-+			return -1;
-+		}
- 		conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+		conf->ocihooks->poststopi->env_len++;
- 		if (handler->cgroup_ops->container_cgroup) {
--			snprintf(bufstr, PATH_MAX + 1, "LXC_CGROUP_PATH=%s", handler->cgroup_ops->container_cgroup);
-+			nret = snprintf(bufstr, PATH_MAX + 1, "LXC_CGROUP_PATH=%s", handler->cgroup_ops->container_cgroup);
-+			if (nret < 0 || nret > PATH_MAX) {
-+				return -1;
-+			}
- 			conf->ocihooks->poststopi->envj++ = safe_strdup(bufstr);
-+			conf->ocihooks->poststopi->env_len++;
- 		}
--		conf->ocihooks->poststopi->env_len = j;
- 		/* End of environment variable setup for hooks. */
- 	}
- 	return 0;
-@@ -3075,6 +3108,11 @@ int do_lxcapi_get_pids(char *name, char *lxcpath, struct lxc_conf *conf, pid_t *
- 	struct lxc_handler *handler = NULL;
- 	struct cgroup_ops *cg_ops = NULL;
- 
-+	if (conf == NULL || pids == NULL || pids_len == NULL) {
-+		ERROR("Invalid arguments");
-+		return -1;
-+	}
-+
- 	handler = lxc_init_pids_handler(name, lxcpath, conf);
- 	if (!handler) {
- 		ERROR("Failed to init container %s clean handler", name);
-diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
-index 0539eca..88d4d94 100644
---- a/src/lxc/terminal.c
-+++ b/src/lxc/terminal.c
-@@ -194,6 +194,11 @@ int lxc_set_terminal_winsz(struct lxc_terminal *terminal, unsigned int height, u
- 	int ret = 0;
- 	struct winsize wsz;
- 
-+	if (terminal == NULL) {
-+		ERROR("Invalid arguments");
-+		return -1;
-+	}
-+
- 	if (terminal->ptmx < 0) {
- 		return 0;
- 	}
-@@ -225,6 +230,10 @@ static int lxc_terminal_rename_old_log_file(struct lxc_terminal *terminal)
- 	char tmpPATH_MAX = {0};
- 	char *rename_fname = NULL;
- 
-+	if (terminal->log_rotate == 0) {
-+		return 0;
-+	}
-+
- 	for (i = terminal->log_rotate - 1; i > 1; i--) {
- 		ret = snprintf(tmp, PATH_MAX, "%s.%u", terminal->log_path, i);
- 		if (ret < 0 || ret >= PATH_MAX) {
-@@ -413,10 +422,12 @@ static bool get_time_buffer(struct timespec *timestamp, char *timebuffer,
- 
- 	seconds = (time_t)timestamp->tv_sec;
- 	gmtime_r(&seconds, &tm_utc);
--	strftime(timebuffer, maxsize, "%Y-%m-%dT%H:%M:%S", &tm_utc);
-+	len = strftime(timebuffer, maxsize, "%Y-%m-%dT%H:%M:%S", &tm_utc);
-+	if (len == 0) {
-+		return false;
-+	}
- 
- 	nanos = (int32_t)timestamp->tv_nsec;
--	len = strlen(timebuffer);
- 	ret = snprintf(timebuffer + len, (maxsize - len), ".%09dZ", nanos);
- 	if (ret < 0 || ret >= (maxsize - len)) {
- 		return false;
-@@ -1548,7 +1559,7 @@ static int terminal_fifo_open(const char *fifo_path, int flags)
- 	return fd;
- }
- 
--bool fifo_exists(const char *path)
-+static bool fifo_exists(const char *path)
- {
- 	struct stat sb;
- 	int ret;
-@@ -1715,11 +1726,16 @@ err:
- int lxc_terminal_add_fifos(struct lxc_conf *conf, const char *fifonames)
- {
- 	int ret = 0;
--	struct lxc_terminal *terminal = &conf->console;
-+	struct lxc_terminal *terminal = NULL;
- 	int fifofd_in = -1;
- 	char *tmp = NULL, *saveptr = NULL, *in = NULL, *out = NULL, *err = NULL;
- 	const char *none_fifo_name = "none";
- 
-+	if (conf == NULL || fifonames == NULL) {
-+		return -1;
-+	}
-+
-+	terminal = &conf->console;
- 	tmp = safe_strdup(fifonames);
- 
- 	in = strtok_r(tmp, "&&&&", &saveptr);
--- 
-2.25.1
-

_service:tar_scm:apply-patches Changed

_service Changed

_service:tar_scm:lxc-4.0.3.tar.gz/ChangeLog Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/INSTALL Deleted

@@ -1,239 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./autogen.sh; ./configure; make; make install'
-should configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  0. If the sources are not coming from a package maintainer and the
-     'configure' file does not exist, you should run './autogen.sh' in
-     the directory containing the package's source code in order to
-     generate the 'configure' file from the 'configure.ac' file.
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

_service:tar_scm:lxc-4.0.3.tar.gz/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/Makefile.in Deleted

@@ -1,964 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile.am
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(am__DIST_COMMON)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc.pc lxc.spec \
-	config/apparmor/abstractions/start-container \
-	src/lxc/cmd/lxc-checkconfig src/lxc/cmd/lxc-update-config
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(pcdatadir)"
-DATA = $(pcdata_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir distdir-am dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc.pc.in \
-	$(srcdir)/lxc.spec.in \
-	$(top_srcdir)/config/apparmor/abstractions/start-container.in \
-	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
-	$(top_srcdir)/config/config.sub \
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
-	$(top_srcdir)/config/missing \
-	$(top_srcdir)/src/lxc/cmd/lxc-checkconfig.in \
-	$(top_srcdir)/src/lxc/cmd/lxc-update-config.in AUTHORS COPYING \
-	ChangeLog INSTALL NEWS README
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I config
-SUBDIRS = config coccinelle src templates doc hooks
-DIST_SUBDIRS = config coccinelle  src templates doc hooks
-EXTRA_DIST = autogen.sh \
-	     lxc.spec \
-	     CONTRIBUTING \
-	     CODING_STYLE.md \
-	     LICENSE.GPL2 \
-	     LICENSE.LGPL2.1 \
-	     MAINTAINERS \
-	     README.md
-
-RPMARGS = 
-pcdatadir = $(libdir)/pkgconfig
-pcdata_DATA = lxc.pc
-all: all-recursive
-
-.SUFFIXES:
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-lxc.pc: $(top_builddir)/config.status $(srcdir)/lxc.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-lxc.spec: $(top_builddir)/config.status $(srcdir)/lxc.spec.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-config/apparmor/abstractions/start-container: $(top_builddir)/config.status $(top_srcdir)/config/apparmor/abstractions/start-container.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-src/lxc/cmd/lxc-checkconfig: $(top_builddir)/config.status $(top_srcdir)/src/lxc/cmd/lxc-checkconfig.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-src/lxc/cmd/lxc-update-config: $(top_builddir)/config.status $(top_srcdir)/src/lxc/cmd/lxc-update-config.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-install-pcdataDATA: $(pcdata_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(pcdata_DATA)'; test -n "$(pcdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pcdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pcdatadir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pcdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pcdatadir)" || exit $$?; \
-	done
-
-uninstall-pcdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pcdata_DATA)'; test -n "$(pcdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pcdatadir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
-
-dist-tarZ: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
-
-dist-shar: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
-
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^^:\\/:\\/,/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build/sub \
-	  && ../../configure \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=../.. --prefix="$$dc_install_base" \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__post_remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(pcdatadir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-data-local install-pcdataDATA
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-pcdataDATA
-
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pcdataDATA install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-pcdataDATA
-
-.PRECIOUS: Makefile
-
-
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status libtool
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(LXCPATH)
-	$(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc
-
-ChangeLog::
-	@touch ChangeLog
-
-rpm: dist
-	rpmbuild --clean -ta ${distdir}.tar.gz $(RPMARGS)
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/NEWS Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/README Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/aclocal.m4 Deleted

@@ -1,1458 +0,0 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef(AC_CONFIG_MACRO_DIRS, m4_defun(_AM_CONFIG_MACRO_DIRS, )m4_defun(AC_CONFIG_MACRO_DIRS, _AM_CONFIG_MACRO_DIRS($@)))
-m4_ifndef(AC_AUTOCONF_VERSION,
-  m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
-m4_warning(this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.))
-
-dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
-dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl As a special exception to the GNU General Public License, if you
-dnl distribute this file as part of a program that contains a
-dnl configuration script generated by Autoconf, you may include it under
-dnl the same distribution terms that you use for the rest of that
-dnl program.
-
-dnl PKG_PREREQ(MIN-VERSION)
-dnl -----------------------
-dnl Since: 0.29
-dnl
-dnl Verify that the version of the pkg-config macros are at least
-dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-dnl installed version of pkg-config, this checks the developer's version
-dnl of pkg.m4 when generating configure.
-dnl
-dnl To ensure that this macro is defined, also add:
-dnl m4_ifndef(PKG_PREREQ,
-dnl     m4_fatal(must install pkg-config 0.29 or later before running autoconf/autogen))
-dnl
-dnl See the "Since" comment for each macro you use to see what version
-dnl of the macros you require.
-m4_defun(PKG_PREREQ,
-m4_define(PKG_MACROS_VERSION, 0.29.1)
-m4_if(m4_version_compare(PKG_MACROS_VERSION, $1), -1,
-    m4_fatal(pkg.m4 version $1 or higher is required but PKG_MACROS_VERSION found))
-)dnl PKG_PREREQ
-
-dnl PKG_PROG_PKG_CONFIG(MIN-VERSION)
-dnl ----------------------------------
-dnl Since: 0.16
-dnl
-dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-dnl first found in the path. Checks that the version of pkg-config found
-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-dnl used since that's the first version where most current features of
-dnl pkg-config existed.
-AC_DEFUN(PKG_PROG_PKG_CONFIG,
-m4_pattern_forbid(^_?PKG_A-Z_+$)
-m4_pattern_allow(^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$)
-m4_pattern_allow(^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$)
-AC_ARG_VAR(PKG_CONFIG, path to pkg-config utility)
-AC_ARG_VAR(PKG_CONFIG_PATH, directories to add to pkg-config's search path)
-AC_ARG_VAR(PKG_CONFIG_LIBDIR, path overriding pkg-config's built-in search path)
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL(PKG_CONFIG, pkg-config)
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default($1, 0.9.0)
-	AC_MSG_CHECKING(pkg-config is at least version $_pkg_min_version)
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-		PKG_CONFIG=""
-	fi
-fidnl
-)dnl PKG_PROG_PKG_CONFIG
-
-dnl PKG_CHECK_EXISTS(MODULES, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl -------------------------------------------------------------------
-dnl Since: 0.18
-dnl
-dnl Check to see whether a particular set of modules exists. Similar to
-dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-dnl
-dnl Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
-dnl only at the first occurence in configure.ac, so if the first place
-dnl it's called might be skipped (such as if it is within an "if", you
-dnl have to call PKG_CHECK_EXISTS manually
-AC_DEFUN(PKG_CHECK_EXISTS,
-AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG($PKG_CONFIG --exists --print-errors "$1"); then
-  m4_default($2, :)
-m4_ifvaln($3, else
-  $3)dnl
-fi)
-
-dnl _PKG_CONFIG(VARIABLE, COMMAND, MODULES)
-dnl ---------------------------------------------
-dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-dnl pkg_failed based on the result.
-m4_define(_PKG_CONFIG,
-if test -n "$$1"; then
-    pkg_cv_$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS($3,
-                     pkg_cv_$1=`$PKG_CONFIG --$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ,
-		     pkg_failed=yes)
- else
-    pkg_failed=untried
-fidnl
-)dnl _PKG_CONFIG
-
-dnl _PKG_SHORT_ERRORS_SUPPORTED
-dnl ---------------------------
-dnl Internal check to see if pkg-config supports short errors.
-AC_DEFUN(_PKG_SHORT_ERRORS_SUPPORTED,
-AC_REQUIRE(PKG_PROG_PKG_CONFIG)
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fidnl
-)dnl _PKG_SHORT_ERRORS_SUPPORTED
-
-
-dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
-dnl   ACTION-IF-NOT-FOUND)
-dnl --------------------------------------------------------------
-dnl Since: 0.4.0
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-AC_DEFUN(PKG_CHECK_MODULES,
-AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
-AC_ARG_VAR($1_CFLAGS, C compiler flags for $1, overriding pkg-config)dnl
-AC_ARG_VAR($1_LIBS, linker flags for $1, overriding pkg-config)dnl
-
-pkg_failed=no
-AC_MSG_CHECKING(for $1)
-
-_PKG_CONFIG($1_CFLAGS, cflags, $2)
-_PKG_CONFIG($1_LIBS, libs, $2)
-
-m4_define(_PKG_TEXT, Alternatively, you may set the environment variables $1_CFLAGS
-and $1_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.)
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT(no)
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default($4, AC_MSG_ERROR(
-Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT)dnl
-        )
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT(no)
-	m4_default($4, AC_MSG_FAILURE(
-The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.)dnl
-        )
-else
-	$1_CFLAGS=$pkg_cv_$1_CFLAGS
-	$1_LIBS=$pkg_cv_$1_LIBS
-        AC_MSG_RESULT(yes)
-	$3
-fidnl
-)dnl PKG_CHECK_MODULES
-
-
-dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
-dnl   ACTION-IF-NOT-FOUND)
-dnl ---------------------------------------------------------------------
-dnl Since: 0.29
-dnl
-dnl Checks for existence of MODULES and gathers its build flags with
-dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-dnl and VARIABLE-PREFIX_LIBS from --libs.
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-dnl configure.ac.
-AC_DEFUN(PKG_CHECK_MODULES_STATIC,
-AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
-_save_PKG_CONFIG=$PKG_CONFIG
-PKG_CONFIG="$PKG_CONFIG --static"
-PKG_CHECK_MODULES($@)
-PKG_CONFIG=$_save_PKG_CONFIGdnl
-)dnl PKG_CHECK_MODULES_STATIC
-
-
-dnl PKG_INSTALLDIR(DIRECTORY)
-dnl -------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable pkgconfigdir as the location where a module
-dnl should install pkg-config .pc files. By default the directory is
-dnl $libdir/pkgconfig, but the default can be changed by passing
-dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-dnl parameter.
-AC_DEFUN(PKG_INSTALLDIR,
-m4_pushdef(pkg_default, m4_default($1, '${libdir}/pkgconfig'))
-m4_pushdef(pkg_description,
-    pkg-config installation directory @<:@pkg_default@:>@)
-AC_ARG_WITH(pkgconfigdir,
-    AS_HELP_STRING(--with-pkgconfigdir, pkg_description),,
-    with_pkgconfigdir=pkg_default)
-AC_SUBST(pkgconfigdir, $with_pkgconfigdir)
-m4_popdef(pkg_default)
-m4_popdef(pkg_description)
-)dnl PKG_INSTALLDIR
-
-
-dnl PKG_NOARCH_INSTALLDIR(DIRECTORY)
-dnl --------------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-dnl module should install arch-independent pkg-config .pc files. By
-dnl default the directory is $datadir/pkgconfig, but the default can be
-dnl changed by passing DIRECTORY. The user can override through the
-dnl --with-noarch-pkgconfigdir parameter.
-AC_DEFUN(PKG_NOARCH_INSTALLDIR,
-m4_pushdef(pkg_default, m4_default($1, '${datadir}/pkgconfig'))
-m4_pushdef(pkg_description,
-    pkg-config arch-independent installation directory @<:@pkg_default@:>@)
-AC_ARG_WITH(noarch-pkgconfigdir,
-    AS_HELP_STRING(--with-noarch-pkgconfigdir, pkg_description),,
-    with_noarch_pkgconfigdir=pkg_default)
-AC_SUBST(noarch_pkgconfigdir, $with_noarch_pkgconfigdir)
-m4_popdef(pkg_default)
-m4_popdef(pkg_description)
-)dnl PKG_NOARCH_INSTALLDIR
-
-
-dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-dnl ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl -------------------------------------------
-dnl Since: 0.28
-dnl
-dnl Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN(PKG_CHECK_VAR,
-AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
-AC_ARG_VAR($1, value of $3 for $2, overriding pkg-config)dnl
-
-_PKG_CONFIG($1, variable="$3", $2)
-AS_VAR_COPY($1, pkg_cv_$1)
-
-AS_VAR_IF($1, "", $5, $4)dnl
-)dnl PKG_CHECK_VAR
-
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN(AM_AUTOMAKE_VERSION,
-am__api_version='1.16'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.16.1, ,
-      AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
-)
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define(_AM_AUTOCONF_VERSION, )
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.16.1)dnl
-m4_ifndef(AC_AUTOCONF_VERSION,
-  m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-_AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN(AM_AUX_DIR_EXPAND,
-AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-)
-
-# AM_COND_IF                                            -*- Autoconf -*-
-
-# Copyright (C) 2008-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_COND_IF
-# _AM_COND_ELSE
-# _AM_COND_ENDIF
-# --------------
-# These macros are only used for tracing.
-m4_define(_AM_COND_IF)
-m4_define(_AM_COND_ELSE)
-m4_define(_AM_COND_ENDIF)
-
-# AM_COND_IF(COND, IF-TRUE, IF-FALSE)
-# ---------------------------------------
-# If the shell condition COND is true, execute IF-TRUE, otherwise execute
-# IF-FALSE.  Allow automake to learn about conditional instantiating macros
-# (the AC_CONFIG_FOOS).
-AC_DEFUN(AM_COND_IF,
-m4_ifndef(_AM_COND_VALUE_$1,
-	   m4_fatal($0: no such condition "$1"))dnl
-_AM_COND_IF($1)dnl
-if test -z "$$1_TRUE"; then :
-  m4_n($2)dnl
-m4_ifval($3,
-_AM_COND_ELSE($1)dnl
-else
-  $3
-)dnl
-_AM_COND_ENDIF($1)dnl
-fidnl
-)
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN(AM_CONDITIONAL,
-AC_PREREQ(2.52)dnl
- m4_if($1, TRUE,  AC_FATAL($0: invalid condition: $1),
-       $1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
-AC_SUBST($1_TRUE)dnl
-AC_SUBST($1_FALSE)dnl
-_AM_SUBST_NOTMAKE($1_TRUE)dnl
-_AM_SUBST_NOTMAKE($1_FALSE)dnl
-m4_define(_AM_COND_VALUE_$1, $2)dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR(conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.)
-fi))
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN(_AM_DEPENDENCIES,
-AC_REQUIRE(AM_SET_DEPDIR)dnl
-AC_REQUIRE(AM_OUTPUT_DEPENDENCY_COMMANDS)dnl
-AC_REQUIRE(AM_MAKE_INCLUDE)dnl
-AC_REQUIRE(AM_DEP_TRACK)dnl
-
-m4_if($1, CC,   depcc="$CC"   am_compiler_list=,
-      $1, CXX,  depcc="$CXX"  am_compiler_list=,
-      $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
-      $1, OBJCXX, depcc="$OBJCXX" am_compiler_list='gcc3 gcc',
-      $1, UPC,  depcc="$UPC"  am_compiler_list=,
-      $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
-                    depcc="$$1"   am_compiler_list=)
-
-AC_CACHE_CHECK(dependency style of $depcc,
-               am_cv_$1_dependencies_compiler_type,
-if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  m4_case($1, CC,
-    case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac,
-    CXX,
-    case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac)
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-)
-AC_SUBST($1DEPMODE, depmode=$am_cv_$1_dependencies_compiler_type)
-AM_CONDITIONAL(am__fastdep$1, 
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3)
-)
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN(AM_SET_DEPDIR,
-AC_REQUIRE(AM_SET_LEADING_DOT)dnl
-AC_SUBST(DEPDIR, "${am__leading_dot}deps")dnl
-)
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN(AM_DEP_TRACK,
-AC_ARG_ENABLE(dependency-tracking, dnl
-AS_HELP_STRING(
-  --enable-dependency-tracking,
-  do not reject slow dependency extractors)
-AS_HELP_STRING(
-  --disable-dependency-tracking,
-  speeds up one-time build))
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
-AC_SUBST(AMDEPBACKSLASH)dnl
-_AM_SUBST_NOTMAKE(AMDEPBACKSLASH)dnl
-AC_SUBST(am__nodep)dnl
-_AM_SUBST_NOTMAKE(am__nodep)dnl
-)
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN(_AM_OUTPUT_DEPENDENCY_COMMANDS,
-{
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
-  # requiring Autoconf 2.70 or later.
-  AS_CASE($CONFIG_FILES,
-          *\'*, eval set x "$CONFIG_FILES",
-          *, set x $CONFIG_FILES)
-  shift
-  # Used to flag and report bootstrapping failures.
-  am_rc=0
-  for am_mf
-  do
-    # Strip MF so we end up with the name of the file.
-    am_mf=`AS_ECHO("$am_mf") | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
-    # dependency-tracking related rules and includes.
-    # Grep'ing the whole file directly is not great: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
-      || continue
-    am_dirpart=`AS_DIRNAME("$am_mf")`
-    am_filepart=`AS_BASENAME("$am_mf")`
-    AM_RUN_LOG(cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles) || am_rc=$?
-  done
-  if test $am_rc -ne 0; then
-    AC_MSG_FAILURE(Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  Try re-running configure with the
-    '--disable-dependency-tracking' option to at least be able to build
-    the package (albeit without support for automatic dependency tracking).)
-  fi
-  AS_UNSET(am_dirpart)
-  AS_UNSET(am_filepart)
-  AS_UNSET(am_mf)
-  AS_UNSET(am_rc)
-  rm -f conftest-deps.mk
-}
-)# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking is enabled.
-# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
-# order to bootstrap the dependency handling code.
-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,
-AC_CONFIG_COMMANDS(depfiles,
-     test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS,
-     AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"))
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define(AC_PROG_CC,
-m4_defn(AC_PROG_CC)
-_AM_PROG_CC_C_O
-)
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, NO-DEFINE)
-# AM_INIT_AUTOMAKE(OPTIONS)
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN(AM_INIT_AUTOMAKE,
-AC_PREREQ(2.65)dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow(^AM_A-Z+FLAGS$)dnl
-AC_REQUIRE(AM_SET_CURRENT_AUTOMAKE_VERSION)dnl
-AC_REQUIRE(AC_PROG_INSTALL)dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST(am__isrc, ' -I$(srcdir)')_AM_SUBST_NOTMAKE(am__isrc)dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR(source directory already configured; run "make distclean" there first)
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST(CYGPATH_W)
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval($2,
-AC_DIAGNOSE(obsolete,
-             $0: two- and three-arguments forms are deprecated.)
-m4_ifval($3, _AM_SET_OPTION(no-define))dnl
- AC_SUBST(PACKAGE, $1)dnl
- AC_SUBST(VERSION, $2),
-_AM_SET_OPTIONS($1)dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef(AC_PACKAGE_NAME, ok):m4_ifdef(AC_PACKAGE_VERSION, ok),
-  ok:ok,,
-  m4_fatal(AC_INIT should be called with package and version arguments))dnl
- AC_SUBST(PACKAGE, 'AC_PACKAGE_TARNAME')dnl
- AC_SUBST(VERSION, 'AC_PACKAGE_VERSION'))dnl
-
-_AM_IF_OPTION(no-define,,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", Name of package)
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", Version number of package))dnl
-
-# Some tools Automake needs.
-AC_REQUIRE(AM_SANITY_CHECK)dnl
-AC_REQUIRE(AC_ARG_PROGRAM)dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
-AC_REQUIRE(AM_PROG_INSTALL_STRIP)dnl
-AC_REQUIRE(AC_PROG_MKDIR_P)dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST(mkdir_p, '$(MKDIR_P)')
-# We need awk for the "check" target (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-AC_REQUIRE(AC_PROG_AWK)dnl
-AC_REQUIRE(AC_PROG_MAKE_SET)dnl
-AC_REQUIRE(AM_SET_LEADING_DOT)dnl
-_AM_IF_OPTION(tar-ustar, _AM_PROG_TAR(ustar),
-	      _AM_IF_OPTION(tar-pax, _AM_PROG_TAR(pax),
-			     _AM_PROG_TAR(v7)))
-_AM_IF_OPTION(no-dependencies,,
-AC_PROVIDE_IFELSE(AC_PROG_CC,
-		  _AM_DEPENDENCIES(CC),
-		  m4_define(AC_PROG_CC,
-			     m4_defn(AC_PROG_CC)_AM_DEPENDENCIES(CC)))dnl
-AC_PROVIDE_IFELSE(AC_PROG_CXX,
-		  _AM_DEPENDENCIES(CXX),
-		  m4_define(AC_PROG_CXX,
-			     m4_defn(AC_PROG_CXX)_AM_DEPENDENCIES(CXX)))dnl
-AC_PROVIDE_IFELSE(AC_PROG_OBJC,
-		  _AM_DEPENDENCIES(OBJC),
-		  m4_define(AC_PROG_OBJC,
-			     m4_defn(AC_PROG_OBJC)_AM_DEPENDENCIES(OBJC)))dnl
-AC_PROVIDE_IFELSE(AC_PROG_OBJCXX,
-		  _AM_DEPENDENCIES(OBJCXX),
-		  m4_define(AC_PROG_OBJCXX,
-			     m4_defn(AC_PROG_OBJCXX)_AM_DEPENDENCIES(OBJCXX)))dnl
-)
-AC_REQUIRE(AM_SILENT_RULES)dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-m4_provide_if(_AM_COMPILER_EXEEXT,
-  AM_CONDITIONAL(am__EXEEXT, test -n "$EXEEXT")))dnl
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR(Your 'rm' program is bad, sorry.)
-  fi
-fi
-dnl The trailing newline in this macro's definition is deliberate, for
-dnl backward compatibility and to allow trailing 'dnl'-style comments
-dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
-)
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define(_AC_COMPILER_EXEEXT,
-m4_defn(_AC_COMPILER_EXEEXT)m4_provide(_AM_COMPILER_EXEEXT))
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN(_AC_AM_CONFIG_HEADER_HOOK,
-# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN(AM_PROG_INSTALL_SH,
-AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST(install_sh))
-
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN(AM_SET_LEADING_DOT,
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST(am__leading_dot))
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check whether make has an 'include' directive that can support all
-# the idioms we need for our automatic dependency tracking code.
-AC_DEFUN(AM_MAKE_INCLUDE,
-AC_MSG_CHECKING(whether ${MAKE-make} supports the include directive)
-cat > confinc.mk << 'END'
-am__doit:
-	@echo this is the am__doit target >confinc.out
-.PHONY: am__doit
-END
-am__include="#"
-am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
-  AM_RUN_LOG(${MAKE-make} -f confmf.$s && cat confinc.out)
-  AS_CASE($?:`cat confinc.out 2>/dev/null`,
-      '0:this is the am__doit target',
-      AS_CASE($s,
-          BSD, am__include='.include' am__quote='"',
-          am__include='include' am__quote=''))
-  if test "$am__include" != "#"; then
-    _am_result="yes ($s style)"
-    break
-  fi
-done
-rm -f confinc.* confmf.*
-AC_MSG_RESULT(${_am_result})
-AC_SUBST(am__include))
-AC_SUBST(am__quote))
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN(AM_MISSING_PROG,
-AC_REQUIRE(AM_MISSING_HAS_RUN)
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1))
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN(AM_MISSING_HAS_RUN,
-AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-AC_REQUIRE_AUX_FILE(missing)dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  AC_MSG_WARN('missing' script is too old or missing)
-fi
-)
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN(_AM_MANGLE_OPTION,
-_AM_OPTION_m4_bpatsubst($1, ^a-zA-Z0-9_, _))
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN(_AM_SET_OPTION,
-m4_define(_AM_MANGLE_OPTION($1), 1))
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN(_AM_SET_OPTIONS,
-m4_foreach_w(_AM_Option, $1, _AM_SET_OPTION(_AM_Option)))
-
-# _AM_IF_OPTION(OPTION, IF-SET, IF-NOT-SET)
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN(_AM_IF_OPTION,
-m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN(_AM_PROG_CC_C_O,
-AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-AC_REQUIRE_AUX_FILE(compile)dnl
-AC_LANG_PUSH(C)dnl
-AC_CACHE_CHECK(
-  whether $CC understands -c and -o together,
-  am_cv_prog_cc_c_o,
-  AC_LANG_CONFTEST(AC_LANG_PROGRAM())
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG($CC -c conftest.$ac_ext -o conftest2.$ac_objext) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i)
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP(C))
-
-# For backward compatibility.
-AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN(AM_RUN_LOG,
-{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); })
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN(AM_SANITY_CHECK,
-AC_MSG_CHECKING(whether build environment is sane)
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *\\\"\#\$\&\'\`$am_lf*)
-    AC_MSG_ERROR(unsafe absolute working directory name);;
-esac
-case $srcdir in
-  *\\\"\#\$\&\'\`$am_lf\ \	*)
-    AC_MSG_ERROR(unsafe srcdir value: '$srcdir');;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR(ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment)
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR(newly created file is older than distributed files!
-Check your system clock)
-fi
-AC_MSG_RESULT(yes)
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  AC_MSG_CHECKING(that generated files are newer than configure)
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT(done))
-rm -f conftest.file
-)
-
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SILENT_RULES(DEFAULT)
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN(AM_SILENT_RULES,
-AC_ARG_ENABLE(silent-rules, dnl
-AS_HELP_STRING(
-  --enable-silent-rules,
-  less verbose build output (undo: "make V=1"))
-AS_HELP_STRING(
-  --disable-silent-rules,
-  verbose build output (undo: "make V=0"))dnl
-)
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if($1, yes, 0, 1);;
-esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK(whether $am_make supports nested variables,
-   am_cv_make_support_nested_variables,
-   if AS_ECHO('TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit') | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi)
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST(AM_V)dnl
-AM_SUBST_NOTMAKE(AM_V)dnl
-AC_SUBST(AM_DEFAULT_V)dnl
-AM_SUBST_NOTMAKE(AM_DEFAULT_V)dnl
-AC_SUBST(AM_DEFAULT_VERBOSITY)dnl
-AM_BACKSLASH='\'
-AC_SUBST(AM_BACKSLASH)dnl
-_AM_SUBST_NOTMAKE(AM_BACKSLASH)dnl
-)
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN(AM_PROG_INSTALL_STRIP,
-AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL(STRIP, strip, :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST(INSTALL_STRIP_PROGRAM))
-
-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN(_AM_SUBST_NOTMAKE)
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN(AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($@))
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-#
-AC_DEFUN(_AM_PROG_TAR,
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST(AMTAR, '$${TAR-tar}')
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if($1, ustar, plaintar) pax cpio none'
-
-m4_if($1, v7,
-  am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -',
-
-  m4_case($1,
-    ustar,
-     # The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING(whether UID '$am_uid' is supported by ustar format)
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT(yes)
-      else
-         AC_MSG_RESULT(no)
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING(whether GID '$am_gid' is supported by ustar format)
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT(yes)
-      else
-        AC_MSG_RESULT(no)
-        _am_tools=none
-      fi,
-
-  pax,
-    ,
-
-  m4_fatal(Unknown tar format))
-
-  AC_MSG_CHECKING(how to create a $1 tar archive)
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG($_am_tar --version) && break
-      done
-      am__tar="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
-
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG(tardir=conftest.dir && eval $am__tar_ >conftest.tar)
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG($am__untar <conftest.tar)
-      AM_RUN_LOG(cat conftest.dir/file)
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
-  rm -rf conftest.dir
-
-  AC_CACHE_VAL(am_cv_prog_tar_$1, am_cv_prog_tar_$1=$_am_tool)
-  AC_MSG_RESULT($am_cv_prog_tar_$1))
-
-AC_SUBST(am__tar)
-AC_SUBST(am__untar)
-) # _AM_PROG_TAR
-
-m4_include(config/acinclude.m4)
-m4_include(config/ax_check_compile_flag.m4)
-m4_include(config/ax_check_link_flag.m4)
-m4_include(config/ax_pthread.m4)
-m4_include(config/libtool.m4)
-m4_include(config/ltoptions.m4)
-m4_include(config/ltsugar.m4)
-m4_include(config/ltversion.m4)
-m4_include(config/lt~obsolete.m4)
-m4_include(config/tls.m4)

_service:tar_scm:lxc-4.0.3.tar.gz/autogen.sh Deleted

@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# lxc: linux Container library
-#
-# (C) Copyright IBM Corp. 2007, 2008
-#
-# Authors:
-# Daniel Lezcano <daniel.lezcano at free.fr>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-set -x
-
-test -d autom4te.cache && rm -rf autom4te.cache
-libtoolize || exit 1
-aclocal -I config || exit 1
-autoheader || exit 1
-autoconf || exit 1
-automake --add-missing --copy || exit 1

_service:tar_scm:lxc-4.0.3.tar.gz/coccinelle/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/coccinelle/Makefile.in Deleted

@@ -1,511 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile.am
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = coccinelle
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = exit.cocci \
-	     run-coccinelle.sh \
-	     while-true.cocci
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu coccinelle/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu coccinelle/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/Makefile.in Deleted

@@ -1,687 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in compile config.guess \
-	config.sub install-sh ltmain.sh missing
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = apparmor bash etc init selinux templates yum sysconfig
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/acinclude.m4 Deleted

@@ -1,137 +0,0 @@
-dnl as-ac-expand.m4 0.2.0
-dnl autostars m4 macro for expanding directories using configure's prefix
-dnl thomas@apestaart.org
-dnl
-
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl example
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
-AC_DEFUN(AS_AC_EXPAND,
-
-    EXP_VAR=$1
-    FROM_VAR=$2
-
-    dnl first expand prefix and exec_prefix if necessary
-    prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-    dnl if no prefix given, then use /usr/local, the default prefix
-    if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-    dnl if no exec_prefix given, then use prefix
-    if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-    dnl loop until it doesn't change anymore
-    while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-    dnl clean up
-    full_var=$new_full_var
-    AC_SUBST($1, "$full_var")
-
-    dnl restore prefix and exec_prefix
-    prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-)
-
-dnl Available from the GNU Autoconf Macro Archive at:
-dnl http://www.gnu.org/software/ac-archive/htmldoc/ax_compare_version.html
-AC_DEFUN(AX_COMPARE_VERSION, 
-# Used to indicate true or false condition
-ax_compare_version=false
-	  # Convert the two version strings to be compared into a format that
-  # allows a simple string comparison.  The end result is that a version
-  # string of the form 1.12.5-r617 will be converted to the form
-  # 0001001200050617.  In other words, each number is zero padded to four
-  # digits, and non digits are removed.
-  AS_VAR_PUSHDEF(A,ax_compare_version_A)
-  A=`echo "$1" | sed -e 's/$0-9*$/Z\1Z/g' \
-                     -e 's/Z$0-9$Z/Z0\1Z/g' \
-                     -e 's/Z$0-90-9$Z/Z0\1Z/g' \
-                     -e 's/Z$0-90-90-9$Z/Z0\1Z/g' \
-                     -e 's/^0-9//g'`
-
-  AS_VAR_PUSHDEF(B,ax_compare_version_B)
-  B=`echo "$3" | sed -e 's/$0-9*$/Z\1Z/g' \
-                     -e 's/Z$0-9$Z/Z0\1Z/g' \
-                     -e 's/Z$0-90-9$Z/Z0\1Z/g' \
-                     -e 's/Z$0-90-90-9$Z/Z0\1Z/g' \
-                     -e 's/^0-9//g'`
-
-  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
-  dnl # then the first line is used to determine if the condition is true.
-  dnl # The sed right after the echo is to remove any indented white space.
-  m4_case(m4_tolower($2),
-  lt,
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ,
-  gt,
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ,
-  le,
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ,
-  ge,
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ,
-    dnl Split the operator from the subversion count if present.
-    m4_bmatch(m4_substr($2,2),
-    0,
-      # A count of zero means use the length of the shorter version.
-      # Determine the number of characters in A and B.
-      ax_compare_version_len_A=`echo "$A" | awk '{print(length)}'`
-      ax_compare_version_len_B=`echo "$B" | awk '{print(length)}'`
-
-      # Set A to no more than B's length and B to no more than A's length.
-      A=`echo "$A" | sed "s/$.\{$ax_compare_version_len_B\}$.*/\1/"`
-      B=`echo "$B" | sed "s/$.\{$ax_compare_version_len_A\}$.*/\1/"`
-    ,
-    0-9+,
-      # A count greater than zero means use only that many subversions
-      A=`echo "$A" | sed "s/$\(0-9\{4\}$\{m4_substr($2,2)\}\).*/\1/"`
-      B=`echo "$B" | sed "s/$\(0-9\{4\}$\{m4_substr($2,2)\}\).*/\1/"`
-    ,
-    .+,
-      AC_WARNING(
-        illegal OP numeric parameter: $2)
-    ,)
-
-    # Pad zeros at end of numbers to make same length.
-    ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
-    B="$B`echo $A | sed 's/./0/g'`"
-    A="$ax_compare_version_tmp_A"
-
-    # Check for equality or inequality as necessary.
-    m4_case(m4_tolower(m4_substr($2,0,2)),
-    eq,
-      test "x$A" = "x$B" && ax_compare_version=true
-    ,
-    ne,
-      test "x$A" != "x$B" && ax_compare_version=true
-    ,
-      AC_WARNING(illegal OP parameter: $2)
-    )
-  )
-
-  AS_VAR_POPDEF(A)dnl
-  AS_VAR_POPDEF(B)dnl
-
-  dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
-  if test "$ax_compare_version" = "true" ; then
-    m4_ifvaln($4,$4,:)dnl
-    m4_ifvaln($5,else $5)dnl
-  fi
-) dnl AX_COMPARE_VERSION

_service:tar_scm:lxc-4.0.3.tar.gz/config/apparmor/Makefile.am Deleted

@@ -1,45 +0,0 @@
-EXTRA_DIST = \
-	abstractions/container-base \
-	abstractions/container-base.in \
-	abstractions/start-container \
-	container-rules \
-	container-rules.base \
-	lxc-containers \
-	lxc-generate-aa-rules.py \
-	profiles/lxc-default \
-	profiles/lxc-default-cgns \
-	profiles/lxc-default-with-mounting \
-	profiles/lxc-default-with-nesting \
-	usr.bin.lxc-start
-
-
-if ENABLE_APPARMOR
-install-apparmor:
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/apparmor.d/
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-	$(INSTALL_DATA) $(srcdir)/abstractions/container-base $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
-	$(INSTALL_DATA) abstractions/start-container $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
-	$(INSTALL_DATA) $(srcdir)/profiles/lxc-default $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-	$(INSTALL_DATA) $(srcdir)/profiles/lxc-default-cgns $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-	$(INSTALL_DATA) $(srcdir)/profiles/lxc-default-with-mounting $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-	$(INSTALL_DATA) $(srcdir)/profiles/lxc-default-with-nesting $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-	$(INSTALL_DATA) $(srcdir)/lxc-containers $(DESTDIR)$(sysconfdir)/apparmor.d/
-	$(INSTALL_DATA) $(srcdir)/usr.bin.lxc-start $(DESTDIR)$(sysconfdir)/apparmor.d/
-
-uninstall-apparmor:
-	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/usr.bin.lxc-start
-	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/lxc-containers
-	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/lxc-default-with-nesting
-	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/lxc-default-with-mounting
-	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/lxc-default-cgns
-	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/lxc-default
-	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/start-container
-	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/container-base
-	rmdir $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/ || :
-	rmdir $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/ || :
-	rmdir $(DESTDIR)$(sysconfdir)/apparmor.d/ || :
-
-install-data-local: install-apparmor
-uninstall-local: uninstall-apparmor
-endif

_service:tar_scm:lxc-4.0.3.tar.gz/config/apparmor/Makefile.in Deleted

@@ -1,551 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/apparmor
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in README
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-	abstractions/container-base \
-	abstractions/container-base.in \
-	abstractions/start-container \
-	container-rules \
-	container-rules.base \
-	lxc-containers \
-	lxc-generate-aa-rules.py \
-	profiles/lxc-default \
-	profiles/lxc-default-cgns \
-	profiles/lxc-default-with-mounting \
-	profiles/lxc-default-with-nesting \
-	usr.bin.lxc-start
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/apparmor/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/apparmor/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_APPARMOR_FALSE@uninstall-local:
-@ENABLE_APPARMOR_FALSE@install-data-local:
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-local
-
-.PRECIOUS: Makefile
-
-
-@ENABLE_APPARMOR_TRUE@install-apparmor:
-@ENABLE_APPARMOR_TRUE@	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/apparmor.d/
-@ENABLE_APPARMOR_TRUE@	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
-@ENABLE_APPARMOR_TRUE@	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-@ENABLE_APPARMOR_TRUE@	$(INSTALL_DATA) $(srcdir)/abstractions/container-base $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
-@ENABLE_APPARMOR_TRUE@	$(INSTALL_DATA) abstractions/start-container $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
-@ENABLE_APPARMOR_TRUE@	$(INSTALL_DATA) $(srcdir)/profiles/lxc-default $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-@ENABLE_APPARMOR_TRUE@	$(INSTALL_DATA) $(srcdir)/profiles/lxc-default-cgns $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-@ENABLE_APPARMOR_TRUE@	$(INSTALL_DATA) $(srcdir)/profiles/lxc-default-with-mounting $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-@ENABLE_APPARMOR_TRUE@	$(INSTALL_DATA) $(srcdir)/profiles/lxc-default-with-nesting $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-@ENABLE_APPARMOR_TRUE@	$(INSTALL_DATA) $(srcdir)/lxc-containers $(DESTDIR)$(sysconfdir)/apparmor.d/
-@ENABLE_APPARMOR_TRUE@	$(INSTALL_DATA) $(srcdir)/usr.bin.lxc-start $(DESTDIR)$(sysconfdir)/apparmor.d/
-
-@ENABLE_APPARMOR_TRUE@uninstall-apparmor:
-@ENABLE_APPARMOR_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/usr.bin.lxc-start
-@ENABLE_APPARMOR_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/lxc-containers
-@ENABLE_APPARMOR_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/lxc-default-with-nesting
-@ENABLE_APPARMOR_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/lxc-default-with-mounting
-@ENABLE_APPARMOR_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/lxc-default-cgns
-@ENABLE_APPARMOR_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/lxc-default
-@ENABLE_APPARMOR_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/start-container
-@ENABLE_APPARMOR_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/container-base
-@ENABLE_APPARMOR_TRUE@	rmdir $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/ || :
-@ENABLE_APPARMOR_TRUE@	rmdir $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/ || :
-@ENABLE_APPARMOR_TRUE@	rmdir $(DESTDIR)$(sysconfdir)/apparmor.d/ || :
-
-@ENABLE_APPARMOR_TRUE@install-data-local: install-apparmor
-@ENABLE_APPARMOR_TRUE@uninstall-local: uninstall-apparmor
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/apparmor/abstractions/start-container Deleted

@@ -1,49 +0,0 @@
-  network,
-  capability,
-  file,
-
-  # The following 3 entries are only supported by recent apparmor versions.
-  # Comment them if the apparmor parser doesn't recognize them.
-  dbus,
-  signal,
-  ptrace,
-
-  # currently blocked by apparmor bug
-  mount -> /usr/lib*/*/lxc/{**,},
-  mount -> /usr/lib*/lxc/{**,},
-  mount -> /usr/local/lib/lxc/rootfs/{,**},
-  mount fstype=devpts -> /dev/pts/,
-  mount options=bind /dev/pts/ptmx/ -> /dev/ptmx/,
-  mount options=bind /dev/pts/** -> /dev/**,
-  mount options=(rw, make-slave) -> **,
-  mount options=(rw, make-rslave) -> **,
-  mount fstype=debugfs,
-  # allow pre-mount hooks to stage mounts under /var/lib/lxc/<container>/
-  mount -> /var/lib/lxc/{**,},
-
-  mount /dev/.lxc-boot-id -> /proc/sys/kernel/random/boot_id,
-
-  # required for some pre-mount hooks
-  mount fstype=overlayfs,
-  mount fstype=aufs,
-  mount fstype=ecryptfs,
-
-  # all umounts are under the original root's /mnt, but right now we
-  # can't allow those umounts after pivot_root.  So allow all umounts
-  # right now.  They'll be restricted for the container at least.
-  umount,
-  #umount /mnt/{**,},
-
-  # This may look a bit redundant, however it appears we need all of
-  # them if we want things to work properly on all combinations of kernel
-  # and userspace parser...
-  pivot_root /usr/lib*/lxc/,
-  pivot_root /usr/lib*/*/lxc/,
-  pivot_root /usr/lib*/lxc/**,
-  pivot_root /usr/lib*/*/lxc/**,
-  pivot_root /usr/local/lib/lxc/rootfs/{,**},
-
-  change_profile -> lxc-*,
-  change_profile -> lxc-**,
-  change_profile -> unconfined,
-  change_profile -> :lxc-*:unconfined,

_service:tar_scm:lxc-4.0.3.tar.gz/config/ax_check_compile_flag.m4 Deleted

@@ -1,53 +0,0 @@
-# ===========================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, ACTION-SUCCESS, ACTION-FAILURE, EXTRA-FLAGS, INPUT)
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 6
-
-AC_DEFUN(AX_CHECK_COMPILE_FLAG,
-AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF(CACHEVAR,ax_cv_check__AC_LANG_ABBREVflags_$4_$1)dnl
-AC_CACHE_CHECK(whether _AC_LANG compiler accepts $1, CACHEVAR, 
-  ax_check_save_flags=$_AC_LANG_PREFIXFLAGS
-  _AC_LANG_PREFIXFLAGS="$_AC_LANG_PREFIXFLAGS $4 $1"
-  AC_COMPILE_IFELSE(m4_default($5,AC_LANG_PROGRAM()),
-    AS_VAR_SET(CACHEVAR,yes),
-    AS_VAR_SET(CACHEVAR,no))
-  _AC_LANG_PREFIXFLAGS=$ax_check_save_flags)
-AS_VAR_IF(CACHEVAR,yes,
-  m4_default($2, :),
-  m4_default($3, :))
-AS_VAR_POPDEF(CACHEVAR)dnl
-)dnl AX_CHECK_COMPILE_FLAGS

_service:tar_scm:lxc-4.0.3.tar.gz/config/ax_check_link_flag.m4 Deleted

@@ -1,53 +0,0 @@
-# ===========================================================================
-#    https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_LINK_FLAG(FLAG, ACTION-SUCCESS, ACTION-FAILURE, EXTRA-FLAGS, INPUT)
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the linker or gives an error.
-#   (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
-#   when the check is done.  The check is thus made with the flags: "LDFLAGS
-#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
-#   issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_LINK_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 6
-
-AC_DEFUN(AX_CHECK_LINK_FLAG,
-AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF(CACHEVAR,ax_cv_check_ldflags_$4_$1)dnl
-AC_CACHE_CHECK(whether the linker accepts $1, CACHEVAR, 
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS $4 $1"
-  AC_LINK_IFELSE(m4_default($5,AC_LANG_PROGRAM()),
-    AS_VAR_SET(CACHEVAR,yes),
-    AS_VAR_SET(CACHEVAR,no))
-  LDFLAGS=$ax_check_save_flags)
-AS_VAR_IF(CACHEVAR,yes,
-  m4_default($2, :),
-  m4_default($3, :))
-AS_VAR_POPDEF(CACHEVAR)dnl
-)dnl AX_CHECK_LINK_FLAGS

_service:tar_scm:lxc-4.0.3.tar.gz/config/ax_pthread.m4 Deleted

@@ -1,485 +0,0 @@
-# ===========================================================================
-#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PTHREAD(ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-#
-# DESCRIPTION
-#
-#   This macro figures out how to build C programs using POSIX threads. It
-#   sets the PTHREAD_LIBS output variable to the threads library and linker
-#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-#   flags that are needed. (The user can also force certain compiler
-#   flags/libs to be tested by setting these environment variables.)
-#
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise). (This
-#   is necessary on AIX to use the special cc_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also to link with them as well. For example, you might link with
-#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-#   If you are only building threaded programs, you may wish to use these
-#   variables in your default LIBS, CFLAGS, and CC:
-#
-#     LIBS="$PTHREAD_LIBS $LIBS"
-#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#     CC="$PTHREAD_CC"
-#
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
-#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-#   PTHREAD_CFLAGS.
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-#   is not found. If ACTION-IF-FOUND is not specified, the default action
-#   will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or if
-#   you have any other suggestions or comments. This macro was based on work
-#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-#   grateful for the helpful feedback of numerous users.
-#
-#   Updated for Autoconf 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 24
-
-AU_ALIAS(ACX_PTHREAD, AX_PTHREAD)
-AC_DEFUN(AX_PTHREAD, 
-AC_REQUIRE(AC_CANONICAL_HOST)
-AC_REQUIRE(AC_PROG_CC)
-AC_REQUIRE(AC_PROG_SED)
-AC_LANG_PUSH(C)
-ax_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on Tru64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-        ax_pthread_save_CC="$CC"
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        AS_IF(test "x$PTHREAD_CC" != "x", CC="$PTHREAD_CC")
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING(for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS)
-        AC_LINK_IFELSE(AC_LANG_CALL(, pthread_join), ax_pthread_ok=yes)
-        AC_MSG_RESULT($ax_pthread_ok)
-        if test "x$ax_pthread_ok" = "xno"; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        CC="$ax_pthread_save_CC"
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-#           (Note: HP C rejects this with "bad form for `-t' option")
-# -pthreads: Solaris/gcc (Note: HP C also rejects)
-# -mt: Sun Workshop C (may only link SunOS threads -lthread, but it
-#      doesn't hurt to check since this sometimes defines pthreads and
-#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
-#      is present but should not be used directly; and before -mthreads,
-#      because the compiler interprets this as "-mt" + "-hreads")
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case $host_os in
-
-        freebsd*)
-
-        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-
-        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-        ;;
-
-        hpux*)
-
-        # From the cc(1) man page: "-mt Sets various -D flags to enable
-        # multi-threading and also sets -lpthread."
-
-        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-        ;;
-
-        openedition*)
-
-        # IBM z/OS requires a feature-test macro to be defined in order to
-        # enable POSIX threads at all, so give the user a hint if this is
-        # not set. (We don't define these ourselves, as they can affect
-        # other portions of the system API in unpredictable ways.)
-
-        AC_EGREP_CPP(AX_PTHREAD_ZOS_MISSING,
-            
-#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-             AX_PTHREAD_ZOS_MISSING
-#            endif
-            ,
-            AC_MSG_WARN(IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.))
-        ;;
-
-        solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed. (N.B.: The stubs are missing
-        # pthread_cleanup_push, or rather a function called by this macro,
-        # so we could check for that, but who knows whether they'll stub
-        # that too in a future libc.)  So we'll check first for the
-        # standard Solaris way of linking pthreads (-mt -lpthread).
-
-        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
-        ;;
-esac
-
-# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-
-AS_IF(test "x$GCC" = "xyes",
-      ax_pthread_flags="-pthread -pthreads $ax_pthread_flags")
-
-# The presence of a feature test macro requesting re-entrant function
-# definitions is, on some systems, a strong hint that pthreads support is
-# correctly enabled
-
-case $host_os in
-        darwin* | hpux* | linux* | osf* | solaris*)
-        ax_pthread_check_macro="_REENTRANT"
-        ;;
-
-        aix*)
-        ax_pthread_check_macro="_THREAD_SAFE"
-        ;;
-
-        *)
-        ax_pthread_check_macro="--"
-        ;;
-esac
-AS_IF(test "x$ax_pthread_check_macro" = "x--",
-      ax_pthread_check_cond=0,
-      ax_pthread_check_cond="!defined($ax_pthread_check_macro)")
-
-# Are we compiling with Clang?
-
-AC_CACHE_CHECK(whether $CC is Clang,
-    ax_cv_PTHREAD_CLANG,
-    ax_cv_PTHREAD_CLANG=no
-     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-     if test "x$GCC" = "xyes"; then
-        AC_EGREP_CPP(AX_PTHREAD_CC_IS_CLANG,
-            /* Note: Clang 2.7 lacks __clang_a-z+__ */
-#            if defined(__clang__) && defined(__llvm__)
-             AX_PTHREAD_CC_IS_CLANG
-#            endif
-            ,
-            ax_cv_PTHREAD_CLANG=yes)
-     fi
-    )
-ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-
-ax_pthread_clang_warning=no
-
-# Clang needs special handling, because older versions handle the -pthread
-# option in a rather... idiosyncratic way
-
-if test "x$ax_pthread_clang" = "xyes"; then
-
-        # Clang takes -pthread; it has never supported any other flag
-
-        # (Note 1: This will need to be revisited if a system that Clang
-        # supports has POSIX threads in a separate library.  This tends not
-        # to be the way of modern systems, but it's conceivable.)
-
-        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-        # to get POSIX threads support; the API is always present and
-        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-        # -pthread does define _REENTRANT, and while the Darwin headers
-        # ignore this macro, third-party headers might not.)
-
-        PTHREAD_CFLAGS="-pthread"
-        PTHREAD_LIBS=
-
-        ax_pthread_ok=yes
-
-        # However, older versions of Clang make a point of warning the user
-        # that, in an invocation where only linking and no compilation is
-        # taking place, the -pthread option has no effect ("argument unused
-        # during compilation").  They expect -pthread to be passed in only
-        # when source code is being compiled.
-        #
-        # Problem is, this is at odds with the way Automake and most other
-        # C build frameworks function, which is that the same flags used in
-        # compilation (CFLAGS) are also used in linking.  Many systems
-        # supported by AX_PTHREAD require exactly this for POSIX threads
-        # support, and in fact it is often not straightforward to specify a
-        # flag that is used only in the compilation phase and not in
-        # linking.  Such a scenario is extremely rare in practice.
-        #
-        # Even though use of the -pthread flag in linking would only print
-        # a warning, this can be a nuisance for well-run software projects
-        # that build with -Werror.  So if the active version of Clang has
-        # this misfeature, we search for an option to squash it.
-
-        AC_CACHE_CHECK(whether Clang needs flag to prevent "argument unused" warning when linking with -pthread,
-            ax_cv_PTHREAD_CLANG_NO_WARN_FLAG,
-            ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-             # Create an alternate version of $ac_link that compiles and
-             # links in two steps (.c -> .o, .o -> exe) instead of one
-             # (.c -> exe), because the warning occurs only in the second
-             # step
-             ax_pthread_save_ac_link="$ac_link"
-             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
-             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-             ax_pthread_save_CFLAGS="$CFLAGS"
-             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-                AS_IF(test "x$ax_pthread_try" = "xunknown", break)
-                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-                ac_link="$ax_pthread_save_ac_link"
-                AC_LINK_IFELSE(AC_LANG_SOURCE(int main(void){return 0;}),
-                    ac_link="$ax_pthread_2step_ac_link"
-                     AC_LINK_IFELSE(AC_LANG_SOURCE(int main(void){return 0;}),
-                         break)
-                    )
-             done
-             ac_link="$ax_pthread_save_ac_link"
-             CFLAGS="$ax_pthread_save_CFLAGS"
-             AS_IF(test "x$ax_pthread_try" = "x", ax_pthread_try=no)
-             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-            )
-
-        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-                no | unknown) ;;
-                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-        esac
-
-fi # $ax_pthread_clang = yes
-
-if test "x$ax_pthread_ok" = "xno"; then
-for ax_pthread_try_flag in $ax_pthread_flags; do
-
-        case $ax_pthread_try_flag in
-                none)
-                AC_MSG_CHECKING(whether pthreads work without any flags)
-                ;;
-
-                -mt,pthread)
-                AC_MSG_CHECKING(whether pthreads work with -mt -lpthread)
-                PTHREAD_CFLAGS="-mt"
-                PTHREAD_LIBS="-lpthread"
-                ;;
-
-                -*)
-                AC_MSG_CHECKING(whether pthreads work with $ax_pthread_try_flag)
-                PTHREAD_CFLAGS="$ax_pthread_try_flag"
-                ;;
-
-                pthread-config)
-                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
-                AS_IF(test "x$ax_pthread_config" = "xno", continue)
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING(for the pthreads library -l$ax_pthread_try_flag)
-                PTHREAD_LIBS="-l$ax_pthread_try_flag"
-                ;;
-        esac
-
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-
-        AC_LINK_IFELSE(AC_LANG_PROGRAM(#include <pthread.h>
-#                       if $ax_pthread_check_cond
-#                        error "$ax_pthread_check_macro must be defined"
-#                       endif
-                        static void routine(void *a) { a = 0; }
-                        static void *start_routine(void *a) { return a; },
-                       pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */),
-            ax_pthread_ok=yes,
-            )
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        AC_MSG_RESULT($ax_pthread_ok)
-        AS_IF(test "x$ax_pthread_ok" = "xyes", break)
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_CACHE_CHECK(for joinable pthread attribute,
-            ax_cv_PTHREAD_JOINABLE_ATTR,
-            ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-                 AC_LINK_IFELSE(AC_LANG_PROGRAM(#include <pthread.h>,
-                                                 int attr = $ax_pthread_attr; return attr /* ; */),
-                                ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break,
-                                )
-             done
-            )
-        AS_IF(test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-               test "x$ax_pthread_joinable_attr_defined" != "xyes",
-              AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE,
-                                  $ax_cv_PTHREAD_JOINABLE_ATTR,
-                                  Define to necessary symbol if this constant
-                                   uses a non-standard name on your system.)
-               ax_pthread_joinable_attr_defined=yes
-              )
-
-        AC_CACHE_CHECK(whether more special flags are required for pthreads,
-            ax_cv_PTHREAD_SPECIAL_FLAGS,
-            ax_cv_PTHREAD_SPECIAL_FLAGS=no
-             case $host_os in
-             solaris*)
-             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-             ;;
-             esac
-            )
-        AS_IF(test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-               test "x$ax_pthread_special_flags_added" != "xyes",
-              PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-               ax_pthread_special_flags_added=yes)
-
-        AC_CACHE_CHECK(for PTHREAD_PRIO_INHERIT,
-            ax_cv_PTHREAD_PRIO_INHERIT,
-            AC_LINK_IFELSE(AC_LANG_PROGRAM(#include <pthread.h>,
-                                             int i = PTHREAD_PRIO_INHERIT;),
-                            ax_cv_PTHREAD_PRIO_INHERIT=yes,
-                            ax_cv_PTHREAD_PRIO_INHERIT=no)
-            )
-        AS_IF(test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-               test "x$ax_pthread_prio_inherit_defined" != "xyes",
-              AC_DEFINE(HAVE_PTHREAD_PRIO_INHERIT, 1, Have PTHREAD_PRIO_INHERIT.)
-               ax_pthread_prio_inherit_defined=yes
-              )
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != "xyes"; then
-            case $host_os in
-                aix*)
-                AS_CASE("x/$CC",
-                    x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6,
-                    #handle absolute path differently from PATH based program lookup
-                     AS_CASE("x$CC",
-                         x/*,
-                         AS_IF(AS_EXECUTABLE_P(${CC}_r),PTHREAD_CC="${CC}_r"),
-                         AC_CHECK_PROGS(PTHREAD_CC,${CC}_r,$CC)))
-                ;;
-            esac
-        fi
-fi
-
-test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_CC)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ifelse($1,,AC_DEFINE(HAVE_PTHREAD,1,Define if you have POSIX threads libraries and header files.),$1)
-        :
-else
-        ax_pthread_ok=no
-        $2
-fi
-AC_LANG_POP
-)dnl AX_PTHREAD

_service:tar_scm:lxc-4.0.3.tar.gz/config/bash/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/bash/Makefile.in Deleted

@@ -1,566 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/bash
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__dist_bashcomp_DATA_DIST) \
-	$(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__dist_bashcomp_DATA_DIST = lxc
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(bashcompdir)"
-DATA = $(dist_bashcomp_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = lxc
-@ENABLE_BASH_TRUE@dist_bashcomp_DATA = lxc
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/bash/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/bash/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc: $(top_builddir)/config.status $(srcdir)/lxc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-dist_bashcompDATA: $(dist_bashcomp_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_bashcomp_DATA)'; test -n "$(bashcompdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bashcompdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bashcompdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bashcompdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompdir)" || exit $$?; \
-	done
-
-uninstall-dist_bashcompDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_bashcomp_DATA)'; test -n "$(bashcompdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(bashcompdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(bashcompdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_bashcompDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_bashcompDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-dist_bashcompDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-dist_bashcompDATA
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/bash/lxc Deleted

@@ -1,111 +0,0 @@
-_have lxc-start && {
-    _lxc_names() {
-        COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
-    }
-
-    _lxc_states() {
-        COMPREPLY=( $( compgen -W "STOPPED STARTING RUNNING STOPPING ABORTING FREEZING FROZEN THAWED" "$cur" ) )
-    }
-
-    _lxc_templates() {
-        COMPREPLY=( $( compgen -W "$(ls /usr/local/share/lxc/templates/ | sed -e 's|^lxc-||' )" "$cur" ) )
-    }
-
-    _lxc_backing_stores() {
-        COMPREPLY=( $( compgen -W "dir lvm loop btrfs zfs rbd best" "$cur" ) )
-    }
-
-    _lxc_generic_n() {
-        local cur prev
-
-        COMPREPLY=()
-        _get_comp_words_by_ref cur prev
-
-        case $prev in
-            -n)
-                _lxc_names "$cur"
-                return 0
-            ;;
-        esac
-
-        return 1
-    }
-
-    _lxc_generic_ns() {
-        local cur prev
-
-        COMPREPLY=()
-        _get_comp_words_by_ref cur prev
-
-        case $prev in
-            -n)
-                _lxc_names "$cur"
-                return 0
-            ;;
-
-            -s)
-                _lxc_states "$cur"
-                return 0
-            ;;
-        esac
-
-        return 1
-    }
-
-    _lxc_generic_t() {
-        local cur prev
-
-        COMPREPLY=()
-        _get_comp_words_by_ref cur prev
-
-        case $prev in
-            -t)
-                _lxc_templates "$cur"
-                return 0
-            ;;
-
-            -B)
-                _lxc_backing_stores "$cur"
-                return 0
-            ;;
-        esac
-
-        return 1
-    }
-
-    _lxc_generic_o() {
-        local cur prev
-
-        COMPREPLY=()
-        _get_comp_words_by_ref cur prev
-
-        case $prev in
-            -o)
-                _lxc_names "$cur"
-                return 0
-            ;;
-        esac
-
-        return 1
-    }
-
-    complete -o default -F _lxc_generic_n lxc-attach
-    complete -o default -F _lxc_generic_n lxc-cgroup
-    complete -o default -F _lxc_generic_n lxc-console
-    complete -o default -F _lxc_generic_n lxc-destroy
-    complete -o default -F _lxc_generic_n lxc-device
-    complete -o default -F _lxc_generic_n lxc-execute
-    complete -o default -F _lxc_generic_n lxc-freeze
-    complete -o default -F _lxc_generic_n lxc-info
-    complete -o default -F _lxc_generic_n lxc-monitor
-    complete -o default -F _lxc_generic_n lxc-snapshot
-    complete -o default -F _lxc_generic_n lxc-start
-    complete -o default -F _lxc_generic_n lxc-stop
-    complete -o default -F _lxc_generic_n lxc-unfreeze
-
-    complete -o default -F _lxc_generic_ns lxc-wait
-
-    complete -o default -F _lxc_generic_t lxc-create
-
-    complete -o default -F _lxc_generic_o lxc-copy
-}

_service:tar_scm:lxc-4.0.3.tar.gz/config/bash/lxc.in Deleted

@@ -1,111 +0,0 @@
-_have lxc-start && {
-    _lxc_names() {
-        COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
-    }
-
-    _lxc_states() {
-        COMPREPLY=( $( compgen -W "STOPPED STARTING RUNNING STOPPING ABORTING FREEZING FROZEN THAWED" "$cur" ) )
-    }
-
-    _lxc_templates() {
-        COMPREPLY=( $( compgen -W "$(ls @LXCTEMPLATEDIR@/ | sed -e 's|^lxc-||' )" "$cur" ) )
-    }
-
-    _lxc_backing_stores() {
-        COMPREPLY=( $( compgen -W "dir lvm loop btrfs zfs rbd best" "$cur" ) )
-    }
-
-    _lxc_generic_n() {
-        local cur prev
-
-        COMPREPLY=()
-        _get_comp_words_by_ref cur prev
-
-        case $prev in
-            -n)
-                _lxc_names "$cur"
-                return 0
-            ;;
-        esac
-
-        return 1
-    }
-
-    _lxc_generic_ns() {
-        local cur prev
-
-        COMPREPLY=()
-        _get_comp_words_by_ref cur prev
-
-        case $prev in
-            -n)
-                _lxc_names "$cur"
-                return 0
-            ;;
-
-            -s)
-                _lxc_states "$cur"
-                return 0
-            ;;
-        esac
-
-        return 1
-    }
-
-    _lxc_generic_t() {
-        local cur prev
-
-        COMPREPLY=()
-        _get_comp_words_by_ref cur prev
-
-        case $prev in
-            -t)
-                _lxc_templates "$cur"
-                return 0
-            ;;
-
-            -B)
-                _lxc_backing_stores "$cur"
-                return 0
-            ;;
-        esac
-
-        return 1
-    }
-
-    _lxc_generic_o() {
-        local cur prev
-
-        COMPREPLY=()
-        _get_comp_words_by_ref cur prev
-
-        case $prev in
-            -o)
-                _lxc_names "$cur"
-                return 0
-            ;;
-        esac
-
-        return 1
-    }
-
-    complete -o default -F _lxc_generic_n lxc-attach
-    complete -o default -F _lxc_generic_n lxc-cgroup
-    complete -o default -F _lxc_generic_n lxc-console
-    complete -o default -F _lxc_generic_n lxc-destroy
-    complete -o default -F _lxc_generic_n lxc-device
-    complete -o default -F _lxc_generic_n lxc-execute
-    complete -o default -F _lxc_generic_n lxc-freeze
-    complete -o default -F _lxc_generic_n lxc-info
-    complete -o default -F _lxc_generic_n lxc-monitor
-    complete -o default -F _lxc_generic_n lxc-snapshot
-    complete -o default -F _lxc_generic_n lxc-start
-    complete -o default -F _lxc_generic_n lxc-stop
-    complete -o default -F _lxc_generic_n lxc-unfreeze
-
-    complete -o default -F _lxc_generic_ns lxc-wait
-
-    complete -o default -F _lxc_generic_t lxc-create
-
-    complete -o default -F _lxc_generic_o lxc-copy
-}

_service:tar_scm:lxc-4.0.3.tar.gz/config/compile Deleted

@@ -1,348 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /!/*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.oObBjJ)
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.cC++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.oO)
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile --help --version PROGRAM ARGS
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | */\\cl | cl.exe | */\\cl.exe | \
-  icl | */\\icl | icl.exe | */\\icl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*\\/||; s|^a-zA-Z:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '/\\:.-' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|/\\:.-|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:

_service:tar_scm:lxc-4.0.3.tar.gz/config/config.guess Deleted

@@ -1,1480 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
-
-timestamp='2018-02-24'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
-#
-# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-#
-# Please send patches to <config-patches@gnu.org>.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 OPTION
-
-Output the configuration name of the system \`$me' is run on.
-
-Options:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > "$dummy.c" ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "$UNAME_SYSTEM" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval "$set_cc_for_build"
-	cat <<-EOF > "$dummy.c"
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
-
-	# If ldd exists, use it to detect musl libc.
-	if command -v ldd >/dev/null && \
-		ldd --version 2>&1 | grep -q ^musl
-	then
-	    LIBC=musl
-	fi
-	;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    "/sbin/$sysctl" 2>/dev/null || \
-	    "/usr/sbin/$sysctl" 2>/dev/null || \
-	    echo unknown)`
-	case "$UNAME_MACHINE_ARCH" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    earmv*)
-		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e$armv0-9$.*$,\1,'`
-		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*$eb$$,\1,p'`
-		machine="${arch}${endian}"-unknown
-		;;
-	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently (or will in the future) and ABI.
-	case "$UNAME_MACHINE_ARCH" in
-	    earm*)
-		os=netbsdelf
-		;;
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval "$set_cc_for_build"
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# Determine ABI tags.
-	case "$UNAME_MACHINE_ARCH" in
-	    earm*)
-		expr='s/^earmv0-9/-eabi/;s/eb$//'
-		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "$UNAME_VERSION" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo "$UNAME_RELEASE" | sed -e 's/-_.*//' | cut -d. -f1,2`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "$machine-${os}${release}${abi}"
-	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
-	exit ;;
-    *:LibertyBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
-	exit ;;
-    *:MidnightBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
-	exit ;;
-    *:SolidBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
-	exit ;;
-    *:MirBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
-	exit ;;
-    *:Sortix:*:*)
-	echo "$UNAME_MACHINE"-unknown-sortix
-	exit ;;
-    *:Redox:*:*)
-	echo "$UNAME_MACHINE"-unknown-redox
-	exit ;;
-    mips:OSF1:*.*)
-        echo mips-dec-osf1
-        exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE=alpha ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE=alphaev5 ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE=alphaev56 ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE=alphapca56 ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE=alphapca57 ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE=alphaev6 ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE=alphaev67 ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE=alphaev69 ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE=alphaev7 ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE=alphaev79 ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^PVTX//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:AamigaOoSs:*:*)
-	echo "$UNAME_MACHINE"-unknown-amigaos
-	exit ;;
-    *:MmorphOoSs:*:*)
-	echo "$UNAME_MACHINE"-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
-	echo arm-acorn-riscix"$UNAME_RELEASE"
-	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`"
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`"
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux"$UNAME_RELEASE"
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval "$set_cc_for_build"
-	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if  "$CC_FOR_BUILD" != no_compiler_found ; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos"$UNAME_RELEASE"
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos"$UNAME_RELEASE"
-		;;
-	    sun4)
-		echo sparc-sun-sunos"$UNAME_RELEASE"
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos"$UNAME_RELEASE"
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
-	echo m68k-atari-mint"$UNAME_RELEASE"
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
-	echo m68k-atari-mint"$UNAME_RELEASE"
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint"$UNAME_RELEASE"
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint"$UNAME_RELEASE"
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint"$UNAME_RELEASE"
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint"$UNAME_RELEASE"
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten"$UNAME_RELEASE"
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten"$UNAME_RELEASE"
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix"$UNAME_RELEASE"
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix"$UNAME_RELEASE"
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix"$UNAME_RELEASE"
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval "$set_cc_for_build"
-	sed 's/^	//' << EOF > "$dummy.c"
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv) {
-#else
-	int main (argc, argv) int argc; char *argv; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\\n", argv1); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\\n", argv1); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\\n", argv1); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
-	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/$0-9*$.*/\1/p'` &&
-	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos"$UNAME_RELEASE"
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if  "$UNAME_PROCESSOR" = mc88100  ||  "$UNAME_PROCESSOR" = mc88110 
-	then
-	    if  "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx  || \
-	        "$TARGET_BINARY_INTERFACE"x = x 
-	    then
-		echo m88k-dg-dgux"$UNAME_RELEASE"
-	    else
-		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
-	    fi
-	else
-	    echo i586-dg-dgux"$UNAME_RELEASE"
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek430-90-9:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
-	exit ;;
-    ????????:AIX?:12.1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if  -x /usr/bin/oslevel  ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
-	fi
-	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval "$set_cc_for_build"
-		sed 's/^		//' << EOF > "$dummy.c"
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:4567)
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if  -x /usr/bin/lslpp  ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-			   awk -F: '{ print $3 }' | sed s/0-9*$/0/`
-	else
-		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
-	fi
-	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/34??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/34??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/34678??:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/^.*.0B*//'`
-	case "$UNAME_MACHINE" in
-	    9000/31?)            HP_ARCH=m68000 ;;
-	    9000/34??)         HP_ARCH=m68k ;;
-	    9000/6780-90-9)
-		if  -x /usr/bin/getconf ; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "$sc_cpu_version" in
-		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "$sc_kernel_bits" in
-			  32) HP_ARCH=hppa2.0n ;;
-			  64) HP_ARCH=hppa2.0w ;;
-			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if  "$HP_ARCH" = "" ; then
-		    eval "$set_cc_for_build"
-		    sed 's/^		//' << EOF > "$dummy.c"
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if  "$HP_ARCH" = hppa2.0w 
-	then
-	    eval "$set_cc_for_build"
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH=hppa2.0w
-	    else
-		HP_ARCH=hppa64
-	    fi
-	fi
-	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/^.*.0B*//'`
-	echo ia64-hp-hpux"$HPUX_REV"
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval "$set_cc_for_build"
-	sed 's/^	//' << EOF > "$dummy.c"
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?79:4.3bsd:*:*)
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?79:OSF1:*:*)
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if  -x /usr/sbin/sysversion  ; then
-	    echo "$UNAME_MACHINE"-unknown-osf1mk
-	else
-	    echo "$UNAME_MACHINE"-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
-	exit ;;
-    CRAY*A-Z90:*:*:*)
-	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
-	| sed -e 's/CRAY.*$A-Z90$/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.^.*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
-	exit ;;
-    F3001:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi"$UNAME_RELEASE"
-	exit ;;
-    *:BSD/OS:*:*)
-	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case "$UNAME_PROCESSOR" in
-	    amd64)
-		UNAME_PROCESSOR=x86_64 ;;
-	    i386)
-		UNAME_PROCESSOR=i586 ;;
-	esac
-	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`"
-	exit ;;
-    i*:CYGWIN*:*)
-	echo "$UNAME_MACHINE"-pc-cygwin
-	exit ;;
-    *:MINGW64*:*)
-	echo "$UNAME_MACHINE"-pc-mingw64
-	exit ;;
-    *:MINGW*:*)
-	echo "$UNAME_MACHINE"-pc-mingw32
-	exit ;;
-    *:MSYS*:*)
-	echo "$UNAME_MACHINE"-pc-msys
-	exit ;;
-    i*:PW*:*)
-	echo "$UNAME_MACHINE"-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case "$UNAME_MACHINE" in
-	    x86)
-		echo i586-pc-interix"$UNAME_RELEASE"
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix"$UNAME_RELEASE"
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix"$UNAME_RELEASE"
-		exit ;;
-	esac ;;
-    i*:UWIN*:*)
-	echo "$UNAME_MACHINE"-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo "`echo "$UNAME_MACHINE"|sed -e 's,-/.*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^^/*/,,' | tr ":upper:" ":lower:"``echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`-$LIBC"
-	exit ;;
-    i*86:Minix:*:*)
-	echo "$UNAME_MACHINE"-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    arm*:Linux:*:*)
-	eval "$set_cc_for_build"
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
-	    else
-		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    cris:Linux:*:*)
-	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-	exit ;;
-    crisv32:Linux:*:*)
-	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-	exit ;;
-    e2k:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    frv:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    hexagon:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    i*86:Linux:*:*)
-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-	exit ;;
-    ia64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    k1om:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    m32r*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    m68*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval "$set_cc_for_build"
-	sed 's/^	//' << EOF > "$dummy.c"
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
-	;;
-    mips64el:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-"$LIBC"
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-"$LIBC"
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-"$LIBC"
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu^a-z*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
-	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
-	  *)    echo hppa-unknown-linux-"$LIBC" ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-"$LIBC"
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-"$LIBC"
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-"$LIBC"
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-"$LIBC"
-	exit ;;
-    riscv32:Linux:*:* | riscv64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
-	exit ;;
-    sh64*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    sh*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    tile*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    vax:Linux:*:*)
-	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
-	exit ;;
-    x86_64:Linux:*:*)
-	if objdump -f /bin/sh | grep -q elf32-x86-64; then
-	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
-	else
-	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-	fi
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo "$UNAME_MACHINE"-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo "$UNAME_MACHINE"-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo "$UNAME_MACHINE"-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo "$UNAME_MACHINE"-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.02*:*)
-	echo i386-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
-    i*86:*DOS:*:*)
-	echo "$UNAME_MACHINE"-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:*)
-	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
-	else
-		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
-	fi
-	exit ;;
-    i*86:*:5:678*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
-	else
-		echo "$UNAME_MACHINE"-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configure will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V5678*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3345??:*:4.0:3.0 | 334??A:*:4.0:3.0 | 334??,*:*:4.0:3.0 | 334??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/^ * ^ * $0-90-9$.*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
-    334??:*:4.0:* | 334??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/^ * ^ * $0-90-9$.*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.02*:*)
-	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
-    SMBES:UNIX_SV:*:*)
-	echo mips-dde-sysv"$UNAME_RELEASE"
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo "$UNAME_MACHINE"-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo "$UNAME_MACHINE"-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux"$UNAME_RELEASE"
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R34000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if  -d /usr/nec ; then
-		echo mips-nec-sysv"$UNAME_RELEASE"
-	else
-		echo mips-unknown-sysv"$UNAME_RELEASE"
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
-	exit ;;
-    *:Rhapsody:*:*)
-	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval "$set_cc_for_build"
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
-	    if  "$CC_FOR_BUILD" != no_compiler_found ; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		       grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		       grep IS_PPC >/dev/null
-		then
-		    UNAME_PROCESSOR=powerpc
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
-	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
-	exit ;;
-    *:procnto*:*:* | *:QNX:0123456789*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = x86; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-*:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
-    NSR-*:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
-    NSV-*:NONSTOP_KERNEL:*:*)
-	echo nsv-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
-    NSX-*:NONSTOP_KERNEL:*:*)
-	echo nsx-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = 386; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo "$UNAME_MACHINE"-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux"$UNAME_RELEASE"
-	exit ;;
-    *:DragonFly:*:*)
-	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`"
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "$UNAME_MACHINE" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
-	exit ;;
-    i*86:rdos:*:*)
-	echo "$UNAME_MACHINE"-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo "$UNAME_MACHINE"-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo "$UNAME_MACHINE"-unknown-esx
-	exit ;;
-    amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
-esac
-
-echo "$0: unable to guess system type" >&2
-
-case "$UNAME_MACHINE:$UNAME_SYSTEM" in
-    mips:Linux | mips64:Linux)
-	# If we got here on MIPS GNU/Linux, output extra information.
-	cat >&2 <<EOF
-
-NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
-the system type. Please install a C compiler and try again.
-EOF
-	;;
-esac
-
-cat >&2 <<EOF
-
-This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite *all*
-copies of config.guess and config.sub with the latest versions from:
-
-  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-and
-  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-If $0 has already been updated, send the following data and any
-information you think might be pertinent to config-patches@gnu.org to
-provide the necessary information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = "$UNAME_MACHINE"
-UNAME_RELEASE = "$UNAME_RELEASE"
-UNAME_SYSTEM  = "$UNAME_SYSTEM"
-UNAME_VERSION = "$UNAME_VERSION"
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

_service:tar_scm:lxc-4.0.3.tar.gz/config/config.sub Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/depcomp Deleted

@@ -1,791 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-    exit 1;
-    ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp --help --version PROGRAM ARGS
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by 'PROGRAMS ARGS'.
-  object      Object file output by 'PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-# Get the directory component of the given path, and save it in the
-# global variables '$dir'.  Note that this directory component will
-# be either empty or ending with a '/' character.  This is deliberate.
-set_dir_from ()
-{
-  case $1 in
-    */*) dir=`echo "$1" | sed -e 's|/^/*$|/|'`;;
-      *) dir=;;
-  esac
-}
-
-# Get the suffix-stripped basename of the given path, and save it the
-# global variable '$base'.
-set_base_from ()
-{
-  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.^.*$//'`
-}
-
-# If no dependency file was actually created by the compiler invocation,
-# we still have to create a dummy depfile, to avoid errors with the
-# Makefile "include basename.Plo" scheme.
-make_dummy_depfile ()
-{
-  echo "#dummy" > "$depfile"
-}
-
-# Factor out some common post-processing of the generated depfile.
-# Requires the auxiliary global variable '$tmpdepfile' to be set.
-aix_post_process_depfile ()
-{
-  # If the compiler actually managed to produce a dependency file,
-  # post-process it.
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependency.h'.
-    # Do two passes, one to just change these to
-    #   $object: dependency.h
-    # and one to simply output
-    #   dependency.h:
-    # which is needed to avoid the deleted-header problem.
-    { sed -e "s,^.*\.$lower*:,$object:," < "$tmpdepfile"
-      sed -e "s,^.*\.$lower*:$tab *,," -e 's,$,:,' < "$tmpdepfile"
-    } > "$depfile"
-    rm -f "$tmpdepfile"
-  else
-    make_dummy_depfile
-  fi
-}
-
-# A tabulation character.
-tab='	'
-# A newline character.
-nl='
-'
-# Character ranges might be problematic outside the C locale.
-# These definitions help.
-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
-alpha=${upper}${lower}
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|^\\/*$|'${DEPDIR-.deps}'/&|;s|\.$^.*$$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$^.*$$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Avoid interferences from the environment.
-gccflag= dashmflag=
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-  # This is just like dashmstdout with a different argument.
-  dashmflag=-xM
-  depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-  # This is just like msvisualcpp but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvisualcpp
-fi
-
-if test "$depmode" = msvc7msys; then
-  # This is just like msvc7 but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvc7
-fi
-
-if test "$depmode" = xlc; then
-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
-  gccflag=-qmakedep=gcc,-MF
-  depmode=gcc
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
-## (see the conditional assignment to $gccflag above).
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).  Also, it might not be
-##   supported by the other compilers which use the 'gcc' depmode.
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The second -e expression handles DOS-style file names with drive
-  # letters.
-  sed -e 's/^^:*: / /' \
-      -e 's/^'$alpha':\/^:*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-## Some versions of gcc put a space before the ':'.  On the theory
-## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
-## to the object.  Take care to not repeat it in the output.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like '#:fec' to the end of the
-    # dependency line.
-    tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
-      | tr "$nl" ' ' >> "$depfile"
-    echo >> "$depfile"
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-      >> "$depfile"
-  else
-    make_dummy_depfile
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-xlc)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts '$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  set_dir_from "$object"
-  set_base_from "$object"
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  aix_post_process_depfile
-  ;;
-
-tcc)
-  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
-  # FIXME: That version still under development at the moment of writing.
-  #        Make that this statement remains true also for stable, released
-  #        versions.
-  # It will wrap lines (doesn't matter whether long or short) with a
-  # trailing '\', as in:
-  #
-  #   foo.o : \
-  #    foo.c \
-  #    foo.h \
-  #
-  # It will put a trailing '\' even on the last line, and will use leading
-  # spaces rather than leading tabs (at least since its commit 0394caf7
-  # "Emit spaces for -MD").
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
-  # We have to change lines of the first kind to '$object: \'.
-  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
-  # And for each line of the second kind, we have to emit a 'dep.h:'
-  # dummy dependency, to avoid the deleted-header problem.
-  sed -n -e 's|^  *$.*$ *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-## The order of this option in the case statement is important, since the
-## shell code in configure will try each of these formats in the order
-## listed in this file.  A plain '-MD' option would be understood by many
-## compilers, so we must ensure this comes after the gcc and icc options.
-pgcc)
-  # Portland's C compiler understands '-MD'.
-  # Will always output deps to 'file.d' where file is the root name of the
-  # source file under compilation, even if file resides in a subdirectory.
-  # The object file name does not affect the name of the '.d' file.
-  # pgcc 10.2 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\' :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-  set_dir_from "$object"
-  # Use the source, not the object, to determine the base name, since
-  # that's sadly what pgcc will do too.
-  set_base_from "$source"
-  tmpdepfile=$base.d
-
-  # For projects that build the same source file twice into different object
-  # files, the pgcc approach of using the *source* file root name can cause
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
-  # the same $tmpdepfile.
-  lockdir=$base.d-lock
-  trap "
-    echo '$0: caught signal, cleaning up...' >&2
-    rmdir '$lockdir'
-    exit 1
-  " 1 2 13 15
-  numtries=100
-  i=$numtries
-  while test $i -gt 0; do
-    # mkdir is a portable test-and-set.
-    if mkdir "$lockdir" 2>/dev/null; then
-      # This process acquired the lock.
-      "$@" -MD
-      stat=$?
-      # Release the lock.
-      rmdir "$lockdir"
-      break
-    else
-      # If the lock is being held by a different process, wait
-      # until the winning process is done or we timeout.
-      while test -d "$lockdir" && test $i -gt 0; do
-        sleep 1
-        i=`expr $i - 1`
-      done
-    fi
-    i=`expr $i - 1`
-  done
-  trap - 1 2 13 15
-  if test $i -le 0; then
-    echo "$0: failed to acquire lock after $numtries attempts" >&2
-    echo "$0: check lockdir '$lockdir'" >&2
-    exit 1
-  fi
-
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^^:*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^^:*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  set_dir_from  "$object"
-  set_base_from "$object"
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.$lower*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add 'dependent.h:' lines.
-    sed -ne '2,${
-               s/^ *//
-               s/ \\*$//
-               s/$/:/
-               p
-             }' "$tmpdepfile" >> "$depfile"
-  else
-    make_dummy_depfile
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-  # The Tru64 compiler uses -MD to generate dependencies as a side
-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-  # dependencies in 'foo.d' instead, so we check for that too.
-  # Subdirectories are respected.
-  set_dir_from  "$object"
-  set_base_from "$object"
-
-  if test "$libtool" = yes; then
-    # Libtool generates 2 separate objects for the 2 libraries.  These
-    # two compilations output dependencies in $dir.libs/$base.o.d and
-    # in $dir$base.o.d.  We have to check for both files, because
-    # one of the two compilations can be disabled.  We should prefer
-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-    # automatically cleaned when .libs/ is deleted, while ignoring
-    # the former would cause a distcleancheck panic.
-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
-    "$@" -Wc,-MD
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    tmpdepfile3=$dir$base.d
-    "$@" -MD
-  fi
-
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  # Same post-processing that is required for AIX mode.
-  aix_post_process_depfile
-  ;;
-
-msvc7)
-  if test "$libtool" = yes; then
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *$.*$/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/$.*$/'"$tab"'\1 \\/p
-s/.$.*$ \\/\1:/
-H
-$ {
-  s/.*/'"$tab"'/
-  G
-  p
-}' >> "$depfile"
-  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
-  rm -f "$tmpdepfile"
-  ;;
-
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for ':'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
-  "$@" $dashmflag |
-    sed "s|^$tab *^:$tab ^:^:*:$tab *|$object: |" > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
-  # No need to regex-escape $object, excess matching of '.' is harmless.
-  sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process the last invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed '1,2d' "$tmpdepfile" \
-    | tr ' ' "$nl" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E \
-    | sed -n -e '/^# 0-90-9* "$^"*$".*/ s:: \1 \\:p' \
-             -e '/^#line 0-90-9* "$^"*$".*/ s:: \1 \\:p' \
-    | sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-        set fnord "$@"
-        shift
-        shift
-        ;;
-    *)
-        set fnord "$@" "$arg"
-        shift
-        shift
-        ;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line 0-90-9* "$^"*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::'"$tab"'\1 \\:p' >> "$depfile"
-  echo "$tab" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:

_service:tar_scm:lxc-4.0.3.tar.gz/config/etc/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/etc/Makefile.in Deleted

@@ -1,567 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/etc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = default.conf
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(configdir)"
-DATA = $(config_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-configdir = $(sysconfdir)/lxc
-config_DATA = default.conf
-EXTRA_DIST = default.conf.lxcbr default.conf.libvirt default.conf.unknown
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/etc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/etc/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-configDATA: $(config_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(config_DATA)'; test -n "$(configdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(configdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(configdir)" || exit $$?; \
-	done
-
-uninstall-configDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(config_DATA)'; test -n "$(configdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(configdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-local
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-configDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-configDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distclean-local distdir dvi dvi-am html \
-	html-am info info-am install install-am install-configDATA \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-configDATA
-
-.PRECIOUS: Makefile
-
-
-distclean-local:
-	@$(RM) -f default.conf
-	@$(RM) -f compile config.guess config.sub depcomp install-sh ltmain.sh missing Makefile.in Makefile
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/Makefile.in Deleted

@@ -1,686 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/init
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = common systemd sysvinit upstart
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/init/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/init/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/common/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/common/Makefile.in Deleted

@@ -1,581 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/init/common
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc-containers lxc-net
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(pkglibexecdir)"
-SCRIPTS = $(pkglibexec_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc-containers.in \
-	$(srcdir)/lxc-net.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = lxc-containers.in lxc-net.in
-pkglibexec_SCRIPTS = lxc-containers lxc-net
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/init/common/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/init/common/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc-containers: $(top_builddir)/config.status $(srcdir)/lxc-containers.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-net: $(top_builddir)/config.status $(srcdir)/lxc-net.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1; } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) { filesd = filesd " " $$1; \
-	      if (++nd == $(am__install_max)) { \
-		print "f", d, filesd; nd = 0; filesd = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-pkglibexecSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(pkglibexecdir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(pkglibexecdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-pkglibexecSCRIPTS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkglibexecSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibexecSCRIPTS \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-pkglibexecSCRIPTS
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/systemd/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/systemd/Makefile.in Deleted

@@ -1,609 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/init/systemd
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc.service lxc@.service lxc-net.service
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(pkglibexecdir)"
-SCRIPTS = $(pkglibexec_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc-net.service.in \
-	$(srcdir)/lxc.service.in $(srcdir)/lxc@.service.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-	lxc-apparmor-load \
-	lxc.service.in \
-	lxc@.service.in \
-	lxc-net.service.in
-
-@INIT_SCRIPT_SYSTEMD_TRUE@BUILT_SOURCES = lxc.service lxc@.service lxc-net.service
-@INIT_SCRIPT_SYSTEMD_TRUE@pkglibexec_SCRIPTS = lxc-apparmor-load
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/init/systemd/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/init/systemd/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc.service: $(top_builddir)/config.status $(srcdir)/lxc.service.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc@.service: $(top_builddir)/config.status $(srcdir)/lxc@.service.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-net.service: $(top_builddir)/config.status $(srcdir)/lxc-net.service.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1; } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) { filesd = filesd " " $$1; \
-	      if (++nd == $(am__install_max)) { \
-		print "f", d, filesd; nd = 0; filesd = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-pkglibexecSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(pkglibexecdir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(pkglibexecdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@INIT_SCRIPT_SYSTEMD_FALSE@uninstall-local:
-@INIT_SCRIPT_SYSTEMD_FALSE@install-data-local:
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-pkglibexecSCRIPTS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local uninstall-pkglibexecSCRIPTS
-
-.MAKE: all check install install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pkglibexecSCRIPTS install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am uninstall-local \
-	uninstall-pkglibexecSCRIPTS
-
-.PRECIOUS: Makefile
-
-
-@INIT_SCRIPT_SYSTEMD_TRUE@install-systemd: lxc.service lxc@.service lxc-net.service lxc-apparmor-load
-@INIT_SCRIPT_SYSTEMD_TRUE@	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
-@INIT_SCRIPT_SYSTEMD_TRUE@	$(INSTALL_DATA) lxc.service lxc@.service lxc-net.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
-
-@INIT_SCRIPT_SYSTEMD_TRUE@uninstall-systemd:
-@INIT_SCRIPT_SYSTEMD_TRUE@	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc.service
-@INIT_SCRIPT_SYSTEMD_TRUE@	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc@.service
-@INIT_SCRIPT_SYSTEMD_TRUE@	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc-net.service
-@INIT_SCRIPT_SYSTEMD_TRUE@	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
-
-@INIT_SCRIPT_SYSTEMD_TRUE@install-data-local: install-systemd
-@INIT_SCRIPT_SYSTEMD_TRUE@uninstall-local: uninstall-systemd
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/sysvinit/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/sysvinit/Makefile.in Deleted

@@ -1,532 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/init/sysvinit
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc-containers lxc-net
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc-containers.in \
-	$(srcdir)/lxc-net.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = lxc-containers.in lxc-net.in
-@HAVE_DEBIAN_FALSE@@INIT_SCRIPT_SYSV_TRUE@initdir = "rc.d/init.d"
-
-# If we're installing for sysv init, install the helper scripts
-# directly to the rc directory under the appropriate name.
-@HAVE_DEBIAN_TRUE@@INIT_SCRIPT_SYSV_TRUE@initdir = "init.d"
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/init/sysvinit/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/init/sysvinit/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc-containers: $(top_builddir)/config.status $(srcdir)/lxc-containers.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-net: $(top_builddir)/config.status $(srcdir)/lxc-net.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-@INIT_SCRIPT_SYSV_FALSE@uninstall-local:
-@INIT_SCRIPT_SYSV_FALSE@install-data-local:
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-local
-
-.PRECIOUS: Makefile
-
-
-@INIT_SCRIPT_SYSV_TRUE@install-sysvinit: lxc-containers lxc-net
-@INIT_SCRIPT_SYSV_TRUE@	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/$(initdir)
-@INIT_SCRIPT_SYSV_TRUE@	$(INSTALL_SCRIPT) lxc-containers $(DESTDIR)$(sysconfdir)/$(initdir)/lxc
-@INIT_SCRIPT_SYSV_TRUE@	$(INSTALL_SCRIPT) lxc-net $(DESTDIR)$(sysconfdir)/$(initdir)/lxc-net
-
-@INIT_SCRIPT_SYSV_TRUE@uninstall-sysvinit:
-@INIT_SCRIPT_SYSV_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/$(initdir)/lxc
-@INIT_SCRIPT_SYSV_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/$(initdir)/lxc-net
-@INIT_SCRIPT_SYSV_TRUE@	rmdir $(DESTDIR)$(sysconfdir)/$(initdir) || :
-
-@INIT_SCRIPT_SYSV_TRUE@install-data-local: install-sysvinit
-@INIT_SCRIPT_SYSV_TRUE@uninstall-local: uninstall-sysvinit
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/upstart/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/upstart/Makefile.in Deleted

@@ -1,529 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/init/upstart
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc.conf lxc-net.conf
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc-net.conf.in \
-	$(srcdir)/lxc.conf.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = lxc.conf lxc-instance.conf lxc-net.conf.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/init/upstart/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/init/upstart/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc.conf: $(top_builddir)/config.status $(srcdir)/lxc.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-net.conf: $(top_builddir)/config.status $(srcdir)/lxc-net.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-@INIT_SCRIPT_UPSTART_FALSE@uninstall-local:
-@INIT_SCRIPT_UPSTART_FALSE@install-data-local:
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-local
-
-.PRECIOUS: Makefile
-
-
-@INIT_SCRIPT_UPSTART_TRUE@install-upstart: lxc.conf lxc-instance.conf lxc-net.conf
-@INIT_SCRIPT_UPSTART_TRUE@	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/init/
-@INIT_SCRIPT_UPSTART_TRUE@	$(INSTALL_DATA) lxc.conf $(DESTDIR)$(sysconfdir)/init/
-@INIT_SCRIPT_UPSTART_TRUE@	$(INSTALL_DATA) $(srcdir)/lxc-instance.conf $(DESTDIR)$(sysconfdir)/init/
-@INIT_SCRIPT_UPSTART_TRUE@	$(INSTALL_DATA) lxc-net.conf $(DESTDIR)$(sysconfdir)/init/
-
-@INIT_SCRIPT_UPSTART_TRUE@uninstall-upstart:
-@INIT_SCRIPT_UPSTART_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/init/lxc.conf
-@INIT_SCRIPT_UPSTART_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/init/lxc-instance.conf
-@INIT_SCRIPT_UPSTART_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/init/lxc-net.conf
-@INIT_SCRIPT_UPSTART_TRUE@	rmdir $(DESTDIR)$(sysconfdir)/init || :
-
-@INIT_SCRIPT_UPSTART_TRUE@install-data-local: install-upstart
-@INIT_SCRIPT_UPSTART_TRUE@uninstall-local: uninstall-upstart
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/upstart/lxc.conf Deleted

@@ -1,74 +0,0 @@
-description "lxc"
-author "Serge Hallyn <serge.hallyn@canonical.com>"
-
-start on runlevel 2345
-stop on starting rc RUNLEVEL=016
-
-env LXC_AUTO="false"
-
-# These can be overridden in /etc/default/lxc
-
-# BOOTGROUPS - What groups should start on bootup?
-#	Comma separated list of groups.
-#	Leading comma, trailing comma or embedded double
-#	comma indicates when the NULL group should be run.
-# Example (default): boot the onboot group first then the NULL group
-env BOOTGROUPS="onboot,"
-
-# SHUTDOWNDELAY - Wait time for a container to shut down.
-#	Container shutdown can result in lengthy system
-#	shutdown times.  Even 5 seconds per container can be
-#	too long.
-env SHUTDOWNDELAY=5
-
-# OPTIONS can be used for anything else.
-#	If you want to boot everything then
-#	options can be "-a" or "-a -A".
-env OPTIONS=
-
-# STOPOPTS are stop options.  The can be used for anything else to stop.
-#	If you want to kill containers fast, use -k
-env STOPOPTS="-a -A -s"
-
-pre-start script
-	 -f /etc/default/lxc  && . /etc/default/lxc
-
-	# don't load profiles if mount mediation is not supported
-	SYSF=/sys/kernel/security/apparmor/features/mount/mask
-	if  -f $SYSF ; then
-		if  -x /lib/apparmor/profile-load ; then
-			/lib/apparmor/profile-load usr.bin.lxc-start
-			/lib/apparmor/profile-load lxc-containers
-		elif  -x /lib/init/apparmor-profile-load ; then
-			/lib/init/apparmor-profile-load usr.bin.lxc-start
-			/lib/init/apparmor-profile-load lxc-containers
-		fi
-	fi
-
-	 "x$LXC_AUTO" = "xtrue"  || exit 0
-
-	if  -n "$BOOTGROUPS" 
-	then
-		BOOTGROUPS="-g $BOOTGROUPS"
-	fi
-
-	# Process the "onboot" group first then the NULL group.
-	lxc-autostart -L $OPTIONS $BOOTGROUPS | while read line; do
-		set -- $line
-		(start lxc-instance NAME=$1 && sleep $2) || true
-	done
-end script
-
-# The stop is serialized and can take excessive time.  We need to avoid
-# delaying the system shutdown / reboot as much as we can since it's not
-# parallelized...  Even 5 second timeout may be too long.
-post-stop script
-	 -f /etc/default/lxc  && . /etc/default/lxc
-
-	if  -n "$SHUTDOWNDELAY" 
-	then
-		SHUTDOWNDELAY="-t $SHUTDOWNDELAY"
-	fi
-
-	lxc-autostart $STOPOPTS $SHUTDOWNDELAY || true
-end script

_service:tar_scm:lxc-4.0.3.tar.gz/config/install-sh Deleted

@@ -1,518 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2018-03-11.20; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-tab='	'
-nl='
-'
-IFS=" $tab$nl"
-
-# Set DOITPROG to "echo" to test this script.
-
-doit=${DOITPROG-}
-doit_exec=${doit:-exec}
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-is_target_a_directory=possibly
-
-usage="\
-Usage: $0 OPTION... -T SRCFILE DSTFILE
-   or: $0 OPTION... SRCFILES... DIRECTORY
-   or: $0 OPTION... -t DIRECTORY SRCFILES...
-   or: $0 OPTION... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-        case $mode in
-          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *''*)
-            echo "$0: invalid mode: $mode" >&2
-            exit 1;;
-        esac
-        shift;;
-
-    -o) chowncmd="$chownprog $2"
-        shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t)
-        is_target_a_directory=always
-        dst_arg=$2
-        # Protect names problematic for 'test' and other utilities.
-        case $dst_arg in
-          -* | =!) dst_arg=./$dst_arg;;
-        esac
-        shift;;
-
-    -T) is_target_a_directory=never;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --) shift
-        break;;
-
-    -*) echo "$0: invalid option: $1" >&2
-        exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-# We allow the use of options -d and -T together, by making -d
-# take the precedence; this is for compatibility with GNU install.
-
-if test -n "$dir_arg"; then
-  if test -n "$dst_arg"; then
-    echo "$0: target directory not allowed when installing a directory." >&2
-    exit 1
-  fi
-fi
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-    # Protect names problematic for 'test' and other utilities.
-    case $dst_arg in
-      -* | =!) dst_arg=./$dst_arg;;
-    esac
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call 'install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  if test $# -gt 1 || test "$is_target_a_directory" = always; then
-    if test ! -d "$dst_arg"; then
-      echo "$0: $dst_arg: Is not a directory." >&2
-      exit 1
-    fi
-  fi
-fi
-
-if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *0-7)
-      if test -z "$stripcmd"; then
-        u_plus_rw=
-      else
-        u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-        u_plus_rw=
-      else
-        u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names problematic for 'test' and other utilities.
-  case $src in
-    -* | =!) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-    dst=$dst_arg
-
-    # If destination is a directory, append the input filename.
-    if test -d "$dst"; then
-      if test "$is_target_a_directory" = never; then
-        echo "$0: $dst_arg: Is a directory" >&2
-        exit 1
-      fi
-      dstdir=$dst
-      dstbase=`basename "$src"`
-      case $dst in
-	*/) dst=$dst$dstbase;;
-	*)  dst=$dst/$dstbase;;
-      esac
-      dstdir_status=0
-    else
-      dstdir=`dirname "$dst"`
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  case $dstdir in
-    */) dstdirslash=$dstdir;;
-    *)  dstdirslash=$dstdir/;;
-  esac
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-        # Create intermediate dirs using mode 755 as modified by the umask.
-        # This is like FreeBSD 'install' as of 1997-10-28.
-        umask=`umask`
-        case $stripcmd.$umask in
-          # Optimize common cases.
-          *23672367) mkdir_umask=$umask;;
-          .*00202 | .0202 | .02) mkdir_umask=22;;
-
-          *0-7)
-            mkdir_umask=`expr $umask + 22 \
-              - $umask % 100 % 40 + $umask % 20 \
-              - $umask % 10 % 4 + $umask % 2
-            `;;
-          *) mkdir_umask=$umask,go-w;;
-        esac
-
-        # With -d, create the new directory with the user-specified mode.
-        # Otherwise, rely on $mkdir_umask.
-        if test -n "$dir_arg"; then
-          mkdir_mode=-m$mode
-        else
-          mkdir_mode=
-        fi
-
-        posix_mkdir=false
-        case $umask in
-          *1235670-70-7)
-            # POSIX mkdir -p sets u+wx bits regardless of umask, which
-            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-            ;;
-          *)
-            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
-            # here however when possible just to lower collision chance.
-            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-
-            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-            # Because "mkdir -p" follows existing symlinks and we likely work
-            # directly in world-writeable /tmp, make sure that the '$tmpdir'
-            # directory is successfully created first before we actually test
-            # 'mkdir -p' feature.
-            if (umask $mkdir_umask &&
-                $mkdirprog $mkdir_mode "$tmpdir" &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
-            then
-              if test -z "$dir_arg" || {
-                   # Check for POSIX incompatibilities with -m.
-                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                   # other-writable bit of parent directory when it shouldn't.
-                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   test_tmpdir="$tmpdir/a"
-                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
-                   case $ls_ld_tmpdir in
-                     d????-?r-*) different_mode=700;;
-                     d????-?--*) different_mode=755;;
-                     *) false;;
-                   esac &&
-                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
-                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                   }
-                 }
-              then posix_mkdir=:
-              fi
-              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
-            else
-              # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
-            fi
-            trap '' 0;;
-        esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-        umask $mkdir_umask &&
-        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-        /*) prefix='/';;
-        -=!*) prefix='./';;
-        *)  prefix='';;
-      esac
-
-      oIFS=$IFS
-      IFS=/
-      set -f
-      set fnord $dstdir
-      shift
-      set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-        test X"$d" = X && continue
-
-        prefix=$prefix$d
-        if test -d "$prefix"; then
-          prefixes=
-        else
-          if $posix_mkdir; then
-            (umask=$mkdir_umask &&
-             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-            # Don't fail if two instances are running concurrently.
-            test -d "$prefix" || exit 1
-          else
-            case $prefix in
-              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-              *) qprefix=$prefix;;
-            esac
-            prefixes="$prefixes '$qprefix'"
-          fi
-        fi
-        prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-        # Don't fail if two instances are running concurrently.
-        (umask $mkdir_umask &&
-         eval "\$doit_exec \$mkdirprog $prefixes") ||
-          test -d "$dstdir" || exit 1
-        obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=${dstdirslash}_inst.$$_
-    rmtmp=${dstdirslash}_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
-       set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       set +f &&
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-        # Now remove or move aside any old file at destination location.
-        # We try this two ways since rm can't unlink itself on some
-        # systems and the destination file might be busy for other
-        # reasons.  In this case, the final cleanup might fail but the new
-        # file should still install successfully.
-        {
-          test ! -f "$dst" ||
-          $doit $rmcmd -f "$dst" 2>/dev/null ||
-          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-          } ||
-          { echo "$0: cannot unlink or rename $dst" >&2
-            (exit 1); exit 1
-          }
-        } &&
-
-        # Now rename the file to the real destination.
-        $doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:

_service:tar_scm:lxc-4.0.3.tar.gz/config/libtool.m4 Deleted

@@ -1,8394 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define(_LT_COPYING, dnl
-# Copyright (C) 2014 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program or library that is built
-# using GNU Libtool, you may include this file under the  same
-# distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-)
-
-# serial 58 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun(LT_PREREQ,
-m4_if(m4_version_compare(m4_defn(LT_PACKAGE_VERSION), $1), -1,
-       m4_default($3,
-		   m4_fatal(Libtool version $1 or higher is required,
-		             63)),
-       $2))
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun(_LT_CHECK_BUILDDIR,
-case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN(Libtool does not cope well with whitespace in `pwd`) ;;
-esac
-)
-
-
-# LT_INIT(OPTIONS)
-# ------------------
-AC_DEFUN(LT_INIT,
-AC_PREREQ(2.62)dnl We use AC_PATH_PROGS_FEATURE_CHECK
-AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
-AC_BEFORE($0, LT_LANG)dnl
-AC_BEFORE($0, LT_OUTPUT)dnl
-AC_BEFORE($0, LTDL_INIT)dnl
-m4_require(_LT_CHECK_BUILDDIR)dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid(^_?LT_A-Z_+$)dnl
-m4_pattern_allow(^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$)dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE(LTOPTIONS_VERSION)dnl
-AC_REQUIRE(LTSUGAR_VERSION)dnl
-AC_REQUIRE(LTVERSION_VERSION)dnl
-AC_REQUIRE(LTOBSOLETE_VERSION)dnl
-m4_require(_LT_PROG_LTMAIN)dnl
-
-_LT_SHELL_INIT(SHELL=${CONFIG_SHELL-/bin/sh})
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS($0, $1)
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS=$ltmain
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define(LT_INIT)
-)# LT_INIT
-
-# Old names:
-AU_ALIAS(AC_PROG_LIBTOOL, LT_INIT)
-AU_ALIAS(AM_PROG_LIBTOOL, LT_INIT)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_PROG_LIBTOOL, )
-dnl AC_DEFUN(AM_PROG_LIBTOOL, )
-
-
-# _LT_PREPARE_CC_BASENAME
-# -----------------------
-m4_defun(_LT_PREPARE_CC_BASENAME, 
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in @S|@*""; do
-      case $cc_temp in
-        compile | *\\/compile | ccache | *\\/ccache ) ;;
-        distcc | *\\/distcc | purify | *\\/purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-)# _LT_PREPARE_CC_BASENAME
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
-# but that macro is also expanded into generated libtool script, which
-# arranges for $SED and $ECHO to be set by different means.
-m4_defun(_LT_CC_BASENAME,
-m4_require(_LT_PREPARE_CC_BASENAME)dnl
-AC_REQUIRE(_LT_DECL_SED)dnl
-AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
-func_cc_basename $1
-cc_basename=$func_cc_basename_result
-)
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after 'm4_require(_LT_FILEUTILS_DEFAULTS)'.
-m4_defun(_LT_FILEUTILS_DEFAULTS,
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-)# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun(_LT_SETUP,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_CANONICAL_BUILD)dnl
-AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
-AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
-
-_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl
-dnl
-_LT_DECL(, host_alias, 0, The host system)dnl
-_LT_DECL(, host, 0)dnl
-_LT_DECL(, host_os, 0)dnl
-dnl
-_LT_DECL(, build_alias, 0, The build system)dnl
-_LT_DECL(, build, 0)dnl
-_LT_DECL(, build_os, 0)dnl
-dnl
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_REQUIRE(LT_PATH_LD)dnl
-AC_REQUIRE(LT_PATH_NM)dnl
-dnl
-AC_REQUIRE(AC_PROG_LN_S)dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL(, LN_S, 1, Whether we need soft or hard links)dnl
-dnl
-AC_REQUIRE(LT_CMD_MAX_LEN)dnl
-_LT_DECL(objext, ac_objext, 0, Object file suffix (normally "o"))dnl
-_LT_DECL(, exeext, 0, Executable file suffix (normally ""))dnl
-dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_CHECK_SHELL_FEATURES)dnl
-m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
-m4_require(_LT_CMD_RELOAD)dnl
-m4_require(_LT_CHECK_MAGIC_METHOD)dnl
-m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
-m4_require(_LT_CMD_OLD_ARCHIVE)dnl
-m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
-m4_require(_LT_WITH_SYSROOT)dnl
-m4_require(_LT_CMD_TRUNCATE)dnl
-
-_LT_CONFIG_LIBTOOL_INIT(
-# See if we are running on zsh, and set the options that allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-)
-if test -n "${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require(_LT_TAG_COMPILER)dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test set != "${COLLECT_NAMES+set}"; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-old_CC=$CC
-old_CFLAGS=$CFLAGS
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME($compiler)
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG(CC)
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-)# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun(_LT_PREPARE_SED_QUOTE_VARS,
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/$"`$\\$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$"`\\$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-)
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from 'configure', and 'config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# 'config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun(_LT_PROG_LTMAIN,
-m4_ifdef(AC_REQUIRE_AUX_FILE, AC_REQUIRE_AUX_FILE(ltmain.sh))dnl
-_LT_CONFIG_LIBTOOL_INIT(ac_aux_dir='$ac_aux_dir')
-ltmain=$ac_aux_dir/ltmain.sh
-)# _LT_PROG_LTMAIN
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the 'libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT(INIT-COMMANDS)
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define(_LT_CONFIG_LIBTOOL_INIT,
-m4_ifval($1,
-          m4_append(_LT_OUTPUT_LIBTOOL_INIT,
-                     $1
-)))
-
-# Initialize.
-m4_define(_LT_OUTPUT_LIBTOOL_INIT)
-
-
-# _LT_CONFIG_LIBTOOL(COMMANDS)
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define(_LT_CONFIG_LIBTOOL,
-m4_ifval($1,
-          m4_append(_LT_OUTPUT_LIBTOOL_COMMANDS,
-                     $1
-)))
-
-# Initialize.
-m4_define(_LT_OUTPUT_LIBTOOL_COMMANDS)
-
-
-# _LT_CONFIG_SAVE_COMMANDS(COMMANDS, INIT_COMMANDS)
-# -----------------------------------------------------
-m4_defun(_LT_CONFIG_SAVE_COMMANDS,
-_LT_CONFIG_LIBTOOL($1)
-_LT_CONFIG_LIBTOOL_INIT($2)
-)
-
-
-# _LT_FORMAT_COMMENT(COMMENT)
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define(_LT_FORMAT_COMMENT,
-m4_ifval($1, 
-m4_bpatsubst(m4_bpatsubst($1, ^ *, # ),
-              '`$\, \\\&)m4_bmatch($1, !?.$, , .)
-))
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL(CONFIGNAME, VARNAME, VALUE, DESCRIPTION, IS-TAGGED?)
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define(_LT_DECL,
-lt_if_append_uniq(lt_decl_varnames, $2, , ,
-    lt_dict_add_subkey(lt_decl_dict, $2, libtool_name,
-	m4_ifval($1, $1, $2))
-    lt_dict_add_subkey(lt_decl_dict, $2, value, $3)
-    m4_ifval($4,
-	lt_dict_add_subkey(lt_decl_dict, $2, description, $4))
-    lt_dict_add_subkey(lt_decl_dict, $2,
-	tagged?, m4_ifval($5, yes, no)))
-)
-
-
-# _LT_TAGDECL(CONFIGNAME, VARNAME, VALUE, DESCRIPTION)
-# --------------------------------------------------------
-m4_define(_LT_TAGDECL, _LT_DECL($1, $2, $3, $4, yes))
-
-
-# lt_decl_tag_varnames(SEPARATOR, VARNAME1...)
-# ------------------------------------------------
-m4_define(lt_decl_tag_varnames,
-_lt_decl_filter(tagged?, yes, $@))
-
-
-# _lt_decl_filter(SUBKEY, VALUE, SEPARATOR, VARNAME1..)
-# ---------------------------------------------------------
-m4_define(_lt_decl_filter,
-m4_case($#,
-  0, m4_fatal($0: too few arguments: $#),
-  1, m4_fatal($0: too few arguments: $#: $1),
-  2, lt_dict_filter(lt_decl_dict, $1, $2, , lt_decl_varnames),
-  3, lt_dict_filter(lt_decl_dict, $1, $2, $3, lt_decl_varnames),
-  lt_dict_filter(lt_decl_dict, $@))dnl
-)
-
-
-# lt_decl_quote_varnames(SEPARATOR, VARNAME1...)
-# --------------------------------------------------
-m4_define(lt_decl_quote_varnames,
-_lt_decl_filter(value, 1, $@))
-
-
-# lt_decl_dquote_varnames(SEPARATOR, VARNAME1...)
-# ---------------------------------------------------
-m4_define(lt_decl_dquote_varnames,
-_lt_decl_filter(value, 2, $@))
-
-
-# lt_decl_varnames_tagged(SEPARATOR, VARNAME1...)
-# ---------------------------------------------------
-m4_define(lt_decl_varnames_tagged,
-m4_assert($# <= 2)dnl
-_$0(m4_quote(m4_default($1, , )),
-    m4_ifval($2, $2, m4_dquote(lt_decl_tag_varnames)),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)),  )))
-m4_define(_lt_decl_varnames_tagged,
-m4_ifval($3, lt_combine($1, $2, _, $3)))
-
-
-# lt_decl_all_varnames(SEPARATOR, VARNAME1...)
-# ------------------------------------------------
-m4_define(lt_decl_all_varnames,
-_$0(m4_quote(m4_default($1, , )),
-     m4_if($2, ,
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))dnl
-)
-m4_define(_lt_decl_all_varnames,
-lt_join($@, lt_decl_varnames_tagged($1,
-			lt_decl_tag_varnames(, , m4_shift($@))))dnl
-)
-
-
-# _LT_CONFIG_STATUS_DECLARE(VARNAME)
-# ------------------------------------
-# Quote a variable value, and forward it to 'config.status' so that its
-# declaration there will have the same value as in 'configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define(_LT_CONFIG_STATUS_DECLARE,
-$1='`$ECHO "$$1" | $SED "$delay_single_quote_subst"`')
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun(_LT_CONFIG_STATUS_DECLARATIONS,
-m4_foreach(_lt_var, m4_quote(lt_decl_all_varnames),
-    m4_n(_LT_CONFIG_STATUS_DECLARE(_lt_var))))
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun(_LT_LIBTOOL_TAGS,
-_LT_FORMAT_COMMENT(The names of the tagged configurations supported by this script)dnl
-available_tags='_LT_TAGS'dnl
-)
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, TAG)
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define(_LT_LIBTOOL_DECLARE,
-_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch(lt_decl_dict, $1,
-					   description)))dnl
-m4_pushdef(_libtool_name,
-    m4_quote(lt_dict_fetch(lt_decl_dict, $1, libtool_name)))dnl
-m4_case(m4_quote(lt_dict_fetch(lt_decl_dict, $1, value)),
-    0, _libtool_name=$$1,
-    1, _libtool_name=$lt_$1,
-    2, _libtool_name=$lt_$1,
-    _libtool_name=lt_dict_fetch(lt_decl_dict, $1, value))dnl
-m4_ifval($2, _$2)m4_popdef(_libtool_name)dnl
-)
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun(_LT_LIBTOOL_CONFIG_VARS,
-m4_foreach(_lt_var,
-    m4_quote(_lt_decl_filter(tagged?, no, , lt_decl_varnames)),
-    m4_n(_LT_LIBTOOL_DECLARE(_lt_var))))
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define(_LT_LIBTOOL_TAG_VARS,
-m4_foreach(_lt_var, m4_quote(lt_decl_tag_varnames),
-    m4_n(_LT_LIBTOOL_DECLARE(_lt_var, $1))))
-
-
-# _LT_TAGVAR(VARNAME, TAGNAME)
-# ------------------------------
-m4_define(_LT_TAGVAR, m4_ifval($2, $1_$2, $1))
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into 'config.status', and then the shell code to quote escape them in
-# for loops in 'config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun(_LT_CONFIG_COMMANDS,
-AC_PROVIDE_IFELSE(LT_OUTPUT,
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        AC_CONFIG_COMMANDS(libtool,
-            $SHELL $CONFIG_LT || AS_EXIT(1), CONFIG_LT='$CONFIG_LT'),
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    AC_CONFIG_COMMANDS(libtool,
-        _LT_OUTPUT_LIBTOOL_COMMANDS, _LT_OUTPUT_LIBTOOL_COMMANDS_INIT))
-)#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define(_LT_OUTPUT_LIBTOOL_COMMANDS_INIT,
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames( \
-, lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames( \
-, lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-)
-
-# _LT_GENERATED_FILE_INIT(FILE, COMMENT)
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# '#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef(AS_INIT_GENERATED,
-m4_defun(_LT_GENERATED_FILE_INIT,AS_INIT_GENERATED($@)),
-m4_defun(_LT_GENERATED_FILE_INIT,
-m4_require(AS_PREPARE)dnl
-m4_pushdef(AS_MESSAGE_LOG_FD)dnl
-lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test 0 = "$lt_write_fail" && chmod +x $1dnl
-m4_popdef(AS_MESSAGE_LOG_FD)))# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN(LT_OUTPUT,
-: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE(creating $CONFIG_LT)
-_LT_GENERATED_FILE_INIT("$CONFIG_LT",
-# Run this file to recreate a libtool stub with the current configuration.)
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX(Running $as_me.)
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-'$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $0 OPTIONS
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset(AC_PACKAGE_NAME, AC_PACKAGE_NAME )config.ltdnl
-m4_ifset(AC_PACKAGE_VERSION,  AC_PACKAGE_VERSION)
-configured by $0, generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test 0 != $#
-do
-  case $1 in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR(unrecognized option: $1
-Try '$0 --help' for more information.) ;;
-
-    *) AC_MSG_ERROR(unrecognized argument: $1
-Try '$0 --help' for more information.) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE(creating $ofile)
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test yes = "$silent" &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-)# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun(_LT_CONFIG,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-_LT_CONFIG_SAVE_COMMANDS(
-  m4_define(_LT_TAG, m4_if($1, , C, $1))dnl
-  m4_if(_LT_TAG, C, 
-    # See if we are running on zsh, and set the options that allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}"; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile=${ofile}T
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-# Generated automatically by $as_me ($PACKAGE) $VERSION
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit, 1996
-
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-    cat <<'_LT_EOF' >> "$cfgfile"
-
-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_PREPARE_MUNGE_PATH_LIST
-_LT_PREPARE_CC_BASENAME
-
-# ### END FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test set != "${COLLECT_NAMES+set}"; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-,
-cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-)dnl /m4_if
-,
-m4_if($1, , 
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    RM='$RM'
-    ofile='$ofile', )
-)dnl /_LT_CONFIG_SAVE_COMMANDS
-)# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN(LT_SUPPORTED_TAG, )
-
-
-# C support is built-in for now
-m4_define(_LT_LANG_C_enabled, )
-m4_define(_LT_TAGS, )
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN(LT_LANG,
-AC_BEFORE($0, LT_OUTPUT)dnl
-m4_case($1,
-  C,			_LT_LANG(C),
-  C++,		_LT_LANG(CXX),
-  Go,			_LT_LANG(GO),
-  Java,		_LT_LANG(GCJ),
-  Fortran 77,		_LT_LANG(F77),
-  Fortran,		_LT_LANG(FC),
-  Windows Resource,	_LT_LANG(RC),
-  m4_ifdef(_LT_LANG_$1_CONFIG,
-    _LT_LANG($1),
-    m4_fatal($0: unsupported language: "$1")))dnl
-)# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun(_LT_LANG,
-m4_ifdef(_LT_LANG_$1_enabled, ,
-  LT_SUPPORTED_TAG($1)dnl
-  m4_append(_LT_TAGS, $1 )dnl
-  m4_define(_LT_LANG_$1_enabled, )dnl
-  _LT_LANG_$1_CONFIG($1))dnl
-)# _LT_LANG
-
-
-m4_ifndef(AC_PROG_GO, 
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-m4_defun(AC_PROG_GO,
-AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR(GOC,     Go compiler command)dnl
-AC_ARG_VAR(GOFLAGS, Go compiler flags)dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, ${ac_tool_prefix}gccgo, ${ac_tool_prefix}gccgo)
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-)#m4_defun
-)#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun(_LT_LANG_DEFAULT_CONFIG,
-AC_PROVIDE_IFELSE(AC_PROG_CXX,
-  LT_LANG(CXX),
-  m4_define(AC_PROG_CXX, defn(AC_PROG_CXX)LT_LANG(CXX)))
-
-AC_PROVIDE_IFELSE(AC_PROG_F77,
-  LT_LANG(F77),
-  m4_define(AC_PROG_F77, defn(AC_PROG_F77)LT_LANG(F77)))
-
-AC_PROVIDE_IFELSE(AC_PROG_FC,
-  LT_LANG(FC),
-  m4_define(AC_PROG_FC, defn(AC_PROG_FC)LT_LANG(FC)))
-
-dnl The call to AM_PROG_GCJ is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE(AC_PROG_GCJ,
-  LT_LANG(GCJ),
-  AC_PROVIDE_IFELSE(AM_PROG_GCJ,
-    LT_LANG(GCJ),
-    AC_PROVIDE_IFELSE(LT_PROG_GCJ,
-      LT_LANG(GCJ),
-      m4_ifdef(AC_PROG_GCJ,
-	m4_define(AC_PROG_GCJ, defn(AC_PROG_GCJ)LT_LANG(GCJ)))
-       m4_ifdef(AM_PROG_GCJ,
-	m4_define(AM_PROG_GCJ, defn(AM_PROG_GCJ)LT_LANG(GCJ)))
-       m4_ifdef(LT_PROG_GCJ,
-	m4_define(LT_PROG_GCJ, defn(LT_PROG_GCJ)LT_LANG(GCJ))))))
-
-AC_PROVIDE_IFELSE(AC_PROG_GO,
-  LT_LANG(GO),
-  m4_define(AC_PROG_GO, defn(AC_PROG_GO)LT_LANG(GO)))
-
-AC_PROVIDE_IFELSE(LT_PROG_RC,
-  LT_LANG(RC),
-  m4_define(LT_PROG_RC, defn(LT_PROG_RC)LT_LANG(RC)))
-)# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN(AC_LIBTOOL_CXX, LT_LANG(C++))
-AU_DEFUN(AC_LIBTOOL_F77, LT_LANG(Fortran 77))
-AU_DEFUN(AC_LIBTOOL_FC, LT_LANG(Fortran))
-AU_DEFUN(AC_LIBTOOL_GCJ, LT_LANG(Java))
-AU_DEFUN(AC_LIBTOOL_RC, LT_LANG(Windows Resource))
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_CXX, )
-dnl AC_DEFUN(AC_LIBTOOL_F77, )
-dnl AC_DEFUN(AC_LIBTOOL_FC, )
-dnl AC_DEFUN(AC_LIBTOOL_GCJ, )
-dnl AC_DEFUN(AC_LIBTOOL_RC, )
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun(_LT_TAG_COMPILER,
-AC_REQUIRE(AC_PROG_CC)dnl
-
-_LT_DECL(LTCC, CC, 1, A C compiler)dnl
-_LT_DECL(LTCFLAGS, CFLAGS, 1, LTCC compiler flags)dnl
-_LT_TAGDECL(CC, compiler, 1, A language specific compiler)dnl
-_LT_TAGDECL(with_gcc, GCC, 0, Is the compiler the GNU compiler?)dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-)# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun(_LT_COMPILER_BOILERPLATE,
-m4_require(_LT_DECL_SED)dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-)# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun(_LT_LINKER_BOILERPLATE,
-m4_require(_LT_DECL_SED)dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-)# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once(_LT_REQUIRED_DARWIN_CHECKS,
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL(DSYMUTIL, dsymutil, :)
-    AC_CHECK_TOOL(NMEDIT, nmedit, :)
-    AC_CHECK_TOOL(LIPO, lipo, :)
-    AC_CHECK_TOOL(OTOOL, otool, :)
-    AC_CHECK_TOOL(OTOOL64, otool64, :)
-    _LT_DECL(, DSYMUTIL, 1,
-      Tool to manipulate archived DWARF debug symbol files on Mac OS X)
-    _LT_DECL(, NMEDIT, 1,
-      Tool to change global to local symbols on Mac OS X)
-    _LT_DECL(, LIPO, 1,
-      Tool to manipulate fat objects and archives on Mac OS X)
-    _LT_DECL(, OTOOL, 1,
-      ldd/readelf like tool for Mach-O binaries on Mac OS X)
-    _LT_DECL(, OTOOL64, 1,
-      ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4)
-
-    AC_CACHE_CHECK(for -single_module linker flag,lt_cv_apple_cc_single_mod,
-      lt_cv_apple_cc_single_mod=no
-      if test -z "$LT_MULTI_MODULE"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi)
-
-    AC_CACHE_CHECK(for -exported_symbols_list linker flag,
-      lt_cv_ld_exported_symbols_list,
-      lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
-	lt_cv_ld_exported_symbols_list=yes,
-	lt_cv_ld_exported_symbols_list=no)
-	LDFLAGS=$save_LDFLAGS
-    )
-
-    AC_CACHE_CHECK(for -force_load linker flag,lt_cv_ld_force_load,
-      lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    )
-    case $host_os in
-    rhapsody* | darwin1.012)
-      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin91*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.012,.*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test yes = "$lt_cv_apple_cc_single_mod"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test yes = "$lt_cv_ld_exported_symbols_list"; then
-      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
-    fi
-    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-)
-
-
-# _LT_DARWIN_LINKER_FEATURES(TAG)
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun(_LT_DARWIN_LINKER_FEATURES,
-
-  m4_require(_LT_REQUIRED_DARWIN_CHECKS)
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test yes = "$lt_cv_ld_force_load"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case($1, F77, _LT_TAGVAR(compiler_needs_object, $1)=yes,
-                  FC,  _LT_TAGVAR(compiler_needs_object, $1)=yes)
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
-  case $cc_basename in
-     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test yes = "$_lt_dar_can_shared"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-    m4_if($1, CXX,
-   if test yes != "$lt_cv_apple_cc_single_mod"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
-    fi
-,)
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-)
-
-# _LT_SYS_MODULE_PATH_AIX(TAGNAME)
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun(_LT_SYS_MODULE_PATH_AIX,
-m4_require(_LT_DECL_SED)dnl
-if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL(_LT_TAGVAR(lt_cv_aix_libpath_, $1),
-  AC_LINK_IFELSE(AC_LANG_PROGRAM,
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *$^ *$ *$/\1/
-	      p
-	  }
-      }'
-  _LT_TAGVAR(lt_cv_aix_libpath_, $1)=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR(lt_cv_aix_libpath_, $1)"; then
-    _LT_TAGVAR(lt_cv_aix_libpath_, $1)=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi,)
-  if test -z "$_LT_TAGVAR(lt_cv_aix_libpath_, $1)"; then
-    _LT_TAGVAR(lt_cv_aix_libpath_, $1)=/usr/lib:/lib
-  fi
-  )
-  aix_libpath=$_LT_TAGVAR(lt_cv_aix_libpath_, $1)
-fi
-)# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define(_LT_SHELL_INIT,
-m4_divert_text(M4SH-INIT, $1
-))# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script that will find a shell with a builtin
-# printf (that we can use as an echo command).
-m4_defun(_LT_PROG_ECHO_BACKSLASH,
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING(how to print strings)
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-case $ECHO in
-  printf*) AC_MSG_RESULT(printf) ;;
-  print*) AC_MSG_RESULT(print -r) ;;
-  *) AC_MSG_RESULT(cat) ;;
-esac
-
-m4_ifdef(_AS_DETECT_SUGGESTED,
-_AS_DETECT_SUGGESTED(
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )))
-
-_LT_DECL(, SHELL, 1, Shell to use when invoking shell scripts)
-_LT_DECL(, ECHO, 1, An echo program that protects backslashes)
-)# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN(_LT_WITH_SYSROOT,
-AC_MSG_CHECKING(for sysroot)
-AC_ARG_WITH(sysroot,
-AS_HELP_STRING(--with-sysroot@<:@=DIR@:>@,
-  Search for dependent libraries within DIR (or the compiler's sysroot
-   if not specified).),
-, with_sysroot=no)
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case $with_sysroot in #(
- yes)
-   if test yes = "$GCC"; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT($with_sysroot)
-   AC_MSG_ERROR(The sysroot must be an absolute path.)
-   ;;
-esac
-
- AC_MSG_RESULT(${lt_sysroot:-no})
-_LT_DECL(, lt_sysroot, 0, The root where to search for dnl
-dependent libraries, and where our libraries should be installed.))
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun(_LT_ENABLE_LOCK,
-AC_ARG_ENABLE(libtool-lock,
-  AS_HELP_STRING(--disable-libtool-lock,
-    avoid locking (might break parallel builds)))
-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out what ABI is being produced by ac_compile, and set mode
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE=32
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE=64
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-mips64*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
-      *32-bit*)
-	emul="${emul}32"
-	;;
-      *64-bit*)
-	emul="${emul}64"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *MSB*)
-	emul="${emul}btsmip"
-	;;
-      *LSB*)
-	emul="${emul}ltsmip"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *N32*)
-	emul="${emul}n32"
-	;;
-    esac
-    LD="${LD-ld} -m $emul"
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.  Note that the listed cases only cover the
-  # situations where additional linker options are needed (such as when
-  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
-  # vice versa); the common cases where no linker options are needed do
-  # not appear in the list.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK(whether the C compiler needs -belf, lt_cv_cc_needs_belf,
-    AC_LANG_PUSH(C)
-     AC_LINK_IFELSE(AC_LANG_PROGRAM(,),lt_cv_cc_needs_belf=yes,lt_cv_cc_needs_belf=no)
-     AC_LANG_POP)
-  if test yes != "$lt_cv_cc_needs_belf"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS=$SAVE_CFLAGS
-  fi
-  ;;
-*-*solaris*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*|x86_64-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD=${LD-ld}_sol2
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks=$enable_libtool_lock
-)# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun(_LT_PROG_AR,
-AC_CHECK_TOOLS(AR, ar, false)
-: ${AR=ar}
-: ${AR_FLAGS=cr}
-_LT_DECL(, AR, 1, The archiver)
-_LT_DECL(, AR_FLAGS, 1, Flags to create an archive)
-
-AC_CACHE_CHECK(for archiver @FILE support, lt_cv_ar_at_file,
-  lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE(AC_LANG_PROGRAM,
-     echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL(lt_ar_try)
-      if test 0 -eq "$ac_status"; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL(lt_ar_try)
-	if test 0 -ne "$ac_status"; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     )
-  )
-
-if test no = "$lt_cv_ar_at_file"; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL(, archiver_list_spec, 1,
-  How to feed a file listing to the archiver)
-)# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun(_LT_CMD_OLD_ARCHIVE,
-_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL(, STRIP, 1, A symbol stripping program)
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL(, RANLIB, 1,
-    Commands used to install an old-style archive)
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  bitrig* | openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL(, old_postinstall_cmds, 2)
-_LT_DECL(, old_postuninstall_cmds, 2)
-_LT_TAGDECL(, old_archive_cmds, 2,
-    Commands used to build an old-style archive)
-_LT_DECL(, lock_old_archive_extraction, 0,
-    Whether to use a lock for old archive extraction)
-)# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		OUTPUT-FILE, ACTION-SUCCESS, ACTION-FAILURE)
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN(_LT_COMPILER_OPTION,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_SED)dnl
-AC_CACHE_CHECK($1, $2,
-  $2=no
-   m4_if($4, , ac_outfile=conftest.$ac_objext, ac_outfile=$4)
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-)
-
-if test yes = "$$2"; then
-    m4_if($5, , :, $5)
-else
-    m4_if($6, , :, $6)
-fi
-)# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_COMPILER_OPTION, _LT_COMPILER_OPTION)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_COMPILER_OPTION, )
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  ACTION-SUCCESS, ACTION-FAILURE)
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN(_LT_LINKER_OPTION,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_SED)dnl
-AC_CACHE_CHECK($1, $2,
-  $2=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-)
-
-if test yes = "$$2"; then
-    m4_if($4, , :, $4)
-else
-    m4_if($5, , :, $5)
-fi
-)# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_LINKER_OPTION, _LT_LINKER_OPTION)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_LINKER_OPTION, )
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN(LT_CMD_MAX_LEN,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING(the maximum length of command line arguments)
-AC_CACHE_VAL(lt_cv_sys_max_cmd_len, dnl
-  i=0
-  teststring=ABCD
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-)
-if test -n "$lt_cv_sys_max_cmd_len"; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL(, max_cmd_len, 0,
-    What is the maximum length of a command?)
-)# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_SYS_MAX_CMD_LEN, LT_CMD_MAX_LEN)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_SYS_MAX_CMD_LEN, )
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun(_LT_HEADER_DLFCN,
-AC_CHECK_HEADERS(dlfcn.h, , , AC_INCLUDES_DEFAULT)dnl
-)# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun(_LT_TRY_DLOPEN_SELF,
-m4_require(_LT_HEADER_DLFCN)dnl
-if test yes = "$cross_compiling"; then :
-  $4
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-)# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN(LT_SYS_DLOPEN_SELF,
-m4_require(_LT_HEADER_DLFCN)dnl
-if test yes != "$enable_dlopen"; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen=load_add_on
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen=LoadLibrary
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-    # if libdl is installed we need to link against it
-    AC_CHECK_LIB(dl, dlopen,
-		lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl,
-    lt_cv_dlopen=dyld
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    )
-    ;;
-
-  tpf*)
-    # Don't try to run any link tests for TPF.  We know it's impossible
-    # because TPF is a cross-compiler, and we know how we open DSOs.
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=no
-    ;;
-
-  *)
-    AC_CHECK_FUNC(shl_load,
-	  lt_cv_dlopen=shl_load,
-      AC_CHECK_LIB(dld, shl_load,
-	    lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld,
-	AC_CHECK_FUNC(dlopen,
-	      lt_cv_dlopen=dlopen,
-	  AC_CHECK_LIB(dl, dlopen,
-		lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl,
-	    AC_CHECK_LIB(svld, dlopen,
-		  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld,
-	      AC_CHECK_LIB(dld, dld_link,
-		    lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld)
-	      )
-	    )
-	  )
-	)
-      )
-    ;;
-  esac
-
-  if test no = "$lt_cv_dlopen"; then
-    enable_dlopen=no
-  else
-    enable_dlopen=yes
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS=$CPPFLAGS
-    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS=$LDFLAGS
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS=$LIBS
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK(whether a program can dlopen itself,
-	  lt_cv_dlopen_self, dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    )
-
-    if test yes = "$lt_cv_dlopen_self"; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK(whether a statically linked program can dlopen itself,
-	  lt_cv_dlopen_self_static, dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      )
-    fi
-
-    CPPFLAGS=$save_CPPFLAGS
-    LDFLAGS=$save_LDFLAGS
-    LIBS=$save_LIBS
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL(dlopen_support, enable_dlopen, 0,
-	 Whether dlopen is supported)
-_LT_DECL(dlopen_self, enable_dlopen_self, 0,
-	 Whether dlopen of programs is supported)
-_LT_DECL(dlopen_self_static, enable_dlopen_self_static, 0,
-	 Whether dlopen of statically linked programs is supported)
-)# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_DLOPEN_SELF, LT_SYS_DLOPEN_SELF)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, )
-
-
-# _LT_COMPILER_C_O(TAGNAME)
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun(_LT_COMPILER_C_O,
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_TAG_COMPILER)dnl
-AC_CACHE_CHECK(if $compiler supports -c -o file.$ac_objext,
-  _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1),
-  _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-)
-_LT_TAGDECL(compiler_c_o, lt_cv_prog_compiler_c_o, 1,
-	Does compiler simultaneously support -c and -o options?)
-)# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS(TAGNAME)
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun(_LT_COMPILER_FILE_LOCKS,
-m4_require(_LT_ENABLE_LOCK)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-_LT_COMPILER_C_O($1)
-
-hard_links=nottested
-if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING(if we can lock with hard links)
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT($hard_links)
-  if test no = "$hard_links"; then
-    AC_MSG_WARN('$CC' does not support '-c -o', so 'make -j' may be unsafe)
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL(, need_locks, 1, Must we lock files when doing compilation?)
-)# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun(_LT_CHECK_OBJDIR,
-AC_CACHE_CHECK(for objdir, lt_cv_objdir,
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null)
-objdir=$lt_cv_objdir
-_LT_DECL(, objdir, 0,
-         The name of the directory that contains temporary libtool files)dnl
-m4_pattern_allow(LT_OBJDIR)dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  Define to the sub-directory where libtool stores uninstalled libraries.)
-)# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH(TAGNAME)
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun(_LT_LINKER_HARDCODE_LIBPATH,
-AC_MSG_CHECKING(how to hardcode library paths into programs)
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
-
-  # We can hardcode non-existent directories.
-  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
-     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT($_LT_TAGVAR(hardcode_action, $1))
-
-if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
-   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
-     test no = "$enable_shared"; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL(, hardcode_action, 0,
-    How to hardcode a shared library path into an executable)
-)# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun(_LT_CMD_STRIPLIB,
-m4_require(_LT_DECL_EGREP)
-striplib=
-old_striplib=
-AC_MSG_CHECKING(whether stripping libraries is possible)
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT(yes)
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-  esac
-fi
-_LT_DECL(, old_striplib, 1, Commands to strip libraries)
-_LT_DECL(, striplib, 1)
-)# _LT_CMD_STRIPLIB
-
-
-# _LT_PREPARE_MUNGE_PATH_LIST
-# ---------------------------
-# Make sure func_munge_path_list() is defined correctly.
-m4_defun(_LT_PREPARE_MUNGE_PATH_LIST,
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR:DIR:"
-#       string "DIR DIR" will be prepended to VARIABLE
-# ":DIR:DIR"
-#       string "DIR DIR" will be appended to VARIABLE
-# "DIRP:DIRP::DIRA:DIRA"
-#       string "DIRP DIRP" will be prepended to VARIABLE and string
-#       "DIRA DIRA" will be appended to VARIABLE
-# "DIR:DIR"
-#       VARIABLE will be replaced by "DIR DIR"
-func_munge_path_list ()
-{
-    case x@S|@2 in
-    x)
-        ;;
-    *:)
-        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
-        ;;
-    x:*)
-        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
-        ;;
-    *)
-        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-)# _LT_PREPARE_PATH_LIST
-
-
-# _LT_SYS_DYNAMIC_LINKER(TAG)
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun(_LT_SYS_DYNAMIC_LINKER,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_OBJDUMP)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_CHECK_SHELL_FEATURES)dnl
-m4_require(_LT_PREPARE_MUNGE_PATH_LIST)dnl
-AC_MSG_CHECKING(dynamic linker characteristics)
-m4_if($1,
-	, 
-if test yes = "$GCC"; then
-  case $host_os in
-    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
-    *) lt_awk_arg='/^libraries:/' ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq='s|=$A-Za-z:$|\1|g' ;;
-    *) lt_sed_strip_eq='s|=/|/|g' ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary...
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  # ...but if some path component already ends with the multilib dir we assume
-  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
-  case "$lt_multi_os_dir; $lt_search_path_spec " in
-  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
-    lt_multi_os_dir=
-    ;;
-  esac
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
-    elif test -n "$lt_multi_os_dir"; then
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS = " "; FS = "/|\n";} {
-  lt_foo = "";
-  lt_count = 0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo = "/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freqlt_foo++; }
-  if (lt_freqlt_foo == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's|/$A-Za-z:$|\1|g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi)
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=.so
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-AC_ARG_VAR(LT_SYS_LIBRARY_PATH,
-User-defined run-time library search path.)
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='$libname$release$shared_ext$major'
-  ;;
-
-aix4-9*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test ia64 = "$host_cpu"; then
-    # AIX 5 supports IA64
-    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line '#! .'.  This would cause the generated library to
-    # depend on '.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.01 | aix4.01.*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # Using Import Files as archive members, it is possible to support
-    # filename-based versioning of shared library archives on AIX. While
-    # this would work for both with and without runtime linking, it will
-    # prevent static linking of such archives. So we do filename-based
-    # shared library versioning with .so extension only, which is used
-    # when both runtime linking and shared linking is enabled.
-    # Unfortunately, runtime linking may impact performance, so we do
-    # not want this to be the default eventually. Also, we use the
-    # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
-    # To allow for filename-based versioning support, we need to create
-    # libNAME.so.V as an archive file, containing:
-    # *) an Import File, referring to the versioned filename of the
-    #    archive as well as the shared archive member, telling the
-    #    bitwidth (32 or 64) of that shared object, and providing the
-    #    list of exported symbols of that shared object, eventually
-    #    decorated with the 'weak' keyword
-    # *) the shared object with the F_LOADONLY flag set, to really avoid
-    #    it being seen by the linker.
-    # At run time we better use the real file rather than another symlink,
-    # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
-    case $with_aix_soname,$aix_use_runtimelinking in
-    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    aix,yes) # traditional libtool
-      dynamic_linker='AIX unversionable lib.so'
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      ;;
-    aix,no) # traditional AIX only
-      dynamic_linker='AIX lib.a(lib.so.V)'
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      ;;
-    svr4,*) # full svr4 only
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,yes) # both, prefer svr4
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # unpreferred sharedlib libNAME.a needs extra handling
-      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
-      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,no) # both, prefer aix
-      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
-      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
-      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
-      ;;
-    esac
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='$libname$shared_ext'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi45*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
-m4_if($1, ,
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api")
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
-    library_names_spec='$libname.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec=$LIB
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';c-zC-Z:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$major$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if($1, ,
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib")
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd23.*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      soname_spec='$libname$release$shared_ext$major'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.2-9* | freebsdelf3.2-9* | \
-  freebsd4.0-5 | freebsdelf4.0-5 | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    if test 32 = "$HPUX_IA64_MODE"; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
-    fi
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix3-9*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test yes = "$lt_cv_prog_gnu_ld"; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
-  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-linux*android*)
-  version_type=none # Android doesn't support versioned libraries.
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext'
-  soname_spec='$libname$release$shared_ext'
-  finish_cmds=
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  dynamic_linker='Android linker'
-  # Don't embed -rpath directories since the linker doesn't support them.
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL(lt_cv_shlibpath_overrides_runpath,
-    lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
-      AS_IF( ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null,
-	 lt_cv_shlibpath_overrides_runpath=yes))
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    )
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Ideally, we could use ldconfig to report *all* directores which are
-  # searched for libraries, however this is still not possible.  Aside from not
-  # being certain /sbin/ldconfig is available, command
-  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
-  # even though it is searched at run-time.  Try to do the best guess by
-  # appending ld.so.conf contents (and includes) to the search path.
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd* | bitrig*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec=/usr/lib
-  need_lib_prefix=no
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    need_version=no
-  else
-    need_version=yes
-  fi
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-  # OS/2 can only load a DLL with a base name of 8 characters or less.
-  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
-  library_names_spec='${libname}_dll.$libext'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=BEGINLIBPATH
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  postinstall_cmds='base_file=`basename \$file`~
-    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
-    dldir=$destdir/`dirname \$dlpath`~
-    test -d \$dldir || mkdir -p \$dldir~
-    $install_prog $dir/$dlname \$dldir/$dlname~
-    chmod a+x \$dldir/$dlname~
-    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-    fi'
-  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
-    dlpath=$dir/\$dldll~
-    $RM \$dlpath'
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test yes = "$with_gnu_ld"; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec; then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
-    soname_spec='$libname$shared_ext.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=sco
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test yes = "$with_gnu_ld"; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT($dynamic_linker)
-test no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-_LT_DECL(, variables_saved_for_relink, 1,
-    Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time)
-_LT_DECL(, need_lib_prefix, 0,
-    Do we need the "lib" prefix for modules?)
-_LT_DECL(, need_version, 0, Do we need a version for libraries?)
-_LT_DECL(, version_type, 0, Library versioning type)
-_LT_DECL(, runpath_var, 0,  Shared library runtime path variable)
-_LT_DECL(, shlibpath_var, 0,Shared library path variable)
-_LT_DECL(, shlibpath_overrides_runpath, 0,
-    Is shlibpath searched before the hard-coded library search path?)
-_LT_DECL(, libname_spec, 1, Format of library name prefix)
-_LT_DECL(, library_names_spec, 1,
-    List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME)
-_LT_DECL(, soname_spec, 1,
-    The coded name of the library, if different from the real name)
-_LT_DECL(, install_override_mode, 1,
-    Permission mode override for installation of shared libraries)
-_LT_DECL(, postinstall_cmds, 2,
-    Command to use after installation of a shared archive)
-_LT_DECL(, postuninstall_cmds, 2,
-    Command to use after uninstallation of a shared archive)
-_LT_DECL(, finish_cmds, 2,
-    Commands used to finish a libtool library installation in a directory)
-_LT_DECL(, finish_eval, 1,
-    As "finish_cmds", except a single script fragment to be evaled but
-    not shown)
-_LT_DECL(, hardcode_into_libs, 0,
-    Whether we should hardcode library paths into libraries)
-_LT_DECL(, sys_lib_search_path_spec, 2,
-    Compile-time system search path for libraries)
-_LT_DECL(sys_lib_dlsearch_path_spec, configure_time_dlsearch_path, 2,
-    Detected run-time system search path for libraries)
-_LT_DECL(, configure_time_lt_sys_library_path, 2,
-    Explicit LT_SYS_LIBRARY_PATH set during ./configure time)
-)# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program that can recognize shared library
-AC_DEFUN(_LT_PATH_TOOL_PREFIX,
-m4_require(_LT_DECL_EGREP)dnl
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-case $MAGIC_CMD in
-\\/* |  ?:\\/*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if($2, , $PATH, $2)"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$1"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac)
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL(, MAGIC_CMD, 0,
-	 Used to examine libraries when file_magic_cmd begins with "file")dnl
-)# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS(AC_PATH_TOOL_PREFIX, _LT_PATH_TOOL_PREFIX)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_PATH_TOOL_PREFIX, )
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program that can recognize a shared library
-m4_defun(_LT_PATH_MAGIC,
-_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-)# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN(LT_PATH_LD,
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_CANONICAL_BUILD)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_PROG_ECHO_BACKSLASH)dnl
-
-AC_ARG_WITH(gnu-ld,
-    AS_HELP_STRING(--with-gnu-ld,
-	assume the C compiler uses GNU ld @<:@default=no@:>@),
-    test no = "$withval" || with_gnu_ld=yes,
-    with_gnu_ld=no)dnl
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING(for ld used by $CC)
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    \\/* | ?:\\/*)
-      re_direlt='/^/^/*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  AC_MSG_CHECKING(for GNU ld)
-else
-  AC_MSG_CHECKING(for non-GNU ld)
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi)
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR(no acceptable ld found in \$PATH)
-_LT_PATH_LD_GNU
-AC_SUBST(LD)
-
-_LT_TAGDECL(, LD, 1, The linker used to build libraries)
-)# LT_PATH_LD
-
-# Old names:
-AU_ALIAS(AM_PROG_LD, LT_PATH_LD)
-AU_ALIAS(AC_PROG_LD, LT_PATH_LD)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_PROG_LD, )
-dnl AC_DEFUN(AC_PROG_LD, )
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun(_LT_PATH_LD_GNU,
-AC_CACHE_CHECK(if the linker ($LD) is GNU ld, lt_cv_prog_gnu_ld,
-# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac)
-with_gnu_ld=$lt_cv_prog_gnu_ld
-)# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun(_LT_CMD_RELOAD,
-AC_CACHE_CHECK(for $LD option to reload object files,
-  lt_cv_ld_reload_flag,
-  lt_cv_ld_reload_flag='-r')
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test yes != "$GCC"; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_TAGDECL(, reload_flag, 1, How to create reloadable object files)dnl
-_LT_TAGDECL(, reload_cmds, 2)dnl
-)# _LT_CMD_RELOAD
-
-
-# _LT_PATH_DD
-# -----------
-# find a working dd
-m4_defun(_LT_PATH_DD,
-AC_CACHE_CHECK(for a working dd, ac_cv_path_lt_DD,
-printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-: ${lt_DD:=$DD}
-AC_PATH_PROGS_FEATURE_CHECK(lt_DD, dd,
-if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
-fi)
-rm -f conftest.i conftest2.i conftest.out)
-)# _LT_PATH_DD
-
-
-# _LT_CMD_TRUNCATE
-# ----------------
-# find command to truncate a binary pipe
-m4_defun(_LT_CMD_TRUNCATE,
-m4_require(_LT_PATH_DD)
-AC_CACHE_CHECK(how to truncate binary pipes, lt_cv_truncate_bin,
-printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-lt_cv_truncate_bin=
-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
-fi
-rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q")
-_LT_DECL(lt_truncate_bin, lt_cv_truncate_bin, 1,
-  Command to truncate a binary pipe)
-)# _LT_CMD_TRUNCATE
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun(_LT_CHECK_MAGIC_METHOD,
-m4_require(_LT_DECL_EGREP)
-m4_require(_LT_DECL_OBJDUMP)
-AC_CACHE_CHECK(how to recognize dependent libraries,
-lt_cv_deplibs_check_method,
-lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# 'unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic regex' -- check by looking for files in library path
-# that responds to the $file_magic_cmd with a given extended regex.
-# If you have 'file' or equivalent on your system and you're not sure
-# whether 'pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4-9*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi45*)
-  lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF -0-90-9)(-bit)?( LMSB)? shared object( file)?, -* PA-RISC 0-9\.0-9'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9\.0-9) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix3-9*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd* | bitrig*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib) M0-90-9* Version 0-9'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit LMSB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF 0-90-9*-bit LMSB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-os2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-)
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/\1\/\1\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL(, deplibs_check_method, 1,
-    Method to check whether dependent libraries are shared objects)
-_LT_DECL(, file_magic_cmd, 1,
-    Command to use when deplibs_check_method = "file_magic")
-_LT_DECL(, file_magic_glob, 1,
-    How to find potential files when deplibs_check_method = "file_magic")
-_LT_DECL(, want_nocaseglob, 1,
-    Find potential files using nocaseglob when deplibs_check_method = "file_magic")
-)# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN(LT_PATH_NM,
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_CACHE_CHECK(for BSD- or MS-compatible name lister (nm), lt_cv_path_NM,
-if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM=$NM
-else
-  lt_nm_to_check=${ac_tool_prefix}nm
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
-	case $build_os in
-	mingw*) lt_bad_file=conftest.nm/nofile ;;
-	*) lt_bad_file=/dev/null ;;
-	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
-	*$lt_bad_file* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS=$lt_save_ifs
-  done
-  : ${lt_cv_path_NM=no}
-fi)
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, dumpbin "link -dump", :)
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST(DUMPBIN)
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST(NM)
-_LT_DECL(, NM, 1, A BSD- or MS-compatible name lister)dnl
-
-AC_CACHE_CHECK(the name lister ($NM) interface, lt_cv_nm_interface,
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*)
-)# LT_PATH_NM
-
-# Old names:
-AU_ALIAS(AM_PROG_NM, LT_PATH_NM)
-AU_ALIAS(AC_PROG_NM, LT_PATH_NM)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_PROG_NM, )
-dnl AC_DEFUN(AC_PROG_NM, )
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun(_LT_CHECK_SHAREDLIB_FROM_LINKLIB,
-m4_require(_LT_DECL_EGREP)
-m4_require(_LT_DECL_OBJDUMP)
-m4_require(_LT_DECL_DLLTOOL)
-AC_CACHE_CHECK(how to associate runtime and link libraries,
-lt_cv_sharedlib_from_linklib_cmd,
-lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh;
-  # decide which one to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd=$ECHO
-  ;;
-esac
-)
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL(, sharedlib_from_linklib_cmd, 1,
-    Command to associate shared and link libraries)
-)# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun(_LT_PATH_MANIFEST_TOOL,
-AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK(if $MANIFEST_TOOL is a manifest tool, lt_cv_path_mainfest_tool,
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*)
-if test yes != "$lt_cv_path_mainfest_tool"; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL(, MANIFEST_TOOL, 1, Manifest tool)dnl
-)# _LT_PATH_MANIFEST_TOOL
-
-
-# _LT_DLL_DEF_P(FILE)
-# ---------------------
-# True iff FILE is a Windows DLL '.def' file.
-# Keep in sync with func_dll_def_p in the libtool script
-AC_DEFUN(_LT_DLL_DEF_P,
-dnl
-  test DEF = "`$SED -n dnl
-    -e '\''s/^	 *//'\'' dnl Strip leading whitespace
-    -e '\''/^$;.*$*$/d'\'' dnl      Delete empty lines and comments
-    -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\'' dnl
-    -e q dnl                          Only consider the first "real" line
-    $1`" dnl
-)# _LT_DLL_DEF_P
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN(LT_LIB_M,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM=-lm)
-  ;;
-esac
-AC_SUBST(LIBM)
-)# LT_LIB_M
-
-# Old name:
-AU_ALIAS(AC_CHECK_LIBM, LT_LIB_M)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_CHECK_LIBM, )
-
-
-# _LT_COMPILER_NO_RTTI(TAGNAME)
-# -------------------------------
-m4_defun(_LT_COMPILER_NO_RTTI,
-m4_require(_LT_TAG_COMPILER)dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test yes = "$GCC"; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION(if $compiler supports -fno-rtti -fno-exceptions,
-    lt_cv_prog_compiler_rtti_exceptions,
-    -fno-rtti -fno-exceptions, ,
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions")
-fi
-_LT_TAGDECL(no_builtin_flag, lt_prog_compiler_no_builtin_flag, 1,
-	Compiler flag to turn off builtin functions)
-)# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun(_LT_CMD_GLOBAL_SYMBOLS,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_REQUIRE(AC_PROG_AWK)dnl
-AC_REQUIRE(LT_PATH_NM)dnl
-AC_REQUIRE(LT_PATH_LD)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_TAG_COMPILER)dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING(command to parse $NM output from $compiler object)
-AC_CACHE_VAL(lt_cv_sys_global_symbol_pipe,
-
-# These are sane defaults that work on at least a few old systems.
-# They come from Ultrix.  What could be older than Ultrix?!! ;)
-
-# Character class describing NM global symbol codes.
-symcode='BCDEGRST'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='$_A-Za-z_A-Za-z0-9*$'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='BCDT'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='ABCDGISTW'
-  ;;
-hpux*)
-  if test ia64 = "$host_cpu"; then
-    symcode='ABCDEGRST'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='BCDEGRST'
-  ;;
-osf*)
-  symcode='BCDEGQRST'
-  ;;
-solaris*)
-  symcode='BDRT'
-  ;;
-sco3.2v5*)
-  symcode='DT'
-  ;;
-sysv4.2uw2*)
-  symcode='DT'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='ABDT'
-  ;;
-sysv4)
-  symcode='DFNSTU'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='ABCDGIRSTW' ;;
-esac
-
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
-  # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* $.*$$/  {\"\1\", (void *) 0},/p'"
-  lt_c_name_lib_hook="\
-  -e 's/^I .* $lib.*$$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* $.*$$/  {\"lib\1\", (void *) 0},/p'"
-else
-  # Disable hooks by default.
-  lt_cv_sys_global_symbol_to_import=
-  lt_cdecl_hook=
-  lt_c_name_hook=
-  lt_c_name_lib_hook=
-fi
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
-$lt_cdecl_hook\
-" -e 's/^T .* $.*$$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
-$lt_c_name_hook\
-" -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/p'"
-
-# Transform an extracted symbol line into symbol name with lib prefix and
-# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
-$lt_c_name_lib_hook\
-" -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* $lib.*$$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* $.*$$/  {\"lib\1\", (void *) \&\1},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function,
-    # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
-"     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
-"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn2,2)};"\
-"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
-"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
-"     {if(hidesection) next};"\
-"     {f=\"D\"}; \$ 0~/.*\|/{f=\"T\"};"\
-"     {split(\$ 0,a,/\||\r/); split(a2,s)};"\
-"     s1~/^@?/{print f,s1,s1; next};"\
-"     s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
-    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS=conftstm.$ac_objext
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test yes = "$pipe_works"; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-)
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '@FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL(global_symbol_pipe, lt_cv_sys_global_symbol_pipe, 1,
-    Take the output of nm and produce a listing of raw symbols and C names)
-_LT_DECL(global_symbol_to_cdecl, lt_cv_sys_global_symbol_to_cdecl, 1,
-    Transform the output of nm in a proper C declaration)
-_LT_DECL(global_symbol_to_import, lt_cv_sys_global_symbol_to_import, 1,
-    Transform the output of nm into a list of symbols to manually relocate)
-_LT_DECL(global_symbol_to_c_name_address,
-    lt_cv_sys_global_symbol_to_c_name_address, 1,
-    Transform the output of nm in a C name address pair)
-_LT_DECL(global_symbol_to_c_name_address_lib_prefix,
-    lt_cv_sys_global_symbol_to_c_name_address_lib_prefix, 1,
-    Transform the output of nm in a C name address pair when lib prefix is needed)
-_LT_DECL(nm_interface, lt_cv_nm_interface, 1,
-    The name lister interface)
-_LT_DECL(, nm_file_list_spec, 1,
-    Specify filename containing input files for $NM)
-) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC(TAGNAME)
-# ---------------------------
-m4_defun(_LT_COMPILER_PIC,
-m4_require(_LT_TAG_COMPILER)dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if($1, CXX, 
-  # C++ specific cases for pic, static, wl, etc.
-  if test yes = "$GXX"; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if($1, GCJ, ,
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
-      case $host_os in
-      os2*)
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
-	;;
-      esac
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix3-9*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4-9*)
-	# All AIX code is PIC.
-	if test ia64 = "$host_cpu"; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if($1, GCJ, ,
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
-	    if test ia64 != "$host_cpu"; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64, which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxlcC* | mpixlcC*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-,
-
-  if test yes = "$GCC"; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if($1, GCJ, ,
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
-      case $host_os in
-      os2*)
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix3-9*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      case $cc_basename in
-      nagfor*)
-        # NAG Fortran compiler
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      esac
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if($1, GCJ, ,
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
-      case $host_os in
-      os2*)
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
-	;;
-      esac
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64, which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # flang / f18. f95 an alias for gfortran or flang on Debian
-      flang* | f18* | f95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-        *Intel*\ CF*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-)
-case $host_os in
-  # For platforms that do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if($1,, -DPIC,m4_if($1,CXX, -DPIC,))"
-    ;;
-esac
-
-AC_CACHE_CHECK(for $compiler option to produce PIC,
-  _LT_TAGVAR(lt_cv_prog_compiler_pic, $1),
-  _LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1))
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION(if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works,
-    _LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
-    $_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if($1,, -DPIC,m4_if($1,CXX, -DPIC,)), ,
-    case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac,
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no)
-fi
-_LT_TAGDECL(pic_flag, lt_prog_compiler_pic, 1,
-	Additional compiler flags for building library objects)
-
-_LT_TAGDECL(wl, lt_prog_compiler_wl, 1,
-	How to pass a linker flag through the compiler)
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION(if $compiler static flag $lt_tmp_static_flag works,
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  ,
-  _LT_TAGVAR(lt_prog_compiler_static, $1)=)
-_LT_TAGDECL(link_static_flag, lt_prog_compiler_static, 1,
-	Compiler flag to prevent dynamic linking)
-)# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS(TAGNAME)
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun(_LT_LINKER_SHLIBS,
-AC_REQUIRE(LT_PATH_LD)dnl
-AC_REQUIRE(LT_PATH_NM)dnl
-m4_require(_LT_PATH_MANIFEST_TOOL)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
-m4_require(_LT_TAG_COMPILER)dnl
-AC_MSG_CHECKING(whether the $compiler linker ($LD) supports shared libraries)
-m4_if($1, CXX, 
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
-  case $host_os in
-  aix4-9*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
-    # Without the "-l" option, or with the "-B" option, AIX nm treats
-    # weak defined symbols like other global defined symbols, whereas
-    # GNU nm marks them as "W".
-    # While the 'weak' keyword is ignored in the Export File, we need
-    # it in the Import File for the 'aix-soname' feature, so we have
-    # to replace the "-B" option with "-P" for AIX nm.
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
-      ;;
-    esac
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-, 
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ' (' and ')$', so one must not match beginning or
-  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
-  # as well as any symbol that contains 'd'.
-  _LT_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test yes != "$GCC"; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd* | bitrig*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test yes = "$with_gnu_ld"; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ $GNU\ Binutils$\ 2.19.5*) ;;
-	  *\ $GNU\ Binutils$\ 2.2-9*) ;;
-	  *\ $GNU\ Binutils$\ 3-9*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test yes = "$lt_use_gnu_ld_interface"; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='$wl'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3-9*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test ia64 != "$host_cpu"; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file, use it as
-	# is; otherwise, prepend EXPORTS...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
-          cp $export_symbols $output_objdir/$soname.def;
-        else
-          echo EXPORTS > $output_objdir/$soname.def;
-          cat $export_symbols >> $output_objdir/$soname.def;
-        fi~
-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    interix3-9*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test linux-dietlibc = "$host_os"; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test no = "$tmp_diet"
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-        nagfor*)                        # NAGFOR 5.3
-          tmp_sharedflag='-Wl,-shared' ;;
-	xlcC* | bgxlcC* | mpixlcC*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-
-        if test yes = "$supports_anon_versioning"; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-            echo "local: *; };" >> $output_objdir/$libname.ver~
-            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	tcc*)
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
-	  ;;
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test yes = "$supports_anon_versioning"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-              echo "local: *; };" >> $output_objdir/$libname.ver~
-              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ 01.* | *\ 2.0-9.* | *\ 2.10-5.*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix4-9*)
-      if test ia64 = "$host_cpu"; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
-	# Without the "-l" option, or with the "-B" option, AIX nm treats
-	# weak defined symbols like other global defined symbols, whereas
-	# GNU nm marks them as "W".
-	# While the 'weak' keyword is ignored in the Export File, we need
-	# it in the Import File for the 'aix-soname' feature, so we have
-	# to replace the "-B" option with "-P" for AIX nm.
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# have runtime linking enabled, and use it for executables.
-	# For shared libraries, we enable/disable runtime linking
-	# depending on the kind of the shared library created -
-	# when "with_aix_soname,aix_use_runtimelinking" is:
-	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "aix,yes"  lib.so          shared, rtl:yes, for executables
-	#            lib.a           static archive
-	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
-	#            lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a(lib.so.V) shared, rtl:no
-	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a           static archive
-	case $host_os in aix4.23|aix4.23.*|aix5-9*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	    # so we don't have lib.a shared libs to link our executables.
-	    # We have to force runtime linking in this case.
-	    aix_use_runtimelinking=yes
-	    LDFLAGS="$LDFLAGS -Wl,-brtl"
-	  fi
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
-      case $with_aix_soname,$aix_use_runtimelinking in
-      aix,*) ;; # traditional, no import file
-      svr4,* | *,yes) # use import file
-	# The Import File defines what to hardcode.
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-	;;
-      esac
-
-      if test yes = "$GCC"; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test yes = "$aix_use_runtimelinking"; then
-	  shared_flag="$shared_flag "'$wl-G'
-	fi
-	# Need to ensure runtime linking is disabled for the traditional
-	# shared library, or the linker may eventually find shared libraries
-	# /with/ Import File - we do not want to mix them.
-	shared_flag_aix='-shared'
-	shared_flag_svr4='-shared $wl-G'
-      else
-	# not using gcc
-	if test ia64 = "$host_cpu"; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag='$wl-G'
-	  else
-	    shared_flag='$wl-bM:SRE'
-	  fi
-	  shared_flag_aix='$wl-bM:SRE'
-	  shared_flag_svr4='$wl-G'
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX($1)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-      else
-	if test ia64 = "$host_cpu"; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX($1)
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
-	  if test yes = "$with_gnu_ld"; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	  # -brtl affects multiple linker settings, -berok does not and is overridden later
-	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\$, \$%-berok\\1%g"`'
-	  if test svr4 != "$with_aix_soname"; then
-	    # This is similar to how AIX traditionally builds its shared libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	  fi
-	  if test aix != "$with_aix_soname"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	  else
-	    # used by -dlpreopen to get the symbols
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	  fi
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi45*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
-            cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-          else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-          fi~
-          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-          linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-          lt_tool_outputfile="@TOOL_OUTPUT@"~
-          case $lt_outputfile in
-            *.exe|*.EXE) ;;
-            *)
-              lt_outputfile=$lt_outputfile.exe
-              lt_tool_outputfile=$lt_tool_outputfile.exe
-              ;;
-          esac~
-          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-            $RM "$lt_outputfile.manifest";
-          fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-      ;;
-
-    hpux10*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test no = "$with_gnu_ld"; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, , 
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION(if $CC understands -b,
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), -b,
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags',
-	    _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'),
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags')
-	  ;;
-	esac
-      fi
-      if test no = "$with_gnu_ld"; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK(whether the $host_os linker accepts -exported_symbol,
-	  lt_cv_irix_exported_symbol,
-	  save_LDFLAGS=$LDFLAGS
-	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
-	   AC_LINK_IFELSE(
-	     AC_LANG_SOURCE(
-	        AC_LANG_CASE(C, int foo (void) { return 0; },
-			      C++, int foo (void) { return 0; },
-			      Fortran 77, 
-      subroutine foo
-      end,
-			      Fortran, 
-      subroutine foo
-      end)),
-	      lt_cv_irix_exported_symbol=yes,
-	      lt_cv_irix_exported_symbol=no)
-           LDFLAGS=$save_LDFLAGS)
-	if test yes = "$lt_cv_irix_exported_symbol"; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    linux*)
-      case $cc_basename in
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      esac
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd* | bitrig*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	else
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    osf3*)
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test yes = "$GCC"; then
-	wlarc='$wl'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='$wl'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.0-5 | solaris2.0-5.*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands '-z linker_flag'.  GCC discards it without '$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test yes = "$GCC"; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test sequent = "$host_vendor"; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
-      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We CANNOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test sni = "$host_vendor"; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-)
-AC_MSG_RESULT($_LT_TAGVAR(ld_shlibs, $1))
-test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL(, libext, 0, Old archive suffix (normally "a"))dnl
-_LT_DECL(, shrext_cmds, 1, Shared library suffix (normally ".so"))dnl
-_LT_DECL(, extract_expsyms_cmds, 2,
-    The commands to extract the exported symbol list from a shared archive)
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test yes,yes = "$GCC,$enable_shared"; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK(whether -lc should be explicitly linked in,
-	lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1),
-	$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	)
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL(build_libtool_need_lc, archive_cmds_need_lc, 0,
-    Whether or not to add -lc for building shared libraries)
-_LT_TAGDECL(allow_libtool_libs_with_static_runtimes,
-    enable_shared_with_static_runtimes, 0,
-    Whether or not to disallow shared libs when runtime libs are static)
-_LT_TAGDECL(, export_dynamic_flag_spec, 1,
-    Compiler flag to allow reflexive dlopens)
-_LT_TAGDECL(, whole_archive_flag_spec, 1,
-    Compiler flag to generate shared objects directly from archives)
-_LT_TAGDECL(, compiler_needs_object, 1,
-    Whether the compiler copes with passing no objects directly)
-_LT_TAGDECL(, old_archive_from_new_cmds, 2,
-    Create an old-style archive from a shared archive)
-_LT_TAGDECL(, old_archive_from_expsyms_cmds, 2,
-    Create a temporary old-style archive to link instead of a shared archive)
-_LT_TAGDECL(, archive_cmds, 2, Commands used to build a shared archive)
-_LT_TAGDECL(, archive_expsym_cmds, 2)
-_LT_TAGDECL(, module_cmds, 2,
-    Commands used to build a loadable module if different from building
-    a shared archive.)
-_LT_TAGDECL(, module_expsym_cmds, 2)
-_LT_TAGDECL(, with_gnu_ld, 1,
-    Whether we are building with GNU ld or not)
-_LT_TAGDECL(, allow_undefined_flag, 1,
-    Flag that allows shared libraries with undefined symbols to be built)
-_LT_TAGDECL(, no_undefined_flag, 1,
-    Flag that enforces no undefined symbols)
-_LT_TAGDECL(, hardcode_libdir_flag_spec, 1,
-    Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist)
-_LT_TAGDECL(, hardcode_libdir_separator, 1,
-    Whether we need a single "-rpath" flag with a separated argument)
-_LT_TAGDECL(, hardcode_direct, 0,
-    Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
-    DIR into the resulting binary)
-_LT_TAGDECL(, hardcode_direct_absolute, 0,
-    Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting $shlibpath_var if the
-    library is relocated)
-_LT_TAGDECL(, hardcode_minus_L, 0,
-    Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary)
-_LT_TAGDECL(, hardcode_shlibpath_var, 0,
-    Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary)
-_LT_TAGDECL(, hardcode_automatic, 0,
-    Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it)
-_LT_TAGDECL(, inherit_rpath, 0,
-    Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list)
-_LT_TAGDECL(, link_all_deplibs, 0,
-    Whether libtool must link a program against all its dependency libraries)
-_LT_TAGDECL(, always_export_symbols, 0,
-    Set to "yes" if exported symbols are required)
-_LT_TAGDECL(, export_symbols_cmds, 2,
-    The commands to list exported symbols)
-_LT_TAGDECL(, exclude_expsyms, 1,
-    Symbols that should not be listed in the preloaded symbols)
-_LT_TAGDECL(, include_expsyms, 1,
-    Symbols that must always be exported)
-_LT_TAGDECL(, prelink_cmds, 2,
-    Commands necessary for linking programs (against libraries) with templates)
-_LT_TAGDECL(, postlink_cmds, 2,
-    Commands necessary for finishing linking programs)
-_LT_TAGDECL(, file_list_spec, 1,
-    Specify filename containing input files)
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL(, thread_safe_flag_spec, 1,
-dnl    Compiler flag to generate thread safe objects)
-)# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG(TAG)
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to 'libtool'.
-m4_defun(_LT_LANG_C_CONFIG,
-m4_require(_LT_DECL_EGREP)dnl
-lt_save_CC=$CC
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, ) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report what library types will actually be built
-  AC_MSG_CHECKING(if libtool supports shared libraries)
-  AC_MSG_RESULT($can_build_shared)
-
-  AC_MSG_CHECKING(whether to build shared libraries)
-  test no = "$can_build_shared" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test yes = "$enable_shared" && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix4-9*)
-    if test ia64 != "$host_cpu"; then
-      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-      yes,aix,yes) ;;			# shared object as lib.so file only
-      yes,svr4,*) ;;			# shared object as lib.so archive member only
-      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-      esac
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT($enable_shared)
-
-  AC_MSG_CHECKING(whether to build static libraries)
-  # Make sure either enable_shared or enable_static is yes.
-  test yes = "$enable_shared" || enable_static=yes
-  AC_MSG_RESULT($enable_static)
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC=$lt_save_CC
-)# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG(TAG)
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to 'libtool'.
-m4_defun(_LT_LANG_CXX_CONFIG,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_PATH_MANIFEST_TOOL)dnl
-if test -n "$CXX" && ( test no != "$CXX" &&
-    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
-    (test g++ != "$CXX"))); then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_caught_CXX_error"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME($compiler)
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test yes = "$GXX"; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test yes = "$GXX"; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test yes = "$with_gnu_ld"; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='$wl'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING(whether the $compiler linker ($LD) supports shared libraries)
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix4-9*)
-        if test ia64 = "$host_cpu"; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # have runtime linking enabled, and use it for executables.
-          # For shared libraries, we enable/disable runtime linking
-          # depending on the kind of the shared library created -
-          # when "with_aix_soname,aix_use_runtimelinking" is:
-          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-          # "aix,yes"  lib.so          shared, rtl:yes, for executables
-          #            lib.a           static archive
-          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
-          #            lib.a(lib.so.V) shared, rtl:no,  for executables
-          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-          #            lib.a(lib.so.V) shared, rtl:no
-          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-          #            lib.a           static archive
-          case $host_os in aix4.23|aix4.23.*|aix5-9*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	      # so we don't have lib.a shared libs to link our executables.
-	      # We have to force runtime linking in this case.
-	      aix_use_runtimelinking=yes
-	      LDFLAGS="$LDFLAGS -Wl,-brtl"
-	    fi
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
-        case $with_aix_soname,$aix_use_runtimelinking in
-        aix,*) ;;	# no import file
-        svr4,* | *,yes) # use import file
-          # The Import File defines what to hardcode.
-          _LT_TAGVAR(hardcode_direct, $1)=no
-          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-          ;;
-        esac
-
-        if test yes = "$GXX"; then
-          case $host_os in aix4.012|aix4.012.*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag=$shared_flag' $wl-G'
-	  fi
-	  # Need to ensure runtime linking is disabled for the traditional
-	  # shared library, or the linker may eventually find shared libraries
-	  # /with/ Import File - we do not want to mix them.
-	  shared_flag_aix='-shared'
-	  shared_flag_svr4='-shared $wl-G'
-        else
-          # not using gcc
-          if test ia64 = "$host_cpu"; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test yes = "$aix_use_runtimelinking"; then
-	      shared_flag='$wl-G'
-	    else
-	      shared_flag='$wl-bM:SRE'
-	    fi
-	    shared_flag_aix='$wl-bM:SRE'
-	    shared_flag_svr4='$wl-G'
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          # The "-G" linker flag allows undefined symbols.
-          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX($1)
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-        else
-          if test ia64 = "$host_cpu"; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX($1)
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
-	    if test yes = "$with_gnu_ld"; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	    # -brtl affects multiple linker settings, -berok does not and is overridden later
-	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\$, \$%-berok\\1%g"`'
-	    if test svr4 != "$with_aix_soname"; then
-	      # This is similar to how AIX traditionally builds its shared
-	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
-	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	    fi
-	    if test aix != "$with_aix_soname"; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	    else
-	      # used by -dlpreopen to get the symbols
-	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	    fi
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=.dll
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
-              cp "$export_symbols" "$output_objdir/$soname.def";
-              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-            else
-              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-            fi~
-            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-            linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-            lt_tool_outputfile="@TOOL_OUTPUT@"~
-            case $lt_outputfile in
-              *.exe|*.EXE) ;;
-              *)
-                lt_outputfile=$lt_outputfile.exe
-                lt_tool_outputfile=$lt_tool_outputfile.exe
-                ;;
-            esac~
-            func_to_tool_file "$lt_outputfile"~
-            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-              $RM "$lt_outputfile.manifest";
-            fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file, use it as
-	    # is; otherwise, prepend EXPORTS...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
-              cp $export_symbols $output_objdir/$soname.def;
-            else
-              echo EXPORTS > $output_objdir/$soname.def;
-              cat $export_symbols >> $output_objdir/$soname.def;
-            fi~
-            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      os2*)
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	shrext_cmds=.dll
-	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
-	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
-	  prefix_cmds="$SED"~
-	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	    prefix_cmds="$prefix_cmds -e 1d";
-	  fi~
-	  prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
-	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test yes = "$GXX"; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test no = "$with_gnu_ld"; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test yes = "$GXX"; then
-	      if test no = "$with_gnu_ld"; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix3-9*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test yes = "$GXX"; then
-	      if test no = "$with_gnu_ld"; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ 1-5.* | *pgcpp\ 1-5.*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-                $RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    if test yes = "$supports_anon_versioning"; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-                cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-                echo "local: *; };" >> $output_objdir/$libname.ver~
-                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd* | bitrig*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-                  echo "-hidden">> $lib.exp~
-                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
-                  $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test yes,no = "$GXX,$with_gnu_ld"; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.0-5 | solaris2.0-5.*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands '-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test yes,no = "$GXX,$with_gnu_ld"; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-	      else
-	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
-	      case $host_os in
-		solaris2.0-5 | solaris2.0-5.*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
-      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We CANNOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-              '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-              '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT($_LT_TAGVAR(ld_shlibs, $1))
-    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)=$GXX
-    _LT_TAGVAR(LD, $1)=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test yes != "$_lt_caught_CXX_error"
-
-AC_LANG_POP
-)# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun(_LT_FUNC_STRIPNAME_CNF,dnl
-AC_REQUIRE(_LT_DECL_SED)
-AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)
-func_stripname_cnf ()
-{
-  case @S|@2 in
-  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
-  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
-  esac
-} # func_stripname_cnf
-)# _LT_FUNC_STRIPNAME_CNF
-
-
-# _LT_SYS_HIDDEN_LIBDEPS(TAGNAME)
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun(_LT_SYS_HIDDEN_LIBDEPS,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-AC_REQUIRE(_LT_FUNC_STRIPNAME_CNF)dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if($1, , cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-, $1, CXX, cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-, $1, F77, cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-, $1, FC, cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-, $1, GCJ, cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-, $1, GO, cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-)
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $prev$p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test x-L = "$p" ||
-          test x-R = "$p"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test no = "$pre_test_object_deps_done"; then
-	 case $prev in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)=$prev$p
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test no = "$pre_test_object_deps_done"; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)=$p
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)=$p
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if($1, CXX,
-case $host_os in
-interix3-9*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-esac
-)
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL(, compiler_lib_search_dirs, 1,
-    The directories searched by this compiler when creating a shared library)
-_LT_TAGDECL(, predep_objects, 1,
-    Dependencies to place before and after the objects being linked to
-    create a shared library)
-_LT_TAGDECL(, postdep_objects, 1)
-_LT_TAGDECL(, predeps, 1)
-_LT_TAGDECL(, postdeps, 1)
-_LT_TAGDECL(, compiler_lib_search_path, 1,
-    The library search path used internally by the compiler when linking
-    a shared library)
-)# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG(TAG)
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun(_LT_LANG_F77_CONFIG,
-AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test no = "$F77"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_disable_F77"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME($compiler)
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING(if libtool supports shared libraries)
-    AC_MSG_RESULT($can_build_shared)
-
-    AC_MSG_CHECKING(whether to build shared libraries)
-    test no = "$can_build_shared" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test yes = "$enable_shared" && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix4-9*)
-	if test ia64 != "$host_cpu"; then
-	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-	  yes,aix,yes) ;;		# shared object as lib.so file only
-	  yes,svr4,*) ;;		# shared object as lib.so archive member only
-	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-	  esac
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT($enable_shared)
-
-    AC_MSG_CHECKING(whether to build static libraries)
-    # Make sure either enable_shared or enable_static is yes.
-    test yes = "$enable_shared" || enable_static=yes
-    AC_MSG_RESULT($enable_static)
-
-    _LT_TAGVAR(GCC, $1)=$G77
-    _LT_TAGVAR(LD, $1)=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test yes != "$_lt_disable_F77"
-
-AC_LANG_POP
-)# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG(TAG)
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun(_LT_LANG_FC_CONFIG,
-AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test no = "$FC"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_disable_FC"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME($compiler)
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING(if libtool supports shared libraries)
-    AC_MSG_RESULT($can_build_shared)
-
-    AC_MSG_CHECKING(whether to build shared libraries)
-    test no = "$can_build_shared" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test yes = "$enable_shared" && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix4-9*)
-	if test ia64 != "$host_cpu"; then
-	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-	  yes,aix,yes) ;;		# shared object as lib.so file only
-	  yes,svr4,*) ;;		# shared object as lib.so archive member only
-	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-	  esac
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT($enable_shared)
-
-    AC_MSG_CHECKING(whether to build static libraries)
-    # Make sure either enable_shared or enable_static is yes.
-    test yes = "$enable_shared" || enable_static=yes
-    AC_MSG_RESULT($enable_static)
-
-    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
-    _LT_TAGVAR(LD, $1)=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test yes != "$_lt_disable_FC"
-
-AC_LANG_POP
-)# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG(TAG)
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun(_LT_LANG_GCJ_CONFIG,
-AC_REQUIRE(LT_PROG_GCJ)dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)=$LD
-_LT_CC_BASENAME($compiler)
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-)# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG(TAG)
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun(_LT_LANG_GO_CONFIG,
-AC_REQUIRE(LT_PROG_GO)dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)=$LD
-_LT_CC_BASENAME($compiler)
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-)# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG(TAG)
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun(_LT_LANG_RC_CONFIG,
-AC_REQUIRE(LT_PROG_RC)dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code=$lt_simple_compile_test_code
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME($compiler)
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-)# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN(LT_PROG_GCJ,
-m4_ifdef(AC_PROG_GCJ, AC_PROG_GCJ,
-  m4_ifdef(AM_PROG_GCJ, AM_PROG_GCJ,
-    AC_CHECK_TOOL(GCJ, gcj,)
-      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)))dnl
-)
-
-# Old name:
-AU_ALIAS(LT_AC_PROG_GCJ, LT_PROG_GCJ)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(LT_AC_PROG_GCJ, )
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN(LT_PROG_GO,
-AC_CHECK_TOOL(GOC, gccgo,)
-)
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN(LT_PROG_RC,
-AC_CHECK_TOOL(RC, windres,)
-)
-
-# Old name:
-AU_ALIAS(LT_AC_PROG_RC, LT_PROG_RC)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(LT_AC_PROG_RC, )
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun(_LT_DECL_EGREP,
-AC_REQUIRE(AC_PROG_EGREP)dnl
-AC_REQUIRE(AC_PROG_FGREP)dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL(, GREP, 1, A grep program that handles long lines)
-_LT_DECL(, EGREP, 1, An ERE matcher)
-_LT_DECL(, FGREP, 1, A literal string matcher)
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST(GREP)
-)
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun(_LT_DECL_OBJDUMP,
-AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL(, OBJDUMP, 1, An object symbol dumper)
-AC_SUBST(OBJDUMP)
-)
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun(_LT_DECL_DLLTOOL,
-AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL(, DLLTOOL, 1, DLL creation program)
-AC_SUBST(DLLTOOL)
-)
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun(_LT_DECL_SED,
-AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL(, SED, 1, A sed program that does not truncate output)
-_LT_DECL(, Xsed, "\$SED -e 1s/^X//",
-    Sed that helps us avoid accidentally triggering echo(1) options like -n)
-)# _LT_DECL_SED
-
-m4_ifndef(AC_PROG_SED, 
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-
-m4_defun(AC_PROG_SED,
-AC_MSG_CHECKING(for a sed that does not truncate output)
-AC_CACHE_VAL(lt_cv_path_SED,
-# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f "$lt_ac_sed" && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test 10 -lt "$lt_ac_count" && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test "$lt_ac_count" -gt "$lt_ac_max"; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-)
-SED=$lt_cv_path_SED
-AC_SUBST(SED)
-AC_MSG_RESULT($SED)
-)#AC_PROG_SED
-)#m4_ifndef
-
-# Old name:
-AU_ALIAS(LT_AC_PROG_SED, AC_PROG_SED)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(LT_AC_PROG_SED, )
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun(_LT_CHECK_SHELL_FEATURES,
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL(, lt_unset, 0, whether the shell understands "unset")dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL(SP2NL, lt_SP2NL, 1, turn spaces into newlines)dnl
-_LT_DECL(NL2SP, lt_NL2SP, 1, turn newlines into spaces)dnl
-)# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine what file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun(_LT_PATH_CONVERSION_FUNCTIONS,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_CANONICAL_BUILD)dnl
-AC_MSG_CHECKING(how to convert $build file names to $host format)
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-)
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT($lt_cv_to_host_file_cmd)
-_LT_DECL(to_host_file_cmd, lt_cv_to_host_file_cmd,
-         0, convert $build file names to $host format)dnl
-
-AC_MSG_CHECKING(how to convert $build file names to toolchain format)
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-)
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT($lt_cv_to_tool_file_cmd)
-_LT_DECL(to_tool_file_cmd, lt_cv_to_tool_file_cmd,
-         0, convert $build files to toolchain format)dnl
-)# _LT_PATH_CONVERSION_FUNCTIONS

_service:tar_scm:lxc-4.0.3.tar.gz/config/ltmain.sh Deleted

@@ -1,11251 +0,0 @@
-#! /bin/sh
-## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
-##               by inline-source v2014-01-03.01
-
-# libtool (GNU libtool) 2.4.6
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-PROGRAM=libtool
-PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-14"
-package_revision=2.4.6
-
-
-## ------ ##
-## Usage. ##
-## ------ ##
-
-# Run './libtool --help' for help with using this script from the
-# command line.
-
-
-## ------------------------------- ##
-## User overridable command paths. ##
-## ------------------------------- ##
-
-# After configure completes, it has a better idea of some of the
-# shell tools we need than the defaults used by the functions shared
-# with bootstrap, so set those here where they can still be over-
-# ridden by the user, but otherwise take precedence.
-
-: ${AUTOCONF="autoconf"}
-: ${AUTOMAKE="automake"}
-
-
-## -------------------------- ##
-## Source external libraries. ##
-## -------------------------- ##
-
-# Much of our low-level functionality needs to be sourced from external
-# libraries, which are installed to $pkgauxdir.
-
-# Set a version string for this script.
-scriptversion=2015-01-20.17; # UTC
-
-# General shell script boiler plate, and helper functions.
-# Written by Gary V. Vaughan, 2004
-
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-
-# As a special exception to the GNU General Public License, if you distribute
-# this file as part of a program or library that is built using GNU Libtool,
-# you may include this file under the same distribution terms that you use
-# for the rest of that program.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Please report bugs or propose patches to gary@gnu.org.
-
-
-## ------ ##
-## Usage. ##
-## ------ ##
-
-# Evaluate this file near the top of your script to gain access to
-# the functions and variables defined here:
-#
-#   . `echo "$0" | ${SED-sed} 's|^/*$||'`/build-aux/funclib.sh
-#
-# If you need to override any of the default environment variable
-# settings, do that before evaluating this file.
-
-
-## -------------------- ##
-## Shell normalisation. ##
-## -------------------- ##
-
-# Some shells need a little help to be as Bourne compatible as possible.
-# Before doing anything else, make sure all that help has been provided!
-
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
-fi
-
-# NLS nuisances: We save the old values in case they are required later.
-_G_user_locale=
-_G_safe_locale=
-for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test set = \"\${$_G_var+set}\"; then
-          save_$_G_var=\$$_G_var
-          $_G_var=C
-	  export $_G_var
-	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
-	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
-	fi"
-done
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Make sure IFS has a sensible default
-sp=' '
-nl='
-'
-IFS="$sp	$nl"
-
-# There are apparently some retarded systems that use ';' as a PATH separator!
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-
-## ------------------------- ##
-## Locate command utilities. ##
-## ------------------------- ##
-
-
-# func_executable_p FILE
-# ----------------------
-# Check that FILE is an executable regular file.
-func_executable_p ()
-{
-    test -f "$1" && test -x "$1"
-}
-
-
-# func_path_progs PROGS_LIST CHECK_FUNC PATH
-# --------------------------------------------
-# Search for either a program that responds to --version with output
-# containing "GNU", or else returned by CHECK_FUNC otherwise, by
-# trying all the directories in PATH with each of the elements of
-# PROGS_LIST.
-#
-# CHECK_FUNC should accept the path to a candidate program, and
-# set $func_check_prog_result if it truncates its output less than
-# $_G_path_prog_max characters.
-func_path_progs ()
-{
-    _G_progs_list=$1
-    _G_check_func=$2
-    _G_PATH=${3-"$PATH"}
-
-    _G_path_prog_max=0
-    _G_path_prog_found=false
-    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
-    for _G_dir in $_G_PATH; do
-      IFS=$_G_save_IFS
-      test -z "$_G_dir" && _G_dir=.
-      for _G_prog_name in $_G_progs_list; do
-        for _exeext in '' .EXE; do
-          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
-          func_executable_p "$_G_path_prog" || continue
-          case `"$_G_path_prog" --version 2>&1` in
-            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
-            *)     $_G_check_func $_G_path_prog
-		   func_path_progs_result=$func_check_prog_result
-		   ;;
-          esac
-          $_G_path_prog_found && break 3
-        done
-      done
-    done
-    IFS=$_G_save_IFS
-    test -z "$func_path_progs_result" && {
-      echo "no acceptable sed could be found in \$PATH" >&2
-      exit 1
-    }
-}
-
-
-# We want to be able to use the functions in this file before configure
-# has figured out where the best binaries are kept, which means we have
-# to search for them ourselves - except when the results are already set
-# where we skip the searches.
-
-# Unless the user overrides by setting SED, search the path for either GNU
-# sed, or the sed that truncates its output the least.
-test -z "$SED" && {
-  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-  for _G_i in 1 2 3 4 5 6 7; do
-    _G_sed_script=$_G_sed_script$nl$_G_sed_script
-  done
-  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
-  _G_sed_script=
-
-  func_check_prog_sed ()
-  {
-    _G_path_prog=$1
-
-    _G_count=0
-    printf 0123456789 >conftest.in
-    while :
-    do
-      cat conftest.in conftest.in >conftest.tmp
-      mv conftest.tmp conftest.in
-      cp conftest.in conftest.nl
-      echo '' >> conftest.nl
-      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
-      diff conftest.out conftest.nl >/dev/null 2>&1 || break
-      _G_count=`expr $_G_count + 1`
-      if test "$_G_count" -gt "$_G_path_prog_max"; then
-        # Best one so far, save it but keep looking for a better one
-        func_check_prog_result=$_G_path_prog
-        _G_path_prog_max=$_G_count
-      fi
-      # 10*(2^10) chars as input seems more than enough
-      test 10 -lt "$_G_count" && break
-    done
-    rm -f conftest.in conftest.tmp conftest.nl conftest.out
-  }
-
-  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
-  rm -f conftest.sed
-  SED=$func_path_progs_result
-}
-
-
-# Unless the user overrides by setting GREP, search the path for either GNU
-# grep, or the grep that truncates its output the least.
-test -z "$GREP" && {
-  func_check_prog_grep ()
-  {
-    _G_path_prog=$1
-
-    _G_count=0
-    _G_path_prog_max=0
-    printf 0123456789 >conftest.in
-    while :
-    do
-      cat conftest.in conftest.in >conftest.tmp
-      mv conftest.tmp conftest.in
-      cp conftest.in conftest.nl
-      echo 'GREP' >> conftest.nl
-      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
-      diff conftest.out conftest.nl >/dev/null 2>&1 || break
-      _G_count=`expr $_G_count + 1`
-      if test "$_G_count" -gt "$_G_path_prog_max"; then
-        # Best one so far, save it but keep looking for a better one
-        func_check_prog_result=$_G_path_prog
-        _G_path_prog_max=$_G_count
-      fi
-      # 10*(2^10) chars as input seems more than enough
-      test 10 -lt "$_G_count" && break
-    done
-    rm -f conftest.in conftest.tmp conftest.nl conftest.out
-  }
-
-  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
-  GREP=$func_path_progs_result
-}
-
-
-## ------------------------------- ##
-## User overridable command paths. ##
-## ------------------------------- ##
-
-# All uppercase variable names are used for environment variables.  These
-# variables can be overridden by the user before calling a script that
-# uses them if a suitable command of that name is not already available
-# in the command search PATH.
-
-: ${CP="cp -f"}
-: ${ECHO="printf %s\n"}
-: ${EGREP="$GREP -E"}
-: ${FGREP="$GREP -F"}
-: ${LN_S="ln -s"}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-
-
-## -------------------- ##
-## Useful sed snippets. ##
-## -------------------- ##
-
-sed_dirname='s|/^/*$||'
-sed_basename='s|^.*/||'
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s|$`"$\\$|\\\1|g'
-
-# Same as above, but do not quote variable references.
-sed_double_quote_subst='s/$"`\\$/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s|.^$\\*\/|\\&|g'
-
-# Sed substitution that converts a w32 file name or path
-# that contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-'\' parameter expansions in output of sed_double_quote_subst that
-# were '\'-ed in input to the same.  If an odd number of '\' preceded a
-# '$' in input to sed_double_quote_subst, that '$' was protected from
-# expansion.  Since each input '\' is now two '\'s, look for any number
-# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
-_G_bs='\\'
-_G_bs2='\\\\'
-_G_bs4='\\\\\\\\'
-_G_dollar='\$'
-sed_double_backslash="\
-  s/$_G_bs4/&\\
-/g
-  s/^$_G_bs2$_G_dollar/$_G_bs&/
-  s/\$^$_G_bs\$$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
-  s/\n//g"
-
-
-## ----------------- ##
-## Global variables. ##
-## ----------------- ##
-
-# Except for the global variables explicitly listed below, the following
-# functions in the '^func_' namespace, and the '^require_' namespace
-# variables initialised in the 'Resource management' section, sourcing
-# this file will not pollute your global namespace with anything
-# else. There's no portable way to scope variables in Bourne shell
-# though, so actually running these functions will sometimes place
-# results into a variable named after the function, and often use
-# temporary variables in the '^_G_' namespace. If you are careful to
-# avoid using those namespaces casually in your sourcing script, things
-# should continue to work as you expect. And, of course, you can freely
-# overwrite any of the functions or variables defined here before
-# calling anything to customize them.
-
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-# Allow overriding, eg assuming that you follow the convention of
-# putting '$debug_cmd' at the start of all your functions, you can get
-# bash to show function call trace with:
-#
-#    debug_cmd='echo "${FUNCNAME0} $*" >&2' bash your-script-name
-debug_cmd=${debug_cmd-":"}
-exit_cmd=:
-
-# By convention, finish your script with:
-#
-#    exit $exit_status
-#
-# so that you can set exit_status to non-zero if you want to indicate
-# something went wrong during execution without actually bailing out at
-# the point of failure.
-exit_status=$EXIT_SUCCESS
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath=$0
-
-# The name of this program.
-progname=`$ECHO "$progpath" |$SED "$sed_basename"`
-
-# Make sure we have an absolute progpath for reexecution:
-case $progpath in
-  \\/*|A-Za-z:\\*) ;;
-  *\\/*)
-     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
-     progdir=`cd "$progdir" && pwd`
-     progpath=$progdir/$progname
-     ;;
-  *)
-     _G_IFS=$IFS
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS=$_G_IFS
-       test -x "$progdir/$progname" && break
-     done
-     IFS=$_G_IFS
-     test -n "$progdir" || progdir=`pwd`
-     progpath=$progdir/$progname
-     ;;
-esac
-
-
-## ----------------- ##
-## Standard options. ##
-## ----------------- ##
-
-# The following options affect the operation of the functions defined
-# below, and should be set appropriately depending on run-time para-
-# meters passed on the command line.
-
-opt_dry_run=false
-opt_quiet=false
-opt_verbose=false
-
-# Categories 'all' and 'none' are always available.  Append any others
-# you will pass as the first argument to func_warning from your own
-# code.
-warning_categories=
-
-# By default, display warnings according to 'opt_warning_types'.  Set
-# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
-# treat the next displayed warning as a fatal error.
-warning_func=func_warn_and_continue
-
-# Set to 'all' to display all warnings, 'none' to suppress all
-# warnings, or a space delimited list of some subset of
-# 'warning_categories' to display only the listed warnings.
-opt_warning_types=all
-
-
-## -------------------- ##
-## Resource management. ##
-## -------------------- ##
-
-# This section contains definitions for functions that each ensure a
-# particular resource (a file, or a non-empty configuration variable for
-# example) is available, and if appropriate to extract default values
-# from pertinent package files. Call them using their associated
-# 'require_*' variable to ensure that they are executed, at most, once.
-#
-# It's entirely deliberate that calling these functions can set
-# variables that don't obey the namespace limitations obeyed by the rest
-# of this file, in order that that they be as useful as possible to
-# callers.
-
-
-# require_term_colors
-# -------------------
-# Allow display of bold text on terminals that support it.
-require_term_colors=func_require_term_colors
-func_require_term_colors ()
-{
-    $debug_cmd
-
-    test -t 1 && {
-      # COLORTERM and USE_ANSI_COLORS environment variables take
-      # precedence, because most terminfo databases neglect to describe
-      # whether color sequences are supported.
-      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
-
-      if test 1 = "$USE_ANSI_COLORS"; then
-        # Standard ANSI escape sequences
-        tc_reset='&#x1b;0m'
-        tc_bold='&#x1b;1m';   tc_standout='&#x1b;7m'
-        tc_red='&#x1b;31m';   tc_green='&#x1b;32m'
-        tc_blue='&#x1b;34m';  tc_cyan='&#x1b;36m'
-      else
-        # Otherwise trust the terminfo database after all.
-        test -n "`tput sgr0 2>/dev/null`" && {
-          tc_reset=`tput sgr0`
-          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
-          tc_standout=$tc_bold
-          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
-          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
-          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
-          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
-          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
-        }
-      fi
-    }
-
-    require_term_colors=:
-}
-
-
-## ----------------- ##
-## Function library. ##
-## ----------------- ##
-
-# This section contains a variety of useful functions to call in your
-# scripts. Take note of the portable wrappers for features provided by
-# some modern shells, which will fall back to slower equivalents on
-# less featureful shells.
-
-
-# func_append VAR VALUE
-# ---------------------
-# Append VALUE onto the existing contents of VAR.
-
-  # We should try to minimise forks, especially on Windows where they are
-  # unreasonably slow, so skip the feature probes when bash or zsh are
-  # being used:
-  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
-    : ${_G_HAVE_ARITH_OP="yes"}
-    : ${_G_HAVE_XSI_OPS="yes"}
-    # The += operator was introduced in bash 3.1
-    case $BASH_VERSION in
-      12.* | 3.0 | 3.0*) ;;
-      *)
-        : ${_G_HAVE_PLUSEQ_OP="yes"}
-        ;;
-    esac
-  fi
-
-  # _G_HAVE_PLUSEQ_OP
-  # Can be empty, in which case the shell is probed, "yes" if += is
-  # useable or anything else if it does not work.
-  test -z "$_G_HAVE_PLUSEQ_OP" \
-    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
-    && _G_HAVE_PLUSEQ_OP=yes
-
-if test yes = "$_G_HAVE_PLUSEQ_OP"
-then
-  # This is an XSI compatible shell, allowing a faster implementation...
-  eval 'func_append ()
-  {
-    $debug_cmd
-
-    eval "$1+=\$2"
-  }'
-else
-  # ...otherwise fall back to using expr, which is often a shell builtin.
-  func_append ()
-  {
-    $debug_cmd
-
-    eval "$1=\$$1\$2"
-  }
-fi
-
-
-# func_append_quoted VAR VALUE
-# ----------------------------
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-if test yes = "$_G_HAVE_PLUSEQ_OP"; then
-  eval 'func_append_quoted ()
-  {
-    $debug_cmd
-
-    func_quote_for_eval "$2"
-    eval "$1+=\\ \$func_quote_for_eval_result"
-  }'
-else
-  func_append_quoted ()
-  {
-    $debug_cmd
-
-    func_quote_for_eval "$2"
-    eval "$1=\$$1\\ \$func_quote_for_eval_result"
-  }
-fi
-
-
-# func_append_uniq VAR VALUE
-# --------------------------
-# Append unique VALUE onto the existing contents of VAR, assuming
-# entries are delimited by the first character of VALUE.  For example:
-#
-#   func_append_uniq options " --another-option option-argument"
-#
-# will only append to $options if " --another-option option-argument "
-# is not already present somewhere in $options already (note spaces at
-# each end implied by leading space in second argument).
-func_append_uniq ()
-{
-    $debug_cmd
-
-    eval _G_current_value='`$ECHO $'$1'`'
-    _G_delim=`expr "$2" : '$.$'`
-
-    case $_G_delim$_G_current_value$_G_delim in
-      *"$2$_G_delim"*) ;;
-      *) func_append "$@" ;;
-    esac
-}
-
-
-# func_arith TERM...
-# ------------------
-# Set func_arith_result to the result of evaluating TERMs.
-  test -z "$_G_HAVE_ARITH_OP" \
-    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
-    && _G_HAVE_ARITH_OP=yes
-
-if test yes = "$_G_HAVE_ARITH_OP"; then
-  eval 'func_arith ()
-  {
-    $debug_cmd
-
-    func_arith_result=$(( $* ))
-  }'
-else
-  func_arith ()
-  {
-    $debug_cmd
-
-    func_arith_result=`expr "$@"`
-  }
-fi
-
-
-# func_basename FILE
-# ------------------
-# Set func_basename_result to FILE with everything up to and including
-# the last / stripped.
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  # If this shell supports suffix pattern removal, then use it to avoid
-  # forking. Hide the definitions single quotes in case the shell chokes
-  # on unsupported syntax...
-  _b='func_basename_result=${1##*/}'
-  _d='case $1 in
-        */*) func_dirname_result=${1%/*}$2 ;;
-        *  ) func_dirname_result=$3        ;;
-      esac'
-
-else
-  # ...otherwise fall back to using sed.
-  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
-  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
-      if test "X$func_dirname_result" = "X$1"; then
-        func_dirname_result=$3
-      else
-        func_append func_dirname_result "$2"
-      fi'
-fi
-
-eval 'func_basename ()
-{
-    $debug_cmd
-
-    '"$_b"'
-}'
-
-
-# func_dirname FILE APPEND NONDIR_REPLACEMENT
-# -------------------------------------------
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-eval 'func_dirname ()
-{
-    $debug_cmd
-
-    '"$_d"'
-}'
-
-
-# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
-# --------------------------------------------------------
-# Perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# For efficiency, we do not delegate to the functions above but instead
-# duplicate the functionality here.
-eval 'func_dirname_and_basename ()
-{
-    $debug_cmd
-
-    '"$_b"'
-    '"$_d"'
-}'
-
-
-# func_echo ARG...
-# ----------------
-# Echo program name prefixed message.
-func_echo ()
-{
-    $debug_cmd
-
-    _G_message=$*
-
-    func_echo_IFS=$IFS
-    IFS=$nl
-    for _G_line in $_G_message; do
-      IFS=$func_echo_IFS
-      $ECHO "$progname: $_G_line"
-    done
-    IFS=$func_echo_IFS
-}
-
-
-# func_echo_all ARG...
-# --------------------
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-
-# func_echo_infix_1 INFIX ARG...
-# ------------------------------
-# Echo program name, followed by INFIX on the first line, with any
-# additional lines not showing INFIX.
-func_echo_infix_1 ()
-{
-    $debug_cmd
-
-    $require_term_colors
-
-    _G_infix=$1; shift
-    _G_indent=$_G_infix
-    _G_prefix="$progname: $_G_infix: "
-    _G_message=$*
-
-    # Strip color escape sequences before counting printable length
-    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
-    do
-      test -n "$_G_tc" && {
-        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
-        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
-      }
-    done
-    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
-
-    func_echo_infix_1_IFS=$IFS
-    IFS=$nl
-    for _G_line in $_G_message; do
-      IFS=$func_echo_infix_1_IFS
-      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
-      _G_prefix=$_G_indent
-    done
-    IFS=$func_echo_infix_1_IFS
-}
-
-
-# func_error ARG...
-# -----------------
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $debug_cmd
-
-    $require_term_colors
-
-    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
-}
-
-
-# func_fatal_error ARG...
-# -----------------------
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    $debug_cmd
-
-    func_error "$*"
-    exit $EXIT_FAILURE
-}
-
-
-# func_grep EXPRESSION FILENAME
-# -----------------------------
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $debug_cmd
-
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_len STRING
-# ---------------
-# Set func_len_result to the length of STRING. STRING may not
-# start with a hyphen.
-  test -z "$_G_HAVE_XSI_OPS" \
-    && (eval 'x=a/b/c;
-      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
-    && _G_HAVE_XSI_OPS=yes
-
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  eval 'func_len ()
-  {
-    $debug_cmd
-
-    func_len_result=${#1}
-  }'
-else
-  func_len ()
-  {
-    $debug_cmd
-
-    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-  }
-fi
-
-
-# func_mkdir_p DIRECTORY-PATH
-# ---------------------------
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    $debug_cmd
-
-    _G_directory_path=$1
-    _G_dir_list=
-
-    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
-
-      # Protect directory names starting with '-'
-      case $_G_directory_path in
-        -*) _G_directory_path=./$_G_directory_path ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$_G_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        _G_dir_list=$_G_directory_path:$_G_dir_list
-
-        # If the last portion added has no slash in it, the list is done
-        case $_G_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
-      done
-      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
-
-      func_mkdir_p_IFS=$IFS; IFS=:
-      for _G_dir in $_G_dir_list; do
-	IFS=$func_mkdir_p_IFS
-        # mkdir can fail with a 'File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$_G_dir" 2>/dev/null || :
-      done
-      IFS=$func_mkdir_p_IFS
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$_G_directory_path" || \
-        func_fatal_error "Failed to create '$1'"
-    fi
-}
-
-
-# func_mktempdir BASENAME
-# -------------------------
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, BASENAME is the basename for that directory.
-func_mktempdir ()
-{
-    $debug_cmd
-
-    _G_template=${TMPDIR-/tmp}/${1-$progname}
-
-    if test : = "$opt_dry_run"; then
-      # Return a directory name, but don't create it in dry-run mode
-      _G_tmpdir=$_G_template-$$
-    else
-
-      # If mktemp works, use that first and foremost
-      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$_G_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        _G_tmpdir=$_G_template-${RANDOM-0}$$
-
-        func_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$_G_tmpdir"
-        umask $func_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$_G_tmpdir" || \
-        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
-    fi
-
-    $ECHO "$_G_tmpdir"
-}
-
-
-# func_normal_abspath PATH
-# ------------------------
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-func_normal_abspath ()
-{
-    $debug_cmd
-
-    # These SED scripts presuppose an absolute path with a trailing slash.
-    _G_pathcar='s|^/$^/*$.*$|\1|'
-    _G_pathcdr='s|^/^/*||'
-    _G_removedotparts=':dotsl
-		s|/\./|/|g
-		t dotsl
-		s|/\.$|/|'
-    _G_collapseslashes='s|/\{1,\}|/|g'
-    _G_finalslash='s|/*$|/|'
-
-    # Start from root dir and reassemble the path.
-    func_normal_abspath_result=
-    func_normal_abspath_tpath=$1
-    func_normal_abspath_altnamespace=
-    case $func_normal_abspath_tpath in
-      "")
-        # Empty path, that just means $cwd.
-        func_stripname '' '/' "`pwd`"
-        func_normal_abspath_result=$func_stripname_result
-        return
-        ;;
-      # The next three entries are used to spot a run of precisely
-      # two leading slashes without using negated character classes;
-      # we take advantage of case's first-match behaviour.
-      ///*)
-        # Unusual form of absolute path, do nothing.
-        ;;
-      //*)
-        # Not necessarily an ordinary path; POSIX reserves leading '//'
-        # and for example Cygwin uses it to access remote file shares
-        # over CIFS/SMB, so we conserve a leading double slash if found.
-        func_normal_abspath_altnamespace=/
-        ;;
-      /*)
-        # Absolute path, do nothing.
-        ;;
-      *)
-        # Relative path, prepend $cwd.
-        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-        ;;
-    esac
-
-    # Cancel out all the simple stuff to save iterations.  We also want
-    # the path to end with a slash for ease of parsing, so make sure
-    # there is one (and only one) here.
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
-    while :; do
-      # Processed it all yet?
-      if test / = "$func_normal_abspath_tpath"; then
-        # If we ascended to the root using ".." the result may be empty now.
-        if test -z "$func_normal_abspath_result"; then
-          func_normal_abspath_result=/
-        fi
-        break
-      fi
-      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-          -e "$_G_pathcar"`
-      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-          -e "$_G_pathcdr"`
-      # Figure out what to do with it
-      case $func_normal_abspath_tcomponent in
-        "")
-          # Trailing empty path component, ignore it.
-          ;;
-        ..)
-          # Parent dir; strip last assembled component from result.
-          func_dirname "$func_normal_abspath_result"
-          func_normal_abspath_result=$func_dirname_result
-          ;;
-        *)
-          # Actual path component, append it.
-          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
-          ;;
-      esac
-    done
-    # Restore leading double-slash if one was found on entry.
-    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-
-# func_notquiet ARG...
-# --------------------
-# Echo program name prefixed message only when not in quiet mode.
-func_notquiet ()
-{
-    $debug_cmd
-
-    $opt_quiet || func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-
-# func_relative_path SRCDIR DSTDIR
-# --------------------------------
-# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
-func_relative_path ()
-{
-    $debug_cmd
-
-    func_relative_path_result=
-    func_normal_abspath "$1"
-    func_relative_path_tlibdir=$func_normal_abspath_result
-    func_normal_abspath "$2"
-    func_relative_path_tbindir=$func_normal_abspath_result
-
-    # Ascend the tree starting from libdir
-    while :; do
-      # check if we have found a prefix of bindir
-      case $func_relative_path_tbindir in
-        $func_relative_path_tlibdir)
-          # found an exact match
-          func_relative_path_tcancelled=
-          break
-          ;;
-        $func_relative_path_tlibdir*)
-          # found a matching prefix
-          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-          func_relative_path_tcancelled=$func_stripname_result
-          if test -z "$func_relative_path_result"; then
-            func_relative_path_result=.
-          fi
-          break
-          ;;
-        *)
-          func_dirname $func_relative_path_tlibdir
-          func_relative_path_tlibdir=$func_dirname_result
-          if test -z "$func_relative_path_tlibdir"; then
-            # Have to descend all the way to the root!
-            func_relative_path_result=../$func_relative_path_result
-            func_relative_path_tcancelled=$func_relative_path_tbindir
-            break
-          fi
-          func_relative_path_result=../$func_relative_path_result
-          ;;
-      esac
-    done
-
-    # Now calculate path; take care to avoid doubling-up slashes.
-    func_stripname '' '/' "$func_relative_path_result"
-    func_relative_path_result=$func_stripname_result
-    func_stripname '/' '/' "$func_relative_path_tcancelled"
-    if test -n "$func_stripname_result"; then
-      func_append func_relative_path_result "/$func_stripname_result"
-    fi
-
-    # Normalisation. If bindir is libdir, return '.' else relative path.
-    if test -n "$func_relative_path_result"; then
-      func_stripname './' '' "$func_relative_path_result"
-      func_relative_path_result=$func_stripname_result
-    fi
-
-    test -n "$func_relative_path_result" || func_relative_path_result=.
-
-    :
-}
-
-
-# func_quote_for_eval ARG...
-# --------------------------
-# Aesthetically quote ARGs to be evaled later.
-# This function returns two values:
-#   i) func_quote_for_eval_result
-#      double-quoted, suitable for a subsequent eval
-#  ii) func_quote_for_eval_unquoted_result
-#      has all characters that are still active within double
-#      quotes backslashified.
-func_quote_for_eval ()
-{
-    $debug_cmd
-
-    func_quote_for_eval_unquoted_result=
-    func_quote_for_eval_result=
-    while test 0 -lt $#; do
-      case $1 in
-        *\\\`\"\$*)
-	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
-        *)
-          _G_unquoted_arg=$1 ;;
-      esac
-      if test -n "$func_quote_for_eval_unquoted_result"; then
-	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
-      else
-        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
-      fi
-
-      case $_G_unquoted_arg in
-        # Double-quote args containing shell metacharacters to delay
-        # word splitting, command substitution and variable expansion
-        # for a subsequent eval.
-        # Many Bourne shells cannot handle close brackets correctly
-        # in scan sets, so we specify it separately.
-        *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
-          _G_quoted_arg=\"$_G_unquoted_arg\"
-          ;;
-        *)
-          _G_quoted_arg=$_G_unquoted_arg
-	  ;;
-      esac
-
-      if test -n "$func_quote_for_eval_result"; then
-	func_append func_quote_for_eval_result " $_G_quoted_arg"
-      else
-        func_append func_quote_for_eval_result "$_G_quoted_arg"
-      fi
-      shift
-    done
-}
-
-
-# func_quote_for_expand ARG
-# -------------------------
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    $debug_cmd
-
-    case $1 in
-      *\\\`\"*)
-	_G_arg=`$ECHO "$1" | $SED \
-	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        _G_arg=$1 ;;
-    esac
-
-    case $_G_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
-        _G_arg=\"$_G_arg\"
-        ;;
-    esac
-
-    func_quote_for_expand_result=$_G_arg
-}
-
-
-# func_stripname PREFIX SUFFIX NAME
-# ---------------------------------
-# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  eval 'func_stripname ()
-  {
-    $debug_cmd
-
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary variable first.
-    func_stripname_result=$3
-    func_stripname_result=${func_stripname_result#"$1"}
-    func_stripname_result=${func_stripname_result%"$2"}
-  }'
-else
-  func_stripname ()
-  {
-    $debug_cmd
-
-    case $2 in
-      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
-      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
-    esac
-  }
-fi
-
-
-# func_show_eval CMD FAIL_EXP
-# -----------------------------
-# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    $debug_cmd
-
-    _G_cmd=$1
-    _G_fail_exp=${2-':'}
-
-    func_quote_for_expand "$_G_cmd"
-    eval "func_notquiet $func_quote_for_expand_result"
-
-    $opt_dry_run || {
-      eval "$_G_cmd"
-      _G_status=$?
-      if test 0 -ne "$_G_status"; then
-	eval "(exit $_G_status); $_G_fail_exp"
-      fi
-    }
-}
-
-
-# func_show_eval_locale CMD FAIL_EXP
-# ------------------------------------
-# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    $debug_cmd
-
-    _G_cmd=$1
-    _G_fail_exp=${2-':'}
-
-    $opt_quiet || {
-      func_quote_for_expand "$_G_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    $opt_dry_run || {
-      eval "$_G_user_locale
-	    $_G_cmd"
-      _G_status=$?
-      eval "$_G_safe_locale"
-      if test 0 -ne "$_G_status"; then
-	eval "(exit $_G_status); $_G_fail_exp"
-      fi
-    }
-}
-
-
-# func_tr_sh
-# ----------
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-    $debug_cmd
-
-    case $1 in
-    0-9* | *!a-zA-Z0-9_*)
-      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^$0-9$/_\1/' -e 's/^a-zA-Z0-9_/_/g'`
-      ;;
-    * )
-      func_tr_sh_result=$1
-      ;;
-    esac
-}
-
-
-# func_verbose ARG...
-# -------------------
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $debug_cmd
-
-    $opt_verbose && func_echo "$*"
-
-    :
-}
-
-
-# func_warn_and_continue ARG...
-# -----------------------------
-# Echo program name prefixed warning message to standard error.
-func_warn_and_continue ()
-{
-    $debug_cmd
-
-    $require_term_colors
-
-    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
-}
-
-
-# func_warning CATEGORY ARG...
-# ----------------------------
-# Echo program name prefixed warning message to standard error. Warning
-# messages can be filtered according to CATEGORY, where this function
-# elides messages where CATEGORY is not listed in the global variable
-# 'opt_warning_types'.
-func_warning ()
-{
-    $debug_cmd
-
-    # CATEGORY must be in the warning_categories list!
-    case " $warning_categories " in
-      *" $1 "*) ;;
-      *) func_internal_error "invalid warning category '$1'" ;;
-    esac
-
-    _G_category=$1
-    shift
-
-    case " $opt_warning_types " in
-      *" $_G_category "*) $warning_func ${1+"$@"} ;;
-    esac
-}
-
-
-# func_sort_ver VER1 VER2
-# -----------------------
-# 'sort -V' is not generally available.
-# Note this deviates from the version comparison in automake
-# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
-# but this should suffice as we won't be specifying old
-# version formats or redundant trailing .0 in bootstrap.conf.
-# If we did want full compatibility then we should probably
-# use m4_version_compare from autoconf.
-func_sort_ver ()
-{
-    $debug_cmd
-
-    printf '%s\n%s\n' "$1" "$2" \
-      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
-}
-
-# func_lt_ver PREV CURR
-# ---------------------
-# Return true if PREV and CURR are in the correct order according to
-# func_sort_ver, otherwise false.  Use it like this:
-#
-#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
-func_lt_ver ()
-{
-    $debug_cmd
-
-    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
-}
-
-
-# Local variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
-# time-stamp-time-zone: "UTC"
-# End:
-#! /bin/sh
-
-# Set a version string for this script.
-scriptversion=2015-10-07.11; # UTC
-
-# A portable, pluggable option parser for Bourne shell.
-# Written by Gary V. Vaughan, 2010
-
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Please report bugs or propose patches to gary@gnu.org.
-
-
-## ------ ##
-## Usage. ##
-## ------ ##
-
-# This file is a library for parsing options in your shell scripts along
-# with assorted other useful supporting features that you can make use
-# of too.
-#
-# For the simplest scripts you might need only:
-#
-#   #!/bin/sh
-#   . relative/path/to/funclib.sh
-#   . relative/path/to/options-parser
-#   scriptversion=1.0
-#   func_options ${1+"$@"}
-#   eval set dummy "$func_options_result"; shift
-#   ...rest of your script...
-#
-# In order for the '--version' option to work, you will need to have a
-# suitably formatted comment like the one at the top of this file
-# starting with '# Written by ' and ending with '# warranty; '.
-#
-# For '-h' and '--help' to work, you will also need a one line
-# description of your script's purpose in a comment directly above the
-# '# Written by ' line, like the one at the top of this file.
-#
-# The default options also support '--debug', which will turn on shell
-# execution tracing (see the comment above debug_cmd below for another
-# use), and '--verbose' and the func_verbose function to allow your script
-# to display verbose messages only when your user has specified
-# '--verbose'.
-#
-# After sourcing this file, you can plug processing for additional
-# options by amending the variables from the 'Configuration' section
-# below, and following the instructions in the 'Option parsing'
-# section further down.
-
-## -------------- ##
-## Configuration. ##
-## -------------- ##
-
-# You should override these variables in your script after sourcing this
-# file so that they reflect the customisations you have added to the
-# option parser.
-
-# The usage line for option parsing errors and the start of '-h' and
-# '--help' output messages. You can embed shell variables for delayed
-# expansion at the time the message is displayed, but you will need to
-# quote other shell meta-characters carefully to prevent them being
-# expanded when the contents are evaled.
-usage='$progpath OPTION...'
-
-# Short help message in response to '-h' and '--help'.  Add to this or
-# override it after sourcing this library to reflect the full set of
-# options your script accepts.
-usage_message="\
-       --debug        enable verbose shell tracing
-   -W, --warnings=CATEGORY
-                      report the warnings falling in CATEGORY all
-   -v, --verbose      verbosely report processing
-       --version      print version information and exit
-   -h, --help         print short or long help message and exit
-"
-
-# Additional text appended to 'usage_message' in response to '--help'.
-long_help_message="
-Warning categories include:
-       'all'          show all warnings
-       'none'         turn off all the warnings
-       'error'        warnings are treated as fatal errors"
-
-# Help message printed before fatal option parsing errors.
-fatal_help="Try '\$progname --help' for more information."
-
-
-
-## ------------------------- ##
-## Hook function management. ##
-## ------------------------- ##
-
-# This section contains functions for adding, removing, and running hooks
-# to the main code.  A hook is just a named list of of function, that can
-# be run in order later on.
-
-# func_hookable FUNC_NAME
-# -----------------------
-# Declare that FUNC_NAME will run hooks added with
-# 'func_add_hook FUNC_NAME ...'.
-func_hookable ()
-{
-    $debug_cmd
-
-    func_append hookable_fns " $1"
-}
-
-
-# func_add_hook FUNC_NAME HOOK_FUNC
-# ---------------------------------
-# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
-# first have been declared "hookable" by a call to 'func_hookable'.
-func_add_hook ()
-{
-    $debug_cmd
-
-    case " $hookable_fns " in
-      *" $1 "*) ;;
-      *) func_fatal_error "'$1' does not accept hook functions." ;;
-    esac
-
-    eval func_append ${1}_hooks '" $2"'
-}
-
-
-# func_remove_hook FUNC_NAME HOOK_FUNC
-# ------------------------------------
-# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
-func_remove_hook ()
-{
-    $debug_cmd
-
-    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
-}
-
-
-# func_run_hooks FUNC_NAME ARG...
-# ---------------------------------
-# Run all hook functions registered to FUNC_NAME.
-# It is assumed that the list of hook functions contains nothing more
-# than a whitespace-delimited list of legal shell function names, and
-# no effort is wasted trying to catch shell meta-characters or preserve
-# whitespace.
-func_run_hooks ()
-{
-    $debug_cmd
-
-    _G_rc_run_hooks=false
-
-    case " $hookable_fns " in
-      *" $1 "*) ;;
-      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
-    esac
-
-    eval _G_hook_fns=\$$1_hooks; shift
-
-    for _G_hook in $_G_hook_fns; do
-      if eval $_G_hook '"$@"'; then
-        # store returned options list back into positional
-        # parameters for next 'cmd' execution.
-        eval _G_hook_result=\$${_G_hook}_result
-        eval set dummy "$_G_hook_result"; shift
-        _G_rc_run_hooks=:
-      fi
-    done
-
-    $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
-}
-
-
-
-## --------------- ##
-## Option parsing. ##
-## --------------- ##
-
-# In order to add your own option parsing hooks, you must accept the
-# full positional parameter list in your hook function, you may remove/edit
-# any options that you action, and then pass back the remaining unprocessed
-# options in '<hooked_function_name>_result', escaped suitably for
-# 'eval'.  In this case you also must return $EXIT_SUCCESS to let the
-# hook's caller know that it should pay attention to
-# '<hooked_function_name>_result'.  Returning $EXIT_FAILURE signalizes that
-# arguments are left untouched by the hook and therefore caller will ignore the
-# result variable.
-#
-# Like this:
-#
-#    my_options_prep ()
-#    {
-#        $debug_cmd
-#
-#        # Extend the existing usage message.
-#        usage_message=$usage_message'
-#      -s, --silent       don'\''t print informational messages
-#    '
-#        # No change in '$@' (ignored completely by this hook).  There is
-#        # no need to do the equivalent (but slower) action:
-#        # func_quote_for_eval ${1+"$@"}
-#        # my_options_prep_result=$func_quote_for_eval_result
-#        false
-#    }
-#    func_add_hook func_options_prep my_options_prep
-#
-#
-#    my_silent_option ()
-#    {
-#        $debug_cmd
-#
-#        args_changed=false
-#
-#        # Note that for efficiency, we parse as many options as we can
-#        # recognise in a loop before passing the remainder back to the
-#        # caller on the first unrecognised argument we encounter.
-#        while test $# -gt 0; do
-#          opt=$1; shift
-#          case $opt in
-#            --silent|-s) opt_silent=:
-#                         args_changed=:
-#                         ;;
-#            # Separate non-argument short options:
-#            -s*)         func_split_short_opt "$_G_opt"
-#                         set dummy "$func_split_short_opt_name" \
-#                             "-$func_split_short_opt_arg" ${1+"$@"}
-#                         shift
-#                         args_changed=:
-#                         ;;
-#            *)           # Make sure the first unrecognised option "$_G_opt"
-#                         # is added back to "$@", we could need that later
-#                         # if $args_changed is true.
-#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
-#          esac
-#        done
-#
-#        if $args_changed; then
-#          func_quote_for_eval ${1+"$@"}
-#          my_silent_option_result=$func_quote_for_eval_result
-#        fi
-#
-#        $args_changed
-#    }
-#    func_add_hook func_parse_options my_silent_option
-#
-#
-#    my_option_validation ()
-#    {
-#        $debug_cmd
-#
-#        $opt_silent && $opt_verbose && func_fatal_help "\
-#    '--silent' and '--verbose' options are mutually exclusive."
-#
-#        false
-#    }
-#    func_add_hook func_validate_options my_option_validation
-#
-# You'll also need to manually amend $usage_message to reflect the extra
-# options you parse.  It's preferable to append if you can, so that
-# multiple option parsing hooks can be added safely.
-
-
-# func_options_finish ARG...
-# ----------------------------
-# Finishing the option parse loop (call 'func_options' hooks ATM).
-func_options_finish ()
-{
-    $debug_cmd
-
-    _G_func_options_finish_exit=false
-    if func_run_hooks func_options ${1+"$@"}; then
-      func_options_finish_result=$func_run_hooks_result
-      _G_func_options_finish_exit=:
-    fi
-
-    $_G_func_options_finish_exit
-}
-
-
-# func_options ARG...
-# ---------------------
-# All the functions called inside func_options are hookable. See the
-# individual implementations for details.
-func_hookable func_options
-func_options ()
-{
-    $debug_cmd
-
-    _G_rc_options=false
-
-    for my_func in options_prep parse_options validate_options options_finish
-    do
-      if eval func_$my_func '${1+"$@"}'; then
-        eval _G_res_var='$'"func_${my_func}_result"
-        eval set dummy "$_G_res_var" ; shift
-        _G_rc_options=:
-      fi
-    done
-
-    # Save modified positional parameters for caller.  As a top-level
-    # options-parser function we always need to set the 'func_options_result'
-    # variable (regardless the $_G_rc_options value).
-    if $_G_rc_options; then
-      func_options_result=$_G_res_var
-    else
-      func_quote_for_eval ${1+"$@"}
-      func_options_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_options
-}
-
-
-# func_options_prep ARG...
-# --------------------------
-# All initialisations required before starting the option parse loop.
-# Note that when calling hook functions, we pass through the list of
-# positional parameters.  If a hook function modifies that list, and
-# needs to propagate that back to rest of this script, then the complete
-# modified list must be put in 'func_run_hooks_result' before
-# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
-func_hookable func_options_prep
-func_options_prep ()
-{
-    $debug_cmd
-
-    # Option defaults:
-    opt_verbose=false
-    opt_warning_types=
-
-    _G_rc_options_prep=false
-    if func_run_hooks func_options_prep ${1+"$@"}; then
-      _G_rc_options_prep=:
-      # save modified positional parameters for caller
-      func_options_prep_result=$func_run_hooks_result
-    fi
-
-    $_G_rc_options_prep
-}
-
-
-# func_parse_options ARG...
-# ---------------------------
-# The main option parsing loop.
-func_hookable func_parse_options
-func_parse_options ()
-{
-    $debug_cmd
-
-    func_parse_options_result=
-
-    _G_rc_parse_options=false
-    # this just eases exit handling
-    while test $# -gt 0; do
-      # Defer to hook functions for initial option parsing, so they
-      # get priority in the event of reusing an option name.
-      if func_run_hooks func_parse_options ${1+"$@"}; then
-        eval set dummy "$func_run_hooks_result"; shift
-        _G_rc_parse_options=:
-      fi
-
-      # Break out of the loop if we already parsed every option.
-      test $# -gt 0 || break
-
-      _G_match_parse_options=:
-      _G_opt=$1
-      shift
-      case $_G_opt in
-        --debug|-x)   debug_cmd='set -x'
-                      func_echo "enabling shell trace mode"
-                      $debug_cmd
-                      ;;
-
-        --no-warnings|--no-warning|--no-warn)
-                      set dummy --warnings none ${1+"$@"}
-                      shift
-		      ;;
-
-        --warnings|--warning|-W)
-                      if test $# = 0 && func_missing_arg $_G_opt; then
-                        _G_rc_parse_options=:
-                        break
-                      fi
-                      case " $warning_categories $1" in
-                        *" $1 "*)
-                          # trailing space prevents matching last $1 above
-                          func_append_uniq opt_warning_types " $1"
-                          ;;
-                        *all)
-                          opt_warning_types=$warning_categories
-                          ;;
-                        *none)
-                          opt_warning_types=none
-                          warning_func=:
-                          ;;
-                        *error)
-                          opt_warning_types=$warning_categories
-                          warning_func=func_fatal_error
-                          ;;
-                        *)
-                          func_fatal_error \
-                             "unsupported warning category: '$1'"
-                          ;;
-                      esac
-                      shift
-                      ;;
-
-        --verbose|-v) opt_verbose=: ;;
-        --version)    func_version ;;
-        -\?|-h)       func_usage ;;
-        --help)       func_help ;;
-
-	# Separate optargs to long options (plugins may need this):
-	--*=*)        func_split_equals "$_G_opt"
-	              set dummy "$func_split_equals_lhs" \
-                          "$func_split_equals_rhs" ${1+"$@"}
-                      shift
-                      ;;
-
-       # Separate optargs to short options:
-        -W*)
-                      func_split_short_opt "$_G_opt"
-                      set dummy "$func_split_short_opt_name" \
-                          "$func_split_short_opt_arg" ${1+"$@"}
-                      shift
-                      ;;
-
-        # Separate non-argument short options:
-        -\?*|-h*|-v*|-x*)
-                      func_split_short_opt "$_G_opt"
-                      set dummy "$func_split_short_opt_name" \
-                          "-$func_split_short_opt_arg" ${1+"$@"}
-                      shift
-                      ;;
-
-        --)           _G_rc_parse_options=: ; break ;;
-        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
-        *)            set dummy "$_G_opt" ${1+"$@"}; shift
-                      _G_match_parse_options=false
-                      break
-                      ;;
-      esac
-
-      $_G_match_parse_options && _G_rc_parse_options=:
-    done
-
-
-    if $_G_rc_parse_options; then
-      # save modified positional parameters for caller
-      func_quote_for_eval ${1+"$@"}
-      func_parse_options_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_parse_options
-}
-
-
-# func_validate_options ARG...
-# ------------------------------
-# Perform any sanity checks on option settings and/or unconsumed
-# arguments.
-func_hookable func_validate_options
-func_validate_options ()
-{
-    $debug_cmd
-
-    _G_rc_validate_options=false
-
-    # Display all warnings if -W was not given.
-    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
-
-    if func_run_hooks func_validate_options ${1+"$@"}; then
-      # save modified positional parameters for caller
-      func_validate_options_result=$func_run_hooks_result
-      _G_rc_validate_options=:
-    fi
-
-    # Bail if the options were screwed!
-    $exit_cmd $EXIT_FAILURE
-
-    $_G_rc_validate_options
-}
-
-
-
-## ----------------- ##
-## Helper functions. ##
-## ----------------- ##
-
-# This section contains the helper functions used by the rest of the
-# hookable option parser framework in ascii-betical order.
-
-
-# func_fatal_help ARG...
-# ----------------------
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    $debug_cmd
-
-    eval \$ECHO \""Usage: $usage"\"
-    eval \$ECHO \""$fatal_help"\"
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-
-# func_help
-# ---------
-# Echo long help message to standard output and exit.
-func_help ()
-{
-    $debug_cmd
-
-    func_usage_message
-    $ECHO "$long_help_message"
-    exit 0
-}
-
-
-# func_missing_arg ARGNAME
-# ------------------------
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    $debug_cmd
-
-    func_error "Missing argument for '$1'."
-    exit_cmd=exit
-}
-
-
-# func_split_equals STRING
-# ------------------------
-# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
-# splitting STRING at the '=' sign.
-test -z "$_G_HAVE_XSI_OPS" \
-    && (eval 'x=a/b/c;
-      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
-    && _G_HAVE_XSI_OPS=yes
-
-if test yes = "$_G_HAVE_XSI_OPS"
-then
-  # This is an XSI compatible shell, allowing a faster implementation...
-  eval 'func_split_equals ()
-  {
-      $debug_cmd
-
-      func_split_equals_lhs=${1%%=*}
-      func_split_equals_rhs=${1#*=}
-      test "x$func_split_equals_lhs" = "x$1" \
-        && func_split_equals_rhs=
-  }'
-else
-  # ...otherwise fall back to using expr, which is often a shell builtin.
-  func_split_equals ()
-  {
-      $debug_cmd
-
-      func_split_equals_lhs=`expr "x$1" : 'x$^=*$'`
-      func_split_equals_rhs=
-      test "x$func_split_equals_lhs" = "x$1" \
-        || func_split_equals_rhs=`expr "x$1" : 'x^=*=$.*$$'`
-  }
-fi #func_split_equals
-
-
-# func_split_short_opt SHORTOPT
-# -----------------------------
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-if test yes = "$_G_HAVE_XSI_OPS"
-then
-  # This is an XSI compatible shell, allowing a faster implementation...
-  eval 'func_split_short_opt ()
-  {
-      $debug_cmd
-
-      func_split_short_opt_arg=${1#??}
-      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
-  }'
-else
-  # ...otherwise fall back to using expr, which is often a shell builtin.
-  func_split_short_opt ()
-  {
-      $debug_cmd
-
-      func_split_short_opt_name=`expr "x$1" : 'x-$.$'`
-      func_split_short_opt_arg=`expr "x$1" : 'x-.$.*$$'`
-  }
-fi #func_split_short_opt
-
-
-# func_usage
-# ----------
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $debug_cmd
-
-    func_usage_message
-    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
-    exit 0
-}
-
-
-# func_usage_message
-# ------------------
-# Echo short help message to standard output.
-func_usage_message ()
-{
-    $debug_cmd
-
-    eval \$ECHO \""Usage: $usage"\"
-    echo
-    $SED -n 's|^# ||
-        /^Written by/{
-          x;p;x
-        }
-	h
-	/^Written by/q' < "$progpath"
-    echo
-    eval \$ECHO \""$usage_message"\"
-}
-
-
-# func_version
-# ------------
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $debug_cmd
-
-    printf '%s\n' "$progname $scriptversion"
-    $SED -n '
-        /(C)/!b go
-        :more
-        /\./!{
-          N
-          s|\n# | |
-          b more
-        }
-        :go
-        /^# Written by /,/# warranty; / {
-          s|^# ||
-          s|^# *$||
-          s|$(C)$ 0-9,-* ,-$1-90-9* $|\1 \2|
-          p
-        }
-        /^# Written by / {
-          s|^# ||
-          p
-        }
-        /^warranty; /q' < "$progpath"
-
-    exit $?
-}
-
-
-# Local variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
-# time-stamp-time-zone: "UTC"
-# End:
-
-# Set a version string.
-scriptversion='(GNU libtool) 2.4.6'
-
-
-# func_echo ARG...
-# ----------------
-# Libtool also displays the current mode in messages, so override
-# funclib.sh func_echo with this custom definition.
-func_echo ()
-{
-    $debug_cmd
-
-    _G_message=$*
-
-    func_echo_IFS=$IFS
-    IFS=$nl
-    for _G_line in $_G_message; do
-      IFS=$func_echo_IFS
-      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
-    done
-    IFS=$func_echo_IFS
-}
-
-
-# func_warning ARG...
-# -------------------
-# Libtool warnings are not categorized, so override funclib.sh
-# func_warning with this simpler definition.
-func_warning ()
-{
-    $debug_cmd
-
-    $warning_func ${1+"$@"}
-}
-
-
-## ---------------- ##
-## Options parsing. ##
-## ---------------- ##
-
-# Hook in the functions to make sure our own options are parsed during
-# the option parsing loop.
-
-usage='$progpath OPTION... MODE-ARG...'
-
-# Short help message in response to '-h'.
-usage_message="Options:
-       --config             show all configuration variables
-       --debug              enable verbose shell tracing
-   -n, --dry-run            display commands without modifying any files
-       --features           display basic configuration information and exit
-       --mode=MODE          use operation mode MODE
-       --no-warnings        equivalent to '-Wnone'
-       --preserve-dup-deps  don't remove duplicate dependency libraries
-       --quiet, --silent    don't print informational messages
-       --tag=TAG            use configuration variables from tag TAG
-   -v, --verbose            print more informational messages than default
-       --version            print version information
-   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY all
-   -h, --help, --help-all   print short, long, or detailed help message
-"
-
-# Additional text appended to 'usage_message' in response to '--help'.
-func_help ()
-{
-    $debug_cmd
-
-    func_usage_message
-    $ECHO "$long_help_message
-
-MODE must be one of the following:
-
-       clean           remove files from the build directory
-       compile         compile a source file into a libtool object
-       execute         automatically set library path, then run a program
-       finish          complete the installation of libtool libraries
-       install         install libraries or executables
-       link            create a library or an executable
-       uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  When passed as first option,
-'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
-Try '$progname --help --mode=MODE' for a more detailed description of MODE.
-
-When reporting a bug, please describe a test case to reproduce it and
-include the following information:
-
-       host-triplet:   $host
-       shell:          $SHELL
-       compiler:       $LTCC
-       compiler flags: $LTCFLAGS
-       linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname $scriptversion Debian-2.4.6-14
-       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
-       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
-
-Report bugs to <bug-libtool@gnu.org>.
-GNU libtool home page: <http://www.gnu.org/s/libtool/>.
-General help using GNU software: <http://www.gnu.org/gethelp/>."
-    exit 0
-}
-
-
-# func_lo2o OBJECT-NAME
-# ---------------------
-# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
-# object suffix.
-
-lo2o=s/\\.lo\$/.$objext/
-o2lo=s/\\.$objext\$/.lo/
-
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  eval 'func_lo2o ()
-  {
-    case $1 in
-      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
-      *   ) func_lo2o_result=$1               ;;
-    esac
-  }'
-
-  # func_xform LIBOBJ-OR-SOURCE
-  # ---------------------------
-  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
-  # suffix to a '.lo' libtool-object suffix.
-  eval 'func_xform ()
-  {
-    func_xform_result=${1%.*}.lo
-  }'
-else
-  # ...otherwise fall back to using sed.
-  func_lo2o ()
-  {
-    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
-  }
-
-  func_xform ()
-  {
-    func_xform_result=`$ECHO "$1" | $SED 's|\.^.*$|.lo|'`
-  }
-fi
-
-
-# func_fatal_configuration ARG...
-# -------------------------------
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func__fatal_error ${1+"$@"} \
-      "See the $PACKAGE documentation for more information." \
-      "Fatal configuration error."
-}
-
-
-# func_config
-# -----------
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-
-# func_features
-# -------------
-# Display the features supported by this script.
-func_features ()
-{
-    echo "host: $host"
-    if test yes = "$build_libtool_libs"; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test yes = "$build_old_libs"; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-
-    exit $?
-}
-
-
-# func_enable_tag TAGNAME
-# -----------------------
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-    # Global variable:
-    tagname=$1
-
-    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-    sed_extractcf=/$re_begincf/,/$re_endcf/p
-
-    # Validate tagname.
-    case $tagname in
-      *!-_A-Za-z0-9,/*)
-        func_fatal_error "invalid tag name: $tagname"
-        ;;
-    esac
-
-    # Don't test for the "default" C tag, as we know it's
-    # there but not specially marked.
-    case $tagname in
-        CC) ;;
-    *)
-        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	  taglist="$taglist $tagname"
-
-	  # Evaluate the configuration.  Be careful to quote the path
-	  # and the sed script, to avoid splitting on whitespace, but
-	  # also don't use non-portable quotes within backquotes within
-	  # quotes we have to do it in 2 steps:
-	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	  eval "$extractedcf"
-        else
-	  func_error "ignoring unknown tag $tagname"
-        fi
-        ;;
-    esac
-}
-
-
-# func_check_version_match
-# ------------------------
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-    if test "$package_revision" != "$macro_revision"; then
-      if test "$VERSION" != "$macro_version"; then
-        if test -z "$macro_version"; then
-          cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-        else
-          cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-        fi
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-      fi
-
-      exit $EXIT_MISMATCH
-    fi
-}
-
-
-# libtool_options_prep ARG...
-# -----------------------------
-# Preparation for options parsed by libtool.
-libtool_options_prep ()
-{
-    $debug_mode
-
-    # Option defaults:
-    opt_config=false
-    opt_dlopen=
-    opt_dry_run=false
-    opt_help=false
-    opt_mode=
-    opt_preserve_dup_deps=false
-    opt_quiet=false
-
-    nonopt=
-    preserve_args=
-
-    _G_rc_lt_options_prep=:
-
-    # Shorthand for --mode=foo, only valid as the first argument
-    case $1 in
-    clean|clea|cle|cl)
-      shift; set dummy --mode clean ${1+"$@"}; shift
-      ;;
-    compile|compil|compi|comp|com|co|c)
-      shift; set dummy --mode compile ${1+"$@"}; shift
-      ;;
-    execute|execut|execu|exec|exe|ex|e)
-      shift; set dummy --mode execute ${1+"$@"}; shift
-      ;;
-    finish|finis|fini|fin|fi|f)
-      shift; set dummy --mode finish ${1+"$@"}; shift
-      ;;
-    install|instal|insta|inst|ins|in|i)
-      shift; set dummy --mode install ${1+"$@"}; shift
-      ;;
-    link|lin|li|l)
-      shift; set dummy --mode link ${1+"$@"}; shift
-      ;;
-    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-      shift; set dummy --mode uninstall ${1+"$@"}; shift
-      ;;
-    *)
-      _G_rc_lt_options_prep=false
-      ;;
-    esac
-
-    if $_G_rc_lt_options_prep; then
-      # Pass back the list of options.
-      func_quote_for_eval ${1+"$@"}
-      libtool_options_prep_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_lt_options_prep
-}
-func_add_hook func_options_prep libtool_options_prep
-
-
-# libtool_parse_options ARG...
-# ---------------------------------
-# Provide handling for libtool specific options.
-libtool_parse_options ()
-{
-    $debug_cmd
-
-    _G_rc_lt_parse_options=false
-
-    # Perform our own loop to consume as many options as possible in
-    # each iteration.
-    while test $# -gt 0; do
-      _G_match_lt_parse_options=:
-      _G_opt=$1
-      shift
-      case $_G_opt in
-        --dry-run|--dryrun|-n)
-                        opt_dry_run=:
-                        ;;
-
-        --config)       func_config ;;
-
-        --dlopen|-dlopen)
-                        opt_dlopen="${opt_dlopen+$opt_dlopen
-}$1"
-                        shift
-                        ;;
-
-        --preserve-dup-deps)
-                        opt_preserve_dup_deps=: ;;
-
-        --features)     func_features ;;
-
-        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
-
-        --help)         opt_help=: ;;
-
-        --help-all)     opt_help=': help-all' ;;
-
-        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
-                        opt_mode=$1
-                        case $1 in
-                          # Valid mode arguments:
-                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-                          # Catch anything else as an error
-                          *) func_error "invalid argument for $_G_opt"
-                             exit_cmd=exit
-                             break
-                             ;;
-                        esac
-                        shift
-                        ;;
-
-        --no-silent|--no-quiet)
-                        opt_quiet=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --no-warnings|--no-warning|--no-warn)
-                        opt_warning=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --no-verbose)
-                        opt_verbose=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --silent|--quiet)
-                        opt_quiet=:
-                        opt_verbose=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
-                        opt_tag=$1
-                        func_append preserve_args " $_G_opt $1"
-                        func_enable_tag "$1"
-                        shift
-                        ;;
-
-        --verbose|-v)   opt_quiet=false
-                        opt_verbose=:
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        # An option not handled by this hook function:
-        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
-                        _G_match_lt_parse_options=false
-                        break
-                        ;;
-      esac
-      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
-    done
-
-    if $_G_rc_lt_parse_options; then
-      # save modified positional parameters for caller
-      func_quote_for_eval ${1+"$@"}
-      libtool_parse_options_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_lt_parse_options
-}
-func_add_hook func_parse_options libtool_parse_options
-
-
-
-# libtool_validate_options ARG...
-# ---------------------------------
-# Perform any sanity checks on option settings and/or unconsumed
-# arguments.
-libtool_validate_options ()
-{
-    # save first non-option argument
-    if test 0 -lt $#; then
-      nonopt=$1
-      shift
-    fi
-
-    # preserve --debug
-    test : = "$debug_cmd" || func_append preserve_args " --debug"
-
-    case $host in
-      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
-      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
-      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
-        # don't eliminate duplications in $postdeps and $predeps
-        opt_duplicate_compiler_generated_deps=:
-        ;;
-      *)
-        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-        ;;
-    esac
-
-    $opt_help || {
-      # Sanity checks first:
-      func_check_version_match
-
-      test yes != "$build_libtool_libs" \
-        && test yes != "$build_old_libs" \
-        && func_fatal_configuration "not configured to build any kind of library"
-
-      # Darwin sucks
-      eval std_shrext=\"$shrext_cmds\"
-
-      # Only execute mode is allowed to have -dlopen flags.
-      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
-        func_error "unrecognized option '-dlopen'"
-        $ECHO "$help" 1>&2
-        exit $EXIT_FAILURE
-      fi
-
-      # Change the help message to a mode-specific one.
-      generic_help=$help
-      help="Try '$progname --help --mode=$opt_mode' for more information."
-    }
-
-    # Pass back the unparsed argument list
-    func_quote_for_eval ${1+"$@"}
-    libtool_validate_options_result=$func_quote_for_eval_result
-}
-func_add_hook func_validate_options libtool_validate_options
-
-
-# Process options as early as possible so that --help and --version
-# can return quickly.
-func_options ${1+"$@"}
-eval set dummy "$func_options_result"; shift
-
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-magic='%%%MAGIC variable%%%'
-magic_exe='%%%MAGIC EXE variable%%%'
-
-# Global variables.
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# func_generated_by_libtool
-# True iff stdin has been generated by Libtool. This function is only
-# a basic sanity check; it will hardly flush out determined imposters.
-func_generated_by_libtool_p ()
-{
-  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_p file
-# True iff FILE is a libtool '.la' library or '.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool '.la' library or '.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if 'file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case $lalib_p_line in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test yes = "$lalib_p"
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    test -f "$1" &&
-      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_dirname_and_basename "$1" "" "."
-    func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $debug_cmd
-
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$sp$nl
-      eval cmd=\"$cmd\"
-      IFS=$save_ifs
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# 'FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $debug_cmd
-
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case $lt_sysroot:$1 in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result='='$func_stripname_result
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $debug_cmd
-
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	func_append_quoted CC_quoted "$arg"
-      done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_append_quoted CC_quoted "$arg"
-	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
-	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with '--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=$1
-    if test yes = "$build_libtool_libs"; then
-      write_lobj=\'$2\'
-    else
-      write_lobj=none
-    fi
-
-    if test yes = "$build_old_libs"; then
-      write_oldobj=\'$3\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "$write_libobj"
-    }
-}
-
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
-  $debug_cmd
-
-  func_convert_core_file_wine_to_w32_result=$1
-  if test -n "$1"; then
-    # Unfortunately, winepath does not exit with a non-zero error code, so we
-    # are forced to check the contents of stdout. On the other hand, if the
-    # command is not found, the shell will set an exit code of 127 and print
-    # *an error message* to stdout. So we must check for both error code of
-    # zero AND non-empty stdout, which explains the odd construction:
-    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $debug_cmd
-
-  # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=
-  if test -n "$1"; then
-    oldIFS=$IFS
-    IFS=:
-    for func_convert_core_path_wine_to_w32_f in $1; do
-      IFS=$oldIFS
-      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result"; then
-        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $debug_cmd
-
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $debug_cmd
-
-  # awkward: cmd appends spaces to result
-  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/ *$//' -e "$sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $debug_cmd
-
-  if test -z "$2" && test -n "$1"; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  '$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result=$1
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $debug_cmd
-
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    func_error "  '$3'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback.  This is a deliberately simplistic "conversion" and
-    # should not be "improved".  See libtool.info.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result=$3
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $debug_cmd
-
-  case $4 in
-  $1 ) func_to_host_path_result=$3$func_to_host_path_result
-    ;;
-  esac
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via '$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $debug_cmd
-
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $debug_cmd
-
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result=$1
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result=$func_convert_core_msys_to_w32_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-    # LT_CYGPATH in this case.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result=$func_cygpath_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-    func_convert_core_file_wine_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result=$func_cygpath_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via '$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $debug_cmd
-
-  if test -z "$to_host_path_cmd"; then
-    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd=func_convert_path_$func_stripname_result
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $debug_cmd
-
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result=$1
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from ARG.  MSYS
-    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-    # and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result=$func_convert_core_msys_to_w32_result
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# a working winepath.  Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result=$func_cygpath_result
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from
-    # ARG. msys behavior is inconsistent here, cygpath turns them
-    # into '.;' and ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result=$func_cygpath_result
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
-# func_dll_def_p FILE
-# True iff FILE is a Windows DLL '.def' file.
-# Keep in sync with _LT_DLL_DEF_P in libtool.m4
-func_dll_def_p ()
-{
-  $debug_cmd
-
-  func_dll_def_p_tmp=`$SED -n \
-    -e 's/^	 *//' \
-    -e '/^$;.*$*$/d' \
-    -e 's/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p' \
-    -e q \
-    "$1"`
-  test DEF = "$func_dll_def_p_tmp"
-}
-
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $debug_cmd
-
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg=$arg
-	arg_mode=normal
-	;;
-
-      target )
-	libobj=$arg
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify '-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  func_append later " $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs=$IFS; IFS=,
-	  for arg in $args; do
-	    IFS=$save_ifs
-	    func_append_quoted lastarg "$arg"
-	  done
-	  IFS=$save_ifs
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  func_append base_compile " $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg=$srcfile
-	  srcfile=$arg
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with '-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj=$func_basename_result
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.cCFSifmso | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.fF09? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from '$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test yes = "$build_libtool_libs" \
-	  || func_fatal_configuration "cannot build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '~#^*{};<>?"'"'"'	 &()|`$' \
-      && func_warning "libobj name '$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname=$func_basename_result
-    xdir=$func_dirname_result
-    lobj=$xdir$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test yes = "$build_old_libs"; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test no = "$compiler_c_o"; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.^.*$%%'`.$objext
-      lockfile=$output_obj.lock
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test yes = "$need_locks"; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test warn = "$need_locks"; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support '-c' and '-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      func_append removelist " $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    func_append removelist " $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test yes = "$build_libtool_libs"; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test no != "$pic_mode"; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	func_append command " -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test warn = "$need_locks" &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support '-c' and '-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test yes = "$suppress_opt"; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test yes = "$build_old_libs"; then
-      if test yes != "$pic_mode"; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test yes = "$compiler_c_o"; then
-	func_append command " -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      func_append command "$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test warn = "$need_locks" &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support '-c' and '-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test no != "$need_locks"; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $opt_mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname OPTION... --mode=clean RM RM-OPTION... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname OPTION... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a '.o' file suitable for static linking
-  -static           only build a '.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
-
-COMPILE-COMMAND is a command to be used in creating a 'standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix '.c' with the
-library object suffix, '.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname OPTION... --mode=execute COMMAND ARGS...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to '-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname OPTION... --mode=finish LIBDIR...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the '--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname OPTION... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the 'install' or 'cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname OPTION... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  use a list of object files found in FILE to specify objects
-  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT:REVISION:AGE
-                    specify library version info each variable defaults to 0
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
-
-All other options (arguments beginning with '-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in '.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in '.la', then a libtool library is created,
-only library objects ('.lo' files) may be specified, and '-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
-using 'ar' and 'ranlib', or on Windows using 'lib'.
-
-If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname OPTION... --mode=uninstall RM RM-OPTION... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode '$opt_mode'"
-        ;;
-    esac
-
-    echo
-    $ECHO "Try '$progname --help' for more information about other modes."
-}
-
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test : = "$opt_help"; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    $SED '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=$^ *$ .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $debug_cmd
-
-    # The first argument is the command name.
-    cmd=$nonopt
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $opt_dlopen; do
-      test -f "$file" \
-	|| func_fatal_help "'$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "'$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "'$file' was not linked with '-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir=$func_dirname_result
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  func_append dir "/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir=$func_dirname_result
-	;;
-
-      *)
-	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir=$absdir
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic=$magic
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -* | *.la | *.lo ) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file=$progdir/$program
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file=$progdir/$program
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
-    done
-
-    if $opt_dry_run; then
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    else
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd=\$cmd$args
-    fi
-}
-
-test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $debug_cmd
-
-    libs=
-    libdirs=
-    admincmds=
-
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-	func_append libdirs " $opt"
-
-      elif test -f "$opt"; then
-	if func_lalib_unsafe_p "$opt"; then
-	  func_append libs " $opt"
-	else
-	  func_warning "'$opt' is not a valid libtool archive"
-	fi
-
-      else
-	func_fatal_error "invalid argument '$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/$ '$$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
-        done
-      else
-        tmpdir=`func_mktempdir`
-        for lib in $libs; do
-	  $SED -e "$sysroot_cmd s/$ '-LR$=/\1/g; s/$ '$=/\1/g" $lib \
-	    > $tmpdir/tmp-la
-	  mv -f $tmpdir/tmp-la $lib
-	done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_quiet && exit $EXIT_SUCCESS
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-	$ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
-	echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the '$runpath_var' environment variable"
-	echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-	libdir=LIBDIR
-	eval flag=\"$hardcode_libdir_flag_spec\"
-
-	$ECHO "   - use the '$flag' linker flag"
-      fi
-      if test -n "$admincmds"; then
-	$ECHO "   - have your system administrator run these commands:$admincmds"
-      fi
-      if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
-      fi
-      echo
-
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-	solaris2.6789|solaris2.10-9)
-	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	  echo "pages."
-	  ;;
-	*)
-	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-	  ;;
-      esac
-      echo "----------------------------------------------------------------------"
-    fi
-    exit $EXIT_SUCCESS
-}
-
-test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $debug_cmd
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
-       # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac
-    then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *\\\ /cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=false
-    stripme=
-    no_mode=:
-    for arg
-    do
-      arg2=
-      if test -n "$dest"; then
-	func_append files " $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=: ;;
-      -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
-	    arg2=$install_override_mode
-	    no_mode=false
-	  fi
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
-      if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
-      fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the '$prev' option requires an argument"
-
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
-      fi
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=:
-    if $isdir; then
-      destdir=$dest
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir=$func_dirname_result
-      destname=$func_basename_result
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "'$dest' is not a directory"
-    fi
-    case $destdir in
-    \\/* | A-Za-z:\\/*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "'$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic=$magic
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	func_append staticlibs " $file"
-	;;
-
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "'$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append current_libdirs " $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append future_libdirs " $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir=$func_dirname_result
-	func_append dir "$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking '$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname=$1
-	  shift
-
-	  srcname=$realname
-	  test -n "$relink_command" && srcname=${realname}T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme=$stripme
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=
-	      ;;
-	    esac
-	    ;;
-	  os2*)
-	    case $realname in
-	    *_dll.a)
-	      tstripme=
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try 'ln -sf' first, because the 'ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib=$destdir/$realname
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name=$func_basename_result
-	instname=$dir/${name}i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile=$destdir/$destname
-	else
-	  func_basename "$file"
-	  destfile=$func_basename_result
-	  destfile=$destdir/$destfile
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest=$destfile
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to '$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test yes = "$build_old_libs"; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile=$destdir/$destname
-	else
-	  func_basename "$file"
-	  destfile=$func_basename_result
-	  destfile=$destdir/$destfile
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=.exe
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
-
-	  finalize=:
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "'$lib' has not been installed in '$libdir'"
-	      finalize=false
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test no = "$fast_install" && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if $finalize; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file=$func_basename_result
-	        outputname=$tmpdir/$file
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_quiet || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink '$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file=$outputname
-	      else
-	        func_warning "cannot relink '$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%$^/*$$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name=$func_basename_result
-
-      # Set up the ranlib parameters.
-      oldlib=$destdir/$name
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run '$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test install = "$opt_mode" && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $debug_cmd
-
-    my_outputname=$1
-    my_originator=$2
-    my_pic_p=${3-false}
-    my_prefix=`$ECHO "$my_originator" | $SED 's%^a-zA-Z0-9%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms=${my_outputname}S.c
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist=$output_objdir/$my_outputname.nm
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test yes = "$dlself"; then
-	  func_verbose "generating symbol list for '$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
-	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols=$output_objdir/$outputname.exp
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "$SED -e 's/$.*^$$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin* | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from '$dlprefile'"
-	  func_basename "$dlprefile"
-	  name=$func_basename_result
-          case $host in
-	    *cygwin* | *mingw* | *cegcc* )
-	      # if an import library, we need to obtain dlname
-	      if func_win32_import_lib_p "$dlprefile"; then
-	        func_tr_sh "$dlprefile"
-	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=
-	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-	          # Use subshell, to avoid clobbering current variable values
-	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname"; then
-	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename=$func_basename_result
-	          else
-	            # no lafile. user explicitly requested -dlpreopen <import library>.
-	            $sharedlib_from_linklib_cmd "$dlprefile"
-	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-	          fi
-	        fi
-	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename"; then
-	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-	          else
-	            func_warning "Could not compute DLL name from $name"
-	            eval '$ECHO ": $name " >> "$nlist"'
-	          fi
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-	        }
-	      else # not an import lib
-	        $opt_dry_run || {
-	          eval '$ECHO ": $name " >> "$nlist"'
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	        }
-	      fi
-	    ;;
-	    *)
-	      $opt_dry_run || {
-	        eval '$ECHO ": $name " >> "$nlist"'
-	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	      }
-	    ;;
-          esac
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  func_show_eval '$RM "${nlist}I"'
-	  if test -n "$global_symbol_to_import"; then
-	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
-	  fi
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols;\
-"
-
-	  if test -s "$nlist"I; then
-	    echo >> "$output_objdir/$my_dlsyms" "\
-static void lt_syminit(void)
-{
-  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
-  for (; symbol->name; ++symbol)
-    {"
-	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
-	    echo >> "$output_objdir/$my_dlsyms" "\
-    }
-}"
-	  fi
-	  echo >> "$output_objdir/$my_dlsyms" "\
-LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols =
-{ {\"$my_originator\", (void *) 0},"
-
-	  if test -s "$nlist"I; then
-	    echo >> "$output_objdir/$my_dlsyms" "\
-  {\"@INIT@\", (void *) &lt_syminit},"
-	  fi
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) func_append symtab_cflags " $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj=$output_objdir/${my_outputname}S.$objext
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for '$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $debug_cmd
-
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_A-Za-z0-9_+_adl*|A-Za-z0-9_+_adl*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $debug_cmd
-
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
-func_win32_libid ()
-{
-  $debug_cmd
-
-  win32_libid_type=unknown
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      case $nm_interface in
-      "MS dumpbin")
-	if func_cygming_ms_implib_p "$1" ||
-	   func_cygming_gnu_implib_p "$1"
-	then
-	  win32_nmres=import
-	else
-	  win32_nmres=
-	fi
-	;;
-      *)
-	func_to_tool_file "$1" func_convert_file_msys_to_w32
-	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	  $SED -n -e '
-	    1,100{
-		/ I /{
-		    s|.*|import|
-		    p
-		    q
-		}
-	    }'`
-	;;
-      esac
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $debug_cmd
-
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $debug_cmd
-
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:	 *file format pei\{,1\}-/d
-    /^In archive ^:*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/\. \t*$//
-      # Print
-      /./p' |
-    # we now have a list, one entry per line, of the stringified
-    # contents of the appropriate section of all members of the
-    # archive that possess that section. Heuristic: eliminate
-    # all those that have a first or second character that is
-    # a '.' (that is, objdump's representation of an unprintable
-    # character.) This should work for all archives with less than
-    # 0x302f exports -- but will fail for DLLs whose name actually
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $debug_cmd
-
-  if func_cygming_gnu_implib_p "$1"; then
-    # binutils import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1"; then
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=
-  fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $debug_cmd
-
-    f_ex_an_ar_dir=$1; shift
-    f_ex_an_ar_oldlib=$1
-    if test yes = "$lock_old_archive_extraction"; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test yes = "$lock_old_archive_extraction"; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $debug_cmd
-
-    my_gentop=$1; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=
-    my_xlib=
-    my_xabs=
-    my_xdir=
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	\\/* | A-Za-z:\\/*) my_xabs=$my_xlib ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib=$func_basename_result
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir=$my_gentop/$my_xlib_u
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  func_basename "$darwin_archive"
-	  darwin_base_archive=$func_basename_result
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches; do
-	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
-	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
-	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-    done
-
-    func_extract_archives_result=$my_oldobjs
-}
-
-
-# func_emit_wrapper arg=no
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory where it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ that is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options that match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/^/*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"$outputname:$output:\$LINENO: newargv\$lt_dump_args_N: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"$outputname:$output:\$LINENO: newargv0: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"$outputname:$output:\$LINENO: newargv0: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case \" \$* \" in
-  *\\ --lt-*)
-    for lt_wr_arg
-    do
-      case \$lt_wr_arg in
-      --lt-*) ;;
-      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/^/*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/^/*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      \\\\/* | A-Za-z:\\\\/*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *\\\\/$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%\\\\/^\\\\/*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test yes = "$fast_install"; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	\$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# fixup the dll searchpath if we need to.
-	#
-	# Fix the DLL searchpath if we need to.  Do this before prepending
-	# to shlibpath, because on Windows, both are PATH and uninstalled
-	# libraries must come first.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	# Export our shlibpath_var if we have one.
-	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-*/
-EOF
-	    cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
-
-/* declarations of non-ANSI functions */
-#if defined __MINGW32__
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined __CYGWIN__
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined other_platform || defined ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined _MSC_VER
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-#elif defined __MINGW32__
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined __CYGWIN__
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined other platforms ... */
-#endif
-
-#if defined PATH_MAX
-# define LT_PATHMAX PATH_MAX
-#elif defined MAXPATHLEN
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-/* path handling portability macros */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
-  defined __OS2__
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free (stale); stale = 0; } \
-} while (0)
-
-#if defined LT_DEBUGWRAPPER
-static int lt_debug = 1;
-#else
-static int lt_debug = 0;
-#endif
-
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
-EOF
-
-	    cat <<EOF
-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
-# define externally_visible volatile
-#else
-# define externally_visible __attribute__((externally_visible)) volatile
-#endif
-externally_visible const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_path "$temp_rpath"
-	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test -n "$dllsearchpath"; then
-              func_to_host_path "$dllsearchpath:"
-	      cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test yes = "$fast_install"; then
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	    else
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-	    fi
-
-
-	    cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
-
-int
-main (int argc, char *argv)
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  int rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv0));
-  newargz = XMALLOC (char *, (size_t) argc + 1);
-
-  /* very simple arg parsing; don't want to rely on getopt
-   * also, copy all non cwrapper options to newargz, except
-   * argz0, which is handled differently
-   */
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (STREQ (argvi, dumpscript_opt))
-	{
-EOF
-	    case $host in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
-		;;
-	      esac
-
-	    cat <<"EOF"
-	  lt_dump_script (stdout);
-	  return 0;
-	}
-      if (STREQ (argvi, debug_opt))
-	{
-          lt_debug = 1;
-          continue;
-	}
-      if (STREQ (argvi, ltwrapper_option_prefix))
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal (__FILE__, __LINE__,
-		    "unrecognized %s option: '%s'",
-                    ltwrapper_option_prefix, argvi);
-        }
-      /* otherwise ... */
-      newargz++newargc = xstrdup (argvi);
-    }
-  newargz++newargc = NULL;
-
-EOF
-	    cat <<EOF
-  /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
-EOF
-	    cat <<"EOF"
-  lt_debugprintf (__FILE__, __LINE__, "(main) argv0: %s\n", argv0);
-  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
-
-  tmp_pathspec = find_executable (argv0);
-  if (tmp_pathspec == NULL)
-    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv0);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (before symlink chase) at: %s\n",
-		  tmp_pathspec);
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (after symlink chase) at: %s\n",
-		  actual_cwrapper_path);
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(main) libtool target name: %s\n",
-		  target_name);
-EOF
-
-	    cat <<EOF
-  newargz0 =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz0, actual_cwrapper_path);
-  strcat (newargz0, "$objdir");
-  strcat (newargz0, "/");
-EOF
-
-	    cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz0);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz0, actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz0, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
-	    esac
-
-	    cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-     because on Windows, both *_VARNAMEs are PATH but uninstalled
-     libraries must come first. */
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-
-  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-		  nonnull (lt_argv_zero));
-  for (i = 0; i < newargc; i++)
-    {
-      lt_debugprintf (__FILE__, __LINE__, "(main) newargz%d: %s\n",
-		      i, nonnull (newargzi));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-  /* execv doesn't actually work on mingw as expected on unix */
-  newargz = prepare_spawn (newargz);
-  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      lt_debugprintf (__FILE__, __LINE__,
-		      "(main) failed to launch target \"%s\": %s\n",
-		      lt_argv_zero, nonnull (strerror (errno)));
-      return 127;
-    }
-  return rval;
-EOF
-		;;
-	      *)
-		cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
-		;;
-	    esac
-
-	    cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal (__FILE__, __LINE__, "memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined HAVE_DOS_BASED_FILE_SYSTEM
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name0) && name1 == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmpLT_PATHMAX + 1;
-  size_t tmp_len;
-  char *concat_name;
-
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined HAVE_DOS_BASED_FILE_SYSTEM
-  if (isalpha ((unsigned char) wrapper0) && wrapper1 == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper0))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined HAVE_DOS_BASED_FILE_SYSTEM
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = (size_t) (q - p);
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_nametmp_len = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_namep_len = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_nametmp_len = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char bufLT_PATHMAX;
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (STREQ (str, pat))
-	*str = '\0';
-    }
-  return str;
-}
-
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
-static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *file, int line, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-  va_end (ap);
-}
-
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    size_t len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      size_t orig_value_len = strlen (orig_value);
-      size_t add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      size_t len = strlen (new_value);
-      while ((len > 0) && IS_PATH_SEPARATOR (new_valuelen-1))
-        {
-          new_value--len = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-EOF
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argvargc != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argvi;
-
-      if (string0 == '\0')
-	new_argvi = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-	{
-	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-	  size_t length;
-	  unsigned int backslashes;
-	  const char *s;
-	  char *quoted_string;
-	  char *p;
-
-	  length = 0;
-	  backslashes = 0;
-	  if (quote_around)
-	    length++;
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		length += backslashes + 1;
-	      length++;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    length += backslashes + 1;
-
-	  quoted_string = XMALLOC (char, length + 1);
-
-	  p = quoted_string;
-	  backslashes = 0;
-	  if (quote_around)
-	    *p++ = '"';
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		{
-		  unsigned int j;
-		  for (j = backslashes + 1; j > 0; j--)
-		    *p++ = '\\';
-		}
-	      *p++ = c;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    {
-	      unsigned int j;
-	      for (j = backslashes; j > 0; j--)
-		*p++ = '\\';
-	      *p++ = '"';
-	    }
-	  *p = '\0';
-
-	  new_argvi = quoted_string;
-	}
-      else
-	new_argvi = (char *) string;
-    }
-  new_argvargc = NULL;
-
-  return new_argv;
-}
-EOF
-		;;
-	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-	      $SED -n -e '
-s/^$.\{79\}$$..*$/\1\
-\2/
-h
-s/$\\"$/\\\1/g
-s/$/\\n/
-s/$^\n*$.*/  fputs ("\1", f);/p
-g
-D'
-            cat <<"EOF"
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $debug_cmd
-
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
-# func_suncc_cstd_abi
-# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
-# Several compiler flags select an ABI that is incompatible with the
-# Cstd library. Avoid specifying it if any are in CXXFLAGS.
-func_suncc_cstd_abi ()
-{
-    $debug_cmd
-
-    case " $compile_command " in
-    *" -compat=g "*|*\ -std=c++0-90-9\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
-      suncc_use_cstd_abi=no
-      ;;
-    *)
-      suncc_use_cstd_abi=yes
-      ;;
-    esac
-}
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $debug_cmd
-
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # what system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll that has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    os2dllname=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=false
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module=$wl-single_module
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test yes != "$build_libtool_libs" \
-	  && func_fatal_configuration "cannot build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg=$1
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	bindir)
-	  bindir=$arg
-	  prev=
-	  continue
-	  ;;
-	dlfiles|dlprefiles)
-	  $preload || {
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=:
-	  }
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test no = "$dlself"; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test dlprefiles = "$prev"; then
-	      dlself=yes
-	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test dlfiles = "$prev"; then
-	      func_append dlfiles " $arg"
-	    else
-	      func_append dlprefiles " $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols=$arg
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file '$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex=$arg
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) func_append deplibs " $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir=$arg
-	  prev=
-	  continue
-	  ;;
-	mllvm)
-	  # Clang does not use LLVM to link, so we can simply discard any
-	  # '-mllvm $arg' options when doing the link step.
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      func_append moreargs " $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test none = "$pic_object" &&
-		   test none = "$non_pic_object"; then
-		  func_fatal_error "cannot find name of object for '$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir=$func_dirname_result
-
-		if test none != "$pic_object"; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object=$xdir$pic_object
-
-		  if test dlfiles = "$prev"; then
-		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
-		      func_append dlfiles " $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test dlprefiles = "$prev"; then
-		    # Preload the old-style object.
-		    func_append dlprefiles " $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg=$pic_object
-		fi
-
-		# Non-PIC object.
-		if test none != "$non_pic_object"; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object=$xdir$non_pic_object
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test none = "$pic_object"; then
-		    arg=$non_pic_object
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object=$pic_object
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir=$func_dirname_result
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "'$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file '$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	os2dllname)
-	  os2dllname=$arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex=$arg
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release=-$arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  \\/* | A-Za-z:\\/*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test rpath = "$prev"; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) func_append rpath " $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) func_append xrpath " $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds=$arg
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  func_append weak_libs " $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg=$arg
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "'-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test X-export-symbols = "X$arg"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -LA-ZA-Z*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname "-L" '' "$arg"
-	if test -z "$func_stripname_result"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between '-L' and '$1'"
-	  else
-	    func_fatal_error "need path for '-L' option"
-	  fi
-	fi
-	func_resolve_sysroot "$func_stripname_result"
-	dir=$func_resolve_sysroot_result
-	# We need an absolute path.
-	case $dir in
-	\\/* | A-Za-z:\\/*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of '$dir'"
-	  dir=$absdir
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
-	*)
-	  # Preserve sysroot, but never include relative directories
-	  case $dir in
-	    \\/* | A-Za-z:\\/* | =*) func_append deplibs " $arg" ;;
-	    *) func_append deplibs " -L$dir" ;;
-	  esac
-	  func_append lib_search_path " $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) func_append dllsearchpath ":$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.012)
-	    # Rhapsody C and math libraries are in the System framework
-	    func_append deplibs " System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  esac
-	elif test X-lc_r = "X$arg"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	func_append deplibs " $arg"
-	continue
-	;;
-
-      -mllvm)
-	prev=mllvm
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model arg to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) func_append new_inherited_linker_flags " $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module=$wl-multi_module
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "'-no-install' is ignored for $host"
-	  func_warning "assuming '-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -os2dllname)
-	prev=os2dllname
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	\\/* | A-Za-z:\\/*) ;;
-	=*)
-	  func_stripname '=' '' "$dir"
-	  dir=$lt_sysroot$func_stripname_result
-	  ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) func_append xrpath " $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs=$IFS; IFS=,
-	for flag in $args; do
-	  IFS=$save_ifs
-          func_quote_for_eval "$flag"
-	  func_append arg " $func_quote_for_eval_result"
-	  func_append compiler_flags " $func_quote_for_eval_result"
-	done
-	IFS=$save_ifs
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs=$IFS; IFS=,
-	for flag in $args; do
-	  IFS=$save_ifs
-          func_quote_for_eval "$flag"
-	  func_append arg " $wl$func_quote_for_eval_result"
-	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-	  func_append linker_flags " $func_quote_for_eval_result"
-	done
-	IFS=$save_ifs
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
-	;;
-
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips0-9      enable 64-bit mode for the SGI compiler
-      # -r0-90-9*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t45*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # -fstack-protector*   stack protector flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      # -specs=*             GCC specs files
-      # -stdlib=*            select c++ std lib with clang
-      # -fsanitize=*         Clang/GCC memory and address sanitizer
-      # -fuse-ld=*           Linker select flags for GCC
-      # -static-*            direct GCC to link specific libraries statically
-      # -fcilkplus           Cilk Plus language extension features for C/C++
-      -64|-mips0-9|-r0-90-9*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t45*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-      -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus)
-        func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        func_append compiler_flags " $arg"
-        continue
-        ;;
-
-      -Z*)
-        if test os2 = "`expr $host : '.*$os2$'`"; then
-          # OS/2 uses -Zxxx to specify OS/2-specific options
-	  compiler_flags="$compiler_flags $arg"
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  case $arg in
-	  -Zlinker | -Zstack)
-	    prev=xcompiler
-	    ;;
-	  esac
-	  continue
-        else
-	  # Otherwise treat like 'Some other compiler flag' below
-	  func_quote_for_eval "$arg"
-	  arg=$func_quote_for_eval_result
-        fi
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
-	;;
-
-      *.$objext)
-	# A standard object.
-	func_append objs " $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test none = "$pic_object" &&
-	     test none = "$non_pic_object"; then
-	    func_fatal_error "cannot find name of object for '$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir=$func_dirname_result
-
-	  test none = "$pic_object" || {
-	    # Prepend the subdirectory the object is found in.
-	    pic_object=$xdir$pic_object
-
-	    if test dlfiles = "$prev"; then
-	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
-		func_append dlfiles " $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test dlprefiles = "$prev"; then
-	      # Preload the old-style object.
-	      func_append dlprefiles " $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg=$pic_object
-	  }
-
-	  # Non-PIC object.
-	  if test none != "$non_pic_object"; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object=$xdir$non_pic_object
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test none = "$pic_object"; then
-	      arg=$non_pic_object
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object=$pic_object
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir=$func_dirname_result
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "'$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	func_append deplibs " $arg"
-	func_append old_deplibs " $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	func_resolve_sysroot "$arg"
-	if test dlfiles = "$prev"; then
-	  # This library was specified with -dlopen.
-	  func_append dlfiles " $func_resolve_sysroot_result"
-	  prev=
-	elif test dlprefiles = "$prev"; then
-	  # The library was specified with -dlpreopen.
-	  func_append dlprefiles " $func_resolve_sysroot_result"
-	  prev=
-	else
-	  func_append deplibs " $func_resolve_sysroot_result"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the '$prevarg' option requires an argument"
-
-    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname=$func_basename_result
-    libobjs_save=$libobjs
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    # Definition is injected by LT_CONFIG during libtool generation.
-    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
-
-    func_dirname "$output" "/" ""
-    output_objdir=$func_dirname_result$objdir
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_preserve_dup_deps; then
-	case "$libs " in
-	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	esac
-      fi
-      func_append libs " $deplib"
-    done
-
-    if test lib = "$linkmode"; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-	  esac
-	  func_append pre_post_deps " $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=false
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test lib,link = "$linkmode,$pass"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs=$tmp_deplibs
-      fi
-
-      if test lib,link = "$linkmode,$pass" ||
-	 test prog,scan = "$linkmode,$pass"; then
-	libs=$deplibs
-	deplibs=
-      fi
-      if test prog = "$linkmode"; then
-	case $pass in
-	dlopen) libs=$dlfiles ;;
-	dlpreopen) libs=$dlprefiles ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
-	esac
-      fi
-      if test lib,dlpreopen = "$linkmode,$pass"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  func_resolve_sysroot "$lib"
-	  case $lib in
-	  *.la)	func_source "$func_resolve_sysroot_result" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) func_append deplibs " $deplib" ;;
-	    esac
-	  done
-	done
-	libs=$dlprefiles
-      fi
-      if test dlopen = "$pass"; then
-	# Collect dlpreopened libraries
-	save_deplibs=$deplibs
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=false
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test prog,link = "$linkmode,$pass"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    func_append compiler_flags " $deplib"
-	    if test lib = "$linkmode"; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test lib != "$linkmode" && test prog != "$linkmode"; then
-	    func_warning "'-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test lib = "$linkmode"; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib=$searchdir/lib$name$search_ext
-	      if test -f "$lib"; then
-		if test .la = "$search_ext"; then
-		  found=:
-		else
-		  found=false
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if $found; then
-	    # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll=$l
-		  done
-		  if test "X$ll" = "X$old_library"; then # only static version available
-		    found=false
-		    func_dirname "$lib" "" "."
-		    ladir=$func_dirname_result
-		    lib=$ladir/$old_library
-		    if test prog,link = "$linkmode,$pass"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  else
-	    # deplib doesn't seem to be a libtool library
-	    if test prog,link = "$linkmode,$pass"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test prog,link = "$linkmode,$pass"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test lib = "$linkmode"; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test conv = "$pass" && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  prog)
-	    if test conv = "$pass"; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test scan = "$pass"; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  *)
-	    func_warning "'-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test link = "$pass"; then
-	    func_stripname '-R' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    dir=$func_resolve_sysroot_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) func_append xrpath " $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
-	*.$libext)
-	  if test conv = "$pass"; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=false
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=:
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=:
-		;;
-	      esac
-	      if $valid_a_lib; then
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      else
-		echo
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not use here."
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test link != "$pass"; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test conv = "$pass"; then
-	    deplibs="$deplib $deplibs"
-	  elif test prog = "$linkmode"; then
-	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      func_append newdlprefiles " $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      func_append newdlfiles " $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=:
-	  continue
-	  ;;
-	esac # case $deplib
-
-	$found || test -f "$lib" \
-	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "'$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir=$func_dirname_result
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework $^ $*$/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
-	if test lib,link = "$linkmode,$pass" ||
-	   test prog,scan = "$linkmode,$pass" ||
-	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
-	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-	fi
-
-	if test conv = "$pass"; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for '$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    func_append convenience " $ladir/$objdir/$old_library"
-	    func_append old_convenience " $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_preserve_dup_deps; then
-		case "$tmp_libs " in
-		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-		esac
-	      fi
-	      func_append tmp_libs " $deplib"
-	    done
-	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
-	    func_fatal_error "'$lib' is not a convenience library"
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	if test -n "$old_library" &&
-	   { test yes = "$prefer_static_libs" ||
-	     test built,no = "$prefer_static_libs,$installed"; }; then
-	  linklib=$old_library
-	else
-	  for l in $old_library $library_names; do
-	    linklib=$l
-	  done
-	fi
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for '$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test dlopen = "$pass"; then
-	  test -z "$libdir" \
-	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
-	  if test -z "$dlname" ||
-	     test yes != "$dlopen_support" ||
-	     test no = "$build_libtool_libs"
-	  then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    func_append dlprefiles " $lib $dependency_libs"
-	  else
-	    func_append newdlfiles " $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	\\/* | A-Za-z:\\/*) abs_ladir=$ladir ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of '$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir=$ladir
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname=$func_basename_result
-
-	# Find the relevant object directory and library name.
-	if test yes = "$installed"; then
-	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library '$lib' was moved."
-	    dir=$ladir
-	    absdir=$abs_ladir
-	    libdir=$abs_ladir
-	  else
-	    dir=$lt_sysroot$libdir
-	    absdir=$lt_sysroot$libdir
-	  fi
-	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir=$ladir
-	    absdir=$abs_ladir
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  else
-	    dir=$ladir/$objdir
-	    absdir=$abs_ladir/$objdir
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test dlpreopen = "$pass"; then
-	  if test -z "$libdir" && test prog = "$linkmode"; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
-	  fi
-	  case $host in
-	    # special handling for platforms with PE-DLLs.
-	    *cygwin* | *mingw* | *cegcc* )
-	      # Linker will automatically link against shared library if both
-	      # static and shared are present.  Therefore, ensure we extract
-	      # symbols from the import library if a shared library is present
-	      # (otherwise, the dlopen module name will be incorrect).  We do
-	      # this by putting the import library name into $newdlprefiles.
-	      # We recover the dlopen module name by 'saving' the la file
-	      # name in a special purpose variable, and (later) extracting the
-	      # dlname from the la file.
-	      if test -n "$dlname"; then
-	        func_tr_sh "$dir/$linklib"
-	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-	        func_append newdlprefiles " $dir/$linklib"
-	      else
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      fi
-	    ;;
-	    * )
-	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-	      # are required to link).
-	      if test -n "$old_library"; then
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-	      elif test -n "$dlname"; then
-	        func_append newdlprefiles " $dir/$dlname"
-	      else
-	        func_append newdlprefiles " $dir/$linklib"
-	      fi
-	    ;;
-	  esac
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test lib = "$linkmode"; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test prog,link = "$linkmode,$pass"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test prog = "$linkmode" && test link != "$pass"; then
-	  func_append newlib_search_path " $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=false
-	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
-	     test no = "$build_libtool_libs"; then
-	    linkalldeplibs=:
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         func_resolve_sysroot "$func_stripname_result"
-	         func_append newlib_search_path " $func_resolve_sysroot_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if $linkalldeplibs; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_preserve_dup_deps; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test prog,link = "$linkmode,$pass"; then
-	  if test -n "$library_names" &&
-	     { { test no = "$prefer_static_libs" ||
-	         test built,yes = "$prefer_static_libs,$installed"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
-	      # Make sure the rpath contains only unique directories.
-	      case $temp_rpath: in
-	      *"$absdir:"*) ;;
-	      *) func_append temp_rpath "$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if $alldeplibs &&
-	     { test pass_all = "$deplibs_check_method" ||
-	       { test yes = "$build_libtool_libs" &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test built = "$use_static_libs" && test yes = "$installed"; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* | *os2*)
-	      # No point in relinking DLLs because paths are not encoded
-	      func_append notinst_deplibs " $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test no = "$installed"; then
-	      func_append notinst_deplibs " $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule=$dlpremoduletest
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
-	    echo
-	    if test prog = "$linkmode"; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test lib = "$linkmode" &&
-	     test yes = "$hardcode_into_libs"; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname=$1
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname=$dlname
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc* | *os2*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix=-$major
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname=$realname
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot=$soname
-	    func_basename "$soroot"
-	    soname=$func_basename_result
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from '$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for '$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test no = "$hardcode_direct"; then
-		add=$dir/$linklib
-		case $host in
-		  *-*-sco3.2v5.0.024*) add_dir=-L$dir ;;
-		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.01.10* | \
-		    *-*-unixware7*) add_dir=-L$dir ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we cannot
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": ^:* bundle" >/dev/null; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library"; then
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
-			else
-			  add=$dir/$old_library
-			fi
-		      elif test -n "$old_library"; then
-			add=$dir/$old_library
-		      fi
-		    fi
-		esac
-	      elif test no = "$hardcode_minus_L"; then
-		case $host in
-		*-*-sunos*) add_shlibpath=$dir ;;
-		esac
-		add_dir=-L$dir
-		add=-l$name
-	      elif test no = "$hardcode_shlibpath_var"; then
-		add_shlibpath=$dir
-		add=-l$name
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test yes = "$hardcode_direct" &&
-	         test no = "$hardcode_direct_absolute"; then
-		add=$dir/$linklib
-	      elif test yes = "$hardcode_minus_L"; then
-		add_dir=-L$absdir
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    \\/*)
-		      func_append add_dir " -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add=-l$name
-	      elif test yes = "$hardcode_shlibpath_var"; then
-		add_shlibpath=$dir
-		add=-l$name
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test yes != "$lib_linked"; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test prog = "$linkmode"; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test yes != "$hardcode_direct" &&
-		 test yes != "$hardcode_minus_L" &&
-		 test yes = "$hardcode_shlibpath_var"; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) func_append finalize_shlibpath "$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test yes = "$hardcode_direct" &&
-	       test no = "$hardcode_direct_absolute"; then
-	      add=$libdir/$linklib
-	    elif test yes = "$hardcode_minus_L"; then
-	      add_dir=-L$libdir
-	      add=-l$name
-	    elif test yes = "$hardcode_shlibpath_var"; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) func_append finalize_shlibpath "$libdir:" ;;
-	      esac
-	      add=-l$name
-	    elif test yes = "$hardcode_automatic"; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib"; then
-		add=$inst_prefix_dir$libdir/$linklib
-	      else
-		add=$libdir/$linklib
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir=-L$libdir
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  \\/*)
-		    func_append add_dir " -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add=-l$name
-	    fi
-
-	    if test prog = "$linkmode"; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test prog = "$linkmode"; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test unsupported != "$hardcode_direct"; then
-	    test -n "$old_library" && linklib=$old_library
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test yes = "$build_libtool_libs"; then
-	  # Not a shared library
-	  if test pass_all != "$deplibs_check_method"; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    echo
-	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	    if test yes = "$module"; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** 'nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test no = "$build_old_libs"; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test lib = "$linkmode"; then
-	  if test -n "$dependency_libs" &&
-	     { test yes != "$hardcode_into_libs" ||
-	       test yes = "$build_old_libs" ||
-	       test yes = "$link_static"; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) func_append xrpath " $temp_xrpath";;
-		   esac;;
-	      *) func_append temp_deplibs " $libdir";;
-	      esac
-	    done
-	    dependency_libs=$temp_deplibs
-	  fi
-
-	  func_append newlib_search_path " $absdir"
-	  # Link against this library
-	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-	    if $opt_preserve_dup_deps; then
-	      case "$tmp_libs " in
-	      *" $func_resolve_sysroot_result "*)
-                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $func_resolve_sysroot_result"
-	  done
-
-	  if test no != "$link_all_deplibs"; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path=$deplib ;;
-	      *.la)
-	        func_resolve_sysroot "$deplib"
-	        deplib=$func_resolve_sysroot_result
-	        func_dirname "$deplib" "" "."
-		dir=$func_dirname_result
-		# We need an absolute path.
-		case $dir in
-		\\/* | A-Za-z:\\/*) absdir=$dir ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of '$dir'"
-		    absdir=$dir
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`$SED -n -e 's/^library_names=$.*$$/\1/p' $deplib`
-		  if test -n "$deplibrary_names"; then
-		    for tmp in $deplibrary_names; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl"; then
-		      depdepl=$absdir/$objdir/$depdepl
-		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
-		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path=-L$absdir/$objdir
-		  ;;
-		esac
-		else
-		  eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "'$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "'$deplib' seems to be moved"
-
-		  path=-L$absdir
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test link = "$pass"; then
-	if test prog = "$linkmode"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs=$newdependency_libs
-      if test dlpreopen = "$pass"; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test dlopen != "$pass"; then
-	test conv = "$pass" || {
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) func_append lib_search_path " $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	}
-
-	if test prog,link = "$linkmode,$pass"; then
-	  vars="compile_deplibs finalize_deplibs"
-	else
-	  vars=deplibs
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) func_append tmp_libs " $deplib" ;;
-	      esac
-	      ;;
-	    *) func_append tmp_libs " $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-
-      # Add Sun CC postdeps if required:
-      test CXX = "$tagname" && {
-        case $host_os in
-        linux*)
-          case `$CC -V 2>&1 | sed 5q` in
-          *Sun\ C*) # Sun C++ 5.9
-            func_suncc_cstd_abi
-
-            if test no != "$suncc_use_cstd_abi"; then
-              func_append postdeps ' -library=Cstd -library=Crun'
-            fi
-            ;;
-          esac
-          ;;
-
-        solaris*)
-          func_cc_basename "$CC"
-          case $func_cc_basename_result in
-          CC* | sunCC*)
-            func_suncc_cstd_abi
-
-            if test no != "$suncc_use_cstd_abi"; then
-              func_append postdeps ' -library=Cstd -library=Crun'
-            fi
-            ;;
-          esac
-          ;;
-        esac
-      }
-
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=
-	  ;;
-	esac
-	if test -n "$i"; then
-	  func_append tmp_libs " $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test prog = "$linkmode"; then
-      dlfiles=$newdlfiles
-    fi
-    if test prog = "$linkmode" || test lib = "$linkmode"; then
-      dlprefiles=$newdlprefiles
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
-	func_warning "'-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "'-l' and '-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "'-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "'-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "'-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "'-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "'-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs=$output
-      func_append objs "$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form 'libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test no = "$module" \
-	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
-
-	if test no != "$need_lib_prefix"; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test pass_all != "$deplibs_check_method"; then
-	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
-	else
-	  echo
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  func_append libobjs " $objs"
-	fi
-      fi
-
-      test no = "$dlself" \
-	|| func_warning "'-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test 1 -lt "$#" \
-	&& func_warning "ignoring multiple '-rpath's for a libtool library"
-
-      install_libdir=$1
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test yes = "$build_libtool_libs"; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a '.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "'-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs=$IFS; IFS=:
-	set dummy $vinfo 0 0 0
-	shift
-	IFS=$save_ifs
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to '-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major=$1
-	  number_minor=$2
-	  number_revision=$3
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # that has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  # correct linux to gnu/linux during the next big refactor
-	  darwin|freebsd-elf|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age=$number_minor
-	    revision=$number_revision
-	    ;;
-	  freebsd-aout|qnx|sunos)
-	    current=$number_major
-	    revision=$number_minor
-	    age=0
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age=$number_minor
-	    revision=$number_minor
-	    lt_irix_increment=no
-	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type '$version_type'"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current=$1
-	  revision=$2
-	  age=$3
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|1-9|1-90-9|1-90-90-9|1-90-90-90-9|1-90-90-90-90-9) ;;
-	*)
-	  func_error "CURRENT '$current' must be a nonnegative integer"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|1-9|1-90-9|1-90-90-9|1-90-90-90-9|1-90-90-90-90-9) ;;
-	*)
-	  func_error "REVISION '$revision' must be a nonnegative integer"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|1-9|1-90-9|1-90-90-9|1-90-90-90-9|1-90-90-90-90-9) ;;
-	*)
-	  func_error "AGE '$age' must be a nonnegative integer"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE '$age' is greater than the current interface number '$current'"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=$major.$age.$revision
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-          # On Darwin other compilers
-          case $CC in
-              nagfor*)
-                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
-                  ;;
-              *)
-                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-                  ;;
-          esac
-	  ;;
-
-	freebsd-aout)
-	  major=.$current
-	  versuffix=.$current.$revision
-	  ;;
-
-	freebsd-elf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=$major.$age.$revision
-	  ;;
-
-	irix | nonstopux)
-	  if test no = "$lt_irix_increment"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring=$verstring_prefix$major.$revision
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test 0 -ne "$loop"; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring=$verstring_prefix$major.$iface:$verstring
-	  done
-
-	  # Before this point, $major must not contain '.'.
-	  major=.$major
-	  versuffix=$major.$revision
-	  ;;
-
-	linux) # correct to gnu/linux during the next big refactor
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=$major.$age.$revision
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=.$current.$age.$revision
-	  verstring=$current.$age.$revision
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test 0 -ne "$loop"; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring=$verstring:$iface.0
-	  done
-
-	  # Make executables depend on our current version.
-	  func_append verstring ":$current.0"
-	  ;;
-
-	qnx)
-	  major=.$current
-	  versuffix=.$current
-	  ;;
-
-	sco)
-	  major=.$current
-	  versuffix=.$current
-	  ;;
-
-	sunos)
-	  major=.$current
-	  versuffix=.$current.$revision
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 file systems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix=-$major
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type '$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring=0.0
-	    ;;
-	  esac
-	  if test no = "$need_version"; then
-	    versuffix=
-	  else
-	    versuffix=.0.0
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test yes,no = "$avoid_version,$need_version"; then
-	  major=
-	  versuffix=
-	  verstring=
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test yes = "$allow_undefined"; then
-	  if test unsupported = "$allow_undefined_flag"; then
-	    if test yes = "$build_old_libs"; then
-	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
-	      build_libtool_libs=no
-	    else
-	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
-	    fi
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag=$no_undefined_flag
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" :
-      func_append libobjs " $symfileobj"
-      test " " = "$libobjs" && libobjs=
-
-      if test relink != "$opt_mode"; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
-	       if test -n "$precious_files_regex"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       func_append removelist " $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
-	func_append oldlibs " $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  func_replace_sysroot "$libdir"
-	  func_append temp_xrpath " -R$func_replace_sysroot_result"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles=$dlfiles
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) func_append dlfiles " $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles=$dlprefiles
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) func_append dlprefiles " $lib" ;;
-	esac
-      done
-
-      if test yes = "$build_libtool_libs"; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.012)
-	    # Rhapsody C library is in the System framework
-	    func_append deplibs " System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test yes = "$build_libtool_need_lc"; then
-	      func_append deplibs " -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=
-	versuffix=
-	major=
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    func_append newdeplibs " $i"
-		    i=
-		    ;;
-		  esac
-		fi
-		if test -n "$i"; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
-		    func_append newdeplibs " $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which I believe you do not have"
-		    echo "*** because a test_compile did reveal that the linker did not use it for"
-		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      func_append newdeplibs " $i"
-		      i=
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i"; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
-		      func_append newdeplibs " $i"
-		    else
-		      droppeddeps=yes
-		      echo
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      echo "*** I have the capability to make that library automatically link in when"
-		      echo "*** you link to this library.  But I can only do this if you have a"
-		      echo "*** shared version of the library, which you do not appear to have"
-		      echo "*** because a test_compile did reveal that the linker did not use this one"
-		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  echo
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "*** make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib"; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		if test -n "$file_magic_glob"; then
-		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-		else
-		  libnameglob=$libname
-		fi
-		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test yes = "$want_nocaseglob"; then
-		    shopt -s nocaseglob
-		    potential_libs=`ls $i/$libnameglob.-* 2>/dev/null`
-		    $nocaseglob
-		  else
-		    potential_libs=`ls $i/$libnameglob.-* 2>/dev/null`
-		  fi
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib=$potent_lib
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
-			case $potliblink in
-			\\/* | A-Za-z:\\/*) potlib=$potliblink;;
-			*) potlib=`$ECHO "$potlib" | $SED 's|^/*$||'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			func_append newdeplibs " $a_deplib"
-			a_deplib=
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib"; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib"; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib"; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname.-* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib=$potent_lib # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      func_append newdeplibs " $a_deplib"
-		      a_deplib=
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib"; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib"; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=
-	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -LR^ *//g'`
-	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-	    for i in $predeps $postdeps; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
-	    done
-	  fi
-	  case $tmp_deplibs in
-	  *!\	\ *)
-	    echo
-	    if test none = "$deplibs_check_method"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	    ;;
-	  esac
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.012)
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test yes = "$droppeddeps"; then
-	  if test yes = "$module"; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test no = "$build_old_libs"; then
-	      oldlibs=$output_objdir/$libname.$libext
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    if test no = "$allow_undefined"; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
-	      if test no = "$build_old_libs"; then
-		oldlibs=$output_objdir/$libname.$libext
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      deplibs=$new_libs
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test yes = "$build_libtool_libs"; then
-	# Remove $wl instances when linking with ld.
-	# FIXME: should test the right _cmds variable.
-	case $archive_cmds in
-	  *\$LD\ *) wl= ;;
-        esac
-	if test yes = "$hardcode_into_libs"; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath=$finalize_rpath
-	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		func_replace_sysroot "$libdir"
-		libdir=$func_replace_sysroot_result
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs=$libdir
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		func_append dep_rpath " $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir=$hardcode_libdirs
-	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      func_append rpath "$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath=$finalize_shlibpath
-	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname=$1
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname=$realname
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib=$output_objdir/$realname
-	linknames=
-	for link
-	do
-	  func_append linknames " $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols=$output_objdir/$libname.uexp
-	  func_append delfiles " $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    func_dll_def_p "$export_symbols" || {
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols=$export_symbols
-	      export_symbols=
-	      always_export_symbols=yes
-	    }
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for '$libname.la'"
-	    export_symbols=$output_objdir/$libname.exp
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs=$IFS; IFS='~'
-	    for cmd1 in $cmds; do
-	      IFS=$save_ifs
-	      # Take the normal branch if the nm_file_list_spec branch
-	      # doesn't work or if tool conversion is not needed.
-	      case $nm_file_list_spec~$to_tool_file_cmd in
-		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-		  try_normal_branch=yes
-		  eval cmd=\"$cmd1\"
-		  func_len " $cmd"
-		  len=$func_len_result
-		  ;;
-		*)
-		  try_normal_branch=no
-		  ;;
-	      esac
-	      if test yes = "$try_normal_branch" \
-		 && { test "$len" -lt "$max_cmd_len" \
-		      || test "$max_cmd_len" -le -1; }
-	      then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      elif test -n "$nm_file_list_spec"; then
-		func_basename "$output"
-		output_la=$func_basename_result
-		save_libobjs=$libobjs
-		save_output=$output
-		output=$output_objdir/$output_la.nm
-		func_to_tool_file "$output"
-		libobjs=$nm_file_list_spec$func_to_tool_file_result
-		func_append delfiles " $output"
-		func_verbose "creating $NM input file list: $output"
-		for obj in $save_libobjs; do
-		  func_to_tool_file "$obj"
-		  $ECHO "$func_to_tool_file_result"
-		done > "$output"
-		eval cmd=\"$cmd1\"
-		func_show_eval "$cmd" 'exit $?'
-		output=$save_output
-		libobjs=$save_libobjs
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS=$save_ifs
-	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols=$export_symbols
-	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands, which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/ ,DATA/!d;s,$.*$$ \,.*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    func_append tmp_deplibs " $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs=$tmp_deplibs
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test yes = "$compiler_needs_object" &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop=$output_objdir/${outputname}x
-	    func_append generated " $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    func_append libobjs " $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  func_append linker_flags " $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test relink = "$opt_mode"; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test yes = "$module" && test -n "$module_cmds"; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test : != "$skipped_export" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
-	    output=$output_objdir/$output_la.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    echo ')' >> $output
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
-	    output=$output_objdir/$output_la.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test yes = "$compiler_needs_object"; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-$k.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test -z "$objlist" ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test 1 -eq "$k"; then
-		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-$k.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-$k.$objext
-		  objlist=" $obj"
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	      func_append delfiles " $output"
-
-	    else
-	      output=
-	    fi
-
-	    ${skipped_export-false} && {
-	      func_verbose "generating symbol list for '$libname.la'"
-	      export_symbols=$output_objdir/$libname.exp
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    }
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs=$IFS; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS=$save_ifs
-	      $opt_quiet || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test relink = "$opt_mode"; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS=$save_ifs
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          ${skipped_export-false} && {
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols=$export_symbols
-	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
-	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands, which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/ ,DATA/!d;s,$.*$$ \,.*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  }
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test yes = "$module" && test -n "$module_cmds"; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop=$output_objdir/${outputname}x
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append libobjs " $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs=$IFS; IFS='~'
-	for cmd in $cmds; do
-	  IFS=$sp$nl
-	  eval cmd=\"$cmd\"
-	  IFS=$save_ifs
-	  $opt_quiet || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test relink = "$opt_mode"; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS=$save_ifs
-
-	# Restore the uninstalled library and exit
-	if test relink = "$opt_mode"; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test yes = "$module" || test yes = "$export_dynamic"; then
-	  # On all known operating systems, these are identical.
-	  dlname=$soname
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
-	func_warning "'-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "'-l' and '-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "'-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "'-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "'-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "'-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj=$output
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # if reload_cmds runs $LD directly, get rid of -Wl from
-      # whole_archive_flag_spec and hope we can get by with turning comma
-      # into space.
-      case $reload_cmds in
-        *\$LD\ \$*) wl= ;;
-      esac
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
-	else
-	  gentop=$output_objdir/${obj}x
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # If we're not building shared, we need to use non_pic_objs
-      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
-
-      # Create the old-style object.
-      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
-
-      output=$obj
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      test yes = "$build_libtool_libs" || {
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      }
-
-      if test -n "$pic_flag" || test default != "$pic_mode"; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output=$libobj
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "'-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "'-release' is ignored for programs"
-
-      $preload \
-	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
-	&& func_warning "'LT_INIT(dlopen)' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.012)
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test CXX = "$tagname"; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.0123)
-	      func_append compile_command " $wl-bind_at_load"
-	      func_append finalize_command " $wl-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      compile_deplibs=$new_libs
-
-
-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs=$libdir
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append perm_rpath " $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) func_append dllsearchpath ":$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir=$hardcode_libdirs
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath=$rpath
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs=$libdir
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_perm_rpath " $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir=$hardcode_libdirs
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath=$rpath
-
-      if test -n "$libobjs" && test yes = "$build_old_libs"; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" false
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=:
-      case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=false
-        ;;
-      *cygwin* | *mingw* )
-        test yes = "$build_libtool_libs" || wrappers_required=false
-        ;;
-      *)
-        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
-          wrappers_required=false
-        fi
-        ;;
-      esac
-      $wrappers_required || {
-	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command=$compile_command$compile_rpath
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.$objext"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
-	fi
-
-	exit $exit_status
-      }
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test yes = "$no_install"; then
-	# We don't need to create a wrapper script.
-	link_command=$compile_var$compile_command$compile_rpath
-	# Replace the output file specification.
-	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      case $hardcode_action,$fast_install in
-        relink,*)
-	  # Fast installation is not supported
-	  link_command=$compile_var$compile_command$compile_rpath
-	  relink_command=$finalize_var$finalize_command$finalize_rpath
-
-	  func_warning "this platform does not like uninstalled shared libraries"
-	  func_warning "'$output' will be relinked during installation"
-	  ;;
-        *,yes)
-	  link_command=$finalize_var$compile_command$finalize_rpath
-	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-          ;;
-	*,no)
-	  link_command=$compile_var$compile_command$compile_rpath
-	  relink_command=$finalize_var$finalize_command$finalize_rpath
-          ;;
-	*,needless)
-	  link_command=$finalize_var$compile_command$finalize_rpath
-	  relink_command=
-          ;;
-      esac
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      if test -n "$postlink_cmds"; then
-	func_to_tool_file "$output_objdir/$outputname"
-	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource=$output_path/$objdir/lt-$output_name.c
-	    cwrapper=$output_path/$output_name.exe
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host"; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      case $build_libtool_libs in
-        convenience)
-	  oldobjs="$libobjs_save $symfileobj"
-	  addlibs=$convenience
-	  build_libtool_libs=no
-	  ;;
-	module)
-	  oldobjs=$libobjs_save
-	  addlibs=$old_convenience
-	  build_libtool_libs=no
-          ;;
-	*)
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  $preload && test -f "$symfileobj" \
-	    && func_append oldobjs " $symfileobj"
-	  addlibs=$old_convenience
-	  ;;
-      esac
-
-      if test -n "$addlibs"; then
-	gentop=$output_objdir/${outputname}x
-	func_append generated " $gentop"
-
-	func_extract_archives $gentop $addlibs
-	func_append oldobjs " $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop=$output_objdir/${outputname}x
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append oldobjs " $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop=$output_objdir/${outputname}x
-	  func_append generated " $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase=$func_basename_result
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *\ /"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*\ /"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      func_append oldobjs " $gentop/$newobj"
-	      ;;
-	    *) func_append oldobjs " $obj" ;;
-	    esac
-	  done
-	fi
-	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-	tool_oldlib=$func_to_tool_file_result
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	elif test -n "$archiver_list_spec"; then
-	  func_verbose "using command file archive linking..."
-	  for obj in $oldobjs
-	  do
-	    func_to_tool_file "$obj"
-	    $ECHO "$func_to_tool_file_result"
-	  done > $output_objdir/$libname.libcmd
-	  func_to_tool_file "$output_objdir/$libname.libcmd"
-	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj"; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test -z "$oldobjs"; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test yes = "$build_old_libs" && old_library=$libname.$libext
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test yes = "$hardcode_automatic"; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test yes = "$installed"; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output=$output_objdir/${outputname}i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name=$func_basename_result
-		func_resolve_sysroot "$deplib"
-		eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $func_resolve_sysroot_result`
-		test -z "$libdir" && \
-		  func_fatal_error "'$deplib' is not a valid libtool archive"
-		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      -L*)
-		func_stripname -L '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -L$func_replace_sysroot_result"
-		;;
-	      -R*)
-		func_stripname -R '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -R$func_replace_sysroot_result"
-		;;
-	      *) func_append newdependency_libs " $deplib" ;;
-	      esac
-	    done
-	    dependency_libs=$newdependency_libs
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name=$func_basename_result
-		eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "'$lib' is not a valid libtool archive"
-		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      *) func_append newdlfiles " $lib" ;;
-	      esac
-	    done
-	    dlfiles=$newdlfiles
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name=$func_basename_result
-		eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "'$lib' is not a valid libtool archive"
-		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles=$newdlprefiles
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		\\/* | A-Za-z:\\/*) abs=$lib ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlfiles " $abs"
-	    done
-	    dlfiles=$newdlfiles
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		\\/* | A-Za-z:\\/*) abs=$lib ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlprefiles " $abs"
-	    done
-	    dlprefiles=$newdlprefiles
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-	      # If a -bindir argument was supplied, place the dll there.
-	      if test -n "$bindir"; then
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result/$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that cannot go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test no,yes = "$installed,$need_relink"; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-if test link = "$opt_mode" || test relink = "$opt_mode"; then
-  func_mode_link ${1+"$@"}
-fi
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $debug_cmd
-
-    RM=$nonopt
-    files=
-    rmforce=false
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic=$magic
-
-    for arg
-    do
-      case $arg in
-      -f) func_append RM " $arg"; rmforce=: ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir=$func_dirname_result
-      if test . = "$dir"; then
-	odir=$objdir
-      else
-	odir=$dir/$objdir
-      fi
-      func_basename "$file"
-      name=$func_basename_result
-      test uninstall = "$opt_mode" && odir=$dir
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test clean = "$opt_mode"; then
-	case " $rmdirs " in
-	  *" $odir "*) ;;
-	  *) func_append rmdirs " $odir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif $rmforce; then
-	continue
-      fi
-
-      rmfiles=$file
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    func_append rmfiles " $odir/$n"
-	  done
-	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
-	  case $opt_mode in
-	  clean)
-	    case " $library_names " in
-	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" && test none != "$pic_object"; then
-	    func_append rmfiles " $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
-	    func_append rmfiles " $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test clean = "$opt_mode"; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    func_append rmfiles " $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      func_append rmfiles " $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
-	    if test yes = "$fast_install" && test -n "$relink_command"; then
-	      func_append rmfiles " $odir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name"; then
-	      func_append rmfiles " $odir/lt-$noexename.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-
-    # Try to remove the $objdir's in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
-  func_mode_uninstall ${1+"$@"}
-fi
-
-test -z "$opt_mode" && {
-  help=$generic_help
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode '$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# where we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:

_service:tar_scm:lxc-4.0.3.tar.gz/config/ltoptions.m4 Deleted

@@ -1,437 +0,0 @@
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
-#   Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 8 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN(LTOPTIONS_VERSION, m4_if(1))
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define(_LT_MANGLE_OPTION,
-_LT_OPTION_m4_bpatsubst($1__$2, ^a-zA-Z0-9_, _))
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define(_LT_SET_OPTION,
-m4_define(_LT_MANGLE_OPTION($1, $2))dnl
-m4_ifdef(_LT_MANGLE_DEFUN($1, $2),
-        _LT_MANGLE_DEFUN($1, $2),
-    m4_warning(Unknown $1 option '$2'))dnl
-)
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, IF-NOT-SET)
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define(_LT_IF_OPTION,
-m4_ifdef(_LT_MANGLE_OPTION($1, $2), $3, $4))
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define(_LT_UNLESS_OPTIONS,
-m4_foreach(_LT_Option, m4_split(m4_normalize($2)),
-	    m4_ifdef(_LT_MANGLE_OPTION($1, _LT_Option),
-		      m4_define($0_found)))dnl
-m4_ifdef($0_found, m4_undefine($0_found), $3
-)dnl
-)
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun(_LT_SET_OPTIONS,
-# Set options
-m4_foreach(_LT_Option, m4_split(m4_normalize($2)),
-    _LT_SET_OPTION($1, _LT_Option))
-
-m4_if($1,LT_INIT,
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS(LT_INIT, dlopen, enable_dlopen=no
-  )
-  _LT_UNLESS_OPTIONS(LT_INIT, win32-dll, enable_win32_dll=no
-  )
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS(LT_INIT, shared disable-shared, _LT_ENABLE_SHARED)
-  _LT_UNLESS_OPTIONS(LT_INIT, static disable-static, _LT_ENABLE_STATIC)
-  _LT_UNLESS_OPTIONS(LT_INIT, pic-only no-pic, _LT_WITH_PIC)
-  _LT_UNLESS_OPTIONS(LT_INIT, fast-install disable-fast-install,
-		   _LT_ENABLE_FAST_INSTALL)
-  _LT_UNLESS_OPTIONS(LT_INIT, aix-soname=aix aix-soname=both aix-soname=svr4,
-		   _LT_WITH_AIX_SONAME(aix))
-  )
-)# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define(_LT_MANGLE_DEFUN,
-_LT_OPTION_DEFUN_m4_bpatsubst(m4_toupper($1__$2), ^A-Z0-9_, _))
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define(LT_OPTION_DEFINE,
-m4_define(_LT_MANGLE_DEFUN($1, $2), $3)dnl
-)# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE(LT_INIT, dlopen, enable_dlopen=yes
-)
-
-AU_DEFUN(AC_LIBTOOL_DLOPEN,
-_LT_SET_OPTION(LT_INIT, dlopen)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'dlopen' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_DLOPEN, )
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE(LT_INIT, win32-dll,
-enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL(, AS,      1, Assembler program)dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL(, DLLTOOL, 1, DLL creation program)dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL(, OBJDUMP, 1, Object dumper program)dnl
-)# win32-dll
-
-AU_DEFUN(AC_LIBTOOL_WIN32_DLL,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-_LT_SET_OPTION(LT_INIT, win32-dll)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'win32-dll' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_WIN32_DLL, )
-
-
-# _LT_ENABLE_SHARED(DEFAULT)
-# ----------------------------
-# implement the --enable-shared flag, and supports the 'shared' and
-# 'disable-shared' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
-m4_define(_LT_ENABLE_SHARED,
-m4_define(_LT_ENABLE_SHARED_DEFAULT, m4_if($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-    AS_HELP_STRING(--enable-shared@<:@=PKGS@:>@,
-	build shared libraries @<:@default=_LT_ENABLE_SHARED_DEFAULT@:>@),
-    p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac,
-    enable_shared=_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL(build_libtool_libs, enable_shared, 0,
-	Whether or not to build shared libraries)
-)# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE(LT_INIT, shared, _LT_ENABLE_SHARED(yes))
-LT_OPTION_DEFINE(LT_INIT, disable-shared, _LT_ENABLE_SHARED(no))
-
-# Old names:
-AC_DEFUN(AC_ENABLE_SHARED,
-_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)shared)
-)
-
-AC_DEFUN(AC_DISABLE_SHARED,
-_LT_SET_OPTION(LT_INIT, disable-shared)
-)
-
-AU_DEFUN(AM_ENABLE_SHARED, AC_ENABLE_SHARED($@))
-AU_DEFUN(AM_DISABLE_SHARED, AC_DISABLE_SHARED($@))
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_ENABLE_SHARED, )
-dnl AC_DEFUN(AM_DISABLE_SHARED, )
-
-
-
-# _LT_ENABLE_STATIC(DEFAULT)
-# ----------------------------
-# implement the --enable-static flag, and support the 'static' and
-# 'disable-static' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
-m4_define(_LT_ENABLE_STATIC,
-m4_define(_LT_ENABLE_STATIC_DEFAULT, m4_if($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-    AS_HELP_STRING(--enable-static@<:@=PKGS@:>@,
-	build static libraries @<:@default=_LT_ENABLE_STATIC_DEFAULT@:>@),
-    p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac,
-    enable_static=_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL(build_old_libs, enable_static, 0,
-	Whether or not to build static libraries)
-)# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE(LT_INIT, static, _LT_ENABLE_STATIC(yes))
-LT_OPTION_DEFINE(LT_INIT, disable-static, _LT_ENABLE_STATIC(no))
-
-# Old names:
-AC_DEFUN(AC_ENABLE_STATIC,
-_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)static)
-)
-
-AC_DEFUN(AC_DISABLE_STATIC,
-_LT_SET_OPTION(LT_INIT, disable-static)
-)
-
-AU_DEFUN(AM_ENABLE_STATIC, AC_ENABLE_STATIC($@))
-AU_DEFUN(AM_DISABLE_STATIC, AC_DISABLE_STATIC($@))
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_ENABLE_STATIC, )
-dnl AC_DEFUN(AM_DISABLE_STATIC, )
-
-
-
-# _LT_ENABLE_FAST_INSTALL(DEFAULT)
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the 'fast-install'
-# and 'disable-fast-install' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
-m4_define(_LT_ENABLE_FAST_INSTALL,
-m4_define(_LT_ENABLE_FAST_INSTALL_DEFAULT, m4_if($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-    AS_HELP_STRING(--enable-fast-install@<:@=PKGS@:>@,
-    optimize for fast installation @<:@default=_LT_ENABLE_FAST_INSTALL_DEFAULT@:>@),
-    p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac,
-    enable_fast_install=_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL(fast_install, enable_fast_install, 0,
-	 Whether or not to optimize for fast installation)dnl
-)# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE(LT_INIT, fast-install, _LT_ENABLE_FAST_INSTALL(yes))
-LT_OPTION_DEFINE(LT_INIT, disable-fast-install, _LT_ENABLE_FAST_INSTALL(no))
-
-# Old names:
-AU_DEFUN(AC_ENABLE_FAST_INSTALL,
-_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)fast-install)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'fast-install' option into LT_INIT's first parameter.)
-)
-
-AU_DEFUN(AC_DISABLE_FAST_INSTALL,
-_LT_SET_OPTION(LT_INIT, disable-fast-install)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'disable-fast-install' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_ENABLE_FAST_INSTALL, )
-dnl AC_DEFUN(AM_DISABLE_FAST_INSTALL, )
-
-
-# _LT_WITH_AIX_SONAME(DEFAULT)
-# ----------------------------------
-# implement the --with-aix-soname flag, and support the `aix-soname=aix'
-# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
-# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
-m4_define(_LT_WITH_AIX_SONAME,
-m4_define(_LT_WITH_AIX_SONAME_DEFAULT, m4_if($1, svr4, svr4, m4_if($1, both, both, aix)))dnl
-shared_archive_member_spec=
-case $host,$enable_shared in
-power*-*-aix5-9*,yes)
-  AC_MSG_CHECKING(which variant of shared library versioning to provide)
-  AC_ARG_WITH(aix-soname,
-    AS_HELP_STRING(--with-aix-soname=aix|svr4|both,
-      shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=_LT_WITH_AIX_SONAME_DEFAULT@:>@.),
-    case $withval in
-    aix|svr4|both)
-      ;;
-    *)
-      AC_MSG_ERROR(Unknown argument to --with-aix-soname)
-      ;;
-    esac
-    lt_cv_with_aix_soname=$with_aix_soname,
-    AC_CACHE_VAL(lt_cv_with_aix_soname,
-      lt_cv_with_aix_soname=_LT_WITH_AIX_SONAME_DEFAULT)
-    with_aix_soname=$lt_cv_with_aix_soname)
-  AC_MSG_RESULT($with_aix_soname)
-  if test aix != "$with_aix_soname"; then
-    # For the AIX way of multilib, we name the shared archive member
-    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
-    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
-    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
-    # the AIX toolchain works better with OBJECT_MODE set (default 32).
-    if test 64 = "${OBJECT_MODE-32}"; then
-      shared_archive_member_spec=shr_64
-    else
-      shared_archive_member_spec=shr
-    fi
-  fi
-  ;;
-*)
-  with_aix_soname=aix
-  ;;
-esac
-
-_LT_DECL(, shared_archive_member_spec, 0,
-    Shared archive member basename, for filename based shared library versioning on AIX)dnl
-)# _LT_WITH_AIX_SONAME
-
-LT_OPTION_DEFINE(LT_INIT, aix-soname=aix, _LT_WITH_AIX_SONAME(aix))
-LT_OPTION_DEFINE(LT_INIT, aix-soname=both, _LT_WITH_AIX_SONAME(both))
-LT_OPTION_DEFINE(LT_INIT, aix-soname=svr4, _LT_WITH_AIX_SONAME(svr4))
-
-
-# _LT_WITH_PIC(MODE)
-# --------------------
-# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
-# LT_INIT options.
-# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
-m4_define(_LT_WITH_PIC,
-AC_ARG_WITH(pic,
-    AS_HELP_STRING(--with-pic@<:@=PKGS@:>@,
-	try to use only PIC/non-PIC objects @<:@default=use both@:>@),
-    lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for lt_pkg in $withval; do
-	IFS=$lt_save_ifs
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac,
-    pic_mode=m4_default($1, default))
-
-_LT_DECL(, pic_mode, 0, What type of objects to build)dnl
-)# _LT_WITH_PIC
-
-LT_OPTION_DEFINE(LT_INIT, pic-only, _LT_WITH_PIC(yes))
-LT_OPTION_DEFINE(LT_INIT, no-pic, _LT_WITH_PIC(no))
-
-# Old name:
-AU_DEFUN(AC_LIBTOOL_PICMODE,
-_LT_SET_OPTION(LT_INIT, pic-only)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'pic-only' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_PICMODE, )
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define(_LTDL_MODE, )
-LT_OPTION_DEFINE(LTDL_INIT, nonrecursive,
-		 m4_define(_LTDL_MODE, nonrecursive))
-LT_OPTION_DEFINE(LTDL_INIT, recursive,
-		 m4_define(_LTDL_MODE, recursive))
-LT_OPTION_DEFINE(LTDL_INIT, subproject,
-		 m4_define(_LTDL_MODE, subproject))
-
-m4_define(_LTDL_TYPE, )
-LT_OPTION_DEFINE(LTDL_INIT, installable,
-		 m4_define(_LTDL_TYPE, installable))
-LT_OPTION_DEFINE(LTDL_INIT, convenience,
-		 m4_define(_LTDL_TYPE, convenience))

_service:tar_scm:lxc-4.0.3.tar.gz/config/ltsugar.m4 Deleted

@@ -1,124 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
-# Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN(LTSUGAR_VERSION, m4_if(0.1))
-
-
-# lt_join(SEP, ARG1, ARG2...)
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting  arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define(lt_join,
-m4_if($#, 1, ,
-       $#, 2, $2,
-       m4_if($2, , , $2_)$0($1, m4_shift(m4_shift($@)))))
-m4_define(_lt_join,
-m4_if($#$2, 2, ,
-       m4_if($2, , , $1$2)$0($1, m4_shift(m4_shift($@)))))
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59, which quotes differently.
-m4_define(lt_car, $1)
-m4_define(lt_cdr,
-m4_if($#, 0, m4_fatal($0: cannot be called without arguments),
-       $#, 1, ,
-       m4_dquote(m4_shift($@))))
-m4_define(lt_unquote, $1)
-
-
-# lt_append(MACRO-NAME, STRING, SEPARATOR)
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define(lt_append,
-m4_define($1,
-	   m4_ifdef($1, m4_defn($1)$3)$2))
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, SUFFIX2...)
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define(lt_combine,
-m4_if(m4_eval($# > 3), 1,
-       m4_pushdef(_Lt_sep, m4_define(_Lt_sep, m4_defn(lt_car)))dnl
-m4_foreach(_Lt_prefix, $2,
-	     m4_foreach(_Lt_suffix,
-		m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@))))),
-	_Lt_sep($1)m4_defn(_Lt_prefix)$3m4_defn(_Lt_suffix)))))
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, SEPARATOR, UNIQ, NOT-UNIQ)
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define(lt_if_append_uniq,
-m4_ifdef($1,
-	  m4_if(m4_index($3m4_defn($1)$3, $3$2$3), -1,
-		 lt_append($1, $2, $3)$4,
-		 $5),
-	  lt_append($1, $2, $3)$4))
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define(lt_dict_add,
-m4_define($1($2), $3))
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define(lt_dict_add_subkey,
-m4_define($1($2:$3), $4))
-
-
-# lt_dict_fetch(DICT, KEY, SUBKEY)
-# ----------------------------------
-m4_define(lt_dict_fetch,
-m4_ifval($3,
-	m4_ifdef($1($2:$3), m4_defn($1($2:$3))),
-    m4_ifdef($1($2), m4_defn($1($2)))))
-
-
-# lt_if_dict_fetch(DICT, KEY, SUBKEY, VALUE, IF-TRUE, IF-FALSE)
-# -----------------------------------------------------------------
-m4_define(lt_if_dict_fetch,
-m4_if(lt_dict_fetch($1, $2, $3), $4,
-	$5,
-    $6))
-
-
-# lt_dict_filter(DICT, SUBKEY, VALUE, SEPARATOR, KEY, ...)
-# --------------------------------------------------------------
-m4_define(lt_dict_filter,
-m4_if($5, , ,
-  lt_join(m4_quote(m4_default($4, , )),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car(m4_shiftn(4, $@)),
-		      lt_if_dict_fetch($1, _Lt_key, $2, $3, _Lt_key )))))))dnl
-)

_service:tar_scm:lxc-4.0.3.tar.gz/config/ltversion.m4 Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/lt~obsolete.m4 Deleted

@@ -1,99 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
-#   Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN(LTOBSOLETE_VERSION, m4_if(1))
-
-m4_ifndef(AC_LIBTOOL_LINKER_OPTION,	AC_DEFUN(AC_LIBTOOL_LINKER_OPTION))
-m4_ifndef(AC_PROG_EGREP,		AC_DEFUN(AC_PROG_EGREP))
-m4_ifndef(_LT_AC_PROG_ECHO_BACKSLASH,	AC_DEFUN(_LT_AC_PROG_ECHO_BACKSLASH))
-m4_ifndef(_LT_AC_SHELL_INIT,		AC_DEFUN(_LT_AC_SHELL_INIT))
-m4_ifndef(_LT_AC_SYS_LIBPATH_AIX,	AC_DEFUN(_LT_AC_SYS_LIBPATH_AIX))
-m4_ifndef(_LT_PROG_LTMAIN,		AC_DEFUN(_LT_PROG_LTMAIN))
-m4_ifndef(_LT_AC_TAGVAR,		AC_DEFUN(_LT_AC_TAGVAR))
-m4_ifndef(AC_LTDL_ENABLE_INSTALL,	AC_DEFUN(AC_LTDL_ENABLE_INSTALL))
-m4_ifndef(AC_LTDL_PREOPEN,		AC_DEFUN(AC_LTDL_PREOPEN))
-m4_ifndef(_LT_AC_SYS_COMPILER,	AC_DEFUN(_LT_AC_SYS_COMPILER))
-m4_ifndef(_LT_AC_LOCK,		AC_DEFUN(_LT_AC_LOCK))
-m4_ifndef(AC_LIBTOOL_SYS_OLD_ARCHIVE,	AC_DEFUN(AC_LIBTOOL_SYS_OLD_ARCHIVE))
-m4_ifndef(_LT_AC_TRY_DLOPEN_SELF,	AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF))
-m4_ifndef(AC_LIBTOOL_PROG_CC_C_O,	AC_DEFUN(AC_LIBTOOL_PROG_CC_C_O))
-m4_ifndef(AC_LIBTOOL_SYS_HARD_LINK_LOCKS, AC_DEFUN(AC_LIBTOOL_SYS_HARD_LINK_LOCKS))
-m4_ifndef(AC_LIBTOOL_OBJDIR,		AC_DEFUN(AC_LIBTOOL_OBJDIR))
-m4_ifndef(AC_LTDL_OBJDIR,		AC_DEFUN(AC_LTDL_OBJDIR))
-m4_ifndef(AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH, AC_DEFUN(AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH))
-m4_ifndef(AC_LIBTOOL_SYS_LIB_STRIP,	AC_DEFUN(AC_LIBTOOL_SYS_LIB_STRIP))
-m4_ifndef(AC_PATH_MAGIC,		AC_DEFUN(AC_PATH_MAGIC))
-m4_ifndef(AC_PROG_LD_GNU,		AC_DEFUN(AC_PROG_LD_GNU))
-m4_ifndef(AC_PROG_LD_RELOAD_FLAG,	AC_DEFUN(AC_PROG_LD_RELOAD_FLAG))
-m4_ifndef(AC_DEPLIBS_CHECK_METHOD,	AC_DEFUN(AC_DEPLIBS_CHECK_METHOD))
-m4_ifndef(AC_LIBTOOL_PROG_COMPILER_NO_RTTI, AC_DEFUN(AC_LIBTOOL_PROG_COMPILER_NO_RTTI))
-m4_ifndef(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE, AC_DEFUN(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE))
-m4_ifndef(AC_LIBTOOL_PROG_COMPILER_PIC, AC_DEFUN(AC_LIBTOOL_PROG_COMPILER_PIC))
-m4_ifndef(AC_LIBTOOL_PROG_LD_SHLIBS,	AC_DEFUN(AC_LIBTOOL_PROG_LD_SHLIBS))
-m4_ifndef(AC_LIBTOOL_POSTDEP_PREDEP,	AC_DEFUN(AC_LIBTOOL_POSTDEP_PREDEP))
-m4_ifndef(LT_AC_PROG_EGREP,		AC_DEFUN(LT_AC_PROG_EGREP))
-m4_ifndef(LT_AC_PROG_SED,		AC_DEFUN(LT_AC_PROG_SED))
-m4_ifndef(_LT_CC_BASENAME,		AC_DEFUN(_LT_CC_BASENAME))
-m4_ifndef(_LT_COMPILER_BOILERPLATE,	AC_DEFUN(_LT_COMPILER_BOILERPLATE))
-m4_ifndef(_LT_LINKER_BOILERPLATE,	AC_DEFUN(_LT_LINKER_BOILERPLATE))
-m4_ifndef(_AC_PROG_LIBTOOL,		AC_DEFUN(_AC_PROG_LIBTOOL))
-m4_ifndef(AC_LIBTOOL_SETUP,		AC_DEFUN(AC_LIBTOOL_SETUP))
-m4_ifndef(_LT_AC_CHECK_DLFCN,		AC_DEFUN(_LT_AC_CHECK_DLFCN))
-m4_ifndef(AC_LIBTOOL_SYS_DYNAMIC_LINKER,	AC_DEFUN(AC_LIBTOOL_SYS_DYNAMIC_LINKER))
-m4_ifndef(_LT_AC_TAGCONFIG,		AC_DEFUN(_LT_AC_TAGCONFIG))
-m4_ifndef(AC_DISABLE_FAST_INSTALL,	AC_DEFUN(AC_DISABLE_FAST_INSTALL))
-m4_ifndef(_LT_AC_LANG_CXX,		AC_DEFUN(_LT_AC_LANG_CXX))
-m4_ifndef(_LT_AC_LANG_F77,		AC_DEFUN(_LT_AC_LANG_F77))
-m4_ifndef(_LT_AC_LANG_GCJ,		AC_DEFUN(_LT_AC_LANG_GCJ))
-m4_ifndef(AC_LIBTOOL_LANG_C_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_C_CONFIG))
-m4_ifndef(_LT_AC_LANG_C_CONFIG,	AC_DEFUN(_LT_AC_LANG_C_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_CXX_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_CXX_CONFIG))
-m4_ifndef(_LT_AC_LANG_CXX_CONFIG,	AC_DEFUN(_LT_AC_LANG_CXX_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_F77_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_F77_CONFIG))
-m4_ifndef(_LT_AC_LANG_F77_CONFIG,	AC_DEFUN(_LT_AC_LANG_F77_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_GCJ_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_GCJ_CONFIG))
-m4_ifndef(_LT_AC_LANG_GCJ_CONFIG,	AC_DEFUN(_LT_AC_LANG_GCJ_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_RC_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_RC_CONFIG))
-m4_ifndef(_LT_AC_LANG_RC_CONFIG,	AC_DEFUN(_LT_AC_LANG_RC_CONFIG))
-m4_ifndef(AC_LIBTOOL_CONFIG,		AC_DEFUN(AC_LIBTOOL_CONFIG))
-m4_ifndef(_LT_AC_FILE_LTDLL_C,	AC_DEFUN(_LT_AC_FILE_LTDLL_C))
-m4_ifndef(_LT_REQUIRED_DARWIN_CHECKS,	AC_DEFUN(_LT_REQUIRED_DARWIN_CHECKS))
-m4_ifndef(_LT_AC_PROG_CXXCPP,		AC_DEFUN(_LT_AC_PROG_CXXCPP))
-m4_ifndef(_LT_PREPARE_SED_QUOTE_VARS,	AC_DEFUN(_LT_PREPARE_SED_QUOTE_VARS))
-m4_ifndef(_LT_PROG_ECHO_BACKSLASH,	AC_DEFUN(_LT_PROG_ECHO_BACKSLASH))
-m4_ifndef(_LT_PROG_F77,		AC_DEFUN(_LT_PROG_F77))
-m4_ifndef(_LT_PROG_FC,		AC_DEFUN(_LT_PROG_FC))
-m4_ifndef(_LT_PROG_CXX,		AC_DEFUN(_LT_PROG_CXX))

_service:tar_scm:lxc-4.0.3.tar.gz/config/missing Deleted

@@ -1,215 +0,0 @@
-#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
-  exit 1
-fi
-
-case $1 in
-
-  --is-lightweight)
-    # Used by our autoconf macros to check whether the available missing
-    # script is modern enough.
-    exit 0
-    ;;
-
-  --run)
-    # Back-compat with the calling convention used by older automake.
-    shift
-    ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 OPTION... PROGRAM ARGUMENT...
-
-Run 'PROGRAM ARGUMENT...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
-
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Run the given program, remember its exit status.
-"$@"; st=$?
-
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
-
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch.  This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
-  msg="probably too old"
-elif test $st -eq 127; then
-  # Program was missing.
-  msg="missing on your system"
-else
-  # Program was found and executed, but failed.  Give up.
-  exit $st
-fi
-
-perl_URL=https://www.perl.org/
-flex_URL=https://github.com/westes/flex
-gnu_software_URL=https://www.gnu.org/software
-
-program_details ()
-{
-  case $1 in
-    aclocal|automake)
-      echo "The '$1' program is part of the GNU Automake package:"
-      echo "<$gnu_software_URL/automake>"
-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/autoconf>"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-    autoconf|autom4te|autoheader)
-      echo "The '$1' program is part of the GNU Autoconf package:"
-      echo "<$gnu_software_URL/autoconf/>"
-      echo "It also requires GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-  esac
-}
-
-give_advice ()
-{
-  # Normalize program name to check for.
-  normalized_program=`echo "$1" | sed '
-    s/^gnu-//; t
-    s/^gnu//; t
-    s/^g//; t'`
-
-  printf '%s\n' "'$1' is $msg."
-
-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-  case $normalized_program in
-    autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
-      ;;
-    autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
-      echo "$configure_deps."
-      program_details 'autoheader'
-      ;;
-    automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
-      echo "$configure_deps."
-      program_details 'aclocal'
-      ;;
-   autom4te*)
-      echo "You might have modified some maintainer files that require"
-      echo "the 'autom4te' program to be rebuilt."
-      program_details 'autom4te'
-      ;;
-    bison*|yacc*)
-      echo "You should only need it if you modified a '.y' file."
-      echo "You may want to install the GNU Bison package:"
-      echo "<$gnu_software_URL/bison/>"
-      ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
-    help2man*)
-      echo "You should only need it if you modified a dependency" \
-           "of a man page."
-      echo "You may want to install the GNU Help2man package:"
-      echo "<$gnu_software_URL/help2man/>"
-    ;;
-    makeinfo*)
-      echo "You should only need it if you modified a '.texi' file, or"
-      echo "any other file indirectly affecting the aspect of the manual."
-      echo "You might want to install the Texinfo package:"
-      echo "<$gnu_software_URL/texinfo/>"
-      echo "The spurious makeinfo call might also be the consequence of"
-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-      echo "want to install GNU make:"
-      echo "<$gnu_software_URL/make/>"
-      ;;
-    *)
-      echo "You might have modified some files without having the proper"
-      echo "tools for further handling them.  Check the 'README' file, it"
-      echo "often tells you about the needed prerequisites for installing"
-      echo "this package.  You may also peek at any GNU archive site, in"
-      echo "case some other package contains this missing '$1' program."
-      ;;
-  esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
-                       -e '2,$s/^/         /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
-
-# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:

_service:tar_scm:lxc-4.0.3.tar.gz/config/selinux/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/selinux/Makefile.in Deleted

@@ -1,567 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/selinux
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(selinuxdir)"
-DATA = $(selinux_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-selinuxdir = @DATADIR@/lxc/selinux
-EXTRA_DIST = \
-	lxc.if lxc.te
-
-selinux_DATA = \
-	lxc.if \
-	lxc.te
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/selinux/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/selinux/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-selinuxDATA: $(selinux_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(selinux_DATA)'; test -n "$(selinuxdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(selinuxdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(selinuxdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(selinuxdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(selinuxdir)" || exit $$?; \
-	done
-
-uninstall-selinuxDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(selinux_DATA)'; test -n "$(selinuxdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(selinuxdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(selinuxdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-selinuxDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-selinuxDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-selinuxDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags-am uninstall uninstall-am uninstall-selinuxDATA
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/sysconfig/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/sysconfig/Makefile.in Deleted

@@ -1,567 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/sysconfig
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(sysconfigdir)"
-DATA = $(sysconfig_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-sysconfigdir = "@LXC_DISTRO_SYSCONF@"
-sysconfig_DATA = \
-	lxc
-
-EXTRA_DIST = $(sysconfig_DATA)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/sysconfig/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/sysconfig/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc: $(top_builddir)/config.status $(srcdir)/lxc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-sysconfigDATA: $(sysconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(sysconfig_DATA)'; test -n "$(sysconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(sysconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfigdir)" || exit $$?; \
-	done
-
-uninstall-sysconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(sysconfig_DATA)'; test -n "$(sysconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(sysconfigdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(sysconfigdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-sysconfigDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-sysconfigDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-sysconfigDATA installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-sysconfigDATA
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/sysconfig/lxc Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/templates/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/templates/Makefile.in Deleted

@@ -1,760 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/templates
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = common.conf nesting.conf oci.common.conf \
-	userns.conf
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(templatesconfigdir)"
-DATA = $(templatesconfig_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/common.conf.in \
-	$(srcdir)/nesting.conf.in $(srcdir)/oci.common.conf.in \
-	$(srcdir)/userns.conf.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-templatesconfigdir = @LXCTEMPLATECONFIG@
-EXTRA_DIST = common.seccomp
-SUBDIRS = common.conf.d
-templatesconfig_DATA = common.conf \
-		       common.seccomp \
-		       nesting.conf \
-		       oci.common.conf \
-		       userns.conf
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/templates/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/templates/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-common.conf: $(top_builddir)/config.status $(srcdir)/common.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-nesting.conf: $(top_builddir)/config.status $(srcdir)/nesting.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-oci.common.conf: $(top_builddir)/config.status $(srcdir)/oci.common.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-userns.conf: $(top_builddir)/config.status $(srcdir)/userns.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-templatesconfigDATA: $(templatesconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(templatesconfig_DATA)'; test -n "$(templatesconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(templatesconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(templatesconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(templatesconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(templatesconfigdir)" || exit $$?; \
-	done
-
-uninstall-templatesconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(templatesconfig_DATA)'; test -n "$(templatesconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(templatesconfigdir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(templatesconfigdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-templatesconfigDATA
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-templatesconfigDATA
-
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-templatesconfigDATA installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-templatesconfigDATA
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/templates/common.conf.d/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/templates/common.conf.d/Makefile.in Deleted

@@ -1,565 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/templates/common.conf.d
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(templatesconfigdir)"
-DATA = $(templatesconfig_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in README
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-templatesconfigdir = @LXCTEMPLATECONFIG@/common.conf.d/
-EXTRA_DIST = README
-templatesconfig_DATA = \
-	README
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/templates/common.conf.d/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/templates/common.conf.d/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-templatesconfigDATA: $(templatesconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(templatesconfig_DATA)'; test -n "$(templatesconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(templatesconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(templatesconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(templatesconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(templatesconfigdir)" || exit $$?; \
-	done
-
-uninstall-templatesconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(templatesconfig_DATA)'; test -n "$(templatesconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(templatesconfigdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(templatesconfigdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-templatesconfigDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-templatesconfigDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-templatesconfigDATA installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-templatesconfigDATA
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/config/tls.m4 Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/yum/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/config/yum/Makefile.in Deleted

@@ -1,565 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config/yum
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(yumpluginsdir)"
-DATA = $(yumplugins_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-yumpluginsdir = $(datadir)/lxc
-yumplugins_DATA = \
-	lxc-patch.py
-
-EXTRA_DIST = $(yumplugins_DATA)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/yum/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/yum/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-yumpluginsDATA: $(yumplugins_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(yumplugins_DATA)'; test -n "$(yumpluginsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(yumpluginsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(yumpluginsdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(yumpluginsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(yumpluginsdir)" || exit $$?; \
-	done
-
-uninstall-yumpluginsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(yumplugins_DATA)'; test -n "$(yumpluginsdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(yumpluginsdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(yumpluginsdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-yumpluginsDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-yumpluginsDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-yumpluginsDATA installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-yumpluginsDATA
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/configure Deleted

@@ -1,21274 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for lxc 4.0.3.
-#
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *\\/* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_dir" : 'X$//$^/' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR LINENO LOG_FD
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/$^/^/*$\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /$LINENO/=
-  ' <$as_myself |
-    sed '
-      s/$LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/$LINENO$^'$as_cr_alnum'_.*\n$$.*$/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $0, causing all sort of problems
-  # (the dirname of $0 is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='lxc'
-PACKAGE_TARNAME='lxc'
-PACKAGE_VERSION='4.0.3'
-PACKAGE_STRING='lxc 4.0.3'
-PACKAGE_BUGREPORT=''
-PACKAGE_URL=''
-
-ac_unique_file="configure.ac"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-ENFORCE_MEMFD_REXEC_FALSE
-ENFORCE_MEMFD_REXEC_TRUE
-DLOG_LIBS
-DLOG_CFLAGS
-ENABLE_DLOG_FALSE
-ENABLE_DLOG_TRUE
-ENABLE_COVERITY_BUILD_FALSE
-ENABLE_COVERITY_BUILD_TRUE
-ENFORCE_THREAD_SAFETY_FALSE
-ENFORCE_THREAD_SAFETY_TRUE
-PTHREAD_CFLAGS
-PTHREAD_LIBS
-PTHREAD_CC
-ax_pthread_config
-HAVE_FMEMOPEN_FALSE
-HAVE_FMEMOPEN_TRUE
-HAVE_STRLCAT_FALSE
-HAVE_STRLCAT_TRUE
-HAVE_STRLCPY_FALSE
-HAVE_STRLCPY_TRUE
-HAVE_PTHREAD_SETCANCELSTATE_FALSE
-HAVE_PTHREAD_SETCANCELSTATE_TRUE
-HAVE_PRLIMIT64_FALSE
-HAVE_PRLIMIT64_TRUE
-HAVE_PRLIMIT_FALSE
-HAVE_PRLIMIT_TRUE
-HAVE_KEYCTL_FALSE
-HAVE_KEYCTL_TRUE
-HAVE_FGETLN_FALSE
-HAVE_FGETLN_TRUE
-HAVE_GETSUBOPT_FALSE
-HAVE_GETSUBOPT_TRUE
-HAVE_GETLINE_FALSE
-HAVE_GETLINE_TRUE
-HAVE_GETGRGID_R_FALSE
-HAVE_GETGRGID_R_TRUE
-HAVE_IFADDRS_H_FALSE
-HAVE_IFADDRS_H_TRUE
-pamdir
-PAM_LIBS
-PAM_CFLAGS
-HAVE_PAM_FALSE
-HAVE_PAM_TRUE
-ENABLE_PAM_FALSE
-ENABLE_PAM_TRUE
-IS_BIONIC_FALSE
-IS_BIONIC_TRUE
-DEFAULT_CGROUP_PATTERN
-APPARMOR_CACHE_DIR
-RUNTIME_PATH
-LOGPATH
-LXCINITDIR
-LXCBINHOOKDIR
-LXCHOOKDIR
-LXCTEMPLATECONFIG
-LXCTEMPLATEDIR
-LXCROOTFSMOUNT
-LXC_DISTRO_SYSCONF
-LXC_USERNIC_DB
-LXC_USERNIC_CONF
-LXC_GLOBAL_CONF
-LXCPATH
-LXC_GENERATE_DATE
-DOCDIR
-LOCALSTATEDIR
-DATADIR
-LXC_DEFAULT_CONFIG
-SYSCONFDIR
-INCLUDEDIR
-LIBEXECDIR
-SBINDIR
-BINDIR
-LIBDIR
-PREFIX
-USE_CONFIGPATH_LOGS_FALSE
-USE_CONFIGPATH_LOGS_TRUE
-ENABLE_TESTS_FALSE
-ENABLE_TESTS_TRUE
-ENABLE_UBSAN_FALSE
-ENABLE_UBSAN_TRUE
-ENABLE_ASAN_FALSE
-ENABLE_ASAN_TRUE
-ENABLE_COMMANDS_FALSE
-ENABLE_COMMANDS_TRUE
-ENABLE_TOOLS_FALSE
-ENABLE_TOOLS_TRUE
-bashcompdir
-ENABLE_BASH_FALSE
-ENABLE_BASH_TRUE
-MUTEX_DEBUGGING_FALSE
-MUTEX_DEBUGGING_TRUE
-ENABLE_EXAMPLES_FALSE
-ENABLE_EXAMPLES_TRUE
-CAP_LIBS
-ENABLE_CAP_FALSE
-ENABLE_CAP_TRUE
-HAVE_STATIC_LIBCAP_FALSE
-HAVE_STATIC_LIBCAP_TRUE
-SECCOMP_LIBS
-SECCOMP_CFLAGS
-ENABLE_SECCOMP_FALSE
-ENABLE_SECCOMP_TRUE
-SELINUX_LIBS
-ENABLE_SELINUX_FALSE
-ENABLE_SELINUX_TRUE
-OPENSSL_LIBS
-ENABLE_OPENSSL_FALSE
-ENABLE_OPENSSL_TRUE
-ENABLE_APPARMOR_FALSE
-ENABLE_APPARMOR_TRUE
-ENABLE_API_DOCS_FALSE
-ENABLE_API_DOCS_TRUE
-HAVE_DOXYGEN
-docdtd
-USE_DOCBOOK2X_FALSE
-USE_DOCBOOK2X_TRUE
-ENABLE_DOCBOOK_FALSE
-ENABLE_DOCBOOK_TRUE
-db2xman
-ENABLE_RPATH_FALSE
-ENABLE_RPATH_TRUE
-SYSTEMD_UNIT_DIR
-INIT_SCRIPT_UPSTART_FALSE
-INIT_SCRIPT_UPSTART_TRUE
-INIT_SCRIPT_SYSTEMD_FALSE
-INIT_SCRIPT_SYSTEMD_TRUE
-INIT_SCRIPT_SYSV_FALSE
-INIT_SCRIPT_SYSV_TRUE
-DISTRO_UBUNTU_FALSE
-DISTRO_UBUNTU_TRUE
-HAVE_DEBIAN_FALSE
-HAVE_DEBIAN_TRUE
-LIBTOOL_DEPS
-LT_SYS_LIBRARY_PATH
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-AR
-DLLTOOL
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-SED
-LIBTOOL
-EGREP
-GREP
-CPP
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-LXC_ABI
-LXC_ABI_MICRO
-LXC_ABI_MINOR
-LXC_ABI_MAJOR
-LXC_DEVEL
-LXC_VERSION
-LXC_VERSION_MICRO
-LXC_VERSION_MINOR
-LXC_VERSION_MAJOR
-LXC_VERSION_BETA
-LXC_VERSION_BASE
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-runstatedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL
-am__quote'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_silent_rules
-enable_dependency_tracking
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_aix_soname
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
-with_distro
-with_init_script
-with_systemdsystemunitdir
-enable_werror
-enable_rpath
-enable_doc
-enable_api_docs
-enable_apparmor
-enable_openssl
-enable_selinux
-enable_seccomp
-enable_capabilities
-enable_examples
-enable_mutex_debugging
-enable_bash
-enable_tools
-enable_commands
-enable_asan
-enable_ubsan
-enable_tests
-with_runtime_path
-with_config_path
-with_global_conf
-with_usernic_conf
-with_usernic_db
-with_rootfs_path
-with_cgroup_pattern
-with_apparmor_cache_dir
-enable_configpath_log
-with_log_path
-enable_pam
-with_pamdir
-enable_thread_safety
-enable_coverity_build
-enable_dlog
-enable_memfd_rexec
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-LT_SYS_LIBRARY_PATH
-SECCOMP_CFLAGS
-SECCOMP_LIBS
-bashcompdir
-PAM_CFLAGS
-PAM_LIBS
-DLOG_CFLAGS
-DLOG_LIBS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '^=*=$.*$'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x$^=*$='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | 0-9* | *!_$as_cr_alnum* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X$.*^/$' \| "X$ac_val" : 'X$.*$'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    \\/$* | ?:\\/* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_myself" : 'X$//$^/' \| \
-	 X"$as_myself" : 'X$//$$' \| \
-	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X$.*^/$' \| "X$srcdir" : 'X$.*$'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures lxc 4.0.3 to adapt to many kinds of systems.
-
-Usage: $0 OPTION... VAR=VALUE...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE disabled
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR configure dir or \`..'
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          $ac_default_prefix
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          PREFIX
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables EPREFIX/bin
-  --sbindir=DIR           system admin executables EPREFIX/sbin
-  --libexecdir=DIR        program executables EPREFIX/libexec
-  --sysconfdir=DIR        read-only single-machine data PREFIX/etc
-  --sharedstatedir=DIR    modifiable architecture-independent data PREFIX/com
-  --localstatedir=DIR     modifiable single-machine data PREFIX/var
-  --runstatedir=DIR       modifiable per-process data LOCALSTATEDIR/run
-  --libdir=DIR            object code libraries EPREFIX/lib
-  --includedir=DIR        C header files PREFIX/include
-  --oldincludedir=DIR     C header files for non-gcc /usr/include
-  --datarootdir=DIR       read-only arch.-independent data root PREFIX/share
-  --datadir=DIR           read-only architecture-independent data DATAROOTDIR
-  --infodir=DIR           info documentation DATAROOTDIR/info
-  --localedir=DIR         locale-dependent data DATAROOTDIR/locale
-  --mandir=DIR            man documentation DATAROOTDIR/man
-  --docdir=DIR            documentation root DATAROOTDIR/doc/lxc
-  --htmldir=DIR           html documentation DOCDIR
-  --dvidir=DIR            dvi documentation DOCDIR
-  --pdfdir=DIR            pdf documentation DOCDIR
-  --psdir=DIR             ps documentation DOCDIR
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD guessed
-  --host=HOST       cross-compile to build programs to run on HOST BUILD
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of lxc 4.0.3:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE=ARG  include FEATURE ARG=yes
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
-  --enable-shared=PKGS  build shared libraries default=yes
-  --enable-static=PKGS  build static libraries default=yes
-  --enable-fast-install=PKGS
-                          optimize for fast installation default=yes
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --disable-werror        do not treat warnings as errors
-  --enable-rpath          set rpath in executables default=no
-  --enable-doc            make man pages default=auto
-  --enable-api-docs       make API documentation default=auto
-  --enable-apparmor       enable apparmor support default=auto
-  --enable-openssl        enable OpenSSL support default=auto
-  --enable-selinux        enable SELinux support default=auto
-  --enable-seccomp        enable seccomp support default=auto
-  --enable-capabilities   enable kernel capabilities support default=auto
-  --enable-examples       install examples default=yes
-  --enable-mutex-debugging
-                          Makes mutexes to report error and provide stack
-                          trace default=no
-  --enable-bash           build bash integration default=yes
-  --enable-tools          build the command line tools default=yes
-  --enable-commands       build the liblxc commands default=yes
-  --enable-asan           build with address sanitizer enabled default=no
-  --enable-ubsan          build with ubsan sanitizer enabled default=no
-  --enable-tests          build test/example binaries default=no
-  --enable-configpath-log use logfiles in config path default=no
-  --enable-pam            enable pam module default=no
-  --enable-thread-safety  enforce thread-safety otherwise fail the build
-                          default=yes
-  --enable-coverity-build build for use with Coverity default=no
-  --enable-dlog           enable dlog support default=no
-  --enable-memfd-rexec    enforce liblxc as a memfd to protect against certain
-                          symlink attacks default=yes
-
-Optional Packages:
-  --with-PACKAGE=ARG    use PACKAGE ARG=yes
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic=PKGS       try to use only PIC/non-PIC objects default=use
-                          both
-  --with-aix-soname=aix|svr4|both
-                          shared library versioning (aka "SONAME") variant to
-                          provide on AIX, default=aix.
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
-  --with-sysroot=DIR    Search for dependent libraries within DIR (or the
-                          compiler's sysroot if not specified).
-  --with-distro=DISTRO    Specify the Linux distribution to target: One of
-                          redhat, redhatenterpriseserver, oracle, centos,
-                          fedora, suse, gentoo, debian, arch, slackware,
-                          plamo, paldo, openmandriva, pardus, sparclinux,
-                          altlinux.
-  --with-init-script=TYPE,TYPE,...
-                          Type(s) of init script to install: sysvinit,
-                          systemd, upstart, distro default=distro
-  --with-systemdsystemunitdir=DIR
-                          Directory for systemd service files
-  --with-runtime-path=dir runtime directory (default: /run)
-  --with-config-path=dir  lxc configuration repository path
-  --with-global-conf=dir  global lxc configuration file
-  --with-usernic-conf     user network interface configuration file
-  --with-usernic-db       lxc user nic database
-  --with-rootfs-path=dir  lxc rootfs mount point
-  --with-cgroup-pattern=pattern
-                          pattern for container cgroups
-  --with-apparmor-cache-dir=dir
-                          path for apparmor_parser cache
-  --with-log-path=dir     per container log path
-  --with-pamdir=PATH      Specify the directory where PAM modules are stored,
-                          or "none" if PAM modules are not to be built
-
-Some influential environment variables:
-  PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  LT_SYS_LIBRARY_PATH
-              User-defined run-time library search path.
-  SECCOMP_CFLAGS
-              C compiler flags for SECCOMP, overriding pkg-config
-  SECCOMP_LIBS
-              linker flags for SECCOMP, overriding pkg-config
-  bashcompdir value of completionsdir for bash-completion, overriding
-              pkg-config
-  PAM_CFLAGS  C compiler flags for pam
-  PAM_LIBS    linker flags for pam
-  DLOG_CFLAGS C compiler flags for DLOG, overriding pkg-config
-  DLOG_LIBS   linker flags for DLOG, overriding pkg-config
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  \\/* | ?:\\/* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-lxc configure 4.0.3
-generated by GNU Autoconf 2.69
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  eval "$4=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_member
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by lxc $as_me 4.0.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^$a-zA-Z_a-zA-Z0-9_*$=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      \\/* | ?:\\/* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-# We need pkg-config
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  \\/* | ?:\\/*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  \\/* | ?:\\/*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-
-LXC_VERSION_BASE=4.0.3
-
-
-
-LXC_VERSION_MAJOR=4
-
-LXC_VERSION_MINOR=0
-
-LXC_VERSION_MICRO=3
-
-LXC_VERSION=4.0.3
-
-LXC_DEVEL=0
-
-
-LXC_ABI_MAJOR=1
-
-LXC_ABI_MINOR=7
-
-LXC_ABI_MICRO=0
-
-LXC_ABI=1.7.0
-
-
-
-ac_aux_dir=
-for ac_dir in config "$srcdir"/config; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-ac_config_headers="$ac_config_headers src/config.h"
-
-am__api_version='1.16'
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *\\\"\#\$\&\'\`$am_lf*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *\\\"\#\$\&\'\`$am_lf\ \	*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/\\$/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make1: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='lxc'
- VERSION='4.0.3'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
-# We need awk for the "check" target (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
-$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
-cat > confinc.mk << 'END'
-am__doit:
-	@echo this is the am__doit target >confinc.out
-.PHONY: am__doit
-END
-am__include="#"
-am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
-  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
-   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-  case $?:`cat confinc.out 2>/dev/null` in #(
-  '0:this is the am__doit target') :
-    case $s in #(
-  BSD) :
-    am__include='.include' am__quote='"' ;; #(
-  *) :
-    am__include='include' am__quote='' ;;
-esac ;; #(
-  *) :
-     ;;
-esac
-  if test "$am__include" != "#"; then
-    _am_result="yes ($s style)"
-    break
-  fi
-done
-rm -f confinc.* confmf.*
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-$as_echo "${_am_result}" >&6; }
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    ab.out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return pi;
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array '\x00' == 0 ? 1 : -1;
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_arrayFOO(a) == 'x' ? 1 : -1;
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv0  ||  f (e, argv, 1) != argv1;
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
-  MINIX=yes
-else
-  MINIX=
-fi
-
-
-  if test "$MINIX" = yes; then
-
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-
-
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-
-
-$as_echo "#define _MINIX 1" >>confdefs.h
-
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#         define __EXTENSIONS__ 1
-          $ac_includes_default
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_safe_to_define___extensions__=yes
-else
-  ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
-  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
-  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-
-
-
-# Test if we have a new enough compiler.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define GCC_VERSION \
-	(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-
-#define CLANG_VERSION \
-	(__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
-
-#if GCC_VERSION < 40700 && CLANG_VERSION < 10000
-#error Sorry, your compiler is too old - please upgrade it
-#endif
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  valid_compiler=yes
-else
-  valid_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test "x$valid_compiler" = "xno"; then
-	as_fn_error $? "Sorry, your compiler is too old - please upgrade it" "$LINENO" 5
-fi
-
-# libtool
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.6'
-macro_revision='2.4.6'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/$"`$\\$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$"`\\$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case $ECHO in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    \\/* | ?:\\/*)
-      re_direlt='/^/^/*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi
-fi
-
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM=$NM
-else
-  lt_nm_to_check=${ac_tool_prefix}nm
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
-	case $build_os in
-	mingw*) lt_bad_file=conftest.nm/nofile ;;
-	*) lt_bad_file=/dev/null ;;
-	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
-	*$lt_bad_file* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS=$lt_save_ifs
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring=ABCD
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n "$lt_cv_sys_max_cmd_len"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test yes != "$GCC"; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# 'unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic regex' -- check by looking for files in library path
-# that responds to the $file_magic_cmd with a given extended regex.
-# If you have 'file' or equivalent on your system and you're not sure
-# whether 'pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4-9*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi45*)
-  lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF -0-90-9)(-bit)?( LMSB)? shared object( file)?, -* PA-RISC 0-9\.0-9'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9\.0-9) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix3-9*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd* | bitrig*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib) M0-90-9* Version 0-9'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit LMSB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF 0-90-9*-bit LMSB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-os2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/\1\/\1\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh;
-  # decide which one to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd=$ECHO
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cr}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test 0 -eq "$ac_status"; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test 0 -ne "$ac_status"; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test no = "$lt_cv_ar_at_file"; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  bitrig* | openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# They come from Ultrix.  What could be older than Ultrix?!! ;)
-
-# Character class describing NM global symbol codes.
-symcode='BCDEGRST'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='$_A-Za-z_A-Za-z0-9*$'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='BCDT'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='ABCDGISTW'
-  ;;
-hpux*)
-  if test ia64 = "$host_cpu"; then
-    symcode='ABCDEGRST'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='BCDEGRST'
-  ;;
-osf*)
-  symcode='BCDEGQRST'
-  ;;
-solaris*)
-  symcode='BDRT'
-  ;;
-sco3.2v5*)
-  symcode='DT'
-  ;;
-sysv4.2uw2*)
-  symcode='DT'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='ABDT'
-  ;;
-sysv4)
-  symcode='DFNSTU'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='ABCDGIRSTW' ;;
-esac
-
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
-  # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* $.*$$/  {\"\1\", (void *) 0},/p'"
-  lt_c_name_lib_hook="\
-  -e 's/^I .* $lib.*$$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* $.*$$/  {\"lib\1\", (void *) 0},/p'"
-else
-  # Disable hooks by default.
-  lt_cv_sys_global_symbol_to_import=
-  lt_cdecl_hook=
-  lt_c_name_hook=
-  lt_c_name_lib_hook=
-fi
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
-$lt_cdecl_hook\
-" -e 's/^T .* $.*$$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
-$lt_c_name_hook\
-" -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/p'"
-
-# Transform an extracted symbol line into symbol name with lib prefix and
-# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
-$lt_c_name_lib_hook\
-" -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* $lib.*$$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* $.*$$/  {\"lib\1\", (void *) \&\1},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function,
-    # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
-"     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
-"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn2,2)};"\
-"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
-"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
-"     {if(hidesection) next};"\
-"     {f=\"D\"}; \$ 0~/.*\|/{f=\"T\"};"\
-"     {split(\$ 0,a,/\||\r/); split(a2,s)};"\
-"     s1~/^@?/{print f,s1,s1; next};"\
-"     s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
-    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS=conftstm.$ac_objext
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test yes = "$pipe_works"; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '@FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case $with_sysroot in #(
- yes)
-   if test yes = "$GCC"; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-$as_echo "$with_sysroot" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
-$as_echo_n "checking for a working dd... " >&6; }
-if ${ac_cv_path_lt_DD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-: ${lt_DD:=$DD}
-if test -z "$lt_DD"; then
-  ac_path_lt_DD_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in dd; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_lt_DD" || continue
-if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
-fi
-      $ac_path_lt_DD_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_lt_DD"; then
-    :
-  fi
-else
-  ac_cv_path_lt_DD=$lt_DD
-fi
-
-rm -f conftest.i conftest2.i conftest.out
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-$as_echo "$ac_cv_path_lt_DD" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
-$as_echo_n "checking how to truncate binary pipes... " >&6; }
-if ${lt_cv_truncate_bin+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-lt_cv_truncate_bin=
-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
-fi
-rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-$as_echo "$lt_cv_truncate_bin" >&6; }
-
-
-
-
-
-
-
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in $*""; do
-      case $cc_temp in
-        compile | *\\/compile | ccache | *\\/ccache ) ;;
-        distcc | *\\/distcc | purify | *\\/purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out what ABI is being produced by ac_compile, and set mode
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE=32
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE=64
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-mips64*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
-      *32-bit*)
-	emul="${emul}32"
-	;;
-      *64-bit*)
-	emul="${emul}64"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *MSB*)
-	emul="${emul}btsmip"
-	;;
-      *LSB*)
-	emul="${emul}ltsmip"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *N32*)
-	emul="${emul}n32"
-	;;
-    esac
-    LD="${LD-ld} -m $emul"
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.  Note that the listed cases only cover the
-  # situations where additional linker options are needed (such as when
-  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
-  # vice versa); the common cases where no linker options are needed do
-  # not appear in the list.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test yes != "$lt_cv_cc_needs_belf"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS=$SAVE_CFLAGS
-  fi
-  ;;
-*-*solaris*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*|x86_64-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD=${LD-ld}_sol2
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks=$enable_libtool_lock
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test yes != "$lt_cv_path_mainfest_tool"; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "$LT_MULTI_MODULE"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cr libconftest.a conftest.o" >&5
-      $AR cr libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.012)
-      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin91*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.012,.*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test yes = "$lt_cv_apple_cc_single_mod"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test yes = "$lt_cv_ld_exported_symbols_list"; then
-      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
-    fi
-    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR:DIR:"
-#       string "DIR DIR" will be prepended to VARIABLE
-# ":DIR:DIR"
-#       string "DIR DIR" will be appended to VARIABLE
-# "DIRP:DIRP::DIRA:DIRA"
-#       string "DIRP DIRP" will be prepended to VARIABLE and string
-#       "DIRA DIRA" will be appended to VARIABLE
-# "DIR:DIR"
-#       VARIABLE will be replaced by "DIR DIR"
-func_munge_path_list ()
-{
-    case x$2 in
-    x)
-        ;;
-    *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-        ;;
-    x:*)
-        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-        ;;
-    *)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for lt_pkg in $withval; do
-	IFS=$lt_save_ifs
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  pic_mode=default
-fi
-
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-  shared_archive_member_spec=
-case $host,$enable_shared in
-power*-*-aix5-9*,yes)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
-$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
-
-# Check whether --with-aix-soname was given.
-if test "${with_aix_soname+set}" = set; then :
-  withval=$with_aix_soname; case $withval in
-    aix|svr4|both)
-      ;;
-    *)
-      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
-      ;;
-    esac
-    lt_cv_with_aix_soname=$with_aix_soname
-else
-  if ${lt_cv_with_aix_soname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_with_aix_soname=aix
-fi
-
-    with_aix_soname=$lt_cv_with_aix_soname
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-$as_echo "$with_aix_soname" >&6; }
-  if test aix != "$with_aix_soname"; then
-    # For the AIX way of multilib, we name the shared archive member
-    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
-    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
-    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
-    # the AIX toolchain works better with OBJECT_MODE set (default 32).
-    if test 64 = "${OBJECT_MODE-32}"; then
-      shared_archive_member_spec=shr_64
-    else
-      shared_archive_member_spec=shr
-    fi
-  fi
-  ;;
-*)
-  with_aix_soname=aix
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS=$ltmain
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test set != "${COLLECT_NAMES+set}"; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-old_CC=$CC
-old_CFLAGS=$CFLAGS
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-func_cc_basename $compiler
-cc_basename=$func_cc_basename_result
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-\\/* |  ?:\\/*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/${ac_tool_prefix}file"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac
-fi
-
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-\\/* |  ?:\\/*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/file"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac
-fi
-
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC=$CC
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, ) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test yes = "$GCC"; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-
-  if test yes = "$GCC"; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static='$wl-static'
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix3-9*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      case $cc_basename in
-      nagfor*)
-        # NAG Fortran compiler
-        lt_prog_compiler_wl='-Wl,-Wl,,'
-        lt_prog_compiler_pic='-PIC'
-        lt_prog_compiler_static='-Bstatic'
-        ;;
-      esac
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static='$wl-static'
-	;;
-      esac
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='$wl-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64, which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # flang / f18. f95 an alias for gfortran or flang on Debian
-      flang* | f18* | f95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-        *Intel*\ CF*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms that do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_pic_works"; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_static_works"; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links=nottested
-if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test no = "$hard_links"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ' (' and ')$', so one must not match beginning or
-  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
-  # as well as any symbol that contains 'd'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test yes != "$GCC"; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd* | bitrig*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    link_all_deplibs=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test yes = "$with_gnu_ld"; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ $GNU\ Binutils$\ 2.19.5*) ;;
-	  *\ $GNU\ Binutils$\ 2.2-9*) ;;
-	  *\ $GNU\ Binutils$\ 3-9*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test yes = "$lt_use_gnu_ld_interface"; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='$wl'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-    export_dynamic_flag_spec='$wl--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3-9*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test ia64 != "$host_cpu"; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='$wl--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file, use it as
-	# is; otherwise, prepend EXPORTS...
-	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^	 *//'\''     -e '\''/^$;.*$*$/d'\''     -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\''     -e q     $export_symbols`" ; then
-          cp $export_symbols $output_objdir/$soname.def;
-        else
-          echo EXPORTS > $output_objdir/$soname.def;
-          cat $export_symbols >> $output_objdir/$soname.def;
-        fi~
-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    interix3-9*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-      export_dynamic_flag_spec='$wl-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test linux-dietlibc = "$host_os"; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test no = "$tmp_diet"
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-        nagfor*)                        # NAGFOR 5.3
-          tmp_sharedflag='-Wl,-shared' ;;
-	xlcC* | bgxlcC* | mpixlcC*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-
-        if test yes = "$supports_anon_versioning"; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-            echo "local: *; };" >> $output_objdir/$libname.ver~
-            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	tcc*)
-	  export_dynamic_flag_spec='-rdynamic'
-	  ;;
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test yes = "$supports_anon_versioning"; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-              echo "local: *; };" >> $output_objdir/$libname.ver~
-              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ 01.* | *\ 2.0-9.* | *\ 2.10-5.*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test no = "$ld_shlibs"; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix4-9*)
-      if test ia64 = "$host_cpu"; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
-	# Without the "-l" option, or with the "-B" option, AIX nm treats
-	# weak defined symbols like other global defined symbols, whereas
-	# GNU nm marks them as "W".
-	# While the 'weak' keyword is ignored in the Export File, we need
-	# it in the Import File for the 'aix-soname' feature, so we have
-	# to replace the "-B" option with "-P" for AIX nm.
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# have runtime linking enabled, and use it for executables.
-	# For shared libraries, we enable/disable runtime linking
-	# depending on the kind of the shared library created -
-	# when "with_aix_soname,aix_use_runtimelinking" is:
-	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "aix,yes"  lib.so          shared, rtl:yes, for executables
-	#            lib.a           static archive
-	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
-	#            lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a(lib.so.V) shared, rtl:no
-	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a           static archive
-	case $host_os in aix4.23|aix4.23.*|aix5-9*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	    # so we don't have lib.a shared libs to link our executables.
-	    # We have to force runtime linking in this case.
-	    aix_use_runtimelinking=yes
-	    LDFLAGS="$LDFLAGS -Wl,-brtl"
-	  fi
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='$wl-f,'
-      case $with_aix_soname,$aix_use_runtimelinking in
-      aix,*) ;; # traditional, no import file
-      svr4,* | *,yes) # use import file
-	# The Import File defines what to hardcode.
-	hardcode_direct=no
-	hardcode_direct_absolute=no
-	;;
-      esac
-
-      if test yes = "$GCC"; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test yes = "$aix_use_runtimelinking"; then
-	  shared_flag="$shared_flag "'$wl-G'
-	fi
-	# Need to ensure runtime linking is disabled for the traditional
-	# shared library, or the linker may eventually find shared libraries
-	# /with/ Import File - we do not want to mix them.
-	shared_flag_aix='-shared'
-	shared_flag_svr4='-shared $wl-G'
-      else
-	# not using gcc
-	if test ia64 = "$host_cpu"; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag='$wl-G'
-	  else
-	    shared_flag='$wl-bM:SRE'
-	  fi
-	  shared_flag_aix='$wl-bM:SRE'
-	  shared_flag_svr4='$wl-G'
-	fi
-      fi
-
-      export_dynamic_flag_spec='$wl-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *$^ *$ *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-      else
-	if test ia64 = "$host_cpu"; then
-	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *$^ *$ *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' $wl-bernotok'
-	  allow_undefined_flag=' $wl-berok'
-	  if test yes = "$with_gnu_ld"; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	  # -brtl affects multiple linker settings, -berok does not and is overridden later
-	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\$, \$%-berok\\1%g"`'
-	  if test svr4 != "$with_aix_soname"; then
-	    # This is similar to how AIX traditionally builds its shared libraries.
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	  fi
-	  if test aix != "$with_aix_soname"; then
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	  else
-	    # used by -dlpreopen to get the symbols
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	  fi
-	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi45*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^	 *//'\''     -e '\''/^$;.*$*$/d'\''     -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\''     -e q     $export_symbols`" ; then
-            cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-          else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-          fi~
-          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-          linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-          lt_tool_outputfile="@TOOL_OUTPUT@"~
-          case $lt_outputfile in
-            *.exe|*.EXE) ;;
-            *)
-              lt_outputfile=$lt_outputfile.exe
-              lt_tool_outputfile=$lt_tool_outputfile.exe
-              ;;
-          esac~
-          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-            $RM "$lt_outputfile.manifest";
-          fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test yes = "$lt_cv_ld_force_load"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag=$_lt_dar_allow_undefined
-  case $cc_basename in
-     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test yes = "$_lt_dar_can_shared"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test yes = "$GCC"; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='$wl-E'
-      ;;
-
-    hpux10*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test no = "$with_gnu_ld"; then
-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='$wl-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test yes = "$lt_cv_prog_compiler__b"; then
-    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-	  ;;
-	esac
-      fi
-      if test no = "$with_gnu_ld"; then
-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='$wl-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS=$LDFLAGS
-	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS=$save_LDFLAGS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test yes = "$lt_cv_irix_exported_symbol"; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
-	fi
-	link_all_deplibs=no
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    linux*)
-      case $cc_basename in
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	ld_shlibs=yes
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      esac
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd* | bitrig*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-	  export_dynamic_flag_spec='$wl-E'
-	else
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    osf3*)
-      if test yes = "$GCC"; then
-	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test yes = "$GCC"; then
-	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
-	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test yes = "$GCC"; then
-	wlarc='$wl'
-	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='$wl'
-	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.0-5 | solaris2.0-5.*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands '-z linker_flag'.  GCC discards it without '$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test yes = "$GCC"; then
-	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test sequent = "$host_vendor"; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
-      no_undefined_flag='$wl-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We CANNOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='$wl-z,text'
-      allow_undefined_flag='$wl-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='$wl-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='$wl-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test sni = "$host_vendor"; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='$wl-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test no = "$ld_shlibs" && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test yes,yes = "$GCC,$enable_shared"; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test yes = "$GCC"; then
-  case $host_os in
-    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
-    *) lt_awk_arg='/^libraries:/' ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq='s|=$A-Za-z:$|\1|g' ;;
-    *) lt_sed_strip_eq='s|=/|/|g' ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary...
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  # ...but if some path component already ends with the multilib dir we assume
-  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
-  case "$lt_multi_os_dir; $lt_search_path_spec " in
-  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
-    lt_multi_os_dir=
-    ;;
-  esac
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
-    elif test -n "$lt_multi_os_dir"; then
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS = " "; FS = "/|\n";} {
-  lt_foo = "";
-  lt_count = 0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo = "/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freqlt_foo++; }
-  if (lt_freqlt_foo == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's|/$A-Za-z:$|\1|g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=.so
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='$libname$release$shared_ext$major'
-  ;;
-
-aix4-9*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test ia64 = "$host_cpu"; then
-    # AIX 5 supports IA64
-    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line '#! .'.  This would cause the generated library to
-    # depend on '.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.01 | aix4.01.*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # Using Import Files as archive members, it is possible to support
-    # filename-based versioning of shared library archives on AIX. While
-    # this would work for both with and without runtime linking, it will
-    # prevent static linking of such archives. So we do filename-based
-    # shared library versioning with .so extension only, which is used
-    # when both runtime linking and shared linking is enabled.
-    # Unfortunately, runtime linking may impact performance, so we do
-    # not want this to be the default eventually. Also, we use the
-    # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
-    # To allow for filename-based versioning support, we need to create
-    # libNAME.so.V as an archive file, containing:
-    # *) an Import File, referring to the versioned filename of the
-    #    archive as well as the shared archive member, telling the
-    #    bitwidth (32 or 64) of that shared object, and providing the
-    #    list of exported symbols of that shared object, eventually
-    #    decorated with the 'weak' keyword
-    # *) the shared object with the F_LOADONLY flag set, to really avoid
-    #    it being seen by the linker.
-    # At run time we better use the real file rather than another symlink,
-    # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
-    case $with_aix_soname,$aix_use_runtimelinking in
-    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    aix,yes) # traditional libtool
-      dynamic_linker='AIX unversionable lib.so'
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      ;;
-    aix,no) # traditional AIX only
-      dynamic_linker='AIX lib.a(lib.so.V)'
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      ;;
-    svr4,*) # full svr4 only
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,yes) # both, prefer svr4
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # unpreferred sharedlib libNAME.a needs extra handling
-      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
-      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,no) # both, prefer aix
-      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
-      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
-      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
-      ;;
-    esac
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='$libname$shared_ext'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi45*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
-    library_names_spec='$libname.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec=$LIB
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';c-zC-Z:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$major$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd23.*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      soname_spec='$libname$release$shared_ext$major'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.2-9* | freebsdelf3.2-9* | \
-  freebsd4.0-5 | freebsdelf4.0-5 | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    if test 32 = "$HPUX_IA64_MODE"; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
-    fi
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix3-9*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test yes = "$lt_cv_prog_gnu_ld"; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
-  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-linux*android*)
-  version_type=none # Android doesn't support versioned libraries.
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext'
-  soname_spec='$libname$release$shared_ext'
-  finish_cmds=
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  dynamic_linker='Android linker'
-  # Don't embed -rpath directories since the linker doesn't support them.
-  hardcode_libdir_flag_spec='-L$libdir'
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Ideally, we could use ldconfig to report *all* directores which are
-  # searched for libraries, however this is still not possible.  Aside from not
-  # being certain /sbin/ldconfig is available, command
-  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
-  # even though it is searched at run-time.  Try to do the best guess by
-  # appending ld.so.conf contents (and includes) to the search path.
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd* | bitrig*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec=/usr/lib
-  need_lib_prefix=no
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    need_version=no
-  else
-    need_version=yes
-  fi
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-  # OS/2 can only load a DLL with a base name of 8 characters or less.
-  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
-  library_names_spec='${libname}_dll.$libext'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=BEGINLIBPATH
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  postinstall_cmds='base_file=`basename \$file`~
-    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
-    dldir=$destdir/`dirname \$dlpath`~
-    test -d \$dldir || mkdir -p \$dldir~
-    $install_prog $dir/$dlname \$dldir/$dlname~
-    chmod a+x \$dldir/$dlname~
-    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-    fi'
-  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
-    dlpath=$dir/\$dldll~
-    $RM \$dlpath'
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test yes = "$with_gnu_ld"; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec; then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
-    soname_spec='$libname$shared_ext.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=sco
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test yes = "$with_gnu_ld"; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test yes = "$hardcode_automatic"; then
-
-  # We can hardcode non-existent directories.
-  if test no != "$hardcode_direct" &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
-     test no != "$hardcode_minus_L"; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test relink = "$hardcode_action" ||
-   test yes = "$inherit_rpath"; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
-     test no = "$enable_shared"; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test yes != "$enable_dlopen"; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen=load_add_on
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen=LoadLibrary
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-    # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
-
-    lt_cv_dlopen=dyld
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  tpf*)
-    # Don't try to run any link tests for TPF.  We know it's impossible
-    # because TPF is a cross-compiler, and we know how we open DSOs.
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=no
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen=shl_load
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test no = "$lt_cv_dlopen"; then
-    enable_dlopen=no
-  else
-    enable_dlopen=yes
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS=$CPPFLAGS
-    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS=$LDFLAGS
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS=$LIBS
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test yes = "$cross_compiling"; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test yes = "$lt_cv_dlopen_self"; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test yes = "$cross_compiling"; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS=$save_CPPFLAGS
-    LDFLAGS=$save_LDFLAGS
-    LIBS=$save_LIBS
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report what library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test no = "$can_build_shared" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test yes = "$enable_shared" && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix4-9*)
-    if test ia64 != "$host_cpu"; then
-      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-      yes,aix,yes) ;;			# shared object as lib.so file only
-      yes,svr4,*) ;;			# shared object as lib.so archive member only
-      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-      esac
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test yes = "$enable_shared" || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC=$lt_save_CC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-
-# Detect the distribution. This is used for the default configuration and
-# for some distro-specific build options.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host distribution" >&5
-$as_echo_n "checking host distribution... " >&6; }
-
-# Check whether --with-distro was given.
-if test "${with_distro+set}" = set; then :
-  withval=$with_distro;
-fi
-
-if type lsb_release >/dev/null 2>&1 && test "z$with_distro" = "z"; then
-	with_distro=`lsb_release -is`
-fi
-if test "z$with_distro" = "z"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/redhat-release" >&5
-$as_echo_n "checking for /etc/redhat-release... " >&6; }
-if ${ac_cv_file__etc_redhat_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/redhat-release"; then
-  ac_cv_file__etc_redhat_release=yes
-else
-  ac_cv_file__etc_redhat_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_redhat_release" >&5
-$as_echo "$ac_cv_file__etc_redhat_release" >&6; }
-if test "x$ac_cv_file__etc_redhat_release" = xyes; then :
-  with_distro="redhat"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/oracle-release" >&5
-$as_echo_n "checking for /etc/oracle-release... " >&6; }
-if ${ac_cv_file__etc_oracle_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/oracle-release"; then
-  ac_cv_file__etc_oracle_release=yes
-else
-  ac_cv_file__etc_oracle_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_oracle_release" >&5
-$as_echo "$ac_cv_file__etc_oracle_release" >&6; }
-if test "x$ac_cv_file__etc_oracle_release" = xyes; then :
-  with_distro="oracle"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/sparclinux-release" >&5
-$as_echo_n "checking for /etc/sparclinux-release... " >&6; }
-if ${ac_cv_file__etc_sparclinux_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/sparclinux-release"; then
-  ac_cv_file__etc_sparclinux_release=yes
-else
-  ac_cv_file__etc_sparclinux_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_sparclinux_release" >&5
-$as_echo "$ac_cv_file__etc_sparclinux_release" >&6; }
-if test "x$ac_cv_file__etc_sparclinux_release" = xyes; then :
-  with_distro="sparclinux"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/centos-release" >&5
-$as_echo_n "checking for /etc/centos-release... " >&6; }
-if ${ac_cv_file__etc_centos_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/centos-release"; then
-  ac_cv_file__etc_centos_release=yes
-else
-  ac_cv_file__etc_centos_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_centos_release" >&5
-$as_echo "$ac_cv_file__etc_centos_release" >&6; }
-if test "x$ac_cv_file__etc_centos_release" = xyes; then :
-  with_distro="centos"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/fedora-release" >&5
-$as_echo_n "checking for /etc/fedora-release... " >&6; }
-if ${ac_cv_file__etc_fedora_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/fedora-release"; then
-  ac_cv_file__etc_fedora_release=yes
-else
-  ac_cv_file__etc_fedora_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_fedora_release" >&5
-$as_echo "$ac_cv_file__etc_fedora_release" >&6; }
-if test "x$ac_cv_file__etc_fedora_release" = xyes; then :
-  with_distro="fedora"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5
-$as_echo_n "checking for /etc/SuSE-release... " >&6; }
-if ${ac_cv_file__etc_SuSE_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/SuSE-release"; then
-  ac_cv_file__etc_SuSE_release=yes
-else
-  ac_cv_file__etc_SuSE_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5
-$as_echo "$ac_cv_file__etc_SuSE_release" >&6; }
-if test "x$ac_cv_file__etc_SuSE_release" = xyes; then :
-  with_distro="suse"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/gentoo-release" >&5
-$as_echo_n "checking for /etc/gentoo-release... " >&6; }
-if ${ac_cv_file__etc_gentoo_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/gentoo-release"; then
-  ac_cv_file__etc_gentoo_release=yes
-else
-  ac_cv_file__etc_gentoo_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_gentoo_release" >&5
-$as_echo "$ac_cv_file__etc_gentoo_release" >&6; }
-if test "x$ac_cv_file__etc_gentoo_release" = xyes; then :
-  with_distro="gentoo"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/debian_version" >&5
-$as_echo_n "checking for /etc/debian_version... " >&6; }
-if ${ac_cv_file__etc_debian_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/debian_version"; then
-  ac_cv_file__etc_debian_version=yes
-else
-  ac_cv_file__etc_debian_version=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_debian_version" >&5
-$as_echo "$ac_cv_file__etc_debian_version" >&6; }
-if test "x$ac_cv_file__etc_debian_version" = xyes; then :
-  with_distro="debian"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/arch-release" >&5
-$as_echo_n "checking for /etc/arch-release... " >&6; }
-if ${ac_cv_file__etc_arch_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/arch-release"; then
-  ac_cv_file__etc_arch_release=yes
-else
-  ac_cv_file__etc_arch_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_arch_release" >&5
-$as_echo "$ac_cv_file__etc_arch_release" >&6; }
-if test "x$ac_cv_file__etc_arch_release" = xyes; then :
-  with_distro="arch"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/slackware-version" >&5
-$as_echo_n "checking for /etc/slackware-version... " >&6; }
-if ${ac_cv_file__etc_slackware_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/slackware-version"; then
-  ac_cv_file__etc_slackware_version=yes
-else
-  ac_cv_file__etc_slackware_version=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_slackware_version" >&5
-$as_echo "$ac_cv_file__etc_slackware_version" >&6; }
-if test "x$ac_cv_file__etc_slackware_version" = xyes; then :
-  with_distro="slackware"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/plamo-version" >&5
-$as_echo_n "checking for /etc/plamo-version... " >&6; }
-if ${ac_cv_file__etc_plamo_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/plamo-version"; then
-  ac_cv_file__etc_plamo_version=yes
-else
-  ac_cv_file__etc_plamo_version=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_plamo_version" >&5
-$as_echo "$ac_cv_file__etc_plamo_version" >&6; }
-if test "x$ac_cv_file__etc_plamo_version" = xyes; then :
-  with_distro="plamo"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/frugalware-release" >&5
-$as_echo_n "checking for /etc/frugalware-release... " >&6; }
-if ${ac_cv_file__etc_frugalware_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/frugalware-release"; then
-  ac_cv_file__etc_frugalware_release=yes
-else
-  ac_cv_file__etc_frugalware_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_frugalware_release" >&5
-$as_echo "$ac_cv_file__etc_frugalware_release" >&6; }
-if test "x$ac_cv_file__etc_frugalware_release" = xyes; then :
-  with_distro="frugalware"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/mandrakelinux-release" >&5
-$as_echo_n "checking for /etc/mandrakelinux-release... " >&6; }
-if ${ac_cv_file__etc_mandrakelinux_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/mandrakelinux-release"; then
-  ac_cv_file__etc_mandrakelinux_release=yes
-else
-  ac_cv_file__etc_mandrakelinux_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_mandrakelinux_release" >&5
-$as_echo "$ac_cv_file__etc_mandrakelinux_release" >&6; }
-if test "x$ac_cv_file__etc_mandrakelinux_release" = xyes; then :
-  with_distro="openmandriva"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/mandriva-release" >&5
-$as_echo_n "checking for /etc/mandriva-release... " >&6; }
-if ${ac_cv_file__etc_mandriva_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/mandriva-release"; then
-  ac_cv_file__etc_mandriva_release=yes
-else
-  ac_cv_file__etc_mandriva_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_mandriva_release" >&5
-$as_echo "$ac_cv_file__etc_mandriva_release" >&6; }
-if test "x$ac_cv_file__etc_mandriva_release" = xyes; then :
-  with_distro="openmandriva"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/pardus-release" >&5
-$as_echo_n "checking for /etc/pardus-release... " >&6; }
-if ${ac_cv_file__etc_pardus_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/pardus-release"; then
-  ac_cv_file__etc_pardus_release=yes
-else
-  ac_cv_file__etc_pardus_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_pardus_release" >&5
-$as_echo "$ac_cv_file__etc_pardus_release" >&6; }
-if test "x$ac_cv_file__etc_pardus_release" = xyes; then :
-  with_distro="pardus"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/altlinux-release" >&5
-$as_echo_n "checking for /etc/altlinux-release... " >&6; }
-if ${ac_cv_file__etc_altlinux_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/altlinux-release"; then
-  ac_cv_file__etc_altlinux_release=yes
-else
-  ac_cv_file__etc_altlinux_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_altlinux_release" >&5
-$as_echo "$ac_cv_file__etc_altlinux_release" >&6; }
-if test "x$ac_cv_file__etc_altlinux_release" = xyes; then :
-  with_distro="altlinux"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/pld-release" >&5
-$as_echo_n "checking for /etc/pld-release... " >&6; }
-if ${ac_cv_file__etc_pld_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/pld-release"; then
-  ac_cv_file__etc_pld_release=yes
-else
-  ac_cv_file__etc_pld_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_pld_release" >&5
-$as_echo "$ac_cv_file__etc_pld_release" >&6; }
-if test "x$ac_cv_file__etc_pld_release" = xyes; then :
-  with_distro="pld"
-fi
-
-fi
-with_distro=`echo ${with_distro} | tr ':upper:' ':lower:'`
-
-if test "z$with_distro" = "zforsparc"; then
-	with_distro="sparclinux"
-fi
-
-if test "z$with_distro" = "z"; then
-	with_distro="unknown"
-fi
-case $with_distro in
-	ubuntu|raspbian)
-		distroconf=default.conf.lxcbr
-		distrosysconf="$sysconfdir/default"
-		;;
-	redhat|redhatenterpriseserver|centos|fedora|oracle|oracleserver|sparclinux|altlinux|suse|opensuse*|plamo|pld)
-		distroconf=default.conf.lxcbr
-		distrosysconf="$sysconfdir/sysconfig"
-		;;
-	*)
-		distroconf=default.conf.unknown
-		distrosysconf="$sysconfdir/default"
-		;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_distro" >&5
-$as_echo "$with_distro" >&6; }
- if test x"$with_distro" = "xdebian" -o x"$with_distro" = "xubuntu" -o x"$with_distro" = "xraspbian"; then
-  HAVE_DEBIAN_TRUE=
-  HAVE_DEBIAN_FALSE='#'
-else
-  HAVE_DEBIAN_TRUE='#'
-  HAVE_DEBIAN_FALSE=
-fi
-
- if test "x$with_distro" = "xubuntu"; then
-  DISTRO_UBUNTU_TRUE=
-  DISTRO_UBUNTU_FALSE='#'
-else
-  DISTRO_UBUNTU_TRUE='#'
-  DISTRO_UBUNTU_FALSE=
-fi
-
-
-ac_config_links="$ac_config_links config/etc/default.conf:config/etc/${distroconf}"
-
-
-# Check for init system type
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for init system type" >&5
-$as_echo_n "checking for init system type... " >&6; }
-
-# Check whether --with-init-script was given.
-if test "${with_init_script+set}" = set; then :
-  withval=$with_init_script;
-else
-  with_init_script=distro
-fi
-
-case "$with_init_script" in
-	distro)
-		case $with_distro in
-			fedora|altlinux|opensuse*)
-				init_script=systemd
-				;;
-			redhat|redhatenterpriseserver|oracle|oracleserver|sparclinux|plamo)
-				init_script=sysvinit
-				;;
-			centos)
-				init_script=sysvinit,systemd
-				;;
-			debian|raspbian|ubuntu)
-				init_script=upstart,systemd
-				;;
-			pld)
-				init_script=sysvinit,upstart,systemd
-				;;
-			*)
-				echo -n "Linux distribution init system unknown."
-				init_script=
-				;;
-		esac
-		;;
-	*)
-		init_script=$with_init_script
-		;;
-esac
-
-# Check valid init systems were given, run in subshell so we don't mess up IFS
-(IFS="," ; for init_sys in $init_script;
-do
-	case "$init_sys" in
-		none|sysvinit|systemd|upstart)
-			;;
-		*)
-			exit 1
-			;;
-	esac
-done) || as_fn_error $? "Unknown init system type in $init_script" "$LINENO" 5
-
- if echo "$init_script" |grep -q "sysvinit"; then
-  INIT_SCRIPT_SYSV_TRUE=
-  INIT_SCRIPT_SYSV_FALSE='#'
-else
-  INIT_SCRIPT_SYSV_TRUE='#'
-  INIT_SCRIPT_SYSV_FALSE=
-fi
-
- if echo "$init_script" |grep -q "systemd"; then
-  INIT_SCRIPT_SYSTEMD_TRUE=
-  INIT_SCRIPT_SYSTEMD_FALSE='#'
-else
-  INIT_SCRIPT_SYSTEMD_TRUE='#'
-  INIT_SCRIPT_SYSTEMD_FALSE=
-fi
-
- if echo "$init_script" |grep -q "upstart"; then
-  INIT_SCRIPT_UPSTART_TRUE=
-  INIT_SCRIPT_UPSTART_FALSE='#'
-else
-  INIT_SCRIPT_UPSTART_TRUE='#'
-  INIT_SCRIPT_UPSTART_FALSE=
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $init_script" >&5
-$as_echo "$init_script" >&6; }
-
-# systemd unit dir
-
-# Check whether --with-systemdsystemunitdir was given.
-if test "${with_systemdsystemunitdir+set}" = set; then :
-  withval=$with_systemdsystemunitdir; with_systemdsystemunitdir=$withval
-else
-  with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
-fi
-
-if test -z "$with_systemdsystemunitdir"; then
-  with_systemdsystemunitdir=/lib/systemd/system
-fi
-if test "x$with_systemdsystemunitdir" != "xno"; then
-  SYSTEMD_UNIT_DIR=$with_systemdsystemunitdir
-
-fi
-
-# Check whether --enable-werror was given.
-if test "${enable_werror+set}" = set; then :
-  enableval=$enable_werror; enable_werror=$enableval
-else
-  enable_werror=yes
-fi
-
-
-# Allow disabling rpath
-# Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
-  enableval=$enable_rpath; enable_rpath=$enableval
-else
-  enable_rpath=no
-fi
-
- if test "x$enable_rpath" = "xyes"; then
-  ENABLE_RPATH_TRUE=
-  ENABLE_RPATH_FALSE='#'
-else
-  ENABLE_RPATH_TRUE='#'
-  ENABLE_RPATH_FALSE=
-fi
-
-
-# Documentation (manpages)
-# Check whether --enable-doc was given.
-if test "${enable_doc+set}" = set; then :
-  enableval=$enable_doc; enable_doc=$enableval
-else
-  enable_doc=auto
-fi
-
-
-if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
-	db2xman=""
-	dbparsers="docbook2X2man docbook2x-man db2x_docbook2man docbook2man docbook-to-man"
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook2x-man" >&5
-$as_echo_n "checking for docbook2x-man... " >&6; }
-	for name in ${dbparsers}; do
-		if "$name" --help >/dev/null 2>&1; then
-			db2xman="$name"
-			break;
-		fi
-	done
-
-	if test -n "${db2xman}"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${db2xman}" >&5
-$as_echo "${db2xman}" >&6; }
-		enable_doc="yes"
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		if test "x$enable_doc" = "xyes"; then
-			as_fn_error $? "docbook2x-man is required, but could not be found" "$LINENO" 5
-		fi
-		enable_doc="no"
-	fi
-
-
-fi
- if test "x$db2xman" != "x"; then
-  ENABLE_DOCBOOK_TRUE=
-  ENABLE_DOCBOOK_FALSE='#'
-else
-  ENABLE_DOCBOOK_TRUE='#'
-  ENABLE_DOCBOOK_FALSE=
-fi
-
- if test "x$db2xman" != "xdocbook2man"; then
-  USE_DOCBOOK2X_TRUE=
-  USE_DOCBOOK2X_FALSE='#'
-else
-  USE_DOCBOOK2X_TRUE='#'
-  USE_DOCBOOK2X_FALSE=
-fi
-
-
-if test "x$db2xman" = "xdocbook2man"; then
-	docdtd="\"-//Davenport//DTD DocBook V3.0//EN\""
-else
-	docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\""
-fi
-
-
-# Documentation (API)
-# Check whether --enable-api-docs was given.
-if test "${enable_api_docs+set}" = set; then :
-  enableval=$enable_api_docs; enable_api_docs=$enableval
-else
-  enable_api_docs=auto
-fi
-
-
-if test "x$enable_api_docs" = "xyes" -o "x$enable_api_docs" = "xauto"; then
-	for ac_prog in doxygen
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAVE_DOXYGEN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$HAVE_DOXYGEN"; then
-  ac_cv_prog_HAVE_DOXYGEN="$HAVE_DOXYGEN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_HAVE_DOXYGEN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-HAVE_DOXYGEN=$ac_cv_prog_HAVE_DOXYGEN
-if test -n "$HAVE_DOXYGEN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOXYGEN" >&5
-$as_echo "$HAVE_DOXYGEN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$HAVE_DOXYGEN" && break
-done
-
-
-
-	if test "x$HAVE_DOXYGEN" != "x"; then
-		enable_api_docs="yes"
-	else
-		if test "x$enable_api_docs" = "xyes"; then
-			as_fn_error $? "doxygen is required, but could not be found" "$LINENO" 5
-		fi
-		enable_api_docs="no"
-	fi
-fi
-
- if test "x$HAVE_DOXYGEN" != "x"; then
-  ENABLE_API_DOCS_TRUE=
-  ENABLE_API_DOCS_FALSE='#'
-else
-  ENABLE_API_DOCS_TRUE='#'
-  ENABLE_API_DOCS_FALSE=
-fi
-
-
-
-
-# Apparmor
-# Check whether --enable-apparmor was given.
-if test "${enable_apparmor+set}" = set; then :
-  enableval=$enable_apparmor; enable_apparmor=$enableval
-else
-  enable_apparmor=auto
-fi
-
-
-if test "$enable_apparmor" = "auto" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5
-$as_echo_n "checking for aa_change_profile in -lapparmor... " >&6; }
-if ${ac_cv_lib_apparmor_aa_change_profile+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lapparmor  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char aa_change_profile ();
-int
-main ()
-{
-return aa_change_profile ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_apparmor_aa_change_profile=yes
-else
-  ac_cv_lib_apparmor_aa_change_profile=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5
-$as_echo "$ac_cv_lib_apparmor_aa_change_profile" >&6; }
-if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes; then :
-  enable_apparmor=yes
-else
-  enable_apparmor=no
-fi
-
-fi
- if test "x$enable_apparmor" = "xyes"; then
-  ENABLE_APPARMOR_TRUE=
-  ENABLE_APPARMOR_FALSE='#'
-else
-  ENABLE_APPARMOR_TRUE='#'
-  ENABLE_APPARMOR_FALSE=
-fi
-
-
-# OpenSSL
-# libssl-dev
-# Check whether --enable-openssl was given.
-if test "${enable_openssl+set}" = set; then :
-  enableval=$enable_openssl; enable_openssl=$enableval
-else
-  enable_openssl=auto
-fi
-
-
-if test "$enable_openssl" = "auto" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_ssl in -lssl" >&5
-$as_echo_n "checking for OPENSSL_init_ssl in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_OPENSSL_init_ssl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char OPENSSL_init_ssl ();
-int
-main ()
-{
-return OPENSSL_init_ssl ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ssl_OPENSSL_init_ssl=yes
-else
-  ac_cv_lib_ssl_OPENSSL_init_ssl=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_OPENSSL_init_ssl" >&5
-$as_echo "$ac_cv_lib_ssl_OPENSSL_init_ssl" >&6; }
-if test "x$ac_cv_lib_ssl_OPENSSL_init_ssl" = xyes; then :
-  enable_openssl=yes
-else
-  enable_openssl=no
-fi
-
-
-fi
- if test "x$enable_openssl" = "xyes"; then
-  ENABLE_OPENSSL_TRUE=
-  ENABLE_OPENSSL_FALSE='#'
-else
-  ENABLE_OPENSSL_TRUE='#'
-  ENABLE_OPENSSL_FALSE=
-fi
-
-
-if test -z "$ENABLE_OPENSSL_TRUE"; then :
-  ac_fn_c_check_header_mongrel "$LINENO" "openssl/engine.h" "ac_cv_header_openssl_engine_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_engine_h" = xyes; then :
-
-else
-  as_fn_error $? "You must install the OpenSSL development package in order to compile lxc" "$LINENO" 5
-fi
-
-
-	OPENSSL_LIBS='-lssl -lcrypto'
-
-fi
-
-# SELinux
-# Check whether --enable-selinux was given.
-if test "${enable_selinux+set}" = set; then :
-  enableval=$enable_selinux; enable_selinux=$enableval
-else
-  enable_selinux=auto
-fi
-
-
-if test "x$enable_selinux" = xauto; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setexeccon_raw in -lselinux" >&5
-$as_echo_n "checking for setexeccon_raw in -lselinux... " >&6; }
-if ${ac_cv_lib_selinux_setexeccon_raw+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lselinux  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char setexeccon_raw ();
-int
-main ()
-{
-return setexeccon_raw ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_selinux_setexeccon_raw=yes
-else
-  ac_cv_lib_selinux_setexeccon_raw=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_setexeccon_raw" >&5
-$as_echo "$ac_cv_lib_selinux_setexeccon_raw" >&6; }
-if test "x$ac_cv_lib_selinux_setexeccon_raw" = xyes; then :
-  enable_selinux=yes
-else
-  enable_selinux=no
-fi
-
-fi
- if test "x$enable_selinux" = "xyes"; then
-  ENABLE_SELINUX_TRUE=
-  ENABLE_SELINUX_FALSE='#'
-else
-  ENABLE_SELINUX_TRUE='#'
-  ENABLE_SELINUX_FALSE=
-fi
-
-if test -z "$ENABLE_SELINUX_TRUE"; then :
-  ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
-if test "x$ac_cv_header_selinux_selinux_h" = xyes; then :
-
-else
-  as_fn_error $? "You must install the SELinux development package in order to compile lxc" "$LINENO" 5
-fi
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setexeccon_raw in -lselinux" >&5
-$as_echo_n "checking for setexeccon_raw in -lselinux... " >&6; }
-if ${ac_cv_lib_selinux_setexeccon_raw+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lselinux  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char setexeccon_raw ();
-int
-main ()
-{
-return setexeccon_raw ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_selinux_setexeccon_raw=yes
-else
-  ac_cv_lib_selinux_setexeccon_raw=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_setexeccon_raw" >&5
-$as_echo "$ac_cv_lib_selinux_setexeccon_raw" >&6; }
-if test "x$ac_cv_lib_selinux_setexeccon_raw" = xyes; then :
-  true
-else
-  as_fn_error $? "You must install the SELinux development package in order to compile lxc" "$LINENO" 5
-fi
-
-	SELINUX_LIBS=-lselinux
-
-fi
-
-# Seccomp syscall filter
-# Check whether --enable-seccomp was given.
-if test "${enable_seccomp+set}" = set; then :
-  enableval=$enable_seccomp; enable_seccomp=$enableval
-else
-  enable_seccomp=auto
-fi
-
-
-if test "x$enable_seccomp" = "xauto" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for seccomp_init in -lseccomp" >&5
-$as_echo_n "checking for seccomp_init in -lseccomp... " >&6; }
-if ${ac_cv_lib_seccomp_seccomp_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lseccomp  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char seccomp_init ();
-int
-main ()
-{
-return seccomp_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_seccomp_seccomp_init=yes
-else
-  ac_cv_lib_seccomp_seccomp_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_seccomp_seccomp_init" >&5
-$as_echo "$ac_cv_lib_seccomp_seccomp_init" >&6; }
-if test "x$ac_cv_lib_seccomp_seccomp_init" = xyes; then :
-  enable_seccomp=yes
-else
-  enable_seccomp=no
-fi
-
-fi
- if test "x$enable_seccomp" = "xyes"; then
-  ENABLE_SECCOMP_TRUE=
-  ENABLE_SECCOMP_FALSE='#'
-else
-  ENABLE_SECCOMP_TRUE='#'
-  ENABLE_SECCOMP_FALSE=
-fi
-
-
-if test -z "$ENABLE_SECCOMP_TRUE"; then :
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SECCOMP" >&5
-$as_echo_n "checking for SECCOMP... " >&6; }
-
-if test -n "$SECCOMP_CFLAGS"; then
-    pkg_cv_SECCOMP_CFLAGS="$SECCOMP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libseccomp\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libseccomp") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SECCOMP_CFLAGS=`$PKG_CONFIG --cflags "libseccomp" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$SECCOMP_LIBS"; then
-    pkg_cv_SECCOMP_LIBS="$SECCOMP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libseccomp\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libseccomp") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SECCOMP_LIBS=`$PKG_CONFIG --libs "libseccomp" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        SECCOMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseccomp" 2>&1`
-        else
-	        SECCOMP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseccomp" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SECCOMP_PKG_ERRORS" >&5
-
-
-		ac_fn_c_check_header_mongrel "$LINENO" "seccomp.h" "ac_cv_header_seccomp_h" "$ac_includes_default"
-if test "x$ac_cv_header_seccomp_h" = xyes; then :
-
-else
-  as_fn_error $? "You must install the seccomp development package in order to compile lxc" "$LINENO" 5
-fi
-
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for seccomp_init in -lseccomp" >&5
-$as_echo_n "checking for seccomp_init in -lseccomp... " >&6; }
-if ${ac_cv_lib_seccomp_seccomp_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lseccomp  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char seccomp_init ();
-int
-main ()
-{
-return seccomp_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_seccomp_seccomp_init=yes
-else
-  ac_cv_lib_seccomp_seccomp_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_seccomp_seccomp_init" >&5
-$as_echo "$ac_cv_lib_seccomp_seccomp_init" >&6; }
-if test "x$ac_cv_lib_seccomp_seccomp_init" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSECCOMP 1
-_ACEOF
-
-  LIBS="-lseccomp $LIBS"
-
-else
-  as_fn_error $? "You must install the seccomp development package in order to compile lxc" "$LINENO" 5
-fi
-
-		SECCOMP_LIBS=-lseccomp
-
-
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-		ac_fn_c_check_header_mongrel "$LINENO" "seccomp.h" "ac_cv_header_seccomp_h" "$ac_includes_default"
-if test "x$ac_cv_header_seccomp_h" = xyes; then :
-
-else
-  as_fn_error $? "You must install the seccomp development package in order to compile lxc" "$LINENO" 5
-fi
-
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for seccomp_init in -lseccomp" >&5
-$as_echo_n "checking for seccomp_init in -lseccomp... " >&6; }
-if ${ac_cv_lib_seccomp_seccomp_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lseccomp  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char seccomp_init ();
-int
-main ()
-{
-return seccomp_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_seccomp_seccomp_init=yes
-else
-  ac_cv_lib_seccomp_seccomp_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_seccomp_seccomp_init" >&5
-$as_echo "$ac_cv_lib_seccomp_seccomp_init" >&6; }
-if test "x$ac_cv_lib_seccomp_seccomp_init" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSECCOMP 1
-_ACEOF
-
-  LIBS="-lseccomp $LIBS"
-
-else
-  as_fn_error $? "You must install the seccomp development package in order to compile lxc" "$LINENO" 5
-fi
-
-		SECCOMP_LIBS=-lseccomp
-
-
-else
-	SECCOMP_CFLAGS=$pkg_cv_SECCOMP_CFLAGS
-	SECCOMP_LIBS=$pkg_cv_SECCOMP_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for static libcap" >&5
-$as_echo_n "checking for static libcap... " >&6; }
-# Check for static libcap, make sure the function checked for differs from the
-# the one checked below so the cache doesn't give a wrong answer
-OLD_CFLAGS="$CFLAGS"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-CFLAGS=""
-CPPFLAGS=""
-LDFLAGS="-static"
-LIBS="-lcap"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-  int main() { return 0; }
-
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  have_static_libcap=yes
-else
-  have_static_libcap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
- if test "x$have_static_libcap" = "xyes"; then
-  HAVE_STATIC_LIBCAP_TRUE=
-  HAVE_STATIC_LIBCAP_FALSE='#'
-else
-  HAVE_STATIC_LIBCAP_TRUE='#'
-  HAVE_STATIC_LIBCAP_FALSE=
-fi
-
-if test "x$have_static_libcap" = "xyes"; then
-
-$as_echo "#define HAVE_STATIC_LIBCAP 1" >>confdefs.h
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-CFLAGS="$OLD_CFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-
-
-# Linux capabilities
-# Check whether --enable-capabilities was given.
-if test "${enable_capabilities+set}" = set; then :
-  enableval=$enable_capabilities; enable_capabilities=$enableval
-else
-  enable_capabilities=auto
-fi
-
-
-if test "x$enable_capabilities" = "xauto"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_set_proc in -lcap" >&5
-$as_echo_n "checking for cap_set_proc in -lcap... " >&6; }
-if ${ac_cv_lib_cap_cap_set_proc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcap  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cap_set_proc ();
-int
-main ()
-{
-return cap_set_proc ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_cap_cap_set_proc=yes
-else
-  ac_cv_lib_cap_cap_set_proc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_set_proc" >&5
-$as_echo "$ac_cv_lib_cap_cap_set_proc" >&6; }
-if test "x$ac_cv_lib_cap_cap_set_proc" = xyes; then :
-  enable_capabilities=yes
-else
-  enable_capabilities=no
-fi
-
-fi
- if test "x$enable_capabilities" = "xyes"; then
-  ENABLE_CAP_TRUE=
-  ENABLE_CAP_FALSE='#'
-else
-  ENABLE_CAP_TRUE='#'
-  ENABLE_CAP_FALSE=
-fi
-
-
-if test -z "$ENABLE_CAP_TRUE"; then :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_capability_h" = xyes; then :
-
-else
-  as_fn_error $? "You must install the libcap development package in order to compile lxc" "$LINENO" 5
-fi
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_set_proc in -lcap" >&5
-$as_echo_n "checking for cap_set_proc in -lcap... " >&6; }
-if ${ac_cv_lib_cap_cap_set_proc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcap  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cap_set_proc ();
-int
-main ()
-{
-return cap_set_proc ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_cap_cap_set_proc=yes
-else
-  ac_cv_lib_cap_cap_set_proc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_set_proc" >&5
-$as_echo "$ac_cv_lib_cap_cap_set_proc" >&6; }
-if test "x$ac_cv_lib_cap_cap_set_proc" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCAP 1
-_ACEOF
-
-  LIBS="-lcap $LIBS"
-
-else
-  as_fn_error $? "You must install the libcap development package in order to compile lxc" "$LINENO" 5
-fi
-
-        # Test whether we support getting file capabilities via cap_get_file().
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_get_file in -lcap" >&5
-$as_echo_n "checking for cap_get_file in -lcap... " >&6; }
-if ${ac_cv_lib_cap_cap_get_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcap  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cap_get_file ();
-int
-main ()
-{
-return cap_get_file ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_cap_cap_get_file=yes
-else
-  ac_cv_lib_cap_cap_get_file=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_get_file" >&5
-$as_echo "$ac_cv_lib_cap_cap_get_file" >&6; }
-if test "x$ac_cv_lib_cap_cap_get_file" = xyes; then :
-
-$as_echo "#define LIBCAP_SUPPORTS_FILE_CAPABILITIES 1" >>confdefs.h
-
-fi
-
-        CAP_LIBS=-lcap
-
-fi
-
-# HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0
-OLD_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $SECCOMP_CFLAGS"
-ac_fn_c_check_type "$LINENO" "scmp_filter_ctx" "ac_cv_type_scmp_filter_ctx" "#include <seccomp.h>
-"
-if test "x$ac_cv_type_scmp_filter_ctx" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SCMP_FILTER_CTX 1
-_ACEOF
-
-
-fi
-
-ac_fn_c_check_decl "$LINENO" "seccomp_notify_fd" "ac_cv_have_decl_seccomp_notify_fd" "#include <seccomp.h>
-"
-if test "x$ac_cv_have_decl_seccomp_notify_fd" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SECCOMP_NOTIFY_FD $ac_have_decl
-_ACEOF
-
-ac_fn_c_check_type "$LINENO" "struct seccomp_notif_sizes" "ac_cv_type_struct_seccomp_notif_sizes" "#include <seccomp.h>
-"
-if test "x$ac_cv_type_struct_seccomp_notif_sizes" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SECCOMP_NOTIF_SIZES 1
-_ACEOF
-
-
-fi
-
-ac_fn_c_check_decl "$LINENO" "seccomp_syscall_resolve_name_arch" "ac_cv_have_decl_seccomp_syscall_resolve_name_arch" "#include <seccomp.h>
-"
-if test "x$ac_cv_have_decl_seccomp_syscall_resolve_name_arch" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SECCOMP_SYSCALL_RESOLVE_NAME_ARCH $ac_have_decl
-_ACEOF
-
-CFLAGS="$OLD_CFLAGS"
-
-for ac_header in linux/bpf.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "linux/bpf.h" "ac_cv_header_linux_bpf_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_bpf_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_BPF_H 1
-_ACEOF
-
-	ac_fn_c_check_type "$LINENO" "struct bpf_cgroup_dev_ctx" "ac_cv_type_struct_bpf_cgroup_dev_ctx" "#include <linux/bpf.h>
-"
-if test "x$ac_cv_type_struct_bpf_cgroup_dev_ctx" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_BPF_CGROUP_DEV_CTX 1
-_ACEOF
-
-
-fi
-
-
-fi
-
-done
-
-
-# Configuration examples
-# Check whether --enable-examples was given.
-if test "${enable_examples+set}" = set; then :
-  enableval=$enable_examples; enable_examples=$enableval
-else
-  enable_examples=yes
-fi
-
- if test "x$enable_examples" = "xyes"; then
-  ENABLE_EXAMPLES_TRUE=
-  ENABLE_EXAMPLES_FALSE='#'
-else
-  ENABLE_EXAMPLES_TRUE='#'
-  ENABLE_EXAMPLES_FALSE=
-fi
-
-
-# Enable dumping stack traces
-# Check whether --enable-mutex-debugging was given.
-if test "${enable_mutex_debugging+set}" = set; then :
-  enableval=$enable_mutex_debugging; enable_mutex_debugging=$enableval
-else
-  enable_mutex_debugging=no
-fi
-
- if test "x$enable_mutex_debugging" = "xyes"; then
-  MUTEX_DEBUGGING_TRUE=
-  MUTEX_DEBUGGING_FALSE='#'
-else
-  MUTEX_DEBUGGING_TRUE='#'
-  MUTEX_DEBUGGING_FALSE=
-fi
-
-
-if test -z "$MUTEX_DEBUGGING_TRUE"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define MUTEX_DEBUGGING 1
-_ACEOF
-
-fi
-
-# Not in older autoconf versions
-# AS_VAR_COPY(DEST, SOURCE)
-# -------------------------
-# Set the polymorphic shell variable DEST to the contents of the polymorphic
-# shell variable SOURCE.
-
-
-
-
-# Optional bash integration
-# Check whether --enable-bash was given.
-if test "${enable_bash+set}" = set; then :
-  enableval=$enable_bash; enable_bash=$enableval
-else
-  enable_bash=yes
-fi
-
- if test "x$enable_bash" = "xyes"; then
-  ENABLE_BASH_TRUE=
-  ENABLE_BASH_FALSE='#'
-else
-  ENABLE_BASH_TRUE='#'
-  ENABLE_BASH_FALSE=
-fi
-
-
-if test -z "$ENABLE_BASH_TRUE"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking bash completion directory" >&5
-$as_echo_n "checking bash completion directory... " >&6; }
-
-if test -n "$bashcompdir"; then
-    pkg_cv_bashcompdir="$bashcompdir"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bash-completion\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "bash-completion") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_bashcompdir=`$PKG_CONFIG --variable="completionsdir" "bash-completion" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-bashcompdir=$pkg_cv_bashcompdir
-
-if test "x$bashcompdir" = x""; then :
-  bashcompdir="${sysconfdir}/bash_completion.d"
-fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bashcompdir" >&5
-$as_echo "$bashcompdir" >&6; }
-
-
-fi
-
-# Build the command line tools
-# Check whether --enable-tools was given.
-if test "${enable_tools+set}" = set; then :
-  enableval=$enable_tools; enable_tools=$enableval
-else
-  enable_tools=yes
-fi
-
- if test "x$enable_tools" = "xyes"; then
-  ENABLE_TOOLS_TRUE=
-  ENABLE_TOOLS_FALSE='#'
-else
-  ENABLE_TOOLS_TRUE='#'
-  ENABLE_TOOLS_FALSE=
-fi
-
-
-# Build the liblxc commands
-# Check whether --enable-commands was given.
-if test "${enable_commands+set}" = set; then :
-  enableval=$enable_commands; enable_commands=$enableval
-else
-  enable_commands=yes
-fi
-
- if test "x$enable_commands" = "xyes"; then
-  ENABLE_COMMANDS_TRUE=
-  ENABLE_COMMANDS_FALSE='#'
-else
-  ENABLE_COMMANDS_TRUE='#'
-  ENABLE_COMMANDS_FALSE=
-fi
-
-
-# Build with ASAN commands
-# Check whether --enable-asan was given.
-if test "${enable_asan+set}" = set; then :
-  enableval=$enable_asan; enable_asan=$enableval
-else
-  enable_asan=no
-fi
-
- if test "x$enable_asan" = "xyes"; then
-  ENABLE_ASAN_TRUE=
-  ENABLE_ASAN_FALSE='#'
-else
-  ENABLE_ASAN_TRUE='#'
-  ENABLE_ASAN_FALSE=
-fi
-
-
-# Build with UBSAN commands
-# Check whether --enable-ubsan was given.
-if test "${enable_ubsan+set}" = set; then :
-  enableval=$enable_ubsan; enable_asan=$enableval
-else
-  enable_ubsan=no
-fi
-
- if test "x$enable_ubsan" = "xyes"; then
-  ENABLE_UBSAN_TRUE=
-  ENABLE_UBSAN_FALSE='#'
-else
-  ENABLE_UBSAN_TRUE='#'
-  ENABLE_UBSAN_FALSE=
-fi
-
-
-# Optional test binaries
-# Check whether --enable-tests was given.
-if test "${enable_tests+set}" = set; then :
-  enableval=$enable_tests; enable_tests=$enableval
-else
-  enable_tests=no
-fi
-
- if test "x$enable_tests" = "xyes"; then
-  ENABLE_TESTS_TRUE=
-  ENABLE_TESTS_FALSE='#'
-else
-  ENABLE_TESTS_TRUE='#'
-  ENABLE_TESTS_FALSE=
-fi
-
-
-# Allow overriding the default runtime dir (/run)
-
-# Check whether --with-runtime-path was given.
-if test "${with_runtime_path+set}" = set; then :
-  withval=$with_runtime_path; with_runtime_path=$withval
-else
-  with_runtime_path='/run'
-fi
-
-
-# LXC container path, where the containers are actually stored
-# This is overridden by an entry in the file called LXCCONF
-# (i.e. /etc/lxc/lxc.conf)
-
-# Check whether --with-config-path was given.
-if test "${with_config_path+set}" = set; then :
-  withval=$with_config_path; with_config_path=$withval
-else
-  with_config_path='${localstatedir}/lib/lxc'
-fi
-
-
-# The path of the global lxc configuration file.
-
-# Check whether --with-global-conf was given.
-if test "${with_global_conf+set}" = set; then :
-  withval=$with_global_conf; with_global_conf=$withval
-else
-  with_global_conf='${sysconfdir}/lxc/lxc.conf'
-fi
-
-
-# The path of the userns network configuration file
-
-# Check whether --with-usernic-conf was given.
-if test "${with_usernic_conf+set}" = set; then :
-  withval=$with_usernic_conf; with_usernic_conf=$withval
-else
-  with_usernic_conf='${sysconfdir}/lxc/lxc-usernet'
-fi
-
-
-# The path of the runtime usernic database
-
-# Check whether --with-usernic-db was given.
-if test "${with_usernic_db+set}" = set; then :
-  withval=$with_usernic_db; with_usernic_db=$withval
-else
-  with_usernic_db='${with_runtime_path}/lxc/nics'
-fi
-
-
-# Rootfs path, where the container mount structure is assembled
-
-# Check whether --with-rootfs-path was given.
-if test "${with_rootfs_path+set}" = set; then :
-  withval=$with_rootfs_path; with_rootfs_path=$withval
-else
-  with_rootfs_path='${libdir}/lxc/rootfs'
-fi
-
-
-# cgroup pattern specification
-
-# Check whether --with-cgroup-pattern was given.
-if test "${with_cgroup_pattern+set}" = set; then :
-  withval=$with_cgroup_pattern; with_cgroup_pattern=$withval
-else
-  with_cgroup_pattern=''
-fi
-
-
-# The path for the apparmor_parser's cache for generated apparmor profiles
-
-# Check whether --with-apparmor-cache-dir was given.
-if test "${with_apparmor_cache_dir+set}" = set; then :
-  withval=$with_apparmor_cache_dir; with_apparmor_cache_dir=$withval
-else
-  with_apparmor_cache_dir='${localstatedir}/cache/lxc/apparmor'
-fi
-
-
-# Container log path.  By default, use $lxcpath.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to place logfiles in container config path" >&5
-$as_echo_n "checking Whether to place logfiles in container config path... " >&6; }
-# Check whether --enable-configpath-log was given.
-if test "${enable_configpath_log+set}" = set; then :
-  enableval=$enable_configpath_log; enable_configpath_log=$enableval
-else
-  enable_configpath_log=no
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_configpath_log" >&5
-$as_echo "$enable_configpath_log" >&6; }
- if test "$enable_configpath_log" = "yes"; then
-  USE_CONFIGPATH_LOGS_TRUE=
-  USE_CONFIGPATH_LOGS_FALSE='#'
-else
-  USE_CONFIGPATH_LOGS_TRUE='#'
-  USE_CONFIGPATH_LOGS_FALSE=
-fi
-
-
-if test "$enable_configpath_log" = "yes"; then
-	default_log_path="${with_config_path}"
-else
-	default_log_path="${localstatedir}/log/lxc"
-fi
-
-
-# Check whether --with-log-path was given.
-if test "${with_log_path+set}" = set; then :
-  withval=$with_log_path; with_log_path=$withval
-else
-  with_log_path='${default_log_path}'
-fi
-
-
-# Expand some useful variables
-
-    EXP_VAR=PREFIX
-    FROM_VAR="$prefix"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    PREFIX="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LIBDIR
-    FROM_VAR="$libdir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LIBDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=BINDIR
-    FROM_VAR="$bindir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    BINDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=SBINDIR
-    FROM_VAR="$sbindir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    SBINDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LIBEXECDIR
-    FROM_VAR="$libexecdir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LIBEXECDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=INCLUDEDIR
-    FROM_VAR="$includedir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    INCLUDEDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=SYSCONFDIR
-    FROM_VAR="$sysconfdir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    SYSCONFDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXC_DEFAULT_CONFIG
-    FROM_VAR="$sysconfdir/lxc/default.conf"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXC_DEFAULT_CONFIG="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=DATADIR
-    FROM_VAR="$datadir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    DATADIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LOCALSTATEDIR
-    FROM_VAR="$localstatedir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LOCALSTATEDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=DOCDIR
-    FROM_VAR="$docdir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    DOCDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXC_GENERATE_DATE
-    FROM_VAR="$(date --utc --date=@${SOURCE_DATE_EPOCH:-$(date +%s)} '+%Y-%m-%d')"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXC_GENERATE_DATE="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXCPATH
-    FROM_VAR="$with_config_path"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXCPATH="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXC_GLOBAL_CONF
-    FROM_VAR="$with_global_conf"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXC_GLOBAL_CONF="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXC_USERNIC_CONF
-    FROM_VAR="$with_usernic_conf"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXC_USERNIC_CONF="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXC_USERNIC_DB
-    FROM_VAR="$with_usernic_db"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXC_USERNIC_DB="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXC_DISTRO_SYSCONF
-    FROM_VAR="$distrosysconf"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXC_DISTRO_SYSCONF="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXCROOTFSMOUNT
-    FROM_VAR="$with_rootfs_path"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXCROOTFSMOUNT="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXCTEMPLATEDIR
-    FROM_VAR="$datadir/lxc/templates"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXCTEMPLATEDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXCTEMPLATECONFIG
-    FROM_VAR="$datadir/lxc/config"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXCTEMPLATECONFIG="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXCHOOKDIR
-    FROM_VAR="$datadir/lxc/hooks"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXCHOOKDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXCBINHOOKDIR
-    FROM_VAR="$libexecdir/lxc/hooks"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXCBINHOOKDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LXCINITDIR
-    FROM_VAR="$libexecdir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LXCINITDIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=LOGPATH
-    FROM_VAR="$with_log_path"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    LOGPATH="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=RUNTIME_PATH
-    FROM_VAR="$with_runtime_path"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    RUNTIME_PATH="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-
-    EXP_VAR=APPARMOR_CACHE_DIR
-    FROM_VAR="$with_apparmor_cache_dir"
-
-        prefix_save=$prefix
-    exec_prefix_save=$exec_prefix
-
-        if test "x$prefix" = "xNONE"; then
-        prefix="$ac_default_prefix"
-    fi
-        if test "x$exec_prefix" = "xNONE"; then
-        exec_prefix=$prefix
-    fi
-
-    full_var="$FROM_VAR"
-        while true; do
-        new_full_var="`eval echo $full_var`"
-        if test "x$new_full_var" = "x$full_var"; then break; fi
-        full_var=$new_full_var
-    done
-
-        full_var=$new_full_var
-    APPARMOR_CACHE_DIR="$full_var"
-
-
-        prefix=$prefix_save
-    exec_prefix=$exec_prefix_save
-
-DEFAULT_CGROUP_PATTERN="$with_cgroup_pattern"
-
-
-# We need the install path so criu knows where to reference the hook scripts.
-
-cat >>confdefs.h <<_ACEOF
-#define DATADIR "$DATADIR"
-_ACEOF
-
-
-# Check for some standard kernel headers
-for ac_header in linux/unistd.h linux/netlink.h linux/genetlink.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/socket.h>
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  as_fn_error $? "Please install the Linux kernel headers." "$LINENO" 5
-fi
-
-done
-
-
-# Check for alternate C libraries
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bionic libc" >&5
-$as_echo_n "checking for bionic libc... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __ANDROID__
-error: Not bionic!
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  is_bionic=yes
-else
-  is_bionic=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test "x$is_bionic" = "xyes"; then
-
-$as_echo "#define IS_BIONIC 1" >>confdefs.h
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
- if test "x$is_bionic" = "xyes"; then
-  IS_BIONIC_TRUE=
-  IS_BIONIC_FALSE='#'
-else
-  IS_BIONIC_TRUE='#'
-  IS_BIONIC_FALSE=
-fi
-
-
-# Configuration examples
-# Check whether --enable-pam was given.
-if test "${enable_pam+set}" = set; then :
-  enableval=$enable_pam; enable_pam=$enableval
-else
-  enable_pam=no
-fi
-
- if test "x$enable_pam" = "xyes"; then
-  ENABLE_PAM_TRUE=
-  ENABLE_PAM_FALSE='#'
-else
-  ENABLE_PAM_TRUE='#'
-  ENABLE_PAM_FALSE=
-fi
-
-
-if test -z "$ENABLE_PAM_TRUE"; then :
-
-# Check whether --with-pamdir was given.
-if test "${with_pamdir+set}" = set; then :
-  withval=$with_pamdir; pamdir=$withval
-else
-
-			if test "${prefix}" = "/usr"; then
-				pamdir="/lib${libdir##*/lib}/security"
-			else
-				pamdir="\$(libdir)/security"
-			fi
-
-
-fi
-
-fi
-
- if test x"$pamdir" != "xnone"; then
-  HAVE_PAM_TRUE=
-  HAVE_PAM_FALSE='#'
-else
-  HAVE_PAM_TRUE='#'
-  HAVE_PAM_FALSE=
-fi
-
-if test -z "$ENABLE_PAM_TRUE"; then :
-  if test "z$pamdir" != "znone"; then
-
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_authenticate in -lpam" >&5
-$as_echo_n "checking for pam_authenticate in -lpam... " >&6; }
-if ${ac_cv_lib_pam_pam_authenticate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpam  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pam_authenticate ();
-int
-main ()
-{
-return pam_authenticate ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pam_pam_authenticate=yes
-else
-  ac_cv_lib_pam_pam_authenticate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_authenticate" >&5
-$as_echo "$ac_cv_lib_pam_pam_authenticate" >&6; }
-if test "x$ac_cv_lib_pam_pam_authenticate" = xyes; then :
-  PAM_LIBS="-lpam"
-else
-  as_fn_error $? "*** libpam not found." "$LINENO" 5
-
-fi
-
-
-
-
-	fi
-fi
-
-# Some systems lack PR_CAPBSET_DROP definition => HAVE_DECL_PR_CAPBSET_DROP
-ac_fn_c_check_decl "$LINENO" "PR_CAPBSET_DROP" "ac_cv_have_decl_PR_CAPBSET_DROP" "#include <sys/prctl.h>
-"
-if test "x$ac_cv_have_decl_PR_CAPBSET_DROP" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_PR_CAPBSET_DROP $ac_have_decl
-_ACEOF
-
-
-# Some systems lack PR_{G,S}ET_NO_NEW_PRIVS definition => HAVE_DECL_PR_{G,S}ET_NO_NEW_PRIVS
-ac_fn_c_check_decl "$LINENO" "PR_SET_NO_NEW_PRIVS" "ac_cv_have_decl_PR_SET_NO_NEW_PRIVS" "#include <sys/prctl.h>
-"
-if test "x$ac_cv_have_decl_PR_SET_NO_NEW_PRIVS" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_PR_SET_NO_NEW_PRIVS $ac_have_decl
-_ACEOF
-
-ac_fn_c_check_decl "$LINENO" "PR_GET_NO_NEW_PRIVS" "ac_cv_have_decl_PR_GET_NO_NEW_PRIVS" "#include <sys/prctl.h>
-"
-if test "x$ac_cv_have_decl_PR_GET_NO_NEW_PRIVS" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_PR_GET_NO_NEW_PRIVS $ac_have_decl
-_ACEOF
-
-
-# Check for some headers
-for ac_header in pty.h sys/memfd.h sys/personality.h sys/resource.h sys/signalfd.h sys/timerfd.h utmpx.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
-if test "x$ac_cv_header_ifaddrs_h" = xyes; then :
-   if true; then
-  HAVE_IFADDRS_H_TRUE=
-  HAVE_IFADDRS_H_FALSE='#'
-else
-  HAVE_IFADDRS_H_TRUE='#'
-  HAVE_IFADDRS_H_FALSE=
-fi
-
-
-$as_echo "#define HAVE_IFADDRS_H 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_IFADDRS_H_TRUE=
-  HAVE_IFADDRS_H_FALSE='#'
-else
-  HAVE_IFADDRS_H_TRUE='#'
-  HAVE_IFADDRS_H_FALSE=
-fi
-
-fi
-
-
-
-# lookup major()/minor()/makedev()
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
-$as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
-if ${ac_cv_header_sys_types_h_makedev+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-int
-main ()
-{
-return makedev(0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_header_sys_types_h_makedev=yes
-else
-  ac_cv_header_sys_types_h_makedev=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5
-$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
-
-if test $ac_cv_header_sys_types_h_makedev = no; then
-ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
-
-$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
-
-fi
-
-
-
-  if test $ac_cv_header_sys_mkdev_h = no; then
-    ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
-
-$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
-
-fi
-
-
-  fi
-fi
-
-
-# Check for some syscalls functions
-for ac_func in setns pivot_root sethostname unshare rand_r confstr faccessat gettid memfd_create move_mount open_tree execveat clone3
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-ac_fn_c_check_type "$LINENO" "struct clone_args" "ac_cv_type_struct_clone_args" "#include <linux/sched.h>
-"
-if test "x$ac_cv_type_struct_clone_args" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_CLONE_ARGS 1
-_ACEOF
-
-
-fi
-
-ac_fn_c_check_member "$LINENO" "struct clone_args" "set_tid" "ac_cv_member_struct_clone_args_set_tid" "#include <linux/sched.h>
-"
-if test "x$ac_cv_member_struct_clone_args_set_tid" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_CLONE_ARGS_SET_TID 1
-_ACEOF
-
-
-fi
-
-ac_fn_c_check_member "$LINENO" "struct clone_args" "cgroup" "ac_cv_member_struct_clone_args_cgroup" "#include <linux/sched.h>
-"
-if test "x$ac_cv_member_struct_clone_args_cgroup" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_CLONE_ARGS_CGROUP 1
-_ACEOF
-
-
-fi
-
-
-# Check for strerror_r() support. Defines:
-# - HAVE_STRERROR_R if available
-# - HAVE_DECL_STRERROR_R if defined
-# - STRERROR_R_CHAR_P if it returns char *
-ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR_R $ac_have_decl
-_ACEOF
-
-for ac_func in strerror_r
-do :
-  ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
-if test "x$ac_cv_func_strerror_r" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRERROR_R 1
-_ACEOF
-
-fi
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
-$as_echo_n "checking whether strerror_r returns char *... " >&6; }
-if ${ac_cv_func_strerror_r_char_p+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    ac_cv_func_strerror_r_char_p=no
-    if test $ac_cv_have_decl_strerror_r = yes; then
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-	  char buf100;
-	  char x = *strerror_r (0, buf, sizeof buf);
-	  char *p = strerror_r (0, buf, sizeof buf);
-	  return !p || x;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_func_strerror_r_char_p=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    else
-      # strerror_r is not declared.  Choose between
-      # systems that have relatively inaccessible declarations for the
-      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
-      # former has a strerror_r that returns char*, while the latter
-      # has a strerror_r that returns `int'.
-      # This test should segfault on the DEC system.
-      if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-	extern char *strerror_r ();
-int
-main ()
-{
-char buf100;
-	  char x = *strerror_r (0, buf, sizeof buf);
-	  return ! isalpha (x);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_strerror_r_char_p=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-$as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
-if test $ac_cv_func_strerror_r_char_p = yes; then
-
-$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h
-
-fi
-
-
-# Check if "%m" is supported by printf and Co
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking %m format" >&5
-$as_echo_n "checking %m format... " >&6; }
-if test "$cross_compiling" = yes; then :
-  fmt_m=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-int main(void)
-{
-  char msg256;
-  int rc;
-
-  rc = snprintf(msg, sizeof(msg), "%m\n");
-  if ((rc > 1) && (msg0 != '%'))
-  {
-    return 0;
-  }
-  else
-  {
-    return 1;
-  }
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  fmt_m=yes
-else
-  fmt_m=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-if test "x$fmt_m" = "xyes"; then
-
-$as_echo "#define HAVE_M_FORMAT 1" >>confdefs.h
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-# Check for some functions
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5
-$as_echo_n "checking for main in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_main=yes
-else
-  ac_cv_lib_pthread_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_main" >&5
-$as_echo "$ac_cv_lib_pthread_main" >&6; }
-if test "x$ac_cv_lib_pthread_main" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
-
-  LIBS="-lpthread $LIBS"
-
-fi
-
-for ac_func in statvfs
-do :
-  ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
-if test "x$ac_cv_func_statvfs" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STATVFS 1
-_ACEOF
-
-fi
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
-$as_echo_n "checking for openpty in -lutil... " >&6; }
-if ${ac_cv_lib_util_openpty+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutil  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char openpty ();
-int
-main ()
-{
-return openpty ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_util_openpty=yes
-else
-  ac_cv_lib_util_openpty=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
-$as_echo "$ac_cv_lib_util_openpty" >&6; }
-if test "x$ac_cv_lib_util_openpty" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUTIL 1
-_ACEOF
-
-  LIBS="-lutil $LIBS"
-
-fi
-
-for ac_func in openpty hasmntopt setmntent endmntent utmpxname
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-for ac_func in getgrgid_r
-do :
-  ac_fn_c_check_func "$LINENO" "getgrgid_r" "ac_cv_func_getgrgid_r"
-if test "x$ac_cv_func_getgrgid_r" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETGRGID_R 1
-_ACEOF
-  if true; then
-  HAVE_GETGRGID_R_TRUE=
-  HAVE_GETGRGID_R_FALSE='#'
-else
-  HAVE_GETGRGID_R_TRUE='#'
-  HAVE_GETGRGID_R_FALSE=
-fi
-
-
-$as_echo "#define HAVE_GETGRGID_R 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_GETGRGID_R_TRUE=
-  HAVE_GETGRGID_R_FALSE='#'
-else
-  HAVE_GETGRGID_R_TRUE='#'
-  HAVE_GETGRGID_R_FALSE=
-fi
-
-fi
-done
-
-for ac_func in getline
-do :
-  ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
-if test "x$ac_cv_func_getline" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETLINE 1
-_ACEOF
-  if true; then
-  HAVE_GETLINE_TRUE=
-  HAVE_GETLINE_FALSE='#'
-else
-  HAVE_GETLINE_TRUE='#'
-  HAVE_GETLINE_FALSE=
-fi
-
-
-$as_echo "#define HAVE_GETLINE 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_GETLINE_TRUE=
-  HAVE_GETLINE_FALSE='#'
-else
-  HAVE_GETLINE_TRUE='#'
-  HAVE_GETLINE_FALSE=
-fi
-
-fi
-done
-
-for ac_func in getsubopt
-do :
-  ac_fn_c_check_func "$LINENO" "getsubopt" "ac_cv_func_getsubopt"
-if test "x$ac_cv_func_getsubopt" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETSUBOPT 1
-_ACEOF
-  if true; then
-  HAVE_GETSUBOPT_TRUE=
-  HAVE_GETSUBOPT_FALSE='#'
-else
-  HAVE_GETSUBOPT_TRUE='#'
-  HAVE_GETSUBOPT_FALSE=
-fi
-
-
-$as_echo "#define HAVE_GETSUBOPT 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_GETSUBOPT_TRUE=
-  HAVE_GETSUBOPT_FALSE='#'
-else
-  HAVE_GETSUBOPT_TRUE='#'
-  HAVE_GETSUBOPT_FALSE=
-fi
-
-fi
-done
-
-for ac_func in fgetln
-do :
-  ac_fn_c_check_func "$LINENO" "fgetln" "ac_cv_func_fgetln"
-if test "x$ac_cv_func_fgetln" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FGETLN 1
-_ACEOF
-  if true; then
-  HAVE_FGETLN_TRUE=
-  HAVE_FGETLN_FALSE='#'
-else
-  HAVE_FGETLN_TRUE='#'
-  HAVE_FGETLN_FALSE=
-fi
-
-
-$as_echo "#define HAVE_FGETLN 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_FGETLN_TRUE=
-  HAVE_FGETLN_FALSE='#'
-else
-  HAVE_FGETLN_TRUE='#'
-  HAVE_FGETLN_FALSE=
-fi
-
-fi
-done
-
-for ac_func in keyctl
-do :
-  ac_fn_c_check_func "$LINENO" "keyctl" "ac_cv_func_keyctl"
-if test "x$ac_cv_func_keyctl" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_KEYCTL 1
-_ACEOF
-  if true; then
-  HAVE_KEYCTL_TRUE=
-  HAVE_KEYCTL_FALSE='#'
-else
-  HAVE_KEYCTL_TRUE='#'
-  HAVE_KEYCTL_FALSE=
-fi
-
-
-$as_echo "#define HAVE_KEYCTL 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_KEYCTL_TRUE=
-  HAVE_KEYCTL_FALSE='#'
-else
-  HAVE_KEYCTL_TRUE='#'
-  HAVE_KEYCTL_FALSE=
-fi
-
-fi
-done
-
-for ac_func in prlimit
-do :
-  ac_fn_c_check_func "$LINENO" "prlimit" "ac_cv_func_prlimit"
-if test "x$ac_cv_func_prlimit" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PRLIMIT 1
-_ACEOF
-  if true; then
-  HAVE_PRLIMIT_TRUE=
-  HAVE_PRLIMIT_FALSE='#'
-else
-  HAVE_PRLIMIT_TRUE='#'
-  HAVE_PRLIMIT_FALSE=
-fi
-
-
-$as_echo "#define HAVE_PRLIMIT 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_PRLIMIT_TRUE=
-  HAVE_PRLIMIT_FALSE='#'
-else
-  HAVE_PRLIMIT_TRUE='#'
-  HAVE_PRLIMIT_FALSE=
-fi
-
-fi
-done
-
-for ac_func in prlimit64
-do :
-  ac_fn_c_check_func "$LINENO" "prlimit64" "ac_cv_func_prlimit64"
-if test "x$ac_cv_func_prlimit64" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PRLIMIT64 1
-_ACEOF
-  if true; then
-  HAVE_PRLIMIT64_TRUE=
-  HAVE_PRLIMIT64_FALSE='#'
-else
-  HAVE_PRLIMIT64_TRUE='#'
-  HAVE_PRLIMIT64_FALSE=
-fi
-
-
-$as_echo "#define HAVE_PRLIMIT64 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_PRLIMIT64_TRUE=
-  HAVE_PRLIMIT64_FALSE='#'
-else
-  HAVE_PRLIMIT64_TRUE='#'
-  HAVE_PRLIMIT64_FALSE=
-fi
-
-fi
-done
-
-for ac_func in pthread_setcancelstate
-do :
-  ac_fn_c_check_func "$LINENO" "pthread_setcancelstate" "ac_cv_func_pthread_setcancelstate"
-if test "x$ac_cv_func_pthread_setcancelstate" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_SETCANCELSTATE 1
-_ACEOF
-  if true; then
-  HAVE_PTHREAD_SETCANCELSTATE_TRUE=
-  HAVE_PTHREAD_SETCANCELSTATE_FALSE='#'
-else
-  HAVE_PTHREAD_SETCANCELSTATE_TRUE='#'
-  HAVE_PTHREAD_SETCANCELSTATE_FALSE=
-fi
-
-
-$as_echo "#define HAVE_PTHREAD_SETCANCELSTATE 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_PTHREAD_SETCANCELSTATE_TRUE=
-  HAVE_PTHREAD_SETCANCELSTATE_FALSE='#'
-else
-  HAVE_PTHREAD_SETCANCELSTATE_TRUE='#'
-  HAVE_PTHREAD_SETCANCELSTATE_FALSE=
-fi
-
-fi
-done
-
-for ac_func in strlcpy
-do :
-  ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
-if test "x$ac_cv_func_strlcpy" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRLCPY 1
-_ACEOF
-  if true; then
-  HAVE_STRLCPY_TRUE=
-  HAVE_STRLCPY_FALSE='#'
-else
-  HAVE_STRLCPY_TRUE='#'
-  HAVE_STRLCPY_FALSE=
-fi
-
-
-$as_echo "#define HAVE_STRLCPY 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_STRLCPY_TRUE=
-  HAVE_STRLCPY_FALSE='#'
-else
-  HAVE_STRLCPY_TRUE='#'
-  HAVE_STRLCPY_FALSE=
-fi
-
-fi
-done
-
-for ac_func in strlcat
-do :
-  ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
-if test "x$ac_cv_func_strlcat" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRLCAT 1
-_ACEOF
-  if true; then
-  HAVE_STRLCAT_TRUE=
-  HAVE_STRLCAT_FALSE='#'
-else
-  HAVE_STRLCAT_TRUE='#'
-  HAVE_STRLCAT_FALSE=
-fi
-
-
-$as_echo "#define HAVE_STRLCAT 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_STRLCAT_TRUE=
-  HAVE_STRLCAT_FALSE='#'
-else
-  HAVE_STRLCAT_TRUE='#'
-  HAVE_STRLCAT_FALSE=
-fi
-
-fi
-done
-
-for ac_func in fmemopen
-do :
-  ac_fn_c_check_func "$LINENO" "fmemopen" "ac_cv_func_fmemopen"
-if test "x$ac_cv_func_fmemopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FMEMOPEN 1
-_ACEOF
-  if true; then
-  HAVE_FMEMOPEN_TRUE=
-  HAVE_FMEMOPEN_FALSE='#'
-else
-  HAVE_FMEMOPEN_TRUE='#'
-  HAVE_FMEMOPEN_FALSE=
-fi
-
-
-$as_echo "#define HAVE_FMEMOPEN 1" >>confdefs.h
-
-else
-   if false; then
-  HAVE_FMEMOPEN_TRUE=
-  HAVE_FMEMOPEN_FALSE='#'
-else
-  HAVE_FMEMOPEN_TRUE='#'
-  HAVE_FMEMOPEN_FALSE=
-fi
-
-fi
-done
-
-
-# HAVE_STRUCT_RTNL_LINK_STATS64={0,1}
-ac_fn_c_check_type "$LINENO" "struct rtnl_link_stats64" "ac_cv_type_struct_rtnl_link_stats64" "#include <linux/if_link.h>
-"
-if test "x$ac_cv_type_struct_rtnl_link_stats64" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RTNL_LINK_STATS64 1
-_ACEOF
-
-
-fi
-
-
-# Check for some libraries
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ax_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on Tru64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-        ax_pthread_save_CC="$CC"
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        if test "x$PTHREAD_CC" != "x"; then :
-  CC="$PTHREAD_CC"
-fi
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5
-$as_echo_n "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; }
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_join ();
-int
-main ()
-{
-return pthread_join ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_pthread_ok=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
-$as_echo "$ax_pthread_ok" >&6; }
-        if test "x$ax_pthread_ok" = "xno"; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        CC="$ax_pthread_save_CC"
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-#           (Note: HP C rejects this with "bad form for `-t' option")
-# -pthreads: Solaris/gcc (Note: HP C also rejects)
-# -mt: Sun Workshop C (may only link SunOS threads -lthread, but it
-#      doesn't hurt to check since this sometimes defines pthreads and
-#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
-#      is present but should not be used directly; and before -mthreads,
-#      because the compiler interprets this as "-mt" + "-hreads")
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case $host_os in
-
-        freebsd*)
-
-        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-
-        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-        ;;
-
-        hpux*)
-
-        # From the cc(1) man page: "-mt Sets various -D flags to enable
-        # multi-threading and also sets -lpthread."
-
-        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-        ;;
-
-        openedition*)
-
-        # IBM z/OS requires a feature-test macro to be defined in order to
-        # enable POSIX threads at all, so give the user a hint if this is
-        # not set. (We don't define these ourselves, as they can affect
-        # other portions of the system API in unpredictable ways.)
-
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-             AX_PTHREAD_ZOS_MISSING
-#            endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5
-$as_echo "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;}
-fi
-rm -f conftest*
-
-        ;;
-
-        solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed. (N.B.: The stubs are missing
-        # pthread_cleanup_push, or rather a function called by this macro,
-        # so we could check for that, but who knows whether they'll stub
-        # that too in a future libc.)  So we'll check first for the
-        # standard Solaris way of linking pthreads (-mt -lpthread).
-
-        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
-        ;;
-esac
-
-# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-
-if test "x$GCC" = "xyes"; then :
-  ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"
-fi
-
-# The presence of a feature test macro requesting re-entrant function
-# definitions is, on some systems, a strong hint that pthreads support is
-# correctly enabled
-
-case $host_os in
-        darwin* | hpux* | linux* | osf* | solaris*)
-        ax_pthread_check_macro="_REENTRANT"
-        ;;
-
-        aix*)
-        ax_pthread_check_macro="_THREAD_SAFE"
-        ;;
-
-        *)
-        ax_pthread_check_macro="--"
-        ;;
-esac
-if test "x$ax_pthread_check_macro" = "x--"; then :
-  ax_pthread_check_cond=0
-else
-  ax_pthread_check_cond="!defined($ax_pthread_check_macro)"
-fi
-
-# Are we compiling with Clang?
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5
-$as_echo_n "checking whether $CC is Clang... " >&6; }
-if ${ax_cv_PTHREAD_CLANG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ax_cv_PTHREAD_CLANG=no
-     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-     if test "x$GCC" = "xyes"; then
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Note: Clang 2.7 lacks __clang_a-z+__ */
-#            if defined(__clang__) && defined(__llvm__)
-             AX_PTHREAD_CC_IS_CLANG
-#            endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1; then :
-  ax_cv_PTHREAD_CLANG=yes
-fi
-rm -f conftest*
-
-     fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5
-$as_echo "$ax_cv_PTHREAD_CLANG" >&6; }
-ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-
-ax_pthread_clang_warning=no
-
-# Clang needs special handling, because older versions handle the -pthread
-# option in a rather... idiosyncratic way
-
-if test "x$ax_pthread_clang" = "xyes"; then
-
-        # Clang takes -pthread; it has never supported any other flag
-
-        # (Note 1: This will need to be revisited if a system that Clang
-        # supports has POSIX threads in a separate library.  This tends not
-        # to be the way of modern systems, but it's conceivable.)
-
-        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-        # to get POSIX threads support; the API is always present and
-        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-        # -pthread does define _REENTRANT, and while the Darwin headers
-        # ignore this macro, third-party headers might not.)
-
-        PTHREAD_CFLAGS="-pthread"
-        PTHREAD_LIBS=
-
-        ax_pthread_ok=yes
-
-        # However, older versions of Clang make a point of warning the user
-        # that, in an invocation where only linking and no compilation is
-        # taking place, the -pthread option has no effect ("argument unused
-        # during compilation").  They expect -pthread to be passed in only
-        # when source code is being compiled.
-        #
-        # Problem is, this is at odds with the way Automake and most other
-        # C build frameworks function, which is that the same flags used in
-        # compilation (CFLAGS) are also used in linking.  Many systems
-        # supported by AX_PTHREAD require exactly this for POSIX threads
-        # support, and in fact it is often not straightforward to specify a
-        # flag that is used only in the compilation phase and not in
-        # linking.  Such a scenario is extremely rare in practice.
-        #
-        # Even though use of the -pthread flag in linking would only print
-        # a warning, this can be a nuisance for well-run software projects
-        # that build with -Werror.  So if the active version of Clang has
-        # this misfeature, we search for an option to squash it.
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5
-$as_echo_n "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; }
-if ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-             # Create an alternate version of $ac_link that compiles and
-             # links in two steps (.c -> .o, .o -> exe) instead of one
-             # (.c -> exe), because the warning occurs only in the second
-             # step
-             ax_pthread_save_ac_link="$ac_link"
-             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
-             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-             ax_pthread_save_CFLAGS="$CFLAGS"
-             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-                if test "x$ax_pthread_try" = "xunknown"; then :
-  break
-fi
-                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-                ac_link="$ax_pthread_save_ac_link"
-                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int main(void){return 0;}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_link="$ax_pthread_2step_ac_link"
-                     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int main(void){return 0;}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  break
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-             done
-             ac_link="$ax_pthread_save_ac_link"
-             CFLAGS="$ax_pthread_save_CFLAGS"
-             if test "x$ax_pthread_try" = "x"; then :
-  ax_pthread_try=no
-fi
-             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5
-$as_echo "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; }
-
-        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-                no | unknown) ;;
-                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-        esac
-
-fi # $ax_pthread_clang = yes
-
-if test "x$ax_pthread_ok" = "xno"; then
-for ax_pthread_try_flag in $ax_pthread_flags; do
-
-        case $ax_pthread_try_flag in
-                none)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
-$as_echo_n "checking whether pthreads work without any flags... " >&6; }
-                ;;
-
-                -mt,pthread)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with -mt -lpthread" >&5
-$as_echo_n "checking whether pthreads work with -mt -lpthread... " >&6; }
-                PTHREAD_CFLAGS="-mt"
-                PTHREAD_LIBS="-lpthread"
-                ;;
-
-                -*)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5
-$as_echo_n "checking whether pthreads work with $ax_pthread_try_flag... " >&6; }
-                PTHREAD_CFLAGS="$ax_pthread_try_flag"
-                ;;
-
-                pthread-config)
-                # Extract the first word of "pthread-config", so it can be a program name with args.
-set dummy pthread-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ax_pthread_config+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ax_pthread_config"; then
-  ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ax_pthread_config="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no"
-fi
-fi
-ax_pthread_config=$ac_cv_prog_ax_pthread_config
-if test -n "$ax_pthread_config"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
-$as_echo "$ax_pthread_config" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-                if test "x$ax_pthread_config" = "xno"; then :
-  continue
-fi
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5
-$as_echo_n "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; }
-                PTHREAD_LIBS="-l$ax_pthread_try_flag"
-                ;;
-        esac
-
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <pthread.h>
-#                       if $ax_pthread_check_cond
-#                        error "$ax_pthread_check_macro must be defined"
-#                       endif
-                        static void routine(void *a) { a = 0; }
-                        static void *start_routine(void *a) { return a; }
-int
-main ()
-{
-pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_pthread_ok=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
-$as_echo "$ax_pthread_ok" >&6; }
-        if test "x$ax_pthread_ok" = "xyes"; then :
-  break
-fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
-$as_echo_n "checking for joinable pthread attribute... " >&6; }
-if ${ax_cv_PTHREAD_JOINABLE_ATTR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <pthread.h>
-int
-main ()
-{
-int attr = $ax_pthread_attr; return attr /* ; */
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-             done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5
-$as_echo "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; }
-        if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-               test "x$ax_pthread_joinable_attr_defined" != "xyes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR
-_ACEOF
-
-               ax_pthread_joinable_attr_defined=yes
-
-fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5
-$as_echo_n "checking whether more special flags are required for pthreads... " >&6; }
-if ${ax_cv_PTHREAD_SPECIAL_FLAGS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ax_cv_PTHREAD_SPECIAL_FLAGS=no
-             case $host_os in
-             solaris*)
-             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-             ;;
-             esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5
-$as_echo "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; }
-        if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-               test "x$ax_pthread_special_flags_added" != "xyes"; then :
-  PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-               ax_pthread_special_flags_added=yes
-fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
-$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; }
-if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <pthread.h>
-int
-main ()
-{
-int i = PTHREAD_PRIO_INHERIT;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_PTHREAD_PRIO_INHERIT=yes
-else
-  ax_cv_PTHREAD_PRIO_INHERIT=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
-$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
-        if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-               test "x$ax_pthread_prio_inherit_defined" != "xyes"; then :
-
-$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h
-
-               ax_pthread_prio_inherit_defined=yes
-
-fi
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != "xyes"; then
-            case $host_os in
-                aix*)
-                case "x/$CC" in #(
-  x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6) :
-    #handle absolute path differently from PATH based program lookup
-                     case "x$CC" in #(
-  x/*) :
-    if as_fn_executable_p ${CC}_r; then :
-  PTHREAD_CC="${CC}_r"
-fi ;; #(
-  *) :
-    for ac_prog in ${CC}_r
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PTHREAD_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$PTHREAD_CC"; then
-  ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_PTHREAD_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
-if test -n "$PTHREAD_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
-$as_echo "$PTHREAD_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$PTHREAD_CC" && break
-done
-test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
- ;;
-esac ;; #(
-  *) :
-     ;;
-esac
-                ;;
-            esac
-        fi
-fi
-
-test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-
-
-
-
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test "x$ax_pthread_ok" = "xyes"; then
-
-$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
-
-        :
-else
-        ax_pthread_ok=no
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
-$as_echo_n "checking for library containing clock_gettime... " >&6; }
-if ${ac_cv_search_clock_gettime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char clock_gettime ();
-int
-main ()
-{
-return clock_gettime ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' rt; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_clock_gettime=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_clock_gettime+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_clock_gettime+:} false; then :
-
-else
-  ac_cv_search_clock_gettime=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
-$as_echo "$ac_cv_search_clock_gettime" >&6; }
-ac_res=$ac_cv_search_clock_gettime
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-
-# Check for some standard binaries
-if test $ac_cv_c_compiler_gnu = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
-$as_echo_n "checking whether $CC needs -traditional... " >&6; }
-if ${ac_cv_prog_gcc_traditional+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    ac_pattern="Autoconf.*'x'"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sgtty.h>
-Autoconf TIOCGETP
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
-  ac_cv_prog_gcc_traditional=yes
-else
-  ac_cv_prog_gcc_traditional=no
-fi
-rm -f conftest*
-
-
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <termio.h>
-Autoconf TCGETA
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
-  ac_cv_prog_gcc_traditional=yes
-fi
-rm -f conftest*
-
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
-$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
-  if test $ac_cv_prog_gcc_traditional = yes; then
-    CC="$CC -traditional"
-  fi
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-
-# See if we support thread-local storage.
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS" >&5
-$as_echo_n "checking for TLS... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
- static __thread int val; int main() { return 0; }
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  have_tls=yes
-else
-  have_tls=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_tls" >&5
-$as_echo "$have_tls" >&6; }
-    if test "$have_tls" = "yes"; then
-
-$as_echo "#define HAVE_TLS 1" >>confdefs.h
-
-
-$as_echo "#define thread_local __thread" >>confdefs.h
-
-    fi
-
-
-# Hardening flags
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fdiagnostics-color" >&5
-$as_echo_n "checking whether C compiler accepts -fdiagnostics-color... " >&6; }
-if ${ax_cv_check_cflags__Werror__fdiagnostics_color+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -fdiagnostics-color"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__fdiagnostics_color=yes
-else
-  ax_cv_check_cflags__Werror__fdiagnostics_color=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fdiagnostics_color" >&5
-$as_echo "$ax_cv_check_cflags__Werror__fdiagnostics_color" >&6; }
-if test "x$ax_cv_check_cflags__Werror__fdiagnostics_color" = xyes; then :
-  CFLAGS="$CFLAGS -fdiagnostics-color"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wimplicit-fallthrough=5" >&5
-$as_echo_n "checking whether C compiler accepts -Wimplicit-fallthrough=5... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wimplicit_fallthrough_5+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wimplicit-fallthrough=5"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wimplicit_fallthrough_5=yes
-else
-  ax_cv_check_cflags__Werror__Wimplicit_fallthrough_5=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wimplicit_fallthrough_5" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_5" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_5" = xyes; then :
-  CFLAGS="$CFLAGS -Wimplicit-fallthrough=5"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wcast-align" >&5
-$as_echo_n "checking whether C compiler accepts -Wcast-align... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wcast_align+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wcast-align"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wcast_align=yes
-else
-  ax_cv_check_cflags__Werror__Wcast_align=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wcast_align" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wcast_align" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wcast_align" = xyes; then :
-  CFLAGS="$CFLAGS -Wcast-align"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wstrict-prototypes" >&5
-$as_echo_n "checking whether C compiler accepts -Wstrict-prototypes... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wstrict_prototypes+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wstrict-prototypes"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wstrict_prototypes=yes
-else
-  ax_cv_check_cflags__Werror__Wstrict_prototypes=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wstrict_prototypes" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wstrict_prototypes" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wstrict_prototypes" = xyes; then :
-  CFLAGS="$CFLAGS -Wstrict-prototypes"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-strict-aliasing" >&5
-$as_echo_n "checking whether C compiler accepts -fno-strict-aliasing... " >&6; }
-if ${ax_cv_check_cflags__Werror__fno_strict_aliasing+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__fno_strict_aliasing=yes
-else
-  ax_cv_check_cflags__Werror__fno_strict_aliasing=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fno_strict_aliasing" >&5
-$as_echo "$ax_cv_check_cflags__Werror__fno_strict_aliasing" >&6; }
-if test "x$ax_cv_check_cflags__Werror__fno_strict_aliasing" = xyes; then :
-  CFLAGS="$CFLAGS -fno-strict-aliasing"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstack-clash-protection" >&5
-$as_echo_n "checking whether C compiler accepts -fstack-clash-protection... " >&6; }
-if ${ax_cv_check_cflags__Werror__fstack_clash_protection+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -fstack-clash-protection"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__fstack_clash_protection=yes
-else
-  ax_cv_check_cflags__Werror__fstack_clash_protection=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fstack_clash_protection" >&5
-$as_echo "$ax_cv_check_cflags__Werror__fstack_clash_protection" >&6; }
-if test "x$ax_cv_check_cflags__Werror__fstack_clash_protection" = xyes; then :
-  CFLAGS="$CFLAGS -fstack-clash-protection"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fstack-protector-strong" >&5
-$as_echo_n "checking whether the linker accepts -fstack-protector-strong... " >&6; }
-if ${ax_cv_check_ldflags__Werror__fstack_protector_strong+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS -Werror -fstack-protector-strong"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_check_ldflags__Werror__fstack_protector_strong=yes
-else
-  ax_cv_check_ldflags__Werror__fstack_protector_strong=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags__Werror__fstack_protector_strong" >&5
-$as_echo "$ax_cv_check_ldflags__Werror__fstack_protector_strong" >&6; }
-if test "x$ax_cv_check_ldflags__Werror__fstack_protector_strong" = xyes; then :
-  CFLAGS="$CFLAGS -fstack-protector-strong"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts --param=ssp-buffer-size=4" >&5
-$as_echo_n "checking whether the linker accepts --param=ssp-buffer-size=4... " >&6; }
-if ${ax_cv_check_ldflags__Werror___param_ssp_buffer_size_4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS -Werror --param=ssp-buffer-size=4"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_check_ldflags__Werror___param_ssp_buffer_size_4=yes
-else
-  ax_cv_check_ldflags__Werror___param_ssp_buffer_size_4=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags__Werror___param_ssp_buffer_size_4" >&5
-$as_echo "$ax_cv_check_ldflags__Werror___param_ssp_buffer_size_4" >&6; }
-if test "x$ax_cv_check_ldflags__Werror___param_ssp_buffer_size_4" = xyes; then :
-  CFLAGS="$CFLAGS --param=ssp-buffer-size=4"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -g" >&5
-$as_echo_n "checking whether C compiler accepts -g... " >&6; }
-if ${ax_cv_check_cflags__Werror__g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -g"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__g=yes
-else
-  ax_cv_check_cflags__Werror__g=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__g" >&5
-$as_echo "$ax_cv_check_cflags__Werror__g" >&6; }
-if test "x$ax_cv_check_cflags__Werror__g" = xyes; then :
-  CFLAGS="$CFLAGS -g"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts --mcet -fcf-protection" >&5
-$as_echo_n "checking whether C compiler accepts --mcet -fcf-protection... " >&6; }
-if ${ax_cv_check_cflags__Werror___mcet__fcf_protection+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror --mcet -fcf-protection"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror___mcet__fcf_protection=yes
-else
-  ax_cv_check_cflags__Werror___mcet__fcf_protection=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___mcet__fcf_protection" >&5
-$as_echo "$ax_cv_check_cflags__Werror___mcet__fcf_protection" >&6; }
-if test "x$ax_cv_check_cflags__Werror___mcet__fcf_protection" = xyes; then :
-  CFLAGS="$CFLAGS --mcet -fcf-protection"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=implicit-function-declaration" >&5
-$as_echo_n "checking whether C compiler accepts -Werror=implicit-function-declaration... " >&6; }
-if ${ax_cv_check_cflags__Werror__Werror_implicit_function_declaration+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Werror=implicit-function-declaration"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Werror_implicit_function_declaration=yes
-else
-  ax_cv_check_cflags__Werror__Werror_implicit_function_declaration=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Werror_implicit_function_declaration" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Werror_implicit_function_declaration" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Werror_implicit_function_declaration" = xyes; then :
-  CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wlogical-op" >&5
-$as_echo_n "checking whether C compiler accepts -Wlogical-op... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wlogical_op+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wlogical-op"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wlogical_op=yes
-else
-  ax_cv_check_cflags__Werror__Wlogical_op=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wlogical_op" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wlogical_op" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wlogical_op" = xyes; then :
-  CFLAGS="$CFLAGS -Wlogical-op"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wmissing-include-dirs" >&5
-$as_echo_n "checking whether C compiler accepts -Wmissing-include-dirs... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wmissing_include_dirs+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wmissing-include-dirs"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wmissing_include_dirs=yes
-else
-  ax_cv_check_cflags__Werror__Wmissing_include_dirs=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wmissing_include_dirs" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wmissing_include_dirs" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wmissing_include_dirs" = xyes; then :
-  CFLAGS="$CFLAGS -Wmissing-include-dirs"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wold-style-definition" >&5
-$as_echo_n "checking whether C compiler accepts -Wold-style-definition... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wold_style_definition+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wold-style-definition"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wold_style_definition=yes
-else
-  ax_cv_check_cflags__Werror__Wold_style_definition=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wold_style_definition" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wold_style_definition" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wold_style_definition" = xyes; then :
-  CFLAGS="$CFLAGS -Wold-style-definition"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Winit-self" >&5
-$as_echo_n "checking whether C compiler accepts -Winit-self... " >&6; }
-if ${ax_cv_check_cflags__Werror__Winit_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Winit-self"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Winit_self=yes
-else
-  ax_cv_check_cflags__Werror__Winit_self=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Winit_self" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Winit_self" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Winit_self" = xyes; then :
-  CFLAGS="$CFLAGS -Winit-self"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wunused-but-set-variable" >&5
-$as_echo_n "checking whether C compiler accepts -Wunused-but-set-variable... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wunused_but_set_variable+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wunused-but-set-variable"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wunused_but_set_variable=yes
-else
-  ax_cv_check_cflags__Werror__Wunused_but_set_variable=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wunused_but_set_variable" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wunused_but_set_variable" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wunused_but_set_variable" = xyes; then :
-  CFLAGS="$CFLAGS -Wunused-but-set-variable"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wfloat-equal" >&5
-$as_echo_n "checking whether C compiler accepts -Wfloat-equal... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wfloat_equal+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wfloat-equal"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wfloat_equal=yes
-else
-  ax_cv_check_cflags__Werror__Wfloat_equal=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wfloat_equal" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wfloat_equal" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wfloat_equal" = xyes; then :
-  CFLAGS="$CFLAGS -Wfloat-equal"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wsuggest-attribute=noreturn" >&5
-$as_echo_n "checking whether C compiler accepts -Wsuggest-attribute=noreturn... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wsuggest_attribute_noreturn+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wsuggest-attribute=noreturn"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wsuggest_attribute_noreturn=yes
-else
-  ax_cv_check_cflags__Werror__Wsuggest_attribute_noreturn=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wsuggest_attribute_noreturn" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wsuggest_attribute_noreturn" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wsuggest_attribute_noreturn" = xyes; then :
-  CFLAGS="$CFLAGS -Wsuggest-attribute=noreturn"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=return-type" >&5
-$as_echo_n "checking whether C compiler accepts -Werror=return-type... " >&6; }
-if ${ax_cv_check_cflags__Werror__Werror_return_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Werror=return-type"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Werror_return_type=yes
-else
-  ax_cv_check_cflags__Werror__Werror_return_type=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Werror_return_type" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Werror_return_type" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Werror_return_type" = xyes; then :
-  CFLAGS="$CFLAGS -Werror=return-type"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=incompatible-pointer-types" >&5
-$as_echo_n "checking whether C compiler accepts -Werror=incompatible-pointer-types... " >&6; }
-if ${ax_cv_check_cflags__Werror__Werror_incompatible_pointer_types+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Werror=incompatible-pointer-types"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Werror_incompatible_pointer_types=yes
-else
-  ax_cv_check_cflags__Werror__Werror_incompatible_pointer_types=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Werror_incompatible_pointer_types" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Werror_incompatible_pointer_types" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Werror_incompatible_pointer_types" = xyes; then :
-  CFLAGS="$CFLAGS -Werror=incompatible-pointer-types"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wformat=2" >&5
-$as_echo_n "checking whether C compiler accepts -Wformat=2... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wformat_2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wformat=2"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wformat_2=yes
-else
-  ax_cv_check_cflags__Werror__Wformat_2=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wformat_2" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wformat_2" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wformat_2" = xyes; then :
-  CFLAGS="$CFLAGS -Wformat=2"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wshadow" >&5
-$as_echo_n "checking whether C compiler accepts -Wshadow... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wshadow+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wshadow"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wshadow=yes
-else
-  ax_cv_check_cflags__Werror__Wshadow=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wshadow" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wshadow" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wshadow" = xyes; then :
-  CFLAGS="$CFLAGS -Wshadow"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wendif-labels" >&5
-$as_echo_n "checking whether C compiler accepts -Wendif-labels... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wendif_labels+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wendif-labels"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wendif_labels=yes
-else
-  ax_cv_check_cflags__Werror__Wendif_labels=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wendif_labels" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wendif_labels" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wendif_labels" = xyes; then :
-  CFLAGS="$CFLAGS -Wendif-labels"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=overflow" >&5
-$as_echo_n "checking whether C compiler accepts -Werror=overflow... " >&6; }
-if ${ax_cv_check_cflags__Werror__Werror_overflow+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Werror=overflow"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Werror_overflow=yes
-else
-  ax_cv_check_cflags__Werror__Werror_overflow=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Werror_overflow" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Werror_overflow" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Werror_overflow" = xyes; then :
-  CFLAGS="$CFLAGS -Werror=overflow"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fdiagnostics-show-option" >&5
-$as_echo_n "checking whether C compiler accepts -fdiagnostics-show-option... " >&6; }
-if ${ax_cv_check_cflags__Werror__fdiagnostics_show_option+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -fdiagnostics-show-option"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__fdiagnostics_show_option=yes
-else
-  ax_cv_check_cflags__Werror__fdiagnostics_show_option=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fdiagnostics_show_option" >&5
-$as_echo "$ax_cv_check_cflags__Werror__fdiagnostics_show_option" >&6; }
-if test "x$ax_cv_check_cflags__Werror__fdiagnostics_show_option" = xyes; then :
-  CFLAGS="$CFLAGS -fdiagnostics-show-option"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=shift-count-overflow" >&5
-$as_echo_n "checking whether C compiler accepts -Werror=shift-count-overflow... " >&6; }
-if ${ax_cv_check_cflags__Werror__Werror_shift_count_overflow+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Werror=shift-count-overflow"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Werror_shift_count_overflow=yes
-else
-  ax_cv_check_cflags__Werror__Werror_shift_count_overflow=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Werror_shift_count_overflow" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Werror_shift_count_overflow" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Werror_shift_count_overflow" = xyes; then :
-  CFLAGS="$CFLAGS -Werror=shift-count-overflow"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=shift-overflow=2" >&5
-$as_echo_n "checking whether C compiler accepts -Werror=shift-overflow=2... " >&6; }
-if ${ax_cv_check_cflags__Werror__Werror_shift_overflow_2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Werror=shift-overflow=2"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Werror_shift_overflow_2=yes
-else
-  ax_cv_check_cflags__Werror__Werror_shift_overflow_2=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Werror_shift_overflow_2" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Werror_shift_overflow_2" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Werror_shift_overflow_2" = xyes; then :
-  CFLAGS="$CFLAGS -Werror=shift-overflow=2"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wdate-time" >&5
-$as_echo_n "checking whether C compiler accepts -Wdate-time... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wdate_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wdate-time"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wdate_time=yes
-else
-  ax_cv_check_cflags__Werror__Wdate_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wdate_time" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wdate_time" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wdate_time" = xyes; then :
-  CFLAGS="$CFLAGS -Wdate-time"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wnested-externs" >&5
-$as_echo_n "checking whether C compiler accepts -Wnested-externs... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wnested_externs+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wnested-externs"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wnested_externs=yes
-else
-  ax_cv_check_cflags__Werror__Wnested_externs=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wnested_externs" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wnested_externs" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wnested_externs" = xyes; then :
-  CFLAGS="$CFLAGS -Wnested-externs"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fasynchronous-unwind-tables" >&5
-$as_echo_n "checking whether C compiler accepts -fasynchronous-unwind-tables... " >&6; }
-if ${ax_cv_check_cflags__Werror__fasynchronous_unwind_tables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -fasynchronous-unwind-tables"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__fasynchronous_unwind_tables=yes
-else
-  ax_cv_check_cflags__Werror__fasynchronous_unwind_tables=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fasynchronous_unwind_tables" >&5
-$as_echo "$ax_cv_check_cflags__Werror__fasynchronous_unwind_tables" >&6; }
-if test "x$ax_cv_check_cflags__Werror__fasynchronous_unwind_tables" = xyes; then :
-  CFLAGS="$CFLAGS -fasynchronous-unwind-tables"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -pipe" >&5
-$as_echo_n "checking whether C compiler accepts -pipe... " >&6; }
-if ${ax_cv_check_cflags__Werror__pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -pipe"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__pipe=yes
-else
-  ax_cv_check_cflags__Werror__pipe=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__pipe" >&5
-$as_echo "$ax_cv_check_cflags__Werror__pipe" >&6; }
-if test "x$ax_cv_check_cflags__Werror__pipe" = xyes; then :
-  CFLAGS="$CFLAGS -pipe"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fexceptions" >&5
-$as_echo_n "checking whether C compiler accepts -fexceptions... " >&6; }
-if ${ax_cv_check_cflags__Werror__fexceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -fexceptions"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__fexceptions=yes
-else
-  ax_cv_check_cflags__Werror__fexceptions=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fexceptions" >&5
-$as_echo "$ax_cv_check_cflags__Werror__fexceptions" >&6; }
-if test "x$ax_cv_check_cflags__Werror__fexceptions" = xyes; then :
-  CFLAGS="$CFLAGS -fexceptions"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Warray-bounds" >&5
-$as_echo_n "checking whether C compiler accepts -Warray-bounds... " >&6; }
-if ${ax_cv_check_cflags__Werror__Warray_bounds+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Warray-bounds"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Warray_bounds=yes
-else
-  ax_cv_check_cflags__Werror__Warray_bounds=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Warray_bounds" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Warray_bounds" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Warray_bounds" = xyes; then :
-  CFLAGS="$CFLAGS -Warray-bounds"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wrestrict" >&5
-$as_echo_n "checking whether C compiler accepts -Wrestrict... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wrestrict+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wrestrict"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wrestrict=yes
-else
-  ax_cv_check_cflags__Werror__Wrestrict=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wrestrict" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wrestrict" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wrestrict" = xyes; then :
-  CFLAGS="$CFLAGS -Wrestrict"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wreturn-local-addr" >&5
-$as_echo_n "checking whether C compiler accepts -Wreturn-local-addr... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wreturn_local_addr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wreturn-local-addr"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wreturn_local_addr=yes
-else
-  ax_cv_check_cflags__Werror__Wreturn_local_addr=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wreturn_local_addr" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wreturn_local_addr" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wreturn_local_addr" = xyes; then :
-  CFLAGS="$CFLAGS -Wreturn-local-addr"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wstringop-overflow" >&5
-$as_echo_n "checking whether C compiler accepts -Wstringop-overflow... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wstringop_overflow+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wstringop-overflow"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags__Werror__Wstringop_overflow=yes
-else
-  ax_cv_check_cflags__Werror__Wstringop_overflow=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wstringop_overflow" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wstringop_overflow" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wstringop_overflow" = xyes; then :
-  CFLAGS="$CFLAGS -Wstringop-overflow"
-else
-  :
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -z relro" >&5
-$as_echo_n "checking whether the linker accepts -z relro... " >&6; }
-if ${ax_cv_check_ldflags___z_relro+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS  -z relro"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_check_ldflags___z_relro=yes
-else
-  ax_cv_check_ldflags___z_relro=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___z_relro" >&5
-$as_echo "$ax_cv_check_ldflags___z_relro" >&6; }
-if test "x$ax_cv_check_ldflags___z_relro" = xyes; then :
-  LDFLAGS="$LDFLAGS -z relro"
-else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -z now" >&5
-$as_echo_n "checking whether the linker accepts -z now... " >&6; }
-if ${ax_cv_check_ldflags___z_now+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS  -z now"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_check_ldflags___z_now=yes
-else
-  ax_cv_check_ldflags___z_now=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___z_now" >&5
-$as_echo "$ax_cv_check_ldflags___z_now" >&6; }
-if test "x$ax_cv_check_ldflags___z_now" = xyes; then :
-  LDFLAGS="$LDFLAGS -z now"
-else
-  :
-fi
-
-
-CFLAGS="$CFLAGS -Wvla -std=gnu11 -fms-extensions"
-if test "x$enable_werror" = "xyes"; then
-	CFLAGS="$CFLAGS -Werror"
-fi
-
-# Check whether --enable-thread-safety was given.
-if test "${enable_thread_safety+set}" = set; then :
-  enableval=$enable_thread_safety; enable_thread_safety=$enableval
-else
-  enable_thread_safety=yes
-fi
-
- if test "x$enable_thread_safety" = "xyes"; then
-  ENFORCE_THREAD_SAFETY_TRUE=
-  ENFORCE_THREAD_SAFETY_FALSE='#'
-else
-  ENFORCE_THREAD_SAFETY_TRUE='#'
-  ENFORCE_THREAD_SAFETY_FALSE=
-fi
-
-if test "x$enable_thread_safety" = "xyes"; then
-
-$as_echo "#define ENFORCE_THREAD_SAFETY 1" >>confdefs.h
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-# Check whether --enable-coverity-build was given.
-if test "${enable_coverity_build+set}" = set; then :
-  enableval=$enable_coverity_build; enable_coverity_build=$enableval
-else
-  enable_coverity_build=no
-fi
-
- if test "x$enable_coverity_build" = "xyes"; then
-  ENABLE_COVERITY_BUILD_TRUE=
-  ENABLE_COVERITY_BUILD_FALSE='#'
-else
-  ENABLE_COVERITY_BUILD_TRUE='#'
-  ENABLE_COVERITY_BUILD_FALSE=
-fi
-
-if test "x$enable_coverity_build" = "xyes"; then
-
-$as_echo "#define ENABLE_COVERITY_BUILD 1" >>confdefs.h
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-# Check whether --enable-dlog was given.
-if test "${enable_dlog+set}" = set; then :
-  enableval=$enable_dlog; enable_dlog=$enableval
-else
-  enable_dlog=no
-fi
-
- if test "x$enable_dlog" = "xyes"; then
-  ENABLE_DLOG_TRUE=
-  ENABLE_DLOG_FALSE='#'
-else
-  ENABLE_DLOG_TRUE='#'
-  ENABLE_DLOG_FALSE=
-fi
-
-
-if test -z "$ENABLE_DLOG_TRUE"; then :
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DLOG" >&5
-$as_echo_n "checking for DLOG... " >&6; }
-
-if test -n "$DLOG_CFLAGS"; then
-    pkg_cv_DLOG_CFLAGS="$DLOG_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dlog\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dlog") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DLOG_CFLAGS=`$PKG_CONFIG --cflags "dlog" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$DLOG_LIBS"; then
-    pkg_cv_DLOG_LIBS="$DLOG_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dlog\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dlog") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DLOG_LIBS=`$PKG_CONFIG --libs "dlog" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        DLOG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dlog" 2>&1`
-        else
-	        DLOG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dlog" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DLOG_PKG_ERRORS" >&5
-
-
-		ac_fn_c_check_header_mongrel "$LINENO" "dlog.h" "ac_cv_header_dlog_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlog_h" = xyes; then :
-
-else
-  as_fn_error $? "You must install the dlog development package in order to compile lxc" "$LINENO" 5
-fi
-
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlog_print in -ldlog" >&5
-$as_echo_n "checking for dlog_print in -ldlog... " >&6; }
-if ${ac_cv_lib_dlog_dlog_print+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldlog  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlog_print ();
-int
-main ()
-{
-return dlog_print ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dlog_dlog_print=yes
-else
-  ac_cv_lib_dlog_dlog_print=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dlog_dlog_print" >&5
-$as_echo "$ac_cv_lib_dlog_dlog_print" >&6; }
-if test "x$ac_cv_lib_dlog_dlog_print" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDLOG 1
-_ACEOF
-
-  LIBS="-ldlog $LIBS"
-
-else
-  as_fn_error $? "You must install the dlog development package in order to compile lxc" "$LINENO" 5
-fi
-
-		DLOG_LIBS=-ldlog
-
-
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-		ac_fn_c_check_header_mongrel "$LINENO" "dlog.h" "ac_cv_header_dlog_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlog_h" = xyes; then :
-
-else
-  as_fn_error $? "You must install the dlog development package in order to compile lxc" "$LINENO" 5
-fi
-
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlog_print in -ldlog" >&5
-$as_echo_n "checking for dlog_print in -ldlog... " >&6; }
-if ${ac_cv_lib_dlog_dlog_print+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldlog  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlog_print ();
-int
-main ()
-{
-return dlog_print ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dlog_dlog_print=yes
-else
-  ac_cv_lib_dlog_dlog_print=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dlog_dlog_print" >&5
-$as_echo "$ac_cv_lib_dlog_dlog_print" >&6; }
-if test "x$ac_cv_lib_dlog_dlog_print" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDLOG 1
-_ACEOF
-
-  LIBS="-ldlog $LIBS"
-
-else
-  as_fn_error $? "You must install the dlog development package in order to compile lxc" "$LINENO" 5
-fi
-
-		DLOG_LIBS=-ldlog
-
-
-else
-	DLOG_CFLAGS=$pkg_cv_DLOG_CFLAGS
-	DLOG_LIBS=$pkg_cv_DLOG_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-fi
-
-# Check whether --enable-memfd-rexec was given.
-if test "${enable_memfd_rexec+set}" = set; then :
-  enableval=$enable_memfd_rexec; enable_memfd_rexec=$enableval
-else
-  enable_memfd_rexec=yes
-fi
-
- if test "x$enable_memfd_rexec" = "xyes"; then
-  ENFORCE_MEMFD_REXEC_TRUE=
-  ENFORCE_MEMFD_REXEC_FALSE='#'
-else
-  ENFORCE_MEMFD_REXEC_TRUE='#'
-  ENFORCE_MEMFD_REXEC_FALSE=
-fi
-
-if test "x$enable_memfd_rexec" = "xyes"; then
-
-$as_echo "#define ENFORCE_MEMFD_REXEC 1" >>confdefs.h
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-# Files requiring some variable expansion
-ac_config_files="$ac_config_files Makefile lxc.pc lxc.spec coccinelle/Makefile config/Makefile config/apparmor/Makefile config/apparmor/abstractions/start-container config/selinux/Makefile config/bash/Makefile config/bash/lxc config/init/Makefile config/init/common/Makefile config/init/common/lxc-containers config/init/common/lxc-net config/init/systemd/Makefile config/init/systemd/lxc.service config/init/systemd/lxc@.service config/init/systemd/lxc-net.service config/init/sysvinit/Makefile config/init/sysvinit/lxc-containers config/init/sysvinit/lxc-net config/init/upstart/lxc.conf config/init/upstart/lxc-net.conf config/init/upstart/Makefile config/etc/Makefile config/templates/Makefile config/templates/common.conf config/templates/common.conf.d/Makefile config/templates/nesting.conf config/templates/oci.common.conf config/templates/userns.conf config/yum/Makefile config/sysconfig/Makefile config/sysconfig/lxc doc/Makefile doc/api/Makefile doc/lxc-attach.sgml doc/lxc-autostart.sgml doc/lxc-cgroup.sgml doc/lxc-checkconfig.sgml doc/lxc-checkpoint.sgml doc/lxc-config.sgml doc/lxc-console.sgml doc/lxc-copy.sgml doc/lxc-create.sgml doc/lxc-destroy.sgml doc/lxc-device.sgml doc/lxc-execute.sgml doc/lxc-freeze.sgml doc/lxc-info.sgml doc/lxc-ls.sgml doc/lxc-monitor.sgml doc/lxc-snapshot.sgml doc/lxc-start.sgml doc/lxc-stop.sgml doc/lxc-top.sgml doc/lxc-unfreeze.sgml doc/lxc-unshare.sgml doc/lxc-update-config.sgml doc/lxc-user-nic.sgml doc/lxc-usernsexec.sgml doc/lxc-wait.sgml doc/pam_cgfs.sgml doc/lxc.conf.sgml doc/lxc.container.conf.sgml doc/lxc.system.conf.sgml doc/lxc-usernet.sgml doc/lxc.sgml doc/common_options.sgml doc/see_also.sgml doc/rootfs/Makefile doc/examples/Makefile doc/examples/lxc-macvlan.conf doc/examples/lxc-vlan.conf doc/examples/lxc-no-netns.conf doc/examples/lxc-empty-netns.conf doc/examples/lxc-phys.conf doc/examples/lxc-veth.conf doc/examples/lxc-complex.conf doc/ja/Makefile doc/ja/lxc-attach.sgml doc/ja/lxc-autostart.sgml doc/ja/lxc-cgroup.sgml doc/ja/lxc-checkconfig.sgml doc/ja/lxc-checkpoint.sgml doc/ja/lxc-config.sgml doc/ja/lxc-console.sgml doc/ja/lxc-copy.sgml doc/ja/lxc-create.sgml doc/ja/lxc-destroy.sgml doc/ja/lxc-device.sgml doc/ja/lxc-execute.sgml doc/ja/lxc-freeze.sgml doc/ja/lxc-info.sgml doc/ja/lxc-ls.sgml doc/ja/lxc-monitor.sgml doc/ja/lxc-snapshot.sgml doc/ja/lxc-start.sgml doc/ja/lxc-stop.sgml doc/ja/lxc-top.sgml doc/ja/lxc-unfreeze.sgml doc/ja/lxc-unshare.sgml doc/ja/lxc-update-config.sgml doc/ja/lxc-user-nic.sgml doc/ja/lxc-usernsexec.sgml doc/ja/lxc-wait.sgml doc/ja/pam_cgfs.sgml doc/ja/lxc.conf.sgml doc/ja/lxc.container.conf.sgml doc/ja/lxc.system.conf.sgml doc/ja/lxc-usernet.sgml doc/ja/lxc.sgml doc/ja/common_options.sgml doc/ja/see_also.sgml doc/ko/Makefile doc/ko/lxc-attach.sgml doc/ko/lxc-autostart.sgml doc/ko/lxc-cgroup.sgml doc/ko/lxc-checkconfig.sgml doc/ko/lxc-checkpoint.sgml doc/ko/lxc-config.sgml doc/ko/lxc-console.sgml doc/ko/lxc-copy.sgml doc/ko/lxc-create.sgml doc/ko/lxc-destroy.sgml doc/ko/lxc-device.sgml doc/ko/lxc-execute.sgml doc/ko/lxc-freeze.sgml doc/ko/lxc-info.sgml doc/ko/lxc-ls.sgml doc/ko/lxc-monitor.sgml doc/ko/lxc-snapshot.sgml doc/ko/lxc-start.sgml doc/ko/lxc-stop.sgml doc/ko/lxc-top.sgml doc/ko/lxc-unfreeze.sgml doc/ko/lxc-unshare.sgml doc/ko/lxc-user-nic.sgml doc/ko/lxc-usernsexec.sgml doc/ko/lxc-wait.sgml doc/ko/lxc.conf.sgml doc/ko/lxc.container.conf.sgml doc/ko/lxc.system.conf.sgml doc/ko/lxc-usernet.sgml doc/ko/lxc.sgml doc/ko/common_options.sgml doc/ko/see_also.sgml hooks/Makefile hooks/dhclient templates/Makefile templates/lxc-busybox templates/lxc-download templates/lxc-local templates/lxc-oci src/Makefile src/lxc/Makefile src/lxc/lxc.functions src/lxc/cmd/lxc-checkconfig src/lxc/cmd/lxc-update-config src/lxc/version.h src/tests/Makefile src/tests/lxc-test-usernic"
-
-ac_config_commands="$ac_config_commands default"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^$a-zA-Z_a-zA-Z0-9_*$=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^$^=*$=$.*{}.*$$/test "${\1+set}" = set || &/
-     t end
-     s/^$^=*$=$.*$$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_DEBIAN_TRUE}" && test -z "${HAVE_DEBIAN_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_DEBIAN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${DISTRO_UBUNTU_TRUE}" && test -z "${DISTRO_UBUNTU_FALSE}"; then
-  as_fn_error $? "conditional \"DISTRO_UBUNTU\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${INIT_SCRIPT_SYSV_TRUE}" && test -z "${INIT_SCRIPT_SYSV_FALSE}"; then
-  as_fn_error $? "conditional \"INIT_SCRIPT_SYSV\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${INIT_SCRIPT_SYSTEMD_TRUE}" && test -z "${INIT_SCRIPT_SYSTEMD_FALSE}"; then
-  as_fn_error $? "conditional \"INIT_SCRIPT_SYSTEMD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${INIT_SCRIPT_UPSTART_TRUE}" && test -z "${INIT_SCRIPT_UPSTART_FALSE}"; then
-  as_fn_error $? "conditional \"INIT_SCRIPT_UPSTART\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_RPATH_TRUE}" && test -z "${ENABLE_RPATH_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_RPATH\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_DOCBOOK_TRUE}" && test -z "${ENABLE_DOCBOOK_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_DOCBOOK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${USE_DOCBOOK2X_TRUE}" && test -z "${USE_DOCBOOK2X_FALSE}"; then
-  as_fn_error $? "conditional \"USE_DOCBOOK2X\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_API_DOCS_TRUE}" && test -z "${ENABLE_API_DOCS_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_API_DOCS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_APPARMOR_TRUE}" && test -z "${ENABLE_APPARMOR_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_APPARMOR\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_OPENSSL_TRUE}" && test -z "${ENABLE_OPENSSL_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_OPENSSL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_SELINUX_TRUE}" && test -z "${ENABLE_SELINUX_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_SELINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_SECCOMP_TRUE}" && test -z "${ENABLE_SECCOMP_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_SECCOMP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_STATIC_LIBCAP_TRUE}" && test -z "${HAVE_STATIC_LIBCAP_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STATIC_LIBCAP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_CAP_TRUE}" && test -z "${ENABLE_CAP_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_CAP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_EXAMPLES_TRUE}" && test -z "${ENABLE_EXAMPLES_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_EXAMPLES\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${MUTEX_DEBUGGING_TRUE}" && test -z "${MUTEX_DEBUGGING_FALSE}"; then
-  as_fn_error $? "conditional \"MUTEX_DEBUGGING\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_BASH_TRUE}" && test -z "${ENABLE_BASH_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_BASH\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_TOOLS_TRUE}" && test -z "${ENABLE_TOOLS_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_TOOLS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_COMMANDS_TRUE}" && test -z "${ENABLE_COMMANDS_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_COMMANDS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_ASAN_TRUE}" && test -z "${ENABLE_ASAN_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_ASAN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_UBSAN_TRUE}" && test -z "${ENABLE_UBSAN_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_UBSAN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${USE_CONFIGPATH_LOGS_TRUE}" && test -z "${USE_CONFIGPATH_LOGS_FALSE}"; then
-  as_fn_error $? "conditional \"USE_CONFIGPATH_LOGS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${IS_BIONIC_TRUE}" && test -z "${IS_BIONIC_FALSE}"; then
-  as_fn_error $? "conditional \"IS_BIONIC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_PAM_TRUE}" && test -z "${ENABLE_PAM_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_PAM\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PAM_TRUE}" && test -z "${HAVE_PAM_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PAM\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_IFADDRS_H_TRUE}" && test -z "${HAVE_IFADDRS_H_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_IFADDRS_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_IFADDRS_H_TRUE}" && test -z "${HAVE_IFADDRS_H_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_IFADDRS_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GETGRGID_R_TRUE}" && test -z "${HAVE_GETGRGID_R_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GETGRGID_R\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GETGRGID_R_TRUE}" && test -z "${HAVE_GETGRGID_R_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GETGRGID_R\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GETLINE_TRUE}" && test -z "${HAVE_GETLINE_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GETLINE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GETLINE_TRUE}" && test -z "${HAVE_GETLINE_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GETLINE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GETSUBOPT_TRUE}" && test -z "${HAVE_GETSUBOPT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GETSUBOPT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GETSUBOPT_TRUE}" && test -z "${HAVE_GETSUBOPT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GETSUBOPT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_FGETLN_TRUE}" && test -z "${HAVE_FGETLN_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_FGETLN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_FGETLN_TRUE}" && test -z "${HAVE_FGETLN_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_FGETLN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_KEYCTL_TRUE}" && test -z "${HAVE_KEYCTL_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_KEYCTL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_KEYCTL_TRUE}" && test -z "${HAVE_KEYCTL_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_KEYCTL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PRLIMIT_TRUE}" && test -z "${HAVE_PRLIMIT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PRLIMIT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PRLIMIT_TRUE}" && test -z "${HAVE_PRLIMIT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PRLIMIT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PRLIMIT64_TRUE}" && test -z "${HAVE_PRLIMIT64_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PRLIMIT64\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PRLIMIT64_TRUE}" && test -z "${HAVE_PRLIMIT64_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PRLIMIT64\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PTHREAD_SETCANCELSTATE_TRUE}" && test -z "${HAVE_PTHREAD_SETCANCELSTATE_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PTHREAD_SETCANCELSTATE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PTHREAD_SETCANCELSTATE_TRUE}" && test -z "${HAVE_PTHREAD_SETCANCELSTATE_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PTHREAD_SETCANCELSTATE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_STRLCPY_TRUE}" && test -z "${HAVE_STRLCPY_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STRLCPY\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_STRLCPY_TRUE}" && test -z "${HAVE_STRLCPY_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STRLCPY\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_STRLCAT_TRUE}" && test -z "${HAVE_STRLCAT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STRLCAT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_STRLCAT_TRUE}" && test -z "${HAVE_STRLCAT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STRLCAT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_FMEMOPEN_TRUE}" && test -z "${HAVE_FMEMOPEN_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_FMEMOPEN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_FMEMOPEN_TRUE}" && test -z "${HAVE_FMEMOPEN_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_FMEMOPEN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENFORCE_THREAD_SAFETY_TRUE}" && test -z "${ENFORCE_THREAD_SAFETY_FALSE}"; then
-  as_fn_error $? "conditional \"ENFORCE_THREAD_SAFETY\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_COVERITY_BUILD_TRUE}" && test -z "${ENABLE_COVERITY_BUILD_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_COVERITY_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_DLOG_TRUE}" && test -z "${ENABLE_DLOG_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_DLOG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENFORCE_MEMFD_REXEC_TRUE}" && test -z "${ENFORCE_MEMFD_REXEC_FALSE}"; then
-  as_fn_error $? "conditional \"ENFORCE_MEMFD_REXEC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *\\/* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR LINENO LOG_FD
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/$^/^/*$\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_dir" : 'X$//$^/' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by lxc $as_me 4.0.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_links="$ac_config_links"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 OPTION... TAG...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE:TEMPLATE
-                   instantiate the configuration file FILE
-      --header=FILE:TEMPLATE
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration links:
-$config_links
-
-Configuration commands:
-$config_commands
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
-ac_cs_version="\\
-lxc config.status 4.0.3
-configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X$^=*$='`
-    ac_optarg=`expr "X$1" : 'X^=*=$.*$'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X$^=*$='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
-configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-DLLTOOL \
-sharedlib_from_linklib_cmd \
-AR \
-AR_FLAGS \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_import \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-lt_cv_nm_interface \
-nm_file_list_spec \
-lt_cv_truncate_bin \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-configure_time_dlsearch_path \
-configure_time_lt_sys_library_path; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-
-# See if we are running on zsh, and set the options that allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "config/etc/default.conf") CONFIG_LINKS="$CONFIG_LINKS config/etc/default.conf:config/etc/${distroconf}" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "lxc.pc") CONFIG_FILES="$CONFIG_FILES lxc.pc" ;;
-    "lxc.spec") CONFIG_FILES="$CONFIG_FILES lxc.spec" ;;
-    "coccinelle/Makefile") CONFIG_FILES="$CONFIG_FILES coccinelle/Makefile" ;;
-    "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
-    "config/apparmor/Makefile") CONFIG_FILES="$CONFIG_FILES config/apparmor/Makefile" ;;
-    "config/apparmor/abstractions/start-container") CONFIG_FILES="$CONFIG_FILES config/apparmor/abstractions/start-container" ;;
-    "config/selinux/Makefile") CONFIG_FILES="$CONFIG_FILES config/selinux/Makefile" ;;
-    "config/bash/Makefile") CONFIG_FILES="$CONFIG_FILES config/bash/Makefile" ;;
-    "config/bash/lxc") CONFIG_FILES="$CONFIG_FILES config/bash/lxc" ;;
-    "config/init/Makefile") CONFIG_FILES="$CONFIG_FILES config/init/Makefile" ;;
-    "config/init/common/Makefile") CONFIG_FILES="$CONFIG_FILES config/init/common/Makefile" ;;
-    "config/init/common/lxc-containers") CONFIG_FILES="$CONFIG_FILES config/init/common/lxc-containers" ;;
-    "config/init/common/lxc-net") CONFIG_FILES="$CONFIG_FILES config/init/common/lxc-net" ;;
-    "config/init/systemd/Makefile") CONFIG_FILES="$CONFIG_FILES config/init/systemd/Makefile" ;;
-    "config/init/systemd/lxc.service") CONFIG_FILES="$CONFIG_FILES config/init/systemd/lxc.service" ;;
-    "config/init/systemd/lxc@.service") CONFIG_FILES="$CONFIG_FILES config/init/systemd/lxc@.service" ;;
-    "config/init/systemd/lxc-net.service") CONFIG_FILES="$CONFIG_FILES config/init/systemd/lxc-net.service" ;;
-    "config/init/sysvinit/Makefile") CONFIG_FILES="$CONFIG_FILES config/init/sysvinit/Makefile" ;;
-    "config/init/sysvinit/lxc-containers") CONFIG_FILES="$CONFIG_FILES config/init/sysvinit/lxc-containers" ;;
-    "config/init/sysvinit/lxc-net") CONFIG_FILES="$CONFIG_FILES config/init/sysvinit/lxc-net" ;;
-    "config/init/upstart/lxc.conf") CONFIG_FILES="$CONFIG_FILES config/init/upstart/lxc.conf" ;;
-    "config/init/upstart/lxc-net.conf") CONFIG_FILES="$CONFIG_FILES config/init/upstart/lxc-net.conf" ;;
-    "config/init/upstart/Makefile") CONFIG_FILES="$CONFIG_FILES config/init/upstart/Makefile" ;;
-    "config/etc/Makefile") CONFIG_FILES="$CONFIG_FILES config/etc/Makefile" ;;
-    "config/templates/Makefile") CONFIG_FILES="$CONFIG_FILES config/templates/Makefile" ;;
-    "config/templates/common.conf") CONFIG_FILES="$CONFIG_FILES config/templates/common.conf" ;;
-    "config/templates/common.conf.d/Makefile") CONFIG_FILES="$CONFIG_FILES config/templates/common.conf.d/Makefile" ;;
-    "config/templates/nesting.conf") CONFIG_FILES="$CONFIG_FILES config/templates/nesting.conf" ;;
-    "config/templates/oci.common.conf") CONFIG_FILES="$CONFIG_FILES config/templates/oci.common.conf" ;;
-    "config/templates/userns.conf") CONFIG_FILES="$CONFIG_FILES config/templates/userns.conf" ;;
-    "config/yum/Makefile") CONFIG_FILES="$CONFIG_FILES config/yum/Makefile" ;;
-    "config/sysconfig/Makefile") CONFIG_FILES="$CONFIG_FILES config/sysconfig/Makefile" ;;
-    "config/sysconfig/lxc") CONFIG_FILES="$CONFIG_FILES config/sysconfig/lxc" ;;
-    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "doc/api/Makefile") CONFIG_FILES="$CONFIG_FILES doc/api/Makefile" ;;
-    "doc/lxc-attach.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-attach.sgml" ;;
-    "doc/lxc-autostart.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-autostart.sgml" ;;
-    "doc/lxc-cgroup.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-cgroup.sgml" ;;
-    "doc/lxc-checkconfig.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-checkconfig.sgml" ;;
-    "doc/lxc-checkpoint.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-checkpoint.sgml" ;;
-    "doc/lxc-config.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-config.sgml" ;;
-    "doc/lxc-console.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-console.sgml" ;;
-    "doc/lxc-copy.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-copy.sgml" ;;
-    "doc/lxc-create.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-create.sgml" ;;
-    "doc/lxc-destroy.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-destroy.sgml" ;;
-    "doc/lxc-device.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-device.sgml" ;;
-    "doc/lxc-execute.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-execute.sgml" ;;
-    "doc/lxc-freeze.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-freeze.sgml" ;;
-    "doc/lxc-info.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-info.sgml" ;;
-    "doc/lxc-ls.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-ls.sgml" ;;
-    "doc/lxc-monitor.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-monitor.sgml" ;;
-    "doc/lxc-snapshot.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-snapshot.sgml" ;;
-    "doc/lxc-start.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-start.sgml" ;;
-    "doc/lxc-stop.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-stop.sgml" ;;
-    "doc/lxc-top.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-top.sgml" ;;
-    "doc/lxc-unfreeze.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-unfreeze.sgml" ;;
-    "doc/lxc-unshare.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-unshare.sgml" ;;
-    "doc/lxc-update-config.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-update-config.sgml" ;;
-    "doc/lxc-user-nic.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-user-nic.sgml" ;;
-    "doc/lxc-usernsexec.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-usernsexec.sgml" ;;
-    "doc/lxc-wait.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-wait.sgml" ;;
-    "doc/pam_cgfs.sgml") CONFIG_FILES="$CONFIG_FILES doc/pam_cgfs.sgml" ;;
-    "doc/lxc.conf.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc.conf.sgml" ;;
-    "doc/lxc.container.conf.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc.container.conf.sgml" ;;
-    "doc/lxc.system.conf.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc.system.conf.sgml" ;;
-    "doc/lxc-usernet.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc-usernet.sgml" ;;
-    "doc/lxc.sgml") CONFIG_FILES="$CONFIG_FILES doc/lxc.sgml" ;;
-    "doc/common_options.sgml") CONFIG_FILES="$CONFIG_FILES doc/common_options.sgml" ;;
-    "doc/see_also.sgml") CONFIG_FILES="$CONFIG_FILES doc/see_also.sgml" ;;
-    "doc/rootfs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/rootfs/Makefile" ;;
-    "doc/examples/Makefile") CONFIG_FILES="$CONFIG_FILES doc/examples/Makefile" ;;
-    "doc/examples/lxc-macvlan.conf") CONFIG_FILES="$CONFIG_FILES doc/examples/lxc-macvlan.conf" ;;
-    "doc/examples/lxc-vlan.conf") CONFIG_FILES="$CONFIG_FILES doc/examples/lxc-vlan.conf" ;;
-    "doc/examples/lxc-no-netns.conf") CONFIG_FILES="$CONFIG_FILES doc/examples/lxc-no-netns.conf" ;;
-    "doc/examples/lxc-empty-netns.conf") CONFIG_FILES="$CONFIG_FILES doc/examples/lxc-empty-netns.conf" ;;
-    "doc/examples/lxc-phys.conf") CONFIG_FILES="$CONFIG_FILES doc/examples/lxc-phys.conf" ;;
-    "doc/examples/lxc-veth.conf") CONFIG_FILES="$CONFIG_FILES doc/examples/lxc-veth.conf" ;;
-    "doc/examples/lxc-complex.conf") CONFIG_FILES="$CONFIG_FILES doc/examples/lxc-complex.conf" ;;
-    "doc/ja/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ja/Makefile" ;;
-    "doc/ja/lxc-attach.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-attach.sgml" ;;
-    "doc/ja/lxc-autostart.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-autostart.sgml" ;;
-    "doc/ja/lxc-cgroup.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-cgroup.sgml" ;;
-    "doc/ja/lxc-checkconfig.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-checkconfig.sgml" ;;
-    "doc/ja/lxc-checkpoint.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-checkpoint.sgml" ;;
-    "doc/ja/lxc-config.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-config.sgml" ;;
-    "doc/ja/lxc-console.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-console.sgml" ;;
-    "doc/ja/lxc-copy.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-copy.sgml" ;;
-    "doc/ja/lxc-create.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-create.sgml" ;;
-    "doc/ja/lxc-destroy.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-destroy.sgml" ;;
-    "doc/ja/lxc-device.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-device.sgml" ;;
-    "doc/ja/lxc-execute.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-execute.sgml" ;;
-    "doc/ja/lxc-freeze.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-freeze.sgml" ;;
-    "doc/ja/lxc-info.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-info.sgml" ;;
-    "doc/ja/lxc-ls.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-ls.sgml" ;;
-    "doc/ja/lxc-monitor.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-monitor.sgml" ;;
-    "doc/ja/lxc-snapshot.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-snapshot.sgml" ;;
-    "doc/ja/lxc-start.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-start.sgml" ;;
-    "doc/ja/lxc-stop.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-stop.sgml" ;;
-    "doc/ja/lxc-top.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-top.sgml" ;;
-    "doc/ja/lxc-unfreeze.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-unfreeze.sgml" ;;
-    "doc/ja/lxc-unshare.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-unshare.sgml" ;;
-    "doc/ja/lxc-update-config.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-update-config.sgml" ;;
-    "doc/ja/lxc-user-nic.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-user-nic.sgml" ;;
-    "doc/ja/lxc-usernsexec.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-usernsexec.sgml" ;;
-    "doc/ja/lxc-wait.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-wait.sgml" ;;
-    "doc/ja/pam_cgfs.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/pam_cgfs.sgml" ;;
-    "doc/ja/lxc.conf.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc.conf.sgml" ;;
-    "doc/ja/lxc.container.conf.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc.container.conf.sgml" ;;
-    "doc/ja/lxc.system.conf.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc.system.conf.sgml" ;;
-    "doc/ja/lxc-usernet.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc-usernet.sgml" ;;
-    "doc/ja/lxc.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/lxc.sgml" ;;
-    "doc/ja/common_options.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/common_options.sgml" ;;
-    "doc/ja/see_also.sgml") CONFIG_FILES="$CONFIG_FILES doc/ja/see_also.sgml" ;;
-    "doc/ko/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ko/Makefile" ;;
-    "doc/ko/lxc-attach.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-attach.sgml" ;;
-    "doc/ko/lxc-autostart.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-autostart.sgml" ;;
-    "doc/ko/lxc-cgroup.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-cgroup.sgml" ;;
-    "doc/ko/lxc-checkconfig.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-checkconfig.sgml" ;;
-    "doc/ko/lxc-checkpoint.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-checkpoint.sgml" ;;
-    "doc/ko/lxc-config.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-config.sgml" ;;
-    "doc/ko/lxc-console.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-console.sgml" ;;
-    "doc/ko/lxc-copy.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-copy.sgml" ;;
-    "doc/ko/lxc-create.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-create.sgml" ;;
-    "doc/ko/lxc-destroy.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-destroy.sgml" ;;
-    "doc/ko/lxc-device.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-device.sgml" ;;
-    "doc/ko/lxc-execute.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-execute.sgml" ;;
-    "doc/ko/lxc-freeze.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-freeze.sgml" ;;
-    "doc/ko/lxc-info.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-info.sgml" ;;
-    "doc/ko/lxc-ls.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-ls.sgml" ;;
-    "doc/ko/lxc-monitor.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-monitor.sgml" ;;
-    "doc/ko/lxc-snapshot.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-snapshot.sgml" ;;
-    "doc/ko/lxc-start.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-start.sgml" ;;
-    "doc/ko/lxc-stop.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-stop.sgml" ;;
-    "doc/ko/lxc-top.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-top.sgml" ;;
-    "doc/ko/lxc-unfreeze.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-unfreeze.sgml" ;;
-    "doc/ko/lxc-unshare.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-unshare.sgml" ;;
-    "doc/ko/lxc-user-nic.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-user-nic.sgml" ;;
-    "doc/ko/lxc-usernsexec.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-usernsexec.sgml" ;;
-    "doc/ko/lxc-wait.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-wait.sgml" ;;
-    "doc/ko/lxc.conf.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc.conf.sgml" ;;
-    "doc/ko/lxc.container.conf.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc.container.conf.sgml" ;;
-    "doc/ko/lxc.system.conf.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc.system.conf.sgml" ;;
-    "doc/ko/lxc-usernet.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc-usernet.sgml" ;;
-    "doc/ko/lxc.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/lxc.sgml" ;;
-    "doc/ko/common_options.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/common_options.sgml" ;;
-    "doc/ko/see_also.sgml") CONFIG_FILES="$CONFIG_FILES doc/ko/see_also.sgml" ;;
-    "hooks/Makefile") CONFIG_FILES="$CONFIG_FILES hooks/Makefile" ;;
-    "hooks/dhclient") CONFIG_FILES="$CONFIG_FILES hooks/dhclient" ;;
-    "templates/Makefile") CONFIG_FILES="$CONFIG_FILES templates/Makefile" ;;
-    "templates/lxc-busybox") CONFIG_FILES="$CONFIG_FILES templates/lxc-busybox" ;;
-    "templates/lxc-download") CONFIG_FILES="$CONFIG_FILES templates/lxc-download" ;;
-    "templates/lxc-local") CONFIG_FILES="$CONFIG_FILES templates/lxc-local" ;;
-    "templates/lxc-oci") CONFIG_FILES="$CONFIG_FILES templates/lxc-oci" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/lxc/Makefile") CONFIG_FILES="$CONFIG_FILES src/lxc/Makefile" ;;
-    "src/lxc/lxc.functions") CONFIG_FILES="$CONFIG_FILES src/lxc/lxc.functions" ;;
-    "src/lxc/cmd/lxc-checkconfig") CONFIG_FILES="$CONFIG_FILES src/lxc/cmd/lxc-checkconfig" ;;
-    "src/lxc/cmd/lxc-update-config") CONFIG_FILES="$CONFIG_FILES src/lxc/cmd/lxc-update-config" ;;
-    "src/lxc/version.h") CONFIG_FILES="$CONFIG_FILES src/lxc/version.h" ;;
-    "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
-    "src/tests/lxc-test-usernic") CONFIG_FILES="$CONFIG_FILES src/tests/lxc-test-usernic" ;;
-    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S"/; s/!.*/"=/
-p
-g
-s/^^!*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/$.\{148\}$..*/\1/
-t more1
-s/"\\/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/"\\/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/$.\{148\}$..*/\1/
-t more2
-s/"\\/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/"\\/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^^""/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_setkey = 1
-  FS = "&#x7;"
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field1)
-  for (i = 2; i < nfields; i++) {
-    key = fieldi
-    keylen = length(key)
-    if (S_is_setkey) {
-      value = Skey
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field++i)
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^	 *VPATH	 *=	 */{
-h
-s///
-s/^/:/
-s/	 *$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/$=	 *$.*/\1/
-G
-s/\n//
-s/^^=*=	 *$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=_$as_cr_Letters_$as_cr_alnum*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^	 *#	 *define	 	 */ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/"\\/\\&/g
-s/^ $'"$ac_word_re"'$$(^()*)$	 *$.*$/P"\1"="\2"\
-D"\1"=" \3"/p
-s/^ $'"$ac_word_re"'$	 *$.*$/D"\1"=" \2"/p
-d
-:bsnl
-s/"\\/\\&/g
-s/^ $'"$ac_word_re"'$$(^()*)$	 *$.*$/P"\1"="\2"\
-D"\1"=" \3\\\\\\n"\\/p
-t cont
-s/^ $'"$ac_word_re"'$	 *$.*$/D"\1"=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/"\\/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/"\\/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_setkey = 1
-  FS = "&#x7;"
-}
-/^\t *#\t *(define|undef)\t +$ac_word_re(\t (|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg1 == "#") {
-    defundef = arg2
-    mac1 = arg3
-  } else {
-    defundef = substr(arg1, 2)
-    mac1 = arg2
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac21
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_setmacro) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro Pmacro Dmacro
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS  :L $CONFIG_LINKS  :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :FHLC) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :FHL*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :FH-) ac_tag=-:-;;
-  :FH*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :FH)
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   \\/$*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/\\\\&|/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$ac_file" : 'X$//$^/' \| \
-	 X"$ac_file" : 'X$//$$' \| \
-	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  \\/* | ?:\\/* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  \\/$* | ?:\\/* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  \\/$* | ?:\\/* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@a-zA-Z_a-zA-Z_0-9*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$_am_arg" : 'X$//$^/' \| \
-	 X"$_am_arg" : 'X$//$$' \| \
-	 X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-  :L)
-  #
-  # CONFIG_LINK
-  #
-
-  if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
-    :
-  else
-    # Prefer the file from the source tree if names are identical.
-    if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
-      ac_source=$srcdir/$ac_source
-    fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5
-$as_echo "$as_me: linking $ac_source to $ac_file" >&6;}
-
-    if test ! -r "$ac_source"; then
-      as_fn_error $? "$ac_source: file not found" "$LINENO" 5
-    fi
-    rm -f "$ac_file"
-
-    # Try a relative symlink, then a hard link, then a copy.
-    case $ac_source in
-    \\/$* | ?:\\/* ) ac_rel_source=$ac_source ;;
-	*) ac_rel_source=$ac_top_build_prefix$ac_source ;;
-    esac
-    ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
-      ln "$ac_source" "$ac_file" 2>/dev/null ||
-      cp -p "$ac_source" "$ac_file" ||
-      as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5
-  fi
- ;;
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
-  # requiring Autoconf 2.70 or later.
-  case $CONFIG_FILES in #(
-  *\'*) :
-    eval set x "$CONFIG_FILES" ;; #(
-  *) :
-    set x $CONFIG_FILES ;; #(
-  *) :
-     ;;
-esac
-  shift
-  # Used to flag and report bootstrapping failures.
-  am_rc=0
-  for am_mf
-  do
-    # Strip MF so we end up with the name of the file.
-    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
-    # dependency-tracking related rules and includes.
-    # Grep'ing the whole file directly is not great: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
-      || continue
-    am_dirpart=`$as_dirname -- "$am_mf" ||
-$as_expr X"$am_mf" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$am_mf" : 'X$//$^/' \| \
-	 X"$am_mf" : 'X$//$$' \| \
-	 X"$am_mf" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$am_mf" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    am_filepart=`$as_basename -- "$am_mf" ||
-$as_expr X/"$am_mf" : '.*/$^/^/*$/*$' \| \
-	 X"$am_mf" : 'X$//$$' \| \
-	 X"$am_mf" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$am_mf" |
-    sed '/^.*\/$^/^/*$\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { echo "$as_me:$LINENO: cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles" >&5
-   (cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } || am_rc=$?
-  done
-  if test $am_rc -ne 0; then
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  Try re-running configure with the
-    '--disable-dependency-tracking' option to at least be able to build
-    the package (albeit without support for automatic dependency tracking).
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-  { am_dirpart=; unset am_dirpart;}
-  { am_filepart=; unset am_filepart;}
-  { am_mf=; unset am_mf;}
-  { am_rc=; unset am_rc;}
-  rm -f conftest-deps.mk
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options that allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}"; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile=${ofile}T
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-# Generated automatically by $as_me ($PACKAGE) $VERSION
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit, 1996
-
-# Copyright (C) 2014 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program or library that is built
-# using GNU Libtool, you may include this file under the  same
-# distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=''
-
-# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shared archive member basename,for filename based shared library versioning on AIX.
-shared_archive_member_spec=$shared_archive_member_spec
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm into a list of symbols to manually relocate.
-global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name lister interface.
-nm_interface=$lt_lt_cv_nm_interface
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and where our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# Command to truncate a binary pipe.
-lt_truncate_bin=$lt_lt_cv_truncate_bin
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Detected run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
-
-# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
-configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-    cat <<'_LT_EOF' >> "$cfgfile"
-
-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
-
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR:DIR:"
-#       string "DIR DIR" will be prepended to VARIABLE
-# ":DIR:DIR"
-#       string "DIR DIR" will be appended to VARIABLE
-# "DIRP:DIRP::DIRA:DIRA"
-#       string "DIRP DIRP" will be prepended to VARIABLE and string
-#       "DIRA DIRA" will be appended to VARIABLE
-# "DIR:DIR"
-#       VARIABLE will be replaced by "DIR DIR"
-func_munge_path_list ()
-{
-    case x$2 in
-    x)
-        ;;
-    *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-        ;;
-    x:*)
-        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-        ;;
-    *)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-
-
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in $*""; do
-      case $cc_temp in
-        compile | *\\/compile | ccache | *\\/ccache ) ;;
-        distcc | *\\/distcc | purify | *\\/purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-
-
-# ### END FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test set != "${COLLECT_NAMES+set}"; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
- ;;
-    "default":C)  ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-# Configuration overview
-cat << EOF
-
-----------------------------
-Binaries
- - Command Line Tools:
-   - lxc-attach:     $enable_tools
-   - lxc-autostart:  $enable_tools
-   - lxc-cgroup:     $enable_tools
-   - lxc-checkpoint: $enable_tools
-   - lxc-config:     $enable_tools
-   - lxc-console:    $enable_tools
-   - lxc-copy:       $enable_tools
-   - lxc-create:     $enable_tools
-   - lxc-destroy:    $enable_tools
-   - lxc-device:     $enable_tools
-   - lxc-execute:    $enable_tools
-   - lxc-freeze:     $enable_tools
-   - lxc-info:       $enable_tools
-   - lxc-ls:         $enable_tools
-   - lxc-monitor:    $enable_tools
-   - lxc-snapshot:   $enable_tools
-   - lxc-start:      $enable_tools
-   - lxc-stop:       $enable_tools
-   - lxc-top:        $enable_tools
-   - lxc-unfreeze:   $enable_tools
-   - lxc-unshare:    $enable_tools
-   - lxc-wait:       $enable_tools
-
- - liblxc Commands:
-   - lxc-checkconfig:   $enable_commands
-   - lxc-update-config: $enable_commands
-   - lxc-init:          $enable_commands
-   - lxc-monitord:      $enable_commands
-   - lxc-user-nic:      $enable_commands
-   - lxc-usernsexec:    $enable_commands
-
-Environment:
- - compiler: $CC
- - distribution: $with_distro
- - init script type(s): $init_script
- - rpath: $enable_rpath
- - OpenSSL: $enable_openssl
- - Bash integration: $enable_bash
-
-Security features:
- - Apparmor: $enable_apparmor
- - Linux capabilities: $enable_capabilities
- - seccomp: $enable_seccomp
- - SELinux: $enable_selinux
- - memfd rexec: $enable_memfd_rexec
-
-PAM:
- - PAM module: $enable_pam
- - cgroup PAM module: $pamdir
-
-Documentation:
- - examples: $enable_examples
- - API documentation: $enable_api_docs
- - user documentation: $enable_doc
-
-Debugging:
- - ASAN: $enable_asan
- - Coverity: $enable_coverity_build
- - mutex debugging: $enable_mutex_debugging
- - tests: $enable_tests
-
-Paths:
- - Logs in configpath: $enable_configpath_log
-
-Thread-safety:
- - enforce: $enable_thread_safety
-
-Dlog:
- - enable: $enable_dlog
-EOF

_service:tar_scm:lxc-4.0.3.tar.gz/configure.ac Deleted

@@ -1,1077 +0,0 @@
-AC_PREREQ(2.69)
-
-m4_define(lxc_devel, 0)
-m4_define(lxc_version_major, 4)
-m4_define(lxc_version_minor, 0)
-m4_define(lxc_version_micro, 3)
-m4_define(lxc_version_beta, )
-
-m4_define(lxc_abi_major, 1)
-m4_define(lxc_abi_minor, 7)
-m4_define(lxc_abi_micro, 0)
-m4_define(lxc_abi, lxc_abi_major.lxc_abi_minor.lxc_abi_micro)
-
-m4_define(lxc_version_base, lxc_version_major.lxc_version_minor.lxc_version_micro)
-m4_define(lxc_version,
-       ifelse(lxc_devel, 1,
-        ifelse(lxc_version_beta, , lxc_version_base, lxc_version_base.lxc_version_beta)-devel,
-        ifelse(lxc_version_beta, , lxc_version_base, lxc_version_base.lxc_version_beta)))
-
-AC_INIT(lxc,lxc_version)
-
-# We need pkg-config
-PKG_PROG_PKG_CONFIG
-
-AC_SUBST(LXC_VERSION_BASE, lxc_version_base)
-AC_SUBST(LXC_VERSION_BETA, lxc_version_beta)
-
-AC_SUBST(LXC_VERSION_MAJOR, lxc_version_major)
-AC_SUBST(LXC_VERSION_MINOR, lxc_version_minor)
-AC_SUBST(LXC_VERSION_MICRO, lxc_version_micro)
-AC_SUBST(LXC_VERSION, lxc_version)
-AC_SUBST(LXC_DEVEL, lxc_devel)
-
-AC_SUBST(LXC_ABI_MAJOR, lxc_abi_major)
-AC_SUBST(LXC_ABI_MINOR, lxc_abi_minor)
-AC_SUBST(LXC_ABI_MICRO, lxc_abi_micro)
-AC_SUBST(LXC_ABI, lxc_abi)
-
-AC_CONFIG_SRCDIR(configure.ac)
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_HEADERS(src/config.h)
-AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects)
-AC_CANONICAL_HOST
-AM_PROG_CC_C_O
-AC_USE_SYSTEM_EXTENSIONS
-
-# Test if we have a new enough compiler.
-AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
-#define GCC_VERSION \
-	(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-
-#define CLANG_VERSION \
-	(__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
-
-#if GCC_VERSION < 40700 && CLANG_VERSION < 10000
-#error Sorry, your compiler is too old - please upgrade it
-#endif
-	), valid_compiler=yes, valid_compiler=no)
-if test "x$valid_compiler" = "xno"; then
-	AC_MSG_ERROR(Sorry, your compiler is too old - please upgrade it)
-fi
-
-# libtool
-LT_INIT
-AC_SUBST(LIBTOOL_DEPS)
-
-# Detect the distribution. This is used for the default configuration and
-# for some distro-specific build options.
-AC_MSG_CHECKING(host distribution)
-AC_ARG_WITH(distro, AS_HELP_STRING(--with-distro=DISTRO, Specify the Linux distribution to target: One of redhat, redhatenterpriseserver, oracle, centos, fedora, suse, gentoo, debian, arch, slackware, plamo, paldo, openmandriva, pardus, sparclinux, altlinux.))
-if type lsb_release >/dev/null 2>&1 && test "z$with_distro" = "z"; then
-	with_distro=`lsb_release -is`
-fi
-if test "z$with_distro" = "z"; then
-	AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
-	AC_CHECK_FILE(/etc/oracle-release,with_distro="oracle")
-	AC_CHECK_FILE(/etc/sparclinux-release,with_distro="sparclinux")
-	AC_CHECK_FILE(/etc/centos-release,with_distro="centos")
-	AC_CHECK_FILE(/etc/fedora-release,with_distro="fedora")
-	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
-	AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
-	AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
-	AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
-	AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
-	AC_CHECK_FILE(/etc/plamo-version,with_distro="plamo")
-	AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
-	AC_CHECK_FILE(/etc/mandrakelinux-release, with_distro="openmandriva")
-	AC_CHECK_FILE(/etc/mandriva-release,with_distro="openmandriva")
-	AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
-	AC_CHECK_FILE(/etc/altlinux-release,with_distro="altlinux")
-	AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
-fi
-with_distro=`echo ${with_distro} | tr ':upper:' ':lower:'`
-
-if test "z$with_distro" = "zforsparc"; then
-	with_distro="sparclinux"
-fi
-
-if test "z$with_distro" = "z"; then
-	with_distro="unknown"
-fi
-case $with_distro in
-	ubuntu|raspbian)
-		distroconf=default.conf.lxcbr
-		distrosysconf="$sysconfdir/default"
-		;;
-	redhat|redhatenterpriseserver|centos|fedora|oracle|oracleserver|sparclinux|altlinux|suse|opensuse*|plamo|pld)
-		distroconf=default.conf.lxcbr
-		distrosysconf="$sysconfdir/sysconfig"
-		;;
-	*)
-		distroconf=default.conf.unknown
-		distrosysconf="$sysconfdir/default"
-		;;
-esac
-AC_MSG_RESULT($with_distro)
-AM_CONDITIONAL(HAVE_DEBIAN, test x"$with_distro" = "xdebian" -o x"$with_distro" = "xubuntu" -o x"$with_distro" = "xraspbian")
-AM_CONDITIONAL(DISTRO_UBUNTU, test "x$with_distro" = "xubuntu")
-
-AC_CONFIG_LINKS(config/etc/default.conf:config/etc/${distroconf})
-
-# Check for init system type
-AC_MSG_CHECKING(for init system type)
-AC_ARG_WITH(init-script,
-	    AS_HELP_STRING(--with-init-script@<:@=TYPE@<:@,TYPE,...@:>@@:>@,
-			    Type(s) of init script to install: sysvinit, systemd, upstart,
-			     distro @<:@default=distro@:>@),,with_init_script=distro)
-case "$with_init_script" in
-	distro)
-		case $with_distro in
-			fedora|altlinux|opensuse*)
-				init_script=systemd
-				;;
-			redhat|redhatenterpriseserver|oracle|oracleserver|sparclinux|plamo)
-				init_script=sysvinit
-				;;
-			centos)
-				init_script=sysvinit,systemd
-				;;
-			debian|raspbian|ubuntu)
-				init_script=upstart,systemd
-				;;
-			pld)
-				init_script=sysvinit,upstart,systemd
-				;;
-			*)
-				echo -n "Linux distribution init system unknown."
-				init_script=
-				;;
-		esac
-		;;
-	*)
-		init_script=$with_init_script
-		;;
-esac
-
-# Check valid init systems were given, run in subshell so we don't mess up IFS
-(IFS="," ; for init_sys in $init_script;
-do
-	case "$init_sys" in
-		none|sysvinit|systemd|upstart)
-			;;
-		*)
-			exit 1
-			;;
-	esac
-done) || AC_MSG_ERROR(Unknown init system type in $init_script)
-
-AM_CONDITIONAL(INIT_SCRIPT_SYSV, echo "$init_script" |grep -q "sysvinit")
-AM_CONDITIONAL(INIT_SCRIPT_SYSTEMD, echo "$init_script" |grep -q "systemd")
-AM_CONDITIONAL(INIT_SCRIPT_UPSTART, echo "$init_script" |grep -q "upstart")
-AC_MSG_RESULT($init_script)
-
-# systemd unit dir
-AC_ARG_WITH(systemdsystemunitdir,
-	AS_HELP_STRING(--with-systemdsystemunitdir=DIR, Directory for systemd service files),
-	with_systemdsystemunitdir=$withval,
-	with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd))
-if test -z "$with_systemdsystemunitdir"; then
-  with_systemdsystemunitdir=/lib/systemd/system
-fi
-if test "x$with_systemdsystemunitdir" != "xno"; then
-  AC_SUBST(SYSTEMD_UNIT_DIR, $with_systemdsystemunitdir)
-fi
-
-AC_ARG_ENABLE(werror,
-	AS_HELP_STRING(--disable-werror, do not treat warnings as errors),
-	enable_werror=$enableval, enable_werror=yes)
-
-# Allow disabling rpath
-AC_ARG_ENABLE(rpath,
-	AS_HELP_STRING(--enable-rpath, set rpath in executables default=no),
-	enable_rpath=$enableval, enable_rpath=no)
-AM_CONDITIONAL(ENABLE_RPATH, test "x$enable_rpath" = "xyes")
-
-# Documentation (manpages)
-AC_ARG_ENABLE(doc,
-	AS_HELP_STRING(--enable-doc, make man pages default=auto),
-	enable_doc=$enableval, enable_doc=auto)
-
-if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
-	db2xman=""
-	dbparsers="docbook2X2man docbook2x-man db2x_docbook2man docbook2man docbook-to-man"
-
-	AC_MSG_CHECKING(for docbook2x-man)
-	for name in ${dbparsers}; do
-		if "$name" --help >/dev/null 2>&1; then
-			db2xman="$name"
-			break;
-		fi
-	done
-
-	if test -n "${db2xman}"; then
-		AC_MSG_RESULT(${db2xman})
-		enable_doc="yes"
-	else
-		AC_MSG_RESULT(no)
-		if test "x$enable_doc" = "xyes"; then
-			AC_MSG_ERROR(docbook2x-man is required, but could not be found)
-		fi
-		enable_doc="no"
-	fi
-
-	AC_SUBST(db2xman)
-fi
-AM_CONDITIONAL(ENABLE_DOCBOOK, test "x$db2xman" != "x")
-AM_CONDITIONAL(USE_DOCBOOK2X, test "x$db2xman" != "xdocbook2man")
-
-if test "x$db2xman" = "xdocbook2man"; then
-	docdtd="\"-//Davenport//DTD DocBook V3.0//EN\""
-else
-	docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\""
-fi
-AC_SUBST(docdtd)
-
-# Documentation (API)
-AC_ARG_ENABLE(api-docs,
-	AS_HELP_STRING(--enable-api-docs, make API documentation default=auto),
-	enable_api_docs=$enableval, enable_api_docs=auto)
-
-if test "x$enable_api_docs" = "xyes" -o "x$enable_api_docs" = "xauto"; then
-	AC_CHECK_PROGS(HAVE_DOXYGEN,doxygen)
-	AC_SUBST(HAVE_DOXYGEN)
-
-	if test "x$HAVE_DOXYGEN" != "x"; then
-		enable_api_docs="yes"
-	else
-		if test "x$enable_api_docs" = "xyes"; then
-			AC_MSG_ERROR(doxygen is required, but could not be found)
-		fi
-		enable_api_docs="no"
-	fi
-fi
-
-AM_CONDITIONAL(ENABLE_API_DOCS, test "x$HAVE_DOXYGEN" != "x")
-
-AC_CONFIG_MACRO_DIRS(config)
-
-# Apparmor
-AC_ARG_ENABLE(apparmor,
-	AS_HELP_STRING(--enable-apparmor, enable apparmor support default=auto),
-	enable_apparmor=$enableval, enable_apparmor=auto)
-
-if test "$enable_apparmor" = "auto" ; then
-	AC_CHECK_LIB(apparmor,aa_change_profile,enable_apparmor=yes, enable_apparmor=no)
-fi
-AM_CONDITIONAL(ENABLE_APPARMOR, test "x$enable_apparmor" = "xyes")
-
-# OpenSSL
-# libssl-dev
-AC_ARG_ENABLE(openssl,
-	AS_HELP_STRING(--enable-openssl, enable OpenSSL support default=auto),
-	enable_openssl=$enableval, enable_openssl=auto)
-
-if test "$enable_openssl" = "auto" ; then
-	AC_CHECK_LIB(ssl, OPENSSL_init_ssl, enable_openssl=yes, enable_openssl=no)
-
-fi
-AM_CONDITIONAL(ENABLE_OPENSSL, test "x$enable_openssl" = "xyes")
-
-AM_COND_IF(ENABLE_OPENSSL,
-	AC_CHECK_HEADER(openssl/engine.h,,AC_MSG_ERROR(You must install the OpenSSL development package in order to compile lxc))
-	AC_SUBST(OPENSSL_LIBS, '-lssl -lcrypto'))
-
-# SELinux
-AC_ARG_ENABLE(selinux,
-	AS_HELP_STRING(--enable-selinux, enable SELinux support default=auto),
-	enable_selinux=$enableval, enable_selinux=auto)
-
-if test "x$enable_selinux" = xauto; then
-	AC_CHECK_LIB(selinux,setexeccon_raw,enable_selinux=yes,enable_selinux=no)
-fi
-AM_CONDITIONAL(ENABLE_SELINUX, test "x$enable_selinux" = "xyes")
-AM_COND_IF(ENABLE_SELINUX,
-	AC_CHECK_HEADER(selinux/selinux.h,,AC_MSG_ERROR(You must install the SELinux development package in order to compile lxc))
-	AC_CHECK_LIB(selinux, setexeccon_raw,true,AC_MSG_ERROR(You must install the SELinux development package in order to compile lxc))
-	AC_SUBST(SELINUX_LIBS, -lselinux))
-
-# Seccomp syscall filter
-AC_ARG_ENABLE(seccomp,
-	AS_HELP_STRING(--enable-seccomp, enable seccomp support default=auto),
-	enable_seccomp=$enableval, enable_seccomp=auto)
-
-if test "x$enable_seccomp" = "xauto" ; then
-	AC_CHECK_LIB(seccomp,seccomp_init,enable_seccomp=yes,enable_seccomp=no)
-fi
-AM_CONDITIONAL(ENABLE_SECCOMP, test "x$enable_seccomp" = "xyes")
-
-AM_COND_IF(ENABLE_SECCOMP,
-	PKG_CHECK_MODULES(SECCOMP,libseccomp,,
-		AC_CHECK_HEADER(seccomp.h,,AC_MSG_ERROR(You must install the seccomp development package in order to compile lxc))
-		AC_CHECK_LIB(seccomp, seccomp_init,,AC_MSG_ERROR(You must install the seccomp development package in order to compile lxc))
-		AC_SUBST(SECCOMP_LIBS, -lseccomp)
-		)
-	)
-
-AC_MSG_CHECKING(for static libcap)
-# Check for static libcap, make sure the function checked for differs from the
-# the one checked below so the cache doesn't give a wrong answer
-OLD_CFLAGS="$CFLAGS"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-CFLAGS=""
-CPPFLAGS=""
-LDFLAGS="-static"
-LIBS="-lcap"
-AC_LINK_IFELSE(
-  AC_LANG_SOURCE(
-    int main() { return 0; }
-  ),have_static_libcap=yes,have_static_libcap=no)
-AM_CONDITIONAL(HAVE_STATIC_LIBCAP, test "x$have_static_libcap" = "xyes")
-if test "x$have_static_libcap" = "xyes"; then
-	AC_DEFINE(HAVE_STATIC_LIBCAP, 1, Have static libcap)
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-CFLAGS="$OLD_CFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-
-
-# Linux capabilities
-AC_ARG_ENABLE(capabilities,
-	AS_HELP_STRING(--enable-capabilities, enable kernel capabilities support default=auto),
-	enable_capabilities=$enableval, enable_capabilities=auto)
-
-if test "x$enable_capabilities" = "xauto"; then
-	AC_CHECK_LIB(cap,cap_set_proc,enable_capabilities=yes,enable_capabilities=no)
-fi
-AM_CONDITIONAL(ENABLE_CAP, test "x$enable_capabilities" = "xyes")
-
-AM_COND_IF(ENABLE_CAP,
-	AC_CHECK_HEADER(sys/capability.h,,AC_MSG_ERROR(You must install the libcap development package in order to compile lxc))
-	AC_CHECK_LIB(cap,cap_set_proc,,AC_MSG_ERROR(You must install the libcap development package in order to compile lxc))
-        # Test whether we support getting file capabilities via cap_get_file().
-        AC_CHECK_LIB(cap,cap_get_file, AC_DEFINE(LIBCAP_SUPPORTS_FILE_CAPABILITIES,1,Have cap_get_file),,)
-        AC_SUBST(CAP_LIBS, -lcap))
-
-# HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0
-OLD_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $SECCOMP_CFLAGS"
-AC_CHECK_TYPES(scmp_filter_ctx, , , #include <seccomp.h>)
-AC_CHECK_DECLS(seccomp_notify_fd, , , #include <seccomp.h>)
-AC_CHECK_TYPES(struct seccomp_notif_sizes, , , #include <seccomp.h>)
-AC_CHECK_DECLS(seccomp_syscall_resolve_name_arch, , , #include <seccomp.h>)
-CFLAGS="$OLD_CFLAGS"
-
-AC_CHECK_HEADERS(linux/bpf.h, 
-	AC_CHECK_TYPES(struct bpf_cgroup_dev_ctx, , , #include <linux/bpf.h>)
-, , )
-
-# Configuration examples
-AC_ARG_ENABLE(examples,
-	AS_HELP_STRING(--enable-examples, install examples default=yes),
-	enable_examples=$enableval, enable_examples=yes)
-AM_CONDITIONAL(ENABLE_EXAMPLES, test "x$enable_examples" = "xyes")
-
-# Enable dumping stack traces
-AC_ARG_ENABLE(mutex-debugging,
-	AS_HELP_STRING(--enable-mutex-debugging, Makes mutexes to report error and provide stack trace default=no),
-	enable_mutex_debugging=$enableval, enable_mutex_debugging=no)
-AM_CONDITIONAL(MUTEX_DEBUGGING, test "x$enable_mutex_debugging" = "xyes")
-
-AM_COND_IF(MUTEX_DEBUGGING,
-	AC_DEFINE_UNQUOTED(MUTEX_DEBUGGING, 1, Enabling mutex debugging))
-
-# Not in older autoconf versions
-# AS_VAR_COPY(DEST, SOURCE)
-# -------------------------
-# Set the polymorphic shell variable DEST to the contents of the polymorphic
-# shell variable SOURCE.
-m4_ifdef(AS_VAR_COPY, ,
-AC_DEFUN(AS_VAR_COPY,
-    AS_LITERAL_IF($1$2, $1=$$2, eval $1=\$$2))
-)
-
-dnl PKG_CHECK_VAR was introduced with pkg-config 0.28
-m4_ifdef(PKG_CHECK_VAR, ,
-AC_DEFUN(PKG_CHECK_VAR,
-    AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
-     AC_ARG_VAR($1, value of $3 for $2, overriding pkg-config)dnl
-     _PKG_CONFIG($1, variable="$3", $2)
-     AS_VAR_COPY($1, pkg_cv_$1)
-     AS_VAR_IF($1, "", $5, $4)dnl
-    )# PKG_CHECK_VAR
-)
-
-# Optional bash integration
-AC_ARG_ENABLE(bash,
-	AS_HELP_STRING(--enable-bash, build bash integration default=yes),
-	enable_bash=$enableval, enable_bash=yes)
-AM_CONDITIONAL(ENABLE_BASH, test "x$enable_bash" = "xyes")
-
-AM_COND_IF(ENABLE_BASH,
-	AC_MSG_CHECKING(bash completion directory)
-	PKG_CHECK_VAR(bashcompdir, bash-completion, completionsdir, ,
-		bashcompdir="${sysconfdir}/bash_completion.d")
-	AC_MSG_RESULT($bashcompdir)
-	AC_SUBST(bashcompdir)
-	)
-
-# Build the command line tools
-AC_ARG_ENABLE(tools,
-	AS_HELP_STRING(--enable-tools, build the command line tools default=yes),
-	enable_tools=$enableval, enable_tools=yes)
-AM_CONDITIONAL(ENABLE_TOOLS, test "x$enable_tools" = "xyes")
-
-# Build the liblxc commands
-AC_ARG_ENABLE(commands,
-	AS_HELP_STRING(--enable-commands, build the liblxc commands default=yes),
-	enable_commands=$enableval, enable_commands=yes)
-AM_CONDITIONAL(ENABLE_COMMANDS, test "x$enable_commands" = "xyes")
-
-# Build with ASAN commands
-AC_ARG_ENABLE(asan,
-	AS_HELP_STRING(--enable-asan, build with address sanitizer enabled default=no),
-	enable_asan=$enableval, enable_asan=no)
-AM_CONDITIONAL(ENABLE_ASAN, test "x$enable_asan" = "xyes")
-
-# Build with UBSAN commands
-AC_ARG_ENABLE(ubsan,
-	AS_HELP_STRING(--enable-ubsan, build with ubsan sanitizer enabled default=no),
-	enable_asan=$enableval, enable_ubsan=no)
-AM_CONDITIONAL(ENABLE_UBSAN, test "x$enable_ubsan" = "xyes")
-
-# Optional test binaries
-AC_ARG_ENABLE(tests,
-	AS_HELP_STRING(--enable-tests, build test/example binaries default=no),
-	enable_tests=$enableval, enable_tests=no)
-AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xyes")
-
-# Allow overriding the default runtime dir (/run)
-AC_ARG_WITH(runtime-path,
-	AS_HELP_STRING(--with-runtime-path=dir, runtime directory (default: /run)),
-	with_runtime_path=$withval, with_runtime_path='/run')
-
-# LXC container path, where the containers are actually stored
-# This is overridden by an entry in the file called LXCCONF
-# (i.e. /etc/lxc/lxc.conf)
-AC_ARG_WITH(config-path,
-	AS_HELP_STRING(--with-config-path=dir, lxc configuration repository path),
-	with_config_path=$withval, with_config_path='${localstatedir}/lib/lxc')
-
-# The path of the global lxc configuration file.
-AC_ARG_WITH(global-conf,
-	AS_HELP_STRING(--with-global-conf=dir, global lxc configuration file),
-	with_global_conf=$withval, with_global_conf='${sysconfdir}/lxc/lxc.conf')
-
-# The path of the userns network configuration file
-AC_ARG_WITH(usernic-conf,
-	AS_HELP_STRING(--with-usernic-conf, user network interface configuration file),
-	with_usernic_conf=$withval, with_usernic_conf='${sysconfdir}/lxc/lxc-usernet')
-
-# The path of the runtime usernic database
-AC_ARG_WITH(usernic-db,
-	AS_HELP_STRING(--with-usernic-db, lxc user nic database),
-	with_usernic_db=$withval, with_usernic_db='${with_runtime_path}/lxc/nics')
-
-# Rootfs path, where the container mount structure is assembled
-AC_ARG_WITH(rootfs-path,
-	AS_HELP_STRING(--with-rootfs-path=dir, lxc rootfs mount point),
-	with_rootfs_path=$withval, with_rootfs_path='${libdir}/lxc/rootfs')
-
-# cgroup pattern specification
-AC_ARG_WITH(cgroup-pattern,
-	AS_HELP_STRING(--with-cgroup-pattern=pattern, pattern for container cgroups),
-	with_cgroup_pattern=$withval, with_cgroup_pattern='')
-
-# The path for the apparmor_parser's cache for generated apparmor profiles
-AC_ARG_WITH(apparmor-cache-dir,
-	AS_HELP_STRING(--with-apparmor-cache-dir=dir,path for apparmor_parser cache),
-	with_apparmor_cache_dir=$withval, with_apparmor_cache_dir='${localstatedir}/cache/lxc/apparmor')
-
-# Container log path.  By default, use $lxcpath.
-AC_MSG_CHECKING(Whether to place logfiles in container config path)
-AC_ARG_ENABLE(configpath-log,
-	AS_HELP_STRING(--enable-configpath-log, use logfiles in config path default=no),
-	enable_configpath_log=$enableval, enable_configpath_log=no)
-AC_MSG_RESULT($enable_configpath_log)
-AM_CONDITIONAL(USE_CONFIGPATH_LOGS, test "$enable_configpath_log" = "yes")
-
-if test "$enable_configpath_log" = "yes"; then
-	default_log_path="${with_config_path}"
-else
-	default_log_path="${localstatedir}/log/lxc"
-fi
-
-AC_ARG_WITH(log-path,
-	AS_HELP_STRING(--with-log-path=dir,per container log path),
-	with_log_path=$withval, with_log_path='${default_log_path}')
-
-# Expand some useful variables
-AS_AC_EXPAND(PREFIX, "$prefix")
-AS_AC_EXPAND(LIBDIR, "$libdir")
-AS_AC_EXPAND(BINDIR, "$bindir")
-AS_AC_EXPAND(SBINDIR, "$sbindir")
-AS_AC_EXPAND(LIBEXECDIR, "$libexecdir")
-AS_AC_EXPAND(INCLUDEDIR, "$includedir")
-AS_AC_EXPAND(SYSCONFDIR, "$sysconfdir")
-AS_AC_EXPAND(LXC_DEFAULT_CONFIG, "$sysconfdir/lxc/default.conf")
-AS_AC_EXPAND(DATADIR, "$datadir")
-AS_AC_EXPAND(LOCALSTATEDIR, "$localstatedir")
-AS_AC_EXPAND(DOCDIR, "$docdir")
-AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date --utc --date=@${SOURCE_DATE_EPOCH:-$(date +%s)} '+%Y-%m-%d')")
-AS_AC_EXPAND(LXCPATH, "$with_config_path")
-AS_AC_EXPAND(LXC_GLOBAL_CONF, "$with_global_conf")
-AS_AC_EXPAND(LXC_USERNIC_CONF, "$with_usernic_conf")
-AS_AC_EXPAND(LXC_USERNIC_DB, "$with_usernic_db")
-AS_AC_EXPAND(LXC_DISTRO_SYSCONF, "$distrosysconf")
-AS_AC_EXPAND(LXCROOTFSMOUNT, "$with_rootfs_path")
-AS_AC_EXPAND(LXCTEMPLATEDIR, "$datadir/lxc/templates")
-AS_AC_EXPAND(LXCTEMPLATECONFIG, "$datadir/lxc/config")
-AS_AC_EXPAND(LXCHOOKDIR, "$datadir/lxc/hooks")
-AS_AC_EXPAND(LXCBINHOOKDIR, "$libexecdir/lxc/hooks")
-AS_AC_EXPAND(LXCINITDIR, "$libexecdir")
-AS_AC_EXPAND(LOGPATH, "$with_log_path")
-AS_AC_EXPAND(RUNTIME_PATH, "$with_runtime_path")
-AS_AC_EXPAND(APPARMOR_CACHE_DIR, "$with_apparmor_cache_dir")
-AC_SUBST(DEFAULT_CGROUP_PATTERN, "$with_cgroup_pattern")
-
-# We need the install path so criu knows where to reference the hook scripts.
-AC_DEFINE_UNQUOTED(DATADIR, "$DATADIR", "Prefix for shared files.")
-
-# Check for some standard kernel headers
-AC_CHECK_HEADERS(linux/unistd.h linux/netlink.h linux/genetlink.h,
-				,
-				AC_MSG_ERROR(Please install the Linux kernel headers.),
-				#include <sys/socket.h>)
-
-# Check for alternate C libraries
-AC_MSG_CHECKING(for bionic libc)
-AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
-	#ifndef __ANDROID__
-error: Not bionic!
-#endif),
-	is_bionic=yes,
-	is_bionic=no)
-if test "x$is_bionic" = "xyes"; then
-	AC_DEFINE(IS_BIONIC, 1, bionic libc)
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(IS_BIONIC, test "x$is_bionic" = "xyes")
-
-# Configuration examples
-AC_ARG_ENABLE(pam,
-	AS_HELP_STRING(--enable-pam, enable pam module default=no),
-	enable_pam=$enableval, enable_pam=no)
-AM_CONDITIONAL(ENABLE_PAM, test "x$enable_pam" = "xyes")
-
-AM_COND_IF(ENABLE_PAM,
-	AC_ARG_WITH(
-		pamdir,
-		AS_HELP_STRING(--with-pamdir=PATH,Specify the directory where PAM modules are stored,
-							or "none" if PAM modules are not to be built),
-		pamdir=$withval,
-		
-			if test "${prefix}" = "/usr"; then
-				pamdir="/lib${libdir##*/lib}/security"
-			else
-				pamdir="\$(libdir)/security"
-			fi
-		
-	))
-
-AM_CONDITIONAL(HAVE_PAM, test x"$pamdir" != "xnone")
-AM_COND_IF(ENABLE_PAM,
-	if test "z$pamdir" != "znone"; then
-		AC_ARG_VAR(PAM_CFLAGS, C compiler flags for pam)
-		AC_ARG_VAR(PAM_LIBS, linker flags for pam)
-		AC_CHECK_LIB(
-			pam,
-			pam_authenticate,
-			PAM_LIBS="-lpam",
-			AC_MSG_ERROR(*** libpam not found.)
-			)
-
-		AC_SUBST(PAM_LIBS)
-		AC_SUBST(pamdir)
-	fi)
-
-# Some systems lack PR_CAPBSET_DROP definition => HAVE_DECL_PR_CAPBSET_DROP
-AC_CHECK_DECLS(PR_CAPBSET_DROP, , , #include <sys/prctl.h>)
-
-# Some systems lack PR_{G,S}ET_NO_NEW_PRIVS definition => HAVE_DECL_PR_{G,S}ET_NO_NEW_PRIVS
-AC_CHECK_DECLS(PR_SET_NO_NEW_PRIVS, , , #include <sys/prctl.h>)
-AC_CHECK_DECLS(PR_GET_NO_NEW_PRIVS, , , #include <sys/prctl.h>)
-
-# Check for some headers
-AC_CHECK_HEADERS(pty.h sys/memfd.h sys/personality.h sys/resource.h sys/signalfd.h sys/timerfd.h utmpx.h)
-
-AC_CHECK_HEADER(ifaddrs.h,
-	AM_CONDITIONAL(HAVE_IFADDRS_H, true)
-	AC_DEFINE(HAVE_IFADDRS_H, 1, Have ifaddrs.h),
-	AM_CONDITIONAL(HAVE_IFADDRS_H, false))
-
-# lookup major()/minor()/makedev()
-AC_HEADER_MAJOR
-
-# Check for some syscalls functions
-AC_CHECK_FUNCS(setns pivot_root sethostname unshare rand_r confstr faccessat gettid memfd_create move_mount open_tree execveat clone3)
-AC_CHECK_TYPES(struct clone_args, , , #include <linux/sched.h>)
-AC_CHECK_MEMBERS(struct clone_args.set_tid,,,#include <linux/sched.h>)
-AC_CHECK_MEMBERS(struct clone_args.cgroup,,,#include <linux/sched.h>)
-
-# Check for strerror_r() support. Defines:
-# - HAVE_STRERROR_R if available
-# - HAVE_DECL_STRERROR_R if defined
-# - STRERROR_R_CHAR_P if it returns char *
-AC_FUNC_STRERROR_R
-
-# Check if "%m" is supported by printf and Co
-AC_MSG_CHECKING(%m format)
-AC_RUN_IFELSE(AC_LANG_SOURCE(
-#include <stdio.h>
-int main(void)
-{
-  char msg256;
-  int rc;
-
-  rc = snprintf(msg, sizeof(msg), "%m\n");
-  if ((rc > 1) && (msg0 != '%'))
-  {
-    return 0;
-  }
-  else
-  {
-    return 1;
-  }
-}),fmt_m=yes,fmt_m=no,fmt_m=no)
-if test "x$fmt_m" = "xyes"; then
-	AC_DEFINE(HAVE_M_FORMAT, 1, Have %m format)
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
-
-# Check for some functions
-AC_CHECK_LIB(pthread, main)
-AC_CHECK_FUNCS(statvfs)
-AC_CHECK_LIB(util, openpty)
-AC_CHECK_FUNCS(openpty hasmntopt setmntent endmntent utmpxname)
-AC_CHECK_FUNCS(getgrgid_r,
-	AM_CONDITIONAL(HAVE_GETGRGID_R, true)
-	AC_DEFINE(HAVE_GETGRGID_R,1,Have getgrgid_r),
-	AM_CONDITIONAL(HAVE_GETGRGID_R, false))
-AC_CHECK_FUNCS(getline,
-	AM_CONDITIONAL(HAVE_GETLINE, true)
-	AC_DEFINE(HAVE_GETLINE,1,Have getline),
-	AM_CONDITIONAL(HAVE_GETLINE, false))
-AC_CHECK_FUNCS(getsubopt,
-	AM_CONDITIONAL(HAVE_GETSUBOPT, true)
-	AC_DEFINE(HAVE_GETSUBOPT,1,Have getsubopt),
-	AM_CONDITIONAL(HAVE_GETSUBOPT, false))
-AC_CHECK_FUNCS(fgetln,
-	AM_CONDITIONAL(HAVE_FGETLN, true)
-	AC_DEFINE(HAVE_FGETLN,1,Have fgetln),
-	AM_CONDITIONAL(HAVE_FGETLN, false))
-AC_CHECK_FUNCS(keyctl,
-	AM_CONDITIONAL(HAVE_KEYCTL, true)
-	AC_DEFINE(HAVE_KEYCTL,1,Have keyctl),
-	AM_CONDITIONAL(HAVE_KEYCTL, false))
-AC_CHECK_FUNCS(prlimit,
-	AM_CONDITIONAL(HAVE_PRLIMIT, true)
-	AC_DEFINE(HAVE_PRLIMIT,1,Have prlimit),
-	AM_CONDITIONAL(HAVE_PRLIMIT, false))
-AC_CHECK_FUNCS(prlimit64,
-	AM_CONDITIONAL(HAVE_PRLIMIT64, true)
-	AC_DEFINE(HAVE_PRLIMIT64,1,Have prlimit64),
-	AM_CONDITIONAL(HAVE_PRLIMIT64, false))
-AC_CHECK_FUNCS(pthread_setcancelstate,
-	AM_CONDITIONAL(HAVE_PTHREAD_SETCANCELSTATE, true)
-	AC_DEFINE(HAVE_PTHREAD_SETCANCELSTATE,1,Have pthread_setcancelstate),
-	AM_CONDITIONAL(HAVE_PTHREAD_SETCANCELSTATE, false))
-AC_CHECK_FUNCS(strlcpy,
-	AM_CONDITIONAL(HAVE_STRLCPY, true)
-	AC_DEFINE(HAVE_STRLCPY,1,Have strlcpy),
-	AM_CONDITIONAL(HAVE_STRLCPY, false))
-AC_CHECK_FUNCS(strlcat,
-	AM_CONDITIONAL(HAVE_STRLCAT, true)
-	AC_DEFINE(HAVE_STRLCAT,1,Have strlcat),
-	AM_CONDITIONAL(HAVE_STRLCAT, false))
-AC_CHECK_FUNCS(fmemopen,
-	AM_CONDITIONAL(HAVE_FMEMOPEN, true)
-	AC_DEFINE(HAVE_FMEMOPEN,1,Have fmemopen),
-	AM_CONDITIONAL(HAVE_FMEMOPEN, false))
-
-# HAVE_STRUCT_RTNL_LINK_STATS64={0,1}
-AC_CHECK_TYPES(struct rtnl_link_stats64, , , #include <linux/if_link.h>)
-
-# Check for some libraries
-AX_PTHREAD
-AC_SEARCH_LIBS(clock_gettime, rt)
-
-# Check for some standard binaries
-AC_PROG_GCC_TRADITIONAL
-AC_PROG_SED
-
-# See if we support thread-local storage.
-LXC_CHECK_TLS
-
-# Hardening flags
-AX_CHECK_COMPILE_FLAG(-fdiagnostics-color, CFLAGS="$CFLAGS -fdiagnostics-color",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wimplicit-fallthrough=5, CFLAGS="$CFLAGS -Wimplicit-fallthrough=5",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wcast-align, CFLAGS="$CFLAGS -Wcast-align",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wstrict-prototypes, CFLAGS="$CFLAGS -Wstrict-prototypes",,-Werror)
-AX_CHECK_COMPILE_FLAG(-fno-strict-aliasing, CFLAGS="$CFLAGS -fno-strict-aliasing",,-Werror)
-AX_CHECK_COMPILE_FLAG(-fstack-clash-protection, CFLAGS="$CFLAGS -fstack-clash-protection",,-Werror)
-AX_CHECK_LINK_FLAG(-fstack-protector-strong, CFLAGS="$CFLAGS -fstack-protector-strong",,-Werror)
-AX_CHECK_LINK_FLAG(--param=ssp-buffer-size=4, CFLAGS="$CFLAGS --param=ssp-buffer-size=4",,-Werror)
-AX_CHECK_COMPILE_FLAG(-g, CFLAGS="$CFLAGS -g",,-Werror)
-AX_CHECK_COMPILE_FLAG(--mcet -fcf-protection, CFLAGS="$CFLAGS --mcet -fcf-protection",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Werror=implicit-function-declaration, CFLAGS="$CFLAGS -Werror=implicit-function-declaration",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wlogical-op, CFLAGS="$CFLAGS -Wlogical-op",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wmissing-include-dirs, CFLAGS="$CFLAGS -Wmissing-include-dirs",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wold-style-definition, CFLAGS="$CFLAGS -Wold-style-definition",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Winit-self, CFLAGS="$CFLAGS -Winit-self",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wunused-but-set-variable, CFLAGS="$CFLAGS -Wunused-but-set-variable",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wfloat-equal, CFLAGS="$CFLAGS -Wfloat-equal",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wsuggest-attribute=noreturn, CFLAGS="$CFLAGS -Wsuggest-attribute=noreturn",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Werror=return-type, CFLAGS="$CFLAGS -Werror=return-type",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Werror=incompatible-pointer-types, CFLAGS="$CFLAGS -Werror=incompatible-pointer-types",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wformat=2, CFLAGS="$CFLAGS -Wformat=2",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wshadow, CFLAGS="$CFLAGS -Wshadow",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wendif-labels, CFLAGS="$CFLAGS -Wendif-labels",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Werror=overflow, CFLAGS="$CFLAGS -Werror=overflow",,-Werror)
-AX_CHECK_COMPILE_FLAG(-fdiagnostics-show-option, CFLAGS="$CFLAGS -fdiagnostics-show-option",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Werror=shift-count-overflow, CFLAGS="$CFLAGS -Werror=shift-count-overflow",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Werror=shift-overflow=2, CFLAGS="$CFLAGS -Werror=shift-overflow=2",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wdate-time, CFLAGS="$CFLAGS -Wdate-time",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wnested-externs, CFLAGS="$CFLAGS -Wnested-externs",,-Werror)
-AX_CHECK_COMPILE_FLAG(-fasynchronous-unwind-tables, CFLAGS="$CFLAGS -fasynchronous-unwind-tables",,-Werror)
-AX_CHECK_COMPILE_FLAG(-pipe, CFLAGS="$CFLAGS -pipe",,-Werror)
-AX_CHECK_COMPILE_FLAG(-fexceptions, CFLAGS="$CFLAGS -fexceptions",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Warray-bounds, CFLAGS="$CFLAGS -Warray-bounds",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wrestrict, CFLAGS="$CFLAGS -Wrestrict",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wreturn-local-addr, CFLAGS="$CFLAGS -Wreturn-local-addr",,-Werror)
-AX_CHECK_COMPILE_FLAG(-Wstringop-overflow, CFLAGS="$CFLAGS -Wstringop-overflow",,-Werror)
-
-AX_CHECK_LINK_FLAG(-z relro, LDFLAGS="$LDFLAGS -z relro",,)
-AX_CHECK_LINK_FLAG(-z now, LDFLAGS="$LDFLAGS -z now",,)
-
-CFLAGS="$CFLAGS -Wvla -std=gnu11 -fms-extensions"
-if test "x$enable_werror" = "xyes"; then
-	CFLAGS="$CFLAGS -Werror"
-fi
-
-AC_ARG_ENABLE(thread-safety,
-	AS_HELP_STRING(--enable-thread-safety, enforce thread-safety otherwise fail the build default=yes),
-	enable_thread_safety=$enableval, enable_thread_safety=yes)
-AM_CONDITIONAL(ENFORCE_THREAD_SAFETY, test "x$enable_thread_safety" = "xyes")
-if test "x$enable_thread_safety" = "xyes"; then
-	AC_DEFINE(ENFORCE_THREAD_SAFETY, 1, enforce thread-safety otherwise fail the build)
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
-
-AC_ARG_ENABLE(coverity-build,
-	AS_HELP_STRING(--enable-coverity-build, build for use with Coverity default=no),
-	enable_coverity_build=$enableval, enable_coverity_build=no)
-AM_CONDITIONAL(ENABLE_COVERITY_BUILD, test "x$enable_coverity_build" = "xyes")
-if test "x$enable_coverity_build" = "xyes"; then
-	AC_DEFINE(ENABLE_COVERITY_BUILD, 1, build for use with Coverity)
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
-
-AC_ARG_ENABLE(dlog,
-	AS_HELP_STRING(--enable-dlog, enable dlog support default=no),
-	enable_dlog=$enableval, enable_dlog=no)
-AM_CONDITIONAL(ENABLE_DLOG, test "x$enable_dlog" = "xyes")
-
-AM_COND_IF(ENABLE_DLOG,
-	PKG_CHECK_MODULES(DLOG,dlog,,
-		AC_CHECK_HEADER(dlog.h,,AC_MSG_ERROR(You must install the dlog development package in order to compile lxc))
-		AC_CHECK_LIB(dlog, dlog_print,,AC_MSG_ERROR(You must install the dlog development package in order to compile lxc))
-		AC_SUBST(DLOG_LIBS, -ldlog)
-		)
-	)
-
-AC_ARG_ENABLE(memfd-rexec,
-	AS_HELP_STRING(--enable-memfd-rexec, enforce liblxc as a memfd to protect against certain symlink attacks default=yes),
-	enable_memfd_rexec=$enableval, enable_memfd_rexec=yes)
-AM_CONDITIONAL(ENFORCE_MEMFD_REXEC, test "x$enable_memfd_rexec" = "xyes")
-if test "x$enable_memfd_rexec" = "xyes"; then
-	AC_DEFINE(ENFORCE_MEMFD_REXEC, 1, Rexec liblxc as memfd)
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
-
-# Files requiring some variable expansion
-AC_CONFIG_FILES(
-	Makefile
-	lxc.pc
-	lxc.spec
-
-	coccinelle/Makefile
-
-	config/Makefile
-	config/apparmor/Makefile
-	config/apparmor/abstractions/start-container
-	config/selinux/Makefile
-	config/bash/Makefile
-	config/bash/lxc
-	config/init/Makefile
-	config/init/common/Makefile
-	config/init/common/lxc-containers
-	config/init/common/lxc-net
-	config/init/systemd/Makefile
-	config/init/systemd/lxc.service
-	config/init/systemd/lxc@.service
-	config/init/systemd/lxc-net.service
-	config/init/sysvinit/Makefile
-	config/init/sysvinit/lxc-containers
-	config/init/sysvinit/lxc-net
-	config/init/upstart/lxc.conf
-	config/init/upstart/lxc-net.conf
-	config/init/upstart/Makefile
-	config/etc/Makefile
-	config/templates/Makefile
-	config/templates/common.conf
-	config/templates/common.conf.d/Makefile
-	config/templates/nesting.conf
-	config/templates/oci.common.conf
-	config/templates/userns.conf
-	config/yum/Makefile
-	config/sysconfig/Makefile
-	config/sysconfig/lxc
-
-	doc/Makefile
-	doc/api/Makefile
-	doc/lxc-attach.sgml
-	doc/lxc-autostart.sgml
-	doc/lxc-cgroup.sgml
-	doc/lxc-checkconfig.sgml
-	doc/lxc-checkpoint.sgml
-	doc/lxc-config.sgml
-	doc/lxc-console.sgml
-	doc/lxc-copy.sgml
-	doc/lxc-create.sgml
-	doc/lxc-destroy.sgml
-	doc/lxc-device.sgml
-	doc/lxc-execute.sgml
-	doc/lxc-freeze.sgml
-	doc/lxc-info.sgml
-	doc/lxc-ls.sgml
-	doc/lxc-monitor.sgml
-	doc/lxc-snapshot.sgml
-	doc/lxc-start.sgml
-	doc/lxc-stop.sgml
-	doc/lxc-top.sgml
-	doc/lxc-unfreeze.sgml
-	doc/lxc-unshare.sgml
-	doc/lxc-update-config.sgml
-	doc/lxc-user-nic.sgml
-	doc/lxc-usernsexec.sgml
-	doc/lxc-wait.sgml
-
-	doc/pam_cgfs.sgml
-
-	doc/lxc.conf.sgml
-	doc/lxc.container.conf.sgml
-	doc/lxc.system.conf.sgml
-	doc/lxc-usernet.sgml
-	doc/lxc.sgml
-	doc/common_options.sgml
-	doc/see_also.sgml
-
-	doc/rootfs/Makefile
-
-	doc/examples/Makefile
-	doc/examples/lxc-macvlan.conf
-	doc/examples/lxc-vlan.conf
-	doc/examples/lxc-no-netns.conf
-	doc/examples/lxc-empty-netns.conf
-	doc/examples/lxc-phys.conf
-	doc/examples/lxc-veth.conf
-	doc/examples/lxc-complex.conf
-
-	doc/ja/Makefile
-	doc/ja/lxc-attach.sgml
-	doc/ja/lxc-autostart.sgml
-	doc/ja/lxc-cgroup.sgml
-	doc/ja/lxc-checkconfig.sgml
-	doc/ja/lxc-checkpoint.sgml
-	doc/ja/lxc-config.sgml
-	doc/ja/lxc-console.sgml
-	doc/ja/lxc-copy.sgml
-	doc/ja/lxc-create.sgml
-	doc/ja/lxc-destroy.sgml
-	doc/ja/lxc-device.sgml
-	doc/ja/lxc-execute.sgml
-	doc/ja/lxc-freeze.sgml
-	doc/ja/lxc-info.sgml
-	doc/ja/lxc-ls.sgml
-	doc/ja/lxc-monitor.sgml
-	doc/ja/lxc-snapshot.sgml
-	doc/ja/lxc-start.sgml
-	doc/ja/lxc-stop.sgml
-	doc/ja/lxc-top.sgml
-	doc/ja/lxc-unfreeze.sgml
-	doc/ja/lxc-unshare.sgml
-	doc/ja/lxc-update-config.sgml
-	doc/ja/lxc-user-nic.sgml
-	doc/ja/lxc-usernsexec.sgml
-	doc/ja/lxc-wait.sgml
-
-	doc/ja/pam_cgfs.sgml
-
-	doc/ja/lxc.conf.sgml
-	doc/ja/lxc.container.conf.sgml
-	doc/ja/lxc.system.conf.sgml
-	doc/ja/lxc-usernet.sgml
-	doc/ja/lxc.sgml
-	doc/ja/common_options.sgml
-	doc/ja/see_also.sgml
-
-	doc/ko/Makefile
-	doc/ko/lxc-attach.sgml
-	doc/ko/lxc-autostart.sgml
-	doc/ko/lxc-cgroup.sgml
-	doc/ko/lxc-checkconfig.sgml
-	doc/ko/lxc-checkpoint.sgml
-	doc/ko/lxc-config.sgml
-	doc/ko/lxc-console.sgml
-	doc/ko/lxc-copy.sgml
-	doc/ko/lxc-create.sgml
-	doc/ko/lxc-destroy.sgml
-	doc/ko/lxc-device.sgml
-	doc/ko/lxc-execute.sgml
-	doc/ko/lxc-freeze.sgml
-	doc/ko/lxc-info.sgml
-	doc/ko/lxc-ls.sgml
-	doc/ko/lxc-monitor.sgml
-	doc/ko/lxc-snapshot.sgml
-	doc/ko/lxc-start.sgml
-	doc/ko/lxc-stop.sgml
-	doc/ko/lxc-top.sgml
-	doc/ko/lxc-unfreeze.sgml
-	doc/ko/lxc-unshare.sgml
-	doc/ko/lxc-user-nic.sgml
-	doc/ko/lxc-usernsexec.sgml
-	doc/ko/lxc-wait.sgml
-
-	doc/ko/lxc.conf.sgml
-	doc/ko/lxc.container.conf.sgml
-	doc/ko/lxc.system.conf.sgml
-	doc/ko/lxc-usernet.sgml
-	doc/ko/lxc.sgml
-	doc/ko/common_options.sgml
-	doc/ko/see_also.sgml
-
-	hooks/Makefile
-	hooks/dhclient
-
-	templates/Makefile
-	templates/lxc-busybox
-	templates/lxc-download
-	templates/lxc-local
-	templates/lxc-oci
-
-	src/Makefile
-	src/lxc/Makefile
-	src/lxc/lxc.functions
-	src/lxc/cmd/lxc-checkconfig
-	src/lxc/cmd/lxc-update-config
-	src/lxc/version.h
-
-	src/tests/Makefile
-	src/tests/lxc-test-usernic
-)
-AC_CONFIG_COMMANDS(default,,)
-AC_OUTPUT
-
-# Configuration overview
-cat << EOF
-
-----------------------------
-Binaries
- - Command Line Tools:
-   - lxc-attach:     $enable_tools
-   - lxc-autostart:  $enable_tools
-   - lxc-cgroup:     $enable_tools
-   - lxc-checkpoint: $enable_tools
-   - lxc-config:     $enable_tools
-   - lxc-console:    $enable_tools
-   - lxc-copy:       $enable_tools
-   - lxc-create:     $enable_tools
-   - lxc-destroy:    $enable_tools
-   - lxc-device:     $enable_tools
-   - lxc-execute:    $enable_tools
-   - lxc-freeze:     $enable_tools
-   - lxc-info:       $enable_tools
-   - lxc-ls:         $enable_tools
-   - lxc-monitor:    $enable_tools
-   - lxc-snapshot:   $enable_tools
-   - lxc-start:      $enable_tools
-   - lxc-stop:       $enable_tools
-   - lxc-top:        $enable_tools
-   - lxc-unfreeze:   $enable_tools
-   - lxc-unshare:    $enable_tools
-   - lxc-wait:       $enable_tools
-
- - liblxc Commands:
-   - lxc-checkconfig:   $enable_commands
-   - lxc-update-config: $enable_commands
-   - lxc-init:          $enable_commands
-   - lxc-monitord:      $enable_commands
-   - lxc-user-nic:      $enable_commands
-   - lxc-usernsexec:    $enable_commands
-
-Environment:
- - compiler: $CC
- - distribution: $with_distro
- - init script type(s): $init_script
- - rpath: $enable_rpath
- - OpenSSL: $enable_openssl
- - Bash integration: $enable_bash
-
-Security features:
- - Apparmor: $enable_apparmor
- - Linux capabilities: $enable_capabilities
- - seccomp: $enable_seccomp
- - SELinux: $enable_selinux
- - memfd rexec: $enable_memfd_rexec
-
-PAM:
- - PAM module: $enable_pam
- - cgroup PAM module: $pamdir
-
-Documentation:
- - examples: $enable_examples
- - API documentation: $enable_api_docs
- - user documentation: $enable_doc
-
-Debugging:
- - ASAN: $enable_asan
- - Coverity: $enable_coverity_build
- - mutex debugging: $enable_mutex_debugging
- - tests: $enable_tests
-
-Paths:
- - Logs in configpath: $enable_configpath_log
-
-Thread-safety:
- - enforce: $enable_thread_safety
-
-Dlog:
- - enable: $enable_dlog
-EOF

_service:tar_scm:lxc-4.0.3.tar.gz/doc/Makefile.am Deleted

@@ -1,79 +0,0 @@
-SUBDIRS = examples rootfs
-DIST_SUBDIRS = examples rootfs ja ko api
-
-if USE_DOCBOOK2X
-SUBDIRS += ja ko
-endif
-
-if ENABLE_API_DOCS
-SUBDIRS += api
-endif
-
-EXTRA_DIST = api-extensions.md \
-	     lxc.container.conf \
-	     lxc.system.conf \
-	     FAQ.txt
-
-if ENABLE_DOCBOOK
-man_MANS = lxc.conf.5 \
-	   lxc.container.conf.5 \
-	   lxc.system.conf.5 \
-	   lxc-usernet.5 \
-	   lxc.7
-if ENABLE_TOOLS
-man_MANS += lxc-attach.1 \
-	    lxc-autostart.1 \
-	    lxc-cgroup.1 \
-	    lxc-checkconfig.1 \
-	    lxc-checkpoint.1 \
-	    lxc-config.1 \
-	    lxc-console.1 \
-	    lxc-copy.1 \
-	    lxc-create.1 \
-	    lxc-destroy.1 \
-	    lxc-device.1 \
-	    lxc-execute.1 \
-	    lxc-freeze.1 \
-	    lxc-info.1 \
-	    lxc-ls.1 \
-	    lxc-monitor.1 \
-	    lxc-snapshot.1 \
-	    lxc-start.1 \
-	    lxc-stop.1 \
-	    lxc-top.1 \
-	    lxc-unfreeze.1 \
-	    lxc-unshare.1 \
-	    lxc-wait.1
-endif
-
-if ENABLE_PAM
-man_MANS += pam_cgfs.8
-endif
-
-if ENABLE_COMMANDS
-man_MANS += lxc-update-config.1 \
-	    lxc-user-nic.1 \
-	    lxc-usernsexec.1
-endif
-
-%.1 : %.sgml
-	$(db2xman) $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-%.5 : %.sgml
-	$(db2xman) $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-%.7 : %.sgml
-	$(db2xman) $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-%.8 : %.sgml
-	$(db2xman) $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-lxc-%.sgml : common_options.sgml see_also.sgml
-
-clean-local:
-	$(RM) manpage.* *.7 *.5 *.1 *.8 $(man_MANS)
-endif

_service:tar_scm:lxc-4.0.3.tar.gz/doc/Makefile.in Deleted

@@ -1,1061 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@USE_DOCBOOK2X_TRUE@am__append_1 = ja ko
-@ENABLE_API_DOCS_TRUE@am__append_2 = api
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@am__append_3 = lxc-attach.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-autostart.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-cgroup.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-checkconfig.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-checkpoint.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-config.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-console.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-copy.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-create.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-destroy.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-device.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-execute.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-freeze.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-info.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-ls.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-monitor.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-snapshot.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-start.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-stop.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-top.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-unfreeze.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-unshare.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-wait.1
-
-@ENABLE_DOCBOOK_TRUE@@ENABLE_PAM_TRUE@am__append_4 = pam_cgfs.8
-@ENABLE_COMMANDS_TRUE@@ENABLE_DOCBOOK_TRUE@am__append_5 = lxc-update-config.1 \
-@ENABLE_COMMANDS_TRUE@@ENABLE_DOCBOOK_TRUE@	    lxc-user-nic.1 \
-@ENABLE_COMMANDS_TRUE@@ENABLE_DOCBOOK_TRUE@	    lxc-usernsexec.1
-
-subdir = doc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc-attach.sgml lxc-autostart.sgml \
-	lxc-cgroup.sgml lxc-checkconfig.sgml lxc-checkpoint.sgml \
-	lxc-config.sgml lxc-console.sgml lxc-copy.sgml lxc-create.sgml \
-	lxc-destroy.sgml lxc-device.sgml lxc-execute.sgml \
-	lxc-freeze.sgml lxc-info.sgml lxc-ls.sgml lxc-monitor.sgml \
-	lxc-snapshot.sgml lxc-start.sgml lxc-stop.sgml lxc-top.sgml \
-	lxc-unfreeze.sgml lxc-unshare.sgml lxc-update-config.sgml \
-	lxc-user-nic.sgml lxc-usernsexec.sgml lxc-wait.sgml \
-	pam_cgfs.sgml lxc.conf.sgml lxc.container.conf.sgml \
-	lxc.system.conf.sgml lxc-usernet.sgml lxc.sgml \
-	common_options.sgml see_also.sgml
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
-	"$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)"
-man5dir = $(mandir)/man5
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-NROFF = nroff
-MANS = $(man_MANS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(srcdir)/common_options.sgml.in $(srcdir)/lxc-attach.sgml.in \
-	$(srcdir)/lxc-autostart.sgml.in $(srcdir)/lxc-cgroup.sgml.in \
-	$(srcdir)/lxc-checkconfig.sgml.in \
-	$(srcdir)/lxc-checkpoint.sgml.in $(srcdir)/lxc-config.sgml.in \
-	$(srcdir)/lxc-console.sgml.in $(srcdir)/lxc-copy.sgml.in \
-	$(srcdir)/lxc-create.sgml.in $(srcdir)/lxc-destroy.sgml.in \
-	$(srcdir)/lxc-device.sgml.in $(srcdir)/lxc-execute.sgml.in \
-	$(srcdir)/lxc-freeze.sgml.in $(srcdir)/lxc-info.sgml.in \
-	$(srcdir)/lxc-ls.sgml.in $(srcdir)/lxc-monitor.sgml.in \
-	$(srcdir)/lxc-snapshot.sgml.in $(srcdir)/lxc-start.sgml.in \
-	$(srcdir)/lxc-stop.sgml.in $(srcdir)/lxc-top.sgml.in \
-	$(srcdir)/lxc-unfreeze.sgml.in $(srcdir)/lxc-unshare.sgml.in \
-	$(srcdir)/lxc-update-config.sgml.in \
-	$(srcdir)/lxc-user-nic.sgml.in $(srcdir)/lxc-usernet.sgml.in \
-	$(srcdir)/lxc-usernsexec.sgml.in $(srcdir)/lxc-wait.sgml.in \
-	$(srcdir)/lxc.conf.sgml.in \
-	$(srcdir)/lxc.container.conf.sgml.in $(srcdir)/lxc.sgml.in \
-	$(srcdir)/lxc.system.conf.sgml.in $(srcdir)/pam_cgfs.sgml.in \
-	$(srcdir)/see_also.sgml.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = examples rootfs $(am__append_1) $(am__append_2)
-DIST_SUBDIRS = examples rootfs ja ko api
-EXTRA_DIST = api-extensions.md \
-	     lxc.container.conf \
-	     lxc.system.conf \
-	     FAQ.txt
-
-@ENABLE_DOCBOOK_TRUE@man_MANS = lxc.conf.5 lxc.container.conf.5 \
-@ENABLE_DOCBOOK_TRUE@	lxc.system.conf.5 lxc-usernet.5 lxc.7 \
-@ENABLE_DOCBOOK_TRUE@	$(am__append_3) $(am__append_4) \
-@ENABLE_DOCBOOK_TRUE@	$(am__append_5)
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc-attach.sgml: $(top_builddir)/config.status $(srcdir)/lxc-attach.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-autostart.sgml: $(top_builddir)/config.status $(srcdir)/lxc-autostart.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-cgroup.sgml: $(top_builddir)/config.status $(srcdir)/lxc-cgroup.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-checkconfig.sgml: $(top_builddir)/config.status $(srcdir)/lxc-checkconfig.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-checkpoint.sgml: $(top_builddir)/config.status $(srcdir)/lxc-checkpoint.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-config.sgml: $(top_builddir)/config.status $(srcdir)/lxc-config.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-console.sgml: $(top_builddir)/config.status $(srcdir)/lxc-console.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-copy.sgml: $(top_builddir)/config.status $(srcdir)/lxc-copy.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-create.sgml: $(top_builddir)/config.status $(srcdir)/lxc-create.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-destroy.sgml: $(top_builddir)/config.status $(srcdir)/lxc-destroy.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-device.sgml: $(top_builddir)/config.status $(srcdir)/lxc-device.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-execute.sgml: $(top_builddir)/config.status $(srcdir)/lxc-execute.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-freeze.sgml: $(top_builddir)/config.status $(srcdir)/lxc-freeze.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-info.sgml: $(top_builddir)/config.status $(srcdir)/lxc-info.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-ls.sgml: $(top_builddir)/config.status $(srcdir)/lxc-ls.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-monitor.sgml: $(top_builddir)/config.status $(srcdir)/lxc-monitor.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-snapshot.sgml: $(top_builddir)/config.status $(srcdir)/lxc-snapshot.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-start.sgml: $(top_builddir)/config.status $(srcdir)/lxc-start.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-stop.sgml: $(top_builddir)/config.status $(srcdir)/lxc-stop.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-top.sgml: $(top_builddir)/config.status $(srcdir)/lxc-top.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-unfreeze.sgml: $(top_builddir)/config.status $(srcdir)/lxc-unfreeze.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-unshare.sgml: $(top_builddir)/config.status $(srcdir)/lxc-unshare.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-update-config.sgml: $(top_builddir)/config.status $(srcdir)/lxc-update-config.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-user-nic.sgml: $(top_builddir)/config.status $(srcdir)/lxc-user-nic.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-usernsexec.sgml: $(top_builddir)/config.status $(srcdir)/lxc-usernsexec.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-wait.sgml: $(top_builddir)/config.status $(srcdir)/lxc-wait.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-pam_cgfs.sgml: $(top_builddir)/config.status $(srcdir)/pam_cgfs.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.conf.sgml: $(top_builddir)/config.status $(srcdir)/lxc.conf.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.container.conf.sgml: $(top_builddir)/config.status $(srcdir)/lxc.container.conf.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.system.conf.sgml: $(top_builddir)/config.status $(srcdir)/lxc.system.conf.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-usernet.sgml: $(top_builddir)/config.status $(srcdir)/lxc-usernet.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.sgml: $(top_builddir)/config.status $(srcdir)/lxc.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-common_options.sgml: $(top_builddir)/config.status $(srcdir)/common_options.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-see_also.sgml: $(top_builddir)/config.status $(srcdir)/see_also.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^10-9a-z*$$,1,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^10-9a-z*$$,1,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man5: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man5dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.5a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^50-9a-z*$$,5,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man5:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man5dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.5a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^50-9a-z*$$,5,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
-install-man7: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man7dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.7a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^70-9a-z*$$,7,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man7:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man7dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.7a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^70-9a-z*$$,7,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
-install-man8: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man8dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.8a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^80-9a-z*$$,8,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man8:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man8dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^80-9a-z*$$,8,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(MANS)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_DOCBOOK_FALSE@clean-local:
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-man
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man: install-man1 install-man5 install-man7 install-man8
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-man
-
-uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \
-	uninstall-man8
-
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool clean-local \
-	cscopelist-am ctags ctags-am distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-man5 \
-	install-man7 install-man8 install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-man uninstall-man1 uninstall-man5 \
-	uninstall-man7 uninstall-man8
-
-.PRECIOUS: Makefile
-
-
-@ENABLE_DOCBOOK_TRUE@%.1 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@%.5 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@%.7 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@%.8 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@lxc-%.sgml : common_options.sgml see_also.sgml
-
-@ENABLE_DOCBOOK_TRUE@clean-local:
-@ENABLE_DOCBOOK_TRUE@	$(RM) manpage.* *.7 *.5 *.1 *.8 $(man_MANS)
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/doc/api/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/doc/api/Makefile.in Deleted

@@ -1,517 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = doc/api
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = Doxyfile
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/api/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/api/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-@ENABLE_API_DOCS_FALSE@html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am
-
-.PRECIOUS: Makefile
-
-
-@ENABLE_API_DOCS_TRUE@html: Doxyfile
-@ENABLE_API_DOCS_TRUE@	doxygen $<
-
-.PHONY: html
-
-all-local: html
-
-clean-local:
-	$(RM) -rf html
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/doc/examples/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/doc/examples/Makefile.in Deleted

@@ -1,610 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = doc/examples
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc-macvlan.conf lxc-vlan.conf lxc-no-netns.conf \
-	lxc-empty-netns.conf lxc-phys.conf lxc-veth.conf \
-	lxc-complex.conf
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(pkgexamplesdir)"
-DATA = $(noinst_DATA) $(pkgexamples_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc-complex.conf.in \
-	$(srcdir)/lxc-empty-netns.conf.in \
-	$(srcdir)/lxc-macvlan.conf.in $(srcdir)/lxc-no-netns.conf.in \
-	$(srcdir)/lxc-phys.conf.in $(srcdir)/lxc-veth.conf.in \
-	$(srcdir)/lxc-vlan.conf.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@ENABLE_EXAMPLES_TRUE@pkgexamplesdir = $(docdir)/examples
-@ENABLE_EXAMPLES_TRUE@pkgexamples_DATA = \
-@ENABLE_EXAMPLES_TRUE@	lxc-macvlan.conf \
-@ENABLE_EXAMPLES_TRUE@	lxc-vlan.conf \
-@ENABLE_EXAMPLES_TRUE@	lxc-no-netns.conf \
-@ENABLE_EXAMPLES_TRUE@	lxc-empty-netns.conf \
-@ENABLE_EXAMPLES_TRUE@	lxc-phys.conf \
-@ENABLE_EXAMPLES_TRUE@	lxc-veth.conf \
-@ENABLE_EXAMPLES_TRUE@	lxc-complex.conf \
-@ENABLE_EXAMPLES_TRUE@	seccomp-v1.conf \
-@ENABLE_EXAMPLES_TRUE@	seccomp-v2-blacklist.conf \
-@ENABLE_EXAMPLES_TRUE@	seccomp-v2.conf
-
-noinst_DATA = \
-	lxc-macvlan.conf.in \
-	lxc-vlan.conf.in \
-	lxc-empty-netns.conf.in \
-	lxc-no-netns.conf.in \
-	lxc-phys.conf.in \
-	lxc-veth.conf.in \
-	lxc-complex.conf.in \
-	seccomp-v1.conf \
-	seccomp-v2-blacklist.conf \
-	seccomp-v2.conf
-
-EXTRA_DIST = \
-	seccomp-v1.conf \
-	seccomp-v2-blacklist.conf \
-	seccomp-v2.conf
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/examples/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/examples/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc-macvlan.conf: $(top_builddir)/config.status $(srcdir)/lxc-macvlan.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-vlan.conf: $(top_builddir)/config.status $(srcdir)/lxc-vlan.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-no-netns.conf: $(top_builddir)/config.status $(srcdir)/lxc-no-netns.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-empty-netns.conf: $(top_builddir)/config.status $(srcdir)/lxc-empty-netns.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-phys.conf: $(top_builddir)/config.status $(srcdir)/lxc-phys.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-veth.conf: $(top_builddir)/config.status $(srcdir)/lxc-veth.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-complex.conf: $(top_builddir)/config.status $(srcdir)/lxc-complex.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-pkgexamplesDATA: $(pkgexamples_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(pkgexamples_DATA)'; test -n "$(pkgexamplesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgexamplesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgexamplesdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgexamplesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgexamplesdir)" || exit $$?; \
-	done
-
-uninstall-pkgexamplesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgexamples_DATA)'; test -n "$(pkgexamplesdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgexamplesdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgexamplesdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pkgexamplesDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkgexamplesDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkgexamplesDATA install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags-am uninstall uninstall-am \
-	uninstall-pkgexamplesDATA
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/doc/examples/seccomp-v2-blacklist.conf Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ja/Makefile.am Deleted

@@ -1,72 +0,0 @@
-mandir = @mandir@/ja
-
-SUBDIRS =
-DIST_SUBDIRS =
-
-EXTRA_DIST = \
-	FAQ.txt
-
-if ENABLE_DOCBOOK
-man_MANS = lxc.conf.5 \
-	   lxc.container.conf.5 \
-	   lxc.system.conf.5 \
-	   lxc-usernet.5 \
-	   lxc.7
-
-if ENABLE_TOOLS
-man_MANS += lxc-attach.1 \
-	    lxc-autostart.1 \
-	    lxc-cgroup.1 \
-	    lxc-checkconfig.1 \
-	    lxc-checkpoint.1 \
-	    lxc-config.1 \
-	    lxc-console.1 \
-	    lxc-copy.1 \
-	    lxc-create.1 \
-	    lxc-destroy.1 \
-	    lxc-device.1 \
-	    lxc-execute.1 \
-	    lxc-freeze.1 \
-	    lxc-info.1 \
-	    lxc-ls.1 \
-	    lxc-monitor.1 \
-	    lxc-snapshot.1 \
-	    lxc-start.1 \
-	    lxc-stop.1 \
-	    lxc-top.1 \
-	    lxc-unfreeze.1 \
-	    lxc-unshare.1 \
-	    lxc-wait.1
-endif
-
-if ENABLE_PAM
-man_MANS += pam_cgfs.8
-endif
-
-if ENABLE_COMMANDS
-man_MANS += lxc-update-config.1 \
-	    lxc-user-nic.1 \
-	    lxc-usernsexec.1
-endif
-
-%.1 : %.sgml
-	$(db2xman) --encoding=UTF-8 $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-%.5 : %.sgml
-	$(db2xman) --encoding=UTF-8 $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-%.7 : %.sgml
-	$(db2xman) --encoding=UTF-8 $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-%.8 : %.sgml
-	$(db2xman) --encoding=UTF-8 $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-lxc-%.sgml : common_options.sgml see_also.sgml
-
-clean-local:
-	$(RM) manpage.* *.7 *.5 *.1 *.8 $(man_MANS)
-endif

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ja/Makefile.in Deleted

@@ -1,1057 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@am__append_1 = lxc-attach.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-autostart.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-cgroup.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-checkconfig.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-checkpoint.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-config.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-console.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-copy.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-create.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-destroy.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-device.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-execute.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-freeze.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-info.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-ls.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-monitor.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-snapshot.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-start.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-stop.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-top.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-unfreeze.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-unshare.1 \
-@ENABLE_DOCBOOK_TRUE@@ENABLE_TOOLS_TRUE@	    lxc-wait.1
-
-@ENABLE_DOCBOOK_TRUE@@ENABLE_PAM_TRUE@am__append_2 = pam_cgfs.8
-@ENABLE_COMMANDS_TRUE@@ENABLE_DOCBOOK_TRUE@am__append_3 = lxc-update-config.1 \
-@ENABLE_COMMANDS_TRUE@@ENABLE_DOCBOOK_TRUE@	    lxc-user-nic.1 \
-@ENABLE_COMMANDS_TRUE@@ENABLE_DOCBOOK_TRUE@	    lxc-usernsexec.1
-
-subdir = doc/ja
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc-attach.sgml lxc-autostart.sgml \
-	lxc-cgroup.sgml lxc-checkconfig.sgml lxc-checkpoint.sgml \
-	lxc-config.sgml lxc-console.sgml lxc-copy.sgml lxc-create.sgml \
-	lxc-destroy.sgml lxc-device.sgml lxc-execute.sgml \
-	lxc-freeze.sgml lxc-info.sgml lxc-ls.sgml lxc-monitor.sgml \
-	lxc-snapshot.sgml lxc-start.sgml lxc-stop.sgml lxc-top.sgml \
-	lxc-unfreeze.sgml lxc-unshare.sgml lxc-update-config.sgml \
-	lxc-user-nic.sgml lxc-usernsexec.sgml lxc-wait.sgml \
-	pam_cgfs.sgml lxc.conf.sgml lxc.container.conf.sgml \
-	lxc.system.conf.sgml lxc-usernet.sgml lxc.sgml \
-	common_options.sgml see_also.sgml
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
-	"$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)"
-man5dir = $(mandir)/man5
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-NROFF = nroff
-MANS = $(man_MANS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(srcdir)/common_options.sgml.in $(srcdir)/lxc-attach.sgml.in \
-	$(srcdir)/lxc-autostart.sgml.in $(srcdir)/lxc-cgroup.sgml.in \
-	$(srcdir)/lxc-checkconfig.sgml.in \
-	$(srcdir)/lxc-checkpoint.sgml.in $(srcdir)/lxc-config.sgml.in \
-	$(srcdir)/lxc-console.sgml.in $(srcdir)/lxc-copy.sgml.in \
-	$(srcdir)/lxc-create.sgml.in $(srcdir)/lxc-destroy.sgml.in \
-	$(srcdir)/lxc-device.sgml.in $(srcdir)/lxc-execute.sgml.in \
-	$(srcdir)/lxc-freeze.sgml.in $(srcdir)/lxc-info.sgml.in \
-	$(srcdir)/lxc-ls.sgml.in $(srcdir)/lxc-monitor.sgml.in \
-	$(srcdir)/lxc-snapshot.sgml.in $(srcdir)/lxc-start.sgml.in \
-	$(srcdir)/lxc-stop.sgml.in $(srcdir)/lxc-top.sgml.in \
-	$(srcdir)/lxc-unfreeze.sgml.in $(srcdir)/lxc-unshare.sgml.in \
-	$(srcdir)/lxc-update-config.sgml.in \
-	$(srcdir)/lxc-user-nic.sgml.in $(srcdir)/lxc-usernet.sgml.in \
-	$(srcdir)/lxc-usernsexec.sgml.in $(srcdir)/lxc-wait.sgml.in \
-	$(srcdir)/lxc.conf.sgml.in \
-	$(srcdir)/lxc.container.conf.sgml.in $(srcdir)/lxc.sgml.in \
-	$(srcdir)/lxc.system.conf.sgml.in $(srcdir)/pam_cgfs.sgml.in \
-	$(srcdir)/see_also.sgml.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@/ja
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = 
-DIST_SUBDIRS = 
-EXTRA_DIST = \
-	FAQ.txt
-
-@ENABLE_DOCBOOK_TRUE@man_MANS = lxc.conf.5 lxc.container.conf.5 \
-@ENABLE_DOCBOOK_TRUE@	lxc.system.conf.5 lxc-usernet.5 lxc.7 \
-@ENABLE_DOCBOOK_TRUE@	$(am__append_1) $(am__append_2) \
-@ENABLE_DOCBOOK_TRUE@	$(am__append_3)
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ja/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/ja/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc-attach.sgml: $(top_builddir)/config.status $(srcdir)/lxc-attach.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-autostart.sgml: $(top_builddir)/config.status $(srcdir)/lxc-autostart.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-cgroup.sgml: $(top_builddir)/config.status $(srcdir)/lxc-cgroup.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-checkconfig.sgml: $(top_builddir)/config.status $(srcdir)/lxc-checkconfig.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-checkpoint.sgml: $(top_builddir)/config.status $(srcdir)/lxc-checkpoint.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-config.sgml: $(top_builddir)/config.status $(srcdir)/lxc-config.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-console.sgml: $(top_builddir)/config.status $(srcdir)/lxc-console.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-copy.sgml: $(top_builddir)/config.status $(srcdir)/lxc-copy.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-create.sgml: $(top_builddir)/config.status $(srcdir)/lxc-create.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-destroy.sgml: $(top_builddir)/config.status $(srcdir)/lxc-destroy.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-device.sgml: $(top_builddir)/config.status $(srcdir)/lxc-device.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-execute.sgml: $(top_builddir)/config.status $(srcdir)/lxc-execute.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-freeze.sgml: $(top_builddir)/config.status $(srcdir)/lxc-freeze.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-info.sgml: $(top_builddir)/config.status $(srcdir)/lxc-info.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-ls.sgml: $(top_builddir)/config.status $(srcdir)/lxc-ls.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-monitor.sgml: $(top_builddir)/config.status $(srcdir)/lxc-monitor.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-snapshot.sgml: $(top_builddir)/config.status $(srcdir)/lxc-snapshot.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-start.sgml: $(top_builddir)/config.status $(srcdir)/lxc-start.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-stop.sgml: $(top_builddir)/config.status $(srcdir)/lxc-stop.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-top.sgml: $(top_builddir)/config.status $(srcdir)/lxc-top.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-unfreeze.sgml: $(top_builddir)/config.status $(srcdir)/lxc-unfreeze.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-unshare.sgml: $(top_builddir)/config.status $(srcdir)/lxc-unshare.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-update-config.sgml: $(top_builddir)/config.status $(srcdir)/lxc-update-config.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-user-nic.sgml: $(top_builddir)/config.status $(srcdir)/lxc-user-nic.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-usernsexec.sgml: $(top_builddir)/config.status $(srcdir)/lxc-usernsexec.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-wait.sgml: $(top_builddir)/config.status $(srcdir)/lxc-wait.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-pam_cgfs.sgml: $(top_builddir)/config.status $(srcdir)/pam_cgfs.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.conf.sgml: $(top_builddir)/config.status $(srcdir)/lxc.conf.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.container.conf.sgml: $(top_builddir)/config.status $(srcdir)/lxc.container.conf.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.system.conf.sgml: $(top_builddir)/config.status $(srcdir)/lxc.system.conf.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-usernet.sgml: $(top_builddir)/config.status $(srcdir)/lxc-usernet.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.sgml: $(top_builddir)/config.status $(srcdir)/lxc.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-common_options.sgml: $(top_builddir)/config.status $(srcdir)/common_options.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-see_also.sgml: $(top_builddir)/config.status $(srcdir)/see_also.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^10-9a-z*$$,1,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^10-9a-z*$$,1,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man5: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man5dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.5a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^50-9a-z*$$,5,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man5:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man5dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.5a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^50-9a-z*$$,5,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
-install-man7: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man7dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.7a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^70-9a-z*$$,7,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man7:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man7dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.7a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^70-9a-z*$$,7,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
-install-man8: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man8dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.8a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^80-9a-z*$$,8,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man8:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man8dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^80-9a-z*$$,8,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(MANS)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_DOCBOOK_FALSE@clean-local:
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-man
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man: install-man1 install-man5 install-man7 install-man8
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-man
-
-uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \
-	uninstall-man8
-
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool clean-local \
-	cscopelist-am ctags ctags-am distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-man5 \
-	install-man7 install-man8 install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-man uninstall-man1 uninstall-man5 \
-	uninstall-man7 uninstall-man8
-
-.PRECIOUS: Makefile
-
-
-@ENABLE_DOCBOOK_TRUE@%.1 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) --encoding=UTF-8 $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@%.5 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) --encoding=UTF-8 $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@%.7 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) --encoding=UTF-8 $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@%.8 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) --encoding=UTF-8 $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@lxc-%.sgml : common_options.sgml see_also.sgml
-
-@ENABLE_DOCBOOK_TRUE@clean-local:
-@ENABLE_DOCBOOK_TRUE@	$(RM) manpage.* *.7 *.5 *.1 *.8 $(man_MANS)
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ko/Makefile.am Deleted

@@ -1,60 +0,0 @@
-mandir = @mandir@/ko
-
-SUBDIRS =
-DIST_SUBDIRS =
-
-EXTRA_DIST = \
-	FAQ.txt
-
-if ENABLE_DOCBOOK
-man_MANS = \
-	lxc-attach.1 \
-	lxc-autostart.1 \
-	lxc-cgroup.1 \
-	lxc-checkconfig.1 \
-	lxc-checkpoint.1 \
-	lxc-config.1 \
-	lxc-console.1 \
-	lxc-copy.1 \
-	lxc-create.1 \
-	lxc-destroy.1 \
-	lxc-device.1 \
-	lxc-execute.1 \
-	lxc-freeze.1 \
-	lxc-info.1 \
-	lxc-ls.1 \
-	lxc-monitor.1 \
-	lxc-snapshot.1 \
-	lxc-start.1 \
-	lxc-stop.1 \
-	lxc-top.1 \
-	lxc-unfreeze.1 \
-	lxc-unshare.1 \
-	lxc-user-nic.1 \
-	lxc-usernsexec.1 \
-	lxc-wait.1 \
-	\
-	lxc.conf.5 \
-	lxc.container.conf.5 \
-	lxc.system.conf.5 \
-	lxc-usernet.5 \
-	\
-	lxc.7
-
-%.1 : %.sgml
-	$(db2xman) --encoding=UTF-8 $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-%.5 : %.sgml
-	$(db2xman) --encoding=UTF-8 $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-%.7 : %.sgml
-	$(db2xman) --encoding=UTF-8 $<
-	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-lxc-%.sgml : common_options.sgml see_also.sgml
-
-clean-local:
-	$(RM) manpage.* *.7 *.5 *.1 $(man_MANS)
-endif

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ko/Makefile.in Deleted

@@ -1,1002 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = doc/ko
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc-attach.sgml lxc-autostart.sgml \
-	lxc-cgroup.sgml lxc-checkconfig.sgml lxc-checkpoint.sgml \
-	lxc-config.sgml lxc-console.sgml lxc-copy.sgml lxc-create.sgml \
-	lxc-destroy.sgml lxc-device.sgml lxc-execute.sgml \
-	lxc-freeze.sgml lxc-info.sgml lxc-ls.sgml lxc-monitor.sgml \
-	lxc-snapshot.sgml lxc-start.sgml lxc-stop.sgml lxc-top.sgml \
-	lxc-unfreeze.sgml lxc-unshare.sgml lxc-user-nic.sgml \
-	lxc-usernsexec.sgml lxc-wait.sgml lxc.conf.sgml \
-	lxc.container.conf.sgml lxc.system.conf.sgml lxc-usernet.sgml \
-	lxc.sgml common_options.sgml see_also.sgml
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
-	"$(DESTDIR)$(man7dir)"
-man5dir = $(mandir)/man5
-man7dir = $(mandir)/man7
-NROFF = nroff
-MANS = $(man_MANS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(srcdir)/common_options.sgml.in $(srcdir)/lxc-attach.sgml.in \
-	$(srcdir)/lxc-autostart.sgml.in $(srcdir)/lxc-cgroup.sgml.in \
-	$(srcdir)/lxc-checkconfig.sgml.in \
-	$(srcdir)/lxc-checkpoint.sgml.in $(srcdir)/lxc-config.sgml.in \
-	$(srcdir)/lxc-console.sgml.in $(srcdir)/lxc-copy.sgml.in \
-	$(srcdir)/lxc-create.sgml.in $(srcdir)/lxc-destroy.sgml.in \
-	$(srcdir)/lxc-device.sgml.in $(srcdir)/lxc-execute.sgml.in \
-	$(srcdir)/lxc-freeze.sgml.in $(srcdir)/lxc-info.sgml.in \
-	$(srcdir)/lxc-ls.sgml.in $(srcdir)/lxc-monitor.sgml.in \
-	$(srcdir)/lxc-snapshot.sgml.in $(srcdir)/lxc-start.sgml.in \
-	$(srcdir)/lxc-stop.sgml.in $(srcdir)/lxc-top.sgml.in \
-	$(srcdir)/lxc-unfreeze.sgml.in $(srcdir)/lxc-unshare.sgml.in \
-	$(srcdir)/lxc-user-nic.sgml.in $(srcdir)/lxc-usernet.sgml.in \
-	$(srcdir)/lxc-usernsexec.sgml.in $(srcdir)/lxc-wait.sgml.in \
-	$(srcdir)/lxc.conf.sgml.in \
-	$(srcdir)/lxc.container.conf.sgml.in $(srcdir)/lxc.sgml.in \
-	$(srcdir)/lxc.system.conf.sgml.in $(srcdir)/see_also.sgml.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@/ko
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = 
-DIST_SUBDIRS = 
-EXTRA_DIST = \
-	FAQ.txt
-
-@ENABLE_DOCBOOK_TRUE@man_MANS = \
-@ENABLE_DOCBOOK_TRUE@	lxc-attach.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-autostart.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-cgroup.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-checkconfig.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-checkpoint.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-config.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-console.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-copy.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-create.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-destroy.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-device.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-execute.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-freeze.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-info.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-ls.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-monitor.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-snapshot.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-start.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-stop.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-top.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-unfreeze.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-unshare.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-user-nic.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-usernsexec.1 \
-@ENABLE_DOCBOOK_TRUE@	lxc-wait.1 \
-@ENABLE_DOCBOOK_TRUE@	\
-@ENABLE_DOCBOOK_TRUE@	lxc.conf.5 \
-@ENABLE_DOCBOOK_TRUE@	lxc.container.conf.5 \
-@ENABLE_DOCBOOK_TRUE@	lxc.system.conf.5 \
-@ENABLE_DOCBOOK_TRUE@	lxc-usernet.5 \
-@ENABLE_DOCBOOK_TRUE@	\
-@ENABLE_DOCBOOK_TRUE@	lxc.7
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ko/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/ko/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc-attach.sgml: $(top_builddir)/config.status $(srcdir)/lxc-attach.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-autostart.sgml: $(top_builddir)/config.status $(srcdir)/lxc-autostart.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-cgroup.sgml: $(top_builddir)/config.status $(srcdir)/lxc-cgroup.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-checkconfig.sgml: $(top_builddir)/config.status $(srcdir)/lxc-checkconfig.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-checkpoint.sgml: $(top_builddir)/config.status $(srcdir)/lxc-checkpoint.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-config.sgml: $(top_builddir)/config.status $(srcdir)/lxc-config.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-console.sgml: $(top_builddir)/config.status $(srcdir)/lxc-console.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-copy.sgml: $(top_builddir)/config.status $(srcdir)/lxc-copy.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-create.sgml: $(top_builddir)/config.status $(srcdir)/lxc-create.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-destroy.sgml: $(top_builddir)/config.status $(srcdir)/lxc-destroy.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-device.sgml: $(top_builddir)/config.status $(srcdir)/lxc-device.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-execute.sgml: $(top_builddir)/config.status $(srcdir)/lxc-execute.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-freeze.sgml: $(top_builddir)/config.status $(srcdir)/lxc-freeze.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-info.sgml: $(top_builddir)/config.status $(srcdir)/lxc-info.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-ls.sgml: $(top_builddir)/config.status $(srcdir)/lxc-ls.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-monitor.sgml: $(top_builddir)/config.status $(srcdir)/lxc-monitor.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-snapshot.sgml: $(top_builddir)/config.status $(srcdir)/lxc-snapshot.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-start.sgml: $(top_builddir)/config.status $(srcdir)/lxc-start.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-stop.sgml: $(top_builddir)/config.status $(srcdir)/lxc-stop.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-top.sgml: $(top_builddir)/config.status $(srcdir)/lxc-top.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-unfreeze.sgml: $(top_builddir)/config.status $(srcdir)/lxc-unfreeze.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-unshare.sgml: $(top_builddir)/config.status $(srcdir)/lxc-unshare.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-user-nic.sgml: $(top_builddir)/config.status $(srcdir)/lxc-user-nic.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-usernsexec.sgml: $(top_builddir)/config.status $(srcdir)/lxc-usernsexec.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-wait.sgml: $(top_builddir)/config.status $(srcdir)/lxc-wait.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.conf.sgml: $(top_builddir)/config.status $(srcdir)/lxc.conf.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.container.conf.sgml: $(top_builddir)/config.status $(srcdir)/lxc.container.conf.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.system.conf.sgml: $(top_builddir)/config.status $(srcdir)/lxc.system.conf.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-usernet.sgml: $(top_builddir)/config.status $(srcdir)/lxc-usernet.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc.sgml: $(top_builddir)/config.status $(srcdir)/lxc.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-common_options.sgml: $(top_builddir)/config.status $(srcdir)/common_options.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-see_also.sgml: $(top_builddir)/config.status $(srcdir)/see_also.sgml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^10-9a-z*$$,1,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^10-9a-z*$$,1,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man5: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man5dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.5a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^50-9a-z*$$,5,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man5:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man5dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.5a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^50-9a-z*$$,5,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
-install-man7: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man7dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.7a-z*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^70-9a-z*$$,7,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man7:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man7dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.7a-z*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^70-9a-z*$$,7,;x' \
-	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(MANS)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_DOCBOOK_FALSE@clean-local:
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-man
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man: install-man1 install-man5 install-man7
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-man
-
-uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7
-
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool clean-local \
-	cscopelist-am ctags ctags-am distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-man5 \
-	install-man7 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-man uninstall-man1 uninstall-man5 \
-	uninstall-man7
-
-.PRECIOUS: Makefile
-
-
-@ENABLE_DOCBOOK_TRUE@%.1 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) --encoding=UTF-8 $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@%.5 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) --encoding=UTF-8 $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@%.7 : %.sgml
-@ENABLE_DOCBOOK_TRUE@	$(db2xman) --encoding=UTF-8 $<
-@ENABLE_DOCBOOK_TRUE@	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true
-
-@ENABLE_DOCBOOK_TRUE@lxc-%.sgml : common_options.sgml see_also.sgml
-
-@ENABLE_DOCBOOK_TRUE@clean-local:
-@ENABLE_DOCBOOK_TRUE@	$(RM) manpage.* *.7 *.5 *.1 $(man_MANS)
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/doc/rootfs/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/doc/rootfs/Makefile.in Deleted

@@ -1,562 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = doc/rootfs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(READMEdir)"
-DATA = $(README_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in README
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-READMEdir = @LXCROOTFSMOUNT@
-README_DATA = README
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/rootfs/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/rootfs/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-READMEDATA: $(README_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(README_DATA)'; test -n "$(READMEdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(READMEdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(READMEdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(READMEdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(READMEdir)" || exit $$?; \
-	done
-
-uninstall-READMEDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(README_DATA)'; test -n "$(READMEdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(READMEdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(READMEdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-READMEDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-READMEDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-READMEDATA install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-READMEDATA uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/hooks/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/hooks/Makefile.in Deleted

@@ -1,810 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-binhooks_PROGRAMS = unmount-namespace$(EXEEXT)
-@IS_BIONIC_TRUE@am__append_1 = \
-@IS_BIONIC_TRUE@	../src/include/lxcmntent.c ../src/include/lxcmntent.h
-
-subdir = hooks
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = dhclient
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(binhooksdir)" "$(DESTDIR)$(hooksdir)"
-PROGRAMS = $(binhooks_PROGRAMS)
-am__unmount_namespace_SOURCES_DIST = unmount-namespace.c \
-	../src/include/lxcmntent.c ../src/include/lxcmntent.h
-am__dirstamp = $(am__leading_dot)dirstamp
-@IS_BIONIC_TRUE@am__objects_1 = ../src/include/lxcmntent.$(OBJEXT)
-am_unmount_namespace_OBJECTS = unmount-namespace.$(OBJEXT) \
-	$(am__objects_1)
-unmount_namespace_OBJECTS = $(am_unmount_namespace_OBJECTS)
-unmount_namespace_LDADD = $(LDADD)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-SCRIPTS = $(hooks_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ../src/include/$(DEPDIR)/lxcmntent.Po \
-	./$(DEPDIR)/unmount-namespace.Po
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(unmount_namespace_SOURCES)
-DIST_SOURCES = $(am__unmount_namespace_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/dhclient.in \
-	$(top_srcdir)/config/depcomp
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-hooksdir = @LXCHOOKDIR@
-binhooksdir = @LXCBINHOOKDIR@
-hooks_SCRIPTS = \
-	clonehostname \
-	mountecryptfsroot \
-	ubuntu-cloud-prep \
-	dhclient-script \
-	dhclient \
-	squid-deb-proxy-client \
-	nvidia
-
-unmount_namespace_SOURCES = unmount-namespace.c $(am__append_1)
-EXTRA_DIST = $(hooks_SCRIPTS)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu hooks/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu hooks/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-dhclient: $(top_builddir)/config.status $(srcdir)/dhclient.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-binhooksPROGRAMS: $(binhooks_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(binhooks_PROGRAMS)'; test -n "$(binhooksdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(binhooksdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(binhooksdir)" || exit 1; \
-	fi; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	 || test -f $$p1 \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1 } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) filesd = filesd " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(binhooksdir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(binhooksdir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binhooksPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(binhooks_PROGRAMS)'; test -n "$(binhooksdir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(binhooksdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(binhooksdir)" && rm -f $$files
-
-clean-binhooksPROGRAMS:
-	@list='$(binhooks_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-../src/include/$(am__dirstamp):
-	@$(MKDIR_P) ../src/include
-	@: > ../src/include/$(am__dirstamp)
-../src/include/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../src/include/$(DEPDIR)
-	@: > ../src/include/$(DEPDIR)/$(am__dirstamp)
-../src/include/lxcmntent.$(OBJEXT): ../src/include/$(am__dirstamp) \
-	../src/include/$(DEPDIR)/$(am__dirstamp)
-
-unmount-namespace$(EXEEXT): $(unmount_namespace_OBJECTS) $(unmount_namespace_DEPENDENCIES) $(EXTRA_unmount_namespace_DEPENDENCIES) 
-	@rm -f unmount-namespace$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(unmount_namespace_OBJECTS) $(unmount_namespace_LDADD) $(LIBS)
-install-hooksSCRIPTS: $(hooks_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(hooks_SCRIPTS)'; test -n "$(hooksdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(hooksdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(hooksdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1; } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) { filesd = filesd " " $$1; \
-	      if (++nd == $(am__install_max)) { \
-		print "f", d, filesd; nd = 0; filesd = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(hooksdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(hooksdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-hooksSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(hooks_SCRIPTS)'; test -n "$(hooksdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(hooksdir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f ../src/include/*.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@../src/include/$(DEPDIR)/lxcmntent.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unmount-namespace.Po@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(binhooksdir)" "$(DESTDIR)$(hooksdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../src/include/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../src/include/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binhooksPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-		-rm -f ../src/include/$(DEPDIR)/lxcmntent.Po
-	-rm -f ./$(DEPDIR)/unmount-namespace.Po
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-binhooksPROGRAMS install-hooksSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-		-rm -f ../src/include/$(DEPDIR)/lxcmntent.Po
-	-rm -f ./$(DEPDIR)/unmount-namespace.Po
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binhooksPROGRAMS uninstall-hooksSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-binhooksPROGRAMS clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binhooksPROGRAMS install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-hooksSCRIPTS install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-binhooksPROGRAMS \
-	uninstall-hooksSCRIPTS
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/hooks/dhclient Deleted

@@ -1,105 +0,0 @@
-#! /bin/bash
-
-set -eu
-
-LXC_DHCP_SCRIPT="/usr/local/share/lxc/hooks/dhclient-script"
-LXC_DHCP_CONFIG="/usr/local/etc/lxc/dhclient.conf"
-
-rootfs_path="${LXC_ROOTFS_PATH#*:}"
-hookdir="${rootfs_path/%rootfs/hook}"
-
-conffile_arg=""
-if  -e "${LXC_DHCP_CONFIG}" ; then
-    conffile_arg="-cf ${LXC_DHCP_CONFIG}"
-fi
-
-debugfile="/dev/null"
-if  "${LXC_LOG_LEVEL}" = "DEBUG"  ||  "${LXC_LOG_LEVEL}" = "TRACE" ; then
-    debugfile="${hookdir}/dhclient.log"
-    echo "INFO: Writing dhclient log at ${debugfile}." >&2
-fi
-
-pidfile="${hookdir}/dhclient.pid"
-leasefile="${hookdir}/dhclient.leases"
-
-usage() {
-    echo "Usage: ${0##*/} <name> lxc {start-host|stop}"
-}
-
-# Wrap the dhclient command with "aa-exec -p unconfined" if AppArmor is enabled.
-dhclient() {
-    bin="/sbin/dhclient"
-    if  -d "/sys/kernel/security/apparmor"  && which aa-exec >/dev/null; then
-        bin="aa-exec -p unconfined ${bin}"
-    fi
-    echo $bin
-}
-
-dhclient_start() {
-    ns_args=("--uts" "--net")
-    if  -z "$(readlink /proc/${LXC_PID}/ns/user /proc/self/ns/user | uniq -d)" ; then
-        ns_args+=("--user")
-    fi
-
-    mkdir -p "${hookdir}"
-
-    if  -e "${pidfile}" ; then
-        echo "WARN: DHCP client is already running, skipping start hook." >> "${debugfile}"
-    else
-        echo "INFO: Starting DHCP client and acquiring a lease..." >> "${debugfile}"
-        nsenter ${ns_args@} --target "${LXC_PID}" -- \
-          $(dhclient) -1 ${conffile_arg} -pf "${pidfile}" -lf "${leasefile}" -e "ROOTFS=${rootfs_path}" -sf "${LXC_DHCP_SCRIPT}" -v >> "${debugfile}" 2>&1
-    fi
-}
-
-dhclient_stop() {
-    # We can't use LXC_PID here since the container process has exited,
-    # use the namespace file descriptors in the hook arguments instead.
-    ns_args=("")
-    if  "${LXC_HOOK_VERSION:-0}" -eq 0 ; then
-        for arg in "$@"; do
-            case "${arg}" in
-                uts:* | user:* | net:*) ns_args+=("--${arg/:/=}") ;;
-                *) ;;
-            esac
-        done
-    else
-        ns_args+=("--uts=${LXC_UTS_NS}")
-        ns_args+=("--net=${LXC_NET_NS}")
-         -n "${LXC_USER_NS:+x}"  && ns_args+=("--user=${LXC_USER_NS}")
-    fi
-
-    if  -e "${pidfile}" ; then
-        echo "INFO: Stopping DHCP client and releasing leases..." >> "${debugfile}"
-        nsenter ${ns_args@} -- \
-          $(dhclient) -r ${conffile_arg} -pf "${pidfile}" -lf "${leasefile}" -e "ROOTFS=${rootfs_path}" -sf "${LXC_DHCP_SCRIPT}" -v >> "${debugfile}" 2>&1
-    else
-        echo "WARN: DHCP client is not running, skipping stop hook." >> "${debugfile}"
-    fi
-
-    # dhclient could fail to release the lease and shutdown, try to cleanup after ourselves just in case.
-    nsenter ${ns_args@} -- \
-      /bin/sh -c 'pkill --ns $$ --nslist net -f "^/sbin/dhclient"' || true
-    rm -f "${pidfile}"
-}
-
-HOOK_SECTION=
-HOOK_TYPE=
-case "${LXC_HOOK_VERSION:-0}" in
-    0) HOOK_SECTION="${2:-}"; HOOK_TYPE="${3:-}"; shift 3;;
-    1) HOOK_SECTION="${LXC_HOOK_SECTION:-}"; HOOK_TYPE="${LXC_HOOK_TYPE:-}";;
-    *) echo "ERROR: Unsupported hook version: ${LXC_HOOK_VERSION}." >&2; exit 1;;
-esac
-
-if  "${HOOK_SECTION}" != "lxc" ; then
-    echo "ERROR: Not running through LXC." >&2
-    exit 1
-fi
-
-case "${HOOK_TYPE}" in
-    start-host) dhclient_start $@;;
-    stop) dhclient_stop $@;;
-    *) usage; exit 1;;
-esac
-
-exit 0

_service:tar_scm:lxc-4.0.3.tar.gz/lxc.pc.in Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/lxc.spec Deleted

@@ -1,314 +0,0 @@
-#
-# lxc: linux Container library
-#
-# (C) Copyright IBM Corp. 2007, 2008
-#
-# Authors:
-# Daniel Lezcano <daniel.lezcano at free.fr>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-# Set with_systemd on distros that use it, so we can install the service
-# file, otherwise the sysvinit script will be installed
-%if 0%{?fedora} >= 14 || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
-%global with_systemd 1
-%define init_script systemd
-#
-# BuildRequires systemd-units on fedora and rhel
-%if 0%{?fedora} >= 14 || 0%{?rhel} >= 7
-BuildRequires: systemd-units
-%endif
-#
-# BuildRequires systemd on openSUSE and SUSE
-%if 0%{?suse_version} >= 1210
-BuildRequires: systemd
-%endif
-%else
-%global with_systemd 0
-%define init_script sysvinit
-%endif
-
-# Must use /var/run for runtime_path on older releases or dnsmasq in the
-# lxc-net script will not be able to write its pid in /run (selinux denial)
-%if 0%{?fedora} < 15 || 0%{?rhel} < 7
-%define _with_runtime_path --with-runtime-path=/var/run
-%endif
-
-# RPM needs alpha/beta/rc in Release: not Version: to ensure smooth
-# package upgrades from alpha->beta->rc->release. For more info see:
-# http://fedoraproject.org/wiki/Packaging%3aNamingGuidelines#NonNumericRelease
-%if "x" != "x"
-%global beta_rel 
-%global beta_dot .%{beta_rel}
-%else
-%global norm_rel 1
-%endif
-
-Name: lxc
-Version: 4.0.3
-Release: %{?beta_rel:0.1.%{beta_rel}}%{?!beta_rel:%{norm_rel}}%{?dist}
-URL: http://linuxcontainers.org
-Source: http://linuxcontainers.org/downloads/%{name}-%{version}%{?beta_dot}.tar.gz
-Summary: Linux Containers userspace tools
-Group: Applications/System
-License: LGPLv2+
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: openssl rsync dnsmasq bridge-utils
-Requires: %{name}-libs = %{version}-%{release}
-Requires(pre): /usr/sbin/useradd
-Requires(postun): /usr/sbin/userdel
-%if 0%{?fedora} < 15 || 0%{?rhel} < 7
-Requires: libcgroup
-%endif
-# Note for Suse.  The "docbook2X" BuildRequires does properly
-# match docbook2x on Suse in a case insensitive manner
-BuildRequires: libcap libcap-devel docbook2X graphviz libxslt pkgconfig
-
-#
-# Additional packages for openSUSE and SUSE
-#
-%if 0%{?suse_version} >= 1210
-PreReq:   permissions
-BuildRequires:  libapparmor-devel linux-glibc-devel lsb-release docbook-utils
-
-#
-# libseccomp-devel only needed on i386/i586/i686 and X86_64
-#
-%ifarch %ix86 x86_64
-BuildRequires:  libseccomp-devel
-%endif
-%endif
-
-#
-# Additional package for Tizen
-#
-%if %{defined tizen_version}
-BuildRequires:  pkgconfig(dlog)
-%endif
-
-%description
-Containers are insulated areas inside a system, which have their own namespace
-for filesystem, network, PID, IPC, CPU and memory allocation and which can be
-created using the Control Group and Namespace features included in the Linux
-kernel.
-
-This package provides the lxc-* tools, which can be used to start a single
-daemon in a container, or to boot an entire "containerized" system, and to
-manage and debug your containers.
-
-%package	libs
-Summary:	Shared library files for %{name}
-Group:		System Environment/Libraries
-%description	libs
-The %{name}-libs package contains libraries for running %{name} applications.
-
-%package	devel
-Summary:	Development library for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}, pkgconfig
-%description	devel
-The %{name}-devel package contains header files and library needed for
-development of the Linux containers.
-
-%prep
-%setup -q -n %{name}-%{version}%{?beta_dot}
-%build
-
-#Dont use pkgconfig to get bash completion dir and use backwards compatible location.
-export bashcompdir=%{_sysconfdir}/bash_completion.d
-
-PATH=$PATH:/usr/sbin:/sbin %configure $args \
-%if "x%{_unitdir}" != "x"
-  --with-systemdsystemunitdir=%{_unitdir} \
-%endif
-  %{?_with_runtime_path} \
-  --disable-rpath \
-  --with-init-script=%{init_script}
-make %{?_smp_mflags}
-
-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
-
-%clean
-rm -rf %{buildroot}
-
-%pre
-# Ensure that lxc-dnsmasq uid & gid gets correctly allocated
-if getent passwd lxc-dnsmasq >/dev/null 2>&1 ; then : ; else \
- /usr/sbin/useradd -M -r -s /sbin/nologin \
- -c "LXC Networking Service" -d %_localstatedir/%name lxc-dnsmasq 2> /dev/null \
- || exit 1
-fi
-
-%post
-# This test should trigger a network configure on a new install.
-if  ! -d /usr/local/etc/default 
-then
-	mkdir -p /usr/local/etc/default
-fi
-
-if  ! -f /usr/local/etc/default/lxc-net  || ! grep -q 'USE_LXC_BRIDGE=' /usr/local/etc/default/lxc-net
-then
-	# Grab a random 10net subnet.  Need to add test logic...
-	while  true 
-	do
-		SUBNET=10.$(($RANDOM % 256)).$(($RANDOM % 256))
-		if ! ip -4 route ls | grep -q "^$SUBNET"
-		then
-			break
-		fi
-	done
-
-	cat >  /usr/local/etc/default/lxc-net <<EOF
-# Leave USE_LXC_BRIDGE as "true" if you want to use lxcbr0 for your
-# containers.  Set to "false" if you'll use virbr0 or another existing
-# bridge, or macvlan to your host's NIC.
-USE_LXC_BRIDGE="true"
-
-# If you change the LXC_BRIDGE to something other than lxcbr0, then
-# you will also need to update your /etc/lxc/default.conf as well as the
-# configuration (/var/lib/lxc/<container>/config) for any containers
-# already created using the default config to reflect the new bridge
-# name.
-# If you have the dnsmasq daemon installed, you'll also have to update
-# /etc/dnsmasq.d/lxc and restart the system wide dnsmasq daemon.
-LXC_BRIDGE="lxcbr0"
-LXC_BRIDGE_MAC="00:16:3e:00:00:00"
-LXC_ADDR="$SUBNET.1"
-LXC_NETMASK="255.255.255.0"
-LXC_NETWORK="$SUBNET.0/24"
-LXC_DHCP_RANGE="$SUBNET.2,$SUBNET.254"
-LXC_DHCP_MAX="253"
-# Uncomment the next line if you'd like to use a conf-file for the lxcbr0
-# dnsmasq.  For instance, you can use 'dhcp-host=mail1,10.0.3.100' to have
-# container 'mail1' always get ip address 10.0.3.100.
-#LXC_DHCP_CONFILE=/etc/lxc/dnsmasq.conf
-
-# Uncomment the next line if you want lxcbr0's dnsmasq to resolve the .lxc
-# domain.  You can then add "server=/lxc/10.0.3.1' (or your actual $LXC_ADDR)
-# to /etc/dnsmasq.conf, after which 'container1.lxc' will resolve on your
-# host.
-#LXC_DOMAIN="lxc"
-EOF
-fi
-
-%postun
-/usr/sbin/userdel lxc-dnsmasq > /dev/null 2>&1 || :
-
-%post   libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%{_bindir}/*
-# openSUSE/SUSE
-%if 0%{?suse_version} >= 1210
-%dir  %{_sysconfdir}/apparmor.d
-%dir  %{_sysconfdir}/apparmor.d/abstractions
-%dir  %{_sysconfdir}/apparmor.d/abstractions/%{name}
-%config %{_sysconfdir}/apparmor.d/abstractions/%{name}/container-base
-%config %{_sysconfdir}/apparmor.d/abstractions/%{name}/start-container
-%config %{_sysconfdir}/apparmor.d/%{name}-containers
-%dir  %{_sysconfdir}/apparmor.d/%{name}
-%config %{_sysconfdir}/apparmor.d/%{name}/%{name}-default
-%config %{_sysconfdir}/apparmor.d/%{name}/%{name}-default-with-mounting
-%config %{_sysconfdir}/apparmor.d/%{name}/%{name}-default-with-nesting
-%config %{_sysconfdir}/apparmor.d/usr.bin.%{name}-start
-%endif
-%{_mandir}/man1/lxc*
-%{_mandir}/man5/lxc*
-%{_mandir}/man7/lxc*
-# not openSUSE/SUSE
-%if %{undefined suse_version}
-%{_mandir}/ja/man1/lxc*
-%{_mandir}/ja/man5/lxc*
-%{_mandir}/ja/man7/lxc*
-%{_mandir}/ko/man1/lxc*
-%{_mandir}/ko/man5/lxc*
-%{_mandir}/ko/man7/lxc*
-%endif
-%{_datadir}/doc/*
-%{_datadir}/lxc/*
-%{_sysconfdir}/bash_completion.d
-%config(noreplace) %{_sysconfdir}/lxc/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
-
-%if %{with_systemd}
-%{_unitdir}/lxc-net.service
-%{_unitdir}/lxc.service
-%{_unitdir}/lxc@.service
-%else
-%{_sysconfdir}/rc.d/init.d/lxc
-%{_sysconfdir}/rc.d/init.d/lxc-net
-%endif
-
-%files libs
-%defattr(-,root,root)
-%{_sbindir}/*
-%{_libdir}/*.so.*
-%{_libdir}/*.a
-%{_libdir}/%{name}
-%{_localstatedir}/*
-%{_libexecdir}/%{name}/hooks/unmount-namespace
-%{_libexecdir}/%{name}/lxc-apparmor-load
-%{_libexecdir}/%{name}/lxc-monitord
-%attr(4111,root,root) %{_libexecdir}/%{name}/lxc-user-nic
-%if %{with_systemd}
-%attr(555,root,root) %{_libexecdir}/%{name}/lxc-net
-%attr(555,root,root) %{_libexecdir}/%{name}/lxc-containers
-%endif
-
-%files devel
-%defattr(-,root,root)
-%{_includedir}/%{name}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
-
-%changelog
-* Tue Oct 22 2013 Dwight Engen <dwight.engen@oracle.com> - 1.0.0-0.1.alpha2
-- fix some rpmlint warnings/errors
-- split lua bits into separate package
-
-* Mon Sep 10 2012 Dwight Engen <dwight.engen@oracle.com> - 0.8.0
-- fix lxc-init moved to libexec
-- .pc moved to _libdir
-- package template files /usr/share/lxc/templates
-
-* Thu Sep  8 2011 Greg Kurz <gkurz@fr.ibm.com> - 0.7.5.1
-- fix installed files for rpmbuild
-- introduce lxc-libs package
-
-* Fri Jul 23 2010 Daniel Lezcano <dlezcano@fr.ibm.com> - 0.7.2
-- set attribute for installed files
-- fix libraries installation
-
-* Tue Mar 24 2009 Daniel Lezcano <daniel.lezcano@free.fr> - 0.6.1
-- Removed capability setting, let the user to do that through "lxc-setcap"
-
-* Mon Feb 16 2009 Daniel Lezcano <daniel.lezcano@free.fr> - 0.6.0
-- Added more capabilities to the executables
-
-* Sun Jan 25 2009 Daniel Lezcano <daniel.lezcano@free.fr> - 0.6.0
-- Reduced spec file
-
-* Sun Aug 3 2008 Daniel Lezcano <dlezcano@fr.ibm.com> - 0.1.0
-- Initial RPM release.
-
-# Local variables:
-# mode: shell-script
-# sh-shell: rpm
-# end:

_service:tar_scm:lxc-4.0.3.tar.gz/src/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/src/Makefile.in Deleted

@@ -1,704 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = lxc tests
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@test -f $@ || rm -f stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(am__recursive_targets) all install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/src/config.h.in Deleted

@@ -1,336 +0,0 @@
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* "Prefix for shared files." */
-#undef DATADIR
-
-/* build for use with Coverity */
-#undef ENABLE_COVERITY_BUILD
-
-/* Rexec liblxc as memfd */
-#undef ENFORCE_MEMFD_REXEC
-
-/* enforce thread-safety otherwise fail the build */
-#undef ENFORCE_THREAD_SAFETY
-
-/* Define to 1 if you have the `clone3' function. */
-#undef HAVE_CLONE3
-
-/* Define to 1 if you have the `confstr' function. */
-#undef HAVE_CONFSTR
-
-/* Define to 1 if you have the declaration of `PR_CAPBSET_DROP', and to 0 if
-   you don't. */
-#undef HAVE_DECL_PR_CAPBSET_DROP
-
-/* Define to 1 if you have the declaration of `PR_GET_NO_NEW_PRIVS', and to 0
-   if you don't. */
-#undef HAVE_DECL_PR_GET_NO_NEW_PRIVS
-
-/* Define to 1 if you have the declaration of `PR_SET_NO_NEW_PRIVS', and to 0
-   if you don't. */
-#undef HAVE_DECL_PR_SET_NO_NEW_PRIVS
-
-/* Define to 1 if you have the declaration of `seccomp_notify_fd', and to 0 if
-   you don't. */
-#undef HAVE_DECL_SECCOMP_NOTIFY_FD
-
-/* Define to 1 if you have the declaration of
-   `seccomp_syscall_resolve_name_arch', and to 0 if you don't. */
-#undef HAVE_DECL_SECCOMP_SYSCALL_RESOLVE_NAME_ARCH
-
-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
-   don't. */
-#undef HAVE_DECL_STRERROR_R
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the `endmntent' function. */
-#undef HAVE_ENDMNTENT
-
-/* Define to 1 if you have the `execveat' function. */
-#undef HAVE_EXECVEAT
-
-/* Define to 1 if you have the `faccessat' function. */
-#undef HAVE_FACCESSAT
-
-/* Define to 1 if you have the `fgetln' function. */
-#undef HAVE_FGETLN
-
-/* Define to 1 if you have the `fmemopen' function. */
-#undef HAVE_FMEMOPEN
-
-/* Define to 1 if you have the `getgrgid_r' function. */
-#undef HAVE_GETGRGID_R
-
-/* Define to 1 if you have the `getline' function. */
-#undef HAVE_GETLINE
-
-/* Define to 1 if you have the `getsubopt' function. */
-#undef HAVE_GETSUBOPT
-
-/* Define to 1 if you have the `gettid' function. */
-#undef HAVE_GETTID
-
-/* Define to 1 if you have the `hasmntopt' function. */
-#undef HAVE_HASMNTOPT
-
-/* Have ifaddrs.h */
-#undef HAVE_IFADDRS_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `keyctl' function. */
-#undef HAVE_KEYCTL
-
-/* Define to 1 if you have the `cap' library (-lcap). */
-#undef HAVE_LIBCAP
-
-/* Define to 1 if you have the `dlog' library (-ldlog). */
-#undef HAVE_LIBDLOG
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-#undef HAVE_LIBPTHREAD
-
-/* Define to 1 if you have the `seccomp' library (-lseccomp). */
-#undef HAVE_LIBSECCOMP
-
-/* Define to 1 if you have the `util' library (-lutil). */
-#undef HAVE_LIBUTIL
-
-/* Define to 1 if you have the <linux/bpf.h> header file. */
-#undef HAVE_LINUX_BPF_H
-
-/* Define to 1 if you have the <linux/genetlink.h> header file. */
-#undef HAVE_LINUX_GENETLINK_H
-
-/* Define to 1 if you have the <linux/netlink.h> header file. */
-#undef HAVE_LINUX_NETLINK_H
-
-/* Define to 1 if you have the <linux/unistd.h> header file. */
-#undef HAVE_LINUX_UNISTD_H
-
-/* Define to 1 if you have the `memfd_create' function. */
-#undef HAVE_MEMFD_CREATE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `move_mount' function. */
-#undef HAVE_MOVE_MOUNT
-
-/* Have %m format */
-#undef HAVE_M_FORMAT
-
-/* Define to 1 if you have the `openpty' function. */
-#undef HAVE_OPENPTY
-
-/* Define to 1 if you have the `open_tree' function. */
-#undef HAVE_OPEN_TREE
-
-/* Define to 1 if you have the `pivot_root' function. */
-#undef HAVE_PIVOT_ROOT
-
-/* Define to 1 if you have the `prlimit' function. */
-#undef HAVE_PRLIMIT
-
-/* Define to 1 if you have the `prlimit64' function. */
-#undef HAVE_PRLIMIT64
-
-/* Define if you have POSIX threads libraries and header files. */
-#undef HAVE_PTHREAD
-
-/* Have PTHREAD_PRIO_INHERIT. */
-#undef HAVE_PTHREAD_PRIO_INHERIT
-
-/* Define to 1 if you have the `pthread_setcancelstate' function. */
-#undef HAVE_PTHREAD_SETCANCELSTATE
-
-/* Define to 1 if you have the <pty.h> header file. */
-#undef HAVE_PTY_H
-
-/* Define to 1 if you have the `rand_r' function. */
-#undef HAVE_RAND_R
-
-/* Define to 1 if the system has the type `scmp_filter_ctx'. */
-#undef HAVE_SCMP_FILTER_CTX
-
-/* Define to 1 if you have the `sethostname' function. */
-#undef HAVE_SETHOSTNAME
-
-/* Define to 1 if you have the `setmntent' function. */
-#undef HAVE_SETMNTENT
-
-/* Define to 1 if you have the `setns' function. */
-#undef HAVE_SETNS
-
-/* Have static libcap */
-#undef HAVE_STATIC_LIBCAP
-
-/* Define to 1 if you have the `statvfs' function. */
-#undef HAVE_STATVFS
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strerror_r' function. */
-#undef HAVE_STRERROR_R
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strlcat' function. */
-#undef HAVE_STRLCAT
-
-/* Define to 1 if you have the `strlcpy' function. */
-#undef HAVE_STRLCPY
-
-/* Define to 1 if the system has the type `struct bpf_cgroup_dev_ctx'. */
-#undef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-
-/* Define to 1 if the system has the type `struct clone_args'. */
-#undef HAVE_STRUCT_CLONE_ARGS
-
-/* Define to 1 if `cgroup' is a member of `struct clone_args'. */
-#undef HAVE_STRUCT_CLONE_ARGS_CGROUP
-
-/* Define to 1 if `set_tid' is a member of `struct clone_args'. */
-#undef HAVE_STRUCT_CLONE_ARGS_SET_TID
-
-/* Define to 1 if the system has the type `struct rtnl_link_stats64'. */
-#undef HAVE_STRUCT_RTNL_LINK_STATS64
-
-/* Define to 1 if the system has the type `struct seccomp_notif_sizes'. */
-#undef HAVE_STRUCT_SECCOMP_NOTIF_SIZES
-
-/* Define to 1 if you have the <sys/memfd.h> header file. */
-#undef HAVE_SYS_MEMFD_H
-
-/* Define to 1 if you have the <sys/personality.h> header file. */
-#undef HAVE_SYS_PERSONALITY_H
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
-
-/* Define to 1 if you have the <sys/signalfd.h> header file. */
-#undef HAVE_SYS_SIGNALFD_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/timerfd.h> header file. */
-#undef HAVE_SYS_TIMERFD_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define if the compiler supports __thread */
-#undef HAVE_TLS
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `unshare' function. */
-#undef HAVE_UNSHARE
-
-/* Define to 1 if you have the `utmpxname' function. */
-#undef HAVE_UTMPXNAME
-
-/* Define to 1 if you have the <utmpx.h> header file. */
-#undef HAVE_UTMPX_H
-
-/* bionic libc */
-#undef IS_BIONIC
-
-/* Have cap_get_file */
-#undef LIBCAP_SUPPORTS_FILE_CAPABILITIES
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#undef LT_OBJDIR
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
-   */
-#undef MAJOR_IN_MKDEV
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in
-   <sysmacros.h>. */
-#undef MAJOR_IN_SYSMACROS
-
-/* Enabling mutex debugging */
-#undef MUTEX_DEBUGGING
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
-#undef PTHREAD_CREATE_JOINABLE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if strerror_r returns char *. */
-#undef STRERROR_R_CHAR_P
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Define to the compiler TLS keyword */
-#undef thread_local

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/Makefile.am Deleted

@@ -1,524 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1+
-
-pkginclude_HEADERS = attach_options.h \
-		     lxccontainer.h \
-		     version.h
-
-noinst_HEADERS = api_extensions.h \
-		 attach.h \
-		 caps.h \
-		 cgroups/cgroup.h \
-		 cgroups/cgroup_utils.h \
-		 cgroups/cgroup2_devices.h \
-		 compiler.h \
-		 conf.h \
-		 confile.h \
-		 confile_utils.h \
-		 criu.h \
-		 error.h \
-		 file_utils.h \
-		 ../include/netns_ifaddrs.h \
-		 initutils.h \
-		 list.h \
-		 log.h \
-		 lxc.h \
-		 lxclock.h \
-		 macro.h \
-		 memory_utils.h \
-		 monitor.h \
-		 namespace.h \
-		 process_utils.h \
-		 rexec.h \
-		 start.h \
-		 state.h \
-		 storage/btrfs.h \
-		 storage/dir.h \
-		 storage/loop.h \
-		 storage/lvm.h \
-		 storage/nbd.h \
-		 storage/overlay.h \
-		 storage/rbd.h \
-		 storage/rsync.h \
-		 storage/storage.h \
-		 storage/storage_utils.h \
-		 storage/zfs.h \
-		 string_utils.h \
-		 syscall_numbers.h \
-		 syscall_wrappers.h \
-		 terminal.h \
-		 ../tests/lxctest.h \
-		 tools/arguments.h \
-		 storage/storage_utils.h \
-		 utils.h \
-		 uuid.h
-
-if IS_BIONIC
-noinst_HEADERS += ../include/fexecve.h \
-		  ../include/lxcmntent.h \
-		  ../include/openpty.h
-endif
-
-if !HAVE_PRLIMIT
-if HAVE_PRLIMIT64
-noinst_HEADERS += ../include/prlimit.h
-endif
-endif
-
-if !HAVE_GETLINE
-if HAVE_FGETLN
-noinst_HEADERS += ../include/getline.h
-endif
-endif
-
-if !HAVE_GETSUBOPT
-noinst_HEADERS += tools/include/getsubopt.h
-endif
-
-if !HAVE_GETGRGID_R
-noinst_HEADERS += ../include/getgrgid_r.h
-endif
-
-sodir=$(libdir)
-
-LSM_SOURCES = lsm/lsm.c \
-	      lsm/lsm.h \
-	      lsm/nop.c
-
-if ENABLE_APPARMOR
-LSM_SOURCES += lsm/apparmor.c
-endif
-
-if ENABLE_SELINUX
-LSM_SOURCES += lsm/selinux.c
-endif
-
-lib_LTLIBRARIES = liblxc.la
-liblxc_la_SOURCES = af_unix.c af_unix.h \
-		    api_extensions.h \
-		    attach.c attach.h \
-		    caps.c caps.h \
-		    cgroups/cgfsng.c \
-		    cgroups/cgroup.c cgroups/cgroup.h \
-		    cgroups/cgroup2_devices.c cgroups/cgroup2_devices.h \
-		    cgroups/cgroup_utils.c cgroups/cgroup_utils.h \
-		    compiler.h \
-		    commands.c commands.h \
-		    commands_utils.c commands_utils.h \
-		    conf.c conf.h \
-		    confile.c confile.h \
-		    confile_utils.c confile_utils.h \
-		    criu.c criu.h \
-		    error.c error.h \
-		    execute.c \
-		    freezer.c \
-		    file_utils.c file_utils.h \
-		    ../include/netns_ifaddrs.c ../include/netns_ifaddrs.h \
-		    initutils.c initutils.h \
-		    list.h \
-		    log.c log.h \
-		    lxc.h \
-		    lxccontainer.c lxccontainer.h \
-		    lxclock.c lxclock.h \
-		    lxcseccomp.h \
-		    macro.h \
-		    memory_utils.h \
-		    mainloop.c mainloop.h \
-		    namespace.c namespace.h \
-		    nl.c nl.h \
-		    network.c network.h \
-		    monitor.c monitor.h \
-		    parse.c parse.h \
-		    process_utils.c process_utils.h \
-		    ringbuf.c ringbuf.h \
-		    rtnl.c rtnl.h \
-		    state.c state.h \
-		    start.c start.h \
-		    storage/btrfs.c storage/btrfs.h \
-		    storage/dir.c storage/dir.h \
-		    storage/loop.c storage/loop.h \
-		    storage/lvm.c storage/lvm.h \
-		    storage/nbd.c storage/nbd.h \
-		    storage/overlay.c storage/overlay.h \
-		    storage/rbd.c storage/rbd.h \
-		    storage/rsync.c storage/rsync.h \
-		    storage/storage.c storage/storage.h \
-		    storage/storage_utils.c storage/storage_utils.h \
-		    storage/zfs.c storage/zfs.h \
-		    string_utils.c string_utils.h \
-		    sync.c sync.h \
-		    syscall_numbers.h \
-		    syscall_wrappers.h \
-		    terminal.c \
-		    utils.c utils.h \
-		    uuid.c uuid.h \
-		    version.h \
-		    $(LSM_SOURCES)
-
-if IS_BIONIC
-liblxc_la_SOURCES += ../include/fexecve.c ../include/fexecve.h \
-		     ../include/lxcmntent.c ../include/lxcmntent.h \
-		     ../include/openpty.c ../include/openpty.h
-endif
-
-if !HAVE_GETGRGID_R
-liblxc_la_SOURCES += ../include/getgrgid_r.c ../include/getgrgid_r.h
-endif
-
-if !HAVE_GETLINE
-if HAVE_FGETLN
-liblxc_la_SOURCES += ../include/getline.c ../include/getline.h
-endif
-endif
-
-if !HAVE_PRLIMIT
-if HAVE_PRLIMIT64
-liblxc_la_SOURCES += ../include/prlimit.c ../include/prlimit.h
-endif
-endif
-
-if ENABLE_SECCOMP
-liblxc_la_SOURCES += seccomp.c
-endif
-
-if !HAVE_STRLCPY
-liblxc_la_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
-endif
-
-if !HAVE_STRLCAT
-liblxc_la_SOURCES += ../include/strlcat.c ../include/strlcat.h
-endif
-
-if ENFORCE_MEMFD_REXEC
-liblxc_la_SOURCES += rexec.c rexec.h
-endif
-
-AM_CFLAGS = -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
-	    -DLXCPATH=\"$(LXCPATH)\" \
-	    -DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
-	    -DLXCINITDIR=\"$(LXCINITDIR)\" \
-	    -DLIBEXECDIR=\"$(LIBEXECDIR)\" \
-	    -DLXCTEMPLATEDIR=\"$(LXCTEMPLATEDIR)\" \
-	    -DLXCTEMPLATECONFIG=\"$(LXCTEMPLATECONFIG)\" \
-	    -DLOGPATH=\"$(LOGPATH)\" \
-	    -DLXC_DEFAULT_CONFIG=\"$(LXC_DEFAULT_CONFIG)\" \
-	    -DLXC_USERNIC_DB=\"$(LXC_USERNIC_DB)\" \
-	    -DLXC_USERNIC_CONF=\"$(LXC_USERNIC_CONF)\" \
-	    -DDEFAULT_CGROUP_PATTERN=\"$(DEFAULT_CGROUP_PATTERN)\" \
-	    -DRUNTIME_PATH=\"$(RUNTIME_PATH)\" \
-	    -DSBINDIR=\"$(SBINDIR)\" \
-	    -DAPPARMOR_CACHE_DIR=\"$(APPARMOR_CACHE_DIR)\" \
-	    -I $(top_srcdir)/src \
-	    -I $(top_srcdir)/src/lxc \
-	    -I $(top_srcdir)/src/lxc/storage \
-	    -I $(top_srcdir)/src/lxc/cgroups
-
-if ENABLE_APPARMOR
-AM_CFLAGS += -DHAVE_APPARMOR
-endif
-
-if ENABLE_OPENSSL
-AM_CFLAGS += -DHAVE_OPENSSL
-endif
-
-if ENABLE_SECCOMP
-AM_CFLAGS += -DHAVE_SECCOMP \
-	     $(SECCOMP_CFLAGS)
-endif
-
-if ENABLE_SELINUX
-AM_CFLAGS += -DHAVE_SELINUX
-endif
-
-if ENABLE_DLOG
-AM_CFLAGS += -DHAVE_DLOG \
-	      $(DLOG_CFLAGS)
-endif
-
-if USE_CONFIGPATH_LOGS
-AM_CFLAGS += -DUSE_CONFIGPATH_LOGS
-endif
-
-# build the shared library
-liblxc_la_CFLAGS = -fPIC \
-		   -DPIC \
-		   $(AM_CFLAGS) \
-		   $(LIBLXC_SANITIZER) \
-		   -pthread
-if ENABLE_ASAN
-liblxc_la_CFLAGS += -fsanitize=address \
-		    -fno-omit-frame-pointer
-endif
-
-if ENABLE_UBSAN
-liblxc_la_CFLAGS += -fsanitize=undefined
-endif
-
-liblxc_la_LDFLAGS = -pthread \
-		    -Wl,-no-undefined \
-		    -Wl,-soname,liblxc.so.$(firstword $(subst ., ,@LXC_ABI@)) \
-		    -version-info @LXC_ABI_MAJOR@
-
-liblxc_la_LIBADD = $(CAP_LIBS) \
-		   $(OPENSSL_LIBS) \
-		   $(SELINUX_LIBS) \
-		   $(SECCOMP_LIBS) \
-		   $(DLOG_LIBS)
-
-bin_SCRIPTS=
-
-if ENABLE_COMMANDS
-bin_SCRIPTS += cmd/lxc-checkconfig \
-	       cmd/lxc-update-config
-endif
-
-if ENABLE_TOOLS
-bin_PROGRAMS = lxc-attach \
-	       lxc-autostart \
-	       lxc-cgroup \
-	       lxc-checkpoint \
-	       lxc-copy \
-	       lxc-config \
-	       lxc-console \
-	       lxc-create \
-	       lxc-destroy \
-	       lxc-device \
-	       lxc-execute \
-	       lxc-freeze \
-	       lxc-info \
-	       lxc-ls \
-	       lxc-monitor \
-	       lxc-snapshot \
-	       lxc-start \
-	       lxc-stop \
-	       lxc-top \
-	       lxc-unfreeze \
-	       lxc-unshare \
-	       lxc-wait
-endif
-
-if ENABLE_COMMANDS
-
-if ENABLE_TOOLS
-bin_PROGRAMS += lxc-usernsexec
-else
-bin_PROGRAMS = lxc-usernsexec
-endif
-
-sbin_PROGRAMS = init.lxc
-
-pkglibexec_PROGRAMS = lxc-monitord \
-		      lxc-user-nic
-endif
-
-AM_LDFLAGS = -Wl,-E
-
-if ENABLE_RPATH
-AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir)
-endif
-
-LDADD = liblxc.la \
-	@CAP_LIBS@ \
-	@OPENSSL_LIBS@ \
-	@SECCOMP_LIBS@ \
-	@SELINUX_LIBS@ \
-	@DLOG_LIBS@
-
-if ENABLE_TOOLS
-lxc_attach_SOURCES = tools/lxc_attach.c \
-		     rexec.c rexec.h \
-		     tools/arguments.c tools/arguments.h
-lxc_autostart_SOURCES = tools/lxc_autostart.c \
-			tools/arguments.c tools/arguments.h
-lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
-		     tools/arguments.c tools/arguments.h
-lxc_config_SOURCES = tools/lxc_config.c \
-		     tools/arguments.c tools/arguments.h
-lxc_console_SOURCES = tools/lxc_console.c \
-		      tools/arguments.c tools/arguments.h
-lxc_destroy_SOURCES = tools/lxc_destroy.c \
-		      tools/arguments.c tools/arguments.h
-lxc_device_SOURCES = tools/lxc_device.c \
-		     tools/arguments.c tools/arguments.h
-lxc_execute_SOURCES = tools/lxc_execute.c \
-		      tools/arguments.c tools/arguments.h
-lxc_freeze_SOURCES = tools/lxc_freeze.c \
-		     tools/arguments.c tools/arguments.h
-lxc_info_SOURCES = tools/lxc_info.c \
-		   tools/arguments.c tools/arguments.h
-lxc_monitor_SOURCES = tools/lxc_monitor.c \
-		      macro.h \
-		      tools/arguments.c tools/arguments.h
-lxc_ls_SOURCES = tools/lxc_ls.c \
-		 tools/arguments.c tools/arguments.h
-lxc_copy_SOURCES = tools/lxc_copy.c \
-		   tools/arguments.c tools/arguments.h \
-		   storage/storage_utils.c storage/storage_utils.h
-lxc_start_SOURCES = tools/lxc_start.c \
-		    tools/arguments.c tools/arguments.h
-lxc_stop_SOURCES = tools/lxc_stop.c \
-		   tools/arguments.c tools/arguments.h
-lxc_top_SOURCES = tools/lxc_top.c \
-		  tools/arguments.c tools/arguments.h
-lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
-		       tools/arguments.c tools/arguments.h
-lxc_unshare_SOURCES = tools/lxc_unshare.c \
-		      syscall_numbers.h \
-		      syscall_wrappers.h \
-		      tools/arguments.c tools/arguments.h
-lxc_wait_SOURCES = tools/lxc_wait.c \
-		   tools/arguments.c tools/arguments.h
-lxc_create_SOURCES = tools/lxc_create.c \
-		     tools/arguments.c tools/arguments.h \
-		     storage/storage_utils.c storage/storage_utils.h
-lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
-		       tools/arguments.c tools/arguments.h
-lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
-			 tools/arguments.c tools/arguments.h
-endif
-
-if ENABLE_COMMANDS
-# Binaries shipping with liblxc
-init_lxc_SOURCES = cmd/lxc_init.c \
-		   compiler.h \
-		   error.h \
-		   initutils.c initutils.h \
-		   memory_utils.h \
-		   parse.c parse.h \
-		   process_utils.c process_utils.h \
-		   syscall_numbers.h \
-		   string_utils.c string_utils.h
-
-init_lxc_LDFLAGS = -pthread
-
-lxc_monitord_SOURCES = cmd/lxc_monitord.c \
-		       af_unix.c af_unix.h \
-		       log.c log.h \
-		       mainloop.c mainloop.h \
-		       monitor.c monitor.h \
-		       process_utils.c process_utils.h \
-		       syscall_numbers.h \
-		       utils.c utils.h
-lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
-		       ../include/netns_ifaddrs.c ../include/netns_ifaddrs.h \
-		       log.c log.h \
-		       memory_utils.h \
-		       network.c network.h \
-		       parse.c parse.h \
-		       process_utils.c process_utils.h \
-		       syscall_numbers.h \
-		       file_utils.c file_utils.h \
-		       string_utils.c string_utils.h \
-		       syscall_wrappers.h
-lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
-			 conf.c conf.h \
-			 file_utils.c file_utils.h \
-			 list.h \
-			 log.c log.h \
-			 macro.h \
-			 memory_utils.h \
-			 string_utils.c string_utils.h \
-			 syscall_wrappers.h \
-			 utils.c utils.h
-endif
-
-
-if ENABLE_TOOLS
-if !HAVE_GETSUBOPT
-lxc_copy_SOURCES += tools/include/getsubopt.c tools/include/getsubopt.h
-endif
-endif
-
-if ENABLE_COMMANDS
-if HAVE_STATIC_LIBCAP
-sbin_PROGRAMS += init.lxc.static
-
-init_lxc_static_SOURCES = cmd/lxc_init.c \
-			  caps.c caps.h \
-			  error.c error.h \
-			  initutils.c initutils.h \
-			  file_utils.c file_utils.h \
-			  log.c log.h \
-			  macro.h \
-			  memory_utils.h \
-			  namespace.c namespace.h \
-			  string_utils.c string_utils.h
-
-if !HAVE_GETLINE
-if HAVE_FGETLN
-init_lxc_static_SOURCES += ../include/getline.c ../include/getline.h
-endif
-endif
-
-if !HAVE_STRLCPY
-init_lxc_static_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
-endif
-
-if !HAVE_STRLCAT
-init_lxc_static_SOURCES += ../include/strlcat.c ../include/strlcat.h
-endif
-
-init_lxc_static_LDFLAGS = -all-static -pthread
-init_lxc_static_LDADD = @CAP_LIBS@
-init_lxc_static_CFLAGS = $(AM_CFLAGS) -DNO_LXC_CONF
-endif
-endif
-
-if ENABLE_PAM
-if HAVE_PAM
-pam_LTLIBRARIES = pam_cgfs.la
-
-pam_cgfs_la_SOURCES = pam/pam_cgfs.c \
-		      file_utils.c file_utils.h \
-		      macro.h \
-		      memory_utils.h \
-		      string_utils.c string_utils.h
-
-if !HAVE_STRLCAT
-pam_cgfs_la_SOURCES += ../include/strlcat.c ../include/strlcat.h
-endif
-
-if !HAVE_STRLCPY
-pam_cgfs_la_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
-endif
-
-pam_cgfs_la_CFLAGS = $(AM_CFLAGS) -DNO_LXC_CONF
-
-pam_cgfs_la_LIBADD = $(AM_LIBS) \
-		     $(PAM_LIBS) \
-		     $(DLOG_LIBS) \
-		     -L$(top_srcdir)
-
-pam_cgfs_la_LDFLAGS = $(AM_LDFLAGS) \
-		      -avoid-version \
-		      -module \
-		      -shared \
-		      -Wl,-no-undefined
-endif
-endif
-
-install-exec-local: install-libLTLIBRARIES
-	mkdir -p $(DESTDIR)$(datadir)/lxc
-	install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc
-	mv $(shell readlink -f $(DESTDIR)$(libdir)/liblxc.so) $(DESTDIR)$(libdir)/liblxc.so.@LXC_ABI@
-	rm -f $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.1
-	cd $(DESTDIR)$(libdir); \
-	ln -sf liblxc.so.@LXC_ABI@ liblxc.so.$(firstword $(subst ., ,@LXC_ABI@)); \
-	ln -sf liblxc.so.$(firstword $(subst ., ,@LXC_ABI@)) liblxc.so
-
-if ENABLE_COMMANDS
-install-exec-hook:
-	chmod u+s $(DESTDIR)$(libexecdir)/lxc/lxc-user-nic
-endif
-
-uninstall-local:
-	$(RM) $(DESTDIR)$(libdir)/liblxc.so*
-	$(RM) $(DESTDIR)$(libdir)/liblxc.a
-if ENABLE_PAM
-if HAVE_PAM
-	$(RM) $(DESTDIR)$(pamdir)/pam_cgfs.so*
-
-install-data-hook: install-pamLTLIBRARIES
-	$(RM) "$(DESTDIR)$(pamdir)/pam_cgfs.la"
-	$(RM) "$(DESTDIR)$(pamdir)/pam_cgfs.a"
-endif
-endif

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/Makefile.in Deleted

@@ -1,3139 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# SPDX-License-Identifier: LGPL-2.1+
-
-
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@IS_BIONIC_TRUE@am__append_1 = ../include/fexecve.h \
-@IS_BIONIC_TRUE@		  ../include/lxcmntent.h \
-@IS_BIONIC_TRUE@		  ../include/openpty.h
-
-@HAVE_PRLIMIT64_TRUE@@HAVE_PRLIMIT_FALSE@am__append_2 = ../include/prlimit.h
-@HAVE_FGETLN_TRUE@@HAVE_GETLINE_FALSE@am__append_3 = ../include/getline.h
-@HAVE_GETSUBOPT_FALSE@am__append_4 = tools/include/getsubopt.h
-@HAVE_GETGRGID_R_FALSE@am__append_5 = ../include/getgrgid_r.h
-@ENABLE_APPARMOR_TRUE@am__append_6 = lsm/apparmor.c
-@ENABLE_SELINUX_TRUE@am__append_7 = lsm/selinux.c
-@IS_BIONIC_TRUE@am__append_8 = ../include/fexecve.c ../include/fexecve.h \
-@IS_BIONIC_TRUE@		     ../include/lxcmntent.c ../include/lxcmntent.h \
-@IS_BIONIC_TRUE@		     ../include/openpty.c ../include/openpty.h
-
-@HAVE_GETGRGID_R_FALSE@am__append_9 = ../include/getgrgid_r.c ../include/getgrgid_r.h
-@HAVE_FGETLN_TRUE@@HAVE_GETLINE_FALSE@am__append_10 = ../include/getline.c ../include/getline.h
-@HAVE_PRLIMIT64_TRUE@@HAVE_PRLIMIT_FALSE@am__append_11 = ../include/prlimit.c ../include/prlimit.h
-@ENABLE_SECCOMP_TRUE@am__append_12 = seccomp.c
-@HAVE_STRLCPY_FALSE@am__append_13 = ../include/strlcpy.c ../include/strlcpy.h
-@HAVE_STRLCAT_FALSE@am__append_14 = ../include/strlcat.c ../include/strlcat.h
-@ENFORCE_MEMFD_REXEC_TRUE@am__append_15 = rexec.c rexec.h
-@ENABLE_APPARMOR_TRUE@am__append_16 = -DHAVE_APPARMOR
-@ENABLE_OPENSSL_TRUE@am__append_17 = -DHAVE_OPENSSL
-@ENABLE_SECCOMP_TRUE@am__append_18 = -DHAVE_SECCOMP \
-@ENABLE_SECCOMP_TRUE@	     $(SECCOMP_CFLAGS)
-
-@ENABLE_SELINUX_TRUE@am__append_19 = -DHAVE_SELINUX
-@ENABLE_DLOG_TRUE@am__append_20 = -DHAVE_DLOG \
-@ENABLE_DLOG_TRUE@	      $(DLOG_CFLAGS)
-
-@USE_CONFIGPATH_LOGS_TRUE@am__append_21 = -DUSE_CONFIGPATH_LOGS
-@ENABLE_ASAN_TRUE@am__append_22 = -fsanitize=address \
-@ENABLE_ASAN_TRUE@		    -fno-omit-frame-pointer
-
-@ENABLE_UBSAN_TRUE@am__append_23 = -fsanitize=undefined
-@ENABLE_COMMANDS_TRUE@am__append_24 = cmd/lxc-checkconfig \
-@ENABLE_COMMANDS_TRUE@	       cmd/lxc-update-config
-
-@ENABLE_COMMANDS_TRUE@@ENABLE_TOOLS_FALSE@bin_PROGRAMS = lxc-usernsexec$(EXEEXT)
-@ENABLE_TOOLS_TRUE@bin_PROGRAMS = lxc-attach$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-autostart$(EXEEXT) lxc-cgroup$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-checkpoint$(EXEEXT) lxc-copy$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-config$(EXEEXT) lxc-console$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-create$(EXEEXT) lxc-destroy$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-device$(EXEEXT) lxc-execute$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-freeze$(EXEEXT) lxc-info$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-ls$(EXEEXT) lxc-monitor$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-snapshot$(EXEEXT) lxc-start$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-stop$(EXEEXT) lxc-top$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-unfreeze$(EXEEXT) lxc-unshare$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	lxc-wait$(EXEEXT) $(am__EXEEXT_1)
-@ENABLE_COMMANDS_TRUE@@ENABLE_TOOLS_TRUE@am__append_25 = lxc-usernsexec
-@ENABLE_COMMANDS_TRUE@sbin_PROGRAMS = init.lxc$(EXEEXT) \
-@ENABLE_COMMANDS_TRUE@	$(am__EXEEXT_2)
-@ENABLE_COMMANDS_TRUE@pkglibexec_PROGRAMS = lxc-monitord$(EXEEXT) \
-@ENABLE_COMMANDS_TRUE@	lxc-user-nic$(EXEEXT)
-@ENABLE_RPATH_TRUE@am__append_26 = -Wl,-rpath -Wl,$(libdir)
-@ENABLE_TOOLS_TRUE@@HAVE_GETSUBOPT_FALSE@am__append_27 = tools/include/getsubopt.c tools/include/getsubopt.h
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@am__append_28 = init.lxc.static
-@ENABLE_COMMANDS_TRUE@@HAVE_FGETLN_TRUE@@HAVE_GETLINE_FALSE@@HAVE_STATIC_LIBCAP_TRUE@am__append_29 = ../include/getline.c ../include/getline.h
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@@HAVE_STRLCPY_FALSE@am__append_30 = ../include/strlcpy.c ../include/strlcpy.h
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@@HAVE_STRLCAT_FALSE@am__append_31 = ../include/strlcat.c ../include/strlcat.h
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@@HAVE_STRLCAT_FALSE@am__append_32 = ../include/strlcat.c ../include/strlcat.h
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@@HAVE_STRLCPY_FALSE@am__append_33 = ../include/strlcpy.c ../include/strlcpy.h
-subdir = src/lxc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \
-	$(pkginclude_HEADERS) $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc.functions version.h
-CONFIG_CLEAN_VPATH_FILES =
-@ENABLE_COMMANDS_TRUE@@ENABLE_TOOLS_TRUE@am__EXEEXT_1 = lxc-usernsexec$(EXEEXT)
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
-	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(libdir)" \
-	"$(DESTDIR)$(pamdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(pkgincludedir)"
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@am__EXEEXT_2 = init.lxc.static$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(pkglibexec_PROGRAMS) $(sbin_PROGRAMS)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-LTLIBRARIES = $(lib_LTLIBRARIES) $(pam_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-liblxc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am__liblxc_la_SOURCES_DIST = af_unix.c af_unix.h api_extensions.h \
-	attach.c attach.h caps.c caps.h cgroups/cgfsng.c \
-	cgroups/cgroup.c cgroups/cgroup.h cgroups/cgroup2_devices.c \
-	cgroups/cgroup2_devices.h cgroups/cgroup_utils.c \
-	cgroups/cgroup_utils.h compiler.h commands.c commands.h \
-	commands_utils.c commands_utils.h conf.c conf.h confile.c \
-	confile.h confile_utils.c confile_utils.h criu.c criu.h \
-	error.c error.h execute.c freezer.c file_utils.c file_utils.h \
-	../include/netns_ifaddrs.c ../include/netns_ifaddrs.h \
-	initutils.c initutils.h list.h log.c log.h lxc.h \
-	lxccontainer.c lxccontainer.h lxclock.c lxclock.h lxcseccomp.h \
-	macro.h memory_utils.h mainloop.c mainloop.h namespace.c \
-	namespace.h nl.c nl.h network.c network.h monitor.c monitor.h \
-	parse.c parse.h process_utils.c process_utils.h ringbuf.c \
-	ringbuf.h rtnl.c rtnl.h state.c state.h start.c start.h \
-	storage/btrfs.c storage/btrfs.h storage/dir.c storage/dir.h \
-	storage/loop.c storage/loop.h storage/lvm.c storage/lvm.h \
-	storage/nbd.c storage/nbd.h storage/overlay.c \
-	storage/overlay.h storage/rbd.c storage/rbd.h storage/rsync.c \
-	storage/rsync.h storage/storage.c storage/storage.h \
-	storage/storage_utils.c storage/storage_utils.h storage/zfs.c \
-	storage/zfs.h string_utils.c string_utils.h sync.c sync.h \
-	syscall_numbers.h syscall_wrappers.h terminal.c utils.c \
-	utils.h uuid.c uuid.h version.h lsm/lsm.c lsm/lsm.h lsm/nop.c \
-	lsm/apparmor.c lsm/selinux.c ../include/fexecve.c \
-	../include/fexecve.h ../include/lxcmntent.c \
-	../include/lxcmntent.h ../include/openpty.c \
-	../include/openpty.h ../include/getgrgid_r.c \
-	../include/getgrgid_r.h ../include/getline.c \
-	../include/getline.h ../include/prlimit.c ../include/prlimit.h \
-	seccomp.c ../include/strlcpy.c ../include/strlcpy.h \
-	../include/strlcat.c ../include/strlcat.h rexec.c rexec.h
-am__dirstamp = $(am__leading_dot)dirstamp
-@ENABLE_APPARMOR_TRUE@am__objects_1 = lsm/liblxc_la-apparmor.lo
-@ENABLE_SELINUX_TRUE@am__objects_2 = lsm/liblxc_la-selinux.lo
-am__objects_3 = lsm/liblxc_la-lsm.lo lsm/liblxc_la-nop.lo \
-	$(am__objects_1) $(am__objects_2)
-@IS_BIONIC_TRUE@am__objects_4 = ../include/liblxc_la-fexecve.lo \
-@IS_BIONIC_TRUE@	../include/liblxc_la-lxcmntent.lo \
-@IS_BIONIC_TRUE@	../include/liblxc_la-openpty.lo
-@HAVE_GETGRGID_R_FALSE@am__objects_5 =  \
-@HAVE_GETGRGID_R_FALSE@	../include/liblxc_la-getgrgid_r.lo
-@HAVE_FGETLN_TRUE@@HAVE_GETLINE_FALSE@am__objects_6 = ../include/liblxc_la-getline.lo
-@HAVE_PRLIMIT64_TRUE@@HAVE_PRLIMIT_FALSE@am__objects_7 = ../include/liblxc_la-prlimit.lo
-@ENABLE_SECCOMP_TRUE@am__objects_8 = liblxc_la-seccomp.lo
-@HAVE_STRLCPY_FALSE@am__objects_9 = ../include/liblxc_la-strlcpy.lo
-@HAVE_STRLCAT_FALSE@am__objects_10 = ../include/liblxc_la-strlcat.lo
-@ENFORCE_MEMFD_REXEC_TRUE@am__objects_11 = liblxc_la-rexec.lo
-am_liblxc_la_OBJECTS = liblxc_la-af_unix.lo liblxc_la-attach.lo \
-	liblxc_la-caps.lo cgroups/liblxc_la-cgfsng.lo \
-	cgroups/liblxc_la-cgroup.lo \
-	cgroups/liblxc_la-cgroup2_devices.lo \
-	cgroups/liblxc_la-cgroup_utils.lo liblxc_la-commands.lo \
-	liblxc_la-commands_utils.lo liblxc_la-conf.lo \
-	liblxc_la-confile.lo liblxc_la-confile_utils.lo \
-	liblxc_la-criu.lo liblxc_la-error.lo liblxc_la-execute.lo \
-	liblxc_la-freezer.lo liblxc_la-file_utils.lo \
-	../include/liblxc_la-netns_ifaddrs.lo liblxc_la-initutils.lo \
-	liblxc_la-log.lo liblxc_la-lxccontainer.lo \
-	liblxc_la-lxclock.lo liblxc_la-mainloop.lo \
-	liblxc_la-namespace.lo liblxc_la-nl.lo liblxc_la-network.lo \
-	liblxc_la-monitor.lo liblxc_la-parse.lo \
-	liblxc_la-process_utils.lo liblxc_la-ringbuf.lo \
-	liblxc_la-rtnl.lo liblxc_la-state.lo liblxc_la-start.lo \
-	storage/liblxc_la-btrfs.lo storage/liblxc_la-dir.lo \
-	storage/liblxc_la-loop.lo storage/liblxc_la-lvm.lo \
-	storage/liblxc_la-nbd.lo storage/liblxc_la-overlay.lo \
-	storage/liblxc_la-rbd.lo storage/liblxc_la-rsync.lo \
-	storage/liblxc_la-storage.lo \
-	storage/liblxc_la-storage_utils.lo storage/liblxc_la-zfs.lo \
-	liblxc_la-string_utils.lo liblxc_la-sync.lo \
-	liblxc_la-terminal.lo liblxc_la-utils.lo liblxc_la-uuid.lo \
-	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
-	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
-	$(am__objects_9) $(am__objects_10) $(am__objects_11)
-liblxc_la_OBJECTS = $(am_liblxc_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-liblxc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblxc_la_CFLAGS) \
-	$(CFLAGS) $(liblxc_la_LDFLAGS) $(LDFLAGS) -o $@
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@pam_cgfs_la_DEPENDENCIES =  \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	$(am__DEPENDENCIES_1)
-am__pam_cgfs_la_SOURCES_DIST = pam/pam_cgfs.c file_utils.c \
-	file_utils.h macro.h memory_utils.h string_utils.c \
-	string_utils.h ../include/strlcat.c ../include/strlcat.h \
-	../include/strlcpy.c ../include/strlcpy.h
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@@HAVE_STRLCAT_FALSE@am__objects_12 = ../include/pam_cgfs_la-strlcat.lo
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@@HAVE_STRLCPY_FALSE@am__objects_13 = ../include/pam_cgfs_la-strlcpy.lo
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@am_pam_cgfs_la_OBJECTS =  \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	pam/cgfs_la-pam_cgfs.lo \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	pam_cgfs_la-file_utils.lo \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	pam_cgfs_la-string_utils.lo \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	$(am__objects_12) \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	$(am__objects_13)
-pam_cgfs_la_OBJECTS = $(am_pam_cgfs_la_OBJECTS)
-pam_cgfs_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(pam_cgfs_la_CFLAGS) \
-	$(CFLAGS) $(pam_cgfs_la_LDFLAGS) $(LDFLAGS) -o $@
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@am_pam_cgfs_la_rpath = -rpath \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	$(pamdir)
-am__init_lxc_SOURCES_DIST = cmd/lxc_init.c compiler.h error.h \
-	initutils.c initutils.h memory_utils.h parse.c parse.h \
-	process_utils.c process_utils.h syscall_numbers.h \
-	string_utils.c string_utils.h
-@ENABLE_COMMANDS_TRUE@am_init_lxc_OBJECTS = cmd/lxc_init.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	initutils.$(OBJEXT) parse.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	process_utils.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	string_utils.$(OBJEXT)
-init_lxc_OBJECTS = $(am_init_lxc_OBJECTS)
-init_lxc_LDADD = $(LDADD)
-init_lxc_DEPENDENCIES = liblxc.la
-init_lxc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(init_lxc_LDFLAGS) $(LDFLAGS) -o $@
-am__init_lxc_static_SOURCES_DIST = cmd/lxc_init.c caps.c caps.h \
-	error.c error.h initutils.c initutils.h file_utils.c \
-	file_utils.h log.c log.h macro.h memory_utils.h namespace.c \
-	namespace.h string_utils.c string_utils.h ../include/getline.c \
-	../include/getline.h ../include/strlcpy.c ../include/strlcpy.h \
-	../include/strlcat.c ../include/strlcat.h
-@ENABLE_COMMANDS_TRUE@@HAVE_FGETLN_TRUE@@HAVE_GETLINE_FALSE@@HAVE_STATIC_LIBCAP_TRUE@am__objects_14 = ../include/init_lxc_static-getline.$(OBJEXT)
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@@HAVE_STRLCPY_FALSE@am__objects_15 = ../include/init_lxc_static-strlcpy.$(OBJEXT)
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@@HAVE_STRLCAT_FALSE@am__objects_16 = ../include/init_lxc_static-strlcat.$(OBJEXT)
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@am_init_lxc_static_OBJECTS = cmd/init_lxc_static-lxc_init.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	init_lxc_static-caps.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	init_lxc_static-error.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	init_lxc_static-initutils.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	init_lxc_static-file_utils.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	init_lxc_static-log.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	init_lxc_static-namespace.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	init_lxc_static-string_utils.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	$(am__objects_14) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	$(am__objects_15) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	$(am__objects_16)
-init_lxc_static_OBJECTS = $(am_init_lxc_static_OBJECTS)
-init_lxc_static_DEPENDENCIES =
-init_lxc_static_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(init_lxc_static_CFLAGS) $(CFLAGS) $(init_lxc_static_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am__lxc_attach_SOURCES_DIST = tools/lxc_attach.c rexec.c rexec.h \
-	tools/arguments.c tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_attach_OBJECTS = tools/lxc_attach.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	rexec.$(OBJEXT) tools/arguments.$(OBJEXT)
-lxc_attach_OBJECTS = $(am_lxc_attach_OBJECTS)
-lxc_attach_LDADD = $(LDADD)
-lxc_attach_DEPENDENCIES = liblxc.la
-am__lxc_autostart_SOURCES_DIST = tools/lxc_autostart.c \
-	tools/arguments.c tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_autostart_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	tools/lxc_autostart.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_autostart_OBJECTS = $(am_lxc_autostart_OBJECTS)
-lxc_autostart_LDADD = $(LDADD)
-lxc_autostart_DEPENDENCIES = liblxc.la
-am__lxc_cgroup_SOURCES_DIST = tools/lxc_cgroup.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_cgroup_OBJECTS = tools/lxc_cgroup.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_cgroup_OBJECTS = $(am_lxc_cgroup_OBJECTS)
-lxc_cgroup_LDADD = $(LDADD)
-lxc_cgroup_DEPENDENCIES = liblxc.la
-am__lxc_checkpoint_SOURCES_DIST = tools/lxc_checkpoint.c \
-	tools/arguments.c tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_checkpoint_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	tools/lxc_checkpoint.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_checkpoint_OBJECTS = $(am_lxc_checkpoint_OBJECTS)
-lxc_checkpoint_LDADD = $(LDADD)
-lxc_checkpoint_DEPENDENCIES = liblxc.la
-am__lxc_config_SOURCES_DIST = tools/lxc_config.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_config_OBJECTS = tools/lxc_config.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_config_OBJECTS = $(am_lxc_config_OBJECTS)
-lxc_config_LDADD = $(LDADD)
-lxc_config_DEPENDENCIES = liblxc.la
-am__lxc_console_SOURCES_DIST = tools/lxc_console.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_console_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	tools/lxc_console.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_console_OBJECTS = $(am_lxc_console_OBJECTS)
-lxc_console_LDADD = $(LDADD)
-lxc_console_DEPENDENCIES = liblxc.la
-am__lxc_copy_SOURCES_DIST = tools/lxc_copy.c tools/arguments.c \
-	tools/arguments.h storage/storage_utils.c \
-	storage/storage_utils.h tools/include/getsubopt.c \
-	tools/include/getsubopt.h
-@ENABLE_TOOLS_TRUE@@HAVE_GETSUBOPT_FALSE@am__objects_17 = tools/include/getsubopt.$(OBJEXT)
-@ENABLE_TOOLS_TRUE@am_lxc_copy_OBJECTS = tools/lxc_copy.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	storage/storage_utils.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	$(am__objects_17)
-lxc_copy_OBJECTS = $(am_lxc_copy_OBJECTS)
-lxc_copy_LDADD = $(LDADD)
-lxc_copy_DEPENDENCIES = liblxc.la
-am__lxc_create_SOURCES_DIST = tools/lxc_create.c tools/arguments.c \
-	tools/arguments.h storage/storage_utils.c \
-	storage/storage_utils.h
-@ENABLE_TOOLS_TRUE@am_lxc_create_OBJECTS = tools/lxc_create.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	storage/storage_utils.$(OBJEXT)
-lxc_create_OBJECTS = $(am_lxc_create_OBJECTS)
-lxc_create_LDADD = $(LDADD)
-lxc_create_DEPENDENCIES = liblxc.la
-am__lxc_destroy_SOURCES_DIST = tools/lxc_destroy.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_destroy_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	tools/lxc_destroy.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_destroy_OBJECTS = $(am_lxc_destroy_OBJECTS)
-lxc_destroy_LDADD = $(LDADD)
-lxc_destroy_DEPENDENCIES = liblxc.la
-am__lxc_device_SOURCES_DIST = tools/lxc_device.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_device_OBJECTS = tools/lxc_device.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_device_OBJECTS = $(am_lxc_device_OBJECTS)
-lxc_device_LDADD = $(LDADD)
-lxc_device_DEPENDENCIES = liblxc.la
-am__lxc_execute_SOURCES_DIST = tools/lxc_execute.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_execute_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	tools/lxc_execute.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_execute_OBJECTS = $(am_lxc_execute_OBJECTS)
-lxc_execute_LDADD = $(LDADD)
-lxc_execute_DEPENDENCIES = liblxc.la
-am__lxc_freeze_SOURCES_DIST = tools/lxc_freeze.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_freeze_OBJECTS = tools/lxc_freeze.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_freeze_OBJECTS = $(am_lxc_freeze_OBJECTS)
-lxc_freeze_LDADD = $(LDADD)
-lxc_freeze_DEPENDENCIES = liblxc.la
-am__lxc_info_SOURCES_DIST = tools/lxc_info.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_info_OBJECTS = tools/lxc_info.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_info_OBJECTS = $(am_lxc_info_OBJECTS)
-lxc_info_LDADD = $(LDADD)
-lxc_info_DEPENDENCIES = liblxc.la
-am__lxc_ls_SOURCES_DIST = tools/lxc_ls.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_ls_OBJECTS = tools/lxc_ls.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_ls_OBJECTS = $(am_lxc_ls_OBJECTS)
-lxc_ls_LDADD = $(LDADD)
-lxc_ls_DEPENDENCIES = liblxc.la
-am__lxc_monitor_SOURCES_DIST = tools/lxc_monitor.c macro.h \
-	tools/arguments.c tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_monitor_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	tools/lxc_monitor.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_monitor_OBJECTS = $(am_lxc_monitor_OBJECTS)
-lxc_monitor_LDADD = $(LDADD)
-lxc_monitor_DEPENDENCIES = liblxc.la
-am__lxc_monitord_SOURCES_DIST = cmd/lxc_monitord.c af_unix.c af_unix.h \
-	log.c log.h mainloop.c mainloop.h monitor.c monitor.h \
-	process_utils.c process_utils.h syscall_numbers.h utils.c \
-	utils.h
-@ENABLE_COMMANDS_TRUE@am_lxc_monitord_OBJECTS =  \
-@ENABLE_COMMANDS_TRUE@	cmd/lxc_monitord.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	af_unix.$(OBJEXT) log.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	mainloop.$(OBJEXT) monitor.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	process_utils.$(OBJEXT) utils.$(OBJEXT)
-lxc_monitord_OBJECTS = $(am_lxc_monitord_OBJECTS)
-lxc_monitord_LDADD = $(LDADD)
-lxc_monitord_DEPENDENCIES = liblxc.la
-am__lxc_snapshot_SOURCES_DIST = tools/lxc_snapshot.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_snapshot_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	tools/lxc_snapshot.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_snapshot_OBJECTS = $(am_lxc_snapshot_OBJECTS)
-lxc_snapshot_LDADD = $(LDADD)
-lxc_snapshot_DEPENDENCIES = liblxc.la
-am__lxc_start_SOURCES_DIST = tools/lxc_start.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_start_OBJECTS = tools/lxc_start.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_start_OBJECTS = $(am_lxc_start_OBJECTS)
-lxc_start_LDADD = $(LDADD)
-lxc_start_DEPENDENCIES = liblxc.la
-am__lxc_stop_SOURCES_DIST = tools/lxc_stop.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_stop_OBJECTS = tools/lxc_stop.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_stop_OBJECTS = $(am_lxc_stop_OBJECTS)
-lxc_stop_LDADD = $(LDADD)
-lxc_stop_DEPENDENCIES = liblxc.la
-am__lxc_top_SOURCES_DIST = tools/lxc_top.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_top_OBJECTS = tools/lxc_top.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_top_OBJECTS = $(am_lxc_top_OBJECTS)
-lxc_top_LDADD = $(LDADD)
-lxc_top_DEPENDENCIES = liblxc.la
-am__lxc_unfreeze_SOURCES_DIST = tools/lxc_unfreeze.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_unfreeze_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	tools/lxc_unfreeze.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_unfreeze_OBJECTS = $(am_lxc_unfreeze_OBJECTS)
-lxc_unfreeze_LDADD = $(LDADD)
-lxc_unfreeze_DEPENDENCIES = liblxc.la
-am__lxc_unshare_SOURCES_DIST = tools/lxc_unshare.c syscall_numbers.h \
-	syscall_wrappers.h tools/arguments.c tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_unshare_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	tools/lxc_unshare.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_unshare_OBJECTS = $(am_lxc_unshare_OBJECTS)
-lxc_unshare_LDADD = $(LDADD)
-lxc_unshare_DEPENDENCIES = liblxc.la
-am__lxc_user_nic_SOURCES_DIST = cmd/lxc_user_nic.c \
-	../include/netns_ifaddrs.c ../include/netns_ifaddrs.h log.c \
-	log.h memory_utils.h network.c network.h parse.c parse.h \
-	process_utils.c process_utils.h syscall_numbers.h file_utils.c \
-	file_utils.h string_utils.c string_utils.h syscall_wrappers.h
-@ENABLE_COMMANDS_TRUE@am_lxc_user_nic_OBJECTS =  \
-@ENABLE_COMMANDS_TRUE@	cmd/lxc_user_nic.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	../include/netns_ifaddrs.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	log.$(OBJEXT) network.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	parse.$(OBJEXT) process_utils.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	file_utils.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	string_utils.$(OBJEXT)
-lxc_user_nic_OBJECTS = $(am_lxc_user_nic_OBJECTS)
-lxc_user_nic_LDADD = $(LDADD)
-lxc_user_nic_DEPENDENCIES = liblxc.la
-am__lxc_usernsexec_SOURCES_DIST = cmd/lxc_usernsexec.c conf.c conf.h \
-	file_utils.c file_utils.h list.h log.c log.h macro.h \
-	memory_utils.h string_utils.c string_utils.h \
-	syscall_wrappers.h utils.c utils.h
-@ENABLE_COMMANDS_TRUE@am_lxc_usernsexec_OBJECTS =  \
-@ENABLE_COMMANDS_TRUE@	cmd/lxc_usernsexec.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	conf.$(OBJEXT) file_utils.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	log.$(OBJEXT) string_utils.$(OBJEXT) \
-@ENABLE_COMMANDS_TRUE@	utils.$(OBJEXT)
-lxc_usernsexec_OBJECTS = $(am_lxc_usernsexec_OBJECTS)
-lxc_usernsexec_LDADD = $(LDADD)
-lxc_usernsexec_DEPENDENCIES = liblxc.la
-am__lxc_wait_SOURCES_DIST = tools/lxc_wait.c tools/arguments.c \
-	tools/arguments.h
-@ENABLE_TOOLS_TRUE@am_lxc_wait_OBJECTS = tools/lxc_wait.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	tools/arguments.$(OBJEXT)
-lxc_wait_OBJECTS = $(am_lxc_wait_OBJECTS)
-lxc_wait_LDADD = $(LDADD)
-lxc_wait_DEPENDENCIES = liblxc.la
-SCRIPTS = $(bin_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ../include/$(DEPDIR)/init_lxc_static-getline.Po \
-	../include/$(DEPDIR)/init_lxc_static-strlcat.Po \
-	../include/$(DEPDIR)/init_lxc_static-strlcpy.Po \
-	../include/$(DEPDIR)/liblxc_la-fexecve.Plo \
-	../include/$(DEPDIR)/liblxc_la-getgrgid_r.Plo \
-	../include/$(DEPDIR)/liblxc_la-getline.Plo \
-	../include/$(DEPDIR)/liblxc_la-lxcmntent.Plo \
-	../include/$(DEPDIR)/liblxc_la-netns_ifaddrs.Plo \
-	../include/$(DEPDIR)/liblxc_la-openpty.Plo \
-	../include/$(DEPDIR)/liblxc_la-prlimit.Plo \
-	../include/$(DEPDIR)/liblxc_la-strlcat.Plo \
-	../include/$(DEPDIR)/liblxc_la-strlcpy.Plo \
-	../include/$(DEPDIR)/netns_ifaddrs.Po \
-	../include/$(DEPDIR)/pam_cgfs_la-strlcat.Plo \
-	../include/$(DEPDIR)/pam_cgfs_la-strlcpy.Plo \
-	./$(DEPDIR)/af_unix.Po ./$(DEPDIR)/conf.Po \
-	./$(DEPDIR)/file_utils.Po ./$(DEPDIR)/init_lxc_static-caps.Po \
-	./$(DEPDIR)/init_lxc_static-error.Po \
-	./$(DEPDIR)/init_lxc_static-file_utils.Po \
-	./$(DEPDIR)/init_lxc_static-initutils.Po \
-	./$(DEPDIR)/init_lxc_static-log.Po \
-	./$(DEPDIR)/init_lxc_static-namespace.Po \
-	./$(DEPDIR)/init_lxc_static-string_utils.Po \
-	./$(DEPDIR)/initutils.Po ./$(DEPDIR)/liblxc_la-af_unix.Plo \
-	./$(DEPDIR)/liblxc_la-attach.Plo \
-	./$(DEPDIR)/liblxc_la-caps.Plo \
-	./$(DEPDIR)/liblxc_la-commands.Plo \
-	./$(DEPDIR)/liblxc_la-commands_utils.Plo \
-	./$(DEPDIR)/liblxc_la-conf.Plo \
-	./$(DEPDIR)/liblxc_la-confile.Plo \
-	./$(DEPDIR)/liblxc_la-confile_utils.Plo \
-	./$(DEPDIR)/liblxc_la-criu.Plo ./$(DEPDIR)/liblxc_la-error.Plo \
-	./$(DEPDIR)/liblxc_la-execute.Plo \
-	./$(DEPDIR)/liblxc_la-file_utils.Plo \
-	./$(DEPDIR)/liblxc_la-freezer.Plo \
-	./$(DEPDIR)/liblxc_la-initutils.Plo \
-	./$(DEPDIR)/liblxc_la-log.Plo \
-	./$(DEPDIR)/liblxc_la-lxccontainer.Plo \
-	./$(DEPDIR)/liblxc_la-lxclock.Plo \
-	./$(DEPDIR)/liblxc_la-mainloop.Plo \
-	./$(DEPDIR)/liblxc_la-monitor.Plo \
-	./$(DEPDIR)/liblxc_la-namespace.Plo \
-	./$(DEPDIR)/liblxc_la-network.Plo ./$(DEPDIR)/liblxc_la-nl.Plo \
-	./$(DEPDIR)/liblxc_la-parse.Plo \
-	./$(DEPDIR)/liblxc_la-process_utils.Plo \
-	./$(DEPDIR)/liblxc_la-rexec.Plo \
-	./$(DEPDIR)/liblxc_la-ringbuf.Plo \
-	./$(DEPDIR)/liblxc_la-rtnl.Plo \
-	./$(DEPDIR)/liblxc_la-seccomp.Plo \
-	./$(DEPDIR)/liblxc_la-start.Plo \
-	./$(DEPDIR)/liblxc_la-state.Plo \
-	./$(DEPDIR)/liblxc_la-string_utils.Plo \
-	./$(DEPDIR)/liblxc_la-sync.Plo \
-	./$(DEPDIR)/liblxc_la-terminal.Plo \
-	./$(DEPDIR)/liblxc_la-utils.Plo ./$(DEPDIR)/liblxc_la-uuid.Plo \
-	./$(DEPDIR)/log.Po ./$(DEPDIR)/mainloop.Po \
-	./$(DEPDIR)/monitor.Po ./$(DEPDIR)/network.Po \
-	./$(DEPDIR)/pam_cgfs_la-file_utils.Plo \
-	./$(DEPDIR)/pam_cgfs_la-string_utils.Plo ./$(DEPDIR)/parse.Po \
-	./$(DEPDIR)/process_utils.Po ./$(DEPDIR)/rexec.Po \
-	./$(DEPDIR)/string_utils.Po ./$(DEPDIR)/utils.Po \
-	cgroups/$(DEPDIR)/liblxc_la-cgfsng.Plo \
-	cgroups/$(DEPDIR)/liblxc_la-cgroup.Plo \
-	cgroups/$(DEPDIR)/liblxc_la-cgroup2_devices.Plo \
-	cgroups/$(DEPDIR)/liblxc_la-cgroup_utils.Plo \
-	cmd/$(DEPDIR)/init_lxc_static-lxc_init.Po \
-	cmd/$(DEPDIR)/lxc_init.Po cmd/$(DEPDIR)/lxc_monitord.Po \
-	cmd/$(DEPDIR)/lxc_user_nic.Po cmd/$(DEPDIR)/lxc_usernsexec.Po \
-	lsm/$(DEPDIR)/liblxc_la-apparmor.Plo \
-	lsm/$(DEPDIR)/liblxc_la-lsm.Plo \
-	lsm/$(DEPDIR)/liblxc_la-nop.Plo \
-	lsm/$(DEPDIR)/liblxc_la-selinux.Plo \
-	pam/$(DEPDIR)/cgfs_la-pam_cgfs.Plo \
-	storage/$(DEPDIR)/liblxc_la-btrfs.Plo \
-	storage/$(DEPDIR)/liblxc_la-dir.Plo \
-	storage/$(DEPDIR)/liblxc_la-loop.Plo \
-	storage/$(DEPDIR)/liblxc_la-lvm.Plo \
-	storage/$(DEPDIR)/liblxc_la-nbd.Plo \
-	storage/$(DEPDIR)/liblxc_la-overlay.Plo \
-	storage/$(DEPDIR)/liblxc_la-rbd.Plo \
-	storage/$(DEPDIR)/liblxc_la-rsync.Plo \
-	storage/$(DEPDIR)/liblxc_la-storage.Plo \
-	storage/$(DEPDIR)/liblxc_la-storage_utils.Plo \
-	storage/$(DEPDIR)/liblxc_la-zfs.Plo \
-	storage/$(DEPDIR)/storage_utils.Po \
-	tools/$(DEPDIR)/arguments.Po tools/$(DEPDIR)/lxc_attach.Po \
-	tools/$(DEPDIR)/lxc_autostart.Po tools/$(DEPDIR)/lxc_cgroup.Po \
-	tools/$(DEPDIR)/lxc_checkpoint.Po \
-	tools/$(DEPDIR)/lxc_config.Po tools/$(DEPDIR)/lxc_console.Po \
-	tools/$(DEPDIR)/lxc_copy.Po tools/$(DEPDIR)/lxc_create.Po \
-	tools/$(DEPDIR)/lxc_destroy.Po tools/$(DEPDIR)/lxc_device.Po \
-	tools/$(DEPDIR)/lxc_execute.Po tools/$(DEPDIR)/lxc_freeze.Po \
-	tools/$(DEPDIR)/lxc_info.Po tools/$(DEPDIR)/lxc_ls.Po \
-	tools/$(DEPDIR)/lxc_monitor.Po tools/$(DEPDIR)/lxc_snapshot.Po \
-	tools/$(DEPDIR)/lxc_start.Po tools/$(DEPDIR)/lxc_stop.Po \
-	tools/$(DEPDIR)/lxc_top.Po tools/$(DEPDIR)/lxc_unfreeze.Po \
-	tools/$(DEPDIR)/lxc_unshare.Po tools/$(DEPDIR)/lxc_wait.Po \
-	tools/include/$(DEPDIR)/getsubopt.Po
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(liblxc_la_SOURCES) $(pam_cgfs_la_SOURCES) \
-	$(init_lxc_SOURCES) $(init_lxc_static_SOURCES) \
-	$(lxc_attach_SOURCES) $(lxc_autostart_SOURCES) \
-	$(lxc_cgroup_SOURCES) $(lxc_checkpoint_SOURCES) \
-	$(lxc_config_SOURCES) $(lxc_console_SOURCES) \
-	$(lxc_copy_SOURCES) $(lxc_create_SOURCES) \
-	$(lxc_destroy_SOURCES) $(lxc_device_SOURCES) \
-	$(lxc_execute_SOURCES) $(lxc_freeze_SOURCES) \
-	$(lxc_info_SOURCES) $(lxc_ls_SOURCES) $(lxc_monitor_SOURCES) \
-	$(lxc_monitord_SOURCES) $(lxc_snapshot_SOURCES) \
-	$(lxc_start_SOURCES) $(lxc_stop_SOURCES) $(lxc_top_SOURCES) \
-	$(lxc_unfreeze_SOURCES) $(lxc_unshare_SOURCES) \
-	$(lxc_user_nic_SOURCES) $(lxc_usernsexec_SOURCES) \
-	$(lxc_wait_SOURCES)
-DIST_SOURCES = $(am__liblxc_la_SOURCES_DIST) \
-	$(am__pam_cgfs_la_SOURCES_DIST) $(am__init_lxc_SOURCES_DIST) \
-	$(am__init_lxc_static_SOURCES_DIST) \
-	$(am__lxc_attach_SOURCES_DIST) \
-	$(am__lxc_autostart_SOURCES_DIST) \
-	$(am__lxc_cgroup_SOURCES_DIST) \
-	$(am__lxc_checkpoint_SOURCES_DIST) \
-	$(am__lxc_config_SOURCES_DIST) $(am__lxc_console_SOURCES_DIST) \
-	$(am__lxc_copy_SOURCES_DIST) $(am__lxc_create_SOURCES_DIST) \
-	$(am__lxc_destroy_SOURCES_DIST) $(am__lxc_device_SOURCES_DIST) \
-	$(am__lxc_execute_SOURCES_DIST) $(am__lxc_freeze_SOURCES_DIST) \
-	$(am__lxc_info_SOURCES_DIST) $(am__lxc_ls_SOURCES_DIST) \
-	$(am__lxc_monitor_SOURCES_DIST) \
-	$(am__lxc_monitord_SOURCES_DIST) \
-	$(am__lxc_snapshot_SOURCES_DIST) $(am__lxc_start_SOURCES_DIST) \
-	$(am__lxc_stop_SOURCES_DIST) $(am__lxc_top_SOURCES_DIST) \
-	$(am__lxc_unfreeze_SOURCES_DIST) \
-	$(am__lxc_unshare_SOURCES_DIST) \
-	$(am__lxc_user_nic_SOURCES_DIST) \
-	$(am__lxc_usernsexec_SOURCES_DIST) \
-	$(am__lxc_wait_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__noinst_HEADERS_DIST = api_extensions.h attach.h caps.h \
-	cgroups/cgroup.h cgroups/cgroup_utils.h \
-	cgroups/cgroup2_devices.h compiler.h conf.h confile.h \
-	confile_utils.h criu.h error.h file_utils.h \
-	../include/netns_ifaddrs.h initutils.h list.h log.h lxc.h \
-	lxclock.h macro.h memory_utils.h monitor.h namespace.h \
-	process_utils.h rexec.h start.h state.h storage/btrfs.h \
-	storage/dir.h storage/loop.h storage/lvm.h storage/nbd.h \
-	storage/overlay.h storage/rbd.h storage/rsync.h \
-	storage/storage.h storage/storage_utils.h storage/zfs.h \
-	string_utils.h syscall_numbers.h syscall_wrappers.h terminal.h \
-	../tests/lxctest.h tools/arguments.h utils.h uuid.h \
-	../include/fexecve.h ../include/lxcmntent.h \
-	../include/openpty.h ../include/prlimit.h ../include/getline.h \
-	tools/include/getsubopt.h ../include/getgrgid_r.h
-HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc.functions.in \
-	$(srcdir)/version.h.in $(top_srcdir)/config/depcomp
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-pkginclude_HEADERS = attach_options.h \
-		     lxccontainer.h \
-		     version.h
-
-noinst_HEADERS = api_extensions.h attach.h caps.h cgroups/cgroup.h \
-	cgroups/cgroup_utils.h cgroups/cgroup2_devices.h compiler.h \
-	conf.h confile.h confile_utils.h criu.h error.h file_utils.h \
-	../include/netns_ifaddrs.h initutils.h list.h log.h lxc.h \
-	lxclock.h macro.h memory_utils.h monitor.h namespace.h \
-	process_utils.h rexec.h start.h state.h storage/btrfs.h \
-	storage/dir.h storage/loop.h storage/lvm.h storage/nbd.h \
-	storage/overlay.h storage/rbd.h storage/rsync.h \
-	storage/storage.h storage/storage_utils.h storage/zfs.h \
-	string_utils.h syscall_numbers.h syscall_wrappers.h terminal.h \
-	../tests/lxctest.h tools/arguments.h storage/storage_utils.h \
-	utils.h uuid.h $(am__append_1) $(am__append_2) $(am__append_3) \
-	$(am__append_4) $(am__append_5)
-sodir = $(libdir)
-LSM_SOURCES = lsm/lsm.c lsm/lsm.h lsm/nop.c $(am__append_6) \
-	$(am__append_7)
-lib_LTLIBRARIES = liblxc.la
-liblxc_la_SOURCES = af_unix.c af_unix.h api_extensions.h attach.c \
-	attach.h caps.c caps.h cgroups/cgfsng.c cgroups/cgroup.c \
-	cgroups/cgroup.h cgroups/cgroup2_devices.c \
-	cgroups/cgroup2_devices.h cgroups/cgroup_utils.c \
-	cgroups/cgroup_utils.h compiler.h commands.c commands.h \
-	commands_utils.c commands_utils.h conf.c conf.h confile.c \
-	confile.h confile_utils.c confile_utils.h criu.c criu.h \
-	error.c error.h execute.c freezer.c file_utils.c file_utils.h \
-	../include/netns_ifaddrs.c ../include/netns_ifaddrs.h \
-	initutils.c initutils.h list.h log.c log.h lxc.h \
-	lxccontainer.c lxccontainer.h lxclock.c lxclock.h lxcseccomp.h \
-	macro.h memory_utils.h mainloop.c mainloop.h namespace.c \
-	namespace.h nl.c nl.h network.c network.h monitor.c monitor.h \
-	parse.c parse.h process_utils.c process_utils.h ringbuf.c \
-	ringbuf.h rtnl.c rtnl.h state.c state.h start.c start.h \
-	storage/btrfs.c storage/btrfs.h storage/dir.c storage/dir.h \
-	storage/loop.c storage/loop.h storage/lvm.c storage/lvm.h \
-	storage/nbd.c storage/nbd.h storage/overlay.c \
-	storage/overlay.h storage/rbd.c storage/rbd.h storage/rsync.c \
-	storage/rsync.h storage/storage.c storage/storage.h \
-	storage/storage_utils.c storage/storage_utils.h storage/zfs.c \
-	storage/zfs.h string_utils.c string_utils.h sync.c sync.h \
-	syscall_numbers.h syscall_wrappers.h terminal.c utils.c \
-	utils.h uuid.c uuid.h version.h $(LSM_SOURCES) $(am__append_8) \
-	$(am__append_9) $(am__append_10) $(am__append_11) \
-	$(am__append_12) $(am__append_13) $(am__append_14) \
-	$(am__append_15)
-AM_CFLAGS = -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
-	-DLXCPATH=\"$(LXCPATH)\" \
-	-DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
-	-DLXCINITDIR=\"$(LXCINITDIR)\" -DLIBEXECDIR=\"$(LIBEXECDIR)\" \
-	-DLXCTEMPLATEDIR=\"$(LXCTEMPLATEDIR)\" \
-	-DLXCTEMPLATECONFIG=\"$(LXCTEMPLATECONFIG)\" \
-	-DLOGPATH=\"$(LOGPATH)\" \
-	-DLXC_DEFAULT_CONFIG=\"$(LXC_DEFAULT_CONFIG)\" \
-	-DLXC_USERNIC_DB=\"$(LXC_USERNIC_DB)\" \
-	-DLXC_USERNIC_CONF=\"$(LXC_USERNIC_CONF)\" \
-	-DDEFAULT_CGROUP_PATTERN=\"$(DEFAULT_CGROUP_PATTERN)\" \
-	-DRUNTIME_PATH=\"$(RUNTIME_PATH)\" -DSBINDIR=\"$(SBINDIR)\" \
-	-DAPPARMOR_CACHE_DIR=\"$(APPARMOR_CACHE_DIR)\" -I \
-	$(top_srcdir)/src -I $(top_srcdir)/src/lxc -I \
-	$(top_srcdir)/src/lxc/storage -I $(top_srcdir)/src/lxc/cgroups \
-	$(am__append_16) $(am__append_17) $(am__append_18) \
-	$(am__append_19) $(am__append_20) $(am__append_21)
-
-# build the shared library
-liblxc_la_CFLAGS = -fPIC -DPIC $(AM_CFLAGS) $(LIBLXC_SANITIZER) \
-	-pthread $(am__append_22) $(am__append_23)
-liblxc_la_LDFLAGS = -pthread \
-		    -Wl,-no-undefined \
-		    -Wl,-soname,liblxc.so.$(firstword $(subst ., ,@LXC_ABI@)) \
-		    -version-info @LXC_ABI_MAJOR@
-
-liblxc_la_LIBADD = $(CAP_LIBS) \
-		   $(OPENSSL_LIBS) \
-		   $(SELINUX_LIBS) \
-		   $(SECCOMP_LIBS) \
-		   $(DLOG_LIBS)
-
-bin_SCRIPTS = $(am__append_24)
-AM_LDFLAGS = -Wl,-E $(am__append_26)
-LDADD = liblxc.la \
-	@CAP_LIBS@ \
-	@OPENSSL_LIBS@ \
-	@SECCOMP_LIBS@ \
-	@SELINUX_LIBS@ \
-	@DLOG_LIBS@
-
-@ENABLE_TOOLS_TRUE@lxc_attach_SOURCES = tools/lxc_attach.c \
-@ENABLE_TOOLS_TRUE@		     rexec.c rexec.h \
-@ENABLE_TOOLS_TRUE@		     tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_autostart_SOURCES = tools/lxc_autostart.c \
-@ENABLE_TOOLS_TRUE@			tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
-@ENABLE_TOOLS_TRUE@		     tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_config_SOURCES = tools/lxc_config.c \
-@ENABLE_TOOLS_TRUE@		     tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_console_SOURCES = tools/lxc_console.c \
-@ENABLE_TOOLS_TRUE@		      tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_destroy_SOURCES = tools/lxc_destroy.c \
-@ENABLE_TOOLS_TRUE@		      tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_device_SOURCES = tools/lxc_device.c \
-@ENABLE_TOOLS_TRUE@		     tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_execute_SOURCES = tools/lxc_execute.c \
-@ENABLE_TOOLS_TRUE@		      tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_freeze_SOURCES = tools/lxc_freeze.c \
-@ENABLE_TOOLS_TRUE@		     tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_info_SOURCES = tools/lxc_info.c \
-@ENABLE_TOOLS_TRUE@		   tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_monitor_SOURCES = tools/lxc_monitor.c \
-@ENABLE_TOOLS_TRUE@		      macro.h \
-@ENABLE_TOOLS_TRUE@		      tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_ls_SOURCES = tools/lxc_ls.c \
-@ENABLE_TOOLS_TRUE@		 tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_copy_SOURCES = tools/lxc_copy.c \
-@ENABLE_TOOLS_TRUE@	tools/arguments.c tools/arguments.h \
-@ENABLE_TOOLS_TRUE@	storage/storage_utils.c \
-@ENABLE_TOOLS_TRUE@	storage/storage_utils.h $(am__append_27)
-@ENABLE_TOOLS_TRUE@lxc_start_SOURCES = tools/lxc_start.c \
-@ENABLE_TOOLS_TRUE@		    tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_stop_SOURCES = tools/lxc_stop.c \
-@ENABLE_TOOLS_TRUE@		   tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_top_SOURCES = tools/lxc_top.c \
-@ENABLE_TOOLS_TRUE@		  tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
-@ENABLE_TOOLS_TRUE@		       tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_unshare_SOURCES = tools/lxc_unshare.c \
-@ENABLE_TOOLS_TRUE@		      syscall_numbers.h \
-@ENABLE_TOOLS_TRUE@		      syscall_wrappers.h \
-@ENABLE_TOOLS_TRUE@		      tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_wait_SOURCES = tools/lxc_wait.c \
-@ENABLE_TOOLS_TRUE@		   tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_create_SOURCES = tools/lxc_create.c \
-@ENABLE_TOOLS_TRUE@		     tools/arguments.c tools/arguments.h \
-@ENABLE_TOOLS_TRUE@		     storage/storage_utils.c storage/storage_utils.h
-
-@ENABLE_TOOLS_TRUE@lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
-@ENABLE_TOOLS_TRUE@		       tools/arguments.c tools/arguments.h
-
-@ENABLE_TOOLS_TRUE@lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
-@ENABLE_TOOLS_TRUE@			 tools/arguments.c tools/arguments.h
-
-
-# Binaries shipping with liblxc
-@ENABLE_COMMANDS_TRUE@init_lxc_SOURCES = cmd/lxc_init.c \
-@ENABLE_COMMANDS_TRUE@		   compiler.h \
-@ENABLE_COMMANDS_TRUE@		   error.h \
-@ENABLE_COMMANDS_TRUE@		   initutils.c initutils.h \
-@ENABLE_COMMANDS_TRUE@		   memory_utils.h \
-@ENABLE_COMMANDS_TRUE@		   parse.c parse.h \
-@ENABLE_COMMANDS_TRUE@		   process_utils.c process_utils.h \
-@ENABLE_COMMANDS_TRUE@		   syscall_numbers.h \
-@ENABLE_COMMANDS_TRUE@		   string_utils.c string_utils.h
-
-@ENABLE_COMMANDS_TRUE@init_lxc_LDFLAGS = -pthread
-@ENABLE_COMMANDS_TRUE@lxc_monitord_SOURCES = cmd/lxc_monitord.c \
-@ENABLE_COMMANDS_TRUE@		       af_unix.c af_unix.h \
-@ENABLE_COMMANDS_TRUE@		       log.c log.h \
-@ENABLE_COMMANDS_TRUE@		       mainloop.c mainloop.h \
-@ENABLE_COMMANDS_TRUE@		       monitor.c monitor.h \
-@ENABLE_COMMANDS_TRUE@		       process_utils.c process_utils.h \
-@ENABLE_COMMANDS_TRUE@		       syscall_numbers.h \
-@ENABLE_COMMANDS_TRUE@		       utils.c utils.h
-
-@ENABLE_COMMANDS_TRUE@lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
-@ENABLE_COMMANDS_TRUE@		       ../include/netns_ifaddrs.c ../include/netns_ifaddrs.h \
-@ENABLE_COMMANDS_TRUE@		       log.c log.h \
-@ENABLE_COMMANDS_TRUE@		       memory_utils.h \
-@ENABLE_COMMANDS_TRUE@		       network.c network.h \
-@ENABLE_COMMANDS_TRUE@		       parse.c parse.h \
-@ENABLE_COMMANDS_TRUE@		       process_utils.c process_utils.h \
-@ENABLE_COMMANDS_TRUE@		       syscall_numbers.h \
-@ENABLE_COMMANDS_TRUE@		       file_utils.c file_utils.h \
-@ENABLE_COMMANDS_TRUE@		       string_utils.c string_utils.h \
-@ENABLE_COMMANDS_TRUE@		       syscall_wrappers.h
-
-@ENABLE_COMMANDS_TRUE@lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
-@ENABLE_COMMANDS_TRUE@			 conf.c conf.h \
-@ENABLE_COMMANDS_TRUE@			 file_utils.c file_utils.h \
-@ENABLE_COMMANDS_TRUE@			 list.h \
-@ENABLE_COMMANDS_TRUE@			 log.c log.h \
-@ENABLE_COMMANDS_TRUE@			 macro.h \
-@ENABLE_COMMANDS_TRUE@			 memory_utils.h \
-@ENABLE_COMMANDS_TRUE@			 string_utils.c string_utils.h \
-@ENABLE_COMMANDS_TRUE@			 syscall_wrappers.h \
-@ENABLE_COMMANDS_TRUE@			 utils.c utils.h
-
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@init_lxc_static_SOURCES =  \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	cmd/lxc_init.c \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	caps.c caps.h \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	error.c error.h \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	initutils.c \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	initutils.h \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	file_utils.c \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	file_utils.h \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	log.c log.h \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	macro.h \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	memory_utils.h \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	namespace.c \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	namespace.h \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	string_utils.c \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	string_utils.h \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	$(am__append_29) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	$(am__append_30) \
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@	$(am__append_31)
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@init_lxc_static_LDFLAGS = -all-static -pthread
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@init_lxc_static_LDADD = @CAP_LIBS@
-@ENABLE_COMMANDS_TRUE@@HAVE_STATIC_LIBCAP_TRUE@init_lxc_static_CFLAGS = $(AM_CFLAGS) -DNO_LXC_CONF
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@pam_LTLIBRARIES = pam_cgfs.la
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@pam_cgfs_la_SOURCES = pam/pam_cgfs.c \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	file_utils.c file_utils.h \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	macro.h memory_utils.h \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	string_utils.c string_utils.h \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	$(am__append_32) \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	$(am__append_33)
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@pam_cgfs_la_CFLAGS = $(AM_CFLAGS) -DNO_LXC_CONF
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@pam_cgfs_la_LIBADD = $(AM_LIBS) \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@		     $(PAM_LIBS) \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@		     $(DLOG_LIBS) \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@		     -L$(top_srcdir)
-
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@pam_cgfs_la_LDFLAGS = $(AM_LDFLAGS) \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@		      -avoid-version \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@		      -module \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@		      -shared \
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@		      -Wl,-no-undefined
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lxc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/lxc/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc.functions: $(top_builddir)/config.status $(srcdir)/lxc.functions.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-version.h: $(top_builddir)/config.status $(srcdir)/version.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	 || test -f $$p1 \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1 } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) filesd = filesd " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \
-	fi; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	 || test -f $$p1 \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1 } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) filesd = filesd " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-pkglibexecPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files
-
-clean-pkglibexecPROGRAMS:
-	@list='$(pkglibexec_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-install-sbinPROGRAMS: $(sbin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
-	fi; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	 || test -f $$p1 \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1 } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) filesd = filesd " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-sbinPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
-
-clean-sbinPROGRAMS:
-	@list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-install-pamLTLIBRARIES: $(pam_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(pam_LTLIBRARIES)'; test -n "$(pamdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pamdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pamdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pamdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pamdir)"; \
-	}
-
-uninstall-pamLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pam_LTLIBRARIES)'; test -n "$(pamdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pamdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pamdir)/$$f"; \
-	done
-
-clean-pamLTLIBRARIES:
-	-test -z "$(pam_LTLIBRARIES)" || rm -f $(pam_LTLIBRARIES)
-	@list='$(pam_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-cgroups/$(am__dirstamp):
-	@$(MKDIR_P) cgroups
-	@: > cgroups/$(am__dirstamp)
-cgroups/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) cgroups/$(DEPDIR)
-	@: > cgroups/$(DEPDIR)/$(am__dirstamp)
-cgroups/liblxc_la-cgfsng.lo: cgroups/$(am__dirstamp) \
-	cgroups/$(DEPDIR)/$(am__dirstamp)
-cgroups/liblxc_la-cgroup.lo: cgroups/$(am__dirstamp) \
-	cgroups/$(DEPDIR)/$(am__dirstamp)
-cgroups/liblxc_la-cgroup2_devices.lo: cgroups/$(am__dirstamp) \
-	cgroups/$(DEPDIR)/$(am__dirstamp)
-cgroups/liblxc_la-cgroup_utils.lo: cgroups/$(am__dirstamp) \
-	cgroups/$(DEPDIR)/$(am__dirstamp)
-../include/$(am__dirstamp):
-	@$(MKDIR_P) ../include
-	@: > ../include/$(am__dirstamp)
-../include/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../include/$(DEPDIR)
-	@: > ../include/$(DEPDIR)/$(am__dirstamp)
-../include/liblxc_la-netns_ifaddrs.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-storage/$(am__dirstamp):
-	@$(MKDIR_P) storage
-	@: > storage/$(am__dirstamp)
-storage/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) storage/$(DEPDIR)
-	@: > storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-btrfs.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-dir.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-loop.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-lvm.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-nbd.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-overlay.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-rbd.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-rsync.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-storage.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-storage_utils.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-storage/liblxc_la-zfs.lo: storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-lsm/$(am__dirstamp):
-	@$(MKDIR_P) lsm
-	@: > lsm/$(am__dirstamp)
-lsm/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) lsm/$(DEPDIR)
-	@: > lsm/$(DEPDIR)/$(am__dirstamp)
-lsm/liblxc_la-lsm.lo: lsm/$(am__dirstamp) \
-	lsm/$(DEPDIR)/$(am__dirstamp)
-lsm/liblxc_la-nop.lo: lsm/$(am__dirstamp) \
-	lsm/$(DEPDIR)/$(am__dirstamp)
-lsm/liblxc_la-apparmor.lo: lsm/$(am__dirstamp) \
-	lsm/$(DEPDIR)/$(am__dirstamp)
-lsm/liblxc_la-selinux.lo: lsm/$(am__dirstamp) \
-	lsm/$(DEPDIR)/$(am__dirstamp)
-../include/liblxc_la-fexecve.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-../include/liblxc_la-lxcmntent.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-../include/liblxc_la-openpty.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-../include/liblxc_la-getgrgid_r.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-../include/liblxc_la-getline.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-../include/liblxc_la-prlimit.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-../include/liblxc_la-strlcpy.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-../include/liblxc_la-strlcat.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-
-liblxc.la: $(liblxc_la_OBJECTS) $(liblxc_la_DEPENDENCIES) $(EXTRA_liblxc_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(liblxc_la_LINK) -rpath $(libdir) $(liblxc_la_OBJECTS) $(liblxc_la_LIBADD) $(LIBS)
-pam/$(am__dirstamp):
-	@$(MKDIR_P) pam
-	@: > pam/$(am__dirstamp)
-pam/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) pam/$(DEPDIR)
-	@: > pam/$(DEPDIR)/$(am__dirstamp)
-pam/cgfs_la-pam_cgfs.lo: pam/$(am__dirstamp) \
-	pam/$(DEPDIR)/$(am__dirstamp)
-../include/pam_cgfs_la-strlcat.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-../include/pam_cgfs_la-strlcpy.lo: ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-
-pam_cgfs.la: $(pam_cgfs_la_OBJECTS) $(pam_cgfs_la_DEPENDENCIES) $(EXTRA_pam_cgfs_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(pam_cgfs_la_LINK) $(am_pam_cgfs_la_rpath) $(pam_cgfs_la_OBJECTS) $(pam_cgfs_la_LIBADD) $(LIBS)
-cmd/$(am__dirstamp):
-	@$(MKDIR_P) cmd
-	@: > cmd/$(am__dirstamp)
-cmd/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) cmd/$(DEPDIR)
-	@: > cmd/$(DEPDIR)/$(am__dirstamp)
-cmd/lxc_init.$(OBJEXT): cmd/$(am__dirstamp) \
-	cmd/$(DEPDIR)/$(am__dirstamp)
-
-init.lxc$(EXEEXT): $(init_lxc_OBJECTS) $(init_lxc_DEPENDENCIES) $(EXTRA_init_lxc_DEPENDENCIES) 
-	@rm -f init.lxc$(EXEEXT)
-	$(AM_V_CCLD)$(init_lxc_LINK) $(init_lxc_OBJECTS) $(init_lxc_LDADD) $(LIBS)
-cmd/init_lxc_static-lxc_init.$(OBJEXT): cmd/$(am__dirstamp) \
-	cmd/$(DEPDIR)/$(am__dirstamp)
-../include/init_lxc_static-getline.$(OBJEXT):  \
-	../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-../include/init_lxc_static-strlcpy.$(OBJEXT):  \
-	../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-../include/init_lxc_static-strlcat.$(OBJEXT):  \
-	../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-
-init.lxc.static$(EXEEXT): $(init_lxc_static_OBJECTS) $(init_lxc_static_DEPENDENCIES) $(EXTRA_init_lxc_static_DEPENDENCIES) 
-	@rm -f init.lxc.static$(EXEEXT)
-	$(AM_V_CCLD)$(init_lxc_static_LINK) $(init_lxc_static_OBJECTS) $(init_lxc_static_LDADD) $(LIBS)
-tools/$(am__dirstamp):
-	@$(MKDIR_P) tools
-	@: > tools/$(am__dirstamp)
-tools/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) tools/$(DEPDIR)
-	@: > tools/$(DEPDIR)/$(am__dirstamp)
-tools/lxc_attach.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-tools/arguments.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-attach$(EXEEXT): $(lxc_attach_OBJECTS) $(lxc_attach_DEPENDENCIES) $(EXTRA_lxc_attach_DEPENDENCIES) 
-	@rm -f lxc-attach$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_attach_OBJECTS) $(lxc_attach_LDADD) $(LIBS)
-tools/lxc_autostart.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-autostart$(EXEEXT): $(lxc_autostart_OBJECTS) $(lxc_autostart_DEPENDENCIES) $(EXTRA_lxc_autostart_DEPENDENCIES) 
-	@rm -f lxc-autostart$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_autostart_OBJECTS) $(lxc_autostart_LDADD) $(LIBS)
-tools/lxc_cgroup.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-cgroup$(EXEEXT): $(lxc_cgroup_OBJECTS) $(lxc_cgroup_DEPENDENCIES) $(EXTRA_lxc_cgroup_DEPENDENCIES) 
-	@rm -f lxc-cgroup$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_cgroup_OBJECTS) $(lxc_cgroup_LDADD) $(LIBS)
-tools/lxc_checkpoint.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-checkpoint$(EXEEXT): $(lxc_checkpoint_OBJECTS) $(lxc_checkpoint_DEPENDENCIES) $(EXTRA_lxc_checkpoint_DEPENDENCIES) 
-	@rm -f lxc-checkpoint$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_checkpoint_OBJECTS) $(lxc_checkpoint_LDADD) $(LIBS)
-tools/lxc_config.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-config$(EXEEXT): $(lxc_config_OBJECTS) $(lxc_config_DEPENDENCIES) $(EXTRA_lxc_config_DEPENDENCIES) 
-	@rm -f lxc-config$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_config_OBJECTS) $(lxc_config_LDADD) $(LIBS)
-tools/lxc_console.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-console$(EXEEXT): $(lxc_console_OBJECTS) $(lxc_console_DEPENDENCIES) $(EXTRA_lxc_console_DEPENDENCIES) 
-	@rm -f lxc-console$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_console_OBJECTS) $(lxc_console_LDADD) $(LIBS)
-tools/lxc_copy.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-storage/storage_utils.$(OBJEXT): storage/$(am__dirstamp) \
-	storage/$(DEPDIR)/$(am__dirstamp)
-tools/include/$(am__dirstamp):
-	@$(MKDIR_P) tools/include
-	@: > tools/include/$(am__dirstamp)
-tools/include/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) tools/include/$(DEPDIR)
-	@: > tools/include/$(DEPDIR)/$(am__dirstamp)
-tools/include/getsubopt.$(OBJEXT): tools/include/$(am__dirstamp) \
-	tools/include/$(DEPDIR)/$(am__dirstamp)
-
-lxc-copy$(EXEEXT): $(lxc_copy_OBJECTS) $(lxc_copy_DEPENDENCIES) $(EXTRA_lxc_copy_DEPENDENCIES) 
-	@rm -f lxc-copy$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_copy_OBJECTS) $(lxc_copy_LDADD) $(LIBS)
-tools/lxc_create.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-create$(EXEEXT): $(lxc_create_OBJECTS) $(lxc_create_DEPENDENCIES) $(EXTRA_lxc_create_DEPENDENCIES) 
-	@rm -f lxc-create$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_create_OBJECTS) $(lxc_create_LDADD) $(LIBS)
-tools/lxc_destroy.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-destroy$(EXEEXT): $(lxc_destroy_OBJECTS) $(lxc_destroy_DEPENDENCIES) $(EXTRA_lxc_destroy_DEPENDENCIES) 
-	@rm -f lxc-destroy$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_destroy_OBJECTS) $(lxc_destroy_LDADD) $(LIBS)
-tools/lxc_device.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-device$(EXEEXT): $(lxc_device_OBJECTS) $(lxc_device_DEPENDENCIES) $(EXTRA_lxc_device_DEPENDENCIES) 
-	@rm -f lxc-device$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_device_OBJECTS) $(lxc_device_LDADD) $(LIBS)
-tools/lxc_execute.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-execute$(EXEEXT): $(lxc_execute_OBJECTS) $(lxc_execute_DEPENDENCIES) $(EXTRA_lxc_execute_DEPENDENCIES) 
-	@rm -f lxc-execute$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_execute_OBJECTS) $(lxc_execute_LDADD) $(LIBS)
-tools/lxc_freeze.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-freeze$(EXEEXT): $(lxc_freeze_OBJECTS) $(lxc_freeze_DEPENDENCIES) $(EXTRA_lxc_freeze_DEPENDENCIES) 
-	@rm -f lxc-freeze$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_freeze_OBJECTS) $(lxc_freeze_LDADD) $(LIBS)
-tools/lxc_info.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-info$(EXEEXT): $(lxc_info_OBJECTS) $(lxc_info_DEPENDENCIES) $(EXTRA_lxc_info_DEPENDENCIES) 
-	@rm -f lxc-info$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_info_OBJECTS) $(lxc_info_LDADD) $(LIBS)
-tools/lxc_ls.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-ls$(EXEEXT): $(lxc_ls_OBJECTS) $(lxc_ls_DEPENDENCIES) $(EXTRA_lxc_ls_DEPENDENCIES) 
-	@rm -f lxc-ls$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_ls_OBJECTS) $(lxc_ls_LDADD) $(LIBS)
-tools/lxc_monitor.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-monitor$(EXEEXT): $(lxc_monitor_OBJECTS) $(lxc_monitor_DEPENDENCIES) $(EXTRA_lxc_monitor_DEPENDENCIES) 
-	@rm -f lxc-monitor$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_monitor_OBJECTS) $(lxc_monitor_LDADD) $(LIBS)
-cmd/lxc_monitord.$(OBJEXT): cmd/$(am__dirstamp) \
-	cmd/$(DEPDIR)/$(am__dirstamp)
-
-lxc-monitord$(EXEEXT): $(lxc_monitord_OBJECTS) $(lxc_monitord_DEPENDENCIES) $(EXTRA_lxc_monitord_DEPENDENCIES) 
-	@rm -f lxc-monitord$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_monitord_OBJECTS) $(lxc_monitord_LDADD) $(LIBS)
-tools/lxc_snapshot.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-snapshot$(EXEEXT): $(lxc_snapshot_OBJECTS) $(lxc_snapshot_DEPENDENCIES) $(EXTRA_lxc_snapshot_DEPENDENCIES) 
-	@rm -f lxc-snapshot$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_snapshot_OBJECTS) $(lxc_snapshot_LDADD) $(LIBS)
-tools/lxc_start.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-start$(EXEEXT): $(lxc_start_OBJECTS) $(lxc_start_DEPENDENCIES) $(EXTRA_lxc_start_DEPENDENCIES) 
-	@rm -f lxc-start$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_start_OBJECTS) $(lxc_start_LDADD) $(LIBS)
-tools/lxc_stop.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-stop$(EXEEXT): $(lxc_stop_OBJECTS) $(lxc_stop_DEPENDENCIES) $(EXTRA_lxc_stop_DEPENDENCIES) 
-	@rm -f lxc-stop$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_stop_OBJECTS) $(lxc_stop_LDADD) $(LIBS)
-tools/lxc_top.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-top$(EXEEXT): $(lxc_top_OBJECTS) $(lxc_top_DEPENDENCIES) $(EXTRA_lxc_top_DEPENDENCIES) 
-	@rm -f lxc-top$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_top_OBJECTS) $(lxc_top_LDADD) $(LIBS)
-tools/lxc_unfreeze.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-unfreeze$(EXEEXT): $(lxc_unfreeze_OBJECTS) $(lxc_unfreeze_DEPENDENCIES) $(EXTRA_lxc_unfreeze_DEPENDENCIES) 
-	@rm -f lxc-unfreeze$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_unfreeze_OBJECTS) $(lxc_unfreeze_LDADD) $(LIBS)
-tools/lxc_unshare.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-unshare$(EXEEXT): $(lxc_unshare_OBJECTS) $(lxc_unshare_DEPENDENCIES) $(EXTRA_lxc_unshare_DEPENDENCIES) 
-	@rm -f lxc-unshare$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_unshare_OBJECTS) $(lxc_unshare_LDADD) $(LIBS)
-cmd/lxc_user_nic.$(OBJEXT): cmd/$(am__dirstamp) \
-	cmd/$(DEPDIR)/$(am__dirstamp)
-../include/netns_ifaddrs.$(OBJEXT): ../include/$(am__dirstamp) \
-	../include/$(DEPDIR)/$(am__dirstamp)
-
-lxc-user-nic$(EXEEXT): $(lxc_user_nic_OBJECTS) $(lxc_user_nic_DEPENDENCIES) $(EXTRA_lxc_user_nic_DEPENDENCIES) 
-	@rm -f lxc-user-nic$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_user_nic_OBJECTS) $(lxc_user_nic_LDADD) $(LIBS)
-cmd/lxc_usernsexec.$(OBJEXT): cmd/$(am__dirstamp) \
-	cmd/$(DEPDIR)/$(am__dirstamp)
-
-lxc-usernsexec$(EXEEXT): $(lxc_usernsexec_OBJECTS) $(lxc_usernsexec_DEPENDENCIES) $(EXTRA_lxc_usernsexec_DEPENDENCIES) 
-	@rm -f lxc-usernsexec$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_usernsexec_OBJECTS) $(lxc_usernsexec_LDADD) $(LIBS)
-tools/lxc_wait.$(OBJEXT): tools/$(am__dirstamp) \
-	tools/$(DEPDIR)/$(am__dirstamp)
-
-lxc-wait$(EXEEXT): $(lxc_wait_OBJECTS) $(lxc_wait_DEPENDENCIES) $(EXTRA_lxc_wait_DEPENDENCIES) 
-	@rm -f lxc-wait$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_wait_OBJECTS) $(lxc_wait_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1; } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) { filesd = filesd " " $$1; \
-	      if (++nd == $(am__install_max)) { \
-		print "f", d, filesd; nd = 0; filesd = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f ../include/*.$(OBJEXT)
-	-rm -f ../include/*.lo
-	-rm -f cgroups/*.$(OBJEXT)
-	-rm -f cgroups/*.lo
-	-rm -f cmd/*.$(OBJEXT)
-	-rm -f lsm/*.$(OBJEXT)
-	-rm -f lsm/*.lo
-	-rm -f pam/*.$(OBJEXT)
-	-rm -f pam/*.lo
-	-rm -f storage/*.$(OBJEXT)
-	-rm -f storage/*.lo
-	-rm -f tools/*.$(OBJEXT)
-	-rm -f tools/include/*.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/init_lxc_static-getline.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/init_lxc_static-strlcat.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/init_lxc_static-strlcpy.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/liblxc_la-fexecve.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/liblxc_la-getgrgid_r.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/liblxc_la-getline.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/liblxc_la-lxcmntent.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/liblxc_la-netns_ifaddrs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/liblxc_la-openpty.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/liblxc_la-prlimit.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/liblxc_la-strlcat.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/liblxc_la-strlcpy.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/netns_ifaddrs.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/pam_cgfs_la-strlcat.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../include/$(DEPDIR)/pam_cgfs_la-strlcpy.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/af_unix.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_lxc_static-caps.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_lxc_static-error.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_lxc_static-file_utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_lxc_static-initutils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_lxc_static-log.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_lxc_static-namespace.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_lxc_static-string_utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/initutils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-af_unix.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-attach.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-caps.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-commands.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-commands_utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-conf.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-confile.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-confile_utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-criu.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-error.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-execute.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-file_utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-freezer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-initutils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-log.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-lxccontainer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-lxclock.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-mainloop.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-monitor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-namespace.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-network.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-nl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-parse.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-process_utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-rexec.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-ringbuf.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-rtnl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-seccomp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-start.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-state.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-string_utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-sync.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-terminal.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblxc_la-uuid.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mainloop.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/monitor.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_cgfs_la-file_utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_cgfs_la-string_utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process_utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rexec.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@cgroups/$(DEPDIR)/liblxc_la-cgfsng.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@cgroups/$(DEPDIR)/liblxc_la-cgroup.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@cgroups/$(DEPDIR)/liblxc_la-cgroup2_devices.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@cgroups/$(DEPDIR)/liblxc_la-cgroup_utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@cmd/$(DEPDIR)/init_lxc_static-lxc_init.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@cmd/$(DEPDIR)/lxc_init.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@cmd/$(DEPDIR)/lxc_monitord.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@cmd/$(DEPDIR)/lxc_user_nic.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@cmd/$(DEPDIR)/lxc_usernsexec.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@lsm/$(DEPDIR)/liblxc_la-apparmor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@lsm/$(DEPDIR)/liblxc_la-lsm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@lsm/$(DEPDIR)/liblxc_la-nop.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@lsm/$(DEPDIR)/liblxc_la-selinux.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@pam/$(DEPDIR)/cgfs_la-pam_cgfs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-btrfs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-dir.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-loop.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-lvm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-nbd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-overlay.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-rbd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-rsync.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-storage.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-storage_utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/liblxc_la-zfs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/storage_utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/arguments.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_attach.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_autostart.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_cgroup.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_checkpoint.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_config.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_console.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_copy.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_create.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_destroy.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_device.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_execute.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_freeze.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_info.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_ls.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_monitor.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_snapshot.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_start.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_stop.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_top.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_unfreeze.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_unshare.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/lxc_wait.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@tools/include/$(DEPDIR)/getsubopt.Po@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-liblxc_la-af_unix.lo: af_unix.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-af_unix.lo -MD -MP -MF $(DEPDIR)/liblxc_la-af_unix.Tpo -c -o liblxc_la-af_unix.lo `test -f 'af_unix.c' || echo '$(srcdir)/'`af_unix.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-af_unix.Tpo $(DEPDIR)/liblxc_la-af_unix.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='af_unix.c' object='liblxc_la-af_unix.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-af_unix.lo `test -f 'af_unix.c' || echo '$(srcdir)/'`af_unix.c
-
-liblxc_la-attach.lo: attach.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-attach.lo -MD -MP -MF $(DEPDIR)/liblxc_la-attach.Tpo -c -o liblxc_la-attach.lo `test -f 'attach.c' || echo '$(srcdir)/'`attach.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-attach.Tpo $(DEPDIR)/liblxc_la-attach.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='attach.c' object='liblxc_la-attach.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-attach.lo `test -f 'attach.c' || echo '$(srcdir)/'`attach.c
-
-liblxc_la-caps.lo: caps.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-caps.lo -MD -MP -MF $(DEPDIR)/liblxc_la-caps.Tpo -c -o liblxc_la-caps.lo `test -f 'caps.c' || echo '$(srcdir)/'`caps.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-caps.Tpo $(DEPDIR)/liblxc_la-caps.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='caps.c' object='liblxc_la-caps.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-caps.lo `test -f 'caps.c' || echo '$(srcdir)/'`caps.c
-
-cgroups/liblxc_la-cgfsng.lo: cgroups/cgfsng.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT cgroups/liblxc_la-cgfsng.lo -MD -MP -MF cgroups/$(DEPDIR)/liblxc_la-cgfsng.Tpo -c -o cgroups/liblxc_la-cgfsng.lo `test -f 'cgroups/cgfsng.c' || echo '$(srcdir)/'`cgroups/cgfsng.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cgroups/$(DEPDIR)/liblxc_la-cgfsng.Tpo cgroups/$(DEPDIR)/liblxc_la-cgfsng.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cgroups/cgfsng.c' object='cgroups/liblxc_la-cgfsng.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o cgroups/liblxc_la-cgfsng.lo `test -f 'cgroups/cgfsng.c' || echo '$(srcdir)/'`cgroups/cgfsng.c
-
-cgroups/liblxc_la-cgroup.lo: cgroups/cgroup.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT cgroups/liblxc_la-cgroup.lo -MD -MP -MF cgroups/$(DEPDIR)/liblxc_la-cgroup.Tpo -c -o cgroups/liblxc_la-cgroup.lo `test -f 'cgroups/cgroup.c' || echo '$(srcdir)/'`cgroups/cgroup.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cgroups/$(DEPDIR)/liblxc_la-cgroup.Tpo cgroups/$(DEPDIR)/liblxc_la-cgroup.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cgroups/cgroup.c' object='cgroups/liblxc_la-cgroup.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o cgroups/liblxc_la-cgroup.lo `test -f 'cgroups/cgroup.c' || echo '$(srcdir)/'`cgroups/cgroup.c
-
-cgroups/liblxc_la-cgroup2_devices.lo: cgroups/cgroup2_devices.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT cgroups/liblxc_la-cgroup2_devices.lo -MD -MP -MF cgroups/$(DEPDIR)/liblxc_la-cgroup2_devices.Tpo -c -o cgroups/liblxc_la-cgroup2_devices.lo `test -f 'cgroups/cgroup2_devices.c' || echo '$(srcdir)/'`cgroups/cgroup2_devices.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cgroups/$(DEPDIR)/liblxc_la-cgroup2_devices.Tpo cgroups/$(DEPDIR)/liblxc_la-cgroup2_devices.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cgroups/cgroup2_devices.c' object='cgroups/liblxc_la-cgroup2_devices.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o cgroups/liblxc_la-cgroup2_devices.lo `test -f 'cgroups/cgroup2_devices.c' || echo '$(srcdir)/'`cgroups/cgroup2_devices.c
-
-cgroups/liblxc_la-cgroup_utils.lo: cgroups/cgroup_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT cgroups/liblxc_la-cgroup_utils.lo -MD -MP -MF cgroups/$(DEPDIR)/liblxc_la-cgroup_utils.Tpo -c -o cgroups/liblxc_la-cgroup_utils.lo `test -f 'cgroups/cgroup_utils.c' || echo '$(srcdir)/'`cgroups/cgroup_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cgroups/$(DEPDIR)/liblxc_la-cgroup_utils.Tpo cgroups/$(DEPDIR)/liblxc_la-cgroup_utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cgroups/cgroup_utils.c' object='cgroups/liblxc_la-cgroup_utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o cgroups/liblxc_la-cgroup_utils.lo `test -f 'cgroups/cgroup_utils.c' || echo '$(srcdir)/'`cgroups/cgroup_utils.c
-
-liblxc_la-commands.lo: commands.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-commands.lo -MD -MP -MF $(DEPDIR)/liblxc_la-commands.Tpo -c -o liblxc_la-commands.lo `test -f 'commands.c' || echo '$(srcdir)/'`commands.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-commands.Tpo $(DEPDIR)/liblxc_la-commands.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='commands.c' object='liblxc_la-commands.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-commands.lo `test -f 'commands.c' || echo '$(srcdir)/'`commands.c
-
-liblxc_la-commands_utils.lo: commands_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-commands_utils.lo -MD -MP -MF $(DEPDIR)/liblxc_la-commands_utils.Tpo -c -o liblxc_la-commands_utils.lo `test -f 'commands_utils.c' || echo '$(srcdir)/'`commands_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-commands_utils.Tpo $(DEPDIR)/liblxc_la-commands_utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='commands_utils.c' object='liblxc_la-commands_utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-commands_utils.lo `test -f 'commands_utils.c' || echo '$(srcdir)/'`commands_utils.c
-
-liblxc_la-conf.lo: conf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-conf.lo -MD -MP -MF $(DEPDIR)/liblxc_la-conf.Tpo -c -o liblxc_la-conf.lo `test -f 'conf.c' || echo '$(srcdir)/'`conf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-conf.Tpo $(DEPDIR)/liblxc_la-conf.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='conf.c' object='liblxc_la-conf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-conf.lo `test -f 'conf.c' || echo '$(srcdir)/'`conf.c
-
-liblxc_la-confile.lo: confile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-confile.lo -MD -MP -MF $(DEPDIR)/liblxc_la-confile.Tpo -c -o liblxc_la-confile.lo `test -f 'confile.c' || echo '$(srcdir)/'`confile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-confile.Tpo $(DEPDIR)/liblxc_la-confile.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='confile.c' object='liblxc_la-confile.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-confile.lo `test -f 'confile.c' || echo '$(srcdir)/'`confile.c
-
-liblxc_la-confile_utils.lo: confile_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-confile_utils.lo -MD -MP -MF $(DEPDIR)/liblxc_la-confile_utils.Tpo -c -o liblxc_la-confile_utils.lo `test -f 'confile_utils.c' || echo '$(srcdir)/'`confile_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-confile_utils.Tpo $(DEPDIR)/liblxc_la-confile_utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='confile_utils.c' object='liblxc_la-confile_utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-confile_utils.lo `test -f 'confile_utils.c' || echo '$(srcdir)/'`confile_utils.c
-
-liblxc_la-criu.lo: criu.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-criu.lo -MD -MP -MF $(DEPDIR)/liblxc_la-criu.Tpo -c -o liblxc_la-criu.lo `test -f 'criu.c' || echo '$(srcdir)/'`criu.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-criu.Tpo $(DEPDIR)/liblxc_la-criu.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='criu.c' object='liblxc_la-criu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-criu.lo `test -f 'criu.c' || echo '$(srcdir)/'`criu.c
-
-liblxc_la-error.lo: error.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-error.lo -MD -MP -MF $(DEPDIR)/liblxc_la-error.Tpo -c -o liblxc_la-error.lo `test -f 'error.c' || echo '$(srcdir)/'`error.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-error.Tpo $(DEPDIR)/liblxc_la-error.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='error.c' object='liblxc_la-error.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-error.lo `test -f 'error.c' || echo '$(srcdir)/'`error.c
-
-liblxc_la-execute.lo: execute.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-execute.lo -MD -MP -MF $(DEPDIR)/liblxc_la-execute.Tpo -c -o liblxc_la-execute.lo `test -f 'execute.c' || echo '$(srcdir)/'`execute.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-execute.Tpo $(DEPDIR)/liblxc_la-execute.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='execute.c' object='liblxc_la-execute.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-execute.lo `test -f 'execute.c' || echo '$(srcdir)/'`execute.c
-
-liblxc_la-freezer.lo: freezer.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-freezer.lo -MD -MP -MF $(DEPDIR)/liblxc_la-freezer.Tpo -c -o liblxc_la-freezer.lo `test -f 'freezer.c' || echo '$(srcdir)/'`freezer.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-freezer.Tpo $(DEPDIR)/liblxc_la-freezer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='freezer.c' object='liblxc_la-freezer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-freezer.lo `test -f 'freezer.c' || echo '$(srcdir)/'`freezer.c
-
-liblxc_la-file_utils.lo: file_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-file_utils.lo -MD -MP -MF $(DEPDIR)/liblxc_la-file_utils.Tpo -c -o liblxc_la-file_utils.lo `test -f 'file_utils.c' || echo '$(srcdir)/'`file_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-file_utils.Tpo $(DEPDIR)/liblxc_la-file_utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_utils.c' object='liblxc_la-file_utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-file_utils.lo `test -f 'file_utils.c' || echo '$(srcdir)/'`file_utils.c
-
-../include/liblxc_la-netns_ifaddrs.lo: ../include/netns_ifaddrs.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT ../include/liblxc_la-netns_ifaddrs.lo -MD -MP -MF ../include/$(DEPDIR)/liblxc_la-netns_ifaddrs.Tpo -c -o ../include/liblxc_la-netns_ifaddrs.lo `test -f '../include/netns_ifaddrs.c' || echo '$(srcdir)/'`../include/netns_ifaddrs.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/liblxc_la-netns_ifaddrs.Tpo ../include/$(DEPDIR)/liblxc_la-netns_ifaddrs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/netns_ifaddrs.c' object='../include/liblxc_la-netns_ifaddrs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o ../include/liblxc_la-netns_ifaddrs.lo `test -f '../include/netns_ifaddrs.c' || echo '$(srcdir)/'`../include/netns_ifaddrs.c
-
-liblxc_la-initutils.lo: initutils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-initutils.lo -MD -MP -MF $(DEPDIR)/liblxc_la-initutils.Tpo -c -o liblxc_la-initutils.lo `test -f 'initutils.c' || echo '$(srcdir)/'`initutils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-initutils.Tpo $(DEPDIR)/liblxc_la-initutils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='initutils.c' object='liblxc_la-initutils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-initutils.lo `test -f 'initutils.c' || echo '$(srcdir)/'`initutils.c
-
-liblxc_la-log.lo: log.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-log.lo -MD -MP -MF $(DEPDIR)/liblxc_la-log.Tpo -c -o liblxc_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-log.Tpo $(DEPDIR)/liblxc_la-log.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='log.c' object='liblxc_la-log.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
-
-liblxc_la-lxccontainer.lo: lxccontainer.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-lxccontainer.lo -MD -MP -MF $(DEPDIR)/liblxc_la-lxccontainer.Tpo -c -o liblxc_la-lxccontainer.lo `test -f 'lxccontainer.c' || echo '$(srcdir)/'`lxccontainer.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-lxccontainer.Tpo $(DEPDIR)/liblxc_la-lxccontainer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lxccontainer.c' object='liblxc_la-lxccontainer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-lxccontainer.lo `test -f 'lxccontainer.c' || echo '$(srcdir)/'`lxccontainer.c
-
-liblxc_la-lxclock.lo: lxclock.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-lxclock.lo -MD -MP -MF $(DEPDIR)/liblxc_la-lxclock.Tpo -c -o liblxc_la-lxclock.lo `test -f 'lxclock.c' || echo '$(srcdir)/'`lxclock.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-lxclock.Tpo $(DEPDIR)/liblxc_la-lxclock.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lxclock.c' object='liblxc_la-lxclock.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-lxclock.lo `test -f 'lxclock.c' || echo '$(srcdir)/'`lxclock.c
-
-liblxc_la-mainloop.lo: mainloop.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-mainloop.lo -MD -MP -MF $(DEPDIR)/liblxc_la-mainloop.Tpo -c -o liblxc_la-mainloop.lo `test -f 'mainloop.c' || echo '$(srcdir)/'`mainloop.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-mainloop.Tpo $(DEPDIR)/liblxc_la-mainloop.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mainloop.c' object='liblxc_la-mainloop.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-mainloop.lo `test -f 'mainloop.c' || echo '$(srcdir)/'`mainloop.c
-
-liblxc_la-namespace.lo: namespace.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-namespace.lo -MD -MP -MF $(DEPDIR)/liblxc_la-namespace.Tpo -c -o liblxc_la-namespace.lo `test -f 'namespace.c' || echo '$(srcdir)/'`namespace.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-namespace.Tpo $(DEPDIR)/liblxc_la-namespace.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='namespace.c' object='liblxc_la-namespace.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-namespace.lo `test -f 'namespace.c' || echo '$(srcdir)/'`namespace.c
-
-liblxc_la-nl.lo: nl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-nl.lo -MD -MP -MF $(DEPDIR)/liblxc_la-nl.Tpo -c -o liblxc_la-nl.lo `test -f 'nl.c' || echo '$(srcdir)/'`nl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-nl.Tpo $(DEPDIR)/liblxc_la-nl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nl.c' object='liblxc_la-nl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-nl.lo `test -f 'nl.c' || echo '$(srcdir)/'`nl.c
-
-liblxc_la-network.lo: network.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-network.lo -MD -MP -MF $(DEPDIR)/liblxc_la-network.Tpo -c -o liblxc_la-network.lo `test -f 'network.c' || echo '$(srcdir)/'`network.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-network.Tpo $(DEPDIR)/liblxc_la-network.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='network.c' object='liblxc_la-network.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-network.lo `test -f 'network.c' || echo '$(srcdir)/'`network.c
-
-liblxc_la-monitor.lo: monitor.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-monitor.lo -MD -MP -MF $(DEPDIR)/liblxc_la-monitor.Tpo -c -o liblxc_la-monitor.lo `test -f 'monitor.c' || echo '$(srcdir)/'`monitor.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-monitor.Tpo $(DEPDIR)/liblxc_la-monitor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='monitor.c' object='liblxc_la-monitor.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-monitor.lo `test -f 'monitor.c' || echo '$(srcdir)/'`monitor.c
-
-liblxc_la-parse.lo: parse.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-parse.lo -MD -MP -MF $(DEPDIR)/liblxc_la-parse.Tpo -c -o liblxc_la-parse.lo `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-parse.Tpo $(DEPDIR)/liblxc_la-parse.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='parse.c' object='liblxc_la-parse.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-parse.lo `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
-
-liblxc_la-process_utils.lo: process_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-process_utils.lo -MD -MP -MF $(DEPDIR)/liblxc_la-process_utils.Tpo -c -o liblxc_la-process_utils.lo `test -f 'process_utils.c' || echo '$(srcdir)/'`process_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-process_utils.Tpo $(DEPDIR)/liblxc_la-process_utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='process_utils.c' object='liblxc_la-process_utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-process_utils.lo `test -f 'process_utils.c' || echo '$(srcdir)/'`process_utils.c
-
-liblxc_la-ringbuf.lo: ringbuf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-ringbuf.lo -MD -MP -MF $(DEPDIR)/liblxc_la-ringbuf.Tpo -c -o liblxc_la-ringbuf.lo `test -f 'ringbuf.c' || echo '$(srcdir)/'`ringbuf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-ringbuf.Tpo $(DEPDIR)/liblxc_la-ringbuf.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ringbuf.c' object='liblxc_la-ringbuf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-ringbuf.lo `test -f 'ringbuf.c' || echo '$(srcdir)/'`ringbuf.c
-
-liblxc_la-rtnl.lo: rtnl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-rtnl.lo -MD -MP -MF $(DEPDIR)/liblxc_la-rtnl.Tpo -c -o liblxc_la-rtnl.lo `test -f 'rtnl.c' || echo '$(srcdir)/'`rtnl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-rtnl.Tpo $(DEPDIR)/liblxc_la-rtnl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rtnl.c' object='liblxc_la-rtnl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-rtnl.lo `test -f 'rtnl.c' || echo '$(srcdir)/'`rtnl.c
-
-liblxc_la-state.lo: state.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-state.lo -MD -MP -MF $(DEPDIR)/liblxc_la-state.Tpo -c -o liblxc_la-state.lo `test -f 'state.c' || echo '$(srcdir)/'`state.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-state.Tpo $(DEPDIR)/liblxc_la-state.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='state.c' object='liblxc_la-state.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-state.lo `test -f 'state.c' || echo '$(srcdir)/'`state.c
-
-liblxc_la-start.lo: start.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-start.lo -MD -MP -MF $(DEPDIR)/liblxc_la-start.Tpo -c -o liblxc_la-start.lo `test -f 'start.c' || echo '$(srcdir)/'`start.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-start.Tpo $(DEPDIR)/liblxc_la-start.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='start.c' object='liblxc_la-start.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-start.lo `test -f 'start.c' || echo '$(srcdir)/'`start.c
-
-storage/liblxc_la-btrfs.lo: storage/btrfs.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-btrfs.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-btrfs.Tpo -c -o storage/liblxc_la-btrfs.lo `test -f 'storage/btrfs.c' || echo '$(srcdir)/'`storage/btrfs.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-btrfs.Tpo storage/$(DEPDIR)/liblxc_la-btrfs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/btrfs.c' object='storage/liblxc_la-btrfs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-btrfs.lo `test -f 'storage/btrfs.c' || echo '$(srcdir)/'`storage/btrfs.c
-
-storage/liblxc_la-dir.lo: storage/dir.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-dir.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-dir.Tpo -c -o storage/liblxc_la-dir.lo `test -f 'storage/dir.c' || echo '$(srcdir)/'`storage/dir.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-dir.Tpo storage/$(DEPDIR)/liblxc_la-dir.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/dir.c' object='storage/liblxc_la-dir.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-dir.lo `test -f 'storage/dir.c' || echo '$(srcdir)/'`storage/dir.c
-
-storage/liblxc_la-loop.lo: storage/loop.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-loop.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-loop.Tpo -c -o storage/liblxc_la-loop.lo `test -f 'storage/loop.c' || echo '$(srcdir)/'`storage/loop.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-loop.Tpo storage/$(DEPDIR)/liblxc_la-loop.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/loop.c' object='storage/liblxc_la-loop.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-loop.lo `test -f 'storage/loop.c' || echo '$(srcdir)/'`storage/loop.c
-
-storage/liblxc_la-lvm.lo: storage/lvm.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-lvm.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-lvm.Tpo -c -o storage/liblxc_la-lvm.lo `test -f 'storage/lvm.c' || echo '$(srcdir)/'`storage/lvm.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-lvm.Tpo storage/$(DEPDIR)/liblxc_la-lvm.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/lvm.c' object='storage/liblxc_la-lvm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-lvm.lo `test -f 'storage/lvm.c' || echo '$(srcdir)/'`storage/lvm.c
-
-storage/liblxc_la-nbd.lo: storage/nbd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-nbd.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-nbd.Tpo -c -o storage/liblxc_la-nbd.lo `test -f 'storage/nbd.c' || echo '$(srcdir)/'`storage/nbd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-nbd.Tpo storage/$(DEPDIR)/liblxc_la-nbd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/nbd.c' object='storage/liblxc_la-nbd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-nbd.lo `test -f 'storage/nbd.c' || echo '$(srcdir)/'`storage/nbd.c
-
-storage/liblxc_la-overlay.lo: storage/overlay.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-overlay.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-overlay.Tpo -c -o storage/liblxc_la-overlay.lo `test -f 'storage/overlay.c' || echo '$(srcdir)/'`storage/overlay.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-overlay.Tpo storage/$(DEPDIR)/liblxc_la-overlay.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/overlay.c' object='storage/liblxc_la-overlay.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-overlay.lo `test -f 'storage/overlay.c' || echo '$(srcdir)/'`storage/overlay.c
-
-storage/liblxc_la-rbd.lo: storage/rbd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-rbd.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-rbd.Tpo -c -o storage/liblxc_la-rbd.lo `test -f 'storage/rbd.c' || echo '$(srcdir)/'`storage/rbd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-rbd.Tpo storage/$(DEPDIR)/liblxc_la-rbd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/rbd.c' object='storage/liblxc_la-rbd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-rbd.lo `test -f 'storage/rbd.c' || echo '$(srcdir)/'`storage/rbd.c
-
-storage/liblxc_la-rsync.lo: storage/rsync.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-rsync.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-rsync.Tpo -c -o storage/liblxc_la-rsync.lo `test -f 'storage/rsync.c' || echo '$(srcdir)/'`storage/rsync.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-rsync.Tpo storage/$(DEPDIR)/liblxc_la-rsync.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/rsync.c' object='storage/liblxc_la-rsync.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-rsync.lo `test -f 'storage/rsync.c' || echo '$(srcdir)/'`storage/rsync.c
-
-storage/liblxc_la-storage.lo: storage/storage.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-storage.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-storage.Tpo -c -o storage/liblxc_la-storage.lo `test -f 'storage/storage.c' || echo '$(srcdir)/'`storage/storage.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-storage.Tpo storage/$(DEPDIR)/liblxc_la-storage.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/storage.c' object='storage/liblxc_la-storage.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-storage.lo `test -f 'storage/storage.c' || echo '$(srcdir)/'`storage/storage.c
-
-storage/liblxc_la-storage_utils.lo: storage/storage_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-storage_utils.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-storage_utils.Tpo -c -o storage/liblxc_la-storage_utils.lo `test -f 'storage/storage_utils.c' || echo '$(srcdir)/'`storage/storage_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-storage_utils.Tpo storage/$(DEPDIR)/liblxc_la-storage_utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/storage_utils.c' object='storage/liblxc_la-storage_utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-storage_utils.lo `test -f 'storage/storage_utils.c' || echo '$(srcdir)/'`storage/storage_utils.c
-
-storage/liblxc_la-zfs.lo: storage/zfs.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT storage/liblxc_la-zfs.lo -MD -MP -MF storage/$(DEPDIR)/liblxc_la-zfs.Tpo -c -o storage/liblxc_la-zfs.lo `test -f 'storage/zfs.c' || echo '$(srcdir)/'`storage/zfs.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) storage/$(DEPDIR)/liblxc_la-zfs.Tpo storage/$(DEPDIR)/liblxc_la-zfs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='storage/zfs.c' object='storage/liblxc_la-zfs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o storage/liblxc_la-zfs.lo `test -f 'storage/zfs.c' || echo '$(srcdir)/'`storage/zfs.c
-
-liblxc_la-string_utils.lo: string_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-string_utils.lo -MD -MP -MF $(DEPDIR)/liblxc_la-string_utils.Tpo -c -o liblxc_la-string_utils.lo `test -f 'string_utils.c' || echo '$(srcdir)/'`string_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-string_utils.Tpo $(DEPDIR)/liblxc_la-string_utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string_utils.c' object='liblxc_la-string_utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-string_utils.lo `test -f 'string_utils.c' || echo '$(srcdir)/'`string_utils.c
-
-liblxc_la-sync.lo: sync.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-sync.lo -MD -MP -MF $(DEPDIR)/liblxc_la-sync.Tpo -c -o liblxc_la-sync.lo `test -f 'sync.c' || echo '$(srcdir)/'`sync.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-sync.Tpo $(DEPDIR)/liblxc_la-sync.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sync.c' object='liblxc_la-sync.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-sync.lo `test -f 'sync.c' || echo '$(srcdir)/'`sync.c
-
-liblxc_la-terminal.lo: terminal.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-terminal.lo -MD -MP -MF $(DEPDIR)/liblxc_la-terminal.Tpo -c -o liblxc_la-terminal.lo `test -f 'terminal.c' || echo '$(srcdir)/'`terminal.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-terminal.Tpo $(DEPDIR)/liblxc_la-terminal.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='terminal.c' object='liblxc_la-terminal.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-terminal.lo `test -f 'terminal.c' || echo '$(srcdir)/'`terminal.c
-
-liblxc_la-utils.lo: utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-utils.lo -MD -MP -MF $(DEPDIR)/liblxc_la-utils.Tpo -c -o liblxc_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-utils.Tpo $(DEPDIR)/liblxc_la-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='utils.c' object='liblxc_la-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
-
-liblxc_la-uuid.lo: uuid.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-uuid.lo -MD -MP -MF $(DEPDIR)/liblxc_la-uuid.Tpo -c -o liblxc_la-uuid.lo `test -f 'uuid.c' || echo '$(srcdir)/'`uuid.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-uuid.Tpo $(DEPDIR)/liblxc_la-uuid.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='uuid.c' object='liblxc_la-uuid.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-uuid.lo `test -f 'uuid.c' || echo '$(srcdir)/'`uuid.c
-
-lsm/liblxc_la-lsm.lo: lsm/lsm.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT lsm/liblxc_la-lsm.lo -MD -MP -MF lsm/$(DEPDIR)/liblxc_la-lsm.Tpo -c -o lsm/liblxc_la-lsm.lo `test -f 'lsm/lsm.c' || echo '$(srcdir)/'`lsm/lsm.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lsm/$(DEPDIR)/liblxc_la-lsm.Tpo lsm/$(DEPDIR)/liblxc_la-lsm.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lsm/lsm.c' object='lsm/liblxc_la-lsm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o lsm/liblxc_la-lsm.lo `test -f 'lsm/lsm.c' || echo '$(srcdir)/'`lsm/lsm.c
-
-lsm/liblxc_la-nop.lo: lsm/nop.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT lsm/liblxc_la-nop.lo -MD -MP -MF lsm/$(DEPDIR)/liblxc_la-nop.Tpo -c -o lsm/liblxc_la-nop.lo `test -f 'lsm/nop.c' || echo '$(srcdir)/'`lsm/nop.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lsm/$(DEPDIR)/liblxc_la-nop.Tpo lsm/$(DEPDIR)/liblxc_la-nop.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lsm/nop.c' object='lsm/liblxc_la-nop.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o lsm/liblxc_la-nop.lo `test -f 'lsm/nop.c' || echo '$(srcdir)/'`lsm/nop.c
-
-lsm/liblxc_la-apparmor.lo: lsm/apparmor.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT lsm/liblxc_la-apparmor.lo -MD -MP -MF lsm/$(DEPDIR)/liblxc_la-apparmor.Tpo -c -o lsm/liblxc_la-apparmor.lo `test -f 'lsm/apparmor.c' || echo '$(srcdir)/'`lsm/apparmor.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lsm/$(DEPDIR)/liblxc_la-apparmor.Tpo lsm/$(DEPDIR)/liblxc_la-apparmor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lsm/apparmor.c' object='lsm/liblxc_la-apparmor.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o lsm/liblxc_la-apparmor.lo `test -f 'lsm/apparmor.c' || echo '$(srcdir)/'`lsm/apparmor.c
-
-lsm/liblxc_la-selinux.lo: lsm/selinux.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT lsm/liblxc_la-selinux.lo -MD -MP -MF lsm/$(DEPDIR)/liblxc_la-selinux.Tpo -c -o lsm/liblxc_la-selinux.lo `test -f 'lsm/selinux.c' || echo '$(srcdir)/'`lsm/selinux.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lsm/$(DEPDIR)/liblxc_la-selinux.Tpo lsm/$(DEPDIR)/liblxc_la-selinux.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lsm/selinux.c' object='lsm/liblxc_la-selinux.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o lsm/liblxc_la-selinux.lo `test -f 'lsm/selinux.c' || echo '$(srcdir)/'`lsm/selinux.c
-
-../include/liblxc_la-fexecve.lo: ../include/fexecve.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT ../include/liblxc_la-fexecve.lo -MD -MP -MF ../include/$(DEPDIR)/liblxc_la-fexecve.Tpo -c -o ../include/liblxc_la-fexecve.lo `test -f '../include/fexecve.c' || echo '$(srcdir)/'`../include/fexecve.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/liblxc_la-fexecve.Tpo ../include/$(DEPDIR)/liblxc_la-fexecve.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/fexecve.c' object='../include/liblxc_la-fexecve.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o ../include/liblxc_la-fexecve.lo `test -f '../include/fexecve.c' || echo '$(srcdir)/'`../include/fexecve.c
-
-../include/liblxc_la-lxcmntent.lo: ../include/lxcmntent.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT ../include/liblxc_la-lxcmntent.lo -MD -MP -MF ../include/$(DEPDIR)/liblxc_la-lxcmntent.Tpo -c -o ../include/liblxc_la-lxcmntent.lo `test -f '../include/lxcmntent.c' || echo '$(srcdir)/'`../include/lxcmntent.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/liblxc_la-lxcmntent.Tpo ../include/$(DEPDIR)/liblxc_la-lxcmntent.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/lxcmntent.c' object='../include/liblxc_la-lxcmntent.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o ../include/liblxc_la-lxcmntent.lo `test -f '../include/lxcmntent.c' || echo '$(srcdir)/'`../include/lxcmntent.c
-
-../include/liblxc_la-openpty.lo: ../include/openpty.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT ../include/liblxc_la-openpty.lo -MD -MP -MF ../include/$(DEPDIR)/liblxc_la-openpty.Tpo -c -o ../include/liblxc_la-openpty.lo `test -f '../include/openpty.c' || echo '$(srcdir)/'`../include/openpty.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/liblxc_la-openpty.Tpo ../include/$(DEPDIR)/liblxc_la-openpty.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/openpty.c' object='../include/liblxc_la-openpty.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o ../include/liblxc_la-openpty.lo `test -f '../include/openpty.c' || echo '$(srcdir)/'`../include/openpty.c
-
-../include/liblxc_la-getgrgid_r.lo: ../include/getgrgid_r.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT ../include/liblxc_la-getgrgid_r.lo -MD -MP -MF ../include/$(DEPDIR)/liblxc_la-getgrgid_r.Tpo -c -o ../include/liblxc_la-getgrgid_r.lo `test -f '../include/getgrgid_r.c' || echo '$(srcdir)/'`../include/getgrgid_r.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/liblxc_la-getgrgid_r.Tpo ../include/$(DEPDIR)/liblxc_la-getgrgid_r.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/getgrgid_r.c' object='../include/liblxc_la-getgrgid_r.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o ../include/liblxc_la-getgrgid_r.lo `test -f '../include/getgrgid_r.c' || echo '$(srcdir)/'`../include/getgrgid_r.c
-
-../include/liblxc_la-getline.lo: ../include/getline.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT ../include/liblxc_la-getline.lo -MD -MP -MF ../include/$(DEPDIR)/liblxc_la-getline.Tpo -c -o ../include/liblxc_la-getline.lo `test -f '../include/getline.c' || echo '$(srcdir)/'`../include/getline.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/liblxc_la-getline.Tpo ../include/$(DEPDIR)/liblxc_la-getline.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/getline.c' object='../include/liblxc_la-getline.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o ../include/liblxc_la-getline.lo `test -f '../include/getline.c' || echo '$(srcdir)/'`../include/getline.c
-
-../include/liblxc_la-prlimit.lo: ../include/prlimit.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT ../include/liblxc_la-prlimit.lo -MD -MP -MF ../include/$(DEPDIR)/liblxc_la-prlimit.Tpo -c -o ../include/liblxc_la-prlimit.lo `test -f '../include/prlimit.c' || echo '$(srcdir)/'`../include/prlimit.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/liblxc_la-prlimit.Tpo ../include/$(DEPDIR)/liblxc_la-prlimit.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/prlimit.c' object='../include/liblxc_la-prlimit.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o ../include/liblxc_la-prlimit.lo `test -f '../include/prlimit.c' || echo '$(srcdir)/'`../include/prlimit.c
-
-liblxc_la-seccomp.lo: seccomp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-seccomp.lo -MD -MP -MF $(DEPDIR)/liblxc_la-seccomp.Tpo -c -o liblxc_la-seccomp.lo `test -f 'seccomp.c' || echo '$(srcdir)/'`seccomp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-seccomp.Tpo $(DEPDIR)/liblxc_la-seccomp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='seccomp.c' object='liblxc_la-seccomp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-seccomp.lo `test -f 'seccomp.c' || echo '$(srcdir)/'`seccomp.c
-
-../include/liblxc_la-strlcpy.lo: ../include/strlcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT ../include/liblxc_la-strlcpy.lo -MD -MP -MF ../include/$(DEPDIR)/liblxc_la-strlcpy.Tpo -c -o ../include/liblxc_la-strlcpy.lo `test -f '../include/strlcpy.c' || echo '$(srcdir)/'`../include/strlcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/liblxc_la-strlcpy.Tpo ../include/$(DEPDIR)/liblxc_la-strlcpy.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/strlcpy.c' object='../include/liblxc_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o ../include/liblxc_la-strlcpy.lo `test -f '../include/strlcpy.c' || echo '$(srcdir)/'`../include/strlcpy.c
-
-../include/liblxc_la-strlcat.lo: ../include/strlcat.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT ../include/liblxc_la-strlcat.lo -MD -MP -MF ../include/$(DEPDIR)/liblxc_la-strlcat.Tpo -c -o ../include/liblxc_la-strlcat.lo `test -f '../include/strlcat.c' || echo '$(srcdir)/'`../include/strlcat.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/liblxc_la-strlcat.Tpo ../include/$(DEPDIR)/liblxc_la-strlcat.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/strlcat.c' object='../include/liblxc_la-strlcat.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o ../include/liblxc_la-strlcat.lo `test -f '../include/strlcat.c' || echo '$(srcdir)/'`../include/strlcat.c
-
-liblxc_la-rexec.lo: rexec.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -MT liblxc_la-rexec.lo -MD -MP -MF $(DEPDIR)/liblxc_la-rexec.Tpo -c -o liblxc_la-rexec.lo `test -f 'rexec.c' || echo '$(srcdir)/'`rexec.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblxc_la-rexec.Tpo $(DEPDIR)/liblxc_la-rexec.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rexec.c' object='liblxc_la-rexec.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblxc_la_CFLAGS) $(CFLAGS) -c -o liblxc_la-rexec.lo `test -f 'rexec.c' || echo '$(srcdir)/'`rexec.c
-
-pam/cgfs_la-pam_cgfs.lo: pam/pam_cgfs.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_cgfs_la_CFLAGS) $(CFLAGS) -MT pam/cgfs_la-pam_cgfs.lo -MD -MP -MF pam/$(DEPDIR)/cgfs_la-pam_cgfs.Tpo -c -o pam/cgfs_la-pam_cgfs.lo `test -f 'pam/pam_cgfs.c' || echo '$(srcdir)/'`pam/pam_cgfs.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pam/$(DEPDIR)/cgfs_la-pam_cgfs.Tpo pam/$(DEPDIR)/cgfs_la-pam_cgfs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pam/pam_cgfs.c' object='pam/cgfs_la-pam_cgfs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_cgfs_la_CFLAGS) $(CFLAGS) -c -o pam/cgfs_la-pam_cgfs.lo `test -f 'pam/pam_cgfs.c' || echo '$(srcdir)/'`pam/pam_cgfs.c
-
-pam_cgfs_la-file_utils.lo: file_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_cgfs_la_CFLAGS) $(CFLAGS) -MT pam_cgfs_la-file_utils.lo -MD -MP -MF $(DEPDIR)/pam_cgfs_la-file_utils.Tpo -c -o pam_cgfs_la-file_utils.lo `test -f 'file_utils.c' || echo '$(srcdir)/'`file_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pam_cgfs_la-file_utils.Tpo $(DEPDIR)/pam_cgfs_la-file_utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_utils.c' object='pam_cgfs_la-file_utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_cgfs_la_CFLAGS) $(CFLAGS) -c -o pam_cgfs_la-file_utils.lo `test -f 'file_utils.c' || echo '$(srcdir)/'`file_utils.c
-
-pam_cgfs_la-string_utils.lo: string_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_cgfs_la_CFLAGS) $(CFLAGS) -MT pam_cgfs_la-string_utils.lo -MD -MP -MF $(DEPDIR)/pam_cgfs_la-string_utils.Tpo -c -o pam_cgfs_la-string_utils.lo `test -f 'string_utils.c' || echo '$(srcdir)/'`string_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pam_cgfs_la-string_utils.Tpo $(DEPDIR)/pam_cgfs_la-string_utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string_utils.c' object='pam_cgfs_la-string_utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_cgfs_la_CFLAGS) $(CFLAGS) -c -o pam_cgfs_la-string_utils.lo `test -f 'string_utils.c' || echo '$(srcdir)/'`string_utils.c
-
-../include/pam_cgfs_la-strlcat.lo: ../include/strlcat.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_cgfs_la_CFLAGS) $(CFLAGS) -MT ../include/pam_cgfs_la-strlcat.lo -MD -MP -MF ../include/$(DEPDIR)/pam_cgfs_la-strlcat.Tpo -c -o ../include/pam_cgfs_la-strlcat.lo `test -f '../include/strlcat.c' || echo '$(srcdir)/'`../include/strlcat.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/pam_cgfs_la-strlcat.Tpo ../include/$(DEPDIR)/pam_cgfs_la-strlcat.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/strlcat.c' object='../include/pam_cgfs_la-strlcat.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_cgfs_la_CFLAGS) $(CFLAGS) -c -o ../include/pam_cgfs_la-strlcat.lo `test -f '../include/strlcat.c' || echo '$(srcdir)/'`../include/strlcat.c
-
-../include/pam_cgfs_la-strlcpy.lo: ../include/strlcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_cgfs_la_CFLAGS) $(CFLAGS) -MT ../include/pam_cgfs_la-strlcpy.lo -MD -MP -MF ../include/$(DEPDIR)/pam_cgfs_la-strlcpy.Tpo -c -o ../include/pam_cgfs_la-strlcpy.lo `test -f '../include/strlcpy.c' || echo '$(srcdir)/'`../include/strlcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/pam_cgfs_la-strlcpy.Tpo ../include/$(DEPDIR)/pam_cgfs_la-strlcpy.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/strlcpy.c' object='../include/pam_cgfs_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_cgfs_la_CFLAGS) $(CFLAGS) -c -o ../include/pam_cgfs_la-strlcpy.lo `test -f '../include/strlcpy.c' || echo '$(srcdir)/'`../include/strlcpy.c
-
-cmd/init_lxc_static-lxc_init.o: cmd/lxc_init.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT cmd/init_lxc_static-lxc_init.o -MD -MP -MF cmd/$(DEPDIR)/init_lxc_static-lxc_init.Tpo -c -o cmd/init_lxc_static-lxc_init.o `test -f 'cmd/lxc_init.c' || echo '$(srcdir)/'`cmd/lxc_init.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cmd/$(DEPDIR)/init_lxc_static-lxc_init.Tpo cmd/$(DEPDIR)/init_lxc_static-lxc_init.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cmd/lxc_init.c' object='cmd/init_lxc_static-lxc_init.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o cmd/init_lxc_static-lxc_init.o `test -f 'cmd/lxc_init.c' || echo '$(srcdir)/'`cmd/lxc_init.c
-
-cmd/init_lxc_static-lxc_init.obj: cmd/lxc_init.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT cmd/init_lxc_static-lxc_init.obj -MD -MP -MF cmd/$(DEPDIR)/init_lxc_static-lxc_init.Tpo -c -o cmd/init_lxc_static-lxc_init.obj `if test -f 'cmd/lxc_init.c'; then $(CYGPATH_W) 'cmd/lxc_init.c'; else $(CYGPATH_W) '$(srcdir)/cmd/lxc_init.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cmd/$(DEPDIR)/init_lxc_static-lxc_init.Tpo cmd/$(DEPDIR)/init_lxc_static-lxc_init.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cmd/lxc_init.c' object='cmd/init_lxc_static-lxc_init.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o cmd/init_lxc_static-lxc_init.obj `if test -f 'cmd/lxc_init.c'; then $(CYGPATH_W) 'cmd/lxc_init.c'; else $(CYGPATH_W) '$(srcdir)/cmd/lxc_init.c'; fi`
-
-init_lxc_static-caps.o: caps.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-caps.o -MD -MP -MF $(DEPDIR)/init_lxc_static-caps.Tpo -c -o init_lxc_static-caps.o `test -f 'caps.c' || echo '$(srcdir)/'`caps.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-caps.Tpo $(DEPDIR)/init_lxc_static-caps.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='caps.c' object='init_lxc_static-caps.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-caps.o `test -f 'caps.c' || echo '$(srcdir)/'`caps.c
-
-init_lxc_static-caps.obj: caps.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-caps.obj -MD -MP -MF $(DEPDIR)/init_lxc_static-caps.Tpo -c -o init_lxc_static-caps.obj `if test -f 'caps.c'; then $(CYGPATH_W) 'caps.c'; else $(CYGPATH_W) '$(srcdir)/caps.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-caps.Tpo $(DEPDIR)/init_lxc_static-caps.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='caps.c' object='init_lxc_static-caps.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-caps.obj `if test -f 'caps.c'; then $(CYGPATH_W) 'caps.c'; else $(CYGPATH_W) '$(srcdir)/caps.c'; fi`
-
-init_lxc_static-error.o: error.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-error.o -MD -MP -MF $(DEPDIR)/init_lxc_static-error.Tpo -c -o init_lxc_static-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-error.Tpo $(DEPDIR)/init_lxc_static-error.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='error.c' object='init_lxc_static-error.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c
-
-init_lxc_static-error.obj: error.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-error.obj -MD -MP -MF $(DEPDIR)/init_lxc_static-error.Tpo -c -o init_lxc_static-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-error.Tpo $(DEPDIR)/init_lxc_static-error.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='error.c' object='init_lxc_static-error.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi`
-
-init_lxc_static-initutils.o: initutils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-initutils.o -MD -MP -MF $(DEPDIR)/init_lxc_static-initutils.Tpo -c -o init_lxc_static-initutils.o `test -f 'initutils.c' || echo '$(srcdir)/'`initutils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-initutils.Tpo $(DEPDIR)/init_lxc_static-initutils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='initutils.c' object='init_lxc_static-initutils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-initutils.o `test -f 'initutils.c' || echo '$(srcdir)/'`initutils.c
-
-init_lxc_static-initutils.obj: initutils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-initutils.obj -MD -MP -MF $(DEPDIR)/init_lxc_static-initutils.Tpo -c -o init_lxc_static-initutils.obj `if test -f 'initutils.c'; then $(CYGPATH_W) 'initutils.c'; else $(CYGPATH_W) '$(srcdir)/initutils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-initutils.Tpo $(DEPDIR)/init_lxc_static-initutils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='initutils.c' object='init_lxc_static-initutils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-initutils.obj `if test -f 'initutils.c'; then $(CYGPATH_W) 'initutils.c'; else $(CYGPATH_W) '$(srcdir)/initutils.c'; fi`
-
-init_lxc_static-file_utils.o: file_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-file_utils.o -MD -MP -MF $(DEPDIR)/init_lxc_static-file_utils.Tpo -c -o init_lxc_static-file_utils.o `test -f 'file_utils.c' || echo '$(srcdir)/'`file_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-file_utils.Tpo $(DEPDIR)/init_lxc_static-file_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_utils.c' object='init_lxc_static-file_utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-file_utils.o `test -f 'file_utils.c' || echo '$(srcdir)/'`file_utils.c
-
-init_lxc_static-file_utils.obj: file_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-file_utils.obj -MD -MP -MF $(DEPDIR)/init_lxc_static-file_utils.Tpo -c -o init_lxc_static-file_utils.obj `if test -f 'file_utils.c'; then $(CYGPATH_W) 'file_utils.c'; else $(CYGPATH_W) '$(srcdir)/file_utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-file_utils.Tpo $(DEPDIR)/init_lxc_static-file_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_utils.c' object='init_lxc_static-file_utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-file_utils.obj `if test -f 'file_utils.c'; then $(CYGPATH_W) 'file_utils.c'; else $(CYGPATH_W) '$(srcdir)/file_utils.c'; fi`
-
-init_lxc_static-log.o: log.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-log.o -MD -MP -MF $(DEPDIR)/init_lxc_static-log.Tpo -c -o init_lxc_static-log.o `test -f 'log.c' || echo '$(srcdir)/'`log.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-log.Tpo $(DEPDIR)/init_lxc_static-log.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='log.c' object='init_lxc_static-log.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-log.o `test -f 'log.c' || echo '$(srcdir)/'`log.c
-
-init_lxc_static-log.obj: log.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-log.obj -MD -MP -MF $(DEPDIR)/init_lxc_static-log.Tpo -c -o init_lxc_static-log.obj `if test -f 'log.c'; then $(CYGPATH_W) 'log.c'; else $(CYGPATH_W) '$(srcdir)/log.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-log.Tpo $(DEPDIR)/init_lxc_static-log.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='log.c' object='init_lxc_static-log.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-log.obj `if test -f 'log.c'; then $(CYGPATH_W) 'log.c'; else $(CYGPATH_W) '$(srcdir)/log.c'; fi`
-
-init_lxc_static-namespace.o: namespace.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-namespace.o -MD -MP -MF $(DEPDIR)/init_lxc_static-namespace.Tpo -c -o init_lxc_static-namespace.o `test -f 'namespace.c' || echo '$(srcdir)/'`namespace.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-namespace.Tpo $(DEPDIR)/init_lxc_static-namespace.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='namespace.c' object='init_lxc_static-namespace.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-namespace.o `test -f 'namespace.c' || echo '$(srcdir)/'`namespace.c
-
-init_lxc_static-namespace.obj: namespace.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-namespace.obj -MD -MP -MF $(DEPDIR)/init_lxc_static-namespace.Tpo -c -o init_lxc_static-namespace.obj `if test -f 'namespace.c'; then $(CYGPATH_W) 'namespace.c'; else $(CYGPATH_W) '$(srcdir)/namespace.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-namespace.Tpo $(DEPDIR)/init_lxc_static-namespace.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='namespace.c' object='init_lxc_static-namespace.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-namespace.obj `if test -f 'namespace.c'; then $(CYGPATH_W) 'namespace.c'; else $(CYGPATH_W) '$(srcdir)/namespace.c'; fi`
-
-init_lxc_static-string_utils.o: string_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-string_utils.o -MD -MP -MF $(DEPDIR)/init_lxc_static-string_utils.Tpo -c -o init_lxc_static-string_utils.o `test -f 'string_utils.c' || echo '$(srcdir)/'`string_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-string_utils.Tpo $(DEPDIR)/init_lxc_static-string_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string_utils.c' object='init_lxc_static-string_utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-string_utils.o `test -f 'string_utils.c' || echo '$(srcdir)/'`string_utils.c
-
-init_lxc_static-string_utils.obj: string_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT init_lxc_static-string_utils.obj -MD -MP -MF $(DEPDIR)/init_lxc_static-string_utils.Tpo -c -o init_lxc_static-string_utils.obj `if test -f 'string_utils.c'; then $(CYGPATH_W) 'string_utils.c'; else $(CYGPATH_W) '$(srcdir)/string_utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/init_lxc_static-string_utils.Tpo $(DEPDIR)/init_lxc_static-string_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string_utils.c' object='init_lxc_static-string_utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o init_lxc_static-string_utils.obj `if test -f 'string_utils.c'; then $(CYGPATH_W) 'string_utils.c'; else $(CYGPATH_W) '$(srcdir)/string_utils.c'; fi`
-
-../include/init_lxc_static-getline.o: ../include/getline.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT ../include/init_lxc_static-getline.o -MD -MP -MF ../include/$(DEPDIR)/init_lxc_static-getline.Tpo -c -o ../include/init_lxc_static-getline.o `test -f '../include/getline.c' || echo '$(srcdir)/'`../include/getline.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/init_lxc_static-getline.Tpo ../include/$(DEPDIR)/init_lxc_static-getline.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/getline.c' object='../include/init_lxc_static-getline.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o ../include/init_lxc_static-getline.o `test -f '../include/getline.c' || echo '$(srcdir)/'`../include/getline.c
-
-../include/init_lxc_static-getline.obj: ../include/getline.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT ../include/init_lxc_static-getline.obj -MD -MP -MF ../include/$(DEPDIR)/init_lxc_static-getline.Tpo -c -o ../include/init_lxc_static-getline.obj `if test -f '../include/getline.c'; then $(CYGPATH_W) '../include/getline.c'; else $(CYGPATH_W) '$(srcdir)/../include/getline.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/init_lxc_static-getline.Tpo ../include/$(DEPDIR)/init_lxc_static-getline.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/getline.c' object='../include/init_lxc_static-getline.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o ../include/init_lxc_static-getline.obj `if test -f '../include/getline.c'; then $(CYGPATH_W) '../include/getline.c'; else $(CYGPATH_W) '$(srcdir)/../include/getline.c'; fi`
-
-../include/init_lxc_static-strlcpy.o: ../include/strlcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT ../include/init_lxc_static-strlcpy.o -MD -MP -MF ../include/$(DEPDIR)/init_lxc_static-strlcpy.Tpo -c -o ../include/init_lxc_static-strlcpy.o `test -f '../include/strlcpy.c' || echo '$(srcdir)/'`../include/strlcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/init_lxc_static-strlcpy.Tpo ../include/$(DEPDIR)/init_lxc_static-strlcpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/strlcpy.c' object='../include/init_lxc_static-strlcpy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o ../include/init_lxc_static-strlcpy.o `test -f '../include/strlcpy.c' || echo '$(srcdir)/'`../include/strlcpy.c
-
-../include/init_lxc_static-strlcpy.obj: ../include/strlcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT ../include/init_lxc_static-strlcpy.obj -MD -MP -MF ../include/$(DEPDIR)/init_lxc_static-strlcpy.Tpo -c -o ../include/init_lxc_static-strlcpy.obj `if test -f '../include/strlcpy.c'; then $(CYGPATH_W) '../include/strlcpy.c'; else $(CYGPATH_W) '$(srcdir)/../include/strlcpy.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/init_lxc_static-strlcpy.Tpo ../include/$(DEPDIR)/init_lxc_static-strlcpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/strlcpy.c' object='../include/init_lxc_static-strlcpy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o ../include/init_lxc_static-strlcpy.obj `if test -f '../include/strlcpy.c'; then $(CYGPATH_W) '../include/strlcpy.c'; else $(CYGPATH_W) '$(srcdir)/../include/strlcpy.c'; fi`
-
-../include/init_lxc_static-strlcat.o: ../include/strlcat.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT ../include/init_lxc_static-strlcat.o -MD -MP -MF ../include/$(DEPDIR)/init_lxc_static-strlcat.Tpo -c -o ../include/init_lxc_static-strlcat.o `test -f '../include/strlcat.c' || echo '$(srcdir)/'`../include/strlcat.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/init_lxc_static-strlcat.Tpo ../include/$(DEPDIR)/init_lxc_static-strlcat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/strlcat.c' object='../include/init_lxc_static-strlcat.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o ../include/init_lxc_static-strlcat.o `test -f '../include/strlcat.c' || echo '$(srcdir)/'`../include/strlcat.c
-
-../include/init_lxc_static-strlcat.obj: ../include/strlcat.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -MT ../include/init_lxc_static-strlcat.obj -MD -MP -MF ../include/$(DEPDIR)/init_lxc_static-strlcat.Tpo -c -o ../include/init_lxc_static-strlcat.obj `if test -f '../include/strlcat.c'; then $(CYGPATH_W) '../include/strlcat.c'; else $(CYGPATH_W) '$(srcdir)/../include/strlcat.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../include/$(DEPDIR)/init_lxc_static-strlcat.Tpo ../include/$(DEPDIR)/init_lxc_static-strlcat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../include/strlcat.c' object='../include/init_lxc_static-strlcat.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(init_lxc_static_CFLAGS) $(CFLAGS) -c -o ../include/init_lxc_static-strlcat.obj `if test -f '../include/strlcat.c'; then $(CYGPATH_W) '../include/strlcat.c'; else $(CYGPATH_W) '$(srcdir)/../include/strlcat.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-	-rm -rf ../include/.libs ../include/_libs
-	-rm -rf cgroups/.libs cgroups/_libs
-	-rm -rf lsm/.libs lsm/_libs
-	-rm -rf pam/.libs pam/_libs
-	-rm -rf storage/.libs storage/_libs
-install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
-	done
-
-uninstall-pkgincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(HEADERS)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pamdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../include/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../include/$(am__dirstamp)
-	-rm -f cgroups/$(DEPDIR)/$(am__dirstamp)
-	-rm -f cgroups/$(am__dirstamp)
-	-rm -f cmd/$(DEPDIR)/$(am__dirstamp)
-	-rm -f cmd/$(am__dirstamp)
-	-rm -f lsm/$(DEPDIR)/$(am__dirstamp)
-	-rm -f lsm/$(am__dirstamp)
-	-rm -f pam/$(DEPDIR)/$(am__dirstamp)
-	-rm -f pam/$(am__dirstamp)
-	-rm -f storage/$(DEPDIR)/$(am__dirstamp)
-	-rm -f storage/$(am__dirstamp)
-	-rm -f tools/$(DEPDIR)/$(am__dirstamp)
-	-rm -f tools/$(am__dirstamp)
-	-rm -f tools/include/$(DEPDIR)/$(am__dirstamp)
-	-rm -f tools/include/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_COMMANDS_FALSE@install-exec-hook:
-@ENABLE_PAM_FALSE@install-data-hook:
-@HAVE_PAM_FALSE@install-data-hook:
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-pamLTLIBRARIES clean-pkglibexecPROGRAMS \
-	clean-sbinPROGRAMS mostlyclean-am
-
-distclean: distclean-am
-		-rm -f ../include/$(DEPDIR)/init_lxc_static-getline.Po
-	-rm -f ../include/$(DEPDIR)/init_lxc_static-strlcat.Po
-	-rm -f ../include/$(DEPDIR)/init_lxc_static-strlcpy.Po
-	-rm -f ../include/$(DEPDIR)/liblxc_la-fexecve.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-getgrgid_r.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-getline.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-lxcmntent.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-netns_ifaddrs.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-openpty.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-prlimit.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-strlcat.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-strlcpy.Plo
-	-rm -f ../include/$(DEPDIR)/netns_ifaddrs.Po
-	-rm -f ../include/$(DEPDIR)/pam_cgfs_la-strlcat.Plo
-	-rm -f ../include/$(DEPDIR)/pam_cgfs_la-strlcpy.Plo
-	-rm -f ./$(DEPDIR)/af_unix.Po
-	-rm -f ./$(DEPDIR)/conf.Po
-	-rm -f ./$(DEPDIR)/file_utils.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-caps.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-error.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-file_utils.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-initutils.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-log.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-namespace.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-string_utils.Po
-	-rm -f ./$(DEPDIR)/initutils.Po
-	-rm -f ./$(DEPDIR)/liblxc_la-af_unix.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-attach.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-caps.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-commands.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-commands_utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-conf.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-confile.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-confile_utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-criu.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-error.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-execute.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-file_utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-freezer.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-initutils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-log.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-lxccontainer.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-lxclock.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-mainloop.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-monitor.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-namespace.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-network.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-nl.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-parse.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-process_utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-rexec.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-ringbuf.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-rtnl.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-seccomp.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-start.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-state.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-string_utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-sync.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-terminal.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-uuid.Plo
-	-rm -f ./$(DEPDIR)/log.Po
-	-rm -f ./$(DEPDIR)/mainloop.Po
-	-rm -f ./$(DEPDIR)/monitor.Po
-	-rm -f ./$(DEPDIR)/network.Po
-	-rm -f ./$(DEPDIR)/pam_cgfs_la-file_utils.Plo
-	-rm -f ./$(DEPDIR)/pam_cgfs_la-string_utils.Plo
-	-rm -f ./$(DEPDIR)/parse.Po
-	-rm -f ./$(DEPDIR)/process_utils.Po
-	-rm -f ./$(DEPDIR)/rexec.Po
-	-rm -f ./$(DEPDIR)/string_utils.Po
-	-rm -f ./$(DEPDIR)/utils.Po
-	-rm -f cgroups/$(DEPDIR)/liblxc_la-cgfsng.Plo
-	-rm -f cgroups/$(DEPDIR)/liblxc_la-cgroup.Plo
-	-rm -f cgroups/$(DEPDIR)/liblxc_la-cgroup2_devices.Plo
-	-rm -f cgroups/$(DEPDIR)/liblxc_la-cgroup_utils.Plo
-	-rm -f cmd/$(DEPDIR)/init_lxc_static-lxc_init.Po
-	-rm -f cmd/$(DEPDIR)/lxc_init.Po
-	-rm -f cmd/$(DEPDIR)/lxc_monitord.Po
-	-rm -f cmd/$(DEPDIR)/lxc_user_nic.Po
-	-rm -f cmd/$(DEPDIR)/lxc_usernsexec.Po
-	-rm -f lsm/$(DEPDIR)/liblxc_la-apparmor.Plo
-	-rm -f lsm/$(DEPDIR)/liblxc_la-lsm.Plo
-	-rm -f lsm/$(DEPDIR)/liblxc_la-nop.Plo
-	-rm -f lsm/$(DEPDIR)/liblxc_la-selinux.Plo
-	-rm -f pam/$(DEPDIR)/cgfs_la-pam_cgfs.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-btrfs.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-dir.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-loop.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-lvm.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-nbd.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-overlay.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-rbd.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-rsync.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-storage.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-storage_utils.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-zfs.Plo
-	-rm -f storage/$(DEPDIR)/storage_utils.Po
-	-rm -f tools/$(DEPDIR)/arguments.Po
-	-rm -f tools/$(DEPDIR)/lxc_attach.Po
-	-rm -f tools/$(DEPDIR)/lxc_autostart.Po
-	-rm -f tools/$(DEPDIR)/lxc_cgroup.Po
-	-rm -f tools/$(DEPDIR)/lxc_checkpoint.Po
-	-rm -f tools/$(DEPDIR)/lxc_config.Po
-	-rm -f tools/$(DEPDIR)/lxc_console.Po
-	-rm -f tools/$(DEPDIR)/lxc_copy.Po
-	-rm -f tools/$(DEPDIR)/lxc_create.Po
-	-rm -f tools/$(DEPDIR)/lxc_destroy.Po
-	-rm -f tools/$(DEPDIR)/lxc_device.Po
-	-rm -f tools/$(DEPDIR)/lxc_execute.Po
-	-rm -f tools/$(DEPDIR)/lxc_freeze.Po
-	-rm -f tools/$(DEPDIR)/lxc_info.Po
-	-rm -f tools/$(DEPDIR)/lxc_ls.Po
-	-rm -f tools/$(DEPDIR)/lxc_monitor.Po
-	-rm -f tools/$(DEPDIR)/lxc_snapshot.Po
-	-rm -f tools/$(DEPDIR)/lxc_start.Po
-	-rm -f tools/$(DEPDIR)/lxc_stop.Po
-	-rm -f tools/$(DEPDIR)/lxc_top.Po
-	-rm -f tools/$(DEPDIR)/lxc_unfreeze.Po
-	-rm -f tools/$(DEPDIR)/lxc_unshare.Po
-	-rm -f tools/$(DEPDIR)/lxc_wait.Po
-	-rm -f tools/include/$(DEPDIR)/getsubopt.Po
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pamLTLIBRARIES install-pkgincludeHEADERS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS install-binSCRIPTS \
-	install-exec-local install-libLTLIBRARIES \
-	install-pkglibexecPROGRAMS install-sbinPROGRAMS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-		-rm -f ../include/$(DEPDIR)/init_lxc_static-getline.Po
-	-rm -f ../include/$(DEPDIR)/init_lxc_static-strlcat.Po
-	-rm -f ../include/$(DEPDIR)/init_lxc_static-strlcpy.Po
-	-rm -f ../include/$(DEPDIR)/liblxc_la-fexecve.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-getgrgid_r.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-getline.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-lxcmntent.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-netns_ifaddrs.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-openpty.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-prlimit.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-strlcat.Plo
-	-rm -f ../include/$(DEPDIR)/liblxc_la-strlcpy.Plo
-	-rm -f ../include/$(DEPDIR)/netns_ifaddrs.Po
-	-rm -f ../include/$(DEPDIR)/pam_cgfs_la-strlcat.Plo
-	-rm -f ../include/$(DEPDIR)/pam_cgfs_la-strlcpy.Plo
-	-rm -f ./$(DEPDIR)/af_unix.Po
-	-rm -f ./$(DEPDIR)/conf.Po
-	-rm -f ./$(DEPDIR)/file_utils.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-caps.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-error.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-file_utils.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-initutils.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-log.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-namespace.Po
-	-rm -f ./$(DEPDIR)/init_lxc_static-string_utils.Po
-	-rm -f ./$(DEPDIR)/initutils.Po
-	-rm -f ./$(DEPDIR)/liblxc_la-af_unix.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-attach.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-caps.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-commands.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-commands_utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-conf.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-confile.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-confile_utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-criu.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-error.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-execute.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-file_utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-freezer.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-initutils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-log.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-lxccontainer.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-lxclock.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-mainloop.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-monitor.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-namespace.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-network.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-nl.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-parse.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-process_utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-rexec.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-ringbuf.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-rtnl.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-seccomp.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-start.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-state.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-string_utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-sync.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-terminal.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-utils.Plo
-	-rm -f ./$(DEPDIR)/liblxc_la-uuid.Plo
-	-rm -f ./$(DEPDIR)/log.Po
-	-rm -f ./$(DEPDIR)/mainloop.Po
-	-rm -f ./$(DEPDIR)/monitor.Po
-	-rm -f ./$(DEPDIR)/network.Po
-	-rm -f ./$(DEPDIR)/pam_cgfs_la-file_utils.Plo
-	-rm -f ./$(DEPDIR)/pam_cgfs_la-string_utils.Plo
-	-rm -f ./$(DEPDIR)/parse.Po
-	-rm -f ./$(DEPDIR)/process_utils.Po
-	-rm -f ./$(DEPDIR)/rexec.Po
-	-rm -f ./$(DEPDIR)/string_utils.Po
-	-rm -f ./$(DEPDIR)/utils.Po
-	-rm -f cgroups/$(DEPDIR)/liblxc_la-cgfsng.Plo
-	-rm -f cgroups/$(DEPDIR)/liblxc_la-cgroup.Plo
-	-rm -f cgroups/$(DEPDIR)/liblxc_la-cgroup2_devices.Plo
-	-rm -f cgroups/$(DEPDIR)/liblxc_la-cgroup_utils.Plo
-	-rm -f cmd/$(DEPDIR)/init_lxc_static-lxc_init.Po
-	-rm -f cmd/$(DEPDIR)/lxc_init.Po
-	-rm -f cmd/$(DEPDIR)/lxc_monitord.Po
-	-rm -f cmd/$(DEPDIR)/lxc_user_nic.Po
-	-rm -f cmd/$(DEPDIR)/lxc_usernsexec.Po
-	-rm -f lsm/$(DEPDIR)/liblxc_la-apparmor.Plo
-	-rm -f lsm/$(DEPDIR)/liblxc_la-lsm.Plo
-	-rm -f lsm/$(DEPDIR)/liblxc_la-nop.Plo
-	-rm -f lsm/$(DEPDIR)/liblxc_la-selinux.Plo
-	-rm -f pam/$(DEPDIR)/cgfs_la-pam_cgfs.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-btrfs.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-dir.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-loop.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-lvm.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-nbd.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-overlay.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-rbd.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-rsync.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-storage.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-storage_utils.Plo
-	-rm -f storage/$(DEPDIR)/liblxc_la-zfs.Plo
-	-rm -f storage/$(DEPDIR)/storage_utils.Po
-	-rm -f tools/$(DEPDIR)/arguments.Po
-	-rm -f tools/$(DEPDIR)/lxc_attach.Po
-	-rm -f tools/$(DEPDIR)/lxc_autostart.Po
-	-rm -f tools/$(DEPDIR)/lxc_cgroup.Po
-	-rm -f tools/$(DEPDIR)/lxc_checkpoint.Po
-	-rm -f tools/$(DEPDIR)/lxc_config.Po
-	-rm -f tools/$(DEPDIR)/lxc_console.Po
-	-rm -f tools/$(DEPDIR)/lxc_copy.Po
-	-rm -f tools/$(DEPDIR)/lxc_create.Po
-	-rm -f tools/$(DEPDIR)/lxc_destroy.Po
-	-rm -f tools/$(DEPDIR)/lxc_device.Po
-	-rm -f tools/$(DEPDIR)/lxc_execute.Po
-	-rm -f tools/$(DEPDIR)/lxc_freeze.Po
-	-rm -f tools/$(DEPDIR)/lxc_info.Po
-	-rm -f tools/$(DEPDIR)/lxc_ls.Po
-	-rm -f tools/$(DEPDIR)/lxc_monitor.Po
-	-rm -f tools/$(DEPDIR)/lxc_snapshot.Po
-	-rm -f tools/$(DEPDIR)/lxc_start.Po
-	-rm -f tools/$(DEPDIR)/lxc_stop.Po
-	-rm -f tools/$(DEPDIR)/lxc_top.Po
-	-rm -f tools/$(DEPDIR)/lxc_unfreeze.Po
-	-rm -f tools/$(DEPDIR)/lxc_unshare.Po
-	-rm -f tools/$(DEPDIR)/lxc_wait.Po
-	-rm -f tools/include/$(DEPDIR)/getsubopt.Po
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-libLTLIBRARIES uninstall-local \
-	uninstall-pamLTLIBRARIES uninstall-pkgincludeHEADERS \
-	uninstall-pkglibexecPROGRAMS uninstall-sbinPROGRAMS
-
-.MAKE: install-am install-data-am install-exec-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-pamLTLIBRARIES clean-pkglibexecPROGRAMS \
-	clean-sbinPROGRAMS cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-binSCRIPTS \
-	install-data install-data-am install-data-hook install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-hook \
-	install-exec-local install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-pamLTLIBRARIES install-pdf install-pdf-am \
-	install-pkgincludeHEADERS install-pkglibexecPROGRAMS \
-	install-ps install-ps-am install-sbinPROGRAMS install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-libLTLIBRARIES uninstall-local \
-	uninstall-pamLTLIBRARIES uninstall-pkgincludeHEADERS \
-	uninstall-pkglibexecPROGRAMS uninstall-sbinPROGRAMS
-
-.PRECIOUS: Makefile
-
-
-install-exec-local: install-libLTLIBRARIES
-	mkdir -p $(DESTDIR)$(datadir)/lxc
-	install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc
-	mv $(shell readlink -f $(DESTDIR)$(libdir)/liblxc.so) $(DESTDIR)$(libdir)/liblxc.so.@LXC_ABI@
-	rm -f $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.1
-	cd $(DESTDIR)$(libdir); \
-	ln -sf liblxc.so.@LXC_ABI@ liblxc.so.$(firstword $(subst ., ,@LXC_ABI@)); \
-	ln -sf liblxc.so.$(firstword $(subst ., ,@LXC_ABI@)) liblxc.so
-
-@ENABLE_COMMANDS_TRUE@install-exec-hook:
-@ENABLE_COMMANDS_TRUE@	chmod u+s $(DESTDIR)$(libexecdir)/lxc/lxc-user-nic
-
-uninstall-local:
-	$(RM) $(DESTDIR)$(libdir)/liblxc.so*
-	$(RM) $(DESTDIR)$(libdir)/liblxc.a
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	$(RM) $(DESTDIR)$(pamdir)/pam_cgfs.so*
-
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@install-data-hook: install-pamLTLIBRARIES
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	$(RM) "$(DESTDIR)$(pamdir)/pam_cgfs.la"
-@ENABLE_PAM_TRUE@@HAVE_PAM_TRUE@	$(RM) "$(DESTDIR)$(pamdir)/pam_cgfs.a"
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/version.h Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/Makefile.am Deleted

@@ -1,183 +0,0 @@
-if ENABLE_TESTS
-
-LDADD = ../lxc/liblxc.la
-
-lxc_test_api_reboot_SOURCES = api_reboot.c
-lxc_test_apparmor_SOURCES = aa.c
-lxc_test_attach_SOURCES = attach.c
-lxc_test_basic_SOURCES = basic.c
-lxc_test_cgpath_SOURCES = cgpath.c
-lxc_test_clonetest_SOURCES = clonetest.c
-lxc_test_concurrent_SOURCES = concurrent.c
-lxc_test_config_jump_table_SOURCES = config_jump_table.c lxctest.h
-lxc_test_console_SOURCES = console.c
-lxc_test_console_log_SOURCES = console_log.c lxctest.h
-lxc_test_containertests_SOURCES = containertests.c
-lxc_test_createtest_SOURCES = createtest.c
-lxc_test_criu_check_feature_SOURCES = criu_check_feature.c lxctest.h
-lxc_test_cve_2019_5736_SOURCES =  cve-2019-5736.c lxctest.h
-lxc_test_destroytest_SOURCES = destroytest.c
-lxc_test_device_add_remove_SOURCES = device_add_remove.c
-lxc_test_getkeys_SOURCES = getkeys.c
-lxc_test_get_item_SOURCES = get_item.c
-lxc_test_list_SOURCES = list.c
-lxc_test_locktests_SOURCES = locktests.c
-lxc_test_lxcpath_SOURCES = lxcpath.c
-lxc_test_may_control_SOURCES = may_control.c
-lxc_test_mount_injection_SOURCES = mount_injection.c lxctest.h
-lxc_test_parse_config_file_SOURCES = parse_config_file.c \
-				     lxctest.h
-lxc_test_raw_clone_SOURCES = lxc_raw_clone.c \
-			     lxctest.h \
-			     ../lxc/namespace.c ../lxc/namespace.h \
-			     ../lxc/process_utils.c ../lxc/process_utils.h
-			     ../lxc/utils.c ../lxc/utils.h
-lxc_test_reboot_SOURCES = reboot.c
-lxc_test_saveconfig_SOURCES = saveconfig.c
-lxc_test_share_ns_SOURCES = share_ns.c \
-			    lxctest.h \
-			    ../lxc/compiler.h
-lxc_test_shortlived_SOURCES = shortlived.c
-lxc_test_shutdowntest_SOURCES = shutdowntest.c
-lxc_test_snapshot_SOURCES = snapshot.c
-lxc_test_startone_SOURCES = startone.c
-lxc_test_state_server_SOURCES = state_server.c \
-				lxctest.h \
-				../lxc/compiler.h
-lxc_test_utils_SOURCES = lxc-test-utils.c lxctest.h
-
-AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
-	  -DLXCPATH=\"$(LXCPATH)\" \
-	  -DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
-	  -DLXCINITDIR=\"$(LXCINITDIR)\" \
-	  -DLXC_DEFAULT_CONFIG=\"$(LXC_DEFAULT_CONFIG)\" \
-	  -DRUNTIME_PATH=\"$(RUNTIME_PATH)\" \
-	  -I $(top_srcdir)/src \
-	  -I $(top_srcdir)/src/lxc \
-	  -I $(top_srcdir)/src/lxc/cgroups \
-	  -I $(top_srcdir)/src/lxc/tools \
-	  -pthread
-
-if ENABLE_APPARMOR
-AM_CFLAGS += -DHAVE_APPARMOR
-endif
-
-if ENABLE_SECCOMP
-AM_CFLAGS += -DHAVE_SECCOMP \
-	     $(SECCOMP_CFLAGS)
-endif
-
-if ENABLE_SELINUX
-AM_CFLAGS += -DHAVE_SELINUX
-endif
-
-bin_PROGRAMS = lxc-test-api-reboot \
-	       lxc-test-apparmor \
-	       lxc-test-attach \
-	       lxc-test-basic \
-	       lxc-test-cgpath \
-	       lxc-test-clonetest \
-	       lxc-test-concurrent \
-	       lxc-test-config-jump-table \
-	       lxc-test-console \
-	       lxc-test-console-log \
-	       lxc-test-containertests \
-	       lxc-test-createtest \
-	       lxc-test-criu-check-feature \
-	       lxc-test-cve-2019-5736 \
-	       lxc-test-destroytest \
-	       lxc-test-device-add-remove \
-	       lxc-test-getkeys \
-	       lxc-test-get_item \
-	       lxc-test-list \
-	       lxc-test-locktests \
-	       lxc-test-lxcpath \
-	       lxc-test-may-control \
-	       lxc-test-mount-injection \
-	       lxc-test-parse-config-file \
-	       lxc-test-raw-clone \
-	       lxc-test-reboot \
-	       lxc-test-saveconfig \
-	       lxc-test-share-ns \
-	       lxc-test-shortlived \
-	       lxc-test-shutdowntest \
-	       lxc-test-snapshot \
-	       lxc-test-startone \
-	       lxc-test-state-server \
-	       lxc-test-utils
-
-bin_SCRIPTS =
-if ENABLE_TOOLS
-bin_SCRIPTS += lxc-test-automount \
-	       lxc-test-autostart \
-	       lxc-test-cloneconfig \
-	       lxc-test-createconfig \
-	       lxc-test-exit-code \
-	       lxc-test-no-new-privs \
-	       lxc-test-rootfs \
-	       lxc-test-usernsexec
-
-if DISTRO_UBUNTU
-bin_SCRIPTS += lxc-test-lxc-attach \
-	       lxc-test-apparmor-mount \
-	       lxc-test-apparmor-generated \
-	       lxc-test-checkpoint-restore \
-	       lxc-test-snapdeps \
-	       lxc-test-symlink \
-	       lxc-test-unpriv \
-	       lxc-test-usernic
-endif
-endif
-
-endif
-
-EXTRA_DIST = basic.c \
-	     cgpath.c \
-	     clonetest.c \
-	     concurrent.c \
-	     config_jump_table.c \
-	     console.c \
-	     console_log.c \
-	     containertests.c \
-	     createtest.c \
-	     criu_check_feature.c \
-	     cve-2019-5736.c \
-	     destroytest.c \
-	     device_add_remove.c \
-	     get_item.c \
-	     getkeys.c \
-	     list.c \
-	     locktests.c \
-	     lxcpath.c \
-	     lxc_raw_clone.c \
-	     lxc-test-lxc-attach \
-	     lxc-test-automount \
-	     lxc-test-rootfs \
-	     lxc-test-autostart \
-	     lxc-test-apparmor-mount \
-	     lxc-test-apparmor-generated \
-	     lxc-test-checkpoint-restore \
-	     lxc-test-cloneconfig \
-	     lxc-test-createconfig \
-	     lxc-test-exit-code \
-	     lxc-test-no-new-privs \
-	     lxc-test-snapdeps \
-	     lxc-test-symlink \
-	     lxc-test-unpriv \
-	     lxc-test-usernsexec \
-	     lxc-test-utils.c \
-	     may_control.c \
-	     mount_injection.c \
-	     parse_config_file.c \
-	     saveconfig.c \
-	     shortlived.c \
-	     shutdowntest.c \
-	     snapshot.c \
-	     startone.c \
-	     state_server.c \
-	     share_ns.c \
-	     travis.sh
-
-clean-local:
-	rm -f lxc-test-utils-*
-	rm -f lxc-parse-config-file-*

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/Makefile.in Deleted

@@ -1,1486 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@ENABLE_APPARMOR_TRUE@@ENABLE_TESTS_TRUE@am__append_1 = -DHAVE_APPARMOR
-@ENABLE_SECCOMP_TRUE@@ENABLE_TESTS_TRUE@am__append_2 = -DHAVE_SECCOMP \
-@ENABLE_SECCOMP_TRUE@@ENABLE_TESTS_TRUE@	     $(SECCOMP_CFLAGS)
-
-@ENABLE_SELINUX_TRUE@@ENABLE_TESTS_TRUE@am__append_3 = -DHAVE_SELINUX
-@ENABLE_TESTS_TRUE@bin_PROGRAMS = lxc-test-api-reboot$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-apparmor$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-attach$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-basic$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-cgpath$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-clonetest$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-concurrent$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-config-jump-table$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-console$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-console-log$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-containertests$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-createtest$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-criu-check-feature$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-cve-2019-5736$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-destroytest$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-device-add-remove$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-getkeys$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-get_item$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-list$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-locktests$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-lxcpath$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-may-control$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-mount-injection$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-parse-config-file$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-raw-clone$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-reboot$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-saveconfig$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-share-ns$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-shortlived$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-shutdowntest$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-snapshot$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-startone$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-state-server$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	lxc-test-utils$(EXEEXT)
-@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@am__append_4 = lxc-test-automount \
-@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-autostart \
-@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-cloneconfig \
-@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-createconfig \
-@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-exit-code \
-@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-no-new-privs \
-@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-rootfs \
-@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-usernsexec
-
-@DISTRO_UBUNTU_TRUE@@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@am__append_5 = lxc-test-lxc-attach \
-@DISTRO_UBUNTU_TRUE@@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-apparmor-mount \
-@DISTRO_UBUNTU_TRUE@@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-apparmor-generated \
-@DISTRO_UBUNTU_TRUE@@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-checkpoint-restore \
-@DISTRO_UBUNTU_TRUE@@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-snapdeps \
-@DISTRO_UBUNTU_TRUE@@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-symlink \
-@DISTRO_UBUNTU_TRUE@@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-unpriv \
-@DISTRO_UBUNTU_TRUE@@ENABLE_TESTS_TRUE@@ENABLE_TOOLS_TRUE@	       lxc-test-usernic
-
-subdir = src/tests
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc-test-usernic
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-am__lxc_test_api_reboot_SOURCES_DIST = api_reboot.c
-@ENABLE_TESTS_TRUE@am_lxc_test_api_reboot_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	api_reboot.$(OBJEXT)
-lxc_test_api_reboot_OBJECTS = $(am_lxc_test_api_reboot_OBJECTS)
-lxc_test_api_reboot_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_api_reboot_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-am__lxc_test_apparmor_SOURCES_DIST = aa.c
-@ENABLE_TESTS_TRUE@am_lxc_test_apparmor_OBJECTS = aa.$(OBJEXT)
-lxc_test_apparmor_OBJECTS = $(am_lxc_test_apparmor_OBJECTS)
-lxc_test_apparmor_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_apparmor_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_attach_SOURCES_DIST = attach.c
-@ENABLE_TESTS_TRUE@am_lxc_test_attach_OBJECTS = attach.$(OBJEXT)
-lxc_test_attach_OBJECTS = $(am_lxc_test_attach_OBJECTS)
-lxc_test_attach_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_attach_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_basic_SOURCES_DIST = basic.c
-@ENABLE_TESTS_TRUE@am_lxc_test_basic_OBJECTS = basic.$(OBJEXT)
-lxc_test_basic_OBJECTS = $(am_lxc_test_basic_OBJECTS)
-lxc_test_basic_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_basic_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_cgpath_SOURCES_DIST = cgpath.c
-@ENABLE_TESTS_TRUE@am_lxc_test_cgpath_OBJECTS = cgpath.$(OBJEXT)
-lxc_test_cgpath_OBJECTS = $(am_lxc_test_cgpath_OBJECTS)
-lxc_test_cgpath_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_cgpath_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_clonetest_SOURCES_DIST = clonetest.c
-@ENABLE_TESTS_TRUE@am_lxc_test_clonetest_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	clonetest.$(OBJEXT)
-lxc_test_clonetest_OBJECTS = $(am_lxc_test_clonetest_OBJECTS)
-lxc_test_clonetest_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_clonetest_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_concurrent_SOURCES_DIST = concurrent.c
-@ENABLE_TESTS_TRUE@am_lxc_test_concurrent_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	concurrent.$(OBJEXT)
-lxc_test_concurrent_OBJECTS = $(am_lxc_test_concurrent_OBJECTS)
-lxc_test_concurrent_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_concurrent_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_config_jump_table_SOURCES_DIST = config_jump_table.c \
-	lxctest.h
-@ENABLE_TESTS_TRUE@am_lxc_test_config_jump_table_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	config_jump_table.$(OBJEXT)
-lxc_test_config_jump_table_OBJECTS =  \
-	$(am_lxc_test_config_jump_table_OBJECTS)
-lxc_test_config_jump_table_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_config_jump_table_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_console_SOURCES_DIST = console.c
-@ENABLE_TESTS_TRUE@am_lxc_test_console_OBJECTS = console.$(OBJEXT)
-lxc_test_console_OBJECTS = $(am_lxc_test_console_OBJECTS)
-lxc_test_console_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_console_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_console_log_SOURCES_DIST = console_log.c lxctest.h
-@ENABLE_TESTS_TRUE@am_lxc_test_console_log_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	console_log.$(OBJEXT)
-lxc_test_console_log_OBJECTS = $(am_lxc_test_console_log_OBJECTS)
-lxc_test_console_log_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_console_log_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_containertests_SOURCES_DIST = containertests.c
-@ENABLE_TESTS_TRUE@am_lxc_test_containertests_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	containertests.$(OBJEXT)
-lxc_test_containertests_OBJECTS =  \
-	$(am_lxc_test_containertests_OBJECTS)
-lxc_test_containertests_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_containertests_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_createtest_SOURCES_DIST = createtest.c
-@ENABLE_TESTS_TRUE@am_lxc_test_createtest_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	createtest.$(OBJEXT)
-lxc_test_createtest_OBJECTS = $(am_lxc_test_createtest_OBJECTS)
-lxc_test_createtest_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_createtest_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_criu_check_feature_SOURCES_DIST = criu_check_feature.c \
-	lxctest.h
-@ENABLE_TESTS_TRUE@am_lxc_test_criu_check_feature_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	criu_check_feature.$(OBJEXT)
-lxc_test_criu_check_feature_OBJECTS =  \
-	$(am_lxc_test_criu_check_feature_OBJECTS)
-lxc_test_criu_check_feature_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_criu_check_feature_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_cve_2019_5736_SOURCES_DIST = cve-2019-5736.c lxctest.h
-@ENABLE_TESTS_TRUE@am_lxc_test_cve_2019_5736_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	cve-2019-5736.$(OBJEXT)
-lxc_test_cve_2019_5736_OBJECTS = $(am_lxc_test_cve_2019_5736_OBJECTS)
-lxc_test_cve_2019_5736_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_cve_2019_5736_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_destroytest_SOURCES_DIST = destroytest.c
-@ENABLE_TESTS_TRUE@am_lxc_test_destroytest_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	destroytest.$(OBJEXT)
-lxc_test_destroytest_OBJECTS = $(am_lxc_test_destroytest_OBJECTS)
-lxc_test_destroytest_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_destroytest_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_device_add_remove_SOURCES_DIST = device_add_remove.c
-@ENABLE_TESTS_TRUE@am_lxc_test_device_add_remove_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	device_add_remove.$(OBJEXT)
-lxc_test_device_add_remove_OBJECTS =  \
-	$(am_lxc_test_device_add_remove_OBJECTS)
-lxc_test_device_add_remove_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_device_add_remove_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_get_item_SOURCES_DIST = get_item.c
-@ENABLE_TESTS_TRUE@am_lxc_test_get_item_OBJECTS = get_item.$(OBJEXT)
-lxc_test_get_item_OBJECTS = $(am_lxc_test_get_item_OBJECTS)
-lxc_test_get_item_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_get_item_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_getkeys_SOURCES_DIST = getkeys.c
-@ENABLE_TESTS_TRUE@am_lxc_test_getkeys_OBJECTS = getkeys.$(OBJEXT)
-lxc_test_getkeys_OBJECTS = $(am_lxc_test_getkeys_OBJECTS)
-lxc_test_getkeys_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_getkeys_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_list_SOURCES_DIST = list.c
-@ENABLE_TESTS_TRUE@am_lxc_test_list_OBJECTS = list.$(OBJEXT)
-lxc_test_list_OBJECTS = $(am_lxc_test_list_OBJECTS)
-lxc_test_list_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_list_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_locktests_SOURCES_DIST = locktests.c
-@ENABLE_TESTS_TRUE@am_lxc_test_locktests_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	locktests.$(OBJEXT)
-lxc_test_locktests_OBJECTS = $(am_lxc_test_locktests_OBJECTS)
-lxc_test_locktests_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_locktests_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_lxcpath_SOURCES_DIST = lxcpath.c
-@ENABLE_TESTS_TRUE@am_lxc_test_lxcpath_OBJECTS = lxcpath.$(OBJEXT)
-lxc_test_lxcpath_OBJECTS = $(am_lxc_test_lxcpath_OBJECTS)
-lxc_test_lxcpath_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_lxcpath_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_may_control_SOURCES_DIST = may_control.c
-@ENABLE_TESTS_TRUE@am_lxc_test_may_control_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	may_control.$(OBJEXT)
-lxc_test_may_control_OBJECTS = $(am_lxc_test_may_control_OBJECTS)
-lxc_test_may_control_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_may_control_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_mount_injection_SOURCES_DIST = mount_injection.c \
-	lxctest.h
-@ENABLE_TESTS_TRUE@am_lxc_test_mount_injection_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	mount_injection.$(OBJEXT)
-lxc_test_mount_injection_OBJECTS =  \
-	$(am_lxc_test_mount_injection_OBJECTS)
-lxc_test_mount_injection_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_mount_injection_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_parse_config_file_SOURCES_DIST = parse_config_file.c \
-	lxctest.h
-@ENABLE_TESTS_TRUE@am_lxc_test_parse_config_file_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	parse_config_file.$(OBJEXT)
-lxc_test_parse_config_file_OBJECTS =  \
-	$(am_lxc_test_parse_config_file_OBJECTS)
-lxc_test_parse_config_file_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_parse_config_file_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_raw_clone_SOURCES_DIST = lxc_raw_clone.c lxctest.h \
-	../lxc/namespace.c ../lxc/namespace.h ../lxc/process_utils.c \
-	../lxc/process_utils.h
-am__dirstamp = $(am__leading_dot)dirstamp
-@ENABLE_TESTS_TRUE@am_lxc_test_raw_clone_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	lxc_raw_clone.$(OBJEXT) \
-@ENABLE_TESTS_TRUE@	../lxc/namespace.$(OBJEXT) \
-@ENABLE_TESTS_TRUE@	../lxc/process_utils.$(OBJEXT)
-lxc_test_raw_clone_OBJECTS = $(am_lxc_test_raw_clone_OBJECTS)
-lxc_test_raw_clone_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_raw_clone_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_reboot_SOURCES_DIST = reboot.c
-@ENABLE_TESTS_TRUE@am_lxc_test_reboot_OBJECTS = reboot.$(OBJEXT)
-lxc_test_reboot_OBJECTS = $(am_lxc_test_reboot_OBJECTS)
-lxc_test_reboot_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_reboot_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_saveconfig_SOURCES_DIST = saveconfig.c
-@ENABLE_TESTS_TRUE@am_lxc_test_saveconfig_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	saveconfig.$(OBJEXT)
-lxc_test_saveconfig_OBJECTS = $(am_lxc_test_saveconfig_OBJECTS)
-lxc_test_saveconfig_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_saveconfig_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_share_ns_SOURCES_DIST = share_ns.c lxctest.h \
-	../lxc/compiler.h
-@ENABLE_TESTS_TRUE@am_lxc_test_share_ns_OBJECTS = share_ns.$(OBJEXT)
-lxc_test_share_ns_OBJECTS = $(am_lxc_test_share_ns_OBJECTS)
-lxc_test_share_ns_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_share_ns_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_shortlived_SOURCES_DIST = shortlived.c
-@ENABLE_TESTS_TRUE@am_lxc_test_shortlived_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	shortlived.$(OBJEXT)
-lxc_test_shortlived_OBJECTS = $(am_lxc_test_shortlived_OBJECTS)
-lxc_test_shortlived_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_shortlived_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_shutdowntest_SOURCES_DIST = shutdowntest.c
-@ENABLE_TESTS_TRUE@am_lxc_test_shutdowntest_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	shutdowntest.$(OBJEXT)
-lxc_test_shutdowntest_OBJECTS = $(am_lxc_test_shutdowntest_OBJECTS)
-lxc_test_shutdowntest_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_shutdowntest_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_snapshot_SOURCES_DIST = snapshot.c
-@ENABLE_TESTS_TRUE@am_lxc_test_snapshot_OBJECTS = snapshot.$(OBJEXT)
-lxc_test_snapshot_OBJECTS = $(am_lxc_test_snapshot_OBJECTS)
-lxc_test_snapshot_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_snapshot_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_startone_SOURCES_DIST = startone.c
-@ENABLE_TESTS_TRUE@am_lxc_test_startone_OBJECTS = startone.$(OBJEXT)
-lxc_test_startone_OBJECTS = $(am_lxc_test_startone_OBJECTS)
-lxc_test_startone_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_startone_DEPENDENCIES = ../lxc/liblxc.la
-am__lxc_test_state_server_SOURCES_DIST = state_server.c lxctest.h \
-	../lxc/compiler.h
-@ENABLE_TESTS_TRUE@am_lxc_test_state_server_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	state_server.$(OBJEXT)
-lxc_test_state_server_OBJECTS = $(am_lxc_test_state_server_OBJECTS)
-lxc_test_state_server_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_state_server_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	../lxc/liblxc.la
-am__lxc_test_utils_SOURCES_DIST = lxc-test-utils.c lxctest.h
-@ENABLE_TESTS_TRUE@am_lxc_test_utils_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	lxc-test-utils.$(OBJEXT)
-lxc_test_utils_OBJECTS = $(am_lxc_test_utils_OBJECTS)
-lxc_test_utils_LDADD = $(LDADD)
-@ENABLE_TESTS_TRUE@lxc_test_utils_DEPENDENCIES = ../lxc/liblxc.la
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-SCRIPTS = $(bin_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ../lxc/$(DEPDIR)/namespace.Po \
-	../lxc/$(DEPDIR)/process_utils.Po ./$(DEPDIR)/aa.Po \
-	./$(DEPDIR)/api_reboot.Po ./$(DEPDIR)/attach.Po \
-	./$(DEPDIR)/basic.Po ./$(DEPDIR)/cgpath.Po \
-	./$(DEPDIR)/clonetest.Po ./$(DEPDIR)/concurrent.Po \
-	./$(DEPDIR)/config_jump_table.Po ./$(DEPDIR)/console.Po \
-	./$(DEPDIR)/console_log.Po ./$(DEPDIR)/containertests.Po \
-	./$(DEPDIR)/createtest.Po ./$(DEPDIR)/criu_check_feature.Po \
-	./$(DEPDIR)/cve-2019-5736.Po ./$(DEPDIR)/destroytest.Po \
-	./$(DEPDIR)/device_add_remove.Po ./$(DEPDIR)/get_item.Po \
-	./$(DEPDIR)/getkeys.Po ./$(DEPDIR)/list.Po \
-	./$(DEPDIR)/locktests.Po ./$(DEPDIR)/lxc-test-utils.Po \
-	./$(DEPDIR)/lxc_raw_clone.Po ./$(DEPDIR)/lxcpath.Po \
-	./$(DEPDIR)/may_control.Po ./$(DEPDIR)/mount_injection.Po \
-	./$(DEPDIR)/parse_config_file.Po ./$(DEPDIR)/reboot.Po \
-	./$(DEPDIR)/saveconfig.Po ./$(DEPDIR)/share_ns.Po \
-	./$(DEPDIR)/shortlived.Po ./$(DEPDIR)/shutdowntest.Po \
-	./$(DEPDIR)/snapshot.Po ./$(DEPDIR)/startone.Po \
-	./$(DEPDIR)/state_server.Po
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(lxc_test_api_reboot_SOURCES) $(lxc_test_apparmor_SOURCES) \
-	$(lxc_test_attach_SOURCES) $(lxc_test_basic_SOURCES) \
-	$(lxc_test_cgpath_SOURCES) $(lxc_test_clonetest_SOURCES) \
-	$(lxc_test_concurrent_SOURCES) \
-	$(lxc_test_config_jump_table_SOURCES) \
-	$(lxc_test_console_SOURCES) $(lxc_test_console_log_SOURCES) \
-	$(lxc_test_containertests_SOURCES) \
-	$(lxc_test_createtest_SOURCES) \
-	$(lxc_test_criu_check_feature_SOURCES) \
-	$(lxc_test_cve_2019_5736_SOURCES) \
-	$(lxc_test_destroytest_SOURCES) \
-	$(lxc_test_device_add_remove_SOURCES) \
-	$(lxc_test_get_item_SOURCES) $(lxc_test_getkeys_SOURCES) \
-	$(lxc_test_list_SOURCES) $(lxc_test_locktests_SOURCES) \
-	$(lxc_test_lxcpath_SOURCES) $(lxc_test_may_control_SOURCES) \
-	$(lxc_test_mount_injection_SOURCES) \
-	$(lxc_test_parse_config_file_SOURCES) \
-	$(lxc_test_raw_clone_SOURCES) $(lxc_test_reboot_SOURCES) \
-	$(lxc_test_saveconfig_SOURCES) $(lxc_test_share_ns_SOURCES) \
-	$(lxc_test_shortlived_SOURCES) \
-	$(lxc_test_shutdowntest_SOURCES) $(lxc_test_snapshot_SOURCES) \
-	$(lxc_test_startone_SOURCES) $(lxc_test_state_server_SOURCES) \
-	$(lxc_test_utils_SOURCES)
-DIST_SOURCES = $(am__lxc_test_api_reboot_SOURCES_DIST) \
-	$(am__lxc_test_apparmor_SOURCES_DIST) \
-	$(am__lxc_test_attach_SOURCES_DIST) \
-	$(am__lxc_test_basic_SOURCES_DIST) \
-	$(am__lxc_test_cgpath_SOURCES_DIST) \
-	$(am__lxc_test_clonetest_SOURCES_DIST) \
-	$(am__lxc_test_concurrent_SOURCES_DIST) \
-	$(am__lxc_test_config_jump_table_SOURCES_DIST) \
-	$(am__lxc_test_console_SOURCES_DIST) \
-	$(am__lxc_test_console_log_SOURCES_DIST) \
-	$(am__lxc_test_containertests_SOURCES_DIST) \
-	$(am__lxc_test_createtest_SOURCES_DIST) \
-	$(am__lxc_test_criu_check_feature_SOURCES_DIST) \
-	$(am__lxc_test_cve_2019_5736_SOURCES_DIST) \
-	$(am__lxc_test_destroytest_SOURCES_DIST) \
-	$(am__lxc_test_device_add_remove_SOURCES_DIST) \
-	$(am__lxc_test_get_item_SOURCES_DIST) \
-	$(am__lxc_test_getkeys_SOURCES_DIST) \
-	$(am__lxc_test_list_SOURCES_DIST) \
-	$(am__lxc_test_locktests_SOURCES_DIST) \
-	$(am__lxc_test_lxcpath_SOURCES_DIST) \
-	$(am__lxc_test_may_control_SOURCES_DIST) \
-	$(am__lxc_test_mount_injection_SOURCES_DIST) \
-	$(am__lxc_test_parse_config_file_SOURCES_DIST) \
-	$(am__lxc_test_raw_clone_SOURCES_DIST) \
-	$(am__lxc_test_reboot_SOURCES_DIST) \
-	$(am__lxc_test_saveconfig_SOURCES_DIST) \
-	$(am__lxc_test_share_ns_SOURCES_DIST) \
-	$(am__lxc_test_shortlived_SOURCES_DIST) \
-	$(am__lxc_test_shutdowntest_SOURCES_DIST) \
-	$(am__lxc_test_snapshot_SOURCES_DIST) \
-	$(am__lxc_test_startone_SOURCES_DIST) \
-	$(am__lxc_test_state_server_SOURCES_DIST) \
-	$(am__lxc_test_utils_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc-test-usernic.in \
-	$(top_srcdir)/config/depcomp
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@ENABLE_TESTS_TRUE@LDADD = ../lxc/liblxc.la
-@ENABLE_TESTS_TRUE@lxc_test_api_reboot_SOURCES = api_reboot.c
-@ENABLE_TESTS_TRUE@lxc_test_apparmor_SOURCES = aa.c
-@ENABLE_TESTS_TRUE@lxc_test_attach_SOURCES = attach.c
-@ENABLE_TESTS_TRUE@lxc_test_basic_SOURCES = basic.c
-@ENABLE_TESTS_TRUE@lxc_test_cgpath_SOURCES = cgpath.c
-@ENABLE_TESTS_TRUE@lxc_test_clonetest_SOURCES = clonetest.c
-@ENABLE_TESTS_TRUE@lxc_test_concurrent_SOURCES = concurrent.c
-@ENABLE_TESTS_TRUE@lxc_test_config_jump_table_SOURCES = config_jump_table.c lxctest.h
-@ENABLE_TESTS_TRUE@lxc_test_console_SOURCES = console.c
-@ENABLE_TESTS_TRUE@lxc_test_console_log_SOURCES = console_log.c lxctest.h
-@ENABLE_TESTS_TRUE@lxc_test_containertests_SOURCES = containertests.c
-@ENABLE_TESTS_TRUE@lxc_test_createtest_SOURCES = createtest.c
-@ENABLE_TESTS_TRUE@lxc_test_criu_check_feature_SOURCES = criu_check_feature.c lxctest.h
-@ENABLE_TESTS_TRUE@lxc_test_cve_2019_5736_SOURCES = cve-2019-5736.c lxctest.h
-@ENABLE_TESTS_TRUE@lxc_test_destroytest_SOURCES = destroytest.c
-@ENABLE_TESTS_TRUE@lxc_test_device_add_remove_SOURCES = device_add_remove.c
-@ENABLE_TESTS_TRUE@lxc_test_getkeys_SOURCES = getkeys.c
-@ENABLE_TESTS_TRUE@lxc_test_get_item_SOURCES = get_item.c
-@ENABLE_TESTS_TRUE@lxc_test_list_SOURCES = list.c
-@ENABLE_TESTS_TRUE@lxc_test_locktests_SOURCES = locktests.c
-@ENABLE_TESTS_TRUE@lxc_test_lxcpath_SOURCES = lxcpath.c
-@ENABLE_TESTS_TRUE@lxc_test_may_control_SOURCES = may_control.c
-@ENABLE_TESTS_TRUE@lxc_test_mount_injection_SOURCES = mount_injection.c lxctest.h
-@ENABLE_TESTS_TRUE@lxc_test_parse_config_file_SOURCES = parse_config_file.c \
-@ENABLE_TESTS_TRUE@				     lxctest.h
-
-@ENABLE_TESTS_TRUE@lxc_test_raw_clone_SOURCES = lxc_raw_clone.c \
-@ENABLE_TESTS_TRUE@			     lxctest.h \
-@ENABLE_TESTS_TRUE@			     ../lxc/namespace.c ../lxc/namespace.h \
-@ENABLE_TESTS_TRUE@			     ../lxc/process_utils.c ../lxc/process_utils.h
-
-@ENABLE_TESTS_TRUE@lxc_test_reboot_SOURCES = reboot.c
-@ENABLE_TESTS_TRUE@lxc_test_saveconfig_SOURCES = saveconfig.c
-@ENABLE_TESTS_TRUE@lxc_test_share_ns_SOURCES = share_ns.c \
-@ENABLE_TESTS_TRUE@			    lxctest.h \
-@ENABLE_TESTS_TRUE@			    ../lxc/compiler.h
-
-@ENABLE_TESTS_TRUE@lxc_test_shortlived_SOURCES = shortlived.c
-@ENABLE_TESTS_TRUE@lxc_test_shutdowntest_SOURCES = shutdowntest.c
-@ENABLE_TESTS_TRUE@lxc_test_snapshot_SOURCES = snapshot.c
-@ENABLE_TESTS_TRUE@lxc_test_startone_SOURCES = startone.c
-@ENABLE_TESTS_TRUE@lxc_test_state_server_SOURCES = state_server.c \
-@ENABLE_TESTS_TRUE@				lxctest.h \
-@ENABLE_TESTS_TRUE@				../lxc/compiler.h
-
-@ENABLE_TESTS_TRUE@lxc_test_utils_SOURCES = lxc-test-utils.c lxctest.h
-@ENABLE_TESTS_TRUE@AM_CFLAGS = -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
-@ENABLE_TESTS_TRUE@	-DLXCPATH=\"$(LXCPATH)\" \
-@ENABLE_TESTS_TRUE@	-DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
-@ENABLE_TESTS_TRUE@	-DLXCINITDIR=\"$(LXCINITDIR)\" \
-@ENABLE_TESTS_TRUE@	-DLXC_DEFAULT_CONFIG=\"$(LXC_DEFAULT_CONFIG)\" \
-@ENABLE_TESTS_TRUE@	-DRUNTIME_PATH=\"$(RUNTIME_PATH)\" -I \
-@ENABLE_TESTS_TRUE@	$(top_srcdir)/src -I $(top_srcdir)/src/lxc \
-@ENABLE_TESTS_TRUE@	-I $(top_srcdir)/src/lxc/cgroups -I \
-@ENABLE_TESTS_TRUE@	$(top_srcdir)/src/lxc/tools -pthread \
-@ENABLE_TESTS_TRUE@	$(am__append_1) $(am__append_2) \
-@ENABLE_TESTS_TRUE@	$(am__append_3)
-@ENABLE_TESTS_TRUE@bin_SCRIPTS = $(am__append_4) $(am__append_5)
-EXTRA_DIST = basic.c \
-	     cgpath.c \
-	     clonetest.c \
-	     concurrent.c \
-	     config_jump_table.c \
-	     console.c \
-	     console_log.c \
-	     containertests.c \
-	     createtest.c \
-	     criu_check_feature.c \
-	     cve-2019-5736.c \
-	     destroytest.c \
-	     device_add_remove.c \
-	     get_item.c \
-	     getkeys.c \
-	     list.c \
-	     locktests.c \
-	     lxcpath.c \
-	     lxc_raw_clone.c \
-	     lxc-test-lxc-attach \
-	     lxc-test-automount \
-	     lxc-test-rootfs \
-	     lxc-test-autostart \
-	     lxc-test-apparmor-mount \
-	     lxc-test-apparmor-generated \
-	     lxc-test-checkpoint-restore \
-	     lxc-test-cloneconfig \
-	     lxc-test-createconfig \
-	     lxc-test-exit-code \
-	     lxc-test-no-new-privs \
-	     lxc-test-snapdeps \
-	     lxc-test-symlink \
-	     lxc-test-unpriv \
-	     lxc-test-usernsexec \
-	     lxc-test-utils.c \
-	     may_control.c \
-	     mount_injection.c \
-	     parse_config_file.c \
-	     saveconfig.c \
-	     shortlived.c \
-	     shutdowntest.c \
-	     snapshot.c \
-	     startone.c \
-	     state_server.c \
-	     share_ns.c \
-	     travis.sh
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tests/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/tests/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc-test-usernic: $(top_builddir)/config.status $(srcdir)/lxc-test-usernic.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	 || test -f $$p1 \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1 } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) filesd = filesd " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-lxc-test-api-reboot$(EXEEXT): $(lxc_test_api_reboot_OBJECTS) $(lxc_test_api_reboot_DEPENDENCIES) $(EXTRA_lxc_test_api_reboot_DEPENDENCIES) 
-	@rm -f lxc-test-api-reboot$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_api_reboot_OBJECTS) $(lxc_test_api_reboot_LDADD) $(LIBS)
-
-lxc-test-apparmor$(EXEEXT): $(lxc_test_apparmor_OBJECTS) $(lxc_test_apparmor_DEPENDENCIES) $(EXTRA_lxc_test_apparmor_DEPENDENCIES) 
-	@rm -f lxc-test-apparmor$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_apparmor_OBJECTS) $(lxc_test_apparmor_LDADD) $(LIBS)
-
-lxc-test-attach$(EXEEXT): $(lxc_test_attach_OBJECTS) $(lxc_test_attach_DEPENDENCIES) $(EXTRA_lxc_test_attach_DEPENDENCIES) 
-	@rm -f lxc-test-attach$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_attach_OBJECTS) $(lxc_test_attach_LDADD) $(LIBS)
-
-lxc-test-basic$(EXEEXT): $(lxc_test_basic_OBJECTS) $(lxc_test_basic_DEPENDENCIES) $(EXTRA_lxc_test_basic_DEPENDENCIES) 
-	@rm -f lxc-test-basic$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_basic_OBJECTS) $(lxc_test_basic_LDADD) $(LIBS)
-
-lxc-test-cgpath$(EXEEXT): $(lxc_test_cgpath_OBJECTS) $(lxc_test_cgpath_DEPENDENCIES) $(EXTRA_lxc_test_cgpath_DEPENDENCIES) 
-	@rm -f lxc-test-cgpath$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_cgpath_OBJECTS) $(lxc_test_cgpath_LDADD) $(LIBS)
-
-lxc-test-clonetest$(EXEEXT): $(lxc_test_clonetest_OBJECTS) $(lxc_test_clonetest_DEPENDENCIES) $(EXTRA_lxc_test_clonetest_DEPENDENCIES) 
-	@rm -f lxc-test-clonetest$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_clonetest_OBJECTS) $(lxc_test_clonetest_LDADD) $(LIBS)
-
-lxc-test-concurrent$(EXEEXT): $(lxc_test_concurrent_OBJECTS) $(lxc_test_concurrent_DEPENDENCIES) $(EXTRA_lxc_test_concurrent_DEPENDENCIES) 
-	@rm -f lxc-test-concurrent$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_concurrent_OBJECTS) $(lxc_test_concurrent_LDADD) $(LIBS)
-
-lxc-test-config-jump-table$(EXEEXT): $(lxc_test_config_jump_table_OBJECTS) $(lxc_test_config_jump_table_DEPENDENCIES) $(EXTRA_lxc_test_config_jump_table_DEPENDENCIES) 
-	@rm -f lxc-test-config-jump-table$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_config_jump_table_OBJECTS) $(lxc_test_config_jump_table_LDADD) $(LIBS)
-
-lxc-test-console$(EXEEXT): $(lxc_test_console_OBJECTS) $(lxc_test_console_DEPENDENCIES) $(EXTRA_lxc_test_console_DEPENDENCIES) 
-	@rm -f lxc-test-console$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_console_OBJECTS) $(lxc_test_console_LDADD) $(LIBS)
-
-lxc-test-console-log$(EXEEXT): $(lxc_test_console_log_OBJECTS) $(lxc_test_console_log_DEPENDENCIES) $(EXTRA_lxc_test_console_log_DEPENDENCIES) 
-	@rm -f lxc-test-console-log$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_console_log_OBJECTS) $(lxc_test_console_log_LDADD) $(LIBS)
-
-lxc-test-containertests$(EXEEXT): $(lxc_test_containertests_OBJECTS) $(lxc_test_containertests_DEPENDENCIES) $(EXTRA_lxc_test_containertests_DEPENDENCIES) 
-	@rm -f lxc-test-containertests$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_containertests_OBJECTS) $(lxc_test_containertests_LDADD) $(LIBS)
-
-lxc-test-createtest$(EXEEXT): $(lxc_test_createtest_OBJECTS) $(lxc_test_createtest_DEPENDENCIES) $(EXTRA_lxc_test_createtest_DEPENDENCIES) 
-	@rm -f lxc-test-createtest$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_createtest_OBJECTS) $(lxc_test_createtest_LDADD) $(LIBS)
-
-lxc-test-criu-check-feature$(EXEEXT): $(lxc_test_criu_check_feature_OBJECTS) $(lxc_test_criu_check_feature_DEPENDENCIES) $(EXTRA_lxc_test_criu_check_feature_DEPENDENCIES) 
-	@rm -f lxc-test-criu-check-feature$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_criu_check_feature_OBJECTS) $(lxc_test_criu_check_feature_LDADD) $(LIBS)
-
-lxc-test-cve-2019-5736$(EXEEXT): $(lxc_test_cve_2019_5736_OBJECTS) $(lxc_test_cve_2019_5736_DEPENDENCIES) $(EXTRA_lxc_test_cve_2019_5736_DEPENDENCIES) 
-	@rm -f lxc-test-cve-2019-5736$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_cve_2019_5736_OBJECTS) $(lxc_test_cve_2019_5736_LDADD) $(LIBS)
-
-lxc-test-destroytest$(EXEEXT): $(lxc_test_destroytest_OBJECTS) $(lxc_test_destroytest_DEPENDENCIES) $(EXTRA_lxc_test_destroytest_DEPENDENCIES) 
-	@rm -f lxc-test-destroytest$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_destroytest_OBJECTS) $(lxc_test_destroytest_LDADD) $(LIBS)
-
-lxc-test-device-add-remove$(EXEEXT): $(lxc_test_device_add_remove_OBJECTS) $(lxc_test_device_add_remove_DEPENDENCIES) $(EXTRA_lxc_test_device_add_remove_DEPENDENCIES) 
-	@rm -f lxc-test-device-add-remove$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_device_add_remove_OBJECTS) $(lxc_test_device_add_remove_LDADD) $(LIBS)
-
-lxc-test-get_item$(EXEEXT): $(lxc_test_get_item_OBJECTS) $(lxc_test_get_item_DEPENDENCIES) $(EXTRA_lxc_test_get_item_DEPENDENCIES) 
-	@rm -f lxc-test-get_item$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_get_item_OBJECTS) $(lxc_test_get_item_LDADD) $(LIBS)
-
-lxc-test-getkeys$(EXEEXT): $(lxc_test_getkeys_OBJECTS) $(lxc_test_getkeys_DEPENDENCIES) $(EXTRA_lxc_test_getkeys_DEPENDENCIES) 
-	@rm -f lxc-test-getkeys$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_getkeys_OBJECTS) $(lxc_test_getkeys_LDADD) $(LIBS)
-
-lxc-test-list$(EXEEXT): $(lxc_test_list_OBJECTS) $(lxc_test_list_DEPENDENCIES) $(EXTRA_lxc_test_list_DEPENDENCIES) 
-	@rm -f lxc-test-list$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_list_OBJECTS) $(lxc_test_list_LDADD) $(LIBS)
-
-lxc-test-locktests$(EXEEXT): $(lxc_test_locktests_OBJECTS) $(lxc_test_locktests_DEPENDENCIES) $(EXTRA_lxc_test_locktests_DEPENDENCIES) 
-	@rm -f lxc-test-locktests$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_locktests_OBJECTS) $(lxc_test_locktests_LDADD) $(LIBS)
-
-lxc-test-lxcpath$(EXEEXT): $(lxc_test_lxcpath_OBJECTS) $(lxc_test_lxcpath_DEPENDENCIES) $(EXTRA_lxc_test_lxcpath_DEPENDENCIES) 
-	@rm -f lxc-test-lxcpath$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_lxcpath_OBJECTS) $(lxc_test_lxcpath_LDADD) $(LIBS)
-
-lxc-test-may-control$(EXEEXT): $(lxc_test_may_control_OBJECTS) $(lxc_test_may_control_DEPENDENCIES) $(EXTRA_lxc_test_may_control_DEPENDENCIES) 
-	@rm -f lxc-test-may-control$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_may_control_OBJECTS) $(lxc_test_may_control_LDADD) $(LIBS)
-
-lxc-test-mount-injection$(EXEEXT): $(lxc_test_mount_injection_OBJECTS) $(lxc_test_mount_injection_DEPENDENCIES) $(EXTRA_lxc_test_mount_injection_DEPENDENCIES) 
-	@rm -f lxc-test-mount-injection$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_mount_injection_OBJECTS) $(lxc_test_mount_injection_LDADD) $(LIBS)
-
-lxc-test-parse-config-file$(EXEEXT): $(lxc_test_parse_config_file_OBJECTS) $(lxc_test_parse_config_file_DEPENDENCIES) $(EXTRA_lxc_test_parse_config_file_DEPENDENCIES) 
-	@rm -f lxc-test-parse-config-file$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_parse_config_file_OBJECTS) $(lxc_test_parse_config_file_LDADD) $(LIBS)
-../lxc/$(am__dirstamp):
-	@$(MKDIR_P) ../lxc
-	@: > ../lxc/$(am__dirstamp)
-../lxc/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../lxc/$(DEPDIR)
-	@: > ../lxc/$(DEPDIR)/$(am__dirstamp)
-../lxc/namespace.$(OBJEXT): ../lxc/$(am__dirstamp) \
-	../lxc/$(DEPDIR)/$(am__dirstamp)
-../lxc/process_utils.$(OBJEXT): ../lxc/$(am__dirstamp) \
-	../lxc/$(DEPDIR)/$(am__dirstamp)
-
-lxc-test-raw-clone$(EXEEXT): $(lxc_test_raw_clone_OBJECTS) $(lxc_test_raw_clone_DEPENDENCIES) $(EXTRA_lxc_test_raw_clone_DEPENDENCIES) 
-	@rm -f lxc-test-raw-clone$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_raw_clone_OBJECTS) $(lxc_test_raw_clone_LDADD) $(LIBS)
-
-lxc-test-reboot$(EXEEXT): $(lxc_test_reboot_OBJECTS) $(lxc_test_reboot_DEPENDENCIES) $(EXTRA_lxc_test_reboot_DEPENDENCIES) 
-	@rm -f lxc-test-reboot$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_reboot_OBJECTS) $(lxc_test_reboot_LDADD) $(LIBS)
-
-lxc-test-saveconfig$(EXEEXT): $(lxc_test_saveconfig_OBJECTS) $(lxc_test_saveconfig_DEPENDENCIES) $(EXTRA_lxc_test_saveconfig_DEPENDENCIES) 
-	@rm -f lxc-test-saveconfig$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_saveconfig_OBJECTS) $(lxc_test_saveconfig_LDADD) $(LIBS)
-
-lxc-test-share-ns$(EXEEXT): $(lxc_test_share_ns_OBJECTS) $(lxc_test_share_ns_DEPENDENCIES) $(EXTRA_lxc_test_share_ns_DEPENDENCIES) 
-	@rm -f lxc-test-share-ns$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_share_ns_OBJECTS) $(lxc_test_share_ns_LDADD) $(LIBS)
-
-lxc-test-shortlived$(EXEEXT): $(lxc_test_shortlived_OBJECTS) $(lxc_test_shortlived_DEPENDENCIES) $(EXTRA_lxc_test_shortlived_DEPENDENCIES) 
-	@rm -f lxc-test-shortlived$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_shortlived_OBJECTS) $(lxc_test_shortlived_LDADD) $(LIBS)
-
-lxc-test-shutdowntest$(EXEEXT): $(lxc_test_shutdowntest_OBJECTS) $(lxc_test_shutdowntest_DEPENDENCIES) $(EXTRA_lxc_test_shutdowntest_DEPENDENCIES) 
-	@rm -f lxc-test-shutdowntest$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_shutdowntest_OBJECTS) $(lxc_test_shutdowntest_LDADD) $(LIBS)
-
-lxc-test-snapshot$(EXEEXT): $(lxc_test_snapshot_OBJECTS) $(lxc_test_snapshot_DEPENDENCIES) $(EXTRA_lxc_test_snapshot_DEPENDENCIES) 
-	@rm -f lxc-test-snapshot$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_snapshot_OBJECTS) $(lxc_test_snapshot_LDADD) $(LIBS)
-
-lxc-test-startone$(EXEEXT): $(lxc_test_startone_OBJECTS) $(lxc_test_startone_DEPENDENCIES) $(EXTRA_lxc_test_startone_DEPENDENCIES) 
-	@rm -f lxc-test-startone$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_startone_OBJECTS) $(lxc_test_startone_LDADD) $(LIBS)
-
-lxc-test-state-server$(EXEEXT): $(lxc_test_state_server_OBJECTS) $(lxc_test_state_server_DEPENDENCIES) $(EXTRA_lxc_test_state_server_DEPENDENCIES) 
-	@rm -f lxc-test-state-server$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_state_server_OBJECTS) $(lxc_test_state_server_LDADD) $(LIBS)
-
-lxc-test-utils$(EXEEXT): $(lxc_test_utils_OBJECTS) $(lxc_test_utils_DEPENDENCIES) $(EXTRA_lxc_test_utils_DEPENDENCIES) 
-	@rm -f lxc-test-utils$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(lxc_test_utils_OBJECTS) $(lxc_test_utils_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1; } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) { filesd = filesd " " $$1; \
-	      if (++nd == $(am__install_max)) { \
-		print "f", d, filesd; nd = 0; filesd = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f ../lxc/*.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@../lxc/$(DEPDIR)/namespace.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../lxc/$(DEPDIR)/process_utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aa.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/api_reboot.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attach.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgpath.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clonetest.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/concurrent.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config_jump_table.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/console.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/console_log.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/containertests.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/createtest.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/criu_check_feature.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cve-2019-5736.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/destroytest.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device_add_remove.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_item.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getkeys.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locktests.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxc-test-utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxc_raw_clone.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxcpath.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/may_control.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_injection.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_config_file.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reboot.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saveconfig.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/share_ns.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shortlived.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shutdowntest.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snapshot.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/startone.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/state_server.Po@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../lxc/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../lxc/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
-	mostlyclean-am
-
-distclean: distclean-am
-		-rm -f ../lxc/$(DEPDIR)/namespace.Po
-	-rm -f ../lxc/$(DEPDIR)/process_utils.Po
-	-rm -f ./$(DEPDIR)/aa.Po
-	-rm -f ./$(DEPDIR)/api_reboot.Po
-	-rm -f ./$(DEPDIR)/attach.Po
-	-rm -f ./$(DEPDIR)/basic.Po
-	-rm -f ./$(DEPDIR)/cgpath.Po
-	-rm -f ./$(DEPDIR)/clonetest.Po
-	-rm -f ./$(DEPDIR)/concurrent.Po
-	-rm -f ./$(DEPDIR)/config_jump_table.Po
-	-rm -f ./$(DEPDIR)/console.Po
-	-rm -f ./$(DEPDIR)/console_log.Po
-	-rm -f ./$(DEPDIR)/containertests.Po
-	-rm -f ./$(DEPDIR)/createtest.Po
-	-rm -f ./$(DEPDIR)/criu_check_feature.Po
-	-rm -f ./$(DEPDIR)/cve-2019-5736.Po
-	-rm -f ./$(DEPDIR)/destroytest.Po
-	-rm -f ./$(DEPDIR)/device_add_remove.Po
-	-rm -f ./$(DEPDIR)/get_item.Po
-	-rm -f ./$(DEPDIR)/getkeys.Po
-	-rm -f ./$(DEPDIR)/list.Po
-	-rm -f ./$(DEPDIR)/locktests.Po
-	-rm -f ./$(DEPDIR)/lxc-test-utils.Po
-	-rm -f ./$(DEPDIR)/lxc_raw_clone.Po
-	-rm -f ./$(DEPDIR)/lxcpath.Po
-	-rm -f ./$(DEPDIR)/may_control.Po
-	-rm -f ./$(DEPDIR)/mount_injection.Po
-	-rm -f ./$(DEPDIR)/parse_config_file.Po
-	-rm -f ./$(DEPDIR)/reboot.Po
-	-rm -f ./$(DEPDIR)/saveconfig.Po
-	-rm -f ./$(DEPDIR)/share_ns.Po
-	-rm -f ./$(DEPDIR)/shortlived.Po
-	-rm -f ./$(DEPDIR)/shutdowntest.Po
-	-rm -f ./$(DEPDIR)/snapshot.Po
-	-rm -f ./$(DEPDIR)/startone.Po
-	-rm -f ./$(DEPDIR)/state_server.Po
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS install-binSCRIPTS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-		-rm -f ../lxc/$(DEPDIR)/namespace.Po
-	-rm -f ../lxc/$(DEPDIR)/process_utils.Po
-	-rm -f ./$(DEPDIR)/aa.Po
-	-rm -f ./$(DEPDIR)/api_reboot.Po
-	-rm -f ./$(DEPDIR)/attach.Po
-	-rm -f ./$(DEPDIR)/basic.Po
-	-rm -f ./$(DEPDIR)/cgpath.Po
-	-rm -f ./$(DEPDIR)/clonetest.Po
-	-rm -f ./$(DEPDIR)/concurrent.Po
-	-rm -f ./$(DEPDIR)/config_jump_table.Po
-	-rm -f ./$(DEPDIR)/console.Po
-	-rm -f ./$(DEPDIR)/console_log.Po
-	-rm -f ./$(DEPDIR)/containertests.Po
-	-rm -f ./$(DEPDIR)/createtest.Po
-	-rm -f ./$(DEPDIR)/criu_check_feature.Po
-	-rm -f ./$(DEPDIR)/cve-2019-5736.Po
-	-rm -f ./$(DEPDIR)/destroytest.Po
-	-rm -f ./$(DEPDIR)/device_add_remove.Po
-	-rm -f ./$(DEPDIR)/get_item.Po
-	-rm -f ./$(DEPDIR)/getkeys.Po
-	-rm -f ./$(DEPDIR)/list.Po
-	-rm -f ./$(DEPDIR)/locktests.Po
-	-rm -f ./$(DEPDIR)/lxc-test-utils.Po
-	-rm -f ./$(DEPDIR)/lxc_raw_clone.Po
-	-rm -f ./$(DEPDIR)/lxcpath.Po
-	-rm -f ./$(DEPDIR)/may_control.Po
-	-rm -f ./$(DEPDIR)/mount_injection.Po
-	-rm -f ./$(DEPDIR)/parse_config_file.Po
-	-rm -f ./$(DEPDIR)/reboot.Po
-	-rm -f ./$(DEPDIR)/saveconfig.Po
-	-rm -f ./$(DEPDIR)/share_ns.Po
-	-rm -f ./$(DEPDIR)/shortlived.Po
-	-rm -f ./$(DEPDIR)/shutdowntest.Po
-	-rm -f ./$(DEPDIR)/snapshot.Po
-	-rm -f ./$(DEPDIR)/startone.Po
-	-rm -f ./$(DEPDIR)/state_server.Po
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libtool clean-local \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-binSCRIPTS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS
-
-.PRECIOUS: Makefile
-
-@ENABLE_TESTS_TRUE@			     ../lxc/utils.c ../lxc/utils.h
-
-clean-local:
-	rm -f lxc-test-utils-*
-	rm -f lxc-parse-config-file-*
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/travis.sh Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/templates/Makefile.am Deleted

_service:tar_scm:lxc-4.0.3.tar.gz/templates/Makefile.in Deleted

@@ -1,590 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = templates
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
-	$(top_srcdir)/config/ax_check_compile_flag.m4 \
-	$(top_srcdir)/config/ax_check_link_flag.m4 \
-	$(top_srcdir)/config/ax_pthread.m4 \
-	$(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 \
-	$(top_srcdir)/config/tls.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = lxc-busybox lxc-download lxc-local lxc-oci
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(templatesdir)"
-SCRIPTS = $(templates_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lxc-busybox.in \
-	$(srcdir)/lxc-download.in $(srcdir)/lxc-local.in \
-	$(srcdir)/lxc-oci.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPARMOR_CACHE_DIR = @APPARMOR_CACHE_DIR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
-DEFAULT_CGROUP_PATTERN = @DEFAULT_CGROUP_PATTERN@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOG_CFLAGS = @DLOG_CFLAGS@
-DLOG_LIBS = @DLOG_LIBS@
-DOCDIR = @DOCDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-INCLUDEDIR = @INCLUDEDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBEXECDIR = @LIBEXECDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALSTATEDIR = @LOCALSTATEDIR@
-LOGPATH = @LOGPATH@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LXCBINHOOKDIR = @LXCBINHOOKDIR@
-LXCHOOKDIR = @LXCHOOKDIR@
-LXCINITDIR = @LXCINITDIR@
-LXCPATH = @LXCPATH@
-LXCROOTFSMOUNT = @LXCROOTFSMOUNT@
-LXCTEMPLATECONFIG = @LXCTEMPLATECONFIG@
-LXCTEMPLATEDIR = @LXCTEMPLATEDIR@
-LXC_ABI = @LXC_ABI@
-LXC_ABI_MAJOR = @LXC_ABI_MAJOR@
-LXC_ABI_MICRO = @LXC_ABI_MICRO@
-LXC_ABI_MINOR = @LXC_ABI_MINOR@
-LXC_DEFAULT_CONFIG = @LXC_DEFAULT_CONFIG@
-LXC_DEVEL = @LXC_DEVEL@
-LXC_DISTRO_SYSCONF = @LXC_DISTRO_SYSCONF@
-LXC_GENERATE_DATE = @LXC_GENERATE_DATE@
-LXC_GLOBAL_CONF = @LXC_GLOBAL_CONF@
-LXC_USERNIC_CONF = @LXC_USERNIC_CONF@
-LXC_USERNIC_DB = @LXC_USERNIC_DB@
-LXC_VERSION = @LXC_VERSION@
-LXC_VERSION_BASE = @LXC_VERSION_BASE@
-LXC_VERSION_BETA = @LXC_VERSION_BETA@
-LXC_VERSION_MAJOR = @LXC_VERSION_MAJOR@
-LXC_VERSION_MICRO = @LXC_VERSION_MICRO@
-LXC_VERSION_MINOR = @LXC_VERSION_MINOR@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_CFLAGS = @PAM_CFLAGS@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PREFIX = @PREFIX@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RUNTIME_PATH = @RUNTIME_PATH@
-SBINDIR = @SBINDIR@
-SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
-SECCOMP_LIBS = @SECCOMP_LIBS@
-SED = @SED@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
-SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bashcompdir = @bashcompdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-db2xman = @db2xman@
-docdir = @docdir@
-docdtd = @docdtd@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamdir = @pamdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-templatesdir = @LXCTEMPLATEDIR@
-templates_SCRIPTS = lxc-busybox \
-		    lxc-download \
-		    lxc-local \
-		    lxc-oci
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu templates/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu templates/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-lxc-busybox: $(top_builddir)/config.status $(srcdir)/lxc-busybox.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-download: $(top_builddir)/config.status $(srcdir)/lxc-download.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-local: $(top_builddir)/config.status $(srcdir)/lxc-local.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lxc-oci: $(top_builddir)/config.status $(srcdir)/lxc-oci.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-templatesSCRIPTS: $(templates_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(templates_SCRIPTS)'; test -n "$(templatesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(templatesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(templatesdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1; } \
-	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
-	    if ($$2 == $$4) { filesd = filesd " " $$1; \
-	      if (++nd == $(am__install_max)) { \
-		print "f", d, filesd; nd = 0; filesd = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, filesd }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(templatesdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(templatesdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-templatesSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(templates_SCRIPTS)'; test -n "$(templatesdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(templatesdir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(templatesdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-templatesSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-templatesSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-templatesSCRIPTS installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-templatesSCRIPTS
-
-.PRECIOUS: Makefile
-
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

_service:tar_scm:lxc-5.0.2.tar.gz/.github Added

_service:tar_scm:lxc-5.0.2.tar.gz/.github/ISSUE_TEMPLATE.md Added

_service:tar_scm:lxc-5.0.2.tar.gz/.github/dependabot.yml Added

_service:tar_scm:lxc-5.0.2.tar.gz/.github/workflows Added

_service:tar_scm:lxc-5.0.2.tar.gz/.github/workflows/build.yml Added

@@ -0,0 +1,56 @@
+name: Simple test build
+on:
+  - push
+  - pull_request
+permissions:
+  contents: read
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - gcc
+          - clang
+        os:
+          - ubuntu-22.04
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq gcc clang meson llvm
+          sudo apt-get install -qq libapparmor-dev libcap-dev libseccomp-dev libselinux1-dev linux-libc-dev libpam0g-dev docbook2x libsystemd-dev
+
+      - name: Compiler version
+        env:
+          CC: ${{ matrix.compiler }}
+        run: |
+          ${CC} --version
+
+      - name: Kernel version
+        run: |
+          uname -a
+
+      - name: Mount table
+        run: |
+          findmnt
+
+      - name: Build
+        env:
+          CC: ${{ matrix.compiler }}
+        run: |
+          # Standard build
+          meson setup build \
+                -Dtests=true \
+                -Dpam-cgroup=true \
+                -Dwerror=true \
+                -Db_lto_mode=default
+          ninja -C build
+          DESTDIR=build_install ninja -C build install

_service:tar_scm:lxc-5.0.2.tar.gz/.github/workflows/cifuzz.yml Added

@@ -0,0 +1,43 @@
+name: Fuzzing with OSS-fuzz
+on:
+  push:
+  pull_request:
+    paths:
+      - '**/meson.build'
+      - '.github/workflows/**'
+      - 'meson_options.txt'
+      - 'src/**'
+    branches:
+      - master
+permissions:
+  contents: read
+jobs:
+  Fuzzing:
+    runs-on: ubuntu-22.04
+    if: github.repository == 'lxc/lxc'
+    strategy:
+      fail-fast: false
+      matrix:
+        sanitizer: address, undefined, memory
+    steps:
+      - name: Build Fuzzers (${{ matrix.sanitizer }})
+        id: build
+        uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+        with:
+          oss-fuzz-project-name: 'lxc'
+          dry-run: false
+          allowed-broken-targets-percentage: 0
+          sanitizer: ${{ matrix.sanitizer }}
+      - name: Run Fuzzers (${{ matrix.sanitizer }})
+        uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+        with:
+          oss-fuzz-project-name: 'lxc'
+          fuzz-seconds: 360
+          dry-run: false
+          sanitizer: ${{ matrix.sanitizer }}
+      - name: Upload Crash
+        uses: actions/upload-artifact@v3
+        if: failure() && steps.build.outcome == 'success'
+        with:
+          name: ${{ matrix.sanitizer }}-artifacts
+          path: ./out/artifacts

_service:tar_scm:lxc-5.0.2.tar.gz/.github/workflows/coverity.yml Added

@@ -0,0 +1,66 @@
+name: Coverity build and upload
+on:
+  push:
+    branches:
+      - master
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Download Coverity Build Tool
+        run: |
+          wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=lxc/lxc" -O cov-analysis-linux64.tar.gz
+          mkdir cov-analysis-linux64
+          tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64
+        env:
+          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq gcc clang meson
+          sudo apt-get install -qq libapparmor-dev libcap-dev libseccomp-dev libselinux1-dev linux-libc-dev libpam0g-dev docbook2x libsystemd-dev
+
+      - name: Compiler version
+        run: |
+          gcc --version
+
+      - name: Kernel version
+        run: |
+          uname -a
+
+      - name: Mount table
+        run: |
+          findmnt
+
+      - name: Run coverity
+        run: |
+          # Configure
+          export PATH="$(pwd)/cov-analysis-linux64/bin:${PATH}"
+          export CFLAGS="-Wall -Werror"
+          export LDFLAGS="-pthread -lpthread"
+
+          BUILD="$(pwd)/build"
+          meson setup -Dtests=true -Dpam-cgroup=true -Dcoverity-build=true build/
+
+          # Build
+          cov-build --dir cov-int ninja -C ${BUILD}
+          tar czvf lxc.tgz cov-int
+
+          # Submit the results
+          curl \
+            --form project=lxc/lxc \
+            --form token=${TOKEN} \
+            --form email=lxc-devel@lists.linuxcontainers.org \
+            --form file=@lxc.tgz \
+            --form version=master \
+            --form description="${GITHUB_SHA}" \
+            https://scan.coverity.com/builds?project=lxc/lxc
+        env:
+          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}

_service:tar_scm:lxc-5.0.2.tar.gz/.github/workflows/sanitizers.sh Added

@@ -0,0 +1,54 @@
+#!/bin/bash
+set -eux
+set -o pipefail
+
+export ASAN_OPTIONS=detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:strict_string_checks=1
+
+# https://github.com/lxc/lxc/issues/3757
+ASAN_OPTIONS="$ASAN_OPTIONS:detect_odr_violation=0"
+
+export UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
+
+apt-get update -qq
+apt-get install --yes --no-install-recommends \
+    apparmor bash-completion bridge-utils build-essential \
+    busybox-static clang cloud-image-utils curl dbus debhelper debootstrap \
+    devscripts dnsmasq-base docbook2x doxygen ed fakeroot file gcc graphviz \
+    git iptables meson net-tools libapparmor-dev libcap-dev libgnutls28-dev liblua5.2-dev \
+    libpam0g-dev libseccomp-dev libselinux1-dev libtool linux-libc-dev \
+    llvm lsb-release make openssl pkg-config python3-all-dev \
+    python3-setuptools rsync squashfs-tools uidmap unzip uuid-runtime \
+    wget xz-utils systemd-coredump libsystemd-dev
+apt-get remove --yes lxc-utils liblxc-common liblxc1 liblxc-dev
+
+ARGS="-Dprefix=/usr -Dtests=true -Dpam-cgroup=false -Dwerror=true -Dio-uring-event-loop=false -Db_lto_mode=default -Db_lundef=false"
+case "$CC" in clang*)
+	ARGS="$ARGS -Db_sanitize=address,undefined"
+esac
+meson setup san_build $ARGS
+ninja -C san_build
+ninja -C san_build install
+
+cat <<'EOF' >/usr/bin/lxc-test-share-ns
+#!/bin/bash
+printf "The test is skipped due to https://github.com/lxc/lxc/issues/3798.\n"
+EOF
+
+mv /usr/bin/{lxc-test-concurrent,test-concurrent.orig}
+cat <<EOF >/usr/bin/lxc-test-concurrent
+#!/bin/bash
+printf "Memory leaks are ignored due to https://github.com/lxc/lxc/issues/3788.\n"
+ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 UBSAN_OPTIONS=$UBSAN_OPTIONS /usr/bin/test-concurrent.orig
+EOF
+chmod +x /usr/bin/lxc-test-concurrent
+
+sed -i 's/USE_LXC_BRIDGE="false"/USE_LXC_BRIDGE="true"/' /etc/default/lxc
+systemctl daemon-reload
+systemctl restart apparmor
+systemctl restart lxc-net
+
+# Undo default ACLs from Github
+setfacl -b -R /home
+
+git clone --depth=1 https://github.com/lxc/lxc-ci
+timeout 30m bash -x lxc-ci/deps/lxc-exercise

_service:tar_scm:lxc-5.0.2.tar.gz/.github/workflows/sanitizers.yml Added

@@ -0,0 +1,43 @@
+name: Sanitizers build
+on:
+  - push
+  - pull_request
+permissions:
+  contents: read
+
+jobs:
+  sanitizers:
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - gcc
+          - clang
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq gcc clang meson llvm
+          sudo apt-get install -qq libapparmor-dev libcap-dev libseccomp-dev libselinux1-dev linux-libc-dev libpam0g-dev docbook2x libsystemd-dev
+
+      - name: Compiler version
+        env:
+          CC: ${{ matrix.compiler }}
+        run: |
+          ${CC} --version
+
+      - name: Kernel version
+        run: |
+          uname -a
+
+      - name: Mount table
+        run: |
+          findmnt
+
+      - name: Build
+        run: |
+          sudo CC=${{ matrix.compiler }} CXX=${{ matrix.compiler }}++ .github/workflows/sanitizers.sh

_service:tar_scm:lxc-5.0.2.tar.gz/.github/workflows/static-analysis.yml Added

_service:tar_scm:lxc-5.0.2.tar.gz/.gitignore Added

_service:tar_scm:lxc-4.0.3.tar.gz/AUTHORS -> _service:tar_scm:lxc-5.0.2.tar.gz/AUTHORS Changed

_service:tar_scm:lxc-4.0.3.tar.gz/CODING_STYLE.md -> _service:tar_scm:lxc-5.0.2.tar.gz/CODING_STYLE.md Changed

_service:tar_scm:lxc-4.0.3.tar.gz/COPYING -> _service:tar_scm:lxc-5.0.2.tar.gz/COPYING Changed

@@ -1,674 +1,2 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+All files have SPDX headers that declare what license applies. The applicable
+licenses are included in the code repository.

_service:tar_scm:lxc-4.0.3.tar.gz/MAINTAINERS -> _service:tar_scm:lxc-5.0.2.tar.gz/MAINTAINERS Changed

_service:tar_scm:lxc-5.0.2.tar.gz/Makefile Added

_service:tar_scm:lxc-4.0.3.tar.gz/README.md -> _service:tar_scm:lxc-5.0.2.tar.gz/README.md Changed

@@ -10,10 +10,11 @@
 ## Status
 Type            | Service               | Status
 ---             | ---                   | ---
+CI (Linux)      | GitHub                | !Build Status(https://github.com/lxc/lxc/actions/workflows/build.yml/badge.svg)(https://github.com/lxc/lxc/actions)
 CI (Linux)      | Jenkins               | !Build Status(https://jenkins.linuxcontainers.org/job/lxc-github-commit/badge/icon)(https://jenkins.linuxcontainers.org/job/lxc-github-commit/)
-CI (Linux)      | Travis                | !Build Status(https://travis-ci.org/lxc/lxc.svg?branch=master)(https://travis-ci.org/lxc/lxc/)
 Project status  | CII Best Practices    | !CII Best Practices(https://bestpractices.coreinfrastructure.org/projects/1087/badge)(https://bestpractices.coreinfrastructure.org/projects/1087)
-Code Quality    | LGTM                  | !Language grade: C/C++(https://img.shields.io/lgtm/grade/cpp/g/lxc/lxc.svg?logo=lgtm&logoWidth=18)(https://lgtm.com/projects/g/lxc/lxc/context:cpp)
+Fuzzing         | OSS-Fuzz              | !Fuzzing Status(https://oss-fuzz-build-logs.storage.googleapis.com/badges/lxc.svg)(https://oss-fuzz-build-logs.storage.googleapis.com/index.html#lxc)
+Fuzzing         | CIFuzz                | !CIFuzz(https://github.com/lxc/lxc/actions/workflows/cifuzz.yml/badge.svg)(https://github.com/lxc/lxc/actions/workflows/cifuzz.yml)
 
 ## System Containers
 
@@ -106,6 +107,7 @@
 - i686
 - x86_64
 - ppc, ppc64, ppc64le
+- riscv64
 - s390x
 - armvl7, arm64
 
@@ -119,7 +121,7 @@
 
 LXC has always focused on strong backwards compatibility. In fact, the API
 hasn't been broken from release `1.0.0` onwards. Main LXC is currently at
-version `2.*.*`.
+version `4.*.*`.
 
 ## Reporting Security Issues
 
@@ -129,7 +131,7 @@
 
 - serge (at) hallyn (dot) com
 - stgraber (at) ubuntu (dot) com
-- christian.brauner (at) ubuntu (dot) com
+- brauner (at) kernel (dot) org
 
 For further details please have a look at
 
@@ -149,7 +151,7 @@
 repo.
 
 If you want to become more active it is usually also a good idea to show up in
-the LXC IRC channel `#lxc-dev` on `Freenode`. We try to do all development out
+the LXC IRC channel #lxc-dev(https://kiwiirc.com/client/irc.libera.chat/#lxc-dev) on irc.libera.chat. We try to do all development out
 in the open and discussion of new features or bugs is done either in
 appropriate GitHub issues or on IRC.
 
@@ -166,7 +168,7 @@
 
 Source for the latest released version can always be downloaded from
 
-- https://linuxcontainers.org/downloads/
+- https://linuxcontainers.org/lxc/downloads/
 
 You can browse the up to the minute source code and change history online
 
@@ -176,31 +178,25 @@
 
 Without considering distribution specific details a simple
 
-    ./autogen.sh && ./configure && make && sudo make install
+    meson setup -Dprefix=/usr build
+    meson compile -C build
 
 is usually sufficient.
 
-In order to test current git master of LXC it is usually a good idea to compile with
-
-    ./autogen.sh && ./configure && make
-
-in a convenient directory and set `LD_LIBRARY_PATH="${BUILD_DIR}"/lxc/src/lxc/.libs`.
-
 ## Getting help
 
 When you find you need help, the LXC projects provides you with several options.
 
 ### Discuss Forum
 
-We maintain an discuss forum at
+We maintain a discuss forum at
 
 - https://discuss.linuxcontainers.org/
 
 where you can get support.
 
 ### IRC
-
-You can find support by joining `#lxcontainers` on `Freenode`.
+You can find us in #lxc(https://kiwiirc.com/client/irc.libera.chat/#lxc) on irc.libera.chat.
 
 ### Mailing Lists

_service:tar_scm:lxc-4.0.3.tar.gz/coccinelle/run-coccinelle.sh -> _service:tar_scm:lxc-5.0.2.tar.gz/coccinelle/run-coccinelle.sh Changed

_service:tar_scm:lxc-5.0.2.tar.gz/config/apparmor/abstractions/meson.build Added

_service:tar_scm:lxc-4.0.3.tar.gz/config/apparmor/abstractions/start-container.in -> _service:tar_scm:lxc-5.0.2.tar.gz/config/apparmor/abstractions/start-container.in Changed

_service:tar_scm:lxc-5.0.2.tar.gz/config/apparmor/meson.build Added

_service:tar_scm:lxc-4.0.3.tar.gz/config/apparmor/profiles/lxc-default-cgns -> _service:tar_scm:lxc-5.0.2.tar.gz/config/apparmor/profiles/lxc-default-cgns Changed

_service:tar_scm:lxc-5.0.2.tar.gz/config/apparmor/profiles/meson.build Added

@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+if libapparmor.found()
+    configure_file(
+        configuration: dummy_config_data,
+        input: 'lxc-default',
+        output: 'lxc-default',
+        install: true,
+        install_dir: join_paths(sysconfdir, 'apparmor.d', 'lxc'))
+
+    configure_file(
+        configuration: dummy_config_data,
+        input: 'lxc-default-cgns',
+        output: 'lxc-default-cgns',
+        install: true,
+        install_dir: join_paths(sysconfdir, 'apparmor.d', 'lxc'))
+
+    configure_file(
+        configuration: dummy_config_data,
+        input: 'lxc-default-with-mounting',
+        output: 'lxc-default-with-mounting',
+        install: true,
+        install_dir: join_paths(sysconfdir, 'apparmor.d', 'lxc'))
+
+    configure_file(
+        configuration: dummy_config_data,
+        input: 'lxc-default-with-nesting',
+        output: 'lxc-default-with-nesting',
+        install: true,
+        install_dir: join_paths(sysconfdir, 'apparmor.d', 'lxc'))
+endif

_service:tar_scm:lxc-5.0.2.tar.gz/config/bash/_lxc.in Added

@@ -0,0 +1,1267 @@
+# lxc-* commands completion
+
+__lxc_names() {
+    declare -a names
+    case ${words0} in
+        lxc-attach | lxc-cgroup | lxc-checkpoint | lxc-console | lxc-device | lxc-freeze | lxc-stop )
+            mapfile -t names < <(command lxc-ls --running -1)
+            ;;
+        lxc-destroy | lxc-execute | lxc-snapshot | lxc-start )
+            mapfile -t names < <(command lxc-ls --stopped -1)
+            ;;
+        lxc-copy | lxc-info | lxc-monitor | lxc-wait )
+            mapfile -t names < <(command lxc-ls --defined -1)
+            ;;
+        lxc-autostart | lxc-create | lxc-checkconfig | lxc-config | lxc-ls | \
+        lxc-top | lxc-unshare | lxc-update-config | lxc-usernsexec )
+            ;;
+        lxc-unfreeze )
+            mapfile -t names < <(command lxc-ls --frozen -1)
+            ;;
+        *)
+            # If we are running as an alias or symlink with different name,
+            # fallback to old behaviour.
+            mapfile -t names < <(command lxc-ls -1)
+            ;;
+    esac
+
+    COMPREPLY=()
+    for i in "${!names@}"; do
+        # For composed names with spaces escaped by '\'.
+        names${i}=$(command printf "%q" "${names${i}}")
+        if  -n $(compgen -W "${names${i}}" -- "${cur}") ; then
+            COMPREPLY+=("${names${i}}")
+        fi
+    done
+}
+
+__lxc_check_name_present() {
+    mapfile -t names < <(command lxc-ls -1)
+    local -r shortoptnamexp="^-0-9A-Za-mo-z*n0-9A-Za-mo-z*$"
+    local container
+    local param
+    local parsed
+    # Current word on command line, minus double/single quote and backslash.
+    local -r current="${cur//\\\"\'}"
+    # If `--name` or `-n` are present, then a container name should be available.
+    for i in "${!words@}"; do
+        param="${words${i}}"
+        # Parse names from command line when space is escaped by backslash.
+        parsed="${param//\\\"\'}"
+        if  ${parsed} =~ ^--name(=(.*))?$ ; then
+            if  -n "${BASH_REMATCH2}" ; then
+                container="${BASH_REMATCH2}"
+            else
+                container="${words${i}+1}"
+            fi
+            command printf "%q" "${container}"
+            return 0
+        elif  ${parsed} =~ ${shortoptnamexp} ; then
+            command printf "%q" "${words${i}+1}"
+            return 0
+        fi
+        for name in "${names@}"; do
+            if  "${parsed}" == "${name}"  &&  "${current}" != "${parsed}" ; then
+                command printf "%q" "${name}"
+                return 0
+            fi
+        done
+    done
+    return 1
+}
+
+__lxc_append_name() {
+    local -r name=$(__lxc_check_name_present)
+    if  -z "${name}" ; then
+        __lxc_names
+    fi
+}
+
+__lxc_get_snapshots() {
+    local -r container=$(__lxc_check_name_present)
+     -z "${container}"  && return
+    mapfile -t snaps < <(command lxc-snapshot --name="${container}" --list)
+    local -r nosnapxp="^No snapshots$"
+    if  ! "${snaps*}" =~ ${nosnapxp} ; then
+        for i in "${!snaps@}"; do
+            read -r -e -a line <<< "${snaps${i}}"
+            command printf "%s " "${line0}"
+        done
+    fi
+}
+
+__lxc_common_opt() {
+    # End of options.
+    if  "${words*}" =~ ' -- ' ; then
+        return 1
+    fi
+
+    case ${prev} in
+        --help | -h | -\? | --usage | --version )
+            return 1
+            ;;
+        --lxcpath | -P )
+            _filedir -d
+            return 1
+            ;;
+        --logfile | -o )
+            _filedir log
+            return 1
+            ;;
+        --logpriority | -l )
+            COMPREPLY=( $( compgen -W 'FATAL CRIT WARN ERROR NOTICE INFO DEBUG' -- "${cur}" ) )
+            return 1
+            ;;
+        --quiet | -q )
+            # Only flags.
+            return
+            ;;
+    esac
+}
+
+__lxc_concat_array_sep() {
+    local -r sep="${1}"
+    local concat
+    for word in "${@:2}"; do
+	if  "${word}" == "${sep}" ; then
+	    concat+="${word}"
+	else
+	    concat+="${word}${sep}"
+	fi
+    done
+    command printf "%s" "${concat}"
+}
+
+__lxc_check_completion_avail() {
+    local -r word="${1}"
+    local -r pattern="^${word}"
+    for w in "${@:2}"; do
+        if  "${w}" =~ ${pattern}  &&  "${w}" != "${word}" ; then
+           return 0
+        fi
+    done
+    return 1
+}
+
+__lxc_array_has_duplicates() {
+    declare -A unique
+    for word in "${@}"; do
+	if  -z "${unique${word}}" ; then
+	    unique"${word}"="${word}"
+	else
+	    return 0
+	fi
+    done
+    return 1
+}
+
+__lxc_check_word_in_array() {
+    local -r word="${1}"
+    for w in "${@:2}"; do
+        if  "${w}" == "${word}" ; then
+           return 0
+        fi
+    done
+    return 1
+}
+
+__lxc_piped_args() {
+    local -r currentWord="${1}"
+    local -r sep="${2}"
+    declare -a completionWords=("${@:3}")
+    # Remove double/single quote and backslash from current completion parameter.
+    IFS=$"${sep}" read -r -e -a current <<< "${currentWord//\\\"\'}"
+
+    # Add separator back to current in case it is part of completion list.
+    for i in "${!current@}"; do
+        if  -z "${current${i}}" ; then
+	    current"${i}"="${sep}"
+        fi
+    done
+
+    # Remove words from completion already added to argument.
+    declare -a minuslast=("${current@::${#current@}-1}")
+    declare -a completion=("${completionWords@}")
+    for i in "${!completion@}"; do
+        if __lxc_check_word_in_array "${completion${i}}" "${minuslast@}"; then
+            command unset -v 'completion${i}'
+        fi
+    done
+    completion=("${completion@}")
+
+    # Check if words from argument are uniquely part of completion.
+    if __lxc_array_has_duplicates "${minuslast@}"; then
+        return
+    fi
+    declare -a allcomps=("${completionWords@}")
+    for i in "${!minuslast@}"; do
+        if ! __lxc_check_word_in_array "${minuslast${i}}" "${allcomps@}"; then
+            return
+        fi
+    done
+
+    # Actual completion array.
+    declare -a extcompletion
+    local -r nparts="${#current@}"
+
+    if  "${nparts}" -gt 0 ; then
+        local prefix=$(__lxc_concat_array_sep "${sep}" "${current@::${nparts}-1}")
+        local -r lastword="${current${nparts}-1}"
+        if __lxc_check_completion_avail "${lastword}" "${completion@}"; then
+            for comp in "${completion@}"; do
+                extcompletion+=("\"${prefix}${comp}\"")
+            done
+        fi
+        # TAB after quotes to complete for next value.
+        if ! __lxc_array_has_duplicates "${current@}" && __lxc_check_word_in_array "${lastword}" "${allcomps@}"; then
+            if ! __lxc_check_completion_avail "${lastword}" "${completion@}" ||  "${#currentWord}" -lt "${#sep}"  ||  "${currentWord: -${#sep}}" == "${sep}" ; then
+                prefix=$(__lxc_concat_array_sep "${sep}" "${current@}")
+                for comp in "${completion@}"; do
+                     "${comp}" == "${lastword}"  && continue
+                    if  "${comp}" != "${sep}" ; then
+                        extcompletion+=("\"${prefix}${comp}\"")
+                    else
+                        # Trailing sep.
+                        extcompletion+=("\"${prefix}\"")
+                         "${#completion@}" -gt 2  && extcompletion+=("\"${prefix}${comp}\"")
+                    fi
+                done
+            fi
+        fi
+    else #  "${nparts}" -eq 0 
+        for word in "${allcomps@}"; do
+            extcompletion+=("${word}")
+        done
+    fi
+
+    COMPREPLY=( $( compgen -P '"' -S '"' -W "$(command echo -e ${extcompletion@})" -- "${cur}" ) )
+     "${#extcompletion@}" -gt 1  && compopt -o nospace
+}
+
+__lxc_get_selinux_contexts() {
+    declare -a sepolicies=()
+    local sepolicy
+    # Check for SElinux tool.
+    if ! command -v semanage > /dev/null 2>&1; then
+        return
+    fi
+    # Skip header + following empty line.
+    mapfile -s 2 -t output < <(command semanage fcontext -l 2>/dev/null)
+    local -r none="<<None>>"
+    for line in "${output@}"; do
+        if  "${line}" =~ "SELinux Distribution fcontext Equivalence" ; then
+            break
+        fi
+        read -r -e -a current <<< "${line}"
+        if  "${#current@}" -gt 0 ; then
+            sepolicy="${current${#current@}-1}"
+             ! "${sepolicy}" =~ ${none}  && sepolicies+=("${sepolicy}")
+        fi
+    done
+    # Default context.
+    sepolicies+=("unconfined_u:object_r:default_t:s0")
+    COMPREPLY=( $( compgen -P'"' -S'"' -W "${sepolicies*}" -- "${cur}" ) )
+}
+
+_lxc_attach() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile | -f )
+            _filedir
+            return
+            ;;
+        --pty-log | -L )
+            _filedir log
+            return
+            ;;
+        --arch | -a )
+            # https://github.com/lxc/lxc/blob/stable-4.0/src/tests/arch_parse.c#L37
+            COMPREPLY=( $( compgen -W 'arm armel armhf armv7l athlon i386 i486 i586 i686 linux32 mips mipsel ppc powerpc x86 aarch64 amd64 arm64 linux64 mips64 mips64el ppc64 ppc64el ppc64le powerpc64 riscv64 s390x x86_64' -- "${cur}" ) )
+            return
+            ;;
+        --elevated-privileges | -e )
+            __lxc_piped_args "${cur}" '|' CGROUP CAP LSM
+            return
+            ;;
+        --namespaces | -s )
+            __lxc_piped_args "${cur}" '|' MOUNT PID UTSNAME IPC USER NETWORK
+            return
+            ;;
+        --remount-sys-proc | -R | --keep-env | --clear-env )
+            # Only flags.
+            ;;
+        --set-var | -v )
+            # custom VAR=VALUE
+            return
+            ;;
+        --keep-var )
+            COMPREPLY=( $( compgen -A variable -- "${cur}" ) )
+            return
+            ;;
+        --uid | -u )
+            _uids
+            return
+            ;;
+        --gid | -g )
+            _gids
+            return
+            ;;
+        --context | -c )
+            __lxc_get_selinux_contexts
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_attach lxc-attach
+
+__lxc_get_groups() {
+    declare -A groups
+    local key
+    declare -a linegroups
+    # Discard "GROUPS" header and lines without any groups (with only '-').
+    mapfile -s 1 -t lines < <(command lxc-ls -f --fancy-format GROUPS | command sed -e '/^-/d')
+    for line in "${lines@}"; do
+        line=$(command echo -e "${line}" | command sed -e 's/^:space:*//' -e 's/:space:*$//')
+        IFS=$',' read -r -e -a linegroups <<< "${line}"
+        for entry in "${linegroups@}"; do
+            key=$(command printf "%q" "${entry}")
+            groups+=("${key}"=1)
+        done
+    done
+    declare -a output=("${!groups@}")
+    command printf "%s" "${output*}"
+}
+
+_lxc_autostart() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --reboot | -r | --shutdown | -s | --kill | -k | --list | -L | --all | -a | --ignore-auto | -A )
+            # Only flags.
+            ;;
+        --timeout | -t )
+            COMPREPLY=( $( compgen -P "${cur}" -W "{0..9}" ) )
+            compopt -o nospace
+            return
+            ;;
+        --groups | -g )
+            __lxc_piped_args "${cur}" ',' $( __lxc_get_groups ) ','
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+} &&
+    complete -F _lxc_autostart lxc-autostart
+
+__lxc_cgroup_v2() {
+    declare -a stateObjects
+    local -r path="${1}"
+     ! -f "${path}/cgroup.controllers"  && return
+    for controller in $(<"${path}/cgroup.controllers"); do
+        for so in "${path}/${controller}".*; do
+             ! -f "${so}"  && continue
+            stateObjects+=("${so##*/}")
+        done
+    done
+    command printf "%s" "${stateObjects*}"
+}
+
+__lxc_cgroup_v1() {
+    declare -a stateObjects
+    local -r path="${1}"
+    local prefix
+    for controller in "${path}"/*; do
+         ! -d "${controller}"  && continue
+        prefix="${controller##*/}"
+        for so in "${controller}/${prefix}".*; do
+             ! -f "${so}"  && continue
+            stateObjects+=("${so##*/}")
+        done
+    done
+    command printf "%s" "${stateObjects*}"
+}
+
+__lxc_cgroup_state_object() {
+    local -r name="${1}"
+    local -r cgroupPath="/sys/fs/cgroup"
+    local output
+    local -r userSlicePath="${cgroupPath}/user.slice"
+    local -r lxcPayloadPath="${cgroupPath}/lxc.payload.${name}"
+    if  -d "${userSlicePath}" ; then
+        # cgroup_v2 + user.slice
+        read -r -e -a output <<< $(__lxc_cgroup_v2 "${userSlicePath}")
+    elif  -d "${lxcPayloadPath}" ; then
+        # cgroup_v2 + lxc.payload
+        read -r -e -a output <<< $(__lxc_cgroup_v2 "${lxcPayloadPath}")
+    else
+        # cgroup_v1
+        read -r -e -a output <<< $(__lxc_cgroup_v1 "${cgroupPath}")
+    fi
+
+    # Check if state-object is present already.
+    for w in "${words@}"; do
+        if  "${cur}" != "${w}"  && __lxc_check_word_in_array "${w}" "${output@}"; then
+            return
+        elif  "${cur}" == "${w}"  && ! __lxc_check_completion_avail "${w}" "${output@}"; then
+            return
+        fi
+    done
+
+    COMPREPLY=( $( compgen -W "${output*}" -- "${cur}" ) )
+}
+
+_lxc_cgroup() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+
+    local -r custom=$(__lxc_check_name_present)
+    if  -n "${custom}" ; then
+        __lxc_cgroup_state_object "${custom}"
+    else
+        __lxc_append_name
+    fi
+} &&
+    complete -F _lxc_cgroup lxc-cgroup
+
+_lxc_checkpoint() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+        --restore | -r | --stop | -s | --verbose | -v | --daemon | -d | --foreground | -F )
+            # Only flags.
+            ;;
+        --checkpoint-dir | -D )
+            _filedir -d
+            return
+            ;;
+        --action-script | -A )
+            _filedir
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_checkpoint lxc-checkpoint
+
+_lxc_config() {
+    local cur prev words cword split
+    _init_completion -s -n : || return
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '-l' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    COMPREPLY=( $( compgen -W "$( command lxc-config -l )" -- "${cur}" ) )
+} &&
+    complete -F _lxc_config lxc-config
+
+_lxc_console() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+        --escape | -e )
+            COMPREPLY+=( $( compgen -P "'" -S "'" -W "^{a..z} {a..z}" -- "${cur}" ) )
+            return
+            ;;
+        --tty | -t )
+            COMPREPLY=( $( compgen -P "${cur}" -W "{0..9}" ) )
+            compopt -o nospace
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_console lxc-console
+
+__lxc_backing_stores() {
+    COMPREPLY=( $( compgen -W 'best btrfs dir loop lvm nbd overlay overlayfs rbd zfs' -- "${cur}" ) )
+}
+
+__lxc_size_unit() {
+    if  -n "${cur}"  &&  ! "${cur}" =~ ^0-9+$ ; then
+        return
+    fi
+    # Size.
+    if  -z "${cur}" ; then
+        COMPREPLY=( $( compgen -P "${cur}" -W "{1..9}" ) )
+    else
+        COMPREPLY=( $( compgen -P "${cur}" -W "{0..9}" ) )
+        # Unit
+        COMPREPLY+=( $( compgen -P "${cur}" -W "$( command echo ${@})" ) )
+    fi
+    compopt -o nospace
+}
+
+_lxc_copy() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+        --newname | -N | --mount | -m )
+            return
+            ;;
+        --newpath | -p )
+            _filedir -d
+            return
+            ;;
+        --rename | -R | --snapshot | -s | --allowrunning | -a | --foreground | -F | --daemon | -d | --tmpfs | -t | --keepname | -K | --keepdata | -D | --keepmac | -M )
+            # Only flags.
+            ;;
+        --backingstorage | -B )
+            __lxc_backing_stores
+            return
+            ;;
+        --fssize | -L )
+            __lxc_size_unit K M G T
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_copy lxc-copy
+
+__lxc_templates() {
+    COMPREPLY=( $( compgen -W "$(command ls @LXCTEMPLATEDIR@/ | command sed -e 's|^lxc-||' )" -- "${cur}" ) )
+}
+
+_lxc_create() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+        --config | -f )
+            _filedir
+            return
+            ;;
+        --template | -t )
+            __lxc_templates
+            return
+            ;;
+        --bdev | -B )
+            __lxc_backing_stores
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+} &&
+    complete -F _lxc_create lxc-create
+
+_lxc_destroy() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+        --force | -f | --snapshots | -s )
+            # Only flags.
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_destroy lxc-destroy
+
+_lxc_device() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    case ${prev} in
+        -h )
+            return
+            ;;
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        add )
+            _available_interfaces
+            COMPREPLY+=( $( compgen -f -d -X "!*/?*" -- "${cur:-/dev/}" ) )
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_device lxc-device
+
+_lxc_execute() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile | -f )
+            _filedir
+            return
+            ;;
+        --define | -s )
+            # @TODO: list values from source code.
+            # tag=value
+            # https://github.com/lxc/lxc/blob/stable-4.0/src/lxc/confile.c#L178
+            return
+            ;;
+        --daemon | -d )
+            # Only flags.
+            ;;
+        --uid | -u )
+            _uids
+            return
+            ;;
+        --gid | -g )
+            _gids
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_execute lxc-execute
+
+_lxc_freeze() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile | -f )
+            _filedir
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_freeze lxc-freeze
+
+_lxc_info() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+        --config | -c )
+            # @TODO: list values from source code.
+            # tag
+            # https://github.com/lxc/lxc/blob/stable-4.0/src/lxc/confile.c#L178
+            return
+            ;;
+        --ips | -i | --pid | -p | --stats | -S | --no-humanize | -H | --state | -s )
+            # Only flags.
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_info lxc-info
+
+_lxc_ls() {
+    local cur prev words cword split
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --line | -1 | --fancy | -f | --active | --frozen | --running | --stopped | --defined )
+            # Only flags.
+            ;;
+        --fancy-format | -F )
+            __lxc_piped_args "${cur}" ',' NAME STATE PID RAM SWAP AUTOSTART GROUPS INTERFACE IPV4 IPV6 UNPRIVILEGED
+            return
+            ;;
+        --groups | -g )
+            __lxc_piped_args "${cur}" ',' $( __lxc_get_groups ) ','
+            return
+            ;;
+        --nesting )
+            COMPREPLY=( $( compgen -P "${cur}" -W "{0..9}" ) )
+            compopt -o nospace
+            return
+            ;;
+        --filter )
+            # POSIX extended regular expression.
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+} &&
+    complete -F _lxc_ls lxc-ls
+
+_lxc_monitor() {
+    local cur prev words cword split
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --quit | -Q )
+            # Only flags.
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_monitor lxc-monitor
+
+_lxc_snapshot() {
+    local cur prev words cword split
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+        --comment | -c )
+            _filedir
+            return
+            ;;
+        --destroy | -d )
+            COMPREPLY=( $( compgen -W 'ALL $( __lxc_get_snapshots )' -- "${cur}" ) )
+            return
+            ;;
+        --list | -L | --showcomments | -C )
+            # Only flags.
+            ;;
+        --restore | -r )
+            COMPREPLY=( $( compgen -W '$( __lxc_get_snapshots )' -- "${cur}" ) )
+            return
+            ;;
+        --newname | -N )
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_snapshot lxc-snapshot
+
+_lxc_start() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --daemon | -d | --foreground | -F | --close-all-fds | -C )
+            # Only flags.
+            ;;
+        --pidfile | -p )
+            _filedir pid
+            return
+            ;;
+        --rcfile | -f )
+            _filedir
+            return
+            ;;
+        --console | -c )
+            # Output devices, such as /dev/tty*
+            _filedir
+            return
+            ;;
+        --console-log | -L)
+            _filedir
+            return
+            ;;
+        --define | -s )
+            # @TODO: list values from source code.
+            # tag=value
+            # https://github.com/lxc/lxc/blob/stable-4.0/src/lxc/confile.c#L178
+            return
+            ;;
+        --share-net | --share-ipc | --share-uts )
+            _pids
+            COMPREPLY+=( $( compgen -W "$( command lxc-ls --active )" -- "${cur}" ) )
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+
+        # Needed due to weird `_parse_help` output for the `--share-*` options.
+	COMPREPLY=( $( compgen -W '${COMPREPLY@/--share-} --share-net --share-ipc --share-uts' -- "${cur}" ) )
+
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_start lxc-start
+
+_lxc_stop() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+        --reboot | -r | --kill | -k | --nokill | --nolock | --nowait | -W )
+            # Only flags.
+            ;;
+        --timeout | -t )
+            COMPREPLY=( $( compgen -P "${cur}" -W "{0..9}" ) )
+            compopt -o nospace
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_stop lxc-stop
+
+_lxc_top() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --batch | -b | --reverse | -r )
+            # Only flags.
+            ;;
+        --delay | -d )
+            COMPREPLY=( $( compgen -P "${cur}" -W "{0..9}" ) )
+            compopt -o nospace
+            return
+            ;;
+        --sort | -s )
+            COMPREPLY=( $( compgen -W 'n c b m k' -- "${cur}" ) )
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+} &&
+    complete -F _lxc_top lxc-top
+
+_lxc_unfreeze() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_unfreeze lxc-unfreeze
+
+_lxc_unshare() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --namespaces | -s )
+            __lxc_piped_args "${cur}" '|' MOUNT PID UTSNAME IPC USER NETWORK
+            return
+            ;;
+        --user | -u )
+            _uids
+            return
+            ;;
+        --hostname | -H )
+            return
+            ;;
+        --ifname | -i )
+            _available_interfaces
+            return
+            ;;
+        --daemon | -d | --remount | -M )
+            # Only flags.
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+} &&
+    complete -F _lxc_unshare lxc-unshare
+
+_lxc_update_config() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    case ${prev} in
+        --help | -h )
+            return
+            ;;
+        --config | -c )
+            _filedir
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+} &&
+    complete -F _lxc_update_config lxc-update-config
+
+__lxc_id_mapping() {
+    local -r tmp="${cur//^:}"
+    if  "${#tmp}" -eq 0 ; then
+        COMPREPLY=( $( compgen -W "u: g: b:" -- "${cur}" ) )
+    fi
+    compopt -o nospace
+}
+
+_lxc_usernsexec() {
+    local cur prev words cword split
+    COMPREPLY=()
+    _init_completion -s -n : || return
+
+    # End of options.
+    if  "${words*}" =~ ' -- ' ; then
+        return
+    fi
+
+    case ${prev} in
+        -h )
+            return
+            ;;
+        -m )
+            # ^ugb:0-9+:0-9+(:0-9+)?$
+            __lxc_id_mapping
+            return
+            ;;
+        -s )
+            # Only flags.
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '-h -m -s' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+    fi
+} &&
+    complete -F _lxc_usernsexec lxc-usernsexec
+
+_lxc_wait() {
+    local cur prev words cword split
+    _init_completion -s -n : || return
+
+    __lxc_common_opt || return
+
+    case ${prev} in
+        --name | -n )
+            __lxc_names
+            return
+            ;;
+        --rcfile )
+            _filedir
+            return
+            ;;
+        --state | -s )
+            __lxc_piped_args "${cur}" '|' STOPPED STARTING RUNNING STOPPING ABORTING FREEZING FROZEN THAWED
+            return
+            ;;
+        --timeout | -t )
+            COMPREPLY=( $( compgen -P "${cur}" -W "{0..9}" ) )
+            compopt -o nospace
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if  ${cur} == -* ; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "${cur}" ) )
+         ${COMPREPLY-} == *=  && compopt -o nospace
+        return
+    fi
+    __lxc_append_name
+} &&
+    complete -F _lxc_wait lxc-wait
+
+# ex: filetype=sh

_service:tar_scm:lxc-5.0.2.tar.gz/config/bash/meson.build Added

_service:tar_scm:lxc-5.0.2.tar.gz/config/etc/meson.build Added

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/common/lxc-containers.in -> _service:tar_scm:lxc-5.0.2.tar.gz/config/init/common/lxc-containers.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/common/lxc-net.in -> _service:tar_scm:lxc-5.0.2.tar.gz/config/init/common/lxc-net.in Changed

@@ -18,6 +18,7 @@
 LXC_DHCP_CONFILE=""
 LXC_DHCP_PING="true"
 LXC_DOMAIN=""
+LXC_USE_NFT="true"
 
 LXC_IPV6_ADDR=""
 LXC_IPV6_MASK=""
@@ -26,8 +27,15 @@
 
  ! -f $distrosysconfdir/lxc  || . $distrosysconfdir/lxc
 
-use_iptables_lock="-w"
-iptables -w -L -n > /dev/null 2>&1 || use_iptables_lock=""
+use_nft() {
+     -n "$NFT"  && nft list ruleset > /dev/null 2>&1 &&  "$LXC_USE_NFT" = "true" 
+}
+
+NFT="$(command -v nft)"
+if ! use_nft; then
+    use_iptables_lock="-w"
+    iptables -w -L -n > /dev/null 2>&1 || use_iptables_lock=""
+fi
 
 _netmask2cidr ()
 {
@@ -44,13 +52,65 @@
 }
 
 _ifup() {
-    MASK=`_netmask2cidr ${LXC_NETMASK}`
+    MASK=$(_netmask2cidr ${LXC_NETMASK})
     CIDR_ADDR="${LXC_ADDR}/${MASK}"
     ip addr add ${CIDR_ADDR} broadcast + dev ${LXC_BRIDGE}
     ip link set dev ${LXC_BRIDGE} address $LXC_BRIDGE_MAC
     ip link set dev ${LXC_BRIDGE} up
 }
 
+start_ipv6() {
+    LXC_IPV6_ARG=""
+    if  -n "$LXC_IPV6_ADDR"  &&  -n "$LXC_IPV6_MASK"  &&  -n "$LXC_IPV6_NETWORK" ; then
+        echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
+        echo 0 > /proc/sys/net/ipv6/conf/${LXC_BRIDGE}/autoconf
+        ip -6 addr add dev ${LXC_BRIDGE} ${LXC_IPV6_ADDR}/${LXC_IPV6_MASK}
+        LXC_IPV6_ARG="--dhcp-range=${LXC_IPV6_ADDR},ra-only --listen-address ${LXC_IPV6_ADDR}"
+    fi
+}
+
+start_iptables() {
+    start_ipv6
+    if  -n "$LXC_IPV6_ARG"  &&  "$LXC_IPV6_NAT" = "true" ; then
+        ip6tables $use_iptables_lock -t nat -A POSTROUTING -s ${LXC_IPV6_NETWORK} ! -d ${LXC_IPV6_NETWORK} -j MASQUERADE
+    fi
+    iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
+    iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT
+    iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p udp --dport 53 -j ACCEPT
+    iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p tcp --dport 53 -j ACCEPT
+    iptables $use_iptables_lock -I FORWARD -i ${LXC_BRIDGE} -j ACCEPT
+    iptables $use_iptables_lock -I FORWARD -o ${LXC_BRIDGE} -j ACCEPT
+    iptables $use_iptables_lock -t nat -A POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE
+    iptables $use_iptables_lock -t mangle -A POSTROUTING -o ${LXC_BRIDGE} -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill
+}
+
+start_nftables() {
+    start_ipv6
+    NFT_RULESET=""
+    if  -n "$LXC_IPV6_ARG"  &&  "$LXC_IPV6_NAT" = "true" ; then
+        NFT_RULESET="${NFT_RULESET}
+add table ip6 lxc;
+flush table ip6 lxc;
+add chain ip6 lxc postrouting { type nat hook postrouting priority 100; };
+add rule ip6 lxc postrouting ip saddr ${LXC_IPV6_NETWORK} ip daddr != ${LXC_IPV6_NETWORK} counter masquerade;
+"
+    fi
+    NFT_RULESET="${NFT_RULESET};
+add table inet lxc;
+flush table inet lxc;
+add chain inet lxc input { type filter hook input priority 0; };
+add rule inet lxc input iifname ${LXC_BRIDGE} udp dport { 53, 67 } accept;
+add rule inet lxc input iifname ${LXC_BRIDGE} tcp dport { 53, 67 } accept;
+add chain inet lxc forward { type filter hook forward priority 0; };
+add rule inet lxc forward iifname ${LXC_BRIDGE} accept;
+add rule inet lxc forward oifname ${LXC_BRIDGE} accept;
+add table ip lxc;
+flush table ip lxc;
+add chain ip lxc postrouting { type nat hook postrouting priority 100; };
+add rule ip lxc postrouting ip saddr ${LXC_NETWORK} ip daddr != ${LXC_NETWORK} counter masquerade"
+    nft "${NFT_RULESET}"
+}
+
 start() {
      "x$USE_LXC_BRIDGE" = "xtrue"  || { exit 0; }
 
@@ -84,41 +144,27 @@
     # can't write its pid into, so we restorecon it (to var_run_t)
     if  ! -d "${varrun}" ; then
         mkdir -p "${varrun}"
-        if which restorecon >/dev/null 2>&1; then
+        if command -v restorecon >/dev/null 2>&1; then
             restorecon "${varrun}"
         fi
     fi
 
     _ifup
 
-    LXC_IPV6_ARG=""
-    if  -n "$LXC_IPV6_ADDR"  &&  -n "$LXC_IPV6_MASK"  &&  -n "$LXC_IPV6_NETWORK" ; then
-        echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
-        echo 0 > /proc/sys/net/ipv6/conf/${LXC_BRIDGE}/autoconf
-        ip -6 addr add dev ${LXC_BRIDGE} ${LXC_IPV6_ADDR}/${LXC_IPV6_MASK}
-        if  "$LXC_IPV6_NAT" = "true" ; then
-            ip6tables $use_iptables_lock -t nat -A POSTROUTING -s ${LXC_IPV6_NETWORK} ! -d ${LXC_IPV6_NETWORK} -j MASQUERADE
-        fi
-        LXC_IPV6_ARG="--dhcp-range=${LXC_IPV6_ADDR},ra-only --listen-address ${LXC_IPV6_ADDR}"
+    if use_nft; then
+        start_nftables
+    else
+        start_iptables
     fi
-    iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
-    iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT
-    iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p udp --dport 53 -j ACCEPT
-    iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p tcp --dport 53 -j ACCEPT
-    iptables $use_iptables_lock -I FORWARD -i ${LXC_BRIDGE} -j ACCEPT
-    iptables $use_iptables_lock -I FORWARD -o ${LXC_BRIDGE} -j ACCEPT
-    iptables $use_iptables_lock -t nat -A POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE
-    iptables $use_iptables_lock -t mangle -A POSTROUTING -o ${LXC_BRIDGE} -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill
 
     LXC_DOMAIN_ARG=""
     if  -n "$LXC_DOMAIN" ; then
         LXC_DOMAIN_ARG="-s $LXC_DOMAIN -S /$LXC_DOMAIN/"
     fi
 
-    LXC_DHCP_CONFILE_ARG=""
-    if  -n "$LXC_DHCP_CONFILE" ; then
-        LXC_DHCP_CONFILE_ARG="--conf-file=${LXC_DHCP_CONFILE}"
-    fi
+    # lxc's dnsmasq should be hermetic and not read `/etc/dnsmasq.conf` (which
+    # it does by default if `--conf-file` is not present
+    LXC_DHCP_CONFILE_ARG="--conf-file=${LXC_DHCP_CONFILE:-/dev/null}"
 
     # https://lists.linuxcontainers.org/pipermail/lxc-devel/2014-October/010561.html
     for DNSMASQ_USER in lxc-dnsmasq dnsmasq nobody
@@ -133,39 +179,67 @@
         LXC_DHCP_PING_ARG="--no-ping"
     fi
 
+    DNSMASQ_MISC_DIR="$varlib/misc"
+    if  ! -d "$DNSMASQ_MISC_DIR" ; then
+        mkdir -p "$DNSMASQ_MISC_DIR"
+    fi
+
     dnsmasq $LXC_DHCP_CONFILE_ARG $LXC_DOMAIN_ARG $LXC_DHCP_PING_ARG -u ${DNSMASQ_USER} \
             --strict-order --bind-interfaces --pid-file="${varrun}"/dnsmasq.pid \
             --listen-address ${LXC_ADDR} --dhcp-range ${LXC_DHCP_RANGE} \
             --dhcp-lease-max=${LXC_DHCP_MAX} --dhcp-no-override \
             --except-interface=lo --interface=${LXC_BRIDGE} \
-            --dhcp-leasefile="${varlib}"/misc/dnsmasq.${LXC_BRIDGE}.leases \
+            --dhcp-leasefile="${DNSMASQ_MISC_DIR}"/dnsmasq.${LXC_BRIDGE}.leases \
             --dhcp-authoritative $LXC_IPV6_ARG || cleanup
 
     touch "${varrun}"/network_up
     FAILED=0
 }
 
+stop_iptables() {
+    iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
+    iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT
+    iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 53 -j ACCEPT
+    iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 53 -j ACCEPT
+    iptables $use_iptables_lock -D FORWARD -i ${LXC_BRIDGE} -j ACCEPT
+    iptables $use_iptables_lock -D FORWARD -o ${LXC_BRIDGE} -j ACCEPT
+    iptables $use_iptables_lock -t nat -D POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE
+    iptables $use_iptables_lock -t mangle -D POSTROUTING -o ${LXC_BRIDGE} -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill
+    if  "$LXC_IPV6_NAT" = "true" ; then
+        ip6tables $use_iptables_lock -t nat -D POSTROUTING -s ${LXC_IPV6_NETWORK} ! -d ${LXC_IPV6_NETWORK} -j MASQUERADE
+    fi
+}
+
+stop_nftables() {
+    # Adding table before removing them is just to avoid
+    # delete error for non-existent table
+    NFT_RULESET="add table inet lxc;
+delete table inet lxc;
+add table ip lxc;
+delete table ip lxc;
+"
+    if  "$LXC_IPV6_NAT" = "true" ; then
+        NFT_RULESET="${NFT_RULESET};
+add table ip6 lxc;
+delete table ip6 lxc;"
+    fi
+    nft "${NFT_RULESET}"
+}
+
 stop() {
      "x$USE_LXC_BRIDGE" = "xtrue"  || { exit 0; }
 
      -f "${varrun}/network_up"  ||  "$1" = "force"  || { echo "lxc-net isn't running"; exit 1; }
 
     if  -d /sys/class/net/${LXC_BRIDGE} ; then
-        _ifdown 
-        iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
-        iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT
-        iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 53 -j ACCEPT
-        iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 53 -j ACCEPT
-        iptables $use_iptables_lock -D FORWARD -i ${LXC_BRIDGE} -j ACCEPT
-        iptables $use_iptables_lock -D FORWARD -o ${LXC_BRIDGE} -j ACCEPT
-        iptables $use_iptables_lock -t nat -D POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE
-        iptables $use_iptables_lock -t mangle -D POSTROUTING -o ${LXC_BRIDGE} -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill
-
-        if  "$LXC_IPV6_NAT" = "true" ; then
-            ip6tables $use_iptables_lock -t nat -D POSTROUTING -s ${LXC_IPV6_NETWORK} ! -d ${LXC_IPV6_NETWORK} -j MASQUERADE
+        _ifdown
+        if use_nft; then
+            stop_nftables
+        else
+            stop_iptables
         fi
 
-        pid=`cat "${varrun}"/dnsmasq.pid 2>/dev/null` && kill -9 $pid
+        pid=$(cat "${varrun}"/dnsmasq.pid 2>/dev/null) && kill -9 $pid
         rm -f "${varrun}"/dnsmasq.pid
         # if $LXC_BRIDGE has attached interfaces, don't destroy the bridge
         ls /sys/class/net/${LXC_BRIDGE}/brif/* > /dev/null 2>&1 || ip link delete ${LXC_BRIDGE}

_service:tar_scm:lxc-5.0.2.tar.gz/config/init/common/meson.build Added

_service:tar_scm:lxc-5.0.2.tar.gz/config/init/systemd/lxc-monitord.service.in Added

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/systemd/lxc-net.service.in -> _service:tar_scm:lxc-5.0.2.tar.gz/config/init/systemd/lxc-net.service.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/systemd/lxc.service.in -> _service:tar_scm:lxc-5.0.2.tar.gz/config/init/systemd/lxc.service.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/config/init/systemd/lxc@.service.in -> _service:tar_scm:lxc-5.0.2.tar.gz/config/init/systemd/lxc@.service.in Changed

_service:tar_scm:lxc-5.0.2.tar.gz/config/init/systemd/meson.build Added

@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+lxc_apparmor_load = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxc-apparmor-load',
+    output: 'lxc-apparmor-load',
+    install: true,
+    install_dir: lxclibexec)
+
+if 'systemd' in init_script
+    systemd_system_unit_dir = get_option('systemd-unitdir')
+    if systemd_system_unit_dir == ''
+        systemd = dependency('systemd')
+        systemd_system_unit_dir = systemd.get_variable('systemdsystemunitdir')
+    endif
+
+    configure_file(
+        configuration: conf,
+        input: 'lxc-monitord.service.in',
+        output: 'lxc-monitord.service',
+        install: true,
+        install_dir: systemd_system_unit_dir)
+
+    configure_file(
+        configuration: conf,
+        input: 'lxc-net.service.in',
+        output: 'lxc-net.service',
+        install: true,
+        install_dir: systemd_system_unit_dir)
+
+    configure_file(
+        configuration: conf,
+        input: 'lxc.service.in',
+        output: 'lxc.service',
+        install: true,
+        install_dir: systemd_system_unit_dir)
+
+    configure_file(
+        configuration: conf,
+        input: 'lxc@.service.in',
+        output: 'lxc@.service',
+        install: true,
+        install_dir: systemd_system_unit_dir)
+endif

_service:tar_scm:lxc-5.0.2.tar.gz/config/init/sysvinit/meson.build Added

_service:tar_scm:lxc-5.0.2.tar.gz/config/init/upstart/meson.build Added

_service:tar_scm:lxc-5.0.2.tar.gz/config/selinux/meson.build Added

_service:tar_scm:lxc-5.0.2.tar.gz/config/sysconfig/meson.build Added

_service:tar_scm:lxc-5.0.2.tar.gz/config/templates/common.conf.d/meson.build Added

_service:tar_scm:lxc-4.0.3.tar.gz/config/templates/common.conf.in -> _service:tar_scm:lxc-5.0.2.tar.gz/config/templates/common.conf.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/config/templates/common.seccomp -> _service:tar_scm:lxc-5.0.2.tar.gz/config/templates/common.seccomp Changed

_service:tar_scm:lxc-5.0.2.tar.gz/config/templates/meson.build Added

@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+lxc_conf_common_seccomp = configure_file(
+    configuration: conf,
+    input: 'common.seccomp',
+    output: 'common.seccomp',
+    install: true,
+    install_dir: lxctemplateconfdir)
+
+lxc_conf_common_main = configure_file(
+    configuration: conf,
+    input: 'common.conf.in',
+    output: 'common.conf',
+    install: true,
+    install_dir: lxctemplateconfdir)
+
+lxc_conf_common_nesting = configure_file(
+    configuration: conf,
+    input: 'nesting.conf.in',
+    output: 'nesting.conf',
+    install: true,
+    install_dir: lxctemplateconfdir)
+
+lxc_conf_common_oci = configure_file(
+    configuration: conf,
+    input: 'oci.common.conf.in',
+    output: 'oci.common.conf',
+    install: true,
+    install_dir: lxctemplateconfdir)
+
+lxc_conf_common_userns = configure_file(
+    configuration: conf,
+    input: 'userns.conf.in',
+    output: 'userns.conf',
+    install: true,
+    install_dir: lxctemplateconfdir)

_service:tar_scm:lxc-4.0.3.tar.gz/config/templates/userns.conf.in -> _service:tar_scm:lxc-5.0.2.tar.gz/config/templates/userns.conf.in Changed

_service:tar_scm:lxc-5.0.2.tar.gz/config/yum/meson.build Added

_service:tar_scm:lxc-4.0.3.tar.gz/doc/FAQ.txt -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/FAQ.txt Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/api-extensions.md -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/api-extensions.md Changed

@@ -113,8 +113,50 @@
 
 ## init\_pidfd
 
-This adds a new API function `init_pidfd()` which allows to retrieve a pidfd for the container's init process allowing process management interactions such as sending signal to be completely reliable and rac-e free.
+This adds a new API function `init_pidfd()` which allows one to retrieve a pidfd for the container's init process allowing process management interactions such as sending signals to be completely reliable and race free.
 
 ## pidfd
 
 When running on kernels that support pidfds LXC will rely on them for most operations. This makes interacting with containers not just more reliable it also makes it significantly safer and eliminates various races inherent to PID-based kernel APIs. LXC will require that the running kernel at least support `pidfd_send_signal()`, `CLONE_PIDFD`, `P_PIDFD`, and pidfd polling support. Any kernel starting with `Linux 5.4` should have full support for pidfds.
+
+## cgroup\_advanced\_isolation
+
+Privileged containers will usually be able to override the cgroup limits given to them. This introduces three new configuration keys `lxc.cgroup.dir.monitor`, `lxc.cgroup.dir.container`, and `lxc.cgroup.dir.container.inner`. The `lxc.cgroup.dir.monitor` and `lxc.cgroup.dir.container` keys can be used to set to place the `monitor` and the `container` into different cgroups. The `lxc.cgroup.dir.container.inner` key can be set to a cgroup that is concatenated with `lxc.cgroup.dir.container`. When `lxc.cgroup.dir.container.inner` is set the container will be placed into the `lxc.cgroup.dir.container.inner` cgroup but the limits will be set in the `lxc.cgroup.dir.container` cgroup. This way privileged containers cannot escape their cgroup limits.
+
+
+## time\_namespace
+
+This adds time namespace support to LXC.
+
+## seccomp\_allow\_deny\_syntax
+
+This adds the ability to use "denylist" and "allowlist" in seccomp v2 policies.
+
+## devpts\_fd
+
+This adds the ability to allocate a file descriptor for the devpts instance of
+the container.
+
+## seccomp\_notify\_fd\_active
+
+Retrieve the seccomp notifier fd from a running container.
+
+## seccomp\_proxy\_send\_notify\_fd
+
+Whether the seccomp notify proxy sends a long a notify fd file descriptor.
+
+## idmapped\_mounts
+
+Whether this LXC instance can handle idmapped mounts for the rootfs.
+
+## idmapped\_mounts\_v2
+
+Whether this LXC instance can handle idmapped mounts for lxc.mount.entry
+entries.
+
+## cgroup2\_auto_mounting
+
+This adds the new options `cgroup2`, `cgroup2:ro`, `cgroup2:force`,
+`cgroup2:ro:force` for the `lxc.mount.auto` configuration key. For example, if
+a user specifies `cgroup2:force` LXC will pre-mount a pure `cgroup2` layout for
+the container even if the host is running with a hybrid layout.

_service:tar_scm:lxc-4.0.3.tar.gz/doc/common_options.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/common_options.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/examples/lxc-complex.conf.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/examples/lxc-complex.conf.in Changed

_service:tar_scm:lxc-5.0.2.tar.gz/doc/examples/meson.build Added

@@ -0,0 +1,71 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+example_lxc_complex = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxc-complex.conf.in',
+    output: 'lxc-complex.conf',
+    install: want_examples,
+    install_dir: lxcexamplesdir)
+
+example_lxc_empty_netns = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxc-empty-netns.conf.in',
+    output: 'lxc-empty-netns.conf',
+    install: want_examples,
+    install_dir: lxcexamplesdir)
+
+example_lxc_macvlan = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxc-macvlan.conf.in',
+    output: 'lxc-macvlan.conf',
+    install: want_examples,
+    install_dir: lxcexamplesdir)
+
+example_lxc_no_netns = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxc-no-netns.conf.in',
+    output: 'lxc-no-netns.conf',
+    install: want_examples,
+    install_dir: lxcexamplesdir)
+
+example_lxc_phys = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxc-phys.conf.in',
+    output: 'lxc-phys.conf',
+    install: want_examples,
+    install_dir: lxcexamplesdir)
+
+example_lxc_veth = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxc-veth.conf.in',
+    output: 'lxc-veth.conf',
+    install: want_examples,
+    install_dir: lxcexamplesdir)
+
+example_lxc_vlan = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxc-vlan.conf.in',
+    output: 'lxc-vlan.conf',
+    install: want_examples,
+    install_dir: lxcexamplesdir)
+
+example_lxc_seccomp_v1 = configure_file(
+    configuration: dummy_config_data,
+    input: 'seccomp-v1.conf',
+    output: 'seccomp-v1.conf',
+    install: want_examples,
+    install_dir: lxcexamplesdir)
+
+example_lxc_seccomp_v2 = configure_file(
+    configuration: dummy_config_data,
+    input: 'seccomp-v2.conf',
+    output: 'seccomp-v2.conf',
+    install: want_examples,
+    install_dir: lxcexamplesdir)
+
+example_lxc_seccomp_v2 = configure_file(
+    configuration: dummy_config_data,
+    input: 'seccomp-v2-denylist.conf',
+    output: 'seccomp-v2-denylist.conf',
+    install: want_examples,
+    install_dir: lxcexamplesdir)

_service:tar_scm:lxc-4.0.3.tar.gz/doc/examples/seccomp-v1.conf -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/examples/seccomp-v1.conf Changed

_service:tar_scm:lxc-5.0.2.tar.gz/doc/examples/seccomp-v2-denylist.conf Added

_service:tar_scm:lxc-4.0.3.tar.gz/doc/examples/seccomp-v2.conf -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/examples/seccomp-v2.conf Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ja/FAQ.txt -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ja/FAQ.txt Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ja/common_options.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ja/common_options.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ja/lxc-attach.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ja/lxc-attach.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ja/lxc-autostart.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ja/lxc-autostart.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ja/lxc-execute.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ja/lxc-execute.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ja/lxc-user-nic.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ja/lxc-user-nic.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ja/lxc.container.conf.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ja/lxc.container.conf.sgml.in Changed

@@ -446,6 +446,42 @@
     </refsect2>
 
     <refsect2>
+      <title>コアスケジューリング</title>
+      <para>
+        
+        コアスケジューリングは、コンテナのペイロードが同じコアでスケジュール可能であるとマークするかどうかを指定します。
+        これによりカーネルスケジューラーは、同じグループに属さないタスクが同一コア上で同時に実行されないようにします。
+        これは、コンテナペイロードがクロスハイパースレッド攻撃を受けることを防ぐための、追加のセキュリティ対策として機能させることができます。
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <option>lxc.sched.core</option>
+          </term>
+          <listitem>
+            <para>
+              
+              0 または 1 のみ指定できます。1 を設定すると、コンテナに対するコアスケジューリングドメインを作成し、0 を設定すると作成しません。
+              明示的に指定していない場合は、コンテナに対するコアスケジューリングドメインは作成されません。
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
       <title>Proc</title>
       <para>
         
-              コンテナがどの種類のネットワーク仮想化を使うかを指定します。すべての <option>lxc.net.*</option> キーに、追加のインデックス <option>i</option> を使うと、複数のネットワークを指定できます。例えば、<option>lxc.net.0.type = veth</option> と <option>lxc.net.1.type = veth</option> は、同じタイプの異なるネットワークを 2 つ指定します。
+              コンテナがどの種類のネットワーク仮想化を使うかを指定します。ネットワークデバイスの他のオプションを設定する前に指定しなければいけません。
+              すべての <option>lxc.net.*</option> キーに、追加のインデックス <option>i</option> を使うと、複数のネットワークを指定できます。例えば、<option>lxc.net.0.type = veth</option> と <option>lxc.net.1.type = veth</option> は、同じタイプの異なるネットワークを 2 つ指定します。
               同じインデックスを指定したキーはすべて同じネットワークの指定になります。例えば、<option>lxc.net.0.link = br0</option> は <option>lxc.net.0.type</option> と同じネットワークの設定になります。
               現時点では、以下のネットワーク仮想化のタイプが使えます:
             </para>
@@ -619,6 +657,12 @@
               <option>lxc.net.i.veth.ipv6.route</option> options.
               Several lines specify several routes.
               The route is in format x.y.z.t/m, eg. 192.168.1.0/24.
+
+              In <option>bridge</option> mode untagged VLAN membership can be set with the
+              <option>lxc.net.i.veth.vlan.id</option> option. It accepts a special value of 'none' indicating
+              that the container port should be removed from the bridge's default untagged VLAN.
+              The <option>lxc.net.i.veth.vlan.tagged.id</option> option can be specified multiple times to set
+              the container's bridge port membership to one or more tagged VLANs.
               -->
               <option>veth:</option> 一方がコンテナに、もう一方がホストに接続されるペアの仮想イーサネットデバイスを作成します。
               <option>lxc.net.i.veth.mode</option> は、veth の親（ホスト側）がホスト上で使うモードを指定します。
@@ -636,6 +680,8 @@
               <option>lxc.net.i.veth.ipv4.route</option>、<option>lxc.net.i.veth.ipv6.route</option> オプションを使って、静的ルーティングをコンテナを指し示すホスト上に追加できます。
               複数のルートがある場合は複数の設定を指定します。
               ルートは x.y.z.t/m の形式です。例: 192.168.1.0/24
+
+	      <option>bridge</option> モードでは、タグなし VLAN は <option>lxc.net.i.veth.vlan.id</option> で設定できます。このオプションでは、コンテナポートをブリッジのデフォルトのタグなし VLAN から削除するための特別な値 'none' が指定できます。コンテナのブリッジポートを複数のタグ付き VLAN に所属させるために、<option>lxc.net.i.veth.vlan.tagged.id</option> を複数回指定できます。
             </para>
 
             <para>
@@ -884,8 +930,13 @@
               Specify the ipv4 address to assign to the virtualized interface.
               Several lines specify several ipv4 addresses. The address is in
               format x.y.z.t/m, eg. 192.168.1.123/24.
+              You can optionally specify the broadcast address after the IP adress,
+              e.g. 192.168.1.123/24 255.255.255.255.
+              Otherwise it is automatically calculated from the IP address.
               -->
               仮想インターフェースに割り当てる ipv4 アドレスを指定します。複数行により複数の ipv4 アドレスを指定します。このアドレスは x.y.z.t/m というフォーマットで指定します。例) 192.168.1.123/24
+              IP アドレスのあとにオプションでブロードキャストアドレスを指定できます。例）192.168.1.123/24 255.255.255.255
+              指定しなければ IP アドレスから自動的に計算されます。
             </para>
           </listitem>
         </varlistentry>
@@ -1144,11 +1195,11 @@
               
               もし設定された場合、コンテナは新しい pseudo tty インスタンスを持ち、それを自身のプライベートとします。
-              この値は pts インスタンスに許可される pseudo tty の最大数を指定します (この制限はまだ実装されていません)。
+              この値は pty インスタンスに許可される pseudo tty の最大数を指定します (この制限はまだ実装されていません)。
             </para>
           </listitem>
         </varlistentry>
@@ -1479,7 +1530,7 @@
         the container at some <filename>path</filename>, and then mounts
         under <filename>path</filename>, then a TOCTTOU attack would be
         possible where the container user modifies a symbolic link under
-        his home directory at just the right time.
+        their home directory at just the right time.
           -->
         注意: 通常 LXC は、マウント対象と相対パス指定のバインドマウントを、適切にコンテナルート以下に閉じ込めます。
         これは、ホストのディレクトリやファイルに対して重ね合わせを行うようなマウントによる攻撃を防ぎます。(絶対パス指定のマウントソース中の各パスがシンボリックリンクである場合は無視されます。)
@@ -1991,9 +2042,26 @@
           <listitem>
             <para>
               
-              rootfs をマウントするときに追加したいマウントオプション。
+              Specify extra mount options to use when mounting the rootfs.
+                The format of the mount options corresponds to the
+                format used in fstab. In addition, LXC supports the custom
+                <option>idmap=</option> mount option. This option can be used
+                to tell LXC to create an idmapped mount for the container's
+                rootfs. This is useful when the user doesn't want to recursively
+                chown the rootfs of the container to match the idmapping of the
+                user namespace the container is going to use. Instead an
+                idmapped mount can be used to handle this.
+                The argument for
+                <option>idmap=</option>
+                can either be a path pointing to a user namespace file that
+                LXC will open and use to idmap the rootfs or the special value
+                "container" which will instruct LXC to use
+                the container's user namespace to idmap the rootfs.
+                -->
+                rootfs をマウントするときに使うマウントオプション。マウントオプションのフォーマットは fstab で使うフォーマットと同じです。
+                加えて、LXC では独自の <option>idmap=</option> マウントオプションが使えます。このオプションを使うと、LXC に対してコンテナの rootfs を idmapped マウントするように指示できます。
+                これは、コンテナが使うユーザー名前空間の ID マッピングと一致させるために、コンテナの rootfs を再帰的に chown したくない場合に役に立ちます。代わりに idmapped マウントが使えます。
+                <option>idmap=</option> の引数は、LXC が開いて rootfs を idmap するのに使うユーザー名前空間ファイルを指すパス、もしくは "container" という特別な値のどちらかです。"container" という値は、コンテナのユーザー名前空間を使って rootfs を idmap するように LXC に指示します。
             </para>
           </listitem>
         </varlistentry>
@@ -2019,7 +2087,7 @@
     </refsect2>
 
     <refsect2>
-      <title>Control group</title>
+      <title>Control group ("cgroup")</title>
       <para>
         
+        カーネルにおける cgroup 実装は長年にわたって大きく変化してきました。
+        Linux 4.5 で新しい cgroup ファイルシステムのサポートが追加されました。通常は "cgroup2" や "unified hierarchy"（単一階層構造） と呼ばれています。
+        それ以来、通常は古い cgroup ファイルシステムは "cgroup1" や "legacy hierarchies"（レガシー階層構造）と呼ばれています。
+        この 2 つのバージョンの違いについての詳細な説明は、cgroup のマニュアルページをご覧ください。
+      </para>
+
+      <para>
+        
+        LXC は cgroup1（レガシー階層構造）と cgroup2（単一階層構造）に対する設定を、異なる設定プレフィックスを使って区別しています。
+        cgroup1 に対する設定を変更するには <option>lxc.cgroup.</option> というプレフィックスを使う必要があり、cgroup2 の設定を変更するには <option>lxc.cgroup2.</option> を使う必要があります。
+        LXC は、cgroup2 だけが使われているシステム上の <option>lxc.cgroup.</option> を無視します。逆に cgroup1 だけが使われているシステム上の <option>lxc.cgroup2.</option> を無視します。
+      </para>
+
+      <para>
+        
+        cgroup 階層の本質は、プロセスを階層的に構造化する方法です。通常は、cgroup 階層では 1 つ以上の「コントローラー」が有効になっています。
+        通常、cgroup 階層の「コントローラー」は階層に従って特定のタイプのシステムリソースを分配する役割を果たします。
+        コントローラーには "pids" コントローラー、"cpu" コントローラー、"memory" コントローラーなどがあります。
+        しかし、システムリソースの分配するという役割に該当しないコントローラーもあります。このようなコントローラーは「ユーティリティー」コントローラーと呼ばれたりします。
+        ユーティリティーコントローラーの 1 つにデバイスコントローラーがあります。このコントローラーはシステムリソースを分配する代わりにデバイスへのアクセスを管理できます。
+      </para>
+
+      <para>
+        
+        cgroup1 では、デバイスコントローラーは他の多くのコントローラーと同様に、書き込みできるファイルのセットとして実装されていました。
+        これらのファイルは "devices.allow" と "devices.deny" という名前のファイルでした。レガシーデバイスコントローラーは「許可リスト（allowlists）」と「拒否リスト（denylists）」の両方を実装できました。
+      </para>
+
+      <para>
+        
+        許可リスト（allowlist）とは、すべてのデバイスへのアクセスをブロックするデバイスプログラムです。特定のデバイスへのアクセスを行うには、特定のデバイスもしくはデバイスクラスに対する「許可ルール（allow rules）」を指定する必要があります。
+        一方、拒否リスト（denylist）はデフォルトですべてのデバイスへのアクセスを許可するデバイスプログラムです。特定のデバイスへのアクセスを拒否するには、特定のデバイスもしくはデバイスクラスに対する「拒否ルール（deny rules）」を指定する必要があります。
+      </para>
+
+      <para>
+        
+        cgroup2 では、デバイスコントローラーの実装が完全に変わりました。読み書きするファイルの代わりに、<option>BPF_PROG_TYPE_CGROUP_DEVICE</option> の eBPF プログラムを cgroup にアタッチできます。
+        カーネルの実装が完全に変わったのにもかかわらず、LXC は cgroup1 のデバイスコントローラーと cgroup2 の eBPF ベースのデバイスコントローラーで同じセマンティクスに従えるようにしています。
+        このあとの段落では、cgroup2 の eBPF デバイスコントローラーに対するセマンティクスを説明します。
+      </para>
+
+      <para>
+        
+        先に述べたように、cgroup2 の eBPF ベースのデバイスコントローラーに対するデバイスルールを指定するフォーマットは、cgroup1 のデバイスコントローラーと同じです。ただし、設定キーのプレフィックスは変更されています。
+        具体的には、cgroup1 のデバイスコントローラーに対するデバイスルールは <option>lxc.cgroup.devices.allow</option> と <option>lxc.cgroup.devices.deny</option> を使って指定します。一方、cgroup2 の eBPF ベースのコントローラーでは <option>lxc.cgroup2.devices.allow</option> と <option>lxc.cgroup2.devices.deny</option> を使わなければなりません。
+      </para>
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              
+              拒否リスト（denylist）のデバイスルール
+              <programlisting>
+                lxc.cgroup2.devices.deny = a
+              </programlisting>
+              は、カーネルに対してデフォルトですべてのデバイスへのアクセスをブロックするように LXC が指示します。
+              デバイスへのアクセスを許可するには、デバイスに対する許可ルールを <option>lxc.cgroup2.devices.allow</option> を使って追加する必要があります。これは「許可リスト」デバイスプログラムとして参照されます。
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              
+              許可リスト（allowlist）のデバイスルール
+              <programlisting>
+                lxc.cgroup2.devices.allow = a
+              </programlisting>
+              は、カーネルに対してすべてのデバイスへのアクセスをデフォルトで許可するように LXC が指示します。
+              デバイスへのアクセスを拒否するには、デバイスに対する拒否ルールを <option>lxc.cgroup2.devices.deny</option> を使って追加する必要があります。これは「拒否リスト」デバイスプログラムとして参照されます。
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              
+              前述の 2 つのルールのいずれかを指定すると、それ以前に指定していたルールがすべてクリアされます。つまり、デバイスリストがリセットされます。
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              
+              許可リストプログラムが要求される場合、つまりデフォルトですべてのデバイスへのアクセスがブロックされている場合、個別のデバイスやデバイスクラスへの拒否ルールを指定しても無視されます。
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              
+              拒否リストプログラムが要求される場合、つまりデフォルトですべてのデバイスへのアクセスが許可されている場合、個別のデバイスやデバイスクラスへの許可ルールを指定しても無視されます。
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+
+      <para>
+        
+        例えば、次のようなルールの組
+        <programlisting>
+          lxc.cgroup2.devices.deny = a
+          lxc.cgroup2.devices.allow = c *:* m
+          lxc.cgroup2.devices.allow = b *:* m
+          lxc.cgroup2.devices.allow = c 1:3 rwm
+        </programlisting>
+        
+        は、許可リスト（allowlist）デバイスプログラムを実装します。つまり、カーネルはこのリストで許可されるように設定されていないすべてのデバイスへのアクセスをブロックします。
+        このプログラムでは、すべてのキャラクターデバイスとブロックデバイスが作成できますが、読み書きは /dev/null に対してしか行なえません。
+      </para>
+
+      <para>
+        
+        代わりに先のルールから次のようなルールの組に変更したとすると、
+        <programlisting>
+          lxc.cgroup2.devices.allow = a
+          lxc.cgroup2.devices.deny = c *:* m
+          lxc.cgroup2.devices.deny = b *:* m
+          lxc.cgroup2.devices.deny = c 1:3 rwm
+        </programlisting>
+         
+        LXC はカーネルに拒否リスト（denylist）の実装を指示します。つまりカーネルはこのリストで拒否を指定していないすべてのデバイスへのアクセスを許可します。
+        このプログラムでは、キャラクターデバイスとブロックデバイスは作成できません。そして /dev/null の読み書きと作成は許可されません。
+      </para>
+
+      <para>
+        
+        ここで、同じプログラムでも、前述のようにデバイスのプログラムタイプを決定するような「グローバルルール」が続いている場合を考えてみましょう。
+        <programlisting>
+          lxc.cgroup2.devices.allow = a
+          lxc.cgroup2.devices.deny = c *:* m
+          lxc.cgroup2.devices.deny = b *:* m
+          lxc.cgroup2.devices.deny = c 1:3 rwm
+          lxc.cgroup2.devices.allow = a
+        </programlisting>
+        
+        最後の行は、デバイスプログラムのタイプを変更せずに、LXC がデバイスリストをリセットしてしまいます。
+      </para>
+
+      <para>
+        
+        次のように指定した場合、
+        <programlisting>
+          lxc.cgroup2.devices.allow = a
+          lxc.cgroup2.devices.deny = c *:* m
+          lxc.cgroup2.devices.deny = b *:* m
+          lxc.cgroup2.devices.deny = c 1:3 rwm
+          lxc.cgroup2.devices.deny = a
+        </programlisting>
+        
+        前の例と違って最後の行によって、LXC はデバイスリストをリセットし、許可リスト（allowlist）から拒否リスト（denylist）にプログラムを変更してしまいます。
+      </para>
       <variablelist>
         <varlistentry>
           <term>
-            <option>lxc.cgroup.control name</option>
+            <option>lxc.cgroup.control name.controller file</option>
           </term>
           <listitem>
             <para>
@@ -2048,7 +2387,7 @@
               kernel running at the time the container is started, eg.
               <option>lxc.cgroup.cpuset.cpus</option>
               -->
-              legacy な cgroup 階層 (cgroup v1) に設定する値を指定します。コントローラー名は control group そのままの名前です。
+              レガシー cgroup 階層 (cgroup v1) に設定する値を指定します。コントローラー名は control group そのままの名前です。
               許される名前や値の書式は LXC が指定することはなく、コンテナが実行された時に実行されている Linux カーネルの機能に依存します。
               例えば <option>lxc.cgroup.cpuset.cpus</option> のようになります。
             </para>
@@ -2056,7 +2395,7 @@
         </varlistentry>
         <varlistentry>
           <term>
-            <option>lxc.cgroup2.controller name</option>
+            <option>lxc.cgroup2.controller name.controller file</option>
           </term>
           <listitem>
             <para>
@@ -2101,6 +2440,79 @@
         </varlistentry>
         <varlistentry>
           <term>
+            <option>lxc.cgroup.dir.container</option>
+          </term>
+          <listitem>
+            <para>
+	      
+	      これは <option>lxc.cgroup.dir</option> と同様の設定ですが、かならず <option>lxc.cgroup.dir.monitor</option> と同時に使わなければなりません。そして、設定はコンテナの cgroup パスにのみ影響を与えます。このオプションは <option>lxc.cgroup.dir</option> と同時に設定できません。コンテナがアタッチされる最終的なパスは <option>lxc.cgroup.dir.container.inner</option> オプションによりさらに変更される可能性があります。
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>lxc.cgroup.dir.monitor</option>
+          </term>
+          <listitem>
+            <para>
+	      
+	      このオプションは、モニタプロセスに対して<option>lxc.cgroup.dir.container</option> と同様の働きをします。
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>lxc.cgroup.dir.monitor.pivot</option>
+          </term>
+          <listitem>
+            <para>
+              
+              コンテナ終了時に、モニタープロセスの PID がここで指定した cgroup にアタッチされます。
+              コンテナ終了時に、他の cgroup パスが確実に適切に削除されるように、ここに設定するパスは他で設定した cgroup ディレクトリのサブパスにすべきではありません。
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>lxc.cgroup.dir.container.inner</option>
+          </term>
+          <listitem>
+            <para>
+	      
+	      cgroup 名前空間が作られる追加のサブディレクトリを指定します。このオプションを使うと、cgroup の制限は <option>lxc.cgroup.dir.container</option> で指定した外部パスに適用されます。<option>lxc.cgroup.dir.container</option> はコンテナ内部からアクセスできないため、特権コンテナに対する制限を上書きできない方法でよりよい方法で強制できます。
+	      このオプションは <option>lxc.cgroup.dir.container</option> と <option>lxc.cgroup.dir.monitor</option> と同時に指定したときのみ機能し、それ以外の場合は効果がありません。
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
             <option>lxc.cgroup.relative</option>
           </term>
           <listitem>
@@ -2239,7 +2651,7 @@
             standard namespace identifiers as seen in the
             <filename>/proc/PID/ns</filename> directory.
             The <option>lxc.namespace.keep</option> is a
-            blacklist option, i.e. it is useful when enforcing that containers
+            denylist option, i.e. it is useful when enforcing that containers
             must keep a specific set of namespaces.
             -->
               コンテナが、作成元のプロセスから継承する (新しい名前空間を作らずに元のプロセスの名前空間のまま実行する) 名前空間を指定します。継承する名前空間はスペース区切りのリストで指定します。指定する名前空間名は、<filename>/proc/PID/ns</filename> ディレクトリ内に存在する標準の名前空間指示子でなければなりません。<option>lxc.namespace.keep</option> はブラックリストを指定するオプションです。つまり、コンテナに特定の名前空間を使い続けることを強制したい場合に便利です。
@@ -2352,6 +2764,39 @@
 
           </listitem>
         </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>lxc.time.offset.boot</option>
+          </term>
+          <listitem>
+            <para>
+              
+              ブートタイム(boottime)クロックの正または負のオフセット値を指定します。フォーマットは、時(h)、分(m)、秒(s)、ミリ秒(ms)、マイクロ秒(us)、ナノ秒(ns)を指定できます。
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>lxc.time.offset.monotonic</option>
+          </term>
+          <listitem>
+            <para>
+              
+              monotonicクロックの正または負のオフセット値を指定します。フォーマットは、時(h)、分(m)、秒(s)、ミリ秒(ms)、マイクロ秒(us)、ナノ秒(ns)を指定できます。
+            </para>
+          </listitem>
+        </varlistentry>
+
       </variablelist>
     </refsect2>
 
@@ -2660,18 +3105,18 @@
       <para>
         
-        現時点では、バージョン番号は 1 と 2 をサポートしています。バージョン 1 では、ポリシーはシンプルなホワイトリストですので、2 行目は "whitelist" でなければなりません。
+        現時点では、バージョン番号は 1 と 2 をサポートしています。バージョン 1 では、ポリシーはシンプルなホワイトリストですので、2 行目は "allowlist" でなければなりません。
         そして残りの行には 1 行に 1 つずつ、システムコール番号を書きます。各行のシステムコール番号がホワイトリスト化され、リストにない番号は、そのコンテナではブラックリストに入ります。
       </para>
 
       <para>
         
@@ -2679,7 +3124,7 @@
       </para>
       <para>
         
@@ -2688,7 +3133,7 @@
 
       <programlisting>
       2
-      blacklist
+      denylist
       mknod errno 0
       ioctl notify
       </programlisting>
@@ -3730,7 +4175,7 @@
         lxc.net.1.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3596
         lxc.net.2.type = phys
         lxc.net.2.flags = up
-        lxc.net.2.link = dummy0
+        lxc.net.2.link = random0
         lxc.net.2.hwaddr = 4a:49:43:49:79:ff
         lxc.net.2.ipv4.address = 10.2.3.6/24
         lxc.net.2.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3297
@@ -3742,6 +4187,7 @@
         lxc.mount.fstab = /etc/fstab.complex
         lxc.mount.entry = /lib /root/myrootfs/lib none ro,bind 0 0
         lxc.rootfs.path = dir:/mnt/rootfs.complex
+        lxc.rootfs.options = idmap=container
         lxc.cap.drop = sys_module mknod setuid net_raw
         lxc.cap.drop = mac_override
       </programlisting>

_service:tar_scm:lxc-5.0.2.tar.gz/doc/ja/meson.build Added

@@ -0,0 +1,74 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+if want_mans
+    PAGES = 
+        'lxc', '7',
+        'lxc.conf', '5',
+        'lxc.container.conf', '5',
+        'lxc.system.conf', '5',
+        'lxc-update-config', '1',
+        'lxc-usernet', '5',
+        'lxc-user-nic', '1',
+        'lxc-usernsexec', '1',
+    
+
+    if want_tools
+        PAGES += 
+            'lxc-attach', '1',
+            'lxc-autostart', '1',
+            'lxc-cgroup', '1',
+            'lxc-checkconfig', '1',
+            'lxc-checkpoint', '1',
+            'lxc-config', '1',
+            'lxc-console', '1',
+            'lxc-copy', '1',
+            'lxc-create', '1',
+            'lxc-destroy', '1',
+            'lxc-device', '1',
+            'lxc-execute', '1',
+            'lxc-freeze', '1',
+            'lxc-info', '1',
+            'lxc-ls', '1',
+            'lxc-monitor', '1',
+            'lxc-snapshot', '1',
+            'lxc-start', '1',
+            'lxc-stop', '1',
+            'lxc-top', '1',
+            'lxc-unfreeze', '1',
+            'lxc-unshare', '1',
+            'lxc-wait', '1',
+        
+    endif
+
+    if want_pam_cgroup
+        PAGES += 
+            'pam_cgfs', '8',
+        
+    endif
+
+    # Common files.
+    configure_file(
+        configuration: docconf,
+        input: 'common_options.sgml.in',
+        output: 'common_options.sgml')
+
+    configure_file(
+        configuration: docconf,
+        input: 'see_also.sgml.in',
+        output: 'see_also.sgml')
+
+    # Initial templating.
+    foreach page : PAGES
+        sgml = configure_file(
+            configuration: docconf,
+            input: page0 + '.sgml.in',
+            output: page0 + '.sgml')
+
+        configure_file(
+            input: sgml,
+            output: page0 + '.' + page1,
+            command: sgml2man, '--encoding=UTF-8', page0 + '.sgml',
+            install: true,
+            install_dir: join_paths(mandir, 'ja', 'man' + page1))
+    endforeach
+endif

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ja/pam_cgfs.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ja/pam_cgfs.sgml.in Changed

@@ -93,17 +93,18 @@
 
     <para>
       
-      <command>pam_cgfs.so</command> モジュールは、cgroupfs v1 (<filename>/sys/fs/cgroup/$controller</filename>) と cgroupfs v2 (<filename>/sys/fs/cgroup</filename>) のいずれも扱えます。また、コントローラのいくつかが cgroupfs v1 ツリー (<filename>/sys/fs/cgroup/$controller</filename>) で、それ以外が cgroupfs v2 (<filename>/sys/fs/cgroup/unified</filename>) ツリーと言ったようなミックスでも扱えます。
+      for only controllers listed as arguments on the command line. 
+      Pure cgroup v2 mount is not covered by the pam_cgfs.so module.
+	-->
+      <command>pam_cgfs.so</command> モジュールは、純粋な cgroupfs v1 (<filename>/sys/fs/cgroup/$controller</filename>) ツリーと、コントローラのいくつかが cgroupfs v1 ツリー (<filename>/sys/fs/cgroup/$controller</filename>) で、それ以外が cgroupfs v2 (<filename>/sys/fs/cgroup/unified</filename>) ツリーと言ったようなミックスマウントを扱えます。
       書き込み可能な cgroup がすべてのコントローラ用に作られます。また、引数で指定すれば、指定したコントローラのみ書き込み可能な cgroup が作られます。
+      純粋な cgroup v2 のみのマウントは pam_cgfs.so モジュールでは対象外です。
     </para>
 
     <para>

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ko/FAQ.txt -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ko/FAQ.txt Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ko/common_options.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ko/common_options.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ko/lxc-attach.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ko/lxc-attach.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ko/lxc-autostart.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ko/lxc-autostart.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ko/lxc-execute.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ko/lxc-execute.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ko/lxc-user-nic.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ko/lxc-user-nic.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ko/lxc.container.conf.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ko/lxc.container.conf.sgml.in Changed

@@ -844,7 +844,7 @@
               
               만약 지정되었다면, 컨테이너는 새 pseudo tty 인스턴스를 갖는다. 그리고 이것을 자기자신 전용으로 만든다. 지정하는 값은 pseudo tty의 최대 개수를 지정한다. (이 제한은 아직 구현되지 않았다)
@@ -1060,7 +1060,7 @@
         the container at some <filename>path</filename>, and then mounts
         under <filename>path</filename>, then a TOCTTOU attack would be
         possible where the container user modifies a symbolic link under
-        his home directory at just the right time.
+        their home directory at just the right time.
         -->
         주의 - 보통 LXC는 마운트 대상과 상대 경로로 된 바인드 마운트 소스들이 컨테이너의 루트 아래에 있도록 보장할 것이다. 이는 호스트 디렉토리와 파일들을 겹쳐서 마운트하는 유형의 공격을 피하기 위한 것이다. (절대 경로로 된 마운트 소스 내에 존재하는 심볼릭 링크들은 무시될 것이다.)
         하지만, 만약 컨테이너 설정에서 컨테이너 사용자가 제어할 수 있는, 예를 들어 /home/joe와 같은 디렉토리를 컨테이너 내의 <filename>path</filename>에 먼저 마운트 하고 나서,  <filename>path</filename> 내에 또 마운트를 하는 경우가 있다면,
@@ -1736,17 +1736,17 @@
       <para>
         
-        현재는 버전1과 2만 지원된다. 버전 1에서는 정책은 단순한 화이트리스트이다. 그러므로 두번째 라인은 반드시 "whitelist"여야 한다. 파일의 나머지 내용은 한 줄에 하나의 시스템콜 번호로 채워진다. 화이트리스트에 없는 번호는 컨테이너에서 블랙리스트로 들어간다.
+        현재는 버전1과 2만 지원된다. 버전 1에서는 정책은 단순한 화이트리스트이다. 그러므로 두번째 라인은 반드시 "allowlist"여야 한다. 파일의 나머지 내용은 한 줄에 하나의 시스템콜 번호로 채워진다. 화이트리스트에 없는 번호는 컨테이너에서 블랙리스트로 들어간다.
       </para>
 
       <para>
         
@@ -1754,7 +1754,7 @@
       </para>
       <para>
         
@@ -1762,7 +1762,7 @@
       </para>
 <screen>
 2
-blacklist
+denylist
 mknod errno 0
 </screen>
       <variablelist>
@@ -2613,7 +2613,7 @@
 	lxc.net.1.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3596
 	lxc.net.2.type = phys
 	lxc.net.2.flags = up
-	lxc.net.2.link = dummy0
+	lxc.net.2.link = random0
 	lxc.net.2.hwaddr = 4a:49:43:49:79:ff
 	lxc.net.2.ipv4.address = 10.2.3.6/24
 	lxc.net.2.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3297

_service:tar_scm:lxc-4.0.3.tar.gz/doc/ko/lxc.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/ko/lxc.sgml.in Changed

_service:tar_scm:lxc-5.0.2.tar.gz/doc/ko/meson.build Added

@@ -0,0 +1,67 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+if want_mans
+    PAGES = 
+        'lxc', '7',
+        'lxc.conf', '5',
+        'lxc.container.conf', '5',
+        'lxc.system.conf', '5',
+        'lxc-usernet', '5',
+        'lxc-user-nic', '1',
+        'lxc-usernsexec', '1',
+    
+
+    if want_tools
+        PAGES += 
+            'lxc-attach', '1',
+            'lxc-autostart', '1',
+            'lxc-cgroup', '1',
+            'lxc-checkconfig', '1',
+            'lxc-checkpoint', '1',
+            'lxc-config', '1',
+            'lxc-console', '1',
+            'lxc-copy', '1',
+            'lxc-create', '1',
+            'lxc-destroy', '1',
+            'lxc-device', '1',
+            'lxc-execute', '1',
+            'lxc-freeze', '1',
+            'lxc-info', '1',
+            'lxc-ls', '1',
+            'lxc-monitor', '1',
+            'lxc-snapshot', '1',
+            'lxc-start', '1',
+            'lxc-stop', '1',
+            'lxc-top', '1',
+            'lxc-unfreeze', '1',
+            'lxc-unshare', '1',
+            'lxc-wait', '1',
+        
+    endif
+
+    # Common files.
+    configure_file(
+        configuration: docconf,
+        input: 'common_options.sgml.in',
+        output: 'common_options.sgml')
+
+    configure_file(
+        configuration: docconf,
+        input: 'see_also.sgml.in',
+        output: 'see_also.sgml')
+
+    # Initial templating.
+    foreach page : PAGES
+        sgml = configure_file(
+            configuration: docconf,
+            input: page0 + '.sgml.in',
+            output: page0 + '.sgml')
+
+        configure_file(
+            input: sgml,
+            output: page0 + '.' + page1,
+            command: sgml2man, '--encoding=UTF-8', page0 + '.sgml',
+            install: true,
+            install_dir: join_paths(mandir, 'ko', 'man' + page1))
+    endforeach
+endif

_service:tar_scm:lxc-4.0.3.tar.gz/doc/lxc-attach.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/lxc-attach.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/lxc-autostart.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/lxc-autostart.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/lxc-execute.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/lxc-execute.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/lxc-user-nic.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/lxc-user-nic.sgml.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/doc/lxc.container.conf.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/lxc.container.conf.sgml.in Changed

@@ -339,6 +339,33 @@
     </refsect2>
 
     <refsect2>
+      <title>Core Scheduling</title>
+      <para>
+        Core scheduling defines if the container payload
+	is marked as being schedulable on the same core. Doing so will cause
+	the kernel scheduler to ensure that tasks that are not in the same
+	group never run simultaneously on a core. This can serve as an extra
+	security measure to prevent the container payload from using
+	cross hyper thread attacks.
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <option>lxc.sched.core</option>
+          </term>
+          <listitem>
+            <para>
+              The only allowed values are 0 and 1. Set this to 1 to create a
+	      core scheduling domain for the container or 0 to not create one.
+	      If not set explicitly no core scheduling domain will be created
+	      for the container.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
       <title>Proc</title>
       <para>
         Configure proc filesystem for the container.
@@ -412,6 +439,7 @@
             <para>
               specify what kind of network virtualization to be used
               for the container.
+              Must be specified before any other option(s) on the net device.
               Multiple networks can be specified by using an additional index
               <option>i</option>
               after all <option>lxc.net.*</option> keys. For example,
@@ -474,6 +502,12 @@
               <option>lxc.net.i.veth.ipv6.route</option> options.
               Several lines specify several routes.
               The route is in format x.y.z.t/m, eg. 192.168.1.0/24.
+
+              In <option>bridge</option> mode untagged VLAN membership can be set with the
+              <option>lxc.net.i.veth.vlan.id</option> option. It accepts a special value of 'none' indicating
+              that the container port should be removed from the bridge's default untagged VLAN.
+              The <option>lxc.net.i.veth.vlan.tagged.id</option> option can be specified multiple times to set
+              the container's bridge port membership to one or more tagged VLANs.
             </para>
 
             <para>
@@ -654,6 +688,9 @@
               Specify the ipv4 address to assign to the virtualized interface.
               Several lines specify several ipv4 addresses. The address is in
               format x.y.z.t/m, eg. 192.168.1.123/24.
+              You can optionally specify the broadcast address after the IP address,
+              e.g. 192.168.1.123/24 255.255.255.255.
+              Otherwise it is automatically calculated from the IP address.
             </para>
           </listitem>
         </varlistentry>
@@ -867,7 +904,7 @@
             <para>
               If set, the container will have a new pseudo tty
               instance, making this private to it. The value specifies
-              the maximum number of pseudo ttys allowed for a pts
+              the maximum number of pseudo ttys allowed for a pty
               instance (this limitation is not implemented yet).
             </para>
           </listitem>
@@ -1118,7 +1155,7 @@
         the container at some <filename>path</filename>, and then mounts
         under <filename>path</filename>, then a TOCTTOU attack would be
         possible where the container user modifies a symbolic link under
-        his home directory at just the right time.
+        their home directory at just the right time.
       </para>
       <variablelist>
         <varlistentry>
@@ -1490,7 +1527,21 @@
           </term>
           <listitem>
             <para>
-              extra mount options to use when mounting the rootfs.
+              Specify extra mount options to use when mounting the rootfs.
+                The format of the mount options corresponds to the
+		format used in fstab. In addition, LXC supports the custom
+                <option>idmap=</option> mount option. This option can be used
+		to tell LXC to create an idmapped mount for the container's
+                rootfs. This is useful when the user doesn't want to recursively
+		chown the rootfs of the container to match the idmapping of the
+		user namespace the container is going to use. Instead an
+		idmapped mount can be used to handle this.
+		The argument for
+                <option>idmap=</option>
+                can either be a path pointing to a user namespace file that
+                LXC will open and use to idmap the rootfs or the special value
+                "container" which will instruct LXC to use
+		the container's user namespace to idmap the rootfs.
             </para>
           </listitem>
         </varlistentry>
@@ -1512,7 +1563,7 @@
     </refsect2>
 
     <refsect2>
-      <title>Control group</title>
+      <title>Control groups ("cgroups")</title>
       <para>
         The control group section contains the configuration for the
         different subsystem. <command>lxc</command> does not check the
@@ -1521,10 +1572,195 @@
         started, but has the advantage of permitting any future
         subsystem.
       </para>
+
+      <para>
+	The kernel implementation of cgroups has changed significantly over the
+	years. With Linux 4.5 support for a new cgroup filesystem was added
+	usually referred to as "cgroup2" or "unified hierarchy". Since then the
+	old cgroup filesystem is usually referred to as "cgroup1" or the
+	"legacy hierarchies". Please see the cgroups manual page for a detailed
+	explanation of the differences between the two versions.
+      </para>
+
+      <para>
+	LXC distinguishes settings for the legacy and the unified hierarchy by
+	using different configuration key prefixes. To alter settings for
+	controllers in a legacy hierarchy the key prefix
+	<option>lxc.cgroup.</option> must be used and in order to alter the
+	settings for a controller in the unified hierarchy the
+	<option>lxc.cgroup2.</option> key must be used. Note that LXC will
+	ignore <option>lxc.cgroup.</option> settings on systems that only use
+	the unified hierarchy. Conversely, it will ignore
+	<option>lxc.cgroup2.</option> options on systems that only use legacy
+	hierarchies.
+      </para>
+
+      <para>
+	At its core a cgroup hierarchy is a way to hierarchically organize
+	processes. Usually a cgroup hierarchy will have one or more
+	"controllers" enabled. A "controller" in a cgroup hierarchy is usually
+	responsible for distributing a specific type of system resource along
+	the hierarchy. Controllers include the "pids" controller, the "cpu"
+	controller, the "memory" controller and others. Some controllers
+	however do not fall into the category of distributing a system
+	resource, instead they are often referred to as "utility" controllers.
+	One utility controller is the device controller. Instead of
+	distributing a system resource it allows one to manage device access.
+      </para>
+
+      <para>
+	In the legacy hierarchy the device controller was implemented like most
+	other controllers as a set of files that could be written to. These
+	files where named "devices.allow" and "devices.deny". The legacy device
+	controller allowed the implementation of both "allowlists" and
+	"denylists".
+      </para>
+
+      <para>
+	An allowlist is a device program that by default blocks access to all
+	devices. In order to access specific devices "allow rules" for
+	particular devices or device classes must be specified. In contrast, a
+	denylist is a device program that by default allows access to all
+	devices. In order to restrict access to specific devices "deny rules"
+	for particular devices or device classes must be specified.
+      </para>
+
+      <para>
+	In the unified cgroup hierarchy the implementation of the device
+	controller has completely changed. Instead of files to read from and
+	write to a eBPF program of
+	<option>BPF_PROG_TYPE_CGROUP_DEVICE</option> can be attached to a
+	cgroup. Even though the kernel implementation has changed completely
+	LXC tries to allow for the same semantics to be followed in the legacy
+	device cgroup and the unified eBPF-based device controller. The
+	following paragraphs explain the semantics for the unified eBPF-based
+	device controller.
+      </para>
+
+      <para>
+	As mentioned the format for specifying device rules for the unified
+	eBPF-based device controller is the same as for the legacy cgroup
+	device controller; only the configuration key prefix has changed.
+	Specifically, device rules for the legacy cgroup device controller are
+	specified via <option>lxc.cgroup.devices.allow</option> and
+	<option>lxc.cgroup.devices.deny</option> whereas for the
+	cgroup2 eBPF-based device controller
+	<option>lxc.cgroup2.devices.allow</option> and
+	<option>lxc.cgroup2.devices.deny</option> must be used.
+      </para>
+      <para>
+        <itemizedlist>
+          <listitem>
+	    <para>
+	      A denylist device rule
+              <programlisting>
+	        lxc.cgroup2.devices.deny = a
+              </programlisting>
+	      will cause LXC to instruct the kernel to block access to all
+	      devices by default. To grant access to devices allow device rules
+	      must be added via the <option>lxc.cgroup2.devices.allow</option>
+	      key. This is referred to as a "allowlist" device program.
+	    </para>
+	  </listitem>
+
+          <listitem>
+	    <para>
+	      An allowlist device rule
+              <programlisting>
+	        lxc.cgroup2.devices.allow = a
+              </programlisting>
+	      will cause LXC to instruct the kernel to allow access to all
+	      devices by default. To deny access to devices deny device rules
+	      must be added via <option>lxc.cgroup2.devices.deny</option> key.
+	      This is referred to as a "denylist" device program.
+	    </para>
+	  </listitem>
+
+          <listitem>
+	    <para>
+	      Specifying any of the aforementioned two rules will cause all
+	      previous rules to be cleared, i.e. the device list will be reset.
+	    </para>
+	  </listitem>
+
+          <listitem>
+	    <para>
+	    When an allowlist program is requested, i.e. access to all devices
+	    is blocked by default, specific deny rules for individual devices
+	    or device classes are ignored.
+	    </para>
+	  </listitem>
+
+          <listitem>
+	    <para>
+	    When a denylist program is requested, i.e. access to all devices
+	    is allowed by default, specific allow rules for individual devices
+	    or device classes are ignored.
+	    </para>
+	  </listitem>
+        </itemizedlist>
+      </para>
+
+      <para>
+        For example the set of rules:
+        <programlisting>
+          lxc.cgroup2.devices.deny = a
+          lxc.cgroup2.devices.allow = c *:* m
+          lxc.cgroup2.devices.allow = b *:* m
+          lxc.cgroup2.devices.allow = c 1:3 rwm
+        </programlisting>
+	implements an allowlist device program, i.e. the kernel will block
+	access to all devices not specifically allowed in this list. This
+	particular program states that all character and block devices may be
+	created but only /dev/null might be read or written.
+      </para>
+
+      <para>
+        If we instead switch to the following set of rules:
+        <programlisting>
+          lxc.cgroup2.devices.allow = a
+          lxc.cgroup2.devices.deny = c *:* m
+          lxc.cgroup2.devices.deny = b *:* m
+          lxc.cgroup2.devices.deny = c 1:3 rwm
+        </programlisting>
+	 then LXC would instruct the kernel to implement a denylist, i.e. the
+	 kernel will allow access to all devices not specifically denied in
+	 this list. This particular program states that no character devices or
+	 block devices might be created and that /dev/null is not allow allowed
+	 to be read, written, or created.
+      </para>
+
+      <para>
+	 Now consider the same program but followed by a "global rule"
+	 which determines the type of device program (allowlist or
+	 denylist) as explained above:
+        <programlisting>
+          lxc.cgroup2.devices.allow = a
+          lxc.cgroup2.devices.deny = c *:* m
+          lxc.cgroup2.devices.deny = b *:* m
+          lxc.cgroup2.devices.deny = c 1:3 rwm
+          lxc.cgroup2.devices.allow = a
+        </programlisting>
+	The last line will cause LXC to reset the device list without changing
+	the type of device program.
+      </para>
+
+      <para>
+	If we specify:
+        <programlisting>
+          lxc.cgroup2.devices.allow = a
+          lxc.cgroup2.devices.deny = c *:* m
+          lxc.cgroup2.devices.deny = b *:* m
+          lxc.cgroup2.devices.deny = c 1:3 rwm
+          lxc.cgroup2.devices.deny = a
+        </programlisting>
+	instead then the last line will cause LXC to reset the device list and
+	switch from an allowlist program to a denylist program.
+      </para>
       <variablelist>
         <varlistentry>
           <term>
-            <option>lxc.cgroup.controller name</option>
+            <option>lxc.cgroup.controller name.controller file</option>
           </term>
           <listitem>
             <para>
@@ -1539,7 +1775,7 @@
         </varlistentry>
         <varlistentry>
           <term>
-            <option>lxc.cgroup2.controller name</option>
+            <option>lxc.cgroup2.controller name.controller file</option>
           </term>
           <listitem>
             <para>
@@ -1573,6 +1809,65 @@
         </varlistentry>
         <varlistentry>
           <term>
+            <option>lxc.cgroup.dir.container</option>
+          </term>
+          <listitem>
+            <para>
+              This is similar to <option>lxc.cgroup.dir</option>, but must be
+              used together with <option>lxc.cgroup.dir.monitor</option> and
+              affects only the container's cgroup path. This option is mutually
+              exclusive with <option>lxc.cgroup.dir</option>.
+              Note that the final path the container attaches to may be
+              extended further by the
+              <option>lxc.cgroup.dir.container.inner</option> option.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>lxc.cgroup.dir.monitor</option>
+          </term>
+          <listitem>
+            <para>
+              This is the monitor process counterpart to
+              <option>lxc.cgroup.dir.container</option>.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>lxc.cgroup.dir.monitor.pivot</option>
+          </term>
+          <listitem>
+            <para>
+              On container termination the PID of the monitor process is attached to this cgroup.
+              This path should not be a subpath of any other configured cgroup dir to ensure
+              proper removal of other cgroup paths on container termination.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>lxc.cgroup.dir.container.inner</option>
+          </term>
+          <listitem>
+            <para>
+              Specify an additional subdirectory where the cgroup namespace
+              will be created. With this option, the cgroup limits will be
+              applied to the outer path specified in
+              <option>lxc.cgroup.dir.container</option>, which is not accessible
+              from within the container, making it possible to better enforce
+              limits for privileged containers in a way they cannot override
+              them.
+              This only works in conjunction with the
+              <option>lxc.cgroup.dir.container</option> and
+              <option>lxc.cgroup.dir.monitor</option> options and has otherwise
+              no effect.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
             <option>lxc.cgroup.relative</option>
           </term>
           <listitem>
@@ -1676,7 +1971,7 @@
             standard namespace identifiers as seen in the
             <filename>/proc/PID/ns</filename> directory.
             The <option>lxc.namespace.keep</option> is a
-            blacklist option, i.e. it is useful when enforcing that containers
+            denylist option, i.e. it is useful when enforcing that containers
             must keep a specific set of namespaces.
             </para>
 
@@ -1753,6 +2048,33 @@
             </para>
           </listitem>
         </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>lxc.time.offset.boot</option>
+          </term>
+          <listitem>
+            <para>
+	    Specify a positive or negative offset for the boottime clock. The
+	    format accepts hours (h), minutes (m), seconds (s),
+	    milliseconds (ms), microseconds (us), and nanoseconds (ns).
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>lxc.time.offset.monotonic</option>
+          </term>
+          <listitem>
+            <para>
+	    Specify a positive or negative offset for the monotonic clock. The
+	    format accepts hours (h), minutes (m), seconds (s),
+	    milliseconds (ms), microseconds (us), and nanoseconds (ns).
+            </para>
+          </listitem>
+        </varlistentry>
+
       </variablelist>
     </refsect2>
 
@@ -1984,26 +2306,26 @@
       </para>
       <para>
         Versions 1 and 2 are currently supported.  In version 1, the
-        policy is a simple whitelist.  The second line therefore must
-        read "whitelist", with the rest of the file containing one (numeric)
-        syscall number per line.  Each syscall number is whitelisted,
-        while every unlisted number is blacklisted for use in the container
+        policy is a simple allowlist.  The second line therefore must
+        read "allowlist", with the rest of the file containing one (numeric)
+        syscall number per line.  Each syscall number is allowlisted,
+        while every unlisted number is denylisted for use in the container
       </para>
 
       <para>
-       In version 2, the policy may be blacklist or whitelist,
+       In version 2, the policy may be denylist or allowlist,
        supports per-rule and per-policy default actions, and supports
        per-architecture system call resolution from textual names.
       </para>
       <para>
-       An example blacklist policy, in which all system calls are
+       An example denylist policy, in which all system calls are
        allowed except for mknod, which will simply do nothing and
        return 0 (success), looks like:
       </para>
 
       <programlisting>
       2
-      blacklist
+      denylist
       mknod errno 0
       ioctl notify
       </programlisting>
@@ -2808,7 +3130,7 @@
         lxc.net.1.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3596
         lxc.net.2.type = phys
         lxc.net.2.flags = up
-        lxc.net.2.link = dummy0
+        lxc.net.2.link = random0
         lxc.net.2.hwaddr = 4a:49:43:49:79:ff
         lxc.net.2.ipv4.address = 10.2.3.6/24
         lxc.net.2.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3297
@@ -2820,6 +3142,7 @@
         lxc.mount.fstab = /etc/fstab.complex
         lxc.mount.entry = /lib /root/myrootfs/lib none ro,bind 0 0
         lxc.rootfs.path = dir:/mnt/rootfs.complex
+        lxc.rootfs.options = idmap=container
         lxc.cap.drop = sys_module mknod setuid net_raw
         lxc.cap.drop = mac_override
       </programlisting>

_service:tar_scm:lxc-5.0.2.tar.gz/doc/meson.build Added

_service:tar_scm:lxc-4.0.3.tar.gz/doc/pam_cgfs.sgml.in -> _service:tar_scm:lxc-5.0.2.tar.gz/doc/pam_cgfs.sgml.in Changed

_service:tar_scm:lxc-5.0.2.tar.gz/doc/rootfs/meson.build Added

_service:tar_scm:lxc-4.0.3.tar.gz/hooks/dhclient.in -> _service:tar_scm:lxc-5.0.2.tar.gz/hooks/dhclient.in Changed

_service:tar_scm:lxc-5.0.2.tar.gz/hooks/meson.build Added

@@ -0,0 +1,57 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+hooks_unmount_namespace_sources = files('unmount-namespace.c')
+if srcconf.get('IS_BIONIC') == 1 or srcconf.get('HAVE_HASMNTOPT') == 0 or srcconf.get('HAVE_SETMNTENT') == 0 or srcconf.get('HAVE_ENDMNTENT') == 0
+    hooks_unmount_namespace_sources += files(
+        '../src/include/lxcmntent.c',
+        '../src/include/lxcmntent.h')
+endif
+
+hook_programs += executable(
+    'unmount-namespace',
+    hooks_unmount_namespace_sources,
+    include_directories: liblxc_includes,
+    install: true,
+    install_dir: join_paths(lxclibexec, 'hooks'))
+
+hook_programs = configure_file(
+    configuration: dummy_config_data,
+    input: 'clonehostname',
+    output: 'clonehostname')
+install_data(join_paths(project_build_root, 'hooks/clonehostname'), install_dir: lxchookdir)
+
+hook_programs = configure_file(
+    configuration: dummy_config_data,
+    input: 'dhclient-script',
+    output: 'dhclient-script')
+install_data(join_paths(project_build_root, 'hooks/dhclient-script'), install_dir: lxchookdir)
+
+hook_programs = configure_file(
+    configuration: conf,
+    input: 'dhclient.in',
+    output: 'dhclient')
+install_data(join_paths(project_build_root, 'hooks/dhclient'), install_dir: lxchookdir)
+
+hook_programs = configure_file(
+    configuration: dummy_config_data,
+    input: 'mountecryptfsroot',
+    output: 'mountecryptfsroot')
+install_data(join_paths(project_build_root, 'hooks/mountecryptfsroot'), install_dir: lxchookdir)
+
+hook_programs = configure_file(
+    configuration: dummy_config_data,
+    input: 'nvidia',
+    output: 'nvidia')
+install_data(join_paths(project_build_root, 'hooks/nvidia'), install_dir: lxchookdir)
+
+hook_programs = configure_file(
+    configuration: dummy_config_data,
+    input: 'squid-deb-proxy-client',
+    output: 'squid-deb-proxy-client')
+install_data(join_paths(project_build_root, 'hooks/squid-deb-proxy-client'), install_dir: lxchookdir)
+
+hook_programs = configure_file(
+    configuration: dummy_config_data,
+    input: 'ubuntu-cloud-prep',
+    output: 'ubuntu-cloud-prep')
+install_data(join_paths(project_build_root, 'hooks/ubuntu-cloud-prep'), install_dir: lxchookdir)

_service:tar_scm:lxc-4.0.3.tar.gz/hooks/mountecryptfsroot -> _service:tar_scm:lxc-5.0.2.tar.gz/hooks/mountecryptfsroot Changed

@@ -28,7 +28,7 @@
 #     a. c=q1
 #     b. mv /var/lib/lxc/$c/rootfs /var/lib/lxc/$c/rootfs.plain
 #     c. mkdir /var/lib/lxc/$c/rootfs{,.crypt}
-#     d. sig=`echo none | ecryptfs-add-passphrase | grep -v Passphrase | cut -d -f 2 | cut -d -f 1`
+#     d. sig=$(echo none | ecryptfs-add-passphrase | grep -v Passphrase | cut -d -f 2 | cut -d -f 1)
 #     e. echo $sig > /var/lib/lxc/$c/sig
 #     f. mount -t ecryptfs -o ecryptfs_cipher=aes,ecryptfs_key_bytes=16,ecryptfs_passthrough=n,ecryptfs_enable_filename_crypto=n,ecryptfs_sig=${sig},sig=${sig},verbosity=0 /var/lib/lxc/$c/rootfs.crypt /var/lib/lxc/$c/rootfs
 #     g. rsync -va /var/lib/lxc/$c/rootfs.plain/ /var/lib/lxc/$c/rootfs/
@@ -45,6 +45,6 @@
 ecryptfs_crypt=$(echo $LXC_ROOTFS_PATH | sed 's/rootfs$/rootfs.crypt/')
 sigfile=$(echo $LXC_CONFIG_FILE | sed 's/config$/sig/')
 
-sig=`cat $sigfile`
+sig=$(cat $sigfile)
 mount -n -t ecryptfs -o ecryptfs_cipher=aes,ecryptfs_key_bytes=16,ecryptfs_passthrough=n,ecryptfs_enable_filename_crypto=n,ecryptfs_sig=${sig},sig=${sig},verbosity=0 $ecryptfs_crypt $LXC_ROOTFS_PATH
 exit 0

_service:tar_scm:lxc-4.0.3.tar.gz/hooks/nvidia -> _service:tar_scm:lxc-5.0.2.tar.gz/hooks/nvidia Changed

_service:tar_scm:lxc-4.0.3.tar.gz/hooks/unmount-namespace.c -> _service:tar_scm:lxc-5.0.2.tar.gz/hooks/unmount-namespace.c Changed

@@ -25,7 +25,8 @@
  * namespaces are gone.
  */
 
-#define _GNU_SOURCE    /* setns */
+#include "config.h"
+
 #include <stdio.h>     /* fdopen, getmntent, endmntent */
 #include <stdlib.h>    /* malloc, qsort */
 #include <unistd.h>    /* close */
@@ -37,20 +38,18 @@
 #include <fcntl.h>     /* openat, open */
 #include <errno.h>     /* errno */
 
-#include <../src/config.h>
-
 #if IS_BIONIC
-#include <../src/include/lxcmntent.h>
+#include "lxcmntent.h"
 #else
 #include <mntent.h>
 #endif
 
 #ifndef O_PATH
-#define O_PATH      010000000
+#define O_PATH 010000000
 #endif
 
 /* Define setns() if missing from the C library */
-#ifndef HAVE_SETNS
+#if !HAVE_SETNS
 static inline int setns(int fd, int nstype)
 {
 #ifdef __NR_setns
@@ -111,13 +110,13 @@
 	*mp = NULL;
 	*countp = 0;
 
-	fd = openat(procfd, "self/mounts", O_RDONLY);
+	fd = openat(procfd, "self/mounts", O_RDONLY | O_CLOEXEC);
 	if (fd < 0) {
 		free(mounts);
 		return 0;
 	}
 
-	mf = fdopen(fd, "r");
+	mf = fdopen(fd, "re");
 	if (!mf) {
 		int error = errno;
 		close(fd);
@@ -189,14 +188,14 @@
 	/* Open a handle to /proc on the host as we need to access /proc/self/mounts
 	 * and the container's /proc doesn't contain our /self. See read_mounts().
 	 */
-	procfd = open("/proc", O_RDONLY | O_DIRECTORY | O_PATH);
+	procfd = open("/proc", O_RDONLY | O_DIRECTORY | O_PATH | O_CLOEXEC);
 	if (procfd < 0) {
 		fprintf(stderr, "%s: failed to open /proc: %s\n", argv0, strerror(errno));
 		return 4;
 	}
 
 	/* Open the mount namespace and enter it. */
-	ctmntfd = open(mntns, O_RDONLY);
+	ctmntfd = open(mntns, O_RDONLY | O_CLOEXEC);
 	if (ctmntfd < 0) {
 		fprintf(stderr, "%s: failed to open mount namespace: %s\n",
 			argv0, strerror(errno));

_service:tar_scm:lxc-4.0.3.tar.gz/lxc.spec.in -> _service:tar_scm:lxc-5.0.2.tar.gz/lxc.spec.in Changed

_service:tar_scm:lxc-5.0.2.tar.gz/meson.build Added

@@ -0,0 +1,1048 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# Project.
+project(
+    'lxc',
+    'c',
+    version: '5.0.2',
+    license: 'LGPLv2+',
+    default_options: 
+        'b_lto=true',
+        'b_lto_mode=thin',
+        'b_colorout=always',
+        'b_asneeded=false',
+        'b_pie=true',
+        'b_staticpic=true',
+        'c_std=gnu11',
+        'warning_level=2',
+    ,
+    meson_version: '>= 0.61')
+
+cc = meson.get_compiler('c')
+pkgconfig = import('pkgconfig')
+pkgconfig_libs = 
+
+liblxc_dependencies = 
+oss_fuzz_dependencies = 
+
+# Version.
+liblxc_version = '1.7.0'
+version_data = configuration_data()
+version_data.set('LXC_VERSION_MAJOR', '5')
+version_data.set('LXC_VERSION_MINOR', '0')
+version_data.set('LXC_VERSION_MICRO', '2')
+version_data.set('LXC_VERSION_BETA', '')
+version_data.set('LXC_ABI', liblxc_version)
+version_data.set('LXC_DEVEL', '0')
+version_data.set('LXC_VERSION', meson.project_version())
+
+# Path handling.
+project_source_root = meson.current_source_dir()
+project_build_root = meson.current_build_dir()
+prefixdir = get_option('prefix')
+
+apparmorcachedir = get_option('apparmor-cache-path')
+globalconfig = get_option('global-config-path')
+localstatedir = join_paths('/', get_option('localstatedir'))
+logpath = get_option('log-path')
+lxcpathprefix = get_option('data-path')
+rootfsmount = get_option('rootfs-mount-path')
+user_network_db_opt = get_option('usernet-db-path')
+user_network_conf_opt = get_option('usernet-config-path')
+
+bashcompletiondir = join_paths('/', 'usr', 'share', 'bash-completion', 'completions')
+bindir = join_paths(prefixdir, get_option('bindir'))
+datadir = join_paths(prefixdir, get_option('datadir'))
+mandir = join_paths(prefixdir, get_option('mandir'))
+docdir = join_paths(datadir, get_option('doc-path'))
+includedir = join_paths(prefixdir, get_option('includedir'))
+libdir = join_paths(prefixdir, get_option('libdir'))
+libexecdir = join_paths(prefixdir, get_option('libexecdir'))
+runtimepath = join_paths(prefixdir, get_option('runtime-path'))
+sbindir = join_paths(prefixdir, get_option('sbindir'))
+sysconfdir = join_paths(prefixdir, get_option('sysconfdir'))
+
+lxcapparmorcachedir = join_paths(localstatedir, apparmorcachedir)
+lxcconfdir = join_paths(sysconfdir, globalconfig)
+lxcdefaultconfig = join_paths(lxcconfdir, 'default.conf')
+lxcglobalconfig = join_paths(lxcconfdir, 'lxc.conf')
+lxcexamplesdir = join_paths(docdir, 'examples')
+lxchookbindir = join_paths(libexecdir, 'lxc/hooks')
+lxcinclude = join_paths(includedir, 'lxc')
+lxclibexec = join_paths(libexecdir, 'lxc')
+lxclogpath = join_paths(localstatedir, logpath)
+lxcpath = join_paths(localstatedir, lxcpathprefix)
+lxcrootfsmount = join_paths(libdir, rootfsmount)
+lxcdatadir = join_paths(datadir, 'lxc')
+lxchookdir = join_paths(lxcdatadir, 'hooks')
+lxcselinuxdir = join_paths(lxcdatadir, 'selinux')
+lxctemplateconfdir = join_paths(lxcdatadir, 'config')
+lxctemplateconfcommondir = join_paths(lxctemplateconfdir, 'common.conf.d')
+lxctemplatedir = join_paths(lxcdatadir, 'templates')
+lxc_user_network_conf = join_paths(sysconfdir, user_network_conf_opt)
+lxc_user_network_db = join_paths(runtimepath, user_network_db_opt)
+pam_security = join_paths(libdir, 'security')
+
+# Configuration options.
+srcconf = configuration_data()
+srcconf.set('_GNU_SOURCE', true)
+srcconf.set('_FILE_OFFSET_BITS', 64)
+srcconf.set('__STDC_FORMAT_MACROS', true)
+
+## This is a hack to prevent any inclusion ofr linux/mount.h which causes
+## conflicts with sys/mount.h all over the place
+srcconf.set('_LINUX_MOUNT_H', true)
+
+srcconf.set_quoted('APPARMOR_CACHE_DIR', lxcapparmorcachedir)
+srcconf.set_quoted('LIBEXECDIR', libexecdir)
+srcconf.set_quoted('LOGPATH', lxclogpath)
+srcconf.set_quoted('LXC_DEFAULT_CONFIG', lxcdefaultconfig)
+srcconf.set_quoted('LXC_GLOBAL_CONF', lxcglobalconfig)
+srcconf.set_quoted('LXCINITDIR', libexecdir)
+srcconf.set_quoted('LXCPATH', lxcpath)
+srcconf.set_quoted('LXCROOTFSMOUNT', lxcrootfsmount)
+srcconf.set_quoted('LXCTEMPLATECONFIG', lxctemplateconfdir)
+srcconf.set_quoted('LXCTEMPLATECONFIG', lxctemplateconfdir)
+srcconf.set_quoted('LXCTEMPLATEDIR', lxctemplatedir)
+srcconf.set_quoted('LXC_USERNIC_CONF', lxc_user_network_conf)
+srcconf.set_quoted('LXC_USERNIC_DB', lxc_user_network_db)
+srcconf.set_quoted('RUNTIME_PATH', runtimepath)
+srcconf.set_quoted('SBINDIR', sbindir)
+
+conf = configuration_data()
+conf.set('BINDIR', bindir)
+conf.set('LIBEXECDIR', libexecdir)
+conf.set('LOCALSTATEDIR', localstatedir)
+conf.set('LXC_GLOBAL_CONF', lxcglobalconfig)
+conf.set('LXCHOOKDIR', lxchookdir)
+conf.set('LXCINITDIR', libexecdir)
+conf.set('LXCROOTFSMOUNT', lxcrootfsmount)
+conf.set('LXCTEMPLATECONFIG', lxctemplateconfdir)
+conf.set('LXCTEMPLATEDIR', lxctemplatedir)
+conf.set('PACKAGE_VERSION', meson.project_version())
+conf.set('RUNTIME_PATH', runtimepath)
+conf.set('SYSCONFDIR', sysconfdir)
+
+# Set sysconfdir
+fs = import('fs')
+distrosysconfdir = get_option('distrosysconfdir')
+if distrosysconfdir != ''
+    distrosysconfdir = join_paths(sysconfdir, distrosysconfdir)
+    conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir)
+elif fs.is_dir('/etc/sysconfig')
+    distrosysconfdir = join_paths(sysconfdir, 'sysconfig')
+    conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir)
+elif fs.is_dir('/etc/default')
+    distrosysconfdir = join_paths(sysconfdir, 'default')
+    conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir)
+else
+    error('"distrosysconfdir" is not set')
+endif
+
+# Cross-compile on Android.
+srcconf.set10('IS_BIONIC', host_machine.system() == 'android')
+
+# Custom configuration.
+cgrouppattern = get_option('cgroup-pattern')
+coverity = get_option('coverity-build')
+init_script = get_option('init-script')
+sanitize = get_option('b_sanitize')
+want_examples = get_option('examples')
+want_io_uring = get_option('io-uring-event-loop')
+want_pam_cgroup = get_option('pam-cgroup')
+want_mans = get_option('man')
+want_tests = get_option('tests')
+want_tools = get_option('tools')
+want_commands = get_option('commands')
+want_capabilities = get_option('capabilities')
+want_apparmor = get_option('apparmor')
+want_openssl = get_option('openssl')
+want_selinux = get_option('selinux')
+want_oss_fuzz = get_option('oss-fuzz')
+want_seccomp = get_option('seccomp')
+want_thread_safety = get_option('thread-safety')
+want_memfd_rexec = get_option('memfd-rexec')
+want_sd_bus = get_option('sd-bus')
+
+srcconf.set_quoted('DEFAULT_CGROUP_PATTERN', cgrouppattern)
+if coverity
+    srcconf.set('ENABLE_COVERITY_BUILD', 1)
+endif
+
+dummy_config_data = configuration_data()
+dummy_config_data.set_quoted('DUMMY_VARIABLE', '1')
+
+# Those generate many false positives, and we do not want to change the code to
+# avoid them.
+basic_disabled_warnings = 
+        '-Wno-format-signedness',
+        '-Wno-missing-field-initializers',
+        '-Wno-unused-parameter',
+
+
+# Build flags.
+possible_cc_flags = 
+    '-Wvla',
+    '-Wimplicit-fallthrough=5',
+    '-Wcast-align',
+    '-Wstrict-prototypes',
+    '-fno-strict-aliasing',
+    '-fstack-clash-protection',
+    '--param=ssp-buffer-size=4',
+    '--mcet -fcf-protection',
+    '-Werror=implicit-function-declaration',
+    '-Wlogical-op',
+    '-Wmissing-include-dirs',
+    '-Wold-style-definition',
+    '-Winit-self',
+    '-Wunused-but-set-variable',
+    '-Wno-unused-parameter',
+    '-Wfloat-equal',
+    '-Wsuggest-attribute=noreturn',
+    '-Werror=return-type',
+    '-Werror=incompatible-pointer-types',
+    '-Wformat=2',
+    '-Wshadow',
+    '-Wendif-labels',
+    '-Werror=overflow',
+    '-fdiagnostics-show-option',
+    '-Werror=shift-count-overflow',
+    '-Werror=shift-overflow=2',
+    '-Wdate-time',
+    '-Wnested-externs',
+    '-fasynchronous-unwind-tables',
+    '-fexceptions',
+    '-Warray-bounds',
+    '-Wrestrict',
+    '-Wreturn-local-addr',
+    '-fsanitize=cfi',
+    '-Wstringop-overflow',
+
+
+possible_link_flags = 
+    '-Wl,--no-as-needed',
+    '-Wl,--gc-sections',
+    '-Wl,-z,relro',
+    '-Wl,-z,now',
+    '-fstack-protector',
+    '-fstack-protector-strong',
+
+
+# The gold linker fails with a bus error on sparc64
+if build_machine.cpu_family() != 'sparc64'
+    possible_link_flags += '-Wl,-fuse-ld=gold'
+endif
+
+if sanitize == 'none'
+    possible_link_flags += '-Wl,--warn-common'
+endif
+
+if cc.get_id() == 'clang'
+    possible_cc_flags += 
+            '-Wno-typedef-redefinition',
+            '-Wno-gnu-variable-sized-type-not-at-end',
+    
+endif
+
+if meson.version().version_compare('>=0.46')
+    add_project_link_arguments(cc.get_supported_link_arguments(possible_link_flags), language: 'c')
+else
+    add_project_link_arguments(possible_link_flags, language: 'c')
+endif
+
+add_project_arguments(cc.get_supported_arguments(basic_disabled_warnings), language : 'c')
+add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language: 'c')
+
+if add_languages('cpp', required : want_oss_fuzz)
+    #  Used only for tests
+    cxx = meson.get_compiler('cpp')
+    cxx_cmd = ' '.join(cxx.cmd_array())
+    add_project_arguments(cxx.get_supported_arguments(basic_disabled_warnings), language : 'cpp')
+endif
+
+# Feature detection
+## I/O uring.
+if want_io_uring
+    liburing = dependency('liburing')
+    if cc.has_function('io_uring_prep_poll_add', prefix: '#include <liburing.h>', dependencies: liburing) == false
+        error('liburing version does not support IORING_POLL_ADD_MULTI')
+    endif
+    pkgconfig_libs += liburing
+    liblxc_dependencies += liburing
+
+    srcconf.set10('HAVE_LIBURING', true)
+else
+    srcconf.set10('HAVE_LIBURING', false)
+endif
+
+if not want_sd_bus.disabled()
+    has_sd_bus = true
+    sd_bus_optional = want_sd_bus.auto()
+
+    libsystemd = dependency('libsystemd', required: not sd_bus_optional)
+    if not libsystemd.found()
+        if not sd_bus_optional
+            error('missing required libsystemd dependency')
+        endif
+
+        has_sd_bus = false
+    endif
+
+    if not cc.has_header('systemd/sd-bus.h')
+        if not sd_bus_optional
+            error('libsystemd misses required systemd/sd-bus.h header')
+        endif
+
+        has_sd_bus = false
+    endif
+
+    if not cc.has_header('systemd/sd-event.h')
+        if not sd_bus_optional
+            error('libsystemd misses required systemd/sd-event.h header')
+        endif
+
+        has_sd_bus = false
+    endif
+
+    if not cc.has_function('sd_bus_call_method_async', prefix: '#include <systemd/sd-bus.h>', dependencies: libsystemd)
+        if not sd_bus_optional
+            error('libsystemd misses required sd_bus_call_method_async function')
+        endif
+
+        has_sd_bus = false
+    endif
+
+    if has_sd_bus
+        liblxc_dependencies += libsystemd
+        if want_oss_fuzz
+            oss_fuzz_dependencies += libsystemd
+        endif
+    endif
+
+    srcconf.set10('HAVE_LIBSYSTEMD', has_sd_bus)
+else
+    has_sd_bus = false
+    srcconf.set10('HAVE_LIBSYSTEMD', false)
+endif
+
+## Time EPOCH.
+sh = find_program('sh')
+date = find_program('date')
+git = find_program('git', required: false)
+time_epoch = run_command(sh, '-c', 'echo "$SOURCE_DATE_EPOCH"', check: true).stdout().strip()
+if time_epoch == '' and git.found() and run_command('test', '-e', '.git', check: false).returncode() == 0
+    # If we're in a git repository, use the creation time of the latest git tag.
+    latest_tag = run_command(git, 'describe', '--abbrev=0', '--tags', check: false).stdout().strip()
+    if latest_tag != ''
+      time_epoch = run_command(git, 'log', '--no-show-signature', '-1', '--format=%at', latest_tag, check: true).stdout().strip()
+    endif
+endif
+
+# Fallback to current epoch.
+if time_epoch == ''
+    time_epoch = run_command(date, '+%s', check: true).stdout().strip()
+endif
+generate_date = run_command(date, '--utc', '--date=@' + time_epoch, '+%Y-%m-%d', check: true).stdout().strip()
+
+## Manpages.
+docconf = configuration_data()
+docconf.set('builddir', '.')
+docconf.set('BINDIR', bindir)
+docconf.set('DATADIR', datadir)
+docconf.set('DOCDIR', docdir)
+docconf.set('LOGPATH', lxclogpath)
+docconf.set('LXC_DEFAULT_CONFIG', lxcdefaultconfig)
+docconf.set('LXC_GENERATE_DATE', generate_date)
+docconf.set('LXC_GLOBAL_CONF', lxcglobalconfig)
+docconf.set('LXCPATH', lxcpath)
+docconf.set('LXCTEMPLATEDIR', lxctemplatedir)
+docconf.set('LXC_USERNIC_CONF', lxc_user_network_conf)
+docconf.set('LXC_USERNIC_DB', lxc_user_network_db)
+docconf.set('PACKAGE_VERSION', version_data.get('LXC_VERSION'))
+docconf.set('docdtd', '"-//OASIS//DTD DocBook XML" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"')
+sgml2man = find_program('docbook2X2man', 'docbook2x-man', 'db2x_docbook2man', 'docbook2man', 'docbook-to-man', required: false, version: '>=0.8')
+if not sgml2man.found()
+    sgml2man = find_program('docbook2man', required: false, version: '<0.8')
+    if sgml2man.found()
+        docconf.set('docdtd', '"-//Davenport//DTD DocBook V3.0//EN"')
+    elif want_mans
+        error('missing required docbook2x or docbook-utils dependency')
+    endif
+endif
+
+## Threads.
+threads = dependency('threads')
+liblxc_dependencies += threads
+
+## Seccomp.
+if want_seccomp
+    libseccomp = dependency('libseccomp', required: false)
+    srcconf.set10('HAVE_SECCOMP', libseccomp.found())
+    pkgconfig_libs += libseccomp
+    liblxc_dependencies += libseccomp
+    if libseccomp.found()
+        if libseccomp.version().version_compare('>=2.5.0')
+            # https://github.com/seccomp/libseccomp/commit/dead12bc788b259b148cc4d93b970ef0bd602b1a
+            srcconf.set10('HAVE_DECL_SECCOMP_NOTIFY_FD', true)
+        else
+            srcconf.set10('HAVE_DECL_SECCOMP_NOTIFY_FD', false)
+        endif
+
+        if libseccomp.version().version_compare('>=2.0.0')
+            # https://github.com/seccomp/libseccomp/commit/6220c8c0fc479d97b6d3e3166a4e46fbfe25a3c0
+            srcconf.set10('HAVE_DECL_SECCOMP_SYSCALL_RESOLVE_NAME_ARCH', true)
+        else
+            srcconf.set10('HAVE_DECL_SECCOMP_SYSCALL_RESOLVE_NAME_ARCH', false)
+        endif
+
+        seccomp_headers = '''
+        #include <seccomp.h>
+        '''
+
+        foreach decl: 
+            'scmp_filter_ctx',
+            'struct seccomp_notif_sizes',
+            'struct clone_args',
+        
+
+            # We get -1 if the size cannot be determined
+            if cc.sizeof(decl, prefix: seccomp_headers, args: '-D_GNU_SOURCE', dependencies: libseccomp) > 0
+                srcconf.set10('HAVE_' + decl.underscorify().to_upper(), true)
+            else
+                srcconf.set10('HAVE_' + decl.underscorify().to_upper(), false)
+            endif
+        endforeach
+    endif
+else
+    srcconf.set10('HAVE_SECCOMP', false)
+endif
+
+## SELinux.
+if want_selinux
+    libselinux = dependency('libselinux', required: false)
+    srcconf.set10('HAVE_SELINUX', libselinux.found())
+    pkgconfig_libs += libselinux
+    liblxc_dependencies += libselinux
+else
+    srcconf.set10('HAVE_SELINUX', false)
+endif
+
+## AppArmor.
+if want_apparmor
+    libapparmor = dependency('libapparmor', required: false)
+    srcconf.set10('HAVE_APPARMOR', libapparmor.found())
+    # We do not use the AppArmor library at runtime, so it's not in our pkg-config.
+    liblxc_dependencies += libapparmor
+else
+    srcconf.set10('HAVE_APPARMOR', false)
+endif
+
+## OpenSSL.
+if want_openssl
+    libopenssl = dependency('openssl', required: false)
+    srcconf.set10('HAVE_OPENSSL', libopenssl.found())
+    pkgconfig_libs += libopenssl
+    liblxc_dependencies += libopenssl
+else
+    srcconf.set10('HAVE_OPENSSL', false)
+endif
+
+## Libcap..
+if want_capabilities
+    libcap = dependency('libcap', required: false)
+    if not libcap.found()
+        # Compat with Ubuntu 14.04 which ships libcap w/o .pc file
+        libcap = cc.find_library('cap', required: false)
+    else
+        have = cc.has_function('cap_get_file', dependencies: libcap, prefix: '#include <sys/capability.h>')
+        srcconf.set10('LIBCAP_SUPPORTS_FILE_CAPABILITIES', have)
+    endif
+    srcconf.set10('HAVE_LIBCAP', libcap.found())
+    pkgconfig_libs += libcap
+    liblxc_dependencies += libcap
+
+    libcap_static = dependency('libcap', required: false, static: true)
+    if not libcap_static.found()
+        # Compat with Ubuntu 14.04 which ships libcap w/o .pc file
+        libcap_static = cc.find_library('cap', required: false, static: true)
+    endif
+
+    code = '''
+int main(int argc, char *argv) { return 0; };
+'''
+    if libcap_static.found()
+        libcap_static_linkable = cc.links(code, args: '-static', dependencies: libcap_static)
+    else
+        libcap_static_linkable = false
+    endif
+    srcconf.set10('HAVE_STATIC_LIBCAP', libcap_static_linkable)
+else
+    libcap_static = 
+    libcap_static_linkable = false
+    srcconf.set10('HAVE_LIBCAP', false)
+    srcconf.set10('HAVE_STATIC_LIBCAP', false)
+endif
+
+libutil = cc.find_library('util', required: false)
+
+if want_oss_fuzz
+    srcconf.set10('FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION', true)
+    srcconf.set10('RUN_ON_OSS_FUZZ', true)
+    fuzzing_engine = meson.get_compiler('cpp').find_library('FuzzingEngine')
+endif
+
+srcconf.set10('ENFORCE_THREAD_SAFETY', want_thread_safety)
+srcconf.set10('ENFORCE_MEMFD_REXEC', want_memfd_rexec)
+
+## PAM.
+pam = cc.find_library('pam', has_headers: 'security/pam_modules.h', required: want_pam_cgroup)
+srcconf.set10('HAVE_PAM', pam.found())
+pkgconfig_libs += pam
+
+## Others.
+have = cc.has_function('fmemopen', prefix: '#include <stdio.h>', args: '-D_GNU_SOURCE')
+srcconf.set10('HAVE_FMEMOPEN', have)
+
+have = cc.has_function('openpty', dependencies: libutil, prefix: '#include <pty.h>')
+srcconf.set10('HAVE_OPENPTY', have)
+if have
+    liblxc_dependencies += libutil
+    if want_oss_fuzz
+        oss_fuzz_dependencies += libutil
+    endif
+endif
+
+have = cc.has_function('pthread_setcancelstate', prefix: '#include <pthread.h>')
+srcconf.set10('HAVE_PTHREAD_SETCANCELSTATE', have)
+
+have = cc.has_function('rand_r')
+srcconf.set10('HAVE_RAND_R', have)
+
+have = cc.has_function('strchrnul', prefix: '#include <string.h>', args: '-D_GNU_SOURCE')
+srcconf.set10('HAVE_STRCHRNUL', have)
+
+have_func_strerror_r = cc.has_function('strerror_r', prefix: '#include <string.h>', args: '-D_GNU_SOURCE')
+srcconf.set10('HAVE_STRERROR_R', have_func_strerror_r)
+
+have_func_strerror_r_char_p = false
+
+if have_func_strerror_r
+    code = '''
+#define _GNU_SOURCE
+#include <string.h>
+int func (void) {
+    char error_string256;
+    char *ptr = strerror_r (-2, error_string, 256);
+    char c = *strerror_r (-2, error_string, 256);
+    return c != 0 && ptr != (void*) 0L;
+}
+'''
+
+have_func_strerror_r_char_p = cc.compiles(code, name : 'strerror_r() returns char *')
+endif
+
+srcconf.set10('STRERROR_R_CHAR_P', have_func_strerror_r_char_p)
+
+## Compiler attributes.
+foreach ccattr: 
+    'fallthrough',
+    'nonnull',
+    'returns_nonnull',
+
+
+    srcconf.set10('HAVE_COMPILER_ATTR_' + ccattr.underscorify().to_upper(), cc.has_function_attribute(ccattr))
+endforeach
+
+## Syscalls.
+found_syscalls = 
+missing_syscalls = 
+foreach tuple: 
+    'bpf',
+    'close_range',
+    'endmntent',
+    'execveat',
+    'faccessat',
+    'strchrnul',
+    'strerror_r',
+    'fgetln',
+    'fsconfig',
+    'fsmount',
+    'fsopen',
+    'fspick',
+    'getgrgid_r',
+    'getline',
+    'getsubopt',
+    'gettid',
+    'hasmntopt',
+    'kcmp',
+    'keyctl',
+    'memfd_create',
+    'mount_setattr',
+    'move_mount',
+    'openat2',
+    'open_tree',
+    'personality',
+    'pidfd_open',
+    'pidfd_send_signal',
+    'pivot_root',
+    'prlimit',
+    'prlimit64',
+    'renameat2',
+    'sethostname',
+    'setmntent',
+    'setns',
+    'sigdescr_np',
+    'signalfd',
+    'statx',
+    'statvfs',
+    'strlcat',
+    'strlcpy',
+    'unshare',
+
+
+    if tuple.length() >= 2
+        cond = tuple1
+    else
+        ident1 = 'HAVE_' + tuple0.underscorify().to_upper()
+        ident2 = 'ENABLE_' + tuple0.underscorify().to_upper()
+        cond = srcconf.get(ident1, 0) == 1 or srcconf.get(ident2, 0) == 1
+    endif
+
+    if cond
+        found_syscalls += tuple0
+    else
+        missing_syscalls += tuple0
+    endif
+endforeach
+
+## Types.
+decl_headers = '''
+#include <uchar.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <linux/if_link.h>
+#include <linux/types.h>
+'''
+
+foreach decl: 
+    '__aligned_u64',
+    'struct clone_args',
+    'struct open_how',
+    'struct rtnl_link_stats64',
+
+
+    # We get -1 if the size cannot be determined
+    if cc.sizeof(decl, prefix: decl_headers, args: '-D_GNU_SOURCE', dependencies: liblxc_dependencies) > 0
+        srcconf.set10('HAVE_' + decl.underscorify().to_upper(), true)
+    else
+        srcconf.set10('HAVE_' + decl.underscorify().to_upper(), false)
+    endif
+endforeach
+
+found_types = 
+missing_types = 
+foreach tuple: 
+    'scmp_filter_ctx',
+    'struct seccomp_notif_sizes',
+    'struct clone_args',
+    '__aligned_u64',
+    'struct open_how',
+    'struct rtnl_link_stats64',
+
+
+    if tuple.length() >= 2
+        cond = tuple1
+    else
+        ident1 = 'HAVE_' + tuple0.underscorify().to_upper()
+        ident2 = 'ENABLE_' + tuple0.underscorify().to_upper()
+        cond = srcconf.get(ident1, 0) == 1 or srcconf.get(ident2, 0) == 1
+    endif
+
+    if cond
+        found_types += tuple0
+    else
+        missing_types += tuple0
+    endif
+endforeach
+
+decl_headers = '''
+#include <sys/mount.h>
+'''
+
+# We get -1 if the size cannot be determined
+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0
+    srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true)
+    found_types += 'struct mount_attr (sys/mount.h)'
+else
+    srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false)
+    missing_types += 'struct mount_attr (sys/mount.h)' endif
+
+## Check if sys/mount.h defines the fsconfig commands
+if cc.get_define('FSCONFIG_SET_FLAG', prefix: decl_headers) != ''
+    srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), true)
+    found_types += 'FSCONFIG_SET_FLAG (sys/mount.h)'
+else
+    srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), false)
+    missing_types += 'FSCONFIG_SET_FLAG (sys/mount.h)'
+endif
+
+if cc.get_define('FS_CONFIG_SET_STRING', prefix: decl_headers) != ''
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_STRING (sys/mount.h)'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_STRING (sys/mount.h)'
+endif
+
+if cc.get_define('FS_CONFIG_SET_BINARY', prefix: decl_headers) != ''
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_BINARY (sys/mount.h)'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_BINARY (sys/mount.h)'
+endif
+
+if cc.get_define('FS_CONFIG_SET_PATH_EMPTY', prefix: decl_headers) != ''
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_PATH_EMPTY (sys/mount.h)'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_PATH_EMPTY (sys/mount.h)'
+endif
+
+if cc.get_define('FS_CONFIG_SET_PATH_FD', prefix: decl_headers) != ''
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_PATH_FD (sys/mount.h)'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_PATH_FD (sys/mount.h)'
+endif
+
+if cc.get_define('FS_CONFIG_SET_CMD_CREATE', prefix: decl_headers) != ''
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_CMD_CREAT (sys/mount.h)'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_CMD_CREATE (sys/mount.h)'
+endif
+
+if cc.get_define('FS_CONFIG_SET_CMD_RECONFIGURE', prefix: decl_headers) != ''
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_CMD_RECONFIGURE (sys/mount.h)'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_CMD_RECONFIGURE (sys/mount.h)'
+endif
+
+## Headers.
+foreach ident: 
+    'bpf',               '''#include <sys/syscall.h>
+                             #include <unistd.h>''',
+    'close_range',       '''#include <unistd.h>''',
+    'execveat',          '''#include <unistd.h>''',
+    'endmntent',         '''#include <stdio.h>
+                             #include <mntent.h>''',
+    'faccessat',         '''#include <fcntl.h>
+                             #include <unistd.h>''',
+    'fexecve',           '''#include <unistd.h>''',
+    'fgetln',            '''#include <stdio.h>''',
+    'fsconfig',          '''#include <sys/mount.h>''',
+    'fsmount',           '''#include <sys/mount.h>''',
+    'fsopen',            '''#include <sys/mount.h>''',
+    'fspick',            '''#include <sys/mount.h>''',
+    'getgrgid_r',        '''#include <sys/types.h>
+                             #include <grp.h>''',
+    'getline',           '''#include <stdio.h>''',
+    'getsubopt',         '''#include <stdlib.h>''',
+    'gettid',            '''#include <sys/types.h>
+                             #include <unistd.h>''',
+    'hasmntopt',         '''#include <stdio.h>
+                             #include <mntent.h>''',
+    'kcmp',              '''#include <linux/kcmp.h>''',
+    'keyctl',            '''#include <sys/types.h>
+                             #include <keyutils.h>''',
+    'memfd_create',      '''#include <sys/mman.h>''',
+    'mount_setattr',     '''#include <sys/mount.h>''',
+    'move_mount',        '''#include <sys/mount.h>''',
+    'openat2',           '''#include <sys/types.h>
+                             #include <sys/stat.h>
+                             #include <fctnl.h>''',
+    'open_tree',         '''#include <sys/mount.h>''',
+    'personality',       '''#include <sys/personality.h>''',
+    'pidfd_open',        '''#include <stdlib.h>
+                             #include <unistd.h>
+                             #include <signal.h>
+                             #include <sys/wait.h>''',
+    'pidfd_send_signal', '''#include <stdlib.h>
+                             #include <unistd.h>
+                             #include <signal.h>
+                             #include <sys/wait.h>''',
+    'pivot_root',        '''#include <stdlib.h>
+                             #include <unistd.h>''',     # no known header declares pivot_root
+    'prlimit',           '''#include <sys/time.h>
+                             #include <sys/resource.h>''',
+    'prlimit64',         '''#include <sys/time.h>
+                             #include <sys/resource.h>''',
+    'renameat2',         '''#include <stdio.h>
+                             #include <fcntl.h>''',
+    'sethostname',       '''#include <unistd.h>''',
+    'setmntent',         '''#include <stdio.h>
+                             #include <mntent.h>''',
+    'setns',             '''#include <sched.h>''',
+    'sigdescr_np',       '''#include <string.h>''',
+    'signalfd',          '''#include <sys/signalfd.h>''',
+    'statvfs',           '''#include <sys/statvfs.h>''',
+    'statx',             '''#include <sys/types.h>
+                             #include <sys/stat.h>
+                             #include <unistd.h>''',
+    'strchrnul',         '''#include <string.h>''',
+    'strlcat',           '''#include <string.h>''',
+    'strlcpy',           '''#include <string.h>''',
+    'unshare',           '''#include <sched.h>''',
+
+
+    have = cc.has_function(ident0, prefix: ident1, args: '-D_GNU_SOURCE')
+    srcconf.set10('HAVE_' + ident0.to_upper(), have)
+endforeach
+
+found_headers = 
+missing_headers = 
+foreach tuple: 
+    'systemd/sd-bus.h',
+    'systemd/sd-event.h',
+    'sys/resource.h',
+    'sys/memfd.h',
+    'sys/personality.h',
+    'sys/pidfd.h',
+    'sys/signalfd.h',
+    'sys/timerfd.h',
+    'pty.h',
+    'utmpx.h',
+
+    srcconf.set10('HAVE_' + tuple0.underscorify().to_upper(), cc.has_header(tuple0))
+
+    if tuple.length() >= 2
+        cond = tuple1
+    else
+        ident1 = 'HAVE_' + tuple0.underscorify().to_upper()
+        ident2 = 'ENABLE_' + tuple0.underscorify().to_upper()
+        cond = srcconf.get(ident1, 0) == 1 or srcconf.get(ident2, 0) == 1
+    endif
+
+    if cond
+        found_headers += tuple0
+    else
+        missing_headers += tuple0
+    endif
+endforeach
+
+## Deps.
+found_deps = 
+missing_deps = 
+foreach tuple: 
+    'AppArmor',
+    'SECCOMP',
+    'SELinux',
+    'libcap',
+    'static libcap',
+    'pam',
+    'openssl',
+    'liburing',
+    'libsystemd',
+
+
+    if tuple.length() >= 2
+        cond = tuple1
+    else
+        ident1 = 'HAVE_' + tuple0.underscorify().to_upper()
+        ident2 = 'ENABLE_' + tuple0.underscorify().to_upper()
+        cond = srcconf.get(ident1, 0) == 1 or srcconf.get(ident2, 0) == 1
+    endif
+
+    if cond
+        found_deps += tuple0
+    else
+        missing_deps += tuple0
+    endif
+endforeach
+
+# Generate config.h
+config_h = configure_file(
+        output: 'config.h',
+        configuration: srcconf)
+
+add_project_arguments('-include', 'config.h', language: 'c')
+
+# Binaries.
+cmd_programs = 
+hook_programs = 
+public_programs = 
+template_scripts = 
+test_programs = 
+
+# Includes.
+liblxc_includes = include_directories(
+    '.',
+    'src',
+    'src/include',
+    'src/lxc',
+    'src/lxc/cgroups',
+    'src/lxc/storage')
+
+# Our static sub-project binaries don't (and in fact can't) link to our
+# dependencies directly, but need access to the headers when compiling (most
+# notably seccomp headers).
+liblxc_dependency_headers = 
+foreach dep: liblxc_dependencies
+    liblxc_dependency_headers += dep.partial_dependency(compile_args: true)
+endforeach
+
+# Early sub-directories.
+subdir('src/include')
+subdir('src/lxc')
+subdir('src/lxc/pam')
+
+liblxc_link_whole = liblxc_static
+
+liblxc = shared_library(
+    'lxc',
+    version: liblxc_version,
+    include_directories: liblxc_includes,
+    link_args: '-DPIC',
+    c_args: '-DPIC',
+    link_whole: liblxc_link_whole,
+    dependencies: liblxc_dependencies,
+    install: true)
+
+liblxc_dep = declare_dependency(
+    link_with: liblxc,
+    dependencies: liblxc_dependencies)
+
+# Rest of sub-directories.
+if want_apparmor
+    subdir('config/apparmor')
+    subdir('config/apparmor/abstractions')
+    subdir('config/apparmor/profiles')
+endif
+subdir('config/bash')
+subdir('config/etc')
+subdir('config/init/common')
+subdir('config/init/systemd')
+subdir('config/init/sysvinit')
+subdir('config/init/upstart')
+if want_selinux
+    subdir('config/selinux')
+endif
+subdir('config/sysconfig')
+subdir('config/templates')
+subdir('config/templates/common.conf.d')
+subdir('config/yum')
+subdir('doc')
+subdir('doc/ja')
+subdir('doc/ko')
+subdir('doc/examples')
+subdir('doc/rootfs')
+subdir('hooks')
+if want_commands
+    subdir('src/lxc/cmd')
+endif
+if want_tools
+    subdir('src/lxc/tools')
+endif
+subdir('src/lxc/tools/include')
+subdir('src/tests')
+subdir('templates')
+
+# Pkg-config.
+pkg_config_file = pkgconfig.generate(liblxc,
+    description: 'linux container tools',
+    version: version_data.get('LXC_VERSION'),
+    url: 'http://linuxcontainers.org',
+    libraries: '-lutil -lpthread -ldl',
+    libraries_private: pkgconfig_libs,
+)
+
+# Empty dirs.
+install_emptydir(join_paths(localstatedir, 'cache', 'lxc'))
+install_emptydir(join_paths(localstatedir, 'lib', 'lxc'))
+
+# RPM spec file.
+specconf = configuration_data()
+specconf.set('LXC_VERSION_BASE', meson.project_version())
+specconf.set('LXC_VERSION_BETA', version_data.get('LXC_VERSION_BETA'))
+specconf.set('PACKAGE', meson.project_name())
+specconf.set('LXC_DISTRO_SYSCONF', conf.get('LXC_DISTRO_SYSCONF'))
+
+configure_file(
+    configuration: specconf,
+    input: 'lxc.spec.in',
+    output: 'lxc.spec',
+    install: false)
+
+# Build overview.
+status = 
+    '@0@ @1@'.format(meson.project_name(), meson.project_version()),
+
+    'Meson version:			@0@'.format(meson.version()),
+
+    'prefix directory:		@0@'.format(prefixdir),
+    'bin directory:			@0@'.format(bindir),
+    'data directory:		@0@'.format(datadir),
+    'doc directory:			@0@'.format(docdir),
+    'include directory:		@0@'.format(includedir),
+    'lib directory:			@0@'.format(libdir),
+    'libexec directory:		@0@'.format(libexecdir),
+    'local state directory:		@0@'.format(localstatedir),
+    'sbin directory:		@0@'.format(sbindir),
+    'sysconf directory:		@0@'.format(sysconfdir),
+
+    'lxc cgroup pattern:		@0@'.format(cgrouppattern),
+    'lxc init directory:		@0@'.format(libexecdir),
+    'runtime path:			@0@'.format(runtimepath),
+
+    'lxc default config:		@0@'.format(lxcdefaultconfig),
+    'lxc global config:		@0@'.format(lxcglobalconfig),
+    'lxc hook directory:		@0@'.format(lxchookdir),
+    'lxc hook bin directory:	@0@'.format(lxchookbindir),
+    'lxc rootfs mount directory:	@0@'.format(lxcrootfsmount),
+    'log path:			@0@'.format(lxclogpath),
+    'lxc path:			@0@'.format(lxcpath),
+    'lxc template config:		@0@'.format(lxctemplateconfdir),
+    'lxc template directory:	@0@'.format(lxctemplatedir),
+    'lxc user network config:	@0@'.format(lxc_user_network_conf),
+    'lxc user network database:	@0@'.format(lxc_user_network_db)
+
+alt_time_epoch = run_command('date', '-Is', '-u', '-d',
+                             '@@0@'.format(time_epoch), check: true).stdout().strip()
+status += 
+    'time epoch:			@0@ (@1@)'.format(time_epoch, alt_time_epoch)
+
+status += 
+    '',
+    'supported dependencies:	@0@'.format(', '.join(found_deps)),
+    '',
+    'unsupported dependencies:	@0@'.format(', '.join(missing_deps)),
+    ''
+
+status += 
+    '',
+    'supported headers:	@0@'.format(', '.join(found_headers)),
+    '',
+    'unsupported headers:	@0@'.format(', '.join(missing_headers)),
+    ''
+
+status += 
+    '',
+    'supported calls:	@0@'.format(', '.join(found_syscalls)),
+    '',
+    'unsupported calls:	@0@'.format(', '.join(missing_syscalls)),
+    ''
+
+status += 
+    '',
+    'supported types:	@0@'.format(', '.join(found_types)),
+    '',
+    'unsupported types:	@0@'.format(', '.join(missing_types)),
+    ''
+
+message('\n     '.join(status))

_service:tar_scm:lxc-5.0.2.tar.gz/meson_options.txt Added

@@ -0,0 +1,122 @@
+# -*- mode: meson -*-
+
+# Main options
+# was --cgroup-pattern in autotools
+option('cgroup-pattern', type: 'string', value: '',
+       description: 'CGroup pattern')
+
+# was --coverity-build in autotools
+option('coverity-build', type: 'boolean', value: 'true',
+       description: 'build for coverity')
+
+# was --{disable,enable}-examples in autotools
+option('examples', type: 'boolean', value: 'true',
+       description: 'build and install examples')
+
+# was --init-script in autotools
+option('init-script', type : 'array',
+       choices : 'systemd', 'sysvinit', 'upstart', value : 'systemd',
+       description : 'init script')
+
+# was --systemd-unidir in autotools
+# If set to "", the value is taken from the running systemd instance.
+option('systemd-unitdir', type : 'string', value: '',
+       description : 'systemd system unit directory')
+
+# was --{disable,enable}-liburing in autotools
+option('io-uring-event-loop', type: 'boolean', value: 'false',
+       description: 'Enable io-uring based event loop')
+
+option('sd-bus', type: 'feature', value: 'auto',
+       description: 'Enable linking against sd-bus')
+
+# was --{disable,enable}-doc in autotools
+option('man', type: 'boolean', value: 'true',
+       description: 'build and install manpages')
+
+# was --{disable,enable}-pam in autotools
+option('pam-cgroup', type: 'boolean', value: 'false',
+       description: 'build and install the pam cgroup module')
+
+# was --{disable,enable}-tools in autotools
+option('tools', type: 'boolean', value: 'true',
+       description: 'build and install tools')
+
+# was --{disable,enable}-commands in autotools
+option('commands', type: 'boolean', value: 'true',
+       description: 'build and install commands')
+
+# was --{disable,enable}-capabilities in autotools
+option('capabilities', type: 'boolean', value: 'true',
+       description: 'use capabilities')
+
+# was --{disable,enable}-seccomp in autotools
+option('seccomp', type: 'boolean', value: 'true',
+       description: 'use seccomp')
+
+# was --{disable,enable}-apparmor in autotools
+option('apparmor', type: 'boolean', value: 'true',
+       description: 'use apparmor')
+
+# was --{disable,enable}-openssl in autotools
+option('openssl', type: 'boolean', value: 'true',
+       description: 'use openssl')
+
+# was --{disable,enable}-selinux in autotools
+option('selinux', type: 'boolean', value: 'true',
+       description: 'use selinux')
+
+# was --{disable,enable}-tests in autotools
+option('tests', type: 'boolean', value: 'false',
+       description: 'build and install tests')
+
+# Paths
+# was --apparmor-cache-dir in autotools
+option('apparmor-cache-path', type: 'string', value: 'cache/lxc/apparmor',
+       description: 'AppArmor cache directory')
+
+# was --with-config-path in autotools
+option('data-path', type: 'string', value: 'lib/lxc',
+       description: 'Container storage directory')
+
+# was --with-doc-dir in autotools
+option('doc-path', type: 'string', value: 'doc/lxc',
+       description: 'Documentation directory')
+
+# was --with-global-conf in autotools
+option('global-config-path', type: 'string', value: 'lxc',
+       description: 'Global configuration directory')
+
+# was --log-path in autotools
+option('log-path', type: 'string', value: 'log/lxc',
+       description: 'Loging directory')
+
+# was --with-rootfs-path in autotools
+option('rootfs-mount-path', type: 'string', value: 'lxc/rootfs',
+       description: 'Container rootfs mount directory')
+
+# was --with-runtime-path in autotools
+option('runtime-path', type: 'string', value: '/run',
+       description: 'Main runtime directory')
+
+# was --with-usernic-conf in autotools
+option('usernet-config-path', type: 'string', value: 'lxc/lxc-usernet',
+       description: 'User network configuration file path')
+
+# was --with-usernic-db in autotools
+option('usernet-db-path', type: 'string', value: 'lxc/nics',
+       description: 'User network database file path')
+
+option('oss-fuzz', type : 'boolean', value : 'false',
+       description : 'build against oss-fuzz')
+
+# was --{disable,enable}-thread-safety in autotools
+option('thread-safety', type : 'boolean', value : 'true',
+       description : 'whether the build fails when thread-safe logging cannot be guaranteed')
+
+# was --{disable,enable}-memfd-rexec in autotools
+option('memfd-rexec', type : 'boolean', value : 'true',
+       description : 'whether to rexec the lxc-attach binary when attaching to a container')
+
+option('distrosysconfdir', type : 'string', value: '',
+       description: 'relative path to sysconfdir for distro default configuration')

_service:tar_scm:lxc-5.0.2.tar.gz/src/include/bpf.h Added

@@ -0,0 +1,5154 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+#ifndef _UAPI__LINUX_BPF_H__
+#define _UAPI__LINUX_BPF_H__
+
+#include <linux/types.h>
+#include "bpf_common.h"
+
+/* Extended instruction set based on top of classic BPF */
+
+/* instruction classes */
+#define BPF_JMP32	0x06	/* jmp mode in word width */
+#define BPF_ALU64	0x07	/* alu mode in double word width */
+
+/* ld/ldx fields */
+#define BPF_DW		0x18	/* double word (64-bit) */
+#define BPF_XADD	0xc0	/* exclusive add */
+
+/* alu/jmp fields */
+#define BPF_MOV		0xb0	/* mov reg to reg */
+#define BPF_ARSH	0xc0	/* sign extending arithmetic shift right */
+
+/* change endianness of a register */
+#define BPF_END		0xd0	/* flags for endianness conversion: */
+#define BPF_TO_LE	0x00	/* convert to little-endian */
+#define BPF_TO_BE	0x08	/* convert to big-endian */
+#define BPF_FROM_LE	BPF_TO_LE
+#define BPF_FROM_BE	BPF_TO_BE
+
+/* jmp encodings */
+#define BPF_JNE		0x50	/* jump != */
+#define BPF_JLT		0xa0	/* LT is unsigned, '<' */
+#define BPF_JLE		0xb0	/* LE is unsigned, '<=' */
+#define BPF_JSGT	0x60	/* SGT is signed '>', GT in x86 */
+#define BPF_JSGE	0x70	/* SGE is signed '>=', GE in x86 */
+#define BPF_JSLT	0xc0	/* SLT is signed, '<' */
+#define BPF_JSLE	0xd0	/* SLE is signed, '<=' */
+#define BPF_CALL	0x80	/* function call */
+#define BPF_EXIT	0x90	/* function return */
+
+/* Register numbers */
+enum {
+	BPF_REG_0 = 0,
+	BPF_REG_1,
+	BPF_REG_2,
+	BPF_REG_3,
+	BPF_REG_4,
+	BPF_REG_5,
+	BPF_REG_6,
+	BPF_REG_7,
+	BPF_REG_8,
+	BPF_REG_9,
+	BPF_REG_10,
+	__MAX_BPF_REG,
+};
+
+/* BPF has 10 general purpose 64-bit registers and stack frame. */
+#define MAX_BPF_REG	__MAX_BPF_REG
+
+struct bpf_insn {
+	__u8	code;		/* opcode */
+	__u8	dst_reg:4;	/* dest register */
+	__u8	src_reg:4;	/* source register */
+	__s16	off;		/* signed offset */
+	__s32	imm;		/* signed immediate constant */
+};
+
+/* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */
+struct bpf_lpm_trie_key {
+	__u32	prefixlen;	/* up to 32 for AF_INET, 128 for AF_INET6 */
+	__u8	data0;	/* Arbitrary size */
+};
+
+struct bpf_cgroup_storage_key {
+	__u64	cgroup_inode_id;	/* cgroup inode id */
+	__u32	attach_type;		/* program attach type */
+};
+
+union bpf_iter_link_info {
+	struct {
+		__u32	map_fd;
+	} map;
+};
+
+/* BPF syscall commands, see bpf(2) man-page for details. */
+enum bpf_cmd {
+	BPF_MAP_CREATE,
+	BPF_MAP_LOOKUP_ELEM,
+	BPF_MAP_UPDATE_ELEM,
+	BPF_MAP_DELETE_ELEM,
+	BPF_MAP_GET_NEXT_KEY,
+	BPF_PROG_LOAD,
+	BPF_OBJ_PIN,
+	BPF_OBJ_GET,
+	BPF_PROG_ATTACH,
+	BPF_PROG_DETACH,
+	BPF_PROG_TEST_RUN,
+	BPF_PROG_GET_NEXT_ID,
+	BPF_MAP_GET_NEXT_ID,
+	BPF_PROG_GET_FD_BY_ID,
+	BPF_MAP_GET_FD_BY_ID,
+	BPF_OBJ_GET_INFO_BY_FD,
+	BPF_PROG_QUERY,
+	BPF_RAW_TRACEPOINT_OPEN,
+	BPF_BTF_LOAD,
+	BPF_BTF_GET_FD_BY_ID,
+	BPF_TASK_FD_QUERY,
+	BPF_MAP_LOOKUP_AND_DELETE_ELEM,
+	BPF_MAP_FREEZE,
+	BPF_BTF_GET_NEXT_ID,
+	BPF_MAP_LOOKUP_BATCH,
+	BPF_MAP_LOOKUP_AND_DELETE_BATCH,
+	BPF_MAP_UPDATE_BATCH,
+	BPF_MAP_DELETE_BATCH,
+	BPF_LINK_CREATE,
+	BPF_LINK_UPDATE,
+	BPF_LINK_GET_FD_BY_ID,
+	BPF_LINK_GET_NEXT_ID,
+	BPF_ENABLE_STATS,
+	BPF_ITER_CREATE,
+	BPF_LINK_DETACH,
+	BPF_PROG_BIND_MAP,
+};
+
+enum bpf_map_type {
+	BPF_MAP_TYPE_UNSPEC,
+	BPF_MAP_TYPE_HASH,
+	BPF_MAP_TYPE_ARRAY,
+	BPF_MAP_TYPE_PROG_ARRAY,
+	BPF_MAP_TYPE_PERF_EVENT_ARRAY,
+	BPF_MAP_TYPE_PERCPU_HASH,
+	BPF_MAP_TYPE_PERCPU_ARRAY,
+	BPF_MAP_TYPE_STACK_TRACE,
+	BPF_MAP_TYPE_CGROUP_ARRAY,
+	BPF_MAP_TYPE_LRU_HASH,
+	BPF_MAP_TYPE_LRU_PERCPU_HASH,
+	BPF_MAP_TYPE_LPM_TRIE,
+	BPF_MAP_TYPE_ARRAY_OF_MAPS,
+	BPF_MAP_TYPE_HASH_OF_MAPS,
+	BPF_MAP_TYPE_DEVMAP,
+	BPF_MAP_TYPE_SOCKMAP,
+	BPF_MAP_TYPE_CPUMAP,
+	BPF_MAP_TYPE_XSKMAP,
+	BPF_MAP_TYPE_SOCKHASH,
+	BPF_MAP_TYPE_CGROUP_STORAGE,
+	BPF_MAP_TYPE_REUSEPORT_SOCKARRAY,
+	BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE,
+	BPF_MAP_TYPE_QUEUE,
+	BPF_MAP_TYPE_STACK,
+	BPF_MAP_TYPE_SK_STORAGE,
+	BPF_MAP_TYPE_DEVMAP_HASH,
+	BPF_MAP_TYPE_STRUCT_OPS,
+	BPF_MAP_TYPE_RINGBUF,
+	BPF_MAP_TYPE_INODE_STORAGE,
+	BPF_MAP_TYPE_TASK_STORAGE,
+};
+
+/* Note that tracing related programs such as
+ * BPF_PROG_TYPE_{KPROBE,TRACEPOINT,PERF_EVENT,RAW_TRACEPOINT}
+ * are not subject to a stable API since kernel internal data
+ * structures can change from release to release and may
+ * therefore break existing tracing BPF programs. Tracing BPF
+ * programs correspond to /a/ specific kernel which is to be
+ * analyzed, and not /a/ specific kernel /and/ all future ones.
+ */
+enum bpf_prog_type {
+	BPF_PROG_TYPE_UNSPEC,
+	BPF_PROG_TYPE_SOCKET_FILTER,
+	BPF_PROG_TYPE_KPROBE,
+	BPF_PROG_TYPE_SCHED_CLS,
+	BPF_PROG_TYPE_SCHED_ACT,
+	BPF_PROG_TYPE_TRACEPOINT,
+	BPF_PROG_TYPE_XDP,
+	BPF_PROG_TYPE_PERF_EVENT,
+	BPF_PROG_TYPE_CGROUP_SKB,
+	BPF_PROG_TYPE_CGROUP_SOCK,
+	BPF_PROG_TYPE_LWT_IN,
+	BPF_PROG_TYPE_LWT_OUT,
+	BPF_PROG_TYPE_LWT_XMIT,
+	BPF_PROG_TYPE_SOCK_OPS,
+	BPF_PROG_TYPE_SK_SKB,
+	BPF_PROG_TYPE_CGROUP_DEVICE,
+	BPF_PROG_TYPE_SK_MSG,
+	BPF_PROG_TYPE_RAW_TRACEPOINT,
+	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
+	BPF_PROG_TYPE_LWT_SEG6LOCAL,
+	BPF_PROG_TYPE_LIRC_MODE2,
+	BPF_PROG_TYPE_SK_REUSEPORT,
+	BPF_PROG_TYPE_FLOW_DISSECTOR,
+	BPF_PROG_TYPE_CGROUP_SYSCTL,
+	BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE,
+	BPF_PROG_TYPE_CGROUP_SOCKOPT,
+	BPF_PROG_TYPE_TRACING,
+	BPF_PROG_TYPE_STRUCT_OPS,
+	BPF_PROG_TYPE_EXT,
+	BPF_PROG_TYPE_LSM,
+	BPF_PROG_TYPE_SK_LOOKUP,
+};
+
+enum bpf_attach_type {
+	BPF_CGROUP_INET_INGRESS,
+	BPF_CGROUP_INET_EGRESS,
+	BPF_CGROUP_INET_SOCK_CREATE,
+	BPF_CGROUP_SOCK_OPS,
+	BPF_SK_SKB_STREAM_PARSER,
+	BPF_SK_SKB_STREAM_VERDICT,
+	BPF_CGROUP_DEVICE,
+	BPF_SK_MSG_VERDICT,
+	BPF_CGROUP_INET4_BIND,
+	BPF_CGROUP_INET6_BIND,
+	BPF_CGROUP_INET4_CONNECT,
+	BPF_CGROUP_INET6_CONNECT,
+	BPF_CGROUP_INET4_POST_BIND,
+	BPF_CGROUP_INET6_POST_BIND,
+	BPF_CGROUP_UDP4_SENDMSG,
+	BPF_CGROUP_UDP6_SENDMSG,
+	BPF_LIRC_MODE2,
+	BPF_FLOW_DISSECTOR,
+	BPF_CGROUP_SYSCTL,
+	BPF_CGROUP_UDP4_RECVMSG,
+	BPF_CGROUP_UDP6_RECVMSG,
+	BPF_CGROUP_GETSOCKOPT,
+	BPF_CGROUP_SETSOCKOPT,
+	BPF_TRACE_RAW_TP,
+	BPF_TRACE_FENTRY,
+	BPF_TRACE_FEXIT,
+	BPF_MODIFY_RETURN,
+	BPF_LSM_MAC,
+	BPF_TRACE_ITER,
+	BPF_CGROUP_INET4_GETPEERNAME,
+	BPF_CGROUP_INET6_GETPEERNAME,
+	BPF_CGROUP_INET4_GETSOCKNAME,
+	BPF_CGROUP_INET6_GETSOCKNAME,
+	BPF_XDP_DEVMAP,
+	BPF_CGROUP_INET_SOCK_RELEASE,
+	BPF_XDP_CPUMAP,
+	BPF_SK_LOOKUP,
+	BPF_XDP,
+	__MAX_BPF_ATTACH_TYPE
+};
+
+#define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE
+
+enum bpf_link_type {
+	BPF_LINK_TYPE_UNSPEC = 0,
+	BPF_LINK_TYPE_RAW_TRACEPOINT = 1,
+	BPF_LINK_TYPE_TRACING = 2,
+	BPF_LINK_TYPE_CGROUP = 3,
+	BPF_LINK_TYPE_ITER = 4,
+	BPF_LINK_TYPE_NETNS = 5,
+	BPF_LINK_TYPE_XDP = 6,
+
+	MAX_BPF_LINK_TYPE,
+};
+
+/* cgroup-bpf attach flags used in BPF_PROG_ATTACH command
+ *
+ * NONE(default): No further bpf programs allowed in the subtree.
+ *
+ * BPF_F_ALLOW_OVERRIDE: If a sub-cgroup installs some bpf program,
+ * the program in this cgroup yields to sub-cgroup program.
+ *
+ * BPF_F_ALLOW_MULTI: If a sub-cgroup installs some bpf program,
+ * that cgroup program gets run in addition to the program in this cgroup.
+ *
+ * Only one program is allowed to be attached to a cgroup with
+ * NONE or BPF_F_ALLOW_OVERRIDE flag.
+ * Attaching another program on top of NONE or BPF_F_ALLOW_OVERRIDE will
+ * release old program and attach the new one. Attach flags has to match.
+ *
+ * Multiple programs are allowed to be attached to a cgroup with
+ * BPF_F_ALLOW_MULTI flag. They are executed in FIFO order
+ * (those that were attached first, run first)
+ * The programs of sub-cgroup are executed first, then programs of
+ * this cgroup and then programs of parent cgroup.
+ * When children program makes decision (like picking TCP CA or sock bind)
+ * parent program has a chance to override it.
+ *
+ * With BPF_F_ALLOW_MULTI a new program is added to the end of the list of
+ * programs for a cgroup. Though it's possible to replace an old program at
+ * any position by also specifying BPF_F_REPLACE flag and position itself in
+ * replace_bpf_fd attribute. Old program at this position will be released.
+ *
+ * A cgroup with MULTI or OVERRIDE flag allows any attach flags in sub-cgroups.
+ * A cgroup with NONE doesn't allow any programs in sub-cgroups.
+ * Ex1:
+ * cgrp1 (MULTI progs A, B) ->
+ *    cgrp2 (OVERRIDE prog C) ->
+ *      cgrp3 (MULTI prog D) ->
+ *        cgrp4 (OVERRIDE prog E) ->
+ *          cgrp5 (NONE prog F)
+ * the event in cgrp5 triggers execution of F,D,A,B in that order.
+ * if prog F is detached, the execution is E,D,A,B
+ * if prog F and D are detached, the execution is E,A,B
+ * if prog F, E and D are detached, the execution is C,A,B
+ *
+ * All eligible programs are executed regardless of return code from
+ * earlier programs.
+ */
+#define BPF_F_ALLOW_OVERRIDE	(1U << 0)
+#define BPF_F_ALLOW_MULTI	(1U << 1)
+#define BPF_F_REPLACE		(1U << 2)
+
+/* If BPF_F_STRICT_ALIGNMENT is used in BPF_PROG_LOAD command, the
+ * verifier will perform strict alignment checking as if the kernel
+ * has been built with CONFIG_EFFICIENT_UNALIGNED_ACCESS not set,
+ * and NET_IP_ALIGN defined to 2.
+ */
+#define BPF_F_STRICT_ALIGNMENT	(1U << 0)
+
+/* If BPF_F_ANY_ALIGNMENT is used in BPF_PROF_LOAD command, the
+ * verifier will allow any alignment whatsoever.  On platforms
+ * with strict alignment requirements for loads ands stores (such
+ * as sparc and mips) the verifier validates that all loads and
+ * stores provably follow this requirement.  This flag turns that
+ * checking and enforcement off.
+ *
+ * It is mostly used for testing when we want to validate the
+ * context and memory access aspects of the verifier, but because
+ * of an unaligned access the alignment check would trigger before
+ * the one we are interested in.
+ */
+#define BPF_F_ANY_ALIGNMENT	(1U << 1)
+
+/* BPF_F_TEST_RND_HI32 is used in BPF_PROG_LOAD command for testing purpose.
+ * Verifier does sub-register def/use analysis and identifies instructions whose
+ * def only matters for low 32-bit, high 32-bit is never referenced later
+ * through implicit zero extension. Therefore verifier notifies JIT back-ends
+ * that it is safe to ignore clearing high 32-bit for these instructions. This
+ * saves some back-ends a lot of code-gen. However such optimization is not
+ * necessary on some arches, for example x86_64, arm64 etc, whose JIT back-ends
+ * hence hasn't used verifier's analysis result. But, we really want to have a
+ * way to be able to verify the correctness of the described optimization on
+ * x86_64 on which testsuites are frequently exercised.
+ *
+ * So, this flag is introduced. Once it is set, verifier will randomize high
+ * 32-bit for those instructions who has been identified as safe to ignore them.
+ * Then, if verifier is not doing correct analysis, such randomization will
+ * regress tests to expose bugs.
+ */
+#define BPF_F_TEST_RND_HI32	(1U << 2)
+
+/* The verifier internal test flag. Behavior is undefined */
+#define BPF_F_TEST_STATE_FREQ	(1U << 3)
+
+/* If BPF_F_SLEEPABLE is used in BPF_PROG_LOAD command, the verifier will
+ * restrict map and helper usage for such programs. Sleepable BPF programs can
+ * only be attached to hooks where kernel execution context allows sleeping.
+ * Such programs are allowed to use helpers that may sleep like
+ * bpf_copy_from_user().
+ */
+#define BPF_F_SLEEPABLE		(1U << 4)
+
+/* When BPF ldimm64's insn0.src_reg != 0 then this can have
+ * the following extensions:
+ *
+ * insn0.src_reg:  BPF_PSEUDO_MAP_FD
+ * insn0.imm:      map fd
+ * insn1.imm:      0
+ * insn0.off:      0
+ * insn1.off:      0
+ * ldimm64 rewrite:  address of map
+ * verifier type:    CONST_PTR_TO_MAP
+ */
+#define BPF_PSEUDO_MAP_FD	1
+/* insn0.src_reg:  BPF_PSEUDO_MAP_VALUE
+ * insn0.imm:      map fd
+ * insn1.imm:      offset into value
+ * insn0.off:      0
+ * insn1.off:      0
+ * ldimm64 rewrite:  address of map0+offset
+ * verifier type:    PTR_TO_MAP_VALUE
+ */
+#define BPF_PSEUDO_MAP_VALUE	2
+/* insn0.src_reg:  BPF_PSEUDO_BTF_ID
+ * insn0.imm:      kernel btd id of VAR
+ * insn1.imm:      0
+ * insn0.off:      0
+ * insn1.off:      0
+ * ldimm64 rewrite:  address of the kernel variable
+ * verifier type:    PTR_TO_BTF_ID or PTR_TO_MEM, depending on whether the var
+ *                   is struct/union.
+ */
+#define BPF_PSEUDO_BTF_ID	3
+
+/* when bpf_call->src_reg == BPF_PSEUDO_CALL, bpf_call->imm == pc-relative
+ * offset to another bpf function
+ */
+#define BPF_PSEUDO_CALL		1
+
+/* flags for BPF_MAP_UPDATE_ELEM command */
+enum {
+	BPF_ANY		= 0, /* create new element or update existing */
+	BPF_NOEXIST	= 1, /* create new element if it didn't exist */
+	BPF_EXIST	= 2, /* update existing element */
+	BPF_F_LOCK	= 4, /* spin_lock-ed map_lookup/map_update */
+};
+
+/* flags for BPF_MAP_CREATE command */
+enum {
+	BPF_F_NO_PREALLOC	= (1U << 0),
+/* Instead of having one common LRU list in the
+ * BPF_MAP_TYPE_LRU_PERCPU_HASH map, use a percpu LRU list
+ * which can scale and perform better.
+ * Note, the LRU nodes (including free nodes) cannot be moved
+ * across different LRU lists.
+ */
+	BPF_F_NO_COMMON_LRU	= (1U << 1),
+/* Specify numa node during map creation */
+	BPF_F_NUMA_NODE		= (1U << 2),
+
+/* Flags for accessing BPF object from syscall side. */
+	BPF_F_RDONLY		= (1U << 3),
+	BPF_F_WRONLY		= (1U << 4),
+
+/* Flag for stack_map, store build_id+offset instead of pointer */
+	BPF_F_STACK_BUILD_ID	= (1U << 5),
+
+/* Zero-initialize hash function seed. This should only be used for testing. */
+	BPF_F_ZERO_SEED		= (1U << 6),
+
+/* Flags for accessing BPF object from program side. */
+	BPF_F_RDONLY_PROG	= (1U << 7),
+	BPF_F_WRONLY_PROG	= (1U << 8),
+
+/* Clone map from listener for newly accepted socket */
+	BPF_F_CLONE		= (1U << 9),
+
+/* Enable memory-mapping BPF map */
+	BPF_F_MMAPABLE		= (1U << 10),
+
+/* Share perf_event among processes */
+	BPF_F_PRESERVE_ELEMS	= (1U << 11),
+
+/* Create a map that is suitable to be an inner map with dynamic max entries */
+	BPF_F_INNER_MAP		= (1U << 12),
+};
+
+/* Flags for BPF_PROG_QUERY. */
+
+/* Query effective (directly attached + inherited from ancestor cgroups)
+ * programs that will be executed for events within a cgroup.
+ * attach_flags with this flag are returned only for directly attached programs.
+ */
+#define BPF_F_QUERY_EFFECTIVE	(1U << 0)
+
+/* Flags for BPF_PROG_TEST_RUN */
+
+/* If set, run the test on the cpu specified by bpf_attr.test.cpu */
+#define BPF_F_TEST_RUN_ON_CPU	(1U << 0)
+
+/* type for BPF_ENABLE_STATS */
+enum bpf_stats_type {
+	/* enabled run_time_ns and run_cnt */
+	BPF_STATS_RUN_TIME = 0,
+};
+
+enum bpf_stack_build_id_status {
+	/* user space need an empty entry to identify end of a trace */
+	BPF_STACK_BUILD_ID_EMPTY = 0,
+	/* with valid build_id and offset */
+	BPF_STACK_BUILD_ID_VALID = 1,
+	/* couldn't get build_id, fallback to ip */
+	BPF_STACK_BUILD_ID_IP = 2,
+};
+
+#define BPF_BUILD_ID_SIZE 20
+struct bpf_stack_build_id {
+	__s32		status;
+	unsigned char	build_idBPF_BUILD_ID_SIZE;
+	union {
+		__u64	offset;
+		__u64	ip;
+	};
+};
+
+#define BPF_OBJ_NAME_LEN 16U
+
+union bpf_attr {
+	struct { /* anonymous struct used by BPF_MAP_CREATE command */
+		__u32	map_type;	/* one of enum bpf_map_type */
+		__u32	key_size;	/* size of key in bytes */
+		__u32	value_size;	/* size of value in bytes */
+		__u32	max_entries;	/* max number of entries in a map */
+		__u32	map_flags;	/* BPF_MAP_CREATE related
+					 * flags defined above.
+					 */
+		__u32	inner_map_fd;	/* fd pointing to the inner map */
+		__u32	numa_node;	/* numa node (effective only if
+					 * BPF_F_NUMA_NODE is set).
+					 */
+		char	map_nameBPF_OBJ_NAME_LEN;
+		__u32	map_ifindex;	/* ifindex of netdev to create on */
+		__u32	btf_fd;		/* fd pointing to a BTF type data */
+		__u32	btf_key_type_id;	/* BTF type_id of the key */
+		__u32	btf_value_type_id;	/* BTF type_id of the value */
+		__u32	btf_vmlinux_value_type_id;/* BTF type_id of a kernel-
+						   * struct stored as the
+						   * map value
+						   */
+	};
+
+	struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
+		__u32		map_fd;
+		__aligned_u64	key;
+		union {
+			__aligned_u64 value;
+			__aligned_u64 next_key;
+		};
+		__u64		flags;
+	};
+
+	struct { /* struct used by BPF_MAP_*_BATCH commands */
+		__aligned_u64	in_batch;	/* start batch,
+						 * NULL to start from beginning
+						 */
+		__aligned_u64	out_batch;	/* output: next start batch */
+		__aligned_u64	keys;
+		__aligned_u64	values;
+		__u32		count;		/* input/output:
+						 * input: # of key/value
+						 * elements
+						 * output: # of filled elements
+						 */
+		__u32		map_fd;
+		__u64		elem_flags;
+		__u64		flags;
+	} batch;
+
+	struct { /* anonymous struct used by BPF_PROG_LOAD command */
+		__u32		prog_type;	/* one of enum bpf_prog_type */
+		__u32		insn_cnt;
+		__aligned_u64	insns;
+		__aligned_u64	license;
+		__u32		log_level;	/* verbosity level of verifier */
+		__u32		log_size;	/* size of user buffer */
+		__aligned_u64	log_buf;	/* user supplied buffer */
+		__u32		kern_version;	/* not used */
+		__u32		prog_flags;
+		char		prog_nameBPF_OBJ_NAME_LEN;
+		__u32		prog_ifindex;	/* ifindex of netdev to prep for */
+		/* For some prog types expected attach type must be known at
+		 * load time to verify attach type specific parts of prog
+		 * (context accesses, allowed helpers, etc).
+		 */
+		__u32		expected_attach_type;
+		__u32		prog_btf_fd;	/* fd pointing to BTF type data */
+		__u32		func_info_rec_size;	/* userspace bpf_func_info size */
+		__aligned_u64	func_info;	/* func info */
+		__u32		func_info_cnt;	/* number of bpf_func_info records */
+		__u32		line_info_rec_size;	/* userspace bpf_line_info size */
+		__aligned_u64	line_info;	/* line info */
+		__u32		line_info_cnt;	/* number of bpf_line_info records */
+		__u32		attach_btf_id;	/* in-kernel BTF type id to attach to */
+		union {
+			/* valid prog_fd to attach to bpf prog */
+			__u32		attach_prog_fd;
+			/* or valid module BTF object fd or 0 to attach to vmlinux */
+			__u32		attach_btf_obj_fd;
+		};
+	};
+
+	struct { /* anonymous struct used by BPF_OBJ_* commands */
+		__aligned_u64	pathname;
+		__u32		bpf_fd;
+		__u32		file_flags;
+	};
+
+	struct { /* anonymous struct used by BPF_PROG_ATTACH/DETACH commands */
+		__u32		target_fd;	/* container object to attach to */
+		__u32		attach_bpf_fd;	/* eBPF program to attach */
+		__u32		attach_type;
+		__u32		attach_flags;
+		__u32		replace_bpf_fd;	/* previously attached eBPF
+						 * program to replace if
+						 * BPF_F_REPLACE is used
+						 */
+	};
+
+	struct { /* anonymous struct used by BPF_PROG_TEST_RUN command */
+		__u32		prog_fd;
+		__u32		retval;
+		__u32		data_size_in;	/* input: len of data_in */
+		__u32		data_size_out;	/* input/output: len of data_out
+						 *   returns ENOSPC if data_out
+						 *   is too small.
+						 */
+		__aligned_u64	data_in;
+		__aligned_u64	data_out;
+		__u32		repeat;
+		__u32		duration;
+		__u32		ctx_size_in;	/* input: len of ctx_in */
+		__u32		ctx_size_out;	/* input/output: len of ctx_out
+						 *   returns ENOSPC if ctx_out
+						 *   is too small.
+						 */
+		__aligned_u64	ctx_in;
+		__aligned_u64	ctx_out;
+		__u32		flags;
+		__u32		cpu;
+	} test;
+
+	struct { /* anonymous struct used by BPF_*_GET_*_ID */
+		union {
+			__u32		start_id;
+			__u32		prog_id;
+			__u32		map_id;
+			__u32		btf_id;
+			__u32		link_id;
+		};
+		__u32		next_id;
+		__u32		open_flags;
+	};
+
+	struct { /* anonymous struct used by BPF_OBJ_GET_INFO_BY_FD */
+		__u32		bpf_fd;
+		__u32		info_len;
+		__aligned_u64	info;
+	} info;
+
+	struct { /* anonymous struct used by BPF_PROG_QUERY command */
+		__u32		target_fd;	/* container object to query */
+		__u32		attach_type;
+		__u32		query_flags;
+		__u32		attach_flags;
+		__aligned_u64	prog_ids;
+		__u32		prog_cnt;
+	} query;
+
+	struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */
+		__u64 name;
+		__u32 prog_fd;
+	} raw_tracepoint;
+
+	struct { /* anonymous struct for BPF_BTF_LOAD */
+		__aligned_u64	btf;
+		__aligned_u64	btf_log_buf;
+		__u32		btf_size;
+		__u32		btf_log_size;
+		__u32		btf_log_level;
+	};
+
+	struct {
+		__u32		pid;		/* input: pid */
+		__u32		fd;		/* input: fd */
+		__u32		flags;		/* input: flags */
+		__u32		buf_len;	/* input/output: buf len */
+		__aligned_u64	buf;		/* input/output:
+						 *   tp_name for tracepoint
+						 *   symbol for kprobe
+						 *   filename for uprobe
+						 */
+		__u32		prog_id;	/* output: prod_id */
+		__u32		fd_type;	/* output: BPF_FD_TYPE_* */
+		__u64		probe_offset;	/* output: probe_offset */
+		__u64		probe_addr;	/* output: probe_addr */
+	} task_fd_query;
+
+	struct { /* struct used by BPF_LINK_CREATE command */
+		__u32		prog_fd;	/* eBPF program to attach */
+		union {
+			__u32		target_fd;	/* object to attach to */
+			__u32		target_ifindex; /* target ifindex */
+		};
+		__u32		attach_type;	/* attach type */
+		__u32		flags;		/* extra flags */
+		union {
+			__u32		target_btf_id;	/* btf_id of target to attach to */
+			struct {
+				__aligned_u64	iter_info;	/* extra bpf_iter_link_info */
+				__u32		iter_info_len;	/* iter_info length */
+			};
+		};
+	} link_create;
+
+	struct { /* struct used by BPF_LINK_UPDATE command */
+		__u32		link_fd;	/* link fd */
+		/* new program fd to update link with */
+		__u32		new_prog_fd;
+		__u32		flags;		/* extra flags */
+		/* expected link's program fd; is specified only if
+		 * BPF_F_REPLACE flag is set in flags */
+		__u32		old_prog_fd;
+	} link_update;
+
+	struct {
+		__u32		link_fd;
+	} link_detach;
+
+	struct { /* struct used by BPF_ENABLE_STATS command */
+		__u32		type;
+	} enable_stats;
+
+	struct { /* struct used by BPF_ITER_CREATE command */
+		__u32		link_fd;
+		__u32		flags;
+	} iter_create;
+
+	struct { /* struct used by BPF_PROG_BIND_MAP command */
+		__u32		prog_fd;
+		__u32		map_fd;
+		__u32		flags;		/* extra flags */
+	} prog_bind_map;
+
+} __attribute__((aligned(8)));
+
+/* The description below is an attempt at providing documentation to eBPF
+ * developers about the multiple available eBPF helper functions. It can be
+ * parsed and used to produce a manual page. The workflow is the following,
+ * and requires the rst2man utility:
+ *
+ *     $ ./scripts/bpf_helpers_doc.py \
+ *             --filename include/uapi/linux/bpf.h > /tmp/bpf-helpers.rst
+ *     $ rst2man /tmp/bpf-helpers.rst > /tmp/bpf-helpers.7
+ *     $ man /tmp/bpf-helpers.7
+ *
+ * Note that in order to produce this external documentation, some RST
+ * formatting is used in the descriptions to get "bold" and "italics" in
+ * manual pages. Also note that the few trailing white spaces are
+ * intentional, removing them would break paragraphs for rst2man.
+ *
+ * Start of BPF helper function descriptions:
+ *
+ * void *bpf_map_lookup_elem(struct bpf_map *map, const void *key)
+ * 	Description
+ * 		Perform a lookup in *map* for an entry associated to *key*.
+ * 	Return
+ * 		Map value associated to *key*, or **NULL** if no entry was
+ * 		found.
+ *
+ * long bpf_map_update_elem(struct bpf_map *map, const void *key, const void *value, u64 flags)
+ * 	Description
+ * 		Add or update the value of the entry associated to *key* in
+ * 		*map* with *value*. *flags* is one of:
+ *
+ * 		**BPF_NOEXIST**
+ * 			The entry for *key* must not exist in the map.
+ * 		**BPF_EXIST**
+ * 			The entry for *key* must already exist in the map.
+ * 		**BPF_ANY**
+ * 			No condition on the existence of the entry for *key*.
+ *
+ * 		Flag value **BPF_NOEXIST** cannot be used for maps of types
+ * 		**BPF_MAP_TYPE_ARRAY** or **BPF_MAP_TYPE_PERCPU_ARRAY**  (all
+ * 		elements always exist), the helper would return an error.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_map_delete_elem(struct bpf_map *map, const void *key)
+ * 	Description
+ * 		Delete entry with *key* from *map*.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_probe_read(void *dst, u32 size, const void *unsafe_ptr)
+ * 	Description
+ * 		For tracing programs, safely attempt to read *size* bytes from
+ * 		kernel space address *unsafe_ptr* and store the data in *dst*.
+ *
+ * 		Generally, use **bpf_probe_read_user**\ () or
+ * 		**bpf_probe_read_kernel**\ () instead.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * u64 bpf_ktime_get_ns(void)
+ * 	Description
+ * 		Return the time elapsed since system boot, in nanoseconds.
+ * 		Does not include time the system was suspended.
+ * 		See: **clock_gettime**\ (**CLOCK_MONOTONIC**)
+ * 	Return
+ * 		Current *ktime*.
+ *
+ * long bpf_trace_printk(const char *fmt, u32 fmt_size, ...)
+ * 	Description
+ * 		This helper is a "printk()-like" facility for debugging. It
+ * 		prints a message defined by format *fmt* (of size *fmt_size*)
+ * 		to file *\/sys/kernel/debug/tracing/trace* from DebugFS, if
+ * 		available. It can take up to three additional **u64**
+ * 		arguments (as an eBPF helpers, the total number of arguments is
+ * 		limited to five).
+ *
+ * 		Each time the helper is called, it appends a line to the trace.
+ * 		Lines are discarded while *\/sys/kernel/debug/tracing/trace* is
+ * 		open, use *\/sys/kernel/debug/tracing/trace_pipe* to avoid this.
+ * 		The format of the trace is customizable, and the exact output
+ * 		one will get depends on the options set in
+ * 		*\/sys/kernel/debug/tracing/trace_options* (see also the
+ * 		*README* file under the same directory). However, it usually
+ * 		defaults to something like:
+ *
+ * 		::
+ *
+ * 			telnet-470   001 .N.. 419421.045894: 0x00000001: <formatted msg>
+ *
+ * 		In the above:
+ *
+ * 			* ``telnet`` is the name of the current task.
+ * 			* ``470`` is the PID of the current task.
+ * 			* ``001`` is the CPU number on which the task is
+ * 			  running.
+ * 			* In ``.N..``, each character refers to a set of
+ * 			  options (whether irqs are enabled, scheduling
+ * 			  options, whether hard/softirqs are running, level of
+ * 			  preempt_disabled respectively). **N** means that
+ * 			  **TIF_NEED_RESCHED** and **PREEMPT_NEED_RESCHED**
+ * 			  are set.
+ * 			* ``419421.045894`` is a timestamp.
+ * 			* ``0x00000001`` is a fake value used by BPF for the
+ * 			  instruction pointer register.
+ * 			* ``<formatted msg>`` is the message formatted with
+ * 			  *fmt*.
+ *
+ * 		The conversion specifiers supported by *fmt* are similar, but
+ * 		more limited than for printk(). They are **%d**, **%i**,
+ * 		**%u**, **%x**, **%ld**, **%li**, **%lu**, **%lx**, **%lld**,
+ * 		**%lli**, **%llu**, **%llx**, **%p**, **%s**. No modifier (size
+ * 		of field, padding with zeroes, etc.) is available, and the
+ * 		helper will return **-EINVAL** (but print nothing) if it
+ * 		encounters an unknown specifier.
+ *
+ * 		Also, note that **bpf_trace_printk**\ () is slow, and should
+ * 		only be used for debugging purposes. For this reason, a notice
+ * 		block (spanning several lines) is printed to kernel logs and
+ * 		states that the helper should not be used "for production use"
+ * 		the first time this helper is used (or more precisely, when
+ * 		**trace_printk**\ () buffers are allocated). For passing values
+ * 		to user space, perf events should be preferred.
+ * 	Return
+ * 		The number of bytes written to the buffer, or a negative error
+ * 		in case of failure.
+ *
+ * u32 bpf_get_prandom_u32(void)
+ * 	Description
+ * 		Get a pseudo-random number.
+ *
+ * 		From a security point of view, this helper uses its own
+ * 		pseudo-random internal state, and cannot be used to infer the
+ * 		seed of other random functions in the kernel. However, it is
+ * 		essential to note that the generator used by the helper is not
+ * 		cryptographically secure.
+ * 	Return
+ * 		A random 32-bit unsigned value.
+ *
+ * u32 bpf_get_smp_processor_id(void)
+ * 	Description
+ * 		Get the SMP (symmetric multiprocessing) processor id. Note that
+ * 		all programs run with preemption disabled, which means that the
+ * 		SMP processor id is stable during all the execution of the
+ * 		program.
+ * 	Return
+ * 		The SMP id of the processor running the program.
+ *
+ * long bpf_skb_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len, u64 flags)
+ * 	Description
+ * 		Store *len* bytes from address *from* into the packet
+ * 		associated to *skb*, at *offset*. *flags* are a combination of
+ * 		**BPF_F_RECOMPUTE_CSUM** (automatically recompute the
+ * 		checksum for the packet after storing the bytes) and
+ * 		**BPF_F_INVALIDATE_HASH** (set *skb*\ **->hash**, *skb*\
+ * 		**->swhash** and *skb*\ **->l4hash** to 0).
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_l3_csum_replace(struct sk_buff *skb, u32 offset, u64 from, u64 to, u64 size)
+ * 	Description
+ * 		Recompute the layer 3 (e.g. IP) checksum for the packet
+ * 		associated to *skb*. Computation is incremental, so the helper
+ * 		must know the former value of the header field that was
+ * 		modified (*from*), the new value of this field (*to*), and the
+ * 		number of bytes (2 or 4) for this field, stored in *size*.
+ * 		Alternatively, it is possible to store the difference between
+ * 		the previous and the new values of the header field in *to*, by
+ * 		setting *from* and *size* to 0. For both methods, *offset*
+ * 		indicates the location of the IP checksum within the packet.
+ *
+ * 		This helper works in combination with **bpf_csum_diff**\ (),
+ * 		which does not update the checksum in-place, but offers more
+ * 		flexibility and can handle sizes larger than 2 or 4 for the
+ * 		checksum to update.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_l4_csum_replace(struct sk_buff *skb, u32 offset, u64 from, u64 to, u64 flags)
+ * 	Description
+ * 		Recompute the layer 4 (e.g. TCP, UDP or ICMP) checksum for the
+ * 		packet associated to *skb*. Computation is incremental, so the
+ * 		helper must know the former value of the header field that was
+ * 		modified (*from*), the new value of this field (*to*), and the
+ * 		number of bytes (2 or 4) for this field, stored on the lowest
+ * 		four bits of *flags*. Alternatively, it is possible to store
+ * 		the difference between the previous and the new values of the
+ * 		header field in *to*, by setting *from* and the four lowest
+ * 		bits of *flags* to 0. For both methods, *offset* indicates the
+ * 		location of the IP checksum within the packet. In addition to
+ * 		the size of the field, *flags* can be added (bitwise OR) actual
+ * 		flags. With **BPF_F_MARK_MANGLED_0**, a null checksum is left
+ * 		untouched (unless **BPF_F_MARK_ENFORCE** is added as well), and
+ * 		for updates resulting in a null checksum the value is set to
+ * 		**CSUM_MANGLED_0** instead. Flag **BPF_F_PSEUDO_HDR** indicates
+ * 		the checksum is to be computed against a pseudo-header.
+ *
+ * 		This helper works in combination with **bpf_csum_diff**\ (),
+ * 		which does not update the checksum in-place, but offers more
+ * 		flexibility and can handle sizes larger than 2 or 4 for the
+ * 		checksum to update.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_tail_call(void *ctx, struct bpf_map *prog_array_map, u32 index)
+ * 	Description
+ * 		This special helper is used to trigger a "tail call", or in
+ * 		other words, to jump into another eBPF program. The same stack
+ * 		frame is used (but values on stack and in registers for the
+ * 		caller are not accessible to the callee). This mechanism allows
+ * 		for program chaining, either for raising the maximum number of
+ * 		available eBPF instructions, or to execute given programs in
+ * 		conditional blocks. For security reasons, there is an upper
+ * 		limit to the number of successive tail calls that can be
+ * 		performed.
+ *
+ * 		Upon call of this helper, the program attempts to jump into a
+ * 		program referenced at index *index* in *prog_array_map*, a
+ * 		special map of type **BPF_MAP_TYPE_PROG_ARRAY**, and passes
+ * 		*ctx*, a pointer to the context.
+ *
+ * 		If the call succeeds, the kernel immediately runs the first
+ * 		instruction of the new program. This is not a function call,
+ * 		and it never returns to the previous program. If the call
+ * 		fails, then the helper has no effect, and the caller continues
+ * 		to run its subsequent instructions. A call can fail if the
+ * 		destination program for the jump does not exist (i.e. *index*
+ * 		is superior to the number of entries in *prog_array_map*), or
+ * 		if the maximum number of tail calls has been reached for this
+ * 		chain of programs. This limit is defined in the kernel by the
+ * 		macro **MAX_TAIL_CALL_CNT** (not accessible to user space),
+ * 		which is currently set to 32.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_clone_redirect(struct sk_buff *skb, u32 ifindex, u64 flags)
+ * 	Description
+ * 		Clone and redirect the packet associated to *skb* to another
+ * 		net device of index *ifindex*. Both ingress and egress
+ * 		interfaces can be used for redirection. The **BPF_F_INGRESS**
+ * 		value in *flags* is used to make the distinction (ingress path
+ * 		is selected if the flag is present, egress path otherwise).
+ * 		This is the only flag supported for now.
+ *
+ * 		In comparison with **bpf_redirect**\ () helper,
+ * 		**bpf_clone_redirect**\ () has the associated cost of
+ * 		duplicating the packet buffer, but this can be executed out of
+ * 		the eBPF program. Conversely, **bpf_redirect**\ () is more
+ * 		efficient, but it is handled through an action code where the
+ * 		redirection happens only after the eBPF program has returned.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * u64 bpf_get_current_pid_tgid(void)
+ * 	Return
+ * 		A 64-bit integer containing the current tgid and pid, and
+ * 		created as such:
+ * 		*current_task*\ **->tgid << 32 \|**
+ * 		*current_task*\ **->pid**.
+ *
+ * u64 bpf_get_current_uid_gid(void)
+ * 	Return
+ * 		A 64-bit integer containing the current GID and UID, and
+ * 		created as such: *current_gid* **<< 32 \|** *current_uid*.
+ *
+ * long bpf_get_current_comm(void *buf, u32 size_of_buf)
+ * 	Description
+ * 		Copy the **comm** attribute of the current task into *buf* of
+ * 		*size_of_buf*. The **comm** attribute contains the name of
+ * 		the executable (excluding the path) for the current task. The
+ * 		*size_of_buf* must be strictly positive. On success, the
+ * 		helper makes sure that the *buf* is NUL-terminated. On failure,
+ * 		it is filled with zeroes.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * u32 bpf_get_cgroup_classid(struct sk_buff *skb)
+ * 	Description
+ * 		Retrieve the classid for the current task, i.e. for the net_cls
+ * 		cgroup to which *skb* belongs.
+ *
+ * 		This helper can be used on TC egress path, but not on ingress.
+ *
+ * 		The net_cls cgroup provides an interface to tag network packets
+ * 		based on a user-provided identifier for all traffic coming from
+ * 		the tasks belonging to the related cgroup. See also the related
+ * 		kernel documentation, available from the Linux sources in file
+ * 		*Documentation/admin-guide/cgroup-v1/net_cls.rst*.
+ *
+ * 		The Linux kernel has two versions for cgroups: there are
+ * 		cgroups v1 and cgroups v2. Both are available to users, who can
+ * 		use a mixture of them, but note that the net_cls cgroup is for
+ * 		cgroup v1 only. This makes it incompatible with BPF programs
+ * 		run on cgroups, which is a cgroup-v2-only feature (a socket can
+ * 		only hold data for one version of cgroups at a time).
+ *
+ * 		This helper is only available is the kernel was compiled with
+ * 		the **CONFIG_CGROUP_NET_CLASSID** configuration option set to
+ * 		"**y**" or to "**m**".
+ * 	Return
+ * 		The classid, or 0 for the default unconfigured classid.
+ *
+ * long bpf_skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci)
+ * 	Description
+ * 		Push a *vlan_tci* (VLAN tag control information) of protocol
+ * 		*vlan_proto* to the packet associated to *skb*, then update
+ * 		the checksum. Note that if *vlan_proto* is different from
+ * 		**ETH_P_8021Q** and **ETH_P_8021AD**, it is considered to
+ * 		be **ETH_P_8021Q**.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_skb_vlan_pop(struct sk_buff *skb)
+ * 	Description
+ * 		Pop a VLAN header from the packet associated to *skb*.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_skb_get_tunnel_key(struct sk_buff *skb, struct bpf_tunnel_key *key, u32 size, u64 flags)
+ * 	Description
+ * 		Get tunnel metadata. This helper takes a pointer *key* to an
+ * 		empty **struct bpf_tunnel_key** of **size**, that will be
+ * 		filled with tunnel metadata for the packet associated to *skb*.
+ * 		The *flags* can be set to **BPF_F_TUNINFO_IPV6**, which
+ * 		indicates that the tunnel is based on IPv6 protocol instead of
+ * 		IPv4.
+ *
+ * 		The **struct bpf_tunnel_key** is an object that generalizes the
+ * 		principal parameters used by various tunneling protocols into a
+ * 		single struct. This way, it can be used to easily make a
+ * 		decision based on the contents of the encapsulation header,
+ * 		"summarized" in this struct. In particular, it holds the IP
+ * 		address of the remote end (IPv4 or IPv6, depending on the case)
+ * 		in *key*\ **->remote_ipv4** or *key*\ **->remote_ipv6**. Also,
+ * 		this struct exposes the *key*\ **->tunnel_id**, which is
+ * 		generally mapped to a VNI (Virtual Network Identifier), making
+ * 		it programmable together with the **bpf_skb_set_tunnel_key**\
+ * 		() helper.
+ *
+ * 		Let's imagine that the following code is part of a program
+ * 		attached to the TC ingress interface, on one end of a GRE
+ * 		tunnel, and is supposed to filter out all messages coming from
+ * 		remote ends with IPv4 address other than 10.0.0.1:
+ *
+ * 		::
+ *
+ * 			int ret;
+ * 			struct bpf_tunnel_key key = {};
+ *
+ * 			ret = bpf_skb_get_tunnel_key(skb, &key, sizeof(key), 0);
+ * 			if (ret < 0)
+ * 				return TC_ACT_SHOT;	// drop packet
+ *
+ * 			if (key.remote_ipv4 != 0x0a000001)
+ * 				return TC_ACT_SHOT;	// drop packet
+ *
+ * 			return TC_ACT_OK;		// accept packet
+ *
+ * 		This interface can also be used with all encapsulation devices
+ * 		that can operate in "collect metadata" mode: instead of having
+ * 		one network device per specific configuration, the "collect
+ * 		metadata" mode only requires a single device where the
+ * 		configuration can be extracted from this helper.
+ *
+ * 		This can be used together with various tunnels such as VXLan,
+ * 		Geneve, GRE or IP in IP (IPIP).
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_skb_set_tunnel_key(struct sk_buff *skb, struct bpf_tunnel_key *key, u32 size, u64 flags)
+ * 	Description
+ * 		Populate tunnel metadata for packet associated to *skb.* The
+ * 		tunnel metadata is set to the contents of *key*, of *size*. The
+ * 		*flags* can be set to a combination of the following values:
+ *
+ * 		**BPF_F_TUNINFO_IPV6**
+ * 			Indicate that the tunnel is based on IPv6 protocol
+ * 			instead of IPv4.
+ * 		**BPF_F_ZERO_CSUM_TX**
+ * 			For IPv4 packets, add a flag to tunnel metadata
+ * 			indicating that checksum computation should be skipped
+ * 			and checksum set to zeroes.
+ * 		**BPF_F_DONT_FRAGMENT**
+ * 			Add a flag to tunnel metadata indicating that the
+ * 			packet should not be fragmented.
+ * 		**BPF_F_SEQ_NUMBER**
+ * 			Add a flag to tunnel metadata indicating that a
+ * 			sequence number should be added to tunnel header before
+ * 			sending the packet. This flag was added for GRE
+ * 			encapsulation, but might be used with other protocols
+ * 			as well in the future.
+ *
+ * 		Here is a typical usage on the transmit path:
+ *
+ * 		::
+ *
+ * 			struct bpf_tunnel_key key;
+ * 			     populate key ...
+ * 			bpf_skb_set_tunnel_key(skb, &key, sizeof(key), 0);
+ * 			bpf_clone_redirect(skb, vxlan_dev_ifindex, 0);
+ *
+ * 		See also the description of the **bpf_skb_get_tunnel_key**\ ()
+ * 		helper for additional information.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * u64 bpf_perf_event_read(struct bpf_map *map, u64 flags)
+ * 	Description
+ * 		Read the value of a perf event counter. This helper relies on a
+ * 		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. The nature of
+ * 		the perf event counter is selected when *map* is updated with
+ * 		perf event file descriptors. The *map* is an array whose size
+ * 		is the number of available CPUs, and each cell contains a value
+ * 		relative to one CPU. The value to retrieve is indicated by
+ * 		*flags*, that contains the index of the CPU to look up, masked
+ * 		with **BPF_F_INDEX_MASK**. Alternatively, *flags* can be set to
+ * 		**BPF_F_CURRENT_CPU** to indicate that the value for the
+ * 		current CPU should be retrieved.
+ *
+ * 		Note that before Linux 4.13, only hardware perf event can be
+ * 		retrieved.
+ *
+ * 		Also, be aware that the newer helper
+ * 		**bpf_perf_event_read_value**\ () is recommended over
+ * 		**bpf_perf_event_read**\ () in general. The latter has some ABI
+ * 		quirks where error and counter value are used as a return code
+ * 		(which is wrong to do since ranges may overlap). This issue is
+ * 		fixed with **bpf_perf_event_read_value**\ (), which at the same
+ * 		time provides more features over the **bpf_perf_event_read**\
+ * 		() interface. Please refer to the description of
+ * 		**bpf_perf_event_read_value**\ () for details.
+ * 	Return
+ * 		The value of the perf event counter read from the map, or a
+ * 		negative error code in case of failure.
+ *
+ * long bpf_redirect(u32 ifindex, u64 flags)
+ * 	Description
+ * 		Redirect the packet to another net device of index *ifindex*.
+ * 		This helper is somewhat similar to **bpf_clone_redirect**\
+ * 		(), except that the packet is not cloned, which provides
+ * 		increased performance.
+ *
+ * 		Except for XDP, both ingress and egress interfaces can be used
+ * 		for redirection. The **BPF_F_INGRESS** value in *flags* is used
+ * 		to make the distinction (ingress path is selected if the flag
+ * 		is present, egress path otherwise). Currently, XDP only
+ * 		supports redirection to the egress interface, and accepts no
+ * 		flag at all.
+ *
+ * 		The same effect can also be attained with the more generic
+ * 		**bpf_redirect_map**\ (), which uses a BPF map to store the
+ * 		redirect target instead of providing it directly to the helper.
+ * 	Return
+ * 		For XDP, the helper returns **XDP_REDIRECT** on success or
+ * 		**XDP_ABORTED** on error. For other program types, the values
+ * 		are **TC_ACT_REDIRECT** on success or **TC_ACT_SHOT** on
+ * 		error.
+ *
+ * u32 bpf_get_route_realm(struct sk_buff *skb)
+ * 	Description
+ * 		Retrieve the realm or the route, that is to say the
+ * 		**tclassid** field of the destination for the *skb*. The
+ * 		identifier retrieved is a user-provided tag, similar to the
+ * 		one used with the net_cls cgroup (see description for
+ * 		**bpf_get_cgroup_classid**\ () helper), but here this tag is
+ * 		held by a route (a destination entry), not by a task.
+ *
+ * 		Retrieving this identifier works with the clsact TC egress hook
+ * 		(see also **tc-bpf(8)**), or alternatively on conventional
+ * 		classful egress qdiscs, but not on TC ingress path. In case of
+ * 		clsact TC egress hook, this has the advantage that, internally,
+ * 		the destination entry has not been dropped yet in the transmit
+ * 		path. Therefore, the destination entry does not need to be
+ * 		artificially held via **netif_keep_dst**\ () for a classful
+ * 		qdisc until the *skb* is freed.
+ *
+ * 		This helper is available only if the kernel was compiled with
+ * 		**CONFIG_IP_ROUTE_CLASSID** configuration option.
+ * 	Return
+ * 		The realm of the route for the packet associated to *skb*, or 0
+ * 		if none was found.
+ *
+ * long bpf_perf_event_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
+ * 	Description
+ * 		Write raw *data* blob into a special BPF perf event held by
+ * 		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
+ * 		event must have the following attributes: **PERF_SAMPLE_RAW**
+ * 		as **sample_type**, **PERF_TYPE_SOFTWARE** as **type**, and
+ * 		**PERF_COUNT_SW_BPF_OUTPUT** as **config**.
+ *
+ * 		The *flags* are used to indicate the index in *map* for which
+ * 		the value must be put, masked with **BPF_F_INDEX_MASK**.
+ * 		Alternatively, *flags* can be set to **BPF_F_CURRENT_CPU**
+ * 		to indicate that the index of the current CPU core should be
+ * 		used.
+ *
+ * 		The value to write, of *size*, is passed through eBPF stack and
+ * 		pointed by *data*.
+ *
+ * 		The context of the program *ctx* needs also be passed to the
+ * 		helper.
+ *
+ * 		On user space, a program willing to read the values needs to
+ * 		call **perf_event_open**\ () on the perf event (either for
+ * 		one or for all CPUs) and to store the file descriptor into the
+ * 		*map*. This must be done before the eBPF program can send data
+ * 		into it. An example is available in file
+ * 		*samples/bpf/trace_output_user.c* in the Linux kernel source
+ * 		tree (the eBPF program counterpart is in
+ * 		*samples/bpf/trace_output_kern.c*).
+ *
+ * 		**bpf_perf_event_output**\ () achieves better performance
+ * 		than **bpf_trace_printk**\ () for sharing data with user
+ * 		space, and is much better suitable for streaming data from eBPF
+ * 		programs.
+ *
+ * 		Note that this helper is not restricted to tracing use cases
+ * 		and can be used with programs attached to TC or XDP as well,
+ * 		where it allows for passing data to user space listeners. Data
+ * 		can be:
+ *
+ * 		* Only custom structs,
+ * 		* Only the packet payload, or
+ * 		* A combination of both.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_skb_load_bytes(const void *skb, u32 offset, void *to, u32 len)
+ * 	Description
+ * 		This helper was provided as an easy way to load data from a
+ * 		packet. It can be used to load *len* bytes from *offset* from
+ * 		the packet associated to *skb*, into the buffer pointed by
+ * 		*to*.
+ *
+ * 		Since Linux 4.7, usage of this helper has mostly been replaced
+ * 		by "direct packet access", enabling packet data to be
+ * 		manipulated with *skb*\ **->data** and *skb*\ **->data_end**
+ * 		pointing respectively to the first byte of packet data and to
+ * 		the byte after the last byte of packet data. However, it
+ * 		remains useful if one wishes to read large quantities of data
+ * 		at once from a packet into the eBPF stack.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_get_stackid(void *ctx, struct bpf_map *map, u64 flags)
+ * 	Description
+ * 		Walk a user or a kernel stack and return its id. To achieve
+ * 		this, the helper needs *ctx*, which is a pointer to the context
+ * 		on which the tracing program is executed, and a pointer to a
+ * 		*map* of type **BPF_MAP_TYPE_STACK_TRACE**.
+ *
+ * 		The last argument, *flags*, holds the number of stack frames to
+ * 		skip (from 0 to 255), masked with
+ * 		**BPF_F_SKIP_FIELD_MASK**. The next bits can be used to set
+ * 		a combination of the following flags:
+ *
+ * 		**BPF_F_USER_STACK**
+ * 			Collect a user space stack instead of a kernel stack.
+ * 		**BPF_F_FAST_STACK_CMP**
+ * 			Compare stacks by hash only.
+ * 		**BPF_F_REUSE_STACKID**
+ * 			If two different stacks hash into the same *stackid*,
+ * 			discard the old one.
+ *
+ * 		The stack id retrieved is a 32 bit long integer handle which
+ * 		can be further combined with other data (including other stack
+ * 		ids) and used as a key into maps. This can be useful for
+ * 		generating a variety of graphs (such as flame graphs or off-cpu
+ * 		graphs).
+ *
+ * 		For walking a stack, this helper is an improvement over
+ * 		**bpf_probe_read**\ (), which can be used with unrolled loops
+ * 		but is not efficient and consumes a lot of eBPF instructions.
+ * 		Instead, **bpf_get_stackid**\ () can collect up to
+ * 		**PERF_MAX_STACK_DEPTH** both kernel and user frames. Note that
+ * 		this limit can be controlled with the **sysctl** program, and
+ * 		that it should be manually increased in order to profile long
+ * 		user stacks (such as stacks for Java programs). To do so, use:
+ *
+ * 		::
+ *
+ * 			# sysctl kernel.perf_event_max_stack=<new value>
+ * 	Return
+ * 		The positive or null stack id on success, or a negative error
+ * 		in case of failure.
+ *
+ * s64 bpf_csum_diff(__be32 *from, u32 from_size, __be32 *to, u32 to_size, __wsum seed)
+ * 	Description
+ * 		Compute a checksum difference, from the raw buffer pointed by
+ * 		*from*, of length *from_size* (that must be a multiple of 4),
+ * 		towards the raw buffer pointed by *to*, of size *to_size*
+ * 		(same remark). An optional *seed* can be added to the value
+ * 		(this can be cascaded, the seed may come from a previous call
+ * 		to the helper).
+ *
+ * 		This is flexible enough to be used in several ways:
+ *
+ * 		* With *from_size* == 0, *to_size* > 0 and *seed* set to
+ * 		  checksum, it can be used when pushing new data.
+ * 		* With *from_size* > 0, *to_size* == 0 and *seed* set to
+ * 		  checksum, it can be used when removing data from a packet.
+ * 		* With *from_size* > 0, *to_size* > 0 and *seed* set to 0, it
+ * 		  can be used to compute a diff. Note that *from_size* and
+ * 		  *to_size* do not need to be equal.
+ *
+ * 		This helper can be used in combination with
+ * 		**bpf_l3_csum_replace**\ () and **bpf_l4_csum_replace**\ (), to
+ * 		which one can feed in the difference computed with
+ * 		**bpf_csum_diff**\ ().
+ * 	Return
+ * 		The checksum result, or a negative error code in case of
+ * 		failure.
+ *
+ * long bpf_skb_get_tunnel_opt(struct sk_buff *skb, void *opt, u32 size)
+ * 	Description
+ * 		Retrieve tunnel options metadata for the packet associated to
+ * 		*skb*, and store the raw tunnel option data to the buffer *opt*
+ * 		of *size*.
+ *
+ * 		This helper can be used with encapsulation devices that can
+ * 		operate in "collect metadata" mode (please refer to the related
+ * 		note in the description of **bpf_skb_get_tunnel_key**\ () for
+ * 		more details). A particular example where this can be used is
+ * 		in combination with the Geneve encapsulation protocol, where it
+ * 		allows for pushing (with **bpf_skb_get_tunnel_opt**\ () helper)
+ * 		and retrieving arbitrary TLVs (Type-Length-Value headers) from
+ * 		the eBPF program. This allows for full customization of these
+ * 		headers.
+ * 	Return
+ * 		The size of the option data retrieved.
+ *
+ * long bpf_skb_set_tunnel_opt(struct sk_buff *skb, void *opt, u32 size)
+ * 	Description
+ * 		Set tunnel options metadata for the packet associated to *skb*
+ * 		to the option data contained in the raw buffer *opt* of *size*.
+ *
+ * 		See also the description of the **bpf_skb_get_tunnel_opt**\ ()
+ * 		helper for additional information.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_skb_change_proto(struct sk_buff *skb, __be16 proto, u64 flags)
+ * 	Description
+ * 		Change the protocol of the *skb* to *proto*. Currently
+ * 		supported are transition from IPv4 to IPv6, and from IPv6 to
+ * 		IPv4. The helper takes care of the groundwork for the
+ * 		transition, including resizing the socket buffer. The eBPF
+ * 		program is expected to fill the new headers, if any, via
+ * 		**skb_store_bytes**\ () and to recompute the checksums with
+ * 		**bpf_l3_csum_replace**\ () and **bpf_l4_csum_replace**\
+ * 		(). The main case for this helper is to perform NAT64
+ * 		operations out of an eBPF program.
+ *
+ * 		Internally, the GSO type is marked as dodgy so that headers are
+ * 		checked and segments are recalculated by the GSO/GRO engine.
+ * 		The size for GSO target is adapted as well.
+ *
+ * 		All values for *flags* are reserved for future usage, and must
+ * 		be left at zero.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_skb_change_type(struct sk_buff *skb, u32 type)
+ * 	Description
+ * 		Change the packet type for the packet associated to *skb*. This
+ * 		comes down to setting *skb*\ **->pkt_type** to *type*, except
+ * 		the eBPF program does not have a write access to *skb*\
+ * 		**->pkt_type** beside this helper. Using a helper here allows
+ * 		for graceful handling of errors.
+ *
+ * 		The major use case is to change incoming *skb*s to
+ * 		**PACKET_HOST** in a programmatic way instead of having to
+ * 		recirculate via **redirect**\ (..., **BPF_F_INGRESS**), for
+ * 		example.
+ *
+ * 		Note that *type* only allows certain values. At this time, they
+ * 		are:
+ *
+ * 		**PACKET_HOST**
+ * 			Packet is for us.
+ * 		**PACKET_BROADCAST**
+ * 			Send packet to all.
+ * 		**PACKET_MULTICAST**
+ * 			Send packet to group.
+ * 		**PACKET_OTHERHOST**
+ * 			Send packet to someone else.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_skb_under_cgroup(struct sk_buff *skb, struct bpf_map *map, u32 index)
+ * 	Description
+ * 		Check whether *skb* is a descendant of the cgroup2 held by
+ * 		*map* of type **BPF_MAP_TYPE_CGROUP_ARRAY**, at *index*.
+ * 	Return
+ * 		The return value depends on the result of the test, and can be:
+ *
+ * 		* 0, if the *skb* failed the cgroup2 descendant test.
+ * 		* 1, if the *skb* succeeded the cgroup2 descendant test.
+ * 		* A negative error code, if an error occurred.
+ *
+ * u32 bpf_get_hash_recalc(struct sk_buff *skb)
+ * 	Description
+ * 		Retrieve the hash of the packet, *skb*\ **->hash**. If it is
+ * 		not set, in particular if the hash was cleared due to mangling,
+ * 		recompute this hash. Later accesses to the hash can be done
+ * 		directly with *skb*\ **->hash**.
+ *
+ * 		Calling **bpf_set_hash_invalid**\ (), changing a packet
+ * 		prototype with **bpf_skb_change_proto**\ (), or calling
+ * 		**bpf_skb_store_bytes**\ () with the
+ * 		**BPF_F_INVALIDATE_HASH** are actions susceptible to clear
+ * 		the hash and to trigger a new computation for the next call to
+ * 		**bpf_get_hash_recalc**\ ().
+ * 	Return
+ * 		The 32-bit hash.
+ *
+ * u64 bpf_get_current_task(void)
+ * 	Return
+ * 		A pointer to the current task struct.
+ *
+ * long bpf_probe_write_user(void *dst, const void *src, u32 len)
+ * 	Description
+ * 		Attempt in a safe way to write *len* bytes from the buffer
+ * 		*src* to *dst* in memory. It only works for threads that are in
+ * 		user context, and *dst* must be a valid user space address.
+ *
+ * 		This helper should not be used to implement any kind of
+ * 		security mechanism because of TOC-TOU attacks, but rather to
+ * 		debug, divert, and manipulate execution of semi-cooperative
+ * 		processes.
+ *
+ * 		Keep in mind that this feature is meant for experiments, and it
+ * 		has a risk of crashing the system and running programs.
+ * 		Therefore, when an eBPF program using this helper is attached,
+ * 		a warning including PID and process name is printed to kernel
+ * 		logs.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_current_task_under_cgroup(struct bpf_map *map, u32 index)
+ * 	Description
+ * 		Check whether the probe is being run is the context of a given
+ * 		subset of the cgroup2 hierarchy. The cgroup2 to test is held by
+ * 		*map* of type **BPF_MAP_TYPE_CGROUP_ARRAY**, at *index*.
+ * 	Return
+ * 		The return value depends on the result of the test, and can be:
+ *
+ *		* 0, if current task belongs to the cgroup2.
+ *		* 1, if current task does not belong to the cgroup2.
+ * 		* A negative error code, if an error occurred.
+ *
+ * long bpf_skb_change_tail(struct sk_buff *skb, u32 len, u64 flags)
+ * 	Description
+ * 		Resize (trim or grow) the packet associated to *skb* to the
+ * 		new *len*. The *flags* are reserved for future usage, and must
+ * 		be left at zero.
+ *
+ * 		The basic idea is that the helper performs the needed work to
+ * 		change the size of the packet, then the eBPF program rewrites
+ * 		the rest via helpers like **bpf_skb_store_bytes**\ (),
+ * 		**bpf_l3_csum_replace**\ (), **bpf_l3_csum_replace**\ ()
+ * 		and others. This helper is a slow path utility intended for
+ * 		replies with control messages. And because it is targeted for
+ * 		slow path, the helper itself can afford to be slow: it
+ * 		implicitly linearizes, unclones and drops offloads from the
+ * 		*skb*.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_skb_pull_data(struct sk_buff *skb, u32 len)
+ * 	Description
+ * 		Pull in non-linear data in case the *skb* is non-linear and not
+ * 		all of *len* are part of the linear section. Make *len* bytes
+ * 		from *skb* readable and writable. If a zero value is passed for
+ * 		*len*, then the whole length of the *skb* is pulled.
+ *
+ * 		This helper is only needed for reading and writing with direct
+ * 		packet access.
+ *
+ * 		For direct packet access, testing that offsets to access
+ * 		are within packet boundaries (test on *skb*\ **->data_end**) is
+ * 		susceptible to fail if offsets are invalid, or if the requested
+ * 		data is in non-linear parts of the *skb*. On failure the
+ * 		program can just bail out, or in the case of a non-linear
+ * 		buffer, use a helper to make the data available. The
+ * 		**bpf_skb_load_bytes**\ () helper is a first solution to access
+ * 		the data. Another one consists in using **bpf_skb_pull_data**
+ * 		to pull in once the non-linear parts, then retesting and
+ * 		eventually access the data.
+ *
+ * 		At the same time, this also makes sure the *skb* is uncloned,
+ * 		which is a necessary condition for direct write. As this needs
+ * 		to be an invariant for the write part only, the verifier
+ * 		detects writes and adds a prologue that is calling
+ * 		**bpf_skb_pull_data()** to effectively unclone the *skb* from
+ * 		the very beginning in case it is indeed cloned.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * s64 bpf_csum_update(struct sk_buff *skb, __wsum csum)
+ * 	Description
+ * 		Add the checksum *csum* into *skb*\ **->csum** in case the
+ * 		driver has supplied a checksum for the entire packet into that
+ * 		field. Return an error otherwise. This helper is intended to be
+ * 		used in combination with **bpf_csum_diff**\ (), in particular
+ * 		when the checksum needs to be updated after data has been
+ * 		written into the packet through direct packet access.
+ * 	Return
+ * 		The checksum on success, or a negative error code in case of
+ * 		failure.
+ *
+ * void bpf_set_hash_invalid(struct sk_buff *skb)
+ * 	Description
+ * 		Invalidate the current *skb*\ **->hash**. It can be used after
+ * 		mangling on headers through direct packet access, in order to
+ * 		indicate that the hash is outdated and to trigger a
+ * 		recalculation the next time the kernel tries to access this
+ * 		hash or when the **bpf_get_hash_recalc**\ () helper is called.
+ *
+ * long bpf_get_numa_node_id(void)
+ * 	Description
+ * 		Return the id of the current NUMA node. The primary use case
+ * 		for this helper is the selection of sockets for the local NUMA
+ * 		node, when the program is attached to sockets using the
+ * 		**SO_ATTACH_REUSEPORT_EBPF** option (see also **socket(7)**),
+ * 		but the helper is also available to other eBPF program types,
+ * 		similarly to **bpf_get_smp_processor_id**\ ().
+ * 	Return
+ * 		The id of current NUMA node.
+ *
+ * long bpf_skb_change_head(struct sk_buff *skb, u32 len, u64 flags)
+ * 	Description
+ * 		Grows headroom of packet associated to *skb* and adjusts the
+ * 		offset of the MAC header accordingly, adding *len* bytes of
+ * 		space. It automatically extends and reallocates memory as
+ * 		required.
+ *
+ * 		This helper can be used on a layer 3 *skb* to push a MAC header
+ * 		for redirection into a layer 2 device.
+ *
+ * 		All values for *flags* are reserved for future usage, and must
+ * 		be left at zero.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_xdp_adjust_head(struct xdp_buff *xdp_md, int delta)
+ * 	Description
+ * 		Adjust (move) *xdp_md*\ **->data** by *delta* bytes. Note that
+ * 		it is possible to use a negative value for *delta*. This helper
+ * 		can be used to prepare the packet for pushing or popping
+ * 		headers.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_probe_read_str(void *dst, u32 size, const void *unsafe_ptr)
+ * 	Description
+ * 		Copy a NUL terminated string from an unsafe kernel address
+ * 		*unsafe_ptr* to *dst*. See **bpf_probe_read_kernel_str**\ () for
+ * 		more details.
+ *
+ * 		Generally, use **bpf_probe_read_user_str**\ () or
+ * 		**bpf_probe_read_kernel_str**\ () instead.
+ * 	Return
+ * 		On success, the strictly positive length of the string,
+ * 		including the trailing NUL character. On error, a negative
+ * 		value.
+ *
+ * u64 bpf_get_socket_cookie(struct sk_buff *skb)
+ * 	Description
+ * 		If the **struct sk_buff** pointed by *skb* has a known socket,
+ * 		retrieve the cookie (generated by the kernel) of this socket.
+ * 		If no cookie has been set yet, generate a new cookie. Once
+ * 		generated, the socket cookie remains stable for the life of the
+ * 		socket. This helper can be useful for monitoring per socket
+ * 		networking traffic statistics as it provides a global socket
+ * 		identifier that can be assumed unique.
+ * 	Return
+ * 		A 8-byte long non-decreasing number on success, or 0 if the
+ * 		socket field is missing inside *skb*.
+ *
+ * u64 bpf_get_socket_cookie(struct bpf_sock_addr *ctx)
+ * 	Description
+ * 		Equivalent to bpf_get_socket_cookie() helper that accepts
+ * 		*skb*, but gets socket from **struct bpf_sock_addr** context.
+ * 	Return
+ * 		A 8-byte long non-decreasing number.
+ *
+ * u64 bpf_get_socket_cookie(struct bpf_sock_ops *ctx)
+ * 	Description
+ * 		Equivalent to **bpf_get_socket_cookie**\ () helper that accepts
+ * 		*skb*, but gets socket from **struct bpf_sock_ops** context.
+ * 	Return
+ * 		A 8-byte long non-decreasing number.
+ *
+ * u32 bpf_get_socket_uid(struct sk_buff *skb)
+ * 	Return
+ * 		The owner UID of the socket associated to *skb*. If the socket
+ * 		is **NULL**, or if it is not a full socket (i.e. if it is a
+ * 		time-wait or a request socket instead), **overflowuid** value
+ * 		is returned (note that **overflowuid** might also be the actual
+ * 		UID value for the socket).
+ *
+ * long bpf_set_hash(struct sk_buff *skb, u32 hash)
+ * 	Description
+ * 		Set the full hash for *skb* (set the field *skb*\ **->hash**)
+ * 		to value *hash*.
+ * 	Return
+ * 		0
+ *
+ * long bpf_setsockopt(void *bpf_socket, int level, int optname, void *optval, int optlen)
+ * 	Description
+ * 		Emulate a call to **setsockopt()** on the socket associated to
+ * 		*bpf_socket*, which must be a full socket. The *level* at
+ * 		which the option resides and the name *optname* of the option
+ * 		must be specified, see **setsockopt(2)** for more information.
+ * 		The option value of length *optlen* is pointed by *optval*.
+ *
+ * 		*bpf_socket* should be one of the following:
+ *
+ * 		* **struct bpf_sock_ops** for **BPF_PROG_TYPE_SOCK_OPS**.
+ * 		* **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT**
+ * 		  and **BPF_CGROUP_INET6_CONNECT**.
+ *
+ * 		This helper actually implements a subset of **setsockopt()**.
+ * 		It supports the following *level*\ s:
+ *
+ * 		* **SOL_SOCKET**, which supports the following *optname*\ s:
+ * 		  **SO_RCVBUF**, **SO_SNDBUF**, **SO_MAX_PACING_RATE**,
+ * 		  **SO_PRIORITY**, **SO_RCVLOWAT**, **SO_MARK**,
+ * 		  **SO_BINDTODEVICE**, **SO_KEEPALIVE**.
+ * 		* **IPPROTO_TCP**, which supports the following *optname*\ s:
+ * 		  **TCP_CONGESTION**, **TCP_BPF_IW**,
+ * 		  **TCP_BPF_SNDCWND_CLAMP**, **TCP_SAVE_SYN**,
+ * 		  **TCP_KEEPIDLE**, **TCP_KEEPINTVL**, **TCP_KEEPCNT**,
+ *		  **TCP_SYNCNT**, **TCP_USER_TIMEOUT**, **TCP_NOTSENT_LOWAT**.
+ * 		* **IPPROTO_IP**, which supports *optname* **IP_TOS**.
+ * 		* **IPPROTO_IPV6**, which supports *optname* **IPV6_TCLASS**.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64 flags)
+ * 	Description
+ * 		Grow or shrink the room for data in the packet associated to
+ * 		*skb* by *len_diff*, and according to the selected *mode*.
+ *
+ * 		By default, the helper will reset any offloaded checksum
+ * 		indicator of the skb to CHECKSUM_NONE. This can be avoided
+ * 		by the following flag:
+ *
+ * 		* **BPF_F_ADJ_ROOM_NO_CSUM_RESET**: Do not reset offloaded
+ * 		  checksum data of the skb to CHECKSUM_NONE.
+ *
+ *		There are two supported modes at this time:
+ *
+ *		* **BPF_ADJ_ROOM_MAC**: Adjust room at the mac layer
+ *		  (room space is added or removed below the layer 2 header).
+ *
+ * 		* **BPF_ADJ_ROOM_NET**: Adjust room at the network layer
+ * 		  (room space is added or removed below the layer 3 header).
+ *
+ *		The following flags are supported at this time:
+ *
+ *		* **BPF_F_ADJ_ROOM_FIXED_GSO**: Do not adjust gso_size.
+ *		  Adjusting mss in this way is not allowed for datagrams.
+ *
+ *		* **BPF_F_ADJ_ROOM_ENCAP_L3_IPV4**,
+ *		  **BPF_F_ADJ_ROOM_ENCAP_L3_IPV6**:
+ *		  Any new space is reserved to hold a tunnel header.
+ *		  Configure skb offsets and other fields accordingly.
+ *
+ *		* **BPF_F_ADJ_ROOM_ENCAP_L4_GRE**,
+ *		  **BPF_F_ADJ_ROOM_ENCAP_L4_UDP**:
+ *		  Use with ENCAP_L3 flags to further specify the tunnel type.
+ *
+ *		* **BPF_F_ADJ_ROOM_ENCAP_L2**\ (*len*):
+ *		  Use with ENCAP_L3/L4 flags to further specify the tunnel
+ *		  type; *len* is the length of the inner MAC header.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_redirect_map(struct bpf_map *map, u32 key, u64 flags)
+ * 	Description
+ * 		Redirect the packet to the endpoint referenced by *map* at
+ * 		index *key*. Depending on its type, this *map* can contain
+ * 		references to net devices (for forwarding packets through other
+ * 		ports), or to CPUs (for redirecting XDP frames to another CPU;
+ * 		but this is only implemented for native XDP (with driver
+ * 		support) as of this writing).
+ *
+ * 		The lower two bits of *flags* are used as the return code if
+ * 		the map lookup fails. This is so that the return value can be
+ * 		one of the XDP program return codes up to **XDP_TX**, as chosen
+ * 		by the caller. Any higher bits in the *flags* argument must be
+ * 		unset.
+ *
+ * 		See also **bpf_redirect**\ (), which only supports redirecting
+ * 		to an ifindex, but doesn't require a map to do so.
+ * 	Return
+ * 		**XDP_REDIRECT** on success, or the value of the two lower bits
+ * 		of the *flags* argument on error.
+ *
+ * long bpf_sk_redirect_map(struct sk_buff *skb, struct bpf_map *map, u32 key, u64 flags)
+ * 	Description
+ * 		Redirect the packet to the socket referenced by *map* (of type
+ * 		**BPF_MAP_TYPE_SOCKMAP**) at index *key*. Both ingress and
+ * 		egress interfaces can be used for redirection. The
+ * 		**BPF_F_INGRESS** value in *flags* is used to make the
+ * 		distinction (ingress path is selected if the flag is present,
+ * 		egress path otherwise). This is the only flag supported for now.
+ * 	Return
+ * 		**SK_PASS** on success, or **SK_DROP** on error.
+ *
+ * long bpf_sock_map_update(struct bpf_sock_ops *skops, struct bpf_map *map, void *key, u64 flags)
+ * 	Description
+ * 		Add an entry to, or update a *map* referencing sockets. The
+ * 		*skops* is used as a new value for the entry associated to
+ * 		*key*. *flags* is one of:
+ *
+ * 		**BPF_NOEXIST**
+ * 			The entry for *key* must not exist in the map.
+ * 		**BPF_EXIST**
+ * 			The entry for *key* must already exist in the map.
+ * 		**BPF_ANY**
+ * 			No condition on the existence of the entry for *key*.
+ *
+ * 		If the *map* has eBPF programs (parser and verdict), those will
+ * 		be inherited by the socket being added. If the socket is
+ * 		already attached to eBPF programs, this results in an error.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_xdp_adjust_meta(struct xdp_buff *xdp_md, int delta)
+ * 	Description
+ * 		Adjust the address pointed by *xdp_md*\ **->data_meta** by
+ * 		*delta* (which can be positive or negative). Note that this
+ * 		operation modifies the address stored in *xdp_md*\ **->data**,
+ * 		so the latter must be loaded only after the helper has been
+ * 		called.
+ *
+ * 		The use of *xdp_md*\ **->data_meta** is optional and programs
+ * 		are not required to use it. The rationale is that when the
+ * 		packet is processed with XDP (e.g. as DoS filter), it is
+ * 		possible to push further meta data along with it before passing
+ * 		to the stack, and to give the guarantee that an ingress eBPF
+ * 		program attached as a TC classifier on the same device can pick
+ * 		this up for further post-processing. Since TC works with socket
+ * 		buffers, it remains possible to set from XDP the **mark** or
+ * 		**priority** pointers, or other pointers for the socket buffer.
+ * 		Having this scratch space generic and programmable allows for
+ * 		more flexibility as the user is free to store whatever meta
+ * 		data they need.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_perf_event_read_value(struct bpf_map *map, u64 flags, struct bpf_perf_event_value *buf, u32 buf_size)
+ * 	Description
+ * 		Read the value of a perf event counter, and store it into *buf*
+ * 		of size *buf_size*. This helper relies on a *map* of type
+ * 		**BPF_MAP_TYPE_PERF_EVENT_ARRAY**. The nature of the perf event
+ * 		counter is selected when *map* is updated with perf event file
+ * 		descriptors. The *map* is an array whose size is the number of
+ * 		available CPUs, and each cell contains a value relative to one
+ * 		CPU. The value to retrieve is indicated by *flags*, that
+ * 		contains the index of the CPU to look up, masked with
+ * 		**BPF_F_INDEX_MASK**. Alternatively, *flags* can be set to
+ * 		**BPF_F_CURRENT_CPU** to indicate that the value for the
+ * 		current CPU should be retrieved.
+ *
+ * 		This helper behaves in a way close to
+ * 		**bpf_perf_event_read**\ () helper, save that instead of
+ * 		just returning the value observed, it fills the *buf*
+ * 		structure. This allows for additional data to be retrieved: in
+ * 		particular, the enabled and running times (in *buf*\
+ * 		**->enabled** and *buf*\ **->running**, respectively) are
+ * 		copied. In general, **bpf_perf_event_read_value**\ () is
+ * 		recommended over **bpf_perf_event_read**\ (), which has some
+ * 		ABI issues and provides fewer functionalities.
+ *
+ * 		These values are interesting, because hardware PMU (Performance
+ * 		Monitoring Unit) counters are limited resources. When there are
+ * 		more PMU based perf events opened than available counters,
+ * 		kernel will multiplex these events so each event gets certain
+ * 		percentage (but not all) of the PMU time. In case that
+ * 		multiplexing happens, the number of samples or counter value
+ * 		will not reflect the case compared to when no multiplexing
+ * 		occurs. This makes comparison between different runs difficult.
+ * 		Typically, the counter value should be normalized before
+ * 		comparing to other experiments. The usual normalization is done
+ * 		as follows.
+ *
+ * 		::
+ *
+ * 			normalized_counter = counter * t_enabled / t_running
+ *
+ * 		Where t_enabled is the time enabled for event and t_running is
+ * 		the time running for event since last normalization. The
+ * 		enabled and running times are accumulated since the perf event
+ * 		open. To achieve scaling factor between two invocations of an
+ * 		eBPF program, users can use CPU id as the key (which is
+ * 		typical for perf array usage model) to remember the previous
+ * 		value and do the calculation inside the eBPF program.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_perf_prog_read_value(struct bpf_perf_event_data *ctx, struct bpf_perf_event_value *buf, u32 buf_size)
+ * 	Description
+ * 		For en eBPF program attached to a perf event, retrieve the
+ * 		value of the event counter associated to *ctx* and store it in
+ * 		the structure pointed by *buf* and of size *buf_size*. Enabled
+ * 		and running times are also stored in the structure (see
+ * 		description of helper **bpf_perf_event_read_value**\ () for
+ * 		more details).
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_getsockopt(void *bpf_socket, int level, int optname, void *optval, int optlen)
+ * 	Description
+ * 		Emulate a call to **getsockopt()** on the socket associated to
+ * 		*bpf_socket*, which must be a full socket. The *level* at
+ * 		which the option resides and the name *optname* of the option
+ * 		must be specified, see **getsockopt(2)** for more information.
+ * 		The retrieved value is stored in the structure pointed by
+ * 		*opval* and of length *optlen*.
+ *
+ * 		*bpf_socket* should be one of the following:
+ *
+ * 		* **struct bpf_sock_ops** for **BPF_PROG_TYPE_SOCK_OPS**.
+ * 		* **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT**
+ * 		  and **BPF_CGROUP_INET6_CONNECT**.
+ *
+ * 		This helper actually implements a subset of **getsockopt()**.
+ * 		It supports the following *level*\ s:
+ *
+ * 		* **IPPROTO_TCP**, which supports *optname*
+ * 		  **TCP_CONGESTION**.
+ * 		* **IPPROTO_IP**, which supports *optname* **IP_TOS**.
+ * 		* **IPPROTO_IPV6**, which supports *optname* **IPV6_TCLASS**.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_override_return(struct pt_regs *regs, u64 rc)
+ * 	Description
+ * 		Used for error injection, this helper uses kprobes to override
+ * 		the return value of the probed function, and to set it to *rc*.
+ * 		The first argument is the context *regs* on which the kprobe
+ * 		works.
+ *
+ * 		This helper works by setting the PC (program counter)
+ * 		to an override function which is run in place of the original
+ * 		probed function. This means the probed function is not run at
+ * 		all. The replacement function just returns with the required
+ * 		value.
+ *
+ * 		This helper has security implications, and thus is subject to
+ * 		restrictions. It is only available if the kernel was compiled
+ * 		with the **CONFIG_BPF_KPROBE_OVERRIDE** configuration
+ * 		option, and in this case it only works on functions tagged with
+ * 		**ALLOW_ERROR_INJECTION** in the kernel code.
+ *
+ * 		Also, the helper is only available for the architectures having
+ * 		the CONFIG_FUNCTION_ERROR_INJECTION option. As of this writing,
+ * 		x86 architecture is the only one to support this feature.
+ * 	Return
+ * 		0
+ *
+ * long bpf_sock_ops_cb_flags_set(struct bpf_sock_ops *bpf_sock, int argval)
+ * 	Description
+ * 		Attempt to set the value of the **bpf_sock_ops_cb_flags** field
+ * 		for the full TCP socket associated to *bpf_sock_ops* to
+ * 		*argval*.
+ *
+ * 		The primary use of this field is to determine if there should
+ * 		be calls to eBPF programs of type
+ * 		**BPF_PROG_TYPE_SOCK_OPS** at various points in the TCP
+ * 		code. A program of the same type can change its value, per
+ * 		connection and as necessary, when the connection is
+ * 		established. This field is directly accessible for reading, but
+ * 		this helper must be used for updates in order to return an
+ * 		error if an eBPF program tries to set a callback that is not
+ * 		supported in the current kernel.
+ *
+ * 		*argval* is a flag array which can combine these flags:
+ *
+ * 		* **BPF_SOCK_OPS_RTO_CB_FLAG** (retransmission time out)
+ * 		* **BPF_SOCK_OPS_RETRANS_CB_FLAG** (retransmission)
+ * 		* **BPF_SOCK_OPS_STATE_CB_FLAG** (TCP state change)
+ * 		* **BPF_SOCK_OPS_RTT_CB_FLAG** (every RTT)
+ *
+ * 		Therefore, this function can be used to clear a callback flag by
+ * 		setting the appropriate bit to zero. e.g. to disable the RTO
+ * 		callback:
+ *
+ * 		**bpf_sock_ops_cb_flags_set(bpf_sock,**
+ * 			**bpf_sock->bpf_sock_ops_cb_flags & ~BPF_SOCK_OPS_RTO_CB_FLAG)**
+ *
+ * 		Here are some examples of where one could call such eBPF
+ * 		program:
+ *
+ * 		* When RTO fires.
+ * 		* When a packet is retransmitted.
+ * 		* When the connection terminates.
+ * 		* When a packet is sent.
+ * 		* When a packet is received.
+ * 	Return
+ * 		Code **-EINVAL** if the socket is not a full TCP socket;
+ * 		otherwise, a positive number containing the bits that could not
+ * 		be set is returned (which comes down to 0 if all bits were set
+ * 		as required).
+ *
+ * long bpf_msg_redirect_map(struct sk_msg_buff *msg, struct bpf_map *map, u32 key, u64 flags)
+ * 	Description
+ * 		This helper is used in programs implementing policies at the
+ * 		socket level. If the message *msg* is allowed to pass (i.e. if
+ * 		the verdict eBPF program returns **SK_PASS**), redirect it to
+ * 		the socket referenced by *map* (of type
+ * 		**BPF_MAP_TYPE_SOCKMAP**) at index *key*. Both ingress and
+ * 		egress interfaces can be used for redirection. The
+ * 		**BPF_F_INGRESS** value in *flags* is used to make the
+ * 		distinction (ingress path is selected if the flag is present,
+ * 		egress path otherwise). This is the only flag supported for now.
+ * 	Return
+ * 		**SK_PASS** on success, or **SK_DROP** on error.
+ *
+ * long bpf_msg_apply_bytes(struct sk_msg_buff *msg, u32 bytes)
+ * 	Description
+ * 		For socket policies, apply the verdict of the eBPF program to
+ * 		the next *bytes* (number of bytes) of message *msg*.
+ *
+ * 		For example, this helper can be used in the following cases:
+ *
+ * 		* A single **sendmsg**\ () or **sendfile**\ () system call
+ * 		  contains multiple logical messages that the eBPF program is
+ * 		  supposed to read and for which it should apply a verdict.
+ * 		* An eBPF program only cares to read the first *bytes* of a
+ * 		  *msg*. If the message has a large payload, then setting up
+ * 		  and calling the eBPF program repeatedly for all bytes, even
+ * 		  though the verdict is already known, would create unnecessary
+ * 		  overhead.
+ *
+ * 		When called from within an eBPF program, the helper sets a
+ * 		counter internal to the BPF infrastructure, that is used to
+ * 		apply the last verdict to the next *bytes*. If *bytes* is
+ * 		smaller than the current data being processed from a
+ * 		**sendmsg**\ () or **sendfile**\ () system call, the first
+ * 		*bytes* will be sent and the eBPF program will be re-run with
+ * 		the pointer for start of data pointing to byte number *bytes*
+ * 		**+ 1**. If *bytes* is larger than the current data being
+ * 		processed, then the eBPF verdict will be applied to multiple
+ * 		**sendmsg**\ () or **sendfile**\ () calls until *bytes* are
+ * 		consumed.
+ *
+ * 		Note that if a socket closes with the internal counter holding
+ * 		a non-zero value, this is not a problem because data is not
+ * 		being buffered for *bytes* and is sent as it is received.
+ * 	Return
+ * 		0
+ *
+ * long bpf_msg_cork_bytes(struct sk_msg_buff *msg, u32 bytes)
+ * 	Description
+ * 		For socket policies, prevent the execution of the verdict eBPF
+ * 		program for message *msg* until *bytes* (byte number) have been
+ * 		accumulated.
+ *
+ * 		This can be used when one needs a specific number of bytes
+ * 		before a verdict can be assigned, even if the data spans
+ * 		multiple **sendmsg**\ () or **sendfile**\ () calls. The extreme
+ * 		case would be a user calling **sendmsg**\ () repeatedly with
+ * 		1-byte long message segments. Obviously, this is bad for
+ * 		performance, but it is still valid. If the eBPF program needs
+ * 		*bytes* bytes to validate a header, this helper can be used to
+ * 		prevent the eBPF program to be called again until *bytes* have
+ * 		been accumulated.
+ * 	Return
+ * 		0
+ *
+ * long bpf_msg_pull_data(struct sk_msg_buff *msg, u32 start, u32 end, u64 flags)
+ * 	Description
+ * 		For socket policies, pull in non-linear data from user space
+ * 		for *msg* and set pointers *msg*\ **->data** and *msg*\
+ * 		**->data_end** to *start* and *end* bytes offsets into *msg*,
+ * 		respectively.
+ *
+ * 		If a program of type **BPF_PROG_TYPE_SK_MSG** is run on a
+ * 		*msg* it can only parse data that the (**data**, **data_end**)
+ * 		pointers have already consumed. For **sendmsg**\ () hooks this
+ * 		is likely the first scatterlist element. But for calls relying
+ * 		on the **sendpage** handler (e.g. **sendfile**\ ()) this will
+ * 		be the range (**0**, **0**) because the data is shared with
+ * 		user space and by default the objective is to avoid allowing
+ * 		user space to modify data while (or after) eBPF verdict is
+ * 		being decided. This helper can be used to pull in data and to
+ * 		set the start and end pointer to given values. Data will be
+ * 		copied if necessary (i.e. if data was not linear and if start
+ * 		and end pointers do not point to the same chunk).
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ *
+ * 		All values for *flags* are reserved for future usage, and must
+ * 		be left at zero.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_bind(struct bpf_sock_addr *ctx, struct sockaddr *addr, int addr_len)
+ * 	Description
+ * 		Bind the socket associated to *ctx* to the address pointed by
+ * 		*addr*, of length *addr_len*. This allows for making outgoing
+ * 		connection from the desired IP address, which can be useful for
+ * 		example when all processes inside a cgroup should use one
+ * 		single IP address on a host that has multiple IP configured.
+ *
+ * 		This helper works for IPv4 and IPv6, TCP and UDP sockets. The
+ * 		domain (*addr*\ **->sa_family**) must be **AF_INET** (or
+ * 		**AF_INET6**). It's advised to pass zero port (**sin_port**
+ * 		or **sin6_port**) which triggers IP_BIND_ADDRESS_NO_PORT-like
+ * 		behavior and lets the kernel efficiently pick up an unused
+ * 		port as long as 4-tuple is unique. Passing non-zero port might
+ * 		lead to degraded performance.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_xdp_adjust_tail(struct xdp_buff *xdp_md, int delta)
+ * 	Description
+ * 		Adjust (move) *xdp_md*\ **->data_end** by *delta* bytes. It is
+ * 		possible to both shrink and grow the packet tail.
+ * 		Shrink done via *delta* being a negative integer.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_skb_get_xfrm_state(struct sk_buff *skb, u32 index, struct bpf_xfrm_state *xfrm_state, u32 size, u64 flags)
+ * 	Description
+ * 		Retrieve the XFRM state (IP transform framework, see also
+ * 		**ip-xfrm(8)**) at *index* in XFRM "security path" for *skb*.
+ *
+ * 		The retrieved value is stored in the **struct bpf_xfrm_state**
+ * 		pointed by *xfrm_state* and of length *size*.
+ *
+ * 		All values for *flags* are reserved for future usage, and must
+ * 		be left at zero.
+ *
+ * 		This helper is available only if the kernel was compiled with
+ * 		**CONFIG_XFRM** configuration option.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_get_stack(void *ctx, void *buf, u32 size, u64 flags)
+ * 	Description
+ * 		Return a user or a kernel stack in bpf program provided buffer.
+ * 		To achieve this, the helper needs *ctx*, which is a pointer
+ * 		to the context on which the tracing program is executed.
+ * 		To store the stacktrace, the bpf program provides *buf* with
+ * 		a nonnegative *size*.
+ *
+ * 		The last argument, *flags*, holds the number of stack frames to
+ * 		skip (from 0 to 255), masked with
+ * 		**BPF_F_SKIP_FIELD_MASK**. The next bits can be used to set
+ * 		the following flags:
+ *
+ * 		**BPF_F_USER_STACK**
+ * 			Collect a user space stack instead of a kernel stack.
+ * 		**BPF_F_USER_BUILD_ID**
+ * 			Collect buildid+offset instead of ips for user stack,
+ * 			only valid if **BPF_F_USER_STACK** is also specified.
+ *
+ * 		**bpf_get_stack**\ () can collect up to
+ * 		**PERF_MAX_STACK_DEPTH** both kernel and user frames, subject
+ * 		to sufficient large buffer size. Note that
+ * 		this limit can be controlled with the **sysctl** program, and
+ * 		that it should be manually increased in order to profile long
+ * 		user stacks (such as stacks for Java programs). To do so, use:
+ *
+ * 		::
+ *
+ * 			# sysctl kernel.perf_event_max_stack=<new value>
+ * 	Return
+ * 		A non-negative value equal to or less than *size* on success,
+ * 		or a negative error in case of failure.
+ *
+ * long bpf_skb_load_bytes_relative(const void *skb, u32 offset, void *to, u32 len, u32 start_header)
+ * 	Description
+ * 		This helper is similar to **bpf_skb_load_bytes**\ () in that
+ * 		it provides an easy way to load *len* bytes from *offset*
+ * 		from the packet associated to *skb*, into the buffer pointed
+ * 		by *to*. The difference to **bpf_skb_load_bytes**\ () is that
+ * 		a fifth argument *start_header* exists in order to select a
+ * 		base offset to start from. *start_header* can be one of:
+ *
+ * 		**BPF_HDR_START_MAC**
+ * 			Base offset to load data from is *skb*'s mac header.
+ * 		**BPF_HDR_START_NET**
+ * 			Base offset to load data from is *skb*'s network header.
+ *
+ * 		In general, "direct packet access" is the preferred method to
+ * 		access packet data, however, this helper is in particular useful
+ * 		in socket filters where *skb*\ **->data** does not always point
+ * 		to the start of the mac header and where "direct packet access"
+ * 		is not available.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_fib_lookup(void *ctx, struct bpf_fib_lookup *params, int plen, u32 flags)
+ *	Description
+ *		Do FIB lookup in kernel tables using parameters in *params*.
+ *		If lookup is successful and result shows packet is to be
+ *		forwarded, the neighbor tables are searched for the nexthop.
+ *		If successful (ie., FIB lookup shows forwarding and nexthop
+ *		is resolved), the nexthop address is returned in ipv4_dst
+ *		or ipv6_dst based on family, smac is set to mac address of
+ *		egress device, dmac is set to nexthop mac address, rt_metric
+ *		is set to metric from route (IPv4/IPv6 only), and ifindex
+ *		is set to the device index of the nexthop from the FIB lookup.
+ *
+ *		*plen* argument is the size of the passed in struct.
+ *		*flags* argument can be a combination of one or more of the
+ *		following values:
+ *
+ *		**BPF_FIB_LOOKUP_DIRECT**
+ *			Do a direct table lookup vs full lookup using FIB
+ *			rules.
+ *		**BPF_FIB_LOOKUP_OUTPUT**
+ *			Perform lookup from an egress perspective (default is
+ *			ingress).
+ *
+ *		*ctx* is either **struct xdp_md** for XDP programs or
+ *		**struct sk_buff** tc cls_act programs.
+ *	Return
+ *		* < 0 if any input argument is invalid
+ *		*   0 on success (packet is forwarded, nexthop neighbor exists)
+ *		* > 0 one of **BPF_FIB_LKUP_RET_** codes explaining why the
+ *		  packet is not forwarded or needs assist from full stack
+ *
+ * long bpf_sock_hash_update(struct bpf_sock_ops *skops, struct bpf_map *map, void *key, u64 flags)
+ *	Description
+ *		Add an entry to, or update a sockhash *map* referencing sockets.
+ *		The *skops* is used as a new value for the entry associated to
+ *		*key*. *flags* is one of:
+ *
+ *		**BPF_NOEXIST**
+ *			The entry for *key* must not exist in the map.
+ *		**BPF_EXIST**
+ *			The entry for *key* must already exist in the map.
+ *		**BPF_ANY**
+ *			No condition on the existence of the entry for *key*.
+ *
+ *		If the *map* has eBPF programs (parser and verdict), those will
+ *		be inherited by the socket being added. If the socket is
+ *		already attached to eBPF programs, this results in an error.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_msg_redirect_hash(struct sk_msg_buff *msg, struct bpf_map *map, void *key, u64 flags)
+ *	Description
+ *		This helper is used in programs implementing policies at the
+ *		socket level. If the message *msg* is allowed to pass (i.e. if
+ *		the verdict eBPF program returns **SK_PASS**), redirect it to
+ *		the socket referenced by *map* (of type
+ *		**BPF_MAP_TYPE_SOCKHASH**) using hash *key*. Both ingress and
+ *		egress interfaces can be used for redirection. The
+ *		**BPF_F_INGRESS** value in *flags* is used to make the
+ *		distinction (ingress path is selected if the flag is present,
+ *		egress path otherwise). This is the only flag supported for now.
+ *	Return
+ *		**SK_PASS** on success, or **SK_DROP** on error.
+ *
+ * long bpf_sk_redirect_hash(struct sk_buff *skb, struct bpf_map *map, void *key, u64 flags)
+ *	Description
+ *		This helper is used in programs implementing policies at the
+ *		skb socket level. If the sk_buff *skb* is allowed to pass (i.e.
+ *		if the verdict eBPF program returns **SK_PASS**), redirect it
+ *		to the socket referenced by *map* (of type
+ *		**BPF_MAP_TYPE_SOCKHASH**) using hash *key*. Both ingress and
+ *		egress interfaces can be used for redirection. The
+ *		**BPF_F_INGRESS** value in *flags* is used to make the
+ *		distinction (ingress path is selected if the flag is present,
+ *		egress otherwise). This is the only flag supported for now.
+ *	Return
+ *		**SK_PASS** on success, or **SK_DROP** on error.
+ *
+ * long bpf_lwt_push_encap(struct sk_buff *skb, u32 type, void *hdr, u32 len)
+ *	Description
+ *		Encapsulate the packet associated to *skb* within a Layer 3
+ *		protocol header. This header is provided in the buffer at
+ *		address *hdr*, with *len* its size in bytes. *type* indicates
+ *		the protocol of the header and can be one of:
+ *
+ *		**BPF_LWT_ENCAP_SEG6**
+ *			IPv6 encapsulation with Segment Routing Header
+ *			(**struct ipv6_sr_hdr**). *hdr* only contains the SRH,
+ *			the IPv6 header is computed by the kernel.
+ *		**BPF_LWT_ENCAP_SEG6_INLINE**
+ *			Only works if *skb* contains an IPv6 packet. Insert a
+ *			Segment Routing Header (**struct ipv6_sr_hdr**) inside
+ *			the IPv6 header.
+ *		**BPF_LWT_ENCAP_IP**
+ *			IP encapsulation (GRE/GUE/IPIP/etc). The outer header
+ *			must be IPv4 or IPv6, followed by zero or more
+ *			additional headers, up to **LWT_BPF_MAX_HEADROOM**
+ *			total bytes in all prepended headers. Please note that
+ *			if **skb_is_gso**\ (*skb*) is true, no more than two
+ *			headers can be prepended, and the inner header, if
+ *			present, should be either GRE or UDP/GUE.
+ *
+ *		**BPF_LWT_ENCAP_SEG6**\ \* types can be called by BPF programs
+ *		of type **BPF_PROG_TYPE_LWT_IN**; **BPF_LWT_ENCAP_IP** type can
+ *		be called by bpf programs of types **BPF_PROG_TYPE_LWT_IN** and
+ *		**BPF_PROG_TYPE_LWT_XMIT**.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ *	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_lwt_seg6_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len)
+ *	Description
+ *		Store *len* bytes from address *from* into the packet
+ *		associated to *skb*, at *offset*. Only the flags, tag and TLVs
+ *		inside the outermost IPv6 Segment Routing Header can be
+ *		modified through this helper.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ *	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_lwt_seg6_adjust_srh(struct sk_buff *skb, u32 offset, s32 delta)
+ *	Description
+ *		Adjust the size allocated to TLVs in the outermost IPv6
+ *		Segment Routing Header contained in the packet associated to
+ *		*skb*, at position *offset* by *delta* bytes. Only offsets
+ *		after the segments are accepted. *delta* can be as well
+ *		positive (growing) as negative (shrinking).
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ *	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_lwt_seg6_action(struct sk_buff *skb, u32 action, void *param, u32 param_len)
+ *	Description
+ *		Apply an IPv6 Segment Routing action of type *action* to the
+ *		packet associated to *skb*. Each action takes a parameter
+ *		contained at address *param*, and of length *param_len* bytes.
+ *		*action* can be one of:
+ *
+ *		**SEG6_LOCAL_ACTION_END_X**
+ *			End.X action: Endpoint with Layer-3 cross-connect.
+ *			Type of *param*: **struct in6_addr**.
+ *		**SEG6_LOCAL_ACTION_END_T**
+ *			End.T action: Endpoint with specific IPv6 table lookup.
+ *			Type of *param*: **int**.
+ *		**SEG6_LOCAL_ACTION_END_B6**
+ *			End.B6 action: Endpoint bound to an SRv6 policy.
+ *			Type of *param*: **struct ipv6_sr_hdr**.
+ *		**SEG6_LOCAL_ACTION_END_B6_ENCAP**
+ *			End.B6.Encap action: Endpoint bound to an SRv6
+ *			encapsulation policy.
+ *			Type of *param*: **struct ipv6_sr_hdr**.
+ *
+ * 		A call to this helper is susceptible to change the underlying
+ * 		packet buffer. Therefore, at load time, all checks on pointers
+ * 		previously done by the verifier are invalidated and must be
+ * 		performed again, if the helper is used in combination with
+ * 		direct packet access.
+ *	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_rc_repeat(void *ctx)
+ *	Description
+ *		This helper is used in programs implementing IR decoding, to
+ *		report a successfully decoded repeat key message. This delays
+ *		the generation of a key up event for previously generated
+ *		key down event.
+ *
+ *		Some IR protocols like NEC have a special IR message for
+ *		repeating last button, for when a button is held down.
+ *
+ *		The *ctx* should point to the lirc sample as passed into
+ *		the program.
+ *
+ *		This helper is only available is the kernel was compiled with
+ *		the **CONFIG_BPF_LIRC_MODE2** configuration option set to
+ *		"**y**".
+ *	Return
+ *		0
+ *
+ * long bpf_rc_keydown(void *ctx, u32 protocol, u64 scancode, u32 toggle)
+ *	Description
+ *		This helper is used in programs implementing IR decoding, to
+ *		report a successfully decoded key press with *scancode*,
+ *		*toggle* value in the given *protocol*. The scancode will be
+ *		translated to a keycode using the rc keymap, and reported as
+ *		an input key down event. After a period a key up event is
+ *		generated. This period can be extended by calling either
+ *		**bpf_rc_keydown**\ () again with the same values, or calling
+ *		**bpf_rc_repeat**\ ().
+ *
+ *		Some protocols include a toggle bit, in case the button was
+ *		released and pressed again between consecutive scancodes.
+ *
+ *		The *ctx* should point to the lirc sample as passed into
+ *		the program.
+ *
+ *		The *protocol* is the decoded protocol number (see
+ *		**enum rc_proto** for some predefined values).
+ *
+ *		This helper is only available is the kernel was compiled with
+ *		the **CONFIG_BPF_LIRC_MODE2** configuration option set to
+ *		"**y**".
+ *	Return
+ *		0
+ *
+ * u64 bpf_skb_cgroup_id(struct sk_buff *skb)
+ * 	Description
+ * 		Return the cgroup v2 id of the socket associated with the *skb*.
+ * 		This is roughly similar to the **bpf_get_cgroup_classid**\ ()
+ * 		helper for cgroup v1 by providing a tag resp. identifier that
+ * 		can be matched on or used for map lookups e.g. to implement
+ * 		policy. The cgroup v2 id of a given path in the hierarchy is
+ * 		exposed in user space through the f_handle API in order to get
+ * 		to the same 64-bit id.
+ *
+ * 		This helper can be used on TC egress path, but not on ingress,
+ * 		and is available only if the kernel was compiled with the
+ * 		**CONFIG_SOCK_CGROUP_DATA** configuration option.
+ * 	Return
+ * 		The id is returned or 0 in case the id could not be retrieved.
+ *
+ * u64 bpf_get_current_cgroup_id(void)
+ * 	Return
+ * 		A 64-bit integer containing the current cgroup id based
+ * 		on the cgroup within which the current task is running.
+ *
+ * void *bpf_get_local_storage(void *map, u64 flags)
+ *	Description
+ *		Get the pointer to the local storage area.
+ *		The type and the size of the local storage is defined
+ *		by the *map* argument.
+ *		The *flags* meaning is specific for each map type,
+ *		and has to be 0 for cgroup local storage.
+ *
+ *		Depending on the BPF program type, a local storage area
+ *		can be shared between multiple instances of the BPF program,
+ *		running simultaneously.
+ *
+ *		A user should care about the synchronization by himself.
+ *		For example, by using the **BPF_STX_XADD** instruction to alter
+ *		the shared data.
+ *	Return
+ *		A pointer to the local storage area.
+ *
+ * long bpf_sk_select_reuseport(struct sk_reuseport_md *reuse, struct bpf_map *map, void *key, u64 flags)
+ *	Description
+ *		Select a **SO_REUSEPORT** socket from a
+ *		**BPF_MAP_TYPE_REUSEPORT_ARRAY** *map*.
+ *		It checks the selected socket is matching the incoming
+ *		request in the socket buffer.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
+ *
+ * u64 bpf_skb_ancestor_cgroup_id(struct sk_buff *skb, int ancestor_level)
+ *	Description
+ *		Return id of cgroup v2 that is ancestor of cgroup associated
+ *		with the *skb* at the *ancestor_level*.  The root cgroup is at
+ *		*ancestor_level* zero and each step down the hierarchy
+ *		increments the level. If *ancestor_level* == level of cgroup
+ *		associated with *skb*, then return value will be same as that
+ *		of **bpf_skb_cgroup_id**\ ().
+ *
+ *		The helper is useful to implement policies based on cgroups
+ *		that are upper in hierarchy than immediate cgroup associated
+ *		with *skb*.
+ *
+ *		The format of returned id and helper limitations are same as in
+ *		**bpf_skb_cgroup_id**\ ().
+ *	Return
+ *		The id is returned or 0 in case the id could not be retrieved.
+ *
+ * struct bpf_sock *bpf_sk_lookup_tcp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
+ *	Description
+ *		Look for TCP socket matching *tuple*, optionally in a child
+ *		network namespace *netns*. The return value must be checked,
+ *		and if non-**NULL**, released via **bpf_sk_release**\ ().
+ *
+ *		The *ctx* should point to the context of the program, such as
+ *		the skb or socket (depending on the hook in use). This is used
+ *		to determine the base network namespace for the lookup.
+ *
+ *		*tuple_size* must be one of:
+ *
+ *		**sizeof**\ (*tuple*\ **->ipv4**)
+ *			Look for an IPv4 socket.
+ *		**sizeof**\ (*tuple*\ **->ipv6**)
+ *			Look for an IPv6 socket.
+ *
+ *		If the *netns* is a negative signed 32-bit integer, then the
+ *		socket lookup table in the netns associated with the *ctx*
+ *		will be used. For the TC hooks, this is the netns of the device
+ *		in the skb. For socket hooks, this is the netns of the socket.
+ *		If *netns* is any other signed 32-bit value greater than or
+ *		equal to zero then it specifies the ID of the netns relative to
+ *		the netns associated with the *ctx*. *netns* values beyond the
+ *		range of 32-bit integers are reserved for future use.
+ *
+ *		All values for *flags* are reserved for future usage, and must
+ *		be left at zero.
+ *
+ *		This helper is available only if the kernel was compiled with
+ *		**CONFIG_NET** configuration option.
+ *	Return
+ *		Pointer to **struct bpf_sock**, or **NULL** in case of failure.
+ *		For sockets with reuseport option, the **struct bpf_sock**
+ *		result is from *reuse*\ **->socks**\  using the hash of the
+ *		tuple.
+ *
+ * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
+ *	Description
+ *		Look for UDP socket matching *tuple*, optionally in a child
+ *		network namespace *netns*. The return value must be checked,
+ *		and if non-**NULL**, released via **bpf_sk_release**\ ().
+ *
+ *		The *ctx* should point to the context of the program, such as
+ *		the skb or socket (depending on the hook in use). This is used
+ *		to determine the base network namespace for the lookup.
+ *
+ *		*tuple_size* must be one of:
+ *
+ *		**sizeof**\ (*tuple*\ **->ipv4**)
+ *			Look for an IPv4 socket.
+ *		**sizeof**\ (*tuple*\ **->ipv6**)
+ *			Look for an IPv6 socket.
+ *
+ *		If the *netns* is a negative signed 32-bit integer, then the
+ *		socket lookup table in the netns associated with the *ctx*
+ *		will be used. For the TC hooks, this is the netns of the device
+ *		in the skb. For socket hooks, this is the netns of the socket.
+ *		If *netns* is any other signed 32-bit value greater than or
+ *		equal to zero then it specifies the ID of the netns relative to
+ *		the netns associated with the *ctx*. *netns* values beyond the
+ *		range of 32-bit integers are reserved for future use.
+ *
+ *		All values for *flags* are reserved for future usage, and must
+ *		be left at zero.
+ *
+ *		This helper is available only if the kernel was compiled with
+ *		**CONFIG_NET** configuration option.
+ *	Return
+ *		Pointer to **struct bpf_sock**, or **NULL** in case of failure.
+ *		For sockets with reuseport option, the **struct bpf_sock**
+ *		result is from *reuse*\ **->socks**\  using the hash of the
+ *		tuple.
+ *
+ * long bpf_sk_release(void *sock)
+ *	Description
+ *		Release the reference held by *sock*. *sock* must be a
+ *		non-**NULL** pointer that was returned from
+ *		**bpf_sk_lookup_xxx**\ ().
+ *	Return
+ *		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_map_push_elem(struct bpf_map *map, const void *value, u64 flags)
+ * 	Description
+ * 		Push an element *value* in *map*. *flags* is one of:
+ *
+ * 		**BPF_EXIST**
+ * 			If the queue/stack is full, the oldest element is
+ * 			removed to make room for this.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_map_pop_elem(struct bpf_map *map, void *value)
+ * 	Description
+ * 		Pop an element from *map*.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_map_peek_elem(struct bpf_map *map, void *value)
+ * 	Description
+ * 		Get an element from *map* without removing it.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_msg_push_data(struct sk_msg_buff *msg, u32 start, u32 len, u64 flags)
+ *	Description
+ *		For socket policies, insert *len* bytes into *msg* at offset
+ *		*start*.
+ *
+ *		If a program of type **BPF_PROG_TYPE_SK_MSG** is run on a
+ *		*msg* it may want to insert metadata or options into the *msg*.
+ *		This can later be read and used by any of the lower layer BPF
+ *		hooks.
+ *
+ *		This helper may fail if under memory pressure (a malloc
+ *		fails) in these cases BPF programs will get an appropriate
+ *		error and BPF programs will need to handle them.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_msg_pop_data(struct sk_msg_buff *msg, u32 start, u32 len, u64 flags)
+ *	Description
+ *		Will remove *len* bytes from a *msg* starting at byte *start*.
+ *		This may result in **ENOMEM** errors under certain situations if
+ *		an allocation and copy are required due to a full ring buffer.
+ *		However, the helper will try to avoid doing the allocation
+ *		if possible. Other errors can occur if input parameters are
+ *		invalid either due to *start* byte not being valid part of *msg*
+ *		payload and/or *pop* value being to large.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_rc_pointer_rel(void *ctx, s32 rel_x, s32 rel_y)
+ *	Description
+ *		This helper is used in programs implementing IR decoding, to
+ *		report a successfully decoded pointer movement.
+ *
+ *		The *ctx* should point to the lirc sample as passed into
+ *		the program.
+ *
+ *		This helper is only available is the kernel was compiled with
+ *		the **CONFIG_BPF_LIRC_MODE2** configuration option set to
+ *		"**y**".
+ *	Return
+ *		0
+ *
+ * long bpf_spin_lock(struct bpf_spin_lock *lock)
+ *	Description
+ *		Acquire a spinlock represented by the pointer *lock*, which is
+ *		stored as part of a value of a map. Taking the lock allows to
+ *		safely update the rest of the fields in that value. The
+ *		spinlock can (and must) later be released with a call to
+ *		**bpf_spin_unlock**\ (\ *lock*\ ).
+ *
+ *		Spinlocks in BPF programs come with a number of restrictions
+ *		and constraints:
+ *
+ *		* **bpf_spin_lock** objects are only allowed inside maps of
+ *		  types **BPF_MAP_TYPE_HASH** and **BPF_MAP_TYPE_ARRAY** (this
+ *		  list could be extended in the future).
+ *		* BTF description of the map is mandatory.
+ *		* The BPF program can take ONE lock at a time, since taking two
+ *		  or more could cause dead locks.
+ *		* Only one **struct bpf_spin_lock** is allowed per map element.
+ *		* When the lock is taken, calls (either BPF to BPF or helpers)
+ *		  are not allowed.
+ *		* The **BPF_LD_ABS** and **BPF_LD_IND** instructions are not
+ *		  allowed inside a spinlock-ed region.
+ *		* The BPF program MUST call **bpf_spin_unlock**\ () to release
+ *		  the lock, on all execution paths, before it returns.
+ *		* The BPF program can access **struct bpf_spin_lock** only via
+ *		  the **bpf_spin_lock**\ () and **bpf_spin_unlock**\ ()
+ *		  helpers. Loading or storing data into the **struct
+ *		  bpf_spin_lock** *lock*\ **;** field of a map is not allowed.
+ *		* To use the **bpf_spin_lock**\ () helper, the BTF description
+ *		  of the map value must be a struct and have **struct
+ *		  bpf_spin_lock** *anyname*\ **;** field at the top level.
+ *		  Nested lock inside another struct is not allowed.
+ *		* The **struct bpf_spin_lock** *lock* field in a map value must
+ *		  be aligned on a multiple of 4 bytes in that value.
+ *		* Syscall with command **BPF_MAP_LOOKUP_ELEM** does not copy
+ *		  the **bpf_spin_lock** field to user space.
+ *		* Syscall with command **BPF_MAP_UPDATE_ELEM**, or update from
+ *		  a BPF program, do not update the **bpf_spin_lock** field.
+ *		* **bpf_spin_lock** cannot be on the stack or inside a
+ *		  networking packet (it can only be inside of a map values).
+ *		* **bpf_spin_lock** is available to root only.
+ *		* Tracing programs and socket filter programs cannot use
+ *		  **bpf_spin_lock**\ () due to insufficient preemption checks
+ *		  (but this may change in the future).
+ *		* **bpf_spin_lock** is not allowed in inner maps of map-in-map.
+ *	Return
+ *		0
+ *
+ * long bpf_spin_unlock(struct bpf_spin_lock *lock)
+ *	Description
+ *		Release the *lock* previously locked by a call to
+ *		**bpf_spin_lock**\ (\ *lock*\ ).
+ *	Return
+ *		0
+ *
+ * struct bpf_sock *bpf_sk_fullsock(struct bpf_sock *sk)
+ *	Description
+ *		This helper gets a **struct bpf_sock** pointer such
+ *		that all the fields in this **bpf_sock** can be accessed.
+ *	Return
+ *		A **struct bpf_sock** pointer on success, or **NULL** in
+ *		case of failure.
+ *
+ * struct bpf_tcp_sock *bpf_tcp_sock(struct bpf_sock *sk)
+ *	Description
+ *		This helper gets a **struct bpf_tcp_sock** pointer from a
+ *		**struct bpf_sock** pointer.
+ *	Return
+ *		A **struct bpf_tcp_sock** pointer on success, or **NULL** in
+ *		case of failure.
+ *
+ * long bpf_skb_ecn_set_ce(struct sk_buff *skb)
+ *	Description
+ *		Set ECN (Explicit Congestion Notification) field of IP header
+ *		to **CE** (Congestion Encountered) if current value is **ECT**
+ *		(ECN Capable Transport). Otherwise, do nothing. Works with IPv6
+ *		and IPv4.
+ *	Return
+ *		1 if the **CE** flag is set (either by the current helper call
+ *		or because it was already present), 0 if it is not set.
+ *
+ * struct bpf_sock *bpf_get_listener_sock(struct bpf_sock *sk)
+ *	Description
+ *		Return a **struct bpf_sock** pointer in **TCP_LISTEN** state.
+ *		**bpf_sk_release**\ () is unnecessary and not allowed.
+ *	Return
+ *		A **struct bpf_sock** pointer on success, or **NULL** in
+ *		case of failure.
+ *
+ * struct bpf_sock *bpf_skc_lookup_tcp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
+ *	Description
+ *		Look for TCP socket matching *tuple*, optionally in a child
+ *		network namespace *netns*. The return value must be checked,
+ *		and if non-**NULL**, released via **bpf_sk_release**\ ().
+ *
+ *		This function is identical to **bpf_sk_lookup_tcp**\ (), except
+ *		that it also returns timewait or request sockets. Use
+ *		**bpf_sk_fullsock**\ () or **bpf_tcp_sock**\ () to access the
+ *		full structure.
+ *
+ *		This helper is available only if the kernel was compiled with
+ *		**CONFIG_NET** configuration option.
+ *	Return
+ *		Pointer to **struct bpf_sock**, or **NULL** in case of failure.
+ *		For sockets with reuseport option, the **struct bpf_sock**
+ *		result is from *reuse*\ **->socks**\  using the hash of the
+ *		tuple.
+ *
+ * long bpf_tcp_check_syncookie(void *sk, void *iph, u32 iph_len, struct tcphdr *th, u32 th_len)
+ * 	Description
+ * 		Check whether *iph* and *th* contain a valid SYN cookie ACK for
+ * 		the listening socket in *sk*.
+ *
+ * 		*iph* points to the start of the IPv4 or IPv6 header, while
+ * 		*iph_len* contains **sizeof**\ (**struct iphdr**) or
+ * 		**sizeof**\ (**struct ip6hdr**).
+ *
+ * 		*th* points to the start of the TCP header, while *th_len*
+ * 		contains **sizeof**\ (**struct tcphdr**).
+ * 	Return
+ * 		0 if *iph* and *th* are a valid SYN cookie ACK, or a negative
+ * 		error otherwise.
+ *
+ * long bpf_sysctl_get_name(struct bpf_sysctl *ctx, char *buf, size_t buf_len, u64 flags)
+ *	Description
+ *		Get name of sysctl in /proc/sys/ and copy it into provided by
+ *		program buffer *buf* of size *buf_len*.
+ *
+ *		The buffer is always NUL terminated, unless it's zero-sized.
+ *
+ *		If *flags* is zero, full name (e.g. "net/ipv4/tcp_mem") is
+ *		copied. Use **BPF_F_SYSCTL_BASE_NAME** flag to copy base name
+ *		only (e.g. "tcp_mem").
+ *	Return
+ *		Number of character copied (not including the trailing NUL).
+ *
+ *		**-E2BIG** if the buffer wasn't big enough (*buf* will contain
+ *		truncated name in this case).
+ *
+ * long bpf_sysctl_get_current_value(struct bpf_sysctl *ctx, char *buf, size_t buf_len)
+ *	Description
+ *		Get current value of sysctl as it is presented in /proc/sys
+ *		(incl. newline, etc), and copy it as a string into provided
+ *		by program buffer *buf* of size *buf_len*.
+ *
+ *		The whole value is copied, no matter what file position user
+ *		space issued e.g. sys_read at.
+ *
+ *		The buffer is always NUL terminated, unless it's zero-sized.
+ *	Return
+ *		Number of character copied (not including the trailing NUL).
+ *
+ *		**-E2BIG** if the buffer wasn't big enough (*buf* will contain
+ *		truncated name in this case).
+ *
+ *		**-EINVAL** if current value was unavailable, e.g. because
+ *		sysctl is uninitialized and read returns -EIO for it.
+ *
+ * long bpf_sysctl_get_new_value(struct bpf_sysctl *ctx, char *buf, size_t buf_len)
+ *	Description
+ *		Get new value being written by user space to sysctl (before
+ *		the actual write happens) and copy it as a string into
+ *		provided by program buffer *buf* of size *buf_len*.
+ *
+ *		User space may write new value at file position > 0.
+ *
+ *		The buffer is always NUL terminated, unless it's zero-sized.
+ *	Return
+ *		Number of character copied (not including the trailing NUL).
+ *
+ *		**-E2BIG** if the buffer wasn't big enough (*buf* will contain
+ *		truncated name in this case).
+ *
+ *		**-EINVAL** if sysctl is being read.
+ *
+ * long bpf_sysctl_set_new_value(struct bpf_sysctl *ctx, const char *buf, size_t buf_len)
+ *	Description
+ *		Override new value being written by user space to sysctl with
+ *		value provided by program in buffer *buf* of size *buf_len*.
+ *
+ *		*buf* should contain a string in same form as provided by user
+ *		space on sysctl write.
+ *
+ *		User space may write new value at file position > 0. To override
+ *		the whole sysctl value file position should be set to zero.
+ *	Return
+ *		0 on success.
+ *
+ *		**-E2BIG** if the *buf_len* is too big.
+ *
+ *		**-EINVAL** if sysctl is being read.
+ *
+ * long bpf_strtol(const char *buf, size_t buf_len, u64 flags, long *res)
+ *	Description
+ *		Convert the initial part of the string from buffer *buf* of
+ *		size *buf_len* to a long integer according to the given base
+ *		and save the result in *res*.
+ *
+ *		The string may begin with an arbitrary amount of white space
+ *		(as determined by **isspace**\ (3)) followed by a single
+ *		optional '**-**' sign.
+ *
+ *		Five least significant bits of *flags* encode base, other bits
+ *		are currently unused.
+ *
+ *		Base must be either 8, 10, 16 or 0 to detect it automatically
+ *		similar to user space **strtol**\ (3).
+ *	Return
+ *		Number of characters consumed on success. Must be positive but
+ *		no more than *buf_len*.
+ *
+ *		**-EINVAL** if no valid digits were found or unsupported base
+ *		was provided.
+ *
+ *		**-ERANGE** if resulting value was out of range.
+ *
+ * long bpf_strtoul(const char *buf, size_t buf_len, u64 flags, unsigned long *res)
+ *	Description
+ *		Convert the initial part of the string from buffer *buf* of
+ *		size *buf_len* to an unsigned long integer according to the
+ *		given base and save the result in *res*.
+ *
+ *		The string may begin with an arbitrary amount of white space
+ *		(as determined by **isspace**\ (3)).
+ *
+ *		Five least significant bits of *flags* encode base, other bits
+ *		are currently unused.
+ *
+ *		Base must be either 8, 10, 16 or 0 to detect it automatically
+ *		similar to user space **strtoul**\ (3).
+ *	Return
+ *		Number of characters consumed on success. Must be positive but
+ *		no more than *buf_len*.
+ *
+ *		**-EINVAL** if no valid digits were found or unsupported base
+ *		was provided.
+ *
+ *		**-ERANGE** if resulting value was out of range.
+ *
+ * void *bpf_sk_storage_get(struct bpf_map *map, void *sk, void *value, u64 flags)
+ *	Description
+ *		Get a bpf-local-storage from a *sk*.
+ *
+ *		Logically, it could be thought of getting the value from
+ *		a *map* with *sk* as the **key**.  From this
+ *		perspective,  the usage is not much different from
+ *		**bpf_map_lookup_elem**\ (*map*, **&**\ *sk*) except this
+ *		helper enforces the key must be a full socket and the map must
+ *		be a **BPF_MAP_TYPE_SK_STORAGE** also.
+ *
+ *		Underneath, the value is stored locally at *sk* instead of
+ *		the *map*.  The *map* is used as the bpf-local-storage
+ *		"type". The bpf-local-storage "type" (i.e. the *map*) is
+ *		searched against all bpf-local-storages residing at *sk*.
+ *
+ *		*sk* is a kernel **struct sock** pointer for LSM program.
+ *		*sk* is a **struct bpf_sock** pointer for other program types.
+ *
+ *		An optional *flags* (**BPF_SK_STORAGE_GET_F_CREATE**) can be
+ *		used such that a new bpf-local-storage will be
+ *		created if one does not exist.  *value* can be used
+ *		together with **BPF_SK_STORAGE_GET_F_CREATE** to specify
+ *		the initial value of a bpf-local-storage.  If *value* is
+ *		**NULL**, the new bpf-local-storage will be zero initialized.
+ *	Return
+ *		A bpf-local-storage pointer is returned on success.
+ *
+ *		**NULL** if not found or there was an error in adding
+ *		a new bpf-local-storage.
+ *
+ * long bpf_sk_storage_delete(struct bpf_map *map, void *sk)
+ *	Description
+ *		Delete a bpf-local-storage from a *sk*.
+ *	Return
+ *		0 on success.
+ *
+ *		**-ENOENT** if the bpf-local-storage cannot be found.
+ *		**-EINVAL** if sk is not a fullsock (e.g. a request_sock).
+ *
+ * long bpf_send_signal(u32 sig)
+ *	Description
+ *		Send signal *sig* to the process of the current task.
+ *		The signal may be delivered to any of this process's threads.
+ *	Return
+ *		0 on success or successfully queued.
+ *
+ *		**-EBUSY** if work queue under nmi is full.
+ *
+ *		**-EINVAL** if *sig* is invalid.
+ *
+ *		**-EPERM** if no permission to send the *sig*.
+ *
+ *		**-EAGAIN** if bpf program can try again.
+ *
+ * s64 bpf_tcp_gen_syncookie(void *sk, void *iph, u32 iph_len, struct tcphdr *th, u32 th_len)
+ *	Description
+ *		Try to issue a SYN cookie for the packet with corresponding
+ *		IP/TCP headers, *iph* and *th*, on the listening socket in *sk*.
+ *
+ *		*iph* points to the start of the IPv4 or IPv6 header, while
+ *		*iph_len* contains **sizeof**\ (**struct iphdr**) or
+ *		**sizeof**\ (**struct ip6hdr**).
+ *
+ *		*th* points to the start of the TCP header, while *th_len*
+ *		contains the length of the TCP header.
+ *	Return
+ *		On success, lower 32 bits hold the generated SYN cookie in
+ *		followed by 16 bits which hold the MSS value for that cookie,
+ *		and the top 16 bits are unused.
+ *
+ *		On failure, the returned value is one of the following:
+ *
+ *		**-EINVAL** SYN cookie cannot be issued due to error
+ *
+ *		**-ENOENT** SYN cookie should not be issued (no SYN flood)
+ *
+ *		**-EOPNOTSUPP** kernel configuration does not enable SYN cookies
+ *
+ *		**-EPROTONOSUPPORT** IP packet version is not 4 or 6
+ *
+ * long bpf_skb_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
+ * 	Description
+ * 		Write raw *data* blob into a special BPF perf event held by
+ * 		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
+ * 		event must have the following attributes: **PERF_SAMPLE_RAW**
+ * 		as **sample_type**, **PERF_TYPE_SOFTWARE** as **type**, and
+ * 		**PERF_COUNT_SW_BPF_OUTPUT** as **config**.
+ *
+ * 		The *flags* are used to indicate the index in *map* for which
+ * 		the value must be put, masked with **BPF_F_INDEX_MASK**.
+ * 		Alternatively, *flags* can be set to **BPF_F_CURRENT_CPU**
+ * 		to indicate that the index of the current CPU core should be
+ * 		used.
+ *
+ * 		The value to write, of *size*, is passed through eBPF stack and
+ * 		pointed by *data*.
+ *
+ * 		*ctx* is a pointer to in-kernel struct sk_buff.
+ *
+ * 		This helper is similar to **bpf_perf_event_output**\ () but
+ * 		restricted to raw_tracepoint bpf programs.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_probe_read_user(void *dst, u32 size, const void *unsafe_ptr)
+ * 	Description
+ * 		Safely attempt to read *size* bytes from user space address
+ * 		*unsafe_ptr* and store the data in *dst*.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_probe_read_kernel(void *dst, u32 size, const void *unsafe_ptr)
+ * 	Description
+ * 		Safely attempt to read *size* bytes from kernel space address
+ * 		*unsafe_ptr* and store the data in *dst*.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_probe_read_user_str(void *dst, u32 size, const void *unsafe_ptr)
+ * 	Description
+ * 		Copy a NUL terminated string from an unsafe user address
+ * 		*unsafe_ptr* to *dst*. The *size* should include the
+ * 		terminating NUL byte. In case the string length is smaller than
+ * 		*size*, the target is not padded with further NUL bytes. If the
+ * 		string length is larger than *size*, just *size*-1 bytes are
+ * 		copied and the last byte is set to NUL.
+ *
+ * 		On success, the length of the copied string is returned. This
+ * 		makes this helper useful in tracing programs for reading
+ * 		strings, and more importantly to get its length at runtime. See
+ * 		the following snippet:
+ *
+ * 		::
+ *
+ * 			SEC("kprobe/sys_open")
+ * 			void bpf_sys_open(struct pt_regs *ctx)
+ * 			{
+ * 			        char bufPATHLEN; // PATHLEN is defined to 256
+ * 			        int res = bpf_probe_read_user_str(buf, sizeof(buf),
+ * 				                                  ctx->di);
+ *
+ * 				// Consume buf, for example push it to
+ * 				// userspace via bpf_perf_event_output(); we
+ * 				// can use res (the string length) as event
+ * 				// size, after checking its boundaries.
+ * 			}
+ *
+ * 		In comparison, using **bpf_probe_read_user**\ () helper here
+ * 		instead to read the string would require to estimate the length
+ * 		at compile time, and would often result in copying more memory
+ * 		than necessary.
+ *
+ * 		Another useful use case is when parsing individual process
+ * 		arguments or individual environment variables navigating
+ * 		*current*\ **->mm->arg_start** and *current*\
+ * 		**->mm->env_start**: using this helper and the return value,
+ * 		one can quickly iterate at the right offset of the memory area.
+ * 	Return
+ * 		On success, the strictly positive length of the string,
+ * 		including the trailing NUL character. On error, a negative
+ * 		value.
+ *
+ * long bpf_probe_read_kernel_str(void *dst, u32 size, const void *unsafe_ptr)
+ * 	Description
+ * 		Copy a NUL terminated string from an unsafe kernel address *unsafe_ptr*
+ * 		to *dst*. Same semantics as with **bpf_probe_read_user_str**\ () apply.
+ * 	Return
+ * 		On success, the strictly positive length of the string, including
+ * 		the trailing NUL character. On error, a negative value.
+ *
+ * long bpf_tcp_send_ack(void *tp, u32 rcv_nxt)
+ *	Description
+ *		Send out a tcp-ack. *tp* is the in-kernel struct **tcp_sock**.
+ *		*rcv_nxt* is the ack_seq to be sent out.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_send_signal_thread(u32 sig)
+ *	Description
+ *		Send signal *sig* to the thread corresponding to the current task.
+ *	Return
+ *		0 on success or successfully queued.
+ *
+ *		**-EBUSY** if work queue under nmi is full.
+ *
+ *		**-EINVAL** if *sig* is invalid.
+ *
+ *		**-EPERM** if no permission to send the *sig*.
+ *
+ *		**-EAGAIN** if bpf program can try again.
+ *
+ * u64 bpf_jiffies64(void)
+ *	Description
+ *		Obtain the 64bit jiffies
+ *	Return
+ *		The 64 bit jiffies
+ *
+ * long bpf_read_branch_records(struct bpf_perf_event_data *ctx, void *buf, u32 size, u64 flags)
+ *	Description
+ *		For an eBPF program attached to a perf event, retrieve the
+ *		branch records (**struct perf_branch_entry**) associated to *ctx*
+ *		and store it in the buffer pointed by *buf* up to size
+ *		*size* bytes.
+ *	Return
+ *		On success, number of bytes written to *buf*. On error, a
+ *		negative value.
+ *
+ *		The *flags* can be set to **BPF_F_GET_BRANCH_RECORDS_SIZE** to
+ *		instead return the number of bytes required to store all the
+ *		branch entries. If this flag is set, *buf* may be NULL.
+ *
+ *		**-EINVAL** if arguments invalid or **size** not a multiple
+ *		of **sizeof**\ (**struct perf_branch_entry**\ ).
+ *
+ *		**-ENOENT** if architecture does not support branch records.
+ *
+ * long bpf_get_ns_current_pid_tgid(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size)
+ *	Description
+ *		Returns 0 on success, values for *pid* and *tgid* as seen from the current
+ *		*namespace* will be returned in *nsdata*.
+ *	Return
+ *		0 on success, or one of the following in case of failure:
+ *
+ *		**-EINVAL** if dev and inum supplied don't match dev_t and inode number
+ *              with nsfs of current task, or if dev conversion to dev_t lost high bits.
+ *
+ *		**-ENOENT** if pidns does not exists for the current task.
+ *
+ * long bpf_xdp_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
+ *	Description
+ *		Write raw *data* blob into a special BPF perf event held by
+ *		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
+ *		event must have the following attributes: **PERF_SAMPLE_RAW**
+ *		as **sample_type**, **PERF_TYPE_SOFTWARE** as **type**, and
+ *		**PERF_COUNT_SW_BPF_OUTPUT** as **config**.
+ *
+ *		The *flags* are used to indicate the index in *map* for which
+ *		the value must be put, masked with **BPF_F_INDEX_MASK**.
+ *		Alternatively, *flags* can be set to **BPF_F_CURRENT_CPU**
+ *		to indicate that the index of the current CPU core should be
+ *		used.
+ *
+ *		The value to write, of *size*, is passed through eBPF stack and
+ *		pointed by *data*.
+ *
+ *		*ctx* is a pointer to in-kernel struct xdp_buff.
+ *
+ *		This helper is similar to **bpf_perf_eventoutput**\ () but
+ *		restricted to raw_tracepoint bpf programs.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
+ *
+ * u64 bpf_get_netns_cookie(void *ctx)
+ * 	Description
+ * 		Retrieve the cookie (generated by the kernel) of the network
+ * 		namespace the input *ctx* is associated with. The network
+ * 		namespace cookie remains stable for its lifetime and provides
+ * 		a global identifier that can be assumed unique. If *ctx* is
+ * 		NULL, then the helper returns the cookie for the initial
+ * 		network namespace. The cookie itself is very similar to that
+ * 		of **bpf_get_socket_cookie**\ () helper, but for network
+ * 		namespaces instead of sockets.
+ * 	Return
+ * 		A 8-byte long opaque number.
+ *
+ * u64 bpf_get_current_ancestor_cgroup_id(int ancestor_level)
+ * 	Description
+ * 		Return id of cgroup v2 that is ancestor of the cgroup associated
+ * 		with the current task at the *ancestor_level*. The root cgroup
+ * 		is at *ancestor_level* zero and each step down the hierarchy
+ * 		increments the level. If *ancestor_level* == level of cgroup
+ * 		associated with the current task, then return value will be the
+ * 		same as that of **bpf_get_current_cgroup_id**\ ().
+ *
+ * 		The helper is useful to implement policies based on cgroups
+ * 		that are upper in hierarchy than immediate cgroup associated
+ * 		with the current task.
+ *
+ * 		The format of returned id and helper limitations are same as in
+ * 		**bpf_get_current_cgroup_id**\ ().
+ * 	Return
+ * 		The id is returned or 0 in case the id could not be retrieved.
+ *
+ * long bpf_sk_assign(struct sk_buff *skb, void *sk, u64 flags)
+ *	Description
+ *		Helper is overloaded depending on BPF program type. This
+ *		description applies to **BPF_PROG_TYPE_SCHED_CLS** and
+ *		**BPF_PROG_TYPE_SCHED_ACT** programs.
+ *
+ *		Assign the *sk* to the *skb*. When combined with appropriate
+ *		routing configuration to receive the packet towards the socket,
+ *		will cause *skb* to be delivered to the specified socket.
+ *		Subsequent redirection of *skb* via  **bpf_redirect**\ (),
+ *		**bpf_clone_redirect**\ () or other methods outside of BPF may
+ *		interfere with successful delivery to the socket.
+ *
+ *		This operation is only valid from TC ingress path.
+ *
+ *		The *flags* argument must be zero.
+ *	Return
+ *		0 on success, or a negative error in case of failure:
+ *
+ *		**-EINVAL** if specified *flags* are not supported.
+ *
+ *		**-ENOENT** if the socket is unavailable for assignment.
+ *
+ *		**-ENETUNREACH** if the socket is unreachable (wrong netns).
+ *
+ *		**-EOPNOTSUPP** if the operation is not supported, for example
+ *		a call from outside of TC ingress.
+ *
+ *		**-ESOCKTNOSUPPORT** if the socket type is not supported
+ *		(reuseport).
+ *
+ * long bpf_sk_assign(struct bpf_sk_lookup *ctx, struct bpf_sock *sk, u64 flags)
+ *	Description
+ *		Helper is overloaded depending on BPF program type. This
+ *		description applies to **BPF_PROG_TYPE_SK_LOOKUP** programs.
+ *
+ *		Select the *sk* as a result of a socket lookup.
+ *
+ *		For the operation to succeed passed socket must be compatible
+ *		with the packet description provided by the *ctx* object.
+ *
+ *		L4 protocol (**IPPROTO_TCP** or **IPPROTO_UDP**) must
+ *		be an exact match. While IP family (**AF_INET** or
+ *		**AF_INET6**) must be compatible, that is IPv6 sockets
+ *		that are not v6-only can be selected for IPv4 packets.
+ *
+ *		Only TCP listeners and UDP unconnected sockets can be
+ *		selected. *sk* can also be NULL to reset any previous
+ *		selection.
+ *
+ *		*flags* argument can combination of following values:
+ *
+ *		* **BPF_SK_LOOKUP_F_REPLACE** to override the previous
+ *		  socket selection, potentially done by a BPF program
+ *		  that ran before us.
+ *
+ *		* **BPF_SK_LOOKUP_F_NO_REUSEPORT** to skip
+ *		  load-balancing within reuseport group for the socket
+ *		  being selected.
+ *
+ *		On success *ctx->sk* will point to the selected socket.
+ *
+ *	Return
+ *		0 on success, or a negative errno in case of failure.
+ *
+ *		* **-EAFNOSUPPORT** if socket family (*sk->family*) is
+ *		  not compatible with packet family (*ctx->family*).
+ *
+ *		* **-EEXIST** if socket has been already selected,
+ *		  potentially by another program, and
+ *		  **BPF_SK_LOOKUP_F_REPLACE** flag was not specified.
+ *
+ *		* **-EINVAL** if unsupported flags were specified.
+ *
+ *		* **-EPROTOTYPE** if socket L4 protocol
+ *		  (*sk->protocol*) doesn't match packet protocol
+ *		  (*ctx->protocol*).
+ *
+ *		* **-ESOCKTNOSUPPORT** if socket is not in allowed
+ *		  state (TCP listening or UDP unconnected).
+ *
+ * u64 bpf_ktime_get_boot_ns(void)
+ * 	Description
+ * 		Return the time elapsed since system boot, in nanoseconds.
+ * 		Does include the time the system was suspended.
+ * 		See: **clock_gettime**\ (**CLOCK_BOOTTIME**)
+ * 	Return
+ * 		Current *ktime*.
+ *
+ * long bpf_seq_printf(struct seq_file *m, const char *fmt, u32 fmt_size, const void *data, u32 data_len)
+ * 	Description
+ * 		**bpf_seq_printf**\ () uses seq_file **seq_printf**\ () to print
+ * 		out the format string.
+ * 		The *m* represents the seq_file. The *fmt* and *fmt_size* are for
+ * 		the format string itself. The *data* and *data_len* are format string
+ * 		arguments. The *data* are a **u64** array and corresponding format string
+ * 		values are stored in the array. For strings and pointers where pointees
+ * 		are accessed, only the pointer values are stored in the *data* array.
+ * 		The *data_len* is the size of *data* in bytes.
+ *
+ *		Formats **%s**, **%p{i,I}{4,6}** requires to read kernel memory.
+ *		Reading kernel memory may fail due to either invalid address or
+ *		valid address but requiring a major memory fault. If reading kernel memory
+ *		fails, the string for **%s** will be an empty string, and the ip
+ *		address for **%p{i,I}{4,6}** will be 0. Not returning error to
+ *		bpf program is consistent with what **bpf_trace_printk**\ () does for now.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure:
+ *
+ *		**-EBUSY** if per-CPU memory copy buffer is busy, can try again
+ *		by returning 1 from bpf program.
+ *
+ *		**-EINVAL** if arguments are invalid, or if *fmt* is invalid/unsupported.
+ *
+ *		**-E2BIG** if *fmt* contains too many format specifiers.
+ *
+ *		**-EOVERFLOW** if an overflow happened: The same object will be tried again.
+ *
+ * long bpf_seq_write(struct seq_file *m, const void *data, u32 len)
+ * 	Description
+ * 		**bpf_seq_write**\ () uses seq_file **seq_write**\ () to write the data.
+ * 		The *m* represents the seq_file. The *data* and *len* represent the
+ * 		data to write in bytes.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure:
+ *
+ *		**-EOVERFLOW** if an overflow happened: The same object will be tried again.
+ *
+ * u64 bpf_sk_cgroup_id(void *sk)
+ *	Description
+ *		Return the cgroup v2 id of the socket *sk*.
+ *
+ *		*sk* must be a non-**NULL** pointer to a socket, e.g. one
+ *		returned from **bpf_sk_lookup_xxx**\ (),
+ *		**bpf_sk_fullsock**\ (), etc. The format of returned id is
+ *		same as in **bpf_skb_cgroup_id**\ ().
+ *
+ *		This helper is available only if the kernel was compiled with
+ *		the **CONFIG_SOCK_CGROUP_DATA** configuration option.
+ *	Return
+ *		The id is returned or 0 in case the id could not be retrieved.
+ *
+ * u64 bpf_sk_ancestor_cgroup_id(void *sk, int ancestor_level)
+ *	Description
+ *		Return id of cgroup v2 that is ancestor of cgroup associated
+ *		with the *sk* at the *ancestor_level*.  The root cgroup is at
+ *		*ancestor_level* zero and each step down the hierarchy
+ *		increments the level. If *ancestor_level* == level of cgroup
+ *		associated with *sk*, then return value will be same as that
+ *		of **bpf_sk_cgroup_id**\ ().
+ *
+ *		The helper is useful to implement policies based on cgroups
+ *		that are upper in hierarchy than immediate cgroup associated
+ *		with *sk*.
+ *
+ *		The format of returned id and helper limitations are same as in
+ *		**bpf_sk_cgroup_id**\ ().
+ *	Return
+ *		The id is returned or 0 in case the id could not be retrieved.
+ *
+ * long bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags)
+ * 	Description
+ * 		Copy *size* bytes from *data* into a ring buffer *ringbuf*.
+ * 		If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
+ * 		of new data availability is sent.
+ * 		If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
+ * 		of new data availability is sent unconditionally.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * void *bpf_ringbuf_reserve(void *ringbuf, u64 size, u64 flags)
+ * 	Description
+ * 		Reserve *size* bytes of payload in a ring buffer *ringbuf*.
+ * 	Return
+ * 		Valid pointer with *size* bytes of memory available; NULL,
+ * 		otherwise.
+ *
+ * void bpf_ringbuf_submit(void *data, u64 flags)
+ * 	Description
+ * 		Submit reserved ring buffer sample, pointed to by *data*.
+ * 		If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
+ * 		of new data availability is sent.
+ * 		If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
+ * 		of new data availability is sent unconditionally.
+ * 	Return
+ * 		Nothing. Always succeeds.
+ *
+ * void bpf_ringbuf_discard(void *data, u64 flags)
+ * 	Description
+ * 		Discard reserved ring buffer sample, pointed to by *data*.
+ * 		If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
+ * 		of new data availability is sent.
+ * 		If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
+ * 		of new data availability is sent unconditionally.
+ * 	Return
+ * 		Nothing. Always succeeds.
+ *
+ * u64 bpf_ringbuf_query(void *ringbuf, u64 flags)
+ *	Description
+ *		Query various characteristics of provided ring buffer. What
+ *		exactly is queries is determined by *flags*:
+ *
+ *		* **BPF_RB_AVAIL_DATA**: Amount of data not yet consumed.
+ *		* **BPF_RB_RING_SIZE**: The size of ring buffer.
+ *		* **BPF_RB_CONS_POS**: Consumer position (can wrap around).
+ *		* **BPF_RB_PROD_POS**: Producer(s) position (can wrap around).
+ *
+ *		Data returned is just a momentary snapshot of actual values
+ *		and could be inaccurate, so this facility should be used to
+ *		power heuristics and for reporting, not to make 100% correct
+ *		calculation.
+ *	Return
+ *		Requested value, or 0, if *flags* are not recognized.
+ *
+ * long bpf_csum_level(struct sk_buff *skb, u64 level)
+ * 	Description
+ * 		Change the skbs checksum level by one layer up or down, or
+ * 		reset it entirely to none in order to have the stack perform
+ * 		checksum validation. The level is applicable to the following
+ * 		protocols: TCP, UDP, GRE, SCTP, FCOE. For example, a decap of
+ * 		| ETH | IP | UDP | GUE | IP | TCP | into | ETH | IP | TCP |
+ * 		through **bpf_skb_adjust_room**\ () helper with passing in
+ * 		**BPF_F_ADJ_ROOM_NO_CSUM_RESET** flag would require one	call
+ * 		to **bpf_csum_level**\ () with **BPF_CSUM_LEVEL_DEC** since
+ * 		the UDP header is removed. Similarly, an encap of the latter
+ * 		into the former could be accompanied by a helper call to
+ * 		**bpf_csum_level**\ () with **BPF_CSUM_LEVEL_INC** if the
+ * 		skb is still intended to be processed in higher layers of the
+ * 		stack instead of just egressing at tc.
+ *
+ * 		There are three supported level settings at this time:
+ *
+ * 		* **BPF_CSUM_LEVEL_INC**: Increases skb->csum_level for skbs
+ * 		  with CHECKSUM_UNNECESSARY.
+ * 		* **BPF_CSUM_LEVEL_DEC**: Decreases skb->csum_level for skbs
+ * 		  with CHECKSUM_UNNECESSARY.
+ * 		* **BPF_CSUM_LEVEL_RESET**: Resets skb->csum_level to 0 and
+ * 		  sets CHECKSUM_NONE to force checksum validation by the stack.
+ * 		* **BPF_CSUM_LEVEL_QUERY**: No-op, returns the current
+ * 		  skb->csum_level.
+ * 	Return
+ * 		0 on success, or a negative error in case of failure. In the
+ * 		case of **BPF_CSUM_LEVEL_QUERY**, the current skb->csum_level
+ * 		is returned or the error code -EACCES in case the skb is not
+ * 		subject to CHECKSUM_UNNECESSARY.
+ *
+ * struct tcp6_sock *bpf_skc_to_tcp6_sock(void *sk)
+ *	Description
+ *		Dynamically cast a *sk* pointer to a *tcp6_sock* pointer.
+ *	Return
+ *		*sk* if casting is valid, or **NULL** otherwise.
+ *
+ * struct tcp_sock *bpf_skc_to_tcp_sock(void *sk)
+ *	Description
+ *		Dynamically cast a *sk* pointer to a *tcp_sock* pointer.
+ *	Return
+ *		*sk* if casting is valid, or **NULL** otherwise.
+ *
+ * struct tcp_timewait_sock *bpf_skc_to_tcp_timewait_sock(void *sk)
+ * 	Description
+ *		Dynamically cast a *sk* pointer to a *tcp_timewait_sock* pointer.
+ *	Return
+ *		*sk* if casting is valid, or **NULL** otherwise.
+ *
+ * struct tcp_request_sock *bpf_skc_to_tcp_request_sock(void *sk)
+ * 	Description
+ *		Dynamically cast a *sk* pointer to a *tcp_request_sock* pointer.
+ *	Return
+ *		*sk* if casting is valid, or **NULL** otherwise.
+ *
+ * struct udp6_sock *bpf_skc_to_udp6_sock(void *sk)
+ * 	Description
+ *		Dynamically cast a *sk* pointer to a *udp6_sock* pointer.
+ *	Return
+ *		*sk* if casting is valid, or **NULL** otherwise.
+ *
+ * long bpf_get_task_stack(struct task_struct *task, void *buf, u32 size, u64 flags)
+ *	Description
+ *		Return a user or a kernel stack in bpf program provided buffer.
+ *		To achieve this, the helper needs *task*, which is a valid
+ *		pointer to **struct task_struct**. To store the stacktrace, the
+ *		bpf program provides *buf* with a nonnegative *size*.
+ *
+ *		The last argument, *flags*, holds the number of stack frames to
+ *		skip (from 0 to 255), masked with
+ *		**BPF_F_SKIP_FIELD_MASK**. The next bits can be used to set
+ *		the following flags:
+ *
+ *		**BPF_F_USER_STACK**
+ *			Collect a user space stack instead of a kernel stack.
+ *		**BPF_F_USER_BUILD_ID**
+ *			Collect buildid+offset instead of ips for user stack,
+ *			only valid if **BPF_F_USER_STACK** is also specified.
+ *
+ *		**bpf_get_task_stack**\ () can collect up to
+ *		**PERF_MAX_STACK_DEPTH** both kernel and user frames, subject
+ *		to sufficient large buffer size. Note that
+ *		this limit can be controlled with the **sysctl** program, and
+ *		that it should be manually increased in order to profile long
+ *		user stacks (such as stacks for Java programs). To do so, use:
+ *
+ *		::
+ *
+ *			# sysctl kernel.perf_event_max_stack=<new value>
+ *	Return
+ *		A non-negative value equal to or less than *size* on success,
+ *		or a negative error in case of failure.
+ *
+ * long bpf_load_hdr_opt(struct bpf_sock_ops *skops, void *searchby_res, u32 len, u64 flags)
+ *	Description
+ *		Load header option.  Support reading a particular TCP header
+ *		option for bpf program (**BPF_PROG_TYPE_SOCK_OPS**).
+ *
+ *		If *flags* is 0, it will search the option from the
+ *		*skops*\ **->skb_data**.  The comment in **struct bpf_sock_ops**
+ *		has details on what skb_data contains under different
+ *		*skops*\ **->op**.
+ *
+ *		The first byte of the *searchby_res* specifies the
+ *		kind that it wants to search.
+ *
+ *		If the searching kind is an experimental kind
+ *		(i.e. 253 or 254 according to RFC6994).  It also
+ *		needs to specify the "magic" which is either
+ *		2 bytes or 4 bytes.  It then also needs to
+ *		specify the size of the magic by using
+ *		the 2nd byte which is "kind-length" of a TCP
+ *		header option and the "kind-length" also
+ *		includes the first 2 bytes "kind" and "kind-length"
+ *		itself as a normal TCP header option also does.
+ *
+ *		For example, to search experimental kind 254 with
+ *		2 byte magic 0xeB9F, the searchby_res should be
+ *		 254, 4, 0xeB, 0x9F, 0, 0, .... 0 .
+ *
+ *		To search for the standard window scale option (3),
+ *		the *searchby_res* should be  3, 0, 0, .... 0 .
+ *		Note, kind-length must be 0 for regular option.
+ *
+ *		Searching for No-Op (0) and End-of-Option-List (1) are
+ *		not supported.
+ *
+ *		*len* must be at least 2 bytes which is the minimal size
+ *		of a header option.
+ *
+ *		Supported flags:
+ *
+ *		* **BPF_LOAD_HDR_OPT_TCP_SYN** to search from the
+ *		  saved_syn packet or the just-received syn packet.
+ *
+ *	Return
+ *		> 0 when found, the header option is copied to *searchby_res*.
+ *		The return value is the total length copied. On failure, a
+ *		negative error code is returned:
+ *
+ *		**-EINVAL** if a parameter is invalid.
+ *
+ *		**-ENOMSG** if the option is not found.
+ *
+ *		**-ENOENT** if no syn packet is available when
+ *		**BPF_LOAD_HDR_OPT_TCP_SYN** is used.
+ *
+ *		**-ENOSPC** if there is not enough space.  Only *len* number of
+ *		bytes are copied.
+ *
+ *		**-EFAULT** on failure to parse the header options in the
+ *		packet.
+ *
+ *		**-EPERM** if the helper cannot be used under the current
+ *		*skops*\ **->op**.
+ *
+ * long bpf_store_hdr_opt(struct bpf_sock_ops *skops, const void *from, u32 len, u64 flags)
+ *	Description
+ *		Store header option.  The data will be copied
+ *		from buffer *from* with length *len* to the TCP header.
+ *
+ *		The buffer *from* should have the whole option that
+ *		includes the kind, kind-length, and the actual
+ *		option data.  The *len* must be at least kind-length
+ *		long.  The kind-length does not have to be 4 byte
+ *		aligned.  The kernel will take care of the padding
+ *		and setting the 4 bytes aligned value to th->doff.
+ *
+ *		This helper will check for duplicated option
+ *		by searching the same option in the outgoing skb.
+ *
+ *		This helper can only be called during
+ *		**BPF_SOCK_OPS_WRITE_HDR_OPT_CB**.
+ *
+ *	Return
+ *		0 on success, or negative error in case of failure:
+ *
+ *		**-EINVAL** If param is invalid.
+ *
+ *		**-ENOSPC** if there is not enough space in the header.
+ *		Nothing has been written
+ *
+ *		**-EEXIST** if the option already exists.
+ *
+ *		**-EFAULT** on failrue to parse the existing header options.
+ *
+ *		**-EPERM** if the helper cannot be used under the current
+ *		*skops*\ **->op**.
+ *
+ * long bpf_reserve_hdr_opt(struct bpf_sock_ops *skops, u32 len, u64 flags)
+ *	Description
+ *		Reserve *len* bytes for the bpf header option.  The
+ *		space will be used by **bpf_store_hdr_opt**\ () later in
+ *		**BPF_SOCK_OPS_WRITE_HDR_OPT_CB**.
+ *
+ *		If **bpf_reserve_hdr_opt**\ () is called multiple times,
+ *		the total number of bytes will be reserved.
+ *
+ *		This helper can only be called during
+ *		**BPF_SOCK_OPS_HDR_OPT_LEN_CB**.
+ *
+ *	Return
+ *		0 on success, or negative error in case of failure:
+ *
+ *		**-EINVAL** if a parameter is invalid.
+ *
+ *		**-ENOSPC** if there is not enough space in the header.
+ *
+ *		**-EPERM** if the helper cannot be used under the current
+ *		*skops*\ **->op**.
+ *
+ * void *bpf_inode_storage_get(struct bpf_map *map, void *inode, void *value, u64 flags)
+ *	Description
+ *		Get a bpf_local_storage from an *inode*.
+ *
+ *		Logically, it could be thought of as getting the value from
+ *		a *map* with *inode* as the **key**.  From this
+ *		perspective,  the usage is not much different from
+ *		**bpf_map_lookup_elem**\ (*map*, **&**\ *inode*) except this
+ *		helper enforces the key must be an inode and the map must also
+ *		be a **BPF_MAP_TYPE_INODE_STORAGE**.
+ *
+ *		Underneath, the value is stored locally at *inode* instead of
+ *		the *map*.  The *map* is used as the bpf-local-storage
+ *		"type". The bpf-local-storage "type" (i.e. the *map*) is
+ *		searched against all bpf_local_storage residing at *inode*.
+ *
+ *		An optional *flags* (**BPF_LOCAL_STORAGE_GET_F_CREATE**) can be
+ *		used such that a new bpf_local_storage will be
+ *		created if one does not exist.  *value* can be used
+ *		together with **BPF_LOCAL_STORAGE_GET_F_CREATE** to specify
+ *		the initial value of a bpf_local_storage.  If *value* is
+ *		**NULL**, the new bpf_local_storage will be zero initialized.
+ *	Return
+ *		A bpf_local_storage pointer is returned on success.
+ *
+ *		**NULL** if not found or there was an error in adding
+ *		a new bpf_local_storage.
+ *
+ * int bpf_inode_storage_delete(struct bpf_map *map, void *inode)
+ *	Description
+ *		Delete a bpf_local_storage from an *inode*.
+ *	Return
+ *		0 on success.
+ *
+ *		**-ENOENT** if the bpf_local_storage cannot be found.
+ *
+ * long bpf_d_path(struct path *path, char *buf, u32 sz)
+ *	Description
+ *		Return full path for given **struct path** object, which
+ *		needs to be the kernel BTF *path* object. The path is
+ *		returned in the provided buffer *buf* of size *sz* and
+ *		is zero terminated.
+ *
+ *	Return
+ *		On success, the strictly positive length of the string,
+ *		including the trailing NUL character. On error, a negative
+ *		value.
+ *
+ * long bpf_copy_from_user(void *dst, u32 size, const void *user_ptr)
+ * 	Description
+ * 		Read *size* bytes from user space address *user_ptr* and store
+ * 		the data in *dst*. This is a wrapper of **copy_from_user**\ ().
+ * 	Return
+ * 		0 on success, or a negative error in case of failure.
+ *
+ * long bpf_snprintf_btf(char *str, u32 str_size, struct btf_ptr *ptr, u32 btf_ptr_size, u64 flags)
+ *	Description
+ *		Use BTF to store a string representation of *ptr*->ptr in *str*,
+ *		using *ptr*->type_id.  This value should specify the type
+ *		that *ptr*->ptr points to. LLVM __builtin_btf_type_id(type, 1)
+ *		can be used to look up vmlinux BTF type ids. Traversing the
+ *		data structure using BTF, the type information and values are
+ *		stored in the first *str_size* - 1 bytes of *str*.  Safe copy of
+ *		the pointer data is carried out to avoid kernel crashes during
+ *		operation.  Smaller types can use string space on the stack;
+ *		larger programs can use map data to store the string
+ *		representation.
+ *
+ *		The string can be subsequently shared with userspace via
+ *		bpf_perf_event_output() or ring buffer interfaces.
+ *		bpf_trace_printk() is to be avoided as it places too small
+ *		a limit on string size to be useful.
+ *
+ *		*flags* is a combination of
+ *
+ *		**BTF_F_COMPACT**
+ *			no formatting around type information
+ *		**BTF_F_NONAME**
+ *			no struct/union member names/types
+ *		**BTF_F_PTR_RAW**
+ *			show raw (unobfuscated) pointer values;
+ *			equivalent to printk specifier %px.
+ *		**BTF_F_ZERO**
+ *			show zero-valued struct/union members; they
+ *			are not displayed by default
+ *
+ *	Return
+ *		The number of bytes that were written (or would have been
+ *		written if output had to be truncated due to string size),
+ *		or a negative error in cases of failure.
+ *
+ * long bpf_seq_printf_btf(struct seq_file *m, struct btf_ptr *ptr, u32 ptr_size, u64 flags)
+ *	Description
+ *		Use BTF to write to seq_write a string representation of
+ *		*ptr*->ptr, using *ptr*->type_id as per bpf_snprintf_btf().
+ *		*flags* are identical to those used for bpf_snprintf_btf.
+ *	Return
+ *		0 on success or a negative error in case of failure.
+ *
+ * u64 bpf_skb_cgroup_classid(struct sk_buff *skb)
+ * 	Description
+ * 		See **bpf_get_cgroup_classid**\ () for the main description.
+ * 		This helper differs from **bpf_get_cgroup_classid**\ () in that
+ * 		the cgroup v1 net_cls class is retrieved only from the *skb*'s
+ * 		associated socket instead of the current process.
+ * 	Return
+ * 		The id is returned or 0 in case the id could not be retrieved.
+ *
+ * long bpf_redirect_neigh(u32 ifindex, struct bpf_redir_neigh *params, int plen, u64 flags)
+ * 	Description
+ * 		Redirect the packet to another net device of index *ifindex*
+ * 		and fill in L2 addresses from neighboring subsystem. This helper
+ * 		is somewhat similar to **bpf_redirect**\ (), except that it
+ * 		populates L2 addresses as well, meaning, internally, the helper
+ * 		relies on the neighbor lookup for the L2 address of the nexthop.
+ *
+ * 		The helper will perform a FIB lookup based on the skb's
+ * 		networking header to get the address of the next hop, unless
+ * 		this is supplied by the caller in the *params* argument. The
+ * 		*plen* argument indicates the len of *params* and should be set
+ * 		to 0 if *params* is NULL.
+ *
+ * 		The *flags* argument is reserved and must be 0. The helper is
+ * 		currently only supported for tc BPF program types, and enabled
+ * 		for IPv4 and IPv6 protocols.
+ * 	Return
+ * 		The helper returns **TC_ACT_REDIRECT** on success or
+ * 		**TC_ACT_SHOT** on error.
+ *
+ * void *bpf_per_cpu_ptr(const void *percpu_ptr, u32 cpu)
+ *     Description
+ *             Take a pointer to a percpu ksym, *percpu_ptr*, and return a
+ *             pointer to the percpu kernel variable on *cpu*. A ksym is an
+ *             extern variable decorated with '__ksym'. For ksym, there is a
+ *             global var (either static or global) defined of the same name
+ *             in the kernel. The ksym is percpu if the global var is percpu.
+ *             The returned pointer points to the global percpu var on *cpu*.
+ *
+ *             bpf_per_cpu_ptr() has the same semantic as per_cpu_ptr() in the
+ *             kernel, except that bpf_per_cpu_ptr() may return NULL. This
+ *             happens if *cpu* is larger than nr_cpu_ids. The caller of
+ *             bpf_per_cpu_ptr() must check the returned value.
+ *     Return
+ *             A pointer pointing to the kernel percpu variable on *cpu*, or
+ *             NULL, if *cpu* is invalid.
+ *
+ * void *bpf_this_cpu_ptr(const void *percpu_ptr)
+ *	Description
+ *		Take a pointer to a percpu ksym, *percpu_ptr*, and return a
+ *		pointer to the percpu kernel variable on this cpu. See the
+ *		description of 'ksym' in **bpf_per_cpu_ptr**\ ().
+ *
+ *		bpf_this_cpu_ptr() has the same semantic as this_cpu_ptr() in
+ *		the kernel. Different from **bpf_per_cpu_ptr**\ (), it would
+ *		never return NULL.
+ *	Return
+ *		A pointer pointing to the kernel percpu variable on this cpu.
+ *
+ * long bpf_redirect_peer(u32 ifindex, u64 flags)
+ * 	Description
+ * 		Redirect the packet to another net device of index *ifindex*.
+ * 		This helper is somewhat similar to **bpf_redirect**\ (), except
+ * 		that the redirection happens to the *ifindex*' peer device and
+ * 		the netns switch takes place from ingress to ingress without
+ * 		going through the CPU's backlog queue.
+ *
+ * 		The *flags* argument is reserved and must be 0. The helper is
+ * 		currently only supported for tc BPF program types at the ingress
+ * 		hook and for veth device types. The peer device must reside in a
+ * 		different network namespace.
+ * 	Return
+ * 		The helper returns **TC_ACT_REDIRECT** on success or
+ * 		**TC_ACT_SHOT** on error.
+ *
+ * void *bpf_task_storage_get(struct bpf_map *map, struct task_struct *task, void *value, u64 flags)
+ *	Description
+ *		Get a bpf_local_storage from the *task*.
+ *
+ *		Logically, it could be thought of as getting the value from
+ *		a *map* with *task* as the **key**.  From this
+ *		perspective,  the usage is not much different from
+ *		**bpf_map_lookup_elem**\ (*map*, **&**\ *task*) except this
+ *		helper enforces the key must be an task_struct and the map must also
+ *		be a **BPF_MAP_TYPE_TASK_STORAGE**.
+ *
+ *		Underneath, the value is stored locally at *task* instead of
+ *		the *map*.  The *map* is used as the bpf-local-storage
+ *		"type". The bpf-local-storage "type" (i.e. the *map*) is
+ *		searched against all bpf_local_storage residing at *task*.
+ *
+ *		An optional *flags* (**BPF_LOCAL_STORAGE_GET_F_CREATE**) can be
+ *		used such that a new bpf_local_storage will be
+ *		created if one does not exist.  *value* can be used
+ *		together with **BPF_LOCAL_STORAGE_GET_F_CREATE** to specify
+ *		the initial value of a bpf_local_storage.  If *value* is
+ *		**NULL**, the new bpf_local_storage will be zero initialized.
+ *	Return
+ *		A bpf_local_storage pointer is returned on success.
+ *
+ *		**NULL** if not found or there was an error in adding
+ *		a new bpf_local_storage.
+ *
+ * long bpf_task_storage_delete(struct bpf_map *map, struct task_struct *task)
+ *	Description
+ *		Delete a bpf_local_storage from a *task*.
+ *	Return
+ *		0 on success.
+ *
+ *		**-ENOENT** if the bpf_local_storage cannot be found.
+ *
+ * struct task_struct *bpf_get_current_task_btf(void)
+ *	Description
+ *		Return a BTF pointer to the "current" task.
+ *		This pointer can also be used in helpers that accept an
+ *		*ARG_PTR_TO_BTF_ID* of type *task_struct*.
+ *	Return
+ *		Pointer to the current task.
+ *
+ * long bpf_bprm_opts_set(struct linux_binprm *bprm, u64 flags)
+ *	Description
+ *		Set or clear certain options on *bprm*:
+ *
+ *		**BPF_F_BPRM_SECUREEXEC** Set the secureexec bit
+ *		which sets the **AT_SECURE** auxv for glibc. The bit
+ *		is cleared if the flag is not specified.
+ *	Return
+ *		**-EINVAL** if invalid *flags* are passed, zero otherwise.
+ *
+ * u64 bpf_ktime_get_coarse_ns(void)
+ * 	Description
+ * 		Return a coarse-grained version of the time elapsed since
+ * 		system boot, in nanoseconds. Does not include time the system
+ * 		was suspended.
+ *
+ * 		See: **clock_gettime**\ (**CLOCK_MONOTONIC_COARSE**)
+ * 	Return
+ * 		Current *ktime*.
+ *
+ * long bpf_ima_inode_hash(struct inode *inode, void *dst, u32 size)
+ *	Description
+ *		Returns the stored IMA hash of the *inode* (if it's avaialable).
+ *		If the hash is larger than *size*, then only *size*
+ *		bytes will be copied to *dst*
+ *	Return
+ *		The **hash_algo** is returned on success,
+ *		**-EOPNOTSUP** if IMA is disabled or **-EINVAL** if
+ *		invalid arguments are passed.
+ *
+ * struct socket *bpf_sock_from_file(struct file *file)
+ *	Description
+ *		If the given file represents a socket, returns the associated
+ *		socket.
+ *	Return
+ *		A pointer to a struct socket on success or NULL if the file is
+ *		not a socket.
+ */
+#define __BPF_FUNC_MAPPER(FN)		\
+	FN(unspec),			\
+	FN(map_lookup_elem),		\
+	FN(map_update_elem),		\
+	FN(map_delete_elem),		\
+	FN(probe_read),			\
+	FN(ktime_get_ns),		\
+	FN(trace_printk),		\
+	FN(get_prandom_u32),		\
+	FN(get_smp_processor_id),	\
+	FN(skb_store_bytes),		\
+	FN(l3_csum_replace),		\
+	FN(l4_csum_replace),		\
+	FN(tail_call),			\
+	FN(clone_redirect),		\
+	FN(get_current_pid_tgid),	\
+	FN(get_current_uid_gid),	\
+	FN(get_current_comm),		\
+	FN(get_cgroup_classid),		\
+	FN(skb_vlan_push),		\
+	FN(skb_vlan_pop),		\
+	FN(skb_get_tunnel_key),		\
+	FN(skb_set_tunnel_key),		\
+	FN(perf_event_read),		\
+	FN(redirect),			\
+	FN(get_route_realm),		\
+	FN(perf_event_output),		\
+	FN(skb_load_bytes),		\
+	FN(get_stackid),		\
+	FN(csum_diff),			\
+	FN(skb_get_tunnel_opt),		\
+	FN(skb_set_tunnel_opt),		\
+	FN(skb_change_proto),		\
+	FN(skb_change_type),		\
+	FN(skb_under_cgroup),		\
+	FN(get_hash_recalc),		\
+	FN(get_current_task),		\
+	FN(probe_write_user),		\
+	FN(current_task_under_cgroup),	\
+	FN(skb_change_tail),		\
+	FN(skb_pull_data),		\
+	FN(csum_update),		\
+	FN(set_hash_invalid),		\
+	FN(get_numa_node_id),		\
+	FN(skb_change_head),		\
+	FN(xdp_adjust_head),		\
+	FN(probe_read_str),		\
+	FN(get_socket_cookie),		\
+	FN(get_socket_uid),		\
+	FN(set_hash),			\
+	FN(setsockopt),			\
+	FN(skb_adjust_room),		\
+	FN(redirect_map),		\
+	FN(sk_redirect_map),		\
+	FN(sock_map_update),		\
+	FN(xdp_adjust_meta),		\
+	FN(perf_event_read_value),	\
+	FN(perf_prog_read_value),	\
+	FN(getsockopt),			\
+	FN(override_return),		\
+	FN(sock_ops_cb_flags_set),	\
+	FN(msg_redirect_map),		\
+	FN(msg_apply_bytes),		\
+	FN(msg_cork_bytes),		\
+	FN(msg_pull_data),		\
+	FN(bind),			\
+	FN(xdp_adjust_tail),		\
+	FN(skb_get_xfrm_state),		\
+	FN(get_stack),			\
+	FN(skb_load_bytes_relative),	\
+	FN(fib_lookup),			\
+	FN(sock_hash_update),		\
+	FN(msg_redirect_hash),		\
+	FN(sk_redirect_hash),		\
+	FN(lwt_push_encap),		\
+	FN(lwt_seg6_store_bytes),	\
+	FN(lwt_seg6_adjust_srh),	\
+	FN(lwt_seg6_action),		\
+	FN(rc_repeat),			\
+	FN(rc_keydown),			\
+	FN(skb_cgroup_id),		\
+	FN(get_current_cgroup_id),	\
+	FN(get_local_storage),		\
+	FN(sk_select_reuseport),	\
+	FN(skb_ancestor_cgroup_id),	\
+	FN(sk_lookup_tcp),		\
+	FN(sk_lookup_udp),		\
+	FN(sk_release),			\
+	FN(map_push_elem),		\
+	FN(map_pop_elem),		\
+	FN(map_peek_elem),		\
+	FN(msg_push_data),		\
+	FN(msg_pop_data),		\
+	FN(rc_pointer_rel),		\
+	FN(spin_lock),			\
+	FN(spin_unlock),		\
+	FN(sk_fullsock),		\
+	FN(tcp_sock),			\
+	FN(skb_ecn_set_ce),		\
+	FN(get_listener_sock),		\
+	FN(skc_lookup_tcp),		\
+	FN(tcp_check_syncookie),	\
+	FN(sysctl_get_name),		\
+	FN(sysctl_get_current_value),	\
+	FN(sysctl_get_new_value),	\
+	FN(sysctl_set_new_value),	\
+	FN(strtol),			\
+	FN(strtoul),			\
+	FN(sk_storage_get),		\
+	FN(sk_storage_delete),		\
+	FN(send_signal),		\
+	FN(tcp_gen_syncookie),		\
+	FN(skb_output),			\
+	FN(probe_read_user),		\
+	FN(probe_read_kernel),		\
+	FN(probe_read_user_str),	\
+	FN(probe_read_kernel_str),	\
+	FN(tcp_send_ack),		\
+	FN(send_signal_thread),		\
+	FN(jiffies64),			\
+	FN(read_branch_records),	\
+	FN(get_ns_current_pid_tgid),	\
+	FN(xdp_output),			\
+	FN(get_netns_cookie),		\
+	FN(get_current_ancestor_cgroup_id),	\
+	FN(sk_assign),			\
+	FN(ktime_get_boot_ns),		\
+	FN(seq_printf),			\
+	FN(seq_write),			\
+	FN(sk_cgroup_id),		\
+	FN(sk_ancestor_cgroup_id),	\
+	FN(ringbuf_output),		\
+	FN(ringbuf_reserve),		\
+	FN(ringbuf_submit),		\
+	FN(ringbuf_discard),		\
+	FN(ringbuf_query),		\
+	FN(csum_level),			\
+	FN(skc_to_tcp6_sock),		\
+	FN(skc_to_tcp_sock),		\
+	FN(skc_to_tcp_timewait_sock),	\
+	FN(skc_to_tcp_request_sock),	\
+	FN(skc_to_udp6_sock),		\
+	FN(get_task_stack),		\
+	FN(load_hdr_opt),		\
+	FN(store_hdr_opt),		\
+	FN(reserve_hdr_opt),		\
+	FN(inode_storage_get),		\
+	FN(inode_storage_delete),	\
+	FN(d_path),			\
+	FN(copy_from_user),		\
+	FN(snprintf_btf),		\
+	FN(seq_printf_btf),		\
+	FN(skb_cgroup_classid),		\
+	FN(redirect_neigh),		\
+	FN(per_cpu_ptr),		\
+	FN(this_cpu_ptr),		\
+	FN(redirect_peer),		\
+	FN(task_storage_get),		\
+	FN(task_storage_delete),	\
+	FN(get_current_task_btf),	\
+	FN(bprm_opts_set),		\
+	FN(ktime_get_coarse_ns),	\
+	FN(ima_inode_hash),		\
+	FN(sock_from_file),		\
+	/* */
+
+/* integer value in 'imm' field of BPF_CALL instruction selects which helper
+ * function eBPF program intends to call
+ */
+#define __BPF_ENUM_FN(x) BPF_FUNC_ ## x
+enum bpf_func_id {
+	__BPF_FUNC_MAPPER(__BPF_ENUM_FN)
+	__BPF_FUNC_MAX_ID,
+};
+#undef __BPF_ENUM_FN
+
+/* All flags used by eBPF helper functions, placed here. */
+
+/* BPF_FUNC_skb_store_bytes flags. */
+enum {
+	BPF_F_RECOMPUTE_CSUM		= (1ULL << 0),
+	BPF_F_INVALIDATE_HASH		= (1ULL << 1),
+};
+
+/* BPF_FUNC_l3_csum_replace and BPF_FUNC_l4_csum_replace flags.
+ * First 4 bits are for passing the header field size.
+ */
+enum {
+	BPF_F_HDR_FIELD_MASK		= 0xfULL,
+};
+
+/* BPF_FUNC_l4_csum_replace flags. */
+enum {
+	BPF_F_PSEUDO_HDR		= (1ULL << 4),
+	BPF_F_MARK_MANGLED_0		= (1ULL << 5),
+	BPF_F_MARK_ENFORCE		= (1ULL << 6),
+};
+
+/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
+enum {
+	BPF_F_INGRESS			= (1ULL << 0),
+};
+
+/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
+enum {
+	BPF_F_TUNINFO_IPV6		= (1ULL << 0),
+};
+
+/* flags for both BPF_FUNC_get_stackid and BPF_FUNC_get_stack. */
+enum {
+	BPF_F_SKIP_FIELD_MASK		= 0xffULL,
+	BPF_F_USER_STACK		= (1ULL << 8),
+/* flags used by BPF_FUNC_get_stackid only. */
+	BPF_F_FAST_STACK_CMP		= (1ULL << 9),
+	BPF_F_REUSE_STACKID		= (1ULL << 10),
+/* flags used by BPF_FUNC_get_stack only. */
+	BPF_F_USER_BUILD_ID		= (1ULL << 11),
+};
+
+/* BPF_FUNC_skb_set_tunnel_key flags. */
+enum {
+	BPF_F_ZERO_CSUM_TX		= (1ULL << 1),
+	BPF_F_DONT_FRAGMENT		= (1ULL << 2),
+	BPF_F_SEQ_NUMBER		= (1ULL << 3),
+};
+
+/* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and
+ * BPF_FUNC_perf_event_read_value flags.
+ */
+enum {
+	BPF_F_INDEX_MASK		= 0xffffffffULL,
+	BPF_F_CURRENT_CPU		= BPF_F_INDEX_MASK,
+/* BPF_FUNC_perf_event_output for sk_buff input context. */
+	BPF_F_CTXLEN_MASK		= (0xfffffULL << 32),
+};
+
+/* Current network namespace */
+enum {
+	BPF_F_CURRENT_NETNS		= (-1L),
+};
+
+/* BPF_FUNC_csum_level level values. */
+enum {
+	BPF_CSUM_LEVEL_QUERY,
+	BPF_CSUM_LEVEL_INC,
+	BPF_CSUM_LEVEL_DEC,
+	BPF_CSUM_LEVEL_RESET,
+};
+
+/* BPF_FUNC_skb_adjust_room flags. */
+enum {
+	BPF_F_ADJ_ROOM_FIXED_GSO	= (1ULL << 0),
+	BPF_F_ADJ_ROOM_ENCAP_L3_IPV4	= (1ULL << 1),
+	BPF_F_ADJ_ROOM_ENCAP_L3_IPV6	= (1ULL << 2),
+	BPF_F_ADJ_ROOM_ENCAP_L4_GRE	= (1ULL << 3),
+	BPF_F_ADJ_ROOM_ENCAP_L4_UDP	= (1ULL << 4),
+	BPF_F_ADJ_ROOM_NO_CSUM_RESET	= (1ULL << 5),
+};
+
+enum {
+	BPF_ADJ_ROOM_ENCAP_L2_MASK	= 0xff,
+	BPF_ADJ_ROOM_ENCAP_L2_SHIFT	= 56,
+};
+
+#define BPF_F_ADJ_ROOM_ENCAP_L2(len)	(((__u64)len & \
+					  BPF_ADJ_ROOM_ENCAP_L2_MASK) \
+					 << BPF_ADJ_ROOM_ENCAP_L2_SHIFT)
+
+/* BPF_FUNC_sysctl_get_name flags. */
+enum {
+	BPF_F_SYSCTL_BASE_NAME		= (1ULL << 0),
+};
+
+/* BPF_FUNC_<kernel_obj>_storage_get flags */
+enum {
+	BPF_LOCAL_STORAGE_GET_F_CREATE	= (1ULL << 0),
+	/* BPF_SK_STORAGE_GET_F_CREATE is only kept for backward compatibility
+	 * and BPF_LOCAL_STORAGE_GET_F_CREATE must be used instead.
+	 */
+	BPF_SK_STORAGE_GET_F_CREATE  = BPF_LOCAL_STORAGE_GET_F_CREATE,
+};
+
+/* BPF_FUNC_read_branch_records flags. */
+enum {
+	BPF_F_GET_BRANCH_RECORDS_SIZE	= (1ULL << 0),
+};
+
+/* BPF_FUNC_bpf_ringbuf_commit, BPF_FUNC_bpf_ringbuf_discard, and
+ * BPF_FUNC_bpf_ringbuf_output flags.
+ */
+enum {
+	BPF_RB_NO_WAKEUP		= (1ULL << 0),
+	BPF_RB_FORCE_WAKEUP		= (1ULL << 1),
+};
+
+/* BPF_FUNC_bpf_ringbuf_query flags */
+enum {
+	BPF_RB_AVAIL_DATA = 0,
+	BPF_RB_RING_SIZE = 1,
+	BPF_RB_CONS_POS = 2,
+	BPF_RB_PROD_POS = 3,
+};
+
+/* BPF ring buffer constants */
+enum {
+	BPF_RINGBUF_BUSY_BIT		= (1U << 31),
+	BPF_RINGBUF_DISCARD_BIT		= (1U << 30),
+	BPF_RINGBUF_HDR_SZ		= 8,
+};
+
+/* BPF_FUNC_sk_assign flags in bpf_sk_lookup context. */
+enum {
+	BPF_SK_LOOKUP_F_REPLACE		= (1ULL << 0),
+	BPF_SK_LOOKUP_F_NO_REUSEPORT	= (1ULL << 1),
+};
+
+/* Mode for BPF_FUNC_skb_adjust_room helper. */
+enum bpf_adj_room_mode {
+	BPF_ADJ_ROOM_NET,
+	BPF_ADJ_ROOM_MAC,
+};
+
+/* Mode for BPF_FUNC_skb_load_bytes_relative helper. */
+enum bpf_hdr_start_off {
+	BPF_HDR_START_MAC,
+	BPF_HDR_START_NET,
+};
+
+/* Encapsulation type for BPF_FUNC_lwt_push_encap helper. */
+enum bpf_lwt_encap_mode {
+	BPF_LWT_ENCAP_SEG6,
+	BPF_LWT_ENCAP_SEG6_INLINE,
+	BPF_LWT_ENCAP_IP,
+};
+
+/* Flags for bpf_bprm_opts_set helper */
+enum {
+	BPF_F_BPRM_SECUREEXEC	= (1ULL << 0),
+};
+
+#define __bpf_md_ptr(type, name)	\
+union {					\
+	type name;			\
+	__u64 :64;			\
+} __attribute__((aligned(8)))
+
+/* user accessible mirror of in-kernel sk_buff.
+ * new fields can only be added to the end of this structure
+ */
+struct __sk_buff {
+	__u32 len;
+	__u32 pkt_type;
+	__u32 mark;
+	__u32 queue_mapping;
+	__u32 protocol;
+	__u32 vlan_present;
+	__u32 vlan_tci;
+	__u32 vlan_proto;
+	__u32 priority;
+	__u32 ingress_ifindex;
+	__u32 ifindex;
+	__u32 tc_index;
+	__u32 cb5;
+	__u32 hash;
+	__u32 tc_classid;
+	__u32 data;
+	__u32 data_end;
+	__u32 napi_id;
+
+	/* Accessed by BPF_PROG_TYPE_sk_skb types from here to ... */
+	__u32 family;
+	__u32 remote_ip4;	/* Stored in network byte order */
+	__u32 local_ip4;	/* Stored in network byte order */
+	__u32 remote_ip64;	/* Stored in network byte order */
+	__u32 local_ip64;	/* Stored in network byte order */
+	__u32 remote_port;	/* Stored in network byte order */
+	__u32 local_port;	/* stored in host byte order */
+	/* ... here. */
+
+	__u32 data_meta;
+	__bpf_md_ptr(struct bpf_flow_keys *, flow_keys);
+	__u64 tstamp;
+	__u32 wire_len;
+	__u32 gso_segs;
+	__bpf_md_ptr(struct bpf_sock *, sk);
+	__u32 gso_size;
+};
+
+struct bpf_tunnel_key {
+	__u32 tunnel_id;
+	union {
+		__u32 remote_ipv4;
+		__u32 remote_ipv64;
+	};
+	__u8 tunnel_tos;
+	__u8 tunnel_ttl;
+	__u16 tunnel_ext;	/* Padding, future use. */
+	__u32 tunnel_label;
+};
+
+/* user accessible mirror of in-kernel xfrm_state.
+ * new fields can only be added to the end of this structure
+ */
+struct bpf_xfrm_state {
+	__u32 reqid;
+	__u32 spi;	/* Stored in network byte order */
+	__u16 family;
+	__u16 ext;	/* Padding, future use. */
+	union {
+		__u32 remote_ipv4;	/* Stored in network byte order */
+		__u32 remote_ipv64;	/* Stored in network byte order */
+	};
+};
+
+/* Generic BPF return codes which all BPF program types may support.
+ * The values are binary compatible with their TC_ACT_* counter-part to
+ * provide backwards compatibility with existing SCHED_CLS and SCHED_ACT
+ * programs.
+ *
+ * XDP is handled seprately, see XDP_*.
+ */
+enum bpf_ret_code {
+	BPF_OK = 0,
+	/* 1 reserved */
+	BPF_DROP = 2,
+	/* 3-6 reserved */
+	BPF_REDIRECT = 7,
+	/* >127 are reserved for prog type specific return codes.
+	 *
+	 * BPF_LWT_REROUTE: used by BPF_PROG_TYPE_LWT_IN and
+	 *    BPF_PROG_TYPE_LWT_XMIT to indicate that skb had been
+	 *    changed and should be routed based on its new L3 header.
+	 *    (This is an L3 redirect, as opposed to L2 redirect
+	 *    represented by BPF_REDIRECT above).
+	 */
+	BPF_LWT_REROUTE = 128,
+};
+
+struct bpf_sock {
+	__u32 bound_dev_if;
+	__u32 family;
+	__u32 type;
+	__u32 protocol;
+	__u32 mark;
+	__u32 priority;
+	/* IP address also allows 1 and 2 bytes access */
+	__u32 src_ip4;
+	__u32 src_ip64;
+	__u32 src_port;		/* host byte order */
+	__u32 dst_port;		/* network byte order */
+	__u32 dst_ip4;
+	__u32 dst_ip64;
+	__u32 state;
+	__s32 rx_queue_mapping;
+};
+
+struct bpf_tcp_sock {
+	__u32 snd_cwnd;		/* Sending congestion window		*/
+	__u32 srtt_us;		/* smoothed round trip time << 3 in usecs */
+	__u32 rtt_min;
+	__u32 snd_ssthresh;	/* Slow start size threshold		*/
+	__u32 rcv_nxt;		/* What we want to receive next		*/
+	__u32 snd_nxt;		/* Next sequence we send		*/
+	__u32 snd_una;		/* First byte we want an ack for	*/
+	__u32 mss_cache;	/* Cached effective mss, not including SACKS */
+	__u32 ecn_flags;	/* ECN status bits.			*/
+	__u32 rate_delivered;	/* saved rate sample: packets delivered */
+	__u32 rate_interval_us;	/* saved rate sample: time elapsed */
+	__u32 packets_out;	/* Packets which are "in flight"	*/
+	__u32 retrans_out;	/* Retransmitted packets out		*/
+	__u32 total_retrans;	/* Total retransmits for entire connection */
+	__u32 segs_in;		/* RFC4898 tcpEStatsPerfSegsIn
+				 * total number of segments in.
+				 */
+	__u32 data_segs_in;	/* RFC4898 tcpEStatsPerfDataSegsIn
+				 * total number of data segments in.
+				 */
+	__u32 segs_out;		/* RFC4898 tcpEStatsPerfSegsOut
+				 * The total number of segments sent.
+				 */
+	__u32 data_segs_out;	/* RFC4898 tcpEStatsPerfDataSegsOut
+				 * total number of data segments sent.
+				 */
+	__u32 lost_out;		/* Lost packets			*/
+	__u32 sacked_out;	/* SACK'd packets			*/
+	__u64 bytes_received;	/* RFC4898 tcpEStatsAppHCThruOctetsReceived
+				 * sum(delta(rcv_nxt)), or how many bytes
+				 * were acked.
+				 */
+	__u64 bytes_acked;	/* RFC4898 tcpEStatsAppHCThruOctetsAcked
+				 * sum(delta(snd_una)), or how many bytes
+				 * were acked.
+				 */
+	__u32 dsack_dups;	/* RFC4898 tcpEStatsStackDSACKDups
+				 * total number of DSACK blocks received
+				 */
+	__u32 delivered;	/* Total data packets delivered incl. rexmits */
+	__u32 delivered_ce;	/* Like the above but only ECE marked packets */
+	__u32 icsk_retransmits;	/* Number of unrecovered RTO timeouts */
+};
+
+struct bpf_sock_tuple {
+	union {
+		struct {
+			__be32 saddr;
+			__be32 daddr;
+			__be16 sport;
+			__be16 dport;
+		} ipv4;
+		struct {
+			__be32 saddr4;
+			__be32 daddr4;
+			__be16 sport;
+			__be16 dport;
+		} ipv6;
+	};
+};
+
+struct bpf_xdp_sock {
+	__u32 queue_id;
+};
+
+#define XDP_PACKET_HEADROOM 256
+
+/* User return codes for XDP prog type.
+ * A valid XDP program must return one of these defined values. All other
+ * return codes are reserved for future use. Unknown return codes will
+ * result in packet drops and a warning via bpf_warn_invalid_xdp_action().
+ */
+enum xdp_action {
+	XDP_ABORTED = 0,
+	XDP_DROP,
+	XDP_PASS,
+	XDP_TX,
+	XDP_REDIRECT,
+};
+
+/* user accessible metadata for XDP packet hook
+ * new fields must be added to the end of this structure
+ */
+struct xdp_md {
+	__u32 data;
+	__u32 data_end;
+	__u32 data_meta;
+	/* Below access go through struct xdp_rxq_info */
+	__u32 ingress_ifindex; /* rxq->dev->ifindex */
+	__u32 rx_queue_index;  /* rxq->queue_index  */
+
+	__u32 egress_ifindex;  /* txq->dev->ifindex */
+};
+
+/* DEVMAP map-value layout
+ *
+ * The struct data-layout of map-value is a configuration interface.
+ * New members can only be added to the end of this structure.
+ */
+struct bpf_devmap_val {
+	__u32 ifindex;   /* device index */
+	union {
+		int   fd;  /* prog fd on map write */
+		__u32 id;  /* prog id on map read */
+	} bpf_prog;
+};
+
+/* CPUMAP map-value layout
+ *
+ * The struct data-layout of map-value is a configuration interface.
+ * New members can only be added to the end of this structure.
+ */
+struct bpf_cpumap_val {
+	__u32 qsize;	/* queue size to remote target CPU */
+	union {
+		int   fd;	/* prog fd on map write */
+		__u32 id;	/* prog id on map read */
+	} bpf_prog;
+};
+
+enum sk_action {
+	SK_DROP = 0,
+	SK_PASS,
+};
+
+/* user accessible metadata for SK_MSG packet hook, new fields must
+ * be added to the end of this structure
+ */
+struct sk_msg_md {
+	__bpf_md_ptr(void *, data);
+	__bpf_md_ptr(void *, data_end);
+
+	__u32 family;
+	__u32 remote_ip4;	/* Stored in network byte order */
+	__u32 local_ip4;	/* Stored in network byte order */
+	__u32 remote_ip64;	/* Stored in network byte order */
+	__u32 local_ip64;	/* Stored in network byte order */
+	__u32 remote_port;	/* Stored in network byte order */
+	__u32 local_port;	/* stored in host byte order */
+	__u32 size;		/* Total size of sk_msg */
+
+	__bpf_md_ptr(struct bpf_sock *, sk); /* current socket */
+};
+
+struct sk_reuseport_md {
+	/*
+	 * Start of directly accessible data. It begins from
+	 * the tcp/udp header.
+	 */
+	__bpf_md_ptr(void *, data);
+	/* End of directly accessible data */
+	__bpf_md_ptr(void *, data_end);
+	/*
+	 * Total length of packet (starting from the tcp/udp header).
+	 * Note that the directly accessible bytes (data_end - data)
+	 * could be less than this "len".  Those bytes could be
+	 * indirectly read by a helper "bpf_skb_load_bytes()".
+	 */
+	__u32 len;
+	/*
+	 * Eth protocol in the mac header (network byte order). e.g.
+	 * ETH_P_IP(0x0800) and ETH_P_IPV6(0x86DD)
+	 */
+	__u32 eth_protocol;
+	__u32 ip_protocol;	/* IP protocol. e.g. IPPROTO_TCP, IPPROTO_UDP */
+	__u32 bind_inany;	/* Is sock bound to an INANY address? */
+	__u32 hash;		/* A hash of the packet 4 tuples */
+};
+
+#define BPF_TAG_SIZE	8
+
+struct bpf_prog_info {
+	__u32 type;
+	__u32 id;
+	__u8  tagBPF_TAG_SIZE;
+	__u32 jited_prog_len;
+	__u32 xlated_prog_len;
+	__aligned_u64 jited_prog_insns;
+	__aligned_u64 xlated_prog_insns;
+	__u64 load_time;	/* ns since boottime */
+	__u32 created_by_uid;
+	__u32 nr_map_ids;
+	__aligned_u64 map_ids;
+	char nameBPF_OBJ_NAME_LEN;
+	__u32 ifindex;
+	__u32 gpl_compatible:1;
+	__u32 :31; /* alignment pad */
+	__u64 netns_dev;
+	__u64 netns_ino;
+	__u32 nr_jited_ksyms;
+	__u32 nr_jited_func_lens;
+	__aligned_u64 jited_ksyms;
+	__aligned_u64 jited_func_lens;
+	__u32 btf_id;
+	__u32 func_info_rec_size;
+	__aligned_u64 func_info;
+	__u32 nr_func_info;
+	__u32 nr_line_info;
+	__aligned_u64 line_info;
+	__aligned_u64 jited_line_info;
+	__u32 nr_jited_line_info;
+	__u32 line_info_rec_size;
+	__u32 jited_line_info_rec_size;
+	__u32 nr_prog_tags;
+	__aligned_u64 prog_tags;
+	__u64 run_time_ns;
+	__u64 run_cnt;
+} __attribute__((aligned(8)));
+
+struct bpf_map_info {
+	__u32 type;
+	__u32 id;
+	__u32 key_size;
+	__u32 value_size;
+	__u32 max_entries;
+	__u32 map_flags;
+	char  nameBPF_OBJ_NAME_LEN;
+	__u32 ifindex;
+	__u32 btf_vmlinux_value_type_id;
+	__u64 netns_dev;
+	__u64 netns_ino;
+	__u32 btf_id;
+	__u32 btf_key_type_id;
+	__u32 btf_value_type_id;
+} __attribute__((aligned(8)));
+
+struct bpf_btf_info {
+	__aligned_u64 btf;
+	__u32 btf_size;
+	__u32 id;
+	__aligned_u64 name;
+	__u32 name_len;
+	__u32 kernel_btf;
+} __attribute__((aligned(8)));
+
+struct bpf_link_info {
+	__u32 type;
+	__u32 id;
+	__u32 prog_id;
+	union {
+		struct {
+			__aligned_u64 tp_name; /* in/out: tp_name buffer ptr */
+			__u32 tp_name_len;     /* in/out: tp_name buffer len */
+		} raw_tracepoint;
+		struct {
+			__u32 attach_type;
+		} tracing;
+		struct {
+			__u64 cgroup_id;
+			__u32 attach_type;
+		} cgroup;
+		struct {
+			__aligned_u64 target_name; /* in/out: target_name buffer ptr */
+			__u32 target_name_len;	   /* in/out: target_name buffer len */
+			union {
+				struct {
+					__u32 map_id;
+				} map;
+			};
+		} iter;
+		struct  {
+			__u32 netns_ino;
+			__u32 attach_type;
+		} netns;
+		struct {
+			__u32 ifindex;
+		} xdp;
+	};
+} __attribute__((aligned(8)));
+
+/* User bpf_sock_addr struct to access socket fields and sockaddr struct passed
+ * by user and intended to be used by socket (e.g. to bind to, depends on
+ * attach type).
+ */
+struct bpf_sock_addr {
+	__u32 user_family;	/* Allows 4-byte read, but no write. */
+	__u32 user_ip4;		/* Allows 1,2,4-byte read and 4-byte write.
+				 * Stored in network byte order.
+				 */
+	__u32 user_ip64;	/* Allows 1,2,4,8-byte read and 4,8-byte write.
+				 * Stored in network byte order.
+				 */
+	__u32 user_port;	/* Allows 1,2,4-byte read and 4-byte write.
+				 * Stored in network byte order
+				 */
+	__u32 family;		/* Allows 4-byte read, but no write */
+	__u32 type;		/* Allows 4-byte read, but no write */
+	__u32 protocol;		/* Allows 4-byte read, but no write */
+	__u32 msg_src_ip4;	/* Allows 1,2,4-byte read and 4-byte write.
+				 * Stored in network byte order.
+				 */
+	__u32 msg_src_ip64;	/* Allows 1,2,4,8-byte read and 4,8-byte write.
+				 * Stored in network byte order.
+				 */
+	__bpf_md_ptr(struct bpf_sock *, sk);
+};
+
+/* User bpf_sock_ops struct to access socket values and specify request ops
+ * and their replies.
+ * Some of this fields are in network (bigendian) byte order and may need
+ * to be converted before use (bpf_ntohl() defined in samples/bpf/bpf_endian.h).
+ * New fields can only be added at the end of this structure
+ */
+struct bpf_sock_ops {
+	__u32 op;
+	union {
+		__u32 args4;		/* Optionally passed to bpf program */
+		__u32 reply;		/* Returned by bpf program	    */
+		__u32 replylong4;	/* Optionally returned by bpf prog  */
+	};
+	__u32 family;
+	__u32 remote_ip4;	/* Stored in network byte order */
+	__u32 local_ip4;	/* Stored in network byte order */
+	__u32 remote_ip64;	/* Stored in network byte order */
+	__u32 local_ip64;	/* Stored in network byte order */
+	__u32 remote_port;	/* Stored in network byte order */
+	__u32 local_port;	/* stored in host byte order */
+	__u32 is_fullsock;	/* Some TCP fields are only valid if
+				 * there is a full socket. If not, the
+				 * fields read as zero.
+				 */
+	__u32 snd_cwnd;
+	__u32 srtt_us;		/* Averaged RTT << 3 in usecs */
+	__u32 bpf_sock_ops_cb_flags; /* flags defined in uapi/linux/tcp.h */
+	__u32 state;
+	__u32 rtt_min;
+	__u32 snd_ssthresh;
+	__u32 rcv_nxt;
+	__u32 snd_nxt;
+	__u32 snd_una;
+	__u32 mss_cache;
+	__u32 ecn_flags;
+	__u32 rate_delivered;
+	__u32 rate_interval_us;
+	__u32 packets_out;
+	__u32 retrans_out;
+	__u32 total_retrans;
+	__u32 segs_in;
+	__u32 data_segs_in;
+	__u32 segs_out;
+	__u32 data_segs_out;
+	__u32 lost_out;
+	__u32 sacked_out;
+	__u32 sk_txhash;
+	__u64 bytes_received;
+	__u64 bytes_acked;
+	__bpf_md_ptr(struct bpf_sock *, sk);
+	/* skb_data, skb_data_end) covers the whole TCP header.
+	 *
+	 * BPF_SOCK_OPS_PARSE_HDR_OPT_CB: The packet received
+	 * BPF_SOCK_OPS_HDR_OPT_LEN_CB:   Not useful because the
+	 *                                header has not been written.
+	 * BPF_SOCK_OPS_WRITE_HDR_OPT_CB: The header and options have
+	 *				  been written so far.
+	 * BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB:  The SYNACK that concludes
+	 *					the 3WHS.
+	 * BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB: The ACK that concludes
+	 *					the 3WHS.
+	 *
+	 * bpf_load_hdr_opt() can also be used to read a particular option.
+	 */
+	__bpf_md_ptr(void *, skb_data);
+	__bpf_md_ptr(void *, skb_data_end);
+	__u32 skb_len;		/* The total length of a packet.
+				 * It includes the header, options,
+				 * and payload.
+				 */
+	__u32 skb_tcp_flags;	/* tcp_flags of the header.  It provides
+				 * an easy way to check for tcp_flags
+				 * without parsing skb_data.
+				 *
+				 * In particular, the skb_tcp_flags
+				 * will still be available in
+				 * BPF_SOCK_OPS_HDR_OPT_LEN even though
+				 * the outgoing header has not
+				 * been written yet.
+				 */
+};
+
+/* Definitions for bpf_sock_ops_cb_flags */
+enum {
+	BPF_SOCK_OPS_RTO_CB_FLAG	= (1<<0),
+	BPF_SOCK_OPS_RETRANS_CB_FLAG	= (1<<1),
+	BPF_SOCK_OPS_STATE_CB_FLAG	= (1<<2),
+	BPF_SOCK_OPS_RTT_CB_FLAG	= (1<<3),
+	/* Call bpf for all received TCP headers.  The bpf prog will be
+	 * called under sock_ops->op == BPF_SOCK_OPS_PARSE_HDR_OPT_CB
+	 *
+	 * Please refer to the comment in BPF_SOCK_OPS_PARSE_HDR_OPT_CB
+	 * for the header option related helpers that will be useful
+	 * to the bpf programs.
+	 *
+	 * It could be used at the client/active side (i.e. connect() side)
+	 * when the server told it that the server was in syncookie
+	 * mode and required the active side to resend the bpf-written
+	 * options.  The active side can keep writing the bpf-options until
+	 * it received a valid packet from the server side to confirm
+	 * the earlier packet (and options) has been received.  The later
+	 * example patch is using it like this at the active side when the
+	 * server is in syncookie mode.
+	 *
+	 * The bpf prog will usually turn this off in the common cases.
+	 */
+	BPF_SOCK_OPS_PARSE_ALL_HDR_OPT_CB_FLAG	= (1<<4),
+	/* Call bpf when kernel has received a header option that
+	 * the kernel cannot handle.  The bpf prog will be called under
+	 * sock_ops->op == BPF_SOCK_OPS_PARSE_HDR_OPT_CB.
+	 *
+	 * Please refer to the comment in BPF_SOCK_OPS_PARSE_HDR_OPT_CB
+	 * for the header option related helpers that will be useful
+	 * to the bpf programs.
+	 */
+	BPF_SOCK_OPS_PARSE_UNKNOWN_HDR_OPT_CB_FLAG = (1<<5),
+	/* Call bpf when the kernel is writing header options for the
+	 * outgoing packet.  The bpf prog will first be called
+	 * to reserve space in a skb under
+	 * sock_ops->op == BPF_SOCK_OPS_HDR_OPT_LEN_CB.  Then
+	 * the bpf prog will be called to write the header option(s)
+	 * under sock_ops->op == BPF_SOCK_OPS_WRITE_HDR_OPT_CB.
+	 *
+	 * Please refer to the comment in BPF_SOCK_OPS_HDR_OPT_LEN_CB
+	 * and BPF_SOCK_OPS_WRITE_HDR_OPT_CB for the header option
+	 * related helpers that will be useful to the bpf programs.
+	 *
+	 * The kernel gets its chance to reserve space and write
+	 * options first before the BPF program does.
+	 */
+	BPF_SOCK_OPS_WRITE_HDR_OPT_CB_FLAG = (1<<6),
+/* Mask of all currently supported cb flags */
+	BPF_SOCK_OPS_ALL_CB_FLAGS       = 0x7F,
+};
+
+/* List of known BPF sock_ops operators.
+ * New entries can only be added at the end
+ */
+enum {
+	BPF_SOCK_OPS_VOID,
+	BPF_SOCK_OPS_TIMEOUT_INIT,	/* Should return SYN-RTO value to use or
+					 * -1 if default value should be used
+					 */
+	BPF_SOCK_OPS_RWND_INIT,		/* Should return initial advertized
+					 * window (in packets) or -1 if default
+					 * value should be used
+					 */
+	BPF_SOCK_OPS_TCP_CONNECT_CB,	/* Calls BPF program right before an
+					 * active connection is initialized
+					 */
+	BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB,	/* Calls BPF program when an
+						 * active connection is
+						 * established
+						 */
+	BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB,	/* Calls BPF program when a
+						 * passive connection is
+						 * established
+						 */
+	BPF_SOCK_OPS_NEEDS_ECN,		/* If connection's congestion control
+					 * needs ECN
+					 */
+	BPF_SOCK_OPS_BASE_RTT,		/* Get base RTT. The correct value is
+					 * based on the path and may be
+					 * dependent on the congestion control
+					 * algorithm. In general it indicates
+					 * a congestion threshold. RTTs above
+					 * this indicate congestion
+					 */
+	BPF_SOCK_OPS_RTO_CB,		/* Called when an RTO has triggered.
+					 * Arg1: value of icsk_retransmits
+					 * Arg2: value of icsk_rto
+					 * Arg3: whether RTO has expired
+					 */
+	BPF_SOCK_OPS_RETRANS_CB,	/* Called when skb is retransmitted.
+					 * Arg1: sequence number of 1st byte
+					 * Arg2: # segments
+					 * Arg3: return value of
+					 *       tcp_transmit_skb (0 => success)
+					 */
+	BPF_SOCK_OPS_STATE_CB,		/* Called when TCP changes state.
+					 * Arg1: old_state
+					 * Arg2: new_state
+					 */
+	BPF_SOCK_OPS_TCP_LISTEN_CB,	/* Called on listen(2), right after
+					 * socket transition to LISTEN state.
+					 */
+	BPF_SOCK_OPS_RTT_CB,		/* Called on every RTT.
+					 */
+	BPF_SOCK_OPS_PARSE_HDR_OPT_CB,	/* Parse the header option.
+					 * It will be called to handle
+					 * the packets received at
+					 * an already established
+					 * connection.
+					 *
+					 * sock_ops->skb_data:
+					 * Referring to the received skb.
+					 * It covers the TCP header only.
+					 *
+					 * bpf_load_hdr_opt() can also
+					 * be used to search for a
+					 * particular option.
+					 */
+	BPF_SOCK_OPS_HDR_OPT_LEN_CB,	/* Reserve space for writing the
+					 * header option later in
+					 * BPF_SOCK_OPS_WRITE_HDR_OPT_CB.
+					 * Arg1: bool want_cookie. (in
+					 *       writing SYNACK only)
+					 *
+					 * sock_ops->skb_data:
+					 * Not available because no header has
+					 * been	written yet.
+					 *
+					 * sock_ops->skb_tcp_flags:
+					 * The tcp_flags of the
+					 * outgoing skb. (e.g. SYN, ACK, FIN).
+					 *
+					 * bpf_reserve_hdr_opt() should
+					 * be used to reserve space.
+					 */
+	BPF_SOCK_OPS_WRITE_HDR_OPT_CB,	/* Write the header options
+					 * Arg1: bool want_cookie. (in
+					 *       writing SYNACK only)
+					 *
+					 * sock_ops->skb_data:
+					 * Referring to the outgoing skb.
+					 * It covers the TCP header
+					 * that has already been written
+					 * by the kernel and the
+					 * earlier bpf-progs.
+					 *
+					 * sock_ops->skb_tcp_flags:
+					 * The tcp_flags of the outgoing
+					 * skb. (e.g. SYN, ACK, FIN).
+					 *
+					 * bpf_store_hdr_opt() should
+					 * be used to write the
+					 * option.
+					 *
+					 * bpf_load_hdr_opt() can also
+					 * be used to search for a
+					 * particular option that
+					 * has already been written
+					 * by the kernel or the
+					 * earlier bpf-progs.
+					 */
+};
+
+/* List of TCP states. There is a build check in net/ipv4/tcp.c to detect
+ * changes between the TCP and BPF versions. Ideally this should never happen.
+ * If it does, we need to add code to convert them before calling
+ * the BPF sock_ops function.
+ */
+enum {
+	BPF_TCP_ESTABLISHED = 1,
+	BPF_TCP_SYN_SENT,
+	BPF_TCP_SYN_RECV,
+	BPF_TCP_FIN_WAIT1,
+	BPF_TCP_FIN_WAIT2,
+	BPF_TCP_TIME_WAIT,
+	BPF_TCP_CLOSE,
+	BPF_TCP_CLOSE_WAIT,
+	BPF_TCP_LAST_ACK,
+	BPF_TCP_LISTEN,
+	BPF_TCP_CLOSING,	/* Now a valid state */
+	BPF_TCP_NEW_SYN_RECV,
+
+	BPF_TCP_MAX_STATES	/* Leave at the end! */
+};
+
+enum {
+	TCP_BPF_IW		= 1001,	/* Set TCP initial congestion window */
+	TCP_BPF_SNDCWND_CLAMP	= 1002,	/* Set sndcwnd_clamp */
+	TCP_BPF_DELACK_MAX	= 1003, /* Max delay ack in usecs */
+	TCP_BPF_RTO_MIN		= 1004, /* Min delay ack in usecs */
+	/* Copy the SYN pkt to optval
+	 *
+	 * BPF_PROG_TYPE_SOCK_OPS only.  It is similar to the
+	 * bpf_getsockopt(TCP_SAVED_SYN) but it does not limit
+	 * to only getting from the saved_syn.  It can either get the
+	 * syn packet from:
+	 *
+	 * 1. the just-received SYN packet (only available when writing the
+	 *    SYNACK).  It will be useful when it is not necessary to
+	 *    save the SYN packet for latter use.  It is also the only way
+	 *    to get the SYN during syncookie mode because the syn
+	 *    packet cannot be saved during syncookie.
+	 *
+	 * OR
+	 *
+	 * 2. the earlier saved syn which was done by
+	 *    bpf_setsockopt(TCP_SAVE_SYN).
+	 *
+	 * The bpf_getsockopt(TCP_BPF_SYN*) option will hide where the
+	 * SYN packet is obtained.
+	 *
+	 * If the bpf-prog does not need the IP46 header,  the
+	 * bpf-prog can avoid parsing the IP header by using
+	 * TCP_BPF_SYN.  Otherwise, the bpf-prog can get both
+	 * IP46 and TCP header by using TCP_BPF_SYN_IP.
+	 *
+	 *      >0: Total number of bytes copied
+	 * -ENOSPC: Not enough space in optval. Only optlen number of
+	 *          bytes is copied.
+	 * -ENOENT: The SYN skb is not available now and the earlier SYN pkt
+	 *	    is not saved by setsockopt(TCP_SAVE_SYN).
+	 */
+	TCP_BPF_SYN		= 1005, /* Copy the TCP header */
+	TCP_BPF_SYN_IP		= 1006, /* Copy the IP46 and TCP header */
+	TCP_BPF_SYN_MAC         = 1007, /* Copy the MAC, IP46, and TCP header */
+};
+
+enum {
+	BPF_LOAD_HDR_OPT_TCP_SYN = (1ULL << 0),
+};
+
+/* args0 value during BPF_SOCK_OPS_HDR_OPT_LEN_CB and
+ * BPF_SOCK_OPS_WRITE_HDR_OPT_CB.
+ */
+enum {
+	BPF_WRITE_HDR_TCP_CURRENT_MSS = 1,	/* Kernel is finding the
+						 * total option spaces
+						 * required for an established
+						 * sk in order to calculate the
+						 * MSS.  No skb is actually
+						 * sent.
+						 */
+	BPF_WRITE_HDR_TCP_SYNACK_COOKIE = 2,	/* Kernel is in syncookie mode
+						 * when sending a SYN.
+						 */
+};
+
+struct bpf_perf_event_value {
+	__u64 counter;
+	__u64 enabled;
+	__u64 running;
+};
+
+enum {
+	BPF_DEVCG_ACC_MKNOD	= (1ULL << 0),
+	BPF_DEVCG_ACC_READ	= (1ULL << 1),
+	BPF_DEVCG_ACC_WRITE	= (1ULL << 2),
+};
+
+enum {
+	BPF_DEVCG_DEV_BLOCK	= (1ULL << 0),
+	BPF_DEVCG_DEV_CHAR	= (1ULL << 1),
+};
+
+struct bpf_cgroup_dev_ctx {
+	/* access_type encoded as (BPF_DEVCG_ACC_* << 16) | BPF_DEVCG_DEV_* */
+	__u32 access_type;
+	__u32 major;
+	__u32 minor;
+};
+
+struct bpf_raw_tracepoint_args {
+	__u64 args0;
+};
+
+/* DIRECT:  Skip the FIB rules and go to FIB table associated with device
+ * OUTPUT:  Do lookup from egress perspective; default is ingress
+ */
+enum {
+	BPF_FIB_LOOKUP_DIRECT  = (1U << 0),
+	BPF_FIB_LOOKUP_OUTPUT  = (1U << 1),
+};
+
+enum {
+	BPF_FIB_LKUP_RET_SUCCESS,      /* lookup successful */
+	BPF_FIB_LKUP_RET_BLACKHOLE,    /* dest is blackholed; can be dropped */
+	BPF_FIB_LKUP_RET_UNREACHABLE,  /* dest is unreachable; can be dropped */
+	BPF_FIB_LKUP_RET_PROHIBIT,     /* dest not allowed; can be dropped */
+	BPF_FIB_LKUP_RET_NOT_FWDED,    /* packet is not forwarded */
+	BPF_FIB_LKUP_RET_FWD_DISABLED, /* fwding is not enabled on ingress */
+	BPF_FIB_LKUP_RET_UNSUPP_LWT,   /* fwd requires encapsulation */
+	BPF_FIB_LKUP_RET_NO_NEIGH,     /* no neighbor entry for nh */
+	BPF_FIB_LKUP_RET_FRAG_NEEDED,  /* fragmentation required to fwd */
+};
+
+struct bpf_fib_lookup {
+	/* input:  network family for lookup (AF_INET, AF_INET6)
+	 * output: network family of egress nexthop
+	 */
+	__u8	family;
+
+	/* set if lookup is to consider L4 data - e.g., FIB rules */
+	__u8	l4_protocol;
+	__be16	sport;
+	__be16	dport;
+
+	/* total length of packet from network header - used for MTU check */
+	__u16	tot_len;
+
+	/* input: L3 device index for lookup
+	 * output: device index from FIB lookup
+	 */
+	__u32	ifindex;
+
+	union {
+		/* inputs to lookup */
+		__u8	tos;		/* AF_INET  */
+		__be32	flowinfo;	/* AF_INET6, flow_label + priority */
+
+		/* output: metric of fib result (IPv4/IPv6 only) */
+		__u32	rt_metric;
+	};
+
+	union {
+		__be32		ipv4_src;
+		__u32		ipv6_src4;  /* in6_addr; network order */
+	};
+
+	/* input to bpf_fib_lookup, ipv{4,6}_dst is destination address in
+	 * network header. output: bpf_fib_lookup sets to gateway address
+	 * if FIB lookup returns gateway route
+	 */
+	union {
+		__be32		ipv4_dst;
+		__u32		ipv6_dst4;  /* in6_addr; network order */
+	};
+
+	/* output */
+	__be16	h_vlan_proto;
+	__be16	h_vlan_TCI;
+	__u8	smac6;     /* ETH_ALEN */
+	__u8	dmac6;     /* ETH_ALEN */
+};
+
+struct bpf_redir_neigh {
+	/* network family for lookup (AF_INET, AF_INET6) */
+	__u32 nh_family;
+	/* network address of nexthop; skips fib lookup to find gateway */
+	union {
+		__be32		ipv4_nh;
+		__u32		ipv6_nh4;  /* in6_addr; network order */
+	};
+};
+
+enum bpf_task_fd_type {
+	BPF_FD_TYPE_RAW_TRACEPOINT,	/* tp name */
+	BPF_FD_TYPE_TRACEPOINT,		/* tp name */
+	BPF_FD_TYPE_KPROBE,		/* (symbol + offset) or addr */
+	BPF_FD_TYPE_KRETPROBE,		/* (symbol + offset) or addr */
+	BPF_FD_TYPE_UPROBE,		/* filename + offset */
+	BPF_FD_TYPE_URETPROBE,		/* filename + offset */
+};
+
+enum {
+	BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG		= (1U << 0),
+	BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL		= (1U << 1),
+	BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP		= (1U << 2),
+};
+
+struct bpf_flow_keys {
+	__u16	nhoff;
+	__u16	thoff;
+	__u16	addr_proto;			/* ETH_P_* of valid addrs */
+	__u8	is_frag;
+	__u8	is_first_frag;
+	__u8	is_encap;
+	__u8	ip_proto;
+	__be16	n_proto;
+	__be16	sport;
+	__be16	dport;
+	union {
+		struct {
+			__be32	ipv4_src;
+			__be32	ipv4_dst;
+		};
+		struct {
+			__u32	ipv6_src4;	/* in6_addr; network order */
+			__u32	ipv6_dst4;	/* in6_addr; network order */
+		};
+	};
+	__u32	flags;
+	__be32	flow_label;
+};
+
+struct bpf_func_info {
+	__u32	insn_off;
+	__u32	type_id;
+};
+
+#define BPF_LINE_INFO_LINE_NUM(line_col)	((line_col) >> 10)
+#define BPF_LINE_INFO_LINE_COL(line_col)	((line_col) & 0x3ff)
+
+struct bpf_line_info {
+	__u32	insn_off;
+	__u32	file_name_off;
+	__u32	line_off;
+	__u32	line_col;
+};
+
+struct bpf_spin_lock {
+	__u32	val;
+};
+
+struct bpf_sysctl {
+	__u32	write;		/* Sysctl is being read (= 0) or written (= 1).
+				 * Allows 1,2,4-byte read, but no write.
+				 */
+	__u32	file_pos;	/* Sysctl file position to read from, write to.
+				 * Allows 1,2,4-byte read an 4-byte write.
+				 */
+};
+
+struct bpf_sockopt {
+	__bpf_md_ptr(struct bpf_sock *, sk);
+	__bpf_md_ptr(void *, optval);
+	__bpf_md_ptr(void *, optval_end);
+
+	__s32	level;
+	__s32	optname;
+	__s32	optlen;
+	__s32	retval;
+};
+
+struct bpf_pidns_info {
+	__u32 pid;
+	__u32 tgid;
+};
+
+/* User accessible data for SK_LOOKUP programs. Add new fields at the end. */
+struct bpf_sk_lookup {
+	__bpf_md_ptr(struct bpf_sock *, sk); /* Selected socket */
+
+	__u32 family;		/* Protocol family (AF_INET, AF_INET6) */
+	__u32 protocol;		/* IP protocol (IPPROTO_TCP, IPPROTO_UDP) */
+	__u32 remote_ip4;	/* Network byte order */
+	__u32 remote_ip64;	/* Network byte order */
+	__u32 remote_port;	/* Network byte order */
+	__u32 local_ip4;	/* Network byte order */
+	__u32 local_ip64;	/* Network byte order */
+	__u32 local_port;	/* Host byte order */
+};
+
+/*
+ * struct btf_ptr is used for typed pointer representation; the
+ * type id is used to render the pointer data as the appropriate type
+ * via the bpf_snprintf_btf() helper described above.  A flags field -
+ * potentially to specify additional details about the BTF pointer
+ * (rather than its mode of display) - is included for future use.
+ * Display flags - BTF_F_* - are passed to bpf_snprintf_btf separately.
+ */
+struct btf_ptr {
+	void *ptr;
+	__u32 type_id;
+	__u32 flags;		/* BTF ptr flags; unused at present. */
+};
+
+/*
+ * Flags to control bpf_snprintf_btf() behaviour.
+ *     - BTF_F_COMPACT: no formatting around type information
+ *     - BTF_F_NONAME: no struct/union member names/types
+ *     - BTF_F_PTR_RAW: show raw (unobfuscated) pointer values;
+ *       equivalent to %px.
+ *     - BTF_F_ZERO: show zero-valued struct/union members; they
+ *       are not displayed by default
+ */
+enum {
+	BTF_F_COMPACT	=	(1ULL << 0),
+	BTF_F_NONAME	=	(1ULL << 1),
+	BTF_F_PTR_RAW	=	(1ULL << 2),
+	BTF_F_ZERO	=	(1ULL << 3),
+};
+
+#endif /* _UAPI__LINUX_BPF_H__ */

_service:tar_scm:lxc-5.0.2.tar.gz/src/include/bpf_common.h Added

@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _UAPI__LINUX_BPF_COMMON_H__
+#define _UAPI__LINUX_BPF_COMMON_H__
+
+/* Instruction classes */
+#define BPF_CLASS(code) ((code) & 0x07)
+#define		BPF_LD		0x00
+#define		BPF_LDX		0x01
+#define		BPF_ST		0x02
+#define		BPF_STX		0x03
+#define		BPF_ALU		0x04
+#define		BPF_JMP		0x05
+#define		BPF_RET		0x06
+#define		BPF_MISC        0x07
+
+/* ld/ldx fields */
+#define BPF_SIZE(code)  ((code) & 0x18)
+#define		BPF_W		0x00 /* 32-bit */
+#define		BPF_H		0x08 /* 16-bit */
+#define		BPF_B		0x10 /*  8-bit */
+/* eBPF		BPF_DW		0x18    64-bit */
+#define BPF_MODE(code)  ((code) & 0xe0)
+#define		BPF_IMM		0x00
+#define		BPF_ABS		0x20
+#define		BPF_IND		0x40
+#define		BPF_MEM		0x60
+#define		BPF_LEN		0x80
+#define		BPF_MSH		0xa0
+
+/* alu/jmp fields */
+#define BPF_OP(code)    ((code) & 0xf0)
+#define		BPF_ADD		0x00
+#define		BPF_SUB		0x10
+#define		BPF_MUL		0x20
+#define		BPF_DIV		0x30
+#define		BPF_OR		0x40
+#define		BPF_AND		0x50
+#define		BPF_LSH		0x60
+#define		BPF_RSH		0x70
+#define		BPF_NEG		0x80
+#define		BPF_MOD		0x90
+#define		BPF_XOR		0xa0
+
+#define		BPF_JA		0x00
+#define		BPF_JEQ		0x10
+#define		BPF_JGT		0x20
+#define		BPF_JGE		0x30
+#define		BPF_JSET        0x40
+#define BPF_SRC(code)   ((code) & 0x08)
+#define		BPF_K		0x00
+#define		BPF_X		0x08
+
+#ifndef BPF_MAXINSNS
+#define BPF_MAXINSNS 4096
+#endif
+
+#endif /* _UAPI__LINUX_BPF_COMMON_H__ */

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/fexecve.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/fexecve.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/getgrgid_r.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/getgrgid_r.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/getline.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/getline.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/lxcmntent.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/lxcmntent.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/lxcmntent.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/lxcmntent.h Changed

@@ -21,6 +21,8 @@
 #ifndef _LXCMNTENT_H
 #define _LXCMNTENT_H
 
+#include "../lxc/compiler.h"
+
 #if IS_BIONIC
 struct mntent
 {
@@ -32,20 +34,21 @@
     int mnt_passno;
 };
 
-extern struct mntent *getmntent (FILE *stream);
-extern struct mntent *getmntent_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz);
+__hidden extern struct mntent *getmntent(FILE *stream);
+__hidden extern struct mntent *getmntent_r(FILE *stream, struct mntent *mp,
+					   char *buffer, int bufsiz);
 #endif
 
-#if !defined(HAVE_SETMNTENT) || IS_BIONIC
-FILE *setmntent (const char *file, const char *mode);
+#if !HAVE_SETMNTENT || IS_BIONIC
+__hidden FILE *setmntent(const char *file, const char *mode);
 #endif
 
-#if !defined(HAVE_ENDMNTENT) || IS_BIONIC
-int endmntent (FILE *stream);
+#if !HAVE_ENDMNTENT || IS_BIONIC
+__hidden int endmntent(FILE *stream);
 #endif
 
-#if !defined(HAVE_HASMNTOPT) || IS_BIONIC
-extern char *hasmntopt (const struct mntent *mnt, const char *opt);
+#if !HAVE_HASMNTOPT || IS_BIONIC
+__hidden extern char *hasmntopt(const struct mntent *mnt, const char *opt);
 #endif
 
 #endif

_service:tar_scm:lxc-5.0.2.tar.gz/src/include/meson.build Added

@@ -0,0 +1,64 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+include_sources = files(
+    'bpf.h',
+    'bpf_common.h')
+
+netns_ifaddrs_sources = files(
+    'netns_ifaddrs.c',
+    'netns_ifaddrs.h')
+
+if srcconf.get('HAVE_GETLINE') == 0
+    include_sources += files(
+        'getline.c',
+        'getline.h')
+endif
+
+if srcconf.get('HAVE_FEXECVE') == 0
+    include_sources += files(
+        'fexecve.c',
+        'fexecve.h')
+endif
+
+
+if srcconf.get('HAVE_GETGRGID_R') == 0
+    include_sources += files(
+        'getgrgid_r.c',
+        'getgrgid_r.h')
+endif
+
+if srcconf.get('IS_BIONIC') == 1 or srcconf.get('HAVE_HASMNTOPT') == 0 or srcconf.get('HAVE_SETMNTENT') == 0 or srcconf.get('HAVE_ENDMNTENT') == 0
+    include_sources += files(
+        'lxcmntent.c',
+        'lxcmntent.h')
+endif
+
+if srcconf.get('HAVE_STRLCPY') == 0
+    include_sources += files(
+        'strlcpy.c',
+        'strlcpy.h')
+endif
+
+if srcconf.get('HAVE_STRLCAT') == 0
+    include_sources += files(
+        'strlcat.c',
+        'strlcat.h')
+endif
+
+if srcconf.get('HAVE_STRCHRNUL') == 0
+    include_sources += files(
+        'strchrnul.c',
+        'strchrnul.h')
+endif
+
+if srcconf.get('HAVE_OPENPTY') == 0
+    include_sources += files(
+        'openpty.c',
+        'openpty.h')
+endif
+
+if srcconf.get('HAVE_PRLIMIT') == 0 and srcconf.get('HAVE_PRLIMIT64') == 1
+    include_sources += files(
+        'prlimit.c',
+        'prlimit.h')
+endif

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/netns_ifaddrs.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/netns_ifaddrs.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/netns_ifaddrs.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/netns_ifaddrs.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/openpty.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/openpty.c Changed

@@ -1,76 +1,136 @@
- /*
- * openpty: glibc implementation
- *
- * Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
- *
- * Authors:
- * Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
-
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
-
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#define _XOPEN_SOURCE       /* See feature_test_macros(7) */
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#define _GNU_SOURCE
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
 #include <termios.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
 
-#define _PATH_DEVPTMX "/dev/ptmx"
+#if HAVE_PTY_H
+#include <pty.h>
+#endif
 
-int openpty (int *aptmx, int *apts, char *name, struct termios *termp,
-       struct winsize *winp)
+static int pts_name(int fd, char **pts, size_t buf_len)
 {
-   char bufPATH_MAX;
-   int ptmx, pts;
+	int rv;
+	char *buf = *pts;
+
+	for (;;) {
+		char *new_buf;
+
+		if (buf_len) {
+			rv = ptsname_r(fd, buf, buf_len);
+
+			if (rv != 0 || memchr(buf, '\0', buf_len))
+				/* We either got an error, or we succeeded and the
+				   returned name fit in the buffer.  */
+				break;
+
+			/* Try again with a longer buffer.  */
+			buf_len += buf_len; /* Double it */
+		} else
+			/* No initial buffer; start out by mallocing one.  */
+			buf_len = 128; /* First time guess.  */
+
+		if (buf != *pts)
+			/* We've already malloced another buffer at least once.  */
+			new_buf = realloc(buf, buf_len);
+		else
+			new_buf = malloc(buf_len);
+		if (!new_buf) {
+			rv = -1;
+			break;
+		}
+		buf = new_buf;
+	}
+
+	if (rv == 0)
+		*pts = buf; /* Return buffer to the user.  */
+	else if (buf != *pts)
+		free(buf); /* Free what we malloced when returning an error.  */
+
+	return rv;
+}
+
+int __unlockpt(int fd)
+{
+#ifdef TIOCSPTLCK
+	int unlock = 0;
+
+	if (ioctl(fd, TIOCSPTLCK, &unlock)) {
+		if (errno != EINVAL)
+			return -1;
+	}
+#endif
+	return 0;
+}
+
+int openpty(int *ptx, int *pty, char *name, const struct termios *termp,
+	    const struct winsize *winp)
+{
+	char _bufPATH_MAX;
+	char *buf = _buf;
+	int ptx_fd, ret = -1, pty_fd = -1;
+
+	*buf = '\0';
+
+	ptx_fd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
+	if (ptx_fd == -1)
+		return -1;
+
+	if (__unlockpt(ptx_fd))
+		goto on_error;
+
+#ifdef TIOCGPTPEER
+	/* Try to allocate pty_fd solely based on ptx_fd first. */
+	pty_fd = ioctl(ptx_fd, TIOCGPTPEER, O_RDWR | O_NOCTTY);
+#endif
+	if (pty_fd == -1) {
+		/* Fallback to path-based pty_fd allocation in case kernel doesn't
+		 * support TIOCGPTPEER.
+		 */
+		if (pts_name(ptx_fd, &buf, sizeof(_buf)))
+			goto on_error;
 
-   ptmx = open(_PATH_DEVPTMX, O_RDWR);
-   if (ptmx == -1)
-       return -1;
+		pty_fd = open(buf, O_RDWR | O_NOCTTY);
+		if (pty_fd == -1)
+			goto on_error;
+	}
 
-   if (grantpt(ptmx))
-       goto fail;
+	if (termp)
+		tcsetattr(pty_fd, TCSAFLUSH, termp);
+#ifdef TIOCSWINSZ
+	if (winp)
+		ioctl(pty_fd, TIOCSWINSZ, winp);
+#endif
 
-   if (unlockpt(ptmx))
-       goto fail;
+	*ptx = ptx_fd;
+	*pty = pty_fd;
+	if (name != NULL) {
+		if (*buf == '\0')
+			if (pts_name(ptx_fd, &buf, sizeof(_buf)))
+				goto on_error;
 
-   if (ptsname_r(ptmx, buf, sizeof buf))
-       goto fail;
+		strcpy(name, buf);
+	}
 
-   pts = open(buf, O_RDWR | O_NOCTTY);
-   if (pts == -1)
-       goto fail;
+	ret = 0;
 
-   /* XXX Should we ignore errors here?  */
-   if (termp)
-       tcsetattr(pts, TCSAFLUSH, termp);
-   if (winp)
-       ioctl(pts, TIOCSWINSZ, winp);
+on_error:
+	if (ret == -1) {
+		close(ptx_fd);
 
-   *aptmx = ptmx;
-   *apts = pts;
-   if (name != NULL)
-       strcpy(name, buf);
+		if (pty_fd != -1)
+			close(pty_fd);
+	}
 
-   return 0;
+	if (buf != _buf)
+		free(buf);
 
-fail:
-   close(ptmx);
-   return -1;
+	return ret;
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/openpty.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/openpty.h Changed

@@ -1,25 +1,4 @@
-/*
- * openpty: glibc implementation
- *
- * Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
- *
- * Authors:
- * Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
-
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
-
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
+/* SPDX-License-Identifier: LGPL-2.1+ */
 
 #ifndef _OPENPTY_H
 #define _OPENPTY_H
@@ -27,13 +6,15 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
+#include "../lxc/memory_utils.h"
+
 /*
- * Create pseudo tty ptmx pts pair with @__name and set terminal
+ * Create pseudo tty ptx pty pair with @__name and set terminal
  * attributes according to @__termp and @__winp and return handles for both
- * ends in @__aptmx and @__apts.
+ * ends in @__aptx and @__apts.
  */
-extern int openpty (int *__aptmx, int *__apts, char *__name,
-		    const struct termios *__termp,
-		    const struct winsize *__winp);
+__hidden extern int openpty(int *ptx, int *pty, char *name,
+			    const struct termios *termp,
+			    const struct winsize *winp);
 
 #endif

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/prlimit.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/prlimit.h Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/include/strchrnul.c Added

@@ -0,0 +1,159 @@
+/* Copyright (C) 1991-2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
+   with help from Dan Sahlin (dan@sics.se) and
+   bug fix and commentary by Jim Blandy (jimb@ai.mit.edu);
+   adaptation to strchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
+   and implemented by Roland McGrath (roland@ai.mit.edu).
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "strchrnul.h"
+
+/* Find the first occurrence of C in S or the final NUL byte.  */
+char *strchrnul(const char *s, int c_in)
+{
+	const unsigned char *char_ptr;
+	const unsigned long int *longword_ptr;
+	unsigned long int longword, magic_bits, charmask;
+	unsigned char c;
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+	c = (unsigned char)c_in;
+
+	/* Handle the first few characters by reading one character at a time.
+	   Do this until CHAR_PTR is aligned on a longword boundary.  */
+	for (char_ptr = (const unsigned char *)s;
+	     ((unsigned long int)char_ptr & (sizeof(longword) - 1)) != 0;
+	     ++char_ptr)
+		if (*char_ptr == c || *char_ptr == '\0')
+			return (void *)char_ptr;
+
+	/* All these elucidatory comments refer to 4-byte longwords,
+	   but the theory applies equally well to 8-byte longwords.  */
+
+	longword_ptr = (unsigned long int *)char_ptr;
+#pragma GCC diagnostic pop
+
+	/* Bits 31, 24, 16, and 8 of this number are zero.  Call these bits
+	   the "holes."  Note that there is a hole just to the left of
+	   each byte, with an extra at the end:
+
+	   bits:  01111110 11111110 11111110 11111111
+	   bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD
+
+	   The 1-bits make sure that carries propagate to the next 0-bit.
+	   The 0-bits provide holes for carries to fall into.  */
+	magic_bits = -1;
+	magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+
+	/* Set up a longword, each of whose bytes is C.  */
+	charmask = c | (c << 8);
+	charmask |= charmask << 16;
+	if (sizeof(longword) > 4)
+		/* Do the shift in two steps to avoid a warning if long has 32 bits.  */
+		charmask |= (charmask << 16) << 16;
+	if (sizeof(longword) > 8)
+		abort();
+
+	/* Instead of the traditional loop which tests each character,
+	   we will test a longword at a time.  The tricky part is testing
+	   if *any of the four* bytes in the longword in question are zero.  */
+	for (;;) {
+		/* We tentatively exit the loop if adding MAGIC_BITS to
+		   LONGWORD fails to change any of the hole bits of LONGWORD.
+
+		   1) Is this safe?  Will it catch all the zero bytes?
+		   Suppose there is a byte with all zeros.  Any carry bits
+		   propagating from its left will fall into the hole at its
+		   least significant bit and stop.  Since there will be no
+		   carry from its most significant bit, the LSB of the
+		   byte to the left will be unchanged, and the zero will be
+		   detected.
+
+		   2) Is this worthwhile?  Will it ignore everything except
+		   zero bytes?  Suppose every byte of LONGWORD has a bit set
+		   somewhere.  There will be a carry into bit 8.  If bit 8
+		   is set, this will carry into bit 16.  If bit 8 is clear,
+		   one of bits 9-15 must be set, so there will be a carry
+		   into bit 16.  Similarly, there will be a carry into bit
+		   24.  If one of bits 24-30 is set, there will be a carry
+		   into bit 31, so all of the hole bits will be changed.
+
+		   The one misfire occurs when bits 24-30 are clear and bit
+		   31 is set; in this case, the hole at bit 31 is not
+		   changed.  If we had access to the processor carry flag,
+		   we could close this loophole by putting the fourth hole
+		   at bit 32!
+
+		   So it ignores everything except 128's, when they're aligned
+		   properly.
+
+		   3) But wait!  Aren't we looking for C as well as zero?
+		   Good point.  So what we do is XOR LONGWORD with a longword,
+		   each of whose bytes is C.  This turns each byte that is C
+		   into a zero.  */
+
+		longword = *longword_ptr++;
+
+		/* Add MAGIC_BITS to LONGWORD.  */
+		if ((((longword + magic_bits)
+
+		      /* Set those bits that were unchanged by the addition.  */
+		      ^ ~longword)
+
+		     /* Look at only the hole bits.  If any of the hole bits
+			are unchanged, most likely one of the bytes was a
+			zero.  */
+		     & ~magic_bits) != 0
+
+		    /* That caught zeroes.  Now test for C.  */
+		    || ((((longword ^ charmask) + magic_bits) ^
+			 ~(longword ^ charmask)) &
+			~magic_bits) != 0) {
+			/* Which of the bytes was C or zero?
+			   If none of them were, it was a misfire; continue the search.  */
+
+			const unsigned char *cp =
+			    (const unsigned char *)(longword_ptr - 1);
+
+			if (*cp == c || *cp == '\0')
+				return (char *)cp;
+			if (*++cp == c || *cp == '\0')
+				return (char *)cp;
+			if (*++cp == c || *cp == '\0')
+				return (char *)cp;
+			if (*++cp == c || *cp == '\0')
+				return (char *)cp;
+			if (sizeof(longword) > 4) {
+				if (*++cp == c || *cp == '\0')
+					return (char *)cp;
+				if (*++cp == c || *cp == '\0')
+					return (char *)cp;
+				if (*++cp == c || *cp == '\0')
+					return (char *)cp;
+				if (*++cp == c || *cp == '\0')
+					return (char *)cp;
+			}
+		}
+	}
+
+	/* This should never happen.  */
+	return NULL;
+}

_service:tar_scm:lxc-5.0.2.tar.gz/src/include/strchrnul.h Added

@@ -0,0 +1,25 @@
+/* Copyright (C) 1991-2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
+   with help from Dan Sahlin (dan@sics.se) and
+   bug fix and commentary by Jim Blandy (jimb@ai.mit.edu);
+   adaptation to strchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
+   and implemented by Roland McGrath (roland@ai.mit.edu).
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "../lxc/compiler.h"
+
+__hidden extern char *strchrnul(const char *s, int c_in);

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/strlcat.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/strlcat.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/strlcat.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/strlcat.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/include/strlcpy.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/include/strlcpy.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/af_unix.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/af_unix.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/af_unix.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/af_unix.h Changed

@@ -3,42 +3,169 @@
 #ifndef __LXC_AF_UNIX_H
 #define __LXC_AF_UNIX_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <sys/socket.h>
+#include <stddef.h>
 #include <sys/un.h>
 
 #include "compiler.h"
+#include "macro.h"
+#include "memory_utils.h"
+
+#define KERNEL_SCM_MAX_FD 253
+
+/* Allow the caller to set expectations. */
+
+/*
+ * UNIX_FDS_ACCEPT_EXACT will only succeed if the exact amount of fds has been
+ * received  (unless combined with UNIX_FDS_ACCEPT_NONE).
+ */
+#define UNIX_FDS_ACCEPT_EXACT ((__u32)(1 << 0)) /* default */
+
+/*
+ * UNIX_FDS_ACCEPT_LESS will also succeed if less than the requested number of
+ * fd has been received. If the UNIX_FDS_ACCEPT_NONE flag is not raised than at
+ * least one fd must be received.
+ * */
+#define UNIX_FDS_ACCEPT_LESS ((__u32)(1 << 1))
+
+/*
+ * UNIX_FDS_ACCEPT_MORE will also succeed if more than the requested number of
+ * fds have been received. Any additional fds will be silently closed.  If the
+ * UNIX_FDS_ACCEPT_NONE flag is not raised than at least one fd must be
+ * received.
+ */
+#define UNIX_FDS_ACCEPT_MORE ((__u32)(1 << 2)) /* wipe any extra fds */
+
+/*
+ * UNIX_FDS_ACCEPT_NONE can be specified with any of the above flags and
+ * indicates that the caller will accept no file descriptors to be received.
+ */
+#define UNIX_FDS_ACCEPT_NONE ((__u32)(1 << 3))
+
+/* UNIX_FDS_ACCEPT_MASK is the value of all the above flags or-ed together. */
+#define UNIX_FDS_ACCEPT_MASK (UNIX_FDS_ACCEPT_EXACT | UNIX_FDS_ACCEPT_LESS | UNIX_FDS_ACCEPT_MORE | UNIX_FDS_ACCEPT_NONE)
+
+/* Allow the callee to communicate reality. */
+
+/* UNIX_FDS_RECEIVED_EXACT indicates that the exact number of fds was received. */
+#define UNIX_FDS_RECEIVED_EXACT ((__u32)(1 << 16))
+
+/*
+ * UNIX_FDS_RECEIVED_LESS indicates that less than the requested number of fd
+ * has been received.
+ */
+#define UNIX_FDS_RECEIVED_LESS ((__u32)(1 << 17))
+
+/*
+ * UNIX_FDS_RECEIVED_MORE indicates that more than the requested number of fd
+ * has been received.
+ */
+#define UNIX_FDS_RECEIVED_MORE ((__u32)(1 << 18))
+
+/* UNIX_FDS_RECEIVED_NONE indicates that no fds have been received. */
+#define UNIX_FDS_RECEIVED_NONE ((__u32)(1 << 19))
+
+/**
+ * Defines a generic struct to receive file descriptors from unix sockets.
+ * @fd_count_max : Either the exact or maximum number of file descriptors the
+ *                 caller is willing to accept. Must be smaller than
+ *                 KERNEL_SCM_MAX_FDs; larger values will be rejected.
+ *                 Filled in by the caller.
+ * @fd_count_ret : The actually received number of file descriptors.
+ *                 Filled in by the callee.
+ * @flags        : Flags to negotiate expectations about the number of file
+ *                 descriptors to receive.
+ *                 Filled in by the caller and callee. The caller's flag space
+ *                 is UNIX_FDS_ACCEPT_* other values will be rejected. The
+ *                 caller may only set one of {EXACT, LESS, MORE}. In addition
+ *                 they can raise the NONE flag. Any combination of {EXACT,
+ *                 LESS, MORE} will be rejected.
+ *                 The callee's flag space is UNIX_FDS_RECEIVED_*. Only ever
+ *                 one of those values will be set.
+ * @fd           : Array to store received file descriptors into. Filled by the
+ *                 callee on success. If less file descriptors are received
+ *                 than requested in @fd_count_max the callee will ensure that
+ *                 all additional slots will be set to -EBADF. Nonetheless, the
+ *                 caller should only ever use @fd_count_ret to iterate through
+ *                 @fd after a successful receive.
+ */
+struct unix_fds {
+	__u32 fd_count_max;
+	__u32 fd_count_ret;
+	__u32 flags;
+	__s32 fdKERNEL_SCM_MAX_FD;
+} __attribute__((aligned(8)));
 
 /* does not enforce \0-termination */
-extern int lxc_abstract_unix_open(const char *path, int type, int flags);
-extern void lxc_abstract_unix_close(int fd);
+__hidden extern int lxc_abstract_unix_open(const char *path, int type, int flags);
+__hidden extern void lxc_abstract_unix_close(int fd);
 /* does not enforce \0-termination */
-extern int lxc_abstract_unix_connect(const char *path);
+__hidden extern int lxc_abstract_unix_connect(const char *path);
+
+__hidden extern int lxc_abstract_unix_send_fds(int fd, const int *sendfds,
+					       int num_sendfds, void *data,
+					       size_t size) __access_r(2, 3)
+    __access_r(4, 5);
+
+__hidden extern int lxc_abstract_unix_send_fds_iov(int fd, const int *sendfds,
+						   int num_sendfds,
+						   struct iovec *iov,
+						   size_t iovlen)
+    __access_r(2, 3);
+
+__hidden extern ssize_t lxc_abstract_unix_recv_fds(int fd,
+						   struct unix_fds *ret_fds,
+						   void *ret_data,
+						   size_t size_ret_data)
+    __access_r(3, 4);
+
+__hidden extern ssize_t lxc_abstract_unix_recv_one_fd(int fd, int *ret_fd,
+						      void *ret_data,
+						      size_t size_ret_data)
+    __access_r(3, 4);
+
+__hidden extern int __lxc_abstract_unix_send_two_fds(int fd, int fd_first,
+						     int fd_second, void *data,
+						     size_t size);
+
+static inline int lxc_abstract_unix_send_two_fds(int fd, int fd_first,
+						 int fd_second)
+{
+	return __lxc_abstract_unix_send_two_fds(fd, fd_first, fd_second, NULL, 0);
+}
 
-extern int lxc_abstract_unix_send_fds(int fd, int *sendfds, int num_sendfds,
-				      void *data, size_t size)
-__access_r(2, 3) __access_r(4, 5);
+__hidden extern ssize_t __lxc_abstract_unix_recv_two_fds(int fd, int *fd_first,
+							 int *fd_second,
+							 void *data, size_t size);
 
-extern int lxc_abstract_unix_send_fds_iov(int fd, int *sendfds, int num_sendfds,
-					  struct iovec *iov, size_t iovlen)
-__access_r(2, 3);
+static inline ssize_t lxc_abstract_unix_recv_two_fds(int fd, int *fd_first, int *fd_second)
+{
+	return __lxc_abstract_unix_recv_two_fds(fd, fd_first, fd_second, NULL, 0);
+}
 
-extern int lxc_abstract_unix_recv_fds(int fd, int *recvfds, int num_recvfds,
-				      void *data, size_t size)
-__access_r(2, 3) __access_r(4, 5);
+__hidden extern int lxc_unix_send_fds(int fd, int *sendfds, int num_sendfds, void *data, size_t size);
 
-extern int lxc_unix_send_fds(int fd, int *sendfds, int num_sendfds, void *data,
-			     size_t size);
+__hidden extern int lxc_abstract_unix_send_credential(int fd, void *data, size_t size)
+    __access_r(2, 3);
 
-extern int lxc_abstract_unix_send_credential(int fd, void *data, size_t size)
-__access_r(2, 3);
+__hidden extern int lxc_abstract_unix_rcv_credential(int fd, void *data, size_t size)
+    __access_w(2, 3);
 
-extern int lxc_abstract_unix_rcv_credential(int fd, void *data, size_t size)
-__access_w(2, 3);
+__hidden extern int lxc_unix_sockaddr(struct sockaddr_un *ret, const char *path);
+__hidden extern int lxc_unix_connect(struct sockaddr_un *addr);
+__hidden extern int lxc_unix_connect_type(struct sockaddr_un *addr, int type);
+__hidden extern int lxc_socket_set_timeout(int fd, int rcv_timeout, int snd_timeout);
 
-extern int lxc_unix_sockaddr(struct sockaddr_un *ret, const char *path);
-extern int lxc_unix_connect(struct sockaddr_un *addr);
-extern int lxc_unix_connect_type(struct sockaddr_un *addr, int type);
-extern int lxc_socket_set_timeout(int fd, int rcv_timeout, int snd_timeout);
+static inline void put_unix_fds(struct unix_fds *fds)
+{
+	if (!IS_ERR_OR_NULL(fds)) {
+		for (size_t idx = 0; idx < fds->fd_count_ret; idx++)
+			close_prot_errno_disarm(fds->fdidx);
+	}
+}
+define_cleanup_function(struct unix_fds *, put_unix_fds);
 
 #endif /* __LXC_AF_UNIX_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/api_extensions.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/api_extensions.h Changed

@@ -3,11 +3,11 @@
 #ifndef __LXC_API_EXTENSIONS_H
 #define __LXC_API_EXTENSIONS_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "config.h"
-
 /*
  * api_extensions is the list of all API extensions in the order they were
  * added.
@@ -27,18 +27,31 @@
 	"cgroup_relative",
 	"mount_injection_file",
 	"seccomp_allow_nesting",
+#ifdef HAVE_DECL_SECCOMP_NOTIFY_FD
 	"seccomp_notify",
+#endif /* HAVE_DECL_SECCOMP_NOTIFY_FD */
 	"network_veth_routes",
 	"network_ipvlan",
 	"network_l2proxy",
 	"network_gateway_device_route",
 	"network_phys_macvlan_mtu",
 	"network_veth_router",
-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
 	"cgroup2_devices",
-#endif
 	"cgroup2",
 	"pidfd",
+	"cgroup_advanced_isolation",
+	"network_bridge_vlan",
+	"time_namespace",
+	"seccomp_allow_deny_syntax",
+	"devpts_fd",
+#ifdef HAVE_DECL_SECCOMP_NOTIFY_FD
+	"seccomp_notify_fd_active",
+	"seccomp_proxy_send_notify_fd",
+#endif /* HAVE_DECL_SECCOMP_NOTIFY_FD */
+	"idmapped_mounts",
+	"idmapped_mounts_v2",
+	"core_scheduling",
+	"cgroup2_auto_mounting",
 };
 
 static size_t nr_api_extensions = sizeof(api_extensions) / sizeof(*api_extensions);

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/attach.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/attach.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@@ -22,15 +21,15 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "attach.h"
 
 #include "af_unix.h"
 #include "attach.h"
 #include "caps.h"
-#include "cgroup.h"
+#include "cgroups/cgroup.h"
+#include "cgroups/cgroup_utils.h"
 #include "commands.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "lsm/lsm.h"
@@ -39,151 +38,702 @@
 #include "macro.h"
 #include "mainloop.h"
 #include "memory_utils.h"
+#include "mount_utils.h"
 #include "namespace.h"
+#include "open_utils.h"
 #include "process_utils.h"
+#include "sync.h"
 #include "syscall_wrappers.h"
 #include "terminal.h"
 #include "utils.h"
 
-#if HAVE_SYS_PERSONALITY_H
-#include <sys/personality.h>
-#endif
-
 lxc_log_define(attach, lxc);
 
 /* Define default options if no options are supplied by the user. */
 static lxc_attach_options_t attach_static_default_options = LXC_ATTACH_OPTIONS_DEFAULT;
 
-static struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid)
+/*
+ * The context used to attach to the container.
+ * @attach_flags	: the attach flags specified in lxc_attach_options_t
+ * @init_pid        	: the PID of the container's init process
+ * @dfd_init_pid    	: file descriptor to /proc/@init_pid
+ *                  	  __Must be closed in attach_context_security_barrier()__!
+ * @dfd_self_pid    	: file descriptor to /proc/self
+ *                  	  __Must be closed in attach_context_security_barrier()__!
+ * @setup_ns_uid    	: if CLONE_NEWUSER is specified will contain the uid used
+ *                  	  during attach setup.
+ * @setup_ns_gid    	: if CLONE_NEWUSER is specified will contain the gid used
+ *                  	  during attach setup.
+ * @target_ns_uid   	: if CLONE_NEWUSER is specified the uid that the final
+ *                  	  program will be run with.
+ * @target_ns_gid   	: if CLONE_NEWUSER is specified the gid that the final
+ *                  	  program will be run with.
+ * @target_host_uid 	: if CLONE_NEWUSER is specified the uid that the final
+ *                  	  program will be run with on the host.
+ * @target_host_gid 	: if CLONE_NEWUSER is specified the gid that the final
+ *                  	  program will be run with on the host.
+ * @lsm_label       	: LSM label to be used for the attaching process
+ * @container       	: the container we're attaching o
+ * @personality     	: the personality to use for the final program
+ * @capability      	: the capability mask of the @init_pid
+ * @ns_inherited    	: flags of namespaces that the final program will inherit
+ *                  	  from @init_pid
+ * @ns_fd           	: file descriptors to @init_pid's namespaces
+ * @core_sched_cookie	: core scheduling cookie
+ */
+struct attach_context {
+	unsigned int ns_clone_flags;
+	unsigned int attach_flags;
+	int init_pid;
+	int init_pidfd;
+	int dfd_init_pid;
+	int dfd_self_pid;
+	uid_t setup_ns_uid;
+	gid_t setup_ns_gid;
+	uid_t target_ns_uid;
+	gid_t target_ns_gid;
+	uid_t target_host_uid;
+	uid_t target_host_gid;
+	char *lsm_label;
+	struct lxc_container *container;
+	personality_t personality;
+	unsigned long long capability_mask;
+	int ns_inherited;
+	int ns_fdLXC_NS_MAX;
+	struct lsm_ops *lsm_ops;
+	__u64 core_sched_cookie;
+};
+
+static pid_t pidfd_get_pid(int dfd_init_pid, int pidfd)
 {
 	__do_free char *line = NULL;
-	__do_fclose FILE *proc_file = NULL;
-	__do_free struct lxc_proc_context_info *info = NULL;
+	__do_fclose FILE *f = NULL;
+	size_t len = 0;
+	char pathSTRLITERALLEN("fdinfo/") + INTTYPE_TO_STRLEN(int) + 1  = "fdinfo/";
 	int ret;
-	bool found;
-	char proc_fnLXC_PROC_STATUS_LEN;
-	size_t line_bufsz = 0;
 
-	/* Read capabilities. */
-	ret = snprintf(proc_fn, LXC_PROC_STATUS_LEN, "/proc/%d/status", pid);
-	if (ret < 0 || ret >= LXC_PROC_STATUS_LEN)
-		return NULL;
+	if (dfd_init_pid < 0 || pidfd < 0)
+		return ret_errno(EBADF);
 
-	proc_file = fopen(proc_fn, "re");
-	if (!proc_file)
-		return log_error_errno(NULL, errno, "Failed to open %s", proc_fn);
+	ret = strnprintf(path + STRLITERALLEN("fdinfo/"), INTTYPE_TO_STRLEN(int), "%d", pidfd);
+	if (ret < 0)
+		return ret_errno(EIO);
 
-	info = calloc(1, sizeof(*info));
-	if (!info)
-		return NULL;
+	f = fdopen_at(dfd_init_pid, path, "re", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH);
+	if (!f)
+		return -errno;
 
-	found = false;
+	while (getline(&line, &len, f) != -1) {
+		const char *prefix = "Pid:\t";
+		const size_t prefix_len = STRLITERALLEN("Pid:\t");
+		int pid = -ESRCH;
+		char *slider = line;
 
-	while (getline(&line, &line_bufsz, proc_file) != -1) {
-		ret = sscanf(line, "CapBnd: %llx", &info->capability_mask);
-		if (ret != EOF && ret == 1) {
-			found = true;
-			break;
-		}
+		if (!strnequal(slider, prefix, prefix_len))
+			continue;
+
+		slider += prefix_len;
+		slider = lxc_trim_whitespace_in_place(slider);
+
+		ret = lxc_safe_int(slider, &pid);
+		if (ret)
+			return -ret;
+
+		return pid;
 	}
 
-	if (!found)
-		return log_error_errno(NULL, ENOENT, "Failed to read capability bounding set from %s", proc_fn);
+	return ret_errno(ENOENT);
+}
+
+static inline bool sync_wake_pid(int fd, pid_t pid)
+{
+	return lxc_write_nointr(fd, &pid, sizeof(pid_t)) == sizeof(pid_t);
+}
 
-	info->lsm_label = lsm_process_label_get(pid);
-	info->ns_inherited = 0;
-	for (int i = 0; i < LXC_NS_MAX; i++)
-		info->ns_fdi = -EBADF;
+static inline bool sync_wait_pid(int fd, pid_t *pid)
+{
+	return lxc_read_nointr(fd, pid, sizeof(pid_t)) == sizeof(pid_t);
+}
+
+static inline bool sync_wake_fd(int fd, int fd_send)
+{
+	return lxc_abstract_unix_send_fds(fd, &fd_send, 1, NULL, 0) > 0;
+}
 
-	return move_ptr(info);
+static inline bool sync_wait_fd(int fd, int *fd_recv)
+{
+	return lxc_abstract_unix_recv_one_fd(fd, fd_recv, NULL, 0) > 0;
 }
 
-static inline void lxc_proc_close_ns_fd(struct lxc_proc_context_info *ctx)
+static inline bool attach_lsm(lxc_attach_options_t *options)
 {
-	for (int i = 0; i < LXC_NS_MAX; i++)
-		close_prot_errno_disarm(ctx->ns_fdi);
+	return (options->attach_flags & (LXC_ATTACH_LSM | LXC_ATTACH_LSM_LABEL));
 }
 
-static void lxc_proc_put_context_info(struct lxc_proc_context_info *ctx)
+static struct attach_context *alloc_attach_context(void)
 {
-	free(ctx->lsm_label);
-	ctx->lsm_label = NULL;
+	struct attach_context *ctx;
+
+	ctx = zalloc(sizeof(struct attach_context));
+	if (!ctx)
+		return ret_set_errno(NULL, ENOMEM);
+
+	ctx->init_pid		= -ESRCH;
+
+	ctx->dfd_self_pid	= -EBADF;
+	ctx->dfd_init_pid	= -EBADF;
+	ctx->init_pidfd		= -EBADF;
 
-	if (ctx->container) {
-		lxc_container_put(ctx->container);
-		ctx->container = NULL;
+	ctx->setup_ns_uid	= LXC_INVALID_UID;
+	ctx->setup_ns_gid	= LXC_INVALID_GID;
+	ctx->target_ns_uid	= LXC_INVALID_UID;
+	ctx->target_ns_gid	= LXC_INVALID_GID;
+	ctx->target_host_uid	= LXC_INVALID_UID;
+	ctx->target_host_gid	= LXC_INVALID_GID;
+
+	ctx->core_sched_cookie	= INVALID_SCHED_CORE_COOKIE;
+
+	for (lxc_namespace_t i = 0; i < LXC_NS_MAX; i++)
+		ctx->ns_fdi = -EBADF;
+
+	return ctx;
+}
+
+static int get_personality(const char *name, const char *lxcpath,
+			   personality_t *personality)
+{
+	__do_free char *p = NULL;
+	int ret;
+	signed long per;
+
+	p = lxc_cmd_get_config_item(name, "lxc.arch", lxcpath);
+	if (!p) {
+		*personality = LXC_ARCH_UNCHANGED;
+		return 0;
 	}
 
-	lxc_proc_close_ns_fd(ctx);
-	free(ctx);
+	ret = lxc_config_parse_arch(p, &per);
+	if (ret < 0)
+		return syserror("Failed to parse personality");
+
+	*personality = per;
+	return 0;
 }
 
-/**
- * in_same_namespace - Check whether two processes are in the same namespace.
- * @pid1 - PID of the first process.
- * @pid2 - PID of the second process.
- * @ns   - Name of the namespace to check. Must correspond to one of the names
- *         for the namespaces as shown in /proc/<pid/ns/
- *
- * If the two processes are not in the same namespace returns an fd to the
- * namespace of the second process identified by @pid2. If the two processes are
- * in the same namespace returns -EINVAL, -1 if an error occurred.
- */
-static int in_same_namespace(pid_t pid1, pid_t pid2, const char *ns)
+static int userns_setup_ids(struct attach_context *ctx,
+			    lxc_attach_options_t *options)
 {
-	__do_close int ns_fd1 = -EBADF, ns_fd2 = -EBADF;
-	int ret = -1;
-	struct stat ns_st1, ns_st2;
+	__do_free char *line = NULL;
+	__do_fclose FILE *f_gidmap = NULL, *f_uidmap = NULL;
+	size_t len = 0;
+	uid_t init_ns_uid = LXC_INVALID_UID;
+	gid_t init_ns_gid = LXC_INVALID_GID;
+	uid_t nsuid, hostuid, range_uid;
+	gid_t nsgid, hostgid, range_gid;
+
+	if (!(options->namespaces & CLONE_NEWUSER))
+		return 0;
+
+	f_uidmap = fdopen_at(ctx->dfd_init_pid, "uid_map", "re", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH);
+	if (!f_uidmap)
+		return syserror("Failed to open uid_map");
+
+	while (getline(&line, &len, f_uidmap) != -1) {
+		if (sscanf(line, "%u %u %u", &nsuid, &hostuid, &range_uid) != 3)
+			continue;
+
+		if (0 >= nsuid && 0 < nsuid + range_uid) {
+			ctx->setup_ns_uid = 0;
+			TRACE("Container has mapping for uid 0");
+			break;
+		}
+
+		if (ctx->target_host_uid >= hostuid && ctx->target_host_uid < hostuid + range_uid) {
+			init_ns_uid = (ctx->target_host_uid - hostuid) + nsuid;
+			TRACE("Container runs with uid %d", init_ns_uid);
+		}
+	}
+
+	f_gidmap = fdopen_at(ctx->dfd_init_pid, "gid_map", "re", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH);
+	if (!f_gidmap)
+		return syserror("Failed to open gid_map");
+
+	while (getline(&line, &len, f_gidmap) != -1) {
+		if (sscanf(line, "%u %u %u", &nsgid, &hostgid, &range_gid) != 3)
+			continue;
+
+		if (0 >= nsgid && 0 < nsgid + range_gid) {
+			ctx->setup_ns_gid = 0;
+			TRACE("Container has mapping for gid 0");
+			break;
+		}
+
+		if (ctx->target_host_gid >= hostgid && ctx->target_host_gid < hostgid + range_gid) {
+			init_ns_gid = (ctx->target_host_gid - hostgid) + nsgid;
+			TRACE("Container runs with gid %d", init_ns_gid);
+		}
+	}
+
+	if (ctx->setup_ns_uid == LXC_INVALID_UID)
+		ctx->setup_ns_uid = init_ns_uid;
+
+	if (ctx->setup_ns_gid == LXC_INVALID_UID)
+		ctx->setup_ns_gid = init_ns_gid;
+
+	return 0;
+}
+
+static void userns_target_ids(struct attach_context *ctx, lxc_attach_options_t *options)
+{
+	if (options->uid != LXC_INVALID_UID)
+		ctx->target_ns_uid = options->uid;
+	else if (options->namespaces & CLONE_NEWUSER)
+		ctx->target_ns_uid = ctx->setup_ns_uid;
+	else
+		ctx->target_ns_uid = 0;
+
+	if (ctx->target_ns_uid == LXC_INVALID_UID)
+		WARN("Invalid uid specified");
+
+	if (options->gid != LXC_INVALID_GID)
+		ctx->target_ns_gid = options->gid;
+	else if (options->namespaces & CLONE_NEWUSER)
+		ctx->target_ns_gid = ctx->setup_ns_gid;
+	else
+		ctx->target_ns_gid = 0;
+
+	if (ctx->target_ns_gid == LXC_INVALID_GID)
+		WARN("Invalid gid specified");
+}
 
-	ns_fd1 = lxc_preserve_ns(pid1, ns);
-	if (ns_fd1 < 0) {
-		/* The kernel does not support this namespace. This is not an
-		 * error.
+static int parse_init_status(struct attach_context *ctx, lxc_attach_options_t *options)
+{
+	__do_free char *line = NULL;
+	__do_fclose FILE *f = NULL;
+	size_t len = 0;
+	bool caps_found = false;
+	int ret;
+
+	f = fdopen_at(ctx->dfd_init_pid, "status", "re", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH);
+	if (!f)
+		return syserror("Failed to open status file");
+
+	while (getline(&line, &len, f) != -1) {
+		signed long value = -1;
+
+		/*
+		 * Format is: real, effective, saved set user, fs we only care
+		 * about real uid.
 		 */
-		if (errno == ENOENT)
-			return -EINVAL;
+		ret = sscanf(line, "Uid: %ld", &value);
+		if (ret != EOF && ret == 1) {
+			ctx->target_host_uid = (uid_t)value;
+			TRACE("Container's init process runs with hostuid %d", ctx->target_host_uid);
+			goto next;
+		}
+
+		ret = sscanf(line, "Gid: %ld", &value);
+		if (ret != EOF && ret == 1) {
+			ctx->target_host_gid = (gid_t)value;
+			TRACE("Container's init process runs with hostgid %d", ctx->target_host_gid);
+			goto next;
+		}
+
+		ret = sscanf(line, "CapBnd: %llx", &ctx->capability_mask);
+		if (ret != EOF && ret == 1) {
+			caps_found = true;
+			goto next;
+		}
+
+        next:
+		if (ctx->target_host_uid != LXC_INVALID_UID &&
+		    ctx->target_host_gid != LXC_INVALID_GID &&
+		    caps_found)
+			break;
 
-		return -1;
 	}
 
-	ns_fd2 = lxc_preserve_ns(pid2, ns);
-	if (ns_fd2 < 0)
-		return -1;
+	ret = userns_setup_ids(ctx, options);
+	if (ret)
+		return syserror_ret(ret, "Failed to get setup ids");
+	userns_target_ids(ctx, options);
+
+	return 0;
+}
 
-	ret = fstat(ns_fd1, &ns_st1);
+static bool pidfd_setns_supported(struct attach_context *ctx)
+{
+	int ret;
+
+	/*
+	 * The ability to attach to time namespaces came after the introduction
+	 * of of using pidfds for attaching to namespaces. To avoid having to
+	 * special-case both CLONE_NEWUSER and CLONE_NEWTIME handling, let's
+	 * use CLONE_NEWTIME as gatekeeper.
+	 */
+	if (ctx->init_pidfd >= 0)
+		ret = setns(ctx->init_pidfd, CLONE_NEWTIME);
+	else
+		ret = -EOPNOTSUPP;
+	TRACE("Attaching to namespaces via pidfds %s",
+	      ret ? "unsupported" : "supported");
+	return ret == 0;
+}
+
+static int get_attach_context(struct attach_context *ctx,
+			      struct lxc_container *container,
+			      lxc_attach_options_t *options)
+{
+	__do_free char *lsm_label = NULL;
+	int ret;
+	char pathLXC_PROC_PID_LEN;
+
+	ctx->container = container;
+	ctx->attach_flags = options->attach_flags;
+
+	ctx->dfd_self_pid = open_at(-EBADF, "/proc/self",
+				    PROTECT_OPATH_FILE & ~O_NOFOLLOW,
+				    (PROTECT_LOOKUP_ABSOLUTE_WITH_SYMLINKS & ~RESOLVE_NO_XDEV), 0);
+	if (ctx->dfd_self_pid < 0)
+		return syserror("Failed to open /proc/self");
+
+	ctx->init_pidfd = lxc_cmd_get_init_pidfd(container->name, container->config_path);
+	if (ctx->init_pidfd >= 0)
+		ctx->init_pid = pidfd_get_pid(ctx->dfd_self_pid, ctx->init_pidfd);
+	else
+		ctx->init_pid = lxc_cmd_get_init_pid(container->name, container->config_path);
+	if (ctx->init_pid < 0)
+		return syserror_ret(-1, "Failed to get init pid");
+
+	ret = lxc_cmd_get_clone_flags(container->name, container->config_path);
 	if (ret < 0)
-		return -1;
+		SYSERROR("Failed to retrieve namespace flags");
+	ctx->ns_clone_flags = ret;
 
-	ret = fstat(ns_fd2, &ns_st2);
+	ret = core_scheduling_cookie_get(ctx->init_pid, &ctx->core_sched_cookie);
+	if (ret || !core_scheduling_cookie_valid(ctx->core_sched_cookie))
+		INFO("Container does not run in a separate core scheduling domain");
+	else
+		INFO("Container runs in separate core scheduling domain %llu",
+		     (llu)ctx->core_sched_cookie);
+
+	ret = strnprintf(path, sizeof(path), "/proc/%d", ctx->init_pid);
 	if (ret < 0)
-		return -1;
+		return ret_errno(EIO);
+
+	ctx->dfd_init_pid = open_at(-EBADF, path,
+				    PROTECT_OPATH_DIRECTORY,
+				    (PROTECT_LOOKUP_ABSOLUTE & ~RESOLVE_NO_XDEV), 0);
+	if (ctx->dfd_init_pid < 0)
+		return syserror("Failed to open /proc/%d", ctx->init_pid);
+
+	if (ctx->init_pidfd >= 0) {
+		ret = lxc_raw_pidfd_send_signal(ctx->init_pidfd, 0, NULL, 0);
+		if (ret)
+			return syserror("Container process exited or PID has been recycled");
+		else
+			TRACE("Container process still running and PID was not recycled");
+
+		if (!pidfd_setns_supported(ctx)) {
+			/* We can't risk leaking file descriptors during attach. */
+			if (close(ctx->init_pidfd))
+				return syserror("Failed to close pidfd");
+
+			ctx->init_pidfd = -EBADF;
+			TRACE("Attaching to namespaces via pidfds not supported");
+		}
+	}
+
+	/* Determine which namespaces the container was created with. */
+	if (options->namespaces == -1) {
+		options->namespaces = ctx->ns_clone_flags;
+		if (options->namespaces == -1)
+			return syserror_set(-EINVAL, "Failed to automatically determine the namespaces which the container uses");
+
+		for (lxc_namespace_t i = 0; i < LXC_NS_MAX; i++) {
+			if (ns_infoi.clone_flag & CLONE_NEWCGROUP)
+				if (!(options->attach_flags & LXC_ATTACH_MOVE_TO_CGROUP) ||
+				    !cgns_supported())
+					continue;
+
+			if (ns_infoi.clone_flag & options->namespaces)
+				continue;
+
+			ctx->ns_inherited |= ns_infoi.clone_flag;
+		}
+	}
+
+	ret = parse_init_status(ctx, options);
+	if (ret)
+		return syserror("Failed to open parse file");
+
+	ctx->lsm_ops = lsm_init_static();
+
+	if (attach_lsm(options)) {
+		if (ctx->attach_flags & LXC_ATTACH_LSM_LABEL)
+			lsm_label = options->lsm_label;
+		else
+			lsm_label = ctx->lsm_ops->process_label_get_at(ctx->lsm_ops, ctx->dfd_init_pid);
+		if (!lsm_label)
+			WARN("No security context received");
+		else
+			INFO("Retrieved security context %s", lsm_label);
+	}
+
+	ret = get_personality(container->name, container->config_path, &ctx->personality);
+	if (ret)
+		return syserror_ret(ret, "Failed to get personality of the container");
+
+	if (!ctx->container->lxc_conf) {
+		ctx->container->lxc_conf = lxc_conf_init();
+		if (!ctx->container->lxc_conf)
+			return syserror_set(-ENOMEM, "Failed to allocate new lxc config");
+	}
+
+	ctx->lsm_label = move_ptr(lsm_label);
+	return 0;
+}
+
+static int same_nsfd(int dfd_pid1, int dfd_pid2, const char *ns_path)
+{
+	int ret;
+	struct stat ns_st1, ns_st2;
+
+	ret = fstatat(dfd_pid1, ns_path, &ns_st1, 0);
+	if (ret)
+		return -errno;
+
+	ret = fstatat(dfd_pid2, ns_path, &ns_st2, 0);
+	if (ret)
+		return -errno;
 
 	/* processes are in the same namespace */
-	if ((ns_st1.st_dev == ns_st2.st_dev) && (ns_st1.st_ino == ns_st2.st_ino))
-		return -EINVAL;
+	if ((ns_st1.st_dev == ns_st2.st_dev) &&
+	    (ns_st1.st_ino == ns_st2.st_ino))
+		return 1;
 
-	/* processes are in different namespaces */
-	return move_fd(ns_fd2);
+	return 0;
 }
 
-static int lxc_attach_to_ns(pid_t pid, struct lxc_proc_context_info *ctx)
+static int same_ns(int dfd_pid1, int dfd_pid2, const char *ns_path)
 {
-	for (int i = 0; i < LXC_NS_MAX; i++) {
+	__do_close int ns_fd2 = -EBADF;
+	int ret = -1;
+
+	ns_fd2 = open_at(dfd_pid2, ns_path, PROTECT_OPEN_WITH_TRAILING_SYMLINKS,
+			 (PROTECT_LOOKUP_BENEATH_WITH_MAGICLINKS &
+			  ~(RESOLVE_NO_XDEV | RESOLVE_BENEATH)), 0);
+	if (ns_fd2 < 0) {
+		if (errno == ENOENT)
+			return -ENOENT;
+		return syserror("Failed to open %d(%s)", dfd_pid2, ns_path);
+	}
+
+	ret = same_nsfd(dfd_pid1, dfd_pid2, ns_path);
+	switch (ret) {
+	case -ENOENT:
+		__fallthrough;
+	case 1:
+		return ret_errno(ENOENT);
+	case 0:
+		/* processes are in different namespaces */
+		return move_fd(ns_fd2);
+	}
+
+	return ret;
+}
+
+static int __prepare_namespaces_pidfd(struct attach_context *ctx)
+{
+	for (lxc_namespace_t i = 0; i < LXC_NS_MAX; i++) {
+		int ret;
+
+		ret = same_nsfd(ctx->dfd_self_pid,
+				ctx->dfd_init_pid,
+				ns_infoi.proc_path);
+		switch (ret) {
+		case -ENOENT:
+			__fallthrough;
+		case 1:
+			ctx->ns_inherited &= ~ns_infoi.clone_flag;
+			TRACE("Shared %s namespace doesn't need attach", ns_infoi.proc_name);
+			continue;
+		case 0:
+			TRACE("Different %s namespace needs attach", ns_infoi.proc_name);
+			continue;
+		}
+
+		return syserror("Failed to determine whether %s namespace is shared",
+				ns_infoi.proc_name);
+	}
+
+	return 0;
+}
+
+static int __prepare_namespaces_nsfd(struct attach_context *ctx,
+				     lxc_attach_options_t *options)
+{
+	for (lxc_namespace_t i = 0; i < LXC_NS_MAX; i++) {
+		lxc_namespace_t j;
+
+		if (options->namespaces & ns_infoi.clone_flag)
+			ctx->ns_fdi = open_at(ctx->dfd_init_pid,
+						ns_infoi.proc_path,
+						PROTECT_OPEN_WITH_TRAILING_SYMLINKS,
+						(PROTECT_LOOKUP_BENEATH_WITH_MAGICLINKS &
+						 ~(RESOLVE_NO_XDEV | RESOLVE_BENEATH)),
+						0);
+		else if (ctx->ns_inherited & ns_infoi.clone_flag)
+			ctx->ns_fdi = same_ns(ctx->dfd_self_pid,
+						ctx->dfd_init_pid,
+						ns_infoi.proc_path);
+		else
+			continue;
+
+		if (ctx->ns_fdi >= 0)
+			continue;
+
+		if (ctx->ns_fdi == -ENOENT) {
+			ctx->ns_inherited &= ~ns_infoi.clone_flag;
+			continue;
+		}
+
+		/* We failed to preserve the namespace. */
+		SYSERROR("Failed to preserve %s namespace of %d",
+			 ns_infoi.proc_name, ctx->init_pid);
+
+		/* Close all already opened file descriptors before we return an
+		 * error, so we don't leak them.
+		 */
+		for (j = 0; j < i; j++)
+			close_prot_errno_disarm(ctx->ns_fdj);
+
+		return ret_errno(EINVAL);
+	}
+
+	return 0;
+}
+
+static int prepare_namespaces(struct attach_context *ctx,
+			      lxc_attach_options_t *options)
+{
+	if (ctx->init_pidfd < 0)
+		return __prepare_namespaces_nsfd(ctx, options);
+
+	return __prepare_namespaces_pidfd(ctx);
+}
+
+static inline void put_namespaces(struct attach_context *ctx)
+{
+	if (ctx->init_pidfd < 0) {
+		for (int i = 0; i < LXC_NS_MAX; i++)
+			close_prot_errno_disarm(ctx->ns_fdi);
+	}
+}
+
+static int __attach_namespaces_pidfd(struct attach_context *ctx,
+				     lxc_attach_options_t *options)
+{
+	unsigned int ns_flags = options->namespaces | ctx->ns_inherited;
+	int ret;
+
+	/* The common case is to attach to all namespaces. */
+	ret = setns(ctx->init_pidfd, ns_flags);
+	if (ret)
+		return syserror("Failed to attach to namespaces via pidfd");
+
+	/* We can't risk leaking file descriptors into the container. */
+	if (close(ctx->init_pidfd))
+		return syserror("Failed to close pidfd");
+	ctx->init_pidfd = -EBADF;
+
+	return log_trace(0, "Attached to container namespaces via pidfd");
+}
+
+static int __attach_namespaces_nsfd(struct attach_context *ctx,
+				    lxc_attach_options_t *options)
+{
+	int fret = 0;
+
+	for (lxc_namespace_t i = 0; i < LXC_NS_MAX; i++) {
 		int ret;
 
 		if (ctx->ns_fdi < 0)
 			continue;
 
 		ret = setns(ctx->ns_fdi, ns_infoi.clone_flag);
-		if (ret < 0)
-			return log_error_errno(-1,
-					       errno, "Failed to attach to %s namespace of %d",
-					       ns_infoi.proc_name, pid);
+		if (ret)
+			return syserror("Failed to attach to %s namespace of %d",
+					ns_infoi.proc_name, ctx->init_pid);
+
+		if (close(ctx->ns_fdi)) {
+			fret = -errno;
+			SYSERROR("Failed to close file descriptor for %s namespace",
+				 ns_infoi.proc_name);
+		}
+		ctx->ns_fdi = -EBADF;
+	}
+
+	return fret;
+}
 
-		DEBUG("Attached to %s namespace of %d", ns_infoi.proc_name, pid);
+static int attach_namespaces(struct attach_context *ctx,
+			     lxc_attach_options_t *options)
+{
+	if (lxc_log_trace()) {
+		for (lxc_namespace_t i = 0; i < LXC_NS_MAX; i++) {
+			if (ns_infoi.clone_flag & options->namespaces) {
+				TRACE("Attaching to %s namespace", ns_infoi.proc_name);
+				continue;
+			}
+			if (ns_infoi.clone_flag & ctx->ns_inherited) {
+				TRACE("Sharing %s namespace", ns_infoi.proc_name);
+				continue;
+			}
+			TRACE("Inheriting %s namespace", ns_infoi.proc_name);
+		}
 	}
 
-	return 0;
+	if (ctx->init_pidfd < 0)
+		return __attach_namespaces_nsfd(ctx, options);
+
+	return __attach_namespaces_pidfd(ctx, options);
+}
+
+static void put_attach_context(struct attach_context *ctx)
+{
+	if (ctx) {
+		if (!(ctx->attach_flags & LXC_ATTACH_LSM_LABEL))
+			free_disarm(ctx->lsm_label);
+		close_prot_errno_disarm(ctx->dfd_init_pid);
+
+		if (ctx->container) {
+			lxc_container_put(ctx->container);
+			ctx->container = NULL;
+		}
+
+		put_namespaces(ctx);
+		free(ctx);
+	}
+}
+
+/*
+ * Place anything in here that needs to be get rid of before we move into the
+ * container's context and fail hard if we can't.
+ */
+static bool attach_context_security_barrier(struct attach_context *ctx)
+{
+	if (ctx) {
+		if (close(ctx->dfd_self_pid))
+			return false;
+		ctx->dfd_self_pid = -EBADF;
+
+		if (close(ctx->dfd_init_pid))
+			return false;
+		ctx->dfd_init_pid = -EBADF;
+	}
+
+	return true;
 }
 
 int lxc_attach_remount_sys_proc(void)
@@ -192,7 +742,7 @@
 
 	ret = unshare(CLONE_NEWNS);
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to unshare mount namespace");
+		return syserror("Failed to unshare mount namespace");
 
 	if (detect_shared_rootfs() && mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL))
 		SYSERROR("Failed to recursively turn root mount tree into dependent mount. Continuing...");
@@ -200,11 +750,11 @@
 	/* Assume /proc is always mounted, so remount it. */
 	ret = umount2("/proc", MNT_DETACH);
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to unmount /proc");
+		return syserror("Failed to unmount /proc");
 
 	ret = mount("none", "/proc", "proc", 0, NULL);
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to remount /proc");
+		return syserror("Failed to remount /proc");
 
 	/*
 	 * Try to umount /sys. If it's not a mount point, we'll get EINVAL, then
@@ -212,27 +762,31 @@
 	 */
 	ret = umount2("/sys", MNT_DETACH);
 	if (ret < 0 && errno != EINVAL)
-		return log_error_errno(-1, errno, "Failed to unmount /sys");
+		return syserror("Failed to unmount /sys");
 
 	/* Remount it. */
 	if (ret == 0 && mount("none", "/sys", "sysfs", 0, NULL))
-		return log_error_errno(-1, errno, "Failed to remount /sys");
+		return syserror("Failed to remount /sys");
 
 	return 0;
 }
 
-static int lxc_attach_drop_privs(struct lxc_proc_context_info *ctx)
+static int drop_capabilities(struct attach_context *ctx)
 {
-	int last_cap;
+	int ret;
+	__u32 last_cap;
 
-	last_cap = lxc_caps_last_cap();
-	for (int cap = 0; cap <= last_cap; cap++) {
+	ret = lxc_caps_last_cap(&last_cap);
+	if (ret)
+		return syserror_ret(ret, "%d - Failed to drop capabilities", ret);
+
+	for (__u32 cap = 0; cap <= last_cap; cap++) {
 		if (ctx->capability_mask & (1LL << cap))
 			continue;
 
 		if (prctl(PR_CAPBSET_DROP, prctl_arg(cap), prctl_arg(0),
 			  prctl_arg(0), prctl_arg(0)))
-			return log_error_errno(-1, errno, "Failed to drop capability %d", cap);
+			return syserror("Failed to drop capability %d", cap);
 
 		TRACE("Dropped capability %d", cap);
 	}
@@ -240,12 +794,11 @@
 	return 0;
 }
 
-static int lxc_attach_set_environment(struct lxc_proc_context_info *init_ctx,
+static int lxc_attach_set_environment(struct attach_context *ctx,
 				      enum lxc_attach_env_policy_t policy,
 				      char **extra_env, char **extra_keep)
 {
 	int ret;
-	struct lxc_list *iterator;
 
 	if (policy == LXC_ATTACH_CLEAR_ENV) {
 		int path_kept = 0;
@@ -257,7 +810,7 @@
 			for (count = 0; extra_keepcount; count++)
 				;
 
-			extra_keep_store = calloc(count, sizeof(char *));
+			extra_keep_store = zalloc(count * sizeof(char *));
 			if (!extra_keep_store)
 				return -1;
 
@@ -273,7 +826,7 @@
 						return -1;
 					}
 
-					if (strcmp(extra_keepi, "PATH") == 0)
+					if (strequal(extra_keepi, "PATH"))
 						path_kept = 1;
 				}
 			}
@@ -289,7 +842,7 @@
 				free(extra_keep_store);
 			}
 
-			return log_error(-1, "Failed to clear environment");
+			return syserror("Failed to clear environment");
 		}
 
 		if (extra_keep_store) {
@@ -325,18 +878,10 @@
 		return log_warn(-1, "Failed to set environment variable");
 
 	/* Set container environment variables.*/
-	if (init_ctx && init_ctx->container && init_ctx->container->lxc_conf) {
-		lxc_list_for_each(iterator, &init_ctx->container->lxc_conf->environment) {
-			char *env_tmp;
-
-			env_tmp = strdup((char *)iterator->elem);
-			if (!env_tmp)
-				return -1;
-
-			ret = putenv(env_tmp);
-			if (ret < 0)
-				return log_error_errno(-1, errno, "Failed to set environment variable: %s", (char *)iterator->elem);
-		}
+	if (ctx->container->lxc_conf) {
+		ret = lxc_set_environment(ctx->container->lxc_conf);
+		if (ret < 0)
+			return -1;
 	}
 
 	/* Set extra environment variables. */
@@ -415,8 +960,8 @@
 		}
 
 		/* Finish argument list. */
-		ret = snprintf(uid_buf, sizeof(uid_buf), "%ld", (long)uid);
-		if (ret <= 0 || ret >= sizeof(uid_buf))
+		ret = strnprintf(uid_buf, sizeof(uid_buf), "%ld", (long)uid);
+		if (ret <= 0)
 			_exit(EXIT_FAILURE);
 
 		/* Try to run getent program. */
@@ -459,7 +1004,7 @@
 		if (!token)
 			continue;
 
-		/* next: dummy password field */
+		/* next: placeholder password field */
 		token = strtok_r(NULL, ":", &saveptr);
 		if (!token)
 			continue;
@@ -471,7 +1016,7 @@
 		    value == LONG_MAX)
 			continue;
 
-		/* dummy sanity check: user id matches */
+		/* placeholder conherence check: user id matches */
 		if ((uid_t)value != uid)
 			continue;
 
@@ -488,71 +1033,23 @@
 		free_disarm(result);
 		result = strdup(token);
 
-		/* Sanity check that there are no fields after that. */
-		token = strtok_r(NULL, ":", &saveptr);
-		if (token)
-			continue;
-
-		found = true;
-	}
-
-reap_child:
-	ret = wait_for_pid(pid);
-	if (ret < 0)
-		return NULL;
-
-	if (!found)
-		return NULL;
-
-	return move_ptr(result);
-}
-
-static void lxc_attach_get_init_uidgid(uid_t *init_uid, gid_t *init_gid)
-{
-	__do_free char *line = NULL;
-	__do_fclose FILE *proc_file = NULL;
-	char proc_fnLXC_PROC_STATUS_LEN;
-	int ret;
-	size_t line_bufsz = 0;
-	long value = -1;
-	uid_t uid = LXC_INVALID_UID;
-	gid_t gid = LXC_INVALID_GID;
-
-	ret = snprintf(proc_fn, LXC_PROC_STATUS_LEN, "/proc/%d/status", 1);
-	if (ret < 0 || ret >= LXC_PROC_STATUS_LEN)
-		return;
-
-	proc_file = fopen(proc_fn, "re");
-	if (!proc_file)
-		return;
-
-	while (getline(&line, &line_bufsz, proc_file) != -1) {
-		/* Format is: real, effective, saved set user, fs we only care
-		 * about real uid.
-		 */
-		ret = sscanf(line, "Uid: %ld", &value);
-		if (ret != EOF && ret == 1) {
-			uid = (uid_t)value;
-		} else {
-			ret = sscanf(line, "Gid: %ld", &value);
-			if (ret != EOF && ret == 1)
-				gid = (gid_t)value;
-		}
+		/* Sanity check that there are no fields after that. */
+		token = strtok_r(NULL, ":", &saveptr);
+		if (token)
+			continue;
 
-		if (uid != LXC_INVALID_UID && gid != LXC_INVALID_GID)
-			break;
+		found = true;
 	}
 
-	/* Only override arguments if we found something. */
-	if (uid != LXC_INVALID_UID)
-		*init_uid = uid;
+reap_child:
+	ret = wait_for_pid(pid);
+	if (ret < 0)
+		return NULL;
 
-	if (gid != LXC_INVALID_GID)
-		*init_gid = gid;
+	if (!found)
+		return NULL;
 
-	/* TODO: we should also parse supplementary groups and use
-	 * setgroups() to set them.
-	 */
+	return move_ptr(result);
 }
 
 static bool fetch_seccomp(struct lxc_container *c, lxc_attach_options_t *options)
@@ -561,13 +1058,12 @@
 	int ret;
 	bool bret;
 
-	if (!(options->namespaces & CLONE_NEWNS) ||
-	    !(options->attach_flags & LXC_ATTACH_LSM)) {
+	if (!attach_lsm(options)) {
 		free_disarm(c->lxc_conf->seccomp.seccomp);
 		return true;
 	}
 
-	/* Remove current setting. */
+        /* Remove current setting. */
 	if (!c->set_config_item(c, "lxc.seccomp.profile", "") &&
 	    !c->set_config_item(c, "lxc.seccomp", ""))
 		return false;
@@ -612,48 +1108,66 @@
 	return c->set_config_item(c, "lxc.no_new_privs", val);
 }
 
-static signed long get_personality(const char *name, const char *lxcpath)
-{
-	__do_free char *p = NULL;
-
-	p = lxc_cmd_get_config_item(name, "lxc.arch", lxcpath);
-	if (!p)
-		return -1;
-
-	return lxc_config_parse_arch(p);
-}
-
-struct attach_clone_payload {
+struct attach_payload {
 	int ipc_socket;
 	int terminal_pts_fd;
 	lxc_attach_options_t *options;
-	struct lxc_proc_context_info *init_ctx;
+	struct attach_context *ctx;
 	lxc_attach_exec_t exec_function;
 	void *exec_payload;
 };
 
-static void lxc_put_attach_clone_payload(struct attach_clone_payload *p)
+static void put_attach_payload(struct attach_payload *p)
 {
-	close_prot_errno_disarm(p->ipc_socket);
-	close_prot_errno_disarm(p->terminal_pts_fd);
-	if (p->init_ctx) {
-		lxc_proc_put_context_info(p->init_ctx);
-		p->init_ctx = NULL;
+	if (p) {
+		close_prot_errno_disarm(p->ipc_socket);
+		close_prot_errno_disarm(p->terminal_pts_fd);
+		put_attach_context(p->ctx);
+		p->ctx = NULL;
 	}
 }
 
-static int attach_child_main(struct attach_clone_payload *payload)
+__noreturn static void do_attach(struct attach_payload *ap)
 {
-	int lsm_fd, ret;
-	uid_t new_uid;
-	gid_t new_gid;
-	uid_t ns_root_uid = 0;
-	gid_t ns_root_gid = 0;
-	lxc_attach_options_t* options = payload->options;
-	struct lxc_proc_context_info* init_ctx = payload->init_ctx;
-	bool needs_lsm = (options->namespaces & CLONE_NEWNS) &&
-			 (options->attach_flags & LXC_ATTACH_LSM) &&
-			 init_ctx->lsm_label;
+	lxc_attach_exec_t attach_function = move_ptr(ap->exec_function);
+	void *attach_function_args = move_ptr(ap->exec_payload);
+	int fd_lsm, ret;
+	lxc_attach_options_t* options = ap->options;
+        struct attach_context *ctx = ap->ctx;
+        struct lxc_conf *conf = ctx->container->lxc_conf;
+
+	/*
+	 * We currently artificially restrict core scheduling to be a pid
+	 * namespace concept since this makes the code easier. We can revisit
+	 * this no problem and make this work with shared pid namespaces as
+	 * well. This check here makes sure that the container was created with
+	 * a separate pid namespace (ctx->ns_clone_flags) and whether we are
+	 * actually attaching to this pid namespace (options->namespaces).
+	 */
+	if (core_scheduling_cookie_valid(ctx->core_sched_cookie) &&
+	    (ctx->ns_clone_flags & CLONE_NEWPID) &&
+	    (options->namespaces & CLONE_NEWPID)) {
+		__u64 core_sched_cookie;
+
+		ret = core_scheduling_cookie_share_with(1);
+		if (ret < 0) {
+			SYSERROR("Failed to join core scheduling domain of %d",
+				 ctx->init_pid);
+			goto on_error;
+		}
+
+		ret = core_scheduling_cookie_get(getpid(), &core_sched_cookie);
+		if (ret || !core_scheduling_cookie_valid(core_sched_cookie) ||
+		    (ctx->core_sched_cookie != core_sched_cookie)) {
+			SYSERROR("Invalid core scheduling domain cookie %llu != %llu",
+				 (llu)core_sched_cookie,
+				 (llu)ctx->core_sched_cookie);
+			goto on_error;
+		}
+
+		INFO("Joined core scheduling domain of %d with cookie %lld",
+		     ctx->init_pid, (llu)core_sched_cookie);
+	}
 
 	/* A description of the purpose of this functionality is provided in the
 	 * lxc-attach(1) manual page. We have to remount here and not in the
@@ -669,26 +1183,26 @@
 		TRACE("Remounted \"/proc\" and \"/sys\"");
 	}
 
-/* Now perform additional attachments. */
-#if HAVE_SYS_PERSONALITY_H
+	/* Now perform additional attachments. */
 	if (options->attach_flags & LXC_ATTACH_SET_PERSONALITY) {
 		long new_personality;
 
-		if (options->personality < 0)
-			new_personality = init_ctx->personality;
+		if (options->personality == LXC_ATTACH_DETECT_PERSONALITY)
+			new_personality = ctx->personality;
 		else
 			new_personality = options->personality;
 
-		ret = personality(new_personality);
-		if (ret < 0)
-			goto on_error;
+		if (new_personality != LXC_ARCH_UNCHANGED) {
+			ret = lxc_personality(new_personality);
+			if (ret < 0)
+				goto on_error;
 
-		TRACE("Set new personality");
+			TRACE("Set new personality");
+		}
 	}
-#endif
 
 	if (options->attach_flags & LXC_ATTACH_DROP_CAPABILITIES) {
-		ret = lxc_attach_drop_privs(init_ctx);
+		ret = drop_capabilities(ctx);
 		if (ret < 0)
 			goto on_error;
 
@@ -698,7 +1212,7 @@
 	/* Always set the environment (specify (LXC_ATTACH_KEEP_ENV, NULL, NULL)
 	 * if you want this to be a no-op).
 	 */
-	ret = lxc_attach_set_environment(init_ctx,
+	ret = lxc_attach_set_environment(ctx,
 					 options->env_policy,
 					 options->extra_env_vars,
 					 options->extra_keep_env);
@@ -707,7 +1221,8 @@
 
 	TRACE("Set up environment");
 
-	/* This remark only affects fully unprivileged containers:
+	/*
+	 * This remark only affects fully unprivileged containers:
 	 * Receive fd for LSM security module before we set{g,u}id(). The reason
 	 * is that on set{g,u}id() the kernel will a) make us undumpable and b)
 	 * we will change our effective uid. This means our effective uid will
@@ -718,16 +1233,13 @@
 	 * mounted with hidepid={1,2}. So let's get the lsm label fd before the
 	 * set{g,u}id().
 	 */
-	if (needs_lsm) {
-		ret = lxc_abstract_unix_recv_fds(payload->ipc_socket, &lsm_fd, 1, NULL, 0);
-		if (ret <= 0) {
-			if (ret < 0)
-				SYSERROR("Failed to receive lsm label fd");
-
+	if (attach_lsm(options) && ctx->lsm_label) {
+		if (!sync_wait_fd(ap->ipc_socket, &fd_lsm)) {
+			SYSERROR("Failed to receive lsm label fd");
 			goto on_error;
 		}
 
-		TRACE("Received LSM label file descriptor %d from parent", lsm_fd);
+		TRACE("Received LSM label file descriptor %d from parent", fd_lsm);
 	}
 
 	if (options->stdin_fd > 0 && isatty(options->stdin_fd)) {
@@ -736,85 +1248,41 @@
 			goto on_error;
 	}
 
-	if (!lxc_setgroups(0, NULL) && errno != EPERM)
-		goto on_error;
-
-	if (options->namespaces & CLONE_NEWUSER) {
-		/* Check whether nsuid 0 has a mapping. */
-		ns_root_uid = get_ns_uid(0);
-
-		/* Check whether nsgid 0 has a mapping. */
-		ns_root_gid = get_ns_gid(0);
-
-		/* If there's no mapping for nsuid 0 try to retrieve the nsuid
-		 * init was started with.
-		 */
-		if (ns_root_uid == LXC_INVALID_UID)
-			lxc_attach_get_init_uidgid(&ns_root_uid, &ns_root_gid);
-
-		if (ns_root_uid == LXC_INVALID_UID)
+	if ((options->attach_flags & LXC_ATTACH_SETGROUPS) &&
+	    options->groups.size > 0) {
+		if (!lxc_setgroups(options->groups.list, options->groups.size))
 			goto on_error;
-
-		if (!lxc_switch_uid_gid(ns_root_uid, ns_root_gid))
+	} else {
+		if (!lxc_drop_groups() && errno != EPERM)
 			goto on_error;
 	}
 
-	/* Set {u,g}id. */
-	if (options->uid != LXC_INVALID_UID)
-		new_uid = options->uid;
-	else
-		new_uid = ns_root_uid;
-
-	if (options->gid != LXC_INVALID_GID)
-		new_gid = options->gid;
-	else
-		new_gid = ns_root_gid;
-
-	if ((init_ctx->container && init_ctx->container->lxc_conf &&
-	     init_ctx->container->lxc_conf->no_new_privs) ||
-	    (options->attach_flags & LXC_ATTACH_NO_NEW_PRIVS)) {
-		ret = prctl(PR_SET_NO_NEW_PRIVS, prctl_arg(1), prctl_arg(0),
-			    prctl_arg(0), prctl_arg(0));
-		if (ret < 0)
+	if (options->namespaces & CLONE_NEWUSER)
+		if (!lxc_switch_uid_gid(ctx->setup_ns_uid, ctx->setup_ns_gid))
 			goto on_error;
 
-		TRACE("Set PR_SET_NO_NEW_PRIVS");
-	}
-
-	if (needs_lsm) {
+	if (attach_lsm(options) && ctx->lsm_label) {
 		bool on_exec;
 
 		/* Change into our new LSM profile. */
 		on_exec = options->attach_flags & LXC_ATTACH_LSM_EXEC ? true : false;
-
-		ret = lsm_process_label_set_at(lsm_fd, init_ctx->lsm_label, on_exec);
-		close(lsm_fd);
+		ret = ctx->lsm_ops->process_label_set_at(ctx->lsm_ops, fd_lsm, ctx->lsm_label, on_exec);
+		close_prot_errno_disarm(fd_lsm);
 		if (ret < 0)
 			goto on_error;
 
-		TRACE("Set %s LSM label to \"%s\"", lsm_name(), init_ctx->lsm_label);
+		TRACE("Set %s LSM label to \"%s\"", ctx->lsm_ops->name, ctx->lsm_label);
 	}
 
-	if (init_ctx->container && init_ctx->container->lxc_conf &&
-	    init_ctx->container->lxc_conf->seccomp.seccomp) {
-		struct lxc_conf *conf = init_ctx->container->lxc_conf;
-
-		ret = lxc_seccomp_load(conf);
+	if (conf->no_new_privs || (options->attach_flags & LXC_ATTACH_NO_NEW_PRIVS)) {
+		ret = prctl(PR_SET_NO_NEW_PRIVS, prctl_arg(1), prctl_arg(0),
+			    prctl_arg(0), prctl_arg(0));
 		if (ret < 0)
 			goto on_error;
 
-		TRACE("Loaded seccomp profile");
-
-		ret = lxc_seccomp_send_notifier_fd(&conf->seccomp, payload->ipc_socket);
-		if (ret < 0)
-			goto on_error;
+		TRACE("Set PR_SET_NO_NEW_PRIVS");
 	}
 
-	close(payload->ipc_socket);
-	payload->ipc_socket = -EBADF;
-	lxc_proc_put_context_info(init_ctx);
-	payload->init_ctx = NULL;
-
 	/* The following is done after the communication socket is shut down.
 	 * That way, all errors that might (though unlikely) occur up until this
 	 * point will have their messages printed to the original stderr (if
@@ -825,13 +1293,16 @@
 	 * may want to make sure the fds are closed, for example.
 	 */
 	if (options->stdin_fd >= 0 && options->stdin_fd != STDIN_FILENO)
-		(void)dup2(options->stdin_fd, STDIN_FILENO);
+		if (dup2(options->stdin_fd, STDIN_FILENO) < 0)
+			SYSDEBUG("Failed to replace stdin with %d", options->stdin_fd);
 
 	if (options->stdout_fd >= 0 && options->stdout_fd != STDOUT_FILENO)
-		(void)dup2(options->stdout_fd, STDOUT_FILENO);
+		if (dup2(options->stdout_fd, STDOUT_FILENO) < 0)
+			SYSDEBUG("Failed to replace stdout with %d", options->stdout_fd);
 
 	if (options->stderr_fd >= 0 && options->stderr_fd != STDERR_FILENO)
-		(void)dup2(options->stderr_fd, STDERR_FILENO);
+		if (dup2(options->stderr_fd, STDERR_FILENO) < 0)
+			SYSDEBUG("Failed to replace stderr with %d", options->stderr_fd);
 
 	/* close the old fds */
 	if (options->stdin_fd > STDERR_FILENO)
@@ -856,90 +1327,97 @@
 	}
 
 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-		ret = lxc_terminal_prepare_login(payload->terminal_pts_fd);
+		ret = lxc_terminal_prepare_login(ap->terminal_pts_fd);
 		if (ret < 0) {
-			SYSERROR("Failed to prepare terminal file descriptor %d", payload->terminal_pts_fd);
+			SYSERROR("Failed to prepare terminal file descriptor %d", ap->terminal_pts_fd);
 			goto on_error;
 		}
 
-		TRACE("Prepared terminal file descriptor %d", payload->terminal_pts_fd);
+		TRACE("Prepared terminal file descriptor %d", ap->terminal_pts_fd);
 	}
 
 	/* Avoid unnecessary syscalls. */
-	if (new_uid == ns_root_uid)
-		new_uid = LXC_INVALID_UID;
+	if (ctx->setup_ns_uid == ctx->target_ns_uid)
+		ctx->target_ns_uid = LXC_INVALID_UID;
 
-	if (new_gid == ns_root_gid)
-		new_gid = LXC_INVALID_GID;
+	if (ctx->setup_ns_gid == ctx->target_ns_gid)
+		ctx->target_ns_gid = LXC_INVALID_GID;
 
-	/* Make sure that the processes STDIO is correctly owned by the user that we are switching to */
-	ret = fix_stdio_permissions(new_uid);
+	/*
+	 * Make sure that the processes STDIO is correctly owned by the user
+	 * that we are switching to.
+	 */
+	ret = fix_stdio_permissions(ctx->target_ns_uid);
 	if (ret)
-		WARN("Failed to ajust stdio permissions");
+		INFO("Failed to adjust stdio permissions");
+
+	if (conf->seccomp.seccomp) {
+		ret = lxc_seccomp_load(conf);
+		if (ret < 0)
+			goto on_error;
+
+		TRACE("Loaded seccomp profile");
+
+		ret = lxc_seccomp_send_notifier_fd(&conf->seccomp, ap->ipc_socket);
+		if (ret < 0)
+			goto on_error;
+		lxc_seccomp_close_notifier_fd(&conf->seccomp);
+	}
 
-	if (!lxc_switch_uid_gid(new_uid, new_gid))
+	if (!lxc_switch_uid_gid(ctx->target_ns_uid, ctx->target_ns_gid))
 		goto on_error;
 
+	put_attach_payload(ap);
+
 	/* We're done, so we can now do whatever the user intended us to do. */
-	_exit(payload->exec_function(payload->exec_payload));
+	_exit(attach_function(attach_function_args));
 
 on_error:
-	lxc_put_attach_clone_payload(payload);
+	ERROR("Failed to attach to container");
+	put_attach_payload(ap);
 	_exit(EXIT_FAILURE);
 }
 
-static int lxc_attach_terminal(struct lxc_conf *conf,
+static int lxc_attach_terminal(const char *name, const char *lxcpath, struct lxc_conf *conf,
 			       struct lxc_terminal *terminal)
 {
 	int ret;
 
 	lxc_terminal_init(terminal);
 
-	ret = lxc_terminal_create(terminal);
+	ret = lxc_terminal_create(name, lxcpath, conf, terminal);
 	if (ret < 0)
-		return log_error(-1, "Failed to create terminal");
-
-	/* Shift ttys to container. */
-	ret = lxc_terminal_map_ids(conf, terminal);
-	if (ret < 0) {
-		ERROR("Failed to chown terminal");
-		goto on_error;
-	}
+		return syserror("Failed to create terminal");
 
 	return 0;
-
-on_error:
-	lxc_terminal_delete(terminal);
-	lxc_terminal_conf_free(terminal);
-	return -1;
 }
 
 static int lxc_attach_terminal_mainloop_init(struct lxc_terminal *terminal,
-					     struct lxc_epoll_descr *descr)
+					     struct lxc_async_descr *descr)
 {
 	int ret;
 
 	ret = lxc_mainloop_open(descr);
 	if (ret < 0)
-		return log_error(-1, "Failed to create mainloop");
+		return syserror("Failed to create mainloop");
 
 	ret = lxc_terminal_mainloop_add(descr, terminal);
 	if (ret < 0) {
 		lxc_mainloop_close(descr);
-		return log_error(-1, "Failed to add handlers to mainloop");
+		return syserror("Failed to add handlers to mainloop");
 	}
 
 	return 0;
 }
 
-static inline void lxc_attach_terminal_close_ptmx(struct lxc_terminal *terminal)
+static inline void lxc_attach_terminal_close_ptx(struct lxc_terminal *terminal)
 {
-	close_prot_errno_disarm(terminal->ptmx);
+	close_prot_errno_disarm(terminal->ptx);
 }
 
 static inline void lxc_attach_terminal_close_pts(struct lxc_terminal *terminal)
 {
-	close_prot_errno_disarm(terminal->pts);
+	close_prot_errno_disarm(terminal->pty);
 }
 
 static inline void lxc_attach_terminal_close_peer(struct lxc_terminal *terminal)
@@ -956,146 +1434,61 @@
 	       void *exec_payload, lxc_attach_options_t *options,
 	       pid_t *attached_process)
 {
-	int i, ret, status;
+	int ret_parent = -1;
+	struct lxc_async_descr descr = {};
+	int ret;
+	char *name, *lxcpath;
 	int ipc_sockets2;
-	char *cwd, *new_cwd;
-	signed long personality;
-	pid_t attached_pid, init_pid, pid;
-	struct lxc_proc_context_info *init_ctx;
+	pid_t attached_pid, pid, to_cleanup_pid;
+	struct attach_context *ctx;
 	struct lxc_terminal terminal;
 	struct lxc_conf *conf;
-	char *name, *lxcpath;
-	struct attach_clone_payload payload = {0};
-
-	ret = access("/proc/self/ns", X_OK);
-	if (ret)
-		return log_error_errno(-1, errno, "Does this kernel version support namespaces?");
 
 	if (!container)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	if (!lxc_container_get(container))
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	name = container->name;
 	lxcpath = container->config_path;
 
-	if (!options)
+	if (!options) {
 		options = &attach_static_default_options;
-
-	init_pid = lxc_cmd_get_init_pid(name, lxcpath);
-	if (init_pid < 0) {
-		lxc_container_put(container);
-		return log_error(-1, "Failed to get init pid");
+		options->lsm_label = NULL;
 	}
 
-	init_ctx = lxc_proc_get_context_info(init_pid);
-	if (!init_ctx) {
-		ERROR("Failed to get context of init process: %ld", (long)init_pid);
+	ctx = alloc_attach_context();
+	if (!ctx) {
 		lxc_container_put(container);
-		return -1;
+		return syserror_set(-ENOMEM, "Failed to allocate attach context");
 	}
 
-	init_ctx->container = container;
-
-	personality = get_personality(name, lxcpath);
-	if (init_ctx->personality < 0) {
-		ERROR("Failed to get personality of the container");
-		lxc_proc_put_context_info(init_ctx);
-		return -1;
+	ret = get_attach_context(ctx, container, options);
+	if (ret) {
+		put_attach_context(ctx);
+		return syserror("Failed to get attach context");
 	}
-	init_ctx->personality = personality;
 
-	if (!init_ctx->container->lxc_conf) {
-		init_ctx->container->lxc_conf = lxc_conf_init();
-		if (!init_ctx->container->lxc_conf) {
-			lxc_proc_put_context_info(init_ctx);
-			return -1;
-		}
-	}
-	conf = init_ctx->container->lxc_conf;
-	if (!conf)
-		return log_error_errno(-EINVAL, EINVAL, "Missing container confifg");
+	conf = ctx->container->lxc_conf;
 
-	if (!fetch_seccomp(init_ctx->container, options))
+	if (!fetch_seccomp(ctx->container, options))
 		WARN("Failed to get seccomp policy");
 
-	if (!no_new_privs(init_ctx->container, options))
+	if (!no_new_privs(ctx->container, options))
 		WARN("Could not determine whether PR_SET_NO_NEW_PRIVS is set");
 
-	cwd = getcwd(NULL, 0);
-
-	/* Determine which namespaces the container was created with
-	 * by asking lxc-start, if necessary.
-	 */
-	if (options->namespaces == -1) {
-		options->namespaces = lxc_cmd_get_clone_flags(name, lxcpath);
-		/* call failed */
-		if (options->namespaces == -1) {
-			ERROR("Failed to automatically determine the "
-			      "namespaces which the container uses");
-			free(cwd);
-			lxc_proc_put_context_info(init_ctx);
-			return -1;
-		}
-
-		for (i = 0; i < LXC_NS_MAX; i++) {
-			if (ns_infoi.clone_flag & CLONE_NEWCGROUP)
-				if (!(options->attach_flags & LXC_ATTACH_MOVE_TO_CGROUP) ||
-				    !cgns_supported())
-					continue;
-
-			if (ns_infoi.clone_flag & options->namespaces)
-				continue;
-
-			init_ctx->ns_inherited |= ns_infoi.clone_flag;
-		}
-	}
-
-	pid = lxc_raw_getpid();
-
-	for (i = 0; i < LXC_NS_MAX; i++) {
-		int j;
-
-		if (options->namespaces & ns_infoi.clone_flag)
-			init_ctx->ns_fdi = lxc_preserve_ns(init_pid, ns_infoi.proc_name);
-		else if (init_ctx->ns_inherited & ns_infoi.clone_flag)
-			init_ctx->ns_fdi = in_same_namespace(pid, init_pid, ns_infoi.proc_name);
-		else
-			continue;
-
-		if (init_ctx->ns_fdi >= 0)
-			continue;
-
-		if (init_ctx->ns_fdi == -EINVAL) {
-			DEBUG("Inheriting %s namespace from %d",
-			      ns_infoi.proc_name, pid);
-			init_ctx->ns_inherited &= ~ns_infoi.clone_flag;
-			continue;
-		}
-
-		/* We failed to preserve the namespace. */
-		SYSERROR("Failed to attach to %s namespace of %d",
-		         ns_infoi.proc_name, pid);
-
-		/* Close all already opened file descriptors before we return an
-		 * error, so we don't leak them.
-		 */
-		for (j = 0; j < i; j++)
-			close(init_ctx->ns_fdj);
-
-		free(cwd);
-		lxc_proc_put_context_info(init_ctx);
-		return -1;
+	ret = prepare_namespaces(ctx, options);
+	if (ret) {
+		put_attach_context(ctx);
+		return syserror("Failed to get namespace file descriptors");
 	}
 
 	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-		ret = lxc_attach_terminal(conf, &terminal);
+		ret = lxc_attach_terminal(name, lxcpath, conf, &terminal);
 		if (ret < 0) {
-			ERROR("Failed to setup new terminal");
-			free(cwd);
-			lxc_proc_put_context_info(init_ctx);
-			return -1;
+			put_attach_context(ctx);
+			return syserror("Failed to setup new terminal");
 		}
 
 		terminal.log_fd = options->log_fd;
@@ -1111,7 +1504,7 @@
 	 * just fork()s away without exec'ing directly after, the socket fd will
 	 * exist in the forked process from the other thread and any close() in
 	 * our own child process will not really cause the socket to close
-	 * properly, potentially causing the parent to hang.
+	 * properly, potentially causing the parent to get stuck.
 	 *
 	 * For this reason, while IPC is still active, we have to use shutdown()
 	 * if the child exits prematurely in order to signal that the socket is
@@ -1119,7 +1512,7 @@
 	 * that.
 	 *
 	 * IPC mechanism: (X is receiver)
-	 *   initial process        intermediate          attached
+	 *   initial process        transient process   attached process
 	 *        X           <---  send pid of
 	 *                          attached proc,
 	 *                          then exit
@@ -1138,13 +1531,11 @@
 	 */
 	ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);
 	if (ret < 0) {
-		SYSERROR("Could not set up required IPC mechanism for attaching");
-		free(cwd);
-		lxc_proc_put_context_info(init_ctx);
-		return -1;
+		put_attach_context(ctx);
+		return syserror("Could not set up required IPC mechanism for attaching");
 	}
 
-	/* Create intermediate subprocess, two reasons:
+	/* Create transient process, two reasons:
 	 *       1. We can't setns() in the child itself, since we want to make
 	 *          sure we are properly attached to the pidns.
 	 *       2. Also, the initial thread has to put the attached process
@@ -1153,281 +1544,280 @@
 	 */
 	pid = fork();
 	if (pid < 0) {
-		SYSERROR("Failed to create first subprocess");
-		free(cwd);
-		lxc_proc_put_context_info(init_ctx);
-		return -1;
+		put_attach_context(ctx);
+		return syserror("Failed to create first subprocess");
 	}
 
-	if (pid) {
-		int ret_parent = -1;
-		pid_t to_cleanup_pid = pid;
-		struct lxc_epoll_descr descr = {0};
+	if (pid == 0) {
+		char *cwd, *new_cwd;
 
 		/* close unneeded file descriptors */
-		close(ipc_sockets1);
-		free(cwd);
-		lxc_proc_close_ns_fd(init_ctx);
-		if (options->attach_flags & LXC_ATTACH_TERMINAL)
-			lxc_attach_terminal_close_pts(&terminal);
-
-		/* Attach to cgroup, if requested. */
-		if (options->attach_flags & LXC_ATTACH_MOVE_TO_CGROUP) {
-			/*
-			 * If this is the unified hierarchy cgroup_attach() is
-			 * enough.
-			 */
-			ret = cgroup_attach(conf, name, lxcpath, pid);
-			if (ret) {
-				call_cleaner(cgroup_exit) struct cgroup_ops *cgroup_ops = NULL;
+		close_prot_errno_disarm(ipc_sockets0);
 
-				cgroup_ops = cgroup_init(conf);
-				if (!cgroup_ops)
-					goto on_error;
+		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+			lxc_attach_terminal_close_ptx(&terminal);
+			lxc_attach_terminal_close_peer(&terminal);
+			lxc_attach_terminal_close_log(&terminal);
+		}
 
-				if (!cgroup_ops->attach(cgroup_ops, conf, name, lxcpath, pid))
-					goto on_error;
-			}
-			TRACE("Moved intermediate process %d into container's cgroups", pid);
+		/* Wait for the parent to have setup cgroups. */
+		if (!sync_wait(ipc_sockets1, ATTACH_SYNC_CGROUP)) {
+			shutdown(ipc_sockets1, SHUT_RDWR);
+			put_attach_context(ctx);
+			_exit(EXIT_FAILURE);
 		}
 
-		/* Setup /proc limits */
-		if (!lxc_list_empty(&conf->procs)) {
-			ret = setup_proc_filesystem(&conf->procs, pid);
-			if (ret < 0)
-				goto on_error;
+		if (!attach_context_security_barrier(ctx)) {
+			shutdown(ipc_sockets1, SHUT_RDWR);
+			put_attach_context(ctx);
+			_exit(EXIT_FAILURE);
 		}
 
-		/* Setup resource limits */
-		if (!lxc_list_empty(&conf->limits)) {
-			ret = setup_resource_limits(&conf->limits, pid);
-			if (ret < 0)
-				goto on_error;
+		cwd = getcwd(NULL, 0);
+
+		/*
+		 * Attach now, create another subprocess later, since pid
+		 * namespaces only really affect the children of the current
+		 * process.
+		 *
+		 * Note that this is a crucial barrier. We're no moving into
+		 * the container's context so we need to make sure to not leak
+		 * anything sensitive. That especially means things such as
+		 * open file descriptors!
+		 */
+		ret = attach_namespaces(ctx, options);
+		if (ret < 0) {
+			ERROR("Failed to enter namespaces");
+			shutdown(ipc_sockets1, SHUT_RDWR);
+			put_attach_context(ctx);
+			_exit(EXIT_FAILURE);
 		}
 
-		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-			ret = lxc_attach_terminal_mainloop_init(&terminal, &descr);
+		/* Attach succeeded, try to cwd. */
+		if (options->initial_cwd)
+			new_cwd = options->initial_cwd;
+		else
+			new_cwd = cwd;
+		if (new_cwd) {
+			ret = chdir(new_cwd);
 			if (ret < 0)
-				goto on_error;
-
-			TRACE("Initialized terminal mainloop");
+				WARN("Could not change directory to \"%s\"", new_cwd);
+		}
+		free_disarm(cwd);
+
+		/* Create attached process. */
+		pid = lxc_raw_clone(CLONE_PARENT, NULL);
+		if (pid < 0) {
+			SYSERROR("Failed to clone attached process");
+			shutdown(ipc_sockets1, SHUT_RDWR);
+			put_attach_context(ctx);
+			_exit(EXIT_FAILURE);
 		}
 
-		/* Let the child process know to go ahead. */
-		status = 0;
-		ret = lxc_write_nointr(ipc_sockets0, &status, sizeof(status));
-		if (ret != sizeof(status))
-			goto close_mainloop;
-
-		TRACE("Told intermediate process to start initializing");
+		if (pid == 0) {
+			struct attach_payload ap = {
+				.ipc_socket		= ipc_sockets1,
+				.options		= options,
+				.ctx			= ctx,
+				.terminal_pts_fd	= terminal.pty,
+				.exec_function		= exec_function,
+				.exec_payload		= exec_payload,
+			};
+
+			if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+				ret = lxc_terminal_signal_sigmask_safe_blocked(&terminal);
+				if (ret < 0) {
+					SYSERROR("Failed to reset signal mask");
+					_exit(EXIT_FAILURE);
+				}
+			}
 
-		/* Get pid of attached process from intermediate process. */
-		ret = lxc_read_nointr(ipc_sockets0, &attached_pid, sizeof(attached_pid));
-		if (ret != sizeof(attached_pid))
-			goto close_mainloop;
+			/* Does not return. */
+			do_attach(&ap);
+		}
+		TRACE("Attached process %d started initializing", pid);
 
-		TRACE("Received pid %d of attached process in parent pid namespace", attached_pid);
+		if (options->attach_flags & LXC_ATTACH_TERMINAL)
+			lxc_attach_terminal_close_pts(&terminal);
 
-		/* Ignore SIGKILL (CTRL-C) and SIGQUIT (CTRL-\) - issue #313. */
-		if (options->stdin_fd == 0) {
-			signal(SIGINT, SIG_IGN);
-			signal(SIGQUIT, SIG_IGN);
+		/* Tell grandparent the pid of the pid of the newly created child. */
+		if (!sync_wake_pid(ipc_sockets1, pid)) {
+			/* If this really happens here, this is very unfortunate, since
+			 * the parent will not know the pid of the attached process and
+			 * will not be able to wait for it (and we won't either due to
+			 * CLONE_PARENT) so the parent won't be able to reap it and the
+			 * attached process will remain a zombie.
+			 */
+			shutdown(ipc_sockets1, SHUT_RDWR);
+			put_attach_context(ctx);
+			_exit(EXIT_FAILURE);
 		}
 
-		/* Reap intermediate process. */
-		ret = wait_for_pid(pid);
-		if (ret < 0)
-			goto close_mainloop;
-
-		TRACE("Intermediate process %d exited", pid);
+		/* The rest is in the hands of the initial and the attached process. */
+		put_attach_context(ctx);
+		_exit(EXIT_SUCCESS);
+	}
+	TRACE("Transient process %d started initializing", pid);
 
-		/* We will always have to reap the attached process now. */
-		to_cleanup_pid = attached_pid;
+	to_cleanup_pid = pid;
 
-		/* Open LSM fd and send it to child. */
-		if ((options->namespaces & CLONE_NEWNS) &&
-		    (options->attach_flags & LXC_ATTACH_LSM) &&
-		    init_ctx->lsm_label) {
-			int labelfd;
-			bool on_exec;
+	/* close unneeded file descriptors */
+	close_prot_errno_disarm(ipc_sockets1);
+	put_namespaces(ctx);
+	if (options->attach_flags & LXC_ATTACH_TERMINAL)
+		lxc_attach_terminal_close_pts(&terminal);
 
-			ret = -1;
-			on_exec = options->attach_flags & LXC_ATTACH_LSM_EXEC ? true : false;
-			labelfd = lsm_process_label_fd_get(attached_pid, on_exec);
-			if (labelfd < 0)
-				goto close_mainloop;
+	/* Attach to cgroup, if requested. */
+	if (options->attach_flags & LXC_ATTACH_MOVE_TO_CGROUP) {
+		/*
+		 * If this is the unified hierarchy cgroup_attach() is
+		 * enough.
+		 */
+		ret = cgroup_attach(conf, name, lxcpath, pid);
+		if (ret) {
+			call_cleaner(cgroup_exit) struct cgroup_ops *cgroup_ops = NULL;
+			if (!ERRNO_IS_NOT_SUPPORTED(ret)) {
+				SYSERROR("Failed to attach cgroup");
+				goto on_error;
+			}
 
-			TRACE("Opened LSM label file descriptor %d", labelfd);
+			cgroup_ops = cgroup_init(conf);
+			if (!cgroup_ops)
+				goto on_error;
 
-			/* Send child fd of the LSM security module to write to. */
-			ret = lxc_abstract_unix_send_fds(ipc_sockets0, &labelfd, 1, NULL, 0);
-			if (ret <= 0) {
-				if (ret < 0)
-					SYSERROR("Failed to send lsm label fd");
+			if (!cgroup_ops->attach(cgroup_ops, conf, name, lxcpath, pid))
+				goto on_error;
+		}
 
-				close(labelfd);
-				goto close_mainloop;
-			}
+		TRACE("Moved transient process %d into container cgroup", pid);
+	}
 
-			close(labelfd);
-			TRACE("Sent LSM label file descriptor %d to child", labelfd);
-		}
+	/*
+	 * Close sensitive file descriptors we don't need anymore. Even if
+	 * we're the parent.
+	 */
+	if (!attach_context_security_barrier(ctx))
+		goto on_error;
 
-		if (conf->seccomp.seccomp) {
-			ret = lxc_seccomp_recv_notifier_fd(&conf->seccomp, ipc_sockets0);
-			if (ret < 0)
-				goto close_mainloop;
+	/* Setup /proc limits */
+	ret = setup_proc_filesystem(conf, pid);
+	if (ret < 0)
+		goto on_error;
 
-			ret = lxc_seccomp_add_notifier(name, lxcpath, &conf->seccomp);
-			if (ret < 0)
-				goto close_mainloop;
-		}
+	/* Setup resource limits */
+	ret = setup_resource_limits(conf, pid);
+	if (ret < 0)
+		goto on_error;
 
-		/* We're done, the child process should now execute whatever it
-		 * is that the user requested. The parent can now track it with
-		 * waitpid() or similar.
-		 */
+	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+		ret = lxc_attach_terminal_mainloop_init(&terminal, &descr);
+		if (ret < 0)
+			goto on_error;
 
-		*attached_process = attached_pid;
+		TRACE("Initialized terminal mainloop");
+	}
 
-		/* Now shut down communication with child, we're done. */
-		shutdown(ipc_sockets0, SHUT_RDWR);
-		close(ipc_sockets0);
-		ipc_sockets0 = -1;
+	/* Let the child process know to go ahead. */
+	if (!sync_wake(ipc_sockets0, ATTACH_SYNC_CGROUP))
+		goto close_mainloop;
 
-		ret_parent = 0;
-		to_cleanup_pid = -1;
+	TRACE("Told transient process to start initializing");
 
-		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-			ret = lxc_mainloop(&descr, -1);
-			if (ret < 0) {
-				ret_parent = -1;
-				to_cleanup_pid = attached_pid;
-			}
-		}
+	/* Get pid of attached process from transient process. */
+	if (!sync_wait_pid(ipc_sockets0, &attached_pid))
+		goto close_mainloop;
 
-	close_mainloop:
-		if (options->attach_flags & LXC_ATTACH_TERMINAL)
-			lxc_mainloop_close(&descr);
+	TRACE("Received pid %d of attached process in parent pid namespace", attached_pid);
 
-	on_error:
-		if (ipc_sockets0 >= 0) {
-			shutdown(ipc_sockets0, SHUT_RDWR);
-			close(ipc_sockets0);
-		}
+	/* Ignore SIGKILL (CTRL-C) and SIGQUIT (CTRL-\) - issue #313. */
+	if (options->stdin_fd == STDIN_FILENO) {
+		signal(SIGINT, SIG_IGN);
+		signal(SIGQUIT, SIG_IGN);
+	}
 
-		if (to_cleanup_pid > 0)
-			(void)wait_for_pid(to_cleanup_pid);
+	/* Reap transient process. */
+	ret = wait_for_pid(pid);
+	if (ret < 0)
+		goto close_mainloop;
 
-		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-			lxc_terminal_delete(&terminal);
-			lxc_terminal_conf_free(&terminal);
-		}
+	TRACE("Transient process %d exited", pid);
 
-		lxc_proc_put_context_info(init_ctx);
-		return ret_parent;
-	}
+	/* We will always have to reap the attached process now. */
+	to_cleanup_pid = attached_pid;
 
-	/* close unneeded file descriptors */
-	close_prot_errno_disarm(ipc_sockets0);
+	/* Open LSM fd and send it to child. */
+	if (attach_lsm(options) && ctx->lsm_label) {
+		__do_close int fd_lsm = -EBADF;
+		bool on_exec;
 
-	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-		lxc_attach_terminal_close_ptmx(&terminal);
-		lxc_attach_terminal_close_peer(&terminal);
-		lxc_attach_terminal_close_log(&terminal);
-	}
+		on_exec = options->attach_flags & LXC_ATTACH_LSM_EXEC ? true : false;
+		fd_lsm = ctx->lsm_ops->process_label_fd_get(ctx->lsm_ops, attached_pid, on_exec);
+		if (fd_lsm < 0)
+			goto close_mainloop;
 
-	/* Wait for the parent to have setup cgroups. */
-	ret = lxc_read_nointr(ipc_sockets1, &status, sizeof(status));
-	if (ret != sizeof(status)) {
-		shutdown(ipc_sockets1, SHUT_RDWR);
-		lxc_proc_put_context_info(init_ctx);
-		_exit(EXIT_FAILURE);
-	}
+		TRACE("Opened LSM label file descriptor %d", fd_lsm);
 
-	TRACE("Intermediate process starting to initialize");
+		/* Send child fd of the LSM security module to write to. */
+		if (!sync_wake_fd(ipc_sockets0, fd_lsm)) {
+			SYSERROR("Failed to send lsm label fd");
+			goto close_mainloop;
+		}
 
-	/* Attach now, create another subprocess later, since pid namespaces
-	 * only really affect the children of the current process.
-	 */
-	ret = lxc_attach_to_ns(init_pid, init_ctx);
-	if (ret < 0) {
-		ERROR("Failed to enter namespaces");
-		shutdown(ipc_sockets1, SHUT_RDWR);
-		lxc_proc_put_context_info(init_ctx);
-		_exit(EXIT_FAILURE);
+		TRACE("Sent LSM label file descriptor %d to child", fd_lsm);
 	}
 
-	/* close namespace file descriptors */
-	lxc_proc_close_ns_fd(init_ctx);
+	if (conf->seccomp.seccomp) {
+		ret = lxc_seccomp_recv_notifier_fd(&conf->seccomp, ipc_sockets0);
+		if (ret < 0)
+			goto close_mainloop;
 
-	/* Attach succeeded, try to cwd. */
-	if (options->initial_cwd)
-		new_cwd = options->initial_cwd;
-	else
-		new_cwd = cwd;
-	if (new_cwd) {
-		ret = chdir(new_cwd);
+		ret = lxc_seccomp_add_notifier(name, lxcpath, &conf->seccomp);
 		if (ret < 0)
-			WARN("Could not change directory to \"%s\"", new_cwd);
+			goto close_mainloop;
 	}
-	free(cwd);
 
-	/* Create attached process. */
-	payload.ipc_socket = ipc_sockets1;
-	payload.options = options;
-	payload.init_ctx = init_ctx;
-	payload.terminal_pts_fd = terminal.pts;
-	payload.exec_function = exec_function;
-	payload.exec_payload = exec_payload;
+	/* We're done, the child process should now execute whatever it
+	 * is that the user requested. The parent can now track it with
+	 * waitpid() or similar.
+	 */
 
-	pid = lxc_raw_clone(CLONE_PARENT, NULL);
-	if (pid < 0) {
-		SYSERROR("Failed to clone attached process");
-		shutdown(ipc_sockets1, SHUT_RDWR);
-		lxc_proc_put_context_info(init_ctx);
-		_exit(EXIT_FAILURE);
-	}
+	*attached_process = attached_pid;
 
-	if (pid == 0) {
-		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
-			ret = pthread_sigmask(SIG_SETMASK,
-					      &terminal.tty_state->oldmask, NULL);
-			if (ret < 0) {
-				SYSERROR("Failed to reset signal mask");
-				_exit(EXIT_FAILURE);
-			}
-		}
+	/* Now shut down communication with child, we're done. */
+	shutdown(ipc_sockets0, SHUT_RDWR);
+	close_prot_errno_disarm(ipc_sockets0);
 
-		ret = attach_child_main(&payload);
-		if (ret < 0)
-			ERROR("Failed to exec");
+	ret_parent = 0;
+	to_cleanup_pid = -1;
 
-		_exit(EXIT_FAILURE);
+	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+		ret = lxc_mainloop(&descr, -1);
+		if (ret < 0) {
+			ret_parent = -1;
+			to_cleanup_pid = attached_pid;
+		}
 	}
 
+close_mainloop:
 	if (options->attach_flags & LXC_ATTACH_TERMINAL)
-		lxc_attach_terminal_close_pts(&terminal);
+		lxc_mainloop_close(&descr);
 
-	/* Tell grandparent the pid of the pid of the newly created child. */
-	ret = lxc_write_nointr(ipc_sockets1, &pid, sizeof(pid));
-	if (ret != sizeof(pid)) {
-		/* If this really happens here, this is very unfortunate, since
-		 * the parent will not know the pid of the attached process and
-		 * will not be able to wait for it (and we won't either due to
-		 * CLONE_PARENT) so the parent won't be able to reap it and the
-		 * attached process will remain a zombie.
-		 */
-		shutdown(ipc_sockets1, SHUT_RDWR);
-		lxc_proc_put_context_info(init_ctx);
-		_exit(EXIT_FAILURE);
+on_error:
+	if (ipc_sockets0 >= 0) {
+		shutdown(ipc_sockets0, SHUT_RDWR);
+		close_prot_errno_disarm(ipc_sockets0);
 	}
 
-	TRACE("Sending pid %d of attached process", pid);
+	if (to_cleanup_pid > 0)
+		(void)wait_for_pid(to_cleanup_pid);
+
+	if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+		lxc_terminal_delete(&terminal);
+		lxc_terminal_conf_free(&terminal);
+	}
 
-	/* The rest is in the hands of the initial and the attached process. */
-	lxc_proc_put_context_info(init_ctx);
-	_exit(EXIT_SUCCESS);
+	put_attach_context(ctx);
+	return ret_parent;
 }
 
 int lxc_attach_run_command(void *payload)
@@ -1438,6 +1828,7 @@
 	ret = execvp(cmd->program, cmd->argv);
 	if (ret < 0) {
 		switch (errno) {
+		case EACCES:
 		case ENOEXEC:
 			ret = 126;
 			break;
@@ -1447,7 +1838,7 @@
 		}
 	}
 
-	return log_error_errno(ret, errno, "Failed to exec \"%s\"", cmd->program);
+	return syserror_ret(ret, "Failed to exec \"%s\"", cmd->program);
 }
 
 int lxc_attach_run_shell(void* payload)
@@ -1457,7 +1848,7 @@
 	struct passwd pwent;
 	struct passwd *pwentp = NULL;
 	char *user_shell;
-	size_t bufsize;
+	ssize_t bufsize;
 	int ret;
 
 	/* Ignore payload parameter. */
@@ -1466,7 +1857,7 @@
 	uid = getuid();
 
 	bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
-	if (bufsize == -1)
+	if (bufsize < 0)
 		bufsize = 1024;
 
 	buf = malloc(bufsize);

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/attach.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/attach.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/attach_options.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/attach_options.h Changed

@@ -13,33 +13,59 @@
  * LXC environment policy.
  */
 typedef enum lxc_attach_env_policy_t {
-	LXC_ATTACH_KEEP_ENV,   /*!< Retain the environment */
-	LXC_ATTACH_CLEAR_ENV   /*!< Clear the environment */
+	LXC_ATTACH_KEEP_ENV     = 0, /*!< Retain the environment */
+#define LXC_ATTACH_KEEP_ENV     LXC_ATTACH_KEEP_ENV
+
+	LXC_ATTACH_CLEAR_ENV    = 1, /*!< Clear the environment */
+#define LXC_ATTACH_CLEAR_ENV    LXC_ATTACH_CLEAR_ENV
 } lxc_attach_env_policy_t;
 
 enum {
 	/* The following are on by default: */
 	LXC_ATTACH_MOVE_TO_CGROUP        = 0x00000001, /*!< Move to cgroup */
+#define LXC_ATTACH_MOVE_TO_CGROUP        LXC_ATTACH_MOVE_TO_CGROUP
+
 	LXC_ATTACH_DROP_CAPABILITIES     = 0x00000002, /*!< Drop capabilities */
+#define LXC_ATTACH_DROP_CAPABILITIES     LXC_ATTACH_DROP_CAPABILITIES
+
 	LXC_ATTACH_SET_PERSONALITY       = 0x00000004, /*!< Set personality */
+#define LXC_ATTACH_SET_PERSONALITY       LXC_ATTACH_SET_PERSONALITY
+
 	LXC_ATTACH_LSM_EXEC              = 0x00000008, /*!< Execute under a Linux Security Module */
+#define LXC_ATTACH_LSM_EXEC              LXC_ATTACH_LSM_EXEC
+
 
 	/* The following are off by default: */
 	LXC_ATTACH_REMOUNT_PROC_SYS      = 0x00010000, /*!< Remount /proc filesystem */
+#define LXC_ATTACH_REMOUNT_PROC_SYS      LXC_ATTACH_REMOUNT_PROC_SYS
+
 	LXC_ATTACH_LSM_NOW               = 0x00020000, /*!< TODO: currently unused */
+#define LXC_ATTACH_LSM_NOW               LXC_ATTACH_LSM_NOW
+
 	/* Set PR_SET_NO_NEW_PRIVS to block execve() gainable privileges. */
-	LXC_ATTACH_NO_NEW_PRIVS		 = 0x00040000, /*!< PR_SET_NO_NEW_PRIVS */
+	LXC_ATTACH_NO_NEW_PRIVS          = 0x00040000, /*!< PR_SET_NO_NEW_PRIVS */
+#define LXC_ATTACH_NO_NEW_PRIVS          LXC_ATTACH_NO_NEW_PRIVS
+
 	LXC_ATTACH_TERMINAL              = 0x00080000, /*!< Allocate new terminal for attached process. */
+#define LXC_ATTACH_TERMINAL              LXC_ATTACH_TERMINAL
+
+	LXC_ATTACH_LSM_LABEL             = 0x00100000, /*!< Set custom LSM label specified in @lsm_label. */
+#define LXC_ATTACH_LSM_LABEL             LXC_ATTACH_LSM_LABEL
+
+	LXC_ATTACH_SETGROUPS             = 0x00200000, /*!< Set additional group ids specified in @groups. */
+#define LXC_ATTACH_SETGROUPS             LXC_ATTACH_SETGROUPS
+
 
 	/* We have 16 bits for things that are on by default and 16 bits that
 	 * are off by default, that should be sufficient to keep binary
 	 * compatibility for a while
 	 */
 	LXC_ATTACH_DEFAULT               = 0x0000FFFF  /*!< Mask of flags to apply by default */
+#define LXC_ATTACH_DEFAULT               LXC_ATTACH_DEFAULT
 };
 
 /*! All Linux Security Module flags */
-#define LXC_ATTACH_LSM (LXC_ATTACH_LSM_EXEC | LXC_ATTACH_LSM_NOW)
+#define LXC_ATTACH_LSM (LXC_ATTACH_LSM_EXEC | LXC_ATTACH_LSM_NOW | LXC_ATTACH_LSM_LABEL)
 
 /*! LXC attach function type.
  *
@@ -51,6 +77,13 @@
  */
 typedef int (*lxc_attach_exec_t)(void* payload);
 
+typedef struct lxc_groups_t {
+	size_t size;
+	gid_t *list;
+} lxc_groups_t;
+
+#define LXC_ATTACH_DETECT_PERSONALITY ~0L
+
 /*!
  * LXC attach options for \ref lxc_container \c attach().
  */
@@ -61,7 +94,7 @@
 	/*! The namespaces to attach to (CLONE_NEW... flags) */
 	int namespaces;
 
-	/*! Initial personality (\c -1 to autodetect).
+	/*! Initial personality (\c LXC_ATTACH_DETECT_PERSONALITY to autodetect).
 	 * \warning This may be ignored if lxc is compiled without personality
 	 * support)
 	 */
@@ -71,7 +104,7 @@
 	 * If the current directory does not exist in the container, the root
 	 * directory will be used instead because of kernel defaults.
 	 */
-	char* initial_cwd;
+	char *initial_cwd;
 
 	/*! The user-id to run as.
 	 *
@@ -91,12 +124,12 @@
 	lxc_attach_env_policy_t env_policy;
 
 	/*! Extra environment variables to set in the container environment */
-	char** extra_env_vars;
+	char **extra_env_vars;
 
 	/*! Names of environment variables in existing environment to retain
 	 * in container environment.
 	 */
-	char** extra_keep_env;
+	char **extra_keep_env;
 
 	/**@{*/
 	/*! File descriptors for stdin, stdout and stderr,
@@ -113,32 +146,43 @@
 
 	/*! File descriptor to log output. */
 	int log_fd;
+
+	/*! lsm label to set. */
+	char *lsm_label;
+
+	/*! The additional group GIDs to run with.
+	 *
+	 * If unset all additional groups are dropped.
+	 */
+	lxc_groups_t groups;
 } lxc_attach_options_t;
 
 /*! Default attach options to use */
-#define LXC_ATTACH_OPTIONS_DEFAULT                                             \
-	{                                                                      \
-		/* .attach_flags = */   LXC_ATTACH_DEFAULT,                    \
-		/* .namespaces = */     -1,                                    \
-		/* .personality = */    -1,                                    \
-		/* .initial_cwd = */    NULL,                                  \
-		/* .uid = */            (uid_t)-1,                             \
-		/* .gid = */            (gid_t)-1,                             \
-		/* .env_policy = */     LXC_ATTACH_KEEP_ENV,                   \
-		/* .extra_env_vars = */ NULL,                                  \
-		/* .extra_keep_env = */ NULL,                                  \
-		/* .stdin_fd = */       0,                                     \
-		/* .stdout_fd = */      1,                                     \
-		/* .stderr_fd = */      2,                                     \
-		/* .log_fd    = */      -EBADF,                                \
+#define LXC_ATTACH_OPTIONS_DEFAULT					\
+	{                                               		\
+		.attach_flags	= LXC_ATTACH_DEFAULT,   		\
+		.namespaces	= -1,					\
+		.personality	= LXC_ATTACH_DETECT_PERSONALITY,	\
+		.initial_cwd	= NULL,					\
+		.uid		= (uid_t)-1,            		\
+		.gid		= (gid_t)-1,            		\
+		.env_policy	= LXC_ATTACH_KEEP_ENV,  		\
+		.extra_env_vars = NULL,                 		\
+		.extra_keep_env = NULL,                 		\
+		.stdin_fd	= 0,                    		\
+		.stdout_fd	= 1,                    		\
+		.stderr_fd	= 2,                    		\
+		.log_fd		= -EBADF,               		\
+		.lsm_label	= NULL,					\
+		.groups		= {},					\
 	}
 
 /*!
  * Representation of a command to run in a container.
  */
 typedef struct lxc_attach_command_t {
-	char* program; /*!< The program to run (passed to execvp) */
-	char** argv;   /*!< The argv pointer of that program, including the program itself in argv0 */
+	char *program;	/*!< The program to run (passed to execvp) */
+	char **argv;	/*!< The argv pointer of that program, including the program itself in argv0 */
 } lxc_attach_command_t;
 
 /*!

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/caps.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/caps.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <limits.h>
 #include <fcntl.h>
@@ -11,11 +10,11 @@
 #include <sys/prctl.h>
 
 #include "caps.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"
 #include "memory_utils.h"
+#include "open_utils.h"
 
 lxc_log_define(caps, lxc);
 
@@ -92,7 +91,7 @@
 	__do_free char *cap_names = NULL;
 	int ret;
 	cap_value_t cap;
-	int last_cap = CAP_LAST_CAP;
+	cap_value_t last_cap = CAP_LAST_CAP;
 
 	if (!getuid() || geteuid())
 		return 0;
@@ -209,54 +208,71 @@
 	return 0;
 }
 
-static long int _real_caps_last_cap(void)
+static int __caps_last_cap(__u32 *cap)
 {
-	int fd, result = -1;
+	__do_close int fd = -EBADF;
 
-	/* Try to get the maximum capability over the kernel interface
+	if (!cap)
+		return ret_errno(EINVAL);
+
+	*cap = 0;
+
+	/*
+	 * Try to get the maximum capability over the kernel interface
 	 * introduced in v3.2.
 	 */
-	fd = open("/proc/sys/kernel/cap_last_cap", O_RDONLY | O_CLOEXEC);
+	fd = open_at(-EBADF,
+		     "/proc/sys/kernel/cap_last_cap",
+		     PROTECT_OPEN,
+		     PROTECT_LOOKUP_ABSOLUTE,
+		     0);
 	if (fd >= 0) {
-		ssize_t n;
-		char *ptr;
-		char bufINTTYPE_TO_STRLEN(int) = {0};
-
-		n = lxc_read_nointr(fd, buf, STRARRAYLEN(buf));
-		if (n >= 0) {
-			errno = 0;
-			result = strtol(buf, &ptr, 10);
-			if (!ptr || (*ptr != '\0' && *ptr != '\n') || errno != 0)
-				result = -1;
-		}
+		ssize_t ret;
+		unsigned int res;
+		char bufINTTYPE_TO_STRLEN(unsigned int);
 
-		close(fd);
+		ret = lxc_read_string_nointr(fd, buf, STRARRAYLEN(buf));
+		if (ret)
+			return syserror("Failed to read \"/proc/sys/kernel/cap_last_cap\"");
+
+		ret = lxc_safe_uint(lxc_trim_whitespace_in_place(buf), &res);
+		if (ret < 0)
+			return syserror("Failed to parse unsigned integer %s", buf);
+
+		*cap = (__u32)res;
 	} else {
-		int cap = 0;
+		__u32 cur_cap = 0;
 
-		/* Try to get it manually by trying to get the status of each
+		/*
+		 * Try to get it manually by trying to get the status of each
 		 * capability individually from the kernel.
 		 */
-		while (prctl(PR_CAPBSET_READ, prctl_arg(cap)) >= 0)
-			cap++;
+		while (prctl(PR_CAPBSET_READ, prctl_arg(cur_cap)) >= 0)
+			cur_cap++;
 
-		result = cap - 1;
+		if (cur_cap)
+			*cap = cur_cap - 1;
 	}
 
-	return result;
+	return 0;
 }
 
-int lxc_caps_last_cap(void)
+int lxc_caps_last_cap(__u32 *cap)
 {
-	static long int last_cap = -1;
+	static int ret = -1;
+	static __u32 last_cap = 0;
 
-	if (last_cap < 0) {
-		last_cap = _real_caps_last_cap();
-		if (last_cap < 0 || last_cap > INT_MAX)
-			last_cap = -1;
+	if (!cap)
+		return ret_errno(EINVAL);
+
+	if (ret < 0) {
+		ret = __caps_last_cap(&last_cap);
+		if (ret)
+			return ret;
 	}
 
-	return last_cap;
+	*cap = last_cap;
+	return 0;
 }
 
 static bool lxc_cap_is_set(cap_t caps, cap_value_t cap, cap_flag_t flag)

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/caps.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/caps.h Changed

@@ -3,23 +3,24 @@
 #ifndef __LXC_CAPS_H
 #define __LXC_CAPS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 
-#include "config.h"
+#include "compiler.h"
 
 #if HAVE_LIBCAP
 #include <linux/types.h> /* workaround for libcap < 2.17 bug */
 #include <sys/capability.h>
 
-extern int lxc_caps_down(void);
-extern int lxc_caps_up(void);
-extern int lxc_ambient_caps_up(void);
-extern int lxc_ambient_caps_down(void);
-extern int lxc_caps_init(void);
-extern int lxc_caps_last_cap(void);
-extern bool lxc_proc_cap_is_set(cap_value_t cap, cap_flag_t flag);
-extern bool lxc_file_cap_is_set(const char *path, cap_value_t cap,
-				cap_flag_t flag);
+__hidden extern int lxc_caps_down(void);
+__hidden extern int lxc_caps_up(void);
+__hidden extern int lxc_ambient_caps_up(void);
+__hidden extern int lxc_ambient_caps_down(void);
+__hidden extern int lxc_caps_init(void);
+__hidden extern int lxc_caps_last_cap(__u32 *cap);
+__hidden extern bool lxc_proc_cap_is_set(cap_value_t cap, cap_flag_t flag);
+__hidden extern bool lxc_file_cap_is_set(const char *path, cap_value_t cap, cap_flag_t flag);
 #else
 static inline int lxc_caps_down(void)
 {
@@ -46,9 +47,9 @@
 	return 0;
 }
 
-static inline int lxc_caps_last_cap(void)
+static inline int lxc_caps_last_cap(__u32 *cap)
 {
-	return 0;
+	return -1;
 }
 
 typedef int cap_value_t;

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cgroups/cgfsng.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cgroups/cgfsng.c Changed

@@ -12,15 +12,15 @@
  * a comma-separated list of controllers.
  */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <grp.h>
 #include <linux/kdev_t.h>
 #include <linux/types.h>
+#include <libgen.h>
 #include <poll.h>
 #include <signal.h>
 #include <stdint.h>
@@ -31,47 +31,64 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "cgroup.h"
 #include "af_unix.h"
 #include "caps.h"
-#include "cgroup.h"
 #include "cgroup2_devices.h"
 #include "cgroup_utils.h"
 #include "commands.h"
+#include "commands_utils.h"
 #include "conf.h"
-#include "config.h"
+#include "error_utils.h"
 #include "log.h"
 #include "macro.h"
 #include "mainloop.h"
 #include "memory_utils.h"
+#include "mount_utils.h"
+#include "open_utils.h"
 #include "storage/storage.h"
+#include "string_utils.h"
+#include "syscall_wrappers.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
+#endif
+
+#if !HAVE_STRLCAT
+#include "strlcat.h"
 #endif
 
-#ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#if HAVE_LIBSYSTEMD
+#include <systemd/sd-bus.h>
+#include <systemd/sd-event.h>
 #endif
 
 lxc_log_define(cgfsng, cgroup);
 
-/* Given a pointer to a null-terminated array of pointers, realloc to add one
+/*
+ * Given a pointer to a null-terminated array of pointers, realloc to add one
  * entry, and point the new entry to NULL. Do not fail. Return the index to the
  * second-to-last entry - that is, the one which is now available for use
  * (keeping the list null-terminated).
  */
-static int append_null_to_list(void ***list)
+static int cg_list_add(void ***list)
 {
-	int newentry = 0;
+	int idx = 0;
+	void **p;
 
 	if (*list)
-		for (; (*list)newentry; newentry++)
+		for (; (*list)idx; idx++)
 			;
 
-	*list = must_realloc(*list, (newentry + 2) * sizeof(void **));
-	(*list)newentry + 1 = NULL;
-	return newentry;
+	p = realloc(*list, (idx + 2) * sizeof(void **));
+	if (!p)
+		return ret_errno(ENOMEM);
+
+	pidx + 1 = NULL;
+	*list = p;
+
+	return idx;
 }
 
 /* Given a null-terminated array of strings, check whether @entry is one of the
@@ -83,69 +100,16 @@
 		return false;
 
 	for (int i = 0; listi; i++)
-		if (strcmp(listi, entry) == 0)
+		if (strequal(listi, entry))
 			return true;
 
 	return false;
 }
 
-/* Return a copy of @entry prepending "name=", i.e.  turn "systemd" into
- * "name=systemd". Do not fail.
- */
-static char *cg_legacy_must_prefix_named(char *entry)
-{
-	size_t len;
-	char *prefixed;
-
-	len = strlen(entry);
-	prefixed = must_realloc(NULL, len + 6);
-
-	memcpy(prefixed, "name=", STRLITERALLEN("name="));
-	memcpy(prefixed + STRLITERALLEN("name="), entry, len);
-	prefixedlen + 5 = '\0';
-
-	return prefixed;
-}
-
-/* Append an entry to the clist. Do not fail. @clist must be NULL the first time
- * we are called.
- *
- * We also handle named subsystems here. Any controller which is not a kernel
- * subsystem, we prefix "name=". Any which is both a kernel and named subsystem,
- * we refuse to use because we're not sure which we have here.
- * (TODO: We could work around this in some cases by just remounting to be
- * unambiguous, or by comparing mountpoint contents with current cgroup.)
- *
- * The last entry will always be NULL.
- */
-static void must_append_controller(char **klist, char **nlist, char ***clist,
-				   char *entry)
-{
-	int newentry;
-	char *copy;
-
-	if (string_in_list(klist, entry) && string_in_list(nlist, entry)) {
-		ERROR("Refusing to use ambiguous controller \"%s\"", entry);
-		ERROR("It is both a named and kernel subsystem");
-		return;
-	}
-
-	newentry = append_null_to_list((void ***)clist);
-
-	if (strncmp(entry, "name=", 5) == 0)
-		copy = must_copy_string(entry);
-	else if (string_in_list(klist, entry))
-		copy = must_copy_string(entry);
-	else
-		copy = cg_legacy_must_prefix_named(entry);
-
-	(*clist)newentry = copy;
-}
-
 /* Given a handler's cgroup data, return the struct hierarchy for the controller
  * @c, or NULL if there is none.
  */
-struct hierarchy *get_hierarchy(struct cgroup_ops *ops, const char *controller)
+static struct hierarchy *get_hierarchy(const struct cgroup_ops *ops, const char *controller)
 {
 	if (!ops->hierarchies)
 		return log_trace_errno(NULL, errno, "There are no useable cgroup controllers");
@@ -153,15 +117,28 @@
 	for (int i = 0; ops->hierarchiesi; i++) {
 		if (!controller) {
 			/* This is the empty unified hierarchy. */
-			if (ops->hierarchiesi->controllers &&
-			    !ops->hierarchiesi->controllers0)
+			if (ops->hierarchiesi->controllers && !ops->hierarchiesi->controllers0)
 				return ops->hierarchiesi;
+
 			continue;
-		} else if (pure_unified_layout(ops) &&
-			   strcmp(controller, "devices") == 0) {
-			if (ops->unified->bpf_device_controller)
-				return ops->unified;
-			break;
+		}
+
+		/*
+		 * Handle controllers with significant implementation changes
+		 * from cgroup to cgroup2.
+		 */
+		if (pure_unified_layout(ops)) {
+			if (strequal(controller, "devices")) {
+				if (device_utility_controller(ops->unified))
+					return ops->unified;
+
+				break;
+			} else if (strequal(controller, "freezer")) {
+				if (freezer_utility_controller(ops->unified))
+					return ops->unified;
+
+				break;
+			}
 		}
 
 		if (string_in_list(ops->hierarchiesi->controllers, controller))
@@ -176,63 +153,36 @@
 	return ret_set_errno(NULL, ENOENT);
 }
 
-#define BATCH_SIZE 50
-static void batch_realloc(char **mem, size_t oldlen, size_t newlen)
-{
-	int newbatches = (newlen / BATCH_SIZE) + 1;
-	int oldbatches = (oldlen / BATCH_SIZE) + 1;
-
-	if (!*mem || newbatches > oldbatches)
-		*mem = must_realloc(*mem, newbatches * BATCH_SIZE);
-}
-
-static void append_line(char **dest, size_t oldlen, char *new, size_t newlen)
+int prepare_cgroup_fd(const struct cgroup_ops *ops, struct cgroup_fd *fd, bool limit)
 {
-	size_t full = oldlen + newlen;
-
-	batch_realloc(dest, oldlen, full + 1);
-
-	memcpy(*dest + oldlen, new, newlen + 1);
-}
-
-/* Slurp in a whole file */
-static char *read_file(const char *fnam)
-{
-	__do_free char *buf = NULL, *line = NULL;
-	__do_fclose FILE *f = NULL;
-	size_t len = 0, fulllen = 0;
-	int linelen;
-
-	f = fopen(fnam, "re");
-	if (!f)
-		return NULL;
+	int dfd;
+	const struct hierarchy *h;
 
-	while ((linelen = getline(&line, &len, f)) != -1) {
-		append_line(&buf, fulllen, line, linelen);
-		fulllen += linelen;
-	}
-
-	return move_ptr(buf);
-}
+	h = get_hierarchy(ops, fd->controller);
+	if (!h)
+		return ret_errno(ENOENT);
 
-/* Taken over modified from the kernel sources. */
-#define NBITS 32 /* bits in uint32_t */
-#define DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
-#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, NBITS)
+	/*
+	 * The client requested that the controller must be in a specific
+	 * cgroup version.
+	 */
+	if (fd->type != 0 && (cgroupfs_type_magic_t)fd->type != h->fs_type)
+		return ret_errno(EINVAL);
 
-static void set_bit(unsigned bit, uint32_t *bitarr)
-{
-	bitarrbit / NBITS |= (1 << (bit % NBITS));
-}
+	if (limit)
+		dfd = h->dfd_con;
+	else
+		dfd = h->dfd_lim;
+	if (dfd < 0)
+		return ret_errno(EBADF);
 
-static void clear_bit(unsigned bit, uint32_t *bitarr)
-{
-	bitarrbit / NBITS &= ~(1 << (bit % NBITS));
-}
+	fd->layout = ops->cgroup_layout;
+	fd->type = h->fs_type;
+	if (fd->type == UNIFIED_HIERARCHY)
+		fd->utilities = h->utilities;
+	fd->fd = dfd;
 
-static bool is_set(unsigned bit, uint32_t *bitarr)
-{
-	return (bitarrbit / NBITS & (1 << (bit % NBITS))) != 0;
+	return 0;
 }
 
 /* Create cpumask from cpulist aka turn:
@@ -243,361 +193,139 @@
  *
  *	1 0 1 1
  */
-static uint32_t *lxc_cpumask(char *buf, size_t nbits)
+static int lxc_cpumask(char *buf, __u32 **bitarr, __u32 *last_set_bit)
 {
-	__do_free uint32_t *bitarr = NULL;
+	__do_free __u32 *arr_u32 = NULL;
+	__u32 cur_last_set_bit = 0, nbits = 256;
+	__u32 nr_u32;
 	char *token;
-	size_t arrlen;
 
-	arrlen = BITS_TO_LONGS(nbits);
-	bitarr = calloc(arrlen, sizeof(uint32_t));
-	if (!bitarr)
-		return ret_set_errno(NULL, ENOMEM);
+	nr_u32 = BITS_TO_LONGS(nbits);
+	arr_u32 = zalloc(nr_u32 * sizeof(__u32));
+	if (!arr_u32)
+		return ret_errno(ENOMEM);
 
 	lxc_iterate_parts(token, buf, ",") {
-		errno = 0;
-		unsigned end, start;
+		__u32 last_bit, first_bit;
 		char *range;
 
-		start = strtoul(token, NULL, 0);
-		end = start;
+		errno = 0;
+		first_bit = strtoul(token, NULL, 0);
+		last_bit = first_bit;
 		range = strchr(token, '-');
 		if (range)
-			end = strtoul(range + 1, NULL, 0);
+			last_bit = strtoul(range + 1, NULL, 0);
 
-		if (!(start <= end))
-			return ret_set_errno(NULL, EINVAL);
-
-		if (end >= nbits)
-			return ret_set_errno(NULL, EINVAL);
-
-		while (start <= end)
-			set_bit(start++, bitarr);
-	}
+		if (!(first_bit <= last_bit))
+			return ret_errno(EINVAL);
 
-	return move_ptr(bitarr);
-}
+		if (last_bit >= nbits) {
+			__u32 add_bits = last_bit - nbits + 32;
+			__u32 new_nr_u32;
+			__u32 *p;
 
-/* Turn cpumask into simple, comma-separated cpulist. */
-static char *lxc_cpumask_to_cpulist(uint32_t *bitarr, size_t nbits)
-{
-	__do_free_string_list char **cpulist = NULL;
-	char numstrINTTYPE_TO_STRLEN(size_t) = {0};
-	int ret;
+			new_nr_u32 = BITS_TO_LONGS(nbits + add_bits);
+			p = realloc(arr_u32, new_nr_u32 * sizeof(uint32_t));
+			if (!p)
+				return ret_errno(ENOMEM);
+			arr_u32 = move_ptr(p);
 
-	for (size_t i = 0; i <= nbits; i++) {
-		if (!is_set(i, bitarr))
-			continue;
+			memset(arr_u32 + nr_u32, 0,
+			       (new_nr_u32 - nr_u32) * sizeof(uint32_t));
+			nbits += add_bits;
+		}
 
-		ret = snprintf(numstr, sizeof(numstr), "%zu", i);
-		if (ret < 0 || (size_t)ret >= sizeof(numstr))
-			return NULL;
+		while (first_bit <= last_bit)
+			set_bit(first_bit++, arr_u32);
 
-		ret = lxc_append_string(&cpulist, numstr);
-		if (ret < 0)
-			return ret_set_errno(NULL, ENOMEM);
+		if (last_bit > cur_last_set_bit)
+			cur_last_set_bit = last_bit;
 	}
 
-	if (!cpulist)
-		return ret_set_errno(NULL, ENOMEM);
-
-	return lxc_string_join(",", (const char **)cpulist, false);
-}
-
-static ssize_t get_max_cpus(char *cpulist)
-{
-	char *c1, *c2;
-	char *maxcpus = cpulist;
-	size_t cpus = 0;
-
-	c1 = strrchr(maxcpus, ',');
-	if (c1)
-		c1++;
-
-	c2 = strrchr(maxcpus, '-');
-	if (c2)
-		c2++;
-
-	if (!c1 && !c2)
-		c1 = maxcpus;
-	else if (c1 > c2)
-		c2 = c1;
-	else if (c1 < c2)
-		c1 = c2;
-	else if (!c1 && c2)
-		c1 = c2;
-
-	errno = 0;
-	cpus = strtoul(c1, NULL, 0);
-	if (errno != 0)
-		return -1;
-
-	return cpus;
+	*last_set_bit = cur_last_set_bit;
+	*bitarr = move_ptr(arr_u32);
+	return 0;
 }
 
-#define __ISOL_CPUS "/sys/devices/system/cpu/isolated"
-#define __OFFLINE_CPUS "/sys/devices/system/cpu/offline"
-static bool cg_legacy_filter_and_set_cpus(const char *parent_cgroup,
-					  char *child_cgroup, bool am_initialized)
+static int lxc_cpumask_update(char *buf, __u32 *bitarr, __u32 last_set_bit,
+			      bool clear)
 {
-	__do_free char *cpulist = NULL, *fpath = NULL, *isolcpus = NULL,
-		       *offlinecpus = NULL, *posscpus = NULL;
-	__do_free uint32_t *isolmask = NULL, *offlinemask = NULL,
-			   *possmask = NULL;
-	int ret;
-	ssize_t i;
-	ssize_t maxisol = 0, maxoffline = 0, maxposs = 0;
-	bool flipped_bit = false;
-
-	fpath = must_make_path(parent_cgroup, "cpuset.cpus", NULL);
-	posscpus = read_file(fpath);
-	if (!posscpus)
-		return log_error_errno(false, errno, "Failed to read file \"%s\"", fpath);
-
-	/* Get maximum number of cpus found in possible cpuset. */
-	maxposs = get_max_cpus(posscpus);
-	if (maxposs < 0 || maxposs >= INT_MAX - 1)
-		return false;
-
-	if (file_exists(__ISOL_CPUS)) {
-		isolcpus = read_file(__ISOL_CPUS);
-		if (!isolcpus)
-			return log_error_errno(false, errno, "Failed to read file \"%s\"", __ISOL_CPUS);
-
-		if (isdigit(isolcpus0)) {
-			/* Get maximum number of cpus found in isolated cpuset. */
-			maxisol = get_max_cpus(isolcpus);
-			if (maxisol < 0 || maxisol >= INT_MAX - 1)
-				return false;
-		}
+	bool flipped = false;
+	char *token;
 
-		if (maxposs < maxisol)
-			maxposs = maxisol;
-		maxposs++;
-	} else {
-		TRACE("The path \""__ISOL_CPUS"\" to read isolated cpus from does not exist");
-	}
+	lxc_iterate_parts(token, buf, ",") {
+		__u32 last_bit, first_bit;
+		char *range;
 
-	if (file_exists(__OFFLINE_CPUS)) {
-		offlinecpus = read_file(__OFFLINE_CPUS);
-		if (!offlinecpus)
-			return log_error_errno(false, errno, "Failed to read file \"%s\"", __OFFLINE_CPUS);
+		errno = 0;
+		first_bit = strtoul(token, NULL, 0);
+		last_bit = first_bit;
+		range = strchr(token, '-');
+		if (range)
+			last_bit = strtoul(range + 1, NULL, 0);
 
-		if (isdigit(offlinecpus0)) {
-			/* Get maximum number of cpus found in offline cpuset. */
-			maxoffline = get_max_cpus(offlinecpus);
-			if (maxoffline < 0 || maxoffline >= INT_MAX - 1)
-				return false;
+		if (!(first_bit <= last_bit)) {
+			WARN("The cup range seems to be inverted: %u-%u", first_bit, last_bit);
+			continue;
 		}
 
-		if (maxposs < maxoffline)
-			maxposs = maxoffline;
-		maxposs++;
-	} else {
-		TRACE("The path \""__OFFLINE_CPUS"\" to read offline cpus from does not exist");
-	}
-
-	if ((maxisol == 0) && (maxoffline == 0)) {
-		cpulist = move_ptr(posscpus);
-		goto copy_parent;
-	}
-
-	possmask = lxc_cpumask(posscpus, maxposs);
-	if (!possmask)
-		return log_error_errno(false, errno, "Failed to create cpumask for possible cpus");
-
-	if (maxisol > 0) {
-		isolmask = lxc_cpumask(isolcpus, maxposs);
-		if (!isolmask)
-			return log_error_errno(false, errno, "Failed to create cpumask for isolated cpus");
-	}
-
-	if (maxoffline > 0) {
-		offlinemask = lxc_cpumask(offlinecpus, maxposs);
-		if (!offlinemask)
-			return log_error_errno(false, errno, "Failed to create cpumask for offline cpus");
-	}
-
-	for (i = 0; i <= maxposs; i++) {
-		if ((isolmask && !is_set(i, isolmask)) ||
-		    (offlinemask && !is_set(i, offlinemask)) ||
-		    !is_set(i, possmask))
+		if (last_bit > last_set_bit)
 			continue;
 
-		flipped_bit = true;
-		clear_bit(i, possmask);
-	}
-
-	if (!flipped_bit) {
-		cpulist = lxc_cpumask_to_cpulist(possmask, maxposs);
-		TRACE("No isolated or offline cpus present in cpuset");
-	} else {
-		cpulist = move_ptr(posscpus);
-		TRACE("Removed isolated or offline cpus from cpuset");
-	}
-	if (!cpulist)
-		return log_error_errno(false, errno, "Failed to create cpu list");
-
-copy_parent:
-	if (!am_initialized) {
-		ret = lxc_write_openat(child_cgroup, "cpuset.cpus", cpulist, strlen(cpulist));
-		if (ret < 0)
-			return log_error_errno(false,
-					       errno, "Failed to write cpu list to \"%s/cpuset.cpus\"",
-					       child_cgroup);
+		while (first_bit <= last_bit) {
+			if (clear && is_set(first_bit, bitarr)) {
+				flipped = true;
+				clear_bit(first_bit, bitarr);
+			} else if (!clear && !is_set(first_bit, bitarr)) {
+				flipped = true;
+				set_bit(first_bit, bitarr);
+			}
 
-		TRACE("Copied cpu settings of parent cgroup");
+			first_bit++;
+		}
 	}
 
-	return true;
-}
+	if (flipped)
+		return 1;
 
-/* Copy contents of parent(@path)/@file to @path/@file */
-static bool copy_parent_file(const char *parent_cgroup,
-			     const char *child_cgroup, const char *file)
-{
-	__do_free char *parent_file = NULL, *value = NULL;
-	int len = 0;
-	int ret;
-
-	parent_file = must_make_path(parent_cgroup, file, NULL);
-	len = lxc_read_from_file(parent_file, NULL, 0);
-	if (len <= 0)
-		return log_error_errno(false, errno, "Failed to determine buffer size");
-
-	value = must_realloc(NULL, len + 1);
-	valuelen = '\0';
-	ret = lxc_read_from_file(parent_file, value, len);
-	if (ret != len)
-		return log_error_errno(false, errno, "Failed to read from parent file \"%s\"", parent_file);
-
-	ret = lxc_write_openat(child_cgroup, file, value, len);
-	if (ret < 0 && errno != EACCES)
-		return log_error_errno(false, errno, "Failed to write \"%s\" to file \"%s/%s\"",
-				       value, child_cgroup, file);
-	return true;
-}
-
-static inline bool is_unified_hierarchy(const struct hierarchy *h)
-{
-	return h->version == CGROUP2_SUPER_MAGIC;
+	return 0;
 }
 
-/*
- * Initialize the cpuset hierarchy in first directory of @cgroup_leaf and set
- * cgroup.clone_children so that children inherit settings. Since the
- * h->base_path is populated by init or ourselves, we know it is already
- * initialized.
- *
- * returns -1 on error, 0 when we didn't created a cgroup, 1 if we created a
- * cgroup.
- */
-static int cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h,
-					     const char *cgroup_leaf)
+/* Turn cpumask into simple, comma-separated cpulist. */
+static char *lxc_cpumask_to_cpulist(__u32 *bitarr, __u32 last_set_bit)
 {
-	__do_free char *parent_cgroup = NULL, *child_cgroup = NULL, *dup = NULL;
-	__do_close int cgroup_fd = -EBADF;
-	int fret = -1;
+	__do_free_string_list char **cpulist = NULL;
+	char numstrINTTYPE_TO_STRLEN(__u32) = {0};
 	int ret;
-	char v;
-	char *leaf, *slash;
-
-	if (is_unified_hierarchy(h))
-		return 0;
-
-	if (!string_in_list(h->controllers, "cpuset"))
-		return 0;
-
-	if (!cgroup_leaf)
-		return ret_set_errno(-1, EINVAL);
-
-	dup = strdup(cgroup_leaf);
-	if (!dup)
-		return ret_set_errno(-1, ENOMEM);
-
-	parent_cgroup = must_make_path(h->mountpoint, h->container_base_path, NULL);
 
-	leaf = dup;
-	leaf += strspn(leaf, "/");
-	slash = strchr(leaf, '/');
-	if (slash)
-		*slash = '\0';
-	child_cgroup = must_make_path(parent_cgroup, leaf, NULL);
-	if (slash)
-		*slash = '/';
+	for (__u32 bit = 0; bit <= last_set_bit; bit++) {
+		if (!is_set(bit, bitarr))
+			continue;
 
-	fret = 1;
-	ret = mkdir(child_cgroup, 0755);
-	if (ret < 0) {
-		if (errno != EEXIST)
-			return log_error_errno(-1, errno, "Failed to create directory \"%s\"", child_cgroup);
+		ret = strnprintf(numstr, sizeof(numstr), "%u", bit);
+		if (ret < 0)
+			return NULL;
 
-		fret = 0;
+		ret = lxc_append_string(&cpulist, numstr);
+		if (ret < 0)
+			return ret_set_errno(NULL, ENOMEM);
 	}
 
-	cgroup_fd = lxc_open_dirfd(child_cgroup);
-	if (cgroup_fd < 0)
-		return -1;
-
-	ret = lxc_readat(cgroup_fd, "cgroup.clone_children", &v, 1);
-	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to read file \"%s/cgroup.clone_children\"", child_cgroup);
-
-	/* Make sure any isolated cpus are removed from cpuset.cpus. */
-	if (!cg_legacy_filter_and_set_cpus(parent_cgroup, child_cgroup, v == '1'))
-		return log_error_errno(-1, errno, "Failed to remove isolated cpus");
-
-	/* Already set for us by someone else. */
-	if (v == '1')
-		TRACE("\"cgroup.clone_children\" was already set to \"1\"");
-
-	/* copy parent's settings */
-	if (!copy_parent_file(parent_cgroup, child_cgroup, "cpuset.mems"))
-		return log_error_errno(-1, errno, "Failed to copy \"cpuset.mems\" settings");
-
-	/* Set clone_children so children inherit our settings */
-	ret = lxc_writeat(cgroup_fd, "cgroup.clone_children", "1", 1);
-	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to write 1 to \"%s/cgroup.clone_children\"", child_cgroup);
-
-	return fret;
-}
-
-/* Given two null-terminated lists of strings, return true if any string is in
- * both.
- */
-static bool controller_lists_intersect(char **l1, char **l2)
-{
-	if (!l1 || !l2)
-		return false;
-
-	for (int i = 0; l1i; i++)
-		if (string_in_list(l2, l1i))
-			return true;
+	if (!cpulist)
+		return ret_set_errno(NULL, ENOMEM);
 
-	return false;
+	return lxc_string_join(",", (const char **)cpulist, false);
 }
 
-/* For a null-terminated list of controllers @clist, return true if any of those
- * controllers is already listed the null-terminated list of hierarchies @hlist.
- * Realistically, if one is present, all must be present.
- */
-static bool controller_list_is_dup(struct hierarchy **hlist, char **clist)
+static inline bool is_unified_hierarchy(const struct hierarchy *h)
 {
-	if (!hlist)
-		return false;
-
-	for (int i = 0; hlisti; i++)
-		if (controller_lists_intersect(hlisti->controllers, clist))
-			return true;
-
-	return false;
+	return h->fs_type == UNIFIED_HIERARCHY;
 }
 
 /* Return true if the controller @entry is found in the null-terminated list of
  * hierarchies @hlist.
  */
-static bool controller_found(struct hierarchy **hlist, char *entry)
+static bool controller_available(struct hierarchy **hlist, char *entry)
 {
 	if (!hlist)
 		return false;
@@ -609,10 +337,7 @@
 	return false;
 }
 
-/* Return true if all of the controllers which we require have been found.  The
- * required list is  freezer and anything in lxc.cgroup.use.
- */
-static bool all_controllers_found(struct cgroup_ops *ops)
+static bool controllers_available(struct cgroup_ops *ops)
 {
 	struct hierarchy **hlist;
 
@@ -621,353 +346,152 @@
 
 	hlist = ops->hierarchies;
 	for (char **cur = ops->cgroup_use; cur && *cur; cur++)
-		if (!controller_found(hlist, *cur))
-			return log_error(false, "No %s controller mountpoint found", *cur);
+		if (!controller_available(hlist, *cur))
+			return log_error(false, "The %s controller found", *cur);
 
 	return true;
 }
 
-/* Get the controllers from a mountinfo line There are other ways we could get
- * this info. For lxcfs, field 3 is /cgroup/controller-list. For cgroupfs, we
- * could parse the mount options. But we simply assume that the mountpoint must
- * be /sys/fs/cgroup/controller-list
- */
-static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
-					int type)
+static char **list_new(void)
 {
-	/* The fourth field is /sys/fs/cgroup/comma-delimited-controller-list
-	 * for legacy hierarchies.
-	 */
-	__do_free_string_list char **aret = NULL;
-	int i;
-	char *p2, *tok;
-	char *p = line, *sep = ",";
-
-	for (i = 0; i < 4; i++) {
-		p = strchr(p, ' ');
-		if (!p)
-			return NULL;
-		p++;
-	}
-
-	/* Note, if we change how mountinfo works, then our caller will need to
-	 * verify /sys/fs/cgroup/ in this field.
-	 */
-	if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0)
-		return log_error(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p);
-
-	p += 15;
-	p2 = strchr(p, ' ');
-	if (!p2)
-		return log_error(NULL, "Corrupt mountinfo");
-	*p2 = '\0';
-
-	if (type == CGROUP_SUPER_MAGIC) {
-		__do_free char *dup = NULL;
-
-		/* strdup() here for v1 hierarchies. Otherwise
-		 * lxc_iterate_parts() will destroy mountpoints such as
-		 * "/sys/fs/cgroup/cpu,cpuacct".
-		 */
-		dup = must_copy_string(p);
-		if (!dup)
-			return NULL;
-
-		lxc_iterate_parts(tok, dup, sep)
-			must_append_controller(klist, nlist, &aret, tok);
-	}
-	*p2 = ' ';
-
-	return move_ptr(aret);
-}
+	__do_free_string_list char **list = NULL;
+	int idx;
 
-static char **cg_unified_make_empty_controller(void)
-{
-	__do_free_string_list char **aret = NULL;
-	int newentry;
+	idx = cg_list_add((void ***)&list);
+	if (idx < 0)
+		return NULL;
 
-	newentry = append_null_to_list((void ***)&aret);
-	aretnewentry = NULL;
-	return move_ptr(aret);
+	listidx = NULL;
+	return move_ptr(list);
 }
 
-static char **cg_unified_get_controllers(const char *file)
+static int list_add_string(char ***list, char *entry)
 {
-	__do_free char *buf = NULL;
-	__do_free_string_list char **aret = NULL;
-	char *sep = " \t\n";
-	char *tok;
-
-	buf = read_file(file);
-	if (!buf)
-		return NULL;
+	__do_free char *dup = NULL;
+	int idx;
 
-	lxc_iterate_parts(tok, buf, sep) {
-		int newentry;
-		char *copy;
+	dup = strdup(entry);
+	if (!dup)
+		return ret_errno(ENOMEM);
 
-		newentry = append_null_to_list((void ***)&aret);
-		copy = must_copy_string(tok);
-		aretnewentry = copy;
-	}
+	idx = cg_list_add((void ***)list);
+	if (idx < 0)
+		return idx;
 
-	return move_ptr(aret);
+	(*list)idx = move_ptr(dup);
+	return 0;
 }
 
-static struct hierarchy *add_hierarchy(struct hierarchy ***h, char **clist, char *mountpoint,
-				       char *container_base_path, int type)
+static char **list_add_controllers(char *controllers)
 {
-	struct hierarchy *new;
-	int newentry;
-
-	new = zalloc(sizeof(*new));
-	new->controllers = clist;
-	new->mountpoint = mountpoint;
-	new->container_base_path = container_base_path;
-	new->version = type;
-	new->cgfd_con = -EBADF;
-	new->cgfd_limit = -EBADF;
-	new->cgfd_mon = -EBADF;
-
-	newentry = append_null_to_list((void ***)h);
-	(*h)newentry = new;
-	return new;
-}
+	__do_free_string_list char **list = NULL;
+	char *it;
 
-/* Get a copy of the mountpoint from @line, which is a line from
- * /proc/self/mountinfo.
- */
-static char *cg_hybrid_get_mountpoint(char *line)
-{
-	char *p = line, *sret = NULL;
-	size_t len;
-	char *p2;
+	lxc_iterate_parts(it, controllers, ", \t\n") {
+		int ret;
 
-	for (int i = 0; i < 4; i++) {
-		p = strchr(p, ' ');
-		if (!p)
+		ret = list_add_string(&list, it);
+		if (ret < 0)
 			return NULL;
-		p++;
 	}
 
-	if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0)
-		return NULL;
-
-	p2 = strchr(p + 15, ' ');
-	if (!p2)
-		return NULL;
-	*p2 = '\0';
-
-	len = strlen(p);
-	sret = must_realloc(NULL, len + 1);
-	memcpy(sret, p, len);
-	sretlen = '\0';
-
-	return sret;
+	return move_ptr(list);
 }
 
-/* Given a multi-line string, return a null-terminated copy of the current line. */
-static char *copy_to_eol(char *p)
+static char **unified_controllers(int dfd, const char *file)
 {
-	char *p2, *sret;
-	size_t len;
+	__do_free char *buf = NULL;
 
-	p2 = strchr(p, '\n');
-	if (!p2)
+	buf = read_file_at(dfd, file, PROTECT_OPEN, 0);
+	if (!buf)
 		return NULL;
 
-	len = p2 - p;
-	sret = must_realloc(NULL, len + 1);
-	memcpy(sret, p, len);
-	sretlen = '\0';
-
-	return sret;
+	return list_add_controllers(buf);
 }
 
-/* cgline: pointer to character after the first ':' in a line in a \n-terminated
- * /proc/self/cgroup file. Check whether controller c is present.
- */
-static bool controller_in_clist(char *cgline, char *c)
+static bool skip_hierarchy(const struct cgroup_ops *ops, char **controllers)
 {
-	__do_free char *tmp = NULL;
-	char *tok, *eol;
-	size_t len;
-
-	eol = strchr(cgline, ':');
-	if (!eol)
+	if (!ops->cgroup_use)
 		return false;
 
-	len = eol - cgline;
-	tmp = must_realloc(NULL, len + 1);
-	memcpy(tmp, cgline, len);
-	tmplen = '\0';
-
-	lxc_iterate_parts(tok, tmp, ",")
-		if (strcmp(tok, c) == 0)
-			return true;
-
-	return false;
-}
-
-/* @basecginfo is a copy of /proc/$$/cgroup. Return the current cgroup for
- * @controller.
- */
-static char *cg_hybrid_get_current_cgroup(char *basecginfo, char *controller,
-					  int type)
-{
-	char *p = basecginfo;
-
-	for (;;) {
-		bool is_cgv2_base_cgroup = false;
-
-		/* cgroup v2 entry in "/proc/<pid>/cgroup": "0::/some/path" */
-		if ((type == CGROUP2_SUPER_MAGIC) && (*p == '0'))
-			is_cgv2_base_cgroup = true;
+	for (char **cur_ctrl = controllers; cur_ctrl && *cur_ctrl; cur_ctrl++) {
+		bool found = false;
 
-		p = strchr(p, ':');
-		if (!p)
-			return NULL;
-		p++;
+		for (char **cur_use = ops->cgroup_use; cur_use && *cur_use; cur_use++) {
+			if (!strequal(*cur_use, *cur_ctrl))
+				continue;
 
-		if (is_cgv2_base_cgroup || (controller && controller_in_clist(p, controller))) {
-			p = strchr(p, ':');
-			if (!p)
-				return NULL;
-			p++;
-			return copy_to_eol(p);
+			found = true;
+			break;
 		}
 
-		p = strchr(p, '\n');
-		if (!p)
-			return NULL;
-		p++;
-	}
-}
-
-static void must_append_string(char ***list, char *entry)
-{
-	int newentry;
-	char *copy;
-
-	newentry = append_null_to_list((void ***)list);
-	copy = must_copy_string(entry);
-	(*list)newentry = copy;
-}
-
-static int get_existing_subsystems(char ***klist, char ***nlist)
-{
-	__do_free char *line = NULL;
-	__do_fclose FILE *f = NULL;
-	size_t len = 0;
-
-	f = fopen("/proc/self/cgroup", "re");
-	if (!f)
-		return -1;
-
-	while (getline(&line, &len, f) != -1) {
-		char *p, *p2, *tok;
-		p = strchr(line, ':');
-		if (!p)
-			continue;
-		p++;
-		p2 = strchr(p, ':');
-		if (!p2)
-			continue;
-		*p2 = '\0';
-
-		/* If the kernel has cgroup v2 support, then /proc/self/cgroup
-		 * contains an entry of the form:
-		 *
-		 *	0::/some/path
-		 *
-		 * In this case we use "cgroup2" as controller name.
-		 */
-		if ((p2 - p) == 0) {
-			must_append_string(klist, "cgroup2");
+		if (found)
 			continue;
-		}
 
-		lxc_iterate_parts(tok, p, ",") {
-			if (strncmp(tok, "name=", 5) == 0)
-				must_append_string(nlist, tok);
-			else
-				must_append_string(klist, tok);
-		}
+		return true;
 	}
 
-	return 0;
-}
-
-static char *trim(char *s)
-{
-	size_t len;
-
-	len = strlen(s);
-	while ((len > 1) && (slen - 1 == '\n'))
-		s--len = '\0';
-
-	return s;
+	return false;
 }
 
-static void lxc_cgfsng_print_hierarchies(struct cgroup_ops *ops)
+static int cgroup_hierarchy_add(struct cgroup_ops *ops, int dfd_mnt, char *mnt,
+				int dfd_base, char *base_cgroup,
+				char **controllers, cgroupfs_type_magic_t fs_type)
 {
-	int i;
-	struct hierarchy **it;
-
-	if (!ops->hierarchies) {
-		TRACE("  No hierarchies found");
-		return;
-	}
-
-	TRACE("  Hierarchies:");
-	for (i = 0, it = ops->hierarchies; it && *it; it++, i++) {
-		int j;
-		char **cit;
+	__do_free struct hierarchy *new = NULL;
+	int idx;
 
-		TRACE("  %d: base_cgroup: %s", i, (*it)->container_base_path ? (*it)->container_base_path : "(null)");
-		TRACE("      mountpoint:  %s", (*it)->mountpoint ? (*it)->mountpoint : "(null)");
-		TRACE("      controllers:");
-		for (j = 0, cit = (*it)->controllers; cit && *cit; cit++, j++)
-			TRACE("      %d: %s", j, *cit);
-	}
-}
+	if (abspath(base_cgroup))
+		return syserror_set(-EINVAL, "Container base path must be relative to controller mount");
 
-static void lxc_cgfsng_print_basecg_debuginfo(char *basecginfo, char **klist,
-					      char **nlist)
-{
-	int k;
-	char **it;
-
-	TRACE("basecginfo is:");
-	TRACE("%s", basecginfo);
+	new = zalloc(sizeof(*new));
+	if (!new)
+		return ret_errno(ENOMEM);
 
-	for (k = 0, it = klist; it && *it; it++, k++)
-		TRACE("kernel subsystem %d: %s", k, *it);
+	new->dfd_con		= -EBADF;
+	new->dfd_lim		= -EBADF;
+	new->dfd_mon		= -EBADF;
+
+	new->fs_type		= fs_type;
+	new->controllers	= controllers;
+	new->at_mnt		= mnt;
+	new->at_base		= base_cgroup;
+
+	new->dfd_mnt		= dfd_mnt;
+	new->dfd_base		= dfd_base;
+
+	TRACE("Adding cgroup hierarchy mounted at %s and base cgroup %s",
+	      mnt, maybe_empty(base_cgroup));
+	for (char *const *it = new->controllers; it && *it; it++)
+		TRACE("The hierarchy contains the %s controller", *it);
+
+	idx = cg_list_add((void ***)&ops->hierarchies);
+	if (idx < 0)
+		return ret_errno(idx);
+
+	if (fs_type == UNIFIED_HIERARCHY)
+		ops->unified = new;
+	(ops->hierarchies)idx = move_ptr(new);
 
-	for (k = 0, it = nlist; it && *it; it++, k++)
-		TRACE("named subsystem %d: %s", k, *it);
+	return 0;
 }
 
-static int cgroup_tree_remove(struct hierarchy **hierarchies,
-			const char *container_cgroup)
+static int cgroup_tree_remove(struct hierarchy **hierarchies, const char *path_prune)
 {
-	if (!container_cgroup || !hierarchies)
+	if (!path_prune || !hierarchies)
 		return 0;
 
 	for (int i = 0; hierarchiesi; i++) {
 		struct hierarchy *h = hierarchiesi;
 		int ret;
 
-		if (!h->container_limit_path)
-			continue;
-
-		ret = lxc_rm_rf(h->container_limit_path);
+		ret = cgroup_tree_prune(h->dfd_base, path_prune);
 		if (ret < 0)
-			WARN("Failed to destroy \"%s\"", h->container_limit_path);
+			SYSWARN("Failed to destroy %d(%s)", h->dfd_base, path_prune);
+		else
+			TRACE("Removed cgroup tree %d(%s)", h->dfd_base, path_prune);
 
-		if (h->container_limit_path != h->container_full_path)
-			free_disarm(h->container_limit_path);
-		free_disarm(h->container_full_path);
+		free_equal(h->path_lim, h->path_con);
 	}
 
 	return 0;
@@ -975,7 +499,7 @@
 
 struct generic_userns_exec_data {
 	struct hierarchy **hierarchies;
-	const char *container_cgroup;
+	const char *path_prune;
 	struct lxc_conf *conf;
 	uid_t origuid; /* target uid in parent namespace */
 	char *path;
@@ -988,7 +512,7 @@
 	gid_t nsgid = (arg->conf->root_nsgid_map != NULL) ? 0 : arg->conf->init_gid;
 	int ret;
 
-	if (!lxc_setgroups(0, NULL) && errno != EPERM)
+	if (!lxc_drop_groups() && errno != EPERM)
 		return log_error_errno(-1, errno, "Failed to setgroups(0, NULL)");
 
 	ret = setresgid(nsgid, nsgid, nsgid);
@@ -1001,7 +525,7 @@
 		return log_error_errno(-1, errno, "Failed to setresuid(%d, %d, %d)",
 				       (int)nsuid, (int)nsuid, (int)nsuid);
 
-	return cgroup_tree_remove(arg->hierarchies, arg->container_cgroup);
+	return cgroup_tree_remove(arg->hierarchies, arg->path_prune);
 }
 
 __cgfsng_ops static void cgfsng_payload_destroy(struct cgroup_ops *ops,
@@ -1027,28 +551,306 @@
 		return;
 	}
 
-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-	ret = bpf_program_cgroup_detach(handler->conf->cgroup2_devices);
+	if (!ops->container_limit_cgroup) {
+		WARN("Uninitialized limit cgroup");
+		return;
+	}
+
+	ret = bpf_program_cgroup_detach(handler->cgroup_ops->cgroup2_devices);
 	if (ret < 0)
 		WARN("Failed to detach bpf program from cgroup");
-#endif
 
-	if (handler->conf && !lxc_list_empty(&handler->conf->id_map)) {
+	/*
+	 * Only do the user namespace dance if we have too. If the container's
+	 * monitor is root we can assume that it is privileged enough to remove
+	 * the cgroups it created when the container started.
+	 */
+	if (!list_empty(&handler->conf->id_map) && !handler->am_root) {
 		struct generic_userns_exec_data wrap = {
 			.conf			= handler->conf,
-			.container_cgroup	= ops->container_cgroup,
+			.path_prune		= ops->container_limit_cgroup,
 			.hierarchies		= ops->hierarchies,
 			.origuid		= 0,
 		};
-		ret = userns_exec_1(handler->conf, cgroup_tree_remove_wrapper,
-				    &wrap, "cgroup_tree_remove_wrapper");
+		ret = userns_exec_full(handler->conf, cgroup_tree_remove_wrapper,
+				       &wrap, "cgroup_tree_remove_wrapper");
 	} else {
-		ret = cgroup_tree_remove(ops->hierarchies, ops->container_cgroup);
+		ret = cgroup_tree_remove(ops->hierarchies, ops->container_limit_cgroup);
 	}
 	if (ret < 0)
 		SYSWARN("Failed to destroy cgroups");
 }
 
+#define __ISOL_CPUS "/sys/devices/system/cpu/isolated"
+#define __OFFLINE_CPUS "/sys/devices/system/cpu/offline"
+static bool cpuset1_cpus_initialize(int dfd_parent, int dfd_child,
+				    bool am_initialized)
+{
+	__do_free char *cpulist = NULL, *isolcpus = NULL,
+		       *offlinecpus = NULL, *posscpus = NULL;
+	__do_free __u32 *possmask = NULL;
+	int ret;
+	__u32 poss_last_set_bit = 0;
+
+	posscpus = read_file_at(dfd_parent, "cpuset.cpus", PROTECT_OPEN, 0);
+	if (!posscpus)
+		return log_error_errno(false, errno, "Failed to read file %d/cpuset.cpus", dfd_parent);
+
+	if (file_exists(__ISOL_CPUS)) {
+		isolcpus = read_file_at(-EBADF, __ISOL_CPUS, PROTECT_OPEN, 0);
+		if (!isolcpus)
+			return log_error_errno(false, errno, "Failed to read file \"%s\"", __ISOL_CPUS);
+
+		if (!isdigit(isolcpus0))
+			free_disarm(isolcpus);
+	} else {
+		TRACE("The path \""__ISOL_CPUS"\" to read isolated cpus from does not exist");
+	}
+
+	if (file_exists(__OFFLINE_CPUS)) {
+		offlinecpus = read_file_at(-EBADF, __OFFLINE_CPUS, PROTECT_OPEN, 0);
+		if (!offlinecpus)
+			return log_error_errno(false, errno, "Failed to read file \"%s\"", __OFFLINE_CPUS);
+
+		if (!isdigit(offlinecpus0))
+			free_disarm(offlinecpus);
+	} else {
+		TRACE("The path \""__OFFLINE_CPUS"\" to read offline cpus from does not exist");
+	}
+
+	if (!isolcpus && !offlinecpus) {
+		cpulist = move_ptr(posscpus);
+		goto copy_parent;
+	}
+
+	ret = lxc_cpumask(posscpus, &possmask, &poss_last_set_bit);
+	if (ret)
+		return log_error_errno(false, errno, "Failed to create cpumask for possible cpus");
+
+	if (isolcpus)
+		ret = lxc_cpumask_update(isolcpus, possmask, poss_last_set_bit, true);
+
+	if (offlinecpus)
+		ret |= lxc_cpumask_update(offlinecpus, possmask, poss_last_set_bit, true);
+
+	if (!ret) {
+		cpulist = lxc_cpumask_to_cpulist(possmask, poss_last_set_bit);
+		TRACE("No isolated or offline cpus present in cpuset");
+	} else {
+		cpulist = move_ptr(posscpus);
+		TRACE("Removed isolated or offline cpus from cpuset");
+	}
+	if (!cpulist)
+		return log_error_errno(false, errno, "Failed to create cpu list");
+
+copy_parent:
+	if (!am_initialized) {
+		ret = lxc_writeat(dfd_child, "cpuset.cpus", cpulist, strlen(cpulist));
+		if (ret < 0)
+			return log_error_errno(false, errno, "Failed to write cpu list to \"%d/cpuset.cpus\"", dfd_child);
+
+		TRACE("Copied cpu settings of parent cgroup");
+	}
+
+	return true;
+}
+
+static bool cpuset1_initialize(int dfd_base, int dfd_next)
+{
+	char memsPATH_MAX;
+	ssize_t bytes;
+	char v;
+
+	/* Determine whether the base cgroup has cpuset inheritance turned on. */
+	bytes = lxc_readat(dfd_base, "cgroup.clone_children", &v, 1);
+	if (bytes < 0)
+		return syserror_ret(false, "Failed to read file %d(cgroup.clone_children)", dfd_base);
+
+	/* Initialize cpuset.cpus removing any isolated and offline cpus. */
+	if (!cpuset1_cpus_initialize(dfd_base, dfd_next, v == '1'))
+		return syserror_ret(false, "Failed to initialize cpuset.cpus");
+
+	/* Read cpuset.mems from parent... */
+	bytes = lxc_readat(dfd_base, "cpuset.mems", mems, sizeof(mems));
+	if (bytes < 0)
+		return syserror_ret(false, "Failed to read file %d(cpuset.mems)", dfd_base);
+
+	/* and copy to first cgroup in the tree... */
+	bytes = lxc_writeat(dfd_next, "cpuset.mems", mems, bytes);
+	if (bytes < 0)
+		return syserror_ret(false, "Failed to write %d(cpuset.mems)", dfd_next);
+
+	/* and finally turn on cpuset inheritance. */
+	bytes = lxc_writeat(dfd_next, "cgroup.clone_children", "1", 1);
+	if (bytes < 0)
+		return syserror_ret(false, "Failed to write %d(cgroup.clone_children)", dfd_next);
+
+	return log_trace(true, "Initialized cpuset in the legacy hierarchy");
+}
+
+static int __cgroup_tree_create(int dfd_base, const char *path, mode_t mode,
+				bool cpuset_v1, bool eexist_ignore)
+{
+	__do_close int dfd_final = -EBADF;
+	int dfd_cur = dfd_base;
+	int ret = 0;
+	size_t len;
+	char *cur;
+	char bufPATH_MAX;
+
+	if (is_empty_string(path))
+		return ret_errno(EINVAL);
+
+	len = strlcpy(buf, path, sizeof(buf));
+	if (len >= sizeof(buf))
+		return ret_errno(E2BIG);
+
+	lxc_iterate_parts(cur, buf, "/") {
+		/*
+		 * Even though we vetted the paths when we parsed the config
+		 * we're paranoid here and check that the path is neither
+		 * absolute nor walks upwards.
+		 */
+		if (abspath(cur))
+			return syserror_set(-EINVAL, "No absolute paths allowed");
+
+		if (strnequal(cur, "..", STRLITERALLEN("..")))
+			return syserror_set(-EINVAL, "No upward walking paths allowed");
+
+		ret = mkdirat(dfd_cur, cur, mode);
+		if (ret < 0) {
+			if (errno != EEXIST)
+				return syserror("Failed to create %d(%s)", dfd_cur, cur);
+
+			ret = -EEXIST;
+		}
+		TRACE("%s %d(%s) cgroup", !ret ? "Created" : "Reusing", dfd_cur, cur);
+
+		dfd_final = open_at(dfd_cur, cur, PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH, 0);
+		if (dfd_final < 0)
+			return syserror("Fail to open%s directory %d(%s)",
+					!ret ? " newly created" : "", dfd_base, cur);
+		if (dfd_cur != dfd_base)
+			close(dfd_cur);
+		else if (cpuset_v1 && !cpuset1_initialize(dfd_base, dfd_final))
+			return syserror_set(-EINVAL, "Failed to initialize cpuset controller in the legacy hierarchy");
+		/*
+		 * Leave dfd_final pointing to the last fd we opened so
+		 * it will be automatically zapped if we return early.
+		 */
+		dfd_cur = dfd_final;
+		TRACE("Opened%s cgroup %s as %d", !ret ? " newly created" : "", cur, dfd_cur);
+	}
+
+	/* The final cgroup must be succesfully creatd by us. */
+	if (ret) {
+		if (ret != -EEXIST || !eexist_ignore)
+			return syswarn_set(ret, "Creating the final cgroup %d(%s) failed", dfd_base, path);
+	}
+
+	return move_fd(dfd_final);
+}
+
+static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
+			       struct hierarchy *h, const char *cgroup_limit_dir,
+			       const char *cgroup_leaf, bool payload)
+{
+	__do_close int fd_limit = -EBADF, fd_final = -EBADF;
+	bool cpuset_v1 = false;
+
+	/*
+	 * The legacy cpuset controller needs massaging in case inheriting
+	 * settings from its immediate ancestor cgroup hasn't been turned on.
+	 */
+	cpuset_v1 = !is_unified_hierarchy(h) && string_in_list(h->controllers, "cpuset");
+
+	if (payload && cgroup_leaf) {
+		/* With isolation both parts need to not already exist. */
+		fd_limit = __cgroup_tree_create(h->dfd_base, cgroup_limit_dir, 0755, cpuset_v1, false);
+		if (fd_limit < 0)
+			return syswarn_ret(false, "Failed to create limiting cgroup %d(%s)", h->dfd_base, cgroup_limit_dir);
+
+		h->path_lim = make_cgroup_path(h, h->at_base, cgroup_limit_dir, NULL);
+		h->dfd_lim = move_fd(fd_limit);
+
+		TRACE("Created limit cgroup %d->%d(%s)",
+		      h->dfd_lim, h->dfd_base, cgroup_limit_dir);
+
+		/*
+		 * With isolation the devices legacy cgroup needs to be
+		 * iinitialized early, as it typically contains an 'a' (all)
+		 * line, which is not possible once a subdirectory has been
+		 * created.
+		 */
+		if (string_in_list(h->controllers, "devices") &&
+		    !ops->setup_limits_legacy(ops, conf, true))
+			return log_warn(false, "Failed to setup legacy device limits");
+
+		/*
+		 * If we use a separate limit cgroup, the leaf cgroup, i.e. the
+		 * cgroup the container actually resides in, is below fd_limit.
+		 */
+		fd_final = __cgroup_tree_create(h->dfd_lim, cgroup_leaf, 0755, cpuset_v1, false);
+		if (fd_final < 0) {
+			/* Ensure we don't leave any garbage behind. */
+			if (cgroup_tree_prune(h->dfd_base, cgroup_limit_dir))
+				SYSWARN("Failed to destroy %d(%s)", h->dfd_base, cgroup_limit_dir);
+			else
+				TRACE("Removed cgroup tree %d(%s)", h->dfd_base, cgroup_limit_dir);
+			return syswarn_ret(false, "Failed to create %s cgroup %d(%s)", payload ? "payload" : "monitor", h->dfd_base, cgroup_limit_dir);
+		}
+		h->dfd_con = move_fd(fd_final);
+		h->path_con = must_make_path(h->path_lim, cgroup_leaf, NULL);
+
+	} else {
+		fd_final = __cgroup_tree_create(h->dfd_base, cgroup_limit_dir, 0755, cpuset_v1, false);
+		if (fd_final < 0)
+			return syswarn_ret(false, "Failed to create %s cgroup %d(%s)", payload ? "payload" : "monitor", h->dfd_base, cgroup_limit_dir);
+
+		if (payload) {
+			h->dfd_con = move_fd(fd_final);
+			h->dfd_lim = h->dfd_con;
+			h->path_con = make_cgroup_path(h, h->at_base, cgroup_limit_dir, NULL);
+
+			h->path_lim = h->path_con;
+		} else {
+			h->dfd_mon = move_fd(fd_final);
+		}
+	}
+
+	return true;
+}
+
+static void cgroup_tree_prune_leaf(struct hierarchy *h, const char *path_prune,
+				   bool payload)
+{
+	bool prune = true;
+
+	if (payload) {
+		/* Check whether we actually created the cgroup to prune. */
+		if (h->dfd_lim < 0)
+			prune = false;
+
+		free_equal(h->path_con, h->path_lim);
+		close_equal(h->dfd_con, h->dfd_lim);
+	} else {
+		/* Check whether we actually created the cgroup to prune. */
+		if (h->dfd_mon < 0)
+			prune = false;
+
+		close_prot_errno_disarm(h->dfd_mon);
+	}
+
+	/* We didn't create this cgroup. */
+	if (!prune)
+		return;
+
+	if (cgroup_tree_prune(h->dfd_base, path_prune))
+		SYSWARN("Failed to destroy %d(%s)", h->dfd_base, path_prune);
+	else
+		TRACE("Removed cgroup tree %d(%s)", h->dfd_base, path_prune);
+}
+
 __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
 						struct lxc_handler *handler)
 {
@@ -1075,221 +877,441 @@
 	}
 	conf = handler->conf;
 
-	len = snprintf(pidstr, sizeof(pidstr), "%d", handler->monitor_pid);
-	if (len < 0 || (size_t)len >= sizeof(pidstr))
+	if (!ops->monitor_cgroup) {
+		WARN("Uninitialized monitor cgroup");
+		return;
+	}
+
+	len = strnprintf(pidstr, sizeof(pidstr), "%d", handler->monitor_pid);
+	if (len < 0)
 		return;
 
 	for (int i = 0; ops->hierarchiesi; i++) {
+		__do_close int fd_pivot = -EBADF;
 		__do_free char *pivot_path = NULL;
 		struct hierarchy *h = ops->hierarchiesi;
-		size_t offset;
+		bool cpuset_v1 = false;
 		int ret;
 
-		if (!h->monitor_full_path)
-			continue;
-
 		/* Monitor might have died before we entered the cgroup. */
 		if (handler->monitor_pid <= 0) {
 			WARN("No valid monitor process found while destroying cgroups");
-			goto try_lxc_rm_rf;
+			goto cgroup_prune_tree;
 		}
 
-		if (conf && conf->cgroup_meta.monitor_dir)
-			pivot_path = must_make_path(h->mountpoint, h->container_base_path,
-						    conf->cgroup_meta.monitor_dir, CGROUP_PIVOT, NULL);
-		else if (conf && conf->cgroup_meta.dir)
-			pivot_path = must_make_path(h->mountpoint, h->container_base_path,
-						    conf->cgroup_meta.dir, CGROUP_PIVOT, NULL);
+		if (conf->cgroup_meta.monitor_pivot_dir)
+			pivot_path = must_make_path(conf->cgroup_meta.monitor_pivot_dir, CGROUP_PIVOT, NULL);
+		else if (conf->cgroup_meta.dir)
+			pivot_path = must_make_path(conf->cgroup_meta.dir, CGROUP_PIVOT, NULL);
 		else
-			pivot_path = must_make_path(h->mountpoint, h->container_base_path,
-						    CGROUP_PIVOT, NULL);
-
-		offset = strlen(h->mountpoint) + strlen(h->container_base_path);
+			pivot_path = must_make_path(CGROUP_PIVOT, NULL);
 
-		if (cg_legacy_handle_cpuset_hierarchy(h, pivot_path + offset))
-			SYSWARN("Failed to initialize cpuset %s/" CGROUP_PIVOT, pivot_path);
+		cpuset_v1 = !is_unified_hierarchy(h) && string_in_list(h->controllers, "cpuset");
 
-		ret = mkdir_p(pivot_path, 0755);
-		if (ret < 0 && errno != EEXIST) {
-			ERROR("Failed to create %s", pivot_path);
-			goto try_lxc_rm_rf;
+		fd_pivot = __cgroup_tree_create(h->dfd_base, pivot_path, 0755, cpuset_v1, true);
+		if (fd_pivot < 0) {
+			SYSWARN("Failed to create pivot cgroup %d(%s)", h->dfd_base, pivot_path);
+			continue;
 		}
 
-		ret = lxc_write_openat(pivot_path, "cgroup.procs", pidstr, len);
+		ret = lxc_writeat(fd_pivot, "cgroup.procs", pidstr, len);
 		if (ret != 0) {
 			SYSWARN("Failed to move monitor %s to \"%s\"", pidstr, pivot_path);
 			continue;
 		}
 
-try_lxc_rm_rf:
-		ret = lxc_rm_rf(h->monitor_full_path);
+cgroup_prune_tree:
+		ret = cgroup_tree_prune(h->dfd_base, ops->monitor_cgroup);
 		if (ret < 0)
-			WARN("Failed to destroy \"%s\"", h->monitor_full_path);
+			SYSWARN("Failed to destroy %d(%s)", h->dfd_base, ops->monitor_cgroup);
+		else
+			TRACE("Removed cgroup tree %d(%s)", h->dfd_base, ops->monitor_cgroup);
 	}
 }
 
-static int mkdir_eexist_on_last(const char *dir, mode_t mode)
+/*
+ * Check we have no lxc.cgroup.dir, and that lxc.cgroup.dir.limit_prefix is a
+ * proper prefix directory of lxc.cgroup.dir.payload.
+ *
+ * Returns the prefix length if it is set, otherwise zero on success.
+ */
+static bool check_cgroup_dir_config(struct lxc_conf *conf)
 {
-	const char *tmp = dir;
-	const char *orig = dir;
-	size_t orig_len;
+	const char *monitor_dir = conf->cgroup_meta.monitor_dir,
+		   *container_dir = conf->cgroup_meta.container_dir,
+		   *namespace_dir = conf->cgroup_meta.namespace_dir;
 
-	orig_len = strlen(dir);
-	do {
-		__do_free char *makeme = NULL;
-		int ret;
-		size_t cur_len;
+	/* none of the new options are set, all is fine */
+	if (!monitor_dir && !container_dir && !namespace_dir)
+		return true;
 
-		dir = tmp + strspn(tmp, "/");
-		tmp = dir + strcspn(dir, "/");
+	/* some are set, make sure lxc.cgroup.dir is not also set*/
+	if (conf->cgroup_meta.dir)
+		return log_error_errno(false, EINVAL,
+			"lxc.cgroup.dir conflicts with lxc.cgroup.dir.payload/monitor");
 
-		cur_len = dir - orig;
-		makeme = strndup(orig, cur_len);
-		if (!makeme)
-			return ret_set_errno(-1, ENOMEM);
-
-		ret = mkdir(makeme, mode);
-		if (ret < 0 && ((errno != EEXIST) || (orig_len == cur_len)))
-			return log_warn_errno(-1, errno, "Failed to create directory \"%s\"", makeme);
-	} while (tmp != dir);
+	/* make sure both monitor and payload are set */
+	if (!monitor_dir || !container_dir)
+		return log_error_errno(false, EINVAL,
+			"lxc.cgroup.dir.payload and lxc.cgroup.dir.monitor must both be set");
 
-	return 0;
+	/* namespace_dir may be empty */
+	return true;
 }
 
-static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
-			       struct hierarchy *h, const char *cgroup_tree,
-			       const char *cgroup_leaf, bool payload,
-			       const char *cgroup_limit_dir)
-{
-	__do_free char *path = NULL, *limit_path = NULL;
-	int ret, ret_cpuset;
-
-	path = must_make_path(h->mountpoint, h->container_base_path, cgroup_leaf, NULL);
-	if (dir_exists(path))
-		return log_warn_errno(false, errno, "The %s cgroup already existed", path);
-
-	ret_cpuset = cg_legacy_handle_cpuset_hierarchy(h, cgroup_leaf);
-	if (ret_cpuset < 0)
-		return log_error_errno(false, errno, "Failed to handle legacy cpuset controller");
-
-	if (payload && cgroup_limit_dir) {
-		/* with isolation both parts need to not already exist */
-		limit_path = must_make_path(h->mountpoint,
-					    h->container_base_path,
-					    cgroup_limit_dir, NULL);
-
-		ret = mkdir_eexist_on_last(limit_path, 0755);
-		if (ret < 0)
-			return log_debug_errno(false,
-					      errno, "Failed to create %s limiting cgroup",
-					      limit_path);
-
-		h->cgfd_limit = lxc_open_dirfd(limit_path);
-		if (h->cgfd_limit < 0)
-			return log_error_errno(false, errno,
-					       "Failed to open %s", path);
-		h->container_limit_path = move_ptr(limit_path);
+#define SYSTEMD_SCOPE_FAILED 2
+#define SYSTEMD_SCOPE_UNSUPP 1
+#define SYSTEMD_SCOPE_SUCCESS 0
+
+#if HAVE_LIBSYSTEMD
+struct sd_callback_data {
+	char *scope_name;
+	bool job_complete;
+};
 
-		/*
-		 * With isolation the devices legacy cgroup needs to be
-		 * iinitialized early, as it typically contains an 'a' (all)
-		 * line, which is not possible once a subdirectory has been
-		 * created.
-		 */
-		if (string_in_list(h->controllers, "devices")) {
-			ret = ops->setup_limits_legacy(ops, conf, true);
-			if (ret < 0)
-				return ret;
+static int systemd_jobremoved_callback(sd_bus_message *m, void *userdata, sd_bus_error *error)
+{
+	char *path, *unit, *result;
+	struct sd_callback_data *sd_data = userdata;
+	uint32_t id;
+	int r;
+
+	r = sd_bus_message_read(m, "uoss", &id, &path, &unit, &result);
+	if (r < 0)
+		return log_error(-1, "bad message received in callback: %s", strerror(-r));
+
+	if (sd_data->scope_name && strcmp(unit, sd_data->scope_name) != 0)
+		return log_trace(-1, "unit was '%s' not '%s'", unit, sd_data->scope_name);
+	if (strcmp(result, "done") == 0) {
+		sd_data->job_complete = true;
+		return log_info(1, "job is done");
+	}
+	return log_debug(0, "result was '%s', not 'done'", result);
+}
+
+#define DESTINATION "org.freedesktop.systemd1"
+#define PATH "/org/freedesktop/systemd1"
+#define INTERFACE "org.freedesktop.systemd1.Manager"
+#define MEMBER "StartTransientUnit"
+static bool start_scope(sd_bus *bus, struct sd_callback_data *data, struct sd_event *event)
+{
+	__attribute__((__cleanup__(sd_bus_error_free))) sd_bus_error error = SD_BUS_ERROR_NULL;;
+	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *reply = NULL;
+	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *m = NULL;
+	char *path = NULL;
+	int r;
+
+	r = sd_bus_message_new_method_call(bus, &m,
+		DESTINATION, PATH, INTERFACE, MEMBER);
+	if (r < 0)
+		return log_error(false, "Failed creating sdbus message");
+
+	r = sd_bus_message_append(m, "ss", data->scope_name, "fail");
+	if (r < 0)
+		return log_error(false, "Failed setting systemd scope name");
+
+	r = sd_bus_message_open_container(m, 'a', "(sv)");
+	if (r < 0)
+		return log_error(false, "Failed allocating sdbus msg properties");
+
+	r = sd_bus_message_append(m, "(sv)(sv)(sv)",
+		"PIDs", "au", 1, getpid(),
+		"Delegate", "b", 1,
+		"CollectMode", "s", "inactive-or-failed");
+	if (r < 0)
+		return log_error(false, "Failed setting properties on sdbus message");
+
+	r = sd_bus_message_close_container(m);
+	if (r < 0)
+		return log_error(false, "Failed closing sdbus message properties");
+
+	r = sd_bus_message_append(m, "a(sa(sv))", 0);
+	if (r < 0)
+		return log_error(false, "Failed appending aux boilerplate\n");
+
+	r = sd_bus_call(NULL, m, 0, &error, &reply);
+	if (r < 0)
+		return log_error(false,  "Failed sending sdbus message: %s", error.message);
+
+	/* Parse the response message */
+	r = sd_bus_message_read(reply, "o", &path);
+	if (r < 0)
+		return log_error(false, "Failed to parse response message: %s", strerror(-r));
+
+	/* Now spin up a mini-event-loop to wait for the "job completed" message */
+	int tries = 0;
+
+	while (!data->job_complete) {
+		r = sd_event_run(event, 1000 * 1000);
+		if (r < 0) {
+			log_debug(stderr, "Error waiting for JobRemoved: %s\n", strerror(-r));
+			continue;
+		}
+		if (data->job_complete || tries == 5)
+			break;
+		if (r > 0) {
+			log_trace(stderr, "Debug: we processed an event (%d), but not the one we wanted\n", r);
+			continue;
 		}
+		if (r == 0) // timeout
+			tries++;
 	}
-
-	ret = mkdir_eexist_on_last(path, 0755);
-	if (ret < 0) {
-		/*
-		 * This is the cpuset controller and
-		 * cg_legacy_handle_cpuset_hierarchy() has created our target
-		 * directory for us to ensure correct initialization.
-		 */
-		if (ret_cpuset != 1 || cgroup_tree)
-			return log_debug_errno(false, errno, "Failed to create %s cgroup", path);
+	if (!data->job_complete) {
+		return log_error(false, "Error: %s job was never removed", data->scope_name);
 	}
+	return true;
+}
 
-	if (payload) {
-		h->cgfd_con = lxc_open_dirfd(path);
-		if (h->cgfd_con < 0)
-			return log_error_errno(false, errno, "Failed to open %s", path);
-		h->container_full_path = move_ptr(path);
-		if (h->cgfd_limit < 0)
-			h->cgfd_limit = h->cgfd_con;
-		if (!h->container_limit_path)
-			h->container_limit_path = h->container_full_path;
-	} else {
-		h->cgfd_mon = lxc_open_dirfd(path);
-		if (h->cgfd_mon < 0)
-			return log_error_errno(false, errno, "Failed to open %s", path);
-		h->monitor_full_path = move_ptr(path);
+static bool string_pure_unified_system(char *contents)
+{
+	char *p;
+	bool first_line_read = false;
+
+	lxc_iterate_parts(p, contents, "\n") {
+		if (first_line_read) // if >1 line, this is not pure unified
+			return false;
+		first_line_read = true;
+
+		if (strlen(p) > 3 && strncmp(p, "0:", 2) == 0)
+			return true;
 	}
 
+	return false;
+}
+
+/*
+ * Only call get_current_unified_cgroup() when we are in a pure
+ * unified (v2-only) cgroup
+ */
+static char *get_current_unified_cgroup(void)
+{
+	__do_free char *buf = NULL;
+	__do_free_string_list char **list = NULL;
+	char *p;
+
+	buf = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0);
+	if (!buf)
+		return NULL;
+
+	if (!string_pure_unified_system(buf))
+		return NULL;
+
+	// 0::/user.slice/user-1000.slice/session-136.scope
+	// Get past the "0::"
+	p = buf;
+	if (strnequal(p, "0::", STRLITERALLEN("0::")))
+		p += STRLITERALLEN("0::");
+
+	return strdup(p);
+}
+
+static bool pure_unified_system(void)
+{
+	__do_free char *buf = NULL;
+
+	buf = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0);
+	if (!buf)
+		return false;
+
+	return string_pure_unified_system(buf);
+}
+
+#define MEMBER_JOIN "AttachProcessesToUnit"
+static bool enter_scope(char *scope_name, pid_t pid)
+{
+	__attribute__((__cleanup__(sd_bus_unrefp))) sd_bus *bus = NULL;
+	__attribute__((__cleanup__(sd_bus_error_free))) sd_bus_error error = SD_BUS_ERROR_NULL;;
+	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *reply = NULL;
+	__attribute__((__cleanup__(sd_bus_message_unrefp))) sd_bus_message *m = NULL;
+	int r;
+
+	r = sd_bus_open_user(&bus);
+	if (r < 0)
+		return log_error(false, "Failed to connect to user bus: %s", strerror(-r));
+
+	r = sd_bus_message_new_method_call(bus, &m,
+		DESTINATION, PATH, INTERFACE, MEMBER_JOIN);
+	if (r < 0)
+		return log_error(false, "Failed creating sdbus message");
+
+	r = sd_bus_message_append(m, "ssau", scope_name, "/init", 1, pid);
+	if (r < 0)
+		return log_error(false, "Failed setting systemd scope name");
+
+
+	r = sd_bus_call(NULL, m, 0, &error, &reply);
+	if (r < 0)
+		return log_error(false,  "Failed sending sdbus message: %s", error.message);
+
 	return true;
 }
 
-static void cgroup_tree_leaf_remove(struct hierarchy *h, bool payload)
+static bool enable_controllers_delegation(int fd_dir, char *cg)
 {
-	__do_free char *full_path = NULL, *__limit_path = NULL;
-	char *limit_path = NULL;
+	__do_free char *rbuf = NULL;
+	__do_free char *wbuf = NULL;
+	__do_free_string_list char **cpulist = NULL;
+	char *controller;
+	size_t full_len = 0;
+	bool first = true;
+	int ret;
 
-	if (payload) {
-		__lxc_unused __do_close int fd = move_fd(h->cgfd_con);
-		full_path = move_ptr(h->container_full_path);
-		limit_path = move_ptr(h->container_limit_path);
-		if (limit_path != full_path)
-			__limit_path = limit_path;
-	} else {
-		__lxc_unused __do_close int fd = move_fd(h->cgfd_mon);
-		full_path = move_ptr(h->monitor_full_path);
+	rbuf = read_file_at(fd_dir, "cgroup.controllers", PROTECT_OPEN, 0);
+	if (!rbuf)
+		return false;
+
+	lxc_iterate_parts(controller, rbuf, " ") {
+		full_len += strlen(controller) + 2;
+		wbuf = must_realloc(wbuf, full_len + 1);
+		if (first) {
+			wbuf0 = '\0';
+			first = false;
+		} else {
+			(void)strlcat(wbuf, " ", full_len + 1);
+		}
+		strlcat(wbuf, "+", full_len + 1);
+		strlcat(wbuf, controller, full_len + 1);
 	}
+	if (!wbuf)
+		return log_debug(true, "No controllers to delegate!");
 
-	if (full_path && rmdir(full_path))
-		SYSWARN("Failed to rmdir(\"%s\") cgroup", full_path);
-	if (limit_path && rmdir(limit_path))
-		SYSWARN("Failed to rmdir(\"%s\") cgroup", limit_path);
+	ret = lxc_writeat(fd_dir, "cgroup.subtree_control", wbuf, strlen(wbuf));
+	if (ret < 0)
+		return log_error_errno(false, errno, "Failed to write \"%s\" to %s/cgroup.subtree_control", wbuf, cg);
+
+	return true;
 }
 
 /*
- * Check we have no lxc.cgroup.dir, and that lxc.cgroup.dir.limit_prefix is a
- * proper prefix directory of lxc.cgroup.dir.payload.
- *
- * Returns the prefix length if it is set, otherwise zero on success.
+ * systemd places us in say .../lxc-1.scope.  We create lxc-1.scope/init,
+ * move ourselves to there, then enable controllers in lxc-1.scope
  */
-static bool check_cgroup_dir_config(struct lxc_conf *conf)
+static bool move_and_delegate_unified(char *parent_cgroup)
 {
-	const char *monitor_dir = conf->cgroup_meta.monitor_dir,
-		   *container_dir = conf->cgroup_meta.container_dir,
-		   *namespace_dir = conf->cgroup_meta.namespace_dir;
+	__do_free char *buf = NULL;
+	__do_close int fd_parent = -EBADF;
+	int ret;
 
-	/* none of the new options are set, all is fine */
-	if (!monitor_dir && !container_dir && !namespace_dir)
-		return true;
+	fd_parent = open_at(-EBADF, parent_cgroup, O_DIRECTORY, 0, 0);
+	if (fd_parent < 0)
+		return syserror_ret(false, "Failed opening cgroup dir \"%s\"", parent_cgroup);
 
-	/* some are set, make sure lxc.cgroup.dir is not also set*/
-	if (conf->cgroup_meta.dir)
-		return log_error_errno(false, EINVAL,
-			"lxc.cgroup.dir conflicts with lxc.cgroup.dir.payload/monitor");
+	ret = mkdirat(fd_parent, "init", 0755);
+	if (ret < 0 && errno != EEXIST)
+		return syserror_ret(false, "Failed to create \"%d/init\" cgroup", fd_parent);
 
-	/* make sure both monitor and payload are set */
-	if (!monitor_dir || !container_dir)
-		return log_error_errno(false, EINVAL,
-			"lxc.cgroup.dir.payload and lxc.cgroup.dir.monitor must both be set");
+	buf = read_file_at(fd_parent, "cgroup.procs", PROTECT_OPEN, 0);
+	if (!buf)
+		return false;
 
-	/* namespace_dir may be empty */
-	return true;
+	ret = lxc_writeat(fd_parent, "init/cgroup.procs", buf, strlen(buf));
+	if (ret)
+		return syserror_ret(false, "Failed to escape to cgroup \"init/cgroup.procs\"");
+
+	/* enable controllers in parent_cgroup */
+	return enable_controllers_delegation(fd_parent, parent_cgroup);
+}
+
+static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf *conf)
+{
+	__do_free char *full_scope_name = NULL;
+	__do_free char *fs_cg_path = NULL;
+	sd_event *event = NULL;
+	__attribute__((__cleanup__(sd_bus_unrefp))) sd_bus *bus = NULL; // free the bus before the names it references, just to be sure
+	struct sd_callback_data sd_data;
+	int idx = 0;
+	size_t len;
+	int r;
+
+	if (geteuid() == 0)
+		return log_info(SYSTEMD_SCOPE_UNSUPP, "Running privileged, not using a systemd unit");
+	// Pure_unified_layout() can't be used as that info is not yet setup.  At
+	// the same time, we don't want to calculate current cgroups until after
+	// we optionally enter a new systemd user scope.  So let's just do a quick
+	// check for pure unified cgroup system: single line /proc/self/cgroup with
+	// only index '0:'
+	if (!pure_unified_system())
+		return log_info(SYSTEMD_SCOPE_UNSUPP, "Not in unified layout, not using a systemd unit");
+
+	r = sd_bus_open_user(&bus);
+	if (r < 0)
+		return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to user bus: %s", strerror(-r));
+
+	r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL);
+	if (r < 0)
+		return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to signals: %s", strerror(-r));
+
+	sd_data.job_complete = false;
+	sd_data.scope_name = NULL;
+	r = sd_bus_match_signal(bus,
+		NULL, // no slot
+		DESTINATION, PATH, INTERFACE, "JobRemoved",
+		systemd_jobremoved_callback, &sd_data);
+	if (r < 0)
+		return log_error(SYSTEMD_SCOPE_FAILED, "Failed to register systemd event loop signal handler: %s", strerror(-r));
+
+	// NEXT: create and attach event
+	r = sd_event_new(&event);
+	if (r < 0)
+		return log_error(SYSTEMD_SCOPE_FAILED, "Failed allocating new event: %s\n", strerror(-r));
+	r = sd_bus_attach_event(bus, event, SD_EVENT_PRIORITY_NORMAL);
+	if (r < 0) {
+		// bus won't clean up event since the attach failed
+		sd_event_unrefp(&event);
+		return log_error(SYSTEMD_SCOPE_FAILED, "Failed attaching event: %s\n", strerror(-r));
+	}
+
+	// "lxc-" + (conf->name) + "-NN" + ".scope" + '\0'
+	len = STRLITERALLEN("lxc-") + strlen(conf->name) + 3 + STRLITERALLEN(".scope") + 1;
+	full_scope_name = malloc(len);
+	if (!full_scope_name)
+		return syserror("Out of memory");
+
+	do {
+		r = strnprintf(full_scope_name, len, "lxc-%s-%d.scope", conf->name, idx);
+		if (r < 0)
+			return log_error_errno(-1, errno, "Failed to build scope name for \"%s\"", conf->name);
+		sd_data.scope_name = full_scope_name;
+		if (start_scope(bus, &sd_data, event)) {
+			conf->cgroup_meta.systemd_scope = get_current_unified_cgroup();
+			if (!conf->cgroup_meta.systemd_scope)
+				return log_trace(SYSTEMD_SCOPE_FAILED, "Out of memory");
+			fs_cg_path = must_make_path("/sys/fs/cgroup", conf->cgroup_meta.systemd_scope, NULL);
+			if (!move_and_delegate_unified(fs_cg_path))
+				return log_error(SYSTEMD_SCOPE_FAILED, "Failed delegating the controllers to our cgroup");
+			return log_trace(SYSTEMD_SCOPE_SUCCESS, "Created systemd scope %s", full_scope_name);
+		}
+		idx++;
+	} while (idx < 99);
+
+	return SYSTEMD_SCOPE_FAILED; // failed, let's try old-school after all
+}
+#else /* !HAVE_LIBSYSTEMD */
+static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf *conf)
+{
+	TRACE("unpriv_systemd_create_scope: no systemd support");
+	return SYSTEMD_SCOPE_UNSUPP; // not supported
+}
+#endif /* HAVE_LIBSYSTEMD */
+
+// Return a duplicate of cgroup path @cg without leading /, so
+// that caller can own+free it and be certain it's not abspath.
+static char *cgroup_relpath(char *cg)
+{
+	char *p;
+
+	if (!cg || strequal(cg, "/"))
+		return NULL;
+	p = strdup(deabs(cg));
+	if (!p)
+		return ERR_PTR(-ENOMEM);
+
+	return p;
 }
 
-__cgfsng_ops static inline bool cgfsng_monitor_create(struct cgroup_ops *ops,
-						      struct lxc_handler *handler)
+__cgfsng_ops static bool cgfsng_monitor_create(struct cgroup_ops *ops, struct lxc_handler *handler)
 {
-	__do_free char *monitor_cgroup = NULL, *__cgroup_tree = NULL;
-	const char *cgroup_tree;
+	__do_free char *monitor_cgroup = NULL;
 	int idx = 0;
 	int i;
 	size_t len;
@@ -1314,25 +1336,23 @@
 		return false;
 
 	if (conf->cgroup_meta.monitor_dir) {
-		cgroup_tree = NULL;
 		monitor_cgroup = strdup(conf->cgroup_meta.monitor_dir);
 	} else if (conf->cgroup_meta.dir) {
-		cgroup_tree = conf->cgroup_meta.dir;
 		monitor_cgroup = must_concat(&len, conf->cgroup_meta.dir, "/",
 					     DEFAULT_MONITOR_CGROUP_PREFIX,
 					     handler->name,
 					     CGROUP_CREATE_RETRY, NULL);
 	} else if (ops->cgroup_pattern) {
-		__cgroup_tree = lxc_string_replace("%n", handler->name, ops->cgroup_pattern);
-		if (!__cgroup_tree)
+		__do_free char *cgroup_tree = NULL;
+
+		cgroup_tree = lxc_string_replace("%n", handler->name, ops->cgroup_pattern);
+		if (!cgroup_tree)
 			return ret_set_errno(false, ENOMEM);
 
-		cgroup_tree = __cgroup_tree;
 		monitor_cgroup = must_concat(&len, cgroup_tree, "/",
 					     DEFAULT_MONITOR_CGROUP,
 					     CGROUP_CREATE_RETRY, NULL);
 	} else {
-		cgroup_tree = NULL;
 		monitor_cgroup = must_concat(&len, DEFAULT_MONITOR_CGROUP_PREFIX,
 					     handler->name,
 					     CGROUP_CREATE_RETRY, NULL);
@@ -1350,13 +1370,14 @@
 
 		for (i = 0; ops->hierarchiesi; i++) {
 			if (cgroup_tree_create(ops, handler->conf,
-				               ops->hierarchiesi, cgroup_tree,
-				               monitor_cgroup, false, NULL))
+					       ops->hierarchiesi,
+					       monitor_cgroup, NULL, false))
 				continue;
 
-			DEBUG("Failed to create cgroup \"%s\"", ops->hierarchiesi->monitor_full_path ?: "(null)");
-			for (int j = 0; j < i; j++)
-				cgroup_tree_leaf_remove(ops->hierarchiesj, false);
+			DEBUG("Failed to create cgroup %s)", monitor_cgroup);
+			for (int j = 0; j <= i; j++)
+				cgroup_tree_prune_leaf(ops->hierarchiesj,
+						       monitor_cgroup, false);
 
 			idx++;
 			break;
@@ -1374,13 +1395,10 @@
  * Try to create the same cgroup in all hierarchies. Start with cgroup_pattern;
  * next cgroup_pattern-1, -2, ..., -999.
  */
-__cgfsng_ops static inline bool cgfsng_payload_create(struct cgroup_ops *ops,
-						      struct lxc_handler *handler)
+__cgfsng_ops static bool cgfsng_payload_create(struct cgroup_ops *ops, struct lxc_handler *handler)
 {
-	__do_free char *container_cgroup = NULL,
-		       *__cgroup_tree = NULL,
-		       *limiting_cgroup = NULL;
-	const char *cgroup_tree;
+	__do_free char *container_cgroup = NULL, *__limit_cgroup = NULL;
+	char *limit_cgroup;
 	int idx = 0;
 	int i;
 	size_t len;
@@ -1393,7 +1411,7 @@
 	if (!ops->hierarchies)
 		return true;
 
-	if (ops->container_cgroup)
+	if (ops->container_cgroup || ops->container_limit_cgroup)
 		return ret_set_errno(false, EEXIST);
 
 	if (!handler || !handler->conf)
@@ -1405,42 +1423,44 @@
 		return false;
 
 	if (conf->cgroup_meta.container_dir) {
-		cgroup_tree = NULL;
-
-		limiting_cgroup = strdup(conf->cgroup_meta.container_dir);
-		if (!limiting_cgroup)
+		__limit_cgroup = strdup(conf->cgroup_meta.container_dir);
+		if (!__limit_cgroup)
 			return ret_set_errno(false, ENOMEM);
 
 		if (conf->cgroup_meta.namespace_dir) {
-			container_cgroup = must_make_path(limiting_cgroup,
+			container_cgroup = must_make_path(__limit_cgroup,
 							  conf->cgroup_meta.namespace_dir,
 							  NULL);
+			limit_cgroup = __limit_cgroup;
 		} else {
 			/* explicit paths but without isolation */
-			container_cgroup = move_ptr(limiting_cgroup);
+			limit_cgroup = move_ptr(__limit_cgroup);
+			container_cgroup = limit_cgroup;
 		}
 	} else if (conf->cgroup_meta.dir) {
-		cgroup_tree = conf->cgroup_meta.dir;
-		container_cgroup = must_concat(&len, cgroup_tree, "/",
-					     DEFAULT_PAYLOAD_CGROUP_PREFIX,
-					     handler->name,
-					     CGROUP_CREATE_RETRY, NULL);
+		limit_cgroup = must_concat(&len, conf->cgroup_meta.dir, "/",
+					   DEFAULT_PAYLOAD_CGROUP_PREFIX,
+					   handler->name,
+					   CGROUP_CREATE_RETRY, NULL);
+		container_cgroup = limit_cgroup;
 	} else if (ops->cgroup_pattern) {
-		__cgroup_tree = lxc_string_replace("%n", handler->name, ops->cgroup_pattern);
-		if (!__cgroup_tree)
+		__do_free char *cgroup_tree = NULL;
+
+		cgroup_tree = lxc_string_replace("%n", handler->name, ops->cgroup_pattern);
+		if (!cgroup_tree)
 			return ret_set_errno(false, ENOMEM);
 
-		cgroup_tree = __cgroup_tree;
-		container_cgroup = must_concat(&len, cgroup_tree, "/",
-					       DEFAULT_PAYLOAD_CGROUP,
-					       CGROUP_CREATE_RETRY, NULL);
+		limit_cgroup = must_concat(&len, cgroup_tree, "/",
+					   DEFAULT_PAYLOAD_CGROUP,
+					   CGROUP_CREATE_RETRY, NULL);
+		container_cgroup = limit_cgroup;
 	} else {
-		cgroup_tree = NULL;
-		container_cgroup = must_concat(&len, DEFAULT_PAYLOAD_CGROUP_PREFIX,
-					     handler->name,
-					     CGROUP_CREATE_RETRY, NULL);
+		limit_cgroup = must_concat(&len, DEFAULT_PAYLOAD_CGROUP_PREFIX,
+					   handler->name,
+					   CGROUP_CREATE_RETRY, NULL);
+		container_cgroup = limit_cgroup;
 	}
-	if (!container_cgroup)
+	if (!limit_cgroup)
 		return ret_set_errno(false, ENOMEM);
 
 	if (!conf->cgroup_meta.container_dir) {
@@ -1453,14 +1473,15 @@
 
 		for (i = 0; ops->hierarchiesi; i++) {
 			if (cgroup_tree_create(ops, handler->conf,
-					       ops->hierarchiesi, cgroup_tree,
-					       container_cgroup, true,
-					       limiting_cgroup))
+					       ops->hierarchiesi, limit_cgroup,
+					       conf->cgroup_meta.namespace_dir,
+					       true))
 				continue;
 
-			DEBUG("Failed to create cgroup \"%s\"", ops->hierarchiesi->container_full_path ?: "(null)");
-			for (int j = 0; j < i; j++)
-				cgroup_tree_leaf_remove(ops->hierarchiesj, true);
+			DEBUG("Failed to create cgroup \"%s\"", ops->hierarchiesi->path_con ?: "(null)");
+			for (int j = 0; j <= i; j++)
+				cgroup_tree_prune_leaf(ops->hierarchiesj,
+						       limit_cgroup, true);
 
 			idx++;
 			break;
@@ -1471,7 +1492,12 @@
 		return log_error_errno(false, ERANGE, "Failed to create container cgroup");
 
 	ops->container_cgroup = move_ptr(container_cgroup);
-	INFO("The container process uses \"%s\" as cgroup", ops->container_cgroup);
+	if (__limit_cgroup)
+		ops->container_limit_cgroup = move_ptr(__limit_cgroup);
+	else
+		ops->container_limit_cgroup = ops->container_cgroup;
+	INFO("The container process uses \"%s\" as inner and \"%s\" as limit cgroup",
+	     ops->container_cgroup, ops->container_limit_cgroup);
 	return true;
 }
 
@@ -1494,24 +1520,39 @@
 	if (!handler || !handler->conf)
 		return ret_set_errno(false, EINVAL);
 
-	monitor_len = snprintf(monitor, sizeof(monitor), "%d", handler->monitor_pid);
-	if (handler->transient_pid > 0)
-		transient_len = snprintf(transient, sizeof(transient), "%d", handler->transient_pid);
+	monitor_len = strnprintf(monitor, sizeof(monitor), "%d", handler->monitor_pid);
+	if (monitor_len < 0)
+		return false;
+
+	if (handler->transient_pid > 0) {
+		transient_len = strnprintf(transient, sizeof(transient), "%d", handler->transient_pid);
+		if (transient_len < 0)
+			return false;
+	}
 
 	for (int i = 0; ops->hierarchiesi; i++) {
 		struct hierarchy *h = ops->hierarchiesi;
 		int ret;
 
-		ret = lxc_writeat(h->cgfd_mon, "cgroup.procs", monitor, monitor_len);
+		ret = lxc_writeat(h->dfd_mon, "cgroup.procs", monitor, monitor_len);
 		if (ret)
-			return log_error_errno(false, errno, "Failed to enter cgroup \"%s\"", h->monitor_full_path);
+			return log_error_errno(false, errno, "Failed to enter cgroup %d", h->dfd_mon);
+
+		TRACE("Moved monitor (%d) into cgroup %d", handler->monitor_pid, h->dfd_mon);
 
 		if (handler->transient_pid <= 0)
-			return true;
+			continue;
 
-		ret = lxc_writeat(h->cgfd_mon, "cgroup.procs", transient, transient_len);
-		if (ret)
-			return log_error_errno(false, errno, "Failed to enter cgroup \"%s\"", h->monitor_full_path);
+		ret = lxc_writeat(h->dfd_mon, "cgroup.procs", transient, transient_len);
+		if (ret) {
+			// TODO: probably ask systemd to do the move for us instead
+			if (!handler->conf->cgroup_meta.systemd_scope)
+				return log_error_errno(false, errno, "Failed to enter pid %d into cgroup %d", handler->transient_pid, h->dfd_mon);
+			else
+				TRACE("Failed moving transient process into cgroup %d", h->dfd_mon);
+		}
+
+		TRACE("Moved transient process into cgroup %d", h->dfd_mon);
 
 		/*
 		 * we don't keep the fds for non-unified hierarchies around
@@ -1520,7 +1561,7 @@
 		 * lot of them.
 		 */
 		if (!is_unified_hierarchy(h))
-			close_prot_errno_disarm(h->cgfd_mon);
+			close_prot_errno_disarm(h->dfd_mon);
 	}
 	handler->transient_pid = -1;
 
@@ -1545,15 +1586,23 @@
 	if (!handler || !handler->conf)
 		return ret_set_errno(false, EINVAL);
 
-	len = snprintf(pidstr, sizeof(pidstr), "%d", handler->pid);
+	len = strnprintf(pidstr, sizeof(pidstr), "%d", handler->pid);
+	if (len < 0)
+		return false;
 
 	for (int i = 0; ops->hierarchiesi; i++) {
 		struct hierarchy *h = ops->hierarchiesi;
 		int ret;
 
-		ret = lxc_writeat(h->cgfd_con, "cgroup.procs", pidstr, len);
+		if (is_unified_hierarchy(h) &&
+		    (handler->clone_flags & CLONE_INTO_CGROUP))
+			continue;
+
+		ret = lxc_writeat(h->dfd_con, "cgroup.procs", pidstr, len);
 		if (ret != 0)
-			return log_error_errno(false, errno, "Failed to enter cgroup \"%s\"", h->container_full_path);
+			return log_error_errno(false, errno, "Failed to enter cgroup \"%s\"", h->path_con);
+
+		TRACE("Moved container into %s cgroup via %d", h->path_con, h->dfd_con);
 	}
 
 	return true;
@@ -1595,7 +1644,7 @@
 	uid_t nsuid = (arg->conf->root_nsuid_map != NULL) ? 0 : arg->conf->init_uid;
 	gid_t nsgid = (arg->conf->root_nsgid_map != NULL) ? 0 : arg->conf->init_gid;
 
-	if (!lxc_setgroups(0, NULL) && errno != EPERM)
+	if (!lxc_drop_groups() && errno != EPERM)
 		return log_error_errno(-1, errno, "Failed to setgroups(0, NULL)");
 
 	ret = setresgid(nsgid, nsgid, nsgid);
@@ -1613,7 +1662,10 @@
 		destuid = 0;
 
 	for (int i = 0; arg->hierarchiesi; i++) {
-		int dirfd = arg->hierarchiesi->cgfd_con;
+		int dirfd = arg->hierarchiesi->dfd_con;
+
+		if (dirfd < 0)
+			return syserror_set(-EBADF, "Invalid cgroup file descriptor");
 
 		(void)fchowmodat(dirfd, "", destuid, nsgid, 0775);
 
@@ -1625,15 +1677,15 @@
 		 * files (which systemd in wily insists on doing).
 		 */
 
-		if (arg->hierarchiesi->version == CGROUP_SUPER_MAGIC)
+		if (arg->hierarchiesi->fs_type == LEGACY_HIERARCHY)
 			(void)fchowmodat(dirfd, "tasks", destuid, nsgid, 0664);
 
 		(void)fchowmodat(dirfd, "cgroup.procs", destuid, nsgid, 0664);
 
-		if (arg->hierarchiesi->version != CGROUP2_SUPER_MAGIC)
+		if (arg->hierarchiesi->fs_type != UNIFIED_HIERARCHY)
 			continue;
 
-		for (char **p = arg->hierarchiesi->cgroup2_chown; p && *p; p++)
+		for (char **p = arg->hierarchiesi->delegate; p && *p; p++)
 			(void)fchowmodat(dirfd, *p, destuid, nsgid, 0664);
 	}
 
@@ -1657,7 +1709,7 @@
 	if (!conf)
 		return ret_set_errno(false, EINVAL);
 
-	if (lxc_list_empty(&conf->id_map))
+	if (list_empty(&conf->id_map))
 		return true;
 
 	wrap.origuid = geteuid();
@@ -1671,7 +1723,7 @@
 	return true;
 }
 
-__cgfsng_ops void cgfsng_payload_finalize(struct cgroup_ops *ops)
+__cgfsng_ops static void cgfsng_finalize(struct cgroup_ops *ops)
 {
 	if (!ops)
 		return;
@@ -1681,56 +1733,83 @@
 
 	for (int i = 0; ops->hierarchiesi; i++) {
 		struct hierarchy *h = ops->hierarchiesi;
-		/*
-		 * we don't keep the fds for non-unified hierarchies around
-		 * mainly because we don't make use of them anymore after the
-		 * core cgroup setup is done but also because there are quite a
-		 * lot of them.
-		 */
-		if (!is_unified_hierarchy(h))
-			close_prot_errno_disarm(h->cgfd_con);
+
+		/* Close all monitor cgroup file descriptors. */
+		close_prot_errno_disarm(h->dfd_mon);
 	}
+	/* Close the cgroup root file descriptor. */
+	close_prot_errno_disarm(ops->dfd_mnt);
+
+	/*
+	 * The checking for freezer support should obviously be done at cgroup
+	 * initialization time but that doesn't work reliable. The freezer
+	 * controller has been demoted (rightly so) to a simple file located in
+	 * each non-root cgroup. At the time when the container is created we
+	 * might still be located in /sys/fs/cgroup and so checking for
+	 * cgroup.freeze won't tell us anything because this file doesn't exist
+	 * in the root cgroup. We could then iterate through /sys/fs/cgroup and
+	 * find an already existing cgroup and then check within that cgroup
+	 * for the existence of cgroup.freeze but that will only work on
+	 * systemd based hosts. Other init systems might not manage cgroups and
+	 * so no cgroup will exist. So we defer until we have created cgroups
+	 * for our container which means we check here.
+	 */
+        if (pure_unified_layout(ops) &&
+            !faccessat(ops->unified->dfd_con, "cgroup.freeze", F_OK,
+                       AT_SYMLINK_NOFOLLOW)) {
+		TRACE("Unified hierarchy supports freezer");
+		ops->unified->utilities |= FREEZER_CONTROLLER;
+        }
 }
 
 /* cgroup-full:* is done, no need to create subdirs */
-static inline bool cg_mount_needs_subdirs(int type)
+static inline bool cg_mount_needs_subdirs(int cgroup_automount_type)
 {
-	return !(type >= LXC_AUTO_CGROUP_FULL_RO);
+	switch (cgroup_automount_type) {
+	case LXC_AUTO_CGROUP_RO:
+		return true;
+	case LXC_AUTO_CGROUP_RW:
+		return true;
+	case LXC_AUTO_CGROUP_MIXED:
+		return true;
+	}
+
+	return false;
 }
 
 /* After $rootfs/sys/fs/container/controller/the/cg/path has been created,
  * remount controller ro if needed and bindmount the cgroupfs onto
  * control/the/cg/path.
  */
-static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
-				       char *controllerpath, char *cgpath,
+static int cg_legacy_mount_controllers(int cgroup_automount_type, struct hierarchy *h,
+				       char *hierarchy_mnt, char *cgpath,
 				       const char *container_cgroup)
 {
 	__do_free char *sourcepath = NULL;
 	int ret, remount_flags;
 	int flags = MS_BIND;
 
-	if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_MIXED) {
-		ret = mount(controllerpath, controllerpath, "cgroup", MS_BIND, NULL);
+	if ((cgroup_automount_type == LXC_AUTO_CGROUP_RO) ||
+	    (cgroup_automount_type == LXC_AUTO_CGROUP_MIXED)) {
+		ret = mount(hierarchy_mnt, hierarchy_mnt, "cgroup", MS_BIND, NULL);
 		if (ret < 0)
 			return log_error_errno(-1, errno, "Failed to bind mount \"%s\" onto \"%s\"",
-					       controllerpath, controllerpath);
+					       hierarchy_mnt, hierarchy_mnt);
 
-		remount_flags = add_required_remount_flags(controllerpath,
-							   controllerpath,
+		remount_flags = add_required_remount_flags(hierarchy_mnt,
+							   hierarchy_mnt,
 							   flags | MS_REMOUNT);
-		ret = mount(controllerpath, controllerpath, "cgroup",
+		ret = mount(hierarchy_mnt, hierarchy_mnt, "cgroup",
 			    remount_flags | MS_REMOUNT | MS_BIND | MS_RDONLY,
 			    NULL);
 		if (ret < 0)
-			return log_error_errno(-1, errno, "Failed to remount \"%s\" ro", controllerpath);
+			return log_error_errno(-1, errno, "Failed to remount \"%s\" ro", hierarchy_mnt);
 
-		INFO("Remounted %s read-only", controllerpath);
+		INFO("Remounted %s read-only", hierarchy_mnt);
 	}
 
-	sourcepath = must_make_path(h->mountpoint, h->container_base_path,
-				    container_cgroup, NULL);
-	if (type == LXC_AUTO_CGROUP_RO)
+	sourcepath = make_cgroup_path(h, h->at_base, container_cgroup, NULL);
+	if (cgroup_automount_type == LXC_AUTO_CGROUP_RO)
 		flags |= MS_RDONLY;
 
 	ret = mount(sourcepath, cgpath, "cgroup", flags, NULL);
@@ -1752,65 +1831,124 @@
 	return 0;
 }
 
-/* __cg_mount_direct
+/* __cgroupfs_mount
  *
  * Mount cgroup hierarchies directly without using bind-mounts. The main
  * uses-cases are mounting cgroup hierarchies in cgroup namespaces and mounting
  * cgroups for the LXC_AUTO_CGROUP_FULL option.
  */
-static int __cg_mount_direct(int type, struct hierarchy *h,
-			     const char *controllerpath)
-{
-	 __do_free char *controllers = NULL;
-	 char *fstype = "cgroup2";
-	 unsigned long flags = 0;
-	 int ret;
+static int __cgroupfs_mount(int cgroup_automount_type, struct hierarchy *h,
+			    struct lxc_rootfs *rootfs, int dfd_mnt_cgroupfs,
+			    const char *hierarchy_mnt)
+{
+	__do_close int fd_fs = -EBADF;
+	unsigned int flags = 0;
+	char *fstype;
+	int ret;
 
-	 flags |= MS_NOSUID;
-	 flags |= MS_NOEXEC;
-	 flags |= MS_NODEV;
-	 flags |= MS_RELATIME;
+	if (dfd_mnt_cgroupfs < 0)
+		return ret_errno(EINVAL);
 
-	 if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_FULL_RO)
-		 flags |= MS_RDONLY;
+	flags |= MOUNT_ATTR_NOSUID;
+	flags |= MOUNT_ATTR_NOEXEC;
+	flags |= MOUNT_ATTR_NODEV;
+	flags |= MOUNT_ATTR_RELATIME;
+
+	if ((cgroup_automount_type == LXC_AUTO_CGROUP_RO) ||
+	    (cgroup_automount_type == LXC_AUTO_CGROUP_FULL_RO) ||
+	    (cgroup_automount_type == LXC_AUTO_CGROUP2_RO))
+		flags |= MOUNT_ATTR_RDONLY;
 
-	 if (h->version != CGROUP2_SUPER_MAGIC) {
-		 controllers = lxc_string_join(",", (const char **)h->controllers, false);
-		 if (!controllers)
-			 return -ENOMEM;
-		 fstype = "cgroup";
-	}
+	if (is_unified_hierarchy(h))
+		fstype = "cgroup2";
+	else
+		fstype = "cgroup";
+
+	if (can_use_mount_api()) {
+		fd_fs = fs_prepare(fstype, -EBADF, "", 0, 0);
+		if (fd_fs < 0)
+			return log_error_errno(-errno, errno, "Failed to prepare filesystem context for %s", fstype);
+
+		if (!is_unified_hierarchy(h)) {
+			for (const char **it = (const char **)h->controllers; it && *it; it++) {
+				if (strnequal(*it, "name=", STRLITERALLEN("name=")))
+					ret = fs_set_property(fd_fs, "name", *it + STRLITERALLEN("name="));
+				else
+					ret = fs_set_property(fd_fs, *it, "");
+				if (ret < 0)
+					return log_error_errno(-errno, errno, "Failed to add %s controller to cgroup filesystem context %d(dev)", *it, fd_fs);
+			}
+		}
+
+		ret = fs_attach(fd_fs, dfd_mnt_cgroupfs, hierarchy_mnt,
+				PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH,
+				flags);
+	} else {
+		__do_free char *controllers = NULL, *target = NULL;
+		unsigned int old_flags = 0;
+		const char *rootfs_mnt;
+
+		if (!is_unified_hierarchy(h)) {
+			controllers = lxc_string_join(",", (const char **)h->controllers, false);
+			if (!controllers)
+				return ret_errno(ENOMEM);
+		}
 
-	ret = mount("cgroup", controllerpath, fstype, flags, controllers);
+		rootfs_mnt = get_rootfs_mnt(rootfs);
+		ret = mnt_attributes_old(flags, &old_flags);
+		if (ret)
+			return log_error_errno(-EINVAL, EINVAL, "Unsupported mount properties specified");
+
+		target = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, hierarchy_mnt, NULL);
+		ret = safe_mount(NULL, target, fstype, old_flags, controllers, rootfs_mnt);
+	}
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to mount \"%s\" with cgroup filesystem type %s",
-				       controllerpath, fstype);
+		return log_error_errno(ret, errno, "Failed to mount %s filesystem onto %d(%s)",
+				       fstype, dfd_mnt_cgroupfs, maybe_empty(hierarchy_mnt));
 
-	DEBUG("Mounted \"%s\" with cgroup filesystem type %s", controllerpath, fstype);
+	DEBUG("Mounted cgroup filesystem %s onto %d(%s)",
+	      fstype, dfd_mnt_cgroupfs, maybe_empty(hierarchy_mnt));
 	return 0;
 }
 
-static inline int cg_mount_in_cgroup_namespace(int type, struct hierarchy *h,
-					       const char *controllerpath)
+static inline int cgroupfs_mount(int cgroup_automount_type, struct hierarchy *h,
+				 struct lxc_rootfs *rootfs,
+				 int dfd_mnt_cgroupfs, const char *hierarchy_mnt)
 {
-	return __cg_mount_direct(type, h, controllerpath);
+	return __cgroupfs_mount(cgroup_automount_type, h, rootfs,
+				dfd_mnt_cgroupfs, hierarchy_mnt);
 }
 
-static inline int cg_mount_cgroup_full(int type, struct hierarchy *h,
-				       const char *controllerpath)
+static inline int cgroupfs_bind_mount(int cgroup_automount_type, struct hierarchy *h,
+				      struct lxc_rootfs *rootfs,
+				      int dfd_mnt_cgroupfs,
+				      const char *hierarchy_mnt)
 {
-	if (type < LXC_AUTO_CGROUP_FULL_RO || type > LXC_AUTO_CGROUP_FULL_MIXED)
+	switch (cgroup_automount_type) {
+	case LXC_AUTO_CGROUP_FULL_RO:
+		break;
+	case LXC_AUTO_CGROUP_FULL_RW:
+		break;
+	case LXC_AUTO_CGROUP_FULL_MIXED:
+		break;
+	default:
 		return 0;
+	}
 
-	return __cg_mount_direct(type, h, controllerpath);
+	return __cgroupfs_mount(cgroup_automount_type, h, rootfs,
+				dfd_mnt_cgroupfs, hierarchy_mnt);
 }
 
 __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
-				      struct lxc_handler *handler,
-				      const char *root, int type)
+				      struct lxc_handler *handler, int cg_flags)
 {
+	__do_close int dfd_mnt_tmpfs = -EBADF, fd_fs = -EBADF;
 	__do_free char *cgroup_root = NULL;
-	bool has_cgns = false, wants_force_mount = false;
+	int cgroup_automount_type;
+	bool in_cgroup_ns = false, wants_force_mount = false;
+	struct lxc_conf *conf = handler->conf;
+	struct lxc_rootfs *rootfs = &conf->rootfs;
+	const char *rootfs_mnt = get_rootfs_mnt(rootfs);
 	int ret;
 
 	if (!ops)
@@ -1819,22 +1957,49 @@
 	if (!ops->hierarchies)
 		return true;
 
-	if (!handler || !handler->conf)
+	if (!conf)
 		return ret_set_errno(false, EINVAL);
 
-	if ((type & LXC_AUTO_CGROUP_MASK) == 0)
-		return true;
+	if ((cg_flags & LXC_AUTO_CGROUP_MASK) == 0)
+		return log_trace(true, "No cgroup mounts requested");
 
-	if (type & LXC_AUTO_CGROUP_FORCE) {
-		type &= ~LXC_AUTO_CGROUP_FORCE;
+	if (cg_flags & LXC_AUTO_CGROUP_FORCE) {
+		cg_flags &= ~LXC_AUTO_CGROUP_FORCE;
 		wants_force_mount = true;
 	}
 
+	switch (cg_flags) {
+	case LXC_AUTO_CGROUP_RO:
+		TRACE("Read-only cgroup mounts requested");
+		break;
+	case LXC_AUTO_CGROUP_RW:
+		TRACE("Read-write cgroup mounts requested");
+		break;
+	case LXC_AUTO_CGROUP_MIXED:
+		TRACE("Mixed cgroup mounts requested");
+		break;
+	case LXC_AUTO_CGROUP_FULL_RO:
+		TRACE("Full read-only cgroup mounts requested");
+		break;
+	case LXC_AUTO_CGROUP_FULL_RW:
+		TRACE("Full read-write cgroup mounts requested");
+		break;
+	case LXC_AUTO_CGROUP_FULL_MIXED:
+		TRACE("Full mixed cgroup mounts requested");
+		break;
+	case LXC_AUTO_CGROUP2_RW:
+		TRACE("Read-write cgroup2 mount requested");
+		break;
+	case LXC_AUTO_CGROUP2_RO:
+		TRACE("Read-only cgroup2 mount requested");
+		break;
+	default:
+		return log_error_errno(false, EINVAL, "Invalid cgroup mount options specified");
+	}
+	cgroup_automount_type = cg_flags;
+
 	if (!wants_force_mount) {
-		if (!lxc_list_empty(&handler->conf->keepcaps))
-			wants_force_mount = !in_caplist(CAP_SYS_ADMIN, &handler->conf->keepcaps);
-		else
-			wants_force_mount = in_caplist(CAP_SYS_ADMIN, &handler->conf->caps);
+		wants_force_mount = !lxc_wants_cap(CAP_SYS_ADMIN, conf);
 
 		/*
 		 * Most recent distro versions currently have init system that
@@ -1850,80 +2015,165 @@
 			wants_force_mount = true;
 	}
 
-	has_cgns = cgns_supported();
-	if (has_cgns && !wants_force_mount)
-		return true;
+	if (cgns_supported() && container_uses_namespace(handler, CLONE_NEWCGROUP))
+		in_cgroup_ns = true;
+
+	if (in_cgroup_ns && !wants_force_mount)
+		return log_trace(true, "Mounting cgroups not requested or needed");
 
-	if (type == LXC_AUTO_CGROUP_NOSPEC)
-		type = LXC_AUTO_CGROUP_MIXED;
-	else if (type == LXC_AUTO_CGROUP_FULL_NOSPEC)
-		type = LXC_AUTO_CGROUP_FULL_MIXED;
-
-	cgroup_root = must_make_path(root, DEFAULT_CGROUP_MOUNTPOINT, NULL);
-	if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
-		if (has_cgns && wants_force_mount) {
+	/* This is really the codepath that we want. */
+	if (pure_unified_layout(ops) ||
+	    (cgroup_automount_type == LXC_AUTO_CGROUP2_RW) ||
+	    (cgroup_automount_type == LXC_AUTO_CGROUP2_RO)) {
+		__do_close int dfd_mnt_unified = -EBADF;
+
+		if (!ops->unified)
+			return log_error_errno(false, EINVAL, "No unified cgroup hierarchy mounted on the host");
+
+		dfd_mnt_unified = open_at(rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
+					  PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
+		if (dfd_mnt_unified < 0)
+			return syserror_ret(false, "Failed to open %d(%s)",
+					    rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
+		/*
+		 * If cgroup namespaces are supported but the container will
+		 * not have CAP_SYS_ADMIN after it has started we need to mount
+		 * the cgroups manually.
+		 *
+		 * Note that here we know that wants_force_mount is true.
+		 * Otherwise we would've returned early above.
+		 */
+		if (in_cgroup_ns) {
 			/*
-			 * If cgroup namespaces are supported but the container
-			 * will not have CAP_SYS_ADMIN after it has started we
-			 * need to mount the cgroups manually.
+			 *  1. cgroup:rw:force    -> Mount the cgroup2 filesystem.
+			 *  2. cgroup:ro:force    -> Mount the cgroup2 filesystem read-only.
+			 *  3. cgroup:mixed:force -> See comment above how this
+			 *                           does not apply so
+			 *                           cgroup:mixed is equal to
+			 *                           cgroup:rw when cgroup
+			 *                           namespaces are supported.
+
+			 *  4. cgroup:rw    -> No-op; init system responsible for mounting.
+			 *  5. cgroup:ro    -> No-op; init system responsible for mounting.
+			 *  6. cgroup:mixed -> No-op; init system responsible for mounting.
+                         *
+			 *  7. cgroup-full:rw    -> Not supported.
+			 *  8. cgroup-full:ro    -> Not supported.
+			 *  9. cgroup-full:mixed -> Not supported.
+
+			 * 10. cgroup-full:rw:force    -> Not supported.
+			 * 11. cgroup-full:ro:force    -> Not supported.
+			 * 12. cgroup-full:mixed:force -> Not supported.
+			 *
+			 * 13. cgroup2		-> No-op; init system responsible for mounting.
+			 * 14. cgroup2:ro	-> No-op; init system responsible for mounting.
+			 * 15. cgroup2:force	-> Mount the cgroup2 filesystem read-write
+			 * 16. cgroup2:ro:force	-> Mount the cgroup2 filesystem read-only
+			 */
+			ret = cgroupfs_mount(cgroup_automount_type, ops->unified, rootfs, dfd_mnt_unified, "");
+			if (ret < 0)
+				return syserror_ret(false, "Failed to force mount cgroup filesystem in cgroup namespace");
+
+			return log_trace(true, "Force mounted cgroup filesystem in new cgroup namespace");
+		} else {
+			/*
+			 * Either no cgroup namespace supported (highly
+			 * unlikely unless we're dealing with a Frankenkernel.
+			 * Or the user requested to keep the cgroup namespace
+			 * of the host or another container.
 			 */
-			return cg_mount_in_cgroup_namespace(type, ops->unified, cgroup_root) == 0;
+			errno = EOPNOTSUPP;
+			if (wants_force_mount)
+				SYSWARN("Force-mounting the unified cgroup hierarchy without cgroup namespace support is currently not supported");
+			else
+				SYSWARN("Mounting the unified cgroup hierarchy without cgroup namespace support is currently not supported");
 		}
 
-		return cg_mount_cgroup_full(type, ops->unified, cgroup_root) == 0;
+		return syserror_ret(false, "Failed to mount cgroups");
 	}
 
-	/* mount tmpfs */
-	ret = safe_mount(NULL, cgroup_root, "tmpfs",
-			 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
-			 "size=10240k,mode=755", root);
+	/*
+	 * Mount a tmpfs over DEFAULT_CGROUP_MOUNTPOINT. Note that we're
+	 * relying on RESOLVE_BENEATH so we need to skip the leading "/" in the
+	 * DEFAULT_CGROUP_MOUNTPOINT define.
+	 */
+	if (can_use_mount_api()) {
+		fd_fs = fs_prepare("tmpfs", -EBADF, "", 0, 0);
+		if (fd_fs < 0)
+			return log_error_errno(false, errno, "Failed to create new filesystem context for tmpfs");
+
+		ret = fs_set_property(fd_fs, "mode", "0755");
+		if (ret < 0)
+			return log_error_errno(false, errno, "Failed to mount tmpfs onto %d(dev)", fd_fs);
+
+		ret = fs_set_property(fd_fs, "size", "10240k");
+		if (ret < 0)
+			return log_error_errno(false, errno, "Failed to mount tmpfs onto %d(dev)", fd_fs);
+
+		ret = fs_attach(fd_fs, rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
+				PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV,
+				MOUNT_ATTR_NOSUID | MOUNT_ATTR_NODEV |
+				MOUNT_ATTR_NOEXEC | MOUNT_ATTR_RELATIME);
+	} else {
+		cgroup_root = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, NULL);
+		ret = safe_mount(NULL, cgroup_root, "tmpfs",
+				 MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME,
+				 "size=10240k,mode=755", rootfs_mnt);
+	}
 	if (ret < 0)
-		return false;
+		return log_error_errno(false, errno, "Failed to mount tmpfs on %s",
+				       DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
+
+	dfd_mnt_tmpfs = open_at(rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
+				PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
+	if (dfd_mnt_tmpfs < 0)
+		return syserror_ret(false, "Failed to open %d(%s)",
+				    rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
 
 	for (int i = 0; ops->hierarchiesi; i++) {
-		__do_free char *controllerpath = NULL, *path2 = NULL;
+		__do_free char *hierarchy_mnt = NULL, *path2 = NULL;
 		struct hierarchy *h = ops->hierarchiesi;
-		char *controller = strrchr(h->mountpoint, '/');
 
-		if (!controller)
-			continue;
-		controller++;
-
-		controllerpath = must_make_path(cgroup_root, controller, NULL);
-		if (dir_exists(controllerpath))
-			continue;
-
-		ret = mkdir(controllerpath, 0755);
+		ret = mkdirat(dfd_mnt_tmpfs, h->at_mnt, 0000);
 		if (ret < 0)
-			return log_error_errno(false, errno, "Error creating cgroup path: %s", controllerpath);
+			return syserror_ret(false, "Failed to create cgroup at_mnt %d(%s)", dfd_mnt_tmpfs, h->at_mnt);
 
-		if (has_cgns && wants_force_mount) {
-			/* If cgroup namespaces are supported but the container
+		if (in_cgroup_ns && wants_force_mount) {
+			/*
+			 * If cgroup namespaces are supported but the container
 			 * will not have CAP_SYS_ADMIN after it has started we
 			 * need to mount the cgroups manually.
 			 */
-			ret = cg_mount_in_cgroup_namespace(type, h, controllerpath);
+			ret = cgroupfs_mount(cgroup_automount_type, h, rootfs,
+					     dfd_mnt_tmpfs, h->at_mnt);
 			if (ret < 0)
 				return false;
 
 			continue;
 		}
 
-		ret = cg_mount_cgroup_full(type, h, controllerpath);
+		/* Here is where the ancient kernel section begins. */
+		ret = cgroupfs_bind_mount(cgroup_automount_type, h, rootfs,
+					  dfd_mnt_tmpfs, h->at_mnt);
 		if (ret < 0)
 			return false;
 
-		if (!cg_mount_needs_subdirs(type))
+		if (!cg_mount_needs_subdirs(cgroup_automount_type))
 			continue;
 
-		path2 = must_make_path(controllerpath, h->container_base_path,
+		if (!cgroup_root)
+			cgroup_root = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, NULL);
+
+		hierarchy_mnt = must_make_path(cgroup_root, h->at_mnt, NULL);
+		path2 = must_make_path(hierarchy_mnt, h->at_base,
 				       ops->container_cgroup, NULL);
 		ret = mkdir_p(path2, 0755);
-		if (ret < 0)
+		if (ret < 0 && (errno != EEXIST))
 			return false;
 
-		ret = cg_legacy_mount_controllers(type, h, controllerpath,
-						  path2, ops->container_cgroup);
+		ret = cg_legacy_mount_controllers(cgroup_automount_type, h,
+						  hierarchy_mnt, path2,
+						  ops->container_cgroup);
 		if (ret < 0)
 			return false;
 	}
@@ -1932,8 +2182,8 @@
 }
 
 /* Only root needs to escape to the cgroup of its init. */
-__cgfsng_ops static bool cgfsng_escape(const struct cgroup_ops *ops,
-				       struct lxc_conf *conf)
+__cgfsng_ops static bool cgfsng_criu_escape(const struct cgroup_ops *ops,
+					    struct lxc_conf *conf)
 {
 	if (!ops)
 		return ret_set_errno(false, ENOENT);
@@ -1951,10 +2201,9 @@
 		__do_free char *fullpath = NULL;
 		int ret;
 
-		fullpath =
-		    must_make_path(ops->hierarchiesi->mountpoint,
-				   ops->hierarchiesi->container_base_path,
-				   "cgroup.procs", NULL);
+		fullpath = make_cgroup_path(ops->hierarchiesi,
+					    ops->hierarchiesi->at_base,
+					    "cgroup.procs", NULL);
 		ret = lxc_write_to_file(fullpath, "0", 2, false, 0666);
 		if (ret != 0)
 			return log_error_errno(false, errno, "Failed to escape to cgroup \"%s\"", fullpath);
@@ -1963,7 +2212,7 @@
 	return true;
 }
 
-__cgfsng_ops static int cgfsng_num_hierarchies(struct cgroup_ops *ops)
+__cgfsng_ops static int cgfsng_criu_num_hierarchies(struct cgroup_ops *ops)
 {
 	int i = 0;
 
@@ -1979,8 +2228,8 @@
 	return i;
 }
 
-__cgfsng_ops static bool cgfsng_get_hierarchies(struct cgroup_ops *ops, int n,
-						char ***out)
+__cgfsng_ops static bool cgfsng_criu_get_hierarchies(struct cgroup_ops *ops,
+						     int n, char ***out)
 {
 	int i;
 
@@ -1990,7 +2239,7 @@
 	if (!ops->hierarchies)
 		return ret_set_errno(false, ENOENT);
 
-	/* sanity check n */
+	/* consistency check n */
 	for (i = 0; i < n; i++)
 		if (!ops->hierarchiesi)
 			return ret_set_errno(false, ENOENT);
@@ -2000,7 +2249,7 @@
 	return true;
 }
 
-static bool cg_legacy_freeze(struct cgroup_ops *ops)
+static int cg_legacy_freeze(struct cgroup_ops *ops)
 {
 	struct hierarchy *h;
 
@@ -2008,31 +2257,22 @@
 	if (!h)
 		return ret_set_errno(-1, ENOENT);
 
-	return lxc_write_openat(h->container_full_path, "freezer.state",
+	return lxc_write_openat(h->path_con, "freezer.state",
 				"FROZEN", STRLITERALLEN("FROZEN"));
 }
 
 static int freezer_cgroup_events_cb(int fd, uint32_t events, void *cbdata,
-				    struct lxc_epoll_descr *descr)
+				    struct lxc_async_descr *descr)
 {
-	__do_close int duped_fd = -EBADF;
 	__do_free char *line = NULL;
 	__do_fclose FILE *f = NULL;
 	int state = PTR_TO_INT(cbdata);
 	size_t len;
 	const char *state_string;
 
-	duped_fd = dup(fd);
-	if (duped_fd < 0)
-		return LXC_MAINLOOP_ERROR;
-
-	if (lseek(duped_fd, 0, SEEK_SET) < (off_t)-1)
-		return LXC_MAINLOOP_ERROR;
-
-	f = fdopen(duped_fd, "re");
+	f = fdopen_at(fd, "", "re", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH);
 	if (!f)
 		return LXC_MAINLOOP_ERROR;
-	move_fd(duped_fd);
 
 	if (state == 1)
 		state_string = "frozen 1";
@@ -2040,9 +2280,11 @@
 		state_string = "frozen 0";
 
 	while (getline(&line, &len, f) != -1)
-		if (strncmp(line, state_string, STRLITERALLEN("frozen") + 2) == 0)
+		if (strnequal(line, state_string, STRLITERALLEN("frozen") + 2))
 			return LXC_MAINLOOP_CLOSE;
 
+	rewind(f);
+
 	return LXC_MAINLOOP_CONTINUE;
 }
 
@@ -2053,22 +2295,22 @@
 				const char *wait_error)
 {
 	__do_close int fd = -EBADF;
-	call_cleaner(lxc_mainloop_close) struct lxc_epoll_descr *descr_ptr = NULL;
+	call_cleaner(lxc_mainloop_close) struct lxc_async_descr *descr_ptr = NULL;
 	int ret;
-	struct lxc_epoll_descr descr;
+	struct lxc_async_descr descr;
 	struct hierarchy *h;
 
 	h = ops->unified;
 	if (!h)
 		return ret_set_errno(-1, ENOENT);
 
-	if (!h->container_full_path)
+	if (!h->path_con)
 		return ret_set_errno(-1, EEXIST);
 
 	if (timeout != 0) {
 		__do_free char *events_file = NULL;
 
-		events_file = must_make_path(h->container_full_path, "cgroup.events", NULL);
+		events_file = must_make_path(h->path_con, "cgroup.events", NULL);
 		fd = open(events_file, O_RDONLY | O_CLOEXEC);
 		if (fd < 0)
 			return log_error_errno(-1, errno, "Failed to open cgroup.events file");
@@ -2080,12 +2322,16 @@
 		/* automatically cleaned up now */
 		descr_ptr = &descr;
 
-		ret = lxc_mainloop_add_handler_events(&descr, fd, EPOLLPRI, freezer_cgroup_events_cb, INT_TO_PTR(state_num));
+		ret = lxc_mainloop_add_handler_events(&descr, fd, EPOLLPRI,
+						      freezer_cgroup_events_cb,
+						      default_cleanup_handler,
+						      INT_TO_PTR(state_num),
+						      "freezer_cgroup_events_cb");
 		if (ret < 0)
 			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
 	}
 
-	ret = lxc_write_openat(h->container_full_path, "cgroup.freeze", state_string, 1);
+	ret = lxc_write_openat(h->path_con, "cgroup.freeze", state_string, 1);
 	if (ret < 0)
 		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
 
@@ -2121,7 +2367,7 @@
 	if (!h)
 		return ret_set_errno(-1, ENOENT);
 
-	return lxc_write_openat(h->container_full_path, "freezer.state",
+	return lxc_write_openat(h->path_con, "freezer.state",
 				"THAWED", STRLITERALLEN("THAWED"));
 }
 
@@ -2147,20 +2393,28 @@
 					const char *controller, bool limiting)
 {
 	struct hierarchy *h;
+	size_t len;
+	const char *path;
 
 	h = get_hierarchy(ops, controller);
 	if (!h)
-		return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
-				      controller ? controller : "(null)");
+		return log_warn_errno(NULL, ENOENT,
+				      "Failed to find hierarchy for controller \"%s\"", maybe_empty(controller));
 
 	if (limiting)
-		return h->container_limit_path
-			   ? h->container_limit_path + strlen(h->mountpoint)
-			   : NULL;
-
-	return h->container_full_path
-		   ? h->container_full_path + strlen(h->mountpoint)
-		   : NULL;
+		path = h->path_lim;
+	else
+		path = h->path_con;
+	if (!path)
+		return NULL;
+
+	len = strlen(h->at_mnt);
+	if (!strnequal(h->at_mnt, DEFAULT_CGROUP_MOUNTPOINT,
+		       STRLITERALLEN(DEFAULT_CGROUP_MOUNTPOINT))) {
+		path += STRLITERALLEN(DEFAULT_CGROUP_MOUNTPOINT);
+		path += strspn(path, "/");
+	}
+	return path += len;
 }
 
 __cgfsng_ops static const char *cgfsng_get_cgroup(struct cgroup_ops *ops,
@@ -2169,8 +2423,8 @@
     return cgfsng_get_cgroup_do(ops, controller, false);
 }
 
-__cgfsng_ops static const char *cgfsng_get_limiting_cgroup(struct cgroup_ops *ops,
-							   const char *controller)
+__cgfsng_ops static const char *cgfsng_get_limit_cgroup(struct cgroup_ops *ops,
+							const char *controller)
 {
     return cgfsng_get_cgroup_do(ops, controller, true);
 }
@@ -2182,7 +2436,7 @@
 						       const char *inpath,
 						       const char *filename)
 {
-	return must_make_path(h->mountpoint, inpath, filename, NULL);
+	return make_cgroup_path(h, inpath, filename, NULL);
 }
 
 static int cgroup_attach_leaf(const struct lxc_conf *conf, int unified_fd, pid_t pid)
@@ -2190,34 +2444,45 @@
 	int idx = 1;
 	int ret;
 	char pidstrINTTYPE_TO_STRLEN(int64_t) + 1;
-	size_t pidstr_len;
+	ssize_t pidstr_len;
 
 	/* Create leaf cgroup. */
 	ret = mkdirat(unified_fd, ".lxc", 0755);
 	if (ret < 0 && errno != EEXIST)
-		return log_error_errno(-1, errno, "Failed to create leaf cgroup \".lxc\"");
+		return log_error_errno(-errno, errno, "Failed to create leaf cgroup \".lxc\"");
+
+	pidstr_len = strnprintf(pidstr, sizeof(pidstr), INT64_FMT, (int64_t)pid);
+	if (pidstr_len < 0)
+		return pidstr_len;
 
-	pidstr_len = sprintf(pidstr, INT64_FMT, (int64_t)pid);
 	ret = lxc_writeat(unified_fd, ".lxc/cgroup.procs", pidstr, pidstr_len);
 	if (ret < 0)
 		ret = lxc_writeat(unified_fd, "cgroup.procs", pidstr, pidstr_len);
 	if (ret == 0)
-		return 0;
+		return log_trace(0, "Moved process %s into cgroup %d(.lxc)", pidstr, unified_fd);
 
 	/* this is a non-leaf node */
 	if (errno != EBUSY)
-		return log_error_errno(-1, errno, "Failed to attach to unified cgroup");
+		return log_error_errno(-errno, errno, "Failed to attach to unified cgroup");
 
 	do {
 		bool rm = false;
-		char attach_cgroupSTRLITERALLEN(".lxc-1000/cgroup.procs") + 1;
-		char *slash;
+		char attach_cgroupSTRLITERALLEN(".lxc-/cgroup.procs") + INTTYPE_TO_STRLEN(int) + 1;
+		char *slash = attach_cgroup;
 
-		ret = snprintf(attach_cgroup, sizeof(attach_cgroup), ".lxc-%d/cgroup.procs", idx);
-		if (ret < 0 || (size_t)ret >= sizeof(attach_cgroup))
-			return ret_errno(EIO);
+		ret = strnprintf(attach_cgroup, sizeof(attach_cgroup), ".lxc-%d/cgroup.procs", idx);
+		if (ret < 0)
+			return ret;
 
-		slash = &attach_cgroupret - STRLITERALLEN("/cgroup.procs");
+		/*
+		 * This shouldn't really happen but the compiler might complain
+		 * that a short write would cause a buffer overrun. So be on
+		 * the safe side.
+		 */
+		if ((size_t)ret < STRLITERALLEN(".lxc-/cgroup.procs"))
+			return log_error_errno(-EINVAL, EINVAL, "Unexpected short write would cause buffer-overrun");
+
+		slash += (ret - STRLITERALLEN("/cgroup.procs"));
 		*slash = '\0';
 
 		ret = mkdirat(unified_fd, attach_cgroup, 0755);
@@ -2230,7 +2495,7 @@
 
 		ret = lxc_writeat(unified_fd, attach_cgroup, pidstr, pidstr_len);
 		if (ret == 0)
-			return 0;
+			return log_trace(0, "Moved process %s into cgroup %d(%s)", pidstr, unified_fd, attach_cgroup);
 
 		if (rm && unlinkat(unified_fd, attach_cgroup, AT_REMOVEDIR))
 			SYSERROR("Failed to remove cgroup \"%d(%s)\"", unified_fd, attach_cgroup);
@@ -2246,7 +2511,7 @@
 }
 
 static int cgroup_attach_create_leaf(const struct lxc_conf *conf,
-				     int unified_fd, int *sk_fd)
+				     int unified_fd, int *sk_fd, bool unprivileged)
 {
 	__do_close int sk = *sk_fd, target_fd0 = -EBADF, target_fd1 = -EBADF;
 	int target_fds2;
@@ -2255,73 +2520,116 @@
 	/* Create leaf cgroup. */
 	ret = mkdirat(unified_fd, ".lxc", 0755);
 	if (ret < 0 && errno != EEXIST)
-		return log_error_errno(-1, errno, "Failed to create leaf cgroup \".lxc\"");
+		return syserror("Failed to create leaf cgroup \".lxc\"");
+
+	if (unprivileged) {
+		target_fd0 = open_at(unified_fd, ".lxc/cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
+		if (target_fd0 < 0)
+			return syserror("Failed to open \".lxc/cgroup.procs\"");
+		target_fds0 = target_fd0;
+
+		target_fd1 = open_at(unified_fd, "cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
+		if (target_fd1 < 0)
+			return syserror("Failed to open \".lxc/cgroup.procs\"");
+		target_fds1 = target_fd1;
+
+		ret = lxc_abstract_unix_send_fds(sk, target_fds, 2, NULL, 0);
+		if (ret <= 0)
+			return syserror("Failed to send \".lxc/cgroup.procs\" fds %d and %d",
+					target_fd0, target_fd1);
+
+		TRACE("Sent cgroup file descriptors %d and %d", target_fd0, target_fd1);
+	} else {
+		ret = lxc_abstract_unix_send_credential(sk, NULL, 0);
+		if (ret < 0)
+			return syserror("Failed to inform parent that we are done setting up mounts");
 
-	target_fd0 = openat(unified_fd, ".lxc/cgroup.procs", O_WRONLY | O_CLOEXEC | O_NOFOLLOW);
-	if (target_fd0 < 0)
-		return log_error_errno(-errno, errno, "Failed to open \".lxc/cgroup.procs\"");
-	target_fds0 = target_fd0;
-
-	target_fd1 = openat(unified_fd, "cgroup.procs", O_WRONLY | O_CLOEXEC | O_NOFOLLOW);
-	if (target_fd1 < 0)
-		return log_error_errno(-errno, errno, "Failed to open \".lxc/cgroup.procs\"");
-	target_fds1 = target_fd1;
-
-	ret = lxc_abstract_unix_send_fds(sk, target_fds, 2, NULL, 0);
-	if (ret <= 0)
-		return log_error_errno(-errno, errno, "Failed to send \".lxc/cgroup.procs\" fds %d and %d",
-				       target_fd0, target_fd1);
+		TRACE("Informed parent process that cgroup has been created");
+	}
 
-	return log_debug(0, "Sent target cgroup fds %d and %d", target_fd0, target_fd1);
+	return 0;
 }
 
 static int cgroup_attach_move_into_leaf(const struct lxc_conf *conf,
-					int *sk_fd, pid_t pid)
+					const char *lxcpath,
+					int unified_fd, int *sk_fd, pid_t pid,
+					bool unprivileged)
 {
 	__do_close int sk = *sk_fd, target_fd0 = -EBADF, target_fd1 = -EBADF;
-	int target_fds2;
 	char pidstrINTTYPE_TO_STRLEN(int64_t) + 1;
 	size_t pidstr_len;
+#if HAVE_LIBSYSTEMD
+	__do_free char *scope = NULL;
+#endif
 	ssize_t ret;
 
-	ret = lxc_abstract_unix_recv_fds(sk, target_fds, 2, NULL, 0);
-	if (ret <= 0)
-		return log_error_errno(-1, errno, "Failed to receive target cgroup fd");
-	target_fd0 = target_fds0;
-	target_fd1 = target_fds1;
+#if HAVE_LIBSYSTEMD
+	scope = lxc_cmd_get_systemd_scope(conf->name, lxcpath);
+	if (scope) {
+		TRACE("%s:%s is running under systemd-created scope '%s'.  Attaching...", lxcpath, conf->name, scope);
+		if (enter_scope(scope, pid))
+			TRACE("Successfully entered scope '%s'", scope);
+		else
+			ERROR("Failed entering scope '%s'", scope);
+	} else {
+		TRACE("%s:%s is not running under a systemd-created scope", lxcpath, conf->name);
+	}
+#endif
+	if (unprivileged) {
+		ret = lxc_abstract_unix_recv_two_fds(sk, &target_fd0, &target_fd1);
+		if (ret < 0)
+			return log_error_errno(-1, errno, "Failed to receive target cgroup fd");
+	} else {
+		ret = lxc_abstract_unix_rcv_credential(sk, NULL, 0);
+		if (ret < 0)
+			return syserror("Failed to receive notification from parent process");
+
+		TRACE("Child process informed us that cgroup has been created");
+
+		target_fd0 = open_at(unified_fd, ".lxc/cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
+		if (target_fd0 < 0)
+			return syserror("Failed to open \".lxc/cgroup.procs\"");
+
+		target_fd1 = open_at(unified_fd, "cgroup.procs", PROTECT_OPEN_W, PROTECT_LOOKUP_BENEATH, 0);
+		if (target_fd1 < 0)
+			return syserror("Failed to open \".lxc/cgroup.procs\"");
+
+		TRACE("Opened target cgroup file descriptors %d and %d", target_fd0, target_fd1);
+	}
 
 	pidstr_len = sprintf(pidstr, INT64_FMT, (int64_t)pid);
 
 	ret = lxc_write_nointr(target_fd0, pidstr, pidstr_len);
-	if (ret > 0 && ret == pidstr_len)
+	if (ret > 0 && (size_t)ret == pidstr_len)
 		return log_debug(0, "Moved process into target cgroup via fd %d", target_fd0);
 
 	ret = lxc_write_nointr(target_fd1, pidstr, pidstr_len);
-	if (ret > 0 && ret == pidstr_len)
+	if (ret > 0 && (size_t)ret == pidstr_len)
 		return log_debug(0, "Moved process into target cgroup via fd %d", target_fd1);
 
-	return log_debug_errno(-1, errno, "Failed to move process into target cgroup via fd %d and %d",
-			       target_fd0, target_fd1);
+	return syserror("Failed to move process into target cgroup via fd %d and %d", target_fd0, target_fd1);
 }
 
 struct userns_exec_unified_attach_data {
 	const struct lxc_conf *conf;
+	const char *lxcpath;
 	int unified_fd;
 	int sk_pair2;
 	pid_t pid;
+	bool unprivileged;
 };
 
 static int cgroup_unified_attach_child_wrapper(void *data)
 {
 	struct userns_exec_unified_attach_data *args = data;
 
-	if (!args->conf || args->unified_fd < 0 || args->pid <= 0 ||
-	    args->sk_pair0 < 0 || args->sk_pair1 < 0)
+	if (!args->conf || !args->lxcpath || args->unified_fd < 0 ||
+	    args->pid <= 0 || args->sk_pair0 < 0 || args->sk_pair1 < 0)
 		return ret_errno(EINVAL);
 
 	close_prot_errno_disarm(args->sk_pair0);
 	return cgroup_attach_create_leaf(args->conf, args->unified_fd,
-					 &args->sk_pair1);
+					 &args->sk_pair1, args->unprivileged);
 }
 
 static int cgroup_unified_attach_parent_wrapper(void *data)
@@ -2333,44 +2641,10 @@
 		return ret_errno(EINVAL);
 
 	close_prot_errno_disarm(args->sk_pair1);
-	return cgroup_attach_move_into_leaf(args->conf, &args->sk_pair0,
-					    args->pid);
-}
-
-int cgroup_attach(const struct lxc_conf *conf, const char *name,
-		  const char *lxcpath, pid_t pid)
-{
-	__do_close int unified_fd = -EBADF;
-	int ret;
-
-	if (!conf || !name || !lxcpath || pid <= 0)
-		return ret_errno(EINVAL);
-
-	unified_fd = lxc_cmd_get_cgroup2_fd(name, lxcpath);
-	if (unified_fd < 0)
-		return ret_errno(EBADF);
-
-	if (!lxc_list_empty(&conf->id_map)) {
-		struct userns_exec_unified_attach_data args = {
-			.conf		= conf,
-			.unified_fd	= unified_fd,
-			.pid		= pid,
-		};
-
-		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
-		if (ret < 0)
-			return -errno;
-
-		ret = userns_exec_minimal(conf,
-					  cgroup_unified_attach_parent_wrapper,
-					  &args,
-					  cgroup_unified_attach_child_wrapper,
-					  &args);
-	} else {
-		ret = cgroup_attach_leaf(conf, unified_fd, pid);
-	}
-
-	return ret;
+	return cgroup_attach_move_into_leaf(args->conf, args->lxcpath,
+					    args->unified_fd,
+					    &args->sk_pair0, args->pid,
+					    args->unprivileged);
 }
 
 /* Technically, we're always at a delegation boundary here (This is especially
@@ -2397,7 +2671,8 @@
 	ret = cgroup_attach(conf, name, lxcpath, pid);
 	if (ret == 0)
 		return log_trace(0, "Attached to unified cgroup via command handler");
-	if (ret != -EBADF)
+	TRACE("__cg_unified_attach: cgroup_attach returned %d", ret);
+	if (!ERRNO_IS_NOT_SUPPORTED(ret) && ret != -ENOCGROUP2)
 		return log_error_errno(ret, errno, "Failed to attach to unified cgroup");
 
 	/* Fall back to retrieving the path for the unified cgroup. */
@@ -2405,18 +2680,21 @@
 	/* not running */
 	if (!cgroup)
 		return 0;
+	TRACE("lxc_cmd_get_cgroup_path returned %s", cgroup);
 
-	path = must_make_path(h->mountpoint, cgroup, NULL);
+	path = make_cgroup_path(h, cgroup, NULL);
 
 	unified_fd = open(path, O_PATH | O_DIRECTORY | O_CLOEXEC);
 	if (unified_fd < 0)
 		return ret_errno(EBADF);
 
-	if (!lxc_list_empty(&conf->id_map)) {
+	if (!list_empty(&conf->id_map)) {
 		struct userns_exec_unified_attach_data args = {
 			.conf		= conf,
 			.unified_fd	= unified_fd,
 			.pid		= pid,
+			.unprivileged	= am_guest_unpriv(),
+			.lxcpath	= lxcpath,
 		};
 
 		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
@@ -2449,15 +2727,15 @@
 	if (!ops->hierarchies)
 		return true;
 
-	len = snprintf(pidstr, sizeof(pidstr), "%d", pid);
-	if (len < 0 || (size_t)len >= sizeof(pidstr))
+	len = strnprintf(pidstr, sizeof(pidstr), "%d", pid);
+	if (len < 0)
 		return false;
 
 	for (int i = 0; ops->hierarchiesi; i++) {
 		__do_free char *fullpath = NULL, *path = NULL;
 		struct hierarchy *h = ops->hierarchiesi;
 
-		if (h->version == CGROUP2_SUPER_MAGIC) {
+		if (h->fs_type == UNIFIED_HIERARCHY) {
 			ret = __cg_unified_attach(h, conf, name, lxcpath, pid,
 						  h->controllers0);
 			if (ret < 0)
@@ -2467,9 +2745,17 @@
 		}
 
 		path = lxc_cmd_get_cgroup_path(name, lxcpath, h->controllers0);
-		/* not running */
-		if (!path)
-			return false;
+		if (!path) {
+			/*
+			 * Someone might have created a name=<controller>
+			 * controller after the container has started and so
+			 * the container doesn't make use of this controller.
+			 *
+			 * Link: https://github.com/lxc/lxd/issues/8577
+			 */
+			TRACE("Skipping unused %s controller", maybe_empty(h->controllers0));
+			continue;
+		}
 
 		fullpath = build_full_cgpath_from_monitorpath(h, path, "cgroup.procs");
 		ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666);
@@ -2498,12 +2784,15 @@
 	if (!ops)
 		return ret_set_errno(-1, ENOENT);
 
-	controller = must_copy_string(filename);
+	controller = strdup(filename);
+	if (!controller)
+		return ret_errno(ENOMEM);
+
 	p = strchr(controller, '.');
 	if (p)
 		*p = '\0';
 
-	path = lxc_cmd_get_limiting_cgroup_path(name, lxcpath, controller);
+	path = lxc_cmd_get_limit_cgroup_path(name, lxcpath, controller);
 	/* not running */
 	if (!path)
 		return -1;
@@ -2547,29 +2836,23 @@
 static int device_cgroup_rule_parse(struct device_item *device, const char *key,
 				    const char *val)
 {
-	int count, ret;
+	size_t count;
+	int ret;
 	char temp50;
 
-	if (strcmp("devices.allow", key) == 0)
-		device->allow = 1;
+	if (strequal("devices.allow", key))
+		device->allow = 1; /* allow the device */
 	else
-		device->allow = 0;
+		device->allow = 0; /* deny the device */
 
-	if (strcmp(val, "a") == 0) {
+	if (strequal(val, "a")) {
 		/* global rule */
 		device->type = 'a';
 		device->major = -1;
 		device->minor = -1;
-		device->global_rule = device->allow
-					  ? LXC_BPF_DEVICE_CGROUP_BLACKLIST
-					  : LXC_BPF_DEVICE_CGROUP_WHITELIST;
-		device->allow = -1;
 		return 0;
 	}
 
-	/* local rule */
-	device->global_rule = LXC_BPF_DEVICE_CGROUP_LOCAL_RULE;
-
 	switch (*val) {
 	case 'a':
 		__fallthrough;
@@ -2645,16 +2928,20 @@
 	struct hierarchy *h;
 	int ret = -1;
 
-	if (!ops)
-		return ret_set_errno(-1, ENOENT);
+	if (!ops || is_empty_string(key) || is_empty_string(value) ||
+	    is_empty_string(name) || is_empty_string(lxcpath))
+		return ret_errno(EINVAL);
+
+	controller = strdup(key);
+	if (!controller)
+		return ret_errno(ENOMEM);
 
-	controller = must_copy_string(key);
 	p = strchr(controller, '.');
 	if (p)
 		*p = '\0';
 
-	if (pure_unified_layout(ops) && strcmp(controller, "devices") == 0) {
-		struct device_item device = {0};
+	if (pure_unified_layout(ops) && strequal(controller, "devices")) {
+		struct device_item device = {};
 
 		ret = device_cgroup_rule_parse(&device, key, value);
 		if (ret < 0)
@@ -2668,7 +2955,7 @@
 		return 0;
 	}
 
-	path = lxc_cmd_get_limiting_cgroup_path(name, lxcpath, controller);
+	path = lxc_cmd_get_limit_cgroup_path(name, lxcpath, controller);
 	/* not running */
 	if (!path)
 		return -1;
@@ -2700,7 +2987,9 @@
 	char *p;
 	struct stat sb;
 
-	path = must_copy_string(devpath);
+	path = strdup(devpath);
+	if (!path)
+		return ret_errno(ENOMEM);
 
 	/*
 	 * Read path followed by mode. Ignore any trailing text.
@@ -2732,9 +3021,6 @@
 	if (device_cgroup_parse_access(device, mode) < 0)
 		return -1;
 
-	if (n_parts == 1)
-		return ret_set_errno(-1, EINVAL);
-
 	ret = stat(path, &sb);
 	if (ret < 0)
 		return ret_set_errno(-1, errno);
@@ -2754,25 +3040,26 @@
 	device->major = MAJOR(sb.st_rdev);
 	device->minor = MINOR(sb.st_rdev);
 	device->allow = 1;
-	device->global_rule = LXC_BPF_DEVICE_CGROUP_LOCAL_RULE;
 
 	return 0;
 }
 
 static int convert_devpath(const char *invalue, char *dest)
 {
-	struct device_item device = {0};
+	struct device_item device = {};
 	int ret;
 
 	ret = device_cgroup_rule_parse_devpath(&device, invalue);
 	if (ret < 0)
 		return -1;
 
-	ret = snprintf(dest, 50, "%c %d:%d %s", device.type, device.major,
-		       device.minor, device.access);
-	if (ret < 0 || ret >= 50)
-		return log_error_errno(-1, ENAMETOOLONG, "Error on configuration value \"%c %d:%d %s\" (max 50 chars)",
-				       device.type, device.major, device.minor, device.access);
+	ret = strnprintf(dest, 50, "%c %d:%d %s", device.type, device.major,
+			 device.minor, device.access);
+	if (ret < 0)
+		return log_error_errno(ret, -ret,
+				       "Error on configuration value \"%c %d:%d %s\" (max 50 chars)",
+				       device.type, device.major, device.minor,
+				       device.access);
 
 	return 0;
 }
@@ -2789,12 +3076,15 @@
 	char converted_value50;
 	struct hierarchy *h;
 
-	controller = must_copy_string(filename);
+	controller = strdup(filename);
+	if (!controller)
+		return ret_errno(ENOMEM);
+
 	p = strchr(controller, '.');
 	if (p)
 		*p = '\0';
 
-	if (strcmp("devices.allow", filename) == 0 && value0 == '/') {
+	if (strequal("devices.allow", filename) && value0 == '/') {
 		int ret;
 
 		ret = convert_devpath(value, converted_value);
@@ -2808,22 +3098,45 @@
 		return log_error_errno(-ENOENT, ENOENT, "Failed to setup limits for the \"%s\" controller. The controller seems to be unused by \"cgfsng\" cgroup driver or not enabled on the cgroup hierarchy", controller);
 
 	if (is_cpuset) {
-		int ret = lxc_write_openat(h->container_full_path, filename, value, strlen(value));
+		int ret = lxc_write_openat(h->path_con, filename, value, strlen(value));
 		if (ret)
 			return ret;
 	}
-	return lxc_write_openat(h->container_limit_path, filename, value, strlen(value));
+	return lxc_write_openat(h->path_lim, filename, value, strlen(value));
+}
+
+/*
+ * Return the list of cgroup_settings sorted according to the following rules
+ * 1. Put memory.limit_in_bytes before memory.memsw.limit_in_bytes
+ */
+static void sort_cgroup_settings(struct lxc_conf *conf)
+{
+	LIST_HEAD(memsw_list);
+	struct lxc_cgroup *cgroup, *ncgroup;
+
+	/* Iterate over the cgroup settings and copy them to the output list. */
+	list_for_each_entry_safe(cgroup, ncgroup, &conf->cgroup, head) {
+		if (!strequal(cgroup->subsystem, "memory.memsw.limit_in_bytes"))
+			continue;
+
+		/* Move the memsw entry from the cgroup settings list. */
+		list_move_tail(&cgroup->head, &memsw_list);
+	}
+
+	/*
+	 * Append all the memsw entries to the end of the cgroup settings list
+	 * to make sure they are applied after all memory limit settings.
+	 */
+	list_splice_tail(&memsw_list, &conf->cgroup);
+
 }
 
 __cgfsng_ops static bool cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
 						    struct lxc_conf *conf,
 						    bool do_devices)
 {
-	__do_free struct lxc_list *sorted_cgroup_settings = NULL;
-	struct lxc_list *cgroup_settings = &conf->cgroup;
-	struct lxc_list *iterator, *next;
-	struct lxc_cgroup *cg;
-	bool ret = false;
+	struct list_head *cgroup_settings;
+	struct lxc_cgroup *cgroup;
 
 	if (!ops)
 		return ret_set_errno(false, ENOENT);
@@ -2832,7 +3145,7 @@
 		return ret_set_errno(false, EINVAL);
 
 	cgroup_settings = &conf->cgroup;
-	if (lxc_list_empty(cgroup_settings))
+	if (list_empty(cgroup_settings))
 		return true;
 
 	if (!ops->hierarchies)
@@ -2841,35 +3154,23 @@
 	if (pure_unified_layout(ops))
 		return log_warn_errno(true, EINVAL, "Ignoring legacy cgroup limits on pure cgroup2 system");
 
-	sorted_cgroup_settings = sort_cgroup_settings(cgroup_settings);
-	if (!sorted_cgroup_settings)
-		return false;
-
-	lxc_list_for_each(iterator, sorted_cgroup_settings) {
-		cg = iterator->elem;
-
-		if (do_devices == !strncmp("devices", cg->subsystem, 7)) {
-			if (cg_legacy_set_data(ops, cg->subsystem, cg->value, strncmp("cpuset", cg->subsystem, 6) == 0)) {
+	sort_cgroup_settings(conf);
+	list_for_each_entry(cgroup, cgroup_settings, head) {
+		if (do_devices == strnequal("devices", cgroup->subsystem, 7)) {
+			if (cg_legacy_set_data(ops, cgroup->subsystem, cgroup->value, strnequal("cpuset", cgroup->subsystem, 6))) {
 				if (do_devices && (errno == EACCES || errno == EPERM)) {
-					SYSWARN("Failed to set \"%s\" to \"%s\"", cg->subsystem, cg->value);
+					SYSWARN("Failed to set \"%s\" to \"%s\"", cgroup->subsystem, cgroup->value);
 					continue;
 				}
-				SYSERROR("Failed to set \"%s\" to \"%s\"", cg->subsystem, cg->value);
-				goto out;
+				SYSERROR("Failed to set \"%s\" to \"%s\"", cgroup->subsystem, cgroup->value);
+				return false;
 			}
-			DEBUG("Set controller \"%s\" set to \"%s\"", cg->subsystem, cg->value);
+			DEBUG("Set controller \"%s\" set to \"%s\"", cgroup->subsystem, cgroup->value);
 		}
 	}
 
-	ret = true;
 	INFO("Limits for the legacy cgroup hierarchies have been setup");
-out:
-	lxc_list_for_each_safe(iterator, sorted_cgroup_settings, next) {
-		lxc_list_del(iterator);
-		free(iterator);
-	}
-
-	return ret;
+	return true;
 }
 
 /*
@@ -2880,30 +3181,35 @@
 				     struct lxc_conf *conf, const char *key,
 				     const char *val)
 {
-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-	struct device_item device_item = {0};
+	struct device_item device_item = {};
 	int ret;
 
-	if (strcmp("devices.allow", key) == 0 && *val == '/')
+	if (strequal("devices.allow", key) && abspath(val))
 		ret = device_cgroup_rule_parse_devpath(&device_item, val);
 	else
 		ret = device_cgroup_rule_parse(&device_item, key, val);
 	if (ret < 0)
-		return log_error_errno(-1, EINVAL, "Failed to parse device string %s=%s", key, val);
+		return syserror_set(EINVAL, "Failed to parse device rule %s=%s", key, val);
 
-	ret = bpf_list_add_device(conf, &device_item);
+	/*
+	 * Note that bpf_list_add_device() returns 1 if it altered the device
+	 * list and 0 if it didn't; both return values indicate success.
+	 * Only a negative return value indicates an error.
+	 */
+	ret = bpf_list_add_device(&conf->bpf_devices, &device_item);
 	if (ret < 0)
 		return -1;
-#endif
+
 	return 0;
 }
 
 __cgfsng_ops static bool cgfsng_setup_limits(struct cgroup_ops *ops,
 					     struct lxc_handler *handler)
 {
-	struct lxc_list *cgroup_settings, *iterator;
+	struct list_head *cgroup_settings;
 	struct hierarchy *h;
 	struct lxc_conf *conf;
+	struct lxc_cgroup *cgroup;
 
 	if (!ops)
 		return ret_set_errno(false, ENOENT);
@@ -2919,7 +3225,7 @@
 	conf = handler->conf;
 
 	cgroup_settings = &conf->cgroup2;
-	if (lxc_list_empty(cgroup_settings))
+	if (list_empty(cgroup_settings))
 		return true;
 
 	if (!pure_unified_layout(ops))
@@ -2929,37 +3235,26 @@
 		return false;
 	h = ops->unified;
 
-	lxc_list_for_each (iterator, cgroup_settings) {
-		struct lxc_cgroup *cg = iterator->elem;
+	list_for_each_entry(cgroup, cgroup_settings, head) {
 		int ret;
 
-		if (strncmp("devices", cg->subsystem, 7) == 0) {
-			ret = bpf_device_cgroup_prepare(ops, conf, cg->subsystem,
-							cg->value);
-		} else {
-			ret = lxc_write_openat(h->container_limit_path,
-					       cg->subsystem, cg->value,
-					       strlen(cg->value));
-			if (ret < 0)
-				return log_error_errno(false, errno, "Failed to set \"%s\" to \"%s\"",
-						       cg->subsystem, cg->value);
-		}
-		TRACE("Set \"%s\" to \"%s\"", cg->subsystem, cg->value);
+		if (strnequal("devices", cgroup->subsystem, 7))
+			ret = bpf_device_cgroup_prepare(ops, conf, cgroup->subsystem, cgroup->value);
+		else
+			ret = lxc_write_openat(h->path_lim, cgroup->subsystem, cgroup->value, strlen(cgroup->value));
+		if (ret < 0)
+			return log_error_errno(false, errno, "Failed to set \"%s\" to \"%s\"", cgroup->subsystem, cgroup->value);
+
+		TRACE("Set \"%s\" to \"%s\"", cgroup->subsystem, cgroup->value);
 	}
 
 	return log_info(true, "Limits for the unified cgroup hierarchy have been setup");
 }
 
-__cgfsng_ops bool cgfsng_devices_activate(struct cgroup_ops *ops,
-					  struct lxc_handler *handler)
+__cgfsng_ops static bool cgfsng_devices_activate(struct cgroup_ops *ops, struct lxc_handler *handler)
 {
-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-	__do_bpf_program_free struct bpf_program *devices = NULL;
-	int ret;
 	struct lxc_conf *conf;
 	struct hierarchy *unified;
-	struct lxc_list *it;
-	struct bpf_program *devices_old;
 
 	if (!ops)
 		return ret_set_errno(false, ENOENT);
@@ -2975,68 +3270,28 @@
 	conf = handler->conf;
 
 	unified = ops->unified;
-	if (!unified || !unified->bpf_device_controller ||
-	    !unified->container_full_path || lxc_list_empty(&conf->devices))
+	if (!unified || !device_utility_controller(unified) ||
+	    !unified->path_con || list_empty(&(conf->bpf_devices).devices))
 		return true;
 
-	devices = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
-	if (!devices)
-		return log_error_errno(false, ENOMEM, "Failed to create new bpf program");
-
-	ret = bpf_program_init(devices);
-	if (ret)
-		return log_error_errno(false, ENOMEM, "Failed to initialize bpf program");
-
-	lxc_list_for_each(it, &conf->devices) {
-		struct device_item *cur = it->elem;
-
-		ret = bpf_program_append_device(devices, cur);
-		if (ret)
-			return log_error_errno(false, ENOMEM, "Failed to add new rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
-					       cur->type,
-					       cur->major,
-					       cur->minor,
-					       cur->access,
-					       cur->allow,
-					       cur->global_rule);
-		TRACE("Added rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
-		      cur->type,
-		      cur->major,
-		      cur->minor,
-		      cur->access,
-		      cur->allow,
-		      cur->global_rule);
-	}
-
-	ret = bpf_program_finalize(devices);
-	if (ret)
-		return log_error_errno(false, ENOMEM, "Failed to finalize bpf program");
-
-	ret = bpf_program_cgroup_attach(devices, BPF_CGROUP_DEVICE,
-					unified->container_limit_path,
-					BPF_F_ALLOW_MULTI);
-	if (ret)
-		return log_error_errno(false, ENOMEM, "Failed to attach bpf program");
-
-	/* Replace old bpf program. */
-	devices_old = move_ptr(conf->cgroup2_devices);
-	conf->cgroup2_devices = move_ptr(devices);
-	devices = move_ptr(devices_old);
-#endif
-	return true;
+	return bpf_cgroup_devices_attach(ops, &conf->bpf_devices);
 }
 
-bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup)
+static bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup)
 {
-	__do_free char *add_controllers = NULL, *base_path = NULL;
-	__do_free_string_list char **parts = NULL;
-	struct hierarchy *unified = ops->unified;
-	ssize_t parts_len;
-	char **it;
+	__do_close int dfd_final = -EBADF;
+	__do_free char *add_controllers = NULL, *copy = NULL;
 	size_t full_len = 0;
+	struct hierarchy *unified;
+	int dfd_cur, ret;
+	char *cur;
+	char **it;
 
-	if (!ops->hierarchies || !pure_unified_layout(ops) ||
-	    !unified->controllers0)
+	if (!ops->hierarchies || !pure_unified_layout(ops))
+		return true;
+
+	unified = ops->unified;
+	if (!unified->controllers0)
 		return true;
 
 	/* For now we simply enable all controllers that we have detected by
@@ -3055,37 +3310,54 @@
 		(void)strlcat(add_controllers, "+", full_len + 1);
 		(void)strlcat(add_controllers, *it, full_len + 1);
 
-		if ((it + 1) && *(it + 1))
+		if (*(it + 1))
 			(void)strlcat(add_controllers, " ", full_len + 1);
 	}
 
-	parts = lxc_string_split(cgroup, '/');
-	if (!parts)
+	copy = strdup(cgroup);
+	if (!copy)
 		return false;
 
-	parts_len = lxc_array_len((void **)parts);
-	if (parts_len > 0)
-		parts_len--;
+	/*
+	 * Placing the write to cgroup.subtree_control before the open() is
+	 * intentional because of the cgroup2 delegation model. It enforces
+	 * that leaf cgroups don't have any controllers enabled for delegation.
+	 */
+	dfd_cur = unified->dfd_base;
+	lxc_iterate_parts(cur, copy, "/") {
+		/*
+		 * Even though we vetted the paths when we parsed the config
+		 * we're paranoid here and check that the path is neither
+		 * absolute nor walks upwards.
+		 */
+		if (abspath(cur))
+			return syserror_set(-EINVAL, "No absolute paths allowed");
 
-	base_path = must_make_path(unified->mountpoint, unified->container_base_path, NULL);
-	for (ssize_t i = -1; i < parts_len; i++) {
-		int ret;
-		__do_free char *target = NULL;
+		if (strnequal(cur, "..", STRLITERALLEN("..")))
+			return syserror_set(-EINVAL, "No upward walking paths allowed");
+
+		ret = lxc_writeat(dfd_cur, "cgroup.subtree_control", add_controllers, full_len);
+		if (ret < 0)
+			return syserror("Could not enable \"%s\" controllers in the unified cgroup %d", add_controllers, dfd_cur);
 
-		if (i >= 0)
-			base_path = must_append_path(base_path, partsi, NULL);
-		target = must_make_path(base_path, "cgroup.subtree_control", NULL);
-		ret = lxc_writeat(-1, target, add_controllers, full_len);
-		if (ret < 0)
-			return log_error_errno(false, errno, "Could not enable \"%s\" controllers in the unified cgroup \"%s\"",
-					       add_controllers, target);
-		TRACE("Enable \"%s\" controllers in the unified cgroup \"%s\"", add_controllers, target);
+		TRACE("Enabled \"%s\" controllers in the unified cgroup %d", add_controllers, dfd_cur);
+
+		dfd_final = open_at(dfd_cur, cur, PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH, 0);
+		if (dfd_final < 0)
+			return syserror("Fail to open directory %d(%s)", dfd_cur, cur);
+		if (dfd_cur != unified->dfd_base)
+			close(dfd_cur);
+		/*
+		 * Leave dfd_final pointing to the last fd we opened so
+		 * it will be automatically zapped if we return early.
+		 */
+		dfd_cur = dfd_final;
 	}
 
 	return true;
 }
 
-__cgfsng_ops bool cgfsng_monitor_delegate_controllers(struct cgroup_ops *ops)
+__cgfsng_ops static bool cgfsng_monitor_delegate_controllers(struct cgroup_ops *ops)
 {
 	if (!ops)
 		return ret_set_errno(false, ENOENT);
@@ -3093,7 +3365,7 @@
 	return __cgfsng_delegate_controllers(ops, ops->monitor_cgroup);
 }
 
-__cgfsng_ops bool cgfsng_payload_delegate_controllers(struct cgroup_ops *ops)
+__cgfsng_ops static bool cgfsng_payload_delegate_controllers(struct cgroup_ops *ops)
 {
 	if (!ops)
 		return ret_set_errno(false, ENOENT);
@@ -3101,47 +3373,65 @@
 	return __cgfsng_delegate_controllers(ops, ops->container_cgroup);
 }
 
-static bool cgroup_use_wants_controllers(const struct cgroup_ops *ops,
-				       char **controllers)
+static inline bool unified_cgroup(const char *line)
 {
-	if (!ops->cgroup_use)
-		return true;
+	return *line == '0';
+}
 
-	for (char **cur_ctrl = controllers; cur_ctrl && *cur_ctrl; cur_ctrl++) {
-		bool found = false;
+static inline char *current_unified_cgroup(bool relative, char *line)
+{
+	char *current_cgroup;
 
-		for (char **cur_use = ops->cgroup_use; cur_use && *cur_use; cur_use++) {
-			if (strcmp(*cur_use, *cur_ctrl) != 0)
-				continue;
+	line += STRLITERALLEN("0::");
 
-			found = true;
-			break;
-		}
+	if (!abspath(line))
+		return ERR_PTR(-EINVAL);
 
-		if (found)
-			continue;
+	/* remove init.scope */
+	if (!relative)
+		line = prune_init_scope(line);
 
-		return false;
-	}
+	/* create a relative path */
+	line = deabs(line);
 
-	return true;
+	current_cgroup = strdup(line);
+	if (!current_cgroup)
+		return ERR_PTR(-ENOMEM);
+
+	return current_cgroup;
 }
 
-static void cg_unified_delegate(char ***delegate)
+static inline const char *unprefix(const char *controllers)
 {
+	if (strnequal(controllers, "name=", STRLITERALLEN("name=")))
+		return controllers + STRLITERALLEN("name=");
+	return controllers;
+}
+
+static int __list_cgroup_delegate(char ***delegate)
+{
+	__do_free char **list = NULL;
 	__do_free char *buf = NULL;
-	char *standard = {"cgroup.subtree_control", "cgroup.threads", NULL};
+	char *standard = {
+		"cgroup.procs",
+		"cgroup.threads",
+		"cgroup.subtree_control",
+		"memory.oom.group",
+		NULL,
+	};
 	char *token;
-	int idx;
+	int ret;
 
-	buf = read_file("/sys/kernel/cgroup/delegate");
+	buf = read_file_at(-EBADF, "/sys/kernel/cgroup/delegate", PROTECT_OPEN, 0);
 	if (!buf) {
 		for (char **p = standard; p && *p; p++) {
-			idx = append_null_to_list((void ***)delegate);
-			(*delegate)idx = must_copy_string(*p);
+			ret = list_add_string(&list, *p);
+			if (ret < 0)
+				return ret;
 		}
-		SYSWARN("Failed to read /sys/kernel/cgroup/delegate");
-		return;
+
+		*delegate = move_ptr(list);
+		return syswarn_ret(0, "Failed to read /sys/kernel/cgroup/delegate");
 	}
 
 	lxc_iterate_parts(token, buf, " \t\n") {
@@ -3149,316 +3439,764 @@
 		 * We always need to chown this for both cgroup and
 		 * cgroup2.
 		 */
-		if (strcmp(token, "cgroup.procs") == 0)
+		if (strequal(token, "cgroup.procs"))
+			continue;
+
+		ret = list_add_string(&list, token);
+		if (ret < 0)
+			return ret;
+	}
+
+	*delegate = move_ptr(list);
+	return 0;
+}
+
+static bool unified_hierarchy_delegated(int dfd_base, char ***ret_files)
+{
+	__do_free_string_list char **list = NULL;
+	int ret;
+
+	ret = __list_cgroup_delegate(&list);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to determine unified cgroup delegation requirements");
+
+	for (char *const *s = list; s && *s; s++) {
+		if (!faccessat(dfd_base, *s, W_OK, 0) || errno == ENOENT)
 			continue;
 
-		idx = append_null_to_list((void ***)delegate);
-		(*delegate)idx = must_copy_string(token);
+		return sysinfo_ret(false, "The %s file is not writable, skipping unified hierarchy", *s);
 	}
+
+	*ret_files = move_ptr(list);
+	return true;
+}
+
+static bool legacy_hierarchy_delegated(int dfd_base)
+{
+	int ret;
+
+	ret = faccessat(dfd_base, ".", W_OK, 0);
+	if (ret < 0 && errno != ENOENT)
+		return sysinfo_ret(false, "Legacy hierarchy not writable, skipping");
+
+	return true;
 }
 
-/* At startup, parse_hierarchies finds all the info we need about cgroup
- * mountpoints and current cgroups, and stores it in @d.
+/**
+ * systemd guarantees that the order of co-mounted controllers is stable. On
+ * some systems the order of the controllers might be reversed though.
+ *
+ * For example, this is how the order is mismatched on CentOS 7:
+ *
+ *      root@localhost ~# cat /proc/self/cgroup
+ *      11:perf_event:/
+ *      10:pids:/
+ *      9:freezer:/
+ * >>>> 8:cpuacct,cpu:/
+ *      7:memory:/
+ *      6:blkio:/
+ *      5:devices:/
+ *      4:hugetlb:/
+ * >>>> 3:net_prio,net_cls:/
+ *      2:cpuset:/
+ *      1:name=systemd:/user.slice/user-0.slice/session-c1.scope
+ *
+ * whereas the mountpoint:
+ *
+ *      | |-/sys/fs/cgroup                    tmpfs         tmpfs      ro,nosuid,nodev,noexec,mode=755
+ *      | | |-/sys/fs/cgroup/systemd          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd
+ *      | | |-/sys/fs/cgroup/cpuset           cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,cpuset
+ * >>>> | | |-/sys/fs/cgroup/net_cls,net_prio cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,net_prio,net_cls
+ *      | | |-/sys/fs/cgroup/hugetlb          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,hugetlb
+ *      | | |-/sys/fs/cgroup/devices          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,devices
+ *      | | |-/sys/fs/cgroup/blkio            cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,blkio
+ *      | | |-/sys/fs/cgroup/memory           cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,memory
+ * >>>> | | |-/sys/fs/cgroup/cpu,cpuacct      cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,cpuacct,cpu
+ *      | | |-/sys/fs/cgroup/freezer          cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,freezer
+ *      | | |-/sys/fs/cgroup/pids             cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,pids
+ *      | | `-/sys/fs/cgroup/perf_event       cgroup        cgroup     rw,nosuid,nodev,noexec,relatime,perf_event
+ *
+ * Ensure that we always use the systemd-guaranteed stable order when checking
+ * for the mountpoint.
  */
-static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileged)
+#if HAVE_COMPILER_ATTR_NONNULL
+__attribute__((nonnull))
+#endif
+#if HAVE_COMPILER_ATTR_RETURNS_NONNULL
+__attribute__((returns_nonnull))
+#endif
+static const char *stable_order(const char *controllers)
 {
-	__do_free char *basecginfo = NULL, *line = NULL;
-	__do_free_string_list char **klist = NULL, **nlist = NULL;
-	__do_fclose FILE *f = NULL;
+	if (strequal(controllers, "cpuacct,cpu"))
+		return "cpu,cpuacct";
+
+	if (strequal(controllers, "net_prio,net_cls"))
+		return "net_cls,net_prio";
+
+	return unprefix(controllers);
+}
+
+#define CGFSNG_LAYOUT_LEGACY	BIT(0)
+#define CGFSNG_LAYOUT_UNIFIED	BIT(1)
+
+static int __initialize_cgroups(struct cgroup_ops *ops, bool relative,
+				bool unprivileged, struct lxc_conf *conf)
+{
+	__do_free char *cgroup_info = NULL;
+	unsigned int layout_mask = 0;
 	int ret;
-	size_t len = 0;
+	char *it;
 
-	/* Root spawned containers escape the current cgroup, so use init's
+	ret = unpriv_systemd_create_scope(ops, conf);
+	if (ret < 0)
+		return ret_set_errno(false, ret);
+	else if (ret == 0)
+		TRACE("Entered an unpriv systemd scope");
+
+	/*
+	 * Root spawned containers escape the current cgroup, so use init's
 	 * cgroups as our base in that case.
 	 */
 	if (!relative && (geteuid() == 0))
-		basecginfo = read_file("/proc/1/cgroup");
+		cgroup_info = read_file_at(-EBADF, "/proc/1/cgroup", PROTECT_OPEN, 0);
 	else
-		basecginfo = read_file("/proc/self/cgroup");
-	if (!basecginfo)
-		return ret_set_errno(-1, ENOMEM);
+		cgroup_info = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0);
+	if (!cgroup_info)
+		return ret_errno(ENOMEM);
+
+	lxc_iterate_parts(it, cgroup_info, "\n") {
+		__do_close int dfd_base = -EBADF, dfd_mnt = -EBADF;
+		__do_free char *controllers = NULL, *current_cgroup = NULL;
+		__do_free_string_list char **controller_list = NULL,
+					   **delegate = NULL;
+		char *line;
+		int dfd, type;
+
+		/* Handle the unified cgroup hierarchy. */
+		line = it;
+		if (unified_cgroup(line)) {
+			char *unified_mnt;
+
+			type = UNIFIED_HIERARCHY;
+			layout_mask |= CGFSNG_LAYOUT_UNIFIED;
+
+			if (conf->cgroup_meta.systemd_scope)
+				current_cgroup = cgroup_relpath(conf->cgroup_meta.systemd_scope);
+			if (IS_ERR_OR_NULL(current_cgroup))
+				current_cgroup = current_unified_cgroup(relative, line);
+			if (IS_ERR(current_cgroup))
+				return PTR_ERR(current_cgroup);
+
+			if (unified_cgroup_fd(ops->dfd_mnt)) {
+				dfd_mnt = dup_cloexec(ops->dfd_mnt);
+				unified_mnt = "";
+			} else {
+				dfd_mnt = open_at(ops->dfd_mnt,
+						  "unified",
+						  PROTECT_OPATH_DIRECTORY,
+						  PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+				unified_mnt = "unified";
+			}
+			if (dfd_mnt < 0) {
+				if (errno != ENOENT)
+					return syserror("Failed to open %d/unified", ops->dfd_mnt);
 
-	ret = get_existing_subsystems(&klist, &nlist);
-	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to retrieve available legacy cgroup controllers");
+				SYSTRACE("Unified cgroup not mounted");
+				continue;
+			}
 
-	f = fopen("/proc/self/mountinfo", "re");
-	if (!f)
-		return log_error_errno(-1, errno, "Failed to open \"/proc/self/mountinfo\"");
+			if (!fhas_fs_type(dfd_mnt, CGROUP2_SUPER_MAGIC)) {
+				SYSTRACE("Opened file descriptor %d is not a cgroup2 mountpoint", dfd_mnt);
+				continue;
+			}
 
-	lxc_cgfsng_print_basecg_debuginfo(basecginfo, klist, nlist);
+			dfd = dfd_mnt;
 
-	while (getline(&line, &len, f) != -1) {
-		__do_free char *base_cgroup = NULL, *mountpoint = NULL;
-		__do_free_string_list char **controller_list = NULL;
-		int type;
-		bool writeable;
-		struct hierarchy *new;
+			if (!is_empty_string(current_cgroup)) {
+				dfd_base = open_at(dfd_mnt, current_cgroup,
+						   PROTECT_OPATH_DIRECTORY,
+						   PROTECT_LOOKUP_BENEATH_XDEV, 0);
+				if (dfd_base < 0) {
+					if (errno != ENOENT)
+						return syserror("Failed to open %d/%s",
+								dfd_mnt, current_cgroup);
 
-		type = get_cgroup_version(line);
-		if (type == 0)
-			continue;
+					SYSTRACE("Current cgroup %d/%s does not exist (funky cgroup layout?)",
+						 dfd_mnt, current_cgroup);
+					continue;
+				}
+				dfd = dfd_base;
+			}
 
-		if (type == CGROUP2_SUPER_MAGIC && ops->unified)
-			continue;
+			if (!unified_hierarchy_delegated(dfd, &delegate))
+				continue;
 
-		if (ops->cgroup_layout == CGROUP_LAYOUT_UNKNOWN) {
-			if (type == CGROUP2_SUPER_MAGIC)
-				ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
-			else if (type == CGROUP_SUPER_MAGIC)
-				ops->cgroup_layout = CGROUP_LAYOUT_LEGACY;
-		} else if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
-			if (type == CGROUP_SUPER_MAGIC)
-				ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
-		} else if (ops->cgroup_layout == CGROUP_LAYOUT_LEGACY) {
-			if (type == CGROUP2_SUPER_MAGIC)
-				ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
-		}
+			controller_list = unified_controllers(dfd, "cgroup.controllers");
+			if (!controller_list) {
+				TRACE("No controllers are enabled for delegation in the unified hierarchy");
+				controller_list = list_new();
+				if (!controller_list)
+					return syserror_set(-ENOMEM, "Failed to create empty controller list");
+			}
 
-		controller_list = cg_hybrid_get_controllers(klist, nlist, line, type);
-		if (!controller_list && type == CGROUP_SUPER_MAGIC)
-			continue;
+			controllers = strdup(unified_mnt);
+			if (!controllers)
+				return ret_errno(ENOMEM);
+		} else {
+			char *__controllers, *__current_cgroup;
+
+			type = LEGACY_HIERARCHY;
+			layout_mask |= CGFSNG_LAYOUT_LEGACY;
+
+			__controllers = strchr(line, ':');
+			if (!__controllers)
+				return ret_errno(EINVAL);
+			__controllers++;
+
+			__current_cgroup = strchr(__controllers, ':');
+			if (!__current_cgroup)
+				return ret_errno(EINVAL);
+			*__current_cgroup = '\0';
+			__current_cgroup++;
+
+			controllers = strdup(stable_order(__controllers));
+			if (!controllers)
+				return ret_errno(ENOMEM);
+
+			dfd_mnt = open_at(ops->dfd_mnt,
+					  controllers,
+					  PROTECT_OPATH_DIRECTORY,
+					  PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+			if (dfd_mnt < 0) {
+				if (errno != ENOENT)
+					return syserror("Failed to open %d/%s",
+							ops->dfd_mnt, controllers);
 
-		if (type == CGROUP_SUPER_MAGIC)
-			if (controller_list_is_dup(ops->hierarchies, controller_list)) {
-				TRACE("Skipping duplicating controller");
+				SYSTRACE("%s not mounted", controllers);
 				continue;
 			}
 
-		mountpoint = cg_hybrid_get_mountpoint(line);
-		if (!mountpoint) {
-			ERROR("Failed parsing mountpoint from \"%s\"", line);
-			continue;
-		}
+			if (!fhas_fs_type(dfd_mnt, CGROUP_SUPER_MAGIC)) {
+				SYSTRACE("Opened file descriptor %d is not a cgroup mountpoint", dfd_mnt);
+				continue;
+			}
 
-		if (type == CGROUP_SUPER_MAGIC)
-			base_cgroup = cg_hybrid_get_current_cgroup(basecginfo, controller_list0, CGROUP_SUPER_MAGIC);
-		else
-			base_cgroup = cg_hybrid_get_current_cgroup(basecginfo, NULL, CGROUP2_SUPER_MAGIC);
-		if (!base_cgroup) {
-			ERROR("Failed to find current cgroup");
-			continue;
-		}
+			dfd = dfd_mnt;
 
-		trim(base_cgroup);
-		prune_init_scope(base_cgroup);
-		if (type == CGROUP2_SUPER_MAGIC)
-			writeable = test_writeable_v2(mountpoint, base_cgroup);
-		else
-			writeable = test_writeable_v1(mountpoint, base_cgroup);
-		if (!writeable) {
-			TRACE("The %s group is not writeable", base_cgroup);
-			continue;
-		}
+			if (!abspath(__current_cgroup))
+				return ret_errno(EINVAL);
 
-		if (type == CGROUP2_SUPER_MAGIC) {
-			char *cgv2_ctrl_path;
+			/* remove init.scope */
+			if (!relative)
+				__current_cgroup = prune_init_scope(__current_cgroup);
+
+			/* create a relative path */
+			__current_cgroup = deabs(__current_cgroup);
+
+			current_cgroup = strdup(__current_cgroup);
+			if (!current_cgroup)
+				return ret_errno(ENOMEM);
+
+			if (!is_empty_string(current_cgroup)) {
+				dfd_base = open_at(dfd_mnt, current_cgroup,
+						   PROTECT_OPATH_DIRECTORY,
+						   PROTECT_LOOKUP_BENEATH_XDEV, 0);
+				if (dfd_base < 0) {
+					if (errno != ENOENT)
+						return syserror("Failed to open %d/%s",
+								dfd_mnt, current_cgroup);
 
-			cgv2_ctrl_path = must_make_path(mountpoint, base_cgroup,
-							"cgroup.controllers",
-							NULL);
-
-			controller_list = cg_unified_get_controllers(cgv2_ctrl_path);
-			free(cgv2_ctrl_path);
-			if (!controller_list) {
-				controller_list = cg_unified_make_empty_controller();
-				TRACE("No controllers are enabled for "
-				      "delegation in the unified hierarchy");
+					SYSTRACE("Current cgroup %d/%s does not exist (funky cgroup layout?)",
+						 dfd_mnt, current_cgroup);
+					continue;
+				}
+				dfd = dfd_base;
 			}
+
+			if (!legacy_hierarchy_delegated(dfd))
+				continue;
+
+			/*
+			 * We intentionally pass __current_cgroup here and not
+			 * controllers because we would otherwise chop the
+			 * mountpoint.
+			 */
+			controller_list = list_add_controllers(__controllers);
+			if (!controller_list)
+				return syserror_set(-ENOMEM, "Failed to create controller list from %s", __controllers);
+
+			if (skip_hierarchy(ops, controller_list))
+				continue;
+
+			ops->cgroup_layout = CGROUP_LAYOUT_LEGACY;
 		}
 
-		/* Exclude all controllers that cgroup use does not want. */
-		if (!cgroup_use_wants_controllers(ops, controller_list)) {
-			TRACE("Skipping controller");
-			continue;
+		ret = cgroup_hierarchy_add(ops, dfd_mnt, controllers, dfd,
+					   current_cgroup, controller_list, type);
+		if (ret < 0)
+			return syserror_ret(ret, "Failed to add %s hierarchy", controllers);
+
+		/* Transfer ownership. */
+		move_fd(dfd_mnt);
+		move_fd(dfd_base);
+		move_ptr(current_cgroup);
+		move_ptr(controllers);
+		move_ptr(controller_list);
+		if (type == UNIFIED_HIERARCHY)
+			ops->unified->delegate = move_ptr(delegate);
+	}
+
+	/* determine cgroup layout */
+	if (ops->unified) {
+		if (ops->cgroup_layout == CGROUP_LAYOUT_LEGACY) {
+			ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
+		} else {
+			if (bpf_devices_cgroup_supported())
+				ops->unified->utilities |= DEVICES_CONTROLLER;
+			ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
 		}
+	}
 
-		new = add_hierarchy(&ops->hierarchies, move_ptr(controller_list), move_ptr(mountpoint), move_ptr(base_cgroup), type);
-		if (type == CGROUP2_SUPER_MAGIC && !ops->unified) {
-			if (unprivileged)
-				cg_unified_delegate(&new->cgroup2_chown);
-			ops->unified = new;
+	/*
+	 * If we still don't know the cgroup layout at this point it means we
+	 * have not found any writable cgroup hierarchies. Infer the layout
+	 * from the layout bitmask we created when parsing the cgroups.
+	 *
+	 * Keep the ordering in the switch otherwise the bistmask-based
+	 * matching won't work.
+	 */
+	if (ops->cgroup_layout == CGROUP_LAYOUT_UNKNOWN) {
+		switch (layout_mask) {
+		case (CGFSNG_LAYOUT_LEGACY | CGFSNG_LAYOUT_UNIFIED):
+			ops->cgroup_layout = CGROUP_LAYOUT_HYBRID;
+			break;
+		case CGFSNG_LAYOUT_LEGACY:
+			ops->cgroup_layout = CGROUP_LAYOUT_LEGACY;
+			break;
+		case CGFSNG_LAYOUT_UNIFIED:
+			ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
+			break;
 		}
 	}
 
-	TRACE("Writable cgroup hierarchies:");
-	lxc_cgfsng_print_hierarchies(ops);
+	if (!controllers_available(ops))
+		return syserror_set(-ENOENT, "One or more requested controllers unavailable or not delegated");
+
+	return 0;
+}
+
+static int initialize_cgroups(struct cgroup_ops *ops, struct lxc_conf *conf)
+{
+	__do_close int dfd = -EBADF;
+	int ret;
+	const char *controllers_use;
+
+	if (ops->dfd_mnt >= 0)
+		return ret_errno(EBUSY);
 
-	/* verify that all controllers in cgroup.use and all crucial
-	 * controllers are accounted for
+	/*
+	 * I don't see the need for allowing symlinks here. If users want to
+	 * have their hierarchy available in different locations I strongly
+	 * suggest bind-mounts.
 	 */
-	if (!all_controllers_found(ops))
-		return log_error_errno(-1, ENOENT, "Failed to find all required controllers");
+	dfd = open_at(-EBADF, DEFAULT_CGROUP_MOUNTPOINT,
+			PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+	if (dfd < 0)
+		return syserror("Failed to open " DEFAULT_CGROUP_MOUNTPOINT);
+
+	controllers_use = lxc_global_config_value("lxc.cgroup.use");
+	if (controllers_use) {
+		__do_free char *dup = NULL;
+		char *it;
 
+		dup = strdup(controllers_use);
+		if (!dup)
+			return -errno;
+
+		lxc_iterate_parts(it, dup, ",") {
+			ret = list_add_string(&ops->cgroup_use, it);
+			if (ret < 0)
+				return ret;
+		}
+	}
+
+	/*
+	 * Keep dfd referenced by the cleanup function and actually move the fd
+	 * once we know the initialization succeeded. So if we fail we clean up
+	 * the dfd.
+	 */
+	ops->dfd_mnt = dfd;
+
+	ret = __initialize_cgroups(ops, conf->cgroup_meta.relative, !list_empty(&conf->id_map), conf);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to initialize cgroups");
+
+	/* Transfer ownership to cgroup_ops. */
+	move_fd(dfd);
 	return 0;
 }
 
-/* Get current cgroup from /proc/self/cgroup for the cgroupfs v2 hierarchy. */
-static char *cg_unified_get_current_cgroup(bool relative)
+__cgfsng_ops static int cgfsng_data_init(struct cgroup_ops *ops)
 {
-	__do_free char *basecginfo = NULL;
-	char *copy;
-	char *base_cgroup;
+	const char *cgroup_pattern;
 
-	if (!relative && (geteuid() == 0))
-		basecginfo = read_file("/proc/1/cgroup");
-	else
-		basecginfo = read_file("/proc/self/cgroup");
-	if (!basecginfo)
-		return NULL;
+	if (!ops)
+		return ret_set_errno(-1, ENOENT);
 
-	base_cgroup = strstr(basecginfo, "0::/");
-	if (!base_cgroup)
-		return NULL;
+	/* copy system-wide cgroup information */
+	cgroup_pattern = lxc_global_config_value("lxc.cgroup.pattern");
+	if (cgroup_pattern && !strequal(cgroup_pattern, "")) {
+		ops->cgroup_pattern = strdup(cgroup_pattern);
+		if (!ops->cgroup_pattern)
+			return ret_errno(ENOMEM);
+	}
 
-	base_cgroup = base_cgroup + 3;
-	copy = copy_to_eol(base_cgroup);
-	if (!copy)
+	return 0;
+}
+
+struct cgroup_ops *cgroup_ops_init(struct lxc_conf *conf)
+{
+	__cleanup_cgroup_ops struct cgroup_ops *cgfsng_ops = NULL;
+
+	cgfsng_ops = zalloc(sizeof(struct cgroup_ops));
+	if (!cgfsng_ops)
+		return ret_set_errno(NULL, ENOMEM);
+
+	cgfsng_ops->cgroup_layout	= CGROUP_LAYOUT_UNKNOWN;
+	cgfsng_ops->dfd_mnt		= -EBADF;
+
+	if (initialize_cgroups(cgfsng_ops, conf))
 		return NULL;
 
-	return trim(copy);
+	cgfsng_ops->data_init				= cgfsng_data_init;
+	cgfsng_ops->payload_destroy			= cgfsng_payload_destroy;
+	cgfsng_ops->monitor_destroy			= cgfsng_monitor_destroy;
+	cgfsng_ops->monitor_create			= cgfsng_monitor_create;
+	cgfsng_ops->monitor_enter			= cgfsng_monitor_enter;
+	cgfsng_ops->monitor_delegate_controllers	= cgfsng_monitor_delegate_controllers;
+	cgfsng_ops->payload_delegate_controllers	= cgfsng_payload_delegate_controllers;
+	cgfsng_ops->payload_create			= cgfsng_payload_create;
+	cgfsng_ops->payload_enter			= cgfsng_payload_enter;
+	cgfsng_ops->finalize				= cgfsng_finalize;
+	cgfsng_ops->get_cgroup				= cgfsng_get_cgroup;
+	cgfsng_ops->get					= cgfsng_get;
+	cgfsng_ops->set 				= cgfsng_set;
+	cgfsng_ops->freeze				= cgfsng_freeze;
+	cgfsng_ops->unfreeze				= cgfsng_unfreeze;
+	cgfsng_ops->setup_limits_legacy			= cgfsng_setup_limits_legacy;
+	cgfsng_ops->setup_limits			= cgfsng_setup_limits;
+	cgfsng_ops->driver				= "cgfsng";
+	cgfsng_ops->version				= "1.0.0";
+	cgfsng_ops->attach				= cgfsng_attach;
+	cgfsng_ops->chown				= cgfsng_chown;
+	cgfsng_ops->mount 				= cgfsng_mount;
+	cgfsng_ops->devices_activate			= cgfsng_devices_activate;
+	cgfsng_ops->get_limit_cgroup			= cgfsng_get_limit_cgroup;
+
+	cgfsng_ops->criu_escape				= cgfsng_criu_escape;
+	cgfsng_ops->criu_num_hierarchies		= cgfsng_criu_num_hierarchies;
+	cgfsng_ops->criu_get_hierarchies		= cgfsng_criu_get_hierarchies;
+
+	return move_ptr(cgfsng_ops);
 }
 
-static int cg_unified_init(struct cgroup_ops *ops, bool relative,
-			   bool unprivileged)
+static int __unified_attach_fd(const struct lxc_conf *conf, const char *lxcpath, int fd_unified, pid_t pid)
 {
-	__do_free char *subtree_path = NULL;
 	int ret;
-	char *mountpoint;
-	char **delegatable;
-	struct hierarchy *new;
-	char *base_cgroup = NULL;
 
-	ret = unified_cgroup_hierarchy();
-	if (ret == -ENOMEDIUM)
-		return ret_errno(ENOMEDIUM);
+	if (!list_empty(&conf->id_map)) {
+		struct userns_exec_unified_attach_data args = {
+			.conf		= conf,
+			.unified_fd	= fd_unified,
+			.pid		= pid,
+			.unprivileged	= am_guest_unpriv(),
+			.lxcpath	= lxcpath,
+		};
 
-	if (ret != CGROUP2_SUPER_MAGIC)
-		return 0;
+		ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, args.sk_pair);
+		if (ret < 0)
+			return -errno;
+
+		ret = userns_exec_minimal(conf,
+					  cgroup_unified_attach_parent_wrapper,
+					  &args,
+					  cgroup_unified_attach_child_wrapper,
+					  &args);
+	} else {
+		ret = cgroup_attach_leaf(conf, fd_unified, pid);
+	}
+
+	return ret;
+}
+
+static int __cgroup_attach_many(const struct lxc_conf *conf, const char *name,
+				const char *lxcpath, pid_t pid)
+{
+	call_cleaner(put_cgroup_ctx) struct cgroup_ctx *ctx = &(struct cgroup_ctx){};
+	int ret;
+	size_t idx;
+	ssize_t pidstr_len;
+	char pidstrINTTYPE_TO_STRLEN(pid_t);
+
+	ret = lxc_cmd_get_cgroup_ctx(name, lxcpath, sizeof(struct cgroup_ctx), ctx);
+	if (ret < 0)
+		return ret_errno(ENOSYS);
 
-	base_cgroup = cg_unified_get_current_cgroup(relative);
-	if (!base_cgroup)
+	if (ctx->fd_len == 0)
+		return log_trace(0, "Container runs with unwritable %s cgroup layout",
+				 cgroup_layout_name(ctx->layout));
+
+	pidstr_len = strnprintf(pidstr, sizeof(pidstr), "%d", pid);
+	if (pidstr_len < 0)
+		return pidstr_len;
+
+	for (idx = 0; idx < ctx->fd_len; idx++) {
+		int dfd_con = ctx->fdidx;
+
+		if (unified_cgroup_fd(dfd_con))
+			ret = __unified_attach_fd(conf, lxcpath, dfd_con, pid);
+		else
+			ret = lxc_writeat(dfd_con, "cgroup.procs", pidstr, pidstr_len);
+		if (ret)
+			return syserror_ret(ret, "Failed to attach to cgroup fd %d", dfd_con);
+		else
+			TRACE("Attached to cgroup fd %d", dfd_con);
+	}
+
+	TRACE("Attached to %s cgroup layout", cgroup_layout_name(ctx->layout));
+	return 0;
+}
+
+static int __cgroup_attach_unified(const struct lxc_conf *conf, const char *name,
+				   const char *lxcpath, pid_t pid)
+{
+	__do_close int dfd_unified = -EBADF;
+
+	if (!conf || is_empty_string(name) || is_empty_string(lxcpath) || pid <= 0)
 		return ret_errno(EINVAL);
-	if (!relative)
-		prune_init_scope(base_cgroup);
 
-	/*
-	 * We assume that the cgroup we're currently in has been delegated to
-	 * us and we are free to further delege all of the controllers listed
-	 * in cgroup.controllers further down the hierarchy.
-	 */
-	mountpoint = must_copy_string(DEFAULT_CGROUP_MOUNTPOINT);
-	subtree_path = must_make_path(mountpoint, base_cgroup, "cgroup.controllers", NULL);
-	delegatable = cg_unified_get_controllers(subtree_path);
-	if (!delegatable)
-		delegatable = cg_unified_make_empty_controller();
-	if (!delegatable0)
-		TRACE("No controllers are enabled for delegation");
-
-	/* TODO: If the user requested specific controllers via lxc.cgroup.use
-	 * we should verify here. The reason I'm not doing it right is that I'm
-	 * not convinced that lxc.cgroup.use will be the future since it is a
-	 * global property. I much rather have an option that lets you request
-	 * controllers per container.
-	 */
+	dfd_unified = lxc_cmd_get_cgroup2_fd(name, lxcpath);
+	if (dfd_unified < 0)
+		return ret_errno(ENOSYS);
 
-	new = add_hierarchy(&ops->hierarchies, delegatable, mountpoint, base_cgroup, CGROUP2_SUPER_MAGIC);
-	if (unprivileged)
-		cg_unified_delegate(&new->cgroup2_chown);
+	return __unified_attach_fd(conf, lxcpath, dfd_unified, pid);
+}
 
-	if (bpf_devices_cgroup_supported())
-		new->bpf_device_controller = 1;
+int cgroup_attach(const struct lxc_conf *conf, const char *name,
+		  const char *lxcpath, pid_t pid)
+{
+	int ret;
 
-	ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
-	ops->unified = new;
+	ret = __cgroup_attach_many(conf, name, lxcpath, pid);
+	if (ret < 0) {
+		if (!ERRNO_IS_NOT_SUPPORTED(ret))
+			return ret;
 
-	return CGROUP2_SUPER_MAGIC;
+		ret = __cgroup_attach_unified(conf, name, lxcpath, pid);
+		if (ret < 0 && ERRNO_IS_NOT_SUPPORTED(ret))
+			return ret_errno(ENOSYS);
+	}
+
+	return ret;
 }
 
-static int cg_init(struct cgroup_ops *ops, struct lxc_conf *conf)
+/* Connects to command socket therefore isn't callable from command handler. */
+int cgroup_get(const char *name, const char *lxcpath, const char *key, char *buf, size_t len)
 {
+	__do_close int dfd = -EBADF;
+	struct cgroup_fd fd = {
+		.fd = -EBADF,
+	};
+	size_t len_controller;
 	int ret;
-	const char *tmp;
-	bool relative = conf->cgroup_meta.relative;
 
-	tmp = lxc_global_config_value("lxc.cgroup.use");
-	if (tmp) {
-		__do_free char *pin = NULL;
-		char *chop, *cur;
+	if (is_empty_string(name) || is_empty_string(lxcpath) ||
+	    is_empty_string(key))
+		return ret_errno(EINVAL);
 
-		pin = must_copy_string(tmp);
-		chop = pin;
+	if ((buf && !len) || (len && !buf))
+		return ret_errno(EINVAL);
+
+	len_controller = strcspn(key, ".");
+	len_controller++; /* Don't forget the \0 byte. */
+	if (len_controller >= MAX_CGROUP_ROOT_NAMELEN)
+		return ret_errno(EINVAL);
+	(void)strlcpy(fd.controller, key, len_controller);
 
-		lxc_iterate_parts(cur, chop, ",")
-			must_append_string(&ops->cgroup_use, cur);
+	ret = lxc_cmd_get_limit_cgroup_fd(name, lxcpath, sizeof(struct cgroup_fd), &fd);
+	if (ret < 0) {
+		if (!ERRNO_IS_NOT_SUPPORTED(ret))
+			return ret;
+
+		dfd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
+		if (dfd < 0) {
+			if (!ERRNO_IS_NOT_SUPPORTED(ret))
+				return ret;
+
+			return ret_errno(ENOSYS);
+		}
+		fd.type = UNIFIED_HIERARCHY;
+		fd.fd = move_fd(dfd);
 	}
+	dfd = move_fd(fd.fd);
 
-	ret = cg_unified_init(ops, relative, !lxc_list_empty(&conf->id_map));
-	if (ret < 0)
-		return -1;
+	TRACE("Reading %s from %s cgroup hierarchy", key, cgroup_hierarchy_name(fd.type));
 
-	if (ret == CGROUP2_SUPER_MAGIC)
-		return 0;
+	if (fd.type == UNIFIED_HIERARCHY && strequal(fd.controller, "devices"))
+		return ret_errno(EOPNOTSUPP);
+	else
+		ret = lxc_read_try_buf_at(dfd, key, buf, len);
 
-	return cg_hybrid_init(ops, relative, !lxc_list_empty(&conf->id_map));
+	return ret;
 }
 
-__cgfsng_ops static int cgfsng_data_init(struct cgroup_ops *ops)
+/* Connects to command socket therefore isn't callable from command handler. */
+int cgroup_set(const char *name, const char *lxcpath, const char *key, const char *value)
 {
-	const char *cgroup_pattern;
+	__do_close int dfd = -EBADF;
+	struct cgroup_fd fd = {
+		.fd = -EBADF,
+	};
+	size_t len_controller;
+	int ret;
 
-	if (!ops)
-		return ret_set_errno(-1, ENOENT);
+	if (is_empty_string(name) || is_empty_string(lxcpath) ||
+	    is_empty_string(key) || is_empty_string(value))
+		return ret_errno(EINVAL);
 
-	/* copy system-wide cgroup information */
-	cgroup_pattern = lxc_global_config_value("lxc.cgroup.pattern");
-	if (cgroup_pattern && strcmp(cgroup_pattern, "") != 0)
-		ops->cgroup_pattern = must_copy_string(cgroup_pattern);
+	len_controller = strcspn(key, ".");
+	len_controller++; /* Don't forget the \0 byte. */
+	if (len_controller >= MAX_CGROUP_ROOT_NAMELEN)
+		return ret_errno(EINVAL);
+	(void)strlcpy(fd.controller, key, len_controller);
 
-	return 0;
+	ret = lxc_cmd_get_limit_cgroup_fd(name, lxcpath, sizeof(struct cgroup_fd), &fd);
+	if (ret < 0) {
+		if (!ERRNO_IS_NOT_SUPPORTED(ret))
+			return ret;
+
+		dfd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
+		if (dfd < 0) {
+			if (!ERRNO_IS_NOT_SUPPORTED(ret))
+				return ret;
+
+			return ret_errno(ENOSYS);
+		}
+		fd.type = UNIFIED_HIERARCHY;
+		fd.fd = move_fd(dfd);
+	}
+	dfd = move_fd(fd.fd);
+
+	TRACE("Setting %s to %s in %s cgroup hierarchy", key, value, cgroup_hierarchy_name(fd.type));
+
+	if (fd.type == UNIFIED_HIERARCHY && strequal(fd.controller, "devices")) {
+		struct device_item device = {};
+
+		ret = device_cgroup_rule_parse(&device, key, value);
+		if (ret < 0)
+			return log_error_errno(-1, EINVAL, "Failed to parse device string %s=%s",
+					       key, value);
+
+		ret = lxc_cmd_add_bpf_device_cgroup(name, lxcpath, &device);
+	} else {
+		ret = lxc_writeat(dfd, key, value, strlen(value));
+	}
+
+	return ret;
 }
 
-struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf)
+static int do_cgroup_freeze(int unified_fd,
+			    const char *state_string,
+			    int state_num,
+			    int timeout,
+			    const char *epoll_error,
+			    const char *wait_error)
 {
-	__do_free struct cgroup_ops *cgfsng_ops = NULL;
+	__do_close int events_fd = -EBADF;
+	call_cleaner(lxc_mainloop_close) struct lxc_async_descr *descr_ptr = NULL;
+	int ret;
+	struct lxc_async_descr descr = {};
 
-	cgfsng_ops = malloc(sizeof(struct cgroup_ops));
-	if (!cgfsng_ops)
-		return ret_set_errno(NULL, ENOMEM);
+	if (timeout != 0) {
+		ret = lxc_mainloop_open(&descr);
+		if (ret)
+			return log_error_errno(-1, errno, "%s", epoll_error);
 
-	memset(cgfsng_ops, 0, sizeof(struct cgroup_ops));
-	cgfsng_ops->cgroup_layout = CGROUP_LAYOUT_UNKNOWN;
+		/* automatically cleaned up now */
+		descr_ptr = &descr;
 
-	if (cg_init(cgfsng_ops, conf))
-		return NULL;
+		events_fd = open_at(unified_fd, "cgroup.events", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH, 0);
+		if (events_fd < 0)
+			return log_error_errno(-errno, errno, "Failed to open cgroup.events file");
+
+		ret = lxc_mainloop_add_handler_events(&descr, events_fd, EPOLLPRI,
+						      freezer_cgroup_events_cb,
+						      default_cleanup_handler,
+						      INT_TO_PTR(state_num),
+						      "freezer_cgroup_events_cb");
+		if (ret < 0)
+			return log_error_errno(-1, errno, "Failed to add cgroup.events fd handler to mainloop");
+	}
 
-	cgfsng_ops->data_init = cgfsng_data_init;
-	cgfsng_ops->payload_destroy = cgfsng_payload_destroy;
-	cgfsng_ops->monitor_destroy = cgfsng_monitor_destroy;
-	cgfsng_ops->monitor_create = cgfsng_monitor_create;
-	cgfsng_ops->monitor_enter = cgfsng_monitor_enter;
-	cgfsng_ops->monitor_delegate_controllers = cgfsng_monitor_delegate_controllers;
-	cgfsng_ops->payload_delegate_controllers = cgfsng_payload_delegate_controllers;
-	cgfsng_ops->payload_create = cgfsng_payload_create;
-	cgfsng_ops->payload_enter = cgfsng_payload_enter;
-	cgfsng_ops->payload_finalize = cgfsng_payload_finalize;
-	cgfsng_ops->escape = cgfsng_escape;
-	cgfsng_ops->num_hierarchies = cgfsng_num_hierarchies;
-	cgfsng_ops->get_hierarchies = cgfsng_get_hierarchies;
-	cgfsng_ops->get_cgroup = cgfsng_get_cgroup;
-	cgfsng_ops->get = cgfsng_get;
-	cgfsng_ops->set = cgfsng_set;
-	cgfsng_ops->freeze = cgfsng_freeze;
-	cgfsng_ops->unfreeze = cgfsng_unfreeze;
-	cgfsng_ops->setup_limits_legacy = cgfsng_setup_limits_legacy;
-	cgfsng_ops->setup_limits = cgfsng_setup_limits;
-	cgfsng_ops->driver = "cgfsng";
-	cgfsng_ops->version = "1.0.0";
-	cgfsng_ops->attach = cgfsng_attach;
-	cgfsng_ops->chown = cgfsng_chown;
-	cgfsng_ops->mount = cgfsng_mount;
-	cgfsng_ops->devices_activate = cgfsng_devices_activate;
-	cgfsng_ops->get_limiting_cgroup = cgfsng_get_limiting_cgroup;
+	ret = lxc_writeat(unified_fd, "cgroup.freeze", state_string, 1);
+	if (ret < 0)
+		return log_error_errno(-1, errno, "Failed to open cgroup.freeze file");
 
-	return move_ptr(cgfsng_ops);
+	if (timeout != 0) {
+		ret = lxc_mainloop(&descr, timeout);
+		if (ret)
+			return log_error_errno(-1, errno, "%s", wait_error);
+	}
+
+	return log_trace(0, "Container now %s", (state_num == 1) ? "frozen" : "unfrozen");
+}
+
+static inline int __cgroup_freeze(int unified_fd, int timeout)
+{
+	return do_cgroup_freeze(unified_fd, "1", 1, timeout,
+			        "Failed to create epoll instance to wait for container freeze",
+			        "Failed to wait for container to be frozen");
+}
+
+int cgroup_freeze(const char *name, const char *lxcpath, int timeout)
+{
+	__do_close int unified_fd = -EBADF;
+	int ret;
+
+	if (is_empty_string(name) || is_empty_string(lxcpath))
+		return ret_errno(EINVAL);
+
+	unified_fd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
+	if (unified_fd < 0)
+		return ret_errno(ENOCGROUP2);
+
+	lxc_cmd_notify_state_listeners(name, lxcpath, FREEZING);
+	ret = __cgroup_freeze(unified_fd, timeout);
+	lxc_cmd_notify_state_listeners(name, lxcpath, !ret ? FROZEN : RUNNING);
+	return ret;
+}
+
+int __cgroup_unfreeze(int unified_fd, int timeout)
+{
+	return do_cgroup_freeze(unified_fd, "0", 0, timeout,
+			        "Failed to create epoll instance to wait for container freeze",
+			        "Failed to wait for container to be frozen");
+}
+
+int cgroup_unfreeze(const char *name, const char *lxcpath, int timeout)
+{
+	__do_close int unified_fd = -EBADF;
+	int ret;
+
+	if (is_empty_string(name) || is_empty_string(lxcpath))
+		return ret_errno(EINVAL);
+
+	unified_fd = lxc_cmd_get_limit_cgroup2_fd(name, lxcpath);
+	if (unified_fd < 0)
+		return ret_errno(ENOCGROUP2);
+
+	lxc_cmd_notify_state_listeners(name, lxcpath, THAWED);
+	ret = __cgroup_unfreeze(unified_fd, timeout);
+	lxc_cmd_notify_state_listeners(name, lxcpath, !ret ? RUNNING : FROZEN);
+	return ret;
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cgroups/cgroup.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cgroups/cgroup.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
@@ -10,15 +9,18 @@
 
 #include "cgroup.h"
 #include "cgroup2_devices.h"
+#include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "initutils.h"
 #include "log.h"
+#include "memory_utils.h"
+#include "open_utils.h"
 #include "start.h"
+#include "string_utils.h"
 
 lxc_log_define(cgroup, lxc);
 
-extern struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf);
+__hidden extern struct cgroup_ops *cgroup_ops_init(struct lxc_conf *conf);
 
 struct cgroup_ops *cgroup_init(struct lxc_conf *conf)
 {
@@ -27,26 +29,25 @@
 	if (!conf)
 		return log_error_errno(NULL, EINVAL, "No valid conf given");
 
-	cgroup_ops = cgfsng_ops_init(conf);
+	cgroup_ops = cgroup_ops_init(conf);
 	if (!cgroup_ops)
 		return log_error_errno(NULL, errno, "Failed to initialize cgroup driver");
 
 	if (cgroup_ops->data_init(cgroup_ops)) {
 		cgroup_exit(cgroup_ops);
-		return log_error_errno(NULL, errno,
-				       "Failed to initialize cgroup data");
+		return log_error_errno(NULL, errno, "Failed to initialize cgroup data");
 	}
 
 	TRACE("Initialized cgroup driver %s", cgroup_ops->driver);
 
 	if (cgroup_ops->cgroup_layout == CGROUP_LAYOUT_LEGACY)
-		TRACE("Running with legacy cgroup layout");
+		TRACE("Legacy cgroup layout");
 	else if (cgroup_ops->cgroup_layout == CGROUP_LAYOUT_HYBRID)
-		TRACE("Running with hybrid cgroup layout");
+		TRACE("Hybrid cgroup layout");
 	else if (cgroup_ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED)
-		TRACE("Running with unified cgroup layout");
+		TRACE("Unified cgroup layout");
 	else
-		WARN("Running with unknown cgroup layout");
+		WARN("Unsupported cgroup layout");
 
 	return cgroup_ops;
 }
@@ -60,54 +61,42 @@
 		free(*cur);
 
 	free(ops->cgroup_pattern);
-	free(ops->container_cgroup);
 	free(ops->monitor_cgroup);
 
-	if (ops->cgroup2_devices)
-		bpf_program_free(ops->cgroup2_devices);
+	free_equal(ops->container_cgroup, ops->container_limit_cgroup);
+
+	bpf_device_program_free(ops);
+
+	if (ops->dfd_mnt >= 0)
+		close(ops->dfd_mnt);
 
 	for (struct hierarchy **it = ops->hierarchies; it && *it; it++) {
 		for (char **p = (*it)->controllers; p && *p; p++)
 			free(*p);
 		free((*it)->controllers);
 
-		for (char **p = (*it)->cgroup2_chown; p && *p; p++)
+		for (char **p = (*it)->delegate; p && *p; p++)
 			free(*p);
-		free((*it)->cgroup2_chown);
-
-		free((*it)->mountpoint);
-		free((*it)->container_base_path);
-		free((*it)->container_full_path);
-		free((*it)->monitor_full_path);
-		if ((*it)->cgfd_con >= 0)
-			close((*it)->cgfd_con);
-		if ((*it)->cgfd_mon >= 0)
-			close((*it)->cgfd_mon);
-		free(*it);
-	}
-	free(ops->hierarchies);
+		free((*it)->delegate);
 
-	free(ops);
+		free((*it)->at_mnt);
+		free((*it)->at_base);
 
-	return;
-}
+		free_equal((*it)->path_con,
+			   (*it)->path_lim);
 
-#define INIT_SCOPE "/init.scope"
-void prune_init_scope(char *cg)
-{
-	char *point;
+		close_equal((*it)->dfd_con, (*it)->dfd_lim);
 
-	if (!cg)
-		return;
+		if ((*it)->dfd_mon >= 0)
+			close((*it)->dfd_mon);
 
-	point = cg + strlen(cg) - strlen(INIT_SCOPE);
-	if (point < cg)
-		return;
+		close_equal((*it)->dfd_base, (*it)->dfd_mnt);
 
-	if (strcmp(point, INIT_SCOPE) == 0) {
-		if (point == cg)
-			*(point + 1) = '\0';
-		else
-			*point = '\0';
+		free(*it);
 	}
+	free(ops->hierarchies);
+
+	free(ops);
+
+	return;
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cgroups/cgroup.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cgroups/cgroup.h Changed

@@ -3,13 +3,20 @@
 #ifndef __LXC_CGROUP_H
 #define __LXC_CGROUP_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stddef.h>
+#include <linux/types.h>
 #include <sys/types.h>
+#include <linux/magic.h>
 
+#include "af_unix.h"
+#include "compiler.h"
 #include "macro.h"
 #include "memory_utils.h"
 
+#define DEFAULT_CGROUP_MOUNTPOINT_RELATIVE "sys/fs/cgroup"
 #define DEFAULT_CGROUP_MOUNTPOINT "/sys/fs/cgroup"
 #define DEFAULT_PAYLOAD_CGROUP_PREFIX "lxc.payload."
 #define DEFAULT_MONITOR_CGROUP_PREFIX "lxc.monitor."
@@ -21,7 +28,6 @@
 
 struct lxc_handler;
 struct lxc_conf;
-struct lxc_list;
 
 typedef enum {
         CGROUP_LAYOUT_UNKNOWN = -1,
@@ -30,6 +36,66 @@
         CGROUP_LAYOUT_UNIFIED =  2,
 } cgroup_layout_t;
 
+static inline const char *cgroup_layout_name(cgroup_layout_t layout)
+{
+	switch (layout) {
+	case CGROUP_LAYOUT_LEGACY:
+		return "legacy";
+	case CGROUP_LAYOUT_HYBRID:
+		return "hybrid";
+	case CGROUP_LAYOUT_UNIFIED:
+		return "unified";
+	case CGROUP_LAYOUT_UNKNOWN:
+		break;
+	}
+
+	return "unknown";
+}
+
+typedef enum {
+	LEGACY_HIERARCHY  = CGROUP_SUPER_MAGIC,
+	UNIFIED_HIERARCHY = CGROUP2_SUPER_MAGIC,
+} cgroupfs_type_magic_t;
+
+static inline const char *cgroup_hierarchy_name(cgroupfs_type_magic_t type)
+{
+	switch (type) {
+	case LEGACY_HIERARCHY:
+		return "legacy";
+	case UNIFIED_HIERARCHY:
+		return "unified";
+	}
+
+	return "unknown";
+}
+
+#define DEVICES_CONTROLLER (1U << 0)
+#define FREEZER_CONTROLLER (1U << 1)
+
+/*
+ * This is the maximum length of a cgroup controller in the kernel.
+ * This includes the \0 byte.
+ */
+#define MAX_CGROUP_ROOT_NAMELEN 64
+
+/* That's plenty of hierarchies. */
+#define CGROUP_CTX_MAX_FD 20
+
+struct cgroup_fd {
+	__s32 layout;
+	__u32 utilities;
+	__s32 type;
+	__s32 fd;
+	char controllerMAX_CGROUP_ROOT_NAMELEN;
+} __attribute__((aligned(8)));
+
+struct cgroup_ctx {
+	__s32 layout;
+	__u32 utilities;
+	__u32 fd_len;
+	__s32 fdCGROUP_CTX_MAX_FD;
+} __attribute__((aligned(8)));
+
 /* A descriptor for a mounted hierarchy
  *
  * @controllers
@@ -38,8 +104,8 @@
  * - unified hierarchy
  *   Either NULL, or a null-terminated list of all enabled controllers.
  *
- * @mountpoint
- * - The mountpoint we will use.
+ * @at_mnt
+ * - The at_mnt we will use.
  * - legacy hierarchy
  *   It will be either /sys/fs/cgroup/controller or
  *   /sys/fs/cgroup/controllerlist.
@@ -48,20 +114,17 @@
  *   depending on whether this is a hybrid cgroup layout (mix of legacy and
  *   unified hierarchies) or a pure unified cgroup layout.
  *
- * @container_base_path
+ * @at_base
  * - The cgroup under which the container cgroup path
  *   is created. This will be either the caller's cgroup (if not root), or
  *   init's cgroup (if root).
  *
- * @container_full_path
+ * @path_con
  * - The full path to the container's cgroup.
  *
- * @container_limit_path
+ * @path_lim
  * - The full path to the container's limiting cgroup. May simply point to
- *   container_full_path.
- *
- * @monitor_full_path
- * - The full path to the monitor's cgroup.
+ *   path_con.
  *
  * @version
  * - legacy hierarchy
@@ -72,30 +135,53 @@
  *   CGROUP2_SUPER_MAGIC.
  */
 struct hierarchy {
+	cgroupfs_type_magic_t fs_type;
+
+	/* File descriptor for the container's cgroup @path_con. */
+	int dfd_con;
+	char *path_con;
+
 	/*
-	 * cgroup2 only: what files need to be chowned to delegate a cgroup to
-	 * an unprivileged user.
+	 * File descriptor for the container's limiting cgroup
+	 * @path_lim.
+	 * Will be equal to @dfd_con if no limiting cgroup has been requested.
 	 */
-	char **cgroup2_chown;
+	int dfd_lim;
+	char *path_lim;
+
+	/* File descriptor for the monitor's cgroup. */
+	int dfd_mon;
+
+	/* File descriptor for the controller's mountpoint @at_mnt. */
+	int dfd_mnt;
+	char *at_mnt;
+
+	/* File descriptor for the controller's base cgroup path @at_base. */
+	int dfd_base;
+	char *at_base;
+
+	struct /* unified hierarchy specific */ {
+		char **delegate;
+		unsigned int utilities;
+	};
+
 	char **controllers;
-	char *mountpoint;
-	char *container_base_path;
-	char *container_full_path;
-	char *container_limit_path;
-	char *monitor_full_path;
-	int version;
-
-	/* cgroup2 only */
-	unsigned int bpf_device_controller:1;
-
-	/* container cgroup fd */
-	int cgfd_con;
-	/* limiting cgroup fd (may be equal to cgfd_con if not separated) */
-	int cgfd_limit;
-	/* monitor cgroup fd */
-	int cgfd_mon;
 };
 
+static inline bool device_utility_controller(const struct hierarchy *h)
+{
+	if (h->fs_type == UNIFIED_HIERARCHY && (h->utilities & DEVICES_CONTROLLER))
+		return true;
+	return false;
+}
+
+static inline bool freezer_utility_controller(const struct hierarchy *h)
+{
+	if (h->fs_type == UNIFIED_HIERARCHY && (h->utilities & FREEZER_CONTROLLER))
+		return true;
+	return false;
+}
+
 struct cgroup_ops {
 	/* string constant */
 	const char *driver;
@@ -103,10 +189,23 @@
 	/* string constant */
 	const char *version;
 
+	/*
+	 * File descriptor for the host's cgroupfs mount.  On
+	 * CGROUP_LAYOUT_LEGACY or CGROUP_LAYOUT_HYBRID hybrid systems
+	 * @dfd_mnt_cgroupfs_host will be a tmpfs fd and the individual
+	 * controllers will be cgroupfs fds. On CGROUP_LAYOUT_UNIFIED it will
+	 * be a cgroupfs fd itself.
+	 *
+	 * So for CGROUP_LAYOUT_LEGACY or CGROUP_LAYOUT_HYBRID we allow
+	 * mountpoint crossing iff we cross from a tmpfs into a cgroupfs mount.
+	 * */
+	int dfd_mnt;
+
 	/* What controllers is the container supposed to use. */
 	char **cgroup_use;
 	char *cgroup_pattern;
 	char *container_cgroup;
+	char *container_limit_cgroup;
 	char *monitor_cgroup;
 
 	/* @hierarchies
@@ -154,9 +253,9 @@
 	bool (*payload_create)(struct cgroup_ops *ops, struct lxc_handler *handler);
 	bool (*payload_enter)(struct cgroup_ops *ops, struct lxc_handler *handler);
 	const char *(*get_cgroup)(struct cgroup_ops *ops, const char *controller);
-	bool (*escape)(const struct cgroup_ops *ops, struct lxc_conf *conf);
-	int (*num_hierarchies)(struct cgroup_ops *ops);
-	bool (*get_hierarchies)(struct cgroup_ops *ops, int n, char ***out);
+	bool (*criu_escape)(const struct cgroup_ops *ops, struct lxc_conf *conf);
+	int (*criu_num_hierarchies)(struct cgroup_ops *ops);
+	bool (*criu_get_hierarchies)(struct cgroup_ops *ops, int n, char ***out);
 	int (*set)(struct cgroup_ops *ops, const char *filename,
 		   const char *value, const char *name, const char *lxcpath);
 	int (*get)(struct cgroup_ops *ops, const char *filename, char *value,
@@ -169,29 +268,89 @@
 	bool (*chown)(struct cgroup_ops *ops, struct lxc_conf *conf);
 	bool (*attach)(struct cgroup_ops *ops, const struct lxc_conf *conf,
 		       const char *name, const char *lxcpath, pid_t pid);
-	bool (*mount)(struct cgroup_ops *ops, struct lxc_handler *handler,
-		      const char *root, int type);
+	bool (*mount)(struct cgroup_ops *ops, struct lxc_handler *handler, int type);
 	bool (*devices_activate)(struct cgroup_ops *ops,
 				 struct lxc_handler *handler);
 	bool (*monitor_delegate_controllers)(struct cgroup_ops *ops);
 	bool (*payload_delegate_controllers)(struct cgroup_ops *ops);
-	void (*payload_finalize)(struct cgroup_ops *ops);
-	const char *(*get_limiting_cgroup)(struct cgroup_ops *ops, const char *controller);
+	void (*finalize)(struct cgroup_ops *ops);
+	const char *(*get_limit_cgroup)(struct cgroup_ops *ops, const char *controller);
 };
 
-extern struct cgroup_ops *cgroup_init(struct lxc_conf *conf);
+__hidden extern struct cgroup_ops *cgroup_init(struct lxc_conf *conf);
 
-extern void cgroup_exit(struct cgroup_ops *ops);
+__hidden extern void cgroup_exit(struct cgroup_ops *ops);
 define_cleanup_function(struct cgroup_ops *, cgroup_exit);
+#define __cleanup_cgroup_ops call_cleaner(cgroup_exit)
 
-extern void prune_init_scope(char *cg);
-
-extern int cgroup_attach(const struct lxc_conf *conf, const char *name,
-			 const char *lxcpath, pid_t pid);
+__hidden extern int cgroup_attach(const struct lxc_conf *conf, const char *name,
+				  const char *lxcpath, pid_t pid);
+__hidden extern int cgroup_get(const char *name, const char *lxcpath,
+                               const char *key, char *buf, size_t len);
+__hidden extern int cgroup_set(const char *name, const char *lxcpath,
+			       const char *key, const char *value);
+__hidden extern int cgroup_freeze(const char *name, const char *lxcpath, int timeout);
+__hidden extern int cgroup_unfreeze(const char *name, const char *lxcpath, int timeout);
+__hidden extern int __cgroup_unfreeze(int unified_fd, int timeout);
 
 static inline bool pure_unified_layout(const struct cgroup_ops *ops)
 {
 	return ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED;
 }
 
-#endif
+static inline int cgroup_unified_fd(const struct cgroup_ops *ops)
+{
+	if (!ops->unified)
+		return -EBADF;
+
+	return ops->unified->dfd_con;
+}
+
+#define make_cgroup_path(__hierarchy, __first, ...)                    \
+	({                                                             \
+		const struct hierarchy *__h = __hierarchy;             \
+		must_make_path(DEFAULT_CGROUP_MOUNTPOINT, __h->at_mnt, \
+			       __first, __VA_ARGS__);                  \
+	})
+
+static inline void put_cgroup_ctx(struct cgroup_ctx *ctx)
+{
+	if (!IS_ERR_OR_NULL(ctx)) {
+		for (__u32 idx = 0; idx < ctx->fd_len; idx++)
+			close_prot_errno_disarm(ctx->fdidx);
+	}
+}
+define_cleanup_function(struct cgroup_ctx *, put_cgroup_ctx);
+
+static inline int prepare_cgroup_ctx(struct cgroup_ops *ops,
+				     struct cgroup_ctx *ctx)
+{
+	__u32 idx;
+
+	if (!ops)
+		return ret_errno(ENOENT);
+
+	/* Always let the client now what cgroup layout we're dealing with. */
+	ctx->layout = ops->cgroup_layout;
+
+	/* No writable cgroup hierarchies. */
+	if (!ops->hierarchies)
+		return 0;
+
+	for (idx = 0; ops->hierarchiesidx; idx++) {
+		if (idx >= CGROUP_CTX_MAX_FD)
+			return ret_errno(E2BIG);
+
+		ctx->fdidx = ops->hierarchiesidx->dfd_con;
+	}
+	ctx->fd_len = idx;
+
+	if (ops->unified && ops->unified->dfd_con > 0)
+		ctx->utilities = ops->unified->utilities;
+
+	return 0;
+}
+__hidden extern int prepare_cgroup_fd(const struct cgroup_ops *ops,
+				      struct cgroup_fd *fd, bool limit);
+
+#endif /* __LXC_CGROUP_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cgroups/cgroup2_devices.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cgroups/cgroup2_devices.c Changed

@@ -2,9 +2,8 @@
 
 /* Parts of this taken from systemd's implementation. */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
@@ -16,17 +15,26 @@
 #include <unistd.h>
 
 #include "cgroup2_devices.h"
-#include "config.h"
+#include "file_utils.h"
 #include "log.h"
 #include "macro.h"
 #include "memory_utils.h"
 
-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-#include <linux/bpf.h>
-#include <linux/filter.h>
-
 lxc_log_define(cgroup2_devices, cgroup);
 
+#define BPF_LOG_BUF_SIZE (1 << 23) /* 8MB */
+#ifndef BPF_LOG_LEVEL1
+#define BPF_LOG_LEVEL1 1
+#endif
+
+#ifndef BPF_LOG_LEVEL2
+#define BPF_LOG_LEVEL2 2
+#endif
+
+#ifndef BPF_LOG_LEVEL
+#define BPF_LOG_LEVEL (BPF_LOG_LEVEL1 | BPF_LOG_LEVEL2)
+#endif
+
 static int bpf_program_add_instructions(struct bpf_program *prog,
 					const struct bpf_insn *instructions,
 					size_t count)
@@ -40,8 +48,9 @@
 	new_insn = realloc(prog->instructions, sizeof(struct bpf_insn) * (count + prog->n_instructions));
 	if (!new_insn)
 		return log_error_errno(-1, ENOMEM, "Failed to reallocate bpf cgroup program");
-
 	prog->instructions = new_insn;
+	memset(prog->instructions + prog->n_instructions, 0,
+	       sizeof(struct bpf_insn) * count);
 	memcpy(prog->instructions + prog->n_instructions, instructions,
 	       sizeof(struct bpf_insn) * count);
 	prog->n_instructions += count;
@@ -49,20 +58,6 @@
 	return 0;
 }
 
-void bpf_program_free(struct bpf_program *prog)
-{
-	if (!prog)
-		return;
-
-	(void)bpf_program_cgroup_detach(prog);
-
-	if (prog->kernel_fd >= 0)
-		close(prog->kernel_fd);
-	free(prog->instructions);
-	free(prog->attached_path);
-	free(prog);
-}
-
 /* Memory load, dst_reg = *(uint *) (src_reg + off16) */
 #define BPF_LDX_MEM(SIZE, DST, SRC, OFF)                               \
 	((struct bpf_insn){.code = BPF_LDX | BPF_SIZE(SIZE) | BPF_MEM, \
@@ -118,29 +113,28 @@
 			   .off = 0,                   \
 			   .imm = 0})
 
-static int bpf_access_mask(const char *acc)
+static int bpf_access_mask(const char *acc, __u32 *mask)
 {
-	int mask = 0;
-
 	if (!acc)
-		return mask;
+		return 0;
 
-	for (; *acc; acc++)
+	for (; *acc; acc++) {
 		switch (*acc) {
 		case 'r':
-			mask |= BPF_DEVCG_ACC_READ;
+			*mask |= BPF_DEVCG_ACC_READ;
 			break;
 		case 'w':
-			mask |= BPF_DEVCG_ACC_WRITE;
+			*mask |= BPF_DEVCG_ACC_WRITE;
 			break;
 		case 'm':
-			mask |= BPF_DEVCG_ACC_MKNOD;
+			*mask |= BPF_DEVCG_ACC_MKNOD;
 			break;
 		default:
 			return -EINVAL;
 		}
+	}
 
-	return mask;
+	return 0;
 }
 
 static int bpf_device_type(char type)
@@ -157,10 +151,9 @@
 	return -1;
 }
 
-static inline bool bpf_device_all_access(int access_mask)
+static inline bool bpf_device_all_access(__u32 access_mask)
 {
-	return (access_mask == (BPF_DEVCG_ACC_READ | BPF_DEVCG_ACC_WRITE |
-				BPF_DEVCG_ACC_MKNOD));
+	return access_mask == (BPF_DEVCG_ACC_READ | BPF_DEVCG_ACC_WRITE | BPF_DEVCG_ACC_MKNOD);
 }
 
 struct bpf_program *bpf_program_new(uint32_t prog_type)
@@ -169,14 +162,15 @@
 
 	prog = zalloc(sizeof(struct bpf_program));
 	if (!prog)
-		return NULL;
+		return ret_set_errno(NULL, ENOMEM);
 
 	prog->prog_type = prog_type;
 	prog->kernel_fd = -EBADF;
+	prog->fd_cgroup = -EBADF;
 	/*
-	 * By default a whitelist is used unless the user tells us otherwise.
+	 * By default a allowlist is used unless the user tells us otherwise.
 	 */
-	prog->device_list_type = LXC_BPF_DEVICE_CGROUP_WHITELIST;
+	prog->device_list_type = LXC_BPF_DEVICE_CGROUP_ALLOWLIST;
 
 	return move_ptr(prog);
 }
@@ -184,19 +178,19 @@
 int bpf_program_init(struct bpf_program *prog)
 {
 	const struct bpf_insn pre_insn = {
-	    /* load device type to r2 */
-	    BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, access_type)),
-	    BPF_ALU32_IMM(BPF_AND, BPF_REG_2, 0xFFFF),
+		/* load device type to r2 */
+		BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, access_type)),
+		BPF_ALU32_IMM(BPF_AND, BPF_REG_2, 0xFFFF),
 
-	    /* load access type to r3 */
-	    BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, access_type)),
-	    BPF_ALU32_IMM(BPF_RSH, BPF_REG_3, 16),
+		/* load access type to r3 */
+		BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, access_type)),
+		BPF_ALU32_IMM(BPF_RSH, BPF_REG_3, 16),
 
-	    /* load major number to r4 */
-	    BPF_LDX_MEM(BPF_W, BPF_REG_4, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, major)),
+		/* load major number to r4 */
+		BPF_LDX_MEM(BPF_W, BPF_REG_4, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, major)),
 
-	    /* load minor number to r5 */
-	    BPF_LDX_MEM(BPF_W, BPF_REG_5, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, minor)),
+		/* load minor number to r5 */
+		BPF_LDX_MEM(BPF_W, BPF_REG_5, BPF_REG_1, offsetof(struct bpf_cgroup_dev_ctx, minor)),
 	};
 
 	if (!prog)
@@ -208,17 +202,19 @@
 int bpf_program_append_device(struct bpf_program *prog, struct device_item *device)
 {
 	int jump_nr = 1;
-	int access_mask, device_type, ret;
+	__u32 access_mask = 0;
+	int device_type, ret;
 	struct bpf_insn bpf_access_decision2;
 
 	if (!prog || !device)
 		return ret_set_errno(-1, EINVAL);
 
-	/* This is a global rule so no need to append anything. */
-	if (device->global_rule > LXC_BPF_DEVICE_CGROUP_LOCAL_RULE) {
-		prog->device_list_type = device->global_rule;
-		return 0;
-	}
+	ret = bpf_access_mask(device->access, &access_mask);
+	if (ret < 0)
+		return log_error_errno(ret, -ret, "Invalid access mask specified %s", device->access);
+
+	if (!bpf_device_all_access(access_mask))
+		jump_nr++;
 
 	device_type = bpf_device_type(device->type);
 	if (device_type < 0)
@@ -227,19 +223,17 @@
 	if (device_type > 0)
 		jump_nr++;
 
-	access_mask = bpf_access_mask(device->access);
-	if (!bpf_device_all_access(access_mask))
-		jump_nr += 3;
-
-	if (device->major != -1)
+	if (device->major >= 0)
 		jump_nr++;
 
-	if (device->minor != -1)
+	if (device->minor >= 0)
 		jump_nr++;
 
-	if (device_type > 0) {
+	if (!bpf_device_all_access(access_mask)) {
 		struct bpf_insn ins = {
-		    BPF_JMP_IMM(BPF_JNE, BPF_REG_2, device_type, jump_nr--),
+			BPF_MOV32_REG(BPF_REG_1, BPF_REG_3),
+			BPF_ALU32_IMM(BPF_AND, BPF_REG_1, access_mask),
+			BPF_JMP_REG(BPF_JNE, BPF_REG_1, BPF_REG_3, jump_nr--),
 		};
 
 		ret = bpf_program_add_instructions(prog, ins, ARRAY_SIZE(ins));
@@ -247,14 +241,11 @@
 			return log_error_errno(-1, errno, "Failed to add instructions to bpf cgroup program");
 	}
 
-	if (!bpf_device_all_access(access_mask)) {
+	if (device_type > 0) {
 		struct bpf_insn ins = {
-		    BPF_MOV32_REG(BPF_REG_1, BPF_REG_3),
-		    BPF_ALU32_IMM(BPF_AND, BPF_REG_1, access_mask),
-		    BPF_JMP_REG(BPF_JNE, BPF_REG_1, BPF_REG_3, jump_nr),
+			BPF_JMP_IMM(BPF_JNE, BPF_REG_2, device_type, jump_nr--),
 		};
 
-		jump_nr -= 3;
 		ret = bpf_program_add_instructions(prog, ins, ARRAY_SIZE(ins));
 		if (ret)
 			return log_error_errno(-1, errno, "Failed to add instructions to bpf cgroup program");
@@ -262,7 +253,7 @@
 
 	if (device->major >= 0) {
 		struct bpf_insn ins = {
-		    BPF_JMP_IMM(BPF_JNE, BPF_REG_4, device->major, jump_nr--),
+			BPF_JMP_IMM(BPF_JNE, BPF_REG_4, device->major, jump_nr--),
 		};
 
 		ret = bpf_program_add_instructions(prog, ins, ARRAY_SIZE(ins));
@@ -272,7 +263,7 @@
 
 	if (device->minor >= 0) {
 		struct bpf_insn ins = {
-		    BPF_JMP_IMM(BPF_JNE, BPF_REG_5, device->minor, jump_nr--),
+			BPF_JMP_IMM(BPF_JNE, BPF_REG_5, device->minor, jump_nr--),
 		};
 
 		ret = bpf_program_add_instructions(prog, ins, ARRAY_SIZE(ins));
@@ -283,7 +274,7 @@
 	bpf_access_decision0 = BPF_MOV64_IMM(BPF_REG_0, device->allow);
 	bpf_access_decision1 = BPF_EXIT_INSN();
 	ret = bpf_program_add_instructions(prog, bpf_access_decision,
-					    ARRAY_SIZE(bpf_access_decision));
+					   ARRAY_SIZE(bpf_access_decision));
 	if (ret)
 		return log_error_errno(-1, errno, "Failed to add instructions to bpf cgroup program");
 
@@ -297,215 +288,241 @@
 	if (!prog)
 		return ret_set_errno(-1, EINVAL);
 
-	TRACE("Implementing %s bpf device cgroup program",
-	      prog->device_list_type == LXC_BPF_DEVICE_CGROUP_BLACKLIST
-		  ? "blacklist"
-		  : "whitelist");
+	TRACE("Device bpf program %s all devices by default",
+	      prog->device_list_type == LXC_BPF_DEVICE_CGROUP_ALLOWLIST
+		  ? "blocks"
+		  : "allows");
 
 	ins0 = BPF_MOV64_IMM(BPF_REG_0, prog->device_list_type);
 	ins1 = BPF_EXIT_INSN();
 	return bpf_program_add_instructions(prog, ins, ARRAY_SIZE(ins));
 }
 
-static int bpf_program_load_kernel(struct bpf_program *prog, char *log_buf,
-				   size_t log_size)
+static int bpf_program_load_kernel(struct bpf_program *prog)
 {
-	union bpf_attr attr;
+	__do_free char *log_buf = NULL;
+	__u32 log_level = 0, log_size = 0;
+	union bpf_attr *attr;
 
-	if (prog->kernel_fd >= 0) {
-		memset(log_buf, 0, log_size);
+	if (prog->kernel_fd >= 0)
 		return 0;
+
+	if (lxc_log_trace()) {
+		log_buf = zalloc(BPF_LOG_BUF_SIZE);
+		if (!log_buf) {
+			WARN("Failed to allocate bpf log buffer");
+		} else {
+			log_level = BPF_LOG_LEVEL;
+			log_size = BPF_LOG_BUF_SIZE;
+		}
 	}
 
-	attr = (union bpf_attr){
-	    .prog_type	= prog->prog_type,
-	    .insns	= PTR_TO_UINT64(prog->instructions),
-	    .insn_cnt	= prog->n_instructions,
-	    .license	= PTR_TO_UINT64("GPL"),
-	    .log_buf	= PTR_TO_UINT64(log_buf),
-	    .log_level	= !!log_buf,
-	    .log_size	= log_size,
+	attr = &(union bpf_attr){
+		.prog_type	= prog->prog_type,
+		.insns		= PTR_TO_U64(prog->instructions),
+		.insn_cnt	= prog->n_instructions,
+		.license	= PTR_TO_U64("GPL"),
+		.log_buf	= PTR_TO_U64(log_buf),
+		.log_level	= log_level,
+		.log_size	= log_size,
 	};
 
-	prog->kernel_fd = bpf(BPF_PROG_LOAD, &attr, sizeof(attr));
+	prog->kernel_fd = bpf(BPF_PROG_LOAD, attr, sizeof(*attr));
 	if (prog->kernel_fd < 0)
-		return log_error_errno(-1, errno, "Failed to load bpf program");
+		return log_error_errno(-1, errno, "Failed to load bpf program: %s",
+				       log_buf ?: "(null)");
 
+	TRACE("Loaded bpf program: %s", log_buf ?: "(null)");
 	return 0;
 }
 
-int bpf_program_cgroup_attach(struct bpf_program *prog, int type,
-			      const char *path, uint32_t flags)
+static int bpf_program_cgroup_attach(struct bpf_program *prog, int type,
+				     int fd_cgroup, __u32 flags)
 {
-	__do_close int fd = -EBADF;
-	__do_free char *copy = NULL;
-	union bpf_attr attr;
+	__do_close int fd_attach = -EBADF;
 	int ret;
+	union bpf_attr *attr;
 
-	if (!path || !prog)
-		return ret_set_errno(-1, EINVAL);
+	if (prog->fd_cgroup >= 0 || prog->kernel_fd >= 0)
+		return ret_errno(EBUSY);
 
-	if (flags & ~(BPF_F_ALLOW_OVERRIDE | BPF_F_ALLOW_MULTI))
-		return log_error_errno(-1, EINVAL, "Invalid flags for bpf program");
+	if (fd_cgroup < 0)
+		return ret_errno(EBADF);
 
-	if (prog->attached_path) {
-		if (prog->attached_type != type)
-			return log_error_errno(-1, EBUSY, "Wrong type for bpf program");
+	if (flags & ~(BPF_F_ALLOW_OVERRIDE | BPF_F_ALLOW_MULTI | BPF_F_REPLACE))
+		return syserror_set(-EINVAL, "Invalid flags for bpf program");
 
-		if (prog->attached_flags != flags)
-			return log_error_errno(-1, EBUSY, "Wrong flags for bpf program");
+	/*
+	 * Don't allow the bpf program to be overwritten for now. If we ever
+	 * allow this we need to verify that the attach_flags of the current
+	 * bpf program and the attach_flags of the new program match.
+	 */
+	if (flags & BPF_F_ALLOW_OVERRIDE)
+		INFO("Allowing to override bpf program");
 
-		if (flags != BPF_F_ALLOW_OVERRIDE)
-			return true;
-	}
+	/* Leave the caller's fd alone. */
+	fd_attach = dup_cloexec(fd_cgroup);
+	if (fd_attach < 0)
+		return -errno;
 
-	ret = bpf_program_load_kernel(prog, NULL, 0);
+	ret = bpf_program_load_kernel(prog);
 	if (ret < 0)
-		return log_error_errno(-1, ret, "Failed to load bpf program");
+		return syserror("Failed to load bpf program");
 
-	copy = strdup(path);
-	if (!copy)
-		return log_error_errno(-1, ENOMEM, "Failed to duplicate cgroup path %s", path);
-
-	fd = open(path, O_DIRECTORY | O_RDONLY | O_CLOEXEC);
-	if (fd < 0)
-		return log_error_errno(-1, errno, "Failed to open cgroup path %s", path);
-
-	attr = (union bpf_attr){
-	    .attach_type	= type,
-	    .target_fd		= fd,
-	    .attach_bpf_fd	= prog->kernel_fd,
-	    .attach_flags	= flags,
+	attr = &(union bpf_attr){
+		.attach_type	= type,
+		.target_fd	= fd_attach,
+		.attach_bpf_fd	= prog->kernel_fd,
+		.attach_flags	= flags,
 	};
 
-	ret = bpf(BPF_PROG_ATTACH, &attr, sizeof(attr));
+	ret = bpf(BPF_PROG_ATTACH, attr, sizeof(*attr));
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to attach bpf program");
+		return syserror("Failed to attach bpf program");
 
-	free_move_ptr(prog->attached_path, copy);
-	prog->attached_type = type;
-	prog->attached_flags = flags;
+	prog->fd_cgroup		= move_fd(fd_attach);
+	prog->attached_type	= type;
+	prog->attached_flags	= flags;
 
-	TRACE("Loaded and attached bpf program to cgroup %s", prog->attached_path);
+	TRACE("Attached bpf program to cgroup %d", prog->fd_cgroup);
 	return 0;
 }
 
 int bpf_program_cgroup_detach(struct bpf_program *prog)
 {
-	__do_close int fd = -EBADF;
+	__do_close int fd_cgroup = -EBADF, fd_kernel = -EBADF;
 	int ret;
+	union bpf_attr *attr;
 
 	if (!prog)
 		return 0;
 
-	if (!prog->attached_path)
-		return 0;
+	/* Ensure that these fds are wiped. */
+	fd_cgroup = move_fd(prog->fd_cgroup);
+	fd_kernel = move_fd(prog->kernel_fd);
 
-	fd = open(prog->attached_path, O_DIRECTORY | O_RDONLY | O_CLOEXEC);
-	if (fd < 0) {
-		if (errno != ENOENT)
-			return log_error_errno(-1, errno, "Failed to open attach cgroup %s",
-					       prog->attached_path);
-	} else {
-		union bpf_attr attr;
+	if (fd_cgroup < 0 || fd_kernel < 0)
+		return 0;
 
-		attr = (union bpf_attr){
-		    .attach_type	= prog->attached_type,
-		    .target_fd		= fd,
-		    .attach_bpf_fd	= prog->kernel_fd,
-		};
+	attr = &(union bpf_attr){
+		.attach_type	= prog->attached_type,
+		.target_fd	= fd_cgroup,
+		.attach_bpf_fd	= fd_kernel,
+	};
 
-		ret = bpf(BPF_PROG_DETACH, &attr, sizeof(attr));
-		if (ret < 0)
-			return log_error_errno(-1, errno, "Failed to detach bpf program from cgroup %s",
-					       prog->attached_path);
-	}
+	ret = bpf(BPF_PROG_DETACH, attr, sizeof(*attr));
+	if (ret < 0)
+		return syserror("Failed to detach bpf program from cgroup %d", fd_cgroup);
 
-	free(prog->attached_path);
-	prog->attached_path = NULL;
+	TRACE("Detached bpf program from cgroup %d", fd_cgroup);
 
 	return 0;
 }
 
-void lxc_clear_cgroup2_devices(struct lxc_conf *conf)
+void bpf_device_program_free(struct cgroup_ops *ops)
 {
-	if (conf->cgroup2_devices) {
-		(void)bpf_program_cgroup_detach(conf->cgroup2_devices);
-		(void)bpf_program_free(conf->cgroup2_devices);
+	if (ops->cgroup2_devices) {
+		(void)bpf_program_cgroup_detach(ops->cgroup2_devices);
+		bpf_program_free(ops->cgroup2_devices);
+		ops->cgroup2_devices = NULL;
 	}
 }
 
-int bpf_list_add_device(struct lxc_conf *conf, struct device_item *device)
+static inline bool bpf_device_list_block_all(const struct bpf_devices *bpf_devices)
+{
+	/* LXC_BPF_DEVICE_CGROUP_ALLOWLIST  -> block ("allowlist") all devices. */
+	return bpf_devices->list_type == LXC_BPF_DEVICE_CGROUP_ALLOWLIST;
+}
+
+static inline bool bpf_device_add(const struct bpf_devices *bpf_devices,
+				  struct device_item *device)
+{
+	/* We're blocking all devices so skip individual deny rules. */
+	if (bpf_device_list_block_all(bpf_devices) && !device->allow)
+		return log_trace(false, "Device cgroup blocks all devices; skipping specific deny rules");
+
+	/* We're allowing all devices so skip individual allow rules. */
+	if (!bpf_device_list_block_all(bpf_devices) && device->allow)
+		return log_trace(false, "Device cgroup allows all devices; skipping specific allow rules");
+
+	return true;
+}
+
+int bpf_list_add_device(struct bpf_devices *bpf_devices,
+			struct device_item *device)
 {
-	__do_free struct lxc_list *list_elem = NULL;
 	__do_free struct device_item *new_device = NULL;
-	struct lxc_list *it;
+	struct device_item *dev;
 
-	if (!conf || !device)
+	if (!bpf_devices || !device)
 		return ret_errno(EINVAL);
 
-	lxc_list_for_each(it, &conf->devices) {
-		struct device_item *cur = it->elem;
-
-		if (cur->global_rule > LXC_BPF_DEVICE_CGROUP_LOCAL_RULE &&
-		    device->global_rule > LXC_BPF_DEVICE_CGROUP_LOCAL_RULE) {
-			TRACE("Switched from %s to %s",
-			      cur->global_rule == LXC_BPF_DEVICE_CGROUP_WHITELIST
-				  ? "whitelist"
-				  : "blacklist",
-			      device->global_rule == LXC_BPF_DEVICE_CGROUP_WHITELIST
-				  ? "whitelist"
-				  : "blacklist");
-			cur->global_rule = device->global_rule;
-			return 1;
+	/* Check whether this determines the list type. */
+	if (device->type == 'a' &&
+	    device->major < 0 &&
+	    device->minor < 0 &&
+	    is_empty_string(device->access)) {
+		if (device->allow) {
+			bpf_devices->list_type = LXC_BPF_DEVICE_CGROUP_DENYLIST;
+			TRACE("Device cgroup will allow (\"denylist\") all devices by default");
+		} else {
+			bpf_devices->list_type = LXC_BPF_DEVICE_CGROUP_ALLOWLIST;
+			TRACE("Device cgroup will block (\"allowlist\") all devices by default");
 		}
 
-		if (cur->type != device->type)
+		/* Reset the device list. */
+		lxc_clear_cgroup2_devices(bpf_devices);
+		TRACE("Resetting cgroup device list");
+		return 1; /* The device list was altered. */
+	}
+
+	TRACE("Processing new device rule: type %c, major %d, minor %d, access %s, allow %d",
+	      device->type, device->major, device->minor, device->access, device->allow);
+
+	list_for_each_entry(dev, &bpf_devices->devices, head) {
+		if (dev->type != device->type)
+			continue;
+		if (dev->major != device->major)
 			continue;
-		if (cur->major != device->major)
+		if (dev->minor != device->minor)
 			continue;
-		if (cur->minor != device->minor)
+		if (!strequal(dev->access, device->access))
 			continue;
-		if (strcmp(cur->access, device->access))
+
+		if (!bpf_device_add(bpf_devices, dev))
 			continue;
 
 		/*
 		 * The rule is switched from allow to deny or vica versa so
 		 * don't bother allocating just flip the existing one.
 		 */
-		if (cur->allow != device->allow) {
-			cur->allow = device->allow;
-			return log_trace(0, "Switched existing rule of bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
-					 cur->type, cur->major, cur->minor,
-					 cur->access, cur->allow,
-					 cur->global_rule);
+		if (dev->allow != device->allow) {
+			dev->allow = device->allow;
+
+			return log_trace(1, "Switched existing device rule"); /* The device list was altered. */
 		}
 
-		return log_trace(1, "Reusing existing rule of bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
-				 cur->type, cur->major, cur->minor, cur->access,
-				 cur->allow, cur->global_rule);
-	}
 
-	list_elem = malloc(sizeof(*list_elem));
-	if (!list_elem)
-		return log_error_errno(-1, ENOMEM, "Failed to allocate new device list");
+		return log_trace(0, "Reused existing device rule"); /* The device list wasn't altered. */
+	}
 
 	new_device = memdup(device, sizeof(struct device_item));
 	if (!new_device)
-		return log_error_errno(-1, ENOMEM, "Failed to allocate new device item");
+		return syserror_set(ENOMEM, "Failed to allocate new device item");
 
-	lxc_list_add_elem(list_elem, move_ptr(new_device));
-	lxc_list_add_tail(&conf->devices, move_ptr(list_elem));
+	list_add(&new_device->head, &bpf_devices->devices);
+	move_ptr(new_device);
 
-	return 0;
+	TRACE("Added new device rule"); /* The device list was altered. */
+	return 1;
 }
 
 bool bpf_devices_cgroup_supported(void)
 {
 	__do_bpf_program_free struct bpf_program *prog = NULL;
-	const struct bpf_insn dummy = {
-	    BPF_MOV64_IMM(BPF_REG_0, 1),
-	    BPF_EXIT_INSN(),
+	const struct bpf_insn insn = {
+		BPF_MOV64_IMM(BPF_REG_0, 1),
+		BPF_EXIT_INSN(),
 	};
 	int ret;
 
@@ -513,18 +530,177 @@
 		return log_trace(false,
 				 "The bpf device cgroup requires real root");
 
+	ret = bpf(BPF_PROG_LOAD, NULL, sizeof(union bpf_attr));
+	if (ret < 0 && errno == ENOSYS)
+		return log_trace(false, "The bpf syscall is not available");
+
 	prog = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
 	if (!prog)
 		return log_trace(false, "Failed to allocate new bpf device cgroup program");
 
-	ret = bpf_program_add_instructions(prog, dummy, ARRAY_SIZE(dummy));
+	ret = bpf_program_init(prog);
+	if (ret)
+		return log_error_errno(false, ENOMEM, "Failed to initialize bpf program");
+
+	ret = bpf_program_add_instructions(prog, insn, ARRAY_SIZE(insn));
 	if (ret < 0)
 		return log_trace(false, "Failed to add new instructions to bpf device cgroup program");
 
-	ret = bpf_program_load_kernel(prog, NULL, 0);
+	ret = bpf_program_load_kernel(prog);
 	if (ret < 0)
 		return log_trace(false, "Failed to load new bpf device cgroup program");
 
 	return log_trace(true, "The bpf device cgroup is supported");
 }
-#endif
+
+static struct bpf_program *__bpf_cgroup_devices(struct bpf_devices *bpf_devices)
+{
+	__do_bpf_program_free struct bpf_program *prog = NULL;
+	int ret;
+	struct device_item *dev;
+
+	prog = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
+	if (!prog)
+		return syserror_ret(NULL, "Failed to create new bpf program");
+
+	ret = bpf_program_init(prog);
+	if (ret)
+		return syserror_ret(NULL, "Failed to initialize bpf program");
+
+	prog->device_list_type = bpf_devices->list_type;
+	TRACE("Device cgroup %s all devices by default",
+	      bpf_device_list_block_all(bpf_devices) ? "blocks" : "allows");
+
+	list_for_each_entry(dev, &bpf_devices->devices, head) {
+		TRACE("Processing device rule: type %c, major %d, minor %d, access %s, allow %d",
+		      dev->type, dev->major, dev->minor, dev->access, dev->allow);
+
+		if (!bpf_device_add(bpf_devices, dev))
+			continue;
+
+		ret = bpf_program_append_device(prog, dev);
+		if (ret)
+			return syserror_ret(NULL, "Failed adding new device rule");
+
+		TRACE("Added new device rule");
+	}
+
+	ret = bpf_program_finalize(prog);
+	if (ret)
+		return syserror_ret(NULL, "Failed to finalize device program");
+
+	return move_ptr(prog);
+}
+
+bool bpf_cgroup_devices_attach(struct cgroup_ops *ops,
+			       struct bpf_devices *bpf_devices)
+{
+	__do_bpf_program_free struct bpf_program *prog = NULL;
+	int ret;
+
+	prog = __bpf_cgroup_devices(bpf_devices);
+	if (!prog)
+		return syserror_ret(false, "Failed to create bpf program");
+
+	ret = bpf_program_cgroup_attach(prog, BPF_CGROUP_DEVICE,
+					ops->unified->dfd_lim,
+					BPF_F_ALLOW_MULTI);
+	if (ret)
+		return syserror_ret(false, "Failed to attach bpf program");
+
+	/* Replace old bpf program. */
+	swap(prog, ops->cgroup2_devices);
+	return log_trace(true, "Attached bpf program");
+}
+
+bool bpf_cgroup_devices_update(struct cgroup_ops *ops,
+			       struct bpf_devices *bpf_devices,
+			       struct device_item *new)
+{
+	__do_bpf_program_free struct bpf_program *prog = NULL;
+	static int can_use_bpf_replace = -1;
+	struct bpf_program *prog_old;
+	union bpf_attr *attr;
+	int ret;
+
+	if (!ops)
+		return ret_set_errno(false, EINVAL);
+
+	if (!pure_unified_layout(ops))
+		return ret_set_errno(false, EINVAL);
+
+	if (ops->unified->dfd_lim < 0)
+		return ret_set_errno(false, EBADF);
+
+	/*
+	 * Note that bpf_list_add_device() returns 1 if it altered the device
+	 * list and 0 if it didn't; both return values indicate success.
+	 * Only a negative return value indicates an error.
+	 */
+	ret = bpf_list_add_device(bpf_devices, new);
+	if (ret < 0)
+		return false;
+
+	if (ret == 0)
+		return log_trace(true, "Device bpf program unaltered");
+
+	/* No previous device program attached. */
+	prog_old = ops->cgroup2_devices;
+	if (!prog_old)
+		return bpf_cgroup_devices_attach(ops, bpf_devices);
+
+	prog = __bpf_cgroup_devices(bpf_devices);
+	if (!prog)
+		return syserror_ret(false, "Failed to create bpf program");
+
+	ret = bpf_program_load_kernel(prog);
+	if (ret < 0)
+		return syserror_ret(false, "Failed to load bpf program");
+
+	attr = &(union bpf_attr){
+		.attach_type	= prog_old->attached_type,
+		.target_fd	= prog_old->fd_cgroup,
+		.attach_bpf_fd	= prog->kernel_fd,
+	};
+
+	switch (can_use_bpf_replace) {
+	case 1:
+		attr->replace_bpf_fd = prog_old->kernel_fd;
+		attr->attach_flags = BPF_F_REPLACE | BPF_F_ALLOW_MULTI;
+
+		ret = bpf(BPF_PROG_ATTACH, attr, sizeof(*attr));
+		break;
+	case -1:
+		attr->replace_bpf_fd = prog_old->kernel_fd;
+		attr->attach_flags = BPF_F_REPLACE | BPF_F_ALLOW_MULTI;
+
+		can_use_bpf_replace = !bpf(BPF_PROG_ATTACH, attr, sizeof(*attr));
+		if (can_use_bpf_replace > 0)
+			break;
+
+		__fallthrough;
+	case 0:
+		attr->attach_flags = BPF_F_ALLOW_MULTI;
+		attr->replace_bpf_fd = 0;
+
+		ret = bpf(BPF_PROG_ATTACH, attr, sizeof(*attr));
+		break;
+	}
+	if (ret < 0)
+		return syserror_ret(false, "Failed to update bpf program");
+
+	if (can_use_bpf_replace > 0) {
+		/* The old program was automatically detached by the kernel. */
+		close_prot_errno_disarm(prog_old->kernel_fd);
+		/* The new bpf program now owns the cgroup fd. */
+		prog->fd_cgroup = move_fd(prog_old->fd_cgroup);
+		TRACE("Replaced existing bpf program");
+	} else {
+		TRACE("Appended bpf program");
+	}
+	prog->attached_type  = prog_old->attached_type;
+	prog->attached_flags = attr->attach_flags;
+	swap(prog, ops->cgroup2_devices);
+
+	return true;
+}

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cgroups/cgroup2_devices.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cgroups/cgroup2_devices.h Changed

@@ -5,6 +5,8 @@
 #ifndef __LXC_CGROUP2_DEVICES_H
 #define __LXC_CGROUP2_DEVICES_H
 
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
@@ -15,128 +17,68 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "cgroup.h"
+#include "compiler.h"
 #include "conf.h"
-#include "config.h"
+#include "list.h"
+#include "macro.h"
+#include "memory_utils.h"
 #include "syscall_numbers.h"
 
-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-#include <linux/bpf.h>
-#include <linux/filter.h>
-#endif
-
-#ifndef HAVE_BPF
-
-union bpf_attr;
+#include "bpf.h"
+#include "bpf_common.h"
 
-static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size)
+#if !HAVE_BPF
+static inline int bpf_lxc(int cmd, union bpf_attr *attr, size_t size)
 {
 	return syscall(__NR_bpf, cmd, attr, size);
 }
-
-#define bpf missing_bpf
+#define bpf bpf_lxc
 #endif /* HAVE_BPF */
 
 struct bpf_program {
 	int device_list_type;
 	int kernel_fd;
-	uint32_t prog_type;
+	__u32 prog_type;
 
 	size_t n_instructions;
-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
 	struct bpf_insn *instructions;
-#endif /* HAVE_STRUCT_BPF_CGROUP_DEV_CTX */
 
-	char *attached_path;
+	int fd_cgroup;
 	int attached_type;
-	uint32_t attached_flags;
+	__u32 attached_flags;
 };
 
-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-struct bpf_program *bpf_program_new(uint32_t prog_type);
-int bpf_program_init(struct bpf_program *prog);
-int bpf_program_append_device(struct bpf_program *prog,
-			      struct device_item *device);
-int bpf_program_finalize(struct bpf_program *prog);
-int bpf_program_cgroup_attach(struct bpf_program *prog, int type,
-			      const char *path, uint32_t flags);
-int bpf_program_cgroup_detach(struct bpf_program *prog);
-void bpf_program_free(struct bpf_program *prog);
-void lxc_clear_cgroup2_devices(struct lxc_conf *conf);
-bool bpf_devices_cgroup_supported(void);
-static inline void __auto_bpf_program_free__(struct bpf_program **prog)
-{
-	if (*prog) {
-		bpf_program_free(*prog);
-		*prog = NULL;
-	}
-}
-int bpf_list_add_device(struct lxc_conf *conf, struct device_item *device);
-#else /* !HAVE_STRUCT_BPF_CGROUP_DEV_CTX */
-static inline struct bpf_program *bpf_program_new(uint32_t prog_type)
-{
-	errno = ENOSYS;
-	return NULL;
-}
-
-static inline int bpf_program_init(struct bpf_program *prog)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-static inline int bpf_program_append_device(struct bpf_program *prog, char type,
-					    int major, int minor,
-					    const char *access, int allow)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-static inline int bpf_program_finalize(struct bpf_program *prog)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-static inline int bpf_program_cgroup_attach(struct bpf_program *prog, int type,
-					    const char *path, uint32_t flags)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-static inline int bpf_program_cgroup_detach(struct bpf_program *prog)
-{
-	errno = ENOSYS;
-	return -1;
-}
+__hidden extern struct bpf_program *bpf_program_new(__u32 prog_type);
+__hidden extern int bpf_program_init(struct bpf_program *prog);
+__hidden extern int bpf_program_append_device(struct bpf_program *prog, struct device_item *device);
+__hidden extern int bpf_program_finalize(struct bpf_program *prog);
+__hidden extern int bpf_program_cgroup_detach(struct bpf_program *prog);
+__hidden extern void bpf_device_program_free(struct cgroup_ops *ops);
+__hidden extern bool bpf_devices_cgroup_supported(void);
+
+/*
+ * Note that bpf_list_add_device() returns 1 if it altered the device list and
+ * 0 if it didn't; both return values indicate success. Only a negative return
+ * value indicates an error.
+ */
+__hidden extern int bpf_list_add_device(struct bpf_devices *bpf_devices,
+					struct device_item *device);
+__hidden extern bool bpf_cgroup_devices_attach(struct cgroup_ops *ops,
+					       struct bpf_devices *bpf_devices);
+__hidden extern bool bpf_cgroup_devices_update(struct cgroup_ops *ops,
+					       struct bpf_devices *bpf_devices,
+					       struct device_item *device);
 
 static inline void bpf_program_free(struct bpf_program *prog)
 {
+	if (prog) {
+		(void)bpf_program_cgroup_detach(prog);
+		free(prog->instructions);
+		free(prog);
+	}
 }
-
-static inline void lxc_clear_cgroup2_devices(struct lxc_conf *conf)
-{
-}
-
-static inline bool bpf_devices_cgroup_supported(void)
-{
-	return false;
-}
-
-static inline void __auto_bpf_program_free__(struct bpf_program **prog)
-{
-}
-
-static inline int bpf_list_add_device(struct lxc_conf *conf,
-				      struct device_item *device)
-{
-	errno = ENOSYS;
-	return -1;
-}
-#endif /* !HAVE_STRUCT_BPF_CGROUP_DEV_CTX */
-
-#define __do_bpf_program_free \
-	__attribute__((__cleanup__(__auto_bpf_program_free__)))
+define_cleanup_function(struct bpf_program *, bpf_program_free);
+#define __do_bpf_program_free call_cleaner(bpf_program_free)
 
 #endif /* __LXC_CGROUP2_DEVICES_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cgroups/cgroup_utils.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cgroups/cgroup_utils.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,90 +10,114 @@
 
 #include "cgroup.h"
 #include "cgroup_utils.h"
-#include "config.h"
 #include "file_utils.h"
+#include "log.h"
 #include "macro.h"
 #include "memory_utils.h"
+#include "open_utils.h"
 #include "utils.h"
 
-int get_cgroup_version(char *line)
+lxc_log_define(cgroup_utils, lxc);
+
+bool unified_cgroup_fd(int fd)
 {
-	if (is_cgroupfs_v1(line))
-		return CGROUP_SUPER_MAGIC;
 
-	if (is_cgroupfs_v2(line))
-		return CGROUP2_SUPER_MAGIC;
+	int ret;
+	struct statfs fs;
 
-	return 0;
-}
+	ret = fstatfs(fd, &fs);
+	if (!ret && is_fs_type(&fs, CGROUP2_SUPER_MAGIC))
+		return true;
 
-bool is_cgroupfs_v1(char *line)
-{
-	char *p = strstr(line, " - ");
-	if (!p)
-		return false;
-	return strncmp(p, " - cgroup ", 10) == 0;
+	return false;
 }
 
-bool is_cgroupfs_v2(char *line)
+int cgroup_tree_prune(int dfd, const char *path)
 {
-	char *p = strstr(line, " - ");
-	if (!p)
-		return false;
-
-	return strncmp(p, " - cgroup2 ", 11) == 0;
-}
+	__do_close int dfd_disown = -EBADF, dfd_dup = -EBADF;
+	__do_closedir DIR *dir = NULL;
+	int ret;
+	struct dirent *direntp;
 
-bool test_writeable_v1(char *mountpoint, char *path)
-{
-	__do_free char *fullpath = must_make_path(mountpoint, path, NULL);
-	return (access(fullpath, W_OK) == 0);
-}
+	/*
+	 * The unlinkat() syscall doesn't work with empty paths, i.e. it isn't
+	 * possible to remove the fd itself.
+	 */
+	if (is_empty_string(path) || strequal(path, "."))
+		return ret_errno(EINVAL);
 
-bool test_writeable_v2(char *mountpoint, char *path)
-{
-	/* In order to move ourselves into an appropriate sub-cgroup we need to
-	 * have write access to the parent cgroup's "cgroup.procs" file, i.e. we
-	 * need to have write access to the our current cgroups's "cgroup.procs"
-	 * file.
+	/*
+	 * Note that O_PATH file descriptors can't be used with getdents() and
+	 * therefore with readdir().
 	 */
-	int ret;
-	__do_free char *cgroup_path = NULL, *cgroup_procs_file = NULL,
-		       *cgroup_threads_file = NULL;
+	dfd_disown = open_at(dfd, path, PROTECT_OPEN,
+			     PROTECT_LOOKUP_BENEATH_WITH_SYMLINKS, 0);
+	if (dfd_disown < 0)
+		return -errno;
 
-	cgroup_path = must_make_path(mountpoint, path, NULL);
-	cgroup_procs_file = must_make_path(cgroup_path, "cgroup.procs", NULL);
+	dfd_dup = dup_cloexec(dfd_disown);
+	if (dfd_dup < 0)
+		return -errno;
 
-	ret = access(cgroup_path, W_OK);
-	if (ret < 0)
-		return false;
+	dir = fdopendir(dfd_disown);
+	if (!dir)
+		return -errno;
 
-	ret = access(cgroup_procs_file, W_OK);
-	if (ret < 0)
-		return false;
+	/* Transfer ownership to fdopendir(). */
+	move_fd(dfd_disown);
 
-	/* Newer versions of cgroup2 now also require write access to the
-	 * "cgroup.threads" file.
-	 */
-	cgroup_threads_file = must_make_path(cgroup_path, "cgroup.threads", NULL);
-	if (!file_exists(cgroup_threads_file))
-		return true;
+	while ((direntp = readdir(dir))) {
+		struct stat st;
 
-	return (access(cgroup_threads_file, W_OK) == 0);
-}
+		if (strequal(direntp->d_name, ".") ||
+		    strequal(direntp->d_name, ".."))
+			continue;
 
-int unified_cgroup_hierarchy(void)
-{
+		ret = fstatat(dfd_dup, direntp->d_name, &st,
+			      AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW);
+		if (ret < 0)
+			continue;
 
-	int ret;
-	struct statfs fs;
+		if (!S_ISDIR(st.st_mode))
+			continue;
 
-	ret = statfs(DEFAULT_CGROUP_MOUNTPOINT, &fs);
-	if (ret < 0)
-		return -ENOMEDIUM;
+		ret = cgroup_tree_prune(dfd_dup, direntp->d_name);
+		if (ret < 0)
+			return -errno;
+	}
 
-	if (is_fs_type(&fs, CGROUP2_SUPER_MAGIC))
-		return CGROUP2_SUPER_MAGIC;
+	ret = unlinkat(dfd, path, AT_REMOVEDIR);
+	if (ret < 0)
+		return -errno;
 
 	return 0;
 }
+
+#define INIT_SCOPE "/init.scope"
+char *prune_init_scope(char *path)
+{
+	char *slash = path;
+	size_t len;
+
+	/*
+	 * This function can only be called on information parsed from
+	 * /proc/<pid>/cgroup. The file displays the current cgroup of the
+	 * process as absolute paths. So if we are passed a non-absolute path
+	 * things are way wrong.
+	 */
+	if (!abspath(path))
+		return ret_set_errno(NULL, EINVAL);
+
+	len = strlen(path);
+	if (len < STRLITERALLEN(INIT_SCOPE))
+		return path;
+
+	slash += (len - STRLITERALLEN(INIT_SCOPE));
+	if (strequal(slash, INIT_SCOPE)) {
+		if (slash == path)
+			slash++;
+		*slash = '\0';
+	}
+
+	return path;
+}

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cgroups/cgroup_utils.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cgroups/cgroup_utils.h Changed

@@ -3,29 +3,33 @@
 #ifndef __LXC_CGROUP_UTILS_H
 #define __LXC_CGROUP_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 
-/* Retrieve the cgroup version of a given entry from /proc/<pid>/mountinfo. */
-extern int get_cgroup_version(char *line);
+#include "compiler.h"
+#include "file_utils.h"
 
-/* Check if given entry from /proc/<pid>/mountinfo is a cgroupfs v1 mount. */
-extern bool is_cgroupfs_v1(char *line);
+__hidden extern bool unified_cgroup_fd(int fd);
 
-/* Check if given entry from /proc/<pid>/mountinfo is a cgroupfs v2 mount. */
-extern bool is_cgroupfs_v2(char *line);
+static inline bool cgns_supported(void)
+{
+	static int supported = -1;
 
-/* Given a v1 hierarchy @mountpoint and base @path, verify that we can create
- * directories underneath it.
- */
-extern bool test_writeable_v1(char *mountpoint, char *path);
+	if (supported == -1)
+		supported = file_exists("/proc/self/ns/cgroup");
 
-/* Given a v2 hierarchy @mountpoint and base @path, verify that we can create
- * directories underneath it and that we have write access to the cgroup's
- * "cgroup.procs" file.
- */
-extern bool test_writeable_v2(char *mountpoint, char *path);
+	return supported == 1;
+}
 
-extern int unified_cgroup_hierarchy(void);
+__hidden extern int cgroup_tree_prune(int dfd, const char *path);
+
+/*
+ * This function can only be called on information parsed from
+ * /proc/<pid>/cgroup or on absolute paths and it will verify the latter and
+ * return NULL if a relative path is passed.
+ */
+__hidden extern char *prune_init_scope(char *path);
 
 #endif /* __LXC_CGROUP_UTILS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cmd/lxc-checkconfig.in -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cmd/lxc-checkconfig.in Changed

@@ -24,11 +24,8 @@
     return $?
 }
 
-is_enabled() {
-    mandatory=$2
-
-    is_set $1
-    RES=$?
+show_enabled() {
+    RES=$1
     RET=1
     if  $RES -eq 0 ; then
         $SETCOLOR_SUCCESS && echo -n "enabled" && $SETCOLOR_NORMAL
@@ -43,7 +40,27 @@
     return $RET
 }
 
+is_enabled() {
+    mandatory=$2
+
+    is_set $1
+    show_enabled $?
+}
+
+has_cgroup_ns() {
+    mandatory=no
+
+    if  -f "/proc/self/ns/cgroup" ; then
+        show_enabled 0
+    else
+        show_enabled 1
+    fi
+}
+
 is_probed() {
+    if  ! -f /proc/modules ; then
+        return
+    fi
     lsmod | grep $1 > /dev/null
     if  $? -eq 0 ; then
         echo -n ", loaded"
@@ -52,9 +69,13 @@
     fi
 }
 
+if type lxc-start >/dev/null 2>&1; then
+    echo "LXC version $(lxc-start --version)"
+fi
+
 if  ! -f $CONFIG ; then
     echo "Kernel configuration not found at $CONFIG; searching..."
-    KVER="`uname -r`"
+    KVER="$(uname -r)"
     HEADERS_CONFIG="/lib/modules/$KVER/build/.config"
     BOOT_CONFIG="/boot/config-$KVER"
      -f "${HEADERS_CONFIG}"  && CONFIG=${HEADERS_CONFIG}
@@ -95,11 +116,13 @@
 fi
 
 if  -z "${KVER_MAJOR}" ; then
-    echo "WARNING: Unable to detect version from configuration, assuming latest\n"
+    echo "WARNING: Unable to detect version from configuration, assuming latest"
+    echo ""
     KVER_MAJOR="100"
     KVER_MINOR="0"
 fi
 
+echo ""
 echo "--- Namespaces ---"
 echo -n "Namespaces: " && is_enabled CONFIG_NAMESPACES yes
 echo
@@ -112,73 +135,74 @@
 echo -n "User namespace: " && is_enabled CONFIG_USER_NS
 echo
 if is_set CONFIG_USER_NS; then
-	if which newuidmap > /dev/null 2>&1; then
-		f=`which newuidmap`
-		if  ! -u "${f}" ; then
-			echo "Warning: newuidmap is not setuid-root"
-		fi
-	else
-		echo "newuidmap is not installed"
-	fi
-	if which newgidmap > /dev/null 2>&1; then
-		f=`which newgidmap`
-		if  ! -u "${f}" ; then
-			echo "Warning: newgidmap is not setuid-root"
-		fi
-	else
-		echo "newgidmap is not installed"
-	fi
+    if command -v newuidmap >/dev/null 2>&1; then
+        f=$(command -v newuidmap)
+        if  ! -u "${f}" ; then
+            echo "Warning: newuidmap is not setuid-root"
+        fi
+    else
+        echo "newuidmap is not installed"
+    fi
+    if command -v newgidmap >/dev/null 2>&1; then
+        f=$(command -v newgidmap)
+        if  ! -u "${f}" ; then
+            echo "Warning: newgidmap is not setuid-root"
+        fi
+    else
+        echo "newgidmap is not installed"
+    fi
 fi
 echo -n "Network namespace: " && is_enabled CONFIG_NET_NS
 echo
 if ( $KVER_MAJOR -lt 4 ) || ( $KVER_MAJOR -eq 4  &&  $KVER_MINOR -lt 7 ); then
-	echo -n "Multiple /dev/pts instances: " && is_enabled DEVPTS_MULTIPLE_INSTANCES
-	echo
+    echo -n "Multiple /dev/pts instances: " && is_enabled DEVPTS_MULTIPLE_INSTANCES
+    echo
 fi
 echo
 
 echo "--- Control groups ---"
-
 echo -n "Cgroups: " && is_enabled CONFIG_CGROUPS
 echo
+echo -n "Cgroup namespace: " && has_cgroup_ns
+echo
 
 print_cgroups() {
   # print all mountpoints for cgroup filesystems
   awk '$1 !~ /#/ && $3 == mp { print $2; } ; END { exit(0); } '  "mp=$1" "$2" ;
 }
+CGROUP_V1_MNTS=$(print_cgroups cgroup /proc/self/mounts)
+CGROUP_V2_MNTS=$(print_cgroups cgroup2 /proc/self/mounts)
 
-CGROUP_V1_MNTS=`print_cgroups cgroup /proc/self/mounts`
-echo
 echo "Cgroup v1 mount points: "
-echo "$CGROUP_V1_MNTS"
-echo
+for mnt in ${CGROUP_V1_MNTS}; do
+    echo " - ${mnt}"
+done
 
-CGROUP_V2_MNTS=`print_cgroups cgroup2 /proc/self/mounts`
 echo "Cgroup v2 mount points: "
-echo "$CGROUP_V2_MNTS"
-echo
+for mnt in ${CGROUP_V2_MNTS}; do
+    echo " - ${mnt}"
+done
 
-CGROUP_SYSTEMD_MNTPT=`echo "$CGROUP_V1_MNTS" | grep "/systemd"`
-if  -z "$CGROUP_SYSTEMD_MNTPT" ; then
-    echo -n "Cgroup v1 systemd controller: "
-    $SETCOLOR_FAILURE && echo -n "missing" && $SETCOLOR_NORMAL
-    echo
-fi
+if  "${CGROUP_V2_MNTS}" != "/sys/fs/cgroup" ; then
+    CGROUP_SYSTEMD_MNTPT=$(echo "$CGROUP_V1_MNTS" | grep "/systemd")
+    if  -z "$CGROUP_SYSTEMD_MNTPT" ; then
+        echo -n "Cgroup v1 systemd controller: "
+        $SETCOLOR_FAILURE && echo -n "missing" && $SETCOLOR_NORMAL
+        echo
+    fi
 
-CGROUP_FREEZER_MNTPT=`echo "$CGROUP_V1_MNTS" | grep "/freezer"`
-if  -z "$CGROUP_FREEZER_MNTPT" ; then
-    echo -n "Cgroup v1 freezer controller: "
-    $SETCOLOR_FAILURE && echo -n "missing" && $SETCOLOR_NORMAL
-    echo
-fi
+    CGROUP_FREEZER_MNTPT=$(echo "$CGROUP_V1_MNTS" | grep "/freezer")
+    if  -z "$CGROUP_FREEZER_MNTPT" ; then
+        echo -n "Cgroup v1 freezer controller: "
+        $SETCOLOR_FAILURE && echo -n "missing" && $SETCOLOR_NORMAL
+        echo
+    fi
 
-CGROUP_MNT_PATH=`echo "$CGROUP_V1_MNTS" | head -n 1`
-if  -f $CGROUP_MNT_PATH/cgroup.clone_children ; then
-    echo -n "Cgroup v1 clone_children flag: " &&
-    $SETCOLOR_SUCCESS && echo "enabled" && $SETCOLOR_NORMAL
-else
-    echo -n "Cgroup namespace: " && is_enabled CONFIG_CGROUP_NS yes
-    echo
+    CGROUP_MNT_PATH=$(echo "$CGROUP_V1_MNTS" | head -n 1)
+    if  -f $CGROUP_MNT_PATH/cgroup.clone_children ; then
+        echo -n "Cgroup v1 clone_children flag: " &&
+        $SETCOLOR_SUCCESS && echo "enabled" && $SETCOLOR_NORMAL
+    fi
 fi
 
 echo -n "Cgroup device: " && is_enabled CONFIG_CGROUP_DEVICE
@@ -211,10 +235,12 @@
 echo -n "Bridges: " && is_enabled CONFIG_BRIDGE && is_probed bridge
 echo
 echo -n "Advanced netfilter: " && is_enabled CONFIG_NETFILTER_ADVANCED && is_probed nf_tables
-echo
-echo -n "CONFIG_NF_NAT_IPV4: " && is_enabled CONFIG_NF_NAT_IPV4 && is_probed nf_nat_ipv4
-echo
-echo -n "CONFIG_NF_NAT_IPV6: " && is_enabled CONFIG_NF_NAT_IPV6 && is_probed nf_nat_ipv6
+if (  $KVER_MAJOR -gt 3  &&  $KVER_MINOR -gt 6  ) &&  $KVER_MAJOR -lt 5  ; then
+    echo
+    echo -n "CONFIG_NF_NAT_IPV4: " && is_enabled CONFIG_NF_NAT_IPV4 && is_probed nf_nat_ipv4
+    echo
+    echo -n "CONFIG_NF_NAT_IPV6: " && is_enabled CONFIG_NF_NAT_IPV6 && is_probed nf_nat_ipv6
+fi
 echo
 echo -n "CONFIG_IP_NF_TARGET_MASQUERADE: " && is_enabled CONFIG_IP_NF_TARGET_MASQUERADE && is_probed nf_nat_masquerade_ipv4
 echo
@@ -245,15 +271,15 @@
 echo
 echo -n "CONFIG_NETLINK_DIAG: " && is_enabled CONFIG_NETLINK_DIAG
 echo
-echo -n "File capabilities: " && \
-    (  "${KVER_MAJOR}" = 2  &&  ${KVER_MINOR} -lt 33  && \
-       is_enabled CONFIG_SECURITY_FILE_CAPABILITIES; echo ) || \
-    ( (  "${KVER_MAJOR}" = "2"  &&  ${KVER_MINOR} -gt 32  ) || \
-          ${KVER_MAJOR} -gt 2  && $SETCOLOR_SUCCESS && \
-         echo "enabled" && $SETCOLOR_NORMAL )
+echo -n "File capabilities: "
+if  "${KVER_MAJOR}" = 2  &&  ${KVER_MINOR} -lt 33 ; then
+    is_enabled CONFIG_SECURITY_FILE_CAPABILITIES
+    echo
+else
+    $SETCOLOR_SUCCESS && echo "enabled" && $SETCOLOR_NORMAL
+fi
 
 echo
 echo "Note : Before booting a new kernel, you can check its configuration"
 echo "usage : CONFIG=/path/to/config $0"
 echo
-

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cmd/lxc_init.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cmd/lxc_init.c Changed

@@ -1,34 +1,27 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <libgen.h>
 #include <limits.h>
-#include <pthread.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
-#include <lxc/version.h>
+#include "lxc.h"
+#include "version.h"
 
 #include "compiler.h"
-#include "config.h"
-#include "error.h"
 #include "initutils.h"
 #include "memory_utils.h"
 #include "parse.h"
-#include "process_utils.h"
 #include "string_utils.h"
 
 /* option keys for long only options */
@@ -38,14 +31,6 @@
 #define QUOTE(macro) #macro
 #define QUOTEVAL(macro) QUOTE(macro)
 
-static sig_atomic_t was_interrupted;
-
-static void interrupt_handler(int sig)
-{
-	if (!was_interrupted)
-		was_interrupted = sig;
-}
-
 static struct option long_options = {
 	    { "name",        required_argument, 0, 'n'         },
 	    { "help",        no_argument,       0, 'h'         },
@@ -75,119 +60,6 @@
 	.shortopts = short_options
 };
 
-static void prevent_forking(void)
-{
-	__do_free char *line = NULL;
-	__do_fclose FILE *f = NULL;
-	char pathPATH_MAX;
-	size_t len = 0;
-
-	f = fopen("/proc/self/cgroup", "re");
-	if (!f)
-		return;
-
-	while (getline(&line, &len, f) != -1) {
-		__do_close int fd = -EBADF;
-		int ret;
-		char *p, *p2;
-
-		p = strchr(line, ':');
-		if (!p)
-			continue;
-		p++;
-		p2 = strchr(p, ':');
-		if (!p2)
-			continue;
-		*p2 = '\0';
-
-		/* This is a cgroup v2 entry. Skip it. */
-		if ((p2 - p) == 0)
-			continue;
-
-		if (strcmp(p, "pids") != 0)
-			continue;
-		p2++;
-
-		p2 += lxc_char_left_gc(p2, strlen(p2));
-		p2lxc_char_right_gc(p2, strlen(p2)) = '\0';
-
-		ret = snprintf(path, sizeof(path),
-			       "/sys/fs/cgroup/pids/%s/pids.max", p2);
-		if (ret < 0 || (size_t)ret >= sizeof(path)) {
-			if (my_args.quiet)
-				fprintf(stderr, "Failed to create string\n");
-			return;
-		}
-
-		fd = open(path, O_WRONLY | O_CLOEXEC);
-		if (fd < 0) {
-			if (my_args.quiet)
-				fprintf(stderr, "Failed to open \"%s\"\n", path);
-			return;
-		}
-
-		ret = write(fd, "1", 1);
-		if (ret != 1 && !my_args.quiet)
-			fprintf(stderr, "Failed to write to \"%s\"\n", path);
-
-		return;
-	}
-}
-
-static void kill_children(pid_t pid)
-{
-	__do_fclose FILE *f = NULL;
-	char pathPATH_MAX;
-	int ret;
-
-	ret = snprintf(path, sizeof(path), "/proc/%d/task/%d/children", pid, pid);
-	if (ret < 0 || (size_t)ret >= sizeof(path)) {
-		if (my_args.quiet)
-			fprintf(stderr, "Failed to create string\n");
-		return;
-	}
-
-	f = fopen(path, "re");
-	if (!f) {
-		if (my_args.quiet)
-			fprintf(stderr, "Failed to open %s\n", path);
-		return;
-	}
-
-	while (!feof(f)) {
-		pid_t find_pid;
-
-		if (fscanf(f, "%d ", &find_pid) != 1) {
-			if (my_args.quiet)
-				fprintf(stderr, "Failed to retrieve pid\n");
-			return;
-		}
-
-		(void)kill_children(find_pid);
-		(void)kill(find_pid, SIGKILL);
-	}
-}
-
-static void remove_self(void)
-{
-	int ret;
-	ssize_t n;
-	char pathPATH_MAX = {0};
-
-	n = readlink("/proc/self/exe", path, sizeof(path));
-	if (n < 0 || n >= PATH_MAX)
-		return;
-	pathn = '\0';
-
-	ret = umount2(path, MNT_DETACH);
-	if (ret < 0)
-		return;
-
-	ret = unlink(path);
-	if (ret < 0)
-		return;
-}
-
 __noreturn static void print_usage_exit(const struct option longopts)
 
 {
@@ -283,12 +155,6 @@
 
 int main(int argc, char *argv)
 {
-	int i, logfd, ret;
-	pid_t pid;
-	struct sigaction act;
-	sigset_t mask, omask;
-	int have_status = 0, exit_with = 1, shutdown = 0;
-
 	if (arguments_parse(&my_args, argc, argv))
 		exit(EXIT_FAILURE);
 
@@ -298,221 +164,5 @@
 		exit(EXIT_FAILURE);
 	}
 
-	/* Mask all the signals so we are safe to install a signal handler and
-	 * to fork.
-	 */
-	ret = sigfillset(&mask);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = sigdelset(&mask, SIGILL);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = sigdelset(&mask, SIGSEGV);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = sigdelset(&mask, SIGBUS);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = pthread_sigmask(SIG_SETMASK, &mask, &omask);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = sigfillset(&act.sa_mask);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = sigdelset(&act.sa_mask, SIGILL);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = sigdelset(&act.sa_mask, SIGSEGV);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = sigdelset(&act.sa_mask, SIGBUS);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = sigdelset(&act.sa_mask, SIGSTOP);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = sigdelset(&act.sa_mask, SIGKILL);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	act.sa_flags = 0;
-	act.sa_handler = interrupt_handler;
-
-	for (i = 1; i < NSIG; i++) {
-		/* Exclude some signals: ILL, SEGV and BUS are likely to reveal
-		 * a bug and we want a core. STOP and KILL cannot be handled
-		 * anyway: they're here for documentation. 32 and 33 are not
-		 * defined.
-		 */
-		if (i == SIGILL || i == SIGSEGV || i == SIGBUS ||
-		    i == SIGSTOP || i == SIGKILL || i == 32 || i == 33)
-			continue;
-
-		ret = sigaction(i, &act, NULL);
-		if (ret < 0) {
-			if (errno == EINVAL)
-				continue;
-
-			if (my_args.quiet)
-				fprintf(stderr, "Failed to change signal action\n");
-			exit(EXIT_FAILURE);
-		}
-	}
-
-	remove_self();
-
-	pid = fork();
-	if (pid < 0)
-		exit(EXIT_FAILURE);
-
-	if (!pid) {
-		/* restore default signal handlers */
-		for (i = 1; i < NSIG; i++) {
-			sighandler_t sigerr;
-
-			if (i == SIGILL || i == SIGSEGV || i == SIGBUS ||
-			    i == SIGSTOP || i == SIGKILL || i == 32 || i == 33)
-				continue;
-
-			sigerr = signal(i, SIG_DFL);
-			if (sigerr == SIG_ERR && !my_args.quiet)
-				fprintf(stderr, "Failed to reset to default action for signal \"%d\": %d\n", i, pid);
-		}
-
-		ret = pthread_sigmask(SIG_SETMASK, &omask, NULL);
-		if (ret < 0) {
-			if (my_args.quiet)
-				fprintf(stderr, "Failed to set signal mask\n");
-			exit(EXIT_FAILURE);
-		}
-
-		(void)setsid();
-
-		(void)ioctl(STDIN_FILENO, TIOCSCTTY, 0);
-
-		ret = execvp(my_args.argv0, my_args.argv);
-		if (my_args.quiet)
-			fprintf(stderr, "Failed to exec \"%s\"\n", my_args.argv0);
-		exit(ret);
-	}
-	logfd = open("/dev/console", O_WRONLY | O_NOCTTY | O_CLOEXEC);
-	if (logfd >= 0) {
-		ret = dup3(logfd, STDERR_FILENO, O_CLOEXEC);
-		if (ret < 0)
-			exit(EXIT_FAILURE);
-	}
-
-	(void)setproctitle("init");
-
-	/* Let's process the signals now. */
-	ret = sigdelset(&omask, SIGALRM);
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-
-	ret = pthread_sigmask(SIG_SETMASK, &omask, NULL);
-	if (ret < 0) {
-		if (my_args.quiet)
-			fprintf(stderr, "Failed to set signal mask\n");
-		exit(EXIT_FAILURE);
-	}
-
-	/* No need of other inherited fds but stderr. */
-	close(STDIN_FILENO);
-	close(STDOUT_FILENO);
-
-	for (;;) {
-		int status;
-		pid_t waited_pid;
-
-		switch (was_interrupted) {
-		case 0:
-		/* Some applications send SIGHUP in order to get init to reload
-		 * its configuration. We don't want to forward this onto the
-		 * application itself, because it probably isn't expecting this
-		 * signal since it was expecting init to do something with it.
-		 *
-		 * Instead, let's explicitly ignore it here. The actual
-		 * terminal case is handled in the monitor's handler, which
-		 * sends this task a SIGTERM in the case of a SIGHUP, which is
-		 * what we want.
-		 */
-		case SIGHUP:
-			break;
-		case SIGPWR:
-		case SIGTERM:
-			if (!shutdown) {
-				pid_t mypid = lxc_raw_getpid();
-
-				shutdown = 1;
-				prevent_forking();
-				if (mypid != 1) {
-					kill_children(mypid);
-				} else {
-					ret = kill(-1, SIGTERM);
-					if (ret < 0 && !my_args.quiet)
-						fprintf(stderr, "Failed to send SIGTERM to all children\n");
-				}
-				alarm(1);
-			}
-			break;
-		case SIGALRM: {
-			pid_t mypid = lxc_raw_getpid();
-
-			prevent_forking();
-			if (mypid != 1) {
-				kill_children(mypid);
-			} else {
-				ret = kill(-1, SIGKILL);
-				if (ret < 0 && !my_args.quiet)
-					fprintf(stderr, "Failed to send SIGTERM to all children\n");
-			}
-			break;
-		}
-		default:
-			ret = kill(pid, was_interrupted);
-			break;
-		}
-		ret = EXIT_SUCCESS;
-
-		was_interrupted = 0;
-		waited_pid = wait(&status);
-		if (waited_pid < 0) {
-			if (errno == ECHILD)
-				goto out;
-
-			if (errno == EINTR)
-				continue;
-
-			if (my_args.quiet)
-				fprintf(stderr, "Failed to wait on child %d\n", pid);
-			ret = -1;
-			goto out;
-		}
-
-		/* Reset timer each time a process exited. */
-		if (shutdown)
-			alarm(1);
-
-		/* Keep the exit code of the started application (not wrapped
-		 * pid) and continue to wait for the end of the orphan group.
-		 */
-		if (waited_pid == pid && !have_status) {
-			exit_with = lxc_error_set_and_log(waited_pid, status);
-			have_status = 1;
-		}
-	}
-out:
-	if (ret < 0)
-		exit(EXIT_FAILURE);
-	exit(exit_with);
+	lxc_container_init(my_args.argc, my_args.argv, my_args.quiet);
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cmd/lxc_monitord.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cmd/lxc_monitord.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cmd/lxc_user_nic.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cmd/lxc_user_nic.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/cmd/lxc_usernsexec.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cmd/lxc_usernsexec.c Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/cmd/meson.build Added

@@ -0,0 +1,109 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+cmd_common_sources = liblxc_sources + include_sources
+
+cmd_lxc_init_sources = files(
+    'lxc_init.c',
+    '../af_unix.c',
+    '../af_unix.h',
+    '../caps.c',
+    '../caps.h',
+    '../error.c',
+    '../error.h',
+    '../file_utils.c',
+    '../file_utils.h',
+    '../initutils.c',
+    '../initutils.h',
+    '../log.h',
+    '../log.c',
+    '../macro.h',
+    '../memory_utils.h',
+    '../namespace.c',
+    '../namespace.h',
+    '../open_utils.h',
+    '../string_utils.c',
+    '../string_utils.h') + include_sources
+
+cmd_lxc_init_static_sources = files(
+    'lxc_init.c',
+    '../af_unix.c',
+    '../af_unix.h',
+    '../caps.c',
+    '../caps.h',
+    '../error.c',
+    '../error.h',
+    '../file_utils.c',
+    '../file_utils.h',
+    '../initutils.c',
+    '../initutils.h',
+    '../log.h',
+    '../log.c',
+    '../macro.h',
+    '../memory_utils.h',
+    '../namespace.c',
+    '../namespace.h',
+    '../open_utils.h',
+    '../string_utils.c',
+    '../string_utils.h') + include_sources
+
+cmd_lxc_monitord_sources = files('lxc_monitord.c') + cmd_common_sources + netns_ifaddrs_sources
+cmd_lxc_user_nic_sources = files('lxc_user_nic.c') + cmd_common_sources + netns_ifaddrs_sources
+cmd_lxc_usernsexec_sources = files('lxc_usernsexec.c') + cmd_common_sources + netns_ifaddrs_sources
+
+cmd_lxc_checkconfig = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxc-checkconfig.in',
+    output: 'lxc-checkconfig')
+install_data(join_paths(project_build_root, 'src/lxc/cmd/lxc-checkconfig'), install_dir: bindir)
+
+cmd_lxc_update_config = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxc-update-config.in',
+    output: 'lxc-update-config')
+install_data(join_paths(project_build_root, 'src/lxc/cmd/lxc-update-config'), install_dir: bindir)
+
+if sanitize == 'none' and libcap_static_linkable
+    cmd_programs += executable(
+        'init.lxc.static',
+        cmd_lxc_init_sources,
+        include_directories: liblxc_includes,
+        link_with: liblxc_static,
+        link_args: '-static',
+        c_args: '-DNO_LXC_CONF',
+        dependencies: libcap_static + liblxc_dependency_headers,
+        install_dir: sbindir,
+        install: true)
+endif
+
+cmd_programs += executable(
+    'init.lxc',
+    cmd_lxc_init_sources,
+    include_directories: liblxc_includes,
+    c_args: '-DNO_LXC_CONF',
+    dependencies: liblxc_dep,
+    install_dir: sbindir,
+    install: true)
+
+cmd_programs += executable(
+    'lxc-monitord',
+    cmd_lxc_monitord_sources,
+    include_directories: liblxc_includes,
+    dependencies: liblxc_dep,
+    install: true,
+    install_dir: lxclibexec)
+
+cmd_programs += executable(
+    'lxc-user-nic',
+    cmd_lxc_user_nic_sources,
+    include_directories: liblxc_includes,
+    dependencies: liblxc_dep,
+    install: true,
+    install_mode: 'rwsr-xr-x', # 4755
+    install_dir: lxclibexec)
+
+cmd_programs += executable(
+    'lxc-usernsexec',
+    cmd_lxc_usernsexec_sources,
+    include_directories: liblxc_includes,
+    dependencies: liblxc_dep,
+    install: true)

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/commands.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/commands.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <caps.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -17,12 +16,11 @@
 #include <unistd.h>
 
 #include "af_unix.h"
-#include "cgroup.h"
+#include "cgroups/cgroup.h"
 #include "cgroups/cgroup2_devices.h"
 #include "commands.h"
 #include "commands_utils.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "lxc.h"
@@ -65,7 +63,7 @@
 static const char *lxc_cmd_str(lxc_cmd_t cmd)
 {
 	static const char *const cmdnameLXC_CMD_MAX = {
-		LXC_CMD_CONSOLE			= "console",
+		LXC_CMD_GET_TTY_FD			= "get_tty_fd",
 		LXC_CMD_TERMINAL_WINCH      		= "terminal_winch",
 		LXC_CMD_STOP                		= "stop",
 		LXC_CMD_GET_STATE           		= "get_state",
@@ -84,8 +82,14 @@
 		LXC_CMD_UNFREEZE			= "unfreeze",
 		LXC_CMD_GET_CGROUP2_FD		= "get_cgroup2_fd",
 		LXC_CMD_GET_INIT_PIDFD        	= "get_init_pidfd",
-		LXC_CMD_GET_LIMITING_CGROUP		= "get_limiting_cgroup",
-		LXC_CMD_GET_LIMITING_CGROUP2_FD	= "get_limiting_cgroup2_fd",
+		LXC_CMD_GET_LIMIT_CGROUP		= "get_limit_cgroup",
+		LXC_CMD_GET_LIMIT_CGROUP2_FD		= "get_limit_cgroup2_fd",
+		LXC_CMD_GET_DEVPTS_FD			= "get_devpts_fd",
+		LXC_CMD_GET_SECCOMP_NOTIFY_FD		= "get_seccomp_notify_fd",
+		LXC_CMD_GET_CGROUP_CTX		= "get_cgroup_ctx",
+		LXC_CMD_GET_CGROUP_FD			= "get_cgroup_fd",
+		LXC_CMD_GET_LIMIT_CGROUP_FD		= "get_limit_cgroup_fd",
+		LXC_CMD_GET_SYSTEMD_SCOPE		= "get_systemd_scope",
 	};
 
 	if (cmd >= LXC_CMD_MAX)
@@ -94,6 +98,57 @@
 	return cmdnamecmd;
 }
 
+static int __transfer_cgroup_ctx_fds(struct unix_fds *fds, struct cgroup_ctx *ctx)
+{
+	/* This shouldn't be able to happen but better safe than sorry. */
+	if (ctx->fd_len != fds->fd_count_ret ||
+	    fds->fd_count_ret > CGROUP_CTX_MAX_FD)
+		return syswarn_set(-EINVAL, "Unexpected number of file descriptors received %u != %u",
+				   ctx->fd_len, fds->fd_count_ret);
+
+	memcpy(ctx->fd, fds->fd, ctx->fd_len * sizeof(__s32));
+	fds->fd_count_ret = 0;
+	return 0;
+}
+
+static int __transfer_cgroup_fd(struct unix_fds *fds, struct cgroup_fd *fd)
+{
+	fd->fd = move_fd(fds->fd0);
+	return 0;
+}
+
+static ssize_t lxc_cmd_rsp_recv_fds(int fd_sock, struct unix_fds *fds,
+				    struct lxc_cmd_rsp *rsp,
+				    const char *cur_cmdstr)
+{
+	ssize_t ret;
+
+	ret = lxc_abstract_unix_recv_fds(fd_sock, fds, rsp, sizeof(*rsp));
+	if (ret < 0)
+		return log_error(ret, "Failed to receive file descriptors for command \"%s\"", cur_cmdstr);
+
+	/*
+	 * If we end up here with fewer or more file descriptors the caller
+	 * must have set flags to indicate that they are fine with this.
+	 * Otherwise the call would have failed.
+	 */
+
+	if (fds->flags & UNIX_FDS_RECEIVED_EXACT)
+		return log_debug(ret, "Received exact number of file descriptors %u == %u for command \"%s\"",
+				 fds->fd_count_max, fds->fd_count_ret, cur_cmdstr);
+
+	if (fds->flags & UNIX_FDS_RECEIVED_LESS)
+		return log_debug(ret, "Received less file descriptors %u < %u for command \"%s\"",
+				 fds->fd_count_ret, fds->fd_count_max, cur_cmdstr);
+
+	if (fds->flags & UNIX_FDS_RECEIVED_MORE)
+		return log_debug(ret, "Received more file descriptors (excessive fds were automatically closed) %u > %u for command \"%s\"",
+				 fds->fd_count_ret, fds->fd_count_max, cur_cmdstr);
+
+	DEBUG("Command \"%s\" received response", cur_cmdstr);
+	return ret;
+}
+
 /*
  * lxc_cmd_rsp_recv: Receive a response to a command
  *
@@ -107,84 +162,179 @@
  * the response data is <= a void * worth of data, it will be
  * stored directly in data and datalen will be 0.
  *
- * As a special case, the response for LXC_CMD_CONSOLE is created
- * here as it contains an fd for the ptmx pty passed through the
- * unix socket.
+ * As a special case, the response for LXC_CMD_GET_TTY_FD is created here as
+ * it contains an fd for the ptx pty passed through the unix socket.
  */
-static int lxc_cmd_rsp_recv(int sock, struct lxc_cmd_rr *cmd)
+static ssize_t lxc_cmd_rsp_recv(int sock, struct lxc_cmd_rr *cmd)
 {
-	__do_close int fd_rsp = -EBADF;
-	int ret;
+	__do_free void *__data = NULL;
+	call_cleaner(put_unix_fds) struct unix_fds *fds = &(struct unix_fds){
+		.fd0 ... KERNEL_SCM_MAX_FD - 1 = -EBADF,
+	};
 	struct lxc_cmd_rsp *rsp = &cmd->rsp;
+	int cur_cmd = cmd->req.cmd;
+	const char *cur_cmdstr;
+	ssize_t bytes_recv;
 
-	ret = lxc_abstract_unix_recv_fds(sock, &fd_rsp, 1, rsp, sizeof(*rsp));
-	if (ret < 0)
-		return log_warn_errno(-1,
-				      errno, "Failed to receive response for command \"%s\"",
-				      lxc_cmd_str(cmd->req.cmd));
-	TRACE("Command \"%s\" received response", lxc_cmd_str(cmd->req.cmd));
+	/*
+	 * Determine whether this command will receive file descriptors and how
+	 * many at most.
+	 */
+	cur_cmdstr = lxc_cmd_str(cur_cmd);
+	switch (cur_cmd) {
+	case LXC_CMD_GET_CGROUP_FD:
+		__fallthrough;
+	case LXC_CMD_GET_LIMIT_CGROUP_FD:
+		__fallthrough;
+	case LXC_CMD_GET_CGROUP2_FD:
+		__fallthrough;
+	case LXC_CMD_GET_LIMIT_CGROUP2_FD:
+		__fallthrough;
+	case LXC_CMD_GET_INIT_PIDFD:
+		__fallthrough;
+	case LXC_CMD_GET_SECCOMP_NOTIFY_FD:
+		__fallthrough;
+	case LXC_CMD_GET_DEVPTS_FD:
+		fds->fd_count_max = 1;
+		/*
+		 * The kernel might not support the required features or the
+		 * server might be too old.
+		 */
+		fds->flags = UNIX_FDS_ACCEPT_EXACT | UNIX_FDS_ACCEPT_NONE;
+		break;
+	case LXC_CMD_GET_TTY_FD:
+		/*
+		 * The requested terminal can be busy so it's perfectly fine
+		 * for LXC_CMD_GET_TTY to receive no file descriptor.
+		 */
+		fds->fd_count_max = 1;
+		fds->flags = UNIX_FDS_ACCEPT_EXACT | UNIX_FDS_ACCEPT_NONE;
+		break;
+	case LXC_CMD_GET_CGROUP_CTX:
+		fds->fd_count_max = CGROUP_CTX_MAX_FD;
+		/* 
+		 * The container might run without any cgroup support at all,
+		 * i.e. no writable cgroup hierarchy was found.
+		 */
+		fds->flags |= UNIX_FDS_ACCEPT_LESS  | UNIX_FDS_ACCEPT_NONE ;
+		break;
+	default:
+		fds->fd_count_max = 0;
+		break;
+	}
 
-	if (cmd->req.cmd == LXC_CMD_CONSOLE) {
-		struct lxc_cmd_console_rsp_data *rspdata;
+	/* Receive the first response including file descriptors if any. */
+	bytes_recv = lxc_cmd_rsp_recv_fds(sock, fds, rsp, cur_cmdstr);
+	if (bytes_recv < 0)
+		return bytes_recv;
 
-		/* recv() returns 0 bytes when a tty cannot be allocated,
-		 * rsp->ret is < 0 when the peer permission check failed
+	/*
+	 * Ensure that no excessive data is sent unless someone retrieves the
+	 * console ringbuffer.
+	 */
+	if ((rsp->datalen > LXC_CMD_DATA_MAX) &&
+	    (cur_cmd != LXC_CMD_CONSOLE_LOG))
+		return syserror_set(-E2BIG, "Response data for command \"%s\" is too long: %d bytes > %d",
+				    cur_cmdstr, rsp->datalen, LXC_CMD_DATA_MAX);
+
+	/*
+	 * Prepare buffer for any command that expects to receive additional
+	 * data. Note that some don't want any additional data.
+	 */
+	switch (cur_cmd) {
+	case LXC_CMD_GET_CGROUP2_FD:		/* no data */
+		__fallthrough;
+	case LXC_CMD_GET_LIMIT_CGROUP2_FD:	/* no data */
+		__fallthrough;
+	case LXC_CMD_GET_INIT_PIDFD:		/* no data */
+		__fallthrough;
+	case LXC_CMD_GET_DEVPTS_FD:		/* no data */
+		__fallthrough;
+	case LXC_CMD_GET_SECCOMP_NOTIFY_FD:	/* no data */
+		rsp->data = INT_TO_PTR(move_fd(fds->fd0));
+		return log_debug(0, "Finished processing \"%s\" with file descriptor %d", cur_cmdstr, PTR_TO_INT(rsp->data));
+	case LXC_CMD_GET_CGROUP_FD:		/* data */
+		__fallthrough;
+	case LXC_CMD_GET_LIMIT_CGROUP_FD:	/* data */
+		if ((size_t)rsp->datalen > sizeof(struct cgroup_fd))
+			return syserror_set(-EINVAL, "Invalid response size from server for \"%s\"", cur_cmdstr);
+
+		/* Don't pointlessly allocate. */
+		rsp->data = (void *)cmd->req.data;
+		break;
+	case LXC_CMD_GET_CGROUP_CTX:		/* data */
+		if ((size_t)rsp->datalen > sizeof(struct cgroup_ctx))
+			return syserror_set(-EINVAL, "Invalid response size from server for \"%s\"", cur_cmdstr);
+
+		/* Don't pointlessly allocate. */
+		rsp->data = (void *)cmd->req.data;
+		break;
+	case LXC_CMD_GET_TTY_FD:			/* data */
+		/*
+		 * recv() returns 0 bytes when a tty cannot be allocated,
+		 * rsp->ret is < 0 when the peer permission check failed.
 		 */
-		if (ret == 0 || rsp->ret < 0)
+		if (bytes_recv == 0 || rsp->ret < 0)
 			return 0;
 
-		rspdata = malloc(sizeof(*rspdata));
-		if (!rspdata)
-			return log_warn_errno(-1,
-					      ENOMEM, "Failed to receive response for command \"%s\"",
-					      lxc_cmd_str(cmd->req.cmd));
-
-		rspdata->ptmxfd = move_fd(fd_rsp);
-		rspdata->ttynum = PTR_TO_INT(rsp->data);
-		rsp->data = rspdata;
-	}
-
-	if (cmd->req.cmd == LXC_CMD_GET_CGROUP2_FD ||
-	    cmd->req.cmd == LXC_CMD_GET_LIMITING_CGROUP2_FD)
-	{
-		int cgroup2_fd = move_fd(fd_rsp);
-		rsp->data = INT_TO_PTR(cgroup2_fd);
-	}
+		__data = malloc(sizeof(struct lxc_cmd_tty_rsp_data));
+		if (__data) {
+			struct lxc_cmd_tty_rsp_data *tty = __data;
 
-	if (cmd->req.cmd == LXC_CMD_GET_INIT_PIDFD) {
-		int init_pidfd = move_fd(fd_rsp);
-		rsp->data = INT_TO_PTR(init_pidfd);
+			tty->ptxfd	= move_fd(fds->fd0);
+			tty->ttynum	= PTR_TO_INT(rsp->data);
+			rsp->datalen	= 0;
+			rsp->data	= tty;
+			break;
+		}
+		return syserror_set(-ENOMEM, "Failed to receive response for command \"%s\"", cur_cmdstr);
+	case LXC_CMD_CONSOLE_LOG:		/* data */
+		if (rsp->datalen > 0)
+			__data = zalloc(rsp->datalen + 1);
+		rsp->data = __data;
+		break;
+	default:				/* catch any additional command */
+		if (rsp->datalen > 0) {
+			__data = zalloc(rsp->datalen);
+			rsp->data = __data;
+		}
+		break;
 	}
 
-	if (rsp->datalen == 0)
-		return log_debug(ret,
-				 "Response data length for command \"%s\" is 0",
-				 lxc_cmd_str(cmd->req.cmd));
+	if (rsp->datalen > 0) {
+		int err;
 
-	if ((rsp->datalen > LXC_CMD_DATA_MAX) &&
-	    (cmd->req.cmd != LXC_CMD_CONSOLE_LOG))
-		return log_error(-1, "Response data for command \"%s\" is too long: %d bytes > %d",
-				 lxc_cmd_str(cmd->req.cmd), rsp->datalen,
-				 LXC_CMD_DATA_MAX);
-
-	if (cmd->req.cmd == LXC_CMD_CONSOLE_LOG) {
-		rsp->data = malloc(rsp->datalen + 1);
-		((char *)rsp->data)rsp->datalen = '\0';
-	} else {
-		rsp->data = malloc(rsp->datalen);
+		/*
+		 * All commands ending up here expect data so rsp->data must be valid.
+		 * Either static or allocated memory.
+		 */
+		if (!rsp->data)
+			return syserror_set(-ENOMEM, "Failed to prepare response buffer for command \"%s\"",
+					    cur_cmdstr);
+
+		bytes_recv = lxc_recv_nointr(sock, rsp->data, rsp->datalen, 0);
+		if (bytes_recv != rsp->datalen)
+			return syserror("Failed to receive response data for command \"%s\": %zd != %d",
+					cur_cmdstr, bytes_recv, rsp->datalen);
+
+		switch (cur_cmd) {
+		case LXC_CMD_GET_CGROUP_CTX:
+			err = __transfer_cgroup_ctx_fds(fds, rsp->data);
+			break;
+		case LXC_CMD_GET_CGROUP_FD:
+			__fallthrough;
+		case LXC_CMD_GET_LIMIT_CGROUP_FD:
+			err = __transfer_cgroup_fd(fds, rsp->data);
+			break;
+		default:
+			err = 0;
+		}
+		if (err < 0)
+			return syserror_ret(err, "Failed to transfer file descriptors for command \"%s\"", cur_cmdstr);
 	}
-	if (!rsp->data)
-		return log_error_errno(-1,
-				       ENOMEM, "Failed to allocate response buffer for command \"%s\"",
-				       lxc_cmd_str(cmd->req.cmd));
-
-	ret = lxc_recv_nointr(sock, rsp->data, rsp->datalen, 0);
-	if (ret != rsp->datalen)
-		return log_error_errno(-1,
-				       errno, "Failed to receive response data for command \"%s\"",
-				       lxc_cmd_str(cmd->req.cmd));
 
-	return ret;
+	move_ptr(__data);
+	return bytes_recv;
 }
 
 /*
@@ -195,26 +345,101 @@
  *
  * Returns 0 on success, < 0 on failure
  */
-static int lxc_cmd_rsp_send(int fd, struct lxc_cmd_rsp *rsp)
+static int __lxc_cmd_rsp_send(int fd, struct lxc_cmd_rsp *rsp)
 {
 	ssize_t ret;
 
-	errno = EMSGSIZE;
 	ret = lxc_send_nointr(fd, rsp, sizeof(*rsp), MSG_NOSIGNAL);
 	if (ret < 0 || (size_t)ret != sizeof(*rsp))
-		return log_error_errno(-1, errno, "Failed to send command response %zd", ret);
+		return syserror("Failed to send command response %zd", ret);
 
 	if (!rsp->data || rsp->datalen <= 0)
 		return 0;
 
-	errno = EMSGSIZE;
 	ret = lxc_send_nointr(fd, rsp->data, rsp->datalen, MSG_NOSIGNAL);
 	if (ret < 0 || ret != (ssize_t)rsp->datalen)
-		return log_warn_errno(-1, errno, "Failed to send command response data %zd", ret);
+		return syswarn("Failed to send command response %zd", ret);
+
+	return 0;
+}
+
+static inline int lxc_cmd_rsp_send_reap(int fd, struct lxc_cmd_rsp *rsp)
+{
+	int ret;
+
+	ret = __lxc_cmd_rsp_send(fd, rsp);
+	if (ret < 0)
+		return ret;
+
+	return LXC_CMD_REAP_CLIENT_FD;
+}
+
+static inline int lxc_cmd_rsp_send_keep(int fd, struct lxc_cmd_rsp *rsp)
+{
+	int ret;
+
+	ret = __lxc_cmd_rsp_send(fd, rsp);
+	if (ret < 0)
+		return ret;
 
 	return 0;
 }
 
+static inline int rsp_one_fd_reap(int fd, int fd_send, struct lxc_cmd_rsp *rsp)
+{
+	ssize_t ret;
+
+	ret = lxc_abstract_unix_send_fds(fd, &fd_send, 1, rsp, sizeof(*rsp));
+	if (ret < 0)
+		return ret;
+
+	if (rsp->data && rsp->datalen > 0) {
+		ret = lxc_send_nointr(fd, rsp->data, rsp->datalen, MSG_NOSIGNAL);
+		if (ret < 0 || ret != (ssize_t)rsp->datalen)
+			return syswarn("Failed to send command response %zd", ret);
+	}
+
+	return LXC_CMD_REAP_CLIENT_FD;
+}
+
+static inline int rsp_one_fd_keep(int fd, int fd_send, struct lxc_cmd_rsp *rsp)
+{
+	int ret;
+
+	ret = rsp_one_fd_reap(fd, fd_send, rsp);
+	if (ret == LXC_CMD_REAP_CLIENT_FD)
+		ret = LXC_CMD_KEEP_CLIENT_FD;
+
+	return ret;
+}
+
+__access_r(3, 2) static int rsp_many_fds_reap(int fd, __u32 fds_len,
+					      const __s32 fdsstatic 2,
+					      struct lxc_cmd_rsp *rsp)
+{
+	ssize_t ret;
+
+	if (fds_len > KERNEL_SCM_MAX_FD) {
+		rsp->ret = -E2BIG;
+		return lxc_cmd_rsp_send_reap(fd, rsp);
+	} else if (fds_len == 0) {
+		rsp->ret = -ENOENT;
+		return lxc_cmd_rsp_send_reap(fd, rsp);
+	}
+
+	ret = lxc_abstract_unix_send_fds(fd, fds, fds_len, rsp, sizeof(*rsp));
+	if (ret < 0)
+		return ret;
+
+	if (rsp->data && rsp->datalen > 0) {
+		ret = lxc_send_nointr(fd, rsp->data, rsp->datalen, MSG_NOSIGNAL);
+		if (ret < 0 || ret != (ssize_t)rsp->datalen)
+			return syswarn("Failed to send command response %zd", ret);
+	}
+
+	return LXC_CMD_REAP_CLIENT_FD;
+}
+
 static int lxc_cmd_send(const char *name, struct lxc_cmd_rr *cmd,
 			const char *lxcpath, const char *hashed_sock_name)
 {
@@ -260,22 +485,22 @@
  *
  * Returns the size of the response message on success, < 0 on failure
  *
- * Note that there is a special case for LXC_CMD_CONSOLE. For this command
- * the fd cannot be closed because it is used as a placeholder to indicate
- * that a particular tty slot is in use. The fd is also used as a signal to
- * the container that when the caller dies or closes the fd, the container
- * will notice the fd on its side of the socket in its mainloop select and
- * then free the slot with lxc_cmd_fd_cleanup(). The socket fd will be
- * returned in the cmd response structure.
+ * Note that there is a special case for LXC_CMD_GET_TTY_FD. For this command
+ * the fd cannot be closed because it is used as a placeholder to indicate that
+ * a particular tty slot is in use. The fd is also used as a signal to the
+ * container that when the caller dies or closes the fd, the container will
+ * notice the fd on its side of the socket in its mainloop select and then free
+ * the slot with lxc_cmd_fd_cleanup(). The socket fd will be returned in the
+ * cmd response structure.
  */
-static int lxc_cmd(const char *name, struct lxc_cmd_rr *cmd, int *stopped,
-		   const char *lxcpath, const char *hashed_sock_name)
+static ssize_t lxc_cmd(const char *name, struct lxc_cmd_rr *cmd, bool *stopped,
+		       const char *lxcpath, const char *hashed_sock_name)
 {
 	__do_close int client_fd = -EBADF;
-	int ret = -1;
 	bool stay_connected = false;
+	ssize_t ret;
 
-	if (cmd->req.cmd == LXC_CMD_CONSOLE ||
+	if (cmd->req.cmd == LXC_CMD_GET_TTY_FD ||
 	    cmd->req.cmd == LXC_CMD_ADD_STATE_CLIENT)
 		stay_connected = true;
 
@@ -286,8 +511,7 @@
 		if (errno == ECONNREFUSED || errno == EPIPE)
 			*stopped = 1;
 
-		return log_trace_errno(-1, errno, "Command \"%s\" failed to connect command socket",
-				       lxc_cmd_str(cmd->req.cmd));
+		return systrace("Command \"%s\" failed to connect command socket", lxc_cmd_str(cmd->req.cmd));
 	}
 
 	ret = lxc_cmd_rsp_recv(client_fd, cmd);
@@ -305,10 +529,11 @@
 
 int lxc_try_cmd(const char *name, const char *lxcpath)
 {
-	int stopped, ret;
-	struct lxc_cmd_rr cmd = {
-		.req = { .cmd = LXC_CMD_GET_INIT_PID },
-	};
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_INIT_PID);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (stopped)
@@ -320,7 +545,8 @@
 	if (ret > 0)
 		return 0;
 
-	/* At this point we weren't denied access, and the container *was*
+	/*
+	 * At this point we weren't denied access, and the container *was*
 	 * started. There was some inexplicable error in the protocol.  I'm not
 	 * clear on whether we should return -1 here, but we didn't receive a
 	 * -EACCES, so technically it's not that we're not allowed to control
@@ -337,7 +563,6 @@
  */
 static int validate_string_request(int fd, const struct lxc_cmd_req *req)
 {
-	int ret;
 	size_t maxlen = req->datalen - 1;
 	const char *data = req->data;
 
@@ -345,16 +570,12 @@
 		return 0;
 
 	struct lxc_cmd_rsp rsp = {
-		.ret = -EINVAL,
-		.datalen = 0,
-		.data = NULL,
+		.ret		= -EINVAL,
+		.datalen	= 0,
+		.data		= NULL,
 	};
 
-	ret = lxc_cmd_rsp_send(fd, &rsp);
-	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
-
-	return -1;
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 /* Implementations of the commands and their callbacks */
@@ -369,16 +590,12 @@
  */
 pid_t lxc_cmd_get_init_pid(const char *name, const char *lxcpath)
 {
-	int ret, stopped;
-	pid_t pid = -1;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_GET_INIT_PID
-		},
-		.rsp = {
-			.data = PID_TO_PTR(pid)
-		}
-	};
+	bool stopped = false;
+	ssize_t ret;
+	pid_t pid;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_INIT_PID);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
@@ -388,7 +605,8 @@
 	if (pid < 0)
 		return -1;
 
-	/* We need to assume that pid_t can actually hold any pid given to us
+	/*
+	 * We need to assume that pid_t can actually hold any pid given to us
 	 * by the kernel. If it can't it's a libc bug.
 	 */
 	return (pid_t)pid;
@@ -396,57 +614,199 @@
 
 static int lxc_cmd_get_init_pid_callback(int fd, struct lxc_cmd_req *req,
 					 struct lxc_handler *handler,
-					 struct lxc_epoll_descr *descr)
+					 struct lxc_async_descr *descr)
 {
-	int ret;
 	struct lxc_cmd_rsp rsp = {
-		.data = PID_TO_PTR(handler->pid)
+		.data = PID_TO_PTR(handler->pid),
 	};
 
-	ret = lxc_cmd_rsp_send(fd, &rsp);
-	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
-
-	return 0;
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 int lxc_cmd_get_init_pidfd(const char *name, const char *lxcpath)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_GET_INIT_PIDFD,
-		},
-	};
+	bool stopped = false;
+	int fd;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_INIT_PIDFD);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
-		return log_debug_errno(-1, errno, "Failed to process init pidfd command");
+		return sysdebug("Failed to process \"%s\"",
+				lxc_cmd_str(LXC_CMD_GET_INIT_PIDFD));
 
 	if (cmd.rsp.ret < 0)
-		return log_debug_errno(-EBADF, errno, "Failed to receive init pidfd");
+		return sysdebug_set(cmd.rsp.ret, "Failed to receive file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_INIT_PIDFD));
 
-	return PTR_TO_INT(cmd.rsp.data);
+	fd = PTR_TO_INT(cmd.rsp.data);
+	if (fd < 0)
+		return sysdebug_set(fd, "Received invalid file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_INIT_PIDFD));
+
+	return fd;
 }
 
 static int lxc_cmd_get_init_pidfd_callback(int fd, struct lxc_cmd_req *req,
 					   struct lxc_handler *handler,
-					   struct lxc_epoll_descr *descr)
+					   struct lxc_async_descr *descr)
 {
 	struct lxc_cmd_rsp rsp = {
-		.ret = 0,
+		.ret = -EBADF,
 	};
-	int ret;
 
 	if (handler->pidfd < 0)
-		rsp.ret = -EBADF;
-	ret = lxc_abstract_unix_send_fds(fd, &handler->pidfd, 1, &rsp, sizeof(rsp));
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
+
+	rsp.ret = 0;
+	return rsp_one_fd_reap(fd, handler->pidfd, &rsp);
+}
+
+int lxc_cmd_get_devpts_fd(const char *name, const char *lxcpath)
+{
+	bool stopped = false;
+	int fd;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_DEVPTS_FD);
+
+	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
+	if (ret < 0)
+		return sysdebug("Failed to process \"%s\"",
+				lxc_cmd_str(LXC_CMD_GET_DEVPTS_FD));
+
+	if (cmd.rsp.ret < 0)
+		return sysdebug_set(cmd.rsp.ret, "Failed to receive file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_DEVPTS_FD));
+
+	fd = PTR_TO_INT(cmd.rsp.data);
+	if (fd < 0)
+		return sysdebug_set(fd, "Received invalid file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_DEVPTS_FD));
+	return fd;
+}
+
+static int lxc_cmd_get_devpts_fd_callback(int fd, struct lxc_cmd_req *req,
+					  struct lxc_handler *handler,
+					  struct lxc_async_descr *descr)
+{
+	struct lxc_cmd_rsp rsp = {
+		.ret = -EBADF,
+	};
+
+	if (handler->conf->devpts_fd < 0)
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
+
+	rsp.ret = 0;
+	return rsp_one_fd_reap(fd, handler->conf->devpts_fd, &rsp);
+}
+
+int lxc_cmd_get_seccomp_notify_fd(const char *name, const char *lxcpath)
+{
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
+	bool stopped = false;
+	int fd;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_SECCOMP_NOTIFY_FD);
+
+	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
-		return log_error(LXC_CMD_REAP_CLIENT_FD, "Failed to send init pidfd");
+		return sysdebug("Failed to process \"%s\"",
+				lxc_cmd_str(LXC_CMD_GET_SECCOMP_NOTIFY_FD));
+
+	if (cmd.rsp.ret < 0)
+		return sysdebug_set(cmd.rsp.ret, "Failed to receive file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_SECCOMP_NOTIFY_FD));
+
+	fd = PTR_TO_INT(cmd.rsp.data);
+	if (fd < 0)
+		return sysdebug_set(fd, "Received invalid file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_SECCOMP_NOTIFY_FD));
+	return fd;
+#else
+	return ret_errno(ENOSYS);
+#endif
+}
+
+static int lxc_cmd_get_seccomp_notify_fd_callback(int fd, struct lxc_cmd_req *req,
+						  struct lxc_handler *handler,
+						  struct lxc_async_descr *descr)
+{
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
+	struct lxc_cmd_rsp rsp = {
+		.ret = -EBADF,
+	};
+
+	if (handler->conf->seccomp.notifier.notify_fd < 0)
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
+
+	rsp.ret = 0;
+	return rsp_one_fd_reap(fd, handler->conf->seccomp.notifier.notify_fd, &rsp);
+#else
+	return syserror_set(-EOPNOTSUPP, "Seccomp notifier not supported");
+#endif
+}
+
+int lxc_cmd_get_cgroup_ctx(const char *name, const char *lxcpath,
+			   size_t size_ret_ctx, struct cgroup_ctx *ret_ctx)
+{
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_CGROUP_CTX);
+	lxc_cmd_data(&cmd, size_ret_ctx, ret_ctx);
+
+	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
+	if (ret < 0)
+		return sysdebug("Failed to process \"%s\"",
+				lxc_cmd_str(LXC_CMD_GET_CGROUP_CTX));
+
+	if (cmd.rsp.ret < 0) {
+		/* Container does not have any writable cgroups. */
+		if (ret_ctx->fd_len == 0)
+			return 0;
+
+		return sysdebug_set(cmd.rsp.ret, "Failed to receive file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_CGROUP_CTX));
+	}
 
 	return 0;
 }
 
+static int lxc_cmd_get_cgroup_ctx_callback(int fd, struct lxc_cmd_req *req,
+					   struct lxc_handler *handler,
+					   struct lxc_async_descr *descr)
+{
+	struct lxc_cmd_rsp rsp = {
+		.ret = EINVAL,
+	};
+	struct cgroup_ops *cgroup_ops = handler->cgroup_ops;
+	struct cgroup_ctx ctx_server = {};
+	ssize_t ret;
+
+	ret = copy_struct_from_client(sizeof(struct cgroup_ctx), &ctx_server,
+				      req->datalen, req->data);
+	if (ret < 0)
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
+
+	ret = prepare_cgroup_ctx(cgroup_ops, &ctx_server);
+	if (ret < 0) {
+		rsp.ret = ret;
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
+	}
+
+	rsp.ret = 0;
+	rsp.data = &ctx_server;
+	rsp.datalen = min(sizeof(struct cgroup_ctx), (size_t)req->datalen);
+	return rsp_many_fds_reap(fd, ctx_server.fd_len, ctx_server.fd, &rsp);
+}
+
 /*
  * lxc_cmd_get_clone_flags: Get clone flags container was spawned with
  *
@@ -457,12 +817,11 @@
  */
 int lxc_cmd_get_clone_flags(const char *name, const char *lxcpath)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_GET_CLONE_FLAGS,
-		},
-	};
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_CLONE_FLAGS);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
@@ -473,44 +832,34 @@
 
 static int lxc_cmd_get_clone_flags_callback(int fd, struct lxc_cmd_req *req,
 					    struct lxc_handler *handler,
-					    struct lxc_epoll_descr *descr)
+					    struct lxc_async_descr *descr)
 {
-	int ret;
 	struct lxc_cmd_rsp rsp = {
 		.data = INT_TO_PTR(handler->ns_clone_flags),
 	};
 
-	ret = lxc_cmd_rsp_send(fd, &rsp);
-	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
-
-	return 0;
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
-static char *lxc_cmd_get_cgroup_path_do(const char *name, const char *lxcpath,
-					const char *subsystem,
-					lxc_cmd_t command)
+static char *lxc_cmd_get_cgroup_path_callback(const char *name,
+					      const char *lxcpath,
+					      const char *controller,
+					      lxc_cmd_t command)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = command,
-			.data = subsystem,
-			.datalen = 0,
-		},
-	};
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
 
-	cmd.req.data = subsystem;
-	cmd.req.datalen = 0;
-	if (subsystem)
-		cmd.req.datalen = strlen(subsystem) + 1;
+	lxc_cmd_init(&cmd, command);
+	if (controller)
+		lxc_cmd_data(&cmd, strlen(controller) + 1, controller);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
 		return NULL;
 
 	if (ret == 0) {
-		if (command == LXC_CMD_GET_LIMITING_CGROUP) {
+		if (command == LXC_CMD_GET_LIMIT_CGROUP) {
 			/*
 			 * This may indicate that the container was started
 			 * under an ealier version before
@@ -518,9 +867,9 @@
 			 * it sees an unknown command and just closes the
 			 * socket, sending us an EOF.
 			 */
-			return lxc_cmd_get_cgroup_path_do(name, lxcpath,
-							  subsystem,
-							  LXC_CMD_GET_CGROUP);
+			return lxc_cmd_get_cgroup_path_callback(name, lxcpath,
+								controller,
+								LXC_CMD_GET_CGROUP);
 		}
 		return NULL;
 	}
@@ -533,50 +882,50 @@
 
 /*
  * lxc_cmd_get_cgroup_path: Calculate a container's cgroup path for a
- * particular subsystem. This is the cgroup path relative to the root
+ * particular controller. This is the cgroup path relative to the root
  * of the cgroup filesystem.
  *
  * @name      : name of container to connect to
  * @lxcpath   : the lxcpath in which the container is running
- * @subsystem : the subsystem being asked about
+ * @controller : the controller being asked about
  *
  * Returns the path on success, NULL on failure. The caller must free() the
  * returned path.
  */
 char *lxc_cmd_get_cgroup_path(const char *name, const char *lxcpath,
-			      const char *subsystem)
+			      const char *controller)
 {
-	return lxc_cmd_get_cgroup_path_do(name, lxcpath, subsystem,
-					  LXC_CMD_GET_CGROUP);
+	return lxc_cmd_get_cgroup_path_callback(name, lxcpath, controller,
+						LXC_CMD_GET_CGROUP);
 }
 
 /*
- * lxc_cmd_get_limiting_cgroup_path: Calculate a container's limiting cgroup
- * path for a particular subsystem. This is the cgroup path relative to the
+ * lxc_cmd_get_limit_cgroup_path: Calculate a container's limit cgroup
+ * path for a particular controller. This is the cgroup path relative to the
  * root of the cgroup filesystem. This may be the same as the path returned by
- * lxc_cmd_get_cgroup_path if the container doesn't have a limiting path prefix
+ * lxc_cmd_get_cgroup_path if the container doesn't have a limit path prefix
  * set.
  *
  * @name      : name of container to connect to
  * @lxcpath   : the lxcpath in which the container is running
- * @subsystem : the subsystem being asked about
+ * @controller : the controller being asked about
  *
  * Returns the path on success, NULL on failure. The caller must free() the
  * returned path.
  */
-char *lxc_cmd_get_limiting_cgroup_path(const char *name, const char *lxcpath,
-				       const char *subsystem)
+char *lxc_cmd_get_limit_cgroup_path(const char *name, const char *lxcpath,
+				    const char *controller)
 {
-	return lxc_cmd_get_cgroup_path_do(name, lxcpath, subsystem,
-					  LXC_CMD_GET_LIMITING_CGROUP);
+	return lxc_cmd_get_cgroup_path_callback(name, lxcpath, controller,
+						LXC_CMD_GET_LIMIT_CGROUP);
 }
 
-static int lxc_cmd_get_cgroup_callback_do(int fd, struct lxc_cmd_req *req,
-					  struct lxc_handler *handler,
-					  struct lxc_epoll_descr *descr,
-					  bool limiting_cgroup)
+static int __lxc_cmd_get_cgroup_callback(int fd, struct lxc_cmd_req *req,
+					 struct lxc_handler *handler,
+					 struct lxc_async_descr *descr,
+					 bool limiting_cgroup)
 {
-	int ret;
+	ssize_t ret;
 	const char *path;
 	const void *reqdata;
 	struct lxc_cmd_rsp rsp;
@@ -592,8 +941,8 @@
 		reqdata = NULL;
 	}
 
-	get_fn = (limiting_cgroup ? cgroup_ops->get_cgroup
-				  : cgroup_ops->get_limiting_cgroup);
+	get_fn = (limiting_cgroup ? cgroup_ops->get_limit_cgroup
+				  : cgroup_ops->get_cgroup);
 
 	path = get_fn(cgroup_ops, reqdata);
 
@@ -604,25 +953,21 @@
 	rsp.datalen = strlen(path) + 1;
 	rsp.data = (char *)path;
 
-	ret = lxc_cmd_rsp_send(fd, &rsp);
-	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
-
-	return 0;
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 static int lxc_cmd_get_cgroup_callback(int fd, struct lxc_cmd_req *req,
 				       struct lxc_handler *handler,
-				       struct lxc_epoll_descr *descr)
+				       struct lxc_async_descr *descr)
 {
-	return lxc_cmd_get_cgroup_callback_do(fd, req, handler, descr, false);
+	return __lxc_cmd_get_cgroup_callback(fd, req, handler, descr, false);
 }
 
-static int lxc_cmd_get_limiting_cgroup_callback(int fd, struct lxc_cmd_req *req,
-						struct lxc_handler *handler,
-						struct lxc_epoll_descr *descr)
+static int lxc_cmd_get_limit_cgroup_callback(int fd, struct lxc_cmd_req *req,
+					     struct lxc_handler *handler,
+					     struct lxc_async_descr *descr)
 {
-	return ret_errno(ENOSYS);
+	return __lxc_cmd_get_cgroup_callback(fd, req, handler, descr, true);
 }
 
 /*
@@ -638,13 +983,15 @@
 char *lxc_cmd_get_config_item(const char *name, const char *item,
 			      const char *lxcpath)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = { .cmd = LXC_CMD_GET_CONFIG_ITEM,
-			 .data = item,
-			 .datalen = strlen(item) + 1,
-		       },
-	};
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	if (is_empty_string(item))
+		return NULL;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_CONFIG_ITEM);
+	lxc_cmd_data(&cmd, strlen(item) + 1, item);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
@@ -658,7 +1005,7 @@
 
 static int lxc_cmd_get_config_item_callback(int fd, struct lxc_cmd_req *req,
 					    struct lxc_handler *handler,
-					    struct lxc_epoll_descr *descr)
+					    struct lxc_async_descr *descr)
 {
 	__do_free char *cidata = NULL;
 	int cilen;
@@ -667,9 +1014,6 @@
 
 	memset(&rsp, 0, sizeof(rsp));
 	item = lxc_get_config(req->data);
-	if (!item)
-		goto err1;
-
 	cilen = item->get(req->data, NULL, 0, handler->conf, NULL);
 	if (cilen <= 0)
 		goto err1;
@@ -687,11 +1031,7 @@
 err1:
 	rsp.ret = -1;
 out:
-	cilen = lxc_cmd_rsp_send(fd, &rsp);
-	if (cilen < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
-
-	return 0;
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 /*
@@ -704,12 +1044,11 @@
  */
 int lxc_cmd_get_state(const char *name, const char *lxcpath)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_GET_STATE,
-		},
-	};
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_STATE);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0 && stopped)
@@ -728,18 +1067,13 @@
 
 static int lxc_cmd_get_state_callback(int fd, struct lxc_cmd_req *req,
 				      struct lxc_handler *handler,
-				      struct lxc_epoll_descr *descr)
+				      struct lxc_async_descr *descr)
 {
-	int ret;
 	struct lxc_cmd_rsp rsp = {
 		.data = INT_TO_PTR(handler->state),
 	};
 
-	ret = lxc_cmd_rsp_send(fd, &rsp);
-	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
-
-	return 0;
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 /*
@@ -753,12 +1087,11 @@
  */
 int lxc_cmd_stop(const char *name, const char *lxcpath)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_STOP,
-		},
-	};
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_STOP);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0) {
@@ -779,7 +1112,7 @@
 
 static int lxc_cmd_stop_callback(int fd, struct lxc_cmd_req *req,
 				 struct lxc_handler *handler,
-				 struct lxc_epoll_descr *descr)
+				 struct lxc_async_descr *descr)
 {
 	struct lxc_cmd_rsp rsp;
 	int stopsignal = SIGKILL;
@@ -800,21 +1133,19 @@
 		else
 			TRACE("Sent signal %d to pidfd %d", stopsignal, handler->pid);
 
-		rsp.ret = cgroup_ops->unfreeze(cgroup_ops, -1);
-		if (!rsp.ret)
-			return 0;
+		if (pure_unified_layout(cgroup_ops))
+			ret = __cgroup_unfreeze(cgroup_ops->unified->dfd_lim, -1);
+		else
+			ret = cgroup_ops->unfreeze(cgroup_ops, -1);
+		if (ret)
+			WARN("Failed to unfreeze container \"%s\"", handler->name);
 
-		ERROR("Failed to unfreeze container \"%s\"", handler->name);
-		rsp.ret = -errno;
+		return 0;
 	} else {
 		rsp.ret = -errno;
 	}
 
-	ret = lxc_cmd_rsp_send(fd, &rsp);
-	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
-
-	return 0;
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 /*
@@ -832,37 +1163,37 @@
 
 static int lxc_cmd_terminal_winch_callback(int fd, struct lxc_cmd_req *req,
 					   struct lxc_handler *handler,
-					   struct lxc_epoll_descr *descr)
+					   struct lxc_async_descr *descr)
 {
 	/* should never be called */
-	return log_error_errno(-1, ENOSYS, "Called lxc_cmd_terminal_winch_callback()");
+	return syserror_set(-ENOSYS, "Called lxc_cmd_terminal_winch_callback()");
 }
 
 /*
- * lxc_cmd_console: Open an fd to a tty in the container
+ * lxc_cmd_get_tty_fd: Open an fd to a tty in the container
  *
  * @name           : name of container to connect to
  * @ttynum         : in:  the tty to open or -1 for next available
  *                 : out: the tty allocated
- * @fd             : out: file descriptor for ptmx side of pty
+ * @fd             : out: file descriptor for ptx side of pty
  * @lxcpath        : the lxcpath in which the container is running
  *
  * Returns fd holding tty allocated on success, < 0 on failure
  */
-int lxc_cmd_console(const char *name, int *ttynum, int *fd, const char *lxcpath)
-{
-	__do_free struct lxc_cmd_console_rsp_data *rspdata = NULL;
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd	= LXC_CMD_CONSOLE,
-			.data	= INT_TO_PTR(*ttynum),
-		},
-	};
+int lxc_cmd_get_tty_fd(const char *name, int *ttynum, int *fd, const char *lxcpath)
+{
+	__do_free struct lxc_cmd_tty_rsp_data *rspdata = NULL;
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_TTY_FD);
+	lxc_cmd_data(&cmd, ENCODE_INTO_PTR_LEN, INT_TO_PTR(*ttynum));
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
-		return ret;
+		return sysdebug("Failed to process \"%s\"",
+				lxc_cmd_str(LXC_CMD_GET_TTY_FD));
 
 	rspdata = cmd.rsp.data;
 	if (cmd.rsp.ret < 0)
@@ -871,38 +1202,41 @@
 	if (ret == 0)
 		return log_error(-1, "tty number %d invalid, busy or all ttys busy", *ttynum);
 
-	if (rspdata->ptmxfd < 0)
+	if (rspdata->ptxfd < 0)
 		return log_error(-1, "Unable to allocate fd for tty %d", rspdata->ttynum);
 
-	ret = cmd.rsp.ret; /* socket fd */
-	*fd = rspdata->ptmxfd;
+	ret	= cmd.rsp.ret; /* socket fd */
+	*fd	= rspdata->ptxfd;
 	*ttynum = rspdata->ttynum;
 
-	return log_info(ret, "Alloced fd %d for tty %d via socket %d", *fd, rspdata->ttynum, ret);
+	INFO("Alloced fd %d for tty %d via socket %zd", *fd, rspdata->ttynum, ret);
+	return ret;
 }
 
-static int lxc_cmd_console_callback(int fd, struct lxc_cmd_req *req,
-				    struct lxc_handler *handler,
-				    struct lxc_epoll_descr *descr)
+static int lxc_cmd_get_tty_fd_callback(int fd, struct lxc_cmd_req *req,
+				       struct lxc_handler *handler,
+				       struct lxc_async_descr *descr)
 {
-	int ptmxfd, ret;
-	struct lxc_cmd_rsp rsp;
-	int ttynum = PTR_TO_INT(req->data);
+	struct lxc_cmd_rsp rsp = {
+		.ret = -EBADF,
+	};
+	int ptxfd, ret, ttynum;
 
-	ptmxfd = lxc_terminal_allocate(handler->conf, fd, &ttynum);
-	if (ptmxfd < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
+	ttynum = PTR_TO_INT(req->data);
+	ptxfd = lxc_terminal_allocate(handler->conf, fd, &ttynum);
+	if (ptxfd < 0)
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
 
-	memset(&rsp, 0, sizeof(rsp));
+	rsp.ret = 0;
 	rsp.data = INT_TO_PTR(ttynum);
-	ret = lxc_abstract_unix_send_fds(fd, &ptmxfd, 1, &rsp, sizeof(rsp));
+	ret = rsp_one_fd_keep(fd, ptxfd, &rsp);
 	if (ret < 0) {
 		lxc_terminal_free(handler->conf, fd);
-		return log_error_errno(LXC_CMD_REAP_CLIENT_FD, errno,
-				       "Failed to send tty to client");
+		return ret;
 	}
 
-	return 0;
+	DEBUG("Send tty to client");
+	return ret;
 }
 
 /*
@@ -914,12 +1248,11 @@
  */
 char *lxc_cmd_get_name(const char *hashed_sock_name)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_GET_NAME,
-		},
-	};
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_NAME);
 
 	ret = lxc_cmd(NULL, &cmd, &stopped, NULL, hashed_sock_name);
 	if (ret < 0)
@@ -933,9 +1266,8 @@
 
 static int lxc_cmd_get_name_callback(int fd, struct lxc_cmd_req *req,
 				     struct lxc_handler *handler,
-				     struct lxc_epoll_descr *descr)
+				     struct lxc_async_descr *descr)
 {
-	int ret;
 	struct lxc_cmd_rsp rsp;
 
 	memset(&rsp, 0, sizeof(rsp));
@@ -944,11 +1276,7 @@
 	rsp.datalen = strlen(handler->name) + 1;
 	rsp.ret = 0;
 
-	ret = lxc_cmd_rsp_send(fd, &rsp);
-	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
-
-	return 0;
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 /*
@@ -960,12 +1288,11 @@
  */
 char *lxc_cmd_get_lxcpath(const char *hashed_sock_name)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_GET_LXCPATH,
-		},
-	};
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_LXCPATH);
 
 	ret = lxc_cmd(NULL, &cmd, &stopped, NULL, hashed_sock_name);
 	if (ret < 0)
@@ -979,36 +1306,78 @@
 
 static int lxc_cmd_get_lxcpath_callback(int fd, struct lxc_cmd_req *req,
 					struct lxc_handler *handler,
-					struct lxc_epoll_descr *descr)
+					struct lxc_async_descr *descr)
 {
-	int ret;
 	struct lxc_cmd_rsp rsp = {
 		.ret		= 0,
 		.data		= (char *)handler->lxcpath,
 		.datalen	= strlen(handler->lxcpath) + 1,
 	};
 
-	ret = lxc_cmd_rsp_send(fd, &rsp);
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
+}
+
+char *lxc_cmd_get_systemd_scope(const char *name, const char *lxcpath)
+{
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_SYSTEMD_SCOPE);
+
+	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
+		return NULL;
 
-	return 0;
+	if (cmd.rsp.ret == 0)
+		return cmd.rsp.data;
+
+	return NULL;
+}
+
+static int lxc_cmd_get_systemd_scope_callback(int fd, struct lxc_cmd_req *req,
+					     struct lxc_handler *handler,
+					     struct lxc_async_descr *descr)
+{
+	__do_free char *scope = NULL;
+	struct lxc_cmd_rsp rsp = {
+		.ret = -EINVAL,
+	};
+
+	// cgroup_meta.systemd_scope is the full cgroup path to the scope.
+	// The caller just wants the actual scope name, that is, basename().
+	// (XXX - or do we want the caller to massage it?  I'm undecided)
+	if (handler->conf->cgroup_meta.systemd_scope) {
+		scope = strrchr(handler->conf->cgroup_meta.systemd_scope, '/');
+		if (scope && *scope)
+			scope++;
+		if (scope && *scope)
+			scope = strdup(scope);
+	}
+
+	if (!scope)
+		goto out;
+
+	rsp.ret = 0;
+	rsp.data = scope;
+	rsp.datalen = strlen(scope) + 1;
+
+out:
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 int lxc_cmd_add_state_client(const char *name, const char *lxcpath,
-			     lxc_state_t statesMAX_STATE,
+			     lxc_state_t statesstatic MAX_STATE,
 			     int *state_client_fd)
 {
 	__do_close int clientfd = -EBADF;
-	int state, stopped;
+	bool stopped = false;
+	int state;
 	ssize_t ret;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd     = LXC_CMD_ADD_STATE_CLIENT,
-			.data    = states,
-			.datalen = (sizeof(lxc_state_t) * MAX_STATE)
-		},
-	};
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_ADD_STATE_CLIENT);
+	lxc_cmd_data(&cmd, (sizeof(lxc_state_t) * MAX_STATE), states);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (statesSTOPPED != 0 && stopped != 0)
@@ -1039,151 +1408,100 @@
 
 static int lxc_cmd_add_state_client_callback(__owns int fd, struct lxc_cmd_req *req,
 					     struct lxc_handler *handler,
-					     struct lxc_epoll_descr *descr)
+					     struct lxc_async_descr *descr)
 {
-	int ret;
-	struct lxc_cmd_rsp rsp = {0};
+	struct lxc_cmd_rsp rsp = {
+		.ret = -EINVAL,
+	};
 
 	if (req->datalen < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
+		goto reap_fd;
 
 	if (req->datalen != (sizeof(lxc_state_t) * MAX_STATE))
-		return LXC_CMD_REAP_CLIENT_FD;
+		goto reap_fd;
 
 	if (!req->data)
-		return LXC_CMD_REAP_CLIENT_FD;
+		goto reap_fd;
 
 	rsp.ret = lxc_add_state_client(fd, handler, (lxc_state_t *)req->data);
 	if (rsp.ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
+		goto reap_fd;
 
 	rsp.data = INT_TO_PTR(rsp.ret);
 
-	ret = lxc_cmd_rsp_send(fd, &rsp);
-	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
+	return lxc_cmd_rsp_send_keep(fd, &rsp);
 
-	return 0;
+reap_fd:
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 int lxc_cmd_add_bpf_device_cgroup(const char *name, const char *lxcpath,
 				  struct device_item *device)
 {
-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-	int stopped = 0;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd     = LXC_CMD_ADD_BPF_DEVICE_CGROUP,
-			.data    = device,
-			.datalen = sizeof(struct device_item),
-		},
-	};
-	int ret;
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
 
 	if (strlen(device->access) > STRLITERALLEN("rwm"))
-		return log_error_errno(-1, EINVAL, "Invalid access mode specified %s",
-				       device->access);
+		return syserror_set(-EINVAL, "Invalid access mode specified %s", device->access);
+
+	lxc_cmd_init(&cmd, LXC_CMD_ADD_BPF_DEVICE_CGROUP);
+	lxc_cmd_data(&cmd, sizeof(struct device_item), device);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
-	if (ret < 0 || cmd.rsp.ret < 0)
-		return log_error_errno(-1, errno, "Failed to add new bpf device cgroup rule");
+	if (ret < 0)
+		return syserror_set(ret, "Failed to process new bpf device cgroup command");
+
+	if (cmd.rsp.ret < 0)
+		return syserror_set(cmd.rsp.ret, "Failed to add new bpf device cgroup rule");
 
 	return 0;
-#else
-	return ret_set_errno(-1, ENOSYS);
-#endif
 }
 
 static int lxc_cmd_add_bpf_device_cgroup_callback(int fd, struct lxc_cmd_req *req,
 						  struct lxc_handler *handler,
-						  struct lxc_epoll_descr *descr)
+						  struct lxc_async_descr *descr)
 {
-#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
-	__do_bpf_program_free struct bpf_program *devices = NULL;
-	struct lxc_cmd_rsp rsp = {0};
-	struct lxc_conf *conf = handler->conf;
-	struct hierarchy *unified = handler->cgroup_ops->unified;
-	int ret;
-	struct lxc_list *it;
-	struct device_item *device;
-	struct bpf_program *devices_old;
+	struct lxc_cmd_rsp rsp = {
+		.ret = -EINVAL,
+	};
+	struct lxc_conf *conf;
 
 	if (req->datalen <= 0)
-		return LXC_CMD_REAP_CLIENT_FD;
+		goto out;
 
 	if (req->datalen != sizeof(struct device_item))
-		return LXC_CMD_REAP_CLIENT_FD;
+		goto out;
 
 	if (!req->data)
-		return LXC_CMD_REAP_CLIENT_FD;
-	device = (struct device_item *)req->data;
-
-	rsp.ret = -1;
-	if (!unified)
-		goto respond;
-
-	ret = bpf_list_add_device(conf, device);
-	if (ret < 0)
-		goto respond;
-
-	devices = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
-	if (!devices)
-		goto respond;
-
-	ret = bpf_program_init(devices);
-	if (ret)
-		goto respond;
-
-	lxc_list_for_each(it, &conf->devices) {
-		struct device_item *cur = it->elem;
-
-		ret = bpf_program_append_device(devices, cur);
-		if (ret)
-			goto respond;
-	}
-
-	ret = bpf_program_finalize(devices);
-	if (ret)
-		goto respond;
-
-	ret = bpf_program_cgroup_attach(devices, BPF_CGROUP_DEVICE,
-					unified->container_full_path,
-					BPF_F_ALLOW_MULTI);
-	if (ret)
-		goto respond;
-
-	/* Replace old bpf program. */
-	devices_old = move_ptr(conf->cgroup2_devices);
-	conf->cgroup2_devices = move_ptr(devices);
-	devices = move_ptr(devices_old);
-
-	rsp.ret = 0;
+		goto out;
 
-respond:
-	ret = lxc_cmd_rsp_send(fd, &rsp);
-	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
+	conf = handler->conf;
+	if (!bpf_cgroup_devices_update(handler->cgroup_ops,
+				       &conf->bpf_devices,
+				       (struct device_item *)req->data))
+		rsp.ret = -1;
+	else
+		rsp.ret = 0;
 
-	return 0;
-#else
-	return ret_set_errno(-1, ENOSYS);
-#endif
+out:
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 int lxc_cmd_console_log(const char *name, const char *lxcpath,
 			struct lxc_console_log *log)
 {
-	int ret, stopped;
-	struct lxc_cmd_console_log data;
+	bool stopped = false;
+	struct lxc_cmd_console_log data = {
+		.clear		= log->clear,
+		.read		= log->read,
+		.read_max	= *log->read_max,
+	};
+	ssize_t ret;
 	struct lxc_cmd_rr cmd;
 
-	data.clear = log->clear;
-	data.read = log->read;
-	data.read_max = *log->read_max;
-
-	cmd.req.cmd = LXC_CMD_CONSOLE_LOG;
-	cmd.req.data = &data;
-	cmd.req.datalen = sizeof(struct lxc_cmd_console_log);
+	lxc_cmd_init(&cmd, LXC_CMD_CONSOLE_LOG);
+	lxc_cmd_data(&cmd, sizeof(struct lxc_cmd_console_log), &data);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
@@ -1201,15 +1519,15 @@
 	if (cmd.rsp.ret < 0)
 		return cmd.rsp.ret;
 
-	*log->read_max = cmd.rsp.datalen;
-	log->data = cmd.rsp.data;
+	*log->read_max	= cmd.rsp.datalen;
+	log->data	= cmd.rsp.data;
 
 	return 0;
 }
 
 static int lxc_cmd_console_log_callback(int fd, struct lxc_cmd_req *req,
 					struct lxc_handler *handler,
-					struct lxc_epoll_descr *descr)
+					struct lxc_async_descr *descr)
 {
 	struct lxc_cmd_rsp rsp;
 	uint64_t buffer_size = handler->conf->console.buffer_size;
@@ -1228,7 +1546,7 @@
 	if (log->read)
 		rsp.data = lxc_ringbuf_get_read_addr(buf);
 
-	if (log->read_max > 0 && (log->read_max <= rsp.datalen))
+	if (log->read_max > 0 && (log->read_max <= (uint64_t)rsp.datalen))
 		rsp.datalen = log->read_max;
 
 	/* there's nothing to read */
@@ -1243,20 +1561,18 @@
 		lxc_ringbuf_move_read_addr(buf, rsp.datalen);
 
 out:
-	return lxc_cmd_rsp_send(fd, &rsp);
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 int lxc_cmd_serve_state_clients(const char *name, const char *lxcpath,
 				lxc_state_t state)
 {
-	int stopped;
+	bool stopped = false;
 	ssize_t ret;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd  = LXC_CMD_SERVE_STATE_CLIENTS,
-			.data = INT_TO_PTR(state)
-		},
-	};
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_SERVE_STATE_CLIENTS);
+	lxc_cmd_data(&cmd, ENCODE_INTO_PTR_LEN, INT_TO_PTR(state));
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
@@ -1267,7 +1583,7 @@
 
 static int lxc_cmd_serve_state_clients_callback(int fd, struct lxc_cmd_req *req,
 						struct lxc_handler *handler,
-						struct lxc_epoll_descr *descr)
+						struct lxc_async_descr *descr)
 {
 	int ret;
 	lxc_state_t state = PTR_TO_INT(req->data);
@@ -1275,13 +1591,9 @@
 
 	ret = lxc_serve_state_clients(handler->name, handler, state);
 	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
-
-	ret = lxc_cmd_rsp_send(fd, &rsp);
-	if (ret < 0)
-		return LXC_CMD_REAP_CLIENT_FD;
+		return ret;
 
-	return 0;
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 int lxc_cmd_seccomp_notify_add_listener(const char *name, const char *lxcpath,
@@ -1290,14 +1602,13 @@
 					/* unused */ unsigned int flags)
 {
 
-#ifdef HAVE_SECCOMP_NOTIFY
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_SECCOMP_NOTIFY_ADD_LISTENER,
-			.data = INT_TO_PTR(fd),
-		},
-	};
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_SECCOMP_NOTIFY_ADD_LISTENER);
+	lxc_cmd_data(&cmd, ENCODE_INTO_PTR_LEN, INT_TO_PTR(fd));
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
@@ -1312,15 +1623,15 @@
 static int lxc_cmd_seccomp_notify_add_listener_callback(int fd,
 							struct lxc_cmd_req *req,
 							struct lxc_handler *handler,
-							struct lxc_epoll_descr *descr)
+							struct lxc_async_descr *descr)
 {
 	struct lxc_cmd_rsp rsp = {0};
 
-#ifdef HAVE_SECCOMP_NOTIFY
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
 	int ret;
 	__do_close int recv_fd = -EBADF;
 
-	ret = lxc_abstract_unix_recv_fds(fd, &recv_fd, 1, NULL, 0);
+	ret = lxc_abstract_unix_recv_one_fd(fd, &recv_fd, NULL, 0);
 	if (ret <= 0) {
 		rsp.ret = -errno;
 		goto out;
@@ -1333,8 +1644,10 @@
 		goto out;
 	}
 
-	ret = lxc_mainloop_add_handler(descr, recv_fd, seccomp_notify_handler,
-				       handler);
+	ret = lxc_mainloop_add_handler(descr, recv_fd,
+				       seccomp_notify_handler,
+				       seccomp_notify_cleanup_handler,
+				       handler, "seccomp_notify_handler");
 	if (ret < 0) {
 		rsp.ret = -errno;
 		goto out;
@@ -1346,18 +1659,17 @@
 	rsp.ret = -ENOSYS;
 
 #endif
-	return lxc_cmd_rsp_send(fd, &rsp);
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 int lxc_cmd_freeze(const char *name, const char *lxcpath, int timeout)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_FREEZE,
-			.data = INT_TO_PTR(timeout),
-		},
-	};
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_FREEZE);
+	lxc_cmd_data(&cmd, ENCODE_INTO_PTR_LEN, INT_TO_PTR(timeout));
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret <= 0 || cmd.rsp.ret < 0)
@@ -1368,7 +1680,7 @@
 
 static int lxc_cmd_freeze_callback(int fd, struct lxc_cmd_req *req,
 				   struct lxc_handler *handler,
-				   struct lxc_epoll_descr *descr)
+				   struct lxc_async_descr *descr)
 {
 	int timeout = PTR_TO_INT(req->data);
 	struct lxc_cmd_rsp rsp = {
@@ -1379,18 +1691,17 @@
 	if (pure_unified_layout(ops))
 		rsp.ret = ops->freeze(ops, timeout);
 
-	return lxc_cmd_rsp_send(fd, &rsp);
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
 int lxc_cmd_unfreeze(const char *name, const char *lxcpath, int timeout)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_UNFREEZE,
-			.data = INT_TO_PTR(timeout),
-		},
-	};
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_UNFREEZE);
+	lxc_cmd_data(&cmd, ENCODE_INTO_PTR_LEN, INT_TO_PTR(timeout));
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret <= 0 || cmd.rsp.ret < 0)
@@ -1401,7 +1712,7 @@
 
 static int lxc_cmd_unfreeze_callback(int fd, struct lxc_cmd_req *req,
 				   struct lxc_handler *handler,
-				   struct lxc_epoll_descr *descr)
+				   struct lxc_async_descr *descr)
 {
 	int timeout = PTR_TO_INT(req->data);
 	struct lxc_cmd_rsp rsp = {
@@ -1412,78 +1723,208 @@
 	if (pure_unified_layout(ops))
 		rsp.ret = ops->unfreeze(ops, timeout);
 
-	return lxc_cmd_rsp_send(fd, &rsp);
+	return lxc_cmd_rsp_send_reap(fd, &rsp);
 }
 
-int lxc_cmd_get_cgroup2_fd(const char *name, const char *lxcpath)
+int lxc_cmd_get_cgroup_fd(const char *name, const char *lxcpath,
+			  size_t size_ret_fd, struct cgroup_fd *ret_fd)
+{
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_CGROUP_FD);
+	lxc_cmd_data(&cmd, sizeof(struct cgroup_fd), ret_fd);
+
+	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
+	if (ret < 0)
+		return sysdebug("Failed to process \"%s\"",
+				lxc_cmd_str(LXC_CMD_GET_CGROUP_FD));
+
+	if (cmd.rsp.ret < 0)
+		return sysdebug_set(cmd.rsp.ret, "Failed to receive file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_CGROUP_FD));
+
+	return 0;
+}
+
+int lxc_cmd_get_limit_cgroup_fd(const char *name, const char *lxcpath,
+				size_t size_ret_fd, struct cgroup_fd *ret_fd)
 {
-	int ret, stopped;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd = LXC_CMD_GET_CGROUP2_FD,
-		},
+	bool stopped = false;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_LIMIT_CGROUP_FD);
+	lxc_cmd_data(&cmd, sizeof(struct cgroup_fd), ret_fd);
+
+	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
+	if (ret < 0)
+		return sysdebug("Failed to process \"%s\"",
+				lxc_cmd_str(LXC_CMD_GET_CGROUP_FD));
+
+	if (cmd.rsp.ret < 0)
+		return sysdebug_set(cmd.rsp.ret, "Failed to receive file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_CGROUP_FD));
+
+	return 0;
+}
+
+static int __lxc_cmd_get_cgroup_fd_callback(int fd, struct lxc_cmd_req *req,
+					    struct lxc_handler *handler,
+					    struct lxc_async_descr *descr,
+					    bool limit)
+{
+	struct lxc_cmd_rsp rsp = {
+		.ret = -EINVAL,
 	};
+	struct cgroup_ops *ops = handler->cgroup_ops;
+	struct cgroup_fd fd_server = {};
+	int ret;
+
+	ret = copy_struct_from_client(sizeof(struct cgroup_fd), &fd_server,
+				      req->datalen, req->data);
+	if (ret < 0)
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
+
+	if (strnlen(fd_server.controller, MAX_CGROUP_ROOT_NAMELEN) == 0)
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
+
+	ret = prepare_cgroup_fd(ops, &fd_server, limit);
+	if (ret < 0) {
+		rsp.ret = ret;
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
+	}
+
+	rsp.ret		= 0;
+	rsp.data	= &fd_server;
+	rsp.datalen	= min(sizeof(struct cgroup_fd), (size_t)req->datalen);
+	return rsp_one_fd_reap(fd, fd_server.fd, &rsp);
+}
+
+static int lxc_cmd_get_cgroup_fd_callback(int fd, struct lxc_cmd_req *req,
+					  struct lxc_handler *handler,
+					  struct lxc_async_descr *descr)
+{
+	return __lxc_cmd_get_cgroup_fd_callback(fd, req, handler, descr, false);
+}
+
+static int lxc_cmd_get_limit_cgroup_fd_callback(int fd, struct lxc_cmd_req *req,
+						struct lxc_handler *handler,
+						struct lxc_async_descr *descr)
+{
+	return __lxc_cmd_get_cgroup_fd_callback(fd, req, handler, descr, true);
+}
+
+int lxc_cmd_get_cgroup2_fd(const char *name, const char *lxcpath)
+{
+	bool stopped = false;
+	int fd;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_CGROUP2_FD);
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
-		return -1;
+		return sysdebug("Failed to process \"%s\"",
+				lxc_cmd_str(LXC_CMD_GET_CGROUP2_FD));
 
 	if (cmd.rsp.ret < 0)
-		return log_debug_errno(cmd.rsp.ret, -cmd.rsp.ret, "Failed to receive cgroup2 fd");
+		return sysdebug_set(cmd.rsp.ret, "Failed to receive file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_CGROUP2_FD));
+
+	fd = PTR_TO_INT(cmd.rsp.data);
+	if (fd < 0)
+		return sysdebug_set(fd, "Received invalid file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_CGROUP2_FD));
+	return fd;
+}
 
-	return PTR_TO_INT(cmd.rsp.data);
+int lxc_cmd_get_limit_cgroup2_fd(const char *name, const char *lxcpath)
+{
+	bool stopped = false;
+	int fd;
+	ssize_t ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_LIMIT_CGROUP2_FD);
+
+	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
+	if (ret < 0)
+		return sysdebug("Failed to process \"%s\"",
+				lxc_cmd_str(LXC_CMD_GET_CGROUP2_FD));
+
+	if (cmd.rsp.ret < 0)
+		return sysdebug_set(cmd.rsp.ret, "Failed to receive file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_CGROUP2_FD));
+
+	fd = PTR_TO_INT(cmd.rsp.data);
+	if (fd < 0)
+		return sysdebug_set(fd, "Received invalid file descriptor for \"%s\"",
+				    lxc_cmd_str(LXC_CMD_GET_CGROUP2_FD));
+	return fd;
 }
 
-static int lxc_cmd_get_cgroup2_fd_callback_do(int fd, struct lxc_cmd_req *req,
-					      struct lxc_handler *handler,
-					      struct lxc_epoll_descr *descr,
-					      bool limiting_cgroup)
+static int __lxc_cmd_get_cgroup2_fd_callback(int fd, struct lxc_cmd_req *req,
+					     struct lxc_handler *handler,
+					     struct lxc_async_descr *descr,
+					     bool limiting_cgroup)
 {
 	struct lxc_cmd_rsp rsp = {
 		.ret = -EINVAL,
 	};
 	struct cgroup_ops *ops = handler->cgroup_ops;
-	int ret, send_fd;
+	int send_fd;
 
 	if (!pure_unified_layout(ops) || !ops->unified)
-		return lxc_cmd_rsp_send(fd, &rsp);
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
 
-	send_fd = limiting_cgroup ? ops->unified->cgfd_limit
-				  : ops->unified->cgfd_con;
+	send_fd = limiting_cgroup ? ops->unified->dfd_lim
+				  : ops->unified->dfd_con;
 
-	rsp.ret = 0;
-	ret = lxc_abstract_unix_send_fds(fd, &send_fd, 1, &rsp, sizeof(rsp));
-	if (ret < 0)
-		return log_error(LXC_CMD_REAP_CLIENT_FD, "Failed to send cgroup2 fd");
+	if (send_fd < 0) {
+		rsp.ret = -EBADF;
+		return lxc_cmd_rsp_send_reap(fd, &rsp);
+	}
 
-	return 0;
+	rsp.ret = 0;
+	return rsp_one_fd_reap(fd, send_fd, &rsp);
 }
 
 static int lxc_cmd_get_cgroup2_fd_callback(int fd, struct lxc_cmd_req *req,
 					   struct lxc_handler *handler,
-					   struct lxc_epoll_descr *descr)
+					   struct lxc_async_descr *descr)
 {
-	return lxc_cmd_get_cgroup2_fd_callback_do(fd, req, handler, descr,
-						  false);
+	return __lxc_cmd_get_cgroup2_fd_callback(fd, req, handler, descr, false);
 }
 
-static int lxc_cmd_get_limiting_cgroup2_fd_callback(int fd,
-						    struct lxc_cmd_req *req,
-						    struct lxc_handler *handler,
-						    struct lxc_epoll_descr *descr)
+static int lxc_cmd_get_limit_cgroup2_fd_callback(int fd, struct lxc_cmd_req *req,
+						 struct lxc_handler *handler,
+						 struct lxc_async_descr *descr)
 {
-	return ret_errno(ENOSYS);
+	return __lxc_cmd_get_cgroup2_fd_callback(fd, req, handler, descr, true);
+}
+
+static int lxc_cmd_rsp_send_enosys(int fd, int id)
+{
+	struct lxc_cmd_rsp rsp = {
+		.ret = -ENOSYS,
+	};
+
+	__lxc_cmd_rsp_send(fd, &rsp);
+	return syserror_set(-ENOSYS, "Invalid command id %d", id);
 }
 
 static int lxc_cmd_process(int fd, struct lxc_cmd_req *req,
 			   struct lxc_handler *handler,
-			   struct lxc_epoll_descr *descr)
+			   struct lxc_async_descr *descr)
 {
 	typedef int (*callback)(int, struct lxc_cmd_req *, struct lxc_handler *,
-				struct lxc_epoll_descr *);
+				struct lxc_async_descr *);
 
 	callback cbLXC_CMD_MAX = {
-		LXC_CMD_CONSOLE			= lxc_cmd_console_callback,
+		LXC_CMD_GET_TTY_FD			= lxc_cmd_get_tty_fd_callback,
 		LXC_CMD_TERMINAL_WINCH              	= lxc_cmd_terminal_winch_callback,
 		LXC_CMD_STOP                        	= lxc_cmd_stop_callback,
 		LXC_CMD_GET_STATE                   	= lxc_cmd_get_state_callback,
@@ -1502,39 +1943,34 @@
 		LXC_CMD_UNFREEZE			= lxc_cmd_unfreeze_callback,
 		LXC_CMD_GET_CGROUP2_FD		= lxc_cmd_get_cgroup2_fd_callback,
 		LXC_CMD_GET_INIT_PIDFD                = lxc_cmd_get_init_pidfd_callback,
-		LXC_CMD_GET_LIMITING_CGROUP           = lxc_cmd_get_limiting_cgroup_callback,
-		LXC_CMD_GET_LIMITING_CGROUP2_FD       = lxc_cmd_get_limiting_cgroup2_fd_callback,
+		LXC_CMD_GET_LIMIT_CGROUP		= lxc_cmd_get_limit_cgroup_callback,
+		LXC_CMD_GET_LIMIT_CGROUP2_FD		= lxc_cmd_get_limit_cgroup2_fd_callback,
+		LXC_CMD_GET_DEVPTS_FD			= lxc_cmd_get_devpts_fd_callback,
+		LXC_CMD_GET_SECCOMP_NOTIFY_FD		= lxc_cmd_get_seccomp_notify_fd_callback,
+		LXC_CMD_GET_CGROUP_CTX		= lxc_cmd_get_cgroup_ctx_callback,
+		LXC_CMD_GET_CGROUP_FD			= lxc_cmd_get_cgroup_fd_callback,
+		LXC_CMD_GET_LIMIT_CGROUP_FD		= lxc_cmd_get_limit_cgroup_fd_callback,
+		LXC_CMD_GET_SYSTEMD_SCOPE		= lxc_cmd_get_systemd_scope_callback,
 	};
 
 	if (req->cmd >= LXC_CMD_MAX)
-		return log_trace_errno(-1, EINVAL, "Invalid command id %d", req->cmd);
+		return lxc_cmd_rsp_send_enosys(fd,  req->cmd);
 
 	return cbreq->cmd(fd, req, handler, descr);
 }
 
 static void lxc_cmd_fd_cleanup(int fd, struct lxc_handler *handler,
-			       struct lxc_epoll_descr *descr, const lxc_cmd_t cmd)
+			       const lxc_cmd_t cmd)
 {
-	lxc_terminal_free(handler->conf, fd);
-	lxc_mainloop_del_handler(descr, fd);
-
 	if (cmd == LXC_CMD_ADD_STATE_CLIENT) {
-		struct lxc_list *cur, *next;
-
-		lxc_list_for_each_safe(cur, &handler->conf->state_clients, next) {
-			struct lxc_state_client *client = cur->elem;
+		struct lxc_state_client *client, *nclient;
 
+		list_for_each_entry_safe(client, nclient, &handler->conf->state_clients, head) {
 			if (client->clientfd != fd)
 				continue;
 
-			/*
-			 * Only kick client from list so it can't be found
-			 * anymore. The actual close happens, as for all other
-			 * file descriptors, below.
-			 */
-			lxc_list_del(cur);
-			free(cur->elem);
-			free(cur);
+			list_del(&client->head);
+			free(client);
 
 			/*
 			 * No need to walk the whole list. If we found the state
@@ -1550,15 +1986,29 @@
 		 * was already reached by the time we were ready to add it. So
 		 * fallthrough and clean it up.
 		 */
-		TRACE("Closing state client fd %d for command \"%s\"", fd, lxc_cmd_str(cmd));
+		TRACE("Deleted state client fd %d for command \"%s\"", fd, lxc_cmd_str(cmd));
 	}
 
-	TRACE("Closing client fd %d for command \"%s\"", fd, lxc_cmd_str(cmd));
+	/*
+	 * We're not closing the client fd here. They will instead be notified
+	 * from the mainloop when it calls the cleanup handler. This will cause
+	 * a slight delay but is semantically cleaner then what we used to do.
+	 */
+}
+
+static int lxc_cmd_cleanup_handler(int fd, void *data)
+{
+	struct lxc_handler *handler = data;
+
+	lxc_terminal_free(handler->conf, fd);
 	close(fd);
+	TRACE("Closing client fd %d for \"%s\"", fd, __FUNCTION__);
+	return 0;
+
 }
 
 static int lxc_cmd_handler(int fd, uint32_t events, void *data,
-			   struct lxc_epoll_descr *descr)
+			   struct lxc_async_descr *descr)
 {
 	__do_free void *reqdata = NULL;
 	int ret;
@@ -1575,23 +2025,23 @@
 				.ret = -EPERM,
 			};
 
-			lxc_cmd_rsp_send(fd, &rsp);
+			__lxc_cmd_rsp_send(fd, &rsp);
 		}
 
-		goto out_close;
+		goto out;
 	}
 
 	if (ret == 0)
-		goto out_close;
+		goto out;
 
 	if (ret != sizeof(req)) {
 		WARN("Failed to receive full command request. Ignoring request for \"%s\"", lxc_cmd_str(req.cmd));
-		goto out_close;
+		goto out;
 	}
 
 	if ((req.datalen > LXC_CMD_DATA_MAX) && (req.cmd != LXC_CMD_CONSOLE_LOG)) {
 		ERROR("Received command data length %d is too large for command \"%s\"", req.datalen, lxc_cmd_str(req.cmd));
-		goto out_close;
+		goto out;
 	}
 
 	if (req.datalen > 0) {
@@ -1599,28 +2049,33 @@
 		ret = lxc_recv_nointr(fd, reqdata, req.datalen, 0);
 		if (ret != req.datalen) {
 			WARN("Failed to receive full command request. Ignoring request for \"%s\"", lxc_cmd_str(req.cmd));
-			goto out_close;
+			goto out;
 		}
 
 		req.data = reqdata;
 	}
 
 	ret = lxc_cmd_process(fd, &req, handler, descr);
-	if (ret) {
-		/* This is not an error, but only a request to close fd. */
-		goto out_close;
+	if (ret < 0) {
+		DEBUG("Failed to process command %s; cleaning up client fd %d", lxc_cmd_str(req.cmd), fd);
+		goto out;
 	}
 
-out:
+	if (ret == LXC_CMD_REAP_CLIENT_FD) {
+		TRACE("Processed command %s; cleaning up client fd %d", lxc_cmd_str(req.cmd), fd);
+		goto out;
+	}
+
+	TRACE("Processed command %s; keeping client fd %d", lxc_cmd_str(req.cmd), fd);
 	return LXC_MAINLOOP_CONTINUE;
 
-out_close:
-	lxc_cmd_fd_cleanup(fd, handler, descr, req.cmd);
-	goto out;
+out:
+	lxc_cmd_fd_cleanup(fd, handler, req.cmd);
+	return LXC_MAINLOOP_DISARM;
 }
 
 static int lxc_cmd_accept(int fd, uint32_t events, void *data,
-			  struct lxc_epoll_descr *descr)
+			  struct lxc_async_descr *descr)
 {
 	__do_close int connection = -EBADF;
 	int opt = 1, ret = -1;
@@ -1637,7 +2092,10 @@
 	if (ret < 0)
 		return log_error_errno(ret, errno, "Failed to enable necessary credentials on command socket");
 
-	ret = lxc_mainloop_add_handler(descr, connection, lxc_cmd_handler, data);
+	ret = lxc_mainloop_add_oneshot_handler(descr, connection,
+					       lxc_cmd_handler,
+					       lxc_cmd_cleanup_handler,
+					       data, "lxc_cmd_handler");
 	if (ret)
 		return log_error(ret, "Failed to add command handler");
 
@@ -1646,7 +2104,7 @@
 	return ret;
 }
 
-int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix)
+int lxc_server_init(const char *name, const char *lxcpath, const char *suffix)
 {
 	__do_close int fd = -EBADF;
 	int ret;
@@ -1671,12 +2129,15 @@
 	return log_trace(move_fd(fd), "Created abstract unix socket \"%s\"", &path1);
 }
 
-int lxc_cmd_mainloop_add(const char *name, struct lxc_epoll_descr *descr,
+int lxc_cmd_mainloop_add(const char *name, struct lxc_async_descr *descr,
 			 struct lxc_handler *handler)
 {
 	int ret;
 
-	ret = lxc_mainloop_add_handler(descr, handler->conf->maincmd_fd, lxc_cmd_accept, handler);
+	ret = lxc_mainloop_add_handler(descr, handler->conf->maincmd_fd,
+				       lxc_cmd_accept,
+				       default_cleanup_handler,
+				       handler, "lxc_cmd_accept");
 	if (ret < 0)
 		return log_error(ret, "Failed to add handler for command socket fd %d", handler->conf->maincmd_fd);

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/commands.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/commands.h Changed

@@ -3,11 +3,17 @@
 #ifndef __LXC_COMMANDS_H
 #define __LXC_COMMANDS_H
 
+#include "config.h"
+
+#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "lxccontainer.h"
+#include "lxc.h"
+
+#include "compiler.h"
+#include "cgroups/cgroup.h"
 #include "macro.h"
 #include "state.h"
 
@@ -17,29 +23,36 @@
  * have specific reasons to keep the file descriptor alive.
  */
 #define LXC_CMD_REAP_CLIENT_FD 1
+#define LXC_CMD_KEEP_CLIENT_FD 2
 
 typedef enum {
-	LXC_CMD_CONSOLE,
-	LXC_CMD_TERMINAL_WINCH,
-	LXC_CMD_STOP,
-	LXC_CMD_GET_STATE,
-	LXC_CMD_GET_INIT_PID,
-	LXC_CMD_GET_CLONE_FLAGS,
-	LXC_CMD_GET_CGROUP,
-	LXC_CMD_GET_CONFIG_ITEM,
-	LXC_CMD_GET_NAME,
-	LXC_CMD_GET_LXCPATH,
-	LXC_CMD_ADD_STATE_CLIENT,
-	LXC_CMD_CONSOLE_LOG,
-	LXC_CMD_SERVE_STATE_CLIENTS,
-	LXC_CMD_SECCOMP_NOTIFY_ADD_LISTENER,
-	LXC_CMD_ADD_BPF_DEVICE_CGROUP,
-	LXC_CMD_FREEZE,
-	LXC_CMD_UNFREEZE,
-	LXC_CMD_GET_CGROUP2_FD,
-	LXC_CMD_GET_INIT_PIDFD,
-	LXC_CMD_GET_LIMITING_CGROUP,
-	LXC_CMD_GET_LIMITING_CGROUP2_FD,
+	LXC_CMD_GET_TTY_FD			= 0,
+	LXC_CMD_TERMINAL_WINCH			= 1,
+	LXC_CMD_STOP				= 2,
+	LXC_CMD_GET_STATE			= 3,
+	LXC_CMD_GET_INIT_PID			= 4,
+	LXC_CMD_GET_CLONE_FLAGS			= 5,
+	LXC_CMD_GET_CGROUP			= 6,
+	LXC_CMD_GET_CONFIG_ITEM			= 7,
+	LXC_CMD_GET_NAME			= 8,
+	LXC_CMD_GET_LXCPATH			= 9,
+	LXC_CMD_ADD_STATE_CLIENT		= 10,
+	LXC_CMD_CONSOLE_LOG			= 11,
+	LXC_CMD_SERVE_STATE_CLIENTS		= 12,
+	LXC_CMD_SECCOMP_NOTIFY_ADD_LISTENER	= 13,
+	LXC_CMD_ADD_BPF_DEVICE_CGROUP		= 14,
+	LXC_CMD_FREEZE				= 15,
+	LXC_CMD_UNFREEZE			= 16,
+	LXC_CMD_GET_CGROUP2_FD			= 17,
+	LXC_CMD_GET_INIT_PIDFD 			= 18,
+	LXC_CMD_GET_LIMIT_CGROUP		= 19,
+	LXC_CMD_GET_LIMIT_CGROUP2_FD		= 20,
+	LXC_CMD_GET_DEVPTS_FD			= 21,
+	LXC_CMD_GET_SECCOMP_NOTIFY_FD		= 22,
+	LXC_CMD_GET_CGROUP_CTX			= 23,
+	LXC_CMD_GET_CGROUP_FD			= 24,
+	LXC_CMD_GET_LIMIT_CGROUP_FD		= 25,
+	LXC_CMD_GET_SYSTEMD_SCOPE		= 26,
 	LXC_CMD_MAX,
 } lxc_cmd_t;
 
@@ -49,6 +62,8 @@
 	const void *data;
 };
 
+#define ENCODE_INTO_PTR_LEN 0
+
 struct lxc_cmd_rsp {
 	int ret; /* 0 on success, -errno on failure */
 	int datalen;
@@ -60,8 +75,22 @@
 	struct lxc_cmd_rsp rsp;
 };
 
-struct lxc_cmd_console_rsp_data {
-	int ptmxfd;
+static inline void lxc_cmd_init(struct lxc_cmd_rr *cmd, lxc_cmd_t command)
+{
+	*cmd = (struct lxc_cmd_rr){
+		.req = {.cmd = command },
+		.rsp = {.ret = -ENOSYS },
+	};
+}
+
+static inline void lxc_cmd_data(struct lxc_cmd_rr *cmd, int len_data, const void *data)
+{
+	cmd->req.data = data;
+	cmd->req.datalen = len_data;
+}
+
+struct lxc_cmd_tty_rsp_data {
+	int ptxfd;
 	int ttynum;
 };
 
@@ -73,23 +102,25 @@
 
 };
 
-extern int lxc_cmd_terminal_winch(const char *name, const char *lxcpath);
-extern int lxc_cmd_console(const char *name, int *ttynum, int *fd,
-			   const char *lxcpath);
+__hidden extern int lxc_cmd_terminal_winch(const char *name, const char *lxcpath);
+__hidden extern int lxc_cmd_get_tty_fd(const char *name, int *ttynum, int *fd,
+				       const char *lxcpath);
 /*
  * Get the 'real' cgroup path (as seen in /proc/self/cgroup) for a container
- * for a particular subsystem
+ * for a particular controller
  */
-extern char *lxc_cmd_get_cgroup_path(const char *name, const char *lxcpath,
-			const char *subsystem);
-extern int lxc_cmd_get_clone_flags(const char *name, const char *lxcpath);
-extern char *lxc_cmd_get_config_item(const char *name, const char *item, const char *lxcpath);
-extern char *lxc_cmd_get_name(const char *hashed_sock);
-extern char *lxc_cmd_get_lxcpath(const char *hashed_sock);
-extern pid_t lxc_cmd_get_init_pid(const char *name, const char *lxcpath);
-extern int lxc_cmd_get_init_pidfd(const char *name, const char *lxcpath);
-extern int lxc_cmd_get_state(const char *name, const char *lxcpath);
-extern int lxc_cmd_stop(const char *name, const char *lxcpath);
+__hidden extern char *lxc_cmd_get_cgroup_path(const char *name, const char *lxcpath,
+					      const char *controller);
+__hidden extern int lxc_cmd_get_clone_flags(const char *name, const char *lxcpath);
+__hidden extern char *lxc_cmd_get_config_item(const char *name, const char *item,
+					      const char *lxcpath);
+__hidden extern char *lxc_cmd_get_name(const char *hashed_sock);
+__hidden extern char *lxc_cmd_get_lxcpath(const char *hashed_sock);
+__hidden extern char *lxc_cmd_get_systemd_scope(const char *name, const char *lxcpath);
+__hidden extern pid_t lxc_cmd_get_init_pid(const char *name, const char *lxcpath);
+__hidden extern int lxc_cmd_get_init_pidfd(const char *name, const char *lxcpath);
+__hidden extern int lxc_cmd_get_state(const char *name, const char *lxcpath);
+__hidden extern int lxc_cmd_stop(const char *name, const char *lxcpath);
 
 /* lxc_cmd_add_state_client    Register a new state client fd in the container's
  *                             in-memory handler.
@@ -104,36 +135,48 @@
  *                                                 via socket fd
  *                                     < MAX_STATE current container state
  */
-extern int lxc_cmd_add_state_client(const char *name, const char *lxcpath,
-				    lxc_state_t statesMAX_STATE,
-				    int *state_client_fd);
-extern int lxc_cmd_serve_state_clients(const char *name, const char *lxcpath,
-				       lxc_state_t state);
-
-struct lxc_epoll_descr;
+__hidden __access_r_nosize(3) extern int lxc_cmd_add_state_client(const char *name,
+								  const char *lxcpath,
+								  lxc_state_t statesstatic MAX_STATE,
+								  int *state_client_fd);
+__hidden extern int lxc_cmd_serve_state_clients(const char *name, const char *lxcpath,
+						lxc_state_t state);
+
+struct lxc_async_descr;
 struct lxc_handler;
 
-extern int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix);
-extern int lxc_cmd_mainloop_add(const char *name, struct lxc_epoll_descr *descr,
-				    struct lxc_handler *handler);
-extern int lxc_try_cmd(const char *name, const char *lxcpath);
-extern int lxc_cmd_console_log(const char *name, const char *lxcpath,
-			       struct lxc_console_log *log);
-extern int lxc_cmd_seccomp_notify_add_listener(const char *name,
-					       const char *lxcpath,
-					       int fd,
-					       /* unused */ unsigned int command,
-					       /* unused */ unsigned int flags);
+__hidden extern int lxc_server_init(const char *name, const char *lxcpath, const char *suffix);
+__hidden extern int lxc_cmd_mainloop_add(const char *name, struct lxc_async_descr *descr,
+					 struct lxc_handler *handler);
+__hidden extern int lxc_try_cmd(const char *name, const char *lxcpath);
+__hidden extern int lxc_cmd_console_log(const char *name, const char *lxcpath,
+					struct lxc_console_log *log);
+__hidden extern int lxc_cmd_get_seccomp_notify_fd(const char *name, const char *lxcpath);
+__hidden extern int lxc_cmd_get_cgroup_ctx(const char *name, const char *lxcpath,
+					   size_t size_ret_ctx,
+					   struct cgroup_ctx *ret_ctx);
+__hidden extern int lxc_cmd_seccomp_notify_add_listener(const char *name, const char *lxcpath, int fd,
+							/* unused */ unsigned int command,
+							/* unused */ unsigned int flags);
 
 struct device_item;
-extern int lxc_cmd_add_bpf_device_cgroup(const char *name, const char *lxcpath,
-					 struct device_item *device);
-extern int lxc_cmd_freeze(const char *name, const char *lxcpath, int timeout);
-extern int lxc_cmd_unfreeze(const char *name, const char *lxcpath, int timeout);
-extern int lxc_cmd_get_cgroup2_fd(const char *name, const char *lxcpath);
-extern char *lxc_cmd_get_limiting_cgroup_path(const char *name,
-					      const char *lxcpath,
-					      const char *subsystem);
-extern int lxc_cmd_get_limiting_cgroup2_fd(const char *name, const char *lxcpath);
+__hidden extern int lxc_cmd_add_bpf_device_cgroup(const char *name, const char *lxcpath,
+						  struct device_item *device);
+__hidden extern int lxc_cmd_freeze(const char *name, const char *lxcpath, int timeout);
+__hidden extern int lxc_cmd_unfreeze(const char *name, const char *lxcpath, int timeout);
+__hidden extern int lxc_cmd_get_cgroup2_fd(const char *name, const char *lxcpath);
+__hidden extern int lxc_cmd_get_cgroup_fd(const char *name, const char *lxcpath,
+					  size_t size_ret_fd,
+					  struct cgroup_fd *ret_fd);
+__hidden extern char *lxc_cmd_get_limit_cgroup_path(const char *name,
+						    const char *lxcpath,
+						    const char *controller);
+__hidden extern int lxc_cmd_get_limit_cgroup2_fd(const char *name,
+						 const char *lxcpath);
+__hidden extern int lxc_cmd_get_limit_cgroup_fd(const char *name,
+						const char *lxcpath,
+						size_t size_ret_fd,
+						struct cgroup_fd *ret_fd);
+__hidden extern int lxc_cmd_get_devpts_fd(const char *name, const char *lxcpath);
 
 #endif /* __commands_h */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/commands_utils.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/commands_utils.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/commands_utils.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/commands_utils.h Changed

@@ -3,16 +3,16 @@
 #ifndef __LXC_COMMANDS_UTILS_H
 #define __LXC_COMMANDS_UTILS_H
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "state.h"
 #include "commands.h"
 
-int lxc_make_abstract_socket_name(char *path, size_t pathlen,
-				  const char *lxcname,
-				  const char *lxcpath,
-				  const char *hashed_sock_name,
-				  const char *suffix);
+__hidden extern int lxc_make_abstract_socket_name(char *path, size_t pathlen, const char *lxcname,
+						  const char *lxcpath, const char *hashed_sock_name,
+						  const char *suffix);
 
 /* lxc_cmd_sock_get_state      Register a new state client fd in the container's
  *                             in-memory handler and retrieve the requested
@@ -24,8 +24,8 @@
  * @return                     Return  < 0 on error
  *                                     < MAX_STATE current container state
  */
-extern int lxc_cmd_sock_get_state(const char *name, const char *lxcpath,
-				  lxc_state_t statesMAX_STATE, int timeout);
+__hidden extern int lxc_cmd_sock_get_state(const char *name, const char *lxcpath,
+					   lxc_state_t statesMAX_STATE, int timeout);
 
 /* lxc_cmd_sock_rcv_state      Retrieve the requested state from a state client
  *                             fd registerd in the container's in-memory
@@ -36,7 +36,7 @@
  * @return                     Return  < 0 on error
  *                                     < MAX_STATE current container state
  */
-extern int lxc_cmd_sock_rcv_state(int state_client_fd, int timeout);
+__hidden extern int lxc_cmd_sock_rcv_state(int state_client_fd, int timeout);
 
 /* lxc_add_state_client        Add a new state client to the container's
  *                             in-memory handler.
@@ -48,9 +48,8 @@
  * @return                     Return  < 0 on error
  *                                       0 on success
  */
-extern int lxc_add_state_client(int state_client_fd,
-				struct lxc_handler *handler,
-				lxc_state_t statesMAX_STATE);
+__hidden extern int lxc_add_state_client(int state_client_fd, struct lxc_handler *handler,
+					 lxc_state_t statesMAX_STATE);
 
 /* lxc_cmd_connect             Connect to the container's command socket.
  *
@@ -62,7 +61,10 @@
  * @return                     Return   < 0 on error
  *                                     >= 0 client fd
  */
-extern int lxc_cmd_connect(const char *name, const char *lxcpath,
-			   const char *hashed_sock_name, const char *suffix);
+__hidden extern int lxc_cmd_connect(const char *name, const char *lxcpath,
+				    const char *hashed_sock_name, const char *suffix);
 
+__hidden extern void lxc_cmd_notify_state_listeners(const char *name,
+                                                    const char *lxcpath,
+                                                    lxc_state_t state);
 #endif /* __LXC_COMMANDS_UTILS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/compiler.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/compiler.h Changed

@@ -3,12 +3,17 @@
 #ifndef __LXC_COMPILER_H
 #define __LXC_COMPILER_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-
 #include "config.h"
 
+#include <assert.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <linux/types.h>
+#include <stdbool.h>
+#include <sys/param.h>
+#include <sys/sysmacros.h>
+#include <sys/types.h>
+
 #ifndef thread_local
 #if __STDC_VERSION__ >= 201112L &&    \
     !(defined(__STDC_NO_THREADS__) || \
@@ -19,10 +24,202 @@
 #endif
 #endif
 
-#ifndef __fallthrough
+#if HAVE_COMPILER_ATTR_FALLTHROUGH || __GNUC__ >= 7
+#define __fallthrough __attribute__((__fallthrough__))
+#else
 #define __fallthrough /* fall through */
 #endif
 
+#if defined(__GNUC__) && !defined(__clang__)
+	#if GCC_VERSION >= 50100
+	#define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
+	#endif
+#endif
+
+#define likely(x) __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#define __must_check __attribute__((__warn_unused_result__))
+
+static inline bool __must_check __must_check_overflow(bool overflow)
+{
+	return unlikely(overflow);
+}
+
+#define is_signed_type(type)       (((type)(-1)) < (type)1)
+#define __type_half_max(type) ((type)1 << (8*sizeof(type) - 1 - is_signed_type(type)))
+#define type_max(T) ((T)((__type_half_max(T) - 1) + __type_half_max(T)))
+#define type_min(T) ((T)((T)-type_max(T)-(T)1))
+
+/*
+ * Avoids triggering -Wtype-limits compilation warning,
+ * while using unsigned data types to check a < 0.
+ */
+#define is_non_negative(a) ((a) > 0 || (a) == 0)
+#define is_negative(a) (!(is_non_negative(a)))
+
+#ifdef COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW
+/*
+ * For simplicity and code hygiene, the fallback code below insists on
+ * a, b and *d having the same type (similar to the min() and max()
+ * macros), whereas gcc's type-generic overflow checkers accept
+ * different types. Hence we don't just make check_add_overflow an
+ * alias for __builtin_add_overflow, but add type checks similar to
+ * below.
+ */
+#define check_add_overflow(a, b, d) __must_check_overflow(({	\
+	typeof(a) __a = (a);			\
+	typeof(b) __b = (b);			\
+	typeof(d) __d = (d);			\
+	(void) (&__a == &__b);			\
+	(void) (&__a == __d);			\
+	__builtin_add_overflow(__a, __b, __d);	\
+}))
+
+#define check_sub_overflow(a, b, d) __must_check_overflow(({	\
+	typeof(a) __a = (a);			\
+	typeof(b) __b = (b);			\
+	typeof(d) __d = (d);			\
+	(void) (&__a == &__b);			\
+	(void) (&__a == __d);			\
+	__builtin_sub_overflow(__a, __b, __d);	\
+}))
+
+#define check_mul_overflow(a, b, d) __must_check_overflow(({	\
+	typeof(a) __a = (a);			\
+	typeof(b) __b = (b);			\
+	typeof(d) __d = (d);			\
+	(void) (&__a == &__b);			\
+	(void) (&__a == __d);			\
+	__builtin_mul_overflow(__a, __b, __d);	\
+}))
+#else /* !COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW */
+
+/* Checking for unsigned overflow is relatively easy without causing UB. */
+#define __unsigned_add_overflow(a, b, d) ({	\
+	typeof(a) __a = (a);			\
+	typeof(b) __b = (b);			\
+	typeof(d) __d = (d);			\
+	(void) (&__a == &__b);			\
+	(void) (&__a == __d);			\
+	*__d = __a + __b;			\
+	*__d < __a;				\
+})
+#define __unsigned_sub_overflow(a, b, d) ({	\
+	typeof(a) __a = (a);			\
+	typeof(b) __b = (b);			\
+	typeof(d) __d = (d);			\
+	(void) (&__a == &__b);			\
+	(void) (&__a == __d);			\
+	*__d = __a - __b;			\
+	__a < __b;				\
+})
+
+/*
+ * If one of a or b is a compile-time constant, this avoids a division.
+ */
+#define __unsigned_mul_overflow(a, b, d) ({		\
+	typeof(a) __a = (a);				\
+	typeof(b) __b = (b);				\
+	typeof(d) __d = (d);				\
+	(void) (&__a == &__b);				\
+	(void) (&__a == __d);				\
+	*__d = __a * __b;				\
+	__builtin_constant_p(__b) ?			\
+	  __b > 0 && __a > type_max(typeof(__a)) / __b : \
+	  __a > 0 && __b > type_max(typeof(__b)) / __a;	 \
+})
+
+/*
+ * For signed types, detecting overflow is much harder, especially if
+ * we want to avoid UB. But the interface of these macros is such that
+ * we must provide a result in *d, and in fact we must produce the
+ * result promised by gcc's builtins, which is simply the possibly
+ * wrapped-around value. Fortunately, we can just formally do the
+ * operations in the widest relevant unsigned type (u64) and then
+ * truncate the result - gcc is smart enough to generate the same code
+ * with and without the (u64) casts.
+ */
+
+/*
+ * Adding two signed integers can overflow only if they have the same
+ * sign, and overflow has happened iff the result has the opposite
+ * sign.
+ */
+#define __signed_add_overflow(a, b, d) ({	\
+	typeof(a) __a = (a);			\
+	typeof(b) __b = (b);			\
+	typeof(d) __d = (d);			\
+	(void) (&__a == &__b);			\
+	(void) (&__a == __d);			\
+	*__d = (__u64)__a + (__u64)__b;		\
+	(((~(__a ^ __b)) & (*__d ^ __a))	\
+		& type_min(typeof(__a))) != 0;	\
+})
+
+/*
+ * Subtraction is similar, except that overflow can now happen only
+ * when the signs are opposite. In this case, overflow has happened if
+ * the result has the opposite sign of a.
+ */
+#define __signed_sub_overflow(a, b, d) ({	\
+	typeof(a) __a = (a);			\
+	typeof(b) __b = (b);			\
+	typeof(d) __d = (d);			\
+	(void) (&__a == &__b);			\
+	(void) (&__a == __d);			\
+	*__d = (__u64)__a - (__u64)__b;		\
+	((((__a ^ __b)) & (*__d ^ __a))		\
+		& type_min(typeof(__a))) != 0;	\
+})
+
+/*
+ * Signed multiplication is rather hard. gcc always follows C99, so
+ * division is truncated towards 0. This means that we can write the
+ * overflow check like this:
+ *
+ * (a > 0 && (b > MAX/a || b < MIN/a)) ||
+ * (a < -1 && (b > MIN/a || b < MAX/a) ||
+ * (a == -1 && b == MIN)
+ *
+ * The redundant casts of -1 are to silence an annoying -Wtype-limits
+ * (included in -Wextra) warning: When the type is u8 or u16, the
+ * __b_c_e in check_mul_overflow obviously selects
+ * __unsigned_mul_overflow, but unfortunately gcc still parses this
+ * code and warns about the limited range of __b.
+ */
+
+#define __signed_mul_overflow(a, b, d) ({				\
+	typeof(a) __a = (a);						\
+	typeof(b) __b = (b);						\
+	typeof(d) __d = (d);						\
+	typeof(a) __tmax = type_max(typeof(a));				\
+	typeof(a) __tmin = type_min(typeof(a));				\
+	(void) (&__a == &__b);						\
+	(void) (&__a == __d);						\
+	*__d = (__u64)__a * (__u64)__b;					\
+	(__b > 0   && (__a > __tmax/__b || __a < __tmin/__b)) ||	\
+	(__b < (typeof(__b))-1  && (__a > __tmin/__b || __a < __tmax/__b)) || \
+	(__b == (typeof(__b))-1 && __a == __tmin);			\
+})
+
+
+#define check_add_overflow(a, b, d)	__must_check_overflow(		\
+	__builtin_choose_expr(is_signed_type(typeof(a)),		\
+			__signed_add_overflow(a, b, d),			\
+			__unsigned_add_overflow(a, b, d)))
+
+#define check_sub_overflow(a, b, d)	__must_check_overflow(		\
+	__builtin_choose_expr(is_signed_type(typeof(a)),		\
+			__signed_sub_overflow(a, b, d),			\
+			__unsigned_sub_overflow(a, b, d)))
+
+#define check_mul_overflow(a, b, d)	__must_check_overflow(		\
+	__builtin_choose_expr(is_signed_type(typeof(a)),		\
+			__signed_mul_overflow(a, b, d),			\
+			__unsigned_mul_overflow(a, b, d)))
+
+#endif /* COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW */
+
 #ifndef __noreturn
 #	if __STDC_VERSION__ >= 201112L
 #		if !IS_BIONIC
@@ -58,6 +255,7 @@
 #define __cgfsng_ops
 
 /* access attribute */
+#define __access_r_nosize(x)
 #define __access_r(x, y)
 #define __access_w(x, y)
 #define __access_rw(x, y)
@@ -67,6 +265,9 @@
 #undef __access_r
 #define __access_r(x, y) __attribute__((access(read_only, x, y)))
 
+#undef __access_r_nosize
+#define __access_r_nosize(x) __attribute__((access(read_only, x)))
+
 #undef __access_w
 #define __access_w(x, y) __attribute__((access(write_only, x, y)))
 
@@ -75,4 +276,43 @@
 #endif
 #endif
 
+#ifndef __hidden
+#define __hidden __attribute__((visibility("hidden")))
+#endif
+
+#ifndef __public
+#define __public __attribute__((visibility("default")))
+#endif
+
+/* Are two types/vars the same type (ignoring qualifiers)? */
+#define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
+
+#define __compiletime_assert(condition, msg, prefix, suffix) \
+	do {                                                 \
+	} while (0)
+
+#define _compiletime_assert(condition, msg, prefix, suffix) \
+	__compiletime_assert(condition, msg, prefix, suffix)
+
+/**
+ * compiletime_assert - break build and emit msg if condition is false
+ * @condition: a compile-time constant condition to check
+ * @msg:       a message to emit if condition is false
+ *
+ * In tradition of POSIX assert, this macro will break the build if the
+ * supplied condition is *false*, emitting the supplied error message if the
+ * compiler has support to do so.
+ */
+#define compiletime_assert(condition, msg) \
+	_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
+
+/**
+ * BUILD_BUG_ON_MSG - break compile if a condition is true & emit supplied
+ *		      error message.
+ * @condition: the condition which the compiler should know is false.
+ *
+ * See BUILD_BUG_ON for description.
+ */
+#define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
+
 #endif /* __LXC_COMPILER_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/conf.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/conf.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <errno.h>
@@ -15,6 +14,7 @@
 #include <netinet/in.h>
 #include <pwd.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -33,12 +33,11 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "conf.h"
 #include "af_unix.h"
 #include "caps.h"
-#include "cgroup.h"
-#include "cgroup2_devices.h"
-#include "conf.h"
-#include "config.h"
+#include "cgroups/cgroup.h"
+#include "compiler.h"
 #include "confile.h"
 #include "confile_utils.h"
 #include "error.h"
@@ -48,14 +47,17 @@
 #include "lxcseccomp.h"
 #include "macro.h"
 #include "memory_utils.h"
+#include "mount_utils.h"
 #include "namespace.h"
 #include "network.h"
+#include "open_utils.h"
 #include "parse.h"
 #include "process_utils.h"
 #include "ringbuf.h"
 #include "start.h"
-#include "storage.h"
+#include "storage/storage.h"
 #include "storage/overlay.h"
+#include "sync.h"
 #include "syscall_wrappers.h"
 #include "terminal.h"
 #include "utils.h"
@@ -69,44 +71,45 @@
 #include <sys/statvfs.h>
 #endif
 
-#if HAVE_PTY_H
+#if HAVE_OPENPTY
 #include <pty.h>
 #else
-#include <../include/openpty.h>
+#include "openpty.h"
 #endif
 
 #if HAVE_LIBCAP
 #include <sys/capability.h>
 #endif
 
-#if HAVE_SYS_PERSONALITY_H
-#include <sys/personality.h>
-#endif
-
-#ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#if !HAVE_STRLCAT
+#include "strlcat.h"
 #endif
 
 #if IS_BIONIC
-#include <../include/lxcmntent.h>
+#include "lxcmntent.h"
 #else
 #include <mntent.h>
 #endif
 
-#if !defined(HAVE_PRLIMIT) && defined(HAVE_PRLIMIT64)
-#include <../include/prlimit.h>
+#if !HAVE_PRLIMIT && HAVE_PRLIMIT64
+#include "prlimit.h"
+#endif
+
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
+#endif
+
+#if !HAVE_STRCHRNUL
+#include "strchrnul.h"
 #endif
 
 lxc_log_define(conf, lxc);
 
-/* The lxc_conf of the container currently being worked on in an API call.
+/*
+ * The lxc_conf of the container currently being worked on in an API call.
  * This is used in the error calls.
  */
-#ifdef HAVE_TLS
 thread_local struct lxc_conf *current_config;
-#else
-struct lxc_conf *current_config;
-#endif
 
 char *lxchook_namesNUM_LXC_HOOKS = {
 	"pre-start",
@@ -124,12 +127,14 @@
 struct mount_opt {
 	char *name;
 	int clear;
-	int flag;
+	bool recursive;
+	__u64 flag;
+	int legacy_flag;
 };
 
 struct caps_opt {
 	char *name;
-	int value;
+	__u32 value;
 };
 
 struct limit_opt {
@@ -138,99 +143,93 @@
 };
 
 static struct mount_opt mount_opt = {
-	{ "async",         1, MS_SYNCHRONOUS },
-	{ "atime",         1, MS_NOATIME     },
-	{ "bind",          0, MS_BIND        },
-	{ "defaults",      0, 0              },
-	{ "dev",           1, MS_NODEV       },
-	{ "diratime",      1, MS_NODIRATIME  },
-	{ "dirsync",       0, MS_DIRSYNC     },
-	{ "exec",          1, MS_NOEXEC      },
-	{ "lazytime",	   0, MS_LAZYTIME    },
-	{ "mand",          0, MS_MANDLOCK    },
-	{ "noatime",       0, MS_NOATIME     },
-	{ "nodev",         0, MS_NODEV       },
-	{ "nodiratime",    0, MS_NODIRATIME  },
-	{ "noexec",        0, MS_NOEXEC      },
-	{ "nomand",        1, MS_MANDLOCK    },
-	{ "norelatime",    1, MS_RELATIME    },
-	{ "nostrictatime", 1, MS_STRICTATIME },
-	{ "nosuid",        0, MS_NOSUID      },
-	{ "rbind",         0, MS_BIND|MS_REC },
-	{ "relatime",      0, MS_RELATIME    },
-	{ "remount",       0, MS_REMOUNT     },
-	{ "ro",            0, MS_RDONLY      },
-	{ "rw",            1, MS_RDONLY      },
-	{ "strictatime",   0, MS_STRICTATIME },
-	{ "suid",          1, MS_NOSUID      },
-	{ "sync",          0, MS_SYNCHRONOUS },
-	{ NULL,            0, 0              },
+	{ "atime",         1, false, MOUNT_ATTR_NOATIME,     MS_NOATIME       },
+	{ "dev",           1, false, MOUNT_ATTR_NODEV,       MS_NODEV         },
+	{ "diratime",      1, false, MOUNT_ATTR_NODIRATIME,  MS_NODIRATIME    },
+	{ "exec",          1, false, MOUNT_ATTR_NOEXEC,      MS_NOEXEC        },
+	{ "noatime",       0, false, MOUNT_ATTR_NOATIME,     MS_NOATIME       },
+	{ "nodev",         0, false, MOUNT_ATTR_NODEV,       MS_NODEV         },
+	{ "nodiratime",    0, false, MOUNT_ATTR_NODIRATIME,  MS_NODIRATIME    },
+	{ "noexec",        0, false, MOUNT_ATTR_NOEXEC,      MS_NOEXEC        },
+	{ "norelatime",    1, false, MOUNT_ATTR_RELATIME,    MS_RELATIME      },
+	{ "nostrictatime", 1, false, MOUNT_ATTR_STRICTATIME, MS_STRICTATIME   },
+	{ "nosuid",        0, false, MOUNT_ATTR_NOSUID,      MS_NOSUID        },
+	{ "relatime",      0, false, MOUNT_ATTR_RELATIME,    MS_RELATIME      },
+	{ "ro",            0, false, MOUNT_ATTR_RDONLY,      MS_RDONLY        },
+	{ "rw",            1, false, MOUNT_ATTR_RDONLY,      MS_RDONLY        },
+	{ "strictatime",   0, false, MOUNT_ATTR_STRICTATIME, MS_STRICTATIME   },
+	{ "suid",          1, false, MOUNT_ATTR_NOSUID,      MS_NOSUID        },
+
+	{ "bind",          0, false,  0,                     MS_BIND          },
+	{ "defaults",      0, false,  0,                     0                },
+	{ "rbind",         0, true,   0,                     MS_BIND | MS_REC },
+
+	{ "sync",          0, false, ~0,                     MS_SYNCHRONOUS   },
+	{ "async",         1, false, ~0,		     MS_SYNCHRONOUS   },
+	{ "dirsync",       0, false, ~0,                     MS_DIRSYNC       },
+	{ "lazytime",      0, false, ~0,                     MS_LAZYTIME      },
+	{ "mand",          0, false, ~0,                     MS_MANDLOCK      },
+	{ "nomand",        1, false, ~0,                     MS_MANDLOCK      },
+	{ "remount",       0, false, ~0,                     MS_REMOUNT       },
+
+	{ NULL,            0, false, ~0,                     ~0               },
 };
 
 static struct mount_opt propagation_opt = {
-	{ "private",     0, MS_PRIVATE           },
-	{ "shared",      0, MS_SHARED            },
-	{ "slave",       0, MS_SLAVE             },
-	{ "unbindable",  0, MS_UNBINDABLE        },
-	{ "rprivate",    0, MS_PRIVATE|MS_REC    },
-	{ "rshared",     0, MS_SHARED|MS_REC     },
-	{ "rslave",      0, MS_SLAVE|MS_REC      },
-	{ "runbindable", 0, MS_UNBINDABLE|MS_REC },
-	{ NULL,          0, 0                    },
+	{ "private",     0, false, MS_PRIVATE,    MS_PRIVATE             },
+	{ "shared",      0, false, MS_SHARED,     MS_SHARED              },
+	{ "slave",       0, false, MS_SLAVE,      MS_SLAVE               },
+	{ "unbindable",  0, false, MS_UNBINDABLE, MS_UNBINDABLE          },
+	{ "rprivate",    0, true,  MS_PRIVATE,    MS_PRIVATE | MS_REC    },
+	{ "rshared",     0, true,  MS_SHARED,     MS_SHARED | MS_REC     },
+	{ "rslave",      0, true,  MS_SLAVE,      MS_SLAVE | MS_REC      },
+	{ "runbindable", 0, true,  MS_UNBINDABLE, MS_UNBINDABLE | MS_REC },
+	{ NULL,          0, false, 0,             0                     },
 };
 
 static struct caps_opt caps_opt = {
 #if HAVE_LIBCAP
-	{ "chown",            CAP_CHOWN            },
-	{ "dac_override",     CAP_DAC_OVERRIDE     },
-	{ "dac_read_search",  CAP_DAC_READ_SEARCH  },
-	{ "fowner",           CAP_FOWNER           },
-	{ "fsetid",           CAP_FSETID           },
-	{ "kill",             CAP_KILL             },
-	{ "setgid",           CAP_SETGID           },
-	{ "setuid",           CAP_SETUID           },
-	{ "setpcap",          CAP_SETPCAP          },
-	{ "linux_immutable",  CAP_LINUX_IMMUTABLE  },
-	{ "net_bind_service", CAP_NET_BIND_SERVICE },
-	{ "net_broadcast",    CAP_NET_BROADCAST    },
-	{ "net_admin",        CAP_NET_ADMIN        },
-	{ "net_raw",          CAP_NET_RAW          },
-	{ "ipc_lock",         CAP_IPC_LOCK         },
-	{ "ipc_owner",        CAP_IPC_OWNER        },
-	{ "sys_module",       CAP_SYS_MODULE       },
-	{ "sys_rawio",        CAP_SYS_RAWIO        },
-	{ "sys_chroot",       CAP_SYS_CHROOT       },
-	{ "sys_ptrace",       CAP_SYS_PTRACE       },
-	{ "sys_pacct",        CAP_SYS_PACCT        },
-	{ "sys_admin",        CAP_SYS_ADMIN        },
-	{ "sys_boot",         CAP_SYS_BOOT         },
-	{ "sys_nice",         CAP_SYS_NICE         },
-	{ "sys_resource",     CAP_SYS_RESOURCE     },
-	{ "sys_time",         CAP_SYS_TIME         },
-	{ "sys_tty_config",   CAP_SYS_TTY_CONFIG   },
-	{ "mknod",            CAP_MKNOD            },
-	{ "lease",            CAP_LEASE            },
-#ifdef CAP_AUDIT_READ
-	{ "audit_read",       CAP_AUDIT_READ       },
-#endif
-#ifdef CAP_AUDIT_WRITE
-	{ "audit_write",      CAP_AUDIT_WRITE      },
-#endif
-#ifdef CAP_AUDIT_CONTROL
-	{ "audit_control",    CAP_AUDIT_CONTROL    },
-#endif
-	{ "setfcap",          CAP_SETFCAP          },
-	{ "mac_override",     CAP_MAC_OVERRIDE     },
-	{ "mac_admin",        CAP_MAC_ADMIN        },
-#ifdef CAP_SYSLOG
-	{ "syslog",           CAP_SYSLOG           },
-#endif
-#ifdef CAP_WAKE_ALARM
-	{ "wake_alarm",       CAP_WAKE_ALARM       },
-#endif
-#ifdef CAP_BLOCK_SUSPEND
-	{ "block_suspend",    CAP_BLOCK_SUSPEND    },
-#endif
+	{ "chown",              CAP_CHOWN              },
+	{ "dac_override",       CAP_DAC_OVERRIDE       },
+	{ "dac_read_search",    CAP_DAC_READ_SEARCH    },
+	{ "fowner",             CAP_FOWNER             },
+	{ "fsetid",             CAP_FSETID             },
+	{ "kill",               CAP_KILL               },
+	{ "setgid",             CAP_SETGID             },
+	{ "setuid",             CAP_SETUID             },
+	{ "setpcap",            CAP_SETPCAP            },
+	{ "linux_immutable",    CAP_LINUX_IMMUTABLE    },
+	{ "net_bind_service",   CAP_NET_BIND_SERVICE   },
+	{ "net_broadcast",      CAP_NET_BROADCAST      },
+	{ "net_admin",          CAP_NET_ADMIN          },
+	{ "net_raw",            CAP_NET_RAW            },
+	{ "ipc_lock",           CAP_IPC_LOCK           },
+	{ "ipc_owner",          CAP_IPC_OWNER          },
+	{ "sys_module",         CAP_SYS_MODULE         },
+	{ "sys_rawio",          CAP_SYS_RAWIO          },
+	{ "sys_chroot",         CAP_SYS_CHROOT         },
+	{ "sys_ptrace",         CAP_SYS_PTRACE         },
+	{ "sys_pacct",          CAP_SYS_PACCT          },
+	{ "sys_admin",          CAP_SYS_ADMIN          },
+	{ "sys_boot",           CAP_SYS_BOOT           },
+	{ "sys_nice",           CAP_SYS_NICE           },
+	{ "sys_resource",       CAP_SYS_RESOURCE       },
+	{ "sys_time",           CAP_SYS_TIME           },
+	{ "sys_tty_config",     CAP_SYS_TTY_CONFIG     },
+	{ "mknod",              CAP_MKNOD              },
+	{ "lease",              CAP_LEASE              },
+	{ "audit_write",        CAP_AUDIT_WRITE        },
+	{ "audit_control",      CAP_AUDIT_CONTROL      },
+	{ "setfcap",            CAP_SETFCAP            },
+	{ "mac_override",       CAP_MAC_OVERRIDE       },
+	{ "mac_admin",          CAP_MAC_ADMIN          },
+	{ "syslog",             CAP_SYSLOG             },
+	{ "wake_alarm",         CAP_WAKE_ALARM         },
+	{ "block_suspend",      CAP_BLOCK_SUSPEND      },
+	{ "audit_read",         CAP_AUDIT_READ         },
+	{ "perfmon",            CAP_PERFMON            },
+	{ "bpf",                CAP_BPF                },
+	{ "checkpoint_restore", CAP_CHECKPOINT_RESTORE },
 #endif
 };
 
@@ -295,7 +294,7 @@
 	if (!f)
 		return log_error_errno(-1, errno, "Failed to popen() %s", buffer);
 
-	output = malloc(LXC_LOG_BUFFER_SIZE);
+	output = zalloc(LXC_LOG_BUFFER_SIZE);
 	if (!output)
 		return log_error_errno(-1, ENOMEM, "Failed to allocate memory for %s", buffer);
 
@@ -366,15 +365,15 @@
 			return -EFBIG;
 	}
 
-	buffer = malloc(size);
+	buffer = zalloc(size);
 	if (!buffer)
 		return -ENOMEM;
 
 	if (hook_version == 0)
-		buf_pos = snprintf(buffer, size, "exec %s %s %s %s", script, name, section, hookname);
+		buf_pos = strnprintf(buffer, size, "exec %s %s %s %s", script, name, section, hookname);
 	else
-		buf_pos = snprintf(buffer, size, "exec %s", script);
-	if (buf_pos < 0 || (size_t)buf_pos >= size)
+		buf_pos = strnprintf(buffer, size, "exec %s", script);
+	if (buf_pos < 0)
 		return log_error_errno(-1, errno, "Failed to create command line for script \"%s\"", script);
 
 	if (hook_version == 1) {
@@ -389,7 +388,7 @@
 			return log_error_errno(-1, errno, "Failed to set environment variable: LXC_HOOK_SECTION=%s", section);
 		TRACE("Set environment variable: LXC_HOOK_SECTION=%s", section);
 
-		if (strcmp(section, "net") == 0) {
+		if (strequal(section, "net")) {
 			char *parent;
 
 			if (!argv || !argv0)
@@ -402,17 +401,17 @@
 
 			parent = argv1 ? argv1 : "";
 
-			if (strcmp(argv0, "macvlan") == 0) {
+			if (strequal(argv0, "macvlan")) {
 				ret = setenv("LXC_NET_PARENT", parent, 1);
 				if (ret < 0)
 					return log_error_errno(-1, errno, "Failed to set environment variable: LXC_NET_PARENT=%s", parent);
 				TRACE("Set environment variable: LXC_NET_PARENT=%s", parent);
-			} else if (strcmp(argv0, "phys") == 0) {
+			} else if (strequal(argv0, "phys")) {
 				ret = setenv("LXC_NET_PARENT", parent, 1);
 				if (ret < 0)
 					return log_error_errno(-1, errno, "Failed to set environment variable: LXC_NET_PARENT=%s", parent);
 				TRACE("Set environment variable: LXC_NET_PARENT=%s", parent);
-			} else if (strcmp(argv0, "veth") == 0) {
+			} else if (strequal(argv0, "veth")) {
 				char *peer = argv2 ? argv2 : "";
 
 				ret = setenv("LXC_NET_PEER", peer, 1);
@@ -431,8 +430,8 @@
 	for (i = 0; argv && argvi; i++) {
 		size_t len = size - buf_pos;
 
-		ret = snprintf(buffer + buf_pos, len, " %s", argvi);
-		if (ret < 0 || (size_t)ret >= len)
+		ret = strnprintf(buffer + buf_pos, len, " %s", argvi);
+		if (ret < 0)
 			return log_error_errno(-1, errno, "Failed to create command line for script \"%s\"", script);
 		buf_pos += ret;
 	}
@@ -466,16 +465,16 @@
 		return -1;
 
 	buffer = must_realloc(NULL, size);
-	ret = snprintf(buffer, size, "exec %s %s %s", script, name, section);
-	if (ret < 0 || ret >= size)
+	ret = strnprintf(buffer, size, "exec %s %s %s", script, name, section);
+	if (ret < 0)
 		return -1;
 
 	va_start(ap, script);
 	while ((p = va_arg(ap, char *))) {
 		int len = size - ret;
 		int rc;
-		rc = snprintf(buffer + ret, len, " %s", p);
-		if (rc < 0 || rc >= len) {
+		rc = strnprintf(buffer + ret, len, " %s", p);
+		if (rc < 0) {
 			va_end(ap);
 			return -1;
 		}
@@ -486,105 +485,175 @@
 	return run_buffer(buffer);
 }
 
-/* pin_rootfs
+int lxc_storage_prepare(struct lxc_conf *conf)
+{
+	int ret;
+	struct lxc_rootfs *rootfs = &conf->rootfs;
+
+	if (!rootfs->path) {
+		ret = mount("", "/", NULL, MS_SLAVE | MS_REC, 0);
+		if (ret < 0)
+			return log_error_errno(-1, errno, "Failed to recursively turn root mount tree into dependent mount");
+
+		rootfs->dfd_mnt = open_at(-EBADF, "/", PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE, 0);
+		if (rootfs->dfd_mnt < 0)
+			return -errno;
+
+		return 0;
+	}
+
+	ret = access(rootfs->mount, F_OK);
+	if (ret != 0)
+		return log_error_errno(-1, errno, "Failed to access to \"%s\". Check it is present",
+				       rootfs->mount);
+
+	rootfs->storage = storage_init(conf);
+	if (!rootfs->storage)
+		return log_error(-1, "Failed to mount rootfs \"%s\" onto \"%s\" with options \"%s\"",
+				 rootfs->path, rootfs->mount,
+				 rootfs->mnt_opts.raw_options ? rootfs->mnt_opts.raw_options : "(null)");
+
+	return 0;
+}
+
+void lxc_storage_put(struct lxc_conf *conf)
+{
+	storage_put(conf->rootfs.storage);
+	conf->rootfs.storage = NULL;
+}
+
+/* lxc_rootfs_prepare
  * if rootfs is a directory, then open ${rootfs}/.lxc-keep for writing for
  * the duration of the container run, to prevent the container from marking
  * the underlying fs readonly on shutdown. unlink the file immediately so
  * no name pollution is happens.
  * don't unlink on NFS to avoid random named stale handles.
- * return -1 on error.
- * return -2 if nothing needed to be pinned.
- * return an open fd (>=0) if we pinned it.
  */
-int pin_rootfs(const char *rootfs)
+int lxc_rootfs_init(struct lxc_conf *conf, bool userns)
 {
-	__do_free char *absrootfs = NULL;
-	int fd, ret;
-	char absrootfspinPATH_MAX;
-	struct stat s;
-	struct statfs sfs;
+	__do_close int dfd_path = -EBADF, fd_pin = -EBADF;
+	int ret;
+	struct stat st;
+	struct statfs stfs;
+	struct lxc_rootfs *rootfs = &conf->rootfs;
 
-	if (rootfs == NULL || strlen(rootfs) == 0)
-		return -2;
+	ret = lxc_storage_prepare(conf);
+	if (ret)
+		return syserror_set(-EINVAL, "Failed to prepare rootfs storage");
 
-	absrootfs = realpath(rootfs, NULL);
-	if (!absrootfs)
-		return -2;
+	if (!is_empty_string(rootfs->mnt_opts.userns_path)) {
+		if (!rootfs->path)
+			return syserror_set(-EINVAL, "Idmapped rootfs currently only supported with separate rootfs for container");
 
-	ret = stat(absrootfs, &s);
-	if (ret < 0)
-		return -1;
+		if (rootfs->bdev_type && !strequal(rootfs->bdev_type, "dir"))
+			return syserror_set(-EINVAL, "Idmapped rootfs currently only supports the \"dir\" storage driver");
+	}
 
-	if (!S_ISDIR(s.st_mode))
-		return -2;
+	if (!rootfs->path)
+		return log_trace(0, "Not pinning because container does not have a rootfs");
 
-	ret = snprintf(absrootfspin, sizeof(absrootfspin), "%s/.lxc-keep", absrootfs);
-	if (ret < 0 || (size_t)ret >= sizeof(absrootfspin))
-		return -1;
+	if (userns)
+		return log_trace(0, "Not pinning because container runs in user namespace");
 
-	fd = open(absrootfspin, O_CREAT | O_RDWR, S_IWUSR | S_IRUSR | O_CLOEXEC);
-	if (fd < 0)
-		return fd;
+	if (rootfs->bdev_type) {
+		if (strequal(rootfs->bdev_type, "overlay") ||
+		    strequal(rootfs->bdev_type, "overlayfs"))
+			return log_trace_errno(0, EINVAL, "Not pinning on stacking filesystem");
 
-	ret = fstatfs (fd, &sfs);
+		if (strequal(rootfs->bdev_type, "zfs"))
+			return log_trace_errno(0, EINVAL, "Not pinning on ZFS filesystem");
+	}
+
+	dfd_path = open_at(-EBADF, rootfs->path, PROTECT_OPATH_FILE, 0, 0);
+	if (dfd_path < 0)
+		return syserror("Failed to open \"%s\"", rootfs->path);
+
+	ret = fstat(dfd_path, &st);
 	if (ret < 0)
-		return fd;
+		return log_trace_errno(-errno, errno, "Failed to retrieve file status");
 
-	if (sfs.f_type == NFS_SUPER_MAGIC)
-		return log_debug(fd, "Rootfs on NFS, not unlinking pin file \"%s\"", absrootfspin);
+	if (!S_ISDIR(st.st_mode))
+		return log_trace_errno(0, ENOTDIR, "Not pinning because file descriptor is not a directory");
 
-	(void)unlink(absrootfspin);
+	fd_pin = open_at(dfd_path, ".lxc_keep",
+			 PROTECT_OPEN | O_CREAT,
+			 PROTECT_LOOKUP_BENEATH,
+			 S_IWUSR | S_IRUSR);
+	if (fd_pin < 0) {
+		if (errno == EROFS)
+			return log_trace_errno(0, EROFS, "Not pinning on read-only filesystem");
+		return syserror("Failed to pin rootfs");
+	}
 
-	return fd;
+	TRACE("Pinned rootfs %d(.lxc_keep)", fd_pin);
+
+	ret = fstatfs(fd_pin, &stfs);
+	if (ret < 0) {
+		SYSWARN("Failed to retrieve filesystem status");
+		goto out;
+	}
+
+	if (stfs.f_type == NFS_SUPER_MAGIC) {
+		DEBUG("Not unlinking pinned file on NFS");
+		goto out;
+	}
+
+	if (unlinkat(dfd_path, ".lxc_keep", 0))
+		SYSTRACE("Failed to unlink rootfs pinning file %d(.lxc_keep)", dfd_path);
+	else
+		TRACE("Unlinked pinned file %d(.lxc_keep)", dfd_path);
+
+out:
+	rootfs->fd_path_pin = move_fd(fd_pin);
+	return 0;
 }
 
-/* If we are asking to remount something, make sure that any NOEXEC etc are
- * honored.
- */
-unsigned long add_required_remount_flags(const char *s, const char *d,
-					 unsigned long flags)
+int lxc_rootfs_prepare_parent(struct lxc_handler *handler)
 {
-#ifdef HAVE_STATVFS
+	__do_close int dfd_idmapped = -EBADF, fd_userns = -EBADF;
+	struct lxc_rootfs *rootfs = &handler->conf->rootfs;
+	struct lxc_storage *storage = rootfs->storage;
+	const struct lxc_mount_options *mnt_opts = &rootfs->mnt_opts;
 	int ret;
-	struct statvfs sb;
-	unsigned long required_flags = 0;
+	const char *path_source;
+
+	if (list_empty(&handler->conf->id_map))
+		return 0;
 
-	if (!s)
-		s = d;
+	if (is_empty_string(rootfs->mnt_opts.userns_path))
+		return 0;
 
-	if (!s)
-		return flags;
+	if (handler->conf->rootfs_setup)
+		return 0;
 
-	ret = statvfs(s, &sb);
-	if (ret < 0)
-		return flags;
-
-	if (flags & MS_REMOUNT) {
-		if (sb.f_flag & MS_NOSUID)
-			required_flags |= MS_NOSUID;
-		if (sb.f_flag & MS_NODEV)
-			required_flags |= MS_NODEV;
-		if (sb.f_flag & MS_RDONLY)
-			required_flags |= MS_RDONLY;
-		if (sb.f_flag & MS_NOEXEC)
-			required_flags |= MS_NOEXEC;
-	}
-
-	if (sb.f_flag & MS_NOATIME)
-		required_flags |= MS_NOATIME;
-	if (sb.f_flag & MS_NODIRATIME)
-		required_flags |= MS_NODIRATIME;
-	if (sb.f_flag & MS_LAZYTIME)
-		required_flags |= MS_LAZYTIME;
-	if (sb.f_flag & MS_RELATIME)
-		required_flags |= MS_RELATIME;
-	if (sb.f_flag & MS_STRICTATIME)
-		required_flags |= MS_STRICTATIME;
+	if (rootfs_is_blockdev(handler->conf))
+		return syserror_set(-EOPNOTSUPP, "Idmapped mounts on block-backed storage not yet supported");
 
-	return flags | required_flags;
-#else
-	return flags;
-#endif
+	if (!can_use_bind_mounts())
+		return syserror_set(-EOPNOTSUPP, "Kernel does not support the new mount api");
+
+	if (strequal(rootfs->mnt_opts.userns_path, "container"))
+		fd_userns = dup_cloexec(handler->nsfdLXC_NS_USER);
+	else
+		fd_userns = open_at(-EBADF, rootfs->mnt_opts.userns_path,
+				    PROTECT_OPEN_WITH_TRAILING_SYMLINKS, 0, 0);
+	if (fd_userns < 0)
+		return syserror("Failed to open user namespace");
+
+	path_source = lxc_storage_get_path(storage->src, storage->type);
+
+	dfd_idmapped = create_detached_idmapped_mount(path_source, fd_userns, true,
+						      mnt_opts->attr.attr_set,
+						      mnt_opts->attr.attr_clr);
+	if (dfd_idmapped < 0)
+		return syserror("Failed to create detached idmapped mount");
+
+	ret = lxc_abstract_unix_send_fds(handler->data_sock0, &dfd_idmapped, 1, NULL, 0);
+	if (ret < 0)
+		return syserror("Failed to send detached idmapped mount fd");
+
+	TRACE("Created detached idmapped mount %d", dfd_idmapped);
+	return 0;
 }
 
 static int add_shmount_to_list(struct lxc_conf *conf)
@@ -595,18 +664,18 @@
 	 */
 	int offset = 1, ret = -1;
 
-	ret = snprintf(new_mount, sizeof(new_mount),
+	ret = strnprintf(new_mount, sizeof(new_mount),
 		       "%s %s none bind,create=dir 0 0", conf->shmount.path_host,
 		       conf->shmount.path_cont + offset);
-	if (ret < 0 || (size_t)ret >= sizeof(new_mount))
+	if (ret < 0)
 		return -1;
 
 	return add_elem_to_mount_list(new_mount, conf);
 }
 
-static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_handler *handler)
+static int lxc_mount_auto_mounts(struct lxc_handler *handler, int flags)
 {
-	int i, r;
+	int i, ret;
 	static struct {
 		int match_mask;
 		int match_flag;
@@ -615,6 +684,7 @@
 		const char *fstype;
 		unsigned long flags;
 		const char *options;
+		bool requires_cap_net_admin;
 	} default_mounts = {
 		/* Read-only bind-mounting... In older kernels, doing that
 		 * required to do one MS_BIND mount and then
@@ -628,65 +698,126 @@
 		 * it's busy...  MS_REMOUNT|MS_BIND|MS_RDONLY seems to work for
 		 * kernels as low as 2.6.32...
 		 */
-		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "proc",                                           "%r/proc",                    "proc",  MS_NODEV|MS_NOEXEC|MS_NOSUID,                    NULL },
+		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "proc",                                           "%r/proc",                    "proc",  MS_NODEV|MS_NOEXEC|MS_NOSUID,                    NULL, false },
 		/* proc/tty is used as a temporary placeholder for proc/sys/net which we'll move back in a few steps */
-		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "%r/proc/sys/net",                                "%r/proc/tty",                NULL,    MS_BIND,                                         NULL },
-		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "%r/proc/sys",                                    "%r/proc/sys",                NULL,    MS_BIND,                                         NULL },
-		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, NULL,                                             "%r/proc/sys",                NULL,    MS_REMOUNT|MS_BIND|MS_RDONLY,                    NULL },
-		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "%r/proc/tty",                                    "%r/proc/sys/net",            NULL,    MS_MOVE,                                         NULL },
-		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "%r/proc/sysrq-trigger",                          "%r/proc/sysrq-trigger",      NULL,    MS_BIND,                                         NULL },
-		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, NULL,                                             "%r/proc/sysrq-trigger",      NULL,    MS_REMOUNT|MS_BIND|MS_RDONLY,                    NULL },
-		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_RW,    "proc",                                           "%r/proc",                    "proc",  MS_NODEV|MS_NOEXEC|MS_NOSUID,                    NULL },
-		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RW,     "sysfs",                                          "%r/sys",                     "sysfs", 0,                                               NULL },
-		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RO,     "sysfs",                                          "%r/sys",                     "sysfs", MS_RDONLY,                                       NULL },
-		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "sysfs",                                          "%r/sys",                     "sysfs", MS_NODEV|MS_NOEXEC|MS_NOSUID,                    NULL },
-		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "%r/sys",                                         "%r/sys",                     NULL,    MS_BIND,                                         NULL },
-		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  NULL,                                             "%r/sys",                     NULL,    MS_REMOUNT|MS_BIND|MS_RDONLY,                    NULL },
-		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "sysfs",                                          "%r/sys/devices/virtual/net", "sysfs", 0,                                               NULL },
-		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "%r/sys/devices/virtual/net/devices/virtual/net", "%r/sys/devices/virtual/net", NULL,    MS_BIND,                                         NULL },
-		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  NULL,                                             "%r/sys/devices/virtual/net", NULL,    MS_REMOUNT|MS_BIND|MS_NOSUID|MS_NODEV|MS_NOEXEC, NULL },
-		{ 0,                  0,                   NULL,                                             NULL,                         NULL,    0,                                               NULL }
+		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "%r/proc/sys/net",                                "%r/proc/tty",                NULL,    MS_BIND,                                         NULL, true, },
+		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "%r/proc/sys",                                    "%r/proc/sys",                NULL,    MS_BIND,                                         NULL, false },
+		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, NULL,                                             "%r/proc/sys",                NULL,    MS_REMOUNT|MS_BIND|MS_RDONLY,                    NULL, false },
+		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "%r/proc/tty",                                    "%r/proc/sys/net",            NULL,    MS_MOVE,                                         NULL, true  },
+		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, "%r/proc/sysrq-trigger",                          "%r/proc/sysrq-trigger",      NULL,    MS_BIND,                                         NULL, false },
+		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED, NULL,                                             "%r/proc/sysrq-trigger",      NULL,    MS_REMOUNT|MS_BIND|MS_RDONLY,                    NULL, false },
+		{ LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_RW,    "proc",                                           "%r/proc",                    "proc",  MS_NODEV|MS_NOEXEC|MS_NOSUID,                    NULL, false },
+		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RW,     "sysfs",                                          "%r/sys",                     "sysfs", 0,                                               NULL, false },
+		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_RO,     "sysfs",                                          "%r/sys",                     "sysfs", MS_RDONLY,                                       NULL, false },
+		/* /proc/sys is used as a temporary staging directory for the read-write sysfs mount and unmounted after binding net */
+		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "sysfs",                                          "%r/proc/sys",                "sysfs", MS_NOSUID|MS_NODEV|MS_NOEXEC,                    NULL, false },
+		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "sysfs",                                          "%r/sys",                     "sysfs", MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC,          NULL, false },
+		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "%r/proc/sys/devices/virtual/net",                "%r/sys/devices/virtual/net", NULL,    MS_BIND,                                         NULL, false },
+		{ LXC_AUTO_SYS_MASK,  LXC_AUTO_SYS_MIXED,  "%r/proc/sys",                                    NULL,                         NULL,    0,                                               NULL, false },
+		{ 0,                  0,                   NULL,                                             NULL,                         NULL,    0,                                               NULL, false }
 	};
+	struct lxc_conf *conf = handler->conf;
+        struct lxc_rootfs *rootfs = &conf->rootfs;
+        bool has_cap_net_admin;
+
+        if (flags & LXC_AUTO_PROC_MASK) {
+		if (rootfs->path) {
+			/*
+			 * Only unmount procfs if we have a separate rootfs so
+			 * we can still access it in safe_mount() below.
+			 */
+			ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/proc",
+					rootfs->path ? rootfs->mount : "");
+			if (ret < 0)
+				return ret_errno(EIO);
+
+			ret = umount2(rootfs->buf, MNT_DETACH);
+			if (ret)
+				SYSDEBUG("Tried to ensure procfs is unmounted");
+		}
+
+		ret = mkdirat(rootfs->dfd_mnt, "proc" , S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+		if (ret < 0 && errno != EEXIST)
+			return syserror("Failed to create procfs mountpoint under %d", rootfs->dfd_mnt);
+
+		TRACE("Created procfs mountpoint under %d", rootfs->dfd_mnt);
+	}
+
+	if (flags & LXC_AUTO_SYS_MASK) {
+		if (rootfs->path) {
+			/*
+			 * Only unmount sysfs if we have a separate rootfs so
+			 * we can still access it in safe_mount() below.
+			 */
+			ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/sys",
+					rootfs->path ? rootfs->mount : "");
+			if (ret < 0)
+				return ret_errno(EIO);
+
+			ret = umount2(rootfs->buf, MNT_DETACH);
+			if (ret)
+				SYSDEBUG("Tried to ensure sysfs is unmounted");
+		}
+
+		ret = mkdirat(rootfs->dfd_mnt, "sys" , S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+		if (ret < 0 && errno != EEXIST)
+			return syserror("Failed to create sysfs mountpoint under %d", rootfs->dfd_mnt);
+
+		TRACE("Created sysfs mountpoint under %d", rootfs->dfd_mnt);
+	}
 
-	for (i = 0; default_mountsi.match_mask; i++) {
+        has_cap_net_admin = lxc_wants_cap(CAP_NET_ADMIN, conf);
+        for (i = 0; default_mountsi.match_mask; i++) {
 		__do_free char *destination = NULL, *source = NULL;
-		int saved_errno;
-		unsigned long mflags;
+		unsigned long mflags = default_mountsi.flags;
+
 		if ((flags & default_mountsi.match_mask) != default_mountsi.match_flag)
 			continue;
 
 		if (default_mountsi.source) {
 			/* will act like strdup if %r is not present */
-			source = lxc_string_replace("%r", conf->rootfs.path ? conf->rootfs.mount : "", default_mountsi.source);
+			source = lxc_string_replace("%r", rootfs->path ? rootfs->mount : "", default_mountsi.source);
 			if (!source)
-				return -1;
+				return syserror_set(-ENOMEM, "Failed to create source path");
+		}
+
+		if (!has_cap_net_admin && default_mountsi.requires_cap_net_admin) {
+			TRACE("Container does not have CAP_NET_ADMIN. Skipping \"%s\" mount", default_mountsi.source ?: "(null)");
+			continue;
 		}
 
-		if (!default_mountsi.destination)
-			return log_error(-1, "BUG: auto mounts destination %d was NULL", i);
+		if (!default_mountsi.destination) {
+			ret = umount2(source, MNT_DETACH);
+			if (ret < 0)
+				return log_error_errno(-1, errno,
+						       "Failed to unmount \"%s\"",
+						       source);
+			TRACE("Unmounted automount \"%s\"", source);
+			continue;
+		}
 
 		/* will act like strdup if %r is not present */
-		destination = lxc_string_replace("%r", conf->rootfs.path ? conf->rootfs.mount : "", default_mountsi.destination);
+		destination = lxc_string_replace("%r", rootfs->path ? rootfs->mount : "", default_mountsi.destination);
 		if (!destination)
-			return -1;
+			return syserror_set(-ENOMEM, "Failed to create target path");
+
+		ret = safe_mount(source, destination,
+				 default_mountsi.fstype,
+				 mflags,
+				 default_mountsi.options,
+				 rootfs->path ? rootfs->mount : NULL);
+		if (ret < 0) {
+			if (errno != ENOENT)
+				return syserror("Failed to mount \"%s\" on \"%s\" with flags %lu", source, destination, mflags);
 
-		mflags = add_required_remount_flags(source, destination,
-						    default_mountsi.flags);
-		r = safe_mount(source, destination, default_mountsi.fstype,
-			       mflags, default_mountsi.options,
-			       conf->rootfs.path ? conf->rootfs.mount : NULL);
-		saved_errno = errno;
-		if (r < 0 && errno == ENOENT) {
 			INFO("Mount source or target for \"%s\" on \"%s\" does not exist. Skipping", source, destination);
-			r = 0;
-		} else if (r < 0) {
-			SYSERROR("Failed to mount \"%s\" on \"%s\" with flags %lu", source, destination, mflags);
+			continue;
 		}
 
-		if (r < 0) {
-			errno = saved_errno;
-			return -1;
-		}
+		if (mflags & MS_REMOUNT)
+			TRACE("Remounted automount \"%s\" on \"%s\" %s with flags %lu", source, destination, (mflags & MS_RDONLY) ? "read-only" : "read-write", mflags);
+		else
+			TRACE("Mounted automount \"%s\" on \"%s\" %s with flags %lu", source, destination, (mflags & MS_RDONLY) ? "read-only" : "read-write", mflags);
 	}
 
 	if (flags & LXC_AUTO_CGROUP_MASK) {
@@ -703,32 +834,26 @@
 		 * CAP_SYS_ADMIN, do only default to :mixed, because then the
 		 * container can't remount it read-write.
 		 */
-		if (cg_flags == LXC_AUTO_CGROUP_NOSPEC || cg_flags == LXC_AUTO_CGROUP_FULL_NOSPEC) {
-			int has_sys_admin = 0;
-
-			if (!lxc_list_empty(&conf->keepcaps))
-				has_sys_admin = in_caplist(CAP_SYS_ADMIN, &conf->keepcaps);
-			else
-				has_sys_admin = !in_caplist(CAP_SYS_ADMIN, &conf->caps);
-
+		if ((cg_flags == LXC_AUTO_CGROUP_NOSPEC) || (cg_flags == LXC_AUTO_CGROUP_FULL_NOSPEC)) {
 			if (cg_flags == LXC_AUTO_CGROUP_NOSPEC)
-				cg_flags = has_sys_admin ? LXC_AUTO_CGROUP_RW : LXC_AUTO_CGROUP_MIXED;
+				cg_flags = has_cap(CAP_SYS_ADMIN, conf)
+					       ? LXC_AUTO_CGROUP_RW
+					       : LXC_AUTO_CGROUP_MIXED;
 			else
-				cg_flags = has_sys_admin ? LXC_AUTO_CGROUP_FULL_RW : LXC_AUTO_CGROUP_FULL_MIXED;
+				cg_flags = has_cap(CAP_SYS_ADMIN, conf)
+					       ? LXC_AUTO_CGROUP_FULL_RW
+					       : LXC_AUTO_CGROUP_FULL_MIXED;
 		}
 
 		if (flags & LXC_AUTO_CGROUP_FORCE)
 			cg_flags |= LXC_AUTO_CGROUP_FORCE;
 
-		if (!handler->cgroup_ops->mount(handler->cgroup_ops,
-						handler,
-						conf->rootfs.path ? conf->rootfs.mount : "",
-						cg_flags))
+		if (!handler->cgroup_ops->mount(handler->cgroup_ops, handler, cg_flags))
 			return log_error_errno(-1, errno, "Failed to mount \"/sys/fs/cgroup\"");
 	}
 
 	if (flags & LXC_AUTO_SHMOUNTS_MASK) {
-		int ret = add_shmount_to_list(conf);
+		ret = add_shmount_to_list(conf);
 		if (ret < 0)
 			return log_error(-1, "Failed to add shmount entry to container config");
 	}
@@ -767,31 +892,30 @@
 
 static int lxc_setup_dev_symlinks(const struct lxc_rootfs *rootfs)
 {
-	int i, ret;
-	char pathPATH_MAX;
-	struct stat s;
-
-	for (i = 0; i < sizeof(dev_symlinks) / sizeof(dev_symlinks0); i++) {
+	for (size_t i = 0; i < sizeof(dev_symlinks) / sizeof(dev_symlinks0); i++) {
+		int ret;
+		struct stat s;
 		const struct dev_symlinks *d = &dev_symlinksi;
 
-		ret = snprintf(path, sizeof(path), "%s/dev/%s",
-			       rootfs->path ? rootfs->mount : "", d->name);
-		if (ret < 0 || (size_t)ret >= sizeof(path))
-			return -1;
-
-		/* Stat the path first. If we don't get an error accept it as
+		/*
+		 * Stat the path first. If we don't get an error accept it as
 		 * is and don't try to create it
 		 */
-		ret = stat(path, &s);
+		ret = fstatat(rootfs->dfd_dev, d->name, &s, 0);
 		if (ret == 0)
 			continue;
 
-		ret = symlink(d->oldpath, path);
-		if (ret && errno != EEXIST) {
-			if (errno == EROFS)
-				WARN("Failed to create \"%s\". Read-only filesystem", path);
-			else
-				return log_error_errno(-1, errno, "Failed to create \"%s\"", path);
+		ret = symlinkat(d->oldpath, rootfs->dfd_dev, d->name);
+		if (ret) {
+			switch (errno) {
+			case EROFS:
+				WARN("Failed to create \"%s\" on read-only filesystem", d->name);
+				__fallthrough;
+			case EEXIST:
+				break;
+			default:
+				return log_error_errno(-errno, errno, "Failed to create \"%s\"", d->name);
+			}
 		}
 	}
 
@@ -799,101 +923,150 @@
 }
 
 /* Build a space-separate list of ptys to pass to systemd. */
-static bool append_ttyname(char **pp, char *name)
+static bool append_ttyname(struct lxc_tty_info *ttys, char *tty_name)
 {
-	char *p;
+	char *tty_names, *buf;
 	size_t size;
 
-	if (!*pp) {
-		*pp = malloc(strlen(name) + strlen("container_ttys=") + 1);
-		if (!*pp)
-			return false;
+	if (!tty_name)
+		return false;
 
-		sprintf(*pp, "container_ttys=%s", name);
-		return true;
-	}
+	size = strlen(tty_name) + 1;
+	if (ttys->tty_names)
+		size += strlen(ttys->tty_names) + 1;
 
-	size = strlen(*pp) + strlen(name) + 2;
-	p = realloc(*pp, size);
-	if (!p)
+	buf = realloc(ttys->tty_names, size);
+	if (!buf)
 		return false;
+	tty_names = buf;
 
-	*pp = p;
-	(void)strlcat(p, " ", size);
-	(void)strlcat(p, name, size);
-
+	if (ttys->tty_names)
+		(void)strlcat(buf, " ", size);
+	else
+		buf0 = '\0';
+	(void)strlcat(buf, tty_name, size);
+	ttys->tty_names = tty_names;
 	return true;
 }
 
+static int open_ttymnt_at(int dfd, const char *path)
+{
+	int fd;
+
+	fd = open_at(dfd, path,
+		     PROTECT_OPEN | O_CREAT | O_EXCL,
+		     PROTECT_LOOKUP_BENEATH,
+		     0);
+	if (fd < 0) {
+		if (errno != ENXIO && errno != EEXIST)
+			return syserror("Failed to create \"%d/\%s\"", dfd, path);
+
+		SYSINFO("Failed to create \"%d/\%s\"", dfd, path);
+		fd = open_at(dfd, path,
+			     PROTECT_OPATH_FILE,
+			     PROTECT_LOOKUP_BENEATH,
+			     0);
+	}
+
+	return fd;
+}
+
 static int lxc_setup_ttys(struct lxc_conf *conf)
 {
-	int i, ret;
+	int ret;
+	struct lxc_rootfs *rootfs = &conf->rootfs;
 	const struct lxc_tty_info *ttys = &conf->ttys;
 	char *ttydir = ttys->dir;
-	char pathPATH_MAX, lxcpathPATH_MAX;
 
 	if (!conf->rootfs.path)
 		return 0;
 
-	for (i = 0; i < ttys->max; i++) {
+	for (size_t i = 0; i < ttys->max; i++) {
+		__do_close int fd_to = -EBADF;
 		struct lxc_terminal_info *tty = &ttys->ttyi;
 
-		ret = snprintf(path, sizeof(path), "/dev/tty%d", i + 1);
-		if (ret < 0 || (size_t)ret >= sizeof(path))
-			return -1;
-
 		if (ttydir) {
-			/* create dev/lxc/tty%d" */
-			ret = snprintf(lxcpath, sizeof(lxcpath),
-				       "/dev/%s/tty%d", ttydir, i + 1);
-			if (ret < 0 || (size_t)ret >= sizeof(lxcpath))
-				return -1;
+			char *tty_name, *tty_path;
 
-			ret = mknod(lxcpath, S_IFREG | 0000, 0);
-			if (ret < 0 && errno != EEXIST) {
-				SYSERROR("Failed to create \"%s\"", lxcpath);
-				return -1;
-			}
+			ret = strnprintf(rootfs->buf, sizeof(rootfs->buf),
+				       "/dev/%s/tty%zu", ttydir, i + 1);
+			if (ret < 0)
+				return ret_errno(-EIO);
 
-			ret = unlink(path);
-			if (ret < 0 && errno != ENOENT) {
-				SYSERROR("Failed to unlink \"%s\"", path);
-				return -1;
-			}
+			tty_path = &rootfs->bufSTRLITERALLEN("/dev/");
+			tty_name = tty_path + strlen(ttydir) + 1;
 
-			ret = mount(tty->name, lxcpath, "none", MS_BIND, 0);
-			if (ret < 0) {
-				SYSWARN("Failed to bind mount \"%s\" onto \"%s\"", tty->name, lxcpath);
-				continue;
-			}
-			DEBUG("Bind mounted \"%s\" onto \"%s\"", tty->name, lxcpath);
-
-			ret = snprintf(lxcpath, sizeof(lxcpath), "%s/tty%d",
-				       ttydir, i + 1);
-			if (ret < 0 || (size_t)ret >= sizeof(lxcpath))
-				return -1;
+			/* create bind-mount target */
+			fd_to = open_ttymnt_at(rootfs->dfd_dev, tty_path);
+			if (fd_to < 0)
+				return log_error_errno(-errno, errno,
+						       "Failed to create tty mount target %d(%s)",
+						       rootfs->dfd_dev, tty_path);
+
+			ret = unlinkat(rootfs->dfd_dev, tty_name, 0);
+			if (ret < 0 && errno != ENOENT)
+				return log_error_errno(-errno, errno,
+						       "Failed to unlink %d(%s)",
+						       rootfs->dfd_dev, tty_name);
+
+			if (can_use_mount_api())
+				ret = fd_bind_mount(tty->pty, "",
+						    PROTECT_OPATH_FILE,
+						    PROTECT_LOOKUP_BENEATH_XDEV,
+						    fd_to, "",
+						    PROTECT_OPATH_FILE,
+						    PROTECT_LOOKUP_BENEATH_XDEV,
+						    0,
+						    0,
+						    0,
+						    false);
+			else
+				ret = mount_fd(tty->pty, fd_to, "none", MS_BIND, 0);
+			if (ret < 0)
+				return log_error_errno(-errno, errno,
+						       "Failed to bind mount \"%s\" onto \"%s\"",
+						       tty->name, rootfs->buf);
+			DEBUG("Bind mounted \"%s\" onto \"%s\"", tty->name, rootfs->buf);
 
-			ret = symlink(lxcpath, path);
+			ret = symlinkat(tty_path, rootfs->dfd_dev, tty_name);
 			if (ret < 0)
-				return log_error_errno(-1, errno, "Failed to create symlink \"%s\" -> \"%s\"", path, lxcpath);
+				return log_error_errno(-errno, errno,
+						       "Failed to create symlink \"%d(%s)\" -> \"%d(%s)\"",
+						       rootfs->dfd_dev, tty_name,
+						       rootfs->dfd_dev, tty_path);
 		} else {
-			/* If we populated /dev, then we need to create
-			 * /dev/ttyN
-			 */
-			ret = mknod(path, S_IFREG | 0000, 0);
-			if (ret < 0) /* this isn't fatal, continue */
-				SYSERROR("Failed to create \"%s\"", path);
-
-			ret = mount(tty->name, path, "none", MS_BIND, 0);
-			if (ret < 0) {
-				SYSERROR("Failed to mount '%s'->'%s'", tty->name, path);
-				continue;
-			}
+			ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "tty%zu", i + 1);
+			if (ret < 0)
+				return ret_errno(-EIO);
 
-			DEBUG("Bind mounted \"%s\" onto \"%s\"", tty->name, path);
+			/* If we populated /dev, then we need to create /dev/tty<idx>. */
+			fd_to = open_ttymnt_at(rootfs->dfd_dev, rootfs->buf);
+			if (fd_to < 0)
+				return log_error_errno(-errno, errno,
+						       "Failed to create tty mount target %d(%s)",
+						       rootfs->dfd_dev, rootfs->buf);
+
+			if (can_use_mount_api())
+				ret = fd_bind_mount(tty->pty, "",
+						    PROTECT_OPATH_FILE,
+						    PROTECT_LOOKUP_BENEATH_XDEV,
+						    fd_to, "",
+						    PROTECT_OPATH_FILE,
+						    PROTECT_LOOKUP_BENEATH,
+						    0,
+						    0,
+						    0,
+						    false);
+			else
+				ret = mount_fd(tty->pty, fd_to, "none", MS_BIND, 0);
+			if (ret < 0)
+				return log_error_errno(-errno, errno,
+						       "Failed to bind mount \"%s\" onto \"%s\"",
+						       tty->name, rootfs->buf);
+			DEBUG("Bind mounted \"%s\" onto \"%s\"", tty->name, rootfs->buf);
 		}
 
-		if (!append_ttyname(&conf->ttys.tty_names, tty->name))
+		if (!append_ttyname(&conf->ttys, tty->name))
 			return log_error(-1, "Error setting up container_ttys string");
 	}
 
@@ -903,52 +1076,34 @@
 
 define_cleanup_function(struct lxc_tty_info *, lxc_delete_tty);
 
-int lxc_allocate_ttys(struct lxc_conf *conf)
+static int lxc_allocate_ttys(struct lxc_conf *conf)
 {
-	struct lxc_terminal_info *tty_new = NULL;
-	int ret;
 	call_cleaner(lxc_delete_tty) struct lxc_tty_info *ttys = &conf->ttys;
+	int ret;
 
 	/* no tty in the configuration */
 	if (ttys->max == 0)
 		return 0;
 
-	tty_new = malloc(sizeof(struct lxc_terminal_info) * ttys->max);
-	if (!tty_new)
+	ttys->tty = zalloc(sizeof(struct lxc_terminal_info) * ttys->max);
+	if (!ttys->tty)
 		return -ENOMEM;
-	ttys->tty = tty_new;
 
-	for (size_t i = 0; i < ttys->max; i++) {
+	for (size_t i = 0; i < conf->ttys.max; i++) {
 		struct lxc_terminal_info *tty = &ttys->ttyi;
 
-		tty->ptmx = -EBADF;
-		tty->pts = -EBADF;
-		ret = openpty(&tty->ptmx, &tty->pts, NULL, NULL, NULL);
+		ret = lxc_devpts_terminal(conf->devpts_fd, &tty->ptx,
+					  &tty->pty, &tty->pty_nr, false);
 		if (ret < 0) {
-			ttys->max = i;
-			return log_error_errno(-ENOTTY, ENOTTY, "Failed to create tty %zu", i);
+			conf->ttys.max = i;
+			return syserror_set(-ENOTTY, "Failed to create tty %zu", i);
 		}
-
-		ret = ttyname_r(tty->pts, tty->name, sizeof(tty->name));
-		if (ret < 0) {
-			ttys->max = i;
-			return log_error_errno(-ENOTTY, ENOTTY, "Failed to retrieve name of tty %zu pts", i);
-		}
-
-		DEBUG("Created tty \"%s\" with ptmx fd %d and pts fd %d",
-		      tty->name, tty->ptmx, tty->pts);
-
-		/* Prevent leaking the file descriptors to the container */
-		ret = fd_cloexec(tty->ptmx, true);
-		if (ret < 0)
-			SYSWARN("Failed to set FD_CLOEXEC flag on ptmx fd %d of tty device \"%s\"",
-				tty->ptmx, tty->name);
-
-		ret = fd_cloexec(tty->pts, true);
+		ret = strnprintf(tty->name, sizeof(tty->name), "pts/%d", tty->pty_nr);
 		if (ret < 0)
-			SYSWARN("Failed to set FD_CLOEXEC flag on pts fd %d of tty device \"%s\"",
-				tty->pts, tty->name);
+			return syserror("Failed to create tty %zu", i);
 
+		DEBUG("Created tty with ptx fd %d and pty fd %d and index %d",
+		      tty->ptx, tty->pty, tty->pty_nr);
 		tty->busy = -1;
 	}
 
@@ -959,21 +1114,20 @@
 
 void lxc_delete_tty(struct lxc_tty_info *ttys)
 {
-	if (!ttys->tty)
+	if (!ttys || !ttys->tty)
 		return;
 
-	for (int i = 0; i < ttys->max; i++) {
+	for (size_t i = 0; i < ttys->max; i++) {
 		struct lxc_terminal_info *tty = &ttys->ttyi;
-		close_prot_errno_disarm(tty->ptmx);
-		close_prot_errno_disarm(tty->pts);
+		close_prot_errno_disarm(tty->ptx);
+		close_prot_errno_disarm(tty->pty);
 	}
 
 	free_disarm(ttys->tty);
 }
 
-static int lxc_send_ttys_to_parent(struct lxc_handler *handler)
+static int __lxc_send_ttys_to_parent(struct lxc_handler *handler)
 {
-	int i;
 	int ret = -1;
 	struct lxc_conf *conf = handler->conf;
 	struct lxc_tty_info *ttys = &conf->ttys;
@@ -982,19 +1136,19 @@
 	if (ttys->max == 0)
 		return 0;
 
-	for (i = 0; i < ttys->max; i++) {
+	for (size_t i = 0; i < ttys->max; i++) {
 		int ttyfds2;
 		struct lxc_terminal_info *tty = &ttys->ttyi;
 
-		ttyfds0 = tty->ptmx;
-		ttyfds1 = tty->pts;
+		ttyfds0 = tty->ptx;
+		ttyfds1 = tty->pty;
 
 		ret = lxc_abstract_unix_send_fds(sock, ttyfds, 2, NULL, 0);
 		if (ret < 0)
 			break;
 
-		TRACE("Sent tty \"%s\" with ptmx fd %d and pts fd %d to parent",
-		      tty->name, tty->ptmx, tty->pts);
+		TRACE("Sent tty \"%s\" with ptx fd %d and pty fd %d to parent",
+		      tty->name, tty->ptx, tty->pty);
 	}
 
 	if (ret < 0)
@@ -1016,12 +1170,6 @@
 		goto on_error;
 	}
 
-	ret = lxc_send_ttys_to_parent(handler);
-	if (ret < 0) {
-		ERROR("Failed to send ttys to parent");
-		goto on_error;
-	}
-
 	if (!conf->is_execute) {
 		ret = lxc_setup_ttys(conf);
 		if (ret < 0) {
@@ -1032,15 +1180,27 @@
 
 	if (conf->ttys.tty_names) {
 		ret = setenv("container_ttys", conf->ttys.tty_names, 1);
-		if (ret < 0)
+		if (ret < 0) {
 			SYSERROR("Failed to set \"container_ttys=%s\"", conf->ttys.tty_names);
+			goto on_error;
+		}
+		TRACE("Set \"container_ttys=%s\"", conf->ttys.tty_names);
 	}
 
-	ret = 0;
+	return 0;
 
 on_error:
 	lxc_delete_tty(&conf->ttys);
 
+	return -1;
+}
+
+static int lxc_send_ttys_to_parent(struct lxc_handler *handler)
+{
+	int ret = -1;
+
+	ret = __lxc_send_ttys_to_parent(handler);
+	lxc_delete_tty(&handler->conf->ttys);
 	return ret;
 }
 
@@ -1050,52 +1210,65 @@
 static int mount_autodev(const char *name, const struct lxc_rootfs *rootfs,
 			 int autodevtmpfssize, const char *lxcpath)
 {
-	__do_free char *path = NULL;
+	__do_close int fd_fs = -EBADF;
+	const char *path = rootfs->path ? rootfs->mount : NULL;
+	size_t tmpfs_size = (autodevtmpfssize != 0) ? autodevtmpfssize : 500000;
 	int ret;
-	size_t clen;
 	mode_t cur_mask;
         char mount_options128;
 
 	INFO("Preparing \"/dev\"");
 
-	/* $(rootfs->mount) + "/dev/pts" + '\0' */
-	clen = (rootfs->path ? strlen(rootfs->mount) : 0) + 9;
-	path = must_realloc(NULL, clen);
-	sprintf(mount_options, "size=%d,mode=755", (autodevtmpfssize != 0) ? autodevtmpfssize : 500000);
-	DEBUG("Using mount options: %s", mount_options);
-
-	ret = snprintf(path, clen, "%s/dev", rootfs->path ? rootfs->mount : "");
-	if (ret < 0 || (size_t)ret >= clen)
-		return -1;
-
 	cur_mask = umask(S_IXUSR | S_IXGRP | S_IXOTH);
-	ret = mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+	ret = mkdirat(rootfs->dfd_mnt, "dev" , S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
 	if (ret < 0 && errno != EEXIST) {
 		SYSERROR("Failed to create \"/dev\" directory");
 		ret = -errno;
 		goto reset_umask;
 	}
 
-	ret = safe_mount("none", path, "tmpfs", 0, mount_options,
-			 rootfs->path ? rootfs->mount : NULL );
+	if (can_use_mount_api()) {
+		fd_fs = fs_prepare("tmpfs", -EBADF, "", 0, 0);
+		if (fd_fs < 0)
+			return log_error_errno(-errno, errno, "Failed to prepare filesystem context for tmpfs");
+
+		sprintf(mount_options, "%zu", tmpfs_size);
+
+		ret = fs_set_property(fd_fs, "mode", "0755");
+		if (ret < 0)
+			return log_error_errno(-errno, errno, "Failed to mount tmpfs onto %d(dev)", fd_fs);
+
+		ret = fs_set_property(fd_fs, "size", mount_options);
+		if (ret < 0)
+			return log_error_errno(-errno, errno, "Failed to mount tmpfs onto %d(dev)", fd_fs);
+
+		ret = fs_attach(fd_fs, rootfs->dfd_mnt, "dev",
+				PROTECT_OPATH_DIRECTORY,
+				PROTECT_LOOKUP_BENEATH_XDEV, 0);
+	} else {
+		__do_free char *fallback_path = NULL;
+
+		sprintf(mount_options, "size=%zu,mode=755", tmpfs_size);
+		DEBUG("Using mount options: %s", mount_options);
+
+		if (path) {
+			fallback_path = must_make_path(path, "/dev", NULL);
+			ret = safe_mount("none", fallback_path, "tmpfs", 0, mount_options, path);
+		} else {
+			ret = safe_mount("none", "dev", "tmpfs", 0, mount_options, NULL);
+		}
+	}
 	if (ret < 0) {
 		SYSERROR("Failed to mount tmpfs on \"%s\"", path);
 		goto reset_umask;
 	}
-	TRACE("Mounted tmpfs on \"%s\"", path);
-
-	ret = snprintf(path, clen, "%s/dev/pts", rootfs->path ? rootfs->mount : "");
-	if (ret < 0 || (size_t)ret >= clen) {
-		ret = -1;
-		goto reset_umask;
-	}
 
 	/* If we are running on a devtmpfs mapping, dev/pts may already exist.
 	 * If not, then create it and exit if that fails...
 	 */
-	ret = mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+	ret = mkdirat(rootfs->dfd_mnt, "dev/pts", S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
 	if (ret < 0 && errno != EEXIST) {
-		SYSERROR("Failed to create directory \"%s\"", path);
+		SYSERROR("Failed to create directory \"dev/pts\"");
 		ret = -errno;
 		goto reset_umask;
 	}
@@ -1133,41 +1306,28 @@
 	LXC_DEVNODE_OPEN,
 };
 
-static int lxc_fill_autodev(const struct lxc_rootfs *rootfs)
+static int lxc_fill_autodev(struct lxc_rootfs *rootfs)
 {
-	int i, ret;
-	char pathPATH_MAX;
+	int ret;
 	mode_t cmask;
 	int use_mknod = LXC_DEVNODE_MKNOD;
 
-	ret = snprintf(path, PATH_MAX, "%s/dev",
-		       rootfs->path ? rootfs->mount : "");
-	if (ret < 0 || ret >= PATH_MAX)
-		return -1;
-
-	/* ignore, just don't try to fill in */
-	if (!dir_exists(path))
-		return 0;
+	if (rootfs->dfd_dev < 0)
+		return log_info(0, "No /dev directory found, skipping setup");
 
 	INFO("Populating \"/dev\"");
 
 	cmask = umask(S_IXUSR | S_IXGRP | S_IXOTH);
-	for (i = 0; i < sizeof(lxc_devices) / sizeof(lxc_devices0); i++) {
-		char hostpathPATH_MAX;
+	for (size_t i = 0; i < sizeof(lxc_devices) / sizeof(lxc_devices0); i++) {
 		const struct lxc_device_node *device = &lxc_devicesi;
 
-		ret = snprintf(path, PATH_MAX, "%s/dev/%s",
-			       rootfs->path ? rootfs->mount : "", device->name);
-		if (ret < 0 || ret >= PATH_MAX)
-			return -1;
-
 		if (use_mknod >= LXC_DEVNODE_MKNOD) {
-			ret = mknod(path, device->mode, makedev(device->maj, device->min));
+			ret = mknodat(rootfs->dfd_dev, device->name, device->mode, makedev(device->maj, device->min));
 			if (ret == 0 || (ret < 0 && errno == EEXIST)) {
-				DEBUG("Created device node \"%s\"", path);
+				DEBUG("Created device node \"%s\"", device->name);
 			} else if (ret < 0) {
 				if (errno != EPERM)
-					return log_error_errno(-1, errno, "Failed to create device node \"%s\"", path);
+					return log_error_errno(-1, errno, "Failed to create device node \"%s\"", device->name);
 
 				use_mknod = LXC_DEVNODE_BIND;
 			}
@@ -1177,19 +1337,19 @@
 				continue;
 
 			if (use_mknod == LXC_DEVNODE_MKNOD) {
+				__do_close int fd = -EBADF;
 				/* See
 				 * - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=55956b59df336f6738da916dbb520b6e37df9fbd
 				 * - https://lists.linuxfoundation.org/pipermail/containers/2018-June/039176.html
 				 */
-				ret = open(path, O_RDONLY | O_CLOEXEC);
-				if (ret >= 0) {
-					close_prot_errno_disarm(ret);
+				fd = open_at(rootfs->dfd_dev, device->name, PROTECT_OPEN, PROTECT_LOOKUP_BENEATH, 0);
+				if (fd >= 0) {
 					/* Device nodes are fully useable. */
 					use_mknod = LXC_DEVNODE_OPEN;
 					continue;
 				}
 
-				SYSTRACE("Failed to open \"%s\" device", path);
+				SYSTRACE("Failed to open \"%s\" device", device->name);
 				/* Device nodes are only partially useable. */
 				use_mknod = LXC_DEVNODE_PARTIAL;
 			}
@@ -1200,22 +1360,46 @@
 			 * nodes the prio mknod() call will have created the
 			 * device node so we can use it as a bind-mount target.
 			 */
-			ret = mknod(path, S_IFREG | 0000, 0);
+			ret = mknodat(rootfs->dfd_dev, device->name, S_IFREG | 0000, 0);
 			if (ret < 0 && errno != EEXIST)
-				return log_error_errno(-1, errno, "Failed to create file \"%s\"", path);
+				return log_error_errno(-1, errno, "Failed to create file \"%s\"", device->name);
 		}
 
 		/* Fallback to bind-mounting the device from the host. */
-		ret = snprintf(hostpath, PATH_MAX, "/dev/%s", device->name);
-		if (ret < 0 || ret >= PATH_MAX)
-			return -1;
-
-		ret = safe_mount(hostpath, path, 0, MS_BIND, NULL,
-				 rootfs->path ? rootfs->mount : NULL);
+		ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "dev/%s", device->name);
 		if (ret < 0)
-			return log_error_errno(-1, errno, "Failed to bind mount host device node \"%s\" onto \"%s\"",
-					       hostpath, path);
-		DEBUG("Bind mounted host device node \"%s\" onto \"%s\"", hostpath, path);
+			return ret_errno(EIO);
+
+		if (can_use_mount_api()) {
+			ret = fd_bind_mount(rootfs->dfd_host, rootfs->buf,
+					    PROTECT_OPATH_FILE,
+					    PROTECT_LOOKUP_BENEATH_XDEV,
+					    rootfs->dfd_dev, device->name,
+					    PROTECT_OPATH_FILE,
+					    PROTECT_LOOKUP_BENEATH,
+					    0,
+					    0,
+					    0,
+					    false);
+		} else {
+			char pathPATH_MAX;
+
+			ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "/dev/%s", device->name);
+			if (ret < 0)
+				return ret_errno(EIO);
+
+			ret = strnprintf(path, sizeof(path), "%s/dev/%s", get_rootfs_mnt(rootfs), device->name);
+			if (ret < 0)
+				return log_error(-1, "Failed to create device path for %s", device->name);
+
+			ret = safe_mount(rootfs->buf, path, 0, MS_BIND, NULL, get_rootfs_mnt(rootfs));
+			if (ret < 0)
+				return log_error_errno(-1, errno, "Failed to bind mount host device node \"%s\" to \"%s\"", rootfs->buf, path);
+
+			DEBUG("Bind mounted host device node \"%s\" to \"%s\"", rootfs->buf, path);
+			continue;
+		}
+		DEBUG("Bind mounted host device %d(%s) to %d(%s)", rootfs->dfd_host, rootfs->buf, rootfs->dfd_dev, device->name);
 	}
 	(void)umask(cmask);
 
@@ -1223,18 +1407,20 @@
 	return 0;
 }
 
-static int lxc_mount_rootfs(struct lxc_conf *conf)
+static int lxc_mount_rootfs(struct lxc_rootfs *rootfs)
 {
 	int ret;
-	struct lxc_storage *bdev;
-	const struct lxc_rootfs *rootfs = &conf->rootfs;
 
 	if (!rootfs->path) {
 		ret = mount("", "/", NULL, MS_SLAVE | MS_REC, 0);
 		if (ret < 0)
 			return log_error_errno(-1, errno, "Failed to recursively turn root mount tree into dependent mount");
 
-		return 0;
+		rootfs->dfd_mnt = open_at(-EBADF, "/", PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE, 0);
+		if (rootfs->dfd_mnt < 0)
+			return -errno;
+
+		return log_trace(0, "Container doesn't use separate rootfs. Opened host's rootfs");
 	}
 
 	ret = access(rootfs->mount, F_OK);
@@ -1242,27 +1428,41 @@
 		return log_error_errno(-1, errno, "Failed to access to \"%s\". Check it is present",
 				       rootfs->mount);
 
-	bdev = storage_init(conf);
-	if (!bdev)
-		return log_error(-1, "Failed to mount rootfs \"%s\" onto \"%s\" with options \"%s\"",
-				 rootfs->path, rootfs->mount,
-				 rootfs->options ? rootfs->options : "(null)");
-
-	ret = bdev->ops->mount(bdev);
-	storage_put(bdev);
+	ret = rootfs->storage->ops->mount(rootfs->storage);
 	if (ret < 0)
 		return log_error(-1, "Failed to mount rootfs \"%s\" onto \"%s\" with options \"%s\"",
 				 rootfs->path, rootfs->mount,
-				 rootfs->options ? rootfs->options : "(null)");
+				 rootfs->mnt_opts.raw_options ? rootfs->mnt_opts.raw_options : "(null)");
 
 	DEBUG("Mounted rootfs \"%s\" onto \"%s\" with options \"%s\"",
 	      rootfs->path, rootfs->mount,
-	      rootfs->options ? rootfs->options : "(null)");
+	      rootfs->mnt_opts.raw_options ? rootfs->mnt_opts.raw_options : "(null)");
 
-	return 0;
+	rootfs->dfd_mnt = open_at(-EBADF, rootfs->mount, PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+	if (rootfs->dfd_mnt < 0)
+		return -errno;
+
+	return log_trace(0, "Container uses separate rootfs. Opened container's rootfs");
 }
 
-int lxc_chroot(const struct lxc_rootfs *rootfs)
+static bool lxc_rootfs_overmounted(struct lxc_rootfs *rootfs)
+{
+	__do_close int fd_rootfs = -EBADF;
+
+	if (!rootfs->path)
+		fd_rootfs = open_at(-EBADF, "/", PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE, 0);
+	else
+		fd_rootfs = open_at(-EBADF, rootfs->mount, PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+	if (fd_rootfs < 0)
+		return true;
+
+	if (!same_file_lax(rootfs->dfd_mnt, fd_rootfs))
+		return syswarn_ret(true, "Rootfs seems to have changed after setting up mounts");
+
+	return false;
+}
+
+static int lxc_chroot(const struct lxc_rootfs *rootfs)
 {
 	__do_free char *nroot = NULL;
 	int i, ret;
@@ -1322,10 +1522,10 @@
 			*slider2 = '\0';
 			*slider1 = '.';
 
-			if (strcmp(slider1 + 1, "/") == 0)
+			if (strequal(slider1 + 1, "/"))
 				continue;
 
-			if (strcmp(slider1 + 1, "/proc") == 0)
+			if (strequal(slider1 + 1, "/proc"))
 				continue;
 
 			ret = umount2(slider1, MNT_DETACH);
@@ -1378,54 +1578,78 @@
  *    though, so you may need to say mount --bind /nfs/my_root /nfs/my_root
  *    first.
  */
-static int lxc_pivot_root(const char *rootfs)
+static int lxc_pivot_root(const struct lxc_rootfs *rootfs)
 {
-	__do_close int oldroot = -EBADF, newroot = -EBADF;
+	__do_close int fd_oldroot = -EBADF;
 	int ret;
 
-	oldroot = open("/", O_DIRECTORY | O_RDONLY | O_CLOEXEC);
-	if (oldroot < 0)
+	fd_oldroot = open_at(-EBADF, "/", PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE, 0);
+	if (fd_oldroot < 0)
 		return log_error_errno(-1, errno, "Failed to open old root directory");
 
-	newroot = open(rootfs, O_DIRECTORY | O_RDONLY | O_CLOEXEC);
-	if (newroot < 0)
-		return log_error_errno(-1, errno, "Failed to open new root directory");
-
 	/* change into new root fs */
-	ret = fchdir(newroot);
+	ret = fchdir(rootfs->dfd_mnt);
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to change to new rootfs \"%s\"", rootfs);
+		return log_error_errno(-errno, errno, "Failed to change into new root directory \"%s\"", rootfs->mount);
 
 	/* pivot_root into our new root fs */
 	ret = pivot_root(".", ".");
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to pivot_root()");
+		return log_error_errno(-errno, errno, "Failed to pivot into new root directory \"%s\"", rootfs->mount);
 
 	/* At this point the old-root is mounted on top of our new-root. To
 	 * unmounted it we must not be chdir'd into it, so escape back to
 	 * old-root.
 	 */
-	ret = fchdir(oldroot);
+	ret = fchdir(fd_oldroot);
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to enter old root directory");
+		return log_error_errno(-errno, errno, "Failed to enter old root directory");
 
-	/* Make oldroot a depedent mount to make sure our umounts don't propagate to the
-	 * host.
+	/*
+	 * Unprivileged containers will have had all their mounts turned into
+	 * dependent mounts when the container was created. But for privileged
+	 * containers we need to turn the old root mount tree into a dependent
+	 * mount tree to prevent propagating mounts and umounts into the host
+	 * mount namespace.
 	 */
 	ret = mount("", ".", "", MS_SLAVE | MS_REC, NULL);
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to recursively turn old root mount tree into dependent mount");
+		return log_error_errno(-errno, errno, "Failed to recursively turn old root mount tree into dependent mount");
 
 	ret = umount2(".", MNT_DETACH);
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to detach old root directory");
+		return log_error_errno(-errno, errno, "Failed to detach old root directory");
 
-	ret = fchdir(newroot);
+	ret = fchdir(rootfs->dfd_mnt);
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to re-enter new root directory");
+		return log_error_errno(-errno, errno, "Failed to re-enter new root directory \"%s\"", rootfs->mount);
 
-	TRACE("pivot_root(\"%s\") successful", rootfs);
+	/*
+	 * Finally, we turn the rootfs into a shared mount. Note, that this
+	 * doesn't reestablish mount propagation with the hosts mount
+	 * namespace. Instead we'll create a new peer group.
+	 *
+	 * We're doing this because most workloads do rely on the rootfs being
+	 * a shared mount. For example, systemd daemon like sytemd-udevd run in
+	 * their own mount namespace. Their mount namespace has been made a
+	 * dependent mount (MS_SLAVE) with the host rootfs as it's dominating
+	 * mount. This means new mounts on the host propagate into the
+	 * respective services.
+	 *
+	 * This is broken if we leave the container's rootfs a dependent mount.
+	 * In which case both the container's rootfs and the service's rootfs
+	 * will be dependent mounts with the host's rootfs as their dominating
+	 * mount. So if you were to mount over the rootfs from the host it
+	 * would not just propagate into the container's mount namespace it
+	 * would also propagate into the service. That's nonsense semantics for
+	 * nearly all relevant use-cases. Instead, establish the container's
+	 * rootfs as a separate peer group mirroring the behavior on the host.
+	 */
+	ret = mount("", ".", "", MS_SHARED | MS_REC, NULL);
+	if (ret < 0)
+		return log_error_errno(-errno, errno, "Failed to turn new root mount tree into shared mount tree");
 
+	TRACE("Changed into new rootfs \"%s\"", rootfs->mount);
 	return 0;
 }
 
@@ -1437,14 +1661,13 @@
 	if (detect_ramfs_rootfs())
 		return lxc_chroot(rootfs);
 
-	return lxc_pivot_root(rootfs->mount);
+	return lxc_pivot_root(rootfs);
 }
 
 static const struct id_map *find_mapped_nsid_entry(const struct lxc_conf *conf,
 						   unsigned id,
 						   enum idtype idtype)
 {
-	struct lxc_list *it;
 	struct id_map *map;
 	struct id_map *retmap = NULL;
 
@@ -1457,8 +1680,7 @@
 			return conf->root_nsgid_map;
 	}
 
-	lxc_list_for_each(it, &conf->id_map) {
-		map = it->elem;
+	list_for_each_entry(map, &conf->id_map, head) {
 		if (map->idtype != idtype)
 			continue;
 
@@ -1471,57 +1693,165 @@
 	return retmap;
 }
 
-static int lxc_setup_devpts(struct lxc_conf *conf)
+static int lxc_recv_devpts_from_child(struct lxc_handler *handler)
 {
 	int ret;
-	char **opts;
-	char devpts_mntopts256;
-	char *mntopt_sets5;
-	char default_devpts_mntopts256 = "gid=5,newinstance,ptmxmode=0666,mode=0620";
 
-	if (conf->pty_max <= 0)
-		return log_debug(0, "No new devpts instance will be mounted since no pts devices are requested");
+	if (handler->conf->pty_max <= 0)
+		return 0;
 
-	ret = snprintf(devpts_mntopts, sizeof(devpts_mntopts), "%s,max=%zu",
-		       default_devpts_mntopts, conf->pty_max);
-	if (ret < 0 || (size_t)ret >= sizeof(devpts_mntopts))
-		return -1;
+	ret = lxc_abstract_unix_recv_one_fd(handler->data_sock1,
+					    &handler->conf->devpts_fd,
+					    &handler->conf->devpts_fd,
+					    sizeof(handler->conf->devpts_fd));
+	if (ret < 0)
+		return log_error_errno(-1, errno, "Failed to receive devpts fd from child");
 
-	(void)umount2("/dev/pts", MNT_DETACH);
+	TRACE("Received devpts file descriptor %d from child", handler->conf->devpts_fd);
+	return 0;
+}
+
+static int lxc_setup_devpts_child(struct lxc_handler *handler)
+{
+	__do_close int devpts_fd = -EBADF, fd_fs = -EBADF;
+	struct lxc_conf *conf = handler->conf;
+	struct lxc_rootfs *rootfs = &conf->rootfs;
+	size_t pty_max = conf->pty_max;
+	int ret;
+
+	pty_max += conf->ttys.max;
+	if (pty_max <= 0)
+		return log_debug(0, "No new devpts instance will be mounted since no pts devices are required");
+
+	ret = strnprintf(rootfs->buf, sizeof(rootfs->buf),
+			 "/proc/self/fd/%d/pts", rootfs->dfd_dev);
+	if (ret < 0)
+		return syserror("Failed to create path");
+
+	(void)umount2(rootfs->buf, MNT_DETACH);
 
 	/* Create mountpoint for devpts instance. */
-	ret = mkdir("/dev/pts", 0755);
+	ret = mkdirat(rootfs->dfd_dev, "pts", 0755);
 	if (ret < 0 && errno != EEXIST)
 		return log_error_errno(-1, errno, "Failed to create \"/dev/pts\" directory");
 
-	/* gid=5 && max= */
-	mntopt_sets0 = devpts_mntopts;
+	if (can_use_mount_api()) {
+		fd_fs = fs_prepare("devpts", -EBADF, "", 0, 0);
+		if (fd_fs < 0)
+			return syserror("Failed to prepare filesystem context for devpts");
 
-	/* !gid=5 && max= */
-	mntopt_sets1 = devpts_mntopts + STRLITERALLEN("gid=5") + 1;
+		ret = fs_set_property(fd_fs, "source", "devpts");
+		if (ret < 0)
+			SYSTRACE("Failed to set \"source=devpts\" on devpts filesystem context %d", fd_fs);
 
-	/* gid=5 && !max= */
-	mntopt_sets2 = default_devpts_mntopts;
+		ret = fs_set_property(fd_fs, "gid", "5");
+		if (ret < 0)
+			SYSTRACE("Failed to set \"gid=5\" on devpts filesystem context %d", fd_fs);
 
-	/* !gid=5 && !max= */
-	mntopt_sets3 = default_devpts_mntopts + STRLITERALLEN("gid=5") + 1;
+		ret = fs_set_flag(fd_fs, "newinstance");
+		if (ret < 0)
+			return syserror("Failed to set \"newinstance\" property on devpts filesystem context %d", fd_fs);
 
-	/* end */
-	mntopt_sets4 = NULL;
+		ret = fs_set_property(fd_fs, "ptmxmode", "0666");
+		if (ret < 0)
+			return syserror("Failed to set \"ptmxmode=0666\" property on devpts filesystem context %d", fd_fs);
 
-	for (ret = -1, opts = mntopt_sets; opts && *opts; opts++) {
-		/* mount new devpts instance */
-		ret = mount("devpts", "/dev/pts", "devpts", MS_NOSUID | MS_NOEXEC, *opts);
-		if (ret == 0)
-			break;
+		ret = fs_set_property(fd_fs, "mode", "0620");
+		if (ret < 0)
+			return syserror("Failed to set \"mode=0620\" property on devpts filesystem context %d", fd_fs);
+
+		ret = fs_set_property(fd_fs, "max", fdstr(pty_max));
+		if (ret < 0)
+			return syserror("Failed to set \"max=%zu\" property on devpts filesystem context %d", conf->pty_max, fd_fs);
+
+		ret = fsconfig(fd_fs, FSCONFIG_CMD_CREATE, NULL, NULL, 0);
+		if (ret < 0)
+			return syserror("Failed to finalize filesystem context %d", fd_fs);
+
+		devpts_fd = fsmount(fd_fs, FSMOUNT_CLOEXEC, MOUNT_ATTR_NOSUID | MOUNT_ATTR_NOEXEC);
+		if (devpts_fd < 0)
+			return syserror("Failed to create new mount for filesystem context %d", fd_fs);
+		TRACE("Created detached devpts mount %d", devpts_fd);
+
+		ret = move_mount(devpts_fd, "", rootfs->dfd_dev, "pts", MOVE_MOUNT_F_EMPTY_PATH);
+		if (ret)
+			return syserror("Failed to attach devpts mount %d to %d/pts", conf->devpts_fd, rootfs->dfd_dev);
+
+		DEBUG("Attached detached devpts mount %d to %d/pts", devpts_fd, rootfs->dfd_dev);
+	} else {
+		char **opts;
+		char devpts_mntopts256;
+		char *mntopt_sets5;
+		char default_devpts_mntopts256 = "gid=5,newinstance,ptmxmode=0666,mode=0620";
+
+		/*
+		 * Fallback codepath in case the new mount API can't be used to
+		 * create detached mounts.
+		 */
+
+		ret = strnprintf(devpts_mntopts, sizeof(devpts_mntopts), "%s,max=%zu",
+				default_devpts_mntopts, pty_max);
+		if (ret < 0)
+			return -1;
+
+		/* Create mountpoint for devpts instance. */
+		ret = mkdirat(rootfs->dfd_dev, "pts", 0755);
+		if (ret < 0 && errno != EEXIST)
+			return log_error_errno(-1, errno, "Failed to create \"/dev/pts\" directory");
+
+		/* gid=5 && max= */
+		mntopt_sets0 = devpts_mntopts;
+
+		/* !gid=5 && max= */
+		mntopt_sets1 = devpts_mntopts + STRLITERALLEN("gid=5") + 1;
+
+		/* gid=5 && !max= */
+		mntopt_sets2 = default_devpts_mntopts;
+
+		/* !gid=5 && !max= */
+		mntopt_sets3 = default_devpts_mntopts + STRLITERALLEN("gid=5") + 1;
+
+		/* end */
+		mntopt_sets4 = NULL;
+
+		for (ret = -1, opts = mntopt_sets; opts && *opts; opts++) {
+			/* mount new devpts instance */
+			ret = mount_at(rootfs->dfd_dev, "", 0,
+				       rootfs->dfd_dev, "pts", PROTECT_LOOKUP_BENEATH,
+				       "devpts", MS_NOSUID | MS_NOEXEC, *opts);
+			if (ret == 0)
+				break;
+		}
+		if (ret < 0)
+			return log_error_errno(-1, errno, "Failed to mount new devpts instance");
+
+		devpts_fd = open_at(rootfs->dfd_dev, "pts", PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
+		if (devpts_fd < 0) {
+			devpts_fd = -EBADF;
+			TRACE("Failed to create detached devpts mount");
+		}
+
+		DEBUG("Mounted new devpts instance with options \"%s\"", *opts);
 	}
 
-	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to mount new devpts instance");
-	DEBUG("Mount new devpts instance with options \"%s\"", *opts);
+	handler->conf->devpts_fd = move_fd(devpts_fd);
+
+	/*
+	 * In order to allocate terminal devices the devpts filesystem will
+	 * have to be attached to the filesystem at least ones in the new mount
+	 * api. The reason is lengthy but the gist is that until the new mount
+	 * has been attached to the filesystem it is a detached mount with an
+	 * anonymous mount mamespace attached to it for which the kernel
+	 * refuses certain operations.
+	 * We end up here if the user has requested to allocate tty devices
+	 * while not requestig pty devices be made available to the container.
+	 * We only need the devpts_fd to allocate tty devices.
+	 */
+	if (conf->pty_max <= 0)
+		return 0;
 
 	/* Remove any pre-existing /dev/ptmx file. */
-	ret = remove("/dev/ptmx");
+	ret = unlinkat(rootfs->dfd_dev, "ptmx", 0);
 	if (ret < 0) {
 		if (errno != ENOENT)
 			return log_error_errno(-1, errno, "Failed to remove existing \"/dev/ptmx\" file");
@@ -1529,206 +1859,355 @@
 		DEBUG("Removed existing \"/dev/ptmx\" file");
 	}
 
-	/* Create dummy /dev/ptmx file as bind mountpoint for /dev/pts/ptmx. */
-	ret = mknod("/dev/ptmx", S_IFREG | 0000, 0);
+	/* Create placeholder /dev/ptmx file as bind mountpoint for /dev/pts/ptmx. */
+	ret = mknodat(rootfs->dfd_dev, "ptmx", S_IFREG | 0000, 0);
 	if (ret < 0 && errno != EEXIST)
-		return log_error_errno(-1, errno, "Failed to create dummy \"/dev/ptmx\" file as bind mount target");
-	DEBUG("Created dummy \"/dev/ptmx\" file as bind mount target");
+		return log_error_errno(-1, errno, "Failed to create \"/dev/ptmx\" file as bind mount target");
+	DEBUG("Created \"/dev/ptmx\" file as bind mount target");
 
-	/* Fallback option: create symlink /dev/ptmx -> /dev/pts/ptmx  */
-	ret = mount("/dev/pts/ptmx", "/dev/ptmx", NULL, MS_BIND, NULL);
+	/* Main option: use a bind-mount to please AppArmor  */
+	ret = mount_at(rootfs->dfd_dev, "pts/ptmx", (PROTECT_LOOKUP_BENEATH_WITH_SYMLINKS & ~RESOLVE_NO_XDEV),
+		       rootfs->dfd_dev, "ptmx", (PROTECT_LOOKUP_BENEATH_WITH_SYMLINKS & ~RESOLVE_NO_XDEV),
+		       NULL, MS_BIND, NULL);
 	if (!ret)
 		return log_debug(0, "Bind mounted \"/dev/pts/ptmx\" to \"/dev/ptmx\"");
 	else
 		/* Fallthrough and try to create a symlink. */
 		ERROR("Failed to bind mount \"/dev/pts/ptmx\" to \"/dev/ptmx\"");
 
-	/* Remove the dummy /dev/ptmx file we created above. */
-	ret = remove("/dev/ptmx");
+	/* Remove the placeholder /dev/ptmx file we created above. */
+	ret = unlinkat(rootfs->dfd_dev, "ptmx", 0);
 	if (ret < 0)
 		return log_error_errno(-1, errno, "Failed to remove existing \"/dev/ptmx\"");
 
 	/* Fallback option: Create symlink /dev/ptmx -> /dev/pts/ptmx. */
-	ret = symlink("/dev/pts/ptmx", "/dev/ptmx");
+	ret = symlinkat("/dev/pts/ptmx", rootfs->dfd_dev, "dev/ptmx");
 	if (ret < 0)
 		return log_error_errno(-1, errno, "Failed to create symlink from \"/dev/ptmx\" to \"/dev/pts/ptmx\"");
-	DEBUG("Created symlink from \"/dev/ptmx\" to \"/dev/pts/ptmx\"");
 
+	DEBUG("Created symlink from \"/dev/ptmx\" to \"/dev/pts/ptmx\"");
 	return 0;
 }
 
-static int setup_personality(int persona)
+static int lxc_finish_devpts_child(struct lxc_handler *handler)
 {
+	struct lxc_conf *conf = handler->conf;
+	struct lxc_rootfs *rootfs = &conf->rootfs;
 	int ret;
 
-#if HAVE_SYS_PERSONALITY_H
-	if (persona == -1)
+	if (conf->pty_max > 0)
 		return 0;
 
-	ret = personality(persona);
+	/*
+	 * We end up here if the user has requested to allocate tty devices
+	 * while not requestig pty devices be made available to the container.
+	 * This means we can unmount the devpts instance. We only need the
+	 * devpts_fd to allocate tty devices.
+	 */
+	ret = strnprintf(rootfs->buf, sizeof(rootfs->buf),
+			 "/proc/self/fd/%d/pts", rootfs->dfd_dev);
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to set personality to \"0x%x\"", persona);
-
-	INFO("Set personality to \"0x%x\"", persona);
-#endif
+		return syserror("Failed to create path");
 
+	close_prot_errno_disarm(conf->devpts_fd);
+	(void)umount2(rootfs->buf, MNT_DETACH);
 	return 0;
 }
 
-static inline bool wants_console(const struct lxc_terminal *terminal)
+static int lxc_send_devpts_to_parent(struct lxc_handler *handler)
 {
-	return !terminal->path || strcmp(terminal->path, "none");
+	int ret;
+
+	if (handler->conf->pty_max <= 0)
+		return log_debug(0, "No devpts file descriptor will be sent since no pts devices are requested");
+
+	ret = lxc_abstract_unix_send_fds(handler->data_sock0, &handler->conf->devpts_fd, 1, NULL, 0);
+	if (ret < 0)
+		SYSERROR("Failed to send devpts file descriptor %d to parent", handler->conf->devpts_fd);
+	else
+		TRACE("Sent devpts file descriptor %d to parent", handler->conf->devpts_fd);
+
+	close_prot_errno_disarm(handler->conf->devpts_fd);
+
+	return 0;
 }
 
-static int lxc_setup_dev_console(const struct lxc_rootfs *rootfs,
-				 const struct lxc_terminal *console,
-				 int pts_mnt_fd)
+static int setup_personality(personality_t persona)
 {
 	int ret;
-	char pathPATH_MAX;
-	char *rootfs_path = rootfs->path ? rootfs->mount : "";
 
-	if (!wants_console(console))
-		return 0;
+	if (persona == LXC_ARCH_UNCHANGED)
+		return log_debug(0, "Retaining original personality");
 
-	ret = snprintf(path, sizeof(path), "%s/dev/console", rootfs_path);
-	if (ret < 0 || (size_t)ret >= sizeof(path))
-		return -1;
+	ret = lxc_personality(persona);
+	if (ret < 0)
+		return syserror("Failed to set personality to \"0lx%lx\"", persona);
+
+	INFO("Set personality to \"0lx%lx\"", persona);
+	return 0;
+}
+
+static int bind_mount_console(int fd_devpts, struct lxc_rootfs *rootfs,
+			      struct lxc_terminal *console, int fd_to)
+{
+	__do_close int fd_pty = -EBADF;
+
+	if (is_empty_string(console->name))
+		return ret_errno(EINVAL);
+
+	/*
+	 * When the pty fd stashed in console->pty has been retrieved via the
+	 * TIOCGPTPEER ioctl() to avoid dangerous path-based lookups when
+	 * allocating new pty devices we can't reopen it through openat2() or
+	 * created a detached mount through open_tree() from it. This means we
+	 * would need to mount using the path stased in console->name which is
+	 * unsafe. We could be mounting a device that isn't identical to the
+	 * one we've already safely opened and stashed in console->pty.
+	 * So, what we do is we open an O_PATH file descriptor for
+	 * console->name and verify that the opened fd and the fd we stashed in
+	 * console->pty refer to the same device. If they do we can go on and
+	 * created a detached mount based on the newly opened O_PATH file
+	 * descriptor and then safely mount.
+	 */
+	fd_pty = open_at_same(console->pty, fd_devpts, fdstr(console->pty_nr),
+			      PROTECT_OPATH_FILE, PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+	if (fd_pty < 0)
+		return syserror("Failed to open \"%s\"", console->name);
+
+	/*
+	 * Note, there are intentionally no open or lookup restrictions since
+	 * we're operating directly on the fd.
+	 */
+	if (can_use_mount_api())
+		return fd_bind_mount(fd_pty, "", 0, 0, fd_to, "", 0, 0, 0, 0, 0, false);
+
+	return mount_fd(fd_pty, fd_to, "none", MS_BIND, 0);
+}
+
+static int lxc_setup_dev_console(int fd_devpts, struct lxc_rootfs *rootfs,
+				 struct lxc_terminal *console)
+{
+	__do_close int fd_console = -EBADF;
+	int ret;
 
 	/*
 	 * When we are asked to setup a console we remove any previous
 	 * /dev/console bind-mounts.
 	 */
-	if (file_exists(path)) {
-		ret = lxc_unstack_mountpoint(path, false);
+	if (exists_file_at(rootfs->dfd_dev, "console")) {
+		char *rootfs_path = rootfs->path ? rootfs->mount : "";
+
+		ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/dev/console", rootfs_path);
+		if (ret < 0)
+			return -1;
+
+		ret = lxc_unstack_mountpoint(rootfs->buf, false);
 		if (ret < 0)
-			return log_error_errno(-ret, errno, "Failed to unmount \"%s\"", path);
+			return log_error_errno(-ret, errno, "Failed to unmount \"%s\"", rootfs->buf);
 		else
-			DEBUG("Cleared all (%d) mounts from \"%s\"", ret, path);
+			DEBUG("Cleared all (%d) mounts from \"%s\"", ret, rootfs->buf);
 	}
 
 	/*
 	 * For unprivileged containers autodev or automounts will already have
 	 * taken care of creating /dev/console.
 	 */
-	ret = mknod(path, S_IFREG | 0000, 0);
-	if (ret < 0 && errno != EEXIST)
-		return log_error_errno(-errno, errno, "Failed to create console");
+	fd_console = open_at(rootfs->dfd_dev,
+			     "console",
+			     PROTECT_OPEN | O_CREAT,
+			     PROTECT_LOOKUP_BENEATH,
+			     0000);
+	if (fd_console < 0)
+		return syserror("Failed to create \"%d/console\"", rootfs->dfd_dev);
 
-	ret = fchmod(console->pts, S_IXUSR | S_IXGRP);
+	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 syserror("Failed to change console mode");
 
-	if (pts_mnt_fd >= 0) {
-		ret = move_mount(pts_mnt_fd, "", -EBADF, path, MOVE_MOUNT_F_EMPTY_PATH);
-		if (!ret) {
-			DEBUG("Moved mount \"%s\" onto \"%s\"", console->name, path);
-			goto finish;
-		}
-
-		if (ret && errno != ENOSYS)
-			return log_error_errno(-1, errno,
-					       "Failed to mount %d(%s) on \"%s\"",
-					       pts_mnt_fd, console->name, path);
-	}
-
-	ret = safe_mount(console->name, path, "none", MS_BIND, 0, rootfs_path);
+	ret = bind_mount_console(fd_devpts, rootfs, console, fd_console);
 	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to mount %d(%s) on \"%s\"", pts_mnt_fd, console->name, path);
+		return syserror("Failed to mount \"%d(%s)\" on \"%d\"",
+				console->pty, console->name, fd_console);
 
-finish:
-	DEBUG("Mounted pts device %d(%s) onto \"%s\"", pts_mnt_fd, console->name, path);
+	TRACE("Setup console \"%s\"", console->name);
 	return 0;
 }
 
-static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs,
-				    const struct lxc_terminal *console,
-				    char *ttydir, int pts_mnt_fd)
+static int lxc_setup_ttydir_console(int fd_devpts, struct lxc_rootfs *rootfs,
+				    struct lxc_terminal *console,
+				    char *ttydir)
 {
+	__do_close int fd_ttydir = -EBADF, fd_dev_console = -EBADF,
+		       fd_reg_console = -EBADF, fd_reg_ttydir_console = -EBADF;
 	int ret;
-	char pathPATH_MAX, lxcpathPATH_MAX;
-	char *rootfs_path = rootfs->path ? rootfs->mount : "";
-
-	if (!wants_console(console))
-		return 0;
 
-	/* create rootfs/dev/<ttydir> directory */
-	ret = snprintf(path, sizeof(path), "%s/dev/%s", rootfs_path, ttydir);
-	if (ret < 0 || (size_t)ret >= sizeof(path))
-		return -1;
+	/* create dev/<ttydir> */
+	ret = mkdirat(rootfs->dfd_dev, ttydir, 0755);
+	if (ret < 0 && errno != EEXIST)
+		return syserror("Failed to create \"%d/%s\"", rootfs->dfd_dev, ttydir);
 
-	ret = mkdir(path, 0755);
-	if (ret && errno != EEXIST)
-		return log_error_errno(-errno, errno, "Failed to create \"%s\"", path);
- 	DEBUG("Created directory for console and tty devices at \"%s\"", path);
+	fd_ttydir = open_at(rootfs->dfd_dev,
+			    ttydir,
+			    PROTECT_OPATH_DIRECTORY,
+			    PROTECT_LOOKUP_BENEATH,
+			    0);
+	if (fd_ttydir < 0)
+		return syserror("Failed to open \"%d/%s\"", rootfs->dfd_dev, ttydir);
 
-	ret = snprintf(lxcpath, sizeof(lxcpath), "%s/dev/%s/console", rootfs_path, ttydir);
-	if (ret < 0 || (size_t)ret >= sizeof(lxcpath))
+	ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/console", ttydir);
+	if (ret < 0)
 		return -1;
 
-	ret = mknod(lxcpath, S_IFREG | 0000, 0);
-	if (ret < 0 && errno != EEXIST)
-		return log_error_errno(-errno, errno, "Failed to create \"%s\"", lxcpath);
+	/* create dev/<ttydir>/console */
+	fd_reg_ttydir_console = open_at(fd_ttydir,
+					"console",
+					PROTECT_OPEN | O_CREAT,
+					PROTECT_LOOKUP_BENEATH,
+					0000);
+	if (fd_reg_ttydir_console < 0)
+		return syserror("Failed to create \"%d/console\"", fd_ttydir);
 
-	ret = snprintf(path, sizeof(path), "%s/dev/console", rootfs_path);
-	if (ret < 0 || (size_t)ret >= sizeof(path))
-		return -1;
+	if (file_exists(rootfs->buf)) {
+		char *rootfs_path = rootfs->path ? rootfs->mount : "";
+
+		ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/dev/console", rootfs_path);
+		if (ret < 0)
+			return -1;
 
-	if (file_exists(path)) {
-		ret = lxc_unstack_mountpoint(path, false);
+		ret = lxc_unstack_mountpoint(rootfs->buf, false);
 		if (ret < 0)
-			return log_error_errno(-ret, errno, "Failed to unmount \"%s\"", path);
+			return log_error_errno(-ret, errno, "Failed to unmount \"%s\"", rootfs->buf);
 		else
-			DEBUG("Cleared all (%d) mounts from \"%s\"", ret, path);
+			DEBUG("Cleared all (%d) mounts from \"%s\"", ret, rootfs->buf);
 	}
 
-	ret = mknod(path, S_IFREG | 0000, 0);
-	if (ret < 0 && errno != EEXIST)
-		return log_error_errno(-errno, errno, "Failed to create console");
-
-	ret = fchmod(console->pts, S_IXUSR | S_IXGRP);
+	/* create dev/console */
+	fd_reg_console = open_at(rootfs->dfd_dev,
+				"console",
+				 PROTECT_OPEN | O_CREAT,
+				 PROTECT_LOOKUP_BENEATH,
+				 0000);
+	if (fd_reg_console < 0)
+		return syserror("Failed to create \"%d/console\"", rootfs->dfd_dev);
+
+	ret = fchmod(console->pty, 0620);
+	if (ret < 0)
+		return syserror("Failed to change console mode");
+
+	/* bind mount console to '/dev/<ttydir>/console' */
+	ret = bind_mount_console(fd_devpts, rootfs, console, fd_reg_ttydir_console);
+	if (ret < 0)
+		return syserror("Failed to mount \"%d(%s)\" on \"%d\"",
+				console->pty, console->name, fd_reg_ttydir_console);
+
+	fd_dev_console = open_at_same(console->pty,
+				      fd_ttydir,
+				      "console",
+				      PROTECT_OPATH_FILE,
+				      PROTECT_LOOKUP_BENEATH_XDEV,
+				      0);
+	if (fd_dev_console < 0)
+		return syserror("Failed to open \"%d/console\"", fd_ttydir);
+
+	/* bind mount '/dev/<ttydir>/console' to '/dev/console' */
+	if (can_use_mount_api())
+		ret = fd_bind_mount(fd_dev_console,
+				    "",
+				    PROTECT_OPATH_FILE,
+				    PROTECT_LOOKUP_BENEATH_XDEV,
+				    fd_reg_console,
+				    "",
+				    PROTECT_OPATH_FILE,
+				    PROTECT_LOOKUP_BENEATH,
+				    0,
+				    0,
+				    0,
+				    false);
+	else
+		ret = mount_fd(fd_dev_console, fd_reg_console, "none", MS_BIND, 0);
 	if (ret < 0)
-		return log_error_errno(-errno, errno, "Failed to set mode \"0%o\" to \"%s\"", S_IXUSR | S_IXGRP, console->name);
+		return syserror("Failed to mount \"%d\" on \"%d\"",
+				fd_dev_console, fd_reg_console);
 
-	/* bind mount console->name to '/dev/<ttydir>/console' */
-	if (pts_mnt_fd >= 0) {
-		ret = move_mount(pts_mnt_fd, "", -EBADF, lxcpath, MOVE_MOUNT_F_EMPTY_PATH);
-		if (!ret) {
-			DEBUG("Moved mount \"%s\" onto \"%s\"", console->name, lxcpath);
-			goto finish;
-		}
+	TRACE("Setup console \"%s\"", console->name);
+	return 0;
+}
 
-		if (ret && errno != ENOSYS)
-			return log_error_errno(-1, errno,
-					       "Failed to mount %d(%s) on \"%s\"",
-					       pts_mnt_fd, console->name, lxcpath);
-	}
+static int lxc_setup_console(const struct lxc_handler *handler,
+			     struct lxc_rootfs *rootfs,
+			     struct lxc_terminal *console, char *ttydir)
+{
+	__do_close int fd_devpts_host = -EBADF;
+	int fd_devpts = handler->conf->devpts_fd;
+	int ret = -1;
 
-	ret = safe_mount(console->name, lxcpath, "none", MS_BIND, 0, rootfs_path);
-	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to mount %d(%s) on \"%s\"", pts_mnt_fd, console->name, lxcpath);
-	DEBUG("Mounted \"%s\" onto \"%s\"", console->name, lxcpath);
+	if (!wants_console(console))
+		return log_trace(0, "Skipping console setup");
 
-finish:
-	/* bind mount '/dev/<ttydir>/console'  to '/dev/console'  */
-	ret = safe_mount(lxcpath, path, "none", MS_BIND, 0, rootfs_path);
-	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to mount \"%s\" on \"%s\"", console->name, lxcpath);
-	DEBUG("Mounted \"%s\" onto \"%s\"", console->name, lxcpath);
+	if (console->pty < 0)  {
+		/*
+		 * Allocate a console from the container's devpts instance. We
+		 * have checked on the host that we have enough pty devices
+		 * available.
+		 */
+		ret = lxc_devpts_terminal(handler->conf->devpts_fd, &console->ptx,
+					  &console->pty, &console->pty_nr, false);
+		if (ret < 0)
+			return syserror("Failed to allocate console from container's devpts instance");
 
-	DEBUG("Console has been setup under \"%s\" and mounted to \"%s\"", lxcpath, path);
-	return 0;
-}
+		ret = strnprintf(console->name, sizeof(console->name),
+				"/dev/pts/%d", console->pty_nr);
+		if (ret < 0)
+			return syserror("Failed to create console path");
+	} else {
+		/*
+		 * We're using a console from the host's devpts instance. Open
+		 * it again so we can later verify that the console we're
+		 * supposed to use is still the same as the one we opened on
+		 * the host.
+		 */
+		fd_devpts_host = open_at(rootfs->dfd_host,
+					 "dev/pts",
+					 PROTECT_OPATH_DIRECTORY,
+					 PROTECT_LOOKUP_BENEATH_XDEV,
+					 0);
+		if (fd_devpts_host < 0)
+			return syserror("Failed to open host devpts");
 
-static int lxc_setup_console(const struct lxc_rootfs *rootfs,
-			     const struct lxc_terminal *console, char *ttydir,
-			     int pts_mnt_fd)
-{
+		fd_devpts = fd_devpts_host;
+	}
+
+	if (ttydir)
+		ret = lxc_setup_ttydir_console(fd_devpts, rootfs, console, ttydir);
+	else
+		ret = lxc_setup_dev_console(fd_devpts, rootfs, console);
+	if (ret < 0)
+		return syserror("Failed to setup console");
+
+	/*
+	 * Some init's such as busybox will set sane tty settings on stdin,
+	 * stdout, stderr which it thinks is the console. We already set them
+	 * the way we wanted on the real terminal, and we want init to do its
+	 * setup on its console ie. the pty allocated in lxc_terminal_setup() so
+	 * make sure that that pty is stdin,stdout,stderr.
+	 */
+	if (console->pty >= 0) {
+		if (handler->daemonize || !handler->conf->is_execute)
+			ret = set_stdfds(console->pty);
+		else
+			ret = lxc_terminal_set_stdfds(console->pty);
+		if (ret < 0)
+			return syserror("Failed to redirect std{in,out,err} to pty file descriptor %d", console->pty);
 
-	if (!ttydir)
-		return lxc_setup_dev_console(rootfs, console, pts_mnt_fd);
+		/*
+		 * If the console has been allocated from the host's devpts
+		 * we're done and we don't need to send fds to the parent.
+		 */
+		if (fd_devpts_host >= 0)
+			lxc_terminal_delete(console);
+	}
 
-	return lxc_setup_ttydir_console(rootfs, console, ttydir, pts_mnt_fd);
+	return ret;
 }
 
 static int parse_mntopt(char *opt, unsigned long *flags, char **data, size_t size)
@@ -1745,11 +2224,11 @@
 		for (struct mount_opt *mo = &mount_opt0; mo->name != NULL; mo++) {
 			size_t mo_name_len = strlen(mo->name);
 
-			if (opt_len == mo_name_len && strncmp(opt, mo->name, mo_name_len) == 0) {
+			if (opt_len == mo_name_len && strnequal(opt, mo->name, mo_name_len)) {
 				if (mo->clear)
-					*flags &= ~mo->flag;
+					*flags &= ~mo->legacy_flag;
 				else
-					*flags |= mo->flag;
+					*flags |= mo->legacy_flag;
 				return 0;
 			}
 		}
@@ -1768,7 +2247,7 @@
 	return 0;
 }
 
-int parse_mntopts(const char *mntopts, unsigned long *mntflags, char **mntdata)
+int parse_mntopts_legacy(const char *mntopts, unsigned long *mntflags, char **mntdata)
 {
 	__do_free char *mntopts_new = NULL, *mntopts_dup = NULL;
 	char *mntopt_cur = NULL;
@@ -1799,39 +2278,108 @@
 	return 0;
 }
 
-static void parse_propagationopt(char *opt, unsigned long *flags)
+static int parse_vfs_attr(struct lxc_mount_options *opts, char *opt, size_t size)
 {
-	struct mount_opt *mo;
+	/*
+	 * If opt is found in mount_opt, set or clear flags.
+	 * Otherwise append it to data.
+	 */
+	for (struct mount_opt *mo = &mount_opt0; mo->name != NULL; mo++) {
+		if (!strnequal(opt, mo->name, strlen(mo->name)))
+			continue;
+
+		/* This is a recursive bind-mount. */
+		if (strequal(mo->name, "rbind")) {
+			opts->bind_recursively = 1;
+			opts->bind = 1;
+			opts->mnt_flags |= mo->legacy_flag; /* MS_BIND | MS_REC */
+			return 0;
+		}
+
+		/* This is a bind-mount. */
+		if (strequal(mo->name, "bind")) {
+			opts->bind = 1;
+			opts->mnt_flags |= mo->legacy_flag; /* MS_BIND */
+			return 0;
+		}
+
+		if (mo->flag == (__u64)~0)
+			return log_info(0, "Ignoring %s mount option", mo->name);
+
+		if (mo->clear) {
+			opts->attr.attr_clr |= mo->flag;
+			opts->mnt_flags &= ~mo->legacy_flag;
+			TRACE("Lowering %s", mo->name);
+		} else {
+			opts->attr.attr_set |= mo->flag;
+			opts->mnt_flags |= mo->legacy_flag;
+			TRACE("Raising %s", mo->name);
+		}
 
-	/* If opt is found in propagation_opt, set or clear flags. */
-	for (mo = &propagation_opt0; mo->name != NULL; mo++) {
-		if (strncmp(opt, mo->name, strlen(mo->name)) != 0)
+		return 0;
+	}
+
+	for (struct mount_opt *mo = &propagation_opt0; mo->name != NULL; mo++) {
+		if (!strnequal(opt, mo->name, strlen(mo->name)))
 			continue;
 
-		if (mo->clear)
-			*flags &= ~mo->flag;
-		else
-			*flags |= mo->flag;
+		if (strequal(mo->name, "rslave") ||
+		    strequal(mo->name, "rshared") ||
+		    strequal(mo->name, "runbindable") ||
+		    strequal(mo->name, "rprivate"))
+			opts->propagate_recursively = 1;
 
-		return;
+		opts->attr.propagation = mo->flag;
+		opts->prop_flags |= mo->legacy_flag;
+		return 0;
 	}
+
+	return 0;
 }
 
-int parse_propagationopts(const char *mntopts, unsigned long *pflags)
+int parse_mount_attrs(struct lxc_mount_options *opts, const char *mntopts)
 {
-	__do_free char *s = NULL;
-	char *p;
+	__do_free char *mntopts_new = NULL, *mntopts_dup = NULL;
+	char *end = NULL, *mntopt_cur = NULL;
+	int ret;
+	size_t size;
+
+	if (!opts)
+		return ret_errno(EINVAL);
 
 	if (!mntopts)
 		return 0;
 
-	s = strdup(mntopts);
-	if (!s)
-		return log_error_errno(-ENOMEM, errno, "Failed to allocate memory");
-
-	*pflags = 0L;
-	lxc_iterate_parts(p, s, ",")
-		parse_propagationopt(p, pflags);
+	mntopts_dup = strdup(mntopts);
+	if (!mntopts_dup)
+		return ret_errno(ENOMEM);
+
+	size = strlen(mntopts_dup) + 1;
+	mntopts_new = zalloc(size);
+	if (!mntopts_new)
+		return ret_errno(ENOMEM);
+
+	lxc_iterate_parts(mntopt_cur, mntopts_dup, ",") {
+		/* This is a filesystem specific option. */
+		if (strchr(mntopt_cur, '=')) {
+			if (!end) {
+				end = stpcpy(mntopts_new, mntopt_cur);
+			} else {
+				end = stpcpy(end, ",");
+				end = stpcpy(end, mntopt_cur);
+			}
+
+			continue;
+		}
+
+		/* This is a generic vfs option. */
+		ret = parse_vfs_attr(opts, mntopt_cur, size);
+		if (ret < 0)
+			return syserror("Failed to parse mount attributes: \"%s\"", mntopt_cur);
+	}
+
+	if (*mntopts_new)
+		opts->data = move_ptr(mntopts_new);
 
 	return 0;
 }
@@ -1875,8 +2423,8 @@
 #endif
 
 	if (relative) {
-		ret = snprintf(srcbuf, sizeof(srcbuf), "%s/%s", rootfs ? rootfs : "/", fsname ? fsname : "");
-		if (ret < 0 || ret >= sizeof(srcbuf))
+		ret = strnprintf(srcbuf, sizeof(srcbuf), "%s/%s", rootfs ? rootfs : "/", fsname ? fsname : "");
+		if (ret < 0)
 			return log_error_errno(-1, errno, "source path is too long");
 		srcpath = srcbuf;
 	}
@@ -1963,34 +2511,74 @@
 	return 0;
 }
 
+const char *lxc_mount_options_infoLXC_MOUNT_MAX = {
+	"create=dir",
+	"create=file",
+	"optional",
+	"relative",
+	"idmap=",
+};
+
 /* Remove "optional", "create=dir", and "create=file" from mntopt */
-static void cull_mntent_opt(struct mntent *mntent)
+int parse_lxc_mount_attrs(struct lxc_mount_options *opts, char *mnt_opts)
 {
-	int i;
-	char *list = {
-		"create=dir",
-		"create=file",
-		"optional",
-		"relative",
-		NULL
-	};
-
-	for (i = 0; listi; i++) {
-		char *p, *p2;
+	for (size_t i = LXC_MOUNT_CREATE_DIR; i < LXC_MOUNT_MAX; i++) {
+		__do_close int fd_userns = -EBADF;
+		const char *opt_name = lxc_mount_options_infoi;
+		size_t len;
+		char *idmap_path, *opt, *opt_next;
 
-		p = strstr(mntent->mnt_opts, listi);
-		if (!p)
+		opt = strstr(mnt_opts, opt_name);
+		if (!opt)
 			continue;
 
-		p2 = strchr(p, ',');
-		if (!p2) {
-			/* no more mntopts, so just chop it here */
-			*p = '\0';
-			continue;
+		switch (i) {
+		case LXC_MOUNT_CREATE_DIR:
+			opts->create_dir = 1;
+			break;
+		case LXC_MOUNT_CREATE_FILE:
+			opts->create_file = 1;
+			break;
+		case LXC_MOUNT_OPTIONAL:
+			opts->optional = 1;
+			break;
+		case LXC_MOUNT_RELATIVE:
+			opts->relative = 1;
+			break;
+		case LXC_MOUNT_IDMAP:
+			opt_next = opt;
+			opt_next += STRLITERALLEN("idmap=");
+			idmap_path = strchrnul(opt_next, ',');
+			len = idmap_path - opt_next + 1;
+
+			if (len >= sizeof(opts->userns_path))
+				return syserror_set(-EIO, "Excessive idmap path length for \"idmap=<path>\" LXC specific mount option");
+
+			strlcpy(opts->userns_path, opt_next, len);
+
+			if (is_empty_string(opts->userns_path))
+				return syserror_set(-EINVAL, "Missing idmap path for \"idmap=<path>\" LXC specific mount option");
+
+			if (!strequal(opts->userns_path, "container")) {
+				fd_userns = open(opts->userns_path, O_RDONLY | O_NOCTTY | O_CLOEXEC);
+				if (fd_userns < 0)
+					return syserror("Failed to open user namespace %s", opts->userns_path);
+			}
+
+			TRACE("Parse LXC specific mount option %d->\"idmap=%s\"", fd_userns, opts->userns_path);
+			break;
+		default:
+			return syserror_set(-EINVAL, "Unknown LXC specific mount option");
 		}
 
-		memmove(p, p2 + 1, strlen(p2 + 1) + 1);
+		opt_next = strchr(opt, ',');
+		if (!opt_next)
+			*opt = '\0'; /* no more mntopts, so just chop it here */
+		else
+			memmove(opt, opt_next + 1, strlen(opt_next + 1) + 1);
 	}
+
+	return 0;
 }
 
 static int mount_entry_create_dir_file(const struct mntent *mntent,
@@ -2002,7 +2590,7 @@
 	int ret;
 	char *p2;
 
-	if (strncmp(mntent->mnt_type, "overlay", 7) == 0) {
+	if (strnequal(mntent->mnt_type, "overlay", 7)) {
 		ret = ovl_mkdir(mntent, rootfs, lxc_name, lxc_path);
 		if (ret < 0)
 			return -1;
@@ -2047,10 +2635,10 @@
 					 const char *lxc_path)
 {
 	__do_free char *mntdata = NULL;
-	unsigned long mntflags = 0, pflags = 0;
 	char *rootfs_path = NULL;
 	int ret;
 	bool dev, optional, relative;
+	struct lxc_mount_options opts = {};
 
 	optional = hasmntopt(mntent, "optional") != NULL;
 	dev = hasmntopt(mntent, "dev") != NULL;
@@ -2067,49 +2655,65 @@
 
 		return -1;
 	}
-	cull_mntent_opt(mntent);
 
-	ret = parse_propagationopts(mntent->mnt_opts, &pflags);
+	ret = parse_lxc_mount_attrs(&opts, mntent->mnt_opts);
 	if (ret < 0)
-		return -1;
+		return ret;
 
-	ret = parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata);
+	/*
+	 * Idmapped mount entries will be setup by the parent for us. Note that
+	 * we rely on mount_entry_create_dir_file() above to have already
+	 * created the target path for us. So the parent can just open the
+	 * target and send us the target fd.
+	 */
+	errno = EOPNOTSUPP;
+	if (!is_empty_string(opts.userns_path))
+		return systrace_ret(0, "Skipping idmapped mount entry");
+
+	ret = parse_mount_attrs(&opts, mntent->mnt_opts);
 	if (ret < 0)
-		return ret;
+		return -1;
 
-	ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type, mntflags,
-			  pflags, mntdata, optional, dev, relative, rootfs_path);
+	ret = mount_entry(mntent->mnt_fsname,
+			  path,
+			  mntent->mnt_type,
+			  opts.mnt_flags,
+			  opts.prop_flags,
+			  opts.data,
+			  optional,
+			  dev,
+			  relative,
+			  rootfs_path);
 
 	return ret;
 }
 
-static inline int mount_entry_on_systemfs(struct mntent *mntent)
+static inline int mount_entry_on_systemfs(struct lxc_rootfs *rootfs,
+					  struct mntent *mntent)
 {
 	int ret;
-	char pathPATH_MAX;
 
 	/* For containers created without a rootfs all mounts are treated as
 	 * absolute paths starting at / on the host.
 	 */
 	if (mntent->mnt_dir0 != '/')
-		ret = snprintf(path, sizeof(path), "/%s", mntent->mnt_dir);
+		ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "/%s", mntent->mnt_dir);
 	else
-		ret = snprintf(path, sizeof(path), "%s", mntent->mnt_dir);
-	if (ret < 0 || ret >= sizeof(path))
+		ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s", mntent->mnt_dir);
+	if (ret < 0)
 		return -1;
 
-	return mount_entry_on_generic(mntent, path, NULL, NULL, NULL);
+	return mount_entry_on_generic(mntent, rootfs->buf, NULL, NULL, NULL);
 }
 
 static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
-					  const struct lxc_rootfs *rootfs,
+					  struct lxc_rootfs *rootfs,
 					  const char *lxc_name,
 					  const char *lxc_path)
 {
 	int offset;
 	char *aux;
 	const char *lxcpath;
-	char pathPATH_MAX;
 	int ret = 0;
 
 	lxcpath = lxc_global_config_value("lxc.lxcpath");
@@ -2119,13 +2723,13 @@
 	/* If rootfs->path is a blockdev path, allow container fstab to use
 	 * <lxcpath>/<name>/rootfs" as the target prefix.
 	 */
-	ret = snprintf(path, PATH_MAX, "%s/%s/rootfs", lxcpath, lxc_name);
-	if (ret < 0 || ret >= PATH_MAX)
+	ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/%s/rootfs", lxcpath, lxc_name);
+	if (ret < 0)
 		goto skipvarlib;
 
-	aux = strstr(mntent->mnt_dir, path);
+	aux = strstr(mntent->mnt_dir, rootfs->buf);
 	if (aux) {
-		offset = strlen(path);
+		offset = strlen(rootfs->buf);
 		goto skipabs;
 	}
 
@@ -2136,31 +2740,29 @@
 	offset = strlen(rootfs->path);
 
 skipabs:
-	ret = snprintf(path, PATH_MAX, "%s/%s", rootfs->mount, aux + offset);
-	if (ret < 0 || ret >= PATH_MAX)
+	ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/%s", rootfs->mount, aux + offset);
+	if (ret < 0)
 		return -1;
 
-	return mount_entry_on_generic(mntent, path, rootfs, lxc_name, lxc_path);
+	return mount_entry_on_generic(mntent, rootfs->buf, rootfs, lxc_name, lxc_path);
 }
 
 static int mount_entry_on_relative_rootfs(struct mntent *mntent,
-					  const struct lxc_rootfs *rootfs,
+					  struct lxc_rootfs *rootfs,
 					  const char *lxc_name,
 					  const char *lxc_path)
 {
 	int ret;
-	char pathPATH_MAX;
 
 	/* relative to root mount point */
-	ret = snprintf(path, sizeof(path), "%s/%s", rootfs->mount, mntent->mnt_dir);
-	if (ret < 0 || (size_t)ret >= sizeof(path))
+	ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/%s", rootfs->mount, mntent->mnt_dir);
+	if (ret < 0)
 		return -1;
 
-	return mount_entry_on_generic(mntent, path, rootfs, lxc_name, lxc_path);
+	return mount_entry_on_generic(mntent, rootfs->buf, rootfs, lxc_name, lxc_path);
 }
 
-static int mount_file_entries(const struct lxc_conf *conf,
-			      const struct lxc_rootfs *rootfs, FILE *file,
+static int mount_file_entries(struct lxc_rootfs *rootfs, FILE *file,
 			      const char *lxc_name, const char *lxc_path)
 {
 	char bufPATH_MAX;
@@ -2170,7 +2772,7 @@
 		int ret;
 
 		if (!rootfs->path)
-			ret = mount_entry_on_systemfs(&mntent);
+			ret = mount_entry_on_systemfs(rootfs, &mntent);
 		else if (mntent.mnt_dir0 != '/')
 			ret = mount_entry_on_relative_rootfs(&mntent, rootfs,
 							     lxc_name, lxc_path);
@@ -2195,9 +2797,8 @@
 
 #define __do_endmntent __attribute__((__cleanup__(__auto_endmntent__)))
 
-static int setup_mount(const struct lxc_conf *conf,
-		       const struct lxc_rootfs *rootfs, const char *fstab,
-		       const char *lxc_name, const char *lxc_path)
+static int setup_mount_fstab(struct lxc_rootfs *rootfs, const char *fstab,
+			     const char *lxc_name, const char *lxc_path)
 {
 	__do_endmntent FILE *f = NULL;
 	int ret;
@@ -2209,7 +2810,7 @@
 	if (!f)
 		return log_error_errno(-1, errno, "Failed to open \"%s\"", fstab);
 
-	ret = mount_file_entries(conf, rootfs, f, lxc_name, lxc_path);
+	ret = mount_file_entries(rootfs, f, lxc_name, lxc_path);
 	if (ret < 0)
 		ERROR("Failed to set up mount entries");
 
@@ -2230,14 +2831,13 @@
 "proc dev/.lxc/proc proc create=dir,optional 0 0\n"
 "sys dev/.lxc/sys sysfs create=dir,optional 0 0\n";
 
-FILE *make_anonymous_mount_file(struct lxc_list *mount,
+FILE *make_anonymous_mount_file(const struct list_head *mount_entries,
 				bool include_nesting_helpers)
 {
 	__do_close int fd = -EBADF;
 	FILE *f;
 	int ret;
-	char *mount_entry;
-	struct lxc_list *iterator;
+	struct string_entry *entry;
 
 	fd = memfd_create(".lxc_mount_file", MFD_CLOEXEC);
 	if (fd < 0) {
@@ -2253,14 +2853,13 @@
 		TRACE("Created temporary mount file");
 	}
 
-	lxc_list_for_each (iterator, mount) {
+	list_for_each_entry(entry, mount_entries, head) {
 		size_t len;
 
-		mount_entry = iterator->elem;
-		len = strlen(mount_entry);
+		len = strlen(entry->val);
 
-		ret = lxc_write_nointr(fd, mount_entry, len);
-		if (ret != len)
+		ret = lxc_write_nointr(fd, entry->val, len);
+		if (ret < 0 || (size_t)ret != len)
 			return NULL;
 
 		ret = lxc_write_nointr(fd, "\n", 1);
@@ -2286,136 +2885,390 @@
 }
 
 static int setup_mount_entries(const struct lxc_conf *conf,
-			       const struct lxc_rootfs *rootfs,
-			       struct lxc_list *mount, const char *lxc_name,
-			       const char *lxc_path)
+			       struct lxc_rootfs *rootfs,
+			       const char *lxc_name, const char *lxc_path)
 {
 	__do_fclose FILE *f = NULL;
 
-	f = make_anonymous_mount_file(mount, conf->lsm_aa_allow_nesting);
+	f = make_anonymous_mount_file(&conf->mount_entries, conf->lsm_aa_allow_nesting);
 	if (!f)
 		return -1;
 
-	return mount_file_entries(conf, rootfs, f, lxc_name, lxc_path);
+	return mount_file_entries(rootfs, f, lxc_name, lxc_path);
 }
 
-static int parse_cap(const char *cap)
+static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f)
 {
-	size_t i;
-	int capid = -1;
-	size_t end = sizeof(caps_opt) / sizeof(caps_opt0);
-	char *ptr = NULL;
+	struct lxc_conf *conf = handler->conf;
+	struct lxc_rootfs *rootfs = &conf->rootfs;
+	int mnt_seq = 0;
+	int ret;
+	char bufPATH_MAX;
+	struct mntent mntent;
 
-	if (strcmp(cap, "none") == 0)
-		return -2;
+	while (getmntent_r(f, &mntent, buf, sizeof(buf))) {
+		__do_close int fd_from = -EBADF, fd_to = -EBADF,
+			       fd_userns = -EBADF;
+		__do_free char *__data = NULL;
+		int cur_mnt_seq = -1;
+		struct lxc_mount_options opts = {};
+		int dfd_from;
+		const char *source_relative, *target_relative;
+		struct mount_attr attr = {};
 
-	for (i = 0; i < end; i++) {
-		if (strcmp(cap, caps_opti.name))
+		ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts);
+		if (ret < 0)
+			return syserror("Failed to parse LXC specific mount options");
+		__data = opts.data;
+
+		ret = parse_mount_attrs(&opts, mntent.mnt_opts);
+		if (ret < 0)
+			return syserror("Failed to parse mount options");
+
+		/* No idmapped mount entry so skip it. */
+		if (is_empty_string(opts.userns_path))
 			continue;
 
-		capid = caps_opti.value;
-		break;
-	}
+		if (!can_use_bind_mounts())
+			return syserror_set(-EINVAL, "Kernel does not support idmapped mounts");
+
+		if (!opts.bind)
+			return syserror_set(-EINVAL, "Only bind mounts can currently be idmapped");
+
+		/* We don't support new filesystem mounts yet. */
+		if (!is_empty_string(mntent.mnt_type) &&
+		    !strequal(mntent.mnt_type, "none"))
+			return syserror_set(-EINVAL, "Only bind mounts can currently be idmapped");
+
+		/* Someone specified additional mount options for a bind-mount. */
+		if (!is_empty_string(opts.data))
+			return syserror_set(-EINVAL, "Bind mounts don't support non-generic mount options");
+
+		/*
+		 * The source path is supposed to be taken relative to the
+		 * container's rootfs mount or - if the container does not have
+		 * a separate rootfs - to the host's /.
+		 */
+		source_relative = deabs(mntent.mnt_fsname);
+		if (opts.relative || !rootfs->path)
+			dfd_from = rootfs->dfd_mnt;
+		else
+			dfd_from = rootfs->dfd_host;
+		fd_from = open_tree(dfd_from, source_relative,
+				    OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC |
+				    (opts.bind_recursively ? AT_RECURSIVE : 0));
+		if (fd_from < 0)
+			return syserror("Failed to create detached %smount of %d/%s",
+					opts.bind_recursively ? "recursive " : "",
+					dfd_from, source_relative);
+
+		if (strequal(opts.userns_path, "container"))
+			fd_userns = openat(dfd_from, "proc/self/ns/user", O_RDONLY | O_CLOEXEC);
+		else
+			fd_userns = open_at(-EBADF, opts.userns_path,
+					    PROTECT_OPEN_WITH_TRAILING_SYMLINKS, 0, 0);
+		if (fd_userns < 0) {
+			if (opts.optional) {
+				TRACE("Skipping optional idmapped mount");
+				continue;
+			}
+
+			return syserror("Failed to open user namespace \"%s\" for detached %smount of %d/%s",
+					opts.userns_path, opts.bind_recursively ? "recursive " : "",
+					dfd_from, source_relative);
+		}
+
+		ret = __lxc_abstract_unix_send_two_fds(handler->data_sock0,
+						       fd_from, fd_userns,
+						       &opts, sizeof(opts));
+		if (ret <= 0) {
+			if (opts.optional) {
+				TRACE("Skipping optional idmapped mount");
+				continue;
+			}
+
+			return syserror("Failed to send file descriptor %d for detached %smount of %d/%s and file descriptor %d of user namespace \"%s\" to parent",
+					fd_from, opts.bind_recursively ? "recursive " : "",
+					dfd_from, source_relative, fd_userns,
+					opts.userns_path);
+		}
+
+		ret = lxc_abstract_unix_rcv_credential(handler->data_sock0,
+						       &cur_mnt_seq,
+						       sizeof(cur_mnt_seq));
+		if (ret <= 0) {
+			if (opts.optional) {
+				TRACE("Skipping optional idmapped mount");
+				continue;
+			}
+
+			return syserror("Failed to receive notification that parent idmapped detached %smount %d/%s to user namespace %d",
+					opts.bind_recursively ? "recursive " : "",
+					dfd_from, source_relative, fd_userns);
+		}
+
+		if (mnt_seq != cur_mnt_seq)
+			return syserror("Expected mount sequence number and mount sequence number from parent mismatch: %d != %d",
+					mnt_seq, cur_mnt_seq);
+		mnt_seq++;
+
+		/* Set regular mount options. */
+		attr = opts.attr;
+		attr.propagation = 0;
+		ret = mount_setattr(fd_from,
+				    "",
+				    AT_EMPTY_PATH |
+				    (opts.bind_recursively ? AT_RECURSIVE : 0),
+				    &attr,
+				    sizeof(attr));
+		if (ret < 0) {
+			if (opts.optional) {
+				TRACE("Skipping optional idmapped mount");
+				continue;
+			}
+
+			return syserror("Failed to set %smount options on detached %d/%s",
+					opts.bind_recursively ? "recursive " : "",
+					dfd_from, source_relative);
+		}
+
+		/* Set propagation mount options. */
+		if (opts.attr.propagation) {
+			attr = (struct mount_attr) {
+				.propagation = opts.attr.propagation,
+			};
+
+			ret = mount_setattr(fd_from,
+					"",
+					AT_EMPTY_PATH |
+					(opts.propagate_recursively ? AT_RECURSIVE : 0),
+					&attr,
+					sizeof(attr));
+			if (ret < 0) {
+				if (opts.optional) {
+					TRACE("Skipping optional idmapped mount");
+					continue;
+				}
 
-	if (capid < 0) {
-		/* Try to see if it's numeric, so the user may specify
-		 * capabilities that the running kernel knows about but we
-		 * don't
+				return syserror("Failed to set %spropagation mount options on detached %d/%s",
+						opts.bind_recursively ? "recursive " : "",
+						dfd_from, source_relative);
+			}
+		}
+
+
+		/*
+		 * In contrast to the legacy mount codepath we will simplify
+		 * our lifes and just always treat the target mountpoint to be
+		 * relative to the container's rootfs mountpoint or - if the
+		 * container does not have a separate rootfs - to the host's /.
 		 */
-		errno = 0;
-		capid = strtol(cap, &ptr, 10);
-		if (!ptr || *ptr != '\0' || errno != 0)
-			/* not a valid number */
-			capid = -1;
-		else if (capid > lxc_caps_last_cap())
-			/* we have a number but it's not a valid
-			 * capability */
-			capid = -1;
+
+		target_relative = deabs(mntent.mnt_dir);
+		if (rootfs->path)
+			dfd_from = rootfs->dfd_mnt;
+		else
+			dfd_from = rootfs->dfd_host;
+		fd_to = open_at(dfd_from, target_relative, PROTECT_OPATH_FILE, PROTECT_LOOKUP_BENEATH_XDEV, 0);
+		if (fd_to < 0) {
+			if (opts.optional) {
+				TRACE("Skipping optional idmapped mount");
+				continue;
+			}
+
+			return syserror("Failed to open target mountpoint %d/%s for detached idmapped %smount %d:%d/%s",
+					dfd_from, target_relative,
+					opts.bind_recursively ? "recursive " : "",
+					fd_userns, dfd_from, source_relative);
+		}
+
+		ret = move_detached_mount(fd_from, fd_to, "", 0, 0);
+		if (ret) {
+			if (opts.optional) {
+				TRACE("Skipping optional idmapped mount");
+				continue;
+			}
+
+			return syserror("Failed to attach detached idmapped %smount %d:%d/%s to target mountpoint %d/%s",
+					opts.bind_recursively ? "recursive " : "",
+					fd_userns, dfd_from, source_relative, dfd_from, target_relative);
+		}
+
+		TRACE("Attached detached idmapped %smount %d:%d/%s to target mountpoint %d/%s",
+		      opts.bind_recursively ? "recursive " : "", fd_userns, dfd_from,
+		      source_relative, dfd_from, target_relative);
 	}
 
-	return capid;
+	if (!feof(f) || ferror(f))
+		return syserror_set(-EINVAL, "Failed to parse mount entries");
+
+	return 0;
 }
 
-int in_caplist(int cap, struct lxc_list *caps)
+static int lxc_idmapped_mounts_child(struct lxc_handler *handler)
 {
-	int capid;
-	struct lxc_list *iterator;
+	__do_fclose FILE *f_entries = NULL;
+	int fret = -1;
+	struct lxc_conf *conf = handler->conf;
+	const char *fstab = conf->fstab;
+	int ret;
 
-	lxc_list_for_each (iterator, caps) {
-		capid = parse_cap(iterator->elem);
-		if (capid == cap)
-			return 1;
+	f_entries = make_anonymous_mount_file(&conf->mount_entries,
+					      conf->lsm_aa_allow_nesting);
+	if (!f_entries) {
+		SYSERROR("Failed to create anonymous mount file");
+		goto out;
 	}
 
+	ret = __lxc_idmapped_mounts_child(handler, f_entries);
+	if (ret) {
+		SYSERROR("Failed to setup idmapped mount entries");
+		goto out;
+	}
+
+	TRACE("Finished setting up idmapped mounts");
+
+	if (fstab) {
+		__do_endmntent FILE *f_fstab = NULL;
+
+		f_fstab = setmntent(fstab, "re");
+		if (!f_fstab) {
+			SYSERROR("Failed to open fstab format file \"%s\"", fstab);
+			goto out;
+		}
+
+		ret = __lxc_idmapped_mounts_child(handler, f_fstab);
+		if (ret) {
+			SYSERROR("Failed to setup idmapped mount entries specified in fstab");
+			goto out;
+		}
+
+		TRACE("Finished setting up idmapped mounts specified in fstab");
+	}
+
+	fret = 0;
+
+out:
+	ret = lxc_abstract_unix_send_credential(handler->data_sock0, NULL, 0);
+	if (ret < 0)
+		return syserror("Failed to inform parent that we are done setting up mounts");
+
+	return fret;
+}
+
+int parse_cap(const char *cap_name, __u32 *cap)
+{
+	size_t end = sizeof(caps_opt) / sizeof(caps_opt0);
+	int ret;
+	unsigned int res;
+	__u32 last_cap;
+
+	if (strequal(cap_name, "none"))
+		return -2;
+
+	for (size_t i = 0; i < end; i++) {
+		if (!strequal(cap_name, caps_opti.name))
+			continue;
+
+		*cap = caps_opti.value;
+		return 0;
+	}
+
+	/*
+	 * Try to see if it's numeric, so the user may specify
+	 * capabilities that the running kernel knows about but we
+	 * don't.
+	 */
+	ret = lxc_safe_uint(cap_name, &res);
+	if (ret < 0)
+		return -1;
+
+	ret = lxc_caps_last_cap(&last_cap);
+	if (ret)
+		return -1;
+
+	if ((__u32)res > last_cap)
+		return -1;
+
+	*cap = (__u32)res;
 	return 0;
 }
 
-static int setup_caps(struct lxc_list *caps)
+bool has_cap(__u32 cap, struct lxc_conf *conf)
 {
-	int capid;
-	char *drop_entry;
-	struct lxc_list *iterator;
+	bool cap_in_list = false;
+	struct cap_entry *cap_entry;
 
-	lxc_list_for_each (iterator, caps) {
-		int ret;
+	list_for_each_entry(cap_entry, &conf->caps.list, head) {
+		if (cap_entry->cap != cap)
+			continue;
+
+		cap_in_list = true;
+	}
+
+	/* The capability is kept. */
+	if (conf->caps.keep)
+		return cap_in_list;
+
+	/* The capability is not dropped. */
+	return !cap_in_list;
+}
 
-		drop_entry = iterator->elem;
+static int capabilities_deny(struct lxc_conf *conf)
+{
+	struct cap_entry *cap;
 
-		capid = parse_cap(drop_entry);
-		if (capid < 0)
-			return log_error(-1, "unknown capability %s", drop_entry);
+	list_for_each_entry(cap, &conf->caps.list, head) {
+		int ret;
 
-		ret = prctl(PR_CAPBSET_DROP, prctl_arg(capid), prctl_arg(0),
+		ret = prctl(PR_CAPBSET_DROP, prctl_arg(cap->cap), prctl_arg(0),
 			    prctl_arg(0), prctl_arg(0));
 		if (ret < 0)
-			return log_error_errno(-1, errno, "Failed to remove %s capability", drop_entry);
-		DEBUG("Dropped %s (%d) capability", drop_entry, capid);
+			return syserror("Failed to remove %s capability", cap->cap_name);
+
+		DEBUG("Dropped %s (%d) capability", cap->cap_name, cap->cap);
 	}
 
 	DEBUG("Capabilities have been setup");
 	return 0;
 }
 
-static int dropcaps_except(struct lxc_list *caps)
+static int capabilities_allow(struct lxc_conf *conf)
 {
-	__do_free int *caplist = NULL;
-	int i, capid, numcaps;
-	char *keep_entry;
-	struct lxc_list *iterator;
+	__do_free __u32 *keep_bits = NULL;
+	int ret;
+	struct cap_entry *cap;
+	__u32 last_cap, nr_u32;
 
-	numcaps = lxc_caps_last_cap() + 1;
-	if (numcaps <= 0 || numcaps > 200)
-		return -1;
-	TRACE("Found %d capabilities", numcaps);
+	ret = lxc_caps_last_cap(&last_cap);
+	if (ret || last_cap > 200)
+		return ret_errno(EINVAL);
 
-	/* caplisti is 1 if we keep capability i */
-	caplist = must_realloc(NULL, numcaps * sizeof(int));
-	memset(caplist, 0, numcaps * sizeof(int));
+	TRACE("Found %d capabilities", last_cap);
 
-	lxc_list_for_each (iterator, caps) {
-		keep_entry = iterator->elem;
+	nr_u32 = BITS_TO_LONGS(last_cap);
+	keep_bits = zalloc(nr_u32 * sizeof(__u32));
+	if (!keep_bits)
+		return ret_errno(ENOMEM);
 
-		capid = parse_cap(keep_entry);
-		if (capid == -2)
+	list_for_each_entry(cap, &conf->caps.list, head) {
+		if (cap->cap > last_cap)
 			continue;
 
-		if (capid < 0)
-			return log_error(-1, "Unknown capability %s", keep_entry);
-
-		DEBUG("Keep capability %s (%d)", keep_entry, capid);
-		caplistcapid = 1;
+		set_bit(cap->cap, keep_bits);
+		DEBUG("Keeping %s (%d) capability", cap->cap_name, cap->cap);
 	}
 
-	for (i = 0; i < numcaps; i++) {
-		int ret;
-
-		if (caplisti)
+	for (__u32 cap_bit = 0; cap_bit <= last_cap; cap_bit++) {
+		if (is_set(cap_bit, keep_bits))
 			continue;
 
-		ret = prctl(PR_CAPBSET_DROP, prctl_arg(i), prctl_arg(0),
+		ret = prctl(PR_CAPBSET_DROP, prctl_arg(cap_bit), prctl_arg(0),
 			    prctl_arg(0), prctl_arg(0));
 		if (ret < 0)
-			return log_error_errno(-1, errno, "Failed to remove capability %d", i);
+			return syserror("Failed to remove capability %d", cap_bit);
+
+		TRACE("Dropped capability %d", cap_bit);
 	}
 
 	DEBUG("Capabilities have been setup");
@@ -2429,7 +3282,7 @@
 	int resid = -1;
 
 	for (i = 0; i < sizeof(limit_opt) / sizeof(limit_opt0); ++i)
-		if (strcmp(res, limit_opti.name) == 0)
+		if (strequal(res, limit_opti.name))
 			return limit_opti.value;
 
 	/* Try to see if it's numeric, so the user may specify
@@ -2443,15 +3296,15 @@
 	return resid;
 }
 
-int setup_resource_limits(struct lxc_list *limits, pid_t pid)
+int setup_resource_limits(struct lxc_conf *conf, pid_t pid)
 {
 	int resid;
-	struct lxc_list *it;
 	struct lxc_limit *lim;
 
-	lxc_list_for_each (it, limits) {
-		lim = it->elem;
+	if (list_empty(&conf->limits))
+		return 0;
 
+	list_for_each_entry(lim, &conf->limits, head) {
 		resid = parse_resource(lim->resource);
 		if (resid < 0)
 			return log_error(-1, "Unknown resource %s", lim->resource);
@@ -2466,61 +3319,71 @@
 #endif
 	}
 
+	TRACE("Setup resource limits");
 	return 0;
 }
 
-int setup_sysctl_parameters(struct lxc_list *sysctls)
+int setup_sysctl_parameters(struct lxc_conf *conf)
 {
 	__do_free char *tmp = NULL;
-	struct lxc_list *it;
-	struct lxc_sysctl *elem;
 	int ret = 0;
 	char filenamePATH_MAX = {0};
+	struct lxc_sysctl *sysctl, *nsysctl;
 
-	lxc_list_for_each (it, sysctls) {
-		elem = it->elem;
-		tmp = lxc_string_replace(".", "/", elem->key);
+	if (list_empty(&conf->sysctls))
+		return 0;
+
+	list_for_each_entry_safe(sysctl, nsysctl, &conf->sysctls, head) {
+		tmp = lxc_string_replace(".", "/", sysctl->key);
 		if (!tmp)
-			return log_error(-1, "Failed to replace key %s", elem->key);
+			return log_error(-1, "Failed to replace key %s", sysctl->key);
 
-		ret = snprintf(filename, sizeof(filename), "/proc/sys/%s", tmp);
-		if (ret < 0 || (size_t)ret >= sizeof(filename))
+		ret = strnprintf(filename, sizeof(filename), "/proc/sys/%s", tmp);
+		if (ret < 0)
 			return log_error(-1, "Error setting up sysctl parameters path");
 
-		ret = lxc_write_to_file(filename, elem->value,
-					strlen(elem->value), false, 0666);
+		ret = lxc_write_to_file(filename, sysctl->value,
+					strlen(sysctl->value), false, 0666);
 		if (ret < 0)
 			return log_error_errno(-1, errno, "Failed to setup sysctl parameters %s to %s",
-					       elem->key, elem->value);
+					       sysctl->key, sysctl->value);
+
+		TRACE("Setting %s to %s", filename, sysctl->value);
 	}
 
+	TRACE("Setup /proc/sys settings");
 	return 0;
 }
 
-int setup_proc_filesystem(struct lxc_list *procs, pid_t pid)
+int setup_proc_filesystem(struct lxc_conf *conf, pid_t pid)
 {
 	__do_free char *tmp = NULL;
-	struct lxc_list *it;
-	struct lxc_proc *elem;
 	int ret = 0;
 	char filenamePATH_MAX = {0};
+	struct lxc_proc *proc;
 
-	lxc_list_for_each (it, procs) {
-		elem = it->elem;
-		tmp = lxc_string_replace(".", "/", elem->filename);
+	if (list_empty(&conf->procs))
+		return 0;
+
+	list_for_each_entry(proc, &conf->procs, head) {
+		tmp = lxc_string_replace(".", "/", proc->filename);
 		if (!tmp)
-			return log_error(-1, "Failed to replace key %s", elem->filename);
+			return log_error(-1, "Failed to replace key %s", proc->filename);
 
-		ret = snprintf(filename, sizeof(filename), "/proc/%d/%s", pid, tmp);
-		if (ret < 0 || (size_t)ret >= sizeof(filename))
+		ret = strnprintf(filename, sizeof(filename), "/proc/%d/%s", pid, tmp);
+		if (ret < 0)
 			return log_error(-1, "Error setting up proc filesystem path");
 
-		ret = lxc_write_to_file(filename, elem->value,
-					strlen(elem->value), false, 0666);
+		ret = lxc_write_to_file(filename, proc->value,
+					strlen(proc->value), false, 0666);
 		if (ret < 0)
-			return log_error_errno(-1, errno, "Failed to setup proc filesystem %s to %s", elem->filename, elem->value);
+			return log_error_errno(-1, errno, "Failed to setup proc filesystem %s to %s",
+					       proc->filename, proc->value);
+
+		TRACE("Setting %s to %s", filename, proc->value);
 	}
 
+	TRACE("Setup /proc/%d settings", pid);
 	return 0;
 }
 
@@ -2531,13 +3394,12 @@
 	int i;
 	struct lxc_conf *new;
 
-	new = malloc(sizeof(*new));
+	new = zalloc(sizeof(*new));
 	if (!new)
 		return NULL;
-	memset(new, 0, sizeof(*new));
 
 	new->loglevel = LXC_LOG_LEVEL_NOTSET;
-	new->personality = -1;
+	new->personality = LXC_ARCH_UNCHANGED;
 	new->autodev = 1;
 	new->console.buffer_size = 0;
 	new->console.log_path = NULL;
@@ -2546,11 +3408,13 @@
 	new->console.path = NULL;
 	new->console.peer = -1;
 	new->console.proxy.busy = -1;
-	new->console.proxy.ptmx = -1;
-	new->console.proxy.pts = -1;
-	new->console.ptmx = -1;
-	new->console.pts = -1;
+	new->console.proxy.ptx = -1;
+	new->console.proxy.pty = -1;
+	new->console.ptx = -EBADF;
+	new->console.pty = -EBADF;
+	new->console.pty_nr = -1;
 	new->console.name0 = '\0';
+	new->devpts_fd = -EBADF;
 	memset(&new->console.ringbuf, 0, sizeof(struct lxc_ringbuf));
 	new->maincmd_fd = -1;
 	new->monitor_signal_pdeath = SIGKILL;
@@ -2561,46 +3425,54 @@
 		return NULL;
 	}
 	new->rootfs.managed = true;
+	new->rootfs.dfd_mnt = -EBADF;
+	new->rootfs.dfd_dev = -EBADF;
+	new->rootfs.dfd_host = -EBADF;
+	new->rootfs.fd_path_pin = -EBADF;
+	new->rootfs.dfd_idmapped = -EBADF;
 	new->logfd = -1;
-	lxc_list_init(&new->cgroup);
-	lxc_list_init(&new->cgroup2);
-	lxc_list_init(&new->devices);
-	lxc_list_init(&new->network);
-	lxc_list_init(&new->mount_list);
-	lxc_list_init(&new->caps);
-	lxc_list_init(&new->keepcaps);
-	lxc_list_init(&new->id_map);
+	INIT_LIST_HEAD(&new->cgroup);
+	INIT_LIST_HEAD(&new->cgroup2);
+	/* Block ("allowlist") all devices by default. */
+	new->bpf_devices.list_type = LXC_BPF_DEVICE_CGROUP_ALLOWLIST;
+	INIT_LIST_HEAD(&(new->bpf_devices).devices);
+	INIT_LIST_HEAD(&new->mount_entries);
+	INIT_LIST_HEAD(&new->caps.list);
+	INIT_LIST_HEAD(&new->id_map);
 	new->root_nsuid_map = NULL;
 	new->root_nsgid_map = NULL;
-	lxc_list_init(&new->includes);
-	lxc_list_init(&new->aliens);
-	lxc_list_init(&new->environment);
-	lxc_list_init(&new->limits);
-	lxc_list_init(&new->sysctls);
-	lxc_list_init(&new->procs);
+	INIT_LIST_HEAD(&new->environment);
+	INIT_LIST_HEAD(&new->limits);
+	INIT_LIST_HEAD(&new->sysctls);
+	INIT_LIST_HEAD(&new->procs);
 	new->hooks_version = 0;
 	for (i = 0; i < NUM_LXC_HOOKS; i++)
-		lxc_list_init(&new->hooksi);
-	lxc_list_init(&new->groups);
-	lxc_list_init(&new->state_clients);
+		INIT_LIST_HEAD(&new->hooksi);
+	INIT_LIST_HEAD(&new->groups);
+	INIT_LIST_HEAD(&new->state_clients);
 	new->lsm_aa_profile = NULL;
-	lxc_list_init(&new->lsm_aa_raw);
+	INIT_LIST_HEAD(&new->lsm_aa_raw);
 	new->lsm_se_context = NULL;
 	new->lsm_se_keyring_context = NULL;
 	new->keyring_disable_session = false;
-	new->tmp_umount_proc = false;
-	new->tmp_umount_proc = 0;
+	new->transient_procfs_mnt = false;
 	new->shmount.path_host = NULL;
 	new->shmount.path_cont = NULL;
+	new->sched_core = false;
+	new->sched_core_cookie = INVALID_SCHED_CORE_COOKIE;
 
 	/* if running in a new user namespace, init and COMMAND
 	 * default to running as UID/GID 0 when using lxc-execute */
 	new->init_uid = 0;
 	new->init_gid = 0;
+	memset(&new->init_groups, 0, sizeof(lxc_groups_t));
 	memset(&new->cgroup_meta, 0, sizeof(struct lxc_cgroup));
 	memset(&new->ns_share, 0, sizeof(char *) * LXC_NS_MAX);
+	memset(&new->timens, 0, sizeof(struct timens_offsets));
 	seccomp_conf_init(new);
 
+	INIT_LIST_HEAD(&new->netdevs);
+
 	return new;
 }
 
@@ -2614,8 +3486,8 @@
 	if (geteuid() != 0 && idtype == ID_TYPE_GID) {
 		__do_close int setgroups_fd = -EBADF;
 
-		ret = snprintf(path, PATH_MAX, "/proc/%d/setgroups", pid);
-		if (ret < 0 || ret >= PATH_MAX)
+		ret = strnprintf(path, sizeof(path), "/proc/%d/setgroups", pid);
+		if (ret < 0)
 			return -E2BIG;
 
 		setgroups_fd = open(path, O_WRONLY);
@@ -2631,9 +3503,9 @@
 		}
 	}
 
-	ret = snprintf(path, PATH_MAX, "/proc/%d/%cid_map", pid,
+	ret = strnprintf(path, sizeof(path), "/proc/%d/%cid_map", pid,
 		       idtype == ID_TYPE_UID ? 'u' : 'g');
-	if (ret < 0 || ret >= PATH_MAX)
+	if (ret < 0)
 		return -E2BIG;
 
 	fd = open(path, O_WRONLY | O_CLOEXEC);
@@ -2641,7 +3513,7 @@
 		return log_error_errno(-1, errno, "Failed to open \"%s\"", path);
 
 	ret = lxc_write_nointr(fd, buf, buf_size);
-	if (ret != buf_size)
+	if (ret < 0 || (size_t)ret != buf_size)
 		return log_error_errno(-1, errno, "Failed to write %cid mapping to \"%s\"",
 				       idtype == ID_TYPE_UID ? 'u' : 'g', path);
 
@@ -2661,18 +3533,16 @@
 	int ret;
 	struct stat st;
 
-	errno = EINVAL;
 	if (cap != CAP_SETUID && cap != CAP_SETGID)
-		return -1;
+		return ret_errno(EINVAL);
 
-	errno = ENOENT;
 	path = on_path(binary, NULL);
 	if (!path)
-		return -1;
+		return ret_errno(ENOENT);
 
 	ret = stat(path, &st);
 	if (ret < 0)
-		return -1;
+		return -errno;
 
 	/* Check if the binary is setuid. */
 	if (st.st_mode & S_ISUID)
@@ -2690,42 +3560,57 @@
 	    lxc_file_cap_is_set(path, CAP_SETGID, CAP_EFFECTIVE) &&
 	    lxc_file_cap_is_set(path, CAP_SETGID, CAP_PERMITTED))
 		return log_debug(1, "The binary \"%s\" has CAP_SETGID in its CAP_EFFECTIVE and CAP_PERMITTED sets", path);
+
+	return 0;
 #else
-	/* If we cannot check for file capabilities we need to give the benefit
+	/*
+	 * If we cannot check for file capabilities we need to give the benefit
 	 * of the doubt. Otherwise we might fail even though all the necessary
 	 * file capabilities are set.
 	 */
 	DEBUG("Cannot check for file capabilities as full capability support is missing. Manual intervention needed");
-#endif
-
 	return 1;
+#endif
 }
 
-int lxc_map_ids_exec_wrapper(void *args)
+static int lxc_map_ids_exec_wrapper(void *args)
 {
 	execl("/bin/sh", "sh", "-c", (char *)args, (char *)NULL);
 	return -1;
 }
 
-int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
+static struct id_map *find_mapped_hostid_entry(const struct list_head *idmap,
+					       unsigned id, enum idtype idtype);
+
+int lxc_map_ids(struct list_head *idmap, pid_t pid)
 {
 	int fill, left;
+	uid_t hostuid;
+	gid_t hostgid;
 	char u_or_g;
 	char *pos;
 	char cmd_outputPATH_MAX;
 	struct id_map *map;
-	struct lxc_list *iterator;
 	enum idtype type;
 	int ret = 0, gidmap = 0, uidmap = 0;
 	char mapbufSTRLITERALLEN("new@idmap") + STRLITERALLEN(" ") +
 		    INTTYPE_TO_STRLEN(pid_t) + STRLITERALLEN(" ") +
 		    LXC_IDMAPLEN = {0};
-	bool had_entry = false, use_shadow = false;
-	int hostuid, hostgid;
+	bool had_entry = false, maps_host_root = false, use_shadow = false;
 
 	hostuid = geteuid();
 	hostgid = getegid();
 
+	/*
+	 * Check whether caller wants to map host root.
+	 * Due to a security fix newer kernels require CAP_SETFCAP when mapping
+	 * host root into the child userns as you would be able to write fscaps
+	 * that would be valid in the ancestor userns. Mapping host root should
+	 * rarely be the case but LXC is being clever in a bunch of cases.
+	 */
+	if (find_mapped_hostid_entry(idmap, 0, ID_TYPE_UID))
+		maps_host_root = true;
+
 	/* If new{g,u}idmap exists, that is, if shadow is handing out subuid
 	 * ranges, then insist that root also reserve ranges in subuid. This
 	 * will protected it by preventing another user from being handed the
@@ -2743,7 +3628,9 @@
 	else if (!gidmap)
 		WARN("newgidmap is lacking necessary privileges");
 
-	if (uidmap > 0 && gidmap > 0) {
+	if (maps_host_root) {
+		INFO("Caller maps host root. Writing mapping directly");
+	} else if (uidmap > 0 && gidmap > 0) {
 		DEBUG("Functional newuidmap and newgidmap binary found");
 		use_shadow = true;
 	} else {
@@ -2757,12 +3644,11 @@
 	}
 
 	/* Check if we really need to use newuidmap and newgidmap.
-	* If the user is only remapping his own {g,u}id, we don't need it.
+	* If the user is only remapping their own {g,u}id, we don't need it.
 	*/
-	if (use_shadow && lxc_list_len(idmap) == 2) {
+	if (use_shadow && list_len(map, idmap, head) == 2) {
 		use_shadow = false;
-		lxc_list_for_each(iterator, idmap) {
-			map = iterator->elem;
+		list_for_each_entry(map, idmap, head) {
 			if (map->idtype == ID_TYPE_UID && map->range == 1 &&
 			    map->nsid == hostuid && map->hostid == hostuid)
 				continue;
@@ -2781,15 +3667,14 @@
 		if (use_shadow)
 			pos += sprintf(mapbuf, "new%cidmap %d", u_or_g, pid);
 
-		lxc_list_for_each(iterator, idmap) {
-			map = iterator->elem;
+		list_for_each_entry(map, idmap, head) {
 			if (map->idtype != type)
 				continue;
 
 			had_entry = true;
 
 			left = LXC_IDMAPLEN - (pos - mapbuf);
-			fill = snprintf(pos, left, "%s%lu %lu %lu%s",
+			fill = strnprintf(pos, left, "%s%lu %lu %lu%s",
 					use_shadow ? " " : "", map->nsid,
 					map->hostid, map->range,
 					use_shadow ? "" : "\n");
@@ -2797,7 +3682,7 @@
 			 * The kernel only takes <= 4k for writes to
 			 * /proc/<pid>/{g,u}id_map
 			 */
-			if (fill <= 0 || fill >= left)
+			if (fill <= 0)
 				return log_error_errno(-1, errno, "Too many %cid mappings defined", u_or_g);
 
 			pos += fill;
@@ -2836,15 +3721,13 @@
 {
 	unsigned nsid;
 	struct id_map *map;
-	struct lxc_list *it;
 
 	if (idtype == ID_TYPE_UID)
 		nsid = (conf->root_nsuid_map != NULL) ? 0 : conf->init_uid;
 	else
 		nsid = (conf->root_nsgid_map != NULL) ? 0 : conf->init_gid;
 
-	lxc_list_for_each (it, &conf->id_map) {
-		map = it->elem;
+	list_for_each_entry (map, &conf->id_map, head) {
 		if (map->idtype != idtype)
 			continue;
 		if (map->nsid != nsid)
@@ -2861,10 +3744,8 @@
 int mapped_hostid(unsigned id, const struct lxc_conf *conf, enum idtype idtype)
 {
 	struct id_map *map;
-	struct lxc_list *it;
 
-	lxc_list_for_each (it, &conf->id_map) {
-		map = it->elem;
+	list_for_each_entry(map, &conf->id_map, head) {
 		if (map->idtype != idtype)
 			continue;
 
@@ -2878,12 +3759,10 @@
 int find_unmapped_nsid(const struct lxc_conf *conf, enum idtype idtype)
 {
 	struct id_map *map;
-	struct lxc_list *it;
 	unsigned int freeid = 0;
 
 again:
-	lxc_list_for_each (it, &conf->id_map) {
-		map = it->elem;
+	list_for_each_entry(map, &conf->id_map, head) {
 		if (map->idtype != idtype)
 			continue;
 
@@ -2896,19 +3775,88 @@
 	return freeid;
 }
 
+/*
+ * Mount a proc under @rootfs if proc self points to a pid other than
+ * my own.  This is needed to have a known-good proc mount for setting
+ * up LSMs both at container startup and attach.
+ *
+ * NOTE: not to be called from inside the container namespace!
+ */
+static int lxc_transient_proc(struct lxc_rootfs *rootfs)
+{
+	__do_close int fd_proc = -EBADF;
+	int link_to_pid, link_len, pid_self, ret;
+	char linkINTTYPE_TO_STRLEN(pid_t) + 1;
+
+	link_len = readlinkat(rootfs->dfd_mnt, "proc/self", link, sizeof(link));
+	if (link_len < 0) {
+		ret = mkdirat(rootfs->dfd_mnt, "proc", 0000);
+		if (ret < 0 && errno != EEXIST)
+			return log_error_errno(-errno, errno, "Failed to create %d(proc)", rootfs->dfd_mnt);
+
+		goto domount;
+	} else if ((size_t)link_len >= sizeof(link)) {
+		return log_error_errno(-EIO, EIO, "Truncated link target");
+	}
+	linklink_len = '\0';
+
+	pid_self = lxc_raw_getpid();
+	INFO("Caller's PID is %d; /proc/self points to %s", pid_self, link);
+
+	ret = lxc_safe_int(link, &link_to_pid);
+	if (ret)
+		return log_error_errno(-ret, ret, "Failed to parse %s", link);
+
+	/* Correct procfs is already mounted. */
+	if (link_to_pid == pid_self)
+		return log_trace(0, "Correct procfs instance mounted");
+
+	fd_proc = open_at(rootfs->dfd_mnt, "proc", PROTECT_OPATH_DIRECTORY,
+			  PROTECT_LOOKUP_BENEATH_XDEV, 0);
+	if (fd_proc < 0)
+		return log_error_errno(-errno, errno, "Failed to open transient procfs mountpoint");
+
+	ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "/proc/self/fd/%d", fd_proc);
+	if (ret < 0)
+		return ret_errno(EIO);
+
+	ret = umount2(rootfs->buf, MNT_DETACH);
+	if (ret < 0)
+		SYSWARN("Failed to umount \"%s\" with MNT_DETACH", rootfs->buf);
+
+domount:
+	/* rootfs is NULL */
+	if (!rootfs->path) {
+		ret = mount("proc", rootfs->buf, "proc", 0, NULL);
+	} else {
+		ret = safe_mount_beneath_at(rootfs->dfd_mnt, "none", "proc", "proc", 0, NULL);
+		if (ret < 0) {
+			ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/proc", rootfs->path ? rootfs->mount : "");
+			if (ret < 0)
+				return ret_errno(EIO);
+
+			ret = safe_mount("proc", rootfs->buf, "proc", 0, NULL, rootfs->mount);
+		}
+	}
+	if (ret < 0)
+		return log_error_errno(-1, errno, "Failed to mount temporary procfs");
+
+	INFO("Created transient procfs mount");
+	return 1;
+}
+
 /* NOTE: Must not be called from inside the container namespace! */
-int lxc_create_tmp_proc_mount(struct lxc_conf *conf)
+static int lxc_create_tmp_proc_mount(struct lxc_conf *conf)
 {
 	int mounted;
 
-	mounted = lxc_mount_proc_if_needed(conf->rootfs.path ? conf->rootfs.mount : "");
+	mounted = lxc_transient_proc(&conf->rootfs);
 	if (mounted == -1) {
-		SYSERROR("Failed to mount proc in the container");
 		/* continue only if there is no rootfs */
 		if (conf->rootfs.path)
-			return -1;
+			return log_error_errno(-EPERM, EPERM, "Failed to create transient procfs mount");
 	} else if (mounted == 1) {
-		conf->tmp_umount_proc = true;
+		conf->transient_procfs_mnt = true;
 	}
 
 	return 0;
@@ -2916,26 +3864,26 @@
 
 void tmp_proc_unmount(struct lxc_conf *lxc_conf)
 {
-	if (!lxc_conf->tmp_umount_proc)
-		return;
-
-	(void)umount2("/proc", MNT_DETACH);
-	lxc_conf->tmp_umount_proc = false;
+	if (lxc_conf->transient_procfs_mnt) {
+		(void)umount2("/proc", MNT_DETACH);
+		lxc_conf->transient_procfs_mnt = false;
+	}
 }
 
 /* Walk /proc/mounts and change any shared entries to dependent mounts. */
-void turn_into_dependent_mounts(void)
+static void turn_into_dependent_mounts(const struct lxc_rootfs *rootfs)
 {
 	__do_free char *line = NULL;
 	__do_fclose FILE *f = NULL;
 	__do_close int memfd = -EBADF, mntinfo_fd = -EBADF;
-	int ret;
-	ssize_t copied;
 	size_t len = 0;
+	ssize_t copied;
+	int ret;
 
-	mntinfo_fd = open("/proc/self/mountinfo", O_RDONLY | O_CLOEXEC);
+	mntinfo_fd = open_at(rootfs->dfd_host, "proc/self/mountinfo", PROTECT_OPEN,
+			     (PROTECT_LOOKUP_BENEATH_XDEV & ~RESOLVE_NO_SYMLINKS), 0);
 	if (mntinfo_fd < 0) {
-		SYSERROR("Failed to open \"/proc/self/mountinfo\"");
+		SYSERROR("Failed to open %d/proc/self/mountinfo", rootfs->dfd_host);
 		return;
 	}
 
@@ -2955,12 +3903,8 @@
 		}
 	}
 
-again:
-	copied = lxc_sendfile_nointr(memfd, mntinfo_fd, NULL, LXC_SENDFILE_MAX);
+	copied = fd_to_fd(mntinfo_fd, memfd);
 	if (copied < 0) {
-		if (errno == EINTR)
-			goto again;
-
 		SYSERROR("Failed to copy \"/proc/self/mountinfo\"");
 		return;
 	}
@@ -3004,63 +3948,10 @@
 			SYSERROR("Failed to recursively turn old root mount tree into dependent mount. Continuing...");
 			continue;
 		}
-		TRACE("Recursively turned old root mount tree into dependent mount");
 	}
 	TRACE("Turned all mount table entries into dependent mount");
 }
 
-static int lxc_execute_bind_init(struct lxc_handler *handler)
-{
-	int ret;
-	char *p;
-	char pathPATH_MAX, destpathPATH_MAX;
-	struct lxc_conf *conf = handler->conf;
-
-	/* If init exists in the container, don't bind mount a static one */
-	p = choose_init(conf->rootfs.mount);
-	if (p) {
-		__do_free char *old = p;
-
-		p = strdup(old + strlen(conf->rootfs.mount));
-		if (!p)
-			return -ENOMEM;
-
-		INFO("Found existing init at \"%s\"", p);
-		goto out;
-	}
-
-	ret = snprintf(path, PATH_MAX, SBINDIR "/init.lxc.static");
-	if (ret < 0 || ret >= PATH_MAX)
-		return -1;
-
-	if (!file_exists(path))
-		return log_error_errno(-1, errno, "The file \"%s\" does not exist on host", path);
-
-	ret = snprintf(destpath, PATH_MAX, "%s" P_tmpdir "%s", conf->rootfs.mount, "/.lxc-init");
-	if (ret < 0 || ret >= PATH_MAX)
-		return -1;
-
-	if (!file_exists(destpath)) {
-		ret = mknod(destpath, S_IFREG | 0000, 0);
-		if (ret < 0 && errno != EEXIST)
-			return log_error_errno(-1, errno, "Failed to create dummy \"%s\" file as bind mount target", destpath);
-	}
-
-	ret = safe_mount(path, destpath, "none", MS_BIND, NULL, conf->rootfs.mount);
-	if (ret < 0)
-		return log_error_errno(-1, errno, "Failed to bind mount lxc.init.static into container");
-
-	p = strdup(destpath + strlen(conf->rootfs.mount));
-	if (!p)
-		return -ENOMEM;
-
-	INFO("Bind mounted lxc.init.static into container at \"%s\"", path);
-out:
-	((struct execute_args *)handler->data)->init_fd = -1;
-	((struct execute_args *)handler->data)->init_path = p;
-	return 0;
-}
-
 /* This does the work of remounting / if it is shared, calling the container
  * pre-mount hooks, and mounting the rootfs.
  */
@@ -3069,26 +3960,35 @@
 {
 	int ret;
 
+	conf->rootfs.dfd_host = open_at(-EBADF, "/", PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE, 0);
+	if (conf->rootfs.dfd_host < 0)
+		return log_error_errno(-errno, errno, "Failed to open \"/\"");
+
+	turn_into_dependent_mounts(&conf->rootfs);
+
 	if (conf->rootfs_setup) {
 		const char *path = conf->rootfs.mount;
 
-		/* The rootfs was set up in another namespace. bind-mount it to
+		/*
+		 * The rootfs was set up in another namespace. bind-mount it to
 		 * give us a mount in our own ns so we can pivot_root to it
 		 */
 		ret = mount(path, path, "rootfs", MS_BIND, NULL);
 		if (ret < 0)
 			return log_error(-1, "Failed to bind mount container / onto itself");
 
+		conf->rootfs.dfd_mnt = openat(-EBADF, path, O_RDONLY | O_CLOEXEC | O_DIRECTORY | O_PATH | O_NOCTTY);
+		if (conf->rootfs.dfd_mnt < 0)
+			return log_error_errno(-errno, errno, "Failed to open file descriptor for container rootfs");
+
 		return log_trace(0, "Bind mounted container / onto itself");
 	}
 
-	turn_into_dependent_mounts();
-
 	ret = run_lxc_hooks(name, "pre-mount", conf, NULL);
 	if (ret < 0)
 		return log_error(-1, "Failed to run pre-mount hooks");
 
-	ret = lxc_mount_rootfs(conf);
+	ret = lxc_mount_rootfs(&conf->rootfs);
 	if (ret < 0)
 		return log_error(-1, "Failed to setup rootfs for");
 
@@ -3099,16 +3999,16 @@
 static bool verify_start_hooks(struct lxc_conf *conf)
 {
 	char pathPATH_MAX;
-	struct lxc_list *it;
+	struct string_entry *hook;
 
-	lxc_list_for_each (it, &conf->hooksLXCHOOK_START) {
+	list_for_each_entry(hook, &conf->hooksLXCHOOK_START, head) {
 		int ret;
-		char *hookname = it->elem;
+		char *hookname = hook->val;
 
-		ret = snprintf(path, PATH_MAX, "%s%s",
+		ret = strnprintf(path, sizeof(path), "%s%s",
 			       conf->rootfs.path ? conf->rootfs.mount : "",
 			       hookname);
-		if (ret < 0 || ret >= PATH_MAX)
+		if (ret < 0)
 			return false;
 
 		ret = access(path, X_OK);
@@ -3121,15 +4021,6 @@
 	return true;
 }
 
-static bool execveat_supported(void)
-{
-	execveat(-1, "", NULL, NULL, AT_EMPTY_PATH);
-	if (errno == ENOSYS)
-		return false;
-
-	return true;
-}
-
 static int lxc_setup_boot_id(void)
 {
 	int ret;
@@ -3180,13 +4071,297 @@
 	return 0;
 }
 
+static int lxc_setup_keyring(struct lsm_ops *lsm_ops, const struct lxc_conf *conf)
+{
+	key_serial_t keyring;
+	int ret = 0;
+
+	if (conf->lsm_se_keyring_context)
+		ret = lsm_ops->keyring_label_set(lsm_ops, conf->lsm_se_keyring_context);
+	else if (conf->lsm_se_context)
+		ret = lsm_ops->keyring_label_set(lsm_ops, conf->lsm_se_context);
+	if (ret < 0)
+		return syserror("Failed to set keyring context");
+
+	/*
+	 * Try to allocate a new session keyring for the container to prevent
+	 * information leaks.
+	 */
+	keyring = keyctl(KEYCTL_JOIN_SESSION_KEYRING, prctl_arg(0),
+			 prctl_arg(0), prctl_arg(0), prctl_arg(0));
+	if (keyring < 0) {
+		switch (errno) {
+		case ENOSYS:
+			DEBUG("The keyctl() syscall is not supported or blocked");
+			break;
+		case EACCES:
+			__fallthrough;
+		case EPERM:
+			DEBUG("Failed to access kernel keyring. Continuing...");
+			break;
+		default:
+			SYSWARN("Failed to create kernel keyring");
+			break;
+		}
+	}
+
+	return ret;
+}
+
+static int lxc_rootfs_prepare_child(struct lxc_handler *handler)
+{
+	struct lxc_rootfs *rootfs = &handler->conf->rootfs;
+	int dfd_idmapped = -EBADF;
+	int ret;
+
+	if (list_empty(&handler->conf->id_map))
+		return 0;
+
+	if (is_empty_string(rootfs->mnt_opts.userns_path))
+		return 0;
+
+	if (handler->conf->rootfs_setup)
+		return 0;
+
+	ret = lxc_abstract_unix_recv_one_fd(handler->data_sock1, &dfd_idmapped, NULL, 0);
+	if (ret < 0)
+		return syserror("Failed to receive idmapped mount fd");
+
+	rootfs->dfd_idmapped = dfd_idmapped;
+	TRACE("Received detached idmapped mount %d", rootfs->dfd_idmapped);
+	return 0;
+}
+
+int lxc_idmapped_mounts_parent(struct lxc_handler *handler)
+{
+	int mnt_seq = 0;
+
+	for (;;) {
+		__do_close int fd_from = -EBADF, fd_userns = -EBADF;
+		struct mount_attr attr = {};
+		struct lxc_mount_options opts = {};
+		ssize_t ret;
+
+		ret = __lxc_abstract_unix_recv_two_fds(handler->data_sock1,
+						       &fd_from, &fd_userns,
+						       &opts, sizeof(opts));
+		if (ret < 0)
+			return syserror("Failed to receive idmapped mount file descriptors from child");
+
+		if (fd_from < 0 || fd_userns < 0)
+			return log_trace(0, "Finished receiving idmapped mount file descriptors (%d | %d) from child", fd_from, fd_userns);
+
+		attr.attr_set	= MOUNT_ATTR_IDMAP;
+		attr.userns_fd	= fd_userns;
+		ret = mount_setattr(fd_from, "",
+				    AT_EMPTY_PATH |
+				    (opts.bind_recursively ? AT_RECURSIVE : 0),
+				    &attr, sizeof(attr));
+		if (ret)
+			return syserror("Failed to idmap detached %smount %d to %d",
+					opts.bind_recursively ? "recursive " : "",
+					fd_from, fd_userns);
+
+		ret = lxc_abstract_unix_send_credential(handler->data_sock1,
+							&mnt_seq,
+							sizeof(mnt_seq));
+		if (ret < 0)
+			return syserror("Parent failed to notify child that detached %smount %d was idmapped to user namespace %d",
+					opts.bind_recursively ? "recursive " : "",
+					fd_from, fd_userns);
+
+		TRACE("Parent idmapped detached %smount %d to user namespace %d",
+		      opts.bind_recursively ? "recursive " : "", fd_from, fd_userns);
+		mnt_seq++;
+	}
+}
+
+static int lxc_recv_ttys_from_child(struct lxc_handler *handler)
+{
+	call_cleaner(lxc_delete_tty) struct lxc_tty_info *info_new = &(struct lxc_tty_info){};
+	int sock = handler->data_sock1;
+	struct lxc_conf *conf = handler->conf;
+	struct lxc_tty_info *tty_info = &conf->ttys;
+	size_t ttys_max = tty_info->max;
+	struct lxc_terminal_info *terminal_info;
+	int ret;
+
+	if (!ttys_max)
+		return 0;
+
+	info_new->tty = malloc(sizeof(*(info_new->tty)) * ttys_max);
+	if (!info_new->tty)
+		return ret_errno(ENOMEM);
+
+	for (size_t i = 0; i < ttys_max; i++) {
+		terminal_info = &info_new->ttyi;
+		terminal_info->busy = -1;
+		terminal_info->pty_nr = -1;
+		terminal_info->ptx = -EBADF;
+		terminal_info->pty = -EBADF;
+	}
+
+	for (size_t i = 0; i < ttys_max; i++) {
+		int ptx = -EBADF, pty = -EBADF;
+
+		ret = lxc_abstract_unix_recv_two_fds(sock, &ptx, &pty);
+		if (ret < 0)
+			return syserror("Failed to receive %zu ttys from child", ttys_max);
+
+		terminal_info = &info_new->ttyi;
+		terminal_info->ptx = ptx;
+		terminal_info->pty = pty;
+		TRACE("Received pty with ptx fd %d and pty fd %d from child",
+		      terminal_info->ptx, terminal_info->pty);
+	}
+
+	tty_info->tty = move_ptr(info_new->tty);
+	TRACE("Received %zu ttys from child", ttys_max);
+	return 0;
+}
+
+static int lxc_send_console_to_parent(struct lxc_handler *handler)
+{
+	struct lxc_terminal *console = &handler->conf->console;
+	int ret;
+
+	if (!wants_console(console))
+		return 0;
+
+	/* We've already allocated a console from the host's devpts instance. */
+	if (console->pty < 0)
+		return 0;
+
+	ret = __lxc_abstract_unix_send_two_fds(handler->data_sock0,
+					       console->ptx, console->pty,
+					       console,
+					       sizeof(struct lxc_terminal));
+	if (ret < 0)
+		return syserror("Fail to send console to parent");
+
+	TRACE("Sent console to parent");
+	return 0;
+}
+
+static int lxc_recv_console_from_child(struct lxc_handler *handler)
+{
+	__do_close int fd_ptx = -EBADF, fd_pty = -EBADF;
+	struct lxc_terminal *console = &handler->conf->console;
+	int ret;
+
+	if (!wants_console(console))
+		return 0;
+
+	/* We've already allocated a console from the host's devpts instance. */
+	if (console->pty >= 0)
+		return 0;
+
+	ret = __lxc_abstract_unix_recv_two_fds(handler->data_sock1,
+					       &fd_ptx, &fd_pty,
+					       console,
+					       sizeof(struct lxc_terminal));
+	if (ret < 0)
+		return syserror("Fail to receive console from child");
+
+	console->ptx = move_fd(fd_ptx);
+	console->pty = move_fd(fd_pty);
+
+	TRACE("Received console from child");
+	return 0;
+}
+
+int lxc_sync_fds_parent(struct lxc_handler *handler)
+{
+	int ret;
+
+	ret = lxc_seccomp_recv_notifier_fd(&handler->conf->seccomp, handler->data_sock1);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to receive seccomp notify fd from child");
+
+	ret = lxc_recv_devpts_from_child(handler);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to receive devpts fd from child");
+
+	/* Read tty fds allocated by child. */
+	ret = lxc_recv_ttys_from_child(handler);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to receive tty info from child process");
+
+	if (handler->ns_clone_flags & CLONE_NEWNET) {
+		ret = lxc_network_recv_name_and_ifindex_from_child(handler);
+		if (ret < 0)
+			return syserror_ret(ret, "Failed to receive names and ifindices for network devices from child");
+	}
+
+	ret = lxc_recv_console_from_child(handler);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to receive console from child");
+
+	TRACE("Finished syncing file descriptors with child");
+	return 0;
+}
+
+int lxc_sync_fds_child(struct lxc_handler *handler)
+{
+	int ret;
+
+	ret = lxc_seccomp_send_notifier_fd(&handler->conf->seccomp, handler->data_sock0);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to send seccomp notify fd to parent");
+
+	ret = lxc_send_devpts_to_parent(handler);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to send seccomp devpts fd to parent");
+
+	ret = lxc_send_ttys_to_parent(handler);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to send tty file descriptors to parent");
+
+	if (handler->ns_clone_flags & CLONE_NEWNET) {
+		ret = lxc_network_send_name_and_ifindex_to_parent(handler);
+		if (ret < 0)
+			return syserror_ret(ret, "Failed to send network device names and ifindices to parent");
+	}
+
+	ret = lxc_send_console_to_parent(handler);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to send console to parent");
+
+	TRACE("Finished syncing file descriptors with parent");
+	return 0;
+}
+
+static int setup_capabilities(struct lxc_conf *conf)
+{
+	int ret;
+
+	if (conf->caps.keep)
+		ret = capabilities_allow(conf);
+	else
+		ret = capabilities_deny(conf);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to %s capabilities", conf->caps.keep ? "allow" : "deny");
+
+	return 0;
+}
+
+static int make_shmount_dependent_mount(const struct lxc_conf *conf)
+{
+	if (!(conf->auto_mounts & LXC_AUTO_SHMOUNTS_MASK))
+		return 0;
+
+	return mount(NULL, conf->shmount.path_cont, NULL, MS_REC | MS_SLAVE, 0);
+}
+
 int lxc_setup(struct lxc_handler *handler)
 {
-	__do_close int pts_mnt_fd = -EBADF;
 	int ret;
 	const char *lxcpath = handler->lxcpath, *name = handler->name;
 	struct lxc_conf *lxc_conf = handler->conf;
-	char *keyring_context = NULL;
+
+	ret = lxc_rootfs_prepare_child(handler);
+	if (ret < 0)
+		return syserror("Failed to prepare rootfs");
 
 	ret = lxc_setup_rootfs_prepare_root(lxc_conf, name, lxcpath);
 	if (ret < 0)
@@ -3199,37 +4374,19 @@
 	}
 
 	if (!lxc_conf->keyring_disable_session) {
-		if (lxc_conf->lsm_se_keyring_context) {
-			keyring_context = lxc_conf->lsm_se_keyring_context;
-		} else if (lxc_conf->lsm_se_context) {
-			keyring_context = lxc_conf->lsm_se_context;
-		}
-
-		ret = lxc_setup_keyring(keyring_context);
+		ret = lxc_setup_keyring(handler->lsm_ops, lxc_conf);
 		if (ret < 0)
-			return -1;
+			return log_error(-1, "Failed to setup container keyring");
 	}
 
 	if (handler->ns_clone_flags & CLONE_NEWNET) {
-		ret = lxc_setup_network_in_child_namespaces(lxc_conf,
-							    &lxc_conf->network);
+		ret = lxc_network_recv_from_parent(handler);
 		if (ret < 0)
-			return log_error(-1, "Failed to setup network");
+			return log_error(-1, "Failed to receive veth names from parent");
 
-		ret = lxc_network_send_name_and_ifindex_to_parent(handler);
+		ret = lxc_setup_network_in_child_namespaces(lxc_conf);
 		if (ret < 0)
-			return log_error(-1, "Failed to send network device names and ifindices to parent");
-	}
-
-	if (wants_console(&lxc_conf->console)) {
-		pts_mnt_fd = open_tree(-EBADF, lxc_conf->console.name,
-				       OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC | AT_EMPTY_PATH);
-		if (pts_mnt_fd < 0)
-			SYSTRACE("Failed to create detached mount for container's console \"%s\"",
-				 lxc_conf->console.name);
-		else
-			TRACE("Created detached mount for container's console \"%s\"",
-			      lxc_conf->console.name);
+			return log_error(-1, "Failed to setup network");
 	}
 
 	if (lxc_conf->autodev > 0) {
@@ -3241,48 +4398,37 @@
 	/* Do automatic mounts (mainly /proc and /sys), but exclude those that
 	 * need to wait until other stuff has finished.
 	 */
-	ret = lxc_mount_auto_mounts(lxc_conf, lxc_conf->auto_mounts & ~LXC_AUTO_CGROUP_MASK, handler);
+	ret = lxc_mount_auto_mounts(handler, lxc_conf->auto_mounts & ~LXC_AUTO_CGROUP_MASK);
 	if (ret < 0)
 		return log_error(-1, "Failed to setup first automatic mounts");
 
-	ret = setup_mount(lxc_conf, &lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath);
+	ret = setup_mount_fstab(&lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath);
 	if (ret < 0)
 		return log_error(-1, "Failed to setup mounts");
 
-	if (!lxc_list_empty(&lxc_conf->mount_list)) {
-		ret = setup_mount_entries(lxc_conf, &lxc_conf->rootfs,
-					  &lxc_conf->mount_list, name, lxcpath);
+	if (!list_empty(&lxc_conf->mount_entries)) {
+		ret = setup_mount_entries(lxc_conf, &lxc_conf->rootfs, name, lxcpath);
 		if (ret < 0)
 			return log_error(-1, "Failed to setup mount entries");
 	}
 
-	if (lxc_conf->is_execute) {
-		if (execveat_supported()) {
-			int fd;
-			char pathPATH_MAX;
+	if (!lxc_sync_wake_parent(handler, START_SYNC_IDMAPPED_MOUNTS))
+		return -1;
 
-			ret = snprintf(path, PATH_MAX, SBINDIR "/init.lxc.static");
-			if (ret < 0 || ret >= PATH_MAX)
-				return log_error(-1, "Path to init.lxc.static too long");
-
-			fd = open(path, O_PATH | O_CLOEXEC);
-			if (fd < 0)
-				return log_error_errno(-1, errno, "Unable to open lxc.init.static");
+	ret = lxc_idmapped_mounts_child(handler);
+	if (ret)
+		return syserror("Failed to attached detached idmapped mounts");
 
-			((struct execute_args *)handler->data)->init_fd = fd;
-			((struct execute_args *)handler->data)->init_path = NULL;
-		} else {
-			ret = lxc_execute_bind_init(handler);
-			if (ret < 0)
-				return log_error(-1, "Failed to bind-mount the lxc init system");
-		}
-	}
+	lxc_conf->rootfs.dfd_dev = open_at(lxc_conf->rootfs.dfd_mnt, "dev",
+					   PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
+	if (lxc_conf->rootfs.dfd_dev < 0 && errno != ENOENT)
+		return log_error_errno(-errno, errno, "Failed to open \"/dev\"");
 
 	/* Now mount only cgroups, if wanted. Before, /sys could not have been
 	 * mounted. It is guaranteed to be mounted now either through
 	 * automatically or via fstab entries.
 	 */
-	ret = lxc_mount_auto_mounts(lxc_conf, lxc_conf->auto_mounts & LXC_AUTO_CGROUP_MASK, handler);
+	ret = lxc_mount_auto_mounts(handler, lxc_conf->auto_mounts & LXC_AUTO_CGROUP_MASK);
 	if (ret < 0)
 		return log_error(-1, "Failed to setup remaining automatic mounts");
 
@@ -3290,6 +4436,9 @@
 	if (ret < 0)
 		return log_error(-1, "Failed to run mount hooks");
 
+	if (lxc_rootfs_overmounted(&lxc_conf->rootfs))
+		return log_error(-1, "Rootfs overmounted");
+
 	if (lxc_conf->autodev > 0) {
 		ret = run_lxc_hooks(name, "autodev", lxc_conf, NULL);
 		if (ret < 0)
@@ -3306,13 +4455,25 @@
 
 	ret = lxc_create_tmp_proc_mount(lxc_conf);
 	if (ret < 0)
-		return log_error(-1, "Failed to \"/proc\" LSMs");
+		return log_error(-1, "Failed to mount transient procfs instance for LSMs");
+
+	ret = lxc_setup_devpts_child(handler);
+	if (ret < 0)
+		return log_error(-1, "Failed to prepare new devpts instance");
 
-	ret = lxc_setup_console(&lxc_conf->rootfs, &lxc_conf->console,
-				lxc_conf->ttys.dir, pts_mnt_fd);
+	ret = lxc_finish_devpts_child(handler);
+	if (ret < 0)
+		return log_error(-1, "Failed to finish devpts setup");
+
+	ret = lxc_setup_console(handler, &lxc_conf->rootfs, &lxc_conf->console,
+				lxc_conf->ttys.dir);
 	if (ret < 0)
 		return log_error(-1, "Failed to setup console");
 
+	ret = lxc_create_ttys(handler);
+	if (ret < 0)
+		return log_error(-1, "Failed to create ttys");
+
 	ret = lxc_setup_dev_symlinks(&lxc_conf->rootfs);
 	if (ret < 0)
 		return log_error(-1, "Failed to setup \"/dev\" symlinks");
@@ -3321,42 +4482,32 @@
 	if (ret < 0)
 		return log_error(-1, "Failed to pivot root into rootfs");
 
+	ret = make_shmount_dependent_mount(lxc_conf);
+	if (ret < 0)
+		return log_error(-1, "Failed to turn mount tunnel \"%s\" into dependent mount",
+				 lxc_conf->shmount.path_cont);
+
 	/* Setting the boot-id is best-effort for now. */
 	if (lxc_conf->autodev > 0)
 		(void)lxc_setup_boot_id();
 
-	ret = lxc_setup_devpts(lxc_conf);
-	if (ret < 0)
-		return log_error(-1, "Failed to setup new devpts instance");
-
-	ret = lxc_create_ttys(handler);
-	if (ret < 0)
-		return -1;
-
 	ret = setup_personality(lxc_conf->personality);
 	if (ret < 0)
-		return log_error(-1, "Failed to set personality");
+		return syserror("Failed to set personality");
 
 	/* Set sysctl value to a path under /proc/sys as determined from the
 	 * key. For e.g. net.ipv4.ip_forward translated to
 	 * /proc/sys/net/ipv4/ip_forward.
 	 */
-	if (!lxc_list_empty(&lxc_conf->sysctls)) {
-		ret = setup_sysctl_parameters(&lxc_conf->sysctls);
-		if (ret < 0)
-			return log_error(-1, "Failed to setup sysctl parameters");
-	}
-
-	if (!lxc_list_empty(&lxc_conf->keepcaps)) {
-		if (!lxc_list_empty(&lxc_conf->caps))
-			return log_error(-1, "Container requests lxc.cap.drop and lxc.cap.keep: either use lxc.cap.drop or lxc.cap.keep, not both");
+	ret = setup_sysctl_parameters(lxc_conf);
+	if (ret < 0)
+		return log_error(-1, "Failed to setup sysctl parameters");
 
-		if (dropcaps_except(&lxc_conf->keepcaps))
-			return log_error(-1, "Failed to keep capabilities");
-	} else if (setup_caps(&lxc_conf->caps)) {
-		return log_error(-1, "Failed to drop capabilities");
-	}
+	ret = setup_capabilities(lxc_conf);
+	if (ret < 0)
+		return log_error(-1, "Failed to setup capabilities");
 
+	put_lxc_rootfs(&handler->conf->rootfs, true);
 	NOTICE("The container \"%s\" is set up", name);
 
 	return 0;
@@ -3365,20 +4516,20 @@
 int run_lxc_hooks(const char *name, char *hookname, struct lxc_conf *conf,
 		  char *argv)
 {
-	struct lxc_list *it;
 	int which;
+	struct string_entry *entry;
 
 	for (which = 0; which < NUM_LXC_HOOKS; which ++) {
-		if (strcmp(hookname, lxchook_nameswhich) == 0)
+		if (strequal(hookname, lxchook_nameswhich))
 			break;
 	}
 
 	if (which >= NUM_LXC_HOOKS)
 		return -1;
 
-	lxc_list_for_each (it, &conf->hookswhich) {
+	list_for_each_entry(entry, &conf->hookswhich, head) {
 		int ret;
-		char *hook = it->elem;
+		char *hook = entry->val;
 
 		ret = run_script_argv(name, conf->hooks_version, "lxc", hook,
 				      hookname, argv);
@@ -3391,239 +4542,231 @@
 
 int lxc_clear_config_caps(struct lxc_conf *c)
 {
-	struct lxc_list *it, *next;
+	struct cap_entry *cap, *ncap;
 
-	lxc_list_for_each_safe (it, &c->caps, next) {
-		lxc_list_del(it);
-		free(it->elem);
-		free(it);
+	list_for_each_entry_safe(cap, ncap, &c->caps.list, head) {
+		list_del(&cap->head);
+		free(cap->cap_name);
+		free(cap);
 	}
 
+	c->caps.keep = false;
+	INIT_LIST_HEAD(&c->caps.list);
 	return 0;
 }
 
-static int lxc_free_idmap(struct lxc_list *id_map)
+static int lxc_free_idmap(struct list_head *id_map)
 {
-	struct lxc_list *it, *next;
+	struct id_map *map, *nmap;
 
-	lxc_list_for_each_safe(it, id_map, next) {
-		lxc_list_del(it);
-		free(it->elem);
-		free(it);
+	list_for_each_entry_safe(map, nmap, id_map, head) {
+		list_del(&map->head);
+		free(map);
 	}
 
+	INIT_LIST_HEAD(id_map);
 	return 0;
 }
-define_cleanup_function(struct lxc_list *, lxc_free_idmap);
 
-int lxc_clear_idmaps(struct lxc_conf *c)
+static int __lxc_free_idmap(struct list_head *id_map)
 {
-	return lxc_free_idmap(&c->id_map);
+	lxc_free_idmap(id_map);
+	return 0;
 }
+define_cleanup_function(struct list_head *, __lxc_free_idmap);
 
-int lxc_clear_config_keepcaps(struct lxc_conf *c)
+int lxc_clear_idmaps(struct lxc_conf *c)
 {
-	struct lxc_list *it, *next;
-
-	lxc_list_for_each_safe (it, &c->keepcaps, next) {
-		lxc_list_del(it);
-		free(it->elem);
-		free(it);
-	}
-
-	return 0;
+	return lxc_free_idmap(&c->id_map);
 }
 
 int lxc_clear_namespace(struct lxc_conf *c)
 {
-	int i;
-	for (i = 0; i < LXC_NS_MAX; i++) {
-		free(c->ns_sharei);
-		c->ns_sharei = NULL;
-	}
+	for (int i = 0; i < LXC_NS_MAX; i++)
+		free_disarm(c->ns_sharei);
+
 	return 0;
 }
 
 int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version)
 {
-	char *global_token, *namespaced_token;
-	size_t namespaced_token_len;
-	struct lxc_list *it, *next, *list;
 	const char *k = key;
 	bool all = false;
+	char *global_token, *namespaced_token;
+	size_t namespaced_token_len;
+	struct list_head *list;
+	struct lxc_cgroup *cgroup, *ncgroup;
 
 	if (version == CGROUP2_SUPER_MAGIC) {
-		global_token = "lxc.cgroup2";
-		namespaced_token = "lxc.cgroup2.";
-		namespaced_token_len = STRLITERALLEN("lxc.cgroup2.");
+		global_token		= "lxc.cgroup2";
+		namespaced_token	= "lxc.cgroup2.";
+		namespaced_token_len	= STRLITERALLEN("lxc.cgroup2.");
 		list = &c->cgroup2;
 	} else if (version == CGROUP_SUPER_MAGIC) {
-		global_token = "lxc.cgroup";
-		namespaced_token = "lxc.cgroup.";
-		namespaced_token_len = STRLITERALLEN("lxc.cgroup.");
+		global_token		= "lxc.cgroup";
+		namespaced_token	= "lxc.cgroup.";
+		namespaced_token_len	= STRLITERALLEN("lxc.cgroup.");
 		list = &c->cgroup;
 	} else {
-		return -EINVAL;
+		return ret_errno(EINVAL);
 	}
 
-	if (strcmp(key, global_token) == 0)
+	if (strequal(key, global_token))
 		all = true;
-	else if (strncmp(key, namespaced_token, namespaced_token_len) == 0)
+	else if (strnequal(key, namespaced_token, namespaced_token_len))
 		k += namespaced_token_len;
 	else
-		return -EINVAL;
-
-	lxc_list_for_each_safe (it, list, next) {
-		struct lxc_cgroup *cg = it->elem;
+		return ret_errno(EINVAL);
 
-		if (!all && strcmp(cg->subsystem, k) != 0)
+	list_for_each_entry_safe(cgroup, ncgroup, list, head) {
+		if (!all && !strequal(cgroup->subsystem, k))
 			continue;
 
-		lxc_list_del(it);
-		free(cg->subsystem);
-		free(cg->value);
-		free(cg);
-		free(it);
+		list_del(&cgroup->head);
+		free(cgroup->subsystem);
+		free(cgroup->value);
+		free(cgroup);
 	}
 
+	if (all)
+		INIT_LIST_HEAD(list);
+
 	return 0;
 }
 
-static void lxc_clear_devices(struct lxc_conf *conf)
+static inline void lxc_clear_cgroups_devices(struct lxc_conf *conf)
 {
-	struct lxc_list *list = &conf->devices;
-	struct lxc_list *it, *next;
-
-	lxc_list_for_each_safe(it, list, next) {
-		lxc_list_del(it);
-		free(it);
-	}
+	lxc_clear_cgroup2_devices(&conf->bpf_devices);
 }
 
 int lxc_clear_limits(struct lxc_conf *c, const char *key)
 {
-	struct lxc_list *it, *next;
 	const char *k = NULL;
 	bool all = false;
+	struct lxc_limit *lim, *nlim;
 
-	if (strcmp(key, "lxc.limit") == 0 || strcmp(key, "lxc.prlimit") == 0)
+	if (strequal(key, "lxc.limit") || strequal(key, "lxc.prlimit"))
 		all = true;
-	else if (strncmp(key, "lxc.limit.", STRLITERALLEN("lxc.limit.")) == 0)
+	else if (strnequal(key, "lxc.limit.", STRLITERALLEN("lxc.limit.")))
 		k = key + STRLITERALLEN("lxc.limit.");
-	else if (strncmp(key, "lxc.prlimit.", STRLITERALLEN("lxc.prlimit.")) == 0)
+	else if (strnequal(key, "lxc.prlimit.", STRLITERALLEN("lxc.prlimit.")))
 		k = key + STRLITERALLEN("lxc.prlimit.");
 	else
-		return -1;
-
-	lxc_list_for_each_safe (it, &c->limits, next) {
-		struct lxc_limit *lim = it->elem;
+		return ret_errno(EINVAL);
 
-		if (!all && strcmp(lim->resource, k) != 0)
+	list_for_each_entry_safe(lim, nlim, &c->limits, head) {
+		if (!all && !strequal(lim->resource, k))
 			continue;
 
-		lxc_list_del(it);
-		free(lim->resource);
+		list_del(&lim->head);
+		free_disarm(lim->resource);
 		free(lim);
-		free(it);
 	}
 
+	if (all)
+		INIT_LIST_HEAD(&c->limits);
+
 	return 0;
 }
 
 int lxc_clear_sysctls(struct lxc_conf *c, const char *key)
 {
-	struct lxc_list *it, *next;
 	const char *k = NULL;
 	bool all = false;
+	struct lxc_sysctl *sysctl, *nsysctl;
 
-	if (strcmp(key, "lxc.sysctl") == 0)
+	if (strequal(key, "lxc.sysctl"))
 		all = true;
-	else if (strncmp(key, "lxc.sysctl.", STRLITERALLEN("lxc.sysctl.")) == 0)
+	else if (strnequal(key, "lxc.sysctl.", STRLITERALLEN("lxc.sysctl.")))
 		k = key + STRLITERALLEN("lxc.sysctl.");
 	else
 		return -1;
 
-	lxc_list_for_each_safe (it, &c->sysctls, next) {
-		struct lxc_sysctl *elem = it->elem;
-
-		if (!all && strcmp(elem->key, k) != 0)
+	list_for_each_entry_safe(sysctl, nsysctl, &c->sysctls, head) {
+		if (!all && !strequal(sysctl->key, k))
 			continue;
 
-		lxc_list_del(it);
-		free(elem->key);
-		free(elem->value);
-		free(elem);
-		free(it);
+		list_del(&sysctl->head);
+		free(sysctl->key);
+		free(sysctl->value);
+		free(sysctl);
 	}
 
+	if (all)
+		INIT_LIST_HEAD(&c->sysctls);
+
 	return 0;
 }
 
 int lxc_clear_procs(struct lxc_conf *c, const char *key)
 {
-	struct lxc_list *it, *next;
 	const char *k = NULL;
 	bool all = false;
+	struct lxc_proc *proc, *nproc;
 
-	if (strcmp(key, "lxc.proc") == 0)
+	if (strequal(key, "lxc.proc"))
 		all = true;
-	else if (strncmp(key, "lxc.proc.", STRLITERALLEN("lxc.proc.")) == 0)
+	else if (strnequal(key, "lxc.proc.", STRLITERALLEN("lxc.proc.")))
 		k = key + STRLITERALLEN("lxc.proc.");
 	else
 		return -1;
 
-	lxc_list_for_each_safe (it, &c->procs, next) {
-		struct lxc_proc *proc = it->elem;
-
-		if (!all && strcmp(proc->filename, k) != 0)
+	list_for_each_entry_safe(proc, nproc, &c->procs, head) {
+		if (!all && !strequal(proc->filename, k))
 			continue;
 
-		lxc_list_del(it);
+		list_del(&proc->head);
 		free(proc->filename);
 		free(proc->value);
 		free(proc);
-		free(it);
 	}
 
+	if (all)
+		INIT_LIST_HEAD(&c->procs);
+
 	return 0;
 }
 
 int lxc_clear_groups(struct lxc_conf *c)
 {
-	struct lxc_list *it, *next;
+	struct string_entry *entry, *nentry;
 
-	lxc_list_for_each_safe (it, &c->groups, next) {
-		lxc_list_del(it);
-		free(it->elem);
-		free(it);
+	list_for_each_entry_safe(entry, nentry, &c->groups, head) {
+		list_del(&entry->head);
+		free(entry->val);
+		free(entry);
 	}
 
+	INIT_LIST_HEAD(&c->groups);
 	return 0;
 }
 
 int lxc_clear_environment(struct lxc_conf *c)
 {
-	struct lxc_list *it, *next;
+	struct environment_entry *env, *nenv;
 
-	lxc_list_for_each_safe (it, &c->environment, next) {
-		lxc_list_del(it);
-		free(it->elem);
-		free(it);
+	list_for_each_entry_safe(env, nenv, &c->environment, head) {
+		list_del(&env->head);
+		free(env->key);
+		free(env->val);
+		free(env);
 	}
 
+	INIT_LIST_HEAD(&c->environment);
 	return 0;
 }
 
 int lxc_clear_mount_entries(struct lxc_conf *c)
 {
-	struct lxc_list *it, *next;
+	struct string_entry *entry, *nentry;
 
-	lxc_list_for_each_safe (it, &c->mount_list, next) {
-		lxc_list_del(it);
-		free(it->elem);
-		free(it);
+	list_for_each_entry_safe(entry, nentry, &c->mount_entries, head) {
+		list_del(&entry->head);
+		free(entry->val);
+		free(entry);
 	}
 
+	INIT_LIST_HEAD(&c->mount_entries);
 	return 0;
 }
 
@@ -3635,26 +4778,25 @@
 
 int lxc_clear_hooks(struct lxc_conf *c, const char *key)
 {
-	int i;
-	struct lxc_list *it, *next;
 	const char *k = NULL;
 	bool all = false, done = false;
+	struct string_entry *entry, *nentry;
 
-	if (strcmp(key, "lxc.hook") == 0)
+	if (strequal(key, "lxc.hook"))
 		all = true;
-	else if (strncmp(key, "lxc.hook.", STRLITERALLEN("lxc.hook.")) == 0)
+	else if (strnequal(key, "lxc.hook.", STRLITERALLEN("lxc.hook.")))
 		k = key + STRLITERALLEN("lxc.hook.");
 	else
 		return -1;
 
-	for (i = 0; i < NUM_LXC_HOOKS; i++) {
-		if (all || strcmp(k, lxchook_namesi) == 0) {
-			lxc_list_for_each_safe (it, &c->hooksi, next) {
-				lxc_list_del(it);
-				free(it->elem);
-				free(it);
+	for (int i = 0; i < NUM_LXC_HOOKS; i++) {
+		if (all || strequal(k, lxchook_namesi)) {
+			list_for_each_entry_safe(entry, nentry, &c->hooksi, head) {
+				list_del(&entry->head);
+				free(entry->val);
+				free(entry);
 			}
-
+			INIT_LIST_HEAD(&c->hooksi);
 			done = true;
 		}
 	}
@@ -3665,38 +4807,17 @@
 	return 0;
 }
 
-static inline void lxc_clear_aliens(struct lxc_conf *conf)
-{
-	struct lxc_list *it, *next;
-
-	lxc_list_for_each_safe (it, &conf->aliens, next) {
-		lxc_list_del(it);
-		free(it->elem);
-		free(it);
-	}
-}
-
-void lxc_clear_includes(struct lxc_conf *conf)
-{
-	struct lxc_list *it, *next;
-
-	lxc_list_for_each_safe (it, &conf->includes, next) {
-		lxc_list_del(it);
-		free(it->elem);
-		free(it);
-	}
-}
-
 int lxc_clear_apparmor_raw(struct lxc_conf *c)
 {
-	struct lxc_list *it, *next;
+	struct string_entry *entry, *nentry;
 
-	lxc_list_for_each_safe (it, &c->lsm_aa_raw, next) {
-		lxc_list_del(it);
-		free(it->elem);
-		free(it);
+	list_for_each_entry_safe(entry, nentry, &c->lsm_aa_raw, head) {
+		list_del(&entry->head);
+		free(entry->val);
+		free(entry);
 	}
 
+	INIT_LIST_HEAD(&c->lsm_aa_raw);
 	return 0;
 }
 
@@ -3710,9 +4831,8 @@
 	lxc_terminal_conf_free(&conf->console);
 	free(conf->rootfs.mount);
 	free(conf->rootfs.bdev_type);
-	free(conf->rootfs.options);
 	free(conf->rootfs.path);
-	free(conf->rootfs.data);
+	put_lxc_rootfs(&conf->rootfs, true);
 	free(conf->logfile);
 	if (conf->logfd != -1)
 		close(conf->logfd);
@@ -3723,26 +4843,24 @@
 	free(conf->rcfile);
 	free(conf->execute_cmd);
 	free(conf->init_cmd);
+	free(conf->init_groups.list);
 	free(conf->init_cwd);
 	free(conf->unexpanded_config);
 	free(conf->syslog);
-	lxc_free_networks(&conf->network);
+	lxc_free_networks(conf);
 	free(conf->lsm_aa_profile);
 	free(conf->lsm_aa_profile_computed);
 	free(conf->lsm_se_context);
+	free(conf->lsm_se_keyring_context);
 	lxc_seccomp_free(&conf->seccomp);
 	lxc_clear_config_caps(conf);
-	lxc_clear_config_keepcaps(conf);
 	lxc_clear_cgroups(conf, "lxc.cgroup", CGROUP_SUPER_MAGIC);
 	lxc_clear_cgroups(conf, "lxc.cgroup2", CGROUP2_SUPER_MAGIC);
-	lxc_clear_devices(conf);
-	lxc_clear_cgroup2_devices(conf);
+	lxc_clear_cgroups_devices(conf);
 	lxc_clear_hooks(conf, "lxc.hook");
 	lxc_clear_mount_entries(conf);
 	lxc_clear_idmaps(conf);
 	lxc_clear_groups(conf);
-	lxc_clear_includes(conf);
-	lxc_clear_aliens(conf);
 	lxc_clear_environment(conf);
 	lxc_clear_limits(conf, "lxc.prlimit");
 	lxc_clear_sysctls(conf, "lxc.sysctl");
@@ -3750,7 +4868,12 @@
 	lxc_clear_apparmor_raw(conf);
 	lxc_clear_namespace(conf);
 	free(conf->cgroup_meta.dir);
+	free(conf->cgroup_meta.monitor_dir);
+	free(conf->cgroup_meta.monitor_pivot_dir);
+	free(conf->cgroup_meta.container_dir);
+	free(conf->cgroup_meta.namespace_dir);
 	free(conf->cgroup_meta.controllers);
+	free(conf->cgroup_meta.systemd_scope);
 	free(conf->shmount.path_host);
 	free(conf->shmount.path_cont);
 	free(conf);
@@ -3797,7 +4920,7 @@
 	if (!map)
 		return NULL;
 
-	retmap = malloc(sizeof(*retmap));
+	retmap = zalloc(sizeof(*retmap));
 	if (!retmap)
 		return NULL;
 
@@ -3805,15 +4928,13 @@
 	return retmap;
 }
 
-static struct id_map *find_mapped_hostid_entry(const struct lxc_conf *conf,
+static struct id_map *find_mapped_hostid_entry(const struct list_head *idmap,
 					       unsigned id, enum idtype idtype)
 {
-	struct id_map *map;
-	struct lxc_list *it;
 	struct id_map *retmap = NULL;
+	struct id_map *map;
 
-	lxc_list_for_each (it, &conf->id_map) {
-		map = it->elem;
+	list_for_each_entry(map, idmap, head) {
 		if (map->idtype != idtype)
 			continue;
 
@@ -3836,12 +4957,12 @@
 	int hostid_mapped;
 	struct id_map *tmp = NULL;
 
-	entry = malloc(sizeof(*entry));
+	entry = zalloc(sizeof(*entry));
 	if (!entry)
 		return NULL;
 
 	/* Reuse existing mapping. */
-	tmp = find_mapped_hostid_entry(conf, id, type);
+	tmp = find_mapped_hostid_entry(&conf->id_map, id, type);
 	if (tmp) {
 		memcpy(entry, tmp, sizeof(*entry));
 	} else {
@@ -3859,22 +4980,20 @@
 	return move_ptr(entry);
 }
 
-static struct lxc_list *get_minimal_idmap(const struct lxc_conf *conf,
-					  uid_t *resuid, gid_t *resgid)
+static int get_minimal_idmap(const struct lxc_conf *conf, uid_t *resuid,
+			     gid_t *resgid, struct list_head *head_ret)
 {
 	__do_free struct id_map *container_root_uid = NULL,
 				*container_root_gid = NULL,
 				*host_uid_map = NULL, *host_gid_map = NULL;
-	__do_free struct lxc_list *idmap = NULL;
 	uid_t euid, egid;
 	uid_t nsuid = (conf->root_nsuid_map != NULL) ? 0 : conf->init_uid;
 	gid_t nsgid = (conf->root_nsgid_map != NULL) ? 0 : conf->init_gid;
-	struct lxc_list *tmplist = NULL;
 
 	/* Find container root mappings. */
 	container_root_uid = mapped_nsid_add(conf, nsuid, ID_TYPE_UID);
 	if (!container_root_uid)
-		return log_debug(NULL, "Failed to find mapping for namespace uid %d", 0);
+		return sysdebug("Failed to find mapping for namespace uid %d", 0);
 	euid = geteuid();
 	if (euid >= container_root_uid->hostid &&
 	    euid < (container_root_uid->hostid + container_root_uid->range))
@@ -3882,7 +5001,7 @@
 
 	container_root_gid = mapped_nsid_add(conf, nsgid, ID_TYPE_GID);
 	if (!container_root_gid)
-		return log_debug(NULL, "Failed to find mapping for namespace gid %d", 0);
+		return sysdebug("Failed to find mapping for namespace gid %d", 0);
 	egid = getegid();
 	if (egid >= container_root_gid->hostid &&
 	    egid < (container_root_gid->hostid + container_root_gid->range))
@@ -3892,51 +5011,31 @@
 	if (!host_uid_map)
 		host_uid_map = mapped_hostid_add(conf, euid, ID_TYPE_UID);
 	if (!host_uid_map)
-		return log_debug(NULL, "Failed to find mapping for uid %d", euid);
+		return sysdebug("Failed to find mapping for uid %d", euid);
 
 	if (!host_gid_map)
 		host_gid_map = mapped_hostid_add(conf, egid, ID_TYPE_GID);
 	if (!host_gid_map)
-		return log_debug(NULL, "Failed to find mapping for gid %d", egid);
+		return sysdebug("Failed to find mapping for gid %d", egid);
 
-	/* Allocate new {g,u}id map list. */
-	idmap = malloc(sizeof(*idmap));
-	if (!idmap)
-		return NULL;
-	lxc_list_init(idmap);
-
-	/* Add container root to the map. */
-	tmplist = malloc(sizeof(*tmplist));
-	if (!tmplist)
-		return NULL;
 	/* idmap will now keep track of that memory. */
-	lxc_list_add_elem(tmplist, move_ptr(host_uid_map));
-	lxc_list_add_tail(idmap, tmplist);
+	list_add_tail(&host_uid_map->head, head_ret);
+	move_ptr(host_uid_map);
 
 	if (container_root_uid) {
-		/* Add container root to the map. */
-		tmplist = malloc(sizeof(*tmplist));
-		if (!tmplist)
-			return NULL;
 		/* idmap will now keep track of that memory. */
-		lxc_list_add_elem(tmplist, move_ptr(container_root_uid));
-		lxc_list_add_tail(idmap, tmplist);
+		list_add_tail(&container_root_uid->head, head_ret);
+		move_ptr(container_root_uid);
 	}
 
-	tmplist = malloc(sizeof(*tmplist));
-	if (!tmplist)
-		return NULL;
 	/* idmap will now keep track of that memory. */
-	lxc_list_add_elem(tmplist, move_ptr(host_gid_map));
-	lxc_list_add_tail(idmap, tmplist);
+	list_add_tail(&host_gid_map->head, head_ret);
+	move_ptr(host_gid_map);
 
 	if (container_root_gid) {
-		tmplist = malloc(sizeof(*tmplist));
-		if (!tmplist)
-			return NULL;
 		/* idmap will now keep track of that memory. */
-		lxc_list_add_elem(tmplist, move_ptr(container_root_gid));
-		lxc_list_add_tail(idmap, tmplist);
+		list_add_tail(&container_root_gid->head, head_ret);
+		move_ptr(container_root_gid);
 	}
 
 	TRACE("Allocated minimal idmapping for ns uid %d and ns gid %d", nsuid, nsgid);
@@ -3945,7 +5044,8 @@
 		*resuid = nsuid;
 	if (resgid)
 		*resgid = nsgid;
-	return move_ptr(idmap);
+
+	return 0;
 }
 
 /*
@@ -3963,7 +5063,8 @@
 int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *), void *data,
 		  const char *fn_name)
 {
-	call_cleaner(lxc_free_idmap) struct lxc_list *idmap = NULL;
+	LIST_HEAD(minimal_idmap);
+	call_cleaner(__lxc_free_idmap) struct list_head *idmap = &minimal_idmap;
 	int ret = -1, status = -1;
 	char c = '1';
 	struct userns_fn_data d = {
@@ -3977,8 +5078,8 @@
 	if (!conf)
 		return -EINVAL;
 
-	idmap = get_minimal_idmap(conf, NULL, NULL);
-	if (!idmap)
+	ret = get_minimal_idmap(conf, NULL, NULL, idmap);
+	if (ret)
 		return ret_errno(ENOENT);
 
 	ret = pipe2(pipe_fds, O_CLOEXEC);
@@ -3997,16 +5098,12 @@
 
 	close_prot_errno_disarm(pipe_fds0);
 
-	if (lxc_log_get_level() == LXC_LOG_LEVEL_TRACE ||
-	    conf->loglevel == LXC_LOG_LEVEL_TRACE) {
+	if (lxc_log_trace()) {
 		struct id_map *map;
-		struct lxc_list *it;
 
-		lxc_list_for_each(it, idmap) {
-			map = it->elem;
+		list_for_each_entry(map, idmap, head)
 			TRACE("Establishing %cid mapping for \"%d\" in new user namespace: nsuid %lu - hostid %lu - range %lu",
 			      (map->idtype == ID_TYPE_UID) ? 'u' : 'g', pid, map->nsid, map->hostid, map->range);
-		}
 	}
 
 	/* Set up {g,u}id mapping for user namespace of child process. */
@@ -4040,7 +5137,8 @@
 			int (*fn_parent)(void *), void *fn_parent_data,
 			int (*fn_child)(void *), void *fn_child_data)
 {
-	call_cleaner(lxc_free_idmap) struct lxc_list *idmap = NULL;
+	LIST_HEAD(minimal_idmap);
+	call_cleaner(__lxc_free_idmap) struct list_head *idmap = &minimal_idmap;
 	uid_t resuid = LXC_INVALID_UID;
 	gid_t resgid = LXC_INVALID_GID;
 	char c = '1';
@@ -4051,8 +5149,8 @@
 	if (!conf || !fn_child)
 		return ret_errno(EINVAL);
 
-	idmap = get_minimal_idmap(conf, &resuid, &resgid);
-	if (!idmap)
+	ret = get_minimal_idmap(conf, &resuid, &resgid, idmap);
+	if (ret)
 		return ret_errno(ENOENT);
 
 	ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, sock_fds);
@@ -4084,7 +5182,7 @@
 
 		close_prot_errno_disarm(sock_fds0);
 
-		if (!lxc_setgroups(0, NULL) && errno != EPERM)
+		if (!lxc_drop_groups() && errno != EPERM)
 			_exit(EXIT_FAILURE);
 
 		ret = setresgid(resgid, resgid, resgid);
@@ -4112,16 +5210,12 @@
 
 	close_prot_errno_disarm(sock_fds0);
 
-	if (lxc_log_get_level() == LXC_LOG_LEVEL_TRACE ||
-	    conf->loglevel == LXC_LOG_LEVEL_TRACE) {
+	if (lxc_log_trace()) {
 		struct id_map *map;
-		struct lxc_list *it;
 
-		lxc_list_for_each(it, idmap) {
-			map = it->elem;
+		list_for_each_entry(map, idmap, head)
 			TRACE("Establishing %cid mapping for \"%d\" in new user namespace: nsuid %lu - hostid %lu - range %lu",
 			      (map->idtype == ID_TYPE_UID) ? 'u' : 'g', pid, map->nsid, map->hostid, map->range);
-		}
 	}
 
 	ret = lxc_read_nointr(sock_fds1, &c, 1);
@@ -4163,26 +5257,24 @@
 int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *), void *data,
 		     const char *fn_name)
 {
+	LIST_HEAD(full_idmap);
+	int ret = -1;
+	char c = '1';
+	struct id_map *container_root_uid = NULL, *container_root_gid = NULL,
+		      *host_uid_map = NULL, *host_gid_map = NULL;
 	pid_t pid;
 	uid_t euid, egid;
 	int p2;
 	struct id_map *map;
-	struct lxc_list *cur;
 	struct userns_fn_data d;
-	int ret = -1;
-	char c = '1';
-	struct lxc_list *idmap = NULL, *tmplist = NULL;
-	struct id_map *container_root_uid = NULL, *container_root_gid = NULL,
-		      *host_uid_map = NULL, *host_gid_map = NULL;
 
 	if (!conf)
 		return -EINVAL;
 
 	ret = pipe2(p, O_CLOEXEC);
-	if (ret < 0) {
-		SYSERROR("opening pipe");
-		return -1;
-	}
+	if (ret < 0)
+		return -errno;
+
 	d.fn = fn;
 	d.fn_name = fn_name;
 	d.arg = data;
@@ -4202,33 +5294,16 @@
 	euid = geteuid();
 	egid = getegid();
 
-	/* Allocate new {g,u}id map list. */
-	idmap = malloc(sizeof(*idmap));
-	if (!idmap)
-		goto on_error;
-	lxc_list_init(idmap);
-
 	/* Find container root. */
-	lxc_list_for_each (cur, &conf->id_map) {
-		struct id_map *tmpmap;
-
-		tmplist = malloc(sizeof(*tmplist));
-		if (!tmplist)
-			goto on_error;
+	list_for_each_entry(map, &conf->id_map, head) {
+		__do_free struct id_map *dup_map = NULL;
 
-		tmpmap = malloc(sizeof(*tmpmap));
-		if (!tmpmap) {
-			free(tmplist);
+		dup_map = memdup(map, sizeof(struct id_map));
+		if (!dup_map)
 			goto on_error;
-		}
-
-		memset(tmpmap, 0, sizeof(*tmpmap));
-		memcpy(tmpmap, cur->elem, sizeof(*tmpmap));
-		tmplist->elem = tmpmap;
-
-		lxc_list_add_tail(idmap, tmplist);
 
-		map = cur->elem;
+		list_add_tail(&dup_map->head, &full_idmap);
+		move_ptr(dup_map);
 
 		if (map->idtype == ID_TYPE_UID)
 			if (euid >= map->hostid && euid < map->hostid + map->range)
@@ -4277,40 +5352,27 @@
 	}
 
 	if (host_uid_map && (host_uid_map != container_root_uid)) {
-		/* Add container root to the map. */
-		tmplist = malloc(sizeof(*tmplist));
-		if (!tmplist)
-			goto on_error;
-		lxc_list_add_elem(tmplist, host_uid_map);
-		lxc_list_add_tail(idmap, tmplist);
+		/* idmap will now keep track of that memory. */
+		list_add_tail(&host_uid_map->head, &full_idmap);
+		move_ptr(host_uid_map);
 	}
-	/* idmap will now keep track of that memory. */
-	host_uid_map = NULL;
 
 	if (host_gid_map && (host_gid_map != container_root_gid)) {
-		tmplist = malloc(sizeof(*tmplist));
-		if (!tmplist)
-			goto on_error;
-		lxc_list_add_elem(tmplist, host_gid_map);
-		lxc_list_add_tail(idmap, tmplist);
+		/* idmap will now keep track of that memory. */
+		list_add_tail(&host_gid_map->head, &full_idmap);
+		move_ptr(host_gid_map);
 	}
-	/* idmap will now keep track of that memory. */
-	host_gid_map = NULL;
 
-	if (lxc_log_get_level() == LXC_LOG_LEVEL_TRACE ||
-	    conf->loglevel == LXC_LOG_LEVEL_TRACE) {
-		lxc_list_for_each (cur, idmap) {
-			map = cur->elem;
-			TRACE("establishing %cid mapping for \"%d\" in new "
-			      "user namespace: nsuid %lu - hostid %lu - range "
-			      "%lu",
+	if (lxc_log_trace()) {
+		list_for_each_entry(map, &full_idmap, head) {
+			TRACE("establishing %cid mapping for \"%d\" in new user namespace: nsuid %lu - hostid %lu - range %lu",
 			      (map->idtype == ID_TYPE_UID) ? 'u' : 'g', pid,
 			      map->nsid, map->hostid, map->range);
 		}
 	}
 
 	/* Set up {g,u}id mapping for user namespace of child process. */
-	ret = lxc_map_ids(idmap, pid);
+	ret = lxc_map_ids(&full_idmap, pid);
 	if (ret < 0) {
 		ERROR("error setting up {g,u}id mappings for child process \"%d\"", pid);
 		goto on_error;
@@ -4331,10 +5393,7 @@
 	if (pid > 0)
 		ret = wait_for_pid(pid);
 
-	if (idmap) {
-		lxc_free_idmap(idmap);
-		free(idmap);
-	}
+	__lxc_free_idmap(&full_idmap);
 
 	if (host_uid_map && (host_uid_map != container_root_uid))
 		free(host_uid_map);
@@ -4344,12 +5403,11 @@
 	return ret;
 }
 
-static int add_idmap_entry(struct lxc_list *idmap, enum idtype idtype,
+static int add_idmap_entry(struct list_head *idmap_list, enum idtype idtype,
 			   unsigned long nsid, unsigned long hostid,
 			   unsigned long range)
 {
 	__do_free struct id_map *new_idmap = NULL;
-	__do_free struct lxc_list *new_list = NULL;
 
 	new_idmap = zalloc(sizeof(*new_idmap));
 	if (!new_idmap)
@@ -4360,12 +5418,8 @@
 	new_idmap->nsid = nsid;
 	new_idmap->range = range;
 
-	new_list = zalloc(sizeof(*new_list));
-	if (!new_list)
-		return ret_errno(ENOMEM);
-
-	new_list->elem = move_ptr(new_idmap);
-	lxc_list_add_tail(idmap, move_ptr(new_list));
+	list_add_tail(&new_idmap->head, idmap_list);
+	move_ptr(new_idmap);
 
 	INFO("Adding id map: type %c nsid %lu hostid %lu range %lu",
 	     idtype == ID_TYPE_UID ? 'u' : 'g', nsid, hostid, range);
@@ -4375,7 +5429,8 @@
 int userns_exec_mapped_root(const char *path, int path_fd,
 			    const struct lxc_conf *conf)
 {
-	call_cleaner(lxc_free_idmap) struct lxc_list *idmap = NULL;
+	LIST_HEAD(idmap_list);
+	call_cleaner(__lxc_free_idmap) struct list_head *idmap = &idmap_list;
 	__do_close int fd = -EBADF;
 	int target_fd = -EBADF;
 	char c = '1';
@@ -4441,11 +5496,6 @@
 		TRACE("Chowned %d(%s) to -1:%d", target_fd, path, hostgid);
 	}
 
-	idmap = malloc(sizeof(*idmap));
-	if (!idmap)
-		return -ENOMEM;
-	lxc_list_init(idmap);
-
 	/* "u:0:rootuid:1" */
 	ret = add_idmap_entry(idmap, ID_TYPE_UID, 0, container_host_uid, 1);
 	if (ret < 0)
@@ -4503,15 +5553,24 @@
 
 		close_prot_errno_disarm(sock_fds0);
 
-		if (!lxc_switch_uid_gid(0, 0))
+		if (!lxc_drop_groups() && errno != EPERM)
 			_exit(EXIT_FAILURE);
 
-		if (!lxc_setgroups(0, NULL))
+		ret = setresgid(0, 0, 0);
+		if (ret < 0) {
+			SYSERROR("Failed to setresgid(0, 0, 0)");
+			_exit(EXIT_FAILURE);
+		}
+
+		ret = setresuid(0, 0, 0);
+		if (ret < 0) {
+			SYSERROR("Failed to setresuid(0, 0, 0)");
 			_exit(EXIT_FAILURE);
+		}
 
 		ret = fchown(target_fd, 0, st.st_gid);
 		if (ret) {
-			SYSERROR("Failed to chown %d(%s) to -1:%d", target_fd, path, st.st_gid);
+			SYSERROR("Failed to chown %d(%s) to 0:%d", target_fd, path, st.st_gid);
 			_exit(EXIT_FAILURE);
 		}
 
@@ -4521,16 +5580,12 @@
 
 	close_prot_errno_disarm(sock_fds0);
 
-	if (lxc_log_get_level() == LXC_LOG_LEVEL_TRACE ||
-	    conf->loglevel == LXC_LOG_LEVEL_TRACE) {
+	if (lxc_log_trace()) {
 		struct id_map *map;
-		struct lxc_list *it;
 
-		lxc_list_for_each(it, idmap) {
-			map = it->elem;
+		list_for_each_entry(map, idmap, head)
 			TRACE("Establishing %cid mapping for \"%d\" in new user namespace: nsuid %lu - hostid %lu - range %lu",
 			      (map->idtype == ID_TYPE_UID) ? 'u' : 'g', pid, map->nsid, map->hostid, map->range);
-		}
 	}
 
 	ret = lxc_read_nointr(sock_fds1, &c, 1);
@@ -4559,9 +5614,12 @@
 
 	/* Wait for child to finish. */
 	if (pid < 0)
+		return log_error(-1, "Failed to create child process");
+
+	if (!wait_exited(pid))
 		return -1;
 
-	return wait_for_pid(pid);
+	return 0;
 }
 
 /* not thread-safe, do not use from api without first forking */
@@ -4570,14 +5628,14 @@
 	__do_free char *buf = NULL;
 	struct passwd pwent;
 	struct passwd *pwentp = NULL;
-	size_t bufsize;
+	ssize_t bufsize;
 	int ret;
 
 	bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
-	if (bufsize == -1)
+	if (bufsize < 0)
 		bufsize = 1024;
 
-	buf = malloc(bufsize);
+	buf = zalloc(bufsize);
 	if (!buf)
 		return NULL;
 
@@ -4598,14 +5656,14 @@
 	__do_free char *buf = NULL;
 	struct group grent;
 	struct group *grentp = NULL;
-	size_t bufsize;
+	ssize_t bufsize;
 	int ret;
 
 	bufsize = sysconf(_SC_GETGR_R_SIZE_MAX);
-	if (bufsize == -1)
+	if (bufsize < 0)
 		bufsize = 1024;
 
-	buf = malloc(bufsize);
+	buf = zalloc(bufsize);
 	if (!buf)
 		return NULL;
 
@@ -4654,7 +5712,7 @@
 		*p = '\0';
 		p++;
 
-		if (strcmp(line, uname))
+		if (!strequal(line, uname))
 			continue;
 
 		p2 = strchr(p, ':');
@@ -4691,7 +5749,7 @@
 		*p = '\0';
 		p++;
 
-		if (strcmp(line, uname))
+		if (!strequal(line, uname))
 			continue;
 
 		p2 = strchr(p, ':');
@@ -4724,54 +5782,19 @@
 	ERROR("lxc.idmap = g 0 %u %u", gid, grange);
 }
 
-static void free_cgroup_settings(struct lxc_list *result)
-{
-	struct lxc_list *iterator, *next;
-
-	lxc_list_for_each_safe (iterator, result, next) {
-		lxc_list_del(iterator);
-		free_disarm(iterator);
-	}
-	free_disarm(result);
-}
-
-/* Return the list of cgroup_settings sorted according to the following rules
- * 1. Put memory.limit_in_bytes before memory.memsw.limit_in_bytes
- */
-struct lxc_list *sort_cgroup_settings(struct lxc_list *cgroup_settings)
+int lxc_set_environment(const struct lxc_conf *conf)
 {
-	struct lxc_list *result;
-	struct lxc_cgroup *cg = NULL;
-	struct lxc_list *it = NULL, *item = NULL, *memsw_limit = NULL;
+	struct environment_entry *env;
 
-	result = malloc(sizeof(*result));
-	if (!result)
-		return NULL;
-	lxc_list_init(result);
-
-	/* Iterate over the cgroup settings and copy them to the output list. */
-	lxc_list_for_each (it, cgroup_settings) {
-		item = malloc(sizeof(*item));
-		if (!item) {
-			free_cgroup_settings(result);
-			return NULL;
-		}
+	list_for_each_entry(env, &conf->environment, head) {
+		int ret;
 
-		item->elem = it->elem;
-		cg = it->elem;
-		if (strcmp(cg->subsystem, "memory.memsw.limit_in_bytes") == 0) {
-			/* Store the memsw_limit location */
-			memsw_limit = item;
-		} else if (strcmp(cg->subsystem, "memory.limit_in_bytes") == 0 &&
-			   memsw_limit != NULL) {
-			/* lxc.cgroup.memory.memsw.limit_in_bytes is found
-			 * before lxc.cgroup.memory.limit_in_bytes, swap these
-			 * two items */
-			item->elem = memsw_limit->elem;
-			memsw_limit->elem = it->elem;
-		}
-		lxc_list_add_tail(result, item);
+		ret = setenv(env->key, env->val, 1);
+		if (ret < 0)
+			return syserror("Failed to set environment variable: %s=%s",
+					env->key, env->val);
+		TRACE("Set environment variable: %s=%s", env->key, env->val);
 	}
 
-	return result;
+	return 0;
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/conf.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/conf.h Changed

@@ -3,9 +3,8 @@
 #ifndef __LXC_CONF_H
 #define __LXC_CONF_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <linux/magic.h>
 #include <net/if.h>
 #include <netinet/in.h>
@@ -15,12 +14,21 @@
 #include <sys/types.h>
 #include <sys/vfs.h>
 
+#include "attach_options.h"
+#include "caps.h"
 #include "compiler.h"
-#include "config.h"
+#include "hlist.h"
 #include "list.h"
 #include "lxcseccomp.h"
+#include "memory_utils.h"
+#include "mount_utils.h"
+#include "namespace.h"
 #include "ringbuf.h"
 #include "start.h"
+#include "state.h"
+#include "storage/storage.h"
+#include "string_utils.h"
+#include "syscall_wrappers.h"
 #include "terminal.h"
 
 #if HAVE_SYS_RESOURCE_H
@@ -31,6 +39,8 @@
 typedef void * scmp_filter_ctx;
 #endif
 
+typedef signed long personality_t;
+
 /* worth moving to configure.ac? */
 #define subuidfile "/etc/subuid"
 #define subgidfile "/etc/subgid"
@@ -61,18 +71,39 @@
 			char *controllers;
 			char *dir;
 			char *monitor_dir;
+			char *monitor_pivot_dir;
 			char *container_dir;
 			char *namespace_dir;
 			bool relative;
+			/* If an unpriv user in pure unified-only hierarchy
+			 * starts a container, then we ask systemd to create
+			 * a scope for us, and create the monitor and container
+			 * cgroups under that.
+			 * This will ignore the above things like monitor_dir
+			 */
+			char *systemd_scope;
 		};
 	};
+
+	struct list_head head;
 };
 
+static void free_lxc_cgroup(struct lxc_cgroup *ptr)
+{
+	if (ptr) {
+		free(ptr->subsystem);
+		free(ptr->value);
+		free_disarm(ptr);
+	}
+}
+define_cleanup_function(struct lxc_cgroup *, free_lxc_cgroup);
+
 #if !HAVE_SYS_RESOURCE_H
 #define RLIM_INFINITY ((unsigned long)-1)
 struct rlimit {
 	unsigned long rlim_cur;
 	unsigned long rlim_max;
+	struct list_head head;
 };
 #endif
 
@@ -84,8 +115,18 @@
 struct lxc_limit {
 	char *resource;
 	struct rlimit limit;
+	struct list_head head;
 };
 
+static void free_lxc_limit(struct lxc_limit *ptr)
+{
+	if (ptr) {
+		free_disarm(ptr->resource);
+		free_disarm(ptr);
+	}
+}
+define_cleanup_function(struct lxc_limit *, free_lxc_limit);
+
 enum idtype {
 	ID_TYPE_UID,
 	ID_TYPE_GID
@@ -99,8 +140,19 @@
 struct lxc_sysctl {
 	char *key;
 	char *value;
+	struct list_head head;
 };
 
+static void free_lxc_sysctl(struct lxc_sysctl *ptr)
+{
+	if (ptr) {
+		free(ptr->key);
+		free(ptr->value);
+		free_disarm(ptr);
+	}
+}
+define_cleanup_function(struct lxc_sysctl *, free_lxc_sysctl);
+
 /*
  * Defines a structure to configure proc filesystem at runtime.
  * @filename : the proc filesystem will be configured without the "lxc.proc" prefix
@@ -109,8 +161,19 @@
 struct lxc_proc {
 	char *filename;
 	char *value;
+	struct list_head head;
 };
 
+static void free_lxc_proc(struct lxc_proc *ptr)
+{
+	if (ptr) {
+		free(ptr->filename);
+		free(ptr->value);
+		free_disarm(ptr);
+	}
+}
+define_cleanup_function(struct lxc_proc *, free_lxc_proc);
+
 /*
  * id_map is an id map entry.  Form in confile is:
  * lxc.idmap = u 0    9800 100
@@ -124,6 +187,7 @@
 struct id_map {
 	enum idtype idtype;
 	unsigned long hostid, nsid, range;
+	struct list_head head;
 };
 
 /* Defines the number of tty configured and contains the
@@ -137,59 +201,137 @@
 	struct lxc_terminal_info *tty;
 };
 
+typedef enum lxc_mount_options_t {
+	LXC_MOUNT_CREATE_DIR	= 0,
+	LXC_MOUNT_CREATE_FILE	= 1,
+	LXC_MOUNT_OPTIONAL	= 2,
+	LXC_MOUNT_RELATIVE	= 3,
+	LXC_MOUNT_IDMAP		= 4,
+	LXC_MOUNT_MAX		= 5,
+} lxc_mount_options_t;
+
+__hidden extern const char *lxc_mount_options_infoLXC_MOUNT_MAX;
+
+struct lxc_mount_options {
+	unsigned int create_dir : 1;
+	unsigned int create_file : 1;
+	unsigned int optional : 1;
+	unsigned int relative : 1;
+	unsigned int bind_recursively : 1;
+	unsigned int propagate_recursively : 1;
+	unsigned int bind : 1;
+	char userns_pathPATH_MAX;
+	unsigned long mnt_flags;
+	unsigned long prop_flags;
+	char *data;
+	struct mount_attr attr;
+	char *raw_options;
+};
+
 /* Defines a structure to store the rootfs location, the
  * optionals pivot_root, rootfs mount paths
- * @path       : the rootfs source (directory or device)
- * @mount      : where it is mounted
- * @bev_type   : optional backing store type
- * @options    : mount options
- * @mountflags : the portion of @options that are flags
- * @data       : the portion of @options that are not flags
- * @managed    : whether it is managed by LXC
+ * @path         : the rootfs source (directory or device)
+ * @mount        : where it is mounted
+ * @buf		 : static buffer to construct paths
+ * @bev_type     : optional backing store type
+ * @managed      : whether it is managed by LXC
+ * @dfd_mnt	 : fd for @mount
+ * @dfd_dev : fd for /dev of the container
  */
 struct lxc_rootfs {
+	int dfd_host;
+
 	char *path;
+	int fd_path_pin;
+	int dfd_idmapped;
+
+	int dfd_mnt;
 	char *mount;
+
+	int dfd_dev;
+
+	char bufPATH_MAX;
 	char *bdev_type;
-	char *options;
-	unsigned long mountflags;
-	char *data;
 	bool managed;
+	struct lxc_mount_options mnt_opts;
+	struct lxc_storage *storage;
 };
 
 /*
  * Automatic mounts for LXC to perform inside the container
  */
 enum {
-	LXC_AUTO_PROC_RW              = 0x001, /* /proc read-write */
-	LXC_AUTO_PROC_MIXED           = 0x002, /* /proc/sys and /proc/sysrq-trigger read-only */
-	LXC_AUTO_PROC_MASK            = 0x003,
-
-	LXC_AUTO_SYS_RW               = 0x004, /* /sys */
-	LXC_AUTO_SYS_RO               = 0x008, /* /sys read-only */
-	LXC_AUTO_SYS_MIXED            = 0x00C, /* /sys read-only and /sys/class/net read-write */
-	LXC_AUTO_SYS_MASK             = 0x00C,
-
-	LXC_AUTO_CGROUP_RO            = 0x010, /* /sys/fs/cgroup (partial mount, read-only) */
-	LXC_AUTO_CGROUP_RW            = 0x020, /* /sys/fs/cgroup (partial mount, read-write) */
-	LXC_AUTO_CGROUP_MIXED         = 0x030, /* /sys/fs/cgroup (partial mount, paths r/o, cgroup r/w) */
-	LXC_AUTO_CGROUP_FULL_RO       = 0x040, /* /sys/fs/cgroup (full mount, read-only) */
-	LXC_AUTO_CGROUP_FULL_RW       = 0x050, /* /sys/fs/cgroup (full mount, read-write) */
-	LXC_AUTO_CGROUP_FULL_MIXED    = 0x060, /* /sys/fs/cgroup (full mount, parent r/o, own r/w) */
+	/* /proc read-write */
+	LXC_AUTO_PROC_RW              = BIT(0),
+	/* /proc/sys and /proc/sysrq-trigger read-only */
+	LXC_AUTO_PROC_MIXED           = BIT(1),
+	LXC_AUTO_PROC_MASK            = LXC_AUTO_PROC_RW |
+					LXC_AUTO_PROC_MIXED,
+	/* /sys read-write */
+	LXC_AUTO_SYS_RW               = BIT(2),
+	/* /sys read-only */
+	LXC_AUTO_SYS_RO               = BIT(3),
+	/* /sys read-only and /sys/class/net read-write */
+	LXC_AUTO_SYS_MIXED            = LXC_AUTO_SYS_RW |
+					LXC_AUTO_SYS_RO,
+	LXC_AUTO_SYS_MASK             = LXC_AUTO_SYS_MIXED,
+
+	/* /sys/fs/cgroup (partial mount, read-only) */
+	LXC_AUTO_CGROUP_RO            = BIT(4),
+	/* /sys/fs/cgroup (partial mount, read-write) */
+	LXC_AUTO_CGROUP_RW            = BIT(5),
+	/* /sys/fs/cgroup (partial mount, paths r/o, cgroup r/w) */
+	LXC_AUTO_CGROUP_MIXED         = LXC_AUTO_CGROUP_RO |
+					LXC_AUTO_CGROUP_RW,
+	/* /sys/fs/cgroup (full mount, read-only) */
+	LXC_AUTO_CGROUP_FULL_RO       = BIT(6),
+	/* /sys/fs/cgroup (full mount, read-write) */
+	LXC_AUTO_CGROUP_FULL_RW       = BIT(7),
+	/* /sys/fs/cgroup (full mount, parent r/o, own r/w) */
+	LXC_AUTO_CGROUP_FULL_MIXED    = LXC_AUTO_CGROUP_FULL_RO |
+					LXC_AUTO_CGROUP_FULL_RW,
+
+	/*
+	 * Mount a pure read-write cgroup2 layout in the container independent
+	 * of the cgroup layout used on the host.
+	 */
+	LXC_AUTO_CGROUP2_RW           = BIT(8),
+	/*
+	 * Mount a pure read-only cgroup2 layout in the container independent
+	 * of the cgroup layout used on the host.
+	 */
+	LXC_AUTO_CGROUP2_RO           = BIT(9),
+
 	/*
 	 * These are defined in such a way as to retain binary compatibility
 	 * with earlier versions of this code. If the previous mask is applied,
 	 * both of these will default back to the _MIXED variants, which is
 	 * safe.
 	 */
-	LXC_AUTO_CGROUP_NOSPEC        = 0x0B0, /* /sys/fs/cgroup (partial mount, r/w or mixed, depending on caps) */
-	LXC_AUTO_CGROUP_FULL_NOSPEC   = 0x0E0, /* /sys/fs/cgroup (full mount, r/w or mixed, depending on caps) */
-	LXC_AUTO_CGROUP_FORCE         = 0x100, /* mount cgroups even when cgroup namespaces are supported */
-	LXC_AUTO_CGROUP_MASK          = 0x1F0, /* all known cgroup options, doe not contain LXC_AUTO_CGROUP_FORCE */
-
-	LXC_AUTO_SHMOUNTS             = 0x200, /* shared mount point */
-	LXC_AUTO_SHMOUNTS_MASK        = 0x200, /* shared mount point mask */
-	LXC_AUTO_ALL_MASK             = 0x1FF, /* all known settings */
+	/* /sys/fs/cgroup (partial mount, r/w or mixed, depending on caps) */
+	LXC_AUTO_CGROUP_NOSPEC        = 0x0B0,
+	/* /sys/fs/cgroup (full mount, r/w or mixed, depending on caps) */
+	LXC_AUTO_CGROUP_FULL_NOSPEC   = 0x0E0,
+	/* mount cgroups even when cgroup namespaces are supported */
+	LXC_AUTO_CGROUP_FORCE         = BIT(10),
+	/* all known cgroup options */
+	LXC_AUTO_CGROUP_MASK          = LXC_AUTO_CGROUP_MIXED |
+					LXC_AUTO_CGROUP_FULL_MIXED |
+					LXC_AUTO_CGROUP_NOSPEC |
+					LXC_AUTO_CGROUP_FULL_NOSPEC |
+					LXC_AUTO_CGROUP_FORCE |
+					LXC_AUTO_CGROUP2_RW |
+					LXC_AUTO_CGROUP2_RO,
+
+	/* shared mount point */
+	LXC_AUTO_SHMOUNTS             = BIT(11),
+	/* shared mount point mask */
+	LXC_AUTO_SHMOUNTS_MASK        = LXC_AUTO_SHMOUNTS,
+
+	/* all known settings */
+	LXC_AUTO_ALL_MASK             = LXC_AUTO_PROC_MASK |
+					LXC_AUTO_SYS_MASK |
+					LXC_AUTO_CGROUP_MASK,
 };
 
 enum lxchooks {
@@ -206,18 +348,18 @@
 	NUM_LXC_HOOKS
 };
 
-extern char *lxchook_namesNUM_LXC_HOOKS;
+__hidden extern char *lxchook_namesNUM_LXC_HOOKS;
 
 struct lxc_state_client {
 	int clientfd;
 	lxc_state_t statesMAX_STATE;
+	struct list_head head;
 };
 
-enum {
-	LXC_BPF_DEVICE_CGROUP_LOCAL_RULE = -1,
-	LXC_BPF_DEVICE_CGROUP_WHITELIST  =  0,
-	LXC_BPF_DEVICE_CGROUP_BLACKLIST  =  1,
-};
+typedef enum lxc_bpf_devices_rule_t {
+	LXC_BPF_DEVICE_CGROUP_ALLOWLIST		= 0,
+	LXC_BPF_DEVICE_CGROUP_DENYLIST		= 1,
+} lxc_bpf_devices_rule_t;
 
 struct device_item {
 	char type;
@@ -225,12 +367,44 @@
 	int minor;
 	char access4;
 	int allow;
-	/*
-	 * LXC_BPF_DEVICE_CGROUP_LOCAL_RULE -> no global rule
-	 * LXC_BPF_DEVICE_CGROUP_WHITELIST  -> whitelist (deny all)
-	 * LXC_BPF_DEVICE_CGROUP_BLACKLIST  -> blacklist (allow all)
-	 */
-	int global_rule;
+	struct list_head head;
+};
+
+struct bpf_devices {
+	lxc_bpf_devices_rule_t list_type;
+	struct list_head devices;
+};
+
+struct timens_offsets {
+	/* Currently, either s_boot or ns_boot is set, but not both. */
+	int64_t s_boot;
+	int64_t ns_boot;
+
+	/* Currently, either s_monotonic or ns_monotonic is set, but not both. */
+	int64_t s_monotonic;
+	int64_t ns_monotonic;
+};
+
+struct environment_entry {
+	char *key;
+	char *val;
+	struct list_head head;
+};
+
+struct cap_entry {
+	char *cap_name;
+	__u32 cap;
+	struct list_head head;
+};
+
+struct caps {
+	int keep;
+	struct list_head list;
+};
+
+struct string_entry {
+	char *val;
+	struct list_head head;
 };
 
 struct lxc_conf {
@@ -238,19 +412,17 @@
 	const char *name;
 	bool is_execute;
 	int reboot;
-	signed long personality;
+	personality_t personality;
 	struct utsname *utsname;
 
 	struct {
-		struct lxc_list cgroup;
-		struct lxc_list cgroup2;
-		struct bpf_program *cgroup2_devices;
-		/* This should be reimplemented as a hashmap. */
-		struct lxc_list devices;
+		struct list_head cgroup;
+		struct list_head cgroup2;
+		struct bpf_devices bpf_devices;
 	};
 
 	struct {
-		struct lxc_list id_map;
+		struct list_head id_map;
 
 		/*
 		 * Pointer to the idmap entry for the container's root uid in
@@ -265,16 +437,15 @@
 		const struct id_map *root_nsgid_map;
 	};
 
-	struct lxc_list network;
+	struct list_head netdevs;
 
 	struct {
 		char *fstab;
 		int auto_mounts;
-		struct lxc_list mount_list;
+		struct list_head mount_entries;
 	};
 
-	struct lxc_list caps;
-	struct lxc_list keepcaps;
+	struct caps caps;
 
 	/* /dev/tty<idx> devices */
 	struct lxc_tty_info ttys;
@@ -282,6 +453,8 @@
 	struct lxc_terminal console;
 	/* maximum pty devices allowed by devpts mount */
 	size_t pty_max;
+	/* file descriptor for the container's /dev/pts mount */
+	int devpts_fd;
 
 	/* set to true when rootfs has been setup */
 	bool rootfs_setup;
@@ -291,7 +464,7 @@
 
 	struct {
 		unsigned int hooks_version;
-		struct lxc_list hooksNUM_LXC_HOOKS;
+		struct list_head hooksNUM_LXC_HOOKS;
 	};
 
 	char *lsm_aa_profile;
@@ -299,11 +472,11 @@
 	bool lsm_aa_profile_created;
 	unsigned int lsm_aa_allow_nesting;
 	unsigned int lsm_aa_allow_incomplete;
-	struct lxc_list lsm_aa_raw;
+	struct list_head lsm_aa_raw;
 	char *lsm_se_context;
 	char *lsm_se_keyring_context;
 	bool keyring_disable_session;
-	bool tmp_umount_proc;
+	bool transient_procfs_mnt;
 	struct lxc_seccomp seccomp;
 	int maincmd_fd;
 	unsigned int autodev;  /* if 1, mount and fill a /dev at start */
@@ -325,21 +498,16 @@
 	unsigned int start_auto;
 	unsigned int start_delay;
 	int start_order;
-	struct lxc_list groups;
+	struct list_head groups;
 	int nbd_idx;
 
 	/* unshare the mount namespace in the monitor */
 	unsigned int monitor_unshare;
 	unsigned int monitor_signal_pdeath;
 
-	/* list of included files */
-	struct lxc_list includes;
-	/* config entries which are not "lxc.*" are aliens */
-	struct lxc_list aliens;
-
 	/* list of environment variables we'll add to the container when
 	 * started */
-	struct lxc_list environment;
+	struct list_head environment;
 
 	/* text representation of the config file */
 	char *unexpanded_config;
@@ -352,10 +520,12 @@
 	/* init command */
 	char *init_cmd;
 
-	/* if running in a new user namespace, the UID/GID that init and COMMAND
-	 * should run under when using lxc-execute */
+	/* The uid to use for the container. */
 	uid_t init_uid;
+	/* The gid to use for the container. */
 	gid_t init_gid;
+	/* The groups to use for the container. */
+	lxc_groups_t init_groups;
 
 	/* indicator if the container will be destroyed on shutdown */
 	unsigned int ephemeral;
@@ -368,7 +538,7 @@
 	bool no_new_privs;
 
 	/* RLIMIT_* limits */
-	struct lxc_list limits;
+	struct list_head limits;
 
 	/* Contains generic info about the cgroup configuration for this
 	 * container. Note that struct lxc_cgroup contains a union. It is only
@@ -387,13 +557,13 @@
 	char *init_cwd;
 
 	/* A list of clients registered to be informed about a container state. */
-	struct lxc_list state_clients;
+	struct list_head state_clients;
 
 	/* sysctls */
-	struct lxc_list sysctls;
+	struct list_head sysctls;
 
 	/* procs */
-	struct lxc_list procs;
+	struct list_head procs;
 
 	struct shmount {
 		/* Absolute path to the shared mount point on the host */
@@ -401,83 +571,154 @@
 		/* Absolute path (in the container) to the shared mount point */
 		char *path_cont;
 	} shmount;
+
+	struct timens_offsets timens;
+
+	bool sched_core;
+	__u64 sched_core_cookie;
 };
 
-extern int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf,
-			    size_t buf_size)
-__access_r(3, 4);
+__hidden extern int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf, size_t buf_size)
+    __access_r(3, 4);
 
-#ifdef HAVE_TLS
 extern thread_local struct lxc_conf *current_config;
-#else
-extern struct lxc_conf *current_config;
-#endif
 
-extern int run_lxc_hooks(const char *name, char *hook, struct lxc_conf *conf,
-			 char *argv);
-extern int detect_shared_rootfs(void);
-extern struct lxc_conf *lxc_conf_init(void);
-extern void lxc_conf_free(struct lxc_conf *conf);
-extern int pin_rootfs(const char *rootfs);
-extern int lxc_map_ids(struct lxc_list *idmap, pid_t pid);
-extern int lxc_create_tty(const char *name, struct lxc_conf *conf);
-extern void lxc_delete_tty(struct lxc_tty_info *ttys);
-extern int lxc_clear_config_caps(struct lxc_conf *c);
-extern int lxc_clear_config_keepcaps(struct lxc_conf *c);
-extern int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version);
-extern int lxc_clear_mount_entries(struct lxc_conf *c);
-extern int lxc_clear_automounts(struct lxc_conf *c);
-extern int lxc_clear_hooks(struct lxc_conf *c, const char *key);
-extern int lxc_clear_idmaps(struct lxc_conf *c);
-extern int lxc_clear_groups(struct lxc_conf *c);
-extern int lxc_clear_environment(struct lxc_conf *c);
-extern int lxc_clear_limits(struct lxc_conf *c, const char *key);
-extern int lxc_delete_autodev(struct lxc_handler *handler);
-extern int lxc_clear_autodev_tmpfs_size(struct lxc_conf *c);
-extern void lxc_clear_includes(struct lxc_conf *conf);
-extern int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf,
-					 const char *name, const char *lxcpath);
-extern int lxc_setup(struct lxc_handler *handler);
-extern int lxc_setup_parent(struct lxc_handler *handler);
-extern int setup_resource_limits(struct lxc_list *limits, pid_t pid);
-extern int find_unmapped_nsid(const struct lxc_conf *conf, enum idtype idtype);
-extern int mapped_hostid(unsigned id, const struct lxc_conf *conf,
-			 enum idtype idtype);
-extern int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *),
-			 void *data, const char *fn_name);
-extern int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *),
-			    void *data, const char *fn_name);
-extern int parse_mntopts(const char *mntopts, unsigned long *mntflags,
-			 char **mntdata);
-extern int parse_propagationopts(const char *mntopts, unsigned long *pflags);
-extern void tmp_proc_unmount(struct lxc_conf *lxc_conf);
-extern void turn_into_dependent_mounts(void);
-extern void suggest_default_idmap(void);
-extern FILE *make_anonymous_mount_file(struct lxc_list *mount,
-				       bool include_nesting_helpers);
-extern struct lxc_list *sort_cgroup_settings(struct lxc_list *cgroup_settings);
-extern unsigned long add_required_remount_flags(const char *s, const char *d,
-						unsigned long flags);
-extern int run_script(const char *name, const char *section, const char *script,
-		      ...);
-extern int run_script_argv(const char *name, unsigned int hook_version,
-			   const char *section, const char *script,
-			   const char *hookname, char **argsin);
-extern int in_caplist(int cap, struct lxc_list *caps);
-extern int setup_sysctl_parameters(struct lxc_list *sysctls);
-extern int lxc_clear_sysctls(struct lxc_conf *c, const char *key);
-extern int setup_proc_filesystem(struct lxc_list *procs, pid_t pid);
-extern int lxc_clear_procs(struct lxc_conf *c, const char *key);
-extern int lxc_clear_apparmor_raw(struct lxc_conf *c);
-extern int lxc_clear_namespace(struct lxc_conf *c);
-extern int userns_exec_minimal(const struct lxc_conf *conf,
-			       int (*fn_parent)(void *), void *fn_parent_data,
-			       int (*fn_child)(void *), void *fn_child_data);
-extern int userns_exec_mapped_root(const char *path, int path_fd,
-				   const struct lxc_conf *conf);
+__hidden extern int run_lxc_hooks(const char *name, char *hook, struct lxc_conf *conf, char *argv);
+__hidden extern struct lxc_conf *lxc_conf_init(void);
+__hidden extern void lxc_conf_free(struct lxc_conf *conf);
+__hidden extern int lxc_storage_prepare(struct lxc_conf *conf);
+__hidden extern int lxc_rootfs_prepare(struct lxc_conf *conf, bool userns);
+__hidden extern void lxc_storage_put(struct lxc_conf *conf);
+__hidden extern int lxc_rootfs_init(struct lxc_conf *conf, bool userns);
+__hidden extern int lxc_rootfs_prepare_parent(struct lxc_handler *handler);
+__hidden extern int lxc_idmapped_mounts_parent(struct lxc_handler *handler);
+__hidden extern int lxc_map_ids(struct list_head *idmap, pid_t pid);
+__hidden extern int lxc_create_tty(const char *name, struct lxc_conf *conf);
+__hidden extern void lxc_delete_tty(struct lxc_tty_info *ttys);
+__hidden extern int lxc_clear_config_caps(struct lxc_conf *c);
+__hidden extern int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version);
+__hidden extern int lxc_clear_mount_entries(struct lxc_conf *c);
+__hidden extern int lxc_clear_automounts(struct lxc_conf *c);
+__hidden extern int lxc_clear_hooks(struct lxc_conf *c, const char *key);
+__hidden extern int lxc_clear_idmaps(struct lxc_conf *c);
+__hidden extern int lxc_clear_groups(struct lxc_conf *c);
+__hidden extern int lxc_clear_environment(struct lxc_conf *c);
+__hidden extern int lxc_clear_limits(struct lxc_conf *c, const char *key);
+__hidden extern int lxc_delete_autodev(struct lxc_handler *handler);
+__hidden extern int lxc_clear_autodev_tmpfs_size(struct lxc_conf *c);
+__hidden extern int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
+						  const char *lxcpath);
+__hidden extern int lxc_setup(struct lxc_handler *handler);
+__hidden extern int lxc_setup_parent(struct lxc_handler *handler);
+__hidden extern int setup_resource_limits(struct lxc_conf *conf, pid_t pid);
+__hidden extern int find_unmapped_nsid(const struct lxc_conf *conf, enum idtype idtype);
+__hidden extern int mapped_hostid(unsigned id, const struct lxc_conf *conf, enum idtype idtype);
+__hidden extern int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *), void *data,
+				  const char *fn_name);
+__hidden extern int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *), void *data,
+				     const char *fn_name);
+__hidden extern int parse_mntopts_legacy(const char *mntopts, unsigned long *mntflags, char **mntdata);
+__hidden extern int parse_propagationopts(const char *mntopts, unsigned long *pflags);
+__hidden extern int parse_lxc_mount_attrs(struct lxc_mount_options *opts, char *mnt_opts);
+__hidden extern int parse_mount_attrs(struct lxc_mount_options *opts, const char *mntopts);
+__hidden extern void tmp_proc_unmount(struct lxc_conf *lxc_conf);
+__hidden extern void suggest_default_idmap(void);
+__hidden extern FILE *make_anonymous_mount_file(const struct list_head *mount,
+						bool include_nesting_helpers);
+__hidden extern int run_script(const char *name, const char *section, const char *script, ...);
+__hidden extern int run_script_argv(const char *name, unsigned int hook_version, const char *section,
+				    const char *script, const char *hookname, char **argsin);
+
+__hidden extern bool has_cap(__u32 cap, struct lxc_conf *conf);
+static inline bool lxc_wants_cap(__u32 cap, struct lxc_conf *conf)
+{
+	__u32 last_cap;
+	int ret;
+
+	ret = lxc_caps_last_cap(&last_cap);
+	if (ret)
+		return false;
+
+	if (last_cap < cap)
+		return false;
+
+	return has_cap(cap, conf);
+}
+
+__hidden extern int setup_sysctl_parameters(struct lxc_conf *conf);
+__hidden extern int lxc_clear_sysctls(struct lxc_conf *c, const char *key);
+__hidden extern int setup_proc_filesystem(struct lxc_conf *conf, pid_t pid);
+__hidden extern int lxc_clear_procs(struct lxc_conf *c, const char *key);
+__hidden extern int lxc_clear_apparmor_raw(struct lxc_conf *c);
+__hidden extern int lxc_clear_namespace(struct lxc_conf *c);
+__hidden extern int userns_exec_minimal(const struct lxc_conf *conf, int (*fn_parent)(void *),
+					void *fn_parent_data, int (*fn_child)(void *),
+					void *fn_child_data);
+__hidden extern int userns_exec_mapped_root(const char *path, int path_fd,
+					    const struct lxc_conf *conf);
 static inline int chown_mapped_root(const char *path, const struct lxc_conf *conf)
 {
 	return userns_exec_mapped_root(path, -EBADF, conf);
 }
 
+__hidden extern int lxc_sync_fds_parent(struct lxc_handler *handler);
+__hidden extern int lxc_sync_fds_child(struct lxc_handler *handler);
+
+static inline const char *get_rootfs_mnt(const struct lxc_rootfs *rootfs)
+{
+	static const char *s = "/";
+
+	return !is_empty_string(rootfs->path) ? rootfs->mount : s;
+}
+
+static inline void put_lxc_mount_options(struct lxc_mount_options *mnt_opts)
+{
+	mnt_opts->create_dir = 0;
+	mnt_opts->create_file = 0;
+	mnt_opts->optional = 0;
+	mnt_opts->relative = 0;
+	mnt_opts->userns_path0 = '\0';
+	mnt_opts->mnt_flags = 0;
+	mnt_opts->prop_flags = 0;
+
+	free_disarm(mnt_opts->data);
+	free_disarm(mnt_opts->raw_options);
+}
+
+static inline void put_lxc_rootfs(struct lxc_rootfs *rootfs, bool unpin)
+{
+	if (rootfs) {
+		close_prot_errno_disarm(rootfs->dfd_host);
+		close_prot_errno_disarm(rootfs->dfd_mnt);
+		close_prot_errno_disarm(rootfs->dfd_dev);
+		if (unpin)
+			close_prot_errno_disarm(rootfs->fd_path_pin);
+		close_prot_errno_disarm(rootfs->dfd_idmapped);
+		put_lxc_mount_options(&rootfs->mnt_opts);
+		storage_put(rootfs->storage);
+		rootfs->storage = NULL;
+	}
+}
+
+static inline void lxc_clear_cgroup2_devices(struct bpf_devices *bpf_devices)
+{
+	struct device_item *device, *n;
+
+	list_for_each_entry_safe(device, n, &bpf_devices->devices, head)
+		list_del(&device->head);
+
+	INIT_LIST_HEAD(&bpf_devices->devices);
+}
+
+static inline int lxc_personality(personality_t persona)
+{
+	if (persona < 0)
+		return ret_errno(EINVAL);
+
+	return personality(persona);
+}
+
+__hidden extern int lxc_set_environment(const struct lxc_conf *conf);
+__hidden extern int parse_cap(const char *cap_name, __u32 *cap);
+
 #endif /* __LXC_CONF_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/confile.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/confile.c Changed

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <dirent.h>
@@ -21,33 +19,32 @@
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <syslog.h>
-#include <time.h>
+#include <sys/time.h>
 #include <unistd.h>
 
 #include "af_unix.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "confile_utils.h"
-#include "../include/netns_ifaddrs.h"
+#include "netns_ifaddrs.h"
 #include "log.h"
 #include "lxcseccomp.h"
+#include "macro.h"
 #include "memory_utils.h"
 #include "network.h"
 #include "parse.h"
-#include "storage.h"
 #include "utils.h"
 
-#if HAVE_SYS_PERSONALITY_H
-#include <sys/personality.h>
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCAT
+#include "strlcat.h"
 #endif
 
-#ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#if HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
 #endif
 
 lxc_log_define(confile, lxc);
@@ -71,12 +68,17 @@
 lxc_config_define(cgroup_controller);
 lxc_config_define(cgroup2_controller);
 lxc_config_define(cgroup_dir);
+lxc_config_define(cgroup_monitor_dir);
+lxc_config_define(cgroup_monitor_pivot_dir);
+lxc_config_define(cgroup_container_dir);
+lxc_config_define(cgroup_container_inner_dir);
 lxc_config_define(cgroup_relative);
 lxc_config_define(console_buffer_size);
 lxc_config_define(console_logfile);
 lxc_config_define(console_path);
 lxc_config_define(console_rotate);
 lxc_config_define(console_size);
+lxc_config_define(unsupported_key);
 lxc_config_define(environment);
 lxc_config_define(ephemeral);
 lxc_config_define(execute_cmd);
@@ -89,6 +91,8 @@
 lxc_config_define(init_cwd);
 lxc_config_define(init_gid);
 lxc_config_define(init_uid);
+lxc_config_define(init_groups);
+lxc_config_define(jump_table_net);
 lxc_config_define(keyring_session);
 lxc_config_define(log_file);
 lxc_config_define(log_level);
@@ -100,6 +104,8 @@
 lxc_config_define(mount_fstab);
 lxc_config_define(namespace_clone);
 lxc_config_define(namespace_keep);
+lxc_config_define(time_offset_boot);
+lxc_config_define(time_offset_monotonic);
 lxc_config_define(namespace_share);
 lxc_config_define(net);
 lxc_config_define(net_flags);
@@ -115,14 +121,17 @@
 lxc_config_define(net_ipvlan_isolation);
 lxc_config_define(net_mtu);
 lxc_config_define(net_name);
-lxc_config_define(net_nic);
 lxc_config_define(net_script_down);
 lxc_config_define(net_script_up);
 lxc_config_define(net_type);
 lxc_config_define(net_veth_mode);
+lxc_config_define(net_veth_n_rxqueues);
+lxc_config_define(net_veth_n_txqueues);
 lxc_config_define(net_veth_pair);
 lxc_config_define(net_veth_ipv4_route);
 lxc_config_define(net_veth_ipv6_route);
+lxc_config_define(net_veth_vlan_id);
+lxc_config_define(net_veth_vlan_tagged_id);
 lxc_config_define(net_vlan_id);
 lxc_config_define(no_new_privs);
 lxc_config_define(personality);
@@ -147,6 +156,25 @@
 lxc_config_define(uts_name);
 lxc_config_define(sysctl);
 lxc_config_define(proc);
+lxc_config_define(sched_core);
+
+static int set_config_unsupported_key(const char *key, const char *value,
+				      struct lxc_conf *lxc_conf, void *data)
+{
+	return syserror_set(-EINVAL, "Unsupported config key \"%s\"", key);
+}
+
+static int get_config_unsupported_key(const char *key, char *retv, int inlen,
+				      struct lxc_conf *c, void *data)
+{
+	return syserror_set(-EINVAL, "Unsupported config key \"%s\"", key);
+}
+
+static int clr_config_unsupported_key(const char *key,
+				      struct lxc_conf *lxc_conf, void *data)
+{
+	return syserror_set(-EINVAL, "Unsupported config key \"%s\"", key);
+}
 
 /*
  * Important Note:
@@ -160,127 +188,218 @@
  * has to be placed above lxc.ab.
  */
 static struct lxc_config_t config_jump_table = {
-	{ "lxc.arch",                      set_config_personality,                 get_config_personality,                 clr_config_personality,               },
-	{ "lxc.apparmor.profile",          set_config_apparmor_profile,            get_config_apparmor_profile,            clr_config_apparmor_profile,          },
-	{ "lxc.apparmor.allow_incomplete", set_config_apparmor_allow_incomplete,   get_config_apparmor_allow_incomplete,   clr_config_apparmor_allow_incomplete, },
-	{ "lxc.apparmor.allow_nesting",    set_config_apparmor_allow_nesting,      get_config_apparmor_allow_nesting,      clr_config_apparmor_allow_nesting,    },
-	{ "lxc.apparmor.raw",              set_config_apparmor_raw,                get_config_apparmor_raw,                clr_config_apparmor_raw,              },
-	{ "lxc.autodev.tmpfs.size",        set_config_autodev_tmpfs_size,          get_config_autodev_tmpfs_size,          clr_config_autodev_tmpfs_size,        },
-	{ "lxc.autodev",                   set_config_autodev,                     get_config_autodev,                     clr_config_autodev,                   },
-	{ "lxc.cap.drop",                  set_config_cap_drop,                    get_config_cap_drop,                    clr_config_cap_drop,                  },
-	{ "lxc.cap.keep",                  set_config_cap_keep,                    get_config_cap_keep,                    clr_config_cap_keep,                  },
-	{ "lxc.cgroup2",                   set_config_cgroup2_controller,          get_config_cgroup2_controller,          clr_config_cgroup2_controller,        },
-	{ "lxc.cgroup.dir",                set_config_cgroup_dir,                  get_config_cgroup_dir,                  clr_config_cgroup_dir,                },
-	{ "lxc.cgroup.relative",           set_config_cgroup_relative,             get_config_cgroup_relative,             clr_config_cgroup_relative,           },
-	{ "lxc.cgroup",                    set_config_cgroup_controller,           get_config_cgroup_controller,           clr_config_cgroup_controller,         },
-	{ "lxc.console.buffer.size",       set_config_console_buffer_size,         get_config_console_buffer_size,         clr_config_console_buffer_size,       },
-	{ "lxc.console.logfile",           set_config_console_logfile,             get_config_console_logfile,             clr_config_console_logfile,           },
-	{ "lxc.console.path",              set_config_console_path,                get_config_console_path,                clr_config_console_path,              },
-	{ "lxc.console.rotate",            set_config_console_rotate,              get_config_console_rotate,              clr_config_console_rotate,            },
-	{ "lxc.console.size",              set_config_console_size,                get_config_console_size,                clr_config_console_size,              },
-	{ "lxc.environment",               set_config_environment,                 get_config_environment,                 clr_config_environment,               },
-	{ "lxc.ephemeral",                 set_config_ephemeral,                   get_config_ephemeral,                   clr_config_ephemeral,                 },
-	{ "lxc.execute.cmd",               set_config_execute_cmd,                 get_config_execute_cmd,                 clr_config_execute_cmd,               },
-	{ "lxc.group",                     set_config_group,                       get_config_group,                       clr_config_group,                     },
-	{ "lxc.hook.autodev",              set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.hook.clone",                set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.hook.destroy",              set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.hook.mount",                set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.hook.post-stop",            set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.hook.pre-mount",            set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.hook.pre-start",            set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.hook.start",                set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.hook.start-host",           set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.hook.stop",                 set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.hook.version",              set_config_hooks_version,               get_config_hooks_version,               clr_config_hooks_version,             },
-	{ "lxc.hook",                      set_config_hooks,                       get_config_hooks,                       clr_config_hooks,                     },
-	{ "lxc.idmap",                     set_config_idmaps,                      get_config_idmaps,                      clr_config_idmaps,                    },
-	{ "lxc.include",                   set_config_includefiles,                get_config_includefiles,                clr_config_includefiles,              },
-	{ "lxc.init.cmd",                  set_config_init_cmd,                    get_config_init_cmd,                    clr_config_init_cmd,                  },
-	{ "lxc.init.gid",                  set_config_init_gid,                    get_config_init_gid,                    clr_config_init_gid,                  },
-	{ "lxc.init.uid",                  set_config_init_uid,                    get_config_init_uid,                    clr_config_init_uid,                  },
-	{ "lxc.init.cwd",                  set_config_init_cwd,                    get_config_init_cwd,                    clr_config_init_cwd,                  },
-	{ "lxc.keyring.session",           set_config_keyring_session,             get_config_keyring_session,             clr_config_keyring_session            },
-	{ "lxc.log.file",                  set_config_log_file,                    get_config_log_file,                    clr_config_log_file,                  },
-	{ "lxc.log.level",                 set_config_log_level,                   get_config_log_level,                   clr_config_log_level,                 },
-	{ "lxc.log.syslog",                set_config_log_syslog,                  get_config_log_syslog,                  clr_config_log_syslog,                },
-	{ "lxc.monitor.unshare",           set_config_monitor,                     get_config_monitor,                     clr_config_monitor,                   },
-	{ "lxc.monitor.signal.pdeath",     set_config_monitor_signal_pdeath,       get_config_monitor_signal_pdeath,       clr_config_monitor_signal_pdeath,     },
-	{ "lxc.mount.auto",                set_config_mount_auto,                  get_config_mount_auto,                  clr_config_mount_auto,                },
-	{ "lxc.mount.entry",               set_config_mount,                       get_config_mount,                       clr_config_mount,                     },
-	{ "lxc.mount.fstab",               set_config_mount_fstab,                 get_config_mount_fstab,                 clr_config_mount_fstab,               },
-	{ "lxc.namespace.clone",           set_config_namespace_clone,             get_config_namespace_clone,             clr_config_namespace_clone,           },
-	{ "lxc.namespace.keep",            set_config_namespace_keep,              get_config_namespace_keep,              clr_config_namespace_keep,            },
-	{ "lxc.namespace.share",           set_config_namespace_share,             get_config_namespace_share,             clr_config_namespace_share,           },
-	{ "lxc.net.flags",                 set_config_net_flags,                   get_config_net_flags,                   clr_config_net_flags,                 },
-	{ "lxc.net.hwaddr",                set_config_net_hwaddr,                  get_config_net_hwaddr,                  clr_config_net_hwaddr,                },
-	{ "lxc.net.ipv4.address",          set_config_net_ipv4_address,            get_config_net_ipv4_address,            clr_config_net_ipv4_address,          },
-	{ "lxc.net.ipv4.gateway",          set_config_net_ipv4_gateway,            get_config_net_ipv4_gateway,            clr_config_net_ipv4_gateway,          },
-	{ "lxc.net.ipv6.address",          set_config_net_ipv6_address,            get_config_net_ipv6_address,            clr_config_net_ipv6_address,          },
-	{ "lxc.net.ipv6.gateway",          set_config_net_ipv6_gateway,            get_config_net_ipv6_gateway,            clr_config_net_ipv6_gateway,          },
-	{ "lxc.net.link",                  set_config_net_link,                    get_config_net_link,                    clr_config_net_link,                  },
-	{ "lxc.net.l2proxy",               set_config_net_l2proxy,                 get_config_net_l2proxy,                 clr_config_net_l2proxy,               },
-	{ "lxc.net.macvlan.mode",          set_config_net_macvlan_mode,            get_config_net_macvlan_mode,            clr_config_net_macvlan_mode,          },
-	{ "lxc.net.ipvlan.mode",           set_config_net_ipvlan_mode,             get_config_net_ipvlan_mode,             clr_config_net_ipvlan_mode,           },
-	{ "lxc.net.ipvlan.isolation",      set_config_net_ipvlan_isolation,        get_config_net_ipvlan_isolation,        clr_config_net_ipvlan_isolation,      },
-	{ "lxc.net.mtu",                   set_config_net_mtu,                     get_config_net_mtu,                     clr_config_net_mtu,                   },
-	{ "lxc.net.name",                  set_config_net_name,                    get_config_net_name,                    clr_config_net_name,                  },
-	{ "lxc.net.script.down",           set_config_net_script_down,             get_config_net_script_down,             clr_config_net_script_down,           },
-	{ "lxc.net.script.up",             set_config_net_script_up,               get_config_net_script_up,               clr_config_net_script_up,             },
-	{ "lxc.net.type",                  set_config_net_type,                    get_config_net_type,                    clr_config_net_type,                  },
-	{ "lxc.net.vlan.id",               set_config_net_vlan_id,                 get_config_net_vlan_id,                 clr_config_net_vlan_id,               },
-	{ "lxc.net.veth.mode",             set_config_net_veth_mode,               get_config_net_veth_mode,               clr_config_net_veth_mode,             },
-	{ "lxc.net.veth.pair",             set_config_net_veth_pair,               get_config_net_veth_pair,               clr_config_net_veth_pair,             },
-	{ "lxc.net.veth.ipv4.route",       set_config_net_veth_ipv4_route,         get_config_net_veth_ipv4_route,         clr_config_net_veth_ipv4_route,       },
-	{ "lxc.net.veth.ipv6.route",       set_config_net_veth_ipv6_route,         get_config_net_veth_ipv6_route,         clr_config_net_veth_ipv6_route,       },
-	{ "lxc.net.",                      set_config_net_nic,                     get_config_net_nic,                     clr_config_net_nic,                   },
-	{ "lxc.net",                       set_config_net,                         get_config_net,                         clr_config_net,                       },
-	{ "lxc.no_new_privs",	           set_config_no_new_privs,                get_config_no_new_privs,                clr_config_no_new_privs,              },
-	{ "lxc.prlimit",                   set_config_prlimit,                     get_config_prlimit,                     clr_config_prlimit,                   },
-	{ "lxc.pty.max",                   set_config_pty_max,                     get_config_pty_max,                     clr_config_pty_max,                   },
-	{ "lxc.rootfs.managed",            set_config_rootfs_managed,              get_config_rootfs_managed,              clr_config_rootfs_managed,            },
-	{ "lxc.rootfs.mount",              set_config_rootfs_mount,                get_config_rootfs_mount,                clr_config_rootfs_mount,              },
-	{ "lxc.rootfs.options",            set_config_rootfs_options,              get_config_rootfs_options,              clr_config_rootfs_options,            },
-	{ "lxc.rootfs.path",               set_config_rootfs_path,                 get_config_rootfs_path,                 clr_config_rootfs_path,               },
-	{ "lxc.seccomp.allow_nesting",     set_config_seccomp_allow_nesting,       get_config_seccomp_allow_nesting,       clr_config_seccomp_allow_nesting,     },
-	{ "lxc.seccomp.notify.cookie",     set_config_seccomp_notify_cookie,       get_config_seccomp_notify_cookie,       clr_config_seccomp_notify_cookie,     },
-	{ "lxc.seccomp.notify.proxy",      set_config_seccomp_notify_proxy,        get_config_seccomp_notify_proxy,        clr_config_seccomp_notify_proxy,      },
-	{ "lxc.seccomp.profile",           set_config_seccomp_profile,             get_config_seccomp_profile,             clr_config_seccomp_profile,           },
-	{ "lxc.selinux.context.keyring",   set_config_selinux_context_keyring,     get_config_selinux_context_keyring,     clr_config_selinux_context_keyring    },
-	{ "lxc.selinux.context",           set_config_selinux_context,             get_config_selinux_context,             clr_config_selinux_context,           },
-	{ "lxc.signal.halt",               set_config_signal_halt,                 get_config_signal_halt,                 clr_config_signal_halt,               },
-	{ "lxc.signal.reboot",             set_config_signal_reboot,               get_config_signal_reboot,               clr_config_signal_reboot,             },
-	{ "lxc.signal.stop",               set_config_signal_stop,                 get_config_signal_stop,                 clr_config_signal_stop,               },
-	{ "lxc.start.auto",                set_config_start,                       get_config_start,                       clr_config_start,                     },
-	{ "lxc.start.delay",               set_config_start,                       get_config_start,                       clr_config_start,                     },
-	{ "lxc.start.order",               set_config_start,                       get_config_start,                       clr_config_start,                     },
-	{ "lxc.tty.dir",                   set_config_tty_dir,                     get_config_tty_dir,                     clr_config_tty_dir,                   },
-	{ "lxc.tty.max",                   set_config_tty_max,                     get_config_tty_max,                     clr_config_tty_max,                   },
-	{ "lxc.uts.name",                  set_config_uts_name,                    get_config_uts_name,                    clr_config_uts_name,                  },
-	{ "lxc.sysctl",                    set_config_sysctl,                      get_config_sysctl,                      clr_config_sysctl,                    },
-	{ "lxc.proc",                      set_config_proc,                        get_config_proc,                        clr_config_proc,                      },
+	{ "lxc.arch",                       true,  set_config_personality,                get_config_personality,                clr_config_personality,                },
+	{ "lxc.apparmor.profile",           true,  set_config_apparmor_profile,           get_config_apparmor_profile,           clr_config_apparmor_profile,           },
+	{ "lxc.apparmor.allow_incomplete",  true,  set_config_apparmor_allow_incomplete,  get_config_apparmor_allow_incomplete,  clr_config_apparmor_allow_incomplete,  },
+	{ "lxc.apparmor.allow_nesting",     true,  set_config_apparmor_allow_nesting,     get_config_apparmor_allow_nesting,     clr_config_apparmor_allow_nesting,     },
+	{ "lxc.apparmor.raw",               true,  set_config_apparmor_raw,               get_config_apparmor_raw,               clr_config_apparmor_raw,               },
+	{ "lxc.autodev.tmpfs.size",         true,  set_config_autodev_tmpfs_size,         get_config_autodev_tmpfs_size,         clr_config_autodev_tmpfs_size,         },
+	{ "lxc.autodev",                    true,  set_config_autodev,                    get_config_autodev,                    clr_config_autodev,                    },
+	{ "lxc.cap.drop",                   true,  set_config_cap_drop,                   get_config_cap_drop,                   clr_config_cap_drop,                   },
+	{ "lxc.cap.keep",                   true,  set_config_cap_keep,                   get_config_cap_keep,                   clr_config_cap_keep,                   },
+	{ "lxc.cgroup2",                    false, set_config_cgroup2_controller,         get_config_cgroup2_controller,         clr_config_cgroup2_controller,         },
+	{ "lxc.cgroup.dir.monitor.pivot",   true,  set_config_cgroup_monitor_pivot_dir,   get_config_cgroup_monitor_pivot_dir,   clr_config_cgroup_monitor_pivot_dir,   },
+	{ "lxc.cgroup.dir.monitor",         true,  set_config_cgroup_monitor_dir,         get_config_cgroup_monitor_dir,         clr_config_cgroup_monitor_dir,         },
+	{ "lxc.cgroup.dir.container.inner", true,  set_config_cgroup_container_inner_dir, get_config_cgroup_container_inner_dir, clr_config_cgroup_container_inner_dir, },
+	{ "lxc.cgroup.dir.container",       true,  set_config_cgroup_container_dir,       get_config_cgroup_container_dir,       clr_config_cgroup_container_dir,       },
+	{ "lxc.cgroup.dir",                 true,  set_config_cgroup_dir,                 get_config_cgroup_dir,                 clr_config_cgroup_dir,                 },
+	{ "lxc.cgroup.relative",            true,  set_config_cgroup_relative,            get_config_cgroup_relative,            clr_config_cgroup_relative,            },
+	{ "lxc.cgroup",                     false, set_config_cgroup_controller,          get_config_cgroup_controller,          clr_config_cgroup_controller,          },
+	{ "lxc.console.buffer.size",        true,  set_config_console_buffer_size,        get_config_console_buffer_size,        clr_config_console_buffer_size,        },
+	{ "lxc.console.logfile",            true,  set_config_console_logfile,            get_config_console_logfile,            clr_config_console_logfile,            },
+	{ "lxc.console.path",               true,  set_config_console_path,               get_config_console_path,               clr_config_console_path,               },
+	{ "lxc.console.rotate",             true,  set_config_console_rotate,             get_config_console_rotate,             clr_config_console_rotate,             },
+	{ "lxc.console.size",               true,  set_config_console_size,               get_config_console_size,               clr_config_console_size,               },
+	{ "lxc.sched.core",		    true,  set_config_sched_core,		  get_config_sched_core,                 clr_config_sched_core,                 },
+	{ "lxc.environment",                true,  set_config_environment,                get_config_environment,                clr_config_environment,                },
+	{ "lxc.ephemeral",                  true,  set_config_ephemeral,                  get_config_ephemeral,                  clr_config_ephemeral,                  },
+	{ "lxc.execute.cmd",                true,  set_config_execute_cmd,                get_config_execute_cmd,                clr_config_execute_cmd,                },
+	{ "lxc.group",                      true,  set_config_group,                      get_config_group,                      clr_config_group,                      },
+	{ "lxc.hook.autodev",               true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.hook.clone",                 true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.hook.destroy",               true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.hook.mount",                 true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.hook.post-stop",             true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.hook.pre-mount",             true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.hook.pre-start",             true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.hook.start",                 true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.hook.start-host",            true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.hook.stop",                  true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.hook.version",               true,  set_config_hooks_version,              get_config_hooks_version,              clr_config_hooks_version,              },
+	{ "lxc.hook",                       true,  set_config_hooks,                      get_config_hooks,                      clr_config_hooks,                      },
+	{ "lxc.idmap",                      true,  set_config_idmaps,                     get_config_idmaps,                     clr_config_idmaps,                     },
+	{ "lxc.include",                    true,  set_config_includefiles,               get_config_includefiles,               clr_config_includefiles,               },
+	{ "lxc.init.cmd",                   true,  set_config_init_cmd,                   get_config_init_cmd,                   clr_config_init_cmd,                   },
+	{ "lxc.init.gid",                   true,  set_config_init_gid,                   get_config_init_gid,                   clr_config_init_gid,                   },
+	{ "lxc.init.groups",                true,  set_config_init_groups,                get_config_init_groups,                clr_config_init_groups,                },
+	{ "lxc.init.uid",                   true,  set_config_init_uid,                   get_config_init_uid,                   clr_config_init_uid,                   },
+	{ "lxc.init.cwd",                   true,  set_config_init_cwd,                   get_config_init_cwd,                   clr_config_init_cwd,                   },
+	{ "lxc.keyring.session",            true,  set_config_keyring_session,            get_config_keyring_session,            clr_config_keyring_session             },
+	{ "lxc.log.file",                   true,  set_config_log_file,                   get_config_log_file,                   clr_config_log_file,                   },
+	{ "lxc.log.level",                  true,  set_config_log_level,                  get_config_log_level,                  clr_config_log_level,                  },
+	{ "lxc.log.syslog",                 true,  set_config_log_syslog,                 get_config_log_syslog,                 clr_config_log_syslog,                 },
+	{ "lxc.monitor.unshare",            true,  set_config_monitor,                    get_config_monitor,                    clr_config_monitor,                    },
+	{ "lxc.monitor.signal.pdeath",      true,  set_config_monitor_signal_pdeath,      get_config_monitor_signal_pdeath,      clr_config_monitor_signal_pdeath,      },
+	{ "lxc.mount.auto",                 true,  set_config_mount_auto,                 get_config_mount_auto,                 clr_config_mount_auto,                 },
+	{ "lxc.mount.entry",                true,  set_config_mount,                      get_config_mount,                      clr_config_mount,                      },
+	{ "lxc.mount.fstab",                true,  set_config_mount_fstab,                get_config_mount_fstab,                clr_config_mount_fstab,                },
+	{ "lxc.namespace.clone",            true,  set_config_namespace_clone,            get_config_namespace_clone,            clr_config_namespace_clone,            },
+	{ "lxc.namespace.keep",             true,  set_config_namespace_keep,             get_config_namespace_keep,             clr_config_namespace_keep,             },
+	{ "lxc.namespace.share.",           false, set_config_namespace_share,            get_config_namespace_share,            clr_config_namespace_share,            },
+	{ "lxc.time.offset.boot",           true,  set_config_time_offset_boot,           get_config_time_offset_boot,           clr_config_time_offset_boot,           },
+	{ "lxc.time.offset.monotonic",      true,  set_config_time_offset_monotonic,      get_config_time_offset_monotonic,      clr_config_time_offset_monotonic,      },
+	{ "lxc.net.",                       false, set_config_jump_table_net,             get_config_jump_table_net,             clr_config_jump_table_net,             },
+	{ "lxc.net",                        true,  set_config_net,                        get_config_net,                        clr_config_net,                        },
+	{ "lxc.no_new_privs",	            true,  set_config_no_new_privs,               get_config_no_new_privs,               clr_config_no_new_privs,               },
+	{ "lxc.prlimit",                    false, set_config_prlimit,                    get_config_prlimit,                    clr_config_prlimit,                    },
+	{ "lxc.pty.max",                    true,  set_config_pty_max,                    get_config_pty_max,                    clr_config_pty_max,                    },
+	{ "lxc.rootfs.managed",             true,  set_config_rootfs_managed,             get_config_rootfs_managed,             clr_config_rootfs_managed,             },
+	{ "lxc.rootfs.mount",               true,  set_config_rootfs_mount,               get_config_rootfs_mount,               clr_config_rootfs_mount,               },
+	{ "lxc.rootfs.options",             true,  set_config_rootfs_options,             get_config_rootfs_options,             clr_config_rootfs_options,             },
+	{ "lxc.rootfs.path",                true,  set_config_rootfs_path,                get_config_rootfs_path,                clr_config_rootfs_path,                },
+	{ "lxc.seccomp.allow_nesting",      true,  set_config_seccomp_allow_nesting,      get_config_seccomp_allow_nesting,      clr_config_seccomp_allow_nesting,      },
+	{ "lxc.seccomp.notify.cookie",      true,  set_config_seccomp_notify_cookie,      get_config_seccomp_notify_cookie,      clr_config_seccomp_notify_cookie,      },
+	{ "lxc.seccomp.notify.proxy",       true,  set_config_seccomp_notify_proxy,       get_config_seccomp_notify_proxy,       clr_config_seccomp_notify_proxy,       },
+	{ "lxc.seccomp.profile",            true,  set_config_seccomp_profile,            get_config_seccomp_profile,            clr_config_seccomp_profile,            },
+	{ "lxc.selinux.context.keyring",    true,  set_config_selinux_context_keyring,    get_config_selinux_context_keyring,    clr_config_selinux_context_keyring     },
+	{ "lxc.selinux.context",            true,  set_config_selinux_context,            get_config_selinux_context,            clr_config_selinux_context,            },
+	{ "lxc.signal.halt",                true,  set_config_signal_halt,                get_config_signal_halt,                clr_config_signal_halt,                },
+	{ "lxc.signal.reboot",              true,  set_config_signal_reboot,              get_config_signal_reboot,              clr_config_signal_reboot,              },
+	{ "lxc.signal.stop",                true,  set_config_signal_stop,                get_config_signal_stop,                clr_config_signal_stop,                },
+	{ "lxc.start.auto",                 true,  set_config_start,                      get_config_start,                      clr_config_start,                      },
+	{ "lxc.start.delay",                true,  set_config_start,                      get_config_start,                      clr_config_start,                      },
+	{ "lxc.start.order",                true,  set_config_start,                      get_config_start,                      clr_config_start,                      },
+	{ "lxc.tty.dir",                    true,  set_config_tty_dir,                    get_config_tty_dir,                    clr_config_tty_dir,                    },
+	{ "lxc.tty.max",                    true,  set_config_tty_max,                    get_config_tty_max,                    clr_config_tty_max,                    },
+	{ "lxc.uts.name",                   true,  set_config_uts_name,                   get_config_uts_name,                   clr_config_uts_name,                   },
+	{ "lxc.sysctl",                     false, set_config_sysctl,                     get_config_sysctl,                     clr_config_sysctl,                     },
+	{ "lxc.proc",                       false, set_config_proc,                       get_config_proc,                       clr_config_proc,                       },
 };
 
-static const size_t config_jump_table_size = sizeof(config_jump_table) / sizeof(struct lxc_config_t);
+static struct lxc_config_t unsupported_config_key = {
+	NULL,
+	false,
+	set_config_unsupported_key,
+	get_config_unsupported_key,
+	clr_config_unsupported_key,
+};
 
-struct lxc_config_t *lxc_get_config(const char *key)
+struct lxc_config_net_t {
+	LXC_CONFIG_MEMBERS;
+};
+
+static struct lxc_config_net_t config_jump_table_net = {
+	/* If a longer key is added please update. */
+	#define NETWORK_SUBKEY_SIZE_MAX (STRLITERALLEN("veth.vlan.tagged.id") * 2)
+	{ "flags",                  true,  set_config_net_flags,                  get_config_net_flags,                  clr_config_net_flags,                  },
+	{ "hwaddr",                 true,  set_config_net_hwaddr,                 get_config_net_hwaddr,                 clr_config_net_hwaddr,                 },
+	{ "ipv4.address",           true,  set_config_net_ipv4_address,           get_config_net_ipv4_address,           clr_config_net_ipv4_address,           },
+	{ "ipv4.gateway",           true,  set_config_net_ipv4_gateway,           get_config_net_ipv4_gateway,           clr_config_net_ipv4_gateway,           },
+	{ "ipv6.address",           true,  set_config_net_ipv6_address,           get_config_net_ipv6_address,           clr_config_net_ipv6_address,           },
+	{ "ipv6.gateway",           true,  set_config_net_ipv6_gateway,           get_config_net_ipv6_gateway,           clr_config_net_ipv6_gateway,           },
+	{ "link",                   true,  set_config_net_link,                   get_config_net_link,                   clr_config_net_link,                   },
+	{ "l2proxy",                true,  set_config_net_l2proxy,                get_config_net_l2proxy,                clr_config_net_l2proxy,                },
+	{ "macvlan.mode",           true,  set_config_net_macvlan_mode,           get_config_net_macvlan_mode,           clr_config_net_macvlan_mode,           },
+	{ "ipvlan.mode",            true,  set_config_net_ipvlan_mode,            get_config_net_ipvlan_mode,            clr_config_net_ipvlan_mode,            },
+	{ "ipvlan.isolation",       true,  set_config_net_ipvlan_isolation,       get_config_net_ipvlan_isolation,       clr_config_net_ipvlan_isolation,       },
+	{ "mtu",                    true,  set_config_net_mtu,                    get_config_net_mtu,                    clr_config_net_mtu,                    },
+	{ "name",                   true,  set_config_net_name,                   get_config_net_name,                   clr_config_net_name,                   },
+	{ "script.down",            true,  set_config_net_script_down,            get_config_net_script_down,            clr_config_net_script_down,            },
+	{ "script.up",              true,  set_config_net_script_up,              get_config_net_script_up,              clr_config_net_script_up,              },
+	{ "type",                   true,  set_config_net_type,                   get_config_net_type,                   clr_config_net_type,                   },
+	{ "vlan.id",                true,  set_config_net_vlan_id,                get_config_net_vlan_id,                clr_config_net_vlan_id,                },
+	{ "veth.mode",              true,  set_config_net_veth_mode,              get_config_net_veth_mode,              clr_config_net_veth_mode,              },
+	{ "veth.n_rxqueues",        true,  set_config_net_veth_n_rxqueues,        get_config_net_veth_n_rxqueues,        clr_config_net_veth_n_rxqueues,        },
+	{ "veth.n_txqueues",        true,  set_config_net_veth_n_txqueues,        get_config_net_veth_n_txqueues,        clr_config_net_veth_n_txqueues,        },
+	{ "veth.pair",              true,  set_config_net_veth_pair,              get_config_net_veth_pair,              clr_config_net_veth_pair,              },
+	{ "veth.ipv4.route",        true,  set_config_net_veth_ipv4_route,        get_config_net_veth_ipv4_route,        clr_config_net_veth_ipv4_route,        },
+	{ "veth.ipv6.route",        true,  set_config_net_veth_ipv6_route,        get_config_net_veth_ipv6_route,        clr_config_net_veth_ipv6_route,        },
+	{ "veth.vlan.id",           true,  set_config_net_veth_vlan_id,           get_config_net_veth_vlan_id,           clr_config_net_veth_vlan_id,           },
+	{ "veth.vlan.tagged.id",    true,  set_config_net_veth_vlan_tagged_id,    get_config_net_veth_vlan_tagged_id,    clr_config_net_veth_vlan_tagged_id,    },
+};
+
+static struct lxc_config_net_t unsupported_config_net_key = {
+	NULL,
+	false,
+	set_config_unsupported_key,
+	get_config_unsupported_key,
+	clr_config_unsupported_key,
+};
+
+struct lxc_config_t *lxc_get_config_exact(const char *key)
 {
 	size_t i;
 
-	for (i = 0; i < config_jump_table_size; i++)
-		if (!strncmp(config_jump_tablei.name, key, strlen(config_jump_tablei.name)))
+	for (i = 0; i < ARRAY_SIZE(config_jump_table); i++)
+		if (strequal(config_jump_tablei.name, key))
 			return &config_jump_tablei;
 
 	return NULL;
 }
 
+/* Assume a reasonable subkey size limit. */
+#define LXC_SUBKEY_LEN_MAX 256
+
+static inline int match_config_item(const struct lxc_config_t *entry, const char *key)
+{
+	size_t len;
+
+	if (entry->strict)
+		return strequal(entry->name, key);
+
+	/* There should be no subkey longer than this. */
+	len = strnlen(entry->name, LXC_SUBKEY_LEN_MAX);
+	if (len == LXC_SUBKEY_LEN_MAX)
+		return error_ret(-E2BIG, "Excessive subkey length");
+
+	return strnequal(entry->name, key, len);
+}
+
+struct lxc_config_t *lxc_get_config(const char *key)
+{
+	for (size_t i = 0; i < ARRAY_SIZE(config_jump_table); i++) {
+		struct lxc_config_t *cur = &config_jump_tablei;
+
+		switch (match_config_item(cur, key)) {
+		case 0:
+			continue;
+		case -E2BIG:
+			return &unsupported_config_key;
+		}
+
+		return cur;
+	}
+
+	return &unsupported_config_key;
+}
+
+static inline bool match_config_net_item(const struct lxc_config_net_t *entry,
+					 const char *key)
+{
+	if (entry->strict)
+		return strequal(entry->name, key);
+	return strnequal(entry->name, key, strlen(entry->name));
+}
+
+static struct lxc_config_net_t *lxc_get_config_net(const char *key)
+{
+	for (size_t i = 0; i < ARRAY_SIZE(config_jump_table_net); i++) {
+		struct lxc_config_net_t *cur = &config_jump_table_neti;
+
+		if (!match_config_net_item(cur, key))
+			continue;
+
+		return cur;
+	}
+
+	return &unsupported_config_net_key;
+}
+
 static int set_config_net(const char *key, const char *value,
 			  struct lxc_conf *lxc_conf, void *data)
 {
-	if (!lxc_config_value_empty(value)) {
-		ERROR("lxc.net must not have a value");
-		return -1;
-	}
+	if (!lxc_config_value_empty(value))
+		return syserror_set(-EINVAL, "lxc.net must not have a value");
 
 	return clr_config_net(key, lxc_conf, data);
 }
@@ -290,39 +409,42 @@
 {
 	struct lxc_netdev *netdev = data;
 
-	if (lxc_config_value_empty(value))
-		return clr_config_net_type(key, lxc_conf, data);
-
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	if (strcmp(value, "veth") == 0) {
+	clr_config_net_type(key, lxc_conf, data);
+	if (lxc_config_value_empty(value))
+		return 0;
+
+	if (strequal(value, "veth")) {
 		netdev->type = LXC_NET_VETH;
-		lxc_list_init(&netdev->priv.veth_attr.ipv4_routes);
-		lxc_list_init(&netdev->priv.veth_attr.ipv6_routes);
+		INIT_LIST_HEAD(&netdev->priv.veth_attr.ipv4_routes);
+		INIT_LIST_HEAD(&netdev->priv.veth_attr.ipv6_routes);
+		lxc_list_init(&netdev->priv.veth_attr.vlan_tagged_ids);
 		if (!lxc_veth_flag_to_mode(netdev->priv.veth_attr.mode))
 			lxc_veth_mode_to_flag(&netdev->priv.veth_attr.mode, "bridge");
-	} else if (strcmp(value, "macvlan") == 0) {
+	} else if (strequal(value, "macvlan")) {
 		netdev->type = LXC_NET_MACVLAN;
 		if (!lxc_macvlan_flag_to_mode(netdev->priv.veth_attr.mode))
 			lxc_macvlan_mode_to_flag(&netdev->priv.macvlan_attr.mode, "private");
-	} else if (strcmp(value, "ipvlan") == 0) {
+	} else if (strequal(value, "ipvlan")) {
 		netdev->type = LXC_NET_IPVLAN;
 		if (!lxc_ipvlan_flag_to_mode(netdev->priv.ipvlan_attr.mode))
 			lxc_ipvlan_mode_to_flag(&netdev->priv.ipvlan_attr.mode, "l3");
 		if (!lxc_ipvlan_flag_to_isolation(netdev->priv.ipvlan_attr.isolation))
 			lxc_ipvlan_isolation_to_flag(&netdev->priv.ipvlan_attr.isolation, "bridge");
-	} else if (strcmp(value, "vlan") == 0) {
+	} else if (strequal(value, "vlan")) {
 		netdev->type = LXC_NET_VLAN;
-	} else if (strcmp(value, "phys") == 0) {
+	} else if (strequal(value, "phys")) {
 		netdev->type = LXC_NET_PHYS;
-	} else if (strcmp(value, "empty") == 0) {
+	} else if (strequal(value, "empty")) {
 		netdev->type = LXC_NET_EMPTY;
-	} else if (strcmp(value, "none") == 0) {
+		/* We don't support custom loopback device names. */
+		(void)strlcpy(netdev->name, "lo", IFNAMSIZ);
+	} else if (strequal(value, "none")) {
 		netdev->type = LXC_NET_NONE;
 	} else {
-		ERROR("Invalid network type %s", value);
-		return -1;
+		return log_error(-1, "Invalid network type %s", value);
 	}
 
 	return 0;
@@ -333,12 +455,12 @@
 {
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (lxc_config_value_empty(value))
 		return clr_config_net_flags(key, lxc_conf, data);
 
-	if (!netdev)
-		return -1;
-
 	netdev->flags |= IFF_UP;
 
 	return 0;
@@ -347,17 +469,16 @@
 static int create_matched_ifnames(const char *value, struct lxc_conf *lxc_conf,
 				  struct lxc_netdev *netdev)
 {
-	struct netns_ifaddrs *ifaddr, *ifa;
+	call_cleaner(netns_freeifaddrs) struct netns_ifaddrs *ifaddr = NULL;
+	struct netns_ifaddrs *ifa;
 	int n;
 	int ret = 0;
 	const char *type_key = "lxc.net.type";
 	const char *link_key = "lxc.net.link";
 	const char *tmpvalue = "phys";
 
-	if (netns_getifaddrs(&ifaddr, -1, &(bool){false}) < 0) {
-		SYSERROR("Failed to get network interfaces");
-		return -1;
-	}
+	if (netns_getifaddrs(&ifaddr, -1, &(bool){false}) < 0)
+		return log_error_errno(-1, errno, "Failed to get network interfaces");
 
 	for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
 		if (!ifa->ifa_addr)
@@ -366,7 +487,7 @@
 		if (ifa->ifa_addr->sa_family != AF_PACKET)
 			continue;
 
-		if (!strncmp(value, ifa->ifa_name, strlen(value) - 1)) {
+		if (strnequal(value, ifa->ifa_name, strlen(value) - 1)) {
 			ret = set_config_net_type(type_key, tmpvalue, lxc_conf,
 						  netdev);
 			if (!ret) {
@@ -383,9 +504,6 @@
 		}
 	}
 
-	netns_freeifaddrs(ifaddr);
-	ifaddr = NULL;
-
 	return ret;
 }
 
@@ -395,12 +513,12 @@
 	struct lxc_netdev *netdev = data;
 	int ret = 0;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (lxc_config_value_empty(value))
 		return clr_config_net_link(key, lxc_conf, data);
 
-	if (!netdev)
-		return -1;
-
 	if (valuestrlen(value) - 1 == '+' && netdev->type == LXC_NET_PHYS)
 		ret = create_matched_ifnames(value, lxc_conf, netdev);
 	else
@@ -416,15 +534,15 @@
 	unsigned int val = 0;
 	int ret;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (lxc_config_value_empty(value))
 		return clr_config_net_l2proxy(key, lxc_conf, data);
 
-	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
-
 	ret = lxc_safe_uint(value, &val);
 	if (ret < 0)
-		return ret_set_errno(-1, -ret);
+		return ret_errno(ret);
 
 	switch (val) {
 	case 0:
@@ -435,7 +553,7 @@
 		return 0;
 	}
 
-	return ret_set_errno(-1, EINVAL);
+	return ret_errno(EINVAL);
 }
 
 static int set_config_net_name(const char *key, const char *value,
@@ -443,12 +561,12 @@
 {
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (lxc_config_value_empty(value))
 		return clr_config_net_name(key, lxc_conf, data);
 
-	if (!netdev)
-		return -1;
-
 	return network_ifname(netdev->name, value, sizeof(netdev->name));
 }
 
@@ -458,27 +576,157 @@
 {
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
+
 	if (lxc_config_value_empty(value))
 		return clr_config_net_veth_mode(key, lxc_conf, data);
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
 	return lxc_veth_mode_to_flag(&netdev->priv.veth_attr.mode, value);
 }
 
+static int set_config_net_veth_n_rxqueues(const char *key, const char *value,
+					  struct lxc_conf *lxc_conf, void *data)
+{
+	int n_rxqueues;
+	struct lxc_netdev *netdev = data;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
+
+	if (lxc_config_value_empty(value))
+		return clr_config_net_veth_n_rxqueues(key, lxc_conf, data);
+
+	if (lxc_safe_int(value, &n_rxqueues))
+		return ret_errno(EINVAL);
+
+	if (n_rxqueues <= 0)
+		return ret_errno(EINVAL);
+
+	netdev->priv.veth_attr.n_rxqueues = n_rxqueues;
+	return 0;
+}
+
+static int set_config_net_veth_n_txqueues(const char *key, const char *value,
+				     struct lxc_conf *lxc_conf, void *data)
+{
+	int n_txqueues;
+	struct lxc_netdev *netdev = data;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
+
+	if (lxc_config_value_empty(value))
+		return clr_config_net_veth_n_txqueues(key, lxc_conf, data);
+
+	if (lxc_safe_int(value, &n_txqueues))
+		return ret_errno(EINVAL);
+
+	if (n_txqueues <= 0)
+		return ret_errno(EINVAL);
+
+	netdev->priv.veth_attr.n_txqueues = n_txqueues;
+	return 0;
+}
+
 static int set_config_net_veth_pair(const char *key, const char *value,
 				    struct lxc_conf *lxc_conf, void *data)
 {
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
+
 	if (lxc_config_value_empty(value))
 		return clr_config_net_veth_pair(key, lxc_conf, data);
 
+	return network_ifname(netdev->priv.veth_attr.pair, value,
+			      sizeof(netdev->priv.veth_attr.pair));
+}
+
+static int set_config_net_veth_vlan_id(const char *key, const char *value,
+				       struct lxc_conf *lxc_conf, void *data)
+{
+	int ret;
+	struct lxc_netdev *netdev = data;
+
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
+
+	if (lxc_config_value_empty(value))
+		return clr_config_net_veth_vlan_id(key, lxc_conf, data);
+
+	if (strequal(value, "none")) {
+		netdev->priv.veth_attr.vlan_id = BRIDGE_VLAN_NONE;
+	} else {
+		unsigned short vlan_id;
+
+		ret = get_u16(&vlan_id, value, 0);
+		if (ret < 0)
+			return ret_errno(EINVAL);
+
+		if (vlan_id > BRIDGE_VLAN_ID_MAX)
+			return ret_errno(EINVAL);
+
+		netdev->priv.veth_attr.vlan_id = vlan_id;
+	}
+
+	netdev->priv.veth_attr.vlan_id_set = true;
+	return 0;
+}
+
+static int set_config_net_veth_vlan_tagged_id(const char *key, const char *value,
+					      struct lxc_conf *lxc_conf,
+					      void *data)
+{
+	__do_free struct lxc_list *list = NULL;
+	int ret;
+	unsigned short vlan_id;
+	struct lxc_netdev *netdev = data;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
+
+	if (lxc_config_value_empty(value))
+		return clr_config_net_veth_vlan_tagged_id(key, lxc_conf, data);
+
+	ret = get_u16(&vlan_id, value, 0);
+	if (ret < 0)
+		return ret_errno(EINVAL);
+
+	if (vlan_id > BRIDGE_VLAN_ID_MAX)
+		return ret_errno(EINVAL);
 
-	return network_ifname(netdev->priv.veth_attr.pair, value, sizeof(netdev->priv.veth_attr.pair));
+	list = lxc_list_new();
+	if (!list)
+		return ret_errno(ENOMEM);
+
+	list->elem = UINT_TO_PTR(vlan_id);
+
+	lxc_list_add_tail(&netdev->priv.veth_attr.vlan_tagged_ids, move_ptr(list));
+
+	return 0;
 }
 
 static int set_config_net_macvlan_mode(const char *key, const char *value,
@@ -486,49 +734,48 @@
 {
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_MACVLAN)
+		return ret_errno(EINVAL);
+
 	if (lxc_config_value_empty(value))
 		return clr_config_net_macvlan_mode(key, lxc_conf, data);
 
-	if (!netdev)
-		return -1;
-
 	return lxc_macvlan_mode_to_flag(&netdev->priv.macvlan_attr.mode, value);
 }
 
 static int set_config_net_ipvlan_mode(const char *key, const char *value,
-				       struct lxc_conf *lxc_conf, void *data)
+				      struct lxc_conf *lxc_conf, void *data)
 {
 	struct lxc_netdev *netdev = data;
 
-	if (lxc_config_value_empty(value))
-		return clr_config_net_ipvlan_mode(key, lxc_conf, data);
-
 	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
-	if (netdev->type != LXC_NET_IPVLAN) {
-		SYSERROR("Invalid ipvlan mode \"%s\", can only be used with ipvlan network", value);
-		return ret_set_errno(-1, EINVAL);
-	}
+	if (netdev->type != LXC_NET_IPVLAN)
+		return syserror_set(-EINVAL, "Invalid ipvlan mode \"%s\", can only be used with ipvlan network", value);
+
+	if (lxc_config_value_empty(value))
+		return clr_config_net_ipvlan_mode(key, lxc_conf, data);
 
 	return lxc_ipvlan_mode_to_flag(&netdev->priv.ipvlan_attr.mode, value);
 }
 
 static int set_config_net_ipvlan_isolation(const char *key, const char *value,
-				       struct lxc_conf *lxc_conf, void *data)
+					   struct lxc_conf *lxc_conf, void *data)
 {
 	struct lxc_netdev *netdev = data;
 
-	if (lxc_config_value_empty(value))
-		return clr_config_net_ipvlan_isolation(key, lxc_conf, data);
-
 	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
-	if (netdev->type != LXC_NET_IPVLAN) {
-		SYSERROR("Invalid ipvlan isolation \"%s\", can only be used with ipvlan network", value);
-		return ret_set_errno(-1, EINVAL);
-	}
+	if (netdev->type != LXC_NET_IPVLAN)
+		return syserror_set(-EINVAL, "Invalid ipvlan isolation \"%s\", can only be used with ipvlan network", value);
+
+	if (lxc_config_value_empty(value))
+		return clr_config_net_ipvlan_isolation(key, lxc_conf, data);
 
 	return lxc_ipvlan_isolation_to_flag(&netdev->priv.ipvlan_attr.isolation, value);
 }
@@ -536,28 +783,23 @@
 static int set_config_net_hwaddr(const char *key, const char *value,
 				 struct lxc_conf *lxc_conf, void *data)
 {
+	__do_free char *new_value = NULL;
 	struct lxc_netdev *netdev = data;
-	char *new_value;
-
-	if (lxc_config_value_empty(value))
-		return clr_config_net_hwaddr(key, lxc_conf, data);
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
+
+	clr_config_net_hwaddr(key, lxc_conf, data);
+	if (lxc_config_value_empty(value))
+		return 0;
 
 	new_value = strdup(value);
 	if (!new_value)
-		return -1;
+		return ret_errno(ENOMEM);
 
 	rand_complete_hwaddr(new_value);
-
-	if (lxc_config_value_empty(new_value)) {
-		free(new_value);
-		netdev->hwaddr = NULL;
-		return 0;
-	}
-
-	netdev->hwaddr = new_value;
+	if (!lxc_config_value_empty(new_value))
+		netdev->hwaddr = move_ptr(new_value);
 
 	return 0;
 }
@@ -568,15 +810,18 @@
 	int ret;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VLAN)
+		return ret_errno(EINVAL);
+
 	if (lxc_config_value_empty(value))
 		return clr_config_net_vlan_id(key, lxc_conf, data);
 
-	if (!netdev)
-		return -1;
-
 	ret = get_u16(&netdev->priv.vlan_attr.vid, value, 0);
 	if (ret < 0)
-		return -1;
+		return ret;
 
 	return 0;
 }
@@ -586,11 +831,12 @@
 {
 	struct lxc_netdev *netdev = data;
 
-	if (lxc_config_value_empty(value))
-		return clr_config_net_mtu(key, lxc_conf, data);
-
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
+
+	clr_config_net_mtu(key, lxc_conf, data);
+	if (lxc_config_value_empty(value))
+		return 0;
 
 	return set_config_string_item(&netdev->mtu, value);
 }
@@ -598,39 +844,26 @@
 static int set_config_net_ipv4_address(const char *key, const char *value,
 				       struct lxc_conf *lxc_conf, void *data)
 {
+	__do_free char *addr = NULL;
+	__do_free struct lxc_inetdev *inetdev = NULL;
 	int ret;
 	struct lxc_netdev *netdev = data;
-	struct lxc_inetdev *inetdev;
-	struct lxc_list *list;
 	char *cursor, *slash;
-	char *addr = NULL, *bcast = NULL, *prefix = NULL;
+	char *bcast = NULL, *prefix = NULL;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
 
 	if (lxc_config_value_empty(value))
 		return clr_config_net_ipv4_address(key, lxc_conf, data);
 
-	if (!netdev)
-		return -1;
-
-	inetdev = malloc(sizeof(*inetdev));
+	inetdev = zalloc(sizeof(*inetdev));
 	if (!inetdev)
-		return -1;
-	memset(inetdev, 0, sizeof(*inetdev));
-
-	list = malloc(sizeof(*list));
-	if (!list) {
-		free(inetdev);
-		return -1;
-	}
-
-	lxc_list_init(list);
-	list->elem = inetdev;
+		return ret_errno(ENOMEM);
 
 	addr = strdup(value);
-	if (!addr) {
-		free(inetdev);
-		free(list);
-		return -1;
-	}
+	if (!addr)
+		return ret_errno(ENOMEM);
 
 	cursor = strstr(addr, " ");
 	if (cursor) {
@@ -645,49 +878,43 @@
 	}
 
 	ret = inet_pton(AF_INET, addr, &inetdev->addr);
-	if (!ret || ret < 0) {
-		SYSERROR("Invalid ipv4 address \"%s\"", value);
-		free(inetdev);
-		free(addr);
-		free(list);
-		return -1;
-	}
+	if (!ret || ret < 0)
+		return log_error_errno(-1, errno, "Invalid ipv4 address \"%s\"", value);
 
 	if (bcast) {
 		ret = inet_pton(AF_INET, bcast, &inetdev->bcast);
-		if (!ret || ret < 0) {
-			SYSERROR("Invalid ipv4 broadcast address \"%s\"", value);
-			free(inetdev);
-			free(list);
-			free(addr);
-			return -1;
-		}
+		if (!ret || ret < 0)
+			return log_error_errno(-1, errno, "Invalid ipv4 broadcast address \"%s\"", value);
 
 	}
 
 	/* No prefix specified, determine it from the network class. */
-	if (prefix) {
+	ret = 0;
+	if (prefix)
 		ret = lxc_safe_uint(prefix, &inetdev->prefix);
-		if (ret < 0) {
-			free(inetdev);
-			free(list);
-			free(addr);
-			return -1;
-		}
-	} else {
+	else
 		inetdev->prefix = config_ip_prefix(&inetdev->addr);
-	}
+	if (ret || inetdev->prefix > 32)
+		return ret_errno(EINVAL);
 
-	/* If no broadcast address, let compute one from the
-	 * prefix and address.
-	 */
+	/* If no broadcast address, compute one from the prefix and address. */
 	if (!bcast) {
-		inetdev->bcast.s_addr = inetdev->addr.s_addr;
-		inetdev->bcast.s_addr |= htonl(INADDR_BROADCAST >> inetdev->prefix);
-	}
+		/* 0<=inetdev->prefix<=32 */
+		switch (inetdev->prefix) {
+		case 32: /* single IPv4 network */
+			; /* fall thru */
+		case 31: /* RFC 3021 point to point network */
+			inetdev->bcast.s_addr = INADDR_ANY;
+			break;
 
-	lxc_list_add_tail(&netdev->ipv4, list);
-	free(addr);
+		default:
+			inetdev->bcast.s_addr |= htonl(INADDR_BROADCAST >> inetdev->prefix);
+			break;
+		}
+        }
+
+	list_add_tail(&inetdev->head, &netdev->ipv4_addresses);
+	move_ptr(inetdev);
 
 	return 0;
 }
@@ -697,37 +924,33 @@
 {
 	struct lxc_netdev *netdev = data;
 
-	if (lxc_config_value_empty(value))
-		return clr_config_net_ipv4_gateway(key, lxc_conf, data);
-
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	free(netdev->ipv4_gateway);
+	clr_config_net_ipv4_gateway(key, lxc_conf, data);
+	if (lxc_config_value_empty(value))
+		return 0;
 
-	if (strcmp(value, "auto") == 0) {
+	if (strequal(value, "auto")) {
 		netdev->ipv4_gateway = NULL;
 		netdev->ipv4_gateway_auto = true;
-	} else if (strcmp(value, "dev") == 0) {
+	} else if (strequal(value, "dev")) {
 		netdev->ipv4_gateway = NULL;
 		netdev->ipv4_gateway_auto = false;
 		netdev->ipv4_gateway_dev = true;
 	} else {
+		__do_free struct in_addr *gw = NULL;
 		int ret;
-		struct in_addr *gw;
 
-		gw = malloc(sizeof(*gw));
+		gw = zalloc(sizeof(*gw));
 		if (!gw)
-			return -1;
+			return ret_errno(ENOMEM);
 
 		ret = inet_pton(AF_INET, value, gw);
-		if (!ret || ret < 0) {
-			SYSERROR("Invalid ipv4 gateway address \"%s\"", value);
-			free(gw);
-			return -1;
-		}
+		if (!ret || ret < 0)
+			return log_error_errno(-1, errno, "Invalid ipv4 gateway address \"%s\"", value);
 
-		netdev->ipv4_gateway = gw;
+		netdev->ipv4_gateway = move_ptr(gw);
 		netdev->ipv4_gateway_auto = false;
 	}
 
@@ -735,64 +958,52 @@
 }
 
 static int set_config_net_veth_ipv4_route(const char *key, const char *value,
-				       struct lxc_conf *lxc_conf, void *data)
+					  struct lxc_conf *lxc_conf, void *data)
 {
 	__do_free char *valdup = NULL;
 	__do_free struct lxc_inetdev *inetdev = NULL;
-	__do_free struct lxc_list *list = NULL;
 	int ret;
 	char *netmask, *slash;
 	struct lxc_netdev *netdev = data;
 
-	if (lxc_config_value_empty(value))
-		return clr_config_net_veth_ipv4_route(key, lxc_conf, data);
-
 	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
-
-	if (netdev->type != LXC_NET_VETH) {
-		SYSERROR("Invalid ipv4 route \"%s\", can only be used with veth network", value);
-		return ret_set_errno(-1, EINVAL);
-	}
+		return ret_errno(EINVAL);
 
-	inetdev = malloc(sizeof(*inetdev));
-	if (!inetdev)
-		return -1;
-	memset(inetdev, 0, sizeof(*inetdev));
+	if (netdev->type != LXC_NET_VETH)
+		return syserror_set(-EINVAL, "Invalid ipv4 route \"%s\", can only be used with veth network", value);
 
-	list = malloc(sizeof(*list));
-	if (!list)
-		return -1;
+	if (lxc_config_value_empty(value))
+		return clr_config_net_veth_ipv4_route(key, lxc_conf, data);
 
-	lxc_list_init(list);
-	list->elem = inetdev;
+	inetdev = zalloc(sizeof(*inetdev));
+	if (!inetdev)
+		return ret_errno(ENOMEM);
 
 	valdup = strdup(value);
 	if (!valdup)
-		return -1;
+		return ret_errno(ENOMEM);
 
 	slash = strchr(valdup, '/');
 	if (!slash)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	*slash = '\0';
 	slash++;
 	if (*slash == '\0')
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	netmask = slash;
 
 	ret = lxc_safe_uint(netmask, &inetdev->prefix);
 	if (ret < 0 || inetdev->prefix > 32)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	ret = inet_pton(AF_INET, valdup, &inetdev->addr);
 	if (!ret || ret < 0)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
-	lxc_list_add_tail(&netdev->priv.veth_attr.ipv4_routes, list);
+	list_add_tail(&inetdev->head, &netdev->priv.veth_attr.ipv4_routes);
 	move_ptr(inetdev);
-	move_ptr(list);
 
 	return 0;
 }
@@ -800,38 +1011,25 @@
 static int set_config_net_ipv6_address(const char *key, const char *value,
 				       struct lxc_conf *lxc_conf, void *data)
 {
+	__do_free char *valdup = NULL;
+	__do_free struct lxc_inet6dev *inet6dev = NULL;
 	int ret;
 	struct lxc_netdev *netdev = data;
-	struct lxc_inet6dev *inet6dev;
-	struct lxc_list *list;
-	char *slash, *valdup, *netmask;
+	char *slash, *netmask;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
 
 	if (lxc_config_value_empty(value))
 		return clr_config_net_ipv6_address(key, lxc_conf, data);
 
-	if (!netdev)
-		return -1;
-
-	inet6dev = malloc(sizeof(*inet6dev));
+	inet6dev = zalloc(sizeof(*inet6dev));
 	if (!inet6dev)
-		return -1;
-	memset(inet6dev, 0, sizeof(*inet6dev));
-
-	list = malloc(sizeof(*list));
-	if (!list) {
-		free(inet6dev);
-		return -1;
-	}
-
-	lxc_list_init(list);
-	list->elem = inet6dev;
+		return ret_errno(ENOMEM);
 
 	valdup = strdup(value);
-	if (!valdup) {
-		free(list);
-		free(inet6dev);
-		return -1;
-	}
+	if (!valdup)
+		return ret_errno(ENOMEM);
 
 	inet6dev->prefix = 64;
 	slash = strstr(valdup, "/");
@@ -840,25 +1038,16 @@
 		netmask = slash + 1;
 
 		ret = lxc_safe_uint(netmask, &inet6dev->prefix);
-		if (ret < 0) {
-			free(list);
-			free(inet6dev);
-			free(valdup);
-			return -1;
-		}
+		if (ret < 0)
+			return ret;
 	}
 
 	ret = inet_pton(AF_INET6, valdup, &inet6dev->addr);
-	if (!ret || ret < 0) {
-		SYSERROR("Invalid ipv6 address \"%s\"", valdup);
-		free(list);
-		free(inet6dev);
-		free(valdup);
-		return -1;
-	}
+	if (!ret || ret < 0)
+		return log_error_errno(-EINVAL, EINVAL, "Invalid ipv6 address \"%s\"", valdup);
 
-	lxc_list_add_tail(&netdev->ipv6, list);
-	free(valdup);
+	list_add_tail(&inet6dev->head, &netdev->ipv6_addresses);
+	move_ptr(inet6dev);
 
 	return 0;
 }
@@ -868,37 +1057,34 @@
 {
 	struct lxc_netdev *netdev = data;
 
-	if (lxc_config_value_empty(value))
-		return clr_config_net_ipv6_gateway(key, lxc_conf, data);
-
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	free(netdev->ipv6_gateway);
+	clr_config_net_ipv6_gateway(key, lxc_conf, data);
+	if (lxc_config_value_empty(value))
+		return 0;
 
-	if (strcmp(value, "auto") == 0) {
+	if (strequal(value, "auto")) {
 		netdev->ipv6_gateway = NULL;
 		netdev->ipv6_gateway_auto = true;
-	} else if (strcmp(value, "dev") == 0) {
+	} else if (strequal(value, "dev")) {
 		netdev->ipv6_gateway = NULL;
 		netdev->ipv6_gateway_auto = false;
 		netdev->ipv6_gateway_dev = true;
 	} else {
 		int ret;
-		struct in6_addr *gw;
+		__do_free struct in6_addr *gw = NULL;
 
-		gw = malloc(sizeof(*gw));
+		gw = zalloc(sizeof(*gw));
 		if (!gw)
-			return -1;
+			return ret_errno(ENOMEM);
 
 		ret = inet_pton(AF_INET6, value, gw);
-		if (!ret || ret < 0) {
-			SYSERROR("Invalid ipv6 gateway address \"%s\"", value);
-			free(gw);
-			return -1;
-		}
+		if (!ret || ret < 0)
+			return log_error_errno(-EINVAL, EINVAL,
+					       "Invalid ipv6 gateway address \"%s\"", value);
 
-		netdev->ipv6_gateway = gw;
+		netdev->ipv6_gateway = move_ptr(gw);
 		netdev->ipv6_gateway_auto = false;
 	}
 
@@ -906,64 +1092,52 @@
 }
 
 static int set_config_net_veth_ipv6_route(const char *key, const char *value,
-				       struct lxc_conf *lxc_conf, void *data)
+					  struct lxc_conf *lxc_conf, void *data)
 {
 	__do_free char *valdup = NULL;
 	__do_free struct lxc_inet6dev *inet6dev = NULL;
-	__do_free struct lxc_list *list = NULL;
 	int ret;
 	char *netmask, *slash;
 	struct lxc_netdev *netdev = data;
 
-	if (lxc_config_value_empty(value))
-		return clr_config_net_veth_ipv6_route(key, lxc_conf, data);
-
 	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
-	if (netdev->type != LXC_NET_VETH) {
-		SYSERROR("Invalid ipv6 route \"%s\", can only be used with veth network", value);
-		return ret_set_errno(-1, EINVAL);
-	}
-
-	inet6dev = malloc(sizeof(*inet6dev));
-	if (!inet6dev)
-		return -1;
-	memset(inet6dev, 0, sizeof(*inet6dev));
+	if (netdev->type != LXC_NET_VETH)
+		return syserror_set(-EINVAL, "Invalid ipv6 route \"%s\", can only be used with veth network", value);
 
-	list = malloc(sizeof(*list));
-	if (!list)
-		return -1;
+	if (lxc_config_value_empty(value))
+		return clr_config_net_veth_ipv6_route(key, lxc_conf, data);
 
-	lxc_list_init(list);
-	list->elem = inet6dev;
+	inet6dev = zalloc(sizeof(*inet6dev));
+	if (!inet6dev)
+		return ret_errno(ENOMEM);
 
 	valdup = strdup(value);
 	if (!valdup)
-		return -1;
+		return ret_errno(ENOMEM);
 
 	slash = strchr(valdup, '/');
 	if (!slash)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	*slash = '\0';
 	slash++;
 	if (*slash == '\0')
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	netmask = slash;
 
 	ret = lxc_safe_uint(netmask, &inet6dev->prefix);
 	if (ret < 0 || inet6dev->prefix > 128)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	ret = inet_pton(AF_INET6, valdup, &inet6dev->addr);
 	if (!ret || ret < 0)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
-	lxc_list_add_tail(&netdev->priv.veth_attr.ipv6_routes, list);
+	list_add_tail(&inet6dev->head, &netdev->priv.veth_attr.ipv6_routes);
 	move_ptr(inet6dev);
-	move_ptr(list);
 
 	return 0;
 }
@@ -973,11 +1147,12 @@
 {
 	struct lxc_netdev *netdev = data;
 
-	if (lxc_config_value_empty(value))
-		return clr_config_net_script_up(key, lxc_conf, data);
-
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
+
+	clr_config_net_script_up(key, lxc_conf, data);
+	if (lxc_config_value_empty(value))
+		return 0;
 
 	return set_config_string_item(&netdev->upscript, value);
 }
@@ -987,27 +1162,28 @@
 {
 	struct lxc_netdev *netdev = data;
 
-	if (lxc_config_value_empty(value))
-		return clr_config_net_script_down(key, lxc_conf, data);
-
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
+
+	clr_config_net_script_down(key, lxc_conf, data);
+	if (lxc_config_value_empty(value))
+		return 0;
 
 	return set_config_string_item(&netdev->downscript, value);
 }
 
-static int add_hook(struct lxc_conf *lxc_conf, int which, char *hook)
+static int add_hook(struct lxc_conf *lxc_conf, int which, __owns char *hook)
 {
-	struct lxc_list *hooklist;
+	__do_free char *val = hook;
+	__do_free struct string_entry *entry;
 
-	hooklist = malloc(sizeof(*hooklist));
-	if (!hooklist) {
-		free(hook);
-		return -1;
-	}
-
-	hooklist->elem = hook;
-	lxc_list_add_tail(&lxc_conf->hookswhich, hooklist);
+	entry = zalloc(sizeof(struct string_entry));
+	if (!entry)
+		return ret_errno(ENOMEM);
+
+	entry->val = move_ptr(val);
+	list_add_tail(&entry->head, &lxc_conf->hookswhich);
+	move_ptr(entry);
 
 	return 0;
 }
@@ -1015,71 +1191,74 @@
 static int set_config_seccomp_allow_nesting(const char *key, const char *value,
 					    struct lxc_conf *lxc_conf, void *data)
 {
-#ifdef HAVE_SECCOMP
+#if HAVE_SECCOMP
 	if (lxc_config_value_empty(value))
 		return clr_config_seccomp_allow_nesting(key, lxc_conf, NULL);
 
 	if (lxc_safe_uint(value, &lxc_conf->seccomp.allow_nesting) < 0)
-		return -1;
+		return -errno;
 
 	if (lxc_conf->seccomp.allow_nesting > 1)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	return 0;
 #else
-	errno = ENOSYS;
-	return -1;
+	return ret_errno(ENOSYS);
 #endif
 }
 
 static int set_config_seccomp_notify_cookie(const char *key, const char *value,
 					    struct lxc_conf *lxc_conf, void *data)
 {
-#ifdef HAVE_SECCOMP_NOTIFY
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
 	return set_config_string_item(&lxc_conf->seccomp.notifier.cookie, value);
 #else
-	return ret_set_errno(-1, ENOSYS);
+	return ret_errno(ENOSYS);
 #endif
 }
 
 static int set_config_seccomp_notify_proxy(const char *key, const char *value,
 					   struct lxc_conf *lxc_conf, void *data)
 {
-#ifdef HAVE_SECCOMP_NOTIFY
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
 	const char *offset;
 
 	if (lxc_config_value_empty(value))
 		return clr_config_seccomp_notify_proxy(key, lxc_conf, NULL);
 
-	if (strncmp(value, "unix:", 5) != 0)
-		return ret_set_errno(-1, EINVAL);
+	if (!strnequal(value, "unix:", 5))
+		return ret_errno(EINVAL);
 
 	offset = value + 5;
 	if (lxc_unix_sockaddr(&lxc_conf->seccomp.notifier.proxy_addr, offset) < 0)
-		return -1;
+		return -errno;
 
 	return 0;
 #else
-	return ret_set_errno(-1, ENOSYS);
+	return ret_errno(ENOSYS);
 #endif
 }
 
 static int set_config_seccomp_profile(const char *key, const char *value,
 				      struct lxc_conf *lxc_conf, void *data)
 {
+#if HAVE_SECCOMP
 	return set_config_path_item(&lxc_conf->seccomp.seccomp, value);
+#else
+	return ret_errno(ENOSYS);
+#endif
 }
 
 static int set_config_execute_cmd(const char *key, const char *value,
 			       struct lxc_conf *lxc_conf, void *data)
 {
-	return set_config_path_item(&lxc_conf->execute_cmd, value);
+	return set_config_string_item(&lxc_conf->execute_cmd, value);
 }
 
 static int set_config_init_cmd(const char *key, const char *value,
 			       struct lxc_conf *lxc_conf, void *data)
 {
-	return set_config_path_item(&lxc_conf->init_cmd, value);
+	return set_config_string_item(&lxc_conf->init_cmd, value);
 }
 
 static int set_config_init_cwd(const char *key, const char *value,
@@ -1099,7 +1278,7 @@
 	}
 
 	if (lxc_safe_uint(value, &init_uid) < 0)
-		return -1;
+		return -errno;
 
 	lxc_conf->init_uid = init_uid;
 
@@ -1117,54 +1296,108 @@
 	}
 
 	if (lxc_safe_uint(value, &init_gid) < 0)
-		return -1;
+		return -errno;
 
 	lxc_conf->init_gid = init_gid;
 
 	return 0;
 }
 
+static int set_config_init_groups(const char *key, const char *value,
+				  struct lxc_conf *lxc_conf, void *data)
+{
+	__do_free char *value_dup = NULL;
+	gid_t *init_groups = NULL;
+	size_t num_groups = 0;
+	size_t idx;
+	char *token;
+
+	if (lxc_config_value_empty(value))
+		return clr_config_init_groups(key, lxc_conf, NULL);
+
+	value_dup = strdup(value);
+	if (!value_dup)
+		return -ENOMEM;
+
+	lxc_iterate_parts(token, value_dup, ",")
+		num_groups++;
+
+	if (num_groups == INT_MAX)
+		return log_error_errno(-ERANGE, ERANGE, "Excessive number of supplementary groups specified");
+
+	/* This means the string wasn't empty and all we found was garbage. */
+	if (num_groups == 0)
+		return log_error_errno(-EINVAL, EINVAL, "No valid groups specified %s", value);
+
+	idx = lxc_conf->init_groups.size;
+	init_groups = realloc(lxc_conf->init_groups.list, sizeof(gid_t) * (idx + num_groups));
+	if (!init_groups)
+		return ret_errno(ENOMEM);
+
+	/*
+	 * Once the realloc() succeeded we need to hand control of the memory
+	 * back to the config otherwise we risk a double-free when
+	 * lxc_conf_free() is called.
+	 */
+	lxc_conf->init_groups.list = init_groups;
+
+	/* Restore duplicated value so we can call lxc_iterate_parts() again. */
+	strcpy(value_dup, value);
+
+	lxc_iterate_parts(token, value_dup, ",") {
+		int ret;
+
+		gid_t group;
+
+		ret = lxc_safe_uint(token, &group);
+		if (ret)
+			return log_error_errno(ret, -ret, "Failed to parse group %s", token);
+
+		init_groupsidx++ = group;
+	}
+
+	lxc_conf->init_groups.size += num_groups;
+
+	return 0;
+}
+
 static int set_config_hooks(const char *key, const char *value,
 			    struct lxc_conf *lxc_conf, void *data)
 {
-	char *copy;
+	__do_free char *copy = NULL;
 
 	if (lxc_config_value_empty(value))
 		return lxc_clear_hooks(lxc_conf, key);
 
-	if (strcmp(key + 4, "hook") == 0) {
-		ERROR("lxc.hook must not have a value");
-		return -1;
-	}
+	if (strequal(key + 4, "hook"))
+		return log_error_errno(-EINVAL, EINVAL, "lxc.hook must not have a value");
 
 	copy = strdup(value);
 	if (!copy)
-		return -1;
+		return ret_errno(ENOMEM);
 
-	if (strcmp(key + 9, "pre-start") == 0)
-		return add_hook(lxc_conf, LXCHOOK_PRESTART, copy);
-	else if (strcmp(key + 9, "start-host") == 0)
-		return add_hook(lxc_conf, LXCHOOK_START_HOST, copy);
-	else if (strcmp(key + 9, "pre-mount") == 0)
-		return add_hook(lxc_conf, LXCHOOK_PREMOUNT, copy);
-	else if (strcmp(key + 9, "autodev") == 0)
-		return add_hook(lxc_conf, LXCHOOK_AUTODEV, copy);
-	else if (strcmp(key + 9, "mount") == 0)
-		return add_hook(lxc_conf, LXCHOOK_MOUNT, copy);
-	else if (strcmp(key + 9, "start") == 0)
-		return add_hook(lxc_conf, LXCHOOK_START, copy);
-	else if (strcmp(key + 9, "stop") == 0)
-		return add_hook(lxc_conf, LXCHOOK_STOP, copy);
-	else if (strcmp(key + 9, "post-stop") == 0)
-		return add_hook(lxc_conf, LXCHOOK_POSTSTOP, copy);
-	else if (strcmp(key + 9, "clone") == 0)
-		return add_hook(lxc_conf, LXCHOOK_CLONE, copy);
-	else if (strcmp(key + 9, "destroy") == 0)
-		return add_hook(lxc_conf, LXCHOOK_DESTROY, copy);
+	if (strequal(key + 9, "pre-start"))
+		return add_hook(lxc_conf, LXCHOOK_PRESTART, move_ptr(copy));
+	else if (strequal(key + 9, "start-host"))
+		return add_hook(lxc_conf, LXCHOOK_START_HOST, move_ptr(copy));
+	else if (strequal(key + 9, "pre-mount"))
+		return add_hook(lxc_conf, LXCHOOK_PREMOUNT, move_ptr(copy));
+	else if (strequal(key + 9, "autodev"))
+		return add_hook(lxc_conf, LXCHOOK_AUTODEV, move_ptr(copy));
+	else if (strequal(key + 9, "mount"))
+		return add_hook(lxc_conf, LXCHOOK_MOUNT, move_ptr(copy));
+	else if (strequal(key + 9, "start"))
+		return add_hook(lxc_conf, LXCHOOK_START, move_ptr(copy));
+	else if (strequal(key + 9, "stop"))
+		return add_hook(lxc_conf, LXCHOOK_STOP, move_ptr(copy));
+	else if (strequal(key + 9, "post-stop"))
+		return add_hook(lxc_conf, LXCHOOK_POSTSTOP, move_ptr(copy));
+	else if (strequal(key + 9, "clone"))
+		return add_hook(lxc_conf, LXCHOOK_CLONE, move_ptr(copy));
+	else if (strequal(key + 9, "destroy"))
+		return add_hook(lxc_conf, LXCHOOK_DESTROY, move_ptr(copy));
 
-	free(copy);
-
-	return -1;
+	return ret_errno(EINVAL);
 }
 
 static int set_config_hooks_version(const char *key, const char *value,
@@ -1178,13 +1411,10 @@
 
 	ret = lxc_safe_uint(value, &tmp);
 	if (ret < 0)
-		return -1;
+		return -errno;
 
-	if (tmp > 1) {
-		ERROR("Invalid hook version specified. Currently only 0 "
-		      "(legacy) and 1 are supported");
-		return -1;
-	}
+	if (tmp > 1)
+		return syserror_set(-EINVAL, "Invalid hook version specified. Currently only 0 (legacy) and 1 are supported");
 
 	lxc_conf->hooks_version = tmp;
 
@@ -1194,13 +1424,14 @@
 static int set_config_personality(const char *key, const char *value,
 				  struct lxc_conf *lxc_conf, void *data)
 {
-	signed long personality = lxc_config_parse_arch(value);
+	int ret;
+	personality_t personality;
 
-	if (personality >= 0)
-		lxc_conf->personality = personality;
-	else
-		WARN("Unsupported personality \"%s\"", value);
+	ret = lxc_config_parse_arch(value, &personality);
+	if (ret < 0)
+		return syserror("Unsupported personality \"%s\"", value);
 
+	lxc_conf->personality = personality;
 	return 0;
 }
 
@@ -1217,7 +1448,7 @@
 
 	ret = lxc_safe_uint(value, &max);
 	if (ret < 0)
-		return -1;
+		return ret_errno(EINVAL);
 
 	lxc_conf->pty_max = max;
 
@@ -1232,6 +1463,7 @@
 static int set_config_start(const char *key, const char *value,
 			    struct lxc_conf *lxc_conf, void *data)
 {
+	int ret;
 	bool is_empty;
 
 	is_empty = lxc_config_value_empty(value);
@@ -1242,11 +1474,12 @@
 			return 0;
 		}
 
-		if (lxc_safe_uint(value, &lxc_conf->start_auto) < 0)
-			return -1;
+		ret = lxc_safe_uint(value, &lxc_conf->start_auto);
+		if (ret)
+			return ret;
 
 		if (lxc_conf->start_auto > 1)
-			return -1;
+			return ret_errno(EINVAL);
 
 		return 0;
 	} else if (*(key + 10) == 'd') { /* lxc.start.delay */
@@ -1265,7 +1498,7 @@
 		return lxc_safe_int(value, &lxc_conf->start_order);
 	}
 
-	return -1;
+	return ret_errno(EINVAL);
 }
 
 static int set_config_monitor(const char *key, const char *value,
@@ -1276,10 +1509,10 @@
 		return 0;
 	}
 
-	if (strcmp(key + 12, "unshare") == 0)
+	if (strequal(key + 12, "unshare"))
 		return lxc_safe_uint(value, &lxc_conf->monitor_unshare);
 
-	return -1;
+	return ret_errno(EINVAL);
 }
 
 static int set_config_monitor_signal_pdeath(const char *key, const char *value,
@@ -1290,98 +1523,96 @@
 		return 0;
 	}
 
-	if (strcmp(key + 12, "signal.pdeath") == 0) {
+	if (strequal(key + 12, "signal.pdeath")) {
 		int sig_n;
 
 		sig_n = sig_parse(value);
 		if (sig_n < 0)
-			return -1;
+			return ret_errno(EINVAL);
 
 		lxc_conf->monitor_signal_pdeath = sig_n;
 		return 0;
 	}
 
-	return -EINVAL;
+	return ret_errno(EINVAL);
 }
 
 static int set_config_group(const char *key, const char *value,
 			    struct lxc_conf *lxc_conf, void *data)
 {
-	char *groups, *token;
-	struct lxc_list *grouplist;
-	int ret = 0;
+	__do_free char *groups = NULL;
+	char *token;
 
 	if (lxc_config_value_empty(value))
 		return lxc_clear_groups(lxc_conf);
 
 	groups = strdup(value);
 	if (!groups)
-		return -1;
+		return ret_errno(ENOMEM);
 
-	/* In case several groups are specified in a single line split these
+	/*
+	 * In case several groups are specified in a single line split these
 	 * groups in a single element for the list.
 	 */
 	lxc_iterate_parts(token, groups, " \t") {
-		grouplist = malloc(sizeof(*grouplist));
-		if (!grouplist) {
-			ret = -1;
-			break;
-		}
+		__do_free char *val = NULL;
+		__do_free struct string_entry *entry = NULL;
 
-		grouplist->elem = strdup(token);
-		if (!grouplist->elem) {
-			free(grouplist);
-			ret = -1;
-			break;
-		}
-
-		lxc_list_add_tail(&lxc_conf->groups, grouplist);
+		entry = zalloc(sizeof(struct string_entry));
+		if (!entry)
+			return ret_errno(ENOMEM);
+
+		val = strdup(token);
+		if (!val)
+			return ret_errno(ENOMEM);
+
+		entry->val = move_ptr(val);
+		list_add_tail(&entry->head, &lxc_conf->groups);
+		move_ptr(entry);
 	}
 
-	free(groups);
-
-	return ret;
+	return 0;
 }
 
 static int set_config_environment(const char *key, const char *value,
 				  struct lxc_conf *lxc_conf, void *data)
 {
-	struct lxc_list *list_item = NULL;
+	__do_free char *dup = NULL, *val = NULL;
+	__do_free struct environment_entry *new_env = NULL;
+	char *env_val;
 
 	if (lxc_config_value_empty(value))
 		return lxc_clear_environment(lxc_conf);
 
-	list_item = malloc(sizeof(*list_item));
-	if (!list_item)
-		goto on_error;
-
-	if (!strchr(value, '=')) {
-		const char *env_val;
-		const char *env_key = value;
-		const char *env_var3 = {0};
-
-		env_val = getenv(env_key);
-		if (!env_val)
-			goto on_error;
-
-		env_var0 = env_key;
-		env_var1 = env_val;
-		list_item->elem = lxc_string_join("=", env_var, false);
+	new_env = zalloc(sizeof(struct environment_entry));
+	if (!new_env)
+		return ret_errno(ENOMEM);
+
+	dup = strdup(value);
+	if (!dup)
+		return ret_errno(ENOMEM);
+
+	env_val = strchr(dup, '=');
+	if (!env_val) {
+		env_val = getenv(dup);
 	} else {
-		list_item->elem = strdup(value);
+		*env_val = '\0';
+		env_val++;
 	}
+	if (!env_val)
+		return ret_errno(ENOENT);
 
-	if (!list_item->elem)
-		goto on_error;
+	val = strdup(env_val);
+	if (!val)
+		return ret_errno(ENOMEM);
 
-	lxc_list_add_tail(&lxc_conf->environment, list_item);
+	new_env->key = move_ptr(dup);
+	new_env->val = move_ptr(val);
 
-	return 0;
+	list_add_tail(&new_env->head, &lxc_conf->environment);
+	move_ptr(new_env);
 
-on_error:
-	free(list_item);
-
-	return -1;
+	return 0;
 }
 
 static int set_config_tty_max(const char *key, const char *value,
@@ -1397,7 +1628,7 @@
 
 	ret = lxc_safe_uint(value, &nbtty);
 	if (ret < 0)
-		return -1;
+		return ret;
 
 	lxc_conf->ttys.max = nbtty;
 
@@ -1414,7 +1645,11 @@
 static int set_config_apparmor_profile(const char *key, const char *value,
 				       struct lxc_conf *lxc_conf, void *data)
 {
+#if HAVE_APPARMOR
 	return set_config_string_item(&lxc_conf->lsm_aa_profile, value);
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static int set_config_apparmor_allow_incomplete(const char *key,
@@ -1422,18 +1657,25 @@
 						struct lxc_conf *lxc_conf,
 						void *data)
 {
+#if HAVE_APPARMOR
+	int ret;
+
 	if (lxc_config_value_empty(value)) {
 		lxc_conf->lsm_aa_allow_incomplete = 0;
 		return 0;
 	}
 
-	if (lxc_safe_uint(value, &lxc_conf->lsm_aa_allow_incomplete) < 0)
-		return -1;
+	ret = lxc_safe_uint(value, &lxc_conf->lsm_aa_allow_incomplete);
+	if (ret)
+		return ret;
 
 	if (lxc_conf->lsm_aa_allow_incomplete > 1)
-		return -1;
+		return ret_errno(EINVAL);
 
 	return 0;
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static int set_config_apparmor_allow_nesting(const char *key,
@@ -1441,16 +1683,23 @@
 					     struct lxc_conf *lxc_conf,
 					     void *data)
 {
+#if HAVE_APPARMOR
+	int ret;
+
 	if (lxc_config_value_empty(value))
 		return clr_config_apparmor_allow_nesting(key, lxc_conf, NULL);
 
-	if (lxc_safe_uint(value, &lxc_conf->lsm_aa_allow_nesting) < 0)
-		return -1;
+	ret = lxc_safe_uint(value, &lxc_conf->lsm_aa_allow_nesting);
+	if (ret)
+		return ret;
 
 	if (lxc_conf->lsm_aa_allow_nesting > 1)
-		return -1;
+		return ret_errno(EINVAL);
 
 	return 0;
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static int set_config_apparmor_raw(const char *key,
@@ -1458,40 +1707,49 @@
 				   struct lxc_conf *lxc_conf,
 				   void *data)
 {
-	char *elem;
-	struct lxc_list *list;
+#if HAVE_APPARMOR
+	__do_free char *elem = NULL;
+	__do_free struct string_entry *entry = NULL;
 
 	if (lxc_config_value_empty(value))
 		return lxc_clear_apparmor_raw(lxc_conf);
 
-	list = malloc(sizeof(*list));
-	if (!list) {
-		errno = ENOMEM;
-		return -1;
-	}
+	entry = zalloc(sizeof(struct string_entry));
+	if (!entry)
+		return ret_errno(ENOMEM);
 
 	elem = strdup(value);
-	if (!elem) {
-		free(list);
-		return -1;
-	}
-	list->elem = elem;
+	if (!elem)
+		return ret_errno(ENOMEM);
 
-	lxc_list_add_tail(&lxc_conf->lsm_aa_raw, list);
+	entry->val = move_ptr(elem);
+	list_add_tail(&entry->head, &lxc_conf->lsm_aa_raw);
+	move_ptr(entry);
 
 	return 0;
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static int set_config_selinux_context(const char *key, const char *value,
 				      struct lxc_conf *lxc_conf, void *data)
 {
+#if HAVE_SELINUX
 	return set_config_string_item(&lxc_conf->lsm_se_context, value);
+#else
+	return syserror_set(-EINVAL, "Built without SELinux support");
+#endif
 }
 
 static int set_config_selinux_context_keyring(const char *key, const char *value,
 					      struct lxc_conf *lxc_conf, void *data)
 {
+#if HAVE_SELINUX
 	return set_config_string_item(&lxc_conf->lsm_se_keyring_context, value);
+#else
+	return syserror_set(-EINVAL, "Built without SELinux support");
+#endif
 }
 
 static int set_config_keyring_session(const char *key, const char *value,
@@ -1506,12 +1764,12 @@
 	int ret;
 
 	if (lxc_config_value_empty(value)) {
-		free(c->logfile);
-		c->logfile = NULL;
+		free_disarm(c->logfile);
 		return 0;
 	}
 
-	/* Store these values in the lxc_conf, and then try to set for actual
+	/*
+	 * Store these values in the lxc_conf, and then try to set for actual
 	 * current logging.
 	 */
 	ret = set_config_path_item(&c->logfile, value);
@@ -1532,13 +1790,17 @@
 	}
 
 	if (value0 >= '0' && value0 <= '9') {
-		if (lxc_safe_int(value, &newlevel) < 0)
-			return -1;
+		int ret;
+
+		ret = lxc_safe_int(value, &newlevel);
+		if (ret)
+			return ret_errno(EINVAL);
 	} else {
 		newlevel = lxc_log_priority_to_int(value);
 	}
 
-	/* Store these values in the lxc_conf, and then try to set for actual
+	/*
+	 * Store these values in the lxc_conf, and then try to set for actual
 	 * current logging.
 	 */
 	lxc_conf->loglevel = newlevel;
@@ -1549,16 +1811,19 @@
 static int set_config_autodev(const char *key, const char *value,
 			      struct lxc_conf *lxc_conf, void *data)
 {
+	int ret;
+
 	if (lxc_config_value_empty(value)) {
 		lxc_conf->autodev = 0;
 		return 0;
 	}
 
-	if (lxc_safe_uint(value, &lxc_conf->autodev) < 0)
-		return -1;
+	ret = lxc_safe_uint(value, &lxc_conf->autodev);
+	if (ret)
+		return ret_errno(EINVAL);
 
 	if (lxc_conf->autodev > 1)
-		return -1;
+		return ret_errno(EINVAL);
 
 	return 0;
 }
@@ -1589,7 +1854,7 @@
 
 	sig_n = sig_parse(value);
 	if (sig_n < 0)
-		return -1;
+		return ret_errno(EINVAL);
 
 	lxc_conf->haltsignal = sig_n;
 
@@ -1608,7 +1873,7 @@
 
 	sig_n = sig_parse(value);
 	if (sig_n < 0)
-		return -1;
+		return ret_errno(EINVAL);
 
 	lxc_conf->rebootsignal = sig_n;
 
@@ -1627,7 +1892,7 @@
 
 	sig_n = sig_parse(value);
 	if (sig_n < 0)
-		return -1;
+		return ret_errno(EINVAL);
 
 	lxc_conf->stopsignal = sig_n;
 
@@ -1637,10 +1902,9 @@
 static int __set_config_cgroup_controller(const char *key, const char *value,
 					  struct lxc_conf *lxc_conf, int version)
 {
+	call_cleaner(free_lxc_cgroup) struct lxc_cgroup *new_cgroup = NULL;
 	const char *subkey, *token;
 	size_t token_len;
-	struct lxc_list *cglist = NULL;
-	struct lxc_cgroup *cgelem = NULL;
 
 	if (lxc_config_value_empty(value))
 		return lxc_clear_cgroups(lxc_conf, key, version);
@@ -1652,53 +1916,37 @@
 		token = "lxc.cgroup.";
 		token_len = 11;
 	} else {
-		return -EINVAL;
+		return ret_errno(EINVAL);
 	}
 
-	if (strncmp(key, token, token_len) != 0)
-		return -EINVAL;
+	if (!strnequal(key, token, token_len))
+		return ret_errno(EINVAL);
 
 	subkey = key + token_len;
 	if (*subkey == '\0')
-		return -EINVAL;
-
-	cglist = malloc(sizeof(*cglist));
-	if (!cglist)
-		goto out;
+		return ret_errno(EINVAL);
 
-	cgelem = malloc(sizeof(*cgelem));
-	if (!cgelem)
-		goto out;
-	memset(cgelem, 0, sizeof(*cgelem));
+	new_cgroup = zalloc(sizeof(*new_cgroup));
+	if (!new_cgroup)
+		return ret_errno(ENOMEM);
 
-	cgelem->subsystem = strdup(subkey);
-	if (!cgelem->subsystem)
-		goto out;
+	new_cgroup->subsystem = strdup(subkey);
+	if (!new_cgroup->subsystem)
+		return ret_errno(ENOMEM);
 
-	cgelem->value = strdup(value);
-	if (!cgelem->value)
-		goto out;
+	new_cgroup->value = strdup(value);
+	if (!new_cgroup->value)
+		return ret_errno(ENOMEM);
 
-	cgelem->version = version;
-
-	lxc_list_add_elem(cglist, cgelem);
+	new_cgroup->version = version;
 
 	if (version == CGROUP2_SUPER_MAGIC)
-		lxc_list_add_tail(&lxc_conf->cgroup2, cglist);
+		list_add_tail(&new_cgroup->head, &lxc_conf->cgroup2);
 	else
-		lxc_list_add_tail(&lxc_conf->cgroup, cglist);
+		list_add_tail(&new_cgroup->head, &lxc_conf->cgroup);
+	move_ptr(new_cgroup);
 
 	return 0;
-
-out:
-	free(cglist);
-	if (cgelem) {
-		free(cgelem->subsystem);
-		free(cgelem->value);
-		free(cgelem);
-	}
-
-	return -1;
 }
 
 static int set_config_cgroup_controller(const char *key, const char *value,
@@ -1715,14 +1963,85 @@
 					      CGROUP2_SUPER_MAGIC);
 }
 
-
 static int set_config_cgroup_dir(const char *key, const char *value,
 				 struct lxc_conf *lxc_conf, void *data)
 {
+	if (!strequal(key, "lxc.cgroup.dir"))
+		return ret_errno(EINVAL);
+
 	if (lxc_config_value_empty(value))
 		return clr_config_cgroup_dir(key, lxc_conf, NULL);
 
-	return set_config_string_item(&lxc_conf->cgroup_meta.dir, value);
+	if (abspath(value))
+		return syserror_set(-EINVAL, "%s paths may not be absolute", key);
+
+	if (dotdot(value))
+		return syserror_set(-EINVAL, "%s paths may not walk upwards via \"../\"", key);
+
+	return set_config_path_item(&lxc_conf->cgroup_meta.dir, value);
+}
+
+static int set_config_cgroup_monitor_dir(const char *key, const char *value,
+					 struct lxc_conf *lxc_conf, void *data)
+{
+	if (lxc_config_value_empty(value))
+		return clr_config_cgroup_monitor_dir(key, lxc_conf, NULL);
+
+	if (abspath(value))
+		return syserror_set(-EINVAL, "%s paths may not be absolute", key);
+
+	if (dotdot(value))
+		return syserror_set(-EINVAL, "%s paths may not walk upwards via \"../\"", key);
+
+	return set_config_path_item(&lxc_conf->cgroup_meta.monitor_dir, value);
+}
+
+static int set_config_cgroup_monitor_pivot_dir(const char *key, const char *value,
+					 struct lxc_conf *lxc_conf, void *data)
+{
+	if (lxc_config_value_empty(value))
+		return clr_config_cgroup_monitor_pivot_dir(key, lxc_conf, NULL);
+
+	if (abspath(value))
+		return syserror_set(-EINVAL, "%s paths may not be absolute", key);
+
+	if (dotdot(value))
+		return syserror_set(-EINVAL, "%s paths may not walk upwards via \"../\"", key);
+
+	return set_config_path_item(&lxc_conf->cgroup_meta.monitor_pivot_dir, value);
+}
+
+static int set_config_cgroup_container_dir(const char *key, const char *value,
+					   struct lxc_conf *lxc_conf,
+					   void *data)
+{
+	if (lxc_config_value_empty(value))
+		return clr_config_cgroup_container_dir(key, lxc_conf, NULL);
+
+	if (abspath(value))
+		return syserror_set(-EINVAL, "%s paths may not be absolute", key);
+
+	if (dotdot(value))
+		return syserror_set(-EINVAL, "%s paths may not walk upwards via \"../\"", key);
+
+	return set_config_path_item(&lxc_conf->cgroup_meta.container_dir, value);
+}
+
+static int set_config_cgroup_container_inner_dir(const char *key,
+						 const char *value,
+						 struct lxc_conf *lxc_conf,
+						 void *data)
+{
+	if (lxc_config_value_empty(value))
+		return clr_config_cgroup_container_inner_dir(key, lxc_conf, NULL);
+
+	if (abspath(value))
+		return syserror_set(-EINVAL, "%s paths may not be absolute", key);
+
+	if (strchr(value, '/') || strequal(value, ".") || strequal(value, ".."))
+		return log_error_errno(-EINVAL, EINVAL, "lxc.cgroup.dir.container.inner must be a single directory name");
+
+	return set_config_string_item(&lxc_conf->cgroup_meta.namespace_dir, value);
 }
 
 static int set_config_cgroup_relative(const char *key, const char *value,
@@ -1735,8 +2054,8 @@
 		return clr_config_cgroup_relative(key, lxc_conf, NULL);
 
 	ret = lxc_safe_uint(value, &converted);
-	if (ret < 0)
-		return -ret;
+	if (ret)
+		return ret;
 
 	if (converted == 1) {
 		lxc_conf->cgroup_meta.relative = true;
@@ -1748,14 +2067,14 @@
 		return 0;
 	}
 
-	return -EINVAL;
+	return ret_errno(EINVAL);
 }
 
 static bool parse_limit_value(const char **value, rlim_t *res)
 {
 	char *endptr = NULL;
 
-	if (strncmp(*value, "unlimited", STRLITERALLEN("unlimited")) == 0) {
+	if (strnequal(*value, "unlimited", STRLITERALLEN("unlimited"))) {
 		*res = RLIM_INFINITY;
 		*value += STRLITERALLEN("unlimited");
 		return true;
@@ -1774,23 +2093,22 @@
 static int set_config_prlimit(const char *key, const char *value,
 			    struct lxc_conf *lxc_conf, void *data)
 {
-	struct lxc_list *iter;
+	call_cleaner(free_lxc_limit) struct lxc_limit *new_lim = NULL;
 	struct rlimit limit;
 	rlim_t limit_value;
-	struct lxc_list *limlist = NULL;
-	struct lxc_limit *limelem = NULL;
+	struct lxc_limit *lim;
 
 	if (lxc_config_value_empty(value))
 		return lxc_clear_limits(lxc_conf, key);
 
-	if (strncmp(key, "lxc.prlimit.", STRLITERALLEN("lxc.prlimit.")) != 0)
-		return -1;
+	if (!strnequal(key, "lxc.prlimit.", STRLITERALLEN("lxc.prlimit.")))
+		return ret_errno(EINVAL);
 
 	key += STRLITERALLEN("lxc.prlimit.");
 
 	/* soft limit comes first in the value */
 	if (!parse_limit_value(&value, &limit_value))
-		return -1;
+		return ret_errno(EINVAL);
 
 	limit.rlim_cur = limit_value;
 
@@ -1801,7 +2119,7 @@
 	if (*value == ':')
 		++value;
 	else if (*value) /* any other character is an error here */
-		return -1;
+		return ret_errno(EINVAL);
 
 	while (isspace(*value))
 		++value;
@@ -1809,7 +2127,7 @@
 	/* optional hard limit */
 	if (*value) {
 		if (!parse_limit_value(&value, &limit_value))
-			return -1;
+			return ret_errno(EINVAL);
 
 		limit.rlim_max = limit_value;
 
@@ -1818,196 +2136,139 @@
 			++value;
 
 		if (*value)
-			return -1;
+			return ret_errno(EINVAL);
 	} else {
 		/* a single value sets both hard and soft limit */
 		limit.rlim_max = limit.rlim_cur;
 	}
 
 	/* find existing list element */
-	lxc_list_for_each(iter, &lxc_conf->limits) {
-		limelem = iter->elem;
-		if (!strcmp(key, limelem->resource)) {
-			limelem->limit = limit;
-			return 0;
-		}
-	}
+	list_for_each_entry(lim, &lxc_conf->limits, head) {
+		if (!strequal(key, lim->resource))
+			continue;
 
-	/* allocate list element */
-	limlist = malloc(sizeof(*limlist));
-	if (!limlist)
-		goto on_error;
+		lim->limit = limit;
+		return 0;
+	}
 
-	limelem = malloc(sizeof(*limelem));
-	if (!limelem)
-		goto on_error;
-	memset(limelem, 0, sizeof(*limelem));
+	new_lim = zalloc(sizeof(*new_lim));
+	if (!new_lim)
+		return ret_errno(ENOMEM);
 
-	limelem->resource = strdup(key);
-	if (!limelem->resource)
-		goto on_error;
+	new_lim->resource = strdup(key);
+	if (!new_lim->resource)
+		return ret_errno(ENOMEM);
 
-	limelem->limit = limit;
-	lxc_list_add_elem(limlist, limelem);;
-	lxc_list_add_tail(&lxc_conf->limits, limlist);
+	new_lim->limit = limit;
+	list_add_tail(&new_lim->head, &lxc_conf->limits);
+	move_ptr(new_lim);
 
 	return 0;
-
-on_error:
-	free(limlist);
-
-	if (limelem) {
-		free(limelem->resource);
-		free(limelem);
-	}
-
-	return -1;
 }
 
 static int set_config_sysctl(const char *key, const char *value,
 			    struct lxc_conf *lxc_conf, void *data)
 {
-	struct lxc_list *iter;
-	char *replace_value = NULL;
-	struct lxc_list *sysctl_list = NULL;
-	struct lxc_sysctl *sysctl_elem = NULL;
+	call_cleaner(free_lxc_sysctl) struct lxc_sysctl *sysctl_elem = NULL;
+	struct lxc_sysctl *sysctl, *nsysctl;
 
 	if (lxc_config_value_empty(value))
 		return clr_config_sysctl(key, lxc_conf, NULL);
 
-	if (strncmp(key, "lxc.sysctl.", STRLITERALLEN("lxc.sysctl.")) != 0)
-		return -1;
+	if (!strnequal(key, "lxc.sysctl.", STRLITERALLEN("lxc.sysctl.")))
+		return ret_errno(EINVAL);
 
 	key += STRLITERALLEN("lxc.sysctl.");
+	if (is_empty_string(key))
+		return ret_errno(EINVAL);
 
 	/* find existing list element */
-	lxc_list_for_each(iter, &lxc_conf->sysctls) {
-		sysctl_elem = iter->elem;
+	list_for_each_entry_safe(sysctl, nsysctl, &lxc_conf->sysctls, head) {
+		__do_free char *replace_value = NULL;
 
-		if (strcmp(key, sysctl_elem->key) != 0)
+		if (!strequal(key, sysctl->key))
 			continue;
 
 		replace_value = strdup(value);
 		if (!replace_value)
-			return -1;
+			return ret_errno(EINVAL);
 
-		free(sysctl_elem->value);
-		sysctl_elem->value = replace_value;
+		free(sysctl->value);
+		sysctl->value = move_ptr(replace_value);
 
 		return 0;
 	}
 
-	/* allocate list element */
-	sysctl_list = malloc(sizeof(*sysctl_list));
-	if (!sysctl_list)
-		goto on_error;
-
-	sysctl_elem = malloc(sizeof(*sysctl_elem));
+	sysctl_elem = zalloc(sizeof(*sysctl_elem));
 	if (!sysctl_elem)
-		goto on_error;
-	memset(sysctl_elem, 0, sizeof(*sysctl_elem));
+		return ret_errno(ENOMEM);
 
 	sysctl_elem->key = strdup(key);
 	if (!sysctl_elem->key)
-		goto on_error;
+		return ret_errno(ENOMEM);
 
 	sysctl_elem->value = strdup(value);
 	if (!sysctl_elem->value)
-		goto on_error;
+		return ret_errno(ENOMEM);
 
-	lxc_list_add_elem(sysctl_list, sysctl_elem);
-	lxc_list_add_tail(&lxc_conf->sysctls, sysctl_list);
+	list_add_tail(&sysctl_elem->head, &lxc_conf->sysctls);
+	move_ptr(sysctl_elem);
 
 	return 0;
-
-on_error:
-	free(sysctl_list);
-
-	if (sysctl_elem) {
-		free(sysctl_elem->key);
-		free(sysctl_elem->value);
-		free(sysctl_elem);
-	}
-
-	return -1;
 }
 
 static int set_config_proc(const char *key, const char *value,
 			    struct lxc_conf *lxc_conf, void *data)
 {
+	call_cleaner(free_lxc_proc) struct lxc_proc *new_proc = NULL;
 	const char *subkey;
-	struct lxc_list *proclist = NULL;
-	struct lxc_proc *procelem = NULL;
 
 	if (lxc_config_value_empty(value))
 		return clr_config_proc(key, lxc_conf, NULL);
 
-	if (strncmp(key, "lxc.proc.", STRLITERALLEN("lxc.proc.")) != 0)
-		return -1;
+	if (!strnequal(key, "lxc.proc.", STRLITERALLEN("lxc.proc.")))
+		return ret_errno(EINVAL);
 
 	subkey = key + STRLITERALLEN("lxc.proc.");
 	if (*subkey == '\0')
-		return -EINVAL;
-
-	proclist = malloc(sizeof(*proclist));
-	if (!proclist)
-		goto on_error;
-
-	procelem = malloc(sizeof(*procelem));
-	if (!procelem)
-		goto on_error;
-	memset(procelem, 0, sizeof(*procelem));
-
-	procelem->filename = strdup(subkey);
-	procelem->value = strdup(value);
-
-	if (!procelem->filename || !procelem->value)
-		goto on_error;
+		return ret_errno(EINVAL);
 
-	proclist->elem = procelem;
+	new_proc = zalloc(sizeof(*new_proc));
+	if (!new_proc)
+		return ret_errno(ENOMEM);
+
+	new_proc->filename = strdup(subkey);
+	if (!new_proc->filename)
+		return ret_errno(ENOMEM);
+
+	new_proc->value = strdup(value);
+	if (!new_proc->value)
+		return ret_errno(ENOMEM);
 
-	lxc_list_add_tail(&lxc_conf->procs, proclist);
+	list_add_tail(&new_proc->head, &lxc_conf->procs);
+	move_ptr(new_proc);
 
 	return 0;
-
-on_error:
-	free(proclist);
-
-	if (procelem) {
-		free(procelem->filename);
-		free(procelem->value);
-		free(procelem);
-	}
-
-	return -1;
 }
 
 static int set_config_idmaps(const char *key, const char *value,
 			     struct lxc_conf *lxc_conf, void *data)
 {
+	__do_free struct id_map *idmap = NULL;
 	unsigned long hostid, nsid, range;
 	char type;
 	int ret;
-	struct lxc_list *idmaplist = NULL;
-	struct id_map *idmap = NULL;
 
 	if (lxc_config_value_empty(value))
 		return lxc_clear_idmaps(lxc_conf);
 
-	idmaplist = malloc(sizeof(*idmaplist));
-	if (!idmaplist)
-		goto on_error;
-
-	idmap = malloc(sizeof(*idmap));
+	idmap = zalloc(sizeof(*idmap));
 	if (!idmap)
-		goto on_error;
-	memset(idmap, 0, sizeof(*idmap));
+		return ret_errno(ENOMEM);
 
 	ret = parse_idmaps(value, &type, &nsid, &hostid, &range);
-	if (ret < 0) {
-		ERROR("Failed to parse id mappings");
-		goto on_error;
-	}
+	if (ret < 0)
+		return log_error_errno(-EINVAL, EINVAL, "Failed to parse id mappings");
 
 	INFO("Read uid map: type %c nsid %lu hostid %lu range %lu", type, nsid, hostid, range);
 	if (type == 'u')
@@ -2015,13 +2276,12 @@
 	else if (type == 'g')
 		idmap->idtype = ID_TYPE_GID;
 	else
-		goto on_error;
+		return ret_errno(EINVAL);
 
 	idmap->hostid = hostid;
 	idmap->nsid = nsid;
 	idmap->range = range;
-	idmaplist->elem = idmap;
-	lxc_list_add_tail(&lxc_conf->id_map, idmaplist);
+	list_add_tail(&idmap->head, &lxc_conf->id_map);
 
 	if (!lxc_conf->root_nsuid_map && idmap->idtype == ID_TYPE_UID)
 		if (idmap->nsid == 0)
@@ -2031,15 +2291,9 @@
 		if (idmap->nsid == 0)
 			lxc_conf->root_nsgid_map = idmap;
 
-	idmap = NULL;
+	move_ptr(idmap);
 
 	return 0;
-
-on_error:
-	free(idmaplist);
-	free(idmap);
-
-	return -1;
 }
 
 static int set_config_mount_fstab(const char *key, const char *value,
@@ -2047,7 +2301,7 @@
 {
 	if (lxc_config_value_empty(value)) {
 		clr_config_mount_fstab(key, lxc_conf, NULL);
-		return -1;
+		return ret_errno(EINVAL);
 	}
 
 	return set_config_path_item(&lxc_conf->fstab, value);
@@ -2056,43 +2310,48 @@
 static int set_config_mount_auto(const char *key, const char *value,
 				 struct lxc_conf *lxc_conf, void *data)
 {
-	char *autos, *token;
+	__do_free char *autos = NULL;
+	char *token;
 	int i;
-	int ret = -1;
 	static struct {
 		const char *token;
 		int mask;
 		int flag;
 	} allowed_auto_mounts = {
-	    { "proc",                    LXC_AUTO_PROC_MASK,   LXC_AUTO_PROC_MIXED                                 },
-	    { "proc:mixed",              LXC_AUTO_PROC_MASK,   LXC_AUTO_PROC_MIXED                                 },
-	    { "proc:rw",                 LXC_AUTO_PROC_MASK,   LXC_AUTO_PROC_RW                                    },
-	    { "sys",                     LXC_AUTO_SYS_MASK,    LXC_AUTO_SYS_MIXED                                  },
-	    { "sys:ro",                  LXC_AUTO_SYS_MASK,    LXC_AUTO_SYS_RO                                     },
-	    { "sys:mixed",               LXC_AUTO_SYS_MASK,    LXC_AUTO_SYS_MIXED                                  },
-	    { "sys:rw",                  LXC_AUTO_SYS_MASK,    LXC_AUTO_SYS_RW                                     },
-	    { "cgroup",                  LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_NOSPEC                              },
-	    { "cgroup:mixed",            LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_MIXED                               },
-	    { "cgroup:ro",               LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RO                                  },
-	    { "cgroup:rw",               LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RW                                  },
-	    { "cgroup:force",            LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_NOSPEC | LXC_AUTO_CGROUP_FORCE      },
-	    { "cgroup:mixed:force",      LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_MIXED | LXC_AUTO_CGROUP_FORCE       },
-	    { "cgroup:ro:force",         LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RO | LXC_AUTO_CGROUP_FORCE          },
-	    { "cgroup:rw:force",         LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RW | LXC_AUTO_CGROUP_FORCE          },
-	    { "cgroup-full",             LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_NOSPEC                         },
-	    { "cgroup-full:mixed",       LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_MIXED                          },
-	    { "cgroup-full:ro",          LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RO                             },
-	    { "cgroup-full:rw",          LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RW                             },
-	    { "cgroup-full:force",       LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_NOSPEC | LXC_AUTO_CGROUP_FORCE },
-	    { "cgroup-full:mixed:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_MIXED | LXC_AUTO_CGROUP_FORCE  },
-	    { "cgroup-full:ro:force",    LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RO | LXC_AUTO_CGROUP_FORCE     },
-	    { "cgroup-full:rw:force",    LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RW | LXC_AUTO_CGROUP_FORCE     },
-	    { "shmounts:",               LXC_AUTO_SHMOUNTS_MASK, LXC_AUTO_SHMOUNTS                                 },
-	    /* For adding anything that is just a single on/off, but has no
-	    *  options: keep mask and flag identical and just define the enum
-	    *  value as an unused bit so far
-	     */
-	    { NULL,                      0,                    0                                              }
+		{ "proc",			LXC_AUTO_PROC_MASK,	LXC_AUTO_PROC_MIXED					},
+		{ "proc:mixed",			LXC_AUTO_PROC_MASK,	LXC_AUTO_PROC_MIXED					},
+		{ "proc:rw",			LXC_AUTO_PROC_MASK,	LXC_AUTO_PROC_RW					},
+		{ "sys",			LXC_AUTO_SYS_MASK,	LXC_AUTO_SYS_MIXED					},
+		{ "sys:ro",			LXC_AUTO_SYS_MASK,	LXC_AUTO_SYS_RO						},
+		{ "sys:mixed",			LXC_AUTO_SYS_MASK,	LXC_AUTO_SYS_MIXED					},
+		{ "sys:rw",			LXC_AUTO_SYS_MASK,	LXC_AUTO_SYS_RW						},
+		{ "cgroup2",			LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP2_RW | LXC_AUTO_CGROUP_FORCE		},
+		{ "cgroup2:ro",			LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP2_RO | LXC_AUTO_CGROUP_FORCE		},
+		{ "cgroup2:force",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP2_RW | LXC_AUTO_CGROUP_FORCE		},
+		{ "cgroup2:ro:force",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP2_RO | LXC_AUTO_CGROUP_FORCE		},
+		{ "cgroup",			LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_NOSPEC					},
+		{ "cgroup:mixed",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_MIXED					},
+		{ "cgroup:ro",			LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_RO					},
+		{ "cgroup:rw",			LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_RW					},
+		{ "cgroup:force",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_NOSPEC | LXC_AUTO_CGROUP_FORCE		},
+		{ "cgroup:mixed:force",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_MIXED | LXC_AUTO_CGROUP_FORCE		},
+		{ "cgroup:ro:force",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_RO | LXC_AUTO_CGROUP_FORCE		},
+		{ "cgroup:rw:force",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_RW | LXC_AUTO_CGROUP_FORCE		},
+		{ "cgroup-full",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_FULL_NOSPEC				},
+		{ "cgroup-full:mixed",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_FULL_MIXED				},
+		{ "cgroup-full:ro",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_FULL_RO					},
+		{ "cgroup-full:rw",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_FULL_RW					},
+		{ "cgroup-full:force",		LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_FULL_NOSPEC | LXC_AUTO_CGROUP_FORCE	},
+		{ "cgroup-full:mixed:force",	LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_FULL_MIXED | LXC_AUTO_CGROUP_FORCE	},
+		{ "cgroup-full:ro:force",	LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_FULL_RO | LXC_AUTO_CGROUP_FORCE		},
+		{ "cgroup-full:rw:force",	LXC_AUTO_CGROUP_MASK,	LXC_AUTO_CGROUP_FULL_RW | LXC_AUTO_CGROUP_FORCE		},
+		{ "shmounts:",			LXC_AUTO_SHMOUNTS_MASK,	LXC_AUTO_SHMOUNTS					},
+		/*
+		 * For adding anything that is just a single on/off, but has no
+		 * options: keep mask and flag identical and just define the
+		 * enum value as an unused bit so far
+		 */
+		{ NULL,				0,			0							}
 	};
 
 	if (lxc_config_value_empty(value)) {
@@ -2102,89 +2361,81 @@
 
 	autos = strdup(value);
 	if (!autos)
-		return -1;
+		return ret_errno(ENOMEM);
 
 	lxc_iterate_parts(token, autos, " \t") {
 		bool is_shmounts = false;
 
 		for (i = 0; allowed_auto_mountsi.token; i++) {
-			if (!strcmp(allowed_auto_mountsi.token, token))
+			if (strequal(allowed_auto_mountsi.token, token))
 				break;
 
-			if (strcmp("shmounts:", allowed_auto_mountsi.token) == 0 &&
-			    strncmp("shmounts:", token, STRLITERALLEN("shmounts:")) == 0) {
+			if (strequal("shmounts:", allowed_auto_mountsi.token) &&
+			    strnequal("shmounts:", token, STRLITERALLEN("shmounts:"))) {
 				is_shmounts = true;
 				break;
 			}
 		}
 
-		if (!allowed_auto_mountsi.token) {
-			ERROR("Invalid filesystem to automount \"%s\"", token);
-			goto on_error;
-		}
+		if (!allowed_auto_mountsi.token)
+			return log_error_errno(-EINVAL, EINVAL, "Invalid filesystem to automount \"%s\"", token);
 
 		lxc_conf->auto_mounts &= ~allowed_auto_mountsi.mask;
 		lxc_conf->auto_mounts |= allowed_auto_mountsi.flag;
 
 		if (is_shmounts) {
-			char *container_path;
-			char *host_path;
-
-			host_path = token + STRLITERALLEN("shmounts:");
-			if (*host_path == '\0') {
-				SYSERROR("Failed to copy shmounts host path");
-				goto on_error;
-			}
+			__do_free char *container_path = NULL, *host_path = NULL;
+			char *val;
 
-			container_path = strchr(host_path, ':');
-			if (!container_path || *(container_path + 1) == '\0')
-				container_path = "/dev/.lxc-mounts";
+			val = token + STRLITERALLEN("shmounts:");
+			if (*val == '\0')
+				return log_error_errno(-EINVAL, EINVAL, "Failed to copy shmounts host path");
+
+			host_path = strdup(val);
+			if (!host_path)
+				return log_error_errno(-EINVAL, EINVAL, "Failed to copy shmounts host path");
+
+			val = strchr(host_path, ':');
+			if (!val || *(val + 1) == '\0')
+				val = "/dev/.lxc-mounts";
 			else
-				*container_path++ = '\0';
+				*val++ = '\0';
 
-			lxc_conf->shmount.path_host = strdup(host_path);
-			if (!lxc_conf->shmount.path_host) {
-				SYSERROR("Failed to copy shmounts host path");
-				goto on_error;
-			}
+			container_path = strdup(val);
+			if(!container_path)
+				return log_error_errno(-EINVAL, EINVAL, "Failed to copy shmounts container path");
 
-			lxc_conf->shmount.path_cont = strdup(container_path);
-			if(!lxc_conf->shmount.path_cont) {
-				SYSERROR("Failed to copy shmounts container path");
-				goto on_error;
-			}
+			free_disarm(lxc_conf->shmount.path_host);
+			lxc_conf->shmount.path_host = move_ptr(host_path);
+
+			free_disarm(lxc_conf->shmount.path_cont);
+			lxc_conf->shmount.path_cont = move_ptr(container_path);
 		}
 	}
 
-	ret = 0;
-
-on_error:
-	free(autos);
-
-	return ret;
+	return 0;
 }
 
 static int set_config_mount(const char *key, const char *value,
 			    struct lxc_conf *lxc_conf, void *data)
 {
-	char *mntelem;
-	struct lxc_list *mntlist;
+	__do_free char *mntelem = NULL;
+	__do_free struct string_entry *entry = NULL;
 
 	if (lxc_config_value_empty(value))
 		return lxc_clear_mount_entries(lxc_conf);
 
-	mntlist = malloc(sizeof(*mntlist));
-	if (!mntlist)
-		return -1;
+	entry = zalloc(sizeof(struct string_entry));
+	if (!entry)
+		return ret_errno(ENOMEM);
 
 	mntelem = strdup(value);
-	if (!mntelem) {
-		free(mntlist);
-		return -1;
-	}
-	mntlist->elem = mntelem;
+	if (!mntelem)
+		return ret_errno(ENOMEM);
 
-	lxc_list_add_tail(&lxc_conf->mount_list, mntlist);
+	entry->val = move_ptr(mntelem);
+	list_add_tail(&entry->head, &lxc_conf->mount_entries);
+	move_ptr(entry);
 
 	return 0;
 }
@@ -2193,85 +2444,98 @@
 	return set_config_mount(NULL, value, lxc_conf, NULL);
 }
 
-static int set_config_cap_keep(const char *key, const char *value,
-			       struct lxc_conf *lxc_conf, void *data)
+static int add_cap_entry(struct lxc_conf *conf, char *caps, bool keep)
 {
-	char *keepcaps, *token;
-	struct lxc_list *keeplist;
-	int ret = -1;
+	char *token;
 
-	if (lxc_config_value_empty(value))
-		return lxc_clear_config_keepcaps(lxc_conf);
+	/*
+	 * In case several capability keep is specified in a single line split
+	 * these caps in a single element for the list.
+	 */
+	lxc_iterate_parts(token, caps, " \t") {
+		__do_free struct cap_entry *new_cap = NULL;
+		int ret;
+		__u32 cap;
 
-	keepcaps = strdup(value);
-	if (!keepcaps)
-		return -1;
+		if (strequal(token, "none")) {
+			if (!keep)
+				return syserror_set(-EINVAL, "The \"none\" keyword is only valid when keeping caps");
 
-	/* In case several capability keep is specified in a single line
-	 * split these caps in a single element for the list.
-	 */
-	lxc_iterate_parts(token, keepcaps, " \t") {
-		if (!strcmp(token, "none"))
-			lxc_clear_config_keepcaps(lxc_conf);
-
-		keeplist = malloc(sizeof(*keeplist));
-		if (!keeplist)
-			goto on_error;
-
-		keeplist->elem = strdup(token);
-		if (!keeplist->elem) {
-			free(keeplist);
-			goto on_error;
+			lxc_clear_config_caps(conf);
+			continue;
 		}
 
-		lxc_list_add_tail(&lxc_conf->keepcaps, keeplist);
-	}
+		ret = parse_cap(token, &cap);
+		if (ret < 0) {
+			if (ret != -2)
+				return syserror_set(-EINVAL, "Invalid capability specified");
 
-	ret = 0;
+			INFO("Ignoring unknown capability \"%s\"", token);
+			continue;
+		}
 
-on_error:
-	free(keepcaps);
+		new_cap = zalloc(sizeof(struct cap_entry));
+		if (!new_cap)
+			return ret_errno(ENOMEM);
+
+		new_cap->cap_name = strdup(token);
+		if (!new_cap->cap_name)
+			return ret_errno(ENOMEM);
+		new_cap->cap = cap;
 
-	return ret;
+		list_add_tail(&new_cap->head, &conf->caps.list);
+		move_ptr(new_cap);
+	}
+
+	return 0;
 }
 
-static int set_config_cap_drop(const char *key, const char *value,
+static int set_config_cap_keep(const char *key, const char *value,
 			       struct lxc_conf *lxc_conf, void *data)
 {
-	char *dropcaps, *token;
-	struct lxc_list *droplist;
-	int ret = -1;
+	__do_free char *caps = NULL;
+	int ret;
 
 	if (lxc_config_value_empty(value))
 		return lxc_clear_config_caps(lxc_conf);
 
-	dropcaps = strdup(value);
-	if (!dropcaps)
-		return -1;
+	caps = strdup(value);
+	if (!caps)
+		return ret_errno(ENOMEM);
 
-	/* In case several capability drop is specified in a single line
-	 * split these caps in a single element for the list.
-	 */
-	lxc_iterate_parts(token, dropcaps, " \t") {
-		droplist = malloc(sizeof(*droplist));
-		if (!droplist)
-			goto on_error;
-
-		droplist->elem = strdup(token);
-		if (!droplist->elem) {
-			free(droplist);
-			goto on_error;
-		}
+	if (!lxc_conf->caps.keep && !list_empty(&lxc_conf->caps.list))
+		return syserror_set(-EINVAL, "Keeping and dropping capabilities are mutually exclusive");
 
-		lxc_list_add_tail(&lxc_conf->caps, droplist);
-	}
+	ret = add_cap_entry(lxc_conf, caps, true);
+	if (ret < 0)
+		return ret;
 
-        ret = 0;
+	lxc_conf->caps.keep = true;
+	return 0;
+}
 
-on_error:
-	free(dropcaps);
+static int set_config_cap_drop(const char *key, const char *value,
+			       struct lxc_conf *lxc_conf, void *data)
+{
+	__do_free char *caps = NULL;
+	int ret;
 
-	return ret;
+	if (lxc_config_value_empty(value))
+		return lxc_clear_config_caps(lxc_conf);
+
+	if (lxc_conf->caps.keep)
+		return syserror_set(-EINVAL, "Keeping and dropping capabilities are mutually exclusive");
+
+	caps = strdup(value);
+	if (!caps)
+		return ret_errno(ENOMEM);
+
+	ret = add_cap_entry(lxc_conf, caps, false);
+	if (ret < 0)
+		return ret;
+
+	lxc_conf->caps.keep = false;
+	return 0;
 }
 
 static int set_config_console_path(const char *key, const char *value,
@@ -2283,19 +2547,19 @@
 static int set_config_console_rotate(const char *key, const char *value,
 				     struct lxc_conf *lxc_conf, void *data)
 {
+	int ret;
+
 	if (lxc_config_value_empty(value)) {
 		lxc_conf->console.log_rotate = 0;
 		return 0;
 	}
 
-	if (lxc_safe_uint(value, &lxc_conf->console.log_rotate) < 0)
-		return -1;
+	ret = lxc_safe_uint(value, &lxc_conf->console.log_rotate);
+	if (ret)
+		return ret_errno(EINVAL);
 
-	if (lxc_conf->console.log_rotate > 1) {
-		ERROR("The \"lxc.console.rotate\" config key can only be set "
-		      "to 0 or 1");
-		return -1;
-	}
+	if (lxc_conf->console.log_rotate > 1)
+		return log_error_errno(-EINVAL, EINVAL, "The \"lxc.console.rotate\" config key can only be set to 0 or 1");
 
 	return 0;
 }
@@ -2310,7 +2574,7 @@
 					  struct lxc_conf *lxc_conf, void *data)
 {
 	int ret;
-	int64_t size;
+	long long int size;
 	uint64_t buffer_size, pgsz;
 
 	if (lxc_config_value_empty(value)) {
@@ -2319,35 +2583,32 @@
 	}
 
 	/* If the user specified "auto" the default log size is 2^17 = 128 Kib */
-	if (!strcmp(value, "auto")) {
+	if (strequal(value, "auto")) {
 		lxc_conf->console.buffer_size = 1 << 17;
 		return 0;
 	}
 
 	ret = parse_byte_size_string(value, &size);
-	if (ret < 0)
-		return -1;
+	if (ret)
+		return ret;
 
 	if (size < 0)
-		return -EINVAL;
+		return ret_errno(EINVAL);
 
 	/* must be at least a page size */
 	pgsz = lxc_getpagesize();
 	if ((uint64_t)size < pgsz) {
-		NOTICE("Requested ringbuffer size for the console is %" PRId64
-		       " but must be at least %" PRId64
-		       " bytes. Setting ringbuffer size to %" PRId64 " bytes",
+		NOTICE("Requested ringbuffer size for the console is %lld but must be at least %" PRId64 " bytes. Setting ringbuffer size to %" PRId64 " bytes",
 		       size, pgsz, pgsz);
 		size = pgsz;
 	}
 
 	buffer_size = lxc_find_next_power2((uint64_t)size);
 	if (buffer_size == 0)
-		return -EINVAL;
+		return ret_errno(EINVAL);
 
-	if (buffer_size != size)
-		NOTICE("Passed size was not a power of 2. Rounding log size to "
-		       "next power of two: %" PRIu64 " bytes", buffer_size);
+	if (buffer_size != (uint64_t)size)
+		NOTICE("Passed size was not a power of 2. Rounding log size to next power of two: %" PRIu64 " bytes", buffer_size);
 
 	lxc_conf->console.buffer_size = buffer_size;
 
@@ -2358,7 +2619,7 @@
 				   struct lxc_conf *lxc_conf, void *data)
 {
 	int ret;
-	int64_t size;
+	long long int size;
 	uint64_t log_size, pgsz;
 
 	if (lxc_config_value_empty(value)) {
@@ -2367,35 +2628,32 @@
 	}
 
 	/* If the user specified "auto" the default log size is 2^17 = 128 Kib */
-	if (!strcmp(value, "auto")) {
+	if (strequal(value, "auto")) {
 		lxc_conf->console.log_size = 1 << 17;
 		return 0;
 	}
 
 	ret = parse_byte_size_string(value, &size);
-	if (ret < 0)
-		return -1;
+	if (ret)
+		return ret_errno(EINVAL);
 
 	if (size < 0)
-		return -EINVAL;
+		return ret_errno(EINVAL);
 
 	/* must be at least a page size */
 	pgsz = lxc_getpagesize();
 	if ((uint64_t)size < pgsz) {
-		NOTICE("Requested ringbuffer size for the console is %" PRId64
-		       " but must be at least %" PRId64
-		       " bytes. Setting ringbuffer size to %" PRId64 " bytes",
+		NOTICE("Requested ringbuffer size for the console is %lld but must be at least %" PRId64 " bytes. Setting ringbuffer size to %" PRId64 " bytes",
 		       size, pgsz, pgsz);
 		size = pgsz;
 	}
 
 	log_size = lxc_find_next_power2((uint64_t)size);
 	if (log_size == 0)
-		return -EINVAL;
+		return ret_errno(EINVAL);
 
-	if (log_size != size)
-		NOTICE("Passed size was not a power of 2. Rounding log size to "
-		       "next power of two: %" PRIu64 " bytes", log_size);
+	if (log_size != (uint64_t)size)
+		NOTICE("Passed size was not a power of 2. Rounding log size to next power of two: %" PRIu64 " bytes", log_size);
 
 	lxc_conf->console.log_size = log_size;
 
@@ -2445,10 +2703,11 @@
 
 	linelen = strlen(line);
 	while (conf->unexpanded_alloced <= len + linelen + 2) {
-		char *tmp = realloc(conf->unexpanded_config,
-				    conf->unexpanded_alloced + 1024);
+		char *tmp;
+
+		tmp = realloc(conf->unexpanded_config, conf->unexpanded_alloced + 1024);
 		if (!tmp)
-			return -1;
+			return ret_errno(EINVAL);
 
 		if (!conf->unexpanded_config)
 			*tmp = '\0';
@@ -2470,35 +2729,34 @@
 {
 	__do_closedir DIR *dir = NULL;
 	struct dirent *direntp;
-	char pathPATH_MAX;
-	int len;
-	int ret = -1;
+	int len, ret;
 
 	dir = opendir(dirp);
 	if (!dir)
-		return -1;
+		return errno == ENOENT ? 0 : -errno;
 
 	while ((direntp = readdir(dir))) {
 		const char *fnam;
+		char pathPATH_MAX;
 
 		fnam = direntp->d_name;
-		if (!strcmp(fnam, "."))
+		if (strequal(fnam, "."))
 			continue;
 
-		if (!strcmp(fnam, ".."))
+		if (strequal(fnam, ".."))
 			continue;
 
 		len = strlen(fnam);
-		if (len < 6 || strncmp(fnam + len - 5, ".conf", 5) != 0)
+		if (len < 6 || !strnequal(fnam + len - 5, ".conf", 5))
 			continue;
 
-		len = snprintf(path, PATH_MAX, "%s/%s", dirp, fnam);
-		if (len < 0 || len >= PATH_MAX)
-			return -1;
+		len = strnprintf(path, sizeof(path), "%s/%s", dirp, fnam);
+		if (len < 0)
+			return ret_errno(EIO);
 
 		ret = lxc_config_read(path, lxc_conf, true);
 		if (ret < 0)
-			return -1;
+			return ret;
 	}
 
 	return 0;
@@ -2512,7 +2770,7 @@
 		return 0;
 	}
 
-	if (is_dir(value))
+	if (valuestrlen(value)-1 == '/' || is_dir(value))
 		return do_includedir(value, lxc_conf);
 
 	return lxc_config_read(value, lxc_conf, true);
@@ -2521,8 +2779,9 @@
 static int set_config_rootfs_path(const char *key, const char *value,
 				  struct lxc_conf *lxc_conf, void *data)
 {
+	__do_free char *dup = NULL;
 	int ret;
-	char *dup, *tmp;
+	char *tmp;
 	const char *container_path;
 
 	if (lxc_config_value_empty(value)) {
@@ -2533,7 +2792,7 @@
 
 	dup = strdup(value);
 	if (!dup)
-		return -1;
+		return ret_errno(ENOMEM);
 
 	/* Split <storage type>:<container path> into <storage type> and
 	 * <container path>. Set "rootfs.bdev_type" to <storage type> and
@@ -2544,10 +2803,8 @@
 		*tmp = '\0';
 
 		ret = set_config_path_item(&lxc_conf->rootfs.bdev_type, dup);
-		if (ret < 0) {
-			free(dup);
-			return -1;
-		}
+		if (ret < 0)
+			return ret_errno(ENOMEM);
 
 		tmp++;
 		container_path = tmp;
@@ -2555,10 +2812,7 @@
 		container_path = value;
 	}
 
-	ret = set_config_path_item(&lxc_conf->rootfs.path, container_path);
-	free(dup);
-
-	return ret;
+	return set_config_path_item(&lxc_conf->rootfs.path, container_path);
 }
 
 static int set_config_rootfs_managed(const char *key, const char *value,
@@ -2576,56 +2830,60 @@
 static int set_config_rootfs_options(const char *key, const char *value,
 				     struct lxc_conf *lxc_conf, void *data)
 {
-	unsigned long mflags = 0, pflags = 0;
-	char *mdata = NULL, *opts = NULL;
-	int ret;
+	__do_free char *dup = NULL, *raw_options = NULL;
 	struct lxc_rootfs *rootfs = &lxc_conf->rootfs;
+	struct lxc_mount_options *mnt_opts = &rootfs->mnt_opts;
+	int ret;
 
-	ret = parse_mntopts(value, &mflags, &mdata);
-	if (ret < 0)
-		return -EINVAL;
+	clr_config_rootfs_options(key, lxc_conf, data);
+	if (lxc_config_value_empty(value))
+		return 0;
 
-	ret = parse_propagationopts(value, &pflags);
-	if (ret < 0) {
-		free(mdata);
-		return -EINVAL;
-	}
+	ret = set_config_string_item(&raw_options, value);
+	if (ret < 0)
+		return ret_errno(ENOMEM);
 
-	ret = set_config_string_item(&opts, value);
-	if (ret < 0) {
-		free(mdata);
+	dup = strdup(value);
+	if (!dup)
 		return -ENOMEM;
-	}
 
-	rootfs->mountflags = mflags | pflags;
-	rootfs->options = opts;
-	rootfs->data = mdata;
+	ret = parse_lxc_mount_attrs(mnt_opts, dup);
+	if (ret < 0)
+		return ret;
+
+	/* Make sure we're only valid LXC specific mount options. */
+	if (mnt_opts->create_dir || mnt_opts->create_file ||
+	    mnt_opts->optional || mnt_opts->relative)
+		return syserror_set(-EINVAL, "Invalid LXC specific mount option for rootfs mount");
 
+	ret = parse_mount_attrs(mnt_opts, dup);
+	if (ret < 0)
+		return ret_errno(EINVAL);
+
+	rootfs->mnt_opts.raw_options = move_ptr(raw_options);
 	return 0;
 }
 
 static int set_config_uts_name(const char *key, const char *value,
 			      struct lxc_conf *lxc_conf, void *data)
 {
-	struct utsname *utsname;
+	__do_free struct utsname *utsname = NULL;
 
 	if (lxc_config_value_empty(value)) {
 		clr_config_uts_name(key, lxc_conf, NULL);
 		return 0;
 	}
 
-	utsname = malloc(sizeof(*utsname));
+	utsname = zalloc(sizeof(*utsname));
 	if (!utsname)
-		return -1;
+		return ret_errno(ENOMEM);
 
-	if (strlen(value) >= sizeof(utsname->nodename)) {
-		free(utsname);
-		return -1;
-	}
+	if (strlen(value) >= sizeof(utsname->nodename))
+		return ret_errno(EINVAL);
 
 	(void)strlcpy(utsname->nodename, value, sizeof(utsname->nodename));
 	free(lxc_conf->utsname);
-	lxc_conf->utsname = utsname;
+	lxc_conf->utsname = move_ptr(utsname);
 
 	return 0;
 }
@@ -2633,34 +2891,28 @@
 static int set_config_namespace_clone(const char *key, const char *value,
 				      struct lxc_conf *lxc_conf, void *data)
 {
-	char *ns, *token;
+	__do_free char *ns = NULL;
+	char *token;
 	int cloneflag = 0;
 
 	if (lxc_config_value_empty(value))
 		return clr_config_namespace_clone(key, lxc_conf, data);
 
-	if (lxc_conf->ns_keep != 0) {
-		errno = EINVAL;
-		SYSERROR("Cannot set both \"lxc.namespace.clone\" and "
-		         "\"lxc.namespace.keep\"");
-		return -EINVAL;
-	}
+	if (lxc_conf->ns_keep != 0)
+		return log_error_errno(-EINVAL, EINVAL, "Cannot set both \"lxc.namespace.clone\" and \"lxc.namespace.keep\"");
 
 	ns = strdup(value);
 	if (!ns)
-		return -1;
+		return ret_errno(ENOMEM);
 
 	lxc_iterate_parts(token, ns, " \t") {
 		token += lxc_char_left_gc(token, strlen(token));
 		tokenlxc_char_right_gc(token, strlen(token)) = '\0';
 		cloneflag = lxc_namespace_2_cloneflag(token);
-		if (cloneflag < 0) {
-			free(ns);
-			return -EINVAL;
-		}
+		if (cloneflag < 0)
+			return ret_errno(EINVAL);
 		lxc_conf->ns_clone |= cloneflag;
 	}
-	free(ns);
 
 	return 0;
 }
@@ -2668,34 +2920,106 @@
 static int set_config_namespace_keep(const char *key, const char *value,
 				     struct lxc_conf *lxc_conf, void *data)
 {
-	char *ns, *token;
+	__do_free char *ns = NULL;
+	char *token;
 	int cloneflag = 0;
 
 	if (lxc_config_value_empty(value))
 		return clr_config_namespace_keep(key, lxc_conf, data);
 
-	if (lxc_conf->ns_clone != 0) {
-		errno = EINVAL;
-		SYSERROR("Cannot set both \"lxc.namespace.clone\" and "
-		         "\"lxc.namespace.keep\"");
-		return -EINVAL;
-	}
+	if (lxc_conf->ns_clone != 0)
+		return log_error_errno(-EINVAL, EINVAL, "Cannot set both \"lxc.namespace.clone\" and \"lxc.namespace.keep\"");
 
 	ns = strdup(value);
 	if (!ns)
-		return -1;
+		return ret_errno(ENOMEM);
 
 	lxc_iterate_parts(token, ns, " \t") {
 		token += lxc_char_left_gc(token, strlen(token));
 		tokenlxc_char_right_gc(token, strlen(token)) = '\0';
 		cloneflag = lxc_namespace_2_cloneflag(token);
-		if (cloneflag < 0) {
-			free(ns);
-			return -EINVAL;
-		}
+		if (cloneflag < 0)
+			return ret_errno(EINVAL);
 		lxc_conf->ns_keep |= cloneflag;
 	}
-	free(ns);
+
+	return 0;
+}
+
+static int set_config_time_offset_boot(const char *key, const char *value,
+				       struct lxc_conf *lxc_conf, void *data)
+{
+	int ret;
+	char *unit;
+	int64_t offset = 0;
+	char bufSTRLITERALLEN("ms") + 1;
+
+	if (lxc_config_value_empty(value))
+		return clr_config_time_offset_boot(key, lxc_conf, data);
+
+	ret = lxc_safe_int64_residual(value, &offset, 10, buf, sizeof(buf));
+	if (ret)
+		return ret;
+
+	unit = lxc_trim_whitespace_in_place(buf);
+	if (strequal(unit, "h")) {
+		if (!multiply_overflow(offset, 3600, &lxc_conf->timens.s_boot))
+			return ret_errno(EOVERFLOW);
+	} else if (strequal(unit, "m")) {
+		if (!multiply_overflow(offset, 60, &lxc_conf->timens.s_boot))
+			return ret_errno(EOVERFLOW);
+	} else if (strequal(unit, "s")) {
+		lxc_conf->timens.s_boot = offset;
+	} else if (strequal(unit, "ms")) {
+		if (!multiply_overflow(offset, 1000000, &lxc_conf->timens.ns_boot))
+			return ret_errno(EOVERFLOW);
+	} else if (strequal(unit, "us")) {
+		if (!multiply_overflow(offset, 1000, &lxc_conf->timens.ns_boot))
+			return ret_errno(EOVERFLOW);
+	} else if (strequal(unit, "ns")) {
+		lxc_conf->timens.ns_boot = offset;
+	} else {
+		return ret_errno(EINVAL);
+	}
+
+	return 0;
+}
+
+static int set_config_time_offset_monotonic(const char *key, const char *value,
+					    struct lxc_conf *lxc_conf, void *data)
+{
+	int ret;
+	char *unit;
+	int64_t offset = 0;
+	char bufSTRLITERALLEN("ms") + 1;
+
+	if (lxc_config_value_empty(value))
+		return clr_config_time_offset_monotonic(key, lxc_conf, data);
+
+	ret = lxc_safe_int64_residual(value, &offset, 10, buf, sizeof(buf));
+	if (ret)
+		return ret;
+
+	unit = lxc_trim_whitespace_in_place(buf);
+	if (strequal(unit, "h")) {
+		if (!multiply_overflow(offset, 3600, &lxc_conf->timens.s_monotonic))
+			return ret_errno(EOVERFLOW);
+	} else if (strequal(unit, "m")) {
+		if (!multiply_overflow(offset, 60, &lxc_conf->timens.s_monotonic))
+			return ret_errno(EOVERFLOW);
+	} else if (strequal(unit, "s")) {
+		lxc_conf->timens.s_monotonic = offset;
+	} else if (strequal(unit, "ms")) {
+		if (!multiply_overflow(offset, 1000000, &lxc_conf->timens.ns_monotonic))
+			return ret_errno(EOVERFLOW);
+	} else if (strequal(unit, "us")) {
+		if (!multiply_overflow(offset, 1000, &lxc_conf->timens.ns_monotonic))
+			return ret_errno(EOVERFLOW);
+	} else if (strequal(unit, "ns")) {
+		lxc_conf->timens.ns_monotonic = offset;
+	} else {
+		return ret_errno(EINVAL);
+	}
 
 	return 0;
 }
@@ -2710,6 +3034,9 @@
 		return clr_config_namespace_share(key, lxc_conf, data);
 
 	namespace = key + STRLITERALLEN("lxc.namespace.share.");
+	if (is_empty_string(namespace))
+		return ret_errno(EINVAL);
+
 	ns_idx = lxc_namespace_2_ns_idx(namespace);
 	if (ns_idx < 0)
 		return ns_idx;
@@ -2724,13 +3051,17 @@
 
 static int parse_line(char *buffer, void *data)
 {
-	char *dot, *key, *line, *linep, *value;
+	__do_free char *linep = NULL;
+	char *dot, *key, *line, *value;
 	bool empty_line;
 	struct lxc_config_t *config;
-	int ret = 0;
+	int ret;
 	char *dup = buffer;
 	struct parse_line_conf *plc = data;
 
+	if (!plc->conf)
+		return syserror_set(-EINVAL, "Missing config");
+
 	/* If there are newlines in the config file we should keep them. */
 	empty_line = lxc_is_line_empty(dup);
 	if (empty_line)
@@ -2742,34 +3073,30 @@
 	 */
 	linep = line = strdup(dup);
 	if (!line)
-		return -1;
+		return ret_errno(ENOMEM);
 
 	if (!plc->from_include) {
 		ret = append_unexp_config_line(line, plc->conf);
 		if (ret < 0)
-			goto on_error;
+			return ret;
 	}
 
 	if (empty_line)
-		goto on_error;
+		return 0;
 
 	line += lxc_char_left_gc(line, strlen(line));
 
 	/* ignore comments */
 	if (line0 == '#')
-		goto on_error;
+		return 0;
 
 	/* martian option - don't add it to the config itself */
-	if (strncmp(line, "lxc.", 4))
-		goto on_error;
-
-	ret = -1;
+	if (!strnequal(line, "lxc.", 4))
+		return 0;
 
 	dot = strchr(line, '=');
-	if (!dot) {
-		ERROR("Invalid configuration line: %s", line);
-		goto on_error;
-	}
+	if (!dot)
+		return log_error_errno(-EINVAL, EINVAL, "Invalid configuration line: %s", line);
 
 	*dot = '\0';
 	value = dot + 1;
@@ -2791,25 +3118,18 @@
 	}
 
 	config = lxc_get_config(key);
-	if (!config) {
-		ERROR("Unknown configuration key \"%s\"", key);
-		goto on_error;
-	}
-
-	ret = config->set(key, value, plc->conf, NULL);
-
-on_error:
-	free(linep);
-
-	return ret;
+	return config->set(key, value, plc->conf, NULL);
 }
 
 static struct new_config_item *parse_new_conf_line(char *buffer)
 {
-	char *dot, *key, *line, *linep, *value;
-	int ret = 0;
+	__do_free char *k = NULL, *linep = NULL, *v = NULL;
+	__do_free struct new_config_item *new = NULL;
 	char *dup = buffer;
-	struct new_config_item *new = NULL;
+	char *dot, *key, *line, *value;
+
+	if (is_empty_string(buffer))
+		return log_error_errno(NULL, EINVAL, "Empty configuration line");
 
 	linep = line = strdup(dup);
 	if (!line)
@@ -2818,15 +3138,12 @@
 	line += lxc_char_left_gc(line, strlen(line));
 
 	/* martian option - don't add it to the config itself */
-	if (strncmp(line, "lxc.", 4))
-		goto on_error;
+	if (!strnequal(line, "lxc.", 4))
+		return 0;
 
-	ret = -1;
 	dot = strchr(line, '=');
-	if (!dot) {
-		ERROR("Invalid configuration item: %s", line);
-		goto on_error;
-	}
+	if (!dot)
+		return log_error_errno(NULL, EINVAL, "Invalid configuration line: %s", line);
 
 	*dot = '\0';
 	value = dot + 1;
@@ -2847,60 +3164,53 @@
 		}
 	}
 
-	ret = -1;
-	new = malloc(sizeof(struct new_config_item));
+	new = zalloc(sizeof(struct new_config_item));
 	if (!new)
-		goto on_error;
-
-	new->key = strdup(key);
-	new->val = strdup(value);
-	if (!new->val || !new->key)
-		goto on_error;
-
-	ret = 0;
+		return NULL;
 
-on_error:
-	free(linep);
+	k = strdup(key);
+	if (!k)
+		return NULL;
 
-	if (ret < 0 && new) {
-		free(new->key);
-		free(new->val);
-		free(new);
-		new = NULL;
-	}
+	v = strdup(value);
+	if (!v)
+		return NULL;
 
-	return new;
+	new->key = move_ptr(k);
+	new->val = move_ptr(v);
+	return move_ptr(new);
 }
 
 int lxc_config_read(const char *file, struct lxc_conf *conf, bool from_include)
 {
-	struct parse_line_conf c;
+	struct parse_line_conf plc;
 
-	c.conf = conf;
-	c.from_include = from_include;
+	if (!conf)
+		return syserror_set(-EINVAL, "Missing config");
+
+	plc.conf = conf;
+	plc.from_include = from_include;
 
 	/* Catch only the top level config file name in the structure. */
 	if (!conf->rcfile)
 		conf->rcfile = strdup(file);
 
-	return lxc_file_for_each_line_mmap(file, parse_line, &c);
+	return lxc_file_for_each_line_mmap(file, parse_line, &plc);
 }
 
 int lxc_config_define_add(struct lxc_list *defines, char *arg)
 {
-	struct lxc_list *dent;
+	__do_free struct lxc_list *dent = NULL;
 
-	dent = malloc(sizeof(struct lxc_list));
+	dent = lxc_list_new();
 	if (!dent)
-		return -1;
+		return ret_errno(ENOMEM);
 
 	dent->elem = parse_new_conf_line(arg);
-	if (!dent->elem) {
-		free(dent);
-		return -1;
-	}
+	if (!dent->elem)
+		return ret_errno(ENOMEM);
 
-	lxc_list_add_tail(defines, dent);
+	lxc_list_add_tail(defines, move_ptr(dent));
 
 	return 0;
 }
@@ -2917,7 +3227,9 @@
 			break;
 	}
 
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 	lxc_config_define_free(defines);
+#endif /* !FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */
 
 	return bret;
 }
@@ -2931,59 +3243,62 @@
 		free(new_item->key);
 		free(new_item->val);
 		lxc_list_del(it);
+		free(it->elem);
 		free(it);
 	}
 }
 
-signed long lxc_config_parse_arch(const char *arch)
+int lxc_config_parse_arch(const char *arch, signed long *persona)
 {
-#if HAVE_SYS_PERSONALITY_H
-	size_t i;
-	struct per_name {
+	static struct per_name {
 		char *name;
 		unsigned long per;
 	} pername = {
-	    { "arm",       PER_LINUX32 },
-	    { "armel",     PER_LINUX32 },
-	    { "armhf",     PER_LINUX32 },
-	    { "armv7l",    PER_LINUX32 },
-	    { "athlon",    PER_LINUX32 },
-	    { "i386",      PER_LINUX32 },
-	    { "i486",      PER_LINUX32 },
-	    { "i586",      PER_LINUX32 },
-	    { "i686",      PER_LINUX32 },
-	    { "linux32",   PER_LINUX32 },
-	    { "mips",      PER_LINUX32 },
-	    { "mipsel",    PER_LINUX32 },
-	    { "ppc",       PER_LINUX32 },
-	    { "powerpc",   PER_LINUX32 },
-	    { "x86",       PER_LINUX32 },
-	    { "amd64",     PER_LINUX   },
-	    { "arm64",     PER_LINUX   },
-	    { "linux64",   PER_LINUX   },
-	    { "mips64",    PER_LINUX   },
-	    { "mips64el",  PER_LINUX   },
-	    { "ppc64",     PER_LINUX   },
-	    { "ppc64el",   PER_LINUX   },
-	    { "ppc64le",   PER_LINUX   },
-	    { "powerpc64", PER_LINUX   },
-	    { "s390x",     PER_LINUX   },
-	    { "x86_64",    PER_LINUX   },
+		{ "arm",       PER_LINUX32 },
+		{ "armel",     PER_LINUX32 },
+		{ "armhf",     PER_LINUX32 },
+		{ "armv7l",    PER_LINUX32 },
+		{ "athlon",    PER_LINUX32 },
+		{ "i386",      PER_LINUX32 },
+		{ "i486",      PER_LINUX32 },
+		{ "i586",      PER_LINUX32 },
+		{ "i686",      PER_LINUX32 },
+		{ "linux32",   PER_LINUX32 },
+		{ "mips",      PER_LINUX32 },
+		{ "mipsel",    PER_LINUX32 },
+		{ "ppc",       PER_LINUX32 },
+		{ "powerpc",   PER_LINUX32 },
+		{ "x86",       PER_LINUX32 },
+		{ "aarch64",   PER_LINUX   },
+		{ "amd64",     PER_LINUX   },
+		{ "arm64",     PER_LINUX   },
+		{ "linux64",   PER_LINUX   },
+		{ "mips64",    PER_LINUX   },
+		{ "mips64el",  PER_LINUX   },
+		{ "ppc64",     PER_LINUX   },
+		{ "ppc64el",   PER_LINUX   },
+		{ "ppc64le",   PER_LINUX   },
+		{ "powerpc64", PER_LINUX   },
+		{ "riscv64",   PER_LINUX   },
+		{ "s390x",     PER_LINUX   },
+		{ "x86_64",    PER_LINUX   },
 	};
-	size_t len = sizeof(pername) / sizeof(pername0);
 
-	for (i = 0; i < len; i++)
-		if (!strcmp(pernamei.name, arch))
-			return pernamei.per;
-#endif
+	for (size_t i = 0; i < ARRAY_SIZE(pername); i++) {
+		if (!strequal(pernamei.name, arch))
+			continue;
 
-	return -1;
+		*persona = pernamei.per;
+		return 0;
+	}
+
+	return ret_errno(EINVAL);
 }
 
-int lxc_fill_elevated_privileges(char *flaglist, int *flags)
+int lxc_fill_elevated_privileges(char *flaglist, unsigned int *flags)
 {
+	unsigned int flags_tmp = 0;
 	char *token;
-	int i, aflag;
 	struct {
 		const char *token;
 		int flag;
@@ -2995,28 +3310,33 @@
 	};
 
 	if (!flaglist) {
-		/* For the sake of backward compatibility, drop all privileges
-		*  if none is specified.
+		/*
+		 * For the sake of backward compatibility, keep all privileges
+		 * if no specific privileges are specified.
 		 */
-		for (i = 0; all_privsi.token; i++)
-			*flags |= all_privsi.flag;
+		for (unsigned int i = 0; all_privsi.token; i++)
+			flags_tmp |= all_privsi.flag;
 
+		*flags = flags_tmp;
 		return 0;
 	}
 
 	lxc_iterate_parts(token, flaglist, "|") {
-		aflag = -1;
+		bool valid_token = false;
 
-		for (i = 0; all_privsi.token; i++)
-			if (!strcmp(all_privsi.token, token))
-				aflag = all_privsi.flag;
+		for (unsigned int i = 0; all_privsi.token; i++) {
+			if (!strequal(all_privsi.token, token))
+				continue;
 
-		if (aflag < 0)
-			return -1;
+			valid_token = true;
+			flags_tmp |= all_privsi.flag;
+		}
 
-		*flags |= aflag;
+		if (!valid_token)
+			return syserror_set(-EINVAL, "Invalid elevated privilege \"%s\" requested", token);
 	}
 
+	*flags = flags_tmp;
 	return 0;
 }
 
@@ -3030,10 +3350,8 @@
 		return 0;
 
 	ret = lxc_write_nointr(fd, conf->unexpanded_config, len);
-	if (ret < 0) {
-		SYSERROR("Failed to write configuration file");
-		return -1;
-	}
+	if (ret < 0)
+		return log_error_errno(-errno, errno, "Failed to write configuration file");
 
 	return 0;
 }
@@ -3049,10 +3367,10 @@
 	tmp = must_realloc(NULL, len);
 
 	if (lxc_config_value_empty(v))
-		ret = snprintf(tmp, len, "%s =", key);
+		ret = strnprintf(tmp, len, "%s =", key);
 	else
-		ret = snprintf(tmp, len, "%s = %s", key, v);
-	if (ret < 0 || ret >= len)
+		ret = strnprintf(tmp, len, "%s = %s", key, v);
+	if (ret < 0)
 		return false;
 
 	/* Save the line verbatim into unexpanded_conf */
@@ -3080,7 +3398,7 @@
 		else
 			lend++;
 
-		if (strncmp(lstart, key, strlen(key)) != 0) {
+		if (!strnequal(lstart, key, strlen(key))) {
 			lstart = lend;
 			continue;
 		}
@@ -3108,26 +3426,23 @@
 				  const char *newpath, const char *oldname,
 				  const char *newname, const char *ovldir)
 {
-	__do_free char *newdir = NULL,
-							 *olddir = NULL;
+	__do_free char *newdir = NULL, *olddir = NULL;
+	char *lstart = conf->unexpanded_config;
+	const char *key = "lxc.mount.entry";
 	int ret;
 	char *lend, *p, *q;
 	size_t newdirlen, olddirlen;
-	char *lstart = conf->unexpanded_config;
-	const char *key = "lxc.mount.entry";
 
 	olddirlen = strlen(ovldir) + strlen(oldpath) + strlen(oldname) + 2;
 	olddir = must_realloc(NULL, olddirlen + 1);
-	ret = snprintf(olddir, olddirlen + 1, "%s=%s/%s", ovldir, oldpath,
-		       oldname);
-	if (ret < 0 || ret >= olddirlen + 1)
+	ret = strnprintf(olddir, olddirlen + 1, "%s=%s/%s", ovldir, oldpath, oldname);
+	if (ret < 0)
 		return false;
 
 	newdirlen = strlen(ovldir) + strlen(newpath) + strlen(newname) + 2;
 	newdir = must_realloc(NULL, newdirlen + 1);
-	ret = snprintf(newdir, newdirlen + 1, "%s=%s/%s", ovldir, newpath,
-		       newname);
-	if (ret < 0 || ret >= newdirlen + 1)
+	ret = strnprintf(newdir, newdirlen + 1, "%s=%s/%s", ovldir, newpath, newname);
+	if (ret < 0)
 		return false;
 
 	if (!conf->unexpanded_config)
@@ -3140,7 +3455,7 @@
 		else
 			lend++;
 
-		if (strncmp(lstart, key, strlen(key)) != 0)
+		if (!strnequal(lstart, key, strlen(key)))
 			goto next;
 
 		p = strchr(lstart + strlen(key), '=');
@@ -3218,24 +3533,23 @@
 			      const char *newpath, const char *oldname,
 			      const char *newname)
 {
-	__do_free char *newdir = NULL,
-							 *olddir = NULL;
+	__do_free char *newdir = NULL, *olddir = NULL;
+	char *lstart = conf->unexpanded_config;
+	const char *key = "lxc.hook";
 	int ret;
 	char *lend, *p;
-	char *lstart = conf->unexpanded_config;
 	size_t newdirlen, olddirlen;
-	const char *key = "lxc.hook";
 
 	olddirlen = strlen(oldpath) + strlen(oldname) + 1;
 	olddir = must_realloc(NULL, olddirlen + 1);
-	ret = snprintf(olddir, olddirlen + 1, "%s/%s", oldpath, oldname);
-	if (ret < 0 || ret >= olddirlen + 1)
+	ret = strnprintf(olddir, olddirlen + 1, "%s/%s", oldpath, oldname);
+	if (ret < 0)
 		return false;
 
 	newdirlen = strlen(newpath) + strlen(newname) + 1;
 	newdir = must_realloc(NULL, newdirlen + 1);
-	ret = snprintf(newdir, newdirlen + 1, "%s/%s", newpath, newname);
-	if (ret < 0 || ret >= newdirlen + 1)
+	ret = strnprintf(newdir, newdirlen + 1, "%s/%s", newpath, newname);
+	if (ret < 0)
 		return false;
 
 	if (!conf->unexpanded_config)
@@ -3248,7 +3562,7 @@
 		else
 			lend++;
 
-		if (strncmp(lstart, key, strlen(key)) != 0)
+		if (!strnequal(lstart, key, strlen(key)))
 			goto next;
 
 		p = strchr(lstart + strlen(key), '=');
@@ -3262,7 +3576,7 @@
 		if (p >= lend)
 			goto next;
 
-		if (strncmp(p, olddir, strlen(olddir)) != 0)
+		if (!strnequal(p, olddir, strlen(olddir)))
 			goto next;
 
 		/* replace the olddir with newdir */
@@ -3329,7 +3643,6 @@
 bool network_new_hwaddrs(struct lxc_conf *conf)
 {
 	char *lend, *p, *p2;
-	struct lxc_list *it;
 	char *lstart = conf->unexpanded_config;
 
 	if (!conf->unexpanded_config)
@@ -3337,6 +3650,7 @@
 
 	while (*lstart) {
 		char newhwaddr18, oldhwaddr17;
+		struct lxc_netdev *netdev;
 
 		lend = strchr(lstart, '\n');
 		if (!lend)
@@ -3377,11 +3691,9 @@
 			return false;
 
 		memcpy(p, newhwaddr, 17);
-		lxc_list_for_each(it, &conf->network) {
-			struct lxc_netdev *n = it->elem;
-
-			if (n->hwaddr && memcmp(oldhwaddr, n->hwaddr, 17) == 0)
-				memcpy(n->hwaddr, newhwaddr, 17);
+		list_for_each_entry(netdev, &conf->netdevs, head) {
+			if (netdev->hwaddr && memcmp(oldhwaddr, netdev->hwaddr, 17) == 0)
+				memcpy(netdev->hwaddr, newhwaddr, 17);
 		}
 
 		lstart = lend;
@@ -3393,16 +3705,19 @@
 static int set_config_ephemeral(const char *key, const char *value,
 				struct lxc_conf *lxc_conf, void *data)
 {
+	int ret;
+
 	if (lxc_config_value_empty(value)) {
 		lxc_conf->ephemeral = 0;
 		return 0;
 	}
 
-	if (lxc_safe_uint(value, &lxc_conf->ephemeral) < 0)
-		return -1;
+	ret = lxc_safe_uint(value, &lxc_conf->ephemeral);
+	if (ret < 0)
+		return ret;
 
 	if (lxc_conf->ephemeral > 1)
-		return -1;
+		return ret_errno(EINVAL);
 
 	return 0;
 }
@@ -3412,17 +3727,15 @@
 {
 	int facility;
 
-	if (lxc_conf->syslog) {
-		free(lxc_conf->syslog);
-		lxc_conf->syslog = NULL;
-	}
+	if (lxc_conf->syslog)
+		free_disarm(lxc_conf->syslog);
 
 	if (lxc_config_value_empty(value))
 		return 0;
 
 	facility = lxc_syslog_priority_to_int(value);
 	if (facility == -EINVAL)
-		return -1;
+		return ret_errno(EINVAL);
 
 	lxc_log_syslog(facility);
 
@@ -3432,6 +3745,7 @@
 static int set_config_no_new_privs(const char *key, const char *value,
 				   struct lxc_conf *lxc_conf, void *data)
 {
+	int ret;
 	unsigned int v;
 
 	if (lxc_config_value_empty(value)) {
@@ -3439,11 +3753,12 @@
 		return 0;
 	}
 
-	if (lxc_safe_uint(value, &v) < 0)
-		return -1;
+	ret = lxc_safe_uint(value, &v);
+	if (ret < 0)
+		return ret;
 
 	if (v > 1)
-		return -1;
+		return ret_errno(EINVAL);
 
 	lxc_conf->no_new_privs = v ? true : false;
 
@@ -3461,7 +3776,6 @@
 	else
 		memset(retv, 0, inlen);
 
-#if HAVE_SYS_PERSONALITY_H
 	int len = 0;
 
 	switch (c->personality) {
@@ -3474,7 +3788,6 @@
 	default:
 		break;
 	}
-#endif
 
 	return fulllen;
 }
@@ -3500,31 +3813,42 @@
 static int get_config_apparmor_profile(const char *key, char *retv, int inlen,
 				       struct lxc_conf *c, void *data)
 {
+#if HAVE_APPARMOR
 	return lxc_get_conf_str(retv, inlen, c->lsm_aa_profile);
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static int get_config_apparmor_allow_incomplete(const char *key, char *retv,
 						int inlen, struct lxc_conf *c,
 						void *data)
 {
-	return lxc_get_conf_int(c, retv, inlen,
-				c->lsm_aa_allow_incomplete);
+#if HAVE_APPARMOR
+	return lxc_get_conf_int(c, retv, inlen, c->lsm_aa_allow_incomplete);
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static int get_config_apparmor_allow_nesting(const char *key, char *retv,
 					     int inlen, struct lxc_conf *c,
 					     void *data)
 {
-	return lxc_get_conf_int(c, retv, inlen,
-				c->lsm_aa_allow_nesting);
+#if HAVE_APPARMOR
+	return lxc_get_conf_int(c, retv, inlen, c->lsm_aa_allow_nesting);
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static int get_config_apparmor_raw(const char *key, char *retv,
 				   int inlen, struct lxc_conf *c,
 				   void *data)
 {
+#if HAVE_APPARMOR
 	int len;
-	struct lxc_list *it;
+	struct string_entry *entry;
 	int fulllen = 0;
 
 	if (!retv)
@@ -3532,23 +3856,34 @@
 	else
 		memset(retv, 0, inlen);
 
-	lxc_list_for_each(it, &c->lsm_aa_raw) {
-		strprint(retv, inlen, "%s\n", (char *)it->elem);
+	list_for_each_entry(entry, &c->lsm_aa_raw, head) {
+		strprint(retv, inlen, "%s\n", entry->val);
 	}
 
 	return fulllen;
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static int get_config_selinux_context(const char *key, char *retv, int inlen,
 				      struct lxc_conf *c, void *data)
 {
+#if HAVE_SELINUX
 	return lxc_get_conf_str(retv, inlen, c->lsm_se_context);
+#else
+	return syserror_set(-EINVAL, "Built without SELinux support");
+#endif
 }
 
 static int get_config_selinux_context_keyring(const char *key, char *retv, int inlen,
 					      struct lxc_conf *c, void *data)
 {
+#if HAVE_SELINUX
 	return lxc_get_conf_str(retv, inlen, c->lsm_se_keyring_context);
+#else
+	return syserror_set(-EINVAL, "Built without SELinux support");
+#endif
 }
 
 static int get_config_keyring_session(const char *key, char *retv, int inlen,
@@ -3570,12 +3905,13 @@
 					  int inlen, struct lxc_conf *c,
 					  int version)
 {
+	int fulllen = 0;
+	bool get_all = false;
 	int len;
 	size_t namespaced_token_len;
 	char *global_token, *namespaced_token;
-	struct lxc_list *it;
-	int fulllen = 0;
-	bool get_all = false;
+	struct list_head *list;
+	struct lxc_cgroup *cgroup;
 
 	if (!retv)
 		inlen = 0;
@@ -3586,32 +3922,32 @@
 		global_token = "lxc.cgroup2";
 		namespaced_token = "lxc.cgroup2.";
 		namespaced_token_len = STRLITERALLEN("lxc.cgroup2.");
+		list = &c->cgroup2;
 	} else if (version == CGROUP_SUPER_MAGIC) {
 		global_token = "lxc.cgroup";
 		namespaced_token = "lxc.cgroup.";
 		namespaced_token_len = STRLITERALLEN("lxc.cgroup.");
+		list = &c->cgroup;
 	} else {
-		return -1;
+		return ret_errno(EINVAL);
 	}
 
-	if (strcmp(key, global_token) == 0)
+	if (strequal(key, global_token))
 		get_all = true;
-	else if (strncmp(key, namespaced_token, namespaced_token_len) == 0)
+	else if (strnequal(key, namespaced_token, namespaced_token_len))
 		key += namespaced_token_len;
 	else
-		return -1;
-
-	lxc_list_for_each(it, &c->cgroup) {
-		struct lxc_cgroup *cg = it->elem;
+		return ret_errno(EINVAL);
 
+	list_for_each_entry(cgroup, list, head) {
 		if (get_all) {
-			if (version != cg->version)
+			if (version != cgroup->version)
 				continue;
 
 			strprint(retv, inlen, "%s.%s = %s\n", global_token,
-				 cg->subsystem, cg->value);
-		} else if (strcmp(cg->subsystem, key) == 0) {
-			strprint(retv, inlen, "%s\n", cg->value);
+				 cgroup->subsystem, cgroup->value);
+		} else if (strequal(cgroup->subsystem, key)) {
+			strprint(retv, inlen, "%s\n", cgroup->value);
 		}
 	}
 
@@ -3638,6 +3974,9 @@
 	int len;
 	int fulllen = 0;
 
+	if (!strequal(key, "lxc.cgroup.dir"))
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
@@ -3648,6 +3987,74 @@
 	return fulllen;
 }
 
+static int get_config_cgroup_monitor_dir(const char *key, char *retv, int inlen,
+					 struct lxc_conf *lxc_conf, void *data)
+{
+	int len;
+	int fulllen = 0;
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
+
+	strprint(retv, inlen, "%s", lxc_conf->cgroup_meta.monitor_dir);
+
+	return fulllen;
+}
+
+static int get_config_cgroup_monitor_pivot_dir(const char *key, char *retv, int inlen,
+					 struct lxc_conf *lxc_conf, void *data)
+{
+	int len;
+	int fulllen = 0;
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
+
+	strprint(retv, inlen, "%s", lxc_conf->cgroup_meta.monitor_pivot_dir);
+
+	return fulllen;
+}
+
+static int get_config_cgroup_container_dir(const char *key, char *retv,
+					   int inlen,
+					   struct lxc_conf *lxc_conf,
+					   void *data)
+{
+	int len;
+	int fulllen = 0;
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
+
+	strprint(retv, inlen, "%s", lxc_conf->cgroup_meta.container_dir);
+
+	return fulllen;
+}
+
+static int get_config_cgroup_container_inner_dir(const char *key, char *retv,
+						 int inlen,
+						 struct lxc_conf *lxc_conf,
+						 void *data)
+{
+	int len;
+	int fulllen = 0;
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
+
+	strprint(retv, inlen, "%s", lxc_conf->cgroup_meta.namespace_dir);
+
+	return fulllen;
+}
+
 static inline int get_config_cgroup_relative(const char *key, char *retv,
 					     int inlen, struct lxc_conf *lxc_conf,
 					     void *data)
@@ -3659,7 +4066,7 @@
 static int get_config_idmaps(const char *key, char *retv, int inlen,
 			     struct lxc_conf *c, void *data)
 {
-	struct lxc_list *it;
+	struct id_map *map;
 	int len, listlen, ret;
 	int fulllen = 0;
 /* "u 1000 1000000 65536"
@@ -3690,14 +4097,13 @@
 	else
 		memset(retv, 0, inlen);
 
-	listlen = lxc_list_len(&c->id_map);
-	lxc_list_for_each(it, &c->id_map) {
-		struct id_map *map = it->elem;
-		ret = snprintf(buf, __LXC_IDMAP_STR_BUF, "%c %lu %lu %lu",
-			       (map->idtype == ID_TYPE_UID) ? 'u' : 'g',
-			       map->nsid, map->hostid, map->range);
-		if (ret < 0 || ret >= __LXC_IDMAP_STR_BUF)
-			return -1;
+	listlen = list_len(map, &c->id_map, head);
+	list_for_each_entry(map, &c->id_map, head) {
+		ret = strnprintf(buf, sizeof(buf), "%c %lu %lu %lu",
+				 (map->idtype == ID_TYPE_UID) ? 'u' : 'g',
+				 map->nsid, map->hostid, map->range);
+		if (ret < 0)
+			return ret_errno(EIO);
 
 		strprint(retv, inlen, "%s%s", buf, (listlen-- > 1) ? "\n" : "");
 	}
@@ -3805,15 +4211,15 @@
 			    struct lxc_conf *c, void *data)
 {
 	int len, fulllen = 0;
-	struct lxc_list *it;
+	struct string_entry *entry;
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	lxc_list_for_each(it, &c->mount_list) {
-		strprint(retv, inlen, "%s\n", (char *)it->elem);
+	list_for_each_entry(entry, &c->mount_entries, head) {
+		strprint(retv, inlen, "%s\n", entry->val);
 	}
 
 	return fulllen;
@@ -3840,7 +4246,7 @@
 static int get_config_rootfs_options(const char *key, char *retv, int inlen,
 				     struct lxc_conf *c, void *data)
 {
-	return lxc_get_conf_str(retv, inlen, c->rootfs.options);
+	return lxc_get_conf_str(retv, inlen, c->rootfs.mnt_opts.raw_options);
 }
 
 static int get_config_uts_name(const char *key, char *retv, int inlen,
@@ -3856,37 +4262,37 @@
 {
 	char *subkey;
 	int len, fulllen = 0, found = -1;
-	struct lxc_list *it;
+	struct string_entry *entry;
 	int i;
 
 	subkey = strchr(key, '.');
 	if (!subkey)
-		return -1;
+		return ret_errno(EINVAL);
 
 	subkey = strchr(subkey + 1, '.');
 	if (!subkey)
-		return -1;
+		return ret_errno(EINVAL);
 	subkey++;
 	if (*subkey == '\0')
-		return -1;
+		return ret_errno(EINVAL);
 
 	for (i = 0; i < NUM_LXC_HOOKS; i++) {
-		if (strcmp(lxchook_namesi, subkey) == 0) {
+		if (strequal(lxchook_namesi, subkey)) {
 			found = i;
 			break;
 		}
 	}
 
 	if (found == -1)
-		return -1;
+		return ret_errno(EINVAL);
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	lxc_list_for_each(it, &c->hooksfound) {
-		strprint(retv, inlen, "%s\n", (char *)it->elem);
+	list_for_each_entry(entry, &c->hooksfound, head) {
+		strprint(retv, inlen, "%s\n", entry->val);
 	}
 
 	return fulllen;
@@ -3902,16 +4308,15 @@
 			  struct lxc_conf *c, void *data)
 {
 	int len, fulllen = 0;
-	struct lxc_list *it;
+	struct lxc_netdev *netdev;
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	lxc_list_for_each(it, &c->network) {
-		struct lxc_netdev *n = it->elem;
-		const char *t = lxc_net_type_to_str(n->type);
+	list_for_each_entry(netdev, &c->netdevs, head) {
+		const char *t = lxc_net_type_to_str(netdev->type);
 		strprint(retv, inlen, "%s\n", t ? t : "(invalid)");
 	}
 
@@ -3922,15 +4327,15 @@
 			       struct lxc_conf *c, void *data)
 {
 	int len, fulllen = 0;
-	struct lxc_list *it;
+	struct cap_entry *cap;
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	lxc_list_for_each(it, &c->caps) {
-		strprint(retv, inlen, "%s\n", (char *)it->elem);
+	list_for_each_entry(cap, &c->caps.list, head) {
+		strprint(retv, inlen, "%s\n", cap->cap_name);
 	}
 
 	return fulllen;
@@ -3940,15 +4345,15 @@
 			       struct lxc_conf *c, void *data)
 {
 	int len, fulllen = 0;
-	struct lxc_list *it;
+	struct cap_entry *cap;
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	lxc_list_for_each(it, &c->keepcaps) {
-		strprint(retv, inlen, "%s\n", (char *)it->elem);
+	list_for_each_entry(cap, &c->caps.list, head) {
+		strprint(retv, inlen, "%s\n", cap->cap_name);
 	}
 
 	return fulllen;
@@ -3990,41 +4395,44 @@
 					    int inlen, struct lxc_conf *c,
 					    void *data)
 {
-#ifdef HAVE_SECCOMP
+#if HAVE_SECCOMP
 	return lxc_get_conf_int(c, retv, inlen, c->seccomp.allow_nesting);
 #else
-	errno = ENOSYS;
-	return -1;
+	return ret_errno(ENOSYS);
 #endif
 }
 
 static int get_config_seccomp_notify_cookie(const char *key, char *retv, int inlen,
 					    struct lxc_conf *c, void *data)
 {
-#ifdef HAVE_SECCOMP_NOTIFY
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
 	return lxc_get_conf_str(retv, inlen, c->seccomp.notifier.cookie);
 #else
-	return ret_set_errno(-1, ENOSYS);
+	return ret_errno(ENOSYS);
 #endif
 }
 
 static int get_config_seccomp_notify_proxy(const char *key, char *retv, int inlen,
 					   struct lxc_conf *c, void *data)
 {
-#ifdef HAVE_SECCOMP_NOTIFY
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
 	return lxc_get_conf_str(retv, inlen,
 				(c->seccomp.notifier.proxy_addr.sun_path0) == '/'
 				    ? &c->seccomp.notifier.proxy_addr.sun_path0
 				    : &c->seccomp.notifier.proxy_addr.sun_path1);
 #else
-	return ret_set_errno(-1, ENOSYS);
+	return ret_errno(ENOSYS);
 #endif
 }
 
 static int get_config_seccomp_profile(const char *key, char *retv, int inlen,
 				      struct lxc_conf *c, void *data)
 {
+#if HAVE_SECCOMP
 	return lxc_get_conf_str(retv, inlen, c->seccomp.seccomp);
+#else
+	return ret_errno(ENOSYS);
+#endif
 }
 
 static int get_config_autodev(const char *key, char *retv, int inlen,
@@ -4060,14 +4468,14 @@
 static int get_config_start(const char *key, char *retv, int inlen,
 			    struct lxc_conf *c, void *data)
 {
-	if (strcmp(key + 10, "auto") == 0)
+	if (strequal(key + 10, "auto"))
 		return lxc_get_conf_int(c, retv, inlen, c->start_auto);
-	else if (strcmp(key + 10, "delay") == 0)
+	else if (strequal(key + 10, "delay"))
 		return lxc_get_conf_int(c, retv, inlen, c->start_delay);
-	else if (strcmp(key + 10, "order") == 0)
+	else if (strequal(key + 10, "order"))
 		return lxc_get_conf_int(c, retv, inlen, c->start_order);
 
-	return -1;
+	return ret_errno(EINVAL);
 }
 
 static int get_config_log_syslog(const char *key, char *retv, int inlen,
@@ -4093,15 +4501,15 @@
 			    struct lxc_conf *c, void *data)
 {
 	int len, fulllen = 0;
-	struct lxc_list *it;
+	struct string_entry *entry;
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	lxc_list_for_each(it, &c->groups) {
-		strprint(retv, inlen, "%s\n", (char *)it->elem);
+	list_for_each_entry(entry, &c->groups, head) {
+		strprint(retv, inlen, "%s\n", entry->val);
 	}
 
 	return fulllen;
@@ -4111,15 +4519,15 @@
 				  struct lxc_conf *c, void *data)
 {
 	int len, fulllen = 0;
-	struct lxc_list *it;
+	struct environment_entry *env;
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	lxc_list_for_each(it, &c->environment) {
-		strprint(retv, inlen, "%s\n", (char *)it->elem);
+	list_for_each_entry(env, &c->environment, head) {
+		strprint(retv, inlen, "%s=%s\n", env->key, env->val);
 	}
 
 	return fulllen;
@@ -4155,6 +4563,26 @@
 	return lxc_get_conf_int(c, retv, inlen, c->init_gid);
 }
 
+static int get_config_init_groups(const char *key, char *retv, int inlen,
+				  struct lxc_conf *c, void *data)
+{
+	int fulllen = 0, len;
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
+
+	if (c->init_groups.size == 0)
+		return 0;
+
+	for (size_t i = 0; i < c->init_groups.size; i++)
+		strprint(retv, inlen, "%s%d", (i > 0) ? "," : "",
+			 c->init_groups.listi);
+
+	return fulllen;
+}
+
 static int get_config_ephemeral(const char *key, char *retv, int inlen,
 				struct lxc_conf *c, void *data)
 {
@@ -4176,25 +4604,24 @@
 {
 	int fulllen = 0, len;
 	bool get_all = false;
-	struct lxc_list *it;
+	struct lxc_limit *lim;
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!strcmp(key, "lxc.prlimit"))
+	if (strequal(key, "lxc.prlimit"))
 		get_all = true;
-	else if (strncmp(key, "lxc.prlimit.", 12) == 0)
+	else if (strnequal(key, "lxc.prlimit.", 12))
 		key += 12;
 	else
-		return -1;
+		return ret_errno(EINVAL);
 
-	lxc_list_for_each(it, &c->limits) {
+	list_for_each_entry(lim, &c->limits, head) {
 		/* 2 colon separated 64 bit integers or the word 'unlimited' */
 		char bufINTTYPE_TO_STRLEN(uint64_t) * 2 + 2;
 		int partlen;
-		struct lxc_limit *lim = it->elem;
 
 		if (lim->limit.rlim_cur == RLIM_INFINITY) {
 			memcpy(buf, "unlimited", STRLITERALLEN("unlimited") + 1);
@@ -4216,7 +4643,7 @@
 		if (get_all) {
 			strprint(retv, inlen, "lxc.prlimit.%s = %s\n",
 				 lim->resource, buf);
-		} else if (strcmp(lim->resource, key) == 0) {
+		} else if (strequal(lim->resource, key)) {
 			strprint(retv, inlen, "%s", buf);
 		}
 	}
@@ -4231,30 +4658,29 @@
 static int get_config_sysctl(const char *key, char *retv, int inlen,
 			     struct lxc_conf *c, void *data)
 {
-	int len;
-	struct lxc_list *it;
 	int fulllen = 0;
 	bool get_all = false;
+	int len;
+	struct lxc_sysctl *sysctl;
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (strcmp(key, "lxc.sysctl") == 0)
+	if (strequal(key, "lxc.sysctl"))
 		get_all = true;
-	else if (strncmp(key, "lxc.sysctl.", STRLITERALLEN("lxc.sysctl.")) == 0)
+	else if (strnequal(key, "lxc.sysctl.", STRLITERALLEN("lxc.sysctl.")))
 		key += STRLITERALLEN("lxc.sysctl.");
 	else
-		return -1;
+		return ret_errno(EINVAL);
 
-	lxc_list_for_each(it, &c->sysctls) {
-		struct lxc_sysctl *elem = it->elem;
+	list_for_each_entry(sysctl, &c->sysctls, head) {
 		if (get_all) {
-			strprint(retv, inlen, "lxc.sysctl.%s = %s\n", elem->key,
-				 elem->value);
-		} else if (strcmp(elem->key, key) == 0) {
-			strprint(retv, inlen, "%s", elem->value);
+			strprint(retv, inlen, "lxc.sysctl.%s = %s\n", sysctl->key,
+				 sysctl->value);
+		} else if (strequal(sysctl->key, key)) {
+			strprint(retv, inlen, "%s", sysctl->value);
 		}
 	}
 
@@ -4264,30 +4690,28 @@
 static int get_config_proc(const char *key, char *retv, int inlen,
 			   struct lxc_conf *c, void *data)
 {
-	struct lxc_list *it;
-	int len;
 	int fulllen = 0;
 	bool get_all = false;
+	int len;
+	struct lxc_proc *proc;
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (strcmp(key, "lxc.proc") == 0)
+	if (strequal(key, "lxc.proc"))
 		get_all = true;
-	else if (strncmp(key, "lxc.proc.", STRLITERALLEN("lxc.proc.")) == 0)
+	else if (strnequal(key, "lxc.proc.", STRLITERALLEN("lxc.proc.")))
 		key += STRLITERALLEN("lxc.proc.");
 	else
-		return -1;
-
-	lxc_list_for_each(it, &c->procs) {
-		struct lxc_proc *proc = it->elem;
+		return ret_errno(EINVAL);
 
+	list_for_each_entry(proc, &c->procs, head) {
 		if (get_all) {
 			strprint(retv, inlen, "lxc.proc.%s = %s\n",
 			         proc->filename, proc->value);
-		} else if (strcmp(proc->filename, key) == 0) {
+		} else if (strequal(proc->filename, key)) {
 			strprint(retv, inlen, "%s", proc->value);
 		}
 	}
@@ -4333,6 +4757,46 @@
 	return fulllen;
 }
 
+static int get_config_time_offset_boot(const char *key, char *retv, int inlen, struct lxc_conf *c,
+				       void *data)
+{
+	int len;
+	int fulllen = 0;
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
+
+	if (c->timens.s_boot) {
+		strprint(retv, inlen, "%" PRId64 " s\n", c->timens.s_boot);
+	} else {
+		strprint(retv, inlen, "%" PRId64 " ns\n", c->timens.ns_boot);
+	}
+
+	return fulllen;
+}
+
+static int get_config_time_offset_monotonic(const char *key, char *retv, int inlen,
+					    struct lxc_conf *c, void *data)
+{
+	int len;
+	int fulllen = 0;
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
+
+	if (c->timens.s_monotonic) {
+		strprint(retv, inlen, "%" PRId64 "s\n", c->timens.s_monotonic);
+	} else {
+		strprint(retv, inlen, "%" PRId64 "ns\n", c->timens.ns_monotonic);
+	}
+
+	return fulllen;
+}
+
 static int get_config_namespace_share(const char *key, char *retv, int inlen,
 				      struct lxc_conf *c, void *data)
 {
@@ -4346,6 +4810,9 @@
 		memset(retv, 0, inlen);
 
 	namespace = key + STRLITERALLEN("lxc.namespace.share.");
+	if (is_empty_string(namespace))
+		return ret_errno(EINVAL);
+
 	ns_idx = lxc_namespace_2_ns_idx(namespace);
 	if (ns_idx < 0)
 		return ns_idx;
@@ -4380,56 +4847,76 @@
 static inline int clr_config_tty_dir(const char *key, struct lxc_conf *c,
 				    void *data)
 {
-	free(c->ttys.dir);
-	c->ttys.dir = NULL;
+	free_disarm(c->ttys.dir);
 	return 0;
 }
 
 static inline int clr_config_apparmor_profile(const char *key,
 					      struct lxc_conf *c, void *data)
 {
-	free(c->lsm_aa_profile);
-	c->lsm_aa_profile = NULL;
+#if HAVE_APPARMOR
+	free_disarm(c->lsm_aa_profile);
 	return 0;
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static inline int clr_config_apparmor_allow_incomplete(const char *key,
 						       struct lxc_conf *c,
 						       void *data)
 {
+#if HAVE_APPARMOR
 	c->lsm_aa_allow_incomplete = 0;
 	return 0;
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static inline int clr_config_apparmor_allow_nesting(const char *key,
 						    struct lxc_conf *c,
 						    void *data)
 {
+#if HAVE_APPARMOR
 	c->lsm_aa_allow_nesting = 0;
 	return 0;
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static inline int clr_config_apparmor_raw(const char *key,
 					  struct lxc_conf *c,
 					  void *data)
 {
+#if HAVE_APPARMOR
 	return lxc_clear_apparmor_raw(c);
+#else
+	return syserror_set(-EINVAL, "Built without AppArmor support");
+#endif
 }
 
 static inline int clr_config_selinux_context(const char *key,
 					     struct lxc_conf *c, void *data)
 {
-	free(c->lsm_se_context);
-	c->lsm_se_context = NULL;
+#if HAVE_SELINUX
+	free_disarm(c->lsm_se_context);
 	return 0;
+#else
+	return syserror_set(-EINVAL, "Built without SELinux support");
+#endif
 }
 
 static inline int clr_config_selinux_context_keyring(const char *key,
 						     struct lxc_conf *c, void *data)
 {
-	free(c->lsm_se_keyring_context);
-	c->lsm_se_keyring_context = NULL;
+#if HAVE_SELINUX
+	free_disarm(c->lsm_se_keyring_context);
 	return 0;
+#else
+	return syserror_set(-EINVAL, "Built without SELinux support");
+#endif
 }
 
 static inline int clr_config_keyring_session(const char *key,
@@ -4454,11 +4941,44 @@
 static int clr_config_cgroup_dir(const char *key, struct lxc_conf *lxc_conf,
 				 void *data)
 {
-	if (lxc_conf->cgroup_meta.dir) {
-		free(lxc_conf->cgroup_meta.dir);
-		lxc_conf->cgroup_meta.dir = NULL;
-	}
+	if (!strequal(key, "lxc.cgroup.dir"))
+		return ret_errno(EINVAL);
+
+	if (lxc_conf->cgroup_meta.dir)
+		free_disarm(lxc_conf->cgroup_meta.dir);
+
+	return 0;
+}
+
+static int clr_config_cgroup_monitor_dir(const char *key,
+					 struct lxc_conf *lxc_conf,
+					 void *data)
+{
+	free_disarm(lxc_conf->cgroup_meta.monitor_dir);
+	return 0;
+}
+
+static int clr_config_cgroup_monitor_pivot_dir(const char *key,
+					 struct lxc_conf *lxc_conf,
+					 void *data)
+{
+	free_disarm(lxc_conf->cgroup_meta.monitor_pivot_dir);
+	return 0;
+}
 
+static int clr_config_cgroup_container_dir(const char *key,
+					   struct lxc_conf *lxc_conf,
+					   void *data)
+{
+	free_disarm(lxc_conf->cgroup_meta.container_dir);
+	return 0;
+}
+
+static int clr_config_cgroup_container_inner_dir(const char *key,
+						 struct lxc_conf *lxc_conf,
+						 void *data)
+{
+	free_disarm(lxc_conf->cgroup_meta.namespace_dir);
 	return 0;
 }
 
@@ -4486,8 +5006,7 @@
 static inline int clr_config_log_file(const char *key, struct lxc_conf *c,
 				     void *data)
 {
-	free(c->logfile);
-	c->logfile = NULL;
+	free_disarm(c->logfile);
 	return 0;
 }
 
@@ -4506,16 +5025,14 @@
 static inline int clr_config_mount_fstab(const char *key, struct lxc_conf *c,
 					 void *data)
 {
-	free(c->fstab);
-	c->fstab = NULL;
+	free_disarm(c->fstab);
 	return 0;
 }
 
 static inline int clr_config_rootfs_path(const char *key, struct lxc_conf *c,
 					 void *data)
 {
-	free(c->rootfs.path);
-	c->rootfs.path = NULL;
+	free_disarm(c->rootfs.path);
 	return 0;
 }
 
@@ -4529,19 +5046,14 @@
 static inline int clr_config_rootfs_mount(const char *key, struct lxc_conf *c,
 					  void *data)
 {
-	free(c->rootfs.mount);
-	c->rootfs.mount = NULL;
+	free_disarm(c->rootfs.mount);
 	return 0;
 }
 
 static inline int clr_config_rootfs_options(const char *key, struct lxc_conf *c,
 					    void *data)
 {
-	free(c->rootfs.options);
-	c->rootfs.options = NULL;
-
-	free(c->rootfs.data);
-	c->rootfs.data = NULL;
+	put_lxc_mount_options(&c->rootfs.mnt_opts);
 
 	return 0;
 }
@@ -4549,8 +5061,7 @@
 static inline int clr_config_uts_name(const char *key, struct lxc_conf *c,
 				     void *data)
 {
-	free(c->utsname);
-	c->utsname = NULL;
+	free_disarm(c->utsname);
 	return 0;
 }
 
@@ -4571,7 +5082,7 @@
 static inline int clr_config_net(const char *key, struct lxc_conf *c,
 				 void *data)
 {
-	lxc_free_networks(&c->network);
+	lxc_free_networks(c);
 
 	return 0;
 }
@@ -4585,22 +5096,20 @@
 static inline int clr_config_cap_keep(const char *key, struct lxc_conf *c,
 				      void *data)
 {
-	return lxc_clear_config_keepcaps(c);
+	return lxc_clear_config_caps(c);
 }
 
 static inline int clr_config_console_path(const char *key, struct lxc_conf *c,
 					  void *data)
 {
-	free(c->console.path);
-	c->console.path = NULL;
+	free_disarm(c->console.path);
 	return 0;
 }
 
 static inline int clr_config_console_logfile(const char *key,
 					     struct lxc_conf *c, void *data)
 {
-	free(c->console.log_path);
-	c->console.log_path = NULL;
+	free_disarm(c->console.log_path);
 	return 0;
 }
 
@@ -4628,44 +5137,41 @@
 static inline int clr_config_seccomp_allow_nesting(const char *key,
 						   struct lxc_conf *c, void *data)
 {
-#ifdef HAVE_SECCOMP
+#if HAVE_SECCOMP
 	c->seccomp.allow_nesting = 0;
 	return 0;
 #else
-	errno = ENOSYS;
-	return -1;
+	return ret_errno(ENOSYS);
 #endif
 }
 
 static inline int clr_config_seccomp_notify_cookie(const char *key,
 						   struct lxc_conf *c, void *data)
 {
-#ifdef HAVE_SECCOMP_NOTIFY
-	free(c->seccomp.notifier.cookie);
-	c->seccomp.notifier.cookie = NULL;
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
+	free_disarm(c->seccomp.notifier.cookie);
 	return 0;
 #else
-	return ret_set_errno(-1, ENOSYS);
+	return ret_errno(ENOSYS);
 #endif
 }
 
 static inline int clr_config_seccomp_notify_proxy(const char *key,
 						   struct lxc_conf *c, void *data)
 {
-#ifdef HAVE_SECCOMP_NOTIFY
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
 	memset(&c->seccomp.notifier.proxy_addr, 0,
 	       sizeof(c->seccomp.notifier.proxy_addr));
 	return 0;
 #else
-	return ret_set_errno(-1, ENOSYS);
+	return ret_errno(ENOSYS);
 #endif
 }
 
 static inline int clr_config_seccomp_profile(const char *key,
 					     struct lxc_conf *c, void *data)
 {
-	free(c->seccomp.seccomp);
-	c->seccomp.seccomp = NULL;
+	free_disarm(c->seccomp.seccomp);
 	return 0;
 }
 
@@ -4707,11 +5213,11 @@
 static inline int clr_config_start(const char *key, struct lxc_conf *c,
 				   void *data)
 {
-	if (strcmp(key + 10, "auto") == 0)
+	if (strequal(key + 10, "auto"))
 		c->start_auto = 0;
-	else if (strcmp(key + 10, "delay") == 0)
+	else if (strequal(key + 10, "delay"))
 		c->start_delay = 0;
-	else if (strcmp(key + 10, "order") == 0)
+	else if (strequal(key + 10, "order"))
 		c->start_order = 0;
 
 	return 0;
@@ -4720,8 +5226,7 @@
 static inline int clr_config_log_syslog(const char *key, struct lxc_conf *c,
 				    void *data)
 {
-	free(c->syslog);
-	c->syslog = NULL;
+	free_disarm(c->syslog);
 	return 0;
 }
 
@@ -4754,24 +5259,21 @@
 static inline int clr_config_execute_cmd(const char *key, struct lxc_conf *c,
 				      void *data)
 {
-	free(c->execute_cmd);
-	c->execute_cmd = NULL;
+	free_disarm(c->execute_cmd);
 	return 0;
 }
 
 static inline int clr_config_init_cmd(const char *key, struct lxc_conf *c,
 				      void *data)
 {
-	free(c->init_cmd);
-	c->init_cmd = NULL;
+	free_disarm(c->init_cmd);
 	return 0;
 }
 
 static inline int clr_config_init_cwd(const char *key, struct lxc_conf *c,
 				      void *data)
 {
-	free(c->init_cwd);
-	c->init_cwd = NULL;
+	free_disarm(c->init_cwd);
 	return 0;
 }
 
@@ -4789,6 +5291,14 @@
 	return 0;
 }
 
+static inline int clr_config_init_groups(const char *key, struct lxc_conf *c,
+					 void *data)
+{
+	c->init_groups.size = 0;
+	free_disarm(c->init_groups.list);
+	return 0;
+}
+
 static inline int clr_config_ephemeral(const char *key, struct lxc_conf *c,
 				       void *data)
 {
@@ -4824,7 +5334,6 @@
 static inline int clr_config_includefiles(const char *key, struct lxc_conf *c,
 					  void *data)
 {
-	lxc_clear_includes(c);
 	return 0;
 }
 
@@ -4842,6 +5351,20 @@
 	return 0;
 }
 
+static int clr_config_time_offset_boot(const char *key, struct lxc_conf *lxc_conf, void *data)
+{
+	lxc_conf->timens.s_boot = 0;
+	lxc_conf->timens.ns_boot = 0;
+	return 0;
+}
+
+static int clr_config_time_offset_monotonic(const char *key, struct lxc_conf *lxc_conf, void *data)
+{
+	lxc_conf->timens.s_monotonic = 0;
+	lxc_conf->timens.ns_monotonic = 0;
+	return 0;
+}
+
 static int clr_config_namespace_share(const char *key,
 				      struct lxc_conf *lxc_conf, void *data)
 {
@@ -4849,6 +5372,9 @@
 	const char *namespace;
 
 	namespace = key + STRLITERALLEN("lxc.namespace.share.");
+	if (is_empty_string(namespace))
+		return ret_errno(EINVAL);
+
 	ns_idx = lxc_namespace_2_ns_idx(namespace);
 	if (ns_idx < 0)
 		return ns_idx;
@@ -4862,151 +5388,101 @@
 static int get_config_includefiles(const char *key, char *retv, int inlen,
 				   struct lxc_conf *c, void *data)
 {
-	return -ENOSYS;
+	return ret_errno(ENOSYS);
 }
 
-static struct lxc_config_t *get_network_config_ops(const char *key,
-						   struct lxc_conf *lxc_conf,
-						   ssize_t *idx,
-						   char **deindexed_key)
+struct config_net_info {
+	char bufNETWORK_SUBKEY_SIZE_MAX;
+	const char *subkey;
+	const struct lxc_config_net_t *ops;
+	struct lxc_netdev *netdev;
+};
+
+static int get_network_config_ops(const char *key, struct lxc_conf *lxc_conf,
+				  struct config_net_info *info, bool allocate)
 {
 	int ret;
-	unsigned int tmpidx;
-	size_t numstrlen;
-	char *copy, *idx_start, *idx_end;
-	struct lxc_config_t *config = NULL;
+	int64_t tmpidx;
+	unsigned int idx;
+	const char *idx_start;
 
-	/* check that this is a sensible network key */
-	if (strncmp("lxc.net.", key, 8)) {
-		ERROR("Invalid network configuration key \"%s\"", key);
-		return NULL;
-	}
+	if (is_empty_string(key))
+		return ret_errno(EINVAL);
 
-	copy = strdup(key);
-	if (!copy) {
-		ERROR("Failed to duplicate string \"%s\"", key);
-		return NULL;
-	}
+	/* check that this is a sensible network key */
+	if (!strnequal("lxc.net.", key, STRLITERALLEN("lxc.net.")))
+		return syserror_set(-EINVAL, "Invalid network configuration key \"%s\"", key);
 
 	/* lxc.net.<n> */
-	if (!isdigit(*(key + 8))) {
-		ERROR("Failed to detect digit in string \"%s\"", key + 8);
-		goto on_error;
-	}
-
 	/* beginning of index string */
-	idx_start = (copy + 7);
-	*idx_start = '\0';
-
-	/* end of index string */
-	idx_end = strchr((copy + 8), '.');
-	if (idx_end)
-		*idx_end = '\0';
-
-	/* parse current index */
-	ret = lxc_safe_uint((idx_start + 1), &tmpidx);
-	if (ret < 0) {
-		errno = -ret;
-		SYSERROR("Failed to parse unsigned integer from string \"%s\"",
-		         idx_start + 1);
-		*idx = ret;
-		goto on_error;
-	}
-
-	/* This, of course is utterly nonsensical on so many levels, but
-	 * better safe than sorry.
-	 * (Checking for INT_MAX here is intentional.)
-	 */
-	if (tmpidx == INT_MAX) {
-		SYSERROR("Number of configured networks would overflow the "
-		         "counter");
-		goto on_error;
-	}
-	*idx = tmpidx;
-
-	numstrlen = strlen((idx_start + 1));
-
-	/* repair configuration key */
-	*idx_start = '.';
+	idx_start = key + STRLITERALLEN("lxc.net.");
+	if (!isdigit(*idx_start))
+		return syserror_set(-EINVAL, "Failed to detect digit in string \"%s\"", key + 8);
+
+	ret = lxc_safe_int64_residual(idx_start, &tmpidx, 10, info->buf, sizeof(info->buf));
+	if (ret)
+		return syserror("Failed to parse network index");
+
+	if (tmpidx < 0 || tmpidx >= INT_MAX)
+		return syserror_set(-ERANGE, "Number of configured networks would overflow the counter");
+	idx = (unsigned int)tmpidx;
+
+	info->netdev = lxc_get_netdev_by_idx(lxc_conf, idx, allocate);
+	if (!info->netdev)
+		return ret_errno(EINVAL);
+
+	/* Make sure subkey points to the empty string. */
+	info->subkey = info->buf;
+	if (is_empty_string(info->subkey))
+		return ret_errno(ENOENT);
+
+	if (info->subkey0 != '.')
+		return syserror_set(-EINVAL, "Invalid subkey");
+	info->subkey++;
 
 	/* lxc.net.<idx>.<subkey> */
-	if (idx_end) {
-		*idx_end = '.';
-		if (strlen(idx_end + 1) == 0) {
-			ERROR("No subkey in network configuration key \"%s\"", key);
-			goto on_error;
-		}
-
-		memmove(copy + 8, idx_end + 1, strlen(idx_end + 1));
-		copystrlen(key) - (numstrlen + 1) = '\0';
+	info->ops = lxc_get_config_net(info->subkey);
+	if (info->ops == &unsupported_config_net_key)
+		return syserror_set(-ENOENT, "Unknown network configuration key \"%s\"", key);
 
-		config = lxc_get_config(copy);
-		if (!config) {
-			ERROR("Unknown network configuration key \"%s\"", key);
-			goto on_error;
-		}
-	}
-
-	if (deindexed_key)
-		*deindexed_key = copy;
-
-	return config;
-
-on_error:
-	free(copy);
-	return NULL;
+	return 0;
 }
 
 /* Config entry is something like "lxc.net.0.ipv4" the key 'lxc.net.' was
  * found. So we make sure next comes an integer, find the right callback (by
  * rewriting the key), and call it.
  */
-static int set_config_net_nic(const char *key, const char *value,
-			      struct lxc_conf *lxc_conf, void *data)
+static int set_config_jump_table_net(const char *key, const char *value,
+				     struct lxc_conf *lxc_conf, void *data)
 {
+	struct config_net_info info = {};
 	int ret;
 	const char *idxstring;
-	struct lxc_config_t *config;
-	struct lxc_netdev *netdev;
-	ssize_t idx = -1;
-	char *deindexed_key = NULL;
 
-	idxstring = key + 8;
+	idxstring = key + STRLITERALLEN("lxc.net.");
 	if (!isdigit(*idxstring))
-		return -1;
+		return ret_errno(EINVAL);
 
 	if (lxc_config_value_empty(value))
-		return clr_config_net_nic(key, lxc_conf, data);
-
-	config = get_network_config_ops(key, lxc_conf, &idx, &deindexed_key);
-	if (!config || idx < 0)
-		return -1;
-
-	netdev = lxc_get_netdev_by_idx(lxc_conf, (unsigned int)idx, true);
-	if (!netdev) {
-		free(deindexed_key);
-		return -1;
-	}
+		return clr_config_jump_table_net(key, lxc_conf, data);
 
-	ret = config->set(deindexed_key, value, lxc_conf, netdev);
-	free(deindexed_key);
+	ret = get_network_config_ops(key, lxc_conf, &info, true);
+	if (ret)
+		return ret;
 
-	return ret;
+	return info.ops->set(info.subkey, value, lxc_conf, info.netdev);
 }
 
-static int clr_config_net_nic(const char *key, struct lxc_conf *lxc_conf,
-			      void *data)
+static int clr_config_jump_table_net(const char *key, struct lxc_conf *lxc_conf,
+				     void *data)
 {
+	struct config_net_info info = {};
 	int ret;
 	const char *idxstring;
-	struct lxc_config_t *config;
-	struct lxc_netdev *netdev;
-	ssize_t idx = -1;
-	char *deindexed_key = NULL;
 
 	idxstring = key + 8;
 	if (!isdigit(*idxstring))
-		return -1;
+		return ret_errno(EINVAL);
 
 	/* The left conjunct is pretty self-explanatory. The right conjunct
 	 * checks whether the two pointers are equal. If they are we know that
@@ -5016,28 +5492,20 @@
 	if (isdigit(*idxstring) && (strrchr(key, '.') == (idxstring - 1))) {
 		unsigned int rmnetdevidx;
 
-		if (lxc_safe_uint(idxstring, &rmnetdevidx) < 0)
-			return -1;
+		ret = lxc_safe_uint(idxstring, &rmnetdevidx);
+		if (ret < 0)
+			return ret;
 
 		/* Remove network from network list. */
 		lxc_remove_nic_by_idx(lxc_conf, rmnetdevidx);
 		return 0;
 	}
 
-	config = get_network_config_ops(key, lxc_conf, &idx, &deindexed_key);
-	if (!config || idx < 0)
-		return -1;
-
-	netdev = lxc_get_netdev_by_idx(lxc_conf, (unsigned int)idx, false);
-	if (!netdev) {
-		free(deindexed_key);
-		return -1;
-	}
+	ret = get_network_config_ops(key, lxc_conf, &info, false);
+	if (ret)
+		return ret;
 
-	ret = config->clr(deindexed_key, lxc_conf, netdev);
-	free(deindexed_key);
-
-	return ret;
+	return info.ops->clr(info.subkey, lxc_conf, info.netdev);
 }
 
 static int clr_config_net_type(const char *key, struct lxc_conf *lxc_conf,
@@ -5046,9 +5514,9 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	netdev->type = -1;
+	lxc_clear_netdev(netdev);
 
 	return 0;
 }
@@ -5059,7 +5527,7 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
 	netdev->name0 = '\0';
 
@@ -5072,7 +5540,7 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
 	netdev->flags = 0;
 
@@ -5085,7 +5553,7 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
 	netdev->link0 = '\0';
 
@@ -5098,7 +5566,7 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	netdev->l2proxy = false;
 
@@ -5111,7 +5579,7 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
 	if (netdev->type != LXC_NET_MACVLAN)
 		return 0;
@@ -5127,7 +5595,7 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	if (netdev->type != LXC_NET_IPVLAN)
 		return 0;
@@ -5138,12 +5606,12 @@
 }
 
 static int clr_config_net_ipvlan_isolation(const char *key,
-				       struct lxc_conf *lxc_conf, void *data)
+					   struct lxc_conf *lxc_conf, void *data)
 {
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	if (netdev->type != LXC_NET_IPVLAN)
 		return 0;
@@ -5159,7 +5627,7 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	if (netdev->type != LXC_NET_VETH)
 		return 0;
@@ -5169,29 +5637,102 @@
 	return 0;
 }
 
+static int clr_config_net_veth_n_rxqueues(const char *key, struct lxc_conf *lxc_conf,
+					  void *data)
+{
+	struct lxc_netdev *netdev = data;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return 0;
+
+	netdev->priv.veth_attr.n_rxqueues = -1;
+
+	return 0;
+}
+
+static int clr_config_net_veth_n_txqueues(const char *key, struct lxc_conf *lxc_conf,
+					  void *data)
+{
+	struct lxc_netdev *netdev = data;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return 0;
+
+	netdev->priv.veth_attr.n_txqueues = -1;
+
+	return 0;
+}
+
+
 static int clr_config_net_veth_pair(const char *key, struct lxc_conf *lxc_conf,
 				    void *data)
 {
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return 0;
 
 	netdev->priv.veth_attr.pair0 = '\0';
 
 	return 0;
 }
 
+static int clr_config_net_veth_vlan_id(const char *key, struct lxc_conf *lxc_conf,
+				  void *data)
+{
+	struct lxc_netdev *netdev = data;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return 0;
+
+	netdev->priv.veth_attr.vlan_id = 0;
+	netdev->priv.veth_attr.vlan_id_set = false;
+
+	return 0;
+}
+
+static int clr_config_net_veth_vlan_tagged_id(const char *key,
+				       struct lxc_conf *lxc_conf, void *data)
+{
+	struct lxc_netdev *netdev = data;
+	struct lxc_list *cur, *next;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return 0;
+
+	lxc_list_for_each_safe(cur, &netdev->priv.veth_attr.vlan_tagged_ids, next) {
+		lxc_list_del(cur);
+		free(cur);
+	}
+
+	return 0;
+}
+
+
 static int clr_config_net_script_up(const char *key, struct lxc_conf *lxc_conf,
 				    void *data)
 {
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	free(netdev->upscript);
-	netdev->upscript = NULL;
+	free_disarm(netdev->upscript);
 
 	return 0;
 }
@@ -5202,10 +5743,9 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	free(netdev->downscript);
-	netdev->downscript = NULL;
+	free_disarm(netdev->downscript);
 
 	return 0;
 }
@@ -5216,10 +5756,9 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	free(netdev->hwaddr);
-	netdev->hwaddr = NULL;
+	free_disarm(netdev->hwaddr);
 
 	return 0;
 }
@@ -5230,10 +5769,9 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	free(netdev->mtu);
-	netdev->mtu = NULL;
+	free_disarm(netdev->mtu);
 
 	return 0;
 }
@@ -5244,7 +5782,10 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VLAN)
+		return 0;
 
 	netdev->priv.vlan_attr.vid = 0;
 
@@ -5257,10 +5798,9 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	free(netdev->ipv4_gateway);
-	netdev->ipv4_gateway = NULL;
+	free_disarm(netdev->ipv4_gateway);
 
 	return 0;
 }
@@ -5269,33 +5809,34 @@
 				       struct lxc_conf *lxc_conf, void *data)
 {
 	struct lxc_netdev *netdev = data;
-	struct lxc_list *cur, *next;
+	struct lxc_inetdev *inetdev, *ninetdev;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	lxc_list_for_each_safe(cur, &netdev->ipv4, next) {
-		lxc_list_del(cur);
-		free(cur->elem);
-		free(cur);
+	list_for_each_entry_safe(inetdev, ninetdev, &netdev->ipv4_addresses, head) {
+		list_del(&inetdev->head);
+		free(inetdev);
 	}
 
 	return 0;
 }
 
 static int clr_config_net_veth_ipv4_route(const char *key,
-				       struct lxc_conf *lxc_conf, void *data)
+					  struct lxc_conf *lxc_conf, void *data)
 {
 	struct lxc_netdev *netdev = data;
-	struct lxc_list *cur, *next;
+	struct lxc_inetdev *inetdev, *ninetdev;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	lxc_list_for_each_safe(cur, &netdev->priv.veth_attr.ipv4_routes, next) {
-		lxc_list_del(cur);
-		free(cur->elem);
-		free(cur);
+	if (netdev->type != LXC_NET_VETH)
+		return 0;
+
+	list_for_each_entry_safe(inetdev, ninetdev, &netdev->priv.veth_attr.ipv4_routes, head) {
+		list_del(&inetdev->head);
+		free(inetdev);
 	}
 
 	return 0;
@@ -5307,10 +5848,9 @@
 	struct lxc_netdev *netdev = data;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	free(netdev->ipv6_gateway);
-	netdev->ipv6_gateway = NULL;
+	free_disarm(netdev->ipv6_gateway);
 
 	return 0;
 }
@@ -5319,66 +5859,55 @@
 				       struct lxc_conf *lxc_conf, void *data)
 {
 	struct lxc_netdev *netdev = data;
-	struct lxc_list *cur, *next;
+	struct lxc_inet6dev *inet6dev, *ninet6dev;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	lxc_list_for_each_safe(cur, &netdev->ipv6, next) {
-		lxc_list_del(cur);
-		free(cur->elem);
-		free(cur);
+	list_for_each_entry_safe(inet6dev, ninet6dev, &netdev->ipv6_addresses, head) {
+		list_del(&inet6dev->head);
+		free(inet6dev);
 	}
 
 	return 0;
 }
 
 static int clr_config_net_veth_ipv6_route(const char *key,
-				       struct lxc_conf *lxc_conf, void *data)
+					  struct lxc_conf *lxc_conf, void *data)
 {
 	struct lxc_netdev *netdev = data;
-	struct lxc_list *cur, *next;
+	struct lxc_inet6dev *inet6dev, *ninet6dev;
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
-	lxc_list_for_each_safe(cur, &netdev->priv.veth_attr.ipv6_routes, next) {
-		lxc_list_del(cur);
-		free(cur->elem);
-		free(cur);
+	if (netdev->type != LXC_NET_VETH)
+		return 0;
+
+	list_for_each_entry_safe(inet6dev, ninet6dev, &netdev->priv.veth_attr.ipv6_routes, head) {
+		list_del(&inet6dev->head);
+		free(inet6dev);
 	}
 
 	return 0;
 }
 
-static int get_config_net_nic(const char *key, char *retv, int inlen,
-			      struct lxc_conf *c, void *data)
+static int get_config_jump_table_net(const char *key, char *retv, int inlen,
+				     struct lxc_conf *c, void *data)
 {
+	struct config_net_info info = {};
 	int ret;
 	const char *idxstring;
-	struct lxc_config_t *config;
-	struct lxc_netdev *netdev;
-	ssize_t idx = -1;
-	char *deindexed_key = NULL;
 
-	idxstring = key + 8;
+	idxstring = key + STRLITERALLEN("lxc.net.");
 	if (!isdigit(*idxstring))
-		return -1;
+		return ret_errno(EINVAL);
 
-	config = get_network_config_ops(key, c, &idx, &deindexed_key);
-	if (!config || idx < 0)
-		return -1;
+	ret = get_network_config_ops(key, c, &info, false);
+	if (ret)
+		return ret;
 
-	netdev = lxc_get_netdev_by_idx(c, (unsigned int)idx, false);
-	if (!netdev) {
-		free(deindexed_key);
-		return -1;
-	}
-
-	ret = config->get(deindexed_key, retv, inlen, c, netdev);
-	free(deindexed_key);
-
-	return ret;
+	return info.ops->get(info.subkey, retv, inlen, c, info.netdev);
 }
 
 static int get_config_net_type(const char *key, char *retv, int inlen,
@@ -5388,14 +5917,14 @@
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
 	strprint(retv, inlen, "%s", lxc_net_type_to_str(netdev->type));
 
 	return fulllen;
@@ -5408,14 +5937,14 @@
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
 	if (netdev->flags & IFF_UP)
 		strprint(retv, inlen, "up");
 
@@ -5429,14 +5958,14 @@
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
 	if (netdev->link0 != '\0')
 		strprint(retv, inlen, "%s", netdev->link);
 
@@ -5444,9 +5973,13 @@
 }
 
 static int get_config_net_l2proxy(const char *key, char *retv, int inlen,
-			       struct lxc_conf *c, void *data)
+				  struct lxc_conf *c, void *data)
 {
 	struct lxc_netdev *netdev = data;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	return lxc_get_conf_bool(c, retv, inlen, netdev->l2proxy);
 }
 
@@ -5457,14 +5990,14 @@
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
 	if (netdev->name0 != '\0')
 		strprint(retv, inlen, "%s", netdev->name);
 
@@ -5479,17 +6012,17 @@
 	const char *mode;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_MACVLAN)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
-	if (netdev->type != LXC_NET_MACVLAN)
-		return 0;
-
 	switch (netdev->priv.macvlan_attr.mode) {
 	case MACVLAN_MODE_PRIVATE:
 		mode = "private";
@@ -5516,22 +6049,22 @@
 static int get_config_net_ipvlan_mode(const char *key, char *retv, int inlen,
 				       struct lxc_conf *c, void *data)
 {
-	int len;
 	int fulllen = 0;
-	const char *mode;
 	struct lxc_netdev *netdev = data;
+	int len;
+	const char *mode;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_IPVLAN)
+		return ret_errno(EINVAL);
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
-
-	if (netdev->type != LXC_NET_IPVLAN)
-		return 0;
-
 	switch (netdev->priv.ipvlan_attr.mode) {
 	case IPVLAN_MODE_L3:
 		mode = "l3";
@@ -5555,22 +6088,22 @@
 static int get_config_net_ipvlan_isolation(const char *key, char *retv, int inlen,
 				       struct lxc_conf *c, void *data)
 {
-	int len;
 	int fulllen = 0;
-	const char *mode;
 	struct lxc_netdev *netdev = data;
+	int len;
+	const char *mode;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_IPVLAN)
+		return ret_errno(EINVAL);
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
-
-	if (netdev->type != LXC_NET_IPVLAN)
-		return 0;
-
 	switch (netdev->priv.ipvlan_attr.isolation) {
 	case IPVLAN_ISOLATION_BRIDGE:
 		mode = "bridge";
@@ -5592,24 +6125,24 @@
 }
 
 static int get_config_net_veth_mode(const char *key, char *retv, int inlen,
-				       struct lxc_conf *c, void *data)
+				    struct lxc_conf *c, void *data)
 {
-	int len;
 	int fulllen = 0;
-	const char *mode;
 	struct lxc_netdev *netdev = data;
+	int len;
+	const char *mode;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
-
-	if (netdev->type != LXC_NET_VETH)
-		return 0;
-
 	switch (netdev->priv.veth_attr.mode) {
 	case VETH_MODE_BRIDGE:
 		mode = "bridge";
@@ -5627,23 +6160,71 @@
 	return fulllen;
 }
 
-static int get_config_net_veth_pair(const char *key, char *retv, int inlen,
-				    struct lxc_conf *c, void *data)
+static int get_config_net_veth_n_rxqueues(const char *key, char *retv, int inlen,
+				     struct lxc_conf *c, void *data)
 {
 	int len;
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
+	if (netdev->priv.veth_attr.n_rxqueues > 0)
+		strprint(retv, inlen, "%d", netdev->priv.veth_attr.n_rxqueues);
+
+	return fulllen;
+}
+
+static int get_config_net_veth_n_txqueues(const char *key, char *retv, int inlen,
+				     struct lxc_conf *c, void *data)
+{
+	int len;
+	int fulllen = 0;
+	struct lxc_netdev *netdev = data;
+
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
 	if (netdev->type != LXC_NET_VETH)
-		return 0;
+		return ret_errno(EINVAL);
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
+
+	if (netdev->priv.veth_attr.n_txqueues > 0)
+		strprint(retv, inlen, "%d", netdev->priv.veth_attr.n_txqueues);
+
+	return fulllen;
+}
+
+static int get_config_net_veth_pair(const char *key, char *retv, int inlen,
+				    struct lxc_conf *c, void *data)
+{
+	int len;
+	int fulllen = 0;
+	struct lxc_netdev *netdev = data;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
 
 	strprint(retv, inlen, "%s",
 		 netdev->priv.veth_attr.pair0 != '\0'
@@ -5653,20 +6234,74 @@
 	return fulllen;
 }
 
-static int get_config_net_script_up(const char *key, char *retv, int inlen,
-				    struct lxc_conf *c, void *data)
+static int get_config_net_veth_vlan_id(const char *key, char *retv, int inlen,
+				       struct lxc_conf *c, void *data)
 {
 	int len;
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
+	strprint(retv, inlen, "%d", netdev->priv.veth_attr.vlan_id);
+
+	return fulllen;
+}
+
+static int get_config_net_veth_vlan_tagged_id(const char *key, char *retv,
+					      int inlen, struct lxc_conf *c,
+					      void *data)
+{
+	int len;
+	size_t listlen;
+	struct lxc_list *it;
+	int fulllen = 0;
+	struct lxc_netdev *netdev = data;
+
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
+
+	listlen = lxc_list_len(&netdev->priv.veth_attr.vlan_tagged_ids);
+
+	lxc_list_for_each(it, &netdev->priv.veth_attr.vlan_tagged_ids) {
+		unsigned short i = PTR_TO_USHORT(it->elem);
+		strprint(retv, inlen, "%u%s", i, (listlen-- > 1) ? "\n" : "");
+	}
+
+	return fulllen;
+}
+
+static int get_config_net_script_up(const char *key, char *retv, int inlen,
+				    struct lxc_conf *c, void *data)
+{
+	int len;
+	int fulllen = 0;
+	struct lxc_netdev *netdev = data;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
 
 	if (netdev->upscript)
 		strprint(retv, inlen, "%s", netdev->upscript);
@@ -5681,14 +6316,14 @@
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
 	if (netdev->downscript)
 		strprint(retv, inlen, "%s", netdev->downscript);
 
@@ -5702,14 +6337,14 @@
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
 	if (netdev->hwaddr)
 		strprint(retv, inlen, "%s", netdev->hwaddr);
 
@@ -5723,14 +6358,14 @@
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
 	if (netdev->mtu)
 		strprint(retv, inlen, "%s", netdev->mtu);
 
@@ -5744,17 +6379,17 @@
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
+	if (netdev->type != LXC_NET_VLAN)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
-	if (netdev->type != LXC_NET_VLAN)
-		return 0;
-
 	strprint(retv, inlen, "%d", netdev->priv.vlan_attr.vid);
 
 	return fulllen;
@@ -5768,20 +6403,21 @@
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
 	if (netdev->ipv4_gateway_auto) {
 		strprint(retv, inlen, "auto");
 	} else if (netdev->ipv4_gateway_dev) {
 		strprint(retv, inlen, "dev");
 	} else if (netdev->ipv4_gateway) {
-		inet_ntop(AF_INET, netdev->ipv4_gateway, buf, sizeof(buf));
+		if (!inet_ntop(AF_INET, netdev->ipv4_gateway, buf, sizeof(buf)))
+			return -errno;
 		strprint(retv, inlen, "%s", buf);
 	}
 
@@ -5791,27 +6427,27 @@
 static int get_config_net_ipv4_address(const char *key, char *retv, int inlen,
 				       struct lxc_conf *c, void *data)
 {
+	int fulllen = 0;
+	struct lxc_netdev *netdev = data;
 	int len;
 	size_t listlen;
 	char bufINET_ADDRSTRLEN;
-	struct lxc_list *it;
-	int fulllen = 0;
-	struct lxc_netdev *netdev = data;
+	struct lxc_inetdev *inetdev;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
+	listlen = list_len(inetdev, &netdev->ipv4_addresses, head);
 
-	listlen = lxc_list_len(&netdev->ipv4);
-
-	lxc_list_for_each(it, &netdev->ipv4) {
-		struct lxc_inetdev *i = it->elem;
-		inet_ntop(AF_INET, &i->addr, buf, sizeof(buf));
-		strprint(retv, inlen, "%s/%u%s", buf, i->prefix,
+	list_for_each_entry(inetdev, &netdev->ipv4_addresses, head) {
+		if (!inet_ntop(AF_INET, &inetdev->addr, buf, sizeof(buf)))
+			return -errno;
+		strprint(retv, inlen, "%s/%u%s", buf, inetdev->prefix,
 			 (listlen-- > 1) ? "\n" : "");
 	}
 
@@ -5819,32 +6455,31 @@
 }
 
 static int get_config_net_veth_ipv4_route(const char *key, char *retv, int inlen,
-				       struct lxc_conf *c, void *data)
+					  struct lxc_conf *c, void *data)
 {
 	int len;
 	size_t listlen;
 	char bufINET_ADDRSTRLEN;
-	struct lxc_list *it;
+	struct lxc_inetdev *inetdev;
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
-	if (!retv)
-		inlen = 0;
-	else
-		memset(retv, 0, inlen);
-
 	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	if (netdev->type != LXC_NET_VETH)
-		return 0;
+		return ret_errno(EINVAL);
 
-	listlen = lxc_list_len(&netdev->priv.veth_attr.ipv4_routes);
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
 
-	lxc_list_for_each(it, &netdev->priv.veth_attr.ipv4_routes) {
-		struct lxc_inetdev *i = it->elem;
-		inet_ntop(AF_INET, &i->addr, buf, sizeof(buf));
-		strprint(retv, inlen, "%s/%u%s", buf, i->prefix,
+	listlen = list_len(inetdev, &netdev->priv.veth_attr.ipv4_routes, head);
+	list_for_each_entry(inetdev, &netdev->priv.veth_attr.ipv4_routes, head) {
+		if (!inet_ntop(AF_INET, &inetdev->addr, buf, sizeof(buf)))
+			return -errno;
+		strprint(retv, inlen, "%s/%u%s", buf, inetdev->prefix,
 			 (listlen-- > 1) ? "\n" : "");
 	}
 
@@ -5859,20 +6494,21 @@
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
+	if (!netdev)
+		return ret_errno(EINVAL);
+
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
 	if (netdev->ipv6_gateway_auto) {
 		strprint(retv, inlen, "auto");
 	} else if (netdev->ipv6_gateway_dev) {
 		strprint(retv, inlen, "dev");
 	} else if (netdev->ipv6_gateway) {
-		inet_ntop(AF_INET6, netdev->ipv6_gateway, buf, sizeof(buf));
+		if (!inet_ntop(AF_INET6, netdev->ipv6_gateway, buf, sizeof(buf)))
+			return -errno;
 		strprint(retv, inlen, "%s", buf);
 	}
 
@@ -5885,24 +6521,23 @@
 	int len;
 	size_t listlen;
 	char bufINET6_ADDRSTRLEN;
-	struct lxc_list *it;
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
+	struct lxc_inet6dev *inet6dev;
+
+	if (!netdev)
+		return ret_errno(EINVAL);
 
 	if (!retv)
 		inlen = 0;
 	else
 		memset(retv, 0, inlen);
 
-	if (!netdev)
-		return -1;
-
-	listlen = lxc_list_len(&netdev->ipv6);
-
-	lxc_list_for_each(it, &netdev->ipv6) {
-		struct lxc_inet6dev *i = it->elem;
-		inet_ntop(AF_INET6, &i->addr, buf, sizeof(buf));
-		strprint(retv, inlen, "%s/%u%s", buf, i->prefix,
+	listlen = list_len(inet6dev, &netdev->ipv6_addresses, head);
+	list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) {
+		if (!inet_ntop(AF_INET6, &inet6dev->addr, buf, sizeof(buf)))
+			return -errno;
+		strprint(retv, inlen, "%s/%u%s", buf, inet6dev->prefix,
 			 (listlen-- > 1) ? "\n" : "");
 	}
 
@@ -5910,32 +6545,31 @@
 }
 
 static int get_config_net_veth_ipv6_route(const char *key, char *retv, int inlen,
-				       struct lxc_conf *c, void *data)
+					  struct lxc_conf *c, void *data)
 {
 	int len;
 	size_t listlen;
 	char bufINET6_ADDRSTRLEN;
-	struct lxc_list *it;
+	struct lxc_inet6dev *inet6dev;
 	int fulllen = 0;
 	struct lxc_netdev *netdev = data;
 
-	if (!retv)
-		inlen = 0;
-	else
-		memset(retv, 0, inlen);
-
 	if (!netdev)
-		return ret_set_errno(-1, EINVAL);
+		return ret_errno(EINVAL);
 
 	if (netdev->type != LXC_NET_VETH)
-		return 0;
+		return ret_errno(EINVAL);
 
-	listlen = lxc_list_len(&netdev->priv.veth_attr.ipv6_routes);
+	if (!retv)
+		inlen = 0;
+	else
+		memset(retv, 0, inlen);
 
-	lxc_list_for_each(it, &netdev->priv.veth_attr.ipv6_routes) {
-		struct lxc_inet6dev *i = it->elem;
-		inet_ntop(AF_INET6, &i->addr, buf, sizeof(buf));
-		strprint(retv, inlen, "%s/%u%s", buf, i->prefix,
+	listlen = list_len(inet6dev, &netdev->priv.veth_attr.ipv6_routes, head);
+	list_for_each_entry(inet6dev, &netdev->priv.veth_attr.ipv6_routes, head) {
+		if (!inet_ntop(AF_INET6, &inet6dev->addr, buf, sizeof(buf)))
+			return -errno;
+		strprint(retv, inlen, "%s/%u%s", buf, inet6dev->prefix,
 			 (listlen-- > 1) ? "\n" : "");
 	}
 
@@ -5953,7 +6587,7 @@
 	else
 		memset(retv, 0, inlen);
 
-	for (i = 0; i < config_jump_table_size; i++) {
+	for (i = 0; i < ARRAY_SIZE(config_jump_table); i++) {
 		char *s = config_jump_tablei.name;
 
 		if (sstrlen(s) - 1 == '.')
@@ -5976,27 +6610,27 @@
 	else
 		memset(retv, 0, inlen);
 
-	if (!strcmp(key, "lxc.apparmor")) {
+	if (strequal(key, "lxc.apparmor")) {
 		strprint(retv, inlen, "allow_incomplete\n");
 		strprint(retv, inlen, "allow_nesting\n");
 		strprint(retv, inlen, "profile\n");
 		strprint(retv, inlen, "raw\n");
-	} else if (!strcmp(key, "lxc.cgroup")) {
+	} else if (strequal(key, "lxc.cgroup")) {
 		strprint(retv, inlen, "dir\n");
-	} else if (!strcmp(key, "lxc.selinux")) {
+	} else if (strequal(key, "lxc.selinux")) {
 		strprint(retv, inlen, "context\n");
 		strprint(retv, inlen, "context.keyring\n");
-	} else if (!strcmp(key, "lxc.mount")) {
+	} else if (strequal(key, "lxc.mount")) {
 		strprint(retv, inlen, "auto\n");
 		strprint(retv, inlen, "entry\n");
 		strprint(retv, inlen, "fstab\n");
-	} else if (!strcmp(key, "lxc.rootfs")) {
+	} else if (strequal(key, "lxc.rootfs")) {
 		strprint(retv, inlen, "mount\n");
 		strprint(retv, inlen, "options\n");
 		strprint(retv, inlen, "path\n");
-	} else if (!strcmp(key, "lxc.uts")) {
+	} else if (strequal(key, "lxc.uts")) {
 		strprint(retv, inlen, "name\n");
-	} else if (!strcmp(key, "lxc.hook")) {
+	} else if (strequal(key, "lxc.hook")) {
 		strprint(retv, inlen, "autodev\n");
 		strprint(retv, inlen, "autodevtmpfssize\n");
 		strprint(retv, inlen, "clone\n");
@@ -6008,28 +6642,28 @@
 		strprint(retv, inlen, "start-host\n");
 		strprint(retv, inlen, "start\n");
 		strprint(retv, inlen, "stop\n");
-	} else if (!strcmp(key, "lxc.cap")) {
+	} else if (strequal(key, "lxc.cap")) {
 		strprint(retv, inlen, "drop\n");
 		strprint(retv, inlen, "keep\n");
-	} else if (!strcmp(key, "lxc.console")) {
+	} else if (strequal(key, "lxc.console")) {
 		strprint(retv, inlen, "logfile\n");
 		strprint(retv, inlen, "path\n");
-	} else if (!strcmp(key, "lxc.seccomp")) {
+	} else if (strequal(key, "lxc.seccomp")) {
 		strprint(retv, inlen, "profile\n");
-	} else if (!strcmp(key, "lxc.signal")) {
+	} else if (strequal(key, "lxc.signal")) {
 		strprint(retv, inlen, "halt\n");
 		strprint(retv, inlen, "reboot\n");
 		strprint(retv, inlen, "stop\n");
-	} else if (!strcmp(key, "lxc.start")) {
+	} else if (strequal(key, "lxc.start")) {
 		strprint(retv, inlen, "auto\n");
 		strprint(retv, inlen, "delay\n");
 		strprint(retv, inlen, "order\n");
-	} else if (!strcmp(key, "lxc.monitor")) {
+	} else if (strequal(key, "lxc.monitor")) {
 		strprint(retv, inlen, "unshare\n");
-	} else if (!strcmp(key, "lxc.keyring")) {
+	} else if (strequal(key, "lxc.keyring")) {
 		strprint(retv, inlen, "session\n");
 	} else {
-		fulllen = -1;
+		fulllen = ret_errno(EINVAL);
 	}
 
 	return fulllen;
@@ -6037,23 +6671,22 @@
 
 int lxc_list_net(struct lxc_conf *c, const char *key, char *retv, int inlen)
 {
-	int len;
-	const char *idxstring;
+	struct config_net_info info = {};
 	struct lxc_netdev *netdev;
+	int len, ret;
+	const char *idxstring;
 	int fulllen = 0;
-	ssize_t idx = -1;
 
-	idxstring = key + 8;
+	idxstring = key + STRLITERALLEN("lxc.net.");
 	if (!isdigit(*idxstring))
-		return -1;
+		return ret_errno(EINVAL);
 
-	(void)get_network_config_ops(key, c, &idx, NULL);
-	if (idx < 0)
-		return -1;
-
-	netdev = lxc_get_netdev_by_idx(c, (unsigned int)idx, false);
-	if (!netdev)
-		return -1;
+	ret = get_network_config_ops(key, c, &info, false);
+	if (ret) {
+		if (ret != -ENOENT)
+			return ret_errno(EINVAL);
+	}
+	netdev = info.netdev;
 
 	if (!retv)
 		inlen = 0;
@@ -6081,6 +6714,7 @@
 		strprint(retv, inlen, "veth.pair\n");
 		strprint(retv, inlen, "veth.ipv4.route\n");
 		strprint(retv, inlen, "veth.ipv6.route\n");
+		strprint(retv, inlen, "veth.vlan.id\n");
 		break;
 	case LXC_NET_MACVLAN:
 		strprint(retv, inlen, "macvlan.mode\n");
@@ -6098,3 +6732,35 @@
 
 	return fulllen;
 }
+
+static int set_config_sched_core(const char *key, const char *value,
+				 struct lxc_conf *lxc_conf, void *data)
+{
+	int ret;
+	unsigned int nr;
+
+	if (lxc_config_value_empty(value))
+		return clr_config_sched_core(key, lxc_conf, data);
+
+	ret = lxc_safe_uint(value, &nr);
+	if (ret)
+		return ret_errno(EINVAL);
+
+	if (nr != 0 && nr != 1)
+		return ret_errno(EINVAL);
+
+	lxc_conf->sched_core = (nr == 1);
+	return 0;
+}
+
+static int get_config_sched_core(const char *key, char *retv, int inlen,
+				 struct lxc_conf *c, void *data)
+{
+	return lxc_get_conf_bool(c, retv, inlen, c->sched_core);
+}
+
+static int clr_config_sched_core(const char *key, struct lxc_conf *c, void *data)
+{
+	c->sched_core = false;
+	return 0;
+}

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/confile.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/confile.h Changed

@@ -3,11 +3,12 @@
 #ifndef __LXC_CONFILE_H
 #define __LXC_CONFILE_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 
-#include <lxc/attach_options.h>
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "compiler.h"
 
@@ -32,11 +33,15 @@
 typedef int (*config_clr_cb)(const char *key, struct lxc_conf *conf,
 			     void *data);
 
+#define LXC_CONFIG_MEMBERS \
+	char *name;        \
+	bool strict;       \
+	config_set_cb set; \
+	config_get_cb get; \
+	config_clr_cb clr
+
 struct lxc_config_t {
-	char *name;
-	config_set_cb set;
-	config_get_cb get;
-	config_clr_cb clr;
+	LXC_CONFIG_MEMBERS;
 };
 
 struct new_config_item {
@@ -45,66 +50,68 @@
 };
 
 /* Get the jump table entry for the given configuration key. */
-extern struct lxc_config_t *lxc_get_config(const char *key);
+__hidden extern struct lxc_config_t *lxc_get_config_exact(const char *key);
+
+/* Get the jump table entry if entry name is a prefix of the given configuration key. */
+__hidden extern struct lxc_config_t *lxc_get_config(const char *key);
 
 /* List all available config items. */
-extern int lxc_list_config_items(char *retv, int inlen)
+__hidden extern int lxc_list_config_items(char *retv, int inlen)
 __access_rw(1, 2);
 
 /* Given a configuration key namespace (e.g. lxc.apparmor) list all associated
  * subkeys for that namespace.
  * Must be implemented when adding a new configuration key.
  */
-extern int lxc_list_subkeys(struct lxc_conf *conf, const char *key, char *retv,
-			    int inlen)
-__access_rw(3, 4);
+__hidden extern int lxc_list_subkeys(struct lxc_conf *conf, const char *key, char *retv, int inlen)
+    __access_rw(3, 4);
 
 /* List all configuration items associated with a given network. For example
  * pass "lxc.net.i" to retrieve all configuration items associated with
  * the network associated with index i.
  */
-extern int lxc_list_net(struct lxc_conf *c, const char *key, char *retv,
-			int inlen)
-__access_rw(3, 4);
+__hidden extern int lxc_list_net(struct lxc_conf *c, const char *key, char *retv, int inlen)
+    __access_rw(3, 4);
 
-extern int lxc_config_read(const char *file, struct lxc_conf *conf,
-			   bool from_include);
+__hidden extern int lxc_config_read(const char *file, struct lxc_conf *conf, bool from_include);
 
-extern int append_unexp_config_line(const char *line, struct lxc_conf *conf);
+__hidden extern int append_unexp_config_line(const char *line, struct lxc_conf *conf);
 
-extern int lxc_config_define_add(struct lxc_list *defines, char* arg);
+__hidden extern int lxc_config_define_add(struct lxc_list *defines, char *arg);
 
-extern bool lxc_config_define_load(struct lxc_list *defines,
-				   struct lxc_container *c);
+__hidden extern bool lxc_config_define_load(struct lxc_list *defines, struct lxc_container *c);
 
-extern void lxc_config_define_free(struct lxc_list *defines);
+__hidden extern void lxc_config_define_free(struct lxc_list *defines);
 
-/* needed for lxc-attach */
-extern signed long lxc_config_parse_arch(const char *arch);
+#define LXC_ARCH_UNCHANGED 0xffffffffL
+/*
+ * Parse personality of the container. Returns 0 if personality is valid,
+ * negative errno otherwise.
+ */
+__hidden extern int lxc_config_parse_arch(const char *arch, signed long *persona);
 
-extern int lxc_fill_elevated_privileges(char *flaglist, int *flags);
+__hidden extern int lxc_fill_elevated_privileges(char *flaglist, unsigned int *flags);
 
-extern int lxc_clear_config_item(struct lxc_conf *c, const char *key);
+__hidden extern int lxc_clear_config_item(struct lxc_conf *c, const char *key);
 
-extern int write_config(int fd, const struct lxc_conf *conf);
+__hidden extern int write_config(int fd, const struct lxc_conf *conf);
 
-extern bool do_append_unexp_config_line(struct lxc_conf *conf, const char *key,
-					const char *v);
+__hidden extern bool do_append_unexp_config_line(struct lxc_conf *conf, const char *key,
+						 const char *v);
 
 /* These are used when cloning a container */
-extern void clear_unexp_config_line(struct lxc_conf *conf, const char *key,
-				    bool rm_subkeys);
+__hidden extern void clear_unexp_config_line(struct lxc_conf *conf, const char *key, bool rm_subkeys);
 
-extern bool clone_update_unexp_hooks(struct lxc_conf *conf, const char *oldpath,
-				     const char *newpath, const char *oldname,
-				     const char *newmame);
+__hidden extern bool clone_update_unexp_hooks(struct lxc_conf *conf, const char *oldpath,
+					      const char *newpath, const char *oldname,
+					      const char *newmame);
 
-bool clone_update_unexp_ovl_paths(struct lxc_conf *conf, const char *oldpath,
-				  const char *newpath, const char *oldname,
-				  const char *newname, const char *ovldir);
+__hidden extern bool clone_update_unexp_ovl_paths(struct lxc_conf *conf, const char *oldpath,
+						  const char *newpath, const char *oldname,
+						  const char *newname, const char *ovldir);
 
-extern bool network_new_hwaddrs(struct lxc_conf *conf);
+__hidden extern bool network_new_hwaddrs(struct lxc_conf *conf);
 
-extern int add_elem_to_mount_list(const char *value, struct lxc_conf *lxc_conf);
+__hidden extern int add_elem_to_mount_list(const char *value, struct lxc_conf *lxc_conf);
 
 #endif /* __LXC_CONFILE_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/confile_utils.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/confile_utils.c Changed

@@ -1,29 +1,30 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "lxc.h"
+
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "confile_utils.h"
 #include "error.h"
 #include "list.h"
+#include "lxc.h"
 #include "log.h"
-#include "lxccontainer.h"
 #include "macro.h"
+#include "memory_utils.h"
 #include "network.h"
 #include "parse.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(confile_utils, lxc);
@@ -31,16 +32,16 @@
 int parse_idmaps(const char *idmap, char *type, unsigned long *nsid,
 		 unsigned long *hostid, unsigned long *range)
 {
+	__do_free char *dup = NULL;
 	int ret = -1;
 	unsigned long tmp_hostid, tmp_nsid, tmp_range;
 	char tmp_type;
 	char *window, *slide;
-	char *dup = NULL;
 
 	/* Duplicate string. */
 	dup = strdup(idmap);
 	if (!dup)
-		goto on_error;
+		return ret_errno(ENOMEM);
 
 	/* A prototypical idmap entry would be: "u 1000 1000000 65536" */
 
@@ -49,13 +50,11 @@
 	/* skip whitespace */
 	slide += strspn(slide, " \t\r");
 	if (slide != window && *slide == '\0')
-		goto on_error;
+		return ret_errno(EINVAL);
 
 	/* Validate type. */
-	if (*slide != 'u' && *slide != 'g') {
-		ERROR("Invalid id mapping type: %c", *slide);
-		goto on_error;
-	}
+	if (*slide != 'u' && *slide != 'g')
+		return log_error_errno(-EINVAL, EINVAL, "Invalid id mapping type: %c", *slide);
 
 	/* Assign type. */
 	tmp_type = *slide;
@@ -68,7 +67,7 @@
 	slide += strspn(slide, " \t\r");
 	/* There must be whitespace. */
 	if (slide == window)
-		goto on_error;
+		return ret_errno(EINVAL);
 
 	/* Mark beginning of nsid. */
 	window = slide;
@@ -76,15 +75,14 @@
 	slide += strcspn(slide, " \t\r");
 	/* There must be non-whitespace. */
 	if (slide == window || *slide == '\0')
-		goto on_error;
+		return ret_errno(EINVAL);
 	/* Mark end of nsid. */
 	*slide = '\0';
 
 	/* Parse nsid. */
-	if (lxc_safe_ulong(window, &tmp_nsid) < 0) {
-		ERROR("Failed to parse nsid: %s", window);
-		goto on_error;
-	}
+	ret = lxc_safe_ulong(window, &tmp_nsid);
+	if (ret < 0)
+		return log_error_errno(ret, errno, "Failed to parse nsid: %s", window);
 
 	/* Move beyond \0. */
 	slide++;
@@ -94,7 +92,7 @@
 	 * So only ensure that we're not at the end of the string.
 	 */
 	if (*slide == '\0')
-		goto on_error;
+		return ret_errno(EINVAL);
 
 	/* Mark beginning of hostid. */
 	window = slide;
@@ -102,15 +100,14 @@
 	slide += strcspn(slide, " \t\r");
 	/* There must be non-whitespace. */
 	if (slide == window || *slide == '\0')
-		goto on_error;
+		return ret_errno(EINVAL);
 	/* Mark end of nsid. */
 	*slide = '\0';
 
 	/* Parse hostid. */
-	if (lxc_safe_ulong(window, &tmp_hostid) < 0) {
-		ERROR("Failed to parse hostid: %s", window);
-		goto on_error;
-	}
+	ret = lxc_safe_ulong(window, &tmp_hostid);
+	if (ret < 0)
+		return log_error_errno(ret, errno, "Failed to parse hostid: %s", window);
 
 	/* Move beyond \0. */
 	slide++;
@@ -120,7 +117,7 @@
 	 * So only ensure that we're not at the end of the string.
 	 */
 	if (*slide == '\0')
-		goto on_error;
+		return ret_errno(EINVAL);
 
 	/* Mark beginning of range. */
 	window = slide;
@@ -128,35 +125,29 @@
 	slide += strcspn(slide, " \t\r");
 	/* There must be non-whitespace. */
 	if (slide == window)
-		goto on_error;
+		return ret_errno(EINVAL);
 
 	/* The range is the last valid entry we expect. So make sure that there
 	 * is no trailing garbage and if there is, error out.
 	 */
 	if (*(slide + strspn(slide, " \t\r\n")) != '\0')
-		goto on_error;
+		return ret_errno(EINVAL);
 
 	/* Mark end of range. */
 	*slide = '\0';
 
 	/* Parse range. */
-	if (lxc_safe_ulong(window, &tmp_range) < 0) {
-		ERROR("Failed to parse id mapping range: %s", window);
-		goto on_error;
-	}
+	ret = lxc_safe_ulong(window, &tmp_range);
+	if (ret < 0)
+		return log_error_errno(ret, errno, "Failed to parse id mapping range: %s", window);
 
-	*type = tmp_type;
-	*nsid = tmp_nsid;
+	*type	= tmp_type;
+	*nsid	= tmp_nsid;
 	*hostid = tmp_hostid;
-	*range = tmp_range;
+	*range	= tmp_range;
 
 	/* Yay, we survived. */
-	ret = 0;
-
-on_error:
-	free(dup);
-
-	return ret;
+	return 0;
 }
 
 bool lxc_config_value_empty(const char *value)
@@ -167,39 +158,27 @@
 	return true;
 }
 
-struct lxc_netdev *lxc_network_add(struct lxc_list *networks, int idx, bool tail)
+static struct lxc_netdev *lxc_network_add(struct list_head *head, int idx, bool tail)
 {
-	struct lxc_list *newlist;
-	struct lxc_netdev *netdev = NULL;
+	__do_free struct lxc_netdev *netdev = NULL;
 
 	/* network does not exist */
-	netdev = malloc(sizeof(*netdev));
+	netdev = zalloc(sizeof(*netdev));
 	if (!netdev)
-		return NULL;
+		return ret_set_errno(NULL, ENOMEM);
 
-	memset(netdev, 0, sizeof(*netdev));
-	lxc_list_init(&netdev->ipv4);
-	lxc_list_init(&netdev->ipv6);
+	INIT_LIST_HEAD(&netdev->ipv4_addresses);
+	INIT_LIST_HEAD(&netdev->ipv6_addresses);
 
 	/* give network a unique index */
 	netdev->idx = idx;
 
-	/* prepare new list */
-	newlist = malloc(sizeof(*newlist));
-	if (!newlist) {
-		free(netdev);
-		return NULL;
-	}
-
-	lxc_list_init(newlist);
-	newlist->elem = netdev;
-
 	if (tail)
-		lxc_list_add_tail(networks, newlist);
+		list_add_tail(&netdev->head, head);
 	else
-		lxc_list_add(networks, newlist);
+		list_add(&netdev->head, head);
 
-	return netdev;
+	return move_ptr(netdev);
 }
 
 /* Takes care of finding the correct netdev struct in the networks list or
@@ -208,55 +187,56 @@
 struct lxc_netdev *lxc_get_netdev_by_idx(struct lxc_conf *conf,
 					 unsigned int idx, bool allocate)
 {
-	struct lxc_netdev *netdev = NULL;
-	struct lxc_list *networks = &conf->network;
-	struct lxc_list *insert = networks;
+	struct list_head *netdevs = &conf->netdevs;
+	struct list_head *head = netdevs;
+	struct lxc_netdev *netdev;
 
 	/* lookup network */
-	if (!lxc_list_empty(networks)) {
-		lxc_list_for_each(insert, networks) {
-			netdev = insert->elem;
+	if (!list_empty(netdevs)) {
+		list_for_each_entry(netdev, netdevs, head) {
+			/* found network device */
 			if (netdev->idx == idx)
 				return netdev;
-			else if (netdev->idx > idx)
+
+			if (netdev->idx > idx) {
+				head = &netdev->head;
 				break;
+			}
 		}
 	}
 
-	if (!allocate)
-		return NULL;
+	if (allocate)
+		return lxc_network_add(head, idx, true);
 
-	return lxc_network_add(insert, idx, true);
+	return NULL;
 }
 
 void lxc_log_configured_netdevs(const struct lxc_conf *conf)
 {
 	struct lxc_netdev *netdev;
-	struct lxc_list *it = (struct lxc_list *)&conf->network;;
+	const struct list_head *netdevs = &conf->netdevs;
 
-	if ((conf->loglevel != LXC_LOG_LEVEL_TRACE) &&
-	    (lxc_log_get_level() != LXC_LOG_LEVEL_TRACE))
+	if (!lxc_log_trace())
 		return;
 
-	if (lxc_list_empty(it)) {
+	if (list_empty(netdevs)) {
 		TRACE("container has no networks configured");
 		return;
 	}
 
-	lxc_list_for_each(it, &conf->network) {
+	list_for_each_entry(netdev, netdevs, head) {
 		struct lxc_list *cur, *next;
 		struct lxc_inetdev *inet4dev;
 		struct lxc_inet6dev *inet6dev;
 		char bufinet4INET_ADDRSTRLEN, bufinet6INET6_ADDRSTRLEN;
 
-		netdev = it->elem;
-
 		TRACE("index: %zd", netdev->idx);
 		TRACE("ifindex: %d", netdev->ifindex);
 
 		switch (netdev->type) {
 		case LXC_NET_VETH:
 			TRACE("type: veth");
+			TRACE("veth mode: %d", netdev->priv.veth_attr.mode);
 
 			if (netdev->priv.veth_attr.pair0 != '\0')
 				TRACE("veth pair: %s",
@@ -269,6 +249,15 @@
 			if (netdev->priv.veth_attr.ifindex > 0)
 				TRACE("host side ifindex for veth device: %d",
 				      netdev->priv.veth_attr.ifindex);
+
+			if (netdev->priv.veth_attr.vlan_id_set)
+				TRACE("veth vlan id: %d", netdev->priv.veth_attr.vlan_id);
+
+			lxc_list_for_each_safe(cur, &netdev->priv.veth_attr.vlan_tagged_ids, next) {
+				unsigned short vlan_tagged_id = PTR_TO_USHORT(cur->elem);
+				TRACE("veth vlan tagged id: %u", vlan_tagged_id);
+			}
+
 			break;
 		case LXC_NET_MACVLAN:
 			TRACE("type: macvlan");
@@ -353,8 +342,7 @@
 				TRACE("ipv4 gateway: %s", bufinet4);
 			}
 
-			lxc_list_for_each_safe(cur, &netdev->ipv4, next) {
-				inet4dev = cur->elem;
+			list_for_each_entry(inet4dev, &netdev->ipv4_addresses, head) {
 				inet_ntop(AF_INET, &inet4dev->addr, bufinet4,
 					  sizeof(bufinet4));
 				TRACE("ipv4 addr: %s", bufinet4);
@@ -372,16 +360,14 @@
 				TRACE("ipv6 gateway: %s", bufinet6);
 			}
 
-			lxc_list_for_each_safe(cur, &netdev->ipv6, next) {
-				inet6dev = cur->elem;
+			list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) {
 				inet_ntop(AF_INET6, &inet6dev->addr, bufinet6,
 					  sizeof(bufinet6));
 				TRACE("ipv6 addr: %s", bufinet6);
 			}
 
 			if (netdev->type == LXC_NET_VETH) {
-				lxc_list_for_each_safe(cur, &netdev->priv.veth_attr.ipv4_routes, next) {
-					inet4dev = cur->elem;
+				list_for_each_entry(inet4dev, &netdev->priv.veth_attr.ipv4_routes, head) {
 					if (!inet_ntop(AF_INET, &inet4dev->addr, bufinet4, sizeof(bufinet4))) {
 						ERROR("Invalid ipv4 veth route");
 						return;
@@ -390,8 +376,7 @@
 					TRACE("ipv4 veth route: %s/%u", bufinet4, inet4dev->prefix);
 				}
 
-				lxc_list_for_each_safe(cur, &netdev->priv.veth_attr.ipv6_routes, next) {
-					inet6dev = cur->elem;
+				list_for_each_entry(inet6dev, &netdev->priv.veth_attr.ipv6_routes, head) {
 					if (!inet_ntop(AF_INET6, &inet6dev->addr, bufinet6, sizeof(bufinet6))) {
 						ERROR("Invalid ipv6 veth route");
 						return;
@@ -404,106 +389,124 @@
 	}
 }
 
-static void lxc_free_netdev(struct lxc_netdev *netdev)
+void lxc_clear_netdev(struct lxc_netdev *netdev)
 {
 	struct lxc_list *cur, *next;
+	struct list_head head;
+	struct lxc_inetdev *inetdev, *ninetdev;
+	struct lxc_inet6dev *inet6dev, *ninet6dev;
+	ssize_t idx;
 
-	free(netdev->upscript);
-	free(netdev->downscript);
-	free(netdev->hwaddr);
-	free(netdev->mtu);
+	if (!netdev)
+		return;
+
+	idx = netdev->idx;
 
-	free(netdev->ipv4_gateway);
-	lxc_list_for_each_safe(cur, &netdev->ipv4, next) {
-		lxc_list_del(cur);
-		free(cur->elem);
-		free(cur);
+	free_disarm(netdev->upscript);
+	free_disarm(netdev->downscript);
+	free_disarm(netdev->hwaddr);
+	free_disarm(netdev->mtu);
+
+	free_disarm(netdev->ipv4_gateway);
+	list_for_each_entry_safe(inetdev, ninetdev, &netdev->ipv4_addresses, head) {
+		list_del(&inetdev->head);
+		free(inetdev);
 	}
 
-	free(netdev->ipv6_gateway);
-	lxc_list_for_each_safe(cur, &netdev->ipv6, next) {
-		lxc_list_del(cur);
-		free(cur->elem);
-		free(cur);
+	free_disarm(netdev->ipv6_gateway);
+	list_for_each_entry_safe(inet6dev, ninet6dev, &netdev->ipv6_addresses, head) {
+		list_del(&inet6dev->head);
+		free(inet6dev);
 	}
 
 	if (netdev->type == LXC_NET_VETH) {
-		lxc_list_for_each_safe(cur, &netdev->priv.veth_attr.ipv4_routes, next) {
-			lxc_list_del(cur);
-			free(cur->elem);
-			free(cur);
+		list_for_each_entry_safe(inetdev, ninetdev, &netdev->priv.veth_attr.ipv4_routes, head) {
+			list_del(&inetdev->head);
+			free(inetdev);
+		}
+
+		list_for_each_entry_safe(inet6dev, ninet6dev, &netdev->priv.veth_attr.ipv6_routes, head) {
+			list_del(&inet6dev->head);
+			free(inet6dev);
 		}
 
-		lxc_list_for_each_safe(cur, &netdev->priv.veth_attr.ipv6_routes, next) {
+		lxc_list_for_each_safe(cur, &netdev->priv.veth_attr.vlan_tagged_ids, next) {
 			lxc_list_del(cur);
-			free(cur->elem);
 			free(cur);
 		}
 	}
 
-	free(netdev);
+	head = netdev->head;
+	memset(netdev, 0, sizeof(struct lxc_netdev));
+	netdev->head = head;
+	INIT_LIST_HEAD(&netdev->ipv4_addresses);
+	INIT_LIST_HEAD(&netdev->ipv6_addresses);
+	netdev->type = -1;
+	netdev->idx = idx;
+}
+
+static void lxc_free_netdev(struct lxc_netdev *netdev)
+{
+	if (netdev) {
+		lxc_clear_netdev(netdev);
+		free(netdev);
+	}
 }
 
 bool lxc_remove_nic_by_idx(struct lxc_conf *conf, unsigned int idx)
 {
-	struct lxc_list *cur, *next;
 	struct lxc_netdev *netdev;
-	bool found = false;
 
-	lxc_list_for_each_safe(cur, &conf->network, next) {
-		netdev = cur->elem;
+	if (list_empty(&conf->netdevs))
+		return false;
+
+	list_for_each_entry(netdev, &conf->netdevs, head) {
 		if (netdev->idx != idx)
 			continue;
 
-		lxc_list_del(cur);
-		found = true;
-		break;
+		list_del(&netdev->head);
+		lxc_free_netdev(netdev);
+		return true;
 	}
 
-	if (!found)
-		return false;
-
-	lxc_free_netdev(netdev);
-	free(cur);
-
-	return true;
+	return false;
 }
 
-void lxc_free_networks(struct lxc_list *networks)
+void lxc_free_networks(struct lxc_conf *conf)
 {
-	struct lxc_list *cur, *next;
-	struct lxc_netdev *netdev;
+	struct lxc_netdev *netdev, *n;
+
+	if (list_empty(&conf->netdevs))
+		return;
 
-	lxc_list_for_each_safe(cur, networks, next) {
-		netdev = cur->elem;
+	list_for_each_entry_safe(netdev, n, &conf->netdevs, head) {
+		list_del(&netdev->head);
 		lxc_free_netdev(netdev);
-		free(cur);
 	}
 
 	/* prevent segfaults */
-	lxc_list_init(networks);
+	INIT_LIST_HEAD(&conf->netdevs);
 }
 
-
 static struct lxc_veth_mode {
 	char *name;
 	int mode;
 } veth_mode = {
-    { "bridge", VETH_MODE_BRIDGE },
-    { "router", VETH_MODE_ROUTER },
+	{ "bridge", VETH_MODE_BRIDGE },
+	{ "router", VETH_MODE_ROUTER },
 };
 
 int lxc_veth_mode_to_flag(int *mode, const char *value)
 {
 	for (size_t i = 0; i < sizeof(veth_mode) / sizeof(veth_mode0); i++) {
-		if (strcmp(veth_modei.name, value) != 0)
+		if (!strequal(veth_modei.name, value))
 			continue;
 
 		*mode = veth_modei.mode;
 		return 0;
 	}
 
-	return ret_set_errno(-1, EINVAL);
+	return ret_errno(EINVAL);
 }
 
 char *lxc_veth_flag_to_mode(int mode)
@@ -515,68 +518,64 @@
 		return veth_modei.name;
 	}
 
-	return NULL;
+	return ret_set_errno(NULL, EINVAL);
 }
 
 static struct lxc_macvlan_mode {
 	char *name;
 	int mode;
 } macvlan_mode = {
-    { "private",  MACVLAN_MODE_PRIVATE  },
-    { "vepa",     MACVLAN_MODE_VEPA     },
-    { "bridge",   MACVLAN_MODE_BRIDGE   },
-    { "passthru", MACVLAN_MODE_PASSTHRU },
+	{ "private",  MACVLAN_MODE_PRIVATE  },
+	{ "vepa",     MACVLAN_MODE_VEPA     },
+	{ "bridge",   MACVLAN_MODE_BRIDGE   },
+	{ "passthru", MACVLAN_MODE_PASSTHRU },
 };
 
 int lxc_macvlan_mode_to_flag(int *mode, const char *value)
 {
-	size_t i;
-
-	for (i = 0; i < sizeof(macvlan_mode) / sizeof(macvlan_mode0); i++) {
-		if (strcmp(macvlan_modei.name, value))
+	for (size_t i = 0; i < sizeof(macvlan_mode) / sizeof(macvlan_mode0); i++) {
+		if (!strequal(macvlan_modei.name, value))
 			continue;
 
 		*mode = macvlan_modei.mode;
 		return 0;
 	}
 
-	return -1;
+	return ret_errno(EINVAL);
 }
 
 char *lxc_macvlan_flag_to_mode(int mode)
 {
-	size_t i;
-
-	for (i = 0; i < sizeof(macvlan_mode) / sizeof(macvlan_mode0); i++) {
+	for (size_t i = 0; i < sizeof(macvlan_mode) / sizeof(macvlan_mode0); i++) {
 		if (macvlan_modei.mode != mode)
 			continue;
 
 		return macvlan_modei.name;
 	}
 
-	return NULL;
+	return ret_set_errno(NULL, EINVAL);
 }
 
 static struct lxc_ipvlan_mode {
 	char *name;
 	int mode;
 } ipvlan_mode = {
-    { "l3",  IPVLAN_MODE_L3  },
-    { "l3s", IPVLAN_MODE_L3S },
-    { "l2",  IPVLAN_MODE_L2  },
+	{ "l3",  IPVLAN_MODE_L3  },
+	{ "l3s", IPVLAN_MODE_L3S },
+	{ "l2",  IPVLAN_MODE_L2  },
 };
 
 int lxc_ipvlan_mode_to_flag(int *mode, const char *value)
 {
 	for (size_t i = 0; i < sizeof(ipvlan_mode) / sizeof(ipvlan_mode0); i++) {
-		if (strcmp(ipvlan_modei.name, value) != 0)
+		if (!strequal(ipvlan_modei.name, value))
 			continue;
 
 		*mode = ipvlan_modei.mode;
 		return 0;
 	}
 
-	return -1;
+	return ret_errno(EINVAL);
 }
 
 char *lxc_ipvlan_flag_to_mode(int mode)
@@ -588,29 +587,29 @@
 		return ipvlan_modei.name;
 	}
 
-	return NULL;
+	return ret_set_errno(NULL, EINVAL);
 }
 
 static struct lxc_ipvlan_isolation {
 	char *name;
 	int flag;
 } ipvlan_isolation = {
-    { "bridge",  IPVLAN_ISOLATION_BRIDGE  },
-    { "private", IPVLAN_ISOLATION_PRIVATE },
-    { "vepa",    IPVLAN_ISOLATION_VEPA    },
+	{ "bridge",  IPVLAN_ISOLATION_BRIDGE  },
+	{ "private", IPVLAN_ISOLATION_PRIVATE },
+	{ "vepa",    IPVLAN_ISOLATION_VEPA    },
 };
 
 int lxc_ipvlan_isolation_to_flag(int *flag, const char *value)
 {
 	for (size_t i = 0; i < sizeof(ipvlan_isolation) / sizeof(ipvlan_isolation0); i++) {
-		if (strcmp(ipvlan_isolationi.name, value) != 0)
+		if (!strequal(ipvlan_isolationi.name, value))
 			continue;
 
 		*flag = ipvlan_isolationi.flag;
 		return 0;
 	}
 
-	return -1;
+	return ret_errno(EINVAL);
 }
 
 char *lxc_ipvlan_flag_to_isolation(int flag)
@@ -622,7 +621,7 @@
 		return ipvlan_isolationi.name;
 	}
 
-	return NULL;
+	return ret_set_errno(NULL, EINVAL);
 }
 
 int set_config_string_item(char **conf_item, const char *value)
@@ -630,39 +629,40 @@
 	char *new_value;
 
 	if (lxc_config_value_empty(value)) {
-		free(*conf_item);
-		*conf_item = NULL;
+		free_disarm(*conf_item);
 		return 0;
 	}
 
 	new_value = strdup(value);
-	if (!new_value) {
-		SYSERROR("Failed to duplicate string \"%s\"", value);
-		return -1;
-	}
+	if (!new_value)
+		return log_error_errno(-ENOMEM, ENOMEM, "Failed to duplicate string \"%s\"", value);
 
-	free(*conf_item);
-	*conf_item = new_value;
+	free_move_ptr(*conf_item, new_value);
 	return 0;
 }
 
 int set_config_string_item_max(char **conf_item, const char *value, size_t max)
 {
-	if (strlen(value) >= max) {
-		ERROR("%s is too long (>= %lu)", value, (unsigned long)max);
-		return -1;
-	}
+	if (strlen(value) >= max)
+		return log_error_errno(-ENAMETOOLONG, ENAMETOOLONG, "%s is too long (>= %lu)", value, (unsigned long)max);
 
 	return set_config_string_item(conf_item, value);
 }
 
 int set_config_path_item(char **conf_item, const char *value)
 {
-	return set_config_string_item_max(conf_item, value, PATH_MAX);
+	__do_free char *valdup = NULL;
+
+	valdup = path_simplify(value);
+	if (!valdup)
+		return -ENOMEM;
+
+	return set_config_string_item_max(conf_item, valdup, PATH_MAX);
 }
 
 int set_config_bool_item(bool *conf_item, const char *value, bool empty_conf_action)
 {
+	int ret;
 	unsigned int val = 0;
 
 	if (lxc_config_value_empty(value)) {
@@ -670,8 +670,9 @@
 		return 0;
 	}
 
-	if (lxc_safe_uint(value, &val) < 0)
-		return -EINVAL;
+	ret = lxc_safe_uint(value, &val);
+	if (ret < 0)
+		return ret;
 
 	switch (val) {
 	case 0:
@@ -682,7 +683,7 @@
 		return 0;
 	}
 
-	return -EINVAL;
+	return ret_errno(EINVAL);
 }
 
 int config_ip_prefix(struct in_addr *addr)
@@ -704,12 +705,11 @@
 	size_t retlen;
 
 	if (!valuep || !value)
-		return -1;
+		return ret_errno(EINVAL);
 
 	retlen = strlcpy(valuep, value, size);
 	if (retlen >= size)
-		ERROR("Network device name \"%s\" is too long (>= %zu)", value,
-		      size);
+		ERROR("Network device name \"%s\" is too long (>= %zu)", value, size);
 
 	return 0;
 }
@@ -719,18 +719,18 @@
 	unsigned index;
 	char tmp7;
 
-	if (strncmp(line, "lxc.net", 7) != 0)
+	if (!strnequal(line, "lxc.net", 7))
 		return false;
 
-	if (strncmp(line, "lxc.net.hwaddr", 14) == 0)
+	if (strnequal(line, "lxc.net.hwaddr", 14))
 		return true;
 
-	if (strncmp(line, "lxc.network.hwaddr", 18) == 0)
+	if (strnequal(line, "lxc.network.hwaddr", 18))
 		return true;
 
 	if (sscanf(line, "lxc.net.%u.%6s", &index, tmp) == 2 ||
 	    sscanf(line, "lxc.network.%u.%6s", &index, tmp) == 2)
-		return strncmp(tmp, "hwaddr", 6) == 0;
+		return strnequal(tmp, "hwaddr", 6);
 
 	return false;
 }
@@ -775,19 +775,17 @@
 
 	seed = randseed(false);
 
-	ret = snprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x", rand_r(&seed) % 255,
+	ret = strnprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x", rand_r(&seed) % 255,
 		       rand_r(&seed) % 255, rand_r(&seed) % 255);
 #else
 
 	(void)randseed(true);
 
-	ret = snprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x", rand() % 255,
+	ret = strnprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x", rand() % 255,
 		       rand() % 255, rand() % 255);
 #endif
-	if (ret < 0 || ret >= 18) {
-		SYSERROR("Failed to call snprintf()");
-		return false;
-	}
+	if (ret < 0)
+		return log_error_errno(false, EIO, "Failed to call strnprintf()");
 
 	return true;
 }
@@ -800,7 +798,7 @@
 		return 0;
 
 	value_len = strlen(value);
-	if (retv && inlen >= value_len + 1)
+	if (retv && (size_t)inlen >= value_len + 1)
 		memcpy(retv, value, value_len + 1);
 
 	return value_len;
@@ -875,37 +873,24 @@
 
 	pid = strtol(lxcname_or_pid, &err, 10);
 	if (*err != '\0' || pid < 1) {
-		struct lxc_container *c;
+		__put_lxc_container struct lxc_container *c = NULL;
 
 		c = lxc_container_new(lxcname_or_pid, lxcpath);
-		if (!c) {
-			ERROR("\"%s\" is not a valid pid nor a container name",
-			      lxcname_or_pid);
-			return -1;
-		}
+		if (!c)
+			return log_error_errno(-EINVAL, EINVAL, "\"%s\" is not a valid pid nor a container name", lxcname_or_pid);
 
-		if (!c->may_control(c)) {
-			ERROR("Insufficient privileges to control container "
-			      "\"%s\"", c->name);
-			lxc_container_put(c);
-			return -1;
-		}
+		if (!c->may_control(c))
+			return log_error_errno(-EPERM, EPERM, "Insufficient privileges to control container \"%s\"", c->name);
 
 		pid = c->init_pid(c);
-		if (pid < 1) {
-			ERROR("Container \"%s\" is not running", c->name);
-			lxc_container_put(c);
-			return -1;
-		}
+		if (pid < 1)
+			return log_error_errno(-EINVAL, EINVAL, "Container \"%s\" is not running", c->name);
 
-		lxc_container_put(c);
 	}
 
 	ret = kill(pid, 0);
-	if (ret < 0) {
-		SYSERROR("Failed to send signal to pid %d", (int)pid);
-		return -1;
-	}
+	if (ret < 0)
+		return log_error_errno(-errno, errno, "Failed to send signal to pid %d", (int)pid);
 
 	return pid;
 }
@@ -913,8 +898,9 @@
 int lxc_inherit_namespace(const char *nsfd_path, const char *lxcpath,
 			  const char *namespace)
 {
+	__do_free char *dup = NULL;
 	int fd, pid;
-	char *dup, *lastslash;
+	char *lastslash;
 
 	if (nsfd_path0 == '/') {
 		return open(nsfd_path, O_RDONLY | O_CLOEXEC);
@@ -924,21 +910,20 @@
 	if (lastslash) {
 		dup = strdup(nsfd_path);
 		if (!dup)
-			return -1;
+			return ret_errno(ENOMEM);
 
 		duplastslash - nsfd_path = '\0';
-		pid = lxc_container_name_to_pid(lastslash + 1, dup);
-		free(dup);
-	} else {
-		pid = lxc_container_name_to_pid(nsfd_path, lxcpath);
+		lxcpath = lastslash + 1;
+		nsfd_path = lastslash + 1;
 	}
 
+	pid = lxc_container_name_to_pid(nsfd_path, lxcpath);
 	if (pid < 0)
-		return -1;
+		return pid;
 
 	fd = lxc_preserve_ns(pid, namespace);
 	if (fd < 0)
-		return -1;
+		return -errno;
 
 	return fd;
 }
@@ -1029,48 +1014,63 @@
 
 static int sig_num(const char *sig)
 {
+	int ret;
 	unsigned int signum;
 
-	if (lxc_safe_uint(sig, &signum) < 0)
-		return -1;
+	ret = lxc_safe_uint(sig, &signum);
+	if (ret < 0)
+		return ret;
 
 	return signum;
 }
 
 static int rt_sig_num(const char *signame)
 {
-	int rtmax = 0, sig_n = 0;
-
-	if (strncasecmp(signame, "max-", 4) == 0)
-		rtmax = 1;
+	bool rtmax;
+	int sig_n = 0;
+
+	if (is_empty_string(signame))
+		return ret_errno(EINVAL);
+
+	if (strncasecmp(signame, "max-", STRLITERALLEN("max-")) == 0) {
+		rtmax = true;
+		signame += STRLITERALLEN("max-");
+	} else if (strncasecmp(signame, "min+", STRLITERALLEN("min+")) == 0) {
+		rtmax = false;
+		signame += STRLITERALLEN("min+");
+	} else {
+		return ret_errno(EINVAL);
+	}
 
-	signame += 4;
-	if (!isdigit(*signame))
-		return -1;
+	if (is_empty_string(signame) || !isdigit(*signame))
+		return ret_errno(EINVAL);
 
 	sig_n = sig_num(signame);
-	sig_n = rtmax ? SIGRTMAX - sig_n : SIGRTMIN + sig_n;
-	if (sig_n > SIGRTMAX || sig_n < SIGRTMIN)
-		return -1;
+	if (sig_n < 0 || sig_n > SIGRTMAX - SIGRTMIN)
+		return ret_errno(EINVAL);
+
+	if (rtmax)
+		sig_n = SIGRTMAX - sig_n;
+	else
+		sig_n = SIGRTMIN + sig_n;
 
 	return sig_n;
 }
 
 int sig_parse(const char *signame)
 {
-	size_t n;
-
-	if (isdigit(*signame)) {
+	if (isdigit(*signame))
 		return sig_num(signame);
-	} else if (strncasecmp(signame, "sig", 3) == 0) {
-		signame += 3;
-		if (strncasecmp(signame, "rt", 2) == 0)
-			return rt_sig_num(signame + 2);
 
-		for (n = 0; n < sizeof(signames) / sizeof((signames)0); n++)
+	if (strncasecmp(signame, "sig", STRLITERALLEN("sig")) == 0) {
+		signame += STRLITERALLEN("sig");
+		if (strncasecmp(signame, "rt", STRLITERALLEN("rt")) == 0)
+			return rt_sig_num(signame + STRLITERALLEN("rt"));
+
+		for (size_t n = 0; n < ARRAY_SIZE(signames); n++)
 			if (strcasecmp(signamesn.name, signame) == 0)
 				return signamesn.num;
 	}
 
-	return -1;
+	return ret_errno(EINVAL);
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/confile_utils.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/confile_utils.h Changed

@@ -3,74 +3,70 @@
 #ifndef __LXC_CONFILE_UTILS_H
 #define __LXC_CONFILE_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "compiler.h"
 #include "conf.h"
 #include "confile_utils.h"
 
-#define strprint(str, inlen, ...)                                       \
-	do {                                                            \
-		if (str)                                                \
-			len = snprintf(str, inlen, ##__VA_ARGS__);      \
-		else                                                    \
-			len = snprintf((char *){""}, 0, ##__VA_ARGS__); \
-		if (len < 0) {                                          \
-			SYSERROR("failed to create string");            \
-			return -1;                                      \
-		};                                                      \
-		fulllen += len;                                         \
-		if (inlen > 0) {                                        \
-			if (str)                                        \
-				str += len;                             \
-			inlen -= len;                                   \
-			if (inlen < 0)                                  \
-				inlen = 0;                              \
-		}                                                       \
+#define strprint(str, inlen, ...)                                                     \
+	do {                                                                          \
+		if (str)                                                              \
+			len = snprintf(str, inlen, ##__VA_ARGS__);                    \
+		else                                                                  \
+			len = snprintf((char *){""}, 0, ##__VA_ARGS__);               \
+		if (len < 0)                                                          \
+			return log_error_errno(-EIO, EIO, "failed to create string"); \
+		fulllen += len;                                                       \
+		if (inlen > 0) {                                                      \
+			if (str)                                                      \
+				str += len;                                           \
+			inlen -= len;                                                 \
+			if (inlen < 0)                                                \
+				inlen = 0;                                            \
+		}                                                                     \
 	} while (0);
 
-extern int parse_idmaps(const char *idmap, char *type, unsigned long *nsid,
-			unsigned long *hostid, unsigned long *range);
+__hidden extern int parse_idmaps(const char *idmap, char *type, unsigned long *nsid,
+				 unsigned long *hostid, unsigned long *range);
 
-extern bool lxc_config_value_empty(const char *value);
-extern struct lxc_netdev *lxc_network_add(struct lxc_list *networks, int idx,
-					  bool tail);
-extern struct lxc_netdev *
-lxc_get_netdev_by_idx(struct lxc_conf *conf, unsigned int idx, bool allocate);
-extern void lxc_log_configured_netdevs(const struct lxc_conf *conf);
-extern bool lxc_remove_nic_by_idx(struct lxc_conf *conf, unsigned int idx);
-extern void lxc_free_networks(struct lxc_list *networks);
-extern int lxc_veth_mode_to_flag(int *mode, const char *value);
-extern char *lxc_veth_flag_to_mode(int mode);
-extern int lxc_macvlan_mode_to_flag(int *mode, const char *value);
-extern char *lxc_macvlan_flag_to_mode(int mode);
-extern int lxc_ipvlan_mode_to_flag(int *mode, const char *value);
-extern char *lxc_ipvlan_flag_to_mode(int mode);
-extern int lxc_ipvlan_isolation_to_flag(int *mode, const char *value);
-extern char *lxc_ipvlan_flag_to_isolation(int mode);
+__hidden extern bool lxc_config_value_empty(const char *value);
+__hidden extern struct lxc_netdev *lxc_get_netdev_by_idx(struct lxc_conf *conf, unsigned int idx,
+							 bool allocate);
+__hidden extern void lxc_log_configured_netdevs(const struct lxc_conf *conf);
+__hidden extern bool lxc_remove_nic_by_idx(struct lxc_conf *conf, unsigned int idx);
+__hidden extern void lxc_free_networks(struct lxc_conf *conf);
+__hidden extern void lxc_clear_netdev(struct lxc_netdev *netdev);
+__hidden extern int lxc_veth_mode_to_flag(int *mode, const char *value);
+__hidden extern char *lxc_veth_flag_to_mode(int mode);
+__hidden extern int lxc_macvlan_mode_to_flag(int *mode, const char *value);
+__hidden extern char *lxc_macvlan_flag_to_mode(int mode);
+__hidden extern int lxc_ipvlan_mode_to_flag(int *mode, const char *value);
+__hidden extern char *lxc_ipvlan_flag_to_mode(int mode);
+__hidden extern int lxc_ipvlan_isolation_to_flag(int *mode, const char *value);
+__hidden extern char *lxc_ipvlan_flag_to_isolation(int mode);
 
-extern int set_config_string_item(char **conf_item, const char *value);
-extern int set_config_string_item_max(char **conf_item, const char *value,
-				      size_t max)
-__access_r(2, 3);
+__hidden extern int set_config_string_item(char **conf_item, const char *value);
+__hidden extern int set_config_string_item_max(char **conf_item, const char *value, size_t max)
+    __access_r(2, 3);
 
-extern int set_config_path_item(char **conf_item, const char *value);
-extern int set_config_bool_item(bool *conf_item, const char *value,
-                                bool empty_conf_action);
-extern int config_ip_prefix(struct in_addr *addr);
-extern int network_ifname(char *valuep, const char *value, size_t size)
-__access_r(2, 3);
+__hidden extern int set_config_path_item(char **conf_item, const char *value);
+__hidden extern int set_config_bool_item(bool *conf_item, const char *value, bool empty_conf_action);
+__hidden extern int config_ip_prefix(struct in_addr *addr);
+__hidden extern int network_ifname(char *valuep, const char *value, size_t size) __access_r(2, 3);
 
-extern void rand_complete_hwaddr(char *hwaddr);
-extern bool lxc_config_net_is_hwaddr(const char *line);
-extern bool new_hwaddr(char *hwaddr);
-extern int lxc_get_conf_str(char *retv, int inlen, const char *value);
-extern int lxc_get_conf_bool(struct lxc_conf *c, char *retv, int inlen, bool v);
-extern int lxc_get_conf_int(struct lxc_conf *c, char *retv, int inlen, int v);
-extern int lxc_get_conf_size_t(struct lxc_conf *c, char *retv, int inlen, size_t v);
-extern int lxc_get_conf_uint64(struct lxc_conf *c, char *retv, int inlen, uint64_t v);
-extern int lxc_inherit_namespace(const char *lxcname_or_pid,
-				 const char *lxcpath, const char *namespace);
-extern int sig_parse(const char *signame);
+__hidden extern void rand_complete_hwaddr(char *hwaddr);
+__hidden extern bool lxc_config_net_is_hwaddr(const char *line);
+__hidden extern bool new_hwaddr(char *hwaddr);
+__hidden extern int lxc_get_conf_str(char *retv, int inlen, const char *value);
+__hidden extern int lxc_get_conf_bool(struct lxc_conf *c, char *retv, int inlen, bool v);
+__hidden extern int lxc_get_conf_int(struct lxc_conf *c, char *retv, int inlen, int v);
+__hidden extern int lxc_get_conf_size_t(struct lxc_conf *c, char *retv, int inlen, size_t v);
+__hidden extern int lxc_get_conf_uint64(struct lxc_conf *c, char *retv, int inlen, uint64_t v);
+__hidden extern int lxc_inherit_namespace(const char *lxcname_or_pid, const char *lxcpath,
+					  const char *namespace);
+__hidden extern int sig_parse(const char *signame);
 
 #endif /* __LXC_CONFILE_UTILS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/criu.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/criu.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <inttypes.h>
 #include <linux/limits.h>
 #include <sched.h>
@@ -14,27 +13,29 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "attach_options.h"
+
 #include "cgroup.h"
 #include "commands.h"
 #include "conf.h"
-#include "config.h"
 #include "criu.h"
 #include "log.h"
 #include "lxc.h"
 #include "lxclock.h"
+#include "memory_utils.h"
 #include "network.h"
 #include "storage.h"
 #include "syscall_wrappers.h"
 #include "utils.h"
 
 #if IS_BIONIC
-#include <../include/lxcmntent.h>
+#include "lxcmntent.h"
 #else
 #include <mntent.h>
 #endif
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
 #define CRIU_VERSION		"2.0"
@@ -44,6 +45,7 @@
 
 #define CRIU_IN_FLIGHT_SUPPORT	"2.4"
 #define CRIU_EXTERNAL_NOT_VETH	"2.8"
+#define CRIU_EXTERNAL_NETDEV	"3.15"
 
 lxc_log_define(criu, lxc);
 
@@ -67,7 +69,7 @@
 	struct lxc_handler *handler;
 	int console_fd;
 	/* The path that is bind mounted from /dev/console, if any. We don't
-	 * want to use `--ext-mount-map auto`'s result here because the pts
+	 * want to use `--ext-mount-map auto`'s result here because the pty
 	 * device may have a different path (e.g. if the pty number is
 	 * different) on the target host. NULL if lxc.console.path = "none".
 	 */
@@ -79,36 +81,26 @@
 
 static int load_tty_major_minor(char *directory, char *output, int len)
 {
-	FILE *f;
 	char pathPATH_MAX;
-	int ret;
+	ssize_t ret;
 
-	ret = snprintf(path, sizeof(path), "%s/tty.info", directory);
-	if (ret < 0 || ret >= sizeof(path)) {
-		ERROR("snprintf'd too many characters: %d", ret);
-		return -1;
-	}
+	ret = strnprintf(path, sizeof(path), "%s/tty.info", directory);
+	if (ret < 0)
+		return ret_errno(EIO);
 
-	f = fopen(path, "re");
-	if (!f) {
-		/* This means we're coming from a liblxc which didn't export
+	ret = lxc_read_from_file(path, output, len);
+	if (ret < 0) {
+		/*
+		 * This means we're coming from a liblxc which didn't export
 		 * the tty info. In this case they had to have lxc.console.path
 		 * = * none, so there's no problem restoring.
 		 */
 		if (errno == ENOENT)
 			return 0;
 
-		SYSERROR("couldn't open %s", path);
-		return -1;
-	}
-
-	if (!fgets(output, len, f)) {
-		fclose(f);
-		SYSERROR("couldn't read %s", path);
-		return -1;
+		return log_error_errno(-errno, errno, "Failed to open \"%s\"", path);
 	}
 
-	fclose(f);
 	return 0;
 }
 
@@ -153,18 +145,35 @@
 	return -1;
 }
 
-static void exec_criu(struct cgroup_ops *cgroup_ops, struct lxc_conf *conf,
-		      struct criu_opts *opts)
+struct criu_exec_args {
+	int argc;
+	char *argv;
+};
+
+static void put_criu_exec_args(struct criu_exec_args *args)
+{
+	if (args) {
+		for (int i = 0; i < args->argc; i++)
+			free_disarm(args->argvi);
+		free_disarm(args);
+	}
+}
+
+define_cleanup_function(struct criu_exec_args *, put_criu_exec_args);
+
+static int exec_criu(struct cgroup_ops *cgroup_ops, struct lxc_conf *conf,
+		     struct criu_opts *opts)
 {
-	char **argv, logPATH_MAX;
-	int static_args = 23, argc = 0, i, ret;
+	call_cleaner(put_criu_exec_args) struct criu_exec_args *args = NULL;
+	__do_fclose FILE *f_mnt = NULL;
+	char logPATH_MAX;
+	int static_args = 23, ret;
 	int netnr = 0;
-	struct lxc_list *it;
-	FILE *mnts;
 	struct mntent mntent;
+	struct lxc_netdev *netdev;
+	struct string_entry *strentry;
 
 	char buf4096, ttys32;
-	size_t pos;
 
 	/* If we are currently in a cgroup /foo/bar, and the container is in a
 	 * cgroup /lxc/foo, lxcfs will give us an ENOENT if some task in the
@@ -173,10 +182,8 @@
 	 * /actual/ root cgroup so that lxcfs thinks criu has enough rights to
 	 * see all cgroups.
 	 */
-	if (!cgroup_ops->escape(cgroup_ops, conf)) {
-		ERROR("failed to escape cgroups");
-		return;
-	}
+	if (!cgroup_ops->criu_escape(cgroup_ops, conf))
+		return log_error_errno(-ENOENT, ENOENT, "Failed to escape to root cgroup");
 
 	/* The command line always looks like:
 	 * criu $(action) --tcp-established --file-locks --link-remap \
@@ -186,7 +193,7 @@
 	 * --enable-fs hugetlbfs --enable-fs tracefs --ext-mount-map console:/dev/pts/n
 	 * +1 for final NULL */
 
-	if (strcmp(opts->action, "dump") == 0 || strcmp(opts->action, "pre-dump") == 0) {
+	if (strequal(opts->action, "dump") || strequal(opts->action, "pre-dump")) {
 		/* -t pid --freeze-cgroup /lxc/ct */
 		static_args += 4;
 
@@ -199,7 +206,7 @@
 			static_args += 5;
 
 		/* --leave-running (only for final dump) */
-		if (strcmp(opts->action, "dump") == 0 && !opts->user->stop)
+		if (strequal(opts->action, "dump") && !opts->user->stop)
 			static_args++;
 
 		/* --external tty88,4 */
@@ -213,7 +220,7 @@
 		/* --ghost-limit 1024 */
 		if (opts->user->ghost_limit)
 			static_args += 2;
-	} else if (strcmp(opts->action, "restore") == 0) {
+	} else if (strequal(opts->action, "restore")) {
 		/* --root $(lxc_mount_point) --restore-detached
 		 * --restore-sibling
 		 * --lsm-profile apparmor:whatever
@@ -222,17 +229,19 @@
 
 		ttys0 = 0;
 		if (load_tty_major_minor(opts->user->directory, ttys, sizeof(ttys)))
-			return;
+			return log_error_errno(-EINVAL, EINVAL, "Failed to load tty information");
 
 		/* --inherit-fd fd%d:tty%s */
 		if (ttys0)
 			static_args += 2;
+
+		static_args += list_len(netdev, &opts->c->lxc_conf->netdevs, head) * 2;
 	} else {
-		return;
+		return log_error_errno(-EINVAL, EINVAL, "Invalid criu operation specified");
 	}
 
-	if (cgroup_ops->num_hierarchies(cgroup_ops) > 0)
-		static_args += 2 * cgroup_ops->num_hierarchies(cgroup_ops);
+	if (cgroup_ops->criu_num_hierarchies(cgroup_ops) > 0)
+		static_args += 2 * cgroup_ops->criu_num_hierarchies(cgroup_ops);
 
 	if (opts->user->verbose)
 		static_args++;
@@ -240,36 +249,30 @@
 	if (opts->user->action_script)
 		static_args += 2;
 
-	static_args += 2 * lxc_list_len(&opts->c->lxc_conf->mount_list);
-
-	ret = snprintf(log, PATH_MAX, "%s/%s.log", opts->user->directory, opts->action);
-	if (ret < 0 || ret >= PATH_MAX) {
-		ERROR("logfile name too long");
-		return;
-	}
+	static_args += 2 * list_len(strentry, &opts->c->lxc_conf->mount_entries, head);
 
-	argv = malloc(static_args * sizeof(*argv));
-	if (!argv)
-		return;
-
-	memset(argv, 0, static_args * sizeof(*argv));
-
-#define DECLARE_ARG(arg) 					\
-	do {							\
-		if (arg == NULL) {				\
-			ERROR("Got NULL argument for criu");	\
-			goto err;				\
-		}						\
-		argvargc++ = strdup(arg);			\
-		if (!argvargc-1)				\
-			goto err;				\
+	ret = strnprintf(log, sizeof(log), "%s/%s.log", opts->user->directory, opts->action);
+	if (ret < 0)
+		return ret_errno(EIO);
+
+	args = zalloc(sizeof(struct criu_exec_args) + (static_args * sizeof(char **)));
+	if (!args)
+		return log_error_errno(-ENOMEM, ENOMEM, "Failed to allocate static arguments");
+
+#define DECLARE_ARG(arg)                                                                 \
+	do {                                                                             \
+		if (arg == NULL)                                                         \
+			return log_error_errno(-EINVAL, EINVAL,                          \
+					       "Got NULL argument for criu");            \
+		args->argv(args->argc)++ = strdup(arg);                                \
+		if (!args->argvargs->argc - 1)                                         \
+			return log_error_errno(-ENOMEM, ENOMEM,				 \
+					"Failed to duplicate argumen %s", arg);          \
 	} while (0)
 
-	argvargc++ = on_path("criu", NULL);
-	if (!argvargc-1) {
-		ERROR("Couldn't find criu binary");
-		goto err;
-	}
+	args->argv(args->argc)++ = on_path("criu", NULL);
+	if (!args->argvargs->argc - 1)
+		return log_error_errno(-ENOENT, ENOENT, "Failed to find criu binary");
 
 	DECLARE_ARG(opts->action);
 	DECLARE_ARG("--tcp-established");
@@ -289,65 +292,52 @@
 	DECLARE_ARG("-o");
 	DECLARE_ARG(log);
 
-	for (i = 0; i < cgroup_ops->num_hierarchies(cgroup_ops); i++) {
-		char **controllers = NULL, *fullname;
-		char *path, *tmp;
+	for (int i = 0; i < cgroup_ops->criu_num_hierarchies(cgroup_ops); i++) {
+		__do_free char *cgroup_base_path = NULL, *controllers;
+		char **controllers_list = NULL;
+		char *tmp;
 
-		if (!cgroup_ops->get_hierarchies(cgroup_ops, i, &controllers)) {
-			ERROR("failed to get hierarchy %d", i);
-			goto err;
-		}
+		if (!cgroup_ops->criu_get_hierarchies(cgroup_ops, i, &controllers_list))
+			return log_error_errno(-ENOENT, ENOENT, "Failed to retrieve cgroup hierarchies %d", i);
 
-		/* if we are in a dump, we have to ask the monitor process what
+		/*
+		 * If we are in a dump, we have to ask the monitor process what
 		 * the right cgroup is. if this is a restore, we can just use
 		 * the handler the restore task created.
 		 */
-		if (!strcmp(opts->action, "dump") || !strcmp(opts->action, "pre-dump")) {
-			path = lxc_cmd_get_limiting_cgroup_path(opts->c->name, opts->c->config_path, controllers0);
-			if (!path) {
-				ERROR("failed to get cgroup path for %s", controllers0);
-				goto err;
-			}
+		if (strequal(opts->action, "dump") || strequal(opts->action, "pre-dump")) {
+			cgroup_base_path = lxc_cmd_get_limit_cgroup_path(opts->c->name, opts->c->config_path, controllers_list0);
+			if (!cgroup_base_path)
+				return log_error_errno(-ENOENT, ENOENT, "Failed to retrieve limit cgroup path for %s", controllers_list0 ?: "(null)");
 		} else {
 			const char *p;
 
-			p = cgroup_ops->get_limiting_cgroup(cgroup_ops, controllers0);
-			if (!p) {
-				ERROR("failed to get cgroup path for %s", controllers0);
-				goto err;
-			}
+			p = cgroup_ops->get_limit_cgroup(cgroup_ops, controllers_list0);
+			if (!p)
+				return log_error_errno(-ENOENT, ENOENT, "Failed to retrieve limit cgroup path for %s", controllers_list0 ?: "(null)");
 
-			path = strdup(p);
-			if (!path) {
-				ERROR("strdup failed");
-				goto err;
-			}
+			cgroup_base_path = strdup(p);
+			if (!cgroup_base_path)
+				return log_error_errno(-ENOMEM, ENOMEM, "Failed to duplicate limit cgroup path");
 		}
 
-		tmp = lxc_deslashify(path);
-		if (!tmp) {
-			ERROR("Failed to remove extraneous slashes from \"%s\"",
-			      path);
-			free(path);
-			goto err;
-		}
-		free(path);
-		path = tmp;
-
-		fullname = lxc_string_join(",", (const char **) controllers, false);
-		if (!fullname) {
-			ERROR("failed to join controllers");
-			free(path);
-			goto err;
-		}
+		tmp = path_simplify(cgroup_base_path);
+		if (!tmp)
+			return log_error_errno(-ENOMEM, ENOMEM, "Failed to remove extraneous slashes from \"%s\"", cgroup_base_path);
+		free_move_ptr(cgroup_base_path, tmp);
 
-		ret = sprintf(buf, "%s:%s", fullname, path);
-		free(path);
-		free(fullname);
-		if (ret < 0 || ret >= sizeof(buf)) {
-			ERROR("sprintf of cgroup root arg failed");
-			goto err;
+		if (controllers_list0) {
+			controllers = lxc_string_join(",", (const char **)controllers_list, false);
+			if (!controllers)
+				return log_error_errno(-ENOMEM, ENOMEM, "Failed to join controllers");
+
+			ret = sprintf(buf, "%s:%s", controllers, cgroup_base_path);
+		} else {
+			WARN("No cgroup controllers configured in container's cgroup %s", cgroup_base_path);
+			ret = sprintf(buf, "%s", cgroup_base_path);
 		}
+		if (ret < 0 || (size_t)ret >= sizeof(buf))
+			return log_error_errno(-EIO, EIO, "sprintf of cgroup root arg failed");
 
 		DECLARE_ARG("--cgroup-root");
 		DECLARE_ARG(buf);
@@ -361,65 +351,65 @@
 		DECLARE_ARG(opts->user->action_script);
 	}
 
-	mnts = make_anonymous_mount_file(&opts->c->lxc_conf->mount_list,
+	f_mnt = make_anonymous_mount_file(&opts->c->lxc_conf->mount_entries,
 	                                 opts->c->lxc_conf->lsm_aa_allow_nesting);
-	if (!mnts)
-		goto err;
+	if (!f_mnt)
+		return log_error_errno(-ENOENT, ENOENT, "Failed to create anonymous mount file");
 
-	while (getmntent_r(mnts, &mntent, buf, sizeof(buf))) {
+	while (getmntent_r(f_mnt, &mntent, buf, sizeof(buf))) {
+		__do_free char *mnt_options = NULL;
 		unsigned long flags = 0;
-		char *mntdata = NULL;
 		char arg2 * PATH_MAX + 2;
 
-		if (parse_mntopts(mntent.mnt_opts, &flags, &mntdata) < 0)
-			goto err;
-
-		free(mntdata);
+		if (parse_mntopts_legacy(mntent.mnt_opts, &flags, &mnt_options) < 0)
+			return log_error_errno(-EINVAL, EINVAL, "Failed to parse mount options");
 
 		/* only add --ext-mount-map for actual bind mounts */
 		if (!(flags & MS_BIND))
 			continue;
 
-		if (strcmp(opts->action, "dump") == 0)
-			ret = snprintf(arg, sizeof(arg), "/%s:%s",
-				       mntent.mnt_dir, mntent.mnt_dir);
+		if (strequal(opts->action, "dump"))
+			ret = strnprintf(arg, sizeof(arg), "/%s:%s", mntent.mnt_dir, mntent.mnt_dir);
 		else
-			ret = snprintf(arg, sizeof(arg), "%s:%s",
-				       mntent.mnt_dir, mntent.mnt_fsname);
-		if (ret < 0 || ret >= sizeof(arg)) {
-			fclose(mnts);
-			ERROR("snprintf failed");
-			goto err;
-		}
+			ret = strnprintf(arg, sizeof(arg), "%s:%s", mntent.mnt_dir, mntent.mnt_fsname);
+		if (ret < 0)
+			return log_error_errno(-EIO, EIO, "Failed to create mount entry");
 
 		DECLARE_ARG("--ext-mount-map");
 		DECLARE_ARG(arg);
 	}
-	fclose(mnts);
 
-	if (strcmp(opts->action, "dump") == 0 || strcmp(opts->action, "pre-dump") == 0) {
-		char pid32, *freezer_relative;
+	if (strequal(opts->action, "dump") || strequal(opts->action, "pre-dump")) {
+		pid_t init_pid;
+		char init_pid_strINTTYPE_TO_STRLEN(int);
+		char *freezer_relative;
 
-		if (sprintf(pid, "%d", opts->c->init_pid(opts->c)) < 0)
-			goto err;
+		init_pid = opts->c->init_pid(opts->c);
+		if (init_pid < 0)
+			return log_error_errno(-ESRCH, ESRCH, "Failed to retrieve init pid of container");
+
+		ret = strnprintf(init_pid_str, sizeof(init_pid_str), "%d", init_pid);
+		if (ret < 0)
+			return log_error_errno(-EIO, EIO, "Failed to create entry for init pid of container");
 
 		DECLARE_ARG("-t");
-		DECLARE_ARG(pid);
-
-		freezer_relative = lxc_cmd_get_limiting_cgroup_path(opts->c->name,
-								    opts->c->config_path,
-								    "freezer");
-		if (!freezer_relative) {
-			ERROR("failed getting freezer path");
-			goto err;
-		}
+		DECLARE_ARG(init_pid_str);
 
-		ret = snprintf(log, sizeof(log), "/sys/fs/cgroup/freezer/%s", freezer_relative);
-		if (ret < 0 || ret >= sizeof(log))
-			goto err;
+		freezer_relative = lxc_cmd_get_limit_cgroup_path(opts->c->name,
+								 opts->c->config_path,
+								 "freezer");
+		if (!freezer_relative)
+			return log_error_errno(-ENOENT, ENOENT, "Failed getting freezer path");
+
+		if (pure_unified_layout(cgroup_ops))
+			ret = strnprintf(log, sizeof(log), "/sys/fs/cgroup/%s", freezer_relative);
+		else
+			ret = strnprintf(log, sizeof(log), "/sys/fs/cgroup/freezer/%s", freezer_relative);
+		if (ret < 0)
+			return log_error_errno(-EIO, EIO, "Failed to freezer cgroup entry");
 
 		if (!opts->user->disable_skip_in_flight &&
-				strcmp(opts->criu_version, CRIU_IN_FLIGHT_SUPPORT) >= 0)
+		    strcmp(opts->criu_version, CRIU_IN_FLIGHT_SUPPORT) >= 0)
 			DECLARE_ARG("--skip-in-flight");
 
 		DECLARE_ARG("--freeze-cgroup");
@@ -454,21 +444,17 @@
 			char ghost_limit32;
 
 			ret = sprintf(ghost_limit, "%"PRIu64, opts->user->ghost_limit);
-			if (ret < 0 || ret >= sizeof(ghost_limit)) {
-				ERROR("failed to print ghost limit %"PRIu64, opts->user->ghost_limit);
-				goto err;
-			}
+			if (ret < 0 || (size_t)ret >= sizeof(ghost_limit))
+				return log_error_errno(-EIO, EIO, "Failed to print ghost limit %"PRIu64, opts->user->ghost_limit);
 
 			DECLARE_ARG("--ghost-limit");
 			DECLARE_ARG(ghost_limit);
 		}
 
 		/* only for final dump */
-		if (strcmp(opts->action, "dump") == 0 && !opts->user->stop)
+		if (strequal(opts->action, "dump") && !opts->user->stop)
 			DECLARE_ARG("--leave-running");
-	} else if (strcmp(opts->action, "restore") == 0) {
-		void *m;
-		int additional;
+	} else if (strequal(opts->action, "restore")) {
 		struct lxc_conf *lxc_conf = opts->c->lxc_conf;
 
 		DECLARE_ARG("--root");
@@ -477,22 +463,20 @@
 		DECLARE_ARG("--restore-sibling");
 
 		if (ttys0) {
-			if (opts->console_fd < 0) {
-				ERROR("lxc.console.path configured on source host but not target");
-				goto err;
-			}
+			if (opts->console_fd < 0)
+				return log_error_errno(-EINVAL, EINVAL, "lxc.console.path configured on source host but not target");
 
-			ret = snprintf(buf, sizeof(buf), "fd%d:%s", opts->console_fd, ttys);
-			if (ret < 0 || ret >= sizeof(buf))
-				goto err;
+			ret = strnprintf(buf, sizeof(buf), "fd%d:%s", opts->console_fd, ttys);
+			if (ret < 0)
+				return log_error_errno(-EIO, EIO, "Failed to create console entry");
 
 			DECLARE_ARG("--inherit-fd");
 			DECLARE_ARG(buf);
 		}
 		if (opts->console_name) {
-			if (snprintf(buf, sizeof(buf), "console:%s", opts->console_name) < 0) {
-				SYSERROR("sprintf'd too many bytes");
-			}
+			if (strnprintf(buf, sizeof(buf), "console:%s", opts->console_name) < 0)
+				return log_error_errno(-EIO, EIO, "Failed to create console entry");
+
 			DECLARE_ARG("--ext-mount-map");
 			DECLARE_ARG(buf);
 		}
@@ -500,28 +484,19 @@
 		if (lxc_conf->lsm_aa_profile || lxc_conf->lsm_se_context) {
 
 			if (lxc_conf->lsm_aa_profile)
-				ret = snprintf(buf, sizeof(buf), "apparmor:%s", lxc_conf->lsm_aa_profile);
+				ret = strnprintf(buf, sizeof(buf), "apparmor:%s", lxc_conf->lsm_aa_profile);
 			else
-				ret = snprintf(buf, sizeof(buf), "selinux:%s", lxc_conf->lsm_se_context);
-
-			if (ret < 0 || ret >= sizeof(buf))
-				goto err;
+				ret = strnprintf(buf, sizeof(buf), "selinux:%s", lxc_conf->lsm_se_context);
+			if (ret < 0)
+				return log_error_errno(-EIO, EIO, "Failed to create lsm entry");
 
 			DECLARE_ARG("--lsm-profile");
 			DECLARE_ARG(buf);
 		}
 
-		additional = lxc_list_len(&opts->c->lxc_conf->network) * 2;
-
-		m = realloc(argv, (argc + additional + 1) * sizeof(*argv));
-		if (!m)
-			goto err;
-		argv = m;
-
-		lxc_list_for_each(it, &opts->c->lxc_conf->network) {
+		list_for_each_entry(netdev, &opts->c->lxc_conf->netdevs, head) {
 			size_t retlen;
 			char eth128, *veth;
-			struct lxc_netdev *n = it->elem;
 			bool external_not_veth;
 
 			if (cmp_version(opts->criu_version, CRIU_EXTERNAL_NOT_VETH) >= 0) {
@@ -534,62 +509,69 @@
 				external_not_veth = false;
 			}
 
-			if (n->name0 != '\0') {
-				retlen = strlcpy(eth, n->name, sizeof(eth));
+			if (netdev->name0 != '\0') {
+				retlen = strlcpy(eth, netdev->name, sizeof(eth));
 				if (retlen >= sizeof(eth))
-					goto err;
+					return log_error_errno(-E2BIG, E2BIG, "Failed to append veth device name");
 			} else {
-				ret = snprintf(eth, sizeof(eth), "eth%d", netnr);
-				if (ret < 0 || ret >= sizeof(eth))
-					goto err;
+				ret = strnprintf(eth, sizeof(eth), "eth%d", netnr);
+				if (ret < 0)
+					return log_error_errno(-E2BIG, E2BIG, "Failed to append veth device name");
 			}
 
-			switch (n->type) {
+			switch (netdev->type) {
 			case LXC_NET_VETH:
-				veth = n->priv.veth_attr.pair;
+				veth = netdev->priv.veth_attr.pair;
 				if (veth0 == '\0')
-					veth = n->priv.veth_attr.veth1;
+					veth = netdev->priv.veth_attr.veth1;
 
-				if (n->link0 != '\0') {
+				if (netdev->link0 != '\0') {
 					if (external_not_veth)
-						ret = snprintf(buf, sizeof(buf),
-							       "veth%s:%s@%s",
-							       eth, veth,
-							       n->link);
+						ret = strnprintf(buf, sizeof(buf), "veth%s:%s@%s", eth, veth, netdev->link);
 					else
-						ret = snprintf(buf, sizeof(buf),
-							       "%s=%s@%s", eth,
-							       veth, n->link);
+						ret = strnprintf(buf, sizeof(buf), "%s=%s@%s", eth, veth, netdev->link);
 				} else {
 					if (external_not_veth)
-						ret = snprintf(buf, sizeof(buf),
-							       "veth%s:%s",
-							       eth, veth);
+						ret = strnprintf(buf, sizeof(buf), "veth%s:%s", eth, veth);
 					else
-						ret = snprintf(buf, sizeof(buf),
-							       "%s=%s", eth,
-							       veth);
+						ret = strnprintf(buf, sizeof(buf), "%s=%s", eth, veth);
 				}
-				if (ret < 0 || ret >= sizeof(buf))
-					goto err;
+				if (ret < 0)
+					return log_error_errno(-EIO, EIO, "Failed to append veth device name");
+
+				TRACE("Added veth device entry %s", buf);
 				break;
 			case LXC_NET_MACVLAN:
-				if (n->link0 == '\0') {
-					ERROR("no host interface for macvlan %s", n->name);
-					goto err;
-				}
+				if (netdev->link0 == '\0')
+					return log_error_errno(-EINVAL, EINVAL, "Failed to find host interface for macvlan %s", netdev->name);
+
+				ret = strnprintf(buf, sizeof(buf), "macvlan%s:%s", eth, netdev->link);
+				if (ret < 0)
+					return log_error_errno(-EIO, EIO, "Failed to add macvlan entry");
+
+				TRACE("Added macvlan device entry %s", buf);
 
-				ret = snprintf(buf, sizeof(buf), "macvlan%s:%s", eth, n->link);
-				if (ret < 0 || ret >= sizeof(buf))
-					goto err;
+				break;
+			case LXC_NET_PHYS:
+				if (cmp_version(opts->criu_version, CRIU_EXTERNAL_NETDEV) < 0)
+					return syserror_set(-EOPNOTSUPP, "Restoring physical network devices not supported");
+
+				if (is_empty_string(netdev->link))
+					return syserror_set(-EINVAL, "Specifying link is required");
+
+				ret = strnprintf(buf, sizeof(buf), "netdev%s:%s", eth, netdev->link);
+				if (ret < 0)
+					return syserror_set(-EIO, "Failed to append phys device name");
+
+				TRACE("Added phys device entry %s", buf);
 				break;
 			case LXC_NET_NONE:
+				__fallthrough;
 			case LXC_NET_EMPTY:
 				break;
 			default:
 				/* we have screened for this earlier... */
-				ERROR("unexpected network type %d", n->type);
-				goto err;
+				return log_error_errno(-EINVAL, EINVAL, "Unsupported network type %d", netdev->type);
 			}
 
 			if (external_not_veth)
@@ -602,42 +584,35 @@
 
 	}
 
-	argvargc = NULL;
+	args->argvargs->argc = NULL;
 
-	buf0 = 0;
-	pos = 0;
+	if (lxc_log_trace()) {
+		buf0 = 0;
+		for (int i = 0, pos = 0; i < args->argc && args->argvi; i++) {
+			ret = strnprintf(buf + pos, sizeof(buf) - pos, "%s ", args->argvi);
+			if (ret < 0)
+				return log_error_errno(-EIO, EIO, "Failed to reorder entries");
+			else
+				pos += ret;
+		}
 
-	for (i = 0; argvi; i++) {
-		ret = snprintf(buf + pos, sizeof(buf) - pos, "%s ", argvi);
-		if (ret < 0 || ret >= sizeof(buf) - pos)
-			goto err;
-		else
-			pos += ret;
+		TRACE("Using command line %s", buf);
 	}
 
-	INFO("execing: %s", buf);
-
 	/* before criu inits its log, it sometimes prints things to stdout/err;
 	 * let's be sure we capture that.
 	 */
-	if (dup2(opts->pipefd, STDOUT_FILENO) < 0) {
-		SYSERROR("dup2 stdout failed");
-		goto err;
-	}
+	if (dup2(opts->pipefd, STDOUT_FILENO) < 0)
+		return log_error_errno(-errno, errno, "Failed to duplicate stdout");
 
-	if (dup2(opts->pipefd, STDERR_FILENO) < 0) {
-		SYSERROR("dup2 stderr failed");
-		goto err;
-	}
+	if (dup2(opts->pipefd, STDERR_FILENO) < 0)
+		return log_error_errno(-errno, errno, "Failed to duplicate stderr");
 
 	close(opts->pipefd);
 
 #undef DECLARE_ARG
-	execv(argv0, argv);
-err:
-	for (i = 0; argvi; i++)
-		free(argvi);
-	free(argv);
+	execv(args->argv0, args->argv);
+	return -ENOEXEC;
 }
 
 /*
@@ -849,7 +824,7 @@
  * dump. */
 static bool criu_ok(struct lxc_container *c, char **criu_version)
 {
-	struct lxc_list *it;
+	struct lxc_netdev *netdev;
 
 	if (geteuid()) {
 		ERROR("Must be root to checkpoint");
@@ -860,16 +835,16 @@
 		return false;
 
 	/* We only know how to restore containers with veth networks. */
-	lxc_list_for_each(it, &c->lxc_conf->network) {
-		struct lxc_netdev *n = it->elem;
-		switch(n->type) {
+	list_for_each_entry(netdev, &c->lxc_conf->netdevs, head) {
+		switch(netdev->type) {
 		case LXC_NET_VETH:
 		case LXC_NET_NONE:
 		case LXC_NET_EMPTY:
+		case LXC_NET_PHYS:
 		case LXC_NET_MACVLAN:
 			break;
 		default:
-			ERROR("Found un-dumpable network: %s (%s)", lxc_net_type_to_str(n->type), n->name);
+			ERROR("Found un-dumpable network: %s (%s)", lxc_net_type_to_str(netdev->type), netdev->name);
 			if (criu_version) {
 				free(*criu_version);
 				*criu_version = NULL;
@@ -884,21 +859,20 @@
 static bool restore_net_info(struct lxc_container *c)
 {
 	int ret;
-	struct lxc_list *it;
 	bool has_error = true;
+	struct lxc_netdev *netdev;
 
 	if (container_mem_lock(c))
 		return false;
 
-	lxc_list_for_each(it, &c->lxc_conf->network) {
-		struct lxc_netdev *netdev = it->elem;
+	list_for_each_entry(netdev, &c->lxc_conf->netdevs, head) {
 		char templateIFNAMSIZ;
 
 		if (netdev->type != LXC_NET_VETH)
 			continue;
 
-		ret = snprintf(template, sizeof(template), "vethXXXXXX");
-		if (ret < 0 || ret >= sizeof(template))
+		ret = strnprintf(template, sizeof(template), "vethXXXXXX");
+		if (ret < 0)
 			goto out_unlock;
 
 		if (netdev->priv.veth_attr.pair0 == '\0' &&
@@ -948,14 +922,25 @@
 
 	if (lxc_init(c->name, handler) < 0)
 		goto out;
+	cgroup_ops = handler->cgroup_ops;
+
+	if (!cgroup_ops->monitor_create(cgroup_ops, handler)) {
+		ERROR("Failed to create monitor cgroup");
+		goto out_fini_handler;
+	}
+
+	if (!cgroup_ops->monitor_enter(cgroup_ops, handler)) {
+		ERROR("Failed to enter monitor cgroup");
+		goto out_fini_handler;
+	}
 
-	cgroup_ops = cgroup_init(c->lxc_conf);
-	if (!cgroup_ops)
+	if (!cgroup_ops->monitor_delegate_controllers(cgroup_ops)) {
+		ERROR("Failed to delegate controllers to monitor cgroup");
 		goto out_fini_handler;
-	handler->cgroup_ops = cgroup_ops;
+	}
 
 	if (!cgroup_ops->payload_create(cgroup_ops, handler)) {
-		ERROR("failed creating groups");
+		ERROR("Failed creating cgroups");
 		goto out_fini_handler;
 	}
 
@@ -993,6 +978,10 @@
 		if (unshare(CLONE_NEWNS))
 			goto out_fini_handler;
 
+		ret = lxc_storage_prepare(c->lxc_conf);
+		if (ret)
+			goto out_fini_handler;
+
 		/* CRIU needs the lxc root bind mounted so that it is the root of some
 		 * mount. */
 		rootfs = &c->lxc_conf->rootfs;
@@ -1020,7 +1009,7 @@
 		os.action = "restore";
 		os.user = opts;
 		os.c = c;
-		os.console_fd = c->lxc_conf->console.pts;
+		os.console_fd = c->lxc_conf->console.pty;
 		os.criu_version = criu_version;
 		os.handler = handler;
 
@@ -1044,7 +1033,9 @@
 		os.console_name = c->lxc_conf->console.name;
 
 		/* exec_criu() returning is an error */
-		exec_criu(cgroup_ops, c->lxc_conf, &os);
+		ret = exec_criu(handler->cgroup_ops, c->lxc_conf, &os);
+		if (ret)
+			SYSERROR("Failed to execute criu");
 		umount(rootfs->mount);
 		(void)rmdir(rootfs->mount);
 		goto out_fini_handler;
@@ -1079,9 +1070,9 @@
 				ERROR("criu process exited %d, output:\n%s", WEXITSTATUS(status), buf);
 				goto out_fini_handler;
 			} else {
-				ret = snprintf(buf, sizeof(buf), "/proc/self/task/%lu/children", (unsigned long)syscall(__NR_gettid));
-				if (ret < 0 || ret >= sizeof(buf)) {
-					ERROR("snprintf'd too many characters: %d", ret);
+				ret = strnprintf(buf, sizeof(buf), "/proc/self/task/%lu/children", (unsigned long)syscall(__NR_gettid));
+				if (ret < 0) {
+					ERROR("strnprintf'd too many characters: %d", ret);
 					goto out_fini_handler;
 				}
 
@@ -1124,8 +1115,8 @@
 		 * fail because it's just a beauty thing. We just
 		 * assign the return here to silence potential.
 		 */
-		ret = snprintf(title, sizeof(title), "lxc monitor %s %s", c->config_path, c->name);
-		if (ret < 0 || (size_t)ret >= sizeof(title))
+		ret = strnprintf(title, sizeof(title), "lxc monitor %s %s", c->config_path, c->name);
+		if (ret < 0)
 			INFO("Setting truncated process name");
 
 		ret = setproctitle(title);
@@ -1171,14 +1162,14 @@
 	int ret;
 	struct stat sb;
 
-	if (c->lxc_conf->console.path && !strcmp(c->lxc_conf->console.path, "none")) {
+	if (c->lxc_conf->console.path && strequal(c->lxc_conf->console.path, "none")) {
 		tty_id0 = 0;
 		return 0;
 	}
 
-	ret = snprintf(path, sizeof(path), "/proc/%d/root/dev/console", c->init_pid(c));
-	if (ret < 0 || ret >= sizeof(path)) {
-		ERROR("snprintf'd too many characters: %d", ret);
+	ret = strnprintf(path, sizeof(path), "/proc/%d/root/dev/console", c->init_pid(c));
+	if (ret < 0) {
+		ERROR("strnprintf'd too many characters: %d", ret);
 		return -1;
 	}
 
@@ -1188,17 +1179,17 @@
 		return -1;
 	}
 
-	ret = snprintf(path, sizeof(path), "%s/tty.info", directory);
-	if (ret < 0 || ret >= sizeof(path)) {
-		ERROR("snprintf'd too many characters: %d", ret);
+	ret = strnprintf(path, sizeof(path), "%s/tty.info", directory);
+	if (ret < 0) {
+		ERROR("strnprintf'd too many characters: %d", ret);
 		return -1;
 	}
 
-	ret = snprintf(tty_id, len, "tty%llx:%llx",
+	ret = strnprintf(tty_id, len, "tty%llx:%llx",
 					(long long unsigned) sb.st_rdev,
 					(long long unsigned) sb.st_dev);
-	if (ret < 0 || ret >= sizeof(path)) {
-		ERROR("snprintf'd too many characters: %d", ret);
+	if (ret < 0) {
+		ERROR("strnprintf'd too many characters: %d", ret);
 		return -1;
 	}
 
@@ -1269,7 +1260,9 @@
 		}
 
 		/* exec_criu() returning is an error */
-		exec_criu(cgroup_ops, c->lxc_conf, &os);
+		ret = exec_criu(cgroup_ops, c->lxc_conf, &os);
+		if (ret)
+			SYSERROR("Failed to execute criu");
 		free(criu_version);
 		_exit(EXIT_FAILURE);
 	} else {
@@ -1338,8 +1331,8 @@
 	char pathPATH_MAX;
 	int ret;
 
-	ret = snprintf(path, sizeof(path), "%s/inventory.img", opts->directory);
-	if (ret < 0 || ret >= sizeof(path))
+	ret = strnprintf(path, sizeof(path), "%s/inventory.img", opts->directory);
+	if (ret < 0)
 		return false;
 
 	if (access(path, F_OK) == 0) {

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/criu.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/criu.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/error.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/error.c Changed

@@ -1,11 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 
 #include "error.h"
 #include "log.h"
+#include "process_utils.h"
 
 lxc_log_define(error, lxc);
 
@@ -18,7 +21,7 @@
  *   128+n       signal n received by the application
  *   255         lxc error
  */
-extern int  lxc_error_set_and_log(int pid, int status)
+int lxc_error_set_and_log(int pid, int status)
 {
 	int ret = 0;
 
@@ -26,12 +29,12 @@
 		ret = WEXITSTATUS(status);
 		if (ret)
 			INFO("Child <%d> ended on error (%d)", pid, ret);
-	}
-
-	if (WIFSIGNALED(status)) {
-		int signal = WTERMSIG(status);
-		INFO("Child <%d> ended on signal (%d)", pid, signal);
-		ret = 128 + signal;
+	} else if (WIFSIGNALED(status)) {
+		int signal_nr = WTERMSIG(status);
+		INFO("Child <%d> ended on signal %s(%d)", pid, signal_name(signal_nr), signal_nr);
+		ret = 128 + signal_nr;
+	} else {
+		ERROR("Invalid exit status (%d)", status);
 	}
 
 	return ret;

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/error.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/error.h Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/error_utils.h Added

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/execute.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/execute.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/file_utils.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/file_utils.c Changed

@@ -1,28 +1,28 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/magic.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <sys/sendfile.h>
+#include <sys/stat.h>
 #include <sys/types.h>
+#include <time.h>
 
-#include "config.h"
 #include "file_utils.h"
-#include "log.h"
 #include "macro.h"
 #include "memory_utils.h"
+#include "open_utils.h"
 #include "string_utils.h"
+#include "syscall_wrappers.h"
 #include "utils.h"
 
 int lxc_open_dirfd(const char *dir)
 {
-	return open(dir, O_DIRECTORY | O_RDONLY | O_CLOEXEC | O_NOFOLLOW);
+	return open_at(-EBADF, dir, PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE & ~RESOLVE_NO_XDEV, 0);
 }
 
 int lxc_readat(int dirfd, const char *filename, void *buf, size_t count)
@@ -30,15 +30,15 @@
 	__do_close int fd = -EBADF;
 	ssize_t ret;
 
-	fd = openat(dirfd, filename, O_RDONLY | O_CLOEXEC);
+	fd = open_at(dirfd, filename, PROTECT_OPEN, PROTECT_LOOKUP_BENEATH, 0);
 	if (fd < 0)
-		return -1;
+		return -errno;
 
 	ret = lxc_read_nointr(fd, buf, count);
-	if (ret < 0 || (size_t)ret != count)
-		return -1;
+	if (ret < 0)
+		return -errno;
 
-	return 0;
+	return ret;
 }
 
 int lxc_writeat(int dirfd, const char *filename, const void *buf, size_t count)
@@ -46,8 +46,7 @@
 	__do_close int fd = -EBADF;
 	ssize_t ret;
 
-	fd = openat(dirfd, filename,
-		    O_WRONLY | O_CLOEXEC | O_NOCTTY | O_NOFOLLOW);
+	fd = open_at(dirfd, filename, PROTECT_OPEN_W_WITH_TRAILING_SYMLINKS, PROTECT_LOOKUP_BENEATH, 0);
 	if (fd < 0)
 		return -1;
 
@@ -63,9 +62,9 @@
 {
 	__do_close int dirfd = -EBADF;
 
-	dirfd = open(dir, O_DIRECTORY | O_RDONLY | O_CLOEXEC | O_NOCTTY | O_NOFOLLOW);
+	dirfd = open(dir, PROTECT_OPEN);
 	if (dirfd < 0)
-		return -1;
+		return -errno;
 
 	return lxc_writeat(dirfd, filename, buf, count);
 }
@@ -122,6 +121,32 @@
 	return ret;
 }
 
+ssize_t lxc_read_try_buf_at(int dfd, const char *path, void *buf, size_t count)
+{
+	__do_close int fd = -EBADF;
+	ssize_t ret;
+
+	fd = open_at(dfd, path, PROTECT_OPEN, PROTECT_LOOKUP_BENEATH, 0);
+	if (fd < 0)
+		return -errno;
+
+	if (!buf || !count) {
+		char buf2100;
+		size_t count2 = 0;
+
+		while ((ret = lxc_read_nointr(fd, buf2, 100)) > 0)
+			count2 += ret;
+
+		if (ret >= 0)
+			ret = count2;
+	} else {
+		memset(buf, 0, count);
+		ret = lxc_read_nointr(fd, buf, count);
+	}
+
+	return ret;
+}
+
 ssize_t lxc_write_nointr(int fd, const void *buf, size_t count)
 {
 	ssize_t ret;
@@ -233,14 +258,19 @@
 int print_to_file(const char *file, const char *content)
 {
 	__do_fclose FILE *f = NULL;
-	int ret = 0;
+	int ret;
+	size_t len;
 
 	f = fopen(file, "we");
 	if (!f)
 		return -1;
 
-	if (fprintf(f, "%s", content) != strlen(content))
+	len = strlen(content);
+	ret = fprintf(f, "%s", content);
+	if (ret < 0 || (size_t)ret != len)
 		ret = -1;
+	else
+		ret = 0;
 
 	return ret;
 }
@@ -337,22 +367,22 @@
 	int open_mode = 0, step = 0;
 	FILE *f;
 
-	if (!strncmp(mode, "r+", 2)) {
+	if (strnequal(mode, "r+", 2)) {
 		open_mode = O_RDWR;
 		step = 2;
-	} else if (!strncmp(mode, "r", 1)) {
+	} else if (strnequal(mode, "r", 1)) {
 		open_mode = O_RDONLY;
 		step = 1;
-	} else if (!strncmp(mode, "w+", 2)) {
+	} else if (strnequal(mode, "w+", 2)) {
 		open_mode = O_RDWR | O_TRUNC | O_CREAT;
 		step = 2;
-	} else if (!strncmp(mode, "w", 1)) {
+	} else if (strnequal(mode, "w", 1)) {
 		open_mode = O_WRONLY | O_TRUNC | O_CREAT;
 		step = 1;
-	} else if (!strncmp(mode, "a+", 2)) {
+	} else if (strnequal(mode, "a+", 2)) {
 		open_mode = O_RDWR | O_CREAT | O_APPEND;
 		step = 2;
-	} else if (!strncmp(mode, "a", 1)) {
+	} else if (strnequal(mode, "a", 1)) {
 		open_mode = O_WRONLY | O_CREAT | O_APPEND;
 		step = 1;
 	}
@@ -381,8 +411,10 @@
 	return ret;
 }
 
-int fd_to_fd(int from, int to)
+ssize_t __fd_to_fd(int from, int to)
 {
+	ssize_t total_bytes = 0;
+
 	for (;;) {
 		uint8_t bufPATH_MAX;
 		uint8_t *p = buf;
@@ -396,6 +428,7 @@
 			break;
 
 		bytes_to_write = (size_t)bytes_read;
+		total_bytes += bytes_read;
 		do {
 			ssize_t bytes_written;
 
@@ -408,7 +441,7 @@
 		} while (bytes_to_write > 0);
 	}
 
-	return 0;
+	return total_bytes;
 }
 
 int fd_to_buf(int fd, char **buf, size_t *length)
@@ -426,12 +459,15 @@
 
 		bytes_read = lxc_read_nointr(fd, chunk, sizeof(chunk));
 		if (bytes_read < 0)
-			return 0;
+			return -errno;
 
 		if (!bytes_read)
 			break;
 
-		copy = must_realloc(old, (*length + bytes_read) * sizeof(*old));
+		copy = realloc(old, (*length + bytes_read) * sizeof(*old));
+		if (!copy)
+			return ret_errno(ENOMEM);
+
 		memcpy(copy + *length, chunk, bytes_read);
 		*length += bytes_read;
 	}
@@ -512,3 +548,261 @@
 #endif
 	return f;
 }
+
+int fd_cloexec(int fd, bool cloexec)
+{
+	int oflags, nflags;
+
+	oflags = fcntl(fd, F_GETFD, 0);
+	if (oflags < 0)
+		return -errno;
+
+	if (cloexec)
+		nflags = oflags | FD_CLOEXEC;
+	else
+		nflags = oflags & ~FD_CLOEXEC;
+
+	if (nflags == oflags)
+		return 0;
+
+	if (fcntl(fd, F_SETFD, nflags) < 0)
+		return -errno;
+
+	return 0;
+}
+
+FILE *fdopen_at(int dfd, const char *path, const char *mode,
+		unsigned int o_flags, unsigned int resolve_flags)
+{
+	__do_close int fd = -EBADF;
+	__do_fclose FILE *f = NULL;
+
+	if (is_empty_string(path))
+		fd = dup_cloexec(dfd);
+	else
+		fd = open_at(dfd, path, o_flags, resolve_flags, 0);
+	if (fd < 0)
+		return NULL;
+
+	f = fdopen(fd, "re");
+	if (!f)
+		return NULL;
+
+	/* Transfer ownership of fd. */
+	move_fd(fd);
+
+	return move_ptr(f);
+}
+
+int timens_offset_write(clockid_t clk_id, int64_t s_offset, int64_t ns_offset)
+{
+	__do_close int fd = -EBADF;
+	ssize_t len, ret;
+	char bufINTTYPE_TO_STRLEN(int) +
+		 STRLITERALLEN(" ") + INTTYPE_TO_STRLEN(int64_t) +
+		 STRLITERALLEN(" ") + INTTYPE_TO_STRLEN(int64_t) + 1;
+
+	if (clk_id == CLOCK_MONOTONIC_COARSE || clk_id == CLOCK_MONOTONIC_RAW)
+		clk_id = CLOCK_MONOTONIC;
+
+	fd = open("/proc/self/timens_offsets", O_WRONLY | O_CLOEXEC);
+	if (fd < 0)
+		return -errno;
+
+	len = strnprintf(buf, sizeof(buf), "%d %" PRId64 " %" PRId64, clk_id, s_offset, ns_offset);
+	if (len < 0)
+		return ret_errno(EFBIG);
+
+	ret = lxc_write_nointr(fd, buf, len);
+	if (ret < 0 || ret != len)
+		return -EIO;
+
+	return 0;
+}
+
+bool exists_dir_at(int dir_fd, const char *path)
+{
+	int ret;
+	struct stat sb;
+
+	ret = fstatat(dir_fd, path, &sb, 0);
+	if (ret < 0)
+		return false;
+
+	ret = S_ISDIR(sb.st_mode);
+	if (ret)
+		errno = EEXIST;
+	else
+		errno = ENOTDIR;
+
+	return ret;
+}
+
+bool exists_file_at(int dir_fd, const char *path)
+{
+	int ret;
+	struct stat sb;
+
+	ret = fstatat(dir_fd, path, &sb, 0);
+	if (ret == 0)
+		errno = EEXIST;
+	return ret == 0;
+}
+
+int open_at(int dfd, const char *path, unsigned int o_flags,
+	    unsigned int resolve_flags, mode_t mode)
+{
+	__do_close int fd = -EBADF;
+	struct open_how how = {
+		.flags		= o_flags,
+		.mode		= mode,
+		.resolve	= resolve_flags,
+	};
+
+	fd = openat2(dfd, path, &how, sizeof(how));
+	if (fd >= 0)
+		return move_fd(fd);
+
+	if (errno != ENOSYS)
+		return -errno;
+
+	fd = openat(dfd, path, o_flags, mode);
+	if (fd < 0)
+		return -errno;
+
+	return move_fd(fd);
+}
+
+int open_at_same(int fd_same, int dfd, const char *path, unsigned int o_flags,
+		 unsigned int resolve_flags, mode_t mode)
+{
+	__do_close int fd = -EBADF;
+
+	fd = open_at(dfd, path, o_flags, resolve_flags, mode);
+	if (fd < 0)
+		return -errno;
+
+	if (!same_file_lax(fd_same, fd))
+		return ret_errno(EINVAL);
+
+	return move_fd(fd);
+}
+
+int fd_make_nonblocking(int fd)
+{
+	int flags;
+
+	flags = fcntl(fd, F_GETFL);
+	if (flags < 0)
+		return -1;
+
+	flags &= ~O_NONBLOCK;
+	return fcntl(fd, F_SETFL, flags);
+}
+
+#define BATCH_SIZE 50
+static void batch_realloc(char **mem, size_t oldlen, size_t newlen)
+{
+	int newbatches = (newlen / BATCH_SIZE) + 1;
+	int oldbatches = (oldlen / BATCH_SIZE) + 1;
+
+	if (!*mem || newbatches > oldbatches)
+		*mem = must_realloc(*mem, newbatches * BATCH_SIZE);
+}
+
+static void append_line(char **dest, size_t oldlen, char *new, size_t newlen)
+{
+	size_t full = oldlen + newlen;
+
+	batch_realloc(dest, oldlen, full + 1);
+
+	memcpy(*dest + oldlen, new, newlen + 1);
+}
+
+/* Slurp in a whole file */
+char *read_file_at(int dfd, const char *fnam,
+		   unsigned int o_flags, unsigned resolve_flags)
+{
+	__do_close int fd = -EBADF;
+	__do_free char *buf = NULL, *line = NULL;
+	__do_fclose FILE *f = NULL;
+	size_t len = 0, fulllen = 0;
+	int linelen;
+
+	fd = open_at(dfd, fnam, o_flags, resolve_flags, 0);
+	if (fd < 0)
+		return NULL;
+
+	f = fdopen(fd, "re");
+	if (!f)
+		return NULL;
+	/* Transfer ownership to fdopen(). */
+	move_fd(fd);
+
+	while ((linelen = getline(&line, &len, f)) != -1) {
+		append_line(&buf, fulllen, line, linelen);
+		fulllen += linelen;
+	}
+
+	return move_ptr(buf);
+}
+
+bool same_file_lax(int fda, int fdb)
+{
+	struct stat st_fda, st_fdb;
+
+
+        if (fda == fdb)
+                return true;
+
+        if (fstat(fda, &st_fda) < 0)
+                return false;
+
+        if (fstat(fdb, &st_fdb) < 0)
+                return false;
+
+	errno = EINVAL;
+	if ((st_fda.st_mode & S_IFMT) != (st_fdb.st_mode & S_IFMT))
+		return false;
+
+	errno = EINVAL;
+	return (st_fda.st_dev == st_fdb.st_dev) &&
+	       (st_fda.st_ino == st_fdb.st_ino);
+}
+
+bool same_device(int fda, const char *patha, int fdb, const char *pathb)
+{
+	int ret;
+	mode_t modea, modeb;
+	struct stat st_fda, st_fdb;
+
+        if (fda == fdb)
+                return true;
+
+	if (is_empty_string(patha))
+		ret = fstat(fda, &st_fda);
+	else
+		ret = fstatat(fda, patha, &st_fda, 0);
+	if (ret)
+		return false;
+
+	if (is_empty_string(pathb))
+		ret = fstat(fdb, &st_fdb);
+	else
+		ret = fstatat(fdb, pathb, &st_fdb, 0);
+	if (ret)
+		return false;
+
+	errno = EINVAL;
+	modea = (st_fda.st_mode & S_IFMT);
+	modeb = (st_fdb.st_mode & S_IFMT);
+	if (modea != modeb || !(modea == S_IFCHR || modea == S_IFBLK))
+		return false;
+
+	return (st_fda.st_rdev == st_fdb.st_rdev);
+}
+
+int open_beneath(int dfd, const char *path, unsigned int flags)
+{
+	return open_at(dfd, path, flags, PROTECT_LOOKUP_BENEATH, 0);
+}

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/file_utils.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/file_utils.h Changed

@@ -3,6 +3,8 @@
 #ifndef __LXC_FILE_UTILS_H
 #define __LXC_FILE_UTILS_H
 
+#include "config.h"
+
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -13,74 +15,130 @@
 #include <unistd.h>
 
 #include "compiler.h"
+#include "memory_utils.h"
+#include "syscall_wrappers.h"
 
 /* read and write whole files */
-extern int lxc_write_to_file(const char *filename, const void *buf,
-			     size_t count, bool add_newline, mode_t mode)
-__access_r(2, 3);
+__hidden extern int lxc_write_to_file(const char *filename, const void *buf, size_t count,
+				      bool add_newline, mode_t mode) __access_r(2, 3);
 
-extern int lxc_readat(int dirfd, const char *filename, void *buf, size_t count)
-__access_w(3, 4);
+__hidden extern int lxc_readat(int dirfd, const char *filename, void *buf, size_t count)
+    __access_w(3, 4);
 
-extern int lxc_writeat(int dirfd, const char *filename, const void *buf,
-		       size_t count)
-__access_r(3, 4);
+__hidden extern int lxc_writeat(int dirfd, const char *filename, const void *buf, size_t count)
+    __access_r(3, 4);
 
-extern int lxc_write_openat(const char *dir, const char *filename,
-			    const void *buf, size_t count)
-__access_r(3, 4);
+__hidden extern int lxc_write_openat(const char *dir, const char *filename, const void *buf,
+				     size_t count) __access_r(3, 4);
 
-extern int lxc_read_from_file(const char *filename, void *buf, size_t count)
-__access_w(2, 3);
+__hidden extern int lxc_read_from_file(const char *filename, void *buf, size_t count)
+    __access_w(2, 3);
 
 /* send and receive buffers completely */
-extern ssize_t lxc_write_nointr(int fd, const void *buf, size_t count)
-__access_r(2, 3);
+__hidden extern ssize_t lxc_write_nointr(int fd, const void *buf, size_t count) __access_r(2, 3);
+
+__hidden extern ssize_t lxc_pwrite_nointr(int fd, const void *buf, size_t count, off_t offset)
+    __access_r(2, 3);
+
+__hidden extern ssize_t lxc_send_nointr(int sockfd, void *buf, size_t len, int flags)
+    __access_r(2, 3);
 
-extern ssize_t lxc_pwrite_nointr(int fd, const void *buf, size_t count,
-				 off_t offset)
-__access_r(2, 3);
+__hidden extern ssize_t lxc_read_nointr(int fd, void *buf, size_t count) __access_w(2, 3);
 
-extern ssize_t lxc_send_nointr(int sockfd, void *buf, size_t len, int flags)
-__access_r(2, 3);
+__access_w(2, 3) static inline int lxc_read_string_nointr(int fd, char *buf,
+							  size_t count)
+{
+	ssize_t ret;
 
-extern ssize_t lxc_read_nointr(int fd, void *buf, size_t count)
-__access_w(2, 3);
+	ret = lxc_read_nointr(fd, buf, STRARRAYLEN(buf));
+	if (ret < 0)
+		return -errno;
+	if (ret == 0)
+		return ret_errno(ENODATA);
+	if ((size_t)ret >= sizeof(buf))
+		return ret_errno(E2BIG);
+	bufret = '\0';
+	return 0;
+}
 
-extern ssize_t lxc_read_nointr_expect(int fd, void *buf, size_t count,
-				      const void *expected_buf)
-__access_w(2, 3);
+__hidden extern ssize_t lxc_read_nointr_expect(int fd, void *buf, size_t count,
+					       const void *expected_buf) __access_w(2, 3);
 
-extern ssize_t lxc_read_file_expect(const char *path, void *buf, size_t count,
-				      const void *expected_buf)
-__access_w(2, 3);
+__hidden extern ssize_t lxc_read_file_expect(const char *path, void *buf, size_t count,
+					     const void *expected_buf) __access_w(2, 3);
 
-extern ssize_t lxc_recv_nointr(int sockfd, void *buf, size_t len, int flags)
-__access_w(2, 3);
+__hidden extern ssize_t lxc_recv_nointr(int sockfd, void *buf, size_t len, int flags)
+    __access_w(2, 3);
 
-ssize_t lxc_recvmsg_nointr_iov(int sockfd, struct iovec *iov, size_t iovlen,
-			       int flags);
+__hidden extern ssize_t lxc_recvmsg_nointr_iov(int sockfd, struct iovec *iov, size_t iovlen,
+					       int flags);
 
-extern bool file_exists(const char *f);
-extern int print_to_file(const char *file, const char *content);
-extern int is_dir(const char *path);
-extern int lxc_count_file_lines(const char *fn);
-extern int lxc_make_tmpfile(char *template, bool rm);
+__hidden extern bool file_exists(const char *f);
+__hidden extern int print_to_file(const char *file, const char *content);
+__hidden extern int is_dir(const char *path);
+__hidden extern int lxc_count_file_lines(const char *fn);
+__hidden extern int lxc_make_tmpfile(char *template, bool rm);
 
 /* __typeof__ should be safe to use with all compilers. */
 typedef __typeof__(((struct statfs *)NULL)->f_type) fs_type_magic;
-extern bool has_fs_type(const char *path, fs_type_magic magic_val);
-extern bool fhas_fs_type(int fd, fs_type_magic magic_val);
-extern bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val);
-extern FILE *fopen_cloexec(const char *path, const char *mode);
-extern ssize_t lxc_sendfile_nointr(int out_fd, int in_fd, off_t *offset,
-				   size_t count);
-extern char *file_to_buf(const char *path, size_t *length);
-extern int fd_to_buf(int fd, char **buf, size_t *length);
-extern int fd_to_fd(int from, int to);
-extern int lxc_open_dirfd(const char *dir);
-extern FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer);
-extern FILE *fopen_cached(const char *path, const char *mode,
-			  void **caller_freed_buffer);
+__hidden extern bool has_fs_type(const char *path, fs_type_magic magic_val);
+__hidden extern bool fhas_fs_type(int fd, fs_type_magic magic_val);
+__hidden extern bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val);
+__hidden extern FILE *fopen_cloexec(const char *path, const char *mode);
+__hidden extern ssize_t lxc_sendfile_nointr(int out_fd, int in_fd, off_t *offset, size_t count);
+__hidden extern char *file_to_buf(const char *path, size_t *length);
+__hidden extern int fd_to_buf(int fd, char **buf, size_t *length);
+__hidden extern ssize_t __fd_to_fd(int from, int to);
+static inline int fd_to_fd(int from, int to)
+{
+	return __fd_to_fd(from, to) >= 0;
+}
+__hidden extern int fd_cloexec(int fd, bool cloexec);
+__hidden extern int lxc_open_dirfd(const char *dir);
+__hidden extern FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer);
+__hidden extern FILE *fdopen_at(int dfd, const char *path, const char *mode,
+                                unsigned int o_flags,
+                                unsigned int resolve_flags);
+__hidden extern FILE *fopen_cached(const char *path, const char *mode, void **caller_freed_buffer);
+__hidden extern int timens_offset_write(clockid_t clk_id, int64_t s_offset, int64_t ns_offset);
+__hidden extern bool exists_dir_at(int dir_fd, const char *path);
+__hidden extern bool exists_file_at(int dir_fd, const char *path);
+__hidden extern int open_at(int dfd, const char *path, unsigned int o_flags,
+			    unsigned int resolve_flags, mode_t mode);
+__hidden extern int open_at_same(int fd_same, int dfd, const char *path,
+				 unsigned int o_flags,
+				 unsigned int resolve_flags, mode_t mode);
+__hidden extern int open_beneath(int dfd, const char *path, unsigned int flags);
+__hidden int fd_make_nonblocking(int fd);
+__hidden extern char *read_file_at(int dfd, const char *fnam,
+                                   unsigned int o_flags,
+                                   unsigned resolve_flags);
+__hidden extern ssize_t lxc_read_try_buf_at(int dfd, const char *path,
+                                            void *buf, size_t count);
+
+/*
+ * Check if two fds refer to the same file.
+ * The function is "lax" in so far, as it doesn't care whether fda and fdb have
+ * the same flags or whether they share the same device context when they refer
+ * to devices.
+ */
+__hidden extern bool same_file_lax(int fda, int fdb);
+
+static inline int dup_cloexec(int fd)
+{
+	__do_close int fd_dup = -EBADF;
+
+	fd_dup = dup(fd);
+	if (fd_dup < 0)
+		return -errno;
+
+	if (fd_cloexec(fd_dup, true))
+		return -errno;
+
+	return move_fd(fd_dup);
+}
+
+__hidden extern bool same_device(int fda, const char *patha, int fdb,
+				 const char *pathb);
 
 #endif /* __LXC_FILE_UTILS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/freezer.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/freezer.c Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/hlist.h Added

@@ -0,0 +1,975 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#ifndef __LXC_HLIST_H
+#define __LXC_HLIST_H
+
+struct list_head {
+	struct list_head *next, *prev;
+};
+
+struct hlist_head {
+	struct hlist_node *first;
+};
+
+struct hlist_node {
+	struct hlist_node *next, **pprev;
+};
+
+/*
+ * These are non-NULL pointers that will result in page faults
+ * under normal circumstances, used to verify that nobody uses
+ * non-initialized list entries.
+ */
+#define LIST_POISON1  ((void *) 0x100)
+#define LIST_POISON2  ((void *) 0x122)
+
+/*
+ * Circular doubly linked list implementation.
+ *
+ * Some of the internal functions ("__xxx") are useful when
+ * manipulating whole lists rather than single entries, as
+ * sometimes we already know the next/prev entries and we can
+ * generate better code by using them directly rather than
+ * using the generic single-entry routines.
+ */
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
+
+/**
+ * INIT_LIST_HEAD - Initialize a list_head structure
+ * @list: list_head structure to be initialized.
+ *
+ * Initializes the list_head to point to itself.  If it is a list header,
+ * the result is an empty list.
+ */
+static inline void INIT_LIST_HEAD(struct list_head *list)
+{
+	list->next = list;
+	list->prev = list;
+}
+
+/*
+ * Insert a new entry between two known consecutive entries.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next)
+{
+	next->prev = new;
+	new->next = next;
+	new->prev = prev;
+	prev->next = new;
+}
+
+/**
+ * list_add - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it after
+ *
+ * Insert a new entry after the specified head.
+ * This is good for implementing stacks.
+ */
+static inline void list_add(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head, head->next);
+}
+
+
+/**
+ * list_add_tail - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ */
+static inline void list_add_tail(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head->prev, head);
+}
+
+/*
+ * Delete a list entry by making the prev/next entries
+ * point to each other.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_del(struct list_head * prev, struct list_head * next)
+{
+	next->prev = prev;
+	prev->next = next;
+}
+
+static inline void __list_del_entry(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+}
+
+/**
+ * list_del - deletes entry from list.
+ * @entry: the element to delete from the list.
+ * Note: list_empty() on entry does not return true after this, the entry is
+ * in an undefined state.
+ */
+static inline void list_del(struct list_head *entry)
+{
+	__list_del_entry(entry);
+	entry->next = LIST_POISON1;
+	entry->prev = LIST_POISON2;
+}
+
+/**
+ * list_replace - replace old entry by new one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * If @old was empty, it will be overwritten.
+ */
+static inline void list_replace(struct list_head *old,
+				struct list_head *new)
+{
+	new->next = old->next;
+	new->next->prev = new;
+	new->prev = old->prev;
+	new->prev->next = new;
+}
+
+/**
+ * list_replace_init - replace old entry by new one and initialize the old one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * If @old was empty, it will be overwritten.
+ */
+static inline void list_replace_init(struct list_head *old,
+				     struct list_head *new)
+{
+	list_replace(old, new);
+	INIT_LIST_HEAD(old);
+}
+
+/**
+ * list_swap - replace entry1 with entry2 and re-add entry1 at entry2's position
+ * @entry1: the location to place entry2
+ * @entry2: the location to place entry1
+ */
+static inline void list_swap(struct list_head *entry1,
+			     struct list_head *entry2)
+{
+	struct list_head *pos = entry2->prev;
+
+	list_del(entry2);
+	list_replace(entry1, entry2);
+	if (pos == entry1)
+		pos = entry2;
+	list_add(entry1, pos);
+}
+
+/**
+ * list_del_init - deletes entry from list and reinitialize it.
+ * @entry: the element to delete from the list.
+ */
+static inline void list_del_init(struct list_head *entry)
+{
+	__list_del_entry(entry);
+	INIT_LIST_HEAD(entry);
+}
+
+/**
+ * list_move - delete from one list and add as another's head
+ * @list: the entry to move
+ * @head: the head that will precede our entry
+ */
+static inline void list_move(struct list_head *list, struct list_head *head)
+{
+	__list_del_entry(list);
+	list_add(list, head);
+}
+
+/**
+ * list_move_tail - delete from one list and add as another's tail
+ * @list: the entry to move
+ * @head: the head that will follow our entry
+ */
+static inline void list_move_tail(struct list_head *list,
+				  struct list_head *head)
+{
+	__list_del_entry(list);
+	list_add_tail(list, head);
+}
+
+/**
+ * list_bulk_move_tail - move a subsection of a list to its tail
+ * @head: the head that will follow our entry
+ * @first: first entry to move
+ * @last: last entry to move, can be the same as first
+ *
+ * Move all entries between @first and including @last before @head.
+ * All three entries must belong to the same linked list.
+ */
+static inline void list_bulk_move_tail(struct list_head *head,
+				       struct list_head *first,
+				       struct list_head *last)
+{
+	first->prev->next = last->next;
+	last->next->prev = first->prev;
+
+	head->prev->next = first;
+	first->prev = head->prev;
+
+	last->next = head;
+	head->prev = last;
+}
+
+/**
+ * list_is_first -- tests whether @list is the first entry in list @head
+ * @list: the entry to test
+ * @head: the head of the list
+ */
+static inline int list_is_first(const struct list_head *list,
+					const struct list_head *head)
+{
+	return list->prev == head;
+}
+
+/**
+ * list_is_last - tests whether @list is the last entry in list @head
+ * @list: the entry to test
+ * @head: the head of the list
+ */
+static inline int list_is_last(const struct list_head *list,
+				const struct list_head *head)
+{
+	return list->next == head;
+}
+
+/**
+ * list_empty - tests whether a list is empty
+ * @head: the list to test.
+ */
+static inline int list_empty(const struct list_head *head)
+{
+	return head->next == head;
+}
+
+/**
+ * list_rotate_left - rotate the list to the left
+ * @head: the head of the list
+ */
+static inline void list_rotate_left(struct list_head *head)
+{
+	struct list_head *first;
+
+	if (!list_empty(head)) {
+		first = head->next;
+		list_move_tail(first, head);
+	}
+}
+
+/**
+ * list_rotate_to_front() - Rotate list to specific item.
+ * @list: The desired new front of the list.
+ * @head: The head of the list.
+ *
+ * Rotates list so that @list becomes the new front of the list.
+ */
+static inline void list_rotate_to_front(struct list_head *list,
+					struct list_head *head)
+{
+	/*
+	 * Deletes the list head from the list denoted by @head and
+	 * places it as the tail of @list, this effectively rotates the
+	 * list so that @list is at the front.
+	 */
+	list_move_tail(head, list);
+}
+
+/**
+ * list_is_singular - tests whether a list has just one entry.
+ * @head: the list to test.
+ */
+static inline int list_is_singular(const struct list_head *head)
+{
+	return !list_empty(head) && (head->next == head->prev);
+}
+
+static inline void __list_cut_position(struct list_head *list,
+		struct list_head *head, struct list_head *entry)
+{
+	struct list_head *new_first = entry->next;
+	list->next = head->next;
+	list->next->prev = list;
+	list->prev = entry;
+	entry->next = list;
+	head->next = new_first;
+	new_first->prev = head;
+}
+
+/**
+ * list_cut_position - cut a list into two
+ * @list: a new list to add all removed entries
+ * @head: a list with entries
+ * @entry: an entry within head, could be the head itself
+ *	and if so we won't cut the list
+ *
+ * This helper moves the initial part of @head, up to and
+ * including @entry, from @head to @list. You should
+ * pass on @entry an element you know is on @head. @list
+ * should be an empty list or a list you do not care about
+ * losing its data.
+ *
+ */
+static inline void list_cut_position(struct list_head *list,
+		struct list_head *head, struct list_head *entry)
+{
+	if (list_empty(head))
+		return;
+	if (list_is_singular(head) &&
+		(head->next != entry && head != entry))
+		return;
+	if (entry == head)
+		INIT_LIST_HEAD(list);
+	else
+		__list_cut_position(list, head, entry);
+}
+
+/**
+ * list_cut_before - cut a list into two, before given entry
+ * @list: a new list to add all removed entries
+ * @head: a list with entries
+ * @entry: an entry within head, could be the head itself
+ *
+ * This helper moves the initial part of @head, up to but
+ * excluding @entry, from @head to @list.  You should pass
+ * in @entry an element you know is on @head.  @list should
+ * be an empty list or a list you do not care about losing
+ * its data.
+ * If @entry == @head, all entries on @head are moved to
+ * @list.
+ */
+static inline void list_cut_before(struct list_head *list,
+				   struct list_head *head,
+				   struct list_head *entry)
+{
+	if (head->next == entry) {
+		INIT_LIST_HEAD(list);
+		return;
+	}
+	list->next = head->next;
+	list->next->prev = list;
+	list->prev = entry->prev;
+	list->prev->next = list;
+	head->next = entry;
+	entry->prev = head;
+}
+
+static inline void __list_splice(const struct list_head *list,
+				 struct list_head *prev,
+				 struct list_head *next)
+{
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
+
+	first->prev = prev;
+	prev->next = first;
+
+	last->next = next;
+	next->prev = last;
+}
+
+/**
+ * list_splice - join two lists, this is designed for stacks
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+static inline void list_splice(const struct list_head *list,
+				struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head, head->next);
+}
+
+/**
+ * list_splice_tail - join two lists, each list being a queue
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+static inline void list_splice_tail(struct list_head *list,
+				struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head->prev, head);
+}
+
+/**
+ * list_splice_init - join two lists and reinitialise the emptied list.
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ *
+ * The list at @list is reinitialised
+ */
+static inline void list_splice_init(struct list_head *list,
+				    struct list_head *head)
+{
+	if (!list_empty(list)) {
+		__list_splice(list, head, head->next);
+		INIT_LIST_HEAD(list);
+	}
+}
+
+/**
+ * list_splice_tail_init - join two lists and reinitialise the emptied list
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ *
+ * Each of the lists is a queue.
+ * The list at @list is reinitialised
+ */
+static inline void list_splice_tail_init(struct list_head *list,
+					 struct list_head *head)
+{
+	if (!list_empty(list)) {
+		__list_splice(list, head->prev, head);
+		INIT_LIST_HEAD(list);
+	}
+}
+
+/**
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_head within the struct.
+ */
+#define list_entry(ptr, type, member) \
+	container_of(ptr, type, member)
+
+/**
+ * list_first_entry - get the first element from a list
+ * @ptr:	the list head to take the element from.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_head within the struct.
+ *
+ * Note, that list is expected to be not empty.
+ */
+#define list_first_entry(ptr, type, member) \
+	list_entry((ptr)->next, type, member)
+
+/**
+ * list_last_entry - get the last element from a list
+ * @ptr:	the list head to take the element from.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_head within the struct.
+ *
+ * Note, that list is expected to be not empty.
+ */
+#define list_last_entry(ptr, type, member) \
+	list_entry((ptr)->prev, type, member)
+
+/**
+ * list_first_entry_or_null - get the first element from a list
+ * @ptr:	the list head to take the element from.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_head within the struct.
+ *
+ * Note that if the list is empty, it returns NULL.
+ */
+#define list_first_entry_or_null(ptr, type, member) ({ \
+	struct list_head *head__ = (ptr); \
+	struct list_head *pos__ = head__->next; \
+	pos__ != head__ ? list_entry(pos__, type, member) : NULL; \
+})
+
+/**
+ * list_next_entry - get the next element in list
+ * @pos:	the type * to cursor
+ * @member:	the name of the list_head within the struct.
+ */
+#define list_next_entry(pos, member) \
+	list_entry((pos)->member.next, typeof(*(pos)), member)
+
+/**
+ * list_prev_entry - get the prev element in list
+ * @pos:	the type * to cursor
+ * @member:	the name of the list_head within the struct.
+ */
+#define list_prev_entry(pos, member) \
+	list_entry((pos)->member.prev, typeof(*(pos)), member)
+
+/**
+ * list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ */
+#define list_for_each(pos, head) \
+	for (pos = (head)->next; pos != (head); pos = pos->next)
+
+/**
+ * list_for_each_continue - continue iteration over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ *
+ * Continue to iterate over a list, continuing after the current position.
+ */
+#define list_for_each_continue(pos, head) \
+	for (pos = pos->next; pos != (head); pos = pos->next)
+
+/**
+ * list_for_each_prev	-	iterate over a list backwards
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ */
+#define list_for_each_prev(pos, head) \
+	for (pos = (head)->prev; pos != (head); pos = pos->prev)
+
+/**
+ * list_for_each_safe - iterate over a list safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ */
+#define list_for_each_safe(pos, n, head) \
+	for (pos = (head)->next, n = pos->next; pos != (head); \
+		pos = n, n = pos->next)
+
+/**
+ * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ */
+#define list_for_each_prev_safe(pos, n, head) \
+	for (pos = (head)->prev, n = pos->prev; \
+	     pos != (head); \
+	     pos = n, n = pos->prev)
+
+/**
+ * list_entry_is_head - test if the entry points to the head of the list
+ * @pos:	the type * to cursor
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ */
+#define list_entry_is_head(pos, head, member)				\
+	(&pos->member == (head))
+
+/**
+ * list_for_each_entry	-	iterate over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ */
+#define list_for_each_entry(pos, head, member)				\
+	for (pos = list_first_entry(head, typeof(*pos), member);	\
+	     !list_entry_is_head(pos, head, member);			\
+	     pos = list_next_entry(pos, member))
+
+/**
+ * list_for_each_entry_reverse - iterate backwards over list of given type.
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ */
+#define list_for_each_entry_reverse(pos, head, member)			\
+	for (pos = list_last_entry(head, typeof(*pos), member);		\
+	     !list_entry_is_head(pos, head, member); 			\
+	     pos = list_prev_entry(pos, member))
+
+/**
+ * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
+ * @pos:	the type * to use as a start point
+ * @head:	the head of the list
+ * @member:	the name of the list_head within the struct.
+ *
+ * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
+ */
+#define list_prepare_entry(pos, head, member) \
+	((pos) ? : list_entry(head, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_continue - continue iteration over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ *
+ * Continue to iterate over list of given type, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue(pos, head, member) 		\
+	for (pos = list_next_entry(pos, member);			\
+	     !list_entry_is_head(pos, head, member);			\
+	     pos = list_next_entry(pos, member))
+
+/**
+ * list_for_each_entry_continue_reverse - iterate backwards from the given point
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ *
+ * Start to iterate over list of given type backwards, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue_reverse(pos, head, member)		\
+	for (pos = list_prev_entry(pos, member);			\
+	     !list_entry_is_head(pos, head, member);			\
+	     pos = list_prev_entry(pos, member))
+
+/**
+ * list_for_each_entry_from - iterate over list of given type from the current point
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ *
+ * Iterate over list of given type, continuing from current position.
+ */
+#define list_for_each_entry_from(pos, head, member) 			\
+	for (; !list_entry_is_head(pos, head, member);			\
+	     pos = list_next_entry(pos, member))
+
+/**
+ * list_for_each_entry_from_reverse - iterate backwards over list of given type
+ *                                    from the current point
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ *
+ * Iterate backwards over list of given type, continuing from current position.
+ */
+#define list_for_each_entry_from_reverse(pos, head, member)		\
+	for (; !list_entry_is_head(pos, head, member);			\
+	     pos = list_prev_entry(pos, member))
+
+/**
+ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ */
+#define list_for_each_entry_safe(pos, n, head, member)			\
+	for (pos = list_first_entry(head, typeof(*pos), member),	\
+		n = list_next_entry(pos, member);			\
+	     !list_entry_is_head(pos, head, member); 			\
+	     pos = n, n = list_next_entry(n, member))
+
+/**
+ * list_for_each_entry_safe_continue - continue list iteration safe against removal
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ *
+ * Iterate over list of given type, continuing after current point,
+ * safe against removal of list entry.
+ */
+#define list_for_each_entry_safe_continue(pos, n, head, member) 		\
+	for (pos = list_next_entry(pos, member), 				\
+		n = list_next_entry(pos, member);				\
+	     !list_entry_is_head(pos, head, member);				\
+	     pos = n, n = list_next_entry(n, member))
+
+/**
+ * list_for_each_entry_safe_from - iterate over list from current point safe against removal
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ *
+ * Iterate over list of given type from current point, safe against
+ * removal of list entry.
+ */
+#define list_for_each_entry_safe_from(pos, n, head, member) 			\
+	for (n = list_next_entry(pos, member);					\
+	     !list_entry_is_head(pos, head, member);				\
+	     pos = n, n = list_next_entry(n, member))
+
+/**
+ * list_for_each_entry_safe_reverse - iterate backwards over list safe against removal
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_head within the struct.
+ *
+ * Iterate backwards over list of given type, safe against removal
+ * of list entry.
+ */
+#define list_for_each_entry_safe_reverse(pos, n, head, member)		\
+	for (pos = list_last_entry(head, typeof(*pos), member),		\
+		n = list_prev_entry(pos, member);			\
+	     !list_entry_is_head(pos, head, member); 			\
+	     pos = n, n = list_prev_entry(n, member))
+
+/**
+ * list_safe_reset_next - reset a stale list_for_each_entry_safe loop
+ * @pos:	the loop cursor used in the list_for_each_entry_safe loop
+ * @n:		temporary storage used in list_for_each_entry_safe
+ * @member:	the name of the list_head within the struct.
+ *
+ * list_safe_reset_next is not safe to use in general if the list may be
+ * modified concurrently (eg. the lock is dropped in the loop body). An
+ * exception to this is if the cursor element (pos) is pinned in the list,
+ * and list_safe_reset_next is called after re-taking the lock and before
+ * completing the current iteration of the loop body.
+ */
+#define list_safe_reset_next(pos, n, member)				\
+	n = list_next_entry(pos, member)
+
+/*
+ * Double linked lists with a single pointer list head.
+ * Mostly useful for hash tables where the two pointer list head is
+ * too wasteful.
+ * You lose the ability to access the tail in O(1).
+ */
+
+#define HLIST_HEAD_INIT { .first = NULL }
+#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
+#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
+static inline void INIT_HLIST_NODE(struct hlist_node *h)
+{
+	h->next = NULL;
+	h->pprev = NULL;
+}
+
+/**
+ * hlist_unhashed - Has node been removed from list and reinitialized?
+ * @h: Node to be checked
+ *
+ * Not that not all removal functions will leave a node in unhashed
+ * state.  For example, hlist_nulls_del_init_rcu() does leave the
+ * node in unhashed state, but hlist_nulls_del() does not.
+ */
+static inline int hlist_unhashed(const struct hlist_node *h)
+{
+	return !h->pprev;
+}
+
+/**
+ * hlist_unhashed_lockless - Version of hlist_unhashed for lockless use
+ * @h: Node to be checked
+ */
+static inline int hlist_unhashed_lockless(const struct hlist_node *h)
+{
+	return !h->pprev;
+}
+
+/**
+ * hlist_empty - Is the specified hlist_head structure an empty hlist?
+ * @h: Structure to check.
+ */
+static inline int hlist_empty(const struct hlist_head *h)
+{
+	return !h->first;
+}
+
+static inline void __hlist_del(struct hlist_node *n)
+{
+	struct hlist_node *next = n->next;
+	struct hlist_node **pprev = n->pprev;
+
+	*pprev = next;
+	if (next)
+		next->pprev = pprev;
+}
+
+/**
+ * hlist_del - Delete the specified hlist_node from its list
+ * @n: Node to delete.
+ *
+ * Note that this function leaves the node in hashed state.  Use
+ * hlist_del_init() or similar instead to unhash @n.
+ */
+static inline void hlist_del(struct hlist_node *n)
+{
+	__hlist_del(n);
+	n->next = LIST_POISON1;
+	n->pprev = LIST_POISON2;
+}
+
+/**
+ * hlist_del_init - Delete the specified hlist_node from its list and initialize
+ * @n: Node to delete.
+ *
+ * Note that this function leaves the node in unhashed state.
+ */
+static inline void hlist_del_init(struct hlist_node *n)
+{
+	if (!hlist_unhashed(n)) {
+		__hlist_del(n);
+		INIT_HLIST_NODE(n);
+	}
+}
+
+/**
+ * hlist_add_head - add a new entry at the beginning of the hlist
+ * @n: new entry to be added
+ * @h: hlist head to add it after
+ *
+ * Insert a new entry after the specified head.
+ * This is good for implementing stacks.
+ */
+static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
+{
+	struct hlist_node *first = h->first;
+	n->next = first;
+	if (first)
+		first->pprev = &n->next;
+	h->first = n;
+	n->pprev = &h->first;
+}
+
+/**
+ * hlist_add_before - add a new entry before the one specified
+ * @n: new entry to be added
+ * @next: hlist node to add it before, which must be non-NULL
+ */
+static inline void hlist_add_before(struct hlist_node *n,
+				    struct hlist_node *next)
+{
+	n->pprev	= next->pprev;
+	n->next		= next;
+	next->pprev	= &n->next;
+	*(n->pprev)	= n;
+}
+
+/**
+ * hlist_add_behind - add a new entry after the one specified
+ * @n: new entry to be added
+ * @prev: hlist node to add it after, which must be non-NULL
+ */
+static inline void hlist_add_behind(struct hlist_node *n,
+				    struct hlist_node *prev)
+{
+	n->next		= prev->next;
+	prev->next	= n;
+	n->pprev	= &prev->next;
+
+	if (n->next)
+		n->next->pprev = &n->next;
+}
+
+/**
+ * hlist_add_fake - create a fake hlist consisting of a single headless node
+ * @n: Node to make a fake list out of
+ *
+ * This makes @n appear to be its own predecessor on a headless hlist.
+ * The point of this is to allow things like hlist_del() to work correctly
+ * in cases where there is no list.
+ */
+static inline void hlist_add_fake(struct hlist_node *n)
+{
+	n->pprev = &n->next;
+}
+
+/**
+ * hlist_fake: Is this node a fake hlist?
+ * @h: Node to check for being a self-referential fake hlist.
+ */
+static inline bool hlist_fake(struct hlist_node *h)
+{
+	return h->pprev == &h->next;
+}
+
+/**
+ * hlist_is_singular_node - is node the only element of the specified hlist?
+ * @n: Node to check for singularity.
+ * @h: Header for potentially singular list.
+ *
+ * Check whether the node is the only node of the head without
+ * accessing head, thus avoiding unnecessary cache misses.
+ */
+static inline bool
+hlist_is_singular_node(struct hlist_node *n, struct hlist_head *h)
+{
+	return !n->next && n->pprev == &h->first;
+}
+
+/**
+ * hlist_move_list - Move an hlist
+ * @old: hlist_head for old list.
+ * @new: hlist_head for new list.
+ *
+ * Move a list from one list head to another. Fixup the pprev
+ * reference of the first entry if it exists.
+ */
+static inline void hlist_move_list(struct hlist_head *old,
+				   struct hlist_head *new)
+{
+	new->first = old->first;
+	if (new->first)
+		new->first->pprev = &new->first;
+	old->first = NULL;
+}
+
+#define hlist_entry(ptr, type, member) container_of(ptr,type,member)
+
+#define hlist_for_each(pos, head) \
+	for (pos = (head)->first; pos ; pos = pos->next)
+
+#define hlist_for_each_safe(pos, n, head) \
+	for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \
+	     pos = n)
+
+#define hlist_entry_safe(ptr, type, member) \
+	({ typeof(ptr) ____ptr = (ptr); \
+	   ____ptr ? hlist_entry(____ptr, type, member) : NULL; \
+	})
+
+/**
+ * hlist_for_each_entry	- iterate over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry(pos, head, member)				\
+	for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member);\
+	     pos;							\
+	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
+
+/**
+ * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
+ * @pos:	the type * to use as a loop cursor.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry_continue(pos, member)			\
+	for (pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member);\
+	     pos;							\
+	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
+
+/**
+ * hlist_for_each_entry_from - iterate over a hlist continuing from current point
+ * @pos:	the type * to use as a loop cursor.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry_from(pos, member)				\
+	for (; pos;							\
+	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
+
+/**
+ * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		a &struct hlist_node to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry_safe(pos, n, head, member) 		\
+	for (pos = hlist_entry_safe((head)->first, typeof(*pos), member);\
+	     pos && ({ n = pos->member.next; 1; });			\
+	     pos = hlist_entry_safe(n, typeof(*pos), member))
+
+#define list_len(pos, head, member)                      \
+	({                                               \
+		size_t __list_len__ = 0;                 \
+                                                         \
+		list_for_each_entry(pos, head, member) { \
+			(__list_len__)++;                \
+		}                                        \
+                                                         \
+		__list_len__;                            \
+	})
+
+#endif /* __LXC_HLIST_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/initutils.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/initutils.c Changed

@@ -1,24 +1,26 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
+#include <pthread.h>
+#include <signal.h>
 #include <sys/prctl.h>
+#include <sys/syscall.h>
+#include <sys/wait.h>
+#include <unistd.h>
 
 #include "compiler.h"
-#include "config.h"
+#include "error.h"
 #include "file_utils.h"
 #include "initutils.h"
-#include "log.h"
 #include "macro.h"
 #include "memory_utils.h"
+#include "process_utils.h"
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
-lxc_log_define(initutils, lxc);
-
 static char *copy_global_config_value(char *p)
 {
 	int len = strlen(p);
@@ -55,11 +57,7 @@
 	};
 
 	/* placed in the thread local storage pool for non-bionic targets */
-#ifdef HAVE_TLS
 	static thread_local const char *valuessizeof(options) / sizeof(options0) = {0};
-#else
-	static const char *valuessizeof(options) / sizeof(options0) = {0};
-#endif
 
 	/* user_config_path is freed as soon as it is used */
 	char *user_config_path = NULL;
@@ -89,7 +87,7 @@
 		user_config_path = strdup(LXC_GLOBAL_CONF);
 		user_default_config_path = strdup(LXC_DEFAULT_CONFIG);
 		user_lxc_path = strdup(LXCPATH);
-		if (strcmp(DEFAULT_CGROUP_PATTERN, "") != 0)
+		if (!strequal(DEFAULT_CGROUP_PATTERN, ""))
 			user_cgroup_pattern = strdup(DEFAULT_CGROUP_PATTERN);
 	}
 
@@ -98,7 +96,7 @@
 	FILE *fin = NULL;
 
 	for (i = 0, ptr = options; (*ptr)0; ptr++, i++) {
-		if (!strcmp(option_name, (*ptr)0))
+		if (strequal(option_name, (*ptr)0))
 			break;
 	}
 	if (!(*ptr)0) {
@@ -165,7 +163,7 @@
 			if (!*slider1)
 				continue;
 
-			if (strcmp(option_name, "lxc.lxcpath") == 0) {
+			if (strequal(option_name, "lxc.lxcpath")) {
 				free(user_lxc_path);
 				user_lxc_path = copy_global_config_value(slider1);
 				remove_trailing_slashes(user_lxc_path);
@@ -179,12 +177,12 @@
 	}
 
 	/* could not find value, use default */
-	if (strcmp(option_name, "lxc.lxcpath") == 0) {
+	if (strequal(option_name, "lxc.lxcpath")) {
 		remove_trailing_slashes(user_lxc_path);
 		valuesi = move_ptr(user_lxc_path);
-	} else if (strcmp(option_name, "lxc.default_config") == 0) {
+	} else if (strequal(option_name, "lxc.default_config")) {
 		valuesi = move_ptr(user_default_config_path);
-	} else if (strcmp(option_name, "lxc.cgroup.pattern") == 0) {
+	} else if (strequal(option_name, "lxc.cgroup.pattern")) {
 		valuesi = move_ptr(user_cgroup_pattern);
 	} else {
 		valuesi = (*ptr)1;
@@ -310,8 +308,404 @@
 		    prctl_arg(sizeof(prctl_map)), prctl_arg(0));
 	if (ret == 0)
 		(void)strlcpy((char *)arg_start, title, len);
-	else
-		SYSWARN("Failed to set cmdline");
 
 	return ret;
 }
+
+static void prevent_forking(void)
+{
+	__do_free char *line = NULL;
+	__do_fclose FILE *f = NULL;
+	char pathPATH_MAX;
+	size_t len = 0;
+
+	f = fopen("/proc/self/cgroup", "re");
+	if (!f)
+		return;
+
+	while (getline(&line, &len, f) != -1) {
+		__do_close int fd = -EBADF;
+		int ret;
+		char *p, *p2;
+
+		p = strchr(line, ':');
+		if (!p)
+			continue;
+		p++;
+		p2 = strchr(p, ':');
+		if (!p2)
+			continue;
+		*p2 = '\0';
+
+		/* This is a cgroup v2 entry. Skip it. */
+		if ((p2 - p) == 0)
+			continue;
+
+		if (strcmp(p, "pids") != 0)
+			continue;
+		p2++;
+
+		p2 += lxc_char_left_gc(p2, strlen(p2));
+		p2lxc_char_right_gc(p2, strlen(p2)) = '\0';
+
+		ret = snprintf(path, sizeof(path),
+			       "/sys/fs/cgroup/pids/%s/pids.max", p2);
+		if (ret < 0 || (size_t)ret >= sizeof(path)) {
+			fprintf(stderr, "Failed to create string\n");
+			return;
+		}
+
+		fd = open(path, O_WRONLY | O_CLOEXEC);
+		if (fd < 0) {
+			fprintf(stderr, "Failed to open \"%s\"\n", path);
+			return;
+		}
+
+		ret = write(fd, "1", 1);
+		if (ret != 1)
+			fprintf(stderr, "Failed to write to \"%s\"\n", path);
+
+		return;
+	}
+}
+
+static void kill_children(pid_t pid)
+{
+	__do_fclose FILE *f = NULL;
+	char pathPATH_MAX;
+	int ret;
+
+	ret = snprintf(path, sizeof(path), "/proc/%d/task/%d/children", pid, pid);
+	if (ret < 0 || (size_t)ret >= sizeof(path)) {
+		fprintf(stderr, "Failed to create string\n");
+		return;
+	}
+
+	f = fopen(path, "re");
+	if (!f) {
+		fprintf(stderr, "Failed to open %s\n", path);
+		return;
+	}
+
+	while (!feof(f)) {
+		pid_t find_pid;
+
+		if (fscanf(f, "%d ", &find_pid) != 1) {
+			fprintf(stderr, "Failed to retrieve pid\n");
+			return;
+		}
+
+		(void)kill_children(find_pid);
+		(void)kill(find_pid, SIGKILL);
+	}
+}
+
+static void remove_self(void)
+{
+	int ret;
+	ssize_t n;
+	char pathPATH_MAX = {0};
+
+	n = readlink("/proc/self/exe", path, sizeof(path));
+	if (n < 0 || n >= PATH_MAX)
+		return;
+	pathn = '\0';
+
+	ret = umount2(path, MNT_DETACH);
+	if (ret < 0)
+		return;
+
+	ret = unlink(path);
+	if (ret < 0)
+		return;
+}
+
+static sig_atomic_t was_interrupted;
+
+static void interrupt_handler(int sig)
+{
+	if (!was_interrupted)
+		was_interrupted = sig;
+}
+
+static int close_inherited(void)
+{
+	int fddir;
+	DIR *dir;
+	struct dirent *direntp;
+
+restart:
+	dir = opendir("/proc/self/fd");
+	if (!dir)
+		return -errno;
+
+	fddir = dirfd(dir);
+
+	while ((direntp = readdir(dir))) {
+		int fd, ret;
+
+		if (strcmp(direntp->d_name, ".") == 0)
+			continue;
+
+		if (strcmp(direntp->d_name, "..") == 0)
+			continue;
+
+		ret = lxc_safe_int(direntp->d_name, &fd);
+		if (ret < 0)
+			continue;
+
+		if (fd == STDERR_FILENO || fd == fddir)
+			break;
+
+		if (close(fd)) {
+			closedir(dir);
+			return -errno;
+		}
+
+		closedir(dir);
+		goto restart;
+	}
+
+	closedir(dir);
+	return 0;
+}
+
+__noreturn int lxc_container_init(int argc, char *const *argv, bool quiet)
+{
+	int i, logfd, ret;
+	pid_t pid;
+	struct sigaction act;
+	sigset_t mask, omask;
+	int have_status = 0, exit_with = 1, shutdown = 0;
+
+	/* Mask all the signals so we are safe to install a signal handler and
+	 * to fork.
+	 */
+	ret = sigfillset(&mask);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = sigdelset(&mask, SIGILL);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = sigdelset(&mask, SIGSEGV);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = sigdelset(&mask, SIGBUS);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = pthread_sigmask(SIG_SETMASK, &mask, &omask);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = sigfillset(&act.sa_mask);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = sigdelset(&act.sa_mask, SIGILL);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = sigdelset(&act.sa_mask, SIGSEGV);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = sigdelset(&act.sa_mask, SIGBUS);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = sigdelset(&act.sa_mask, SIGSTOP);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = sigdelset(&act.sa_mask, SIGKILL);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	act.sa_flags = 0;
+	act.sa_handler = interrupt_handler;
+
+	for (i = 1; i < NSIG; i++) {
+		/* Exclude some signals: ILL, SEGV and BUS are likely to reveal
+		 * a bug and we want a core. STOP and KILL cannot be handled
+		 * anyway: they're here for documentation. 32 and 33 are not
+		 * defined.
+		 */
+		if (i == SIGILL || i == SIGSEGV || i == SIGBUS ||
+		    i == SIGSTOP || i == SIGKILL || i == 32 || i == 33)
+			continue;
+
+		ret = sigaction(i, &act, NULL);
+		if (ret < 0) {
+			if (errno == EINVAL)
+				continue;
+
+			if (!quiet)
+				fprintf(stderr, "Failed to change signal action\n");
+			exit(EXIT_FAILURE);
+		}
+	}
+
+	remove_self();
+
+	pid = fork();
+	if (pid < 0)
+		exit(EXIT_FAILURE);
+
+	if (!pid) {
+		/* restore default signal handlers */
+		for (i = 1; i < NSIG; i++) {
+			sighandler_t sigerr;
+
+			if (i == SIGILL || i == SIGSEGV || i == SIGBUS ||
+			    i == SIGSTOP || i == SIGKILL || i == 32 || i == 33)
+				continue;
+
+			sigerr = signal(i, SIG_DFL);
+			if (sigerr == SIG_ERR && !quiet)
+				fprintf(stderr, "Failed to reset to default action for signal \"%d\": %d\n", i, pid);
+		}
+
+		ret = pthread_sigmask(SIG_SETMASK, &omask, NULL);
+		if (ret < 0) {
+			if (quiet)
+				fprintf(stderr, "Failed to set signal mask\n");
+			exit(EXIT_FAILURE);
+		}
+
+		(void)setsid();
+
+		(void)ioctl(STDIN_FILENO, TIOCSCTTY, 0);
+
+		ret = execvp(argv0, argv);
+		if (!quiet)
+			fprintf(stderr, "Failed to exec \"%s\"\n", argv0);
+		exit(ret);
+	}
+	logfd = open("/dev/console", O_WRONLY | O_NOCTTY | O_CLOEXEC);
+	if (logfd >= 0) {
+		ret = dup3(logfd, STDERR_FILENO, O_CLOEXEC);
+		if (ret < 0)
+			exit(EXIT_FAILURE);
+	}
+
+	(void)setproctitle("init");
+
+	/* Let's process the signals now. */
+	ret = sigdelset(&omask, SIGALRM);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+
+	ret = pthread_sigmask(SIG_SETMASK, &omask, NULL);
+	if (ret < 0) {
+		if (!quiet)
+			fprintf(stderr, "Failed to set signal mask\n");
+		exit(EXIT_FAILURE);
+	}
+
+	ret = close_range(STDERR_FILENO + 1, UINT_MAX, CLOSE_RANGE_UNSHARE);
+	if (ret) {
+		/*
+		 * Fallback to close_inherited() when the syscall is not
+		 * available or when CLOSE_RANGE_UNSHARE isn't supported.
+		 * On a regular kernel CLOSE_RANGE_UNSHARE should always be
+		 * available but openSUSE Leap 15.3 seems to have a partial
+		 * backport without CLOSE_RANGE_UNSHARE support.
+		 */
+		if (errno == ENOSYS || errno == EINVAL)
+			ret = close_inherited();
+	}
+	if (ret) {
+		fprintf(stderr, "Aborting attach to prevent leaking file descriptors into container\n");
+		exit(EXIT_FAILURE);
+	}
+
+	for (;;) {
+		int status;
+		pid_t waited_pid;
+
+		switch (was_interrupted) {
+		case 0:
+		/* Some applications send SIGHUP in order to get init to reload
+		 * its configuration. We don't want to forward this onto the
+		 * application itself, because it probably isn't expecting this
+		 * signal since it was expecting init to do something with it.
+		 *
+		 * Instead, let's explicitly ignore it here. The actual
+		 * terminal case is handled in the monitor's handler, which
+		 * sends this task a SIGTERM in the case of a SIGHUP, which is
+		 * what we want.
+		 */
+		case SIGHUP:
+			break;
+		case SIGPWR:
+		case SIGTERM:
+			if (!shutdown) {
+				pid_t mypid = lxc_raw_getpid();
+
+				shutdown = 1;
+				prevent_forking();
+				if (mypid != 1) {
+					kill_children(mypid);
+				} else {
+					ret = kill(-1, SIGTERM);
+					if (ret < 0 && !quiet)
+						fprintf(stderr, "Failed to send SIGTERM to all children\n");
+				}
+				alarm(1);
+			}
+			break;
+		case SIGALRM: {
+			pid_t mypid = lxc_raw_getpid();
+
+			prevent_forking();
+			if (mypid != 1) {
+				kill_children(mypid);
+			} else {
+				ret = kill(-1, SIGKILL);
+				if (ret < 0 && !quiet)
+					fprintf(stderr, "Failed to send SIGTERM to all children\n");
+			}
+			break;
+		}
+		default:
+			kill(pid, was_interrupted);
+			break;
+		}
+		ret = EXIT_SUCCESS;
+
+		was_interrupted = 0;
+		waited_pid = wait(&status);
+		if (waited_pid < 0) {
+			if (errno == ECHILD)
+				goto out;
+
+			if (errno == EINTR)
+				continue;
+
+			if (!quiet)
+				fprintf(stderr, "Failed to wait on child %d\n", pid);
+			ret = -1;
+			goto out;
+		}
+
+		/* Reset timer each time a process exited. */
+		if (shutdown)
+			alarm(1);
+
+		/* Keep the exit code of the started application (not wrapped
+		 * pid) and continue to wait for the end of the orphan group.
+		 */
+		if (waited_pid == pid && !have_status) {
+			exit_with = lxc_error_set_and_log(waited_pid, status);
+			have_status = 1;
+		}
+	}
+out:
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+	exit(exit_with);
+}

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/initutils.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/initutils.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/list.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/list.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/log.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/log.c Changed

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
@@ -18,16 +16,16 @@
 #include <syslog.h>
 #include <unistd.h>
 
+#include "lxc.h"
+
 #include "caps.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
-#include "lxccontainer.h"
 #include "memory_utils.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
 #if HAVE_DLOG
@@ -45,8 +43,8 @@
 
 int lxc_log_fd = -EBADF;
 static bool wants_syslog = false;
-int lxc_quiet_specified;
-int lxc_log_use_global_fd;
+static int lxc_quiet_specified;
+bool lxc_log_use_global_fd = false;
 static int lxc_loglevel_specified;
 
 static char log_prefixLXC_LOG_PREFIX_SIZE = "lxc";
@@ -82,7 +80,7 @@
 	return LOG_NOTICE;
 }
 
-static const char *lxc_log_get_container_name()
+static const char *lxc_log_get_container_name(void)
 {
 #ifndef NO_LXC_CONF
 	if (current_config && !log_vmname)
@@ -92,6 +90,20 @@
 	return log_vmname;
 }
 
+int lxc_log_get_fd(void)
+{
+	int fd_log = -EBADF;
+
+#ifndef NO_LXC_CONF
+	if (current_config && !lxc_log_use_global_fd)
+		fd_log = current_config->logfd;
+#endif
+	if (fd_log < 0)
+		fd_log = lxc_log_fd;
+
+	return fd_log;
+}
+
 static char *lxc_log_get_va_msg(struct lxc_log_event *event)
 {
 	__do_free char *msg = NULL;
@@ -266,19 +278,19 @@
 	seconds = (time->tv_sec - d_in_s - h_in_s - (minutes * 60));
 
 	/* Make string from nanoseconds. */
-	ret = snprintf(nanosec, sizeof(nanosec), "%"PRId64, (int64_t)time->tv_nsec);
-	if (ret < 0 || (size_t)ret >= sizeof(nanosec))
+	ret = strnprintf(nanosec, sizeof(nanosec), "%"PRId64, (int64_t)time->tv_nsec);
+	if (ret < 0)
 		return ret_errno(EIO);
 
 	/*
 	 * Create final timestamp for the log and shorten nanoseconds to 3
 	 * digit precision.
 	 */
-	ret = snprintf(buf, bufsize,
+	ret = strnprintf(buf, bufsize,
 		       "%" PRId64 "%02" PRId64 "%02" PRId64 "%02" PRId64
 		       "%02" PRId64 "%02" PRId64 ".%.3s",
 		       year, month, day, hours, minutes, seconds, nanosec);
-	if (ret < 0 || (size_t)ret >= bufsize)
+	if (ret < 0)
 		return ret_errno(EIO);
 
 	return 0;
@@ -332,6 +344,10 @@
 	if (ret)
 		return ret;
 
+	/*
+	 * We allow truncation here which is why we use snprintf() directly
+	 * instead of strnprintf().
+	 */
 	n = snprintf(buffer, sizeof(buffer),
 		     "%s%s%s %s %-8s %s - %s:%s:%d - ",
 		     log_prefix,
@@ -471,6 +487,9 @@
 	__do_free char *n = NULL;
 	char *e, *p;
 
+	if (is_empty_string(name))
+		return ret_errno(EINVAL);
+
 	/* Make copy of the string since we'll be modifying it. */
 	n = strdup(name);
 	if (!n)
@@ -484,7 +503,14 @@
 			continue;
 		*p = '\0';
 
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		ret = lxc_unpriv(mkdir(n, 0755));
+#else
+		if (RUN_ON_OSS_FUZZ || is_in_comm("fuzz-lxc-") > 0)
+			ret = errno = EEXIST;
+		else
+			ret = lxc_unpriv(mkdir(n, 0755));
+#endif /*!FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */
 		*p = '/';
 		if (ret && errno != EEXIST)
 			return log_error_errno(-errno, errno, "Failed to create directory \"%s\"", n);
@@ -495,10 +521,15 @@
 
 static int log_open(const char *name)
 {
+	int newfd = -EBADF;
 	__do_close int fd = -EBADF;
-	int newfd;
 
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 	fd = lxc_unpriv(open(name, O_CREAT | O_WRONLY | O_APPEND | O_CLOEXEC, 0660));
+#else
+	if (!RUN_ON_OSS_FUZZ && is_in_comm("fuzz-lxc-") <= 0)
+		fd = lxc_unpriv(open(name, O_CREAT | O_WRONLY | O_APPEND | O_CLOEXEC, 0660));
+#endif /* !FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */
 	if (fd < 0)
 		return log_error_errno(-errno, errno, "Failed to open log file \"%s\"", name);
 
@@ -508,7 +539,6 @@
 	newfd = fcntl(fd, F_DUPFD_CLOEXEC, STDERR_FILENO);
 	if (newfd < 0)
 		return log_error_errno(-errno, errno, "Failed to dup log fd %d", fd);
-
 	return newfd;
 }
 
@@ -558,10 +588,10 @@
 		return ret_set_errno(NULL, ENOMEM);
 
 	if (use_dir)
-		ret = snprintf(p, len, "%s/%s/%s.log", lxcpath, name, name);
+		ret = strnprintf(p, len, "%s/%s/%s.log", lxcpath, name, name);
 	else
-		ret = snprintf(p, len, "%s/%s.log", lxcpath, name);
-	if (ret < 0 || (size_t)ret >= len)
+		ret = strnprintf(p, len, "%s/%s.log", lxcpath, name);
+	if (ret < 0)
 		return ret_set_errno(NULL, EIO);
 
 	return move_ptr(p);
@@ -581,7 +611,7 @@
 	if (lxc_log_fd >= 0)
 		lxc_log_close();
 
-	if (!fname)
+	if (is_empty_string(fname))
 		return ret_errno(EINVAL);
 
 	if (strlen(fname) == 0) {
@@ -652,14 +682,14 @@
 		log_vmname = strdup(log->name);
 
 	if (log->file) {
-		if (strcmp(log->file, "none") == 0)
+		if (strequal(log->file, "none"))
 			return 0;
 
 		ret = __lxc_log_set_file(log->file, 1);
 		if (ret < 0)
 			return log_error_errno(-1, errno, "Failed to enable logfile");
 
-		lxc_log_use_global_fd = 1;
+		lxc_log_use_global_fd = true;
 	} else {
 		/* if no name was specified, there nothing to do */
 		if (!log->name)
@@ -671,7 +701,7 @@
 			log->lxcpath = LOGPATH;
 
 		/* try LOGPATH if lxcpath is the default for the privileged containers */
-		if (!geteuid() && strcmp(LXCPATH, log->lxcpath) == 0)
+		if (!geteuid() && strequal(LXCPATH, log->lxcpath))
 			ret = _lxc_log_set_file(log->name, NULL, 0);
 
 		/* try in lxcpath */
@@ -762,9 +792,18 @@
 	return 0;
 }
 
-inline int lxc_log_get_level(void)
+int lxc_log_get_level(void)
 {
-	return lxc_log_category_lxc.priority;
+	int level = LXC_LOG_LEVEL_NOTSET;
+
+#ifndef NO_LXC_CONF
+	if (current_config)
+		level = current_config->loglevel;
+#endif
+	if (level == LXC_LOG_LEVEL_NOTSET)
+		level = lxc_log_category_lxc.priority;
+
+	return level;
 }
 
 bool lxc_log_has_valid_level(void)
@@ -788,13 +827,15 @@
 	if (*fd >= 0)
 		close_prot_errno_disarm(*fd);
 
+	if (is_empty_string(fname))
+		return ret_errno(EINVAL);
+
 	if (build_dir(fname))
 		return -errno;
 
 	*fd = log_open(fname);
 	if (*fd < 0)
 		return -errno;
-
 	return 0;
 }
 
@@ -814,7 +855,7 @@
 	return log_prefix;
 }
 
-inline void lxc_log_options_no_override()
+inline void lxc_log_options_no_override(void)
 {
 	lxc_quiet_specified = 1;
 	lxc_loglevel_specified = 1;

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/log.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/log.h Changed

@@ -3,9 +3,8 @@
 #ifndef __LXC_LOG_H
 #define __LXC_LOG_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -16,8 +15,8 @@
 #include <syslog.h>
 #include <time.h>
 
+#include "compiler.h"
 #include "conf.h"
-#include "config.h"
 
 #ifndef O_CLOEXEC
 #define O_CLOEXEC 02000000
@@ -27,8 +26,8 @@
 #define F_DUPFD_CLOEXEC 1030
 #endif
 
-#define LXC_LOG_PREFIX_SIZE	32
-#define LXC_LOG_BUFFER_SIZE	4096
+#define LXC_LOG_PREFIX_SIZE 32
+#define LXC_LOG_BUFFER_SIZE 4096
 
 /* predefined lxc log priorities. */
 enum lxc_loglevel {
@@ -84,7 +83,7 @@
 };
 
 #ifndef NO_LXC_CONF
-extern int lxc_log_use_global_fd;
+extern bool lxc_log_use_global_fd;
 #endif
 
 /*
@@ -276,13 +275,13 @@
 /*
  * Helper macro to define and use static categories.
  */
-#define lxc_log_category_define(name, parent)				\
+#define lxc_log_category_define(name, parent)					\
 	extern struct lxc_log_category lxc_log_category_##parent;	\
 	struct lxc_log_category lxc_log_category_##name = {		\
-		#name,							\
-		LXC_LOG_LEVEL_NOTSET,					\
-		NULL,							\
-		&lxc_log_category_##parent				\
+		#name,								\
+		LXC_LOG_LEVEL_NOTSET,						\
+		NULL,								\
+		&lxc_log_category_##parent					\
 	};
 
 #define lxc_log_define(name, parent)					\
@@ -305,15 +304,13 @@
  * Helper macro to define errno string.
  */
 #if HAVE_STRERROR_R
-	#ifndef HAVE_DECL_STRERROR_R
-		#ifdef STRERROR_R_CHAR_P
-			char *strerror_r(int errnum, char *buf, size_t buflen);
-		#else
-			int strerror_r(int errnum, char *buf, size_t buflen);
-		#endif
+	#if STRERROR_R_CHAR_P
+	char *strerror_r(int errnum, char *buf, size_t buflen);
+	#else
+	int strerror_r(int errnum, char *buf, size_t buflen);
 	#endif
 
-	#ifdef STRERROR_R_CHAR_P
+	#if STRERROR_R_CHAR_P
 		#define lxc_log_strerror_r                                               \
 			char errno_bufPATH_MAX / 2 = {"Failed to get errno string"};   \
 			char *ptr = NULL;                                                \
@@ -392,7 +389,7 @@
 	LXC_FATAL(&locinfo, format, ##__VA_ARGS__);			\
 } while (0)
 
-#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD
+#if (defined(__GNU_LIBRARY__) || defined(__MUSL__))  && !ENABLE_COVERITY_BUILD
 #define SYSTRACE(format, ...)                              \
 		TRACE("%m - " format, ##__VA_ARGS__)
 #else
@@ -403,7 +400,7 @@
 	} while (0)
 #endif
 
-#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD
+#if (defined(__GNU_LIBRARY__) || defined(__MUSL__))  && !ENABLE_COVERITY_BUILD
 #define SYSDEBUG(format, ...)                              \
                 DEBUG("%m - " format, ##__VA_ARGS__)
 #else
@@ -415,7 +412,7 @@
 #endif
 
 
-#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD
+#if (defined(__GNU_LIBRARY__) || defined(__MUSL__))  && !ENABLE_COVERITY_BUILD
 #define SYSINFO(format, ...)                              \
                 INFO("%m - " format, ##__VA_ARGS__)
 #else
@@ -426,7 +423,7 @@
 	} while (0)
 #endif
 
-#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD
+#if (defined(__GNU_LIBRARY__) || defined(__MUSL__))  && !ENABLE_COVERITY_BUILD
 #define SYSNOTICE(format, ...)                              \
 		NOTICE("%m - " format, ##__VA_ARGS__)
 #else
@@ -437,7 +434,7 @@
 	} while (0)
 #endif
 
-#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD
+#if (defined(__GNU_LIBRARY__) || defined(__MUSL__))  && !ENABLE_COVERITY_BUILD
 #define SYSWARN(format, ...)                              \
 		WARN("%m - " format, ##__VA_ARGS__)
 #else
@@ -448,7 +445,7 @@
 	} while (0)
 #endif
 
-#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD
+#if (defined(__GNU_LIBRARY__) || defined(__MUSL__))  && !ENABLE_COVERITY_BUILD
 #define SYSERROR(format, ...)                              \
 		ERROR("%m - " format, ##__VA_ARGS__)
 #else
@@ -459,7 +456,7 @@
 	} while (0)
 #endif
 
-#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD
+#if (defined(__GNU_LIBRARY__) || defined(__MUSL__))  && !ENABLE_COVERITY_BUILD
 #define CMD_SYSERROR(format, ...)                                             \
 	fprintf(stderr, "%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, \
 		__func__, ##__VA_ARGS__);
@@ -472,7 +469,7 @@
 	} while (0)
 #endif
 
-#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD
+#if (defined(__GNU_LIBRARY__) || defined(__MUSL__))  && !ENABLE_COVERITY_BUILD
 #define CMD_SYSINFO(format, ...)                                               \
 	printf("%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, __func__, \
 	       ##__VA_ARGS__);
@@ -560,17 +557,136 @@
 		__internal_ret__;                             \
 	})
 
+/* These are the logging return helpers to be used. */
+#define syserror(format, ...)                    \
+	({                                       \
+		SYSERROR(format, ##__VA_ARGS__); \
+		(-labs(errno));                  \
+	})
+
+#define syserror_set(__ret__, format, ...)                    \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		errno = labs(__ret__);                        \
+		SYSERROR(format, ##__VA_ARGS__);              \
+		__internal_ret__;                             \
+	})
+
+#define syserror_ret(__ret__, format, ...)                    \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		SYSERROR(format, ##__VA_ARGS__);              \
+		__internal_ret__;                             \
+	})
+
+#define error_ret(__ret__, format, ...)                       \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		ERROR(format, ##__VA_ARGS__);                 \
+		__internal_ret__;                             \
+	})
+
+#define syswarn(format, ...)                    \
+	({                                      \
+		SYSWARN(format, ##__VA_ARGS__); \
+		(-labs(errno));                 \
+	})
+
+#define syswarn_set(__ret__, format, ...)                     \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		errno = labs(__ret__);                        \
+		SYSWARN(format, ##__VA_ARGS__);               \
+		__internal_ret__;                             \
+	})
+
+#define syswarn_ret(__ret__, format, ...)                     \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		SYSWARN(format, ##__VA_ARGS__);               \
+		__internal_ret__;                             \
+	})
+
+#define sysinfo(format, ...)                    \
+	({                                      \
+		SYSINFO(format, ##__VA_ARGS__); \
+		(-labs(errno));                 \
+	})
+
+#define sysinfo_set(__ret__, format, ...)                     \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		errno = labs(__ret__);                        \
+		SYSINFO(format, ##__VA_ARGS__);               \
+		__internal_ret__;                             \
+	})
+
+#define sysinfo_ret(__ret__, format, ...)                    \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		SYSINFO(format, ##__VA_ARGS__);              \
+		__internal_ret__;                             \
+	})
+
+#define sysdebug(format, ...)                    \
+	({                                       \
+		SYSDEBUG(format, ##__VA_ARGS__); \
+		(-labs(errno));                  \
+	})
+
+#define sysdebug_set(__ret__, format, ...)                    \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		errno = labs(__ret__);                        \
+		SYSDEBUG(format, ##__VA_ARGS__);              \
+		__internal_ret__;                             \
+	})
+
+#define sysdebug_ret(__ret__, format, ...)                    \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		SYSDEBUG(format, ##__VA_ARGS__);              \
+		__internal_ret__;                             \
+	})
+
+#define systrace(format, ...)                    \
+	({                                       \
+		SYSTRACE(format, ##__VA_ARGS__); \
+		(-labs(errno));                  \
+	})
+
+#define systrace_set(__ret__, format, ...)                    \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		errno = labs(__ret__);                        \
+		SYSTRACE(format, ##__VA_ARGS__);              \
+		__internal_ret__;                             \
+	})
+
+#define systrace_ret(__ret__, format, ...)                    \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		SYSTRACE(format, ##__VA_ARGS__);              \
+		__internal_ret__;                             \
+	})
+
 extern int lxc_log_fd;
 
-extern int lxc_log_syslog(int facility);
-extern void lxc_log_syslog_enable(void);
-extern void lxc_log_syslog_disable(void);
-extern int lxc_log_set_level(int *dest, int level);
-extern int lxc_log_get_level(void);
-extern bool lxc_log_has_valid_level(void);
-extern int lxc_log_set_file(int *fd, const char *fname);
-extern const char *lxc_log_get_file(void);
-extern void lxc_log_set_prefix(const char *prefix);
-extern const char *lxc_log_get_prefix(void);
-extern void lxc_log_options_no_override(void);
-#endif
+__hidden extern int lxc_log_syslog(int facility);
+__hidden extern void lxc_log_syslog_enable(void);
+__hidden extern void lxc_log_syslog_disable(void);
+__hidden extern int lxc_log_set_level(int *dest, int level);
+__hidden extern int lxc_log_get_level(void);
+static inline bool lxc_log_trace(void)
+{
+	return lxc_log_get_level() <= LXC_LOG_LEVEL_TRACE;
+}
+__hidden extern bool lxc_log_has_valid_level(void);
+__hidden extern int lxc_log_set_file(int *fd, const char *fname);
+__hidden extern const char *lxc_log_get_file(void);
+__hidden extern void lxc_log_set_prefix(const char *prefix);
+__hidden extern const char *lxc_log_get_prefix(void);
+__hidden extern void lxc_log_options_no_override(void);
+__hidden extern int lxc_log_get_fd(void);
+
+#endif /* __LXC_LOG_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lsm/apparmor.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lsm/apparmor.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -13,27 +12,19 @@
 #include <unistd.h>
 
 #include "caps.h"
+#include "cgroups/cgroup_utils.h"
 #include "conf.h"
-#include "config.h"
 #include "initutils.h"
+#include "file_utils.h"
 #include "log.h"
 #include "lsm.h"
+#include "open_utils.h"
 #include "parse.h"
 #include "process_utils.h"
 #include "utils.h"
 
 lxc_log_define(apparmor, lsm);
 
-/* set by lsm_apparmor_drv_init if true */
-static int aa_enabled = 0;
-static bool aa_parser_available = false;
-static bool aa_supports_unix = false;
-static bool aa_can_stack = false;
-static bool aa_is_stacked = false;
-static bool aa_admin = false;
-
-static int mount_features_enabled = 0;
-
 #define AA_DEF_PROFILE "lxc-container-default"
 #define AA_DEF_PROFILE_CGNS "lxc-container-default-cgns"
 #define AA_MOUNT_RESTR "/sys/kernel/security/apparmor/features/mount/mask"
@@ -373,98 +364,128 @@
 "  mount options=(ro,remount),\n"
 ;
 
-static bool check_mount_feature_enabled(void)
-{
-	return mount_features_enabled == 1;
-}
-
-static void load_mount_features_enabled(void)
+static void load_mount_features_enabled(struct lsm_ops *ops)
 {
 	struct stat statbuf;
 	int ret;
 
 	ret = stat(AA_MOUNT_RESTR, &statbuf);
 	if (ret == 0)
-		mount_features_enabled = 1;
+		ops->aa_mount_features_enabled = 1;
 }
 
 /* aa_getcon is not working right now.  Use our hand-rolled version below */
-static int apparmor_enabled(void)
+static int apparmor_enabled(struct lsm_ops *ops)
 {
-	FILE *fin;
+	__do_fclose FILE *fin = NULL;
 	char e;
 	int ret;
 
 	fin = fopen_cloexec(AA_ENABLED_FILE, "r");
 	if (!fin)
 		return 0;
+
 	ret = fscanf(fin, "%c", &e);
-	fclose(fin);
 	if (ret == 1 && e == 'Y') {
-		load_mount_features_enabled();
+		load_mount_features_enabled(ops);
 		return 1;
 	}
 
 	return 0;
 }
 
-static char *apparmor_process_label_get(pid_t pid)
+static int __apparmor_process_label_open(struct lsm_ops *ops, pid_t pid, int o_flags, bool on_exec)
 {
-	char path100, *space;
+	int ret = -1;
+	int labelfd;
+	char pathLXC_LSMATTRLEN;
+
+	if (on_exec)
+		TRACE("On-exec not supported with AppArmor");
+
+	/* first try the apparmor subdir */
+	ret = snprintf(path, LXC_LSMATTRLEN, "/proc/%d/attr/apparmor/current", pid);
+	if (ret < 0 || (size_t)ret >= LXC_LSMATTRLEN)
+		return -1;
+
+	labelfd = open(path, o_flags);
+	if (labelfd >= 0)
+		return labelfd;
+	else if (errno != ENOENT)
+		goto error;
+
+	/* fallback to legacy global attr directory */
+	ret = snprintf(path, LXC_LSMATTRLEN, "/proc/%d/attr/current", pid);
+	if (ret < 0 || (size_t)ret >= LXC_LSMATTRLEN)
+		return -1;
+
+	labelfd = open(path, o_flags);
+	if (labelfd >= 0)
+		return labelfd;
+
+error:
+	return log_error_errno(-errno, errno, "Unable to open AppArmor LSM label file descriptor");
+}
+
+static char *apparmor_process_label_get(struct lsm_ops *ops, pid_t pid)
+{
+	__do_close int fd_label = -EBADF;
+	__do_free char *buf = NULL;
+	__do_free char *label = NULL;
 	int ret;
-	char *buf = NULL, *newbuf;
-	int sz = 0;
-	FILE *f;
+	size_t len;
 
-	ret = snprintf(path, 100, "/proc/%d/attr/current", pid);
-	if (ret < 0 || ret >= 100) {
-		ERROR("path name too long");
+	fd_label = __apparmor_process_label_open(ops, pid, O_RDONLY, false);
+	if (fd_label < 0)
 		return NULL;
-	}
-again:
-	f = fopen_cloexec(path, "r");
-	if (!f) {
-		SYSERROR("opening %s", path);
-		free(buf);
+
+	ret = fd_to_buf(fd_label, &buf, &len);
+	if (ret < 0)
 		return NULL;
-	}
-	sz += 1024;
-	newbuf = realloc(buf, sz);
-	if (!newbuf) {
-		free(buf);
-		ERROR("out of memory");
-		fclose(f);
+
+	if (len == 0)
 		return NULL;
-	}
-	buf = newbuf;
-	memset(buf, 0, sz);
-	ret = fread(buf, 1, sz - 1, f);
-	fclose(f);
-	if (ret < 0) {
-		ERROR("reading %s", path);
-		free(buf);
+
+	label = malloc(len + 1);
+	if (!label)
 		return NULL;
-	}
-	if (ret >= sz)
-		goto again;
-	space = strchr(buf, '\n');
-	if (space)
-		*space = '\0';
-	space = strchr(buf, ' ');
-	if (space)
-		*space = '\0';
-	return buf;
+	memcpy(label, buf, len);
+	labellen = '\0';
+
+	len = strcspn(label, "\n \t");
+	if (len)
+		labellen = '\0';
+
+	return move_ptr(label);
+}
+
+static char *apparmor_process_label_get_at(struct lsm_ops *ops, int fd_pid)
+{
+	__do_free char *label = NULL;
+	size_t len;
+
+	/* first try the apparmor subdir, then fall back to legacy interface */
+	label = read_file_at(fd_pid, "attr/apparmor/current", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH);
+	if (!label && errno == ENOENT)
+		label = read_file_at(fd_pid, "attr/current", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH);
+	if (!label)
+		return log_error_errno(NULL, errno, "Failed to get AppArmor context");
+
+	len = strcspn(label, "\n \t");
+	if (len)
+		labellen = '\0';
+	return move_ptr(label);
 }
 
 /*
  * Probably makes sense to reorganize these to only read
  * the label once
  */
-static bool apparmor_am_unconfined(void)
+static bool apparmor_am_unconfined(struct lsm_ops *ops)
 {
-	char *p = apparmor_process_label_get(lxc_raw_getpid());
+	char *p = apparmor_process_label_get(ops, lxc_raw_getpid());
 	bool ret = false;
-	if (!p || strcmp(p, "unconfined") == 0)
+	if (!p || strequal(p, "unconfined"))
 		ret = true;
 	free(p);
 	return ret;
@@ -474,9 +495,9 @@
 {
 	if (!curlabel)
 		return false;
-	if (strcmp(curlabel, "unconfined") == 0)
+	if (strequal(curlabel, "unconfined"))
 		return false;
-	if (strcmp(curlabel, "/usr/bin/lxc-start") == 0)
+	if (strequal(curlabel, "/usr/bin/lxc-start"))
 		return false;
 	return true;
 }
@@ -538,21 +559,23 @@
 	return full;
 }
 
-/* TODO: This is currently run only in the context of a constructor (via the
- * initial lsm_init() called due to its __attribute__((constructor)), so we
- * do not have ERROR/... macros available, so there are some fprintf(stderr)s
- * in there.
- */
-static bool check_apparmor_parser_version()
+static bool check_apparmor_parser_version(struct lsm_ops *ops)
 {
+	int major = 0, minor = 0, micro = 0, ret = 0;
 	struct lxc_popen_FILE *parserpipe;
 	int rc;
-	int major = 0, minor = 0, micro = 0;
+
+	switch (ops->aa_parser_available) {
+	case 0:
+		return false;
+	case 1:
+		return true;
+	}
 
 	parserpipe = lxc_popen("apparmor_parser --version");
 	if (!parserpipe) {
 		fprintf(stderr, "Failed to run check for apparmor_parser\n");
-		return false;
+		goto out;
 	}
 
 	rc = fscanf(parserpipe->f, "AppArmor parser version %d.%d.%d", &major, &minor, &micro);
@@ -562,30 +585,33 @@
 		 * lxc_popen executed failed to find the apparmor_parser binary.
 		 * See the TODO comment above for details.
 		 */
-		return false;
+		goto out;
 	}
 
 	rc = lxc_pclose(parserpipe);
 	if (rc < 0) {
 		fprintf(stderr, "Error waiting for child process\n");
-		return false;
+		goto out;
 	}
 	if (rc != 0) {
 		fprintf(stderr, "'apparmor_parser --version' executed with an error status\n");
-		return false;
+		goto out;
 	}
 
-	aa_supports_unix = (major > 2) ||
-	                   (major == 2 && minor > 10) ||
-	                   (major == 2 && minor == 10 && micro >= 95);
+	if ((major > 2) || (major == 2 && minor > 10) || (major == 2 && minor == 10 && micro >= 95))
+		ops->aa_supports_unix = 1;
 
-	return true;
+	ret = 1;
+
+out:
+	ops->aa_parser_available = ret;
+	return ret == 1;
 }
 
 static bool file_is_yes(const char *path)
 {
+	__do_close int fd = -EBADF;
 	ssize_t rd;
-	int fd;
 	char buf8; /* we actually just expect "yes" or "no" */
 
 	fd = open(path, O_RDONLY | O_CLOEXEC);
@@ -593,12 +619,11 @@
 		return false;
 
 	rd = lxc_read_nointr(fd, buf, sizeof(buf));
-	close(fd);
 
-	return rd >= 4 && strncmp(buf, "yes\n", 4) == 0;
+	return rd >= 4 && strnequal(buf, "yes\n", 4);
 }
 
-static bool apparmor_can_stack()
+static bool apparmor_can_stack(void)
 {
 	int major, minor, scanned;
 	FILE *f;
@@ -642,7 +667,7 @@
 
 static bool is_privileged(struct lxc_conf *conf)
 {
-	return lxc_list_empty(&conf->id_map);
+	return list_empty(&conf->id_map);
 }
 
 static const char* AA_ALL_DEST_PATH_LIST = {
@@ -695,13 +720,12 @@
 	const size_t buf_append_pos = strlen(buf);
 
 	const size_t opt_count = ARRAY_SIZE(REMOUNT_OPTIONS);
-	size_t opt_bits;
 
 	must_append_sized(profile, size,
 			  "# allow various ro-bind-*re*mounts\n",
 			  sizeof("# allow various ro-bind-*re*mounts\n")-1);
 
-	for (opt_bits = 0; opt_bits != 1 << opt_count; ++opt_bits) {
+	for (size_t opt_bits = 0; opt_bits != (size_t)1 << opt_count; ++opt_bits) {
 		size_t at = buf_append_pos;
 		unsigned bit = 1;
 		size_t o;
@@ -725,11 +749,11 @@
 	}
 }
 
-static char *get_apparmor_profile_content(struct lxc_conf *conf, const char *lxcpath)
+static char *get_apparmor_profile_content(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath)
 {
 	char *profile, *profile_name_full;
 	size_t size;
-	struct lxc_list *it;
+	struct string_entry *rule;
 
 	profile_name_full = apparmor_profile_full(conf->name, lxcpath);
 
@@ -744,7 +768,7 @@
 
 	append_all_remount_rules(&profile, &size);
 
-	if (aa_supports_unix)
+	if (ops->aa_supports_unix)
 		must_append_sized(&profile, &size, AA_PROFILE_UNIX_SOCKETS,
 		                  STRARRAYLEN(AA_PROFILE_UNIX_SOCKETS));
 
@@ -752,7 +776,7 @@
 		must_append_sized(&profile, &size, AA_PROFILE_CGROUP_NAMESPACES,
 		                  STRARRAYLEN(AA_PROFILE_CGROUP_NAMESPACES));
 
-	if (aa_can_stack && !aa_is_stacked) {
+	if (ops->aa_can_stack && !ops->aa_is_stacked) {
 		char *namespace, *temp;
 
 		must_append_sized(&profile, &size, AA_PROFILE_STACKING_BASE,
@@ -775,7 +799,7 @@
 		must_append_sized(&profile, &size, AA_PROFILE_NESTING_BASE,
 		                  STRARRAYLEN(AA_PROFILE_NESTING_BASE));
 
-		if (!aa_can_stack || aa_is_stacked) {
+		if (!ops->aa_can_stack || ops->aa_is_stacked) {
 			char *temp;
 
 			temp = must_concat(NULL, "  change_profile -> \"",
@@ -789,8 +813,8 @@
 		must_append_sized(&profile, &size, AA_PROFILE_UNPRIVILEGED,
 		                  STRARRAYLEN(AA_PROFILE_UNPRIVILEGED));
 
-	lxc_list_for_each(it, &conf->lsm_aa_raw) {
-		const char *line = it->elem;
+	list_for_each_entry(rule, &conf->lsm_aa_raw, head) {
+		const char *line = rule->val;
 
 		must_append_sized_full(&profile, &size, line, strlen(line), true);
 	}
@@ -832,11 +856,11 @@
 	return ret;
 }
 
-static bool make_apparmor_namespace(struct lxc_conf *conf, const char *lxcpath)
+static bool make_apparmor_namespace(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath)
 {
 	char *path;
 
-	if (!aa_can_stack || aa_is_stacked)
+	if (!ops->aa_can_stack || ops->aa_is_stacked)
 		return true;
 
 	path = make_apparmor_namespace_path(conf->name, lxcpath);
@@ -916,7 +940,7 @@
 	free(path);
 }
 
-static int load_apparmor_profile(struct lxc_conf *conf, const char *lxcpath)
+static int load_apparmor_profile(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath)
 {
 	struct stat profile_sb;
 	size_t content_len;
@@ -925,7 +949,7 @@
 	char *profile_path = NULL, *old_content = NULL, *new_content = NULL;
 	int profile_fd = -1;
 
-	if (!make_apparmor_namespace(conf, lxcpath))
+	if (!make_apparmor_namespace(ops, conf, lxcpath))
 		return -1;
 
 	/* In order to avoid forcing a profile parse (potentially slow) on
@@ -951,7 +975,7 @@
 		old_len = profile_sb.st_size;
 		old_content = lxc_strmmap(NULL, old_len, PROT_READ,
 		                          MAP_PRIVATE, profile_fd, 0);
-		if (!old_content) {
+		if (old_content == MAP_FAILED) {
 			SYSERROR("Failed to mmap old profile from %s",
 			         profile_path);
 			goto out;
@@ -961,7 +985,7 @@
 		goto out;
 	}
 
-	new_content = get_apparmor_profile_content(conf, lxcpath);
+	new_content = get_apparmor_profile_content(ops, conf, lxcpath);
 	if (!new_content)
 		goto out;
 
@@ -1019,9 +1043,9 @@
  * Ensure that the container's policy namespace is unloaded to free kernel
  * memory. This does not delete the policy from disk or cache.
  */
-static void apparmor_cleanup(struct lxc_conf *conf, const char *lxcpath)
+static void apparmor_cleanup(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath)
 {
-	if (!aa_admin)
+	if (!ops->aa_admin)
 		return;
 
 	if (!conf->lsm_aa_profile_created)
@@ -1033,34 +1057,32 @@
 	remove_apparmor_profile(conf, lxcpath);
 }
 
-static int apparmor_prepare(struct lxc_conf *conf, const char *lxcpath)
+static int apparmor_prepare(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath)
 {
 	int ret = -1;
 	const char *label;
 	char *curlabel = NULL, *genlabel = NULL;
 
-	if (!aa_enabled) {
-		ERROR("AppArmor not enabled");
-		return -1;
-	}
+	if (!ops->aa_enabled)
+		return log_error(-1, "AppArmor not enabled");
 
 	label = conf->lsm_aa_profile;
 
 	/* user may request that we just ignore apparmor */
-	if (label && strcmp(label, AA_UNCHANGED) == 0) {
+	if (label && strequal(label, AA_UNCHANGED)) {
 		INFO("AppArmor profile unchanged per user request");
 		conf->lsm_aa_profile_computed = must_copy_string(label);
 		return 0;
 	}
 
-	if (label && strcmp(label, AA_GENERATED) == 0) {
-		if (!aa_parser_available) {
+	if (label && strequal(label, AA_GENERATED)) {
+		if (!check_apparmor_parser_version(ops)) {
 			ERROR("Cannot use generated profile: apparmor_parser not available");
 			goto out;
 		}
 
 		/* auto-generate profile based on available/requested security features */
-		if (load_apparmor_profile(conf, lxcpath) != 0) {
+		if (load_apparmor_profile(ops, conf, lxcpath) != 0) {
 			ERROR("Failed to load generated AppArmor profile");
 			goto out;
 		}
@@ -1071,7 +1093,7 @@
 			goto out;
 		}
 
-		if (aa_can_stack && !aa_is_stacked) {
+		if (ops->aa_can_stack && !ops->aa_is_stacked) {
 			char *namespace = apparmor_namespace(conf->name, lxcpath);
 			size_t llen = strlen(genlabel);
 			must_append_sized(&genlabel, &llen, "//&:", STRARRAYLEN("//&:"));
@@ -1083,12 +1105,12 @@
 		label = genlabel;
 	}
 
-	curlabel = apparmor_process_label_get(lxc_raw_getpid());
+	curlabel = apparmor_process_label_get(ops, lxc_raw_getpid());
 
-	if (!aa_can_stack && aa_needs_transition(curlabel)) {
+	if (!ops->aa_can_stack && aa_needs_transition(curlabel)) {
 		/* we're already confined, and stacking isn't supported */
 
-		if (!label || strcmp(curlabel, label) == 0) {
+		if (!label || strequal(curlabel, label)) {
 			/* no change requested */
 			ret = 0;
 			goto out;
@@ -1105,7 +1127,7 @@
 			label = AA_DEF_PROFILE;
 	}
 
-	if (!check_mount_feature_enabled() && strcmp(label, "unconfined") != 0) {
+	if (!ops->aa_mount_features_enabled && !strequal(label, "unconfined")) {
 		WARN("Incomplete AppArmor support in your kernel");
 		if (!conf->lsm_aa_allow_incomplete) {
 			ERROR("If you really want to start this container, set");
@@ -1122,12 +1144,50 @@
 	if (genlabel) {
 		free(genlabel);
 		if (ret != 0)
-			apparmor_cleanup(conf, lxcpath);
+			apparmor_cleanup(ops, conf, lxcpath);
 	}
 	free(curlabel);
 	return ret;
 }
 
+static int apparmor_keyring_label_set(struct lsm_ops *ops, const char *label)
+{
+	return 0;
+}
+
+static int apparmor_process_label_fd_get(struct lsm_ops *ops, pid_t pid, bool on_exec)
+{
+	return __apparmor_process_label_open(ops, pid, O_RDWR, on_exec);
+}
+
+static int apparmor_process_label_set_at(struct lsm_ops *ops, int label_fd,
+					 const char *label, bool on_exec)
+{
+	__do_free char *command = NULL;
+	int ret = -1;
+	size_t len;
+
+	if (on_exec)
+		TRACE("Changing AppArmor profile on exec not supported");
+
+	len = strlen(label) + strlen("changeprofile ") + 1;
+	command = zalloc(len);
+	if (!command)
+		return ret_errno(ENOMEM);
+
+	ret = snprintf(command, len, "changeprofile %s", label);
+	if (ret < 0 || (size_t)ret >= len)
+		return -EFBIG;
+
+	ret = lxc_write_nointr(label_fd, command, len - 1);
+	if (ret < 0)
+		return syserror("Failed to write AppArmor profile \"%s\" to %d",
+				label, label_fd);
+
+	INFO("Set AppArmor label to \"%s\"", label);
+	return 0;
+}
+
 /*
  * apparmor_process_label_set: Set AppArmor process profile
  *
@@ -1140,90 +1200,83 @@
  *
  * Notes: This relies on /proc being available.
  */
-static int apparmor_process_label_set(const char *inlabel, struct lxc_conf *conf,
-				      bool on_exec)
+static int apparmor_process_label_set(struct lsm_ops *ops, const char *inlabel,
+				      struct lxc_conf *conf, bool on_exec)
 {
-	int label_fd, ret;
-	pid_t tid;
+	__do_close int label_fd = -EBADF;
+	int ret;
 	const char *label;
 
-	if (!aa_enabled) {
-		ERROR("AppArmor not enabled");
-		return -1;
-	}
+	if (!ops->aa_enabled)
+		return log_error_errno(-EOPNOTSUPP, EOPNOTSUPP, "AppArmor not enabled");
 
 	label = inlabel ? inlabel : conf->lsm_aa_profile_computed;
-	if (!label) {
-		ERROR("LSM wasn't prepared");
-		return -1;
-	}
+	if (!label)
+		return log_error_errno(-EINVAL, EINVAL, "LSM wasn't prepared");
 
 	/* user may request that we just ignore apparmor */
-	if (strcmp(label, AA_UNCHANGED) == 0) {
-		INFO("AppArmor profile unchanged per user request");
-		return 0;
-	}
+	if (strequal(label, AA_UNCHANGED))
+		return log_info(0, "AppArmor profile unchanged per user request");
 
-	if (strcmp(label, "unconfined") == 0 && apparmor_am_unconfined()) {
-		INFO("AppArmor profile unchanged");
-		return 0;
-	}
-	tid = lxc_raw_gettid();
-	label_fd = lsm_process_label_fd_get(tid, on_exec);
-	if (label_fd < 0) {
-		SYSERROR("Failed to change AppArmor profile to %s", label);
-		return -1;
-	}
+	if (strequal(label, "unconfined") && apparmor_am_unconfined(ops))
+		return log_info(0, "AppArmor profile unchanged");
 
-	ret = lsm_process_label_set_at(label_fd, label, on_exec);
-	close(label_fd);
-	if (ret < 0) {
-		ERROR("Failed to change AppArmor profile to %s", label);
-		return -1;
-	}
+	label_fd = apparmor_process_label_fd_get(ops, lxc_raw_gettid(), on_exec);
+	if (label_fd < 0)
+		return log_error_errno(-EINVAL, EINVAL, "Failed to change AppArmor profile to %s", label);
 
-	INFO("Changed AppArmor profile to %s", label);
-	return 0;
+	ret = apparmor_process_label_set_at(ops, label_fd, label, on_exec);
+	if (ret < 0)
+		return log_error_errno(-EINVAL, EINVAL, "Failed to change AppArmor profile to %s", label);
+
+	return log_info(0, "Changed AppArmor profile to %s", label);
 }
 
-static struct lsm_drv apparmor_drv = {
-	.name = "AppArmor",
-	.enabled           = apparmor_enabled,
-	.process_label_get = apparmor_process_label_get,
-	.process_label_set = apparmor_process_label_set,
-	.prepare           = apparmor_prepare,
-	.cleanup           = apparmor_cleanup,
+static struct lsm_ops apparmor_ops = {
+	.name				= "AppArmor",
+	.aa_admin			= -1,
+	.aa_can_stack			= -1,
+	.aa_enabled			= -1,
+	.aa_is_stacked			= -1,
+	.aa_mount_features_enabled	= -1,
+	.aa_parser_available		= -1,
+	.aa_supports_unix		= -1,
+	.cleanup			= apparmor_cleanup,
+	.enabled			= apparmor_enabled,
+	.keyring_label_set		= apparmor_keyring_label_set,
+	.prepare           		= apparmor_prepare,
+	.process_label_fd_get		= apparmor_process_label_fd_get,
+	.process_label_get 		= apparmor_process_label_get,
+	.process_label_set 		= apparmor_process_label_set,
+	.process_label_get_at 		= apparmor_process_label_get_at,
+	.process_label_set_at		= apparmor_process_label_set_at,
 };
 
-struct lsm_drv *lsm_apparmor_drv_init(void)
+struct lsm_ops *lsm_apparmor_ops_init(void)
 {
-	bool have_mac_admin = false;
-
-	if (!apparmor_enabled())
+	apparmor_ops.aa_admin = 0;
+	apparmor_ops.aa_can_stack = 0;
+	apparmor_ops.aa_enabled = 0;
+	apparmor_ops.aa_is_stacked = 0;
+	apparmor_ops.aa_mount_features_enabled = 0;
+	apparmor_ops.aa_parser_available = -1;
+	apparmor_ops.aa_supports_unix = 0;
+
+	if (!apparmor_enabled(&apparmor_ops))
 		return NULL;
 
-	/* We only support generated profiles when apparmor_parser is usable */
-	if (!check_apparmor_parser_version())
-		goto out;
-
-	aa_parser_available = true;
-
-	aa_can_stack = apparmor_can_stack();
-	if (aa_can_stack)
-		aa_is_stacked = file_is_yes("/sys/kernel/security/apparmor/.ns_stacked");
+	apparmor_ops.aa_can_stack = apparmor_can_stack();
+	if (apparmor_ops.aa_can_stack)
+		apparmor_ops.aa_is_stacked = file_is_yes("/sys/kernel/security/apparmor/.ns_stacked");
 
 	#if HAVE_LIBCAP
-	have_mac_admin = lxc_proc_cap_is_set(CAP_SETGID, CAP_EFFECTIVE);
+	apparmor_ops.aa_admin = lxc_proc_cap_is_set(CAP_SETGID, CAP_EFFECTIVE);
 	#endif
-
-	if (!have_mac_admin)
+	if (!apparmor_ops.aa_admin)
 		WARN("Per-container AppArmor profiles are disabled because the mac_admin capability is missing");
-	else if (am_host_unpriv() && !aa_is_stacked)
+	else if (am_host_unpriv() && !apparmor_ops.aa_is_stacked)
 		WARN("Per-container AppArmor profiles are disabled because LXC is running in an unprivileged container without stacking");
-	else
-		aa_admin = true;
 
-out:
-	aa_enabled = 1;
-	return &apparmor_drv;
+	apparmor_ops.aa_enabled = 1;
+	return &apparmor_ops;
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lsm/lsm.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lsm/lsm.c Changed

@@ -1,208 +1,40 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/mount.h>
 #include <sys/param.h>
 #include <unistd.h>
 
+#include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "log.h"
 #include "lsm.h"
 
 lxc_log_define(lsm, lxc);
 
-static struct lsm_drv *drv = NULL;
-
-extern struct lsm_drv *lsm_apparmor_drv_init(void);
-extern struct lsm_drv *lsm_selinux_drv_init(void);
-extern struct lsm_drv *lsm_nop_drv_init(void);
+__hidden extern struct lsm_ops *lsm_apparmor_ops_init(void);
+__hidden extern struct lsm_ops *lsm_selinux_ops_init(void);
+__hidden extern struct lsm_ops *lsm_nop_ops_init(void);
 
-__attribute__((constructor))
-void lsm_init(void)
+struct lsm_ops *lsm_init_static(void)
 {
-	if (drv) {
-		INFO("LSM security driver %s", drv->name);
-		return;
-	}
+	struct lsm_ops *ops = NULL;
 
 	#if HAVE_APPARMOR
-	drv = lsm_apparmor_drv_init();
+	ops = lsm_apparmor_ops_init();
 	#endif
+
 	#if HAVE_SELINUX
-	if (!drv)
-		drv = lsm_selinux_drv_init();
+	if (!ops)
+		ops = lsm_selinux_ops_init();
 	#endif
 
-	if (!drv)
-		drv = lsm_nop_drv_init();
-	INFO("Initialized LSM security driver %s", drv->name);
-}
-
-int lsm_enabled(void)
-{
-	if (drv)
-		return drv->enabled();
-	return 0;
-}
-
-const char *lsm_name(void)
-{
-	if (drv)
-		return drv->name;
-	return "none";
-}
-
-char *lsm_process_label_get(pid_t pid)
-{
-	if (!drv) {
-		ERROR("LSM driver not inited");
-		return NULL;
-	}
-	return drv->process_label_get(pid);
-}
-
-int lsm_process_label_fd_get(pid_t pid, bool on_exec)
-{
-	int ret = -1;
-	int labelfd = -1;
-	const char *name;
-	char pathLXC_LSMATTRLEN;
-
-	name = lsm_name();
-
-	if (strcmp(name, "nop") == 0)
-		return 0;
-
-	if (strcmp(name, "none") == 0)
-		return 0;
-
-	/* We don't support on-exec with AppArmor */
-	if (strcmp(name, "AppArmor") == 0)
-		on_exec = 0;
-
-	if (on_exec)
-		ret = snprintf(path, LXC_LSMATTRLEN, "/proc/%d/attr/exec", pid);
-	else
-		ret = snprintf(path, LXC_LSMATTRLEN, "/proc/%d/attr/current", pid);
-	if (ret < 0 || ret >= LXC_LSMATTRLEN)
-		return -1;
-
-	labelfd = open(path, O_RDWR);
-	if (labelfd < 0) {
-		SYSERROR("Unable to %s LSM label file descriptor", name);
-		return -1;
-	}
-
-	return labelfd;
-}
-
-int lsm_process_label_set_at(int label_fd, const char *label, bool on_exec)
-{
-	int ret = -1;
-	const char *name;
-
-	name = lsm_name();
-
-	if (strcmp(name, "nop") == 0)
-		return 0;
-
-	if (strcmp(name, "none") == 0)
-		return 0;
-
-	/* We don't support on-exec with AppArmor */
-	if (strcmp(name, "AppArmor") == 0)
-		on_exec = false;
-
-	if (strcmp(name, "AppArmor") == 0) {
-		size_t len;
-		char *command;
-
-		if (on_exec) {
-			ERROR("Changing AppArmor profile on exec not supported");
-			return -1;
-		}
-
-		len = strlen(label) + strlen("changeprofile ") + 1;
-		command = malloc(len);
-		if (!command)
-			goto on_error;
-
-		ret = snprintf(command, len, "changeprofile %s", label);
-		if (ret < 0 || (size_t)ret >= len) {
-			int saved_errno = errno;
-			free(command);
-			errno = saved_errno;
-			goto on_error;
-		}
-
-		ret = lxc_write_nointr(label_fd, command, len - 1);
-		free(command);
-	} else if (strcmp(name, "SELinux") == 0) {
-		ret = lxc_write_nointr(label_fd, label, strlen(label));
-	} else {
-		errno = EINVAL;
-		ret = -1;
-	}
-	if (ret < 0) {
-on_error:
-		SYSERROR("Failed to set %s label \"%s\"", name, label);
-		return -1;
-	}
-
-	INFO("Set %s label to \"%s\"", name, label);
-	return 0;
-}
-
-int lsm_process_label_set(const char *label, struct lxc_conf *conf,
-			  bool on_exec)
-{
-	if (!drv) {
-		ERROR("LSM driver not inited");
-		return -1;
-	}
-	return drv->process_label_set(label, conf, on_exec);
-}
-
-int lsm_process_prepare(struct lxc_conf *conf, const char *lxcpath)
-{
-	if (!drv) {
-		ERROR("LSM driver not inited");
-		return 0;
-	}
-
-	if (!drv->prepare)
-		return 0;
-
-	return drv->prepare(conf, lxcpath);
-}
-
-void lsm_process_cleanup(struct lxc_conf *conf, const char *lxcpath)
-{
-	if (!drv) {
-		ERROR("LSM driver not inited");
-		return;
-	}
-
-	if (!drv->cleanup)
-		return;
-
-	drv->cleanup(conf, lxcpath);
-}
-
-int lsm_keyring_label_set(char *label) {
-
-	if (!drv) {
-		ERROR("LSM driver not inited");
-		return -1;
-	}
-
-	if (!drv->keyring_label_set)
-		return 0;
+	if (!ops)
+		ops = lsm_nop_ops_init();
 
-	return drv->keyring_label_set(label);
+	INFO("Initialized LSM security driver %s", ops->name);
+	return ops;
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lsm/lsm.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lsm/lsm.h Changed

@@ -3,36 +3,39 @@
 #ifndef __LXC_LSM_H
 #define __LXC_LSM_H
 
+#include "config.h"
+
 struct lxc_conf;
 
 #include <sys/types.h>
 
+#include "compiler.h"
 #include "macro.h"
 #include "utils.h"
 
-struct lsm_drv {
+struct lsm_ops {
 	const char *name;
 
-	int (*enabled)(void);
-	char *(*process_label_get)(pid_t pid);
-	int (*process_label_set)(const char *label, struct lxc_conf *conf,
-				 bool on_exec);
-	int (*keyring_label_set)(char* label);
-	int (*prepare)(struct lxc_conf *conf, const char *lxcpath);
-	void (*cleanup)(struct lxc_conf *conf, const char *lxcpath);
+	/* AppArmor specific fields. */
+	int aa_enabled;
+	int aa_parser_available;
+	int aa_supports_unix;
+	int aa_can_stack;
+	int aa_is_stacked;
+	int aa_admin;
+	int aa_mount_features_enabled;
+
+	int (*enabled)(struct lsm_ops *ops);
+	char *(*process_label_get)(struct lsm_ops *ops, pid_t pid);
+	int (*process_label_set)(struct lsm_ops *ops, const char *label, struct lxc_conf *conf, bool on_exec);
+	int (*keyring_label_set)(struct lsm_ops *ops, const char *label);
+	int (*prepare)(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath);
+	void (*cleanup)(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath);
+	int (*process_label_fd_get)(struct lsm_ops *ops, pid_t pid, bool on_exec);
+	char *(*process_label_get_at)(struct lsm_ops *ops, int fd_pid);
+	int (*process_label_set_at)(struct lsm_ops *ops, int label_fd, const char *label, bool on_exec);
 };
 
-extern void lsm_init(void);
-extern int lsm_enabled(void);
-extern const char *lsm_name(void);
-extern char *lsm_process_label_get(pid_t pid);
-extern int lsm_process_prepare(struct lxc_conf *conf, const char *lxcpath);
-extern int lsm_process_label_set(const char *label, struct lxc_conf *conf,
-				 bool on_exec);
-extern int lsm_process_label_fd_get(pid_t pid, bool on_exec);
-extern int lsm_process_label_set_at(int label_fd, const char *label,
-				    bool on_exec);
-extern void lsm_process_cleanup(struct lxc_conf *conf, const char *lxcpath);
-extern int lsm_keyring_label_set(char *label);
+__hidden extern struct lsm_ops *lsm_init_static(void);
 
 #endif /* __LXC_LSM_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lsm/nop.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lsm/nop.c Changed

@@ -1,37 +1,77 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdlib.h>
 
-#include "config.h"
 #include "lsm/lsm.h"
 
-static char *nop_process_label_get(pid_t pid)
+static char *nop_process_label_get(struct lsm_ops *ops, pid_t pid)
+{
+	return NULL;
+}
+
+static char *nop_process_label_get_at(struct lsm_ops *ops, int fd_pid)
 {
 	return NULL;
 }
 
-static int nop_process_label_set(const char *label, struct lxc_conf *conf,
+static int nop_process_label_set(struct lsm_ops *ops, const char *label, struct lxc_conf *conf,
 				 bool on_exec)
 {
 	return 0;
 }
 
-static int nop_enabled(void)
+static int nop_enabled(struct lsm_ops *ops)
+{
+	return 0;
+}
+
+static int nop_keyring_label_set(struct lsm_ops *ops, const char *label)
+{
+	return 0;
+}
+
+static int nop_prepare(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath)
+{
+	return 0;
+}
+
+static void nop_cleanup(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath)
+{
+}
+
+static int nop_process_label_fd_get(struct lsm_ops *ops, pid_t pid, bool on_exec)
+{
+	return 0;
+}
+
+static int nop_process_label_set_at(struct lsm_ops *ops, int label_fd, const char *label, bool on_exec)
 {
 	return 0;
 }
 
-static struct lsm_drv nop_drv = {
-	.name = "nop",
-	.enabled           = nop_enabled,
-	.process_label_get = nop_process_label_get,
-	.process_label_set = nop_process_label_set,
+static struct lsm_ops nop_ops = {
+	.name				= "nop",
+	.aa_admin			= -1,
+	.aa_can_stack			= -1,
+	.aa_enabled			= -1,
+	.aa_is_stacked			= -1,
+	.aa_mount_features_enabled	= -1,
+	.aa_parser_available		= -1,
+	.aa_supports_unix		= -1,
+	.cleanup			= nop_cleanup,
+    	.enabled			= nop_enabled,
+    	.keyring_label_set		= nop_keyring_label_set,
+    	.prepare			= nop_prepare,
+    	.process_label_fd_get		= nop_process_label_fd_get,
+    	.process_label_get		= nop_process_label_get,
+	.process_label_set		= nop_process_label_set,
+	.process_label_get_at		= nop_process_label_get_at,
+	.process_label_set_at		= nop_process_label_set_at,
 };
 
-struct lsm_drv *lsm_nop_drv_init(void)
+struct lsm_ops *lsm_nop_ops_init(void)
 {
-	return &nop_drv;
+	return &nop_ops;
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lsm/selinux.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lsm/selinux.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <selinux/selinux.h>
 #include <stdbool.h>
@@ -12,9 +11,11 @@
 #include <unistd.h>
 
 #include "conf.h"
-#include "config.h"
+#include "file_utils.h"
 #include "log.h"
 #include "lsm.h"
+#include "memory_utils.h"
+#include "open_utils.h"
 
 #define DEFAULT_LABEL "unconfined_t"
 
@@ -30,21 +31,43 @@
  *
  * Note that this relies on /proc being available.
  */
-static char *selinux_process_label_get(pid_t pid)
+static char *selinux_process_label_get(struct lsm_ops *ops, pid_t pid)
 {
-	security_context_t ctx;
 	char *label;
 
-	if (getpidcon_raw(pid, &ctx) < 0) {
-		SYSERROR("failed to get SELinux context for pid %d", pid);
-		return NULL;
-	}
-	label = strdup((char *)ctx);
-	freecon(ctx);
+	if (getpidcon_raw(pid, &label) < 0)
+		return log_error_errno(NULL, errno, "failed to get SELinux context for pid %d", pid);
+
 	return label;
 }
 
 /*
+ * selinux_process_label_get_at: Get SELinux context of a process
+ *
+ * @fd_pid     : file descriptor to /proc/<pid> of the process
+ *
+ * Returns the context of the given pid. The caller must free()
+ * the returned string.
+ *
+ * Note that this relies on /proc being available.
+ */
+static char *selinux_process_label_get_at(struct lsm_ops *ops, int fd_pid)
+{
+	__do_free char *label = NULL;
+	size_t len;
+
+	label = read_file_at(fd_pid, "attr/current", PROTECT_OPEN, PROTECT_LOOKUP_BENEATH);
+	if (!label)
+		return log_error_errno(NULL, errno, "Failed to get SELinux context");
+
+	len = strcspn(label, "\n \t");
+	if (len)
+		labellen = '\0';
+
+	return move_ptr(label);
+}
+
+/*
  * selinux_process_label_set: Set SELinux context of a process
  *
  * @label   : label string
@@ -56,30 +79,26 @@
  *
  * Notes: This relies on /proc being available.
  */
-static int selinux_process_label_set(const char *inlabel, struct lxc_conf *conf,
-				     bool on_exec)
+static int selinux_process_label_set(struct lsm_ops *ops, const char *inlabel,
+				     struct lxc_conf *conf, bool on_exec)
 {
 	int ret;
 	const char *label;
 
 	label = inlabel ? inlabel : conf->lsm_se_context;
-	if (!label) {
-
+	if (!label)
 		label = DEFAULT_LABEL;
-	}
 
-	if (strcmp(label, "unconfined_t") == 0)
+	if (strequal(label, "unconfined_t"))
 		return 0;
 
 	if (on_exec)
 		ret = setexeccon_raw((char *)label);
 	else
 		ret = setcon_raw((char *)label);
-	if (ret < 0) {
-		SYSERROR("Failed to set SELinux%s context to \"%s\"",
-			 on_exec ? " exec" : "", label);
-		return -1;
-	}
+	if (ret < 0)
+		return log_error_errno(-1, errno, "Failed to set SELinux%s context to \"%s\"",
+				       on_exec ? " exec" : "", label);
 
 	INFO("Changed SELinux%s context to \"%s\"", on_exec ? " exec" : "", label);
 	return 0;
@@ -92,22 +111,84 @@
  *
  * Returns 0 on success, < 0 on failure
  */
-static int selinux_keyring_label_set(char *label)
+static int selinux_keyring_label_set(struct lsm_ops *ops, const char *label)
 {
 	return setkeycreatecon_raw(label);
-};
+}
+
+static int selinux_prepare(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath)
+{
+	return 0;
+}
+
+static void selinux_cleanup(struct lsm_ops *ops, struct lxc_conf *conf, const char *lxcpath)
+{
+}
+
+static int selinux_process_label_fd_get(struct lsm_ops *ops, pid_t pid, bool on_exec)
+{
+	int ret = -1;
+	int labelfd;
+	char pathLXC_LSMATTRLEN;
+
+	if (on_exec)
+		ret = snprintf(path, LXC_LSMATTRLEN, "/proc/%d/attr/exec", pid);
+	else
+		ret = snprintf(path, LXC_LSMATTRLEN, "/proc/%d/attr/current", pid);
+	if (ret < 0 || (size_t)ret >= LXC_LSMATTRLEN)
+		return -1;
+
+	labelfd = open(path, O_RDWR);
+	if (labelfd < 0)
+		return log_error_errno(-errno, errno, "Unable to open SELinux LSM label file descriptor");
+
+	return labelfd;
+}
 
-static struct lsm_drv selinux_drv = {
-	.name = "SELinux",
-	.enabled           = is_selinux_enabled,
-	.process_label_get = selinux_process_label_get,
-	.process_label_set = selinux_process_label_set,
-	.keyring_label_set = selinux_keyring_label_set,
+static int selinux_process_label_set_at(struct lsm_ops *ops, int label_fd, const char *label, bool on_exec)
+{
+	int ret;
+
+	if (!label)
+		return 0;
+
+	ret = lxc_write_nointr(label_fd, label, strlen(label));
+	if (ret < 0)
+		return log_error_errno(-errno, errno, "Failed to set AppArmor SELinux label to \"%s\"", label);
+
+	INFO("Set SELinux label to \"%s\"", label);
+	return 0;
+}
+
+static int selinux_enabled(struct lsm_ops *ops)
+{
+	return is_selinux_enabled();
+}
+
+static struct lsm_ops selinux_ops = {
+	.name				= "SELinux",
+	.aa_admin			= -1,
+	.aa_can_stack			= -1,
+	.aa_enabled			= -1,
+	.aa_is_stacked			= -1,
+	.aa_mount_features_enabled	= -1,
+	.aa_parser_available		= -1,
+	.aa_supports_unix		= -1,
+	.cleanup			= selinux_cleanup,
+	.enabled			= selinux_enabled,
+	.keyring_label_set		= selinux_keyring_label_set,
+	.prepare			= selinux_prepare,
+	.process_label_fd_get		= selinux_process_label_fd_get,
+	.process_label_get		= selinux_process_label_get,
+	.process_label_set		= selinux_process_label_set,
+	.process_label_get_at		= selinux_process_label_get_at,
+	.process_label_set_at		= selinux_process_label_set_at,
 };
 
-struct lsm_drv *lsm_selinux_drv_init(void)
+struct lsm_ops *lsm_selinux_ops_init(void)
 {
 	if (!is_selinux_enabled())
 		return NULL;
-	return &selinux_drv;
+
+	return &selinux_ops;
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lxc.functions.in -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lxc.functions.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lxc.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lxc.h Changed

@@ -3,6 +3,8 @@
 #ifndef __LXC_LXC_H
 #define __LXC_LXC_H
 
+#include "config.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -12,6 +14,11 @@
 #include <sys/select.h>
 #include <sys/types.h>
 
+#include "attach_options.h"
+#include "lxccontainer.h"
+
+#include "compiler.h"
+#include "memory_utils.h"
 #include "state.h"
 
 struct lxc_msg;
@@ -32,8 +39,8 @@
  * @daemonize    : whether or not the container is daemonized
  * Returns 0 on success, < 0 otherwise
  */
-extern int lxc_start(char *const argv, struct lxc_handler *handler,
-		     const char *lxcpath, bool daemonize, int *error_num);
+__hidden extern int lxc_start(char *const argv, struct lxc_handler *handler, const char *lxcpath,
+			      bool daemonize, int *error_num);
 
 /*
  * Start the specified command inside an application container
@@ -44,39 +51,37 @@
  * @daemonize    : whether or not the container is daemonized
  * Returns 0 on success, < 0 otherwise
  */
-extern int lxc_execute(const char *name, char *const argv, int quiet,
-		       struct lxc_handler *handler, const char *lxcpath,
-		       bool daemonize, int *error_num);
+__hidden extern int lxc_execute(const char *name, char *const argv, int quiet,
+				struct lxc_handler *handler, const char *lxcpath, bool daemonize,
+				int *error_num);
 
 /*
  * Close the fd associated with the monitoring
  * @fd : the file descriptor provided by lxc_monitor_open
  * Returns 0 on success, < 0 otherwise
  */
-extern int lxc_monitor_close(int fd);
+__hidden extern int lxc_monitor_close(int fd);
 
 /*
  * Freeze all the tasks running inside the container <name>
  * @name : the container name
  * Returns 0 on success, < 0 otherwise
  */
-extern int lxc_freeze(struct lxc_conf *conf, const char *name,
-		      const char *lxcpath);
+__hidden extern int lxc_freeze(struct lxc_conf *conf, const char *name, const char *lxcpath);
 
 /*
  * Unfreeze all previously frozen tasks.
  * @name : the name of the container
  * Return 0 on success, < 0 otherwise
  */
-extern int lxc_unfreeze(struct lxc_conf *conf, const char *name,
-			const char *lxcpath);
+__hidden extern int lxc_unfreeze(struct lxc_conf *conf, const char *name, const char *lxcpath);
 
 /*
  * Retrieve the container state
  * @name : the name of the container
  * Returns the state of the container on success, < 0 otherwise
  */
-extern lxc_state_t lxc_state(const char *name, const char *lxcpath);
+__hidden extern lxc_state_t lxc_state(const char *name, const char *lxcpath);
 
 /*
  * Create and return a new lxccontainer struct.
@@ -95,6 +100,13 @@
  * If it is the last reference, free the lxccontainer and return 1.
  */
 extern int lxc_container_put(struct lxc_container *c);
+static inline void put_lxc_container(struct lxc_container *c)
+{
+	if (c)
+		lxc_container_put(c);
+}
+define_cleanup_function(struct lxc_container *, put_lxc_container);
+#define __put_lxc_container call_cleaner(put_lxc_container)
 
 /*
  * Get a list of valid wait states.
@@ -105,17 +117,16 @@
 /*
  * Add a dependency to a container
  */
-extern int add_rdepend(struct lxc_conf *lxc_conf, char *rdepend);
+__hidden extern int add_rdepend(struct lxc_conf *lxc_conf, char *rdepend);
 
 /*
  * Set a key/value configuration option. Requires that to take a lock on the
  * in-memory config of the container.
  */
-extern int lxc_set_config_item_locked(struct lxc_conf *conf, const char *key,
-				      const char *v);
+__hidden extern int lxc_set_config_item_locked(struct lxc_conf *conf, const char *key, const char *v);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /* __LXC_LXC_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lxccontainer.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lxccontainer.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lxccontainer.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lxccontainer.h Changed

@@ -223,7 +223,8 @@
 
 	/*!
 	 * \brief Change whether the container wishes all file descriptors
-	 *  to be closed on startup.
+	 *  to be closed on startup. The LISTEN_FDS environment variable
+	 *  can be set to keep inherited file descriptors open.
 	 *
 	 * \param c Container.
 	 * \param state Value for the close_all_fds bit (0 or 1).
@@ -563,7 +564,7 @@
 	 * \param c Container.
 	 * \paramin,out ttynum Terminal number to attempt to allocate,
 	 *  or \c -1 to allocate the first available tty.
-	 * \paramout ptmxfd File descriptor referring to the ptmx side of the pty.
+	 * \paramout ptxfd File descriptor referring to the ptx side of the pty.
 	 *
 	 * \return tty file descriptor number on success, or \c -1 on
 	 *  failure.
@@ -575,7 +576,7 @@
 	 *  descriptor when no longer required so that it may be allocated
 	 *  by another caller.
 	 */
-	int (*console_getfd)(struct lxc_container *c, int *ttynum, int *ptmxfd);
+	int (*console_getfd)(struct lxc_container *c, int *ttynum, int *ptxfd);
 
 	/*!
 	 * \brief Allocate and run a console tty.
@@ -858,6 +859,15 @@
 	int (*seccomp_notify_fd)(struct lxc_container *c);
 
 	/*!
+	 * \brief Retrieve a file descriptor for the running container's seccomp filter.
+	 *
+	 * \param c Container
+	 *
+	 * \return file descriptor for the running container's seccomp filter
+	 */
+	int (*seccomp_notify_fd_active)(struct lxc_container *c);
+
+	/*!
 	 * \brief Retrieve a pidfd for the container's init process.
 	 *
 	 * \param c Container.
@@ -865,6 +875,15 @@
 	 * \return pidfd of init process of the container.
 	 */
 	int (*init_pidfd)(struct lxc_container *c);
+
+	/*!
+	 * \brief Retrieve a mount fd for the container's devpts instance.
+	 *
+	 * \param c Container.
+	 *
+	 * \return Mount fd of the container's devpts instance.
+	 */
+	int (*devpts_fd)(struct lxc_container *c);
 };
 
 /*!

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lxclock.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lxclock.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lxclock.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lxclock.h Changed

@@ -3,6 +3,8 @@
 #ifndef __LXC_LXCLOCK_H
 #define __LXC_LXCLOCK_H
 
+#include "config.h"
+
 #include <fcntl.h>
 #include <semaphore.h>
 #include <string.h>
@@ -11,6 +13,8 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "compiler.h"
+
 #ifndef F_OFD_GETLK
 #define F_OFD_GETLK	36
 #endif
@@ -71,7 +75,7 @@
  * freed when the container is freed), and \c u.f.fd = -1.
  *
  */
-extern struct lxc_lock *lxc_newlock(const char *lxcpath, const char *name);
+__hidden extern struct lxc_lock *lxc_newlock(const char *lxcpath, const char *name);
 
 /*!
  * \brief Take an existing lock.
@@ -89,7 +93,7 @@
  * (except in the test case) I may remove the support for it in sem as
  * well.
  */
-extern int lxclock(struct lxc_lock *lock, int timeout);
+__hidden extern int lxclock(struct lxc_lock *lock, int timeout);
 
 /*!
  * \brief Unlock specified lock previously locked using \ref lxclock().
@@ -99,24 +103,24 @@
  * \return \c 0 on success, \c -2 if provided lock was not already held,
  * otherwise \c -1 with \c errno saved from \c fcntl(2) or sem_post function.
  */
-extern int lxcunlock(struct lxc_lock *lock);
+__hidden extern int lxcunlock(struct lxc_lock *lock);
 
 /*!
  * \brief Free a lock created by \ref lxc_newlock().
  *
  * \param lock Lock.
  */
-extern void lxc_putlock(struct lxc_lock *lock);
+__hidden extern void lxc_putlock(struct lxc_lock *lock);
 
 /*!
  * \brief Lock the current process.
  */
-extern void process_lock(void);
+__hidden extern void process_lock(void);
 
 /*!
  * \brief Unlock the current process.
  */
-extern void process_unlock(void);
+__hidden extern void process_unlock(void);
 
 struct lxc_container;
 
@@ -127,14 +131,14 @@
  *
  * \return As for \ref lxclock().
  */
-extern int container_mem_lock(struct lxc_container *c);
+__hidden extern int container_mem_lock(struct lxc_container *c);
 
 /*!
  * \brief Unlock the containers memory.
  *
  * \param c Container.
  */
-extern void container_mem_unlock(struct lxc_container *c);
+__hidden extern void container_mem_unlock(struct lxc_container *c);
 
 /*!
  * \brief Lock the containers disk data.
@@ -144,7 +148,7 @@
  * \return \c 0 on success, or an \ref lxclock() error return
  * values on error.
  */
-extern int container_disk_lock(struct lxc_container *c);
+__hidden extern int container_disk_lock(struct lxc_container *c);
 
 /*!
  * \brief Unlock the containers disk data.
@@ -152,6 +156,6 @@
  * \param c Container.
  *
  */
-extern void container_disk_unlock(struct lxc_container *c);
+__hidden extern void container_disk_unlock(struct lxc_container *c);
 
 #endif

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/lxcseccomp.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/lxcseccomp.h Changed

@@ -3,32 +3,33 @@
 #ifndef __LXC_LXCSECCOMP_H
 #define __LXC_LXCSECCOMP_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
-#ifdef HAVE_SECCOMP
+
+#if HAVE_SECCOMP
 #include <linux/seccomp.h>
 #include <seccomp.h>
 #endif
+
 #if HAVE_DECL_SECCOMP_NOTIFY_FD
 #include <sys/socket.h>
 #include <sys/un.h>
 #endif
 
+#include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "memory_utils.h"
 
 struct lxc_conf;
-struct lxc_epoll_descr;
+struct lxc_async_descr;
 struct lxc_handler;
 
 #ifndef SECCOMP_FILTER_FLAG_NEW_LISTENER
 #define SECCOMP_FILTER_FLAG_NEW_LISTENER (1UL << 3)
 #endif
 
-#ifdef HAVE_SECCOMP
+#if HAVE_SECCOMP
 
 
 #if HAVE_DECL_SECCOMP_NOTIFY_FD
@@ -61,8 +62,6 @@
 	char *cookie;
 };
 
-#define HAVE_SECCOMP_NOTIFY 1
-
 #endif /* HAVE_DECL_SECCOMP_NOTIFY_FD */
 
 struct lxc_seccomp {
@@ -77,21 +76,28 @@
 #endif /* HAVE_DECL_SECCOMP_NOTIFY_FD */
 };
 
-extern int lxc_seccomp_load(struct lxc_conf *conf);
-extern int lxc_read_seccomp_config(struct lxc_conf *conf);
-extern void lxc_seccomp_free(struct lxc_seccomp *seccomp);
-extern int seccomp_notify_handler(int fd, uint32_t events, void *data,
-				  struct lxc_epoll_descr *descr);
-extern void seccomp_conf_init(struct lxc_conf *conf);
-extern int lxc_seccomp_setup_proxy(struct lxc_seccomp *seccomp,
-				   struct lxc_epoll_descr *descr,
-				   struct lxc_handler *handler);
-extern int lxc_seccomp_send_notifier_fd(struct lxc_seccomp *seccomp,
-					int socket_fd);
-extern int lxc_seccomp_recv_notifier_fd(struct lxc_seccomp *seccomp,
-					int socket_fd);
-extern int lxc_seccomp_add_notifier(const char *name, const char *lxcpath,
-				    struct lxc_seccomp *seccomp);
+__hidden extern int lxc_seccomp_load(struct lxc_conf *conf);
+__hidden extern int lxc_read_seccomp_config(struct lxc_conf *conf);
+__hidden extern void lxc_seccomp_free(struct lxc_seccomp *seccomp);
+__hidden extern int seccomp_notify_cleanup_handler(int fd, void *data);
+__hidden extern int seccomp_notify_handler(int fd, uint32_t events, void *data,
+					   struct lxc_async_descr *descr);
+__hidden extern void seccomp_conf_init(struct lxc_conf *conf);
+__hidden extern int lxc_seccomp_setup_proxy(struct lxc_seccomp *seccomp,
+					    struct lxc_async_descr *descr,
+					    struct lxc_handler *handler);
+__hidden extern int lxc_seccomp_send_notifier_fd(struct lxc_seccomp *seccomp, int socket_fd);
+__hidden extern int lxc_seccomp_recv_notifier_fd(struct lxc_seccomp *seccomp, int socket_fd);
+__hidden extern int lxc_seccomp_add_notifier(const char *name, const char *lxcpath,
+					     struct lxc_seccomp *seccomp);
+static inline void lxc_seccomp_close_notifier_fd(struct lxc_seccomp *seccomp)
+{
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
+	if (seccomp->notifier.wants_supervision)
+		close_prot_errno_disarm(seccomp->notifier.notify_fd);
+#endif
+}
+
 static inline int lxc_seccomp_get_notify_fd(struct lxc_seccomp *seccomp)
 {
 #if HAVE_DECL_SECCOMP_NOTIFY_FD
@@ -124,9 +130,14 @@
 }
 
 static inline int seccomp_notify_handler(int fd, uint32_t events, void *data,
-				  struct lxc_epoll_descr *descr)
+				  struct lxc_async_descr *descr)
 {
-	return -ENOSYS;
+	return ret_errno(ENOSYS);
+}
+
+static inline int seccomp_notify_cleanup_handler(void *data)
+{
+	return ret_errno(ENOSYS);
 }
 
 static inline void seccomp_conf_init(struct lxc_conf *conf)
@@ -134,7 +145,7 @@
 }
 
 static inline int lxc_seccomp_setup_proxy(struct lxc_seccomp *seccomp,
-					  struct lxc_epoll_descr *descr,
+					  struct lxc_async_descr *descr,
 					  struct lxc_handler *handler)
 {
 	return 0;
@@ -163,5 +174,9 @@
 	return -EBADF;
 }
 
+static inline void lxc_seccomp_close_notifier_fd(struct lxc_seccomp *seccomp)
+{
+}
+
 #endif /* HAVE_SECCOMP */
 #endif /* __LXC_LXCSECCOMP_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/macro.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/macro.h Changed

@@ -3,13 +3,12 @@
 #ifndef __LXC_MACRO_H
 #define __LXC_MACRO_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <asm/types.h>
 #include <limits.h>
 #include <linux/if_link.h>
+#include <linux/ioctl.h>
 #include <linux/loop.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -21,10 +20,16 @@
 #include <sys/un.h>
 #include <unistd.h>
 
+#include "compiler.h"
+
 #ifndef PATH_MAX
 #define PATH_MAX 4096
 #endif
 
+#ifndef MAX_GRBUF_SIZE
+#define MAX_GRBUF_SIZE 2097152
+#endif
+
 #define INT64_FMT "%" PRId64
 
 /* Define __S_ISTYPE if missing from the C library. */
@@ -32,43 +37,190 @@
 #define __S_ISTYPE(mode, mask) (((mode)&S_IFMT) == (mask))
 #endif
 
+/*
+ * POLL_ADD flags. Note that since sqe->poll_events is the flag space, the
+ * command flags for POLL_ADD are stored in sqe->len.
+ *
+ * IORING_POLL_ADD_MULTI	Multishot poll. Sets IORING_CQE_F_MORE if
+ *				the poll handler will continue to report
+ *				CQEs on behalf of the same SQE.
+ */
+#ifndef IORING_POLL_ADD_MULTI
+#define IORING_POLL_ADD_MULTI (1U << 0)
+#endif
+
+/*
+ * cqe->flags
+ *
+ * IORING_CQE_F_MORE	If set, parent SQE will generate more CQE entries
+ */
+#ifndef IORING_CQE_F_MORE
+#define IORING_CQE_F_MORE (1U << 1)
+#endif
+
 /* capabilities */
+#ifndef CAP_CHOWN
+#define CAP_CHOWN            	0
+#endif
+
+#ifndef CAP_DAC_OVERRIDE
+#define CAP_DAC_OVERRIDE     	1
+#endif
+
+#ifndef CAP_DAC_READ_SEARCH
+#define CAP_DAC_READ_SEARCH  	2
+#endif
+
+#ifndef CAP_FOWNER
+#define CAP_FOWNER           	3
+#endif
+
+#ifndef CAP_FSETID
+#define CAP_FSETID           	4
+#endif
+
+#ifndef CAP_KILL
+#define CAP_KILL             	5
+#endif
+
+#ifndef CAP_SETGID
+#define CAP_SETGID           	6
+#endif
+
+#ifndef CAP_SETUID
+#define CAP_SETUID           	7
+#endif
+
+#ifndef CAP_SETPCAP
+#define CAP_SETPCAP          	8
+#endif
+
+#ifndef CAP_LINUX_IMMUTABLE
+#define CAP_LINUX_IMMUTABLE  	9
+#endif
+
+#ifndef CAP_NET_BIND_SERVICE
+#define CAP_NET_BIND_SERVICE 	10
+#endif
+
+#ifndef CAP_NET_BROADCAST
+#define CAP_NET_BROADCAST    	11
+#endif
+
+#ifndef CAP_NET_ADMIN
+#define CAP_NET_ADMIN        	12
+#endif
+
+#ifndef CAP_NET_RAW
+#define CAP_NET_RAW          	13
+#endif
+
+#ifndef CAP_IPC_LOCK
+#define CAP_IPC_LOCK         	14
+#endif
+
+#ifndef CAP_IPC_OWNER
+#define CAP_IPC_OWNER        	15
+#endif
+
+#ifndef CAP_SYS_MODULE
+#define CAP_SYS_MODULE       	16
+#endif
+
+#ifndef CAP_SYS_RAWIO
+#define CAP_SYS_RAWIO        	17
+#endif
+
+#ifndef CAP_SYS_CHROOT
+#define CAP_SYS_CHROOT       	18
+#endif
+
+#ifndef CAP_SYS_PTRACE
+#define CAP_SYS_PTRACE       	19
+#endif
+
+#ifndef CAP_SYS_PACCT
+#define CAP_SYS_PACCT        	20
+#endif
+
 #ifndef CAP_SYS_ADMIN
-#define CAP_SYS_ADMIN 21
+#define CAP_SYS_ADMIN        	21
+#endif
+
+#ifndef CAP_SYS_BOOT
+#define CAP_SYS_BOOT         	22
+#endif
+
+#ifndef CAP_SYS_NICE
+#define CAP_SYS_NICE         	23
+#endif
+
+#ifndef CAP_SYS_RESOURCE
+#define CAP_SYS_RESOURCE     	24
+#endif
+
+#ifndef CAP_SYS_TIME
+#define CAP_SYS_TIME         	25
+#endif
+
+#ifndef CAP_SYS_TTY_CONFIG
+#define CAP_SYS_TTY_CONFIG   	26
+#endif
+
+#ifndef CAP_MKNOD
+#define CAP_MKNOD            	27
+#endif
+
+#ifndef CAP_LEASE
+#define CAP_LEASE            	28
+#endif
+
+#ifndef CAP_AUDIT_WRITE
+#define CAP_AUDIT_WRITE      	29
+#endif
+
+#ifndef CAP_AUDIT_CONTROL
+#define CAP_AUDIT_CONTROL    	30
 #endif
 
 #ifndef CAP_SETFCAP
-#define CAP_SETFCAP 31
+#define CAP_SETFCAP	     	31
 #endif
 
 #ifndef CAP_MAC_OVERRIDE
-#define CAP_MAC_OVERRIDE 32
+#define CAP_MAC_OVERRIDE     	32
 #endif
 
 #ifndef CAP_MAC_ADMIN
-#define CAP_MAC_ADMIN 33
+#define CAP_MAC_ADMIN        	33
 #endif
 
-#ifndef CAP_SETUID
-#define CAP_SETUID 7
+#ifndef CAP_SYSLOG
+#define CAP_SYSLOG           	34
 #endif
 
-#ifndef CAP_SETGID
-#define CAP_SETGID 6
+#ifndef CAP_WAKE_ALARM
+#define CAP_WAKE_ALARM       	35
+#endif
+
+#ifndef CAP_BLOCK_SUSPEND
+#define CAP_BLOCK_SUSPEND    	36
 #endif
 
-/* move_mount */
-#ifndef MOVE_MOUNT_F_EMPTY_PATH
-#define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */
+#ifndef CAP_AUDIT_READ
+#define CAP_AUDIT_READ		37
 #endif
 
-/* open_tree */
-#ifndef OPEN_TREE_CLONE
-#define OPEN_TREE_CLONE 1 /* Clone the target tree and attach the clone */
+#ifndef CAP_PERFMON
+#define CAP_PERFMON		38
 #endif
 
-#ifndef OPEN_TREE_CLOEXEC
-#define OPEN_TREE_CLOEXEC O_CLOEXEC /* Close the file on execve() */
+#ifndef CAP_BPF
+#define CAP_BPF			39
+#endif
+
+#ifndef CAP_CHECKPOINT_RESTORE
+#define CAP_CHECKPOINT_RESTORE	40
 #endif
 
 /* prctl */
@@ -163,9 +315,30 @@
  *                +
  * \0           =    1
  */
+#define LXC_PROC_PID_LEN \
+	(6 + INTTYPE_TO_STRLEN(pid_t) + 1)
+
+/* /proc/       =    6
+ *                +
+ * <pid-as-str> =   INTTYPE_TO_STRLEN(pid_t)
+ *                +
+ * /fd/         =    4
+ *                +
+ * <fd-as-str>  =   INTTYPE_TO_STRLEN(int)
+ *                +
+ * \0           =    1
+ */
 #define LXC_PROC_PID_FD_LEN \
 	(6 + INTTYPE_TO_STRLEN(pid_t) + 4 + INTTYPE_TO_STRLEN(int) + 1)
 
+/* /proc/self/fd/ =    14
+ *                   +
+ * <fd-as-str>    =    INTTYPE_TO_STRLEN(int)
+ *                   +
+ * \0           =      1
+ */
+#define LXC_PROC_SELF_FD_LEN (14 + INTTYPE_TO_STRLEN(int) + 1)
+
 /* /proc/        = 6
  *               +
  * <pid-as-str>  = INTTYPE_TO_STRLEN(pid_t)
@@ -182,11 +355,31 @@
  *               +
  * /attr/        = 6
  *               +
+ * /apparmor/    = 10
+ *               +
  * /current      = 8
  *               +
  * \0            = 1
  */
-#define LXC_LSMATTRLEN (6 + INTTYPE_TO_STRLEN(pid_t) + 6 + 8 + 1)
+#define LXC_LSMATTRLEN (6 + INTTYPE_TO_STRLEN(pid_t) + 6 + 10 + 8 + 1)
+
+/* MAX_NS_PROC_NAME = MAX_NS_PROC_NAME
+ *                  +
+ * :                = 1
+ *                  +
+ * /proc/           = 6
+ *                  +
+ * <pid-as_str>     = INTTYPE_TO_STRLEN(pid_t)
+ *                  +
+ * /fd/             = 4
+ *                  +
+ * <int-as-str>     = INTTYPE_TO_STRLEN(int)
+ *                  +
+ * \0               = 1
+ */
+#define LXC_EXPOSE_NAMESPACE_LEN                                   \
+	(MAX_NS_PROC_NAME + 1 + 6 + INTTYPE_TO_STRLEN(pid_t) + 4 + \
+	 INTTYPE_TO_STRLEN(int) + 1)
 
 #define LXC_CMD_DATA_MAX (PATH_MAX * 2)
 
@@ -235,11 +428,6 @@
 	} while (0)
 #endif
 
-#define lxc_iterate_parts(__iterator, __splitme, __separators)                  \
-	for (char *__p = NULL, *__it = strtok_r(__splitme, __separators, &__p); \
-	     (__iterator = __it);                                               \
-	     __iterator = __it = strtok_r(NULL, __separators, &__p))
-
 #define prctl_arg(x) ((unsigned long)x)
 
 /* networking */
@@ -380,6 +568,34 @@
 #define IPVLAN_ISOLATION_VEPA 2
 #endif
 
+#ifndef BRIDGE_VLAN_NONE
+#define BRIDGE_VLAN_NONE -1 /* Bridge VLAN option set to "none". */
+#endif
+
+#ifndef BRIDGE_VLAN_ID_MAX
+#define BRIDGE_VLAN_ID_MAX 4094 /* Bridge VLAN MAX VLAN ID. */
+#endif
+
+#ifndef BRIDGE_FLAGS_MASTER
+#define BRIDGE_FLAGS_MASTER 1 /* Bridge command to/from parent */
+#endif
+
+#ifndef BRIDGE_VLAN_INFO_PVID
+#define BRIDGE_VLAN_INFO_PVID (1<<1) /* VLAN is PVID, ingress untagged */
+#endif
+
+#ifndef BRIDGE_VLAN_INFO_UNTAGGED
+#define BRIDGE_VLAN_INFO_UNTAGGED (1<<2) /* VLAN egresses untagged */
+#endif
+
+#ifndef IFLA_BRIDGE_FLAGS
+#define IFLA_BRIDGE_FLAGS 0
+#endif
+
+#ifndef IFLA_BRIDGE_VLAN_INFO
+#define IFLA_BRIDGE_VLAN_INFO 2
+#endif
+
 /* Attributes of RTM_NEWNSID/RTM_GETNSID messages */
 enum {
 	__LXC_NETNSA_NONE,
@@ -431,7 +647,8 @@
 #define PTR_TO_PID(p) ((pid_t)((intptr_t)(p)))
 #define PID_TO_PTR(u) ((void *)((intptr_t)(u)))
 
-#define PTR_TO_UINT64(p) ((uint64_t)((intptr_t)(p)))
+#define PTR_TO_UINT64(p) ((uint64_t)((uintptr_t)(p)))
+#define PTR_TO_U64(p) ((__u64)((uintptr_t)(p)))
 
 #define UINT_TO_PTR(u) ((void *) ((uintptr_t) (u)))
 #define PTR_TO_USHORT(p) ((unsigned short)((uintptr_t)(p)))
@@ -466,16 +683,10 @@
 		__internal_ret__;                             \
 	})
 
-#define ret_errno(__errno__)         \
-	({                           \
-		errno = (__errno__); \
-		-(__errno__);        \
-	})
-
-#define free_move_ptr(a, b)          \
-	({                           \
-		free(a);             \
-		(a) = move_ptr((b)); \
+#define ret_errno(__errno__)             \
+	({                               \
+		errno = labs(__errno__); \
+		-errno;                  \
 	})
 
 /* Container's specific file/directory names */
@@ -490,4 +701,124 @@
 							     typeof(&*(x))), \
 			       sizeof(x) / sizeof((x)0), ((void)0)))
 
+#ifndef TIOCGPTPEER
+	#if defined __sparc__
+		#define TIOCGPTPEER _IO('t', 137)
+	#else
+		#define TIOCGPTPEER _IO('T', 0x41)
+	#endif
+#endif
+
+#define ENOCGROUP2 ENOMEDIUM
+
+#define MAX_FILENO ~0U
+
+#define swap(a, b)                     \
+	do {                           \
+		typeof(a) __tmp = (a); \
+		(a) = (b);             \
+		(b) = __tmp;           \
+	} while (0)
+
+#define min(x, y)                              \
+	({                                     \
+		typeof(x) _min1 = (x);         \
+		typeof(y) _min2 = (y);         \
+		(void)(&_min1 == &_min2);      \
+		_min1 < _min2 ? _min1 : _min2; \
+	})
+
+#define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
+
+/*
+ * Compile time versions of __arch_hweightN()
+ */
+#define __const_hweight8(w)		\
+	((unsigned int)			\
+	 ((!!((w) & (1ULL << 0))) +	\
+	  (!!((w) & (1ULL << 1))) +	\
+	  (!!((w) & (1ULL << 2))) +	\
+	  (!!((w) & (1ULL << 3))) +	\
+	  (!!((w) & (1ULL << 4))) +	\
+	  (!!((w) & (1ULL << 5))) +	\
+	  (!!((w) & (1ULL << 6))) +	\
+	  (!!((w) & (1ULL << 7)))))
+
+#define __const_hweight16(w) (__const_hweight8(w)  + __const_hweight8((w)  >> 8 ))
+#define __const_hweight32(w) (__const_hweight16(w) + __const_hweight16((w) >> 16))
+#define __const_hweight64(w) (__const_hweight32(w) + __const_hweight32((w) >> 32))
+
+#define hweight8(w) __const_hweight8(w)
+#define hweight16(w) __const_hweight16(w)
+#define hweight32(w) __const_hweight32(w)
+#define hweight64(w) __const_hweight64(w)
+
+#if !HAVE___ALIGNED_U64
+#define __aligned_u64 __u64 __attribute__((aligned(8)))
+#endif
+
+#define BITS_PER_BYTE 8
+#define BITS_PER_TYPE(type) (sizeof(type) * 8)
+#define LAST_BIT_PER_TYPE(type) (BITS_PER_TYPE(type) - 1)
+
+#if !HAVE_SYS_PERSONALITY_H
+#define PER_LINUX	0x0000
+#define PER_LINUX32	0x0008
+#endif
+
+static inline bool has_exact_flags(__u32 flags, __u32 mask)
+{
+	return (flags & mask) == mask;
+}
+
+/**
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr:	the pointer to the member.
+ * @type:	the type of the container struct this is embedded in.
+ * @member:	the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member) ({				\
+	void *__mptr = (void *)(ptr);					\
+	BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) &&	\
+			 !__same_type(*(ptr), void),			\
+			 "pointer type mismatch in container_of()");	\
+	((type *)(__mptr - offsetof(type, member))); })
+
+typedef long long unsigned int llu;
+
+/* Taken over modified from the kernel sources. */
+#define NBITS 32 /* bits in uint32_t */
+#define DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
+#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, NBITS)
+
+static inline void set_bit(__u32 bit, __u32 *bitarr)
+{
+	bitarrbit / NBITS |= ((__u32)1 << (bit % NBITS));
+}
+
+static inline void clear_bit(__u32 bit, __u32 *bitarr)
+{
+	bitarrbit / NBITS &= ~((__u32)1 << (bit % NBITS));
+}
+
+static inline bool is_set(__u32 bit, __u32 *bitarr)
+{
+	return (bitarrbit / NBITS & ((__u32)1 << (bit % NBITS))) != 0;
+}
+
+#define BIT(nr) (1UL << (nr))
+
+#ifndef FS_IOC_GETFLAGS
+#define FS_IOC_GETFLAGS _IOR('f', 1, long)
+#endif
+
+#ifndef FS_IOC_SETFLAGS
+#define FS_IOC_SETFLAGS _IOW('f', 2, long)
+#endif
+
+#ifndef FS_IMMUTABLE_FL
+#define FS_IMMUTABLE_FL 0x00000010 /* Immutable file */
+#endif
+
 #endif /* __LXC_MACRO_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/mainloop.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/mainloop.c Changed

@@ -1,34 +1,332 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <poll.h>
 #include <sys/epoll.h>
 #include <unistd.h>
 
-#include "config.h"
+#include "log.h"
+#include "macro.h"
 #include "mainloop.h"
 
+#if HAVE_LIBURING
+#include <liburing.h>
+#endif
+
+lxc_log_define(mainloop, lxc);
+
+#define CANCEL_RECEIVED (1 << 0)
+#define CANCEL_SUCCESS (1 << 1)
+
 struct mainloop_handler {
-	lxc_mainloop_callback_t callback;
 	int fd;
 	void *data;
+	lxc_mainloop_callback_t callback;
+	lxc_mainloop_cleanup_t cleanup;
+	const char *name;
+	unsigned int flags;
+	struct list_head head;
 };
 
 #define MAX_EVENTS 10
 
-int lxc_mainloop(struct lxc_epoll_descr *descr, int timeout_ms)
+static int __io_uring_disarm(struct lxc_async_descr *descr,
+			     struct mainloop_handler *handler);
+
+static int disarm_handler(struct lxc_async_descr *descr,
+			  struct mainloop_handler *handler, bool oneshot)
 {
-	int i, nfds, ret;
-	struct mainloop_handler *handler;
-	struct epoll_event eventsMAX_EVENTS;
+	int ret = 0;
+
+	if (descr->type == LXC_MAINLOOP_IO_URING) {
+		/*
+		 * For a oneshot handler we don't have to do anything. If we
+		 * end up here we know that an event for this handler has been
+		 * generated before and since this is a oneshot handler it
+		 * means that it has been deactivated. So the only thing we
+		 * need to do is to call the registered cleanup handler and
+		 * remove the handler from the list.
+		 */
+		if (!oneshot)
+			ret = __io_uring_disarm(descr, handler);
+	} else {
+		ret = epoll_ctl(descr->epfd, EPOLL_CTL_DEL, handler->fd, NULL);
+	}
+	if (ret < 0)
+		return syswarn_ret(-1, "Failed to disarm %d for \"%s\" handler",
+				   handler->fd, handler->name);
+
+	TRACE("Disarmed %d for \"%s\" handler", handler->fd, handler->name);
+	return 0;
+}
+
+static void delete_handler(struct mainloop_handler *handler)
+{
+	if (handler->cleanup) {
+		int ret;
+
+		ret = handler->cleanup(handler->fd, handler->data);
+		if (ret < 0)
+			SYSWARN("Failed to cleanup %d for \"%s\" handler", handler->fd, handler->name);
+	}
+
+	TRACE("Deleted %d for \"%s\" handler", handler->fd, handler->name);
+	list_del(&handler->head);
+	free(handler);
+}
+
+static inline void cleanup_handler(struct lxc_async_descr *descr,
+				   struct mainloop_handler *handler, bool oneshot)
+{
+	if (disarm_handler(descr, handler, oneshot) == 0)
+		delete_handler(handler);
+}
+
+#if !HAVE_LIBURING
+static inline int __lxc_mainloop_io_uring(struct lxc_async_descr *descr,
+					  int timeout_ms)
+{
+	return ret_errno(ENOSYS);
+}
+
+static int __io_uring_arm(struct lxc_async_descr *descr,
+			  struct mainloop_handler *handler, bool oneshot)
+{
+	return ret_errno(ENOSYS);
+}
+
+static int __io_uring_disarm(struct lxc_async_descr *descr,
+			     struct mainloop_handler *handler)
+{
+	return ret_errno(ENOSYS);
+}
+
+static inline int __io_uring_open(struct lxc_async_descr *descr)
+{
+	return ret_errno(ENOSYS);
+}
+
+#else /* !HAVE_LIBURING */
+
+static inline int __io_uring_open(struct lxc_async_descr *descr)
+{
+	int ret;
+	*descr = (struct lxc_async_descr){
+		.epfd = -EBADF,
+	};
+
+	descr->ring = mmap(NULL, sizeof(struct io_uring), PROT_READ | PROT_WRITE,
+			   MAP_SHARED | MAP_POPULATE | MAP_ANONYMOUS, -1, 0);
+	if (descr->ring == MAP_FAILED)
+		return syserror("Failed to mmap io_uring memory");
+
+	ret = io_uring_queue_init(512, descr->ring, 0);
+	if (ret) {
+		SYSERROR("Failed to initialize io_uring instance");
+		goto on_error;
+	}
+
+	ret = io_uring_ring_dontfork(descr->ring);
+	if (ret) {
+		SYSERROR("Failed to prevent inheritance of io_uring mmaped region");
+		goto on_error;
+	}
+
+	descr->type = LXC_MAINLOOP_IO_URING;
+	TRACE("Created io-uring instance");
+	return 0;
+
+on_error:
+	ret = munmap(descr->ring, sizeof(struct io_uring));
+	if (ret < 0)
+		SYSWARN("Failed to unmap io_uring mmaped memory");
+
+	return ret_errno(ENOSYS);
+}
+
+static int __io_uring_arm(struct lxc_async_descr *descr,
+			  struct mainloop_handler *handler, bool oneshot)
+{
+	int ret;
+	struct io_uring_sqe *sqe;
+
+	sqe = io_uring_get_sqe(descr->ring);
+	if (!sqe)
+		return syserror_set(ENOENT, "Failed to get submission queue entry");
+
+	io_uring_prep_poll_add(sqe, handler->fd, EPOLLIN);
+
+	/*
+	 * Raise IORING_POLL_ADD_MULTI to set up a multishot poll. The same sqe
+	 * will now produce multiple cqes. A cqe produced from a multishot sqe
+	 * will raise IORING_CQE_F_MORE in cqe->flags.
+	 * Some devices can't be used with IORING_POLL_ADD_MULTI. This can only
+	 * be detected at completion time. The IORING_CQE_F_MORE flag will not
+	 * raised in cqe->flags. This includes terminal devices. So
+	 * unfortunately we can't use multishot for them although we really
+	 * would like to. But instead we will need to resubmit them. The
+	 * io_uring based mainloop will deal cases whwere multishot doesn't
+	 * work and resubmit the request. The handler just needs to inform the
+	 * mainloop that it wants to keep the handler.
+	 */
+	if (!oneshot)
+		sqe->len |= IORING_POLL_ADD_MULTI;
+
+	io_uring_sqe_set_data(sqe, handler);
+	ret = io_uring_submit(descr->ring);
+	if (ret < 0) {
+		if (!oneshot && ret == -EINVAL) {
+			/* The kernel might not yet support multishot. */
+			sqe->len &= ~IORING_POLL_ADD_MULTI;
+			ret = io_uring_submit(descr->ring);
+		}
+	}
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to add \"%s\" handler", handler->name);
+
+	TRACE("Added \"%s\" handler", handler->name);
+	return 0;
+}
+
+static int __io_uring_disarm(struct lxc_async_descr *descr,
+			     struct mainloop_handler *handler)
+{
+	int ret;
+	struct io_uring_sqe *sqe;
+
+	sqe = io_uring_get_sqe(descr->ring);
+	if (!sqe)
+		return syserror_set(ENOENT,
+				    "Failed to get submission queue entry");
+
+	io_uring_prep_poll_remove(sqe, handler);
+	io_uring_sqe_set_data(sqe, handler);
+	ret = io_uring_submit(descr->ring);
+	if (ret < 0)
+		return syserror_ret(ret, "Failed to remove \"%s\" handler",
+				    handler->name);
+
+	TRACE("Removed handler \"%s\"", handler->name);
+	return ret;
+}
+
+static void msec_to_ts(struct __kernel_timespec *ts, unsigned int timeout_ms)
+{
+	ts->tv_sec = timeout_ms / 1000;
+	ts->tv_nsec = (timeout_ms % 1000) * 1000000;
+}
+
+static int __lxc_mainloop_io_uring(struct lxc_async_descr *descr, int timeout_ms)
+{
+	struct __kernel_timespec ts;
+
+	if (timeout_ms >= 0)
+		msec_to_ts(&ts, timeout_ms);
 
 	for (;;) {
+		int ret;
+		__s32 res = 0;
+		bool oneshot = false;
+		struct io_uring_cqe *cqe = NULL;
+		struct mainloop_handler *handler = NULL;
+
+		if (timeout_ms >= 0)
+			ret = io_uring_wait_cqe_timeout(descr->ring, &cqe, &ts);
+		else
+			ret = io_uring_wait_cqe(descr->ring, &cqe);
+		if (ret < 0) {
+			if (ret == -EINTR)
+				continue;
+
+			if (ret == -ETIME)
+				return 0;
+
+			return syserror_ret(ret, "Failed to wait for completion");
+		}
+
+		ret	= LXC_MAINLOOP_CONTINUE;
+		oneshot = !(cqe->flags & IORING_CQE_F_MORE);
+		res	= cqe->res;
+		handler = io_uring_cqe_get_data(cqe);
+		io_uring_cqe_seen(descr->ring, cqe);
+
+		if (res <= 0) {
+			switch (res) {
+			case 0:
+				TRACE("Removed \"%s\" handler", handler->name);
+				handler->flags |= CANCEL_SUCCESS;
+				if (has_exact_flags(handler->flags, (CANCEL_SUCCESS | CANCEL_RECEIVED)))
+					delete_handler(handler);
+				break;
+			case -EALREADY:
+				TRACE("Repeat sqe remove request for \"%s\" handler", handler->name);
+				break;
+			case -ECANCELED:
+				TRACE("Canceled \"%s\" handler", handler->name);
+				handler->flags |= CANCEL_RECEIVED;
+				if (has_exact_flags(handler->flags, (CANCEL_SUCCESS | CANCEL_RECEIVED)))
+					delete_handler(handler);
+				break;
+			case -ENOENT:
+				TRACE("No sqe for \"%s\" handler", handler->name);
+				break;
+			default:
+				WARN("Received unexpected return value %d in cqe for \"%s\" handler",
+				     res, handler->name);
+				break;
+			}
+		} else {
+			ret = handler->callback(handler->fd, res, handler->data, descr);
+			switch (ret) {
+			case LXC_MAINLOOP_CONTINUE:
+				/* We're operating in oneshot mode so we need to rearm. */
+				if (oneshot && __io_uring_arm(descr, handler, true))
+					return -1;
+				break;
+			case LXC_MAINLOOP_DISARM:
+				/*
+				 * If this is a multhishot handler we need to
+				 * disarm it here. Actual cleanup happens
+				 * later.
+				 */
+				disarm_handler(descr, handler, oneshot);
+				/*
+				 * If this is a oneshot handler we know it has
+				 * just run and we also know the above call was
+				 * a nop. So clean it up directly.
+				 */
+				if (oneshot)
+					delete_handler(handler);
+				break;
+			case LXC_MAINLOOP_CLOSE:
+				return log_trace(0, "Closing from \"%s\"", handler->name);
+			case LXC_MAINLOOP_ERROR:
+				return syserror_ret(-1, "Closing with error from \"%s\"", handler->name);
+			default:
+				WARN("Received unexpected return value %d from \"%s\" handler",
+				     ret, handler->name);
+				break;
+			}
+		}
+
+		if (list_empty(&descr->handlers))
+			return error_ret(0, "Closing because there are no more handlers");
+	}
+}
+#endif /* HAVE_LIBURING */
+
+static int __lxc_mainloop_epoll(struct lxc_async_descr *descr, int timeout_ms)
+{
+	for (;;) {
+		int nfds;
+		struct epoll_event eventsMAX_EVENTS;
+
 		nfds = epoll_wait(descr->epfd, events, MAX_EVENTS, timeout_ms);
 		if (nfds < 0) {
 			if (errno == EINTR)
@@ -37,116 +335,200 @@
 			return -errno;
 		}
 
-		for (i = 0; i < nfds; i++) {
-			handler = eventsi.data.ptr;
+		for (int i = 0; i < nfds; i++) {
+			int ret;
+			struct mainloop_handler *handler = eventsi.data.ptr;
 
 			/* If the handler returns a positive value, exit the
 			 * mainloop.
 			 */
 			ret = handler->callback(handler->fd, eventsi.events,
 						handler->data, descr);
-			if (ret == LXC_MAINLOOP_ERROR)
-				return -1;
-			if (ret == LXC_MAINLOOP_CLOSE)
+			switch (ret) {
+			case LXC_MAINLOOP_DISARM:
+				cleanup_handler(descr, handler, false);
+				__fallthrough;
+			case LXC_MAINLOOP_CONTINUE:
+				break;
+			case LXC_MAINLOOP_CLOSE:
 				return 0;
+			case LXC_MAINLOOP_ERROR:
+				return -1;
+			}
 		}
 
 		if (nfds == 0)
 			return 0;
 
-		if (lxc_list_empty(&descr->handlers))
+		if (list_empty(&descr->handlers))
 			return 0;
 	}
 }
 
-int lxc_mainloop_add_handler_events(struct lxc_epoll_descr *descr, int fd,
-				    int events,
-				    lxc_mainloop_callback_t callback,
-				    void *data)
+int lxc_mainloop(struct lxc_async_descr *descr, int timeout_ms)
+{
+	if (descr->type == LXC_MAINLOOP_IO_URING)
+		return __lxc_mainloop_io_uring(descr, timeout_ms);
+
+	return __lxc_mainloop_epoll(descr, timeout_ms);
+}
+
+static int __lxc_mainloop_add_handler_events(struct lxc_async_descr *descr,
+					     int fd, int events,
+					     lxc_mainloop_callback_t callback,
+					     lxc_mainloop_cleanup_t cleanup,
+					     void *data, bool oneshot,
+					     const char *name)
 {
 	__do_free struct mainloop_handler *handler = NULL;
-	__do_free struct lxc_list *item = NULL;
+	int ret;
 	struct epoll_event ev;
 
 	if (fd < 0)
-		return -1;
+		return ret_errno(EBADF);
 
-	handler = malloc(sizeof(*handler));
-	if (!handler)
-		return -1;
+	if (!callback || !cleanup || !events || !name)
+		return ret_errno(EINVAL);
 
-	handler->callback = callback;
-	handler->fd = fd;
-	handler->data = data;
+	handler = zalloc(sizeof(*handler));
+	if (!handler)
+		return ret_errno(ENOMEM);
 
-	ev.events = events;
-	ev.data.ptr = handler;
+	handler->callback	= callback;
+	handler->cleanup	= cleanup;
+	handler->fd		= fd;
+	handler->data		= data;
+	handler->name		= name;
 
-	if (epoll_ctl(descr->epfd, EPOLL_CTL_ADD, fd, &ev) < 0)
+	if (descr->type == LXC_MAINLOOP_IO_URING) {
+		ret = __io_uring_arm(descr, handler, oneshot);
+	} else {
+		ev.events	= events;
+		ev.data.ptr	= handler;
+		ret = epoll_ctl(descr->epfd, EPOLL_CTL_ADD, fd, &ev);
+	}
+	if (ret < 0)
 		return -errno;
 
-	item = malloc(sizeof(*item));
-	if (!item)
-		return ret_errno(ENOMEM);
-
-	item->elem = move_ptr(handler);
-	lxc_list_add(&descr->handlers, move_ptr(item));
+	list_add_tail(&handler->head, &descr->handlers);
+	move_ptr(handler);
 	return 0;
 }
 
-int lxc_mainloop_add_handler(struct lxc_epoll_descr *descr, int fd,
-			     lxc_mainloop_callback_t callback, void *data)
+int lxc_mainloop_add_handler_events(struct lxc_async_descr *descr, int fd,
+				    int events,
+				    lxc_mainloop_callback_t callback,
+				    lxc_mainloop_cleanup_t cleanup,
+				    void *data, const char *name)
+{
+	return __lxc_mainloop_add_handler_events(descr, fd, events,
+						 callback, cleanup,
+						 data, false, name);
+}
+
+int lxc_mainloop_add_handler(struct lxc_async_descr *descr, int fd,
+			     lxc_mainloop_callback_t callback,
+			     lxc_mainloop_cleanup_t cleanup,
+			     void *data, const char *name)
 {
-	return lxc_mainloop_add_handler_events(descr, fd, EPOLLIN, callback,
-					       data);
+	return __lxc_mainloop_add_handler_events(descr, fd, EPOLLIN,
+						 callback, cleanup,
+						 data, false, name);
 }
 
-int lxc_mainloop_del_handler(struct lxc_epoll_descr *descr, int fd)
+int lxc_mainloop_add_oneshot_handler(struct lxc_async_descr *descr, int fd,
+				     lxc_mainloop_callback_t callback,
+				     lxc_mainloop_cleanup_t cleanup,
+				     void *data, const char *name)
 {
+	return __lxc_mainloop_add_handler_events(descr, fd, EPOLLIN,
+						 callback, cleanup,
+						 data, true, name);
+}
+
+int lxc_mainloop_del_handler(struct lxc_async_descr *descr, int fd)
+{
+	int ret;
 	struct mainloop_handler *handler;
-	struct lxc_list *iterator;
 
-	lxc_list_for_each(iterator, &descr->handlers) {
-		handler = iterator->elem;
+	list_for_each_entry(handler, &descr->handlers, head) {
+		if (handler->fd != fd)
+			continue;
 
-		if (handler->fd == fd) {
-			/* found */
-			if (epoll_ctl(descr->epfd, EPOLL_CTL_DEL, fd, NULL))
-				return -errno;
+		if (descr->type == LXC_MAINLOOP_IO_URING)
+			ret = __io_uring_disarm(descr, handler);
+		else
+			ret = epoll_ctl(descr->epfd, EPOLL_CTL_DEL, fd, NULL);
+		if (ret < 0)
+			return syserror("Failed to disarm \"%s\"", handler->name);
 
-			lxc_list_del(iterator);
-			free(iterator->elem);
-			free(iterator);
-			return 0;
+		/*
+		 * For io_uring the deletion happens at completion time. Either
+		 * we get ENOENT if the request was oneshot and it had already
+		 * triggered or we get ECANCELED for the original sqe and 0 for
+		 * the cancellation request.
+		 */
+		if (descr->type == LXC_MAINLOOP_EPOLL) {
+			list_del(&handler->head);
+			free(handler);
 		}
+
+		return 0;
 	}
 
 	return ret_errno(EINVAL);
 }
 
-int lxc_mainloop_open(struct lxc_epoll_descr *descr)
+static inline int __epoll_open(struct lxc_async_descr *descr)
 {
+	*descr = (struct lxc_async_descr){
+		.epfd = -EBADF,
+	};
+
 	descr->epfd = epoll_create1(EPOLL_CLOEXEC);
 	if (descr->epfd < 0)
-		return -errno;
+		return syserror("Failed to create epoll instance");
 
-	lxc_list_init(&descr->handlers);
+	descr->type = LXC_MAINLOOP_EPOLL;
+	TRACE("Created epoll instance");
 	return 0;
 }
 
-void lxc_mainloop_close(struct lxc_epoll_descr *descr)
+int lxc_mainloop_open(struct lxc_async_descr *descr)
 {
-	struct lxc_list *iterator, *next;
+	int ret;
 
-	iterator = descr->handlers.next;
-	while (iterator != &descr->handlers) {
-		next = iterator->next;
+	ret = __io_uring_open(descr);
+	if (ret == -ENOSYS)
+		ret = __epoll_open(descr);
+	if (ret < 0)
+		return syserror("Failed to create mainloop instance");
 
-		lxc_list_del(iterator);
-		free(iterator->elem);
-		free(iterator);
-		iterator = next;
+	INIT_LIST_HEAD(&descr->handlers);
+	return 0;
+}
+
+void lxc_mainloop_close(struct lxc_async_descr *descr)
+{
+	struct mainloop_handler *handler, *nhandler;
+
+	list_for_each_entry_safe(handler, nhandler, &descr->handlers, head) {
+		list_del(&handler->head);
+		free(handler);
+	}
+
+	if (descr->type == LXC_MAINLOOP_IO_URING) {
+#if HAVE_LIBURING
+		if (descr->ring) {
+			io_uring_queue_exit(descr->ring);
+			munmap(descr->ring, sizeof(struct io_uring));
+		}
+#else
+		ERROR("Unsupported io_uring mainloop");
+#endif
+	} else {
+		close_prot_errno_disarm(descr->epfd);
 	}
 
-	close_prot_errno_disarm(descr->epfd);
+	INIT_LIST_HEAD(&descr->handlers);
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/mainloop.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/mainloop.h Changed

@@ -3,39 +3,66 @@
 #ifndef __LXC_MAINLOOP_H
 #define __LXC_MAINLOOP_H
 
+#include "config.h"
+
 #include <stdint.h>
 
-#include "list.h"
+#include "compiler.h"
+#include "hlist.h"
 #include "memory_utils.h"
 
 #define LXC_MAINLOOP_ERROR -1
 #define LXC_MAINLOOP_CONTINUE 0
 #define LXC_MAINLOOP_CLOSE 1
+#define LXC_MAINLOOP_DISARM 2
+
+typedef enum {
+	LXC_MAINLOOP_EPOLL	= 1,
+	LXC_MAINLOOP_IO_URING	= 2,
+} async_descr_t;
 
-struct lxc_epoll_descr {
-	int epfd;
-	struct lxc_list handlers;
+struct lxc_async_descr {
+	async_descr_t type;
+	union {
+		int epfd;
+#if HAVE_LIBURING
+		struct io_uring *ring;
+#endif
+	};
+	struct list_head handlers;
 };
 
+static inline int default_cleanup_handler(int fd, void *data)
+{
+	return 0;
+}
+
 typedef int (*lxc_mainloop_callback_t)(int fd, uint32_t event, void *data,
-				       struct lxc_epoll_descr *descr);
+				       struct lxc_async_descr *descr);
+
+typedef int (*lxc_mainloop_cleanup_t)(int fd, void *data);
 
-extern int lxc_mainloop(struct lxc_epoll_descr *descr, int timeout_ms);
+__hidden extern int lxc_mainloop(struct lxc_async_descr *descr, int timeout_ms);
 
-extern int lxc_mainloop_add_handler_events(struct lxc_epoll_descr *descr,
-					   int fd, int events,
-					   lxc_mainloop_callback_t callback,
-					   void *data);
-extern int lxc_mainloop_add_handler(struct lxc_epoll_descr *descr, int fd,
-				    lxc_mainloop_callback_t callback,
-				    void *data);
+__hidden extern int lxc_mainloop_add_handler_events(struct lxc_async_descr *descr, int fd, int events,
+						    lxc_mainloop_callback_t callback,
+						    lxc_mainloop_cleanup_t cleanup,
+						    void *data, const char *name);
+__hidden extern int lxc_mainloop_add_handler(struct lxc_async_descr *descr, int fd,
+					     lxc_mainloop_callback_t callback,
+					     lxc_mainloop_cleanup_t cleanup,
+					     void *data, const char *name);
+__hidden extern int lxc_mainloop_add_oneshot_handler(struct lxc_async_descr *descr, int fd,
+						     lxc_mainloop_callback_t callback,
+						     lxc_mainloop_cleanup_t cleanup,
+						     void *data, const char *name);
 
-extern int lxc_mainloop_del_handler(struct lxc_epoll_descr *descr, int fd);
+__hidden extern int lxc_mainloop_del_handler(struct lxc_async_descr *descr, int fd);
 
-extern int lxc_mainloop_open(struct lxc_epoll_descr *descr);
+__hidden extern int lxc_mainloop_open(struct lxc_async_descr *descr);
 
-extern void lxc_mainloop_close(struct lxc_epoll_descr *descr);
+__hidden extern void lxc_mainloop_close(struct lxc_async_descr *descr);
 
-define_cleanup_function(struct lxc_epoll_descr *, lxc_mainloop_close);
+define_cleanup_function(struct lxc_async_descr *, lxc_mainloop_close);
 
 #endif

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/memory_utils.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/memory_utils.h Changed

@@ -3,6 +3,8 @@
 #ifndef __LXC_MEMORY_UTILS_H
 #define __LXC_MEMORY_UTILS_H
 
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <stdio.h>
@@ -11,6 +13,7 @@
 #include <unistd.h>
 
 #include "macro.h"
+#include "error_utils.h"
 
 #define define_cleanup_function(type, cleaner)           \
 	static inline void cleaner##_function(type *ptr) \
@@ -19,7 +22,8 @@
 			cleaner(*ptr);                   \
 	}
 
-#define call_cleaner(cleaner) __attribute__((__cleanup__(cleaner##_function)))
+#define call_cleaner(cleaner) \
+	__attribute__((__cleanup__(cleaner##_function))) __attribute__((unused))
 
 #define close_prot_errno_disarm(fd) \
 	if (fd >= 0) {              \
@@ -29,6 +33,15 @@
 		fd = -EBADF;        \
 	}
 
+#define close_prot_errno_move(fd, new_fd) \
+	if (fd >= 0) {                       \
+		int _e_ = errno;             \
+		close(fd);                   \
+		errno = _e_;                 \
+		fd = new_fd;                 \
+		new_fd = -EBADF;	     \
+	}
+
 static inline void close_prot_errno_disarm_function(int *fd)
 {
        close_prot_errno_disarm(*fd);
@@ -41,10 +54,12 @@
 define_cleanup_function(DIR *, closedir);
 #define __do_closedir call_cleaner(closedir)
 
-#define free_disarm(ptr)    \
-	({                  \
-		free(ptr);  \
-		ptr = NULL; \
+#define free_disarm(ptr)                    \
+	({                                  \
+		if (!IS_ERR_OR_NULL(ptr)) { \
+			free(ptr);          \
+			ptr = NULL;         \
+		}                           \
 	})
 
 static inline void free_disarm_function(void *ptr)
@@ -55,7 +70,7 @@
 
 static inline void free_string_list(char **list)
 {
-	if (list) {
+	if (list && !IS_ERR(list)) {
 		for (int i = 0; listi; i++)
 			free(listi);
 		free_disarm(list);
@@ -74,4 +89,33 @@
 
 #define zalloc(__size__) (calloc(1, __size__))
 
+#define free_move_ptr(a, b)          \
+	({                           \
+		free(a);             \
+		(a) = move_ptr((b)); \
+	})
+
+#define close_move_fd(a, b)         \
+	({                          \
+		close(a);           \
+		(a) = move_fd((b)); \
+	})
+
+#define close_equal(a, b)             \
+	({                            \
+		if (a >= 0 && a != b) \
+			close(a);     \
+		if (b >= 0)           \
+			close(b);     \
+		a = b = -EBADF;       \
+	})
+
+#define free_equal(a, b)         \
+	({                       \
+		if (a != b)      \
+			free(a); \
+		free(b);         \
+		a = b = NULL;    \
+	})
+
 #endif /* __LXC_MEMORY_UTILS_H */

_service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/meson.build Added

@@ -0,0 +1,167 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+liblxcfs_attach_file = configure_file(
+    configuration: dummy_config_data,
+    input: 'attach_options.h',
+    output: 'attach_options.h',
+    install: true,
+    install_dir: lxcinclude
+)
+
+liblxcfs_header_file = configure_file(
+    configuration: dummy_config_data,
+    input: 'lxccontainer.h',
+    output: 'lxccontainer.h',
+    install: true,
+    install_dir: lxcinclude
+)
+
+liblxcfs_version_file = configure_file(
+    configuration: version_data,
+    input: 'version.h.in',
+    output: 'version.h',
+    install: true,
+    install_dir: lxcinclude
+)
+
+liblxc_sources = files(
+    'cgroups/cgfsng.c',
+    'cgroups/cgroup.c',
+    'cgroups/cgroup.h',
+    'cgroups/cgroup2_devices.c',
+    'cgroups/cgroup2_devices.h',
+    'cgroups/cgroup_utils.c',
+    'cgroups/cgroup_utils.h',
+    'lsm/lsm.c',
+    'lsm/lsm.h',
+    'lsm/nop.c',
+    'storage/btrfs.c',
+    'storage/btrfs.h',
+    'storage/dir.c',
+    'storage/dir.h',
+    'storage/loop.c',
+    'storage/loop.h',
+    'storage/lvm.c',
+    'storage/lvm.h',
+    'storage/nbd.c',
+    'storage/nbd.h',
+    'storage/overlay.c',
+    'storage/overlay.h',
+    'storage/rbd.c',
+    'storage/rbd.h',
+    'storage/rsync.c',
+    'storage/rsync.h',
+    'storage/storage.c',
+    'storage/storage.h',
+    'storage/storage_utils.c',
+    'storage/storage_utils.h',
+    'storage/zfs.c',
+    'storage/zfs.h',
+    'af_unix.c',
+    'af_unix.h',
+    'api_extensions.h',
+    'attach.c',
+    'attach.h',
+    'attach_options.h',
+    'caps.c',
+    'caps.h',
+    'commands.c',
+    'commands.h',
+    'commands_utils.c',
+    'commands_utils.h',
+    'compiler.h',
+    'conf.c',
+    'conf.h',
+    'confile.c',
+    'confile.h',
+    'confile_utils.c',
+    'confile_utils.h',
+    'criu.c',
+    'criu.h',
+    'error.c',
+    'error.h',
+    'error_utils.h',
+    'execute.c',
+    'file_utils.c',
+    'file_utils.h',
+    'freezer.c',
+    'hlist.h',
+    'initutils.c',
+    'initutils.h',
+    'list.h',
+    'log.c',
+    'log.h',
+    'lxc.h',
+    'lxccontainer.c',
+    'lxccontainer.h',
+    'lxclock.c',
+    'lxclock.h',
+    'lxcseccomp.h',
+    'macro.h',
+    'mainloop.c',
+    'mainloop.h',
+    'memory_utils.h',
+    'monitor.c',
+    'monitor.h',
+    'mount_utils.c',
+    'mount_utils.h',
+    'namespace.c',
+    'namespace.h',
+    'network.c',
+    'network.h',
+    'nl.c',
+    'nl.h',
+    'parse.c',
+    'parse.h',
+    'open_utils.h',
+    'process_utils.c',
+    'process_utils.h',
+    'rexec.c',
+    'rexec.h',
+    'ringbuf.c',
+    'ringbuf.h',
+    'rtnl.c',
+    'rtnl.h',
+    'start.c',
+    'start.h',
+    'state.c',
+    'state.h',
+    'string_utils.c',
+    'string_utils.h',
+    'sync.c',
+    'sync.h',
+    'syscall_numbers.h',
+    'syscall_wrappers.h',
+    'terminal.c',
+    'terminal.h',
+    'utils.c',
+    'utils.h',
+    'uuid.c',
+    'uuid.h')
+
+if want_apparmor and libapparmor.found()
+    liblxc_sources += files('lsm/apparmor.c')
+endif
+
+if want_seccomp and libseccomp.found()
+    liblxc_sources += files('seccomp.c')
+endif
+
+if want_selinux and libselinux.found()
+    liblxc_sources += files('lsm/selinux.c')
+endif
+
+liblxc_static = static_library(
+    'lxc',
+    liblxc_sources + include_sources + netns_ifaddrs_sources,
+    install: true,
+    include_directories: liblxc_includes,
+    dependencies: threads + liblxc_dependency_headers,
+    c_args: '-fvisibility=default')
+
+lxc_functions = configure_file(
+    configuration: conf,
+    input: 'lxc.functions.in',
+    output: 'lxc.functions',
+    install: true,
+    install_dir: lxcdatadir)

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/monitor.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/monitor.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/monitor.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/monitor.h Changed

@@ -3,11 +3,15 @@
 #ifndef __LXC_MONITOR_H
 #define __LXC_MONITOR_H
 
+#include "config.h"
+
 #include <limits.h>
 #include <poll.h>
 #include <sys/param.h>
 #include <sys/un.h>
 
+#include "compiler.h"
+
 typedef enum {
 	lxc_msg_state,
 	lxc_msg_priority,
@@ -16,25 +20,23 @@
 
 struct lxc_msg {
 	lxc_msg_type_t type;
-	char nameNAME_MAX+1;
+	char nameNAME_MAX + 1;
 	int value;
 };
 
-extern int lxc_monitor_sock_name(const char *lxcpath, struct sockaddr_un *addr);
-extern int lxc_monitor_fifo_name(const char *lxcpath, char *fifo_path,
-				 size_t fifo_path_sz, int do_mkdirp);
-extern void lxc_monitor_send_state(const char *name, lxc_state_t state,
-			    const char *lxcpath);
-extern void lxc_monitor_send_exit_code(const char *name, int exit_code,
-			    const char *lxcpath);
-extern int lxc_monitord_spawn(const char *lxcpath);
+__hidden extern int lxc_monitor_sock_name(const char *lxcpath, struct sockaddr_un *addr);
+__hidden extern int lxc_monitor_fifo_name(const char *lxcpath, char *fifo_path, size_t fifo_path_sz,
+					  int do_mkdirp);
+__hidden extern void lxc_monitor_send_state(const char *name, lxc_state_t state, const char *lxcpath);
+__hidden extern void lxc_monitor_send_exit_code(const char *name, int exit_code, const char *lxcpath);
+__hidden extern int lxc_monitord_spawn(const char *lxcpath);
 
 /*
  * Open the monitoring mechanism for a specific container
  * The function will return an fd corresponding to the events
  * Returns a file descriptor on success, < 0 otherwise
  */
-extern int lxc_monitor_open(const char *lxcpath);
+__hidden extern int lxc_monitor_open(const char *lxcpath);
 
 /*
  * Blocking read for the next container state change
@@ -43,7 +45,7 @@
  * Returns 0 if the monitored container has exited, > 0 if
  * data was read, < 0 otherwise
  */
-extern int lxc_monitor_read(int fd, struct lxc_msg *msg);
+__hidden extern int lxc_monitor_read(int fd, struct lxc_msg *msg);
 
 /*
  * Blocking read for the next container state change with timeout
@@ -53,7 +55,7 @@
  * Returns 0 if the monitored container has exited, > 0 if
  * data was read, < 0 otherwise
  */
-extern int lxc_monitor_read_timeout(int fd, struct lxc_msg *msg, int timeout);
+__hidden extern int lxc_monitor_read_timeout(int fd, struct lxc_msg *msg, int timeout);
 
 /*
  * Blocking read from multiple monitors for the next container state
@@ -65,8 +67,7 @@
  * Returns 0 if the monitored container has exited, > 0 if
  * data was read, < 0 otherwise
  */
-extern int lxc_monitor_read_fdset(struct pollfd *fds, nfds_t nfds, struct lxc_msg *msg,
-			   int timeout);
-
+__hidden extern int lxc_monitor_read_fdset(struct pollfd *fds, nfds_t nfds, struct lxc_msg *msg,
+					   int timeout);
 
-#endif
+#endif /* __LXC_MONITOR_H */

_service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/mount_utils.c Added

@@ -0,0 +1,665 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include "config.h"
+
+#include <fcntl.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "file_utils.h"
+#include "log.h"
+#include "macro.h"
+#include "memory_utils.h"
+#include "mount_utils.h"
+#include "open_utils.h"
+#include "syscall_numbers.h"
+#include "syscall_wrappers.h"
+
+#ifdef HAVE_STATVFS
+#include <sys/statvfs.h>
+#endif
+
+lxc_log_define(mount_utils, lxc);
+
+/*
+ * Since the MOUNT_ATTR_<atime> values are an enum, not a bitmap, users wanting
+ * to transition to a different atime setting cannot simply specify the atime
+ * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the
+ * @attr_clr field.
+ */
+static inline void set_atime(struct mount_attr *attr)
+{
+	switch (attr->attr_set & MOUNT_ATTR__ATIME) {
+	case MOUNT_ATTR_RELATIME:
+		__fallthrough;
+	case MOUNT_ATTR_NOATIME:
+		__fallthrough;
+	case MOUNT_ATTR_STRICTATIME:
+		attr->attr_clr = MOUNT_ATTR__ATIME;
+		break;
+	}
+}
+
+int mnt_attributes_new(unsigned int old_flags, unsigned int *new_flags)
+{
+	unsigned int flags = 0;
+
+	if (old_flags & MS_RDONLY) {
+		flags |= MOUNT_ATTR_RDONLY;
+		old_flags &= ~MS_RDONLY;
+	}
+
+	if (old_flags & MS_NOSUID) {
+		flags |= MOUNT_ATTR_NOSUID;
+		old_flags &= ~MS_NOSUID;
+	}
+
+	if (old_flags & MS_NODEV) {
+		flags |= MOUNT_ATTR_NODEV;
+		old_flags &= ~MS_NODEV;
+	}
+
+	if (old_flags & MS_NOEXEC) {
+		flags |= MOUNT_ATTR_NOEXEC;
+		old_flags &= ~MS_NOEXEC;
+	}
+
+	if (old_flags & MS_RELATIME) {
+		flags |= MOUNT_ATTR_RELATIME;
+		old_flags &= ~MS_RELATIME;
+	}
+
+	if (old_flags & MS_NOATIME) {
+		flags |= MOUNT_ATTR_NOATIME;
+		old_flags &= ~MS_NOATIME;
+	}
+
+	if (old_flags & MS_STRICTATIME) {
+		flags |= MOUNT_ATTR_STRICTATIME;
+		old_flags &= ~MS_STRICTATIME;
+	}
+
+	if (old_flags & MS_NODIRATIME) {
+		flags |= MOUNT_ATTR_NODIRATIME;
+		old_flags &= ~MS_NODIRATIME;
+	}
+
+	*new_flags |= flags;
+	return old_flags;
+}
+
+int mnt_attributes_old(unsigned int new_flags, unsigned int *old_flags)
+{
+	unsigned int flags = 0;
+
+	if (new_flags & MOUNT_ATTR_RDONLY) {
+		flags |= MS_RDONLY;
+		new_flags &= ~MOUNT_ATTR_RDONLY;
+	}
+
+	if (new_flags & MOUNT_ATTR_NOSUID) {
+		flags |= MS_NOSUID;
+		new_flags &= ~MOUNT_ATTR_NOSUID;
+	}
+
+	if (new_flags & MS_NODEV) {
+		flags |= MOUNT_ATTR_NODEV;
+		new_flags &= ~MS_NODEV;
+	}
+
+	if (new_flags & MOUNT_ATTR_NOEXEC) {
+		flags |= MS_NOEXEC;
+		new_flags &= ~MOUNT_ATTR_NOEXEC;
+	}
+
+	if (new_flags & MS_RELATIME) {
+		flags |= MS_RELATIME;
+		new_flags &= ~MOUNT_ATTR_RELATIME;
+	}
+
+	if (new_flags & MS_NOATIME) {
+		flags |= MS_NOATIME;
+		new_flags &= ~MOUNT_ATTR_NOATIME;
+	}
+
+	if (new_flags & MS_STRICTATIME) {
+		flags |= MS_STRICTATIME;
+		new_flags &= ~MOUNT_ATTR_STRICTATIME;
+	}
+
+	if (new_flags & MS_NODIRATIME) {
+		flags |= MS_NODIRATIME;
+		new_flags &= ~MOUNT_ATTR_NODIRATIME;
+	}
+
+	*old_flags |= flags;
+	return new_flags;
+}
+
+static int __fs_prepare(const char *fs_name, int fd_from)
+{
+	__do_close int fd_fs = -EBADF;
+	char sourceLXC_PROC_PID_FD_LEN;
+	int ret;
+
+	/* This helper is only concerned with filesystems. */
+	if (is_empty_string(fs_name))
+		return ret_errno(EINVAL);
+
+	/*
+	 * So here is where I'm a bit disappointed. The new mount api doesn't
+	 * let you specify the block device source through an fd. You need to
+	 * pass a path which is obviously crap and runs afoul of the mission to
+	 * only use fds for mount.
+	 */
+	if (fd_from >= 0) {
+		ret = strnprintf(source, sizeof(source), "/proc/self/fd/%d", fd_from);
+		if (ret < 0)
+			return log_error_errno(-EIO, EIO, "Failed to create /proc/self/fd/%d", fd_from);
+	}
+
+	fd_fs = fsopen(fs_name, FSOPEN_CLOEXEC);
+	if (fd_fs < 0)
+		return log_error_errno(-errno, errno, "Failed to create new open new %s filesystem context", fs_name);
+
+	if (fd_from >= 0) {
+		ret = fsconfig(fd_fs, FSCONFIG_SET_STRING, "source", source, 0);
+		if (ret)
+			return log_error_errno(-errno, errno, "Failed to set %s filesystem source to %s", fs_name, source);
+
+		TRACE("Set %s filesystem source property to %s", fs_name, source);
+	}
+
+	TRACE("Finished initializing new %s filesystem context %d", fs_name, fd_fs);
+	return move_fd(fd_fs);
+}
+
+int fs_prepare(const char *fs_name,
+	       int dfd_from, const char *path_from,
+	       __u64 o_flags_from, __u64 resolve_flags_from)
+{
+	__do_close int __fd_from = -EBADF;
+	int fd_from;
+
+	if (!is_empty_string(path_from)) {
+		struct open_how how = {
+			.flags		= o_flags_from,
+			.resolve	= resolve_flags_from,
+		};
+
+		__fd_from = openat2(dfd_from, path_from, &how, sizeof(how));
+		if (__fd_from < 0)
+			return -errno;
+		fd_from = __fd_from;
+	} else {
+		fd_from = dfd_from;
+	}
+
+	return __fs_prepare(fs_name, fd_from);
+}
+
+int fs_set_property(int fd_fs, const char *key, const char *val)
+{
+	int ret;
+
+	ret = fsconfig(fd_fs, FSCONFIG_SET_STRING, key, val, 0);
+	if (ret < 0)
+		return log_error_errno(-errno, errno,
+				       "Failed to set \"%s\" to \"%s\" on filesystem context %d",
+				       key, val, fd_fs);
+
+	TRACE("Set \"%s\" to \"%s\" on filesystem context %d", key, val, fd_fs);
+	return 0;
+}
+
+int fs_set_flag(int fd_fs, const char *key)
+{
+	int ret;
+
+	ret = fsconfig(fd_fs, FSCONFIG_SET_FLAG, key, NULL, 0);
+	if (ret < 0)
+		return syserror("Failed to set \"%s\" flag on filesystem context %d", key, fd_fs);
+
+	TRACE("Set \"%s\" flag on filesystem context %d", key, fd_fs);
+	return 0;
+}
+
+int fs_attach(int fd_fs,
+	      int dfd_to, const char *path_to,
+	      __u64 o_flags_to, __u64 resolve_flags_to,
+	      unsigned int attr_flags)
+{
+	__do_close int __fd_to = -EBADF, fd_fsmnt = -EBADF;
+	int fd_to, ret;
+
+	if (!is_empty_string(path_to)) {
+		struct open_how how = {
+			.flags		= o_flags_to,
+			.resolve	= resolve_flags_to,
+		};
+
+		__fd_to = openat2(dfd_to, path_to, &how, sizeof(how));
+		if (__fd_to < 0)
+			return -errno;
+		fd_to = __fd_to;
+	} else {
+		fd_to = dfd_to;
+	}
+
+	ret = fsconfig(fd_fs, FSCONFIG_CMD_CREATE, NULL, NULL, 0);
+	if (ret < 0)
+		return log_error_errno(-errno, errno, "Failed to finalize filesystem context %d", fd_fs);
+
+	fd_fsmnt = fsmount(fd_fs, FSMOUNT_CLOEXEC, attr_flags);
+	if (fd_fsmnt < 0)
+		return log_error_errno(-errno, errno,
+				       "Failed to create new mount for filesystem context %d", fd_fs);
+
+	ret = move_mount(fd_fsmnt, "", fd_to, "", MOVE_MOUNT_F_EMPTY_PATH | MOVE_MOUNT_T_EMPTY_PATH);
+	if (ret)
+		return log_error_errno(-errno, errno, "Failed to mount %d onto %d", fd_fsmnt, fd_to);
+
+	TRACE("Mounted %d onto %d", fd_fsmnt, fd_to);
+	return 0;
+}
+
+int create_detached_idmapped_mount(const char *path, int userns_fd,
+				   bool recursive, __u64 attr_set, __u64 attr_clr)
+{
+	__do_close int fd_tree_from = -EBADF;
+	unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC;
+	struct mount_attr attr = {
+		.attr_set	= MOUNT_ATTR_IDMAP | attr_set,
+		.attr_clr	= attr_clr,
+		.userns_fd	= userns_fd,
+		.propagation	= MS_SLAVE,
+
+	};
+	int ret;
+
+	set_atime(&attr);
+
+	TRACE("Idmapped mount \"%s\" requested with user namespace fd %d", path, userns_fd);
+
+	if (recursive)
+		open_tree_flags |= AT_RECURSIVE;
+
+	fd_tree_from = open_tree(-EBADF, path, open_tree_flags);
+	if (fd_tree_from < 0)
+		return syserror("Failed to create detached mount");
+
+	ret = mount_setattr(fd_tree_from, "",
+			    AT_EMPTY_PATH | (recursive ? AT_RECURSIVE : 0),
+			    &attr, sizeof(attr));
+	if (ret < 0)
+		return syserror("Failed to change mount attributes");
+
+	return move_fd(fd_tree_from);
+}
+
+int move_detached_mount(int dfd_from, int dfd_to, const char *path_to,
+			__u64 o_flags_to, __u64 resolve_flags_to)
+{
+	__do_close int __fd_to = -EBADF;
+	int fd_to, ret;
+
+	if (!is_empty_string(path_to)) {
+		struct open_how how = {
+			.flags		= o_flags_to,
+			.resolve	= resolve_flags_to,
+		};
+
+		__fd_to = openat2(dfd_to, path_to, &how, sizeof(how));
+		if (__fd_to < 0)
+			return -errno;
+		fd_to = __fd_to;
+	} else {
+		fd_to = dfd_to;
+	}
+
+	ret = move_mount(dfd_from, "", fd_to, "", MOVE_MOUNT_F_EMPTY_PATH | MOVE_MOUNT_T_EMPTY_PATH);
+	if (ret)
+		return syserror("Failed to attach detached mount %d to filesystem at %d", dfd_from, fd_to);
+
+	TRACE("Attach detached mount %d to filesystem at %d", dfd_from, fd_to);
+	return 0;
+}
+
+int __fd_bind_mount(int dfd_from, const char *path_from, __u64 o_flags_from,
+		    __u64 resolve_flags_from, int dfd_to, const char *path_to,
+		    __u64 o_flags_to, __u64 resolve_flags_to, __u64 attr_set,
+		    __u64 attr_clr, __u64 propagation, int userns_fd,
+		    bool recursive)
+{
+	struct mount_attr attr = {
+		.attr_set	= attr_set,
+		.attr_clr	= attr_clr,
+		.propagation	= propagation,
+	};
+	__do_close int __fd_from = -EBADF;
+	__do_close int fd_tree_from = -EBADF;
+	unsigned int open_tree_flags = AT_EMPTY_PATH | OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC;
+	int fd_from, ret;
+
+	set_atime(&attr);
+
+	if (!is_empty_string(path_from)) {
+		struct open_how how = {
+			.flags		= o_flags_from,
+			.resolve	= resolve_flags_from,
+		};
+
+		__fd_from = openat2(dfd_from, path_from, &how, sizeof(how));
+		if (__fd_from < 0)
+			return -errno;
+		fd_from = __fd_from;
+	} else {
+		fd_from = dfd_from;
+	}
+
+	if (recursive)
+		open_tree_flags |= AT_RECURSIVE;
+
+	fd_tree_from = open_tree(fd_from, "", open_tree_flags);
+	if (fd_tree_from < 0)
+		return syserror("Failed to create detached mount");
+
+	if (userns_fd >= 0) {
+		attr.attr_set	|= MOUNT_ATTR_IDMAP;
+		attr.userns_fd	= userns_fd;
+		TRACE("Idmapped mount requested with user namespace fd %d", userns_fd);
+	}
+
+	if (attr.attr_set) {
+		ret = mount_setattr(fd_tree_from, "",
+				    AT_EMPTY_PATH | (recursive ? AT_RECURSIVE : 0),
+				    &attr, sizeof(attr));
+		if (ret < 0)
+			return syserror("Failed to change mount attributes");
+	}
+
+	return move_detached_mount(fd_tree_from, dfd_to, path_to, o_flags_to,
+				   resolve_flags_to);
+}
+
+int calc_remount_flags_new(int dfd_from, const char *path_from,
+			   __u64 o_flags_from, __u64 resolve_flags_from,
+			   bool remount, unsigned long cur_flags,
+			   unsigned int *new_flags)
+{
+#ifdef HAVE_STATVFS
+	__do_close int fd_from = -EBADF;
+	unsigned int new_required_flags = 0;
+	int ret;
+	struct statvfs sb;
+
+	fd_from = open_at(dfd_from, path_from, o_flags_from, resolve_flags_from, 0);
+	if (fd_from < 0)
+		return log_error_errno(-errno, errno, "Failed to open %d(%s)", dfd_from, maybe_empty(path_from));
+
+	ret = fstatvfs(dfd_from, &sb);
+	if (ret < 0)
+		return log_error_errno(-errno, errno, "Failed to retrieve mount information from %d(%s)", fd_from, maybe_empty(path_from));
+
+	if (remount) {
+		if (sb.f_flag & MS_NOSUID)
+			new_required_flags |= MOUNT_ATTR_NOSUID;
+
+		if (sb.f_flag & MS_NODEV)
+			new_required_flags |= MOUNT_ATTR_NODEV;
+
+		if (sb.f_flag & MS_RDONLY)
+			new_required_flags |= MOUNT_ATTR_RDONLY;
+
+		if (sb.f_flag & MS_NOEXEC)
+			new_required_flags |= MOUNT_ATTR_NOEXEC;
+	}
+
+	if (sb.f_flag & MS_NOATIME)
+		new_required_flags |= MOUNT_ATTR_NOATIME;
+
+	if (sb.f_flag & MS_NODIRATIME)
+		new_required_flags |= MOUNT_ATTR_NODIRATIME;
+
+	if (sb.f_flag & MS_RELATIME)
+		new_required_flags |= MOUNT_ATTR_RELATIME;
+
+	if (sb.f_flag & MS_STRICTATIME)
+		new_required_flags |= MOUNT_ATTR_STRICTATIME;
+
+	*new_flags = (cur_flags | new_required_flags);
+#endif
+	return 0;
+}
+
+int calc_remount_flags_old(int dfd_from, const char *path_from,
+			   __u64 o_flags_from, __u64 resolve_flags_from,
+			   bool remount, unsigned long cur_flags,
+			   unsigned int *old_flags)
+{
+#ifdef HAVE_STATVFS
+	__do_close int fd_from = -EBADF;
+	unsigned int old_required_flags = 0;
+	int ret;
+	struct statvfs sb;
+
+	fd_from = open_at(dfd_from, path_from, o_flags_from, resolve_flags_from, 0);
+	if (fd_from < 0)
+		return log_error_errno(-errno, errno, "Failed to open %d(%s)", dfd_from, maybe_empty(path_from));
+
+	ret = fstatvfs(dfd_from, &sb);
+	if (ret < 0)
+		return log_error_errno(-errno, errno, "Failed to retrieve mount information from %d(%s)", fd_from, maybe_empty(path_from));
+
+	if (remount) {
+		if (sb.f_flag & MS_NOSUID)
+			old_required_flags |= MS_NOSUID;
+
+		if (sb.f_flag & MS_NODEV)
+			old_required_flags |= MS_NODEV;
+
+		if (sb.f_flag & MS_RDONLY)
+			old_required_flags |= MS_RDONLY;
+
+		if (sb.f_flag & MS_NOEXEC)
+			old_required_flags |= MS_NOEXEC;
+	}
+
+	if (sb.f_flag & MS_NOATIME)
+		old_required_flags |= MS_NOATIME;
+
+	if (sb.f_flag & MS_NODIRATIME)
+		old_required_flags |= MS_NODIRATIME;
+
+	if (sb.f_flag & MS_RELATIME)
+		old_required_flags |= MS_RELATIME;
+
+	if (sb.f_flag & MS_STRICTATIME)
+		old_required_flags |= MS_STRICTATIME;
+
+	*old_flags = (cur_flags | old_required_flags);
+#endif
+	return 0;
+}
+
+/* If we are asking to remount something, make sure that any NOEXEC etc are
+ * honored.
+ */
+unsigned long add_required_remount_flags(const char *s, const char *d,
+                                        unsigned long flags)
+{
+#ifdef HAVE_STATVFS
+       int ret;
+       struct statvfs sb;
+       unsigned long required_flags = 0;
+
+       if (!s)
+               s = d;
+
+       if (!s)
+               return flags;
+
+       ret = statvfs(s, &sb);
+       if (ret < 0)
+               return flags;
+
+       if (flags & MS_REMOUNT) {
+               if (sb.f_flag & MS_NOSUID)
+                       required_flags |= MS_NOSUID;
+               if (sb.f_flag & MS_NODEV)
+                       required_flags |= MS_NODEV;
+               if (sb.f_flag & MS_RDONLY)
+                       required_flags |= MS_RDONLY;
+               if (sb.f_flag & MS_NOEXEC)
+                       required_flags |= MS_NOEXEC;
+       }
+
+       if (sb.f_flag & MS_NOATIME)
+               required_flags |= MS_NOATIME;
+       if (sb.f_flag & MS_NODIRATIME)
+               required_flags |= MS_NODIRATIME;
+       if (sb.f_flag & MS_LAZYTIME)
+               required_flags |= MS_LAZYTIME;
+       if (sb.f_flag & MS_RELATIME)
+               required_flags |= MS_RELATIME;
+       if (sb.f_flag & MS_STRICTATIME)
+               required_flags |= MS_STRICTATIME;
+
+       return flags | required_flags;
+#else
+       return flags;
+#endif
+}
+
+bool can_use_mount_api(void)
+{
+	static int supported = -1;
+
+	if (supported == -1) {
+		__do_close int fd = -EBADF;
+
+		fd = openat2(-EBADF, "", NULL, 0);
+		if (fd > 0 || errno == ENOSYS) {
+			supported = 0;
+			return false;
+		}
+
+		fd = fsmount(-EBADF, 0, 0);
+		if (fd > 0 || errno == ENOSYS) {
+			supported = 0;
+			return false;
+		}
+
+		fd = fsconfig(-EBADF, -EINVAL, NULL, NULL, 0);
+		if (fd > 0 || errno == ENOSYS) {
+			supported = 0;
+			return false;
+		}
+
+		fd = fsopen(NULL, 0);
+		if (fd > 0 || errno == ENOSYS) {
+			supported = 0;
+			return false;
+		}
+
+		fd = move_mount(-EBADF, NULL, -EBADF, NULL, 0);
+		if (fd > 0 || errno == ENOSYS) {
+			supported = 0;
+			return false;
+		}
+
+		fd = open_tree(-EBADF, NULL, 0);
+		if (fd > 0 || errno == ENOSYS) {
+			supported = 0;
+			return false;
+		}
+
+		supported = 1;
+		TRACE("Kernel supports mount api");
+	}
+
+	return supported == 1;
+}
+
+bool can_use_bind_mounts(void)
+{
+	static int supported = -1;
+
+	if (supported == -1) {
+		int ret;
+
+		if (!can_use_mount_api()) {
+			supported = 0;
+			return false;
+		}
+
+		ret = mount_setattr(-EBADF, NULL, 0, NULL, 0);
+		if (!ret || errno == ENOSYS) {
+			supported = 0;
+			return false;
+		}
+
+		supported = 1;
+		TRACE("Kernel supports bind mounts in the new mount api");
+	}
+
+	return supported == 1;
+}
+
+int mount_at(int dfd_from, const char *path_from, __u64 resolve_flags_from,
+	     int dfd_to, const char *path_to, __u64 resolve_flags_to,
+	     const char *fs_name, unsigned int flags, const void *data)
+{
+	__do_close int __fd_from = -EBADF, __fd_to = -EBADF;
+	char *from = NULL, *to = NULL;
+	int fd_from, fd_to, ret;
+	char buf_fromLXC_PROC_SELF_FD_LEN, buf_toLXC_PROC_SELF_FD_LEN;
+
+	if (dfd_from < 0 && !abspath(path_from))
+		return ret_errno(EINVAL);
+
+	if (dfd_to < 0 && !abspath(path_to))
+		return ret_errno(EINVAL);
+
+	if (!is_empty_string(path_from)) {
+		__fd_from = open_at(dfd_from, path_from, PROTECT_OPATH_FILE, resolve_flags_from, 0);
+		if (__fd_from < 0)
+			return -errno;
+		fd_from = __fd_from;
+	} else {
+		fd_from = dfd_from;
+	}
+	if (fd_from >= 0) {
+		ret = strnprintf(buf_from, sizeof(buf_from), "/proc/self/fd/%d", fd_from);
+		if (ret < 0)
+			return syserror("Failed to create path");
+		from = buf_from;
+	}
+
+	if (!is_empty_string(path_to)) {
+		__fd_to = open_at(dfd_to, path_to, PROTECT_OPATH_FILE, resolve_flags_to, 0);
+		if (__fd_to < 0)
+			return -errno;
+		fd_to = __fd_to;
+	} else {
+		fd_to = dfd_to;
+	}
+	if (fd_to >= 0) {
+		ret = strnprintf(buf_to, sizeof(buf_to), "/proc/self/fd/%d", fd_to);
+		if (ret < 0)
+			return syserror("Failed to create path");
+		to = buf_to;
+	}
+
+	ret = mount(from ?: fs_name, to, fs_name, flags, data);
+	if (ret < 0)
+		return syserror("Failed to mount \"%s\" to \"%s\"",
+				maybe_empty(from), maybe_empty(to));
+
+	TRACE("Mounted \"%s\" to \"%s\"", maybe_empty(from), maybe_empty(to));
+	return 0;
+}

_service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/mount_utils.h Added

@@ -0,0 +1,359 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#ifndef __LXC_MOUNT_UTILS_H
+#define __LXC_MOUNT_UTILS_H
+
+#include "config.h"
+
+#include <linux/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/mount.h>
+
+#include "compiler.h"
+#include "memory_utils.h"
+#include "syscall_wrappers.h"
+
+struct lxc_rootfs;
+
+/* open_tree() flags */
+
+#ifndef AT_RECURSIVE
+#define AT_RECURSIVE 0x8000 /* Apply to the entire subtree */
+#endif
+
+#ifndef OPEN_TREE_CLONE
+#define OPEN_TREE_CLONE 1
+#endif
+
+#ifndef OPEN_TREE_CLOEXEC
+#define OPEN_TREE_CLOEXEC O_CLOEXEC
+#endif
+
+/* move_mount() flags */
+#ifndef MOVE_MOUNT_F_SYMLINKS
+#define MOVE_MOUNT_F_SYMLINKS 0x00000001 /* Follow symlinks on from path */
+#endif
+
+#ifndef MOVE_MOUNT_F_AUTOMOUNTS
+#define MOVE_MOUNT_F_AUTOMOUNTS 0x00000002 /* Follow automounts on from path */
+#endif
+
+#ifndef MOVE_MOUNT_F_EMPTY_PATH
+#define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */
+#endif
+
+#ifndef MOVE_MOUNT_T_SYMLINKS
+#define MOVE_MOUNT_T_SYMLINKS 0x00000010 /* Follow symlinks on to path */
+#endif
+
+#ifndef MOVE_MOUNT_T_AUTOMOUNTS
+#define MOVE_MOUNT_T_AUTOMOUNTS 0x00000020 /* Follow automounts on to path */
+#endif
+
+#ifndef MOVE_MOUNT_T_EMPTY_PATH
+#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */
+#endif
+
+#ifndef MOVE_MOUNT__MASK
+#define MOVE_MOUNT__MASK 0x00000077
+#endif
+
+/* fsopen() flags */
+#ifndef FSOPEN_CLOEXEC
+#define FSOPEN_CLOEXEC 0x00000001
+#endif
+
+/* fspick() flags */
+#ifndef FSPICK_CLOEXEC
+#define FSPICK_CLOEXEC 0x00000001
+#endif
+
+#ifndef FSPICK_SYMLINK_NOFOLLOW
+#define FSPICK_SYMLINK_NOFOLLOW 0x00000002
+#endif
+
+#ifndef FSPICK_NO_AUTOMOUNT
+#define FSPICK_NO_AUTOMOUNT 0x00000004
+#endif
+
+#ifndef FSPICK_EMPTY_PATH
+#define FSPICK_EMPTY_PATH 0x00000008
+#endif
+
+/* fsconfig() commands */
+#if !HAVE_FSCONFIG_SET_FLAG
+#ifndef FSCONFIG_SET_FLAG
+#define FSCONFIG_SET_FLAG 0 /* Set parameter, supplying no value */
+#endif
+#endif
+
+#if !HAVE_FSCONFIG_SET_STRING
+#ifndef FSCONFIG_SET_STRING
+#define FSCONFIG_SET_STRING 1 /* Set parameter, supplying a string value */
+#endif
+#endif
+
+#if !HAVE_FSCONFIG_SET_BINARY
+#ifndef FSCONFIG_SET_BINARY
+#define FSCONFIG_SET_BINARY 2 /* Set parameter, supplying a binary blob value */
+#endif
+#endif
+
+#if !HAVE_FSCONFIG_SET_PATH
+#ifndef FSCONFIG_SET_PATH
+#define FSCONFIG_SET_PATH 3 /* Set parameter, supplying an object by path */
+#endif
+#endif
+
+#if !HAVE_FSCONFIG_SET_PATH_EMPTY
+#ifndef FSCONFIG_SET_PATH_EMPTY
+#define FSCONFIG_SET_PATH_EMPTY 4 /* Set parameter, supplying an object by (empty) path */
+#endif
+#endif
+
+#if !HAVE_FSCONFIG_SET_FD
+#ifndef FSCONFIG_SET_FD
+#define FSCONFIG_SET_FD 5 /* Set parameter, supplying an object by fd */
+#endif
+#endif
+
+#if !HAVE_FSCONFIG_CMD_CREATE
+#ifndef FSCONFIG_CMD_CREATE
+#define FSCONFIG_CMD_CREATE 6 /* Invoke superblock creation */
+#endif
+#endif
+
+#if !HAVE_FSCONFIG_CMD_RECONFIGURE
+#ifndef FSCONFIG_CMD_RECONFIGURE
+#define	FSCONFIG_CMD_RECONFIGURE 7	/* Invoke superblock reconfiguration */
+#endif
+#endif
+
+/* fsmount() flags */
+#ifndef FSMOUNT_CLOEXEC
+#define FSMOUNT_CLOEXEC 0x00000001
+#endif
+
+/* mount attributes */
+#ifndef MOUNT_ATTR_RDONLY
+#define MOUNT_ATTR_RDONLY 0x00000001 /* Mount read-only */
+#endif
+
+#ifndef MOUNT_ATTR_NOSUID
+#define MOUNT_ATTR_NOSUID 0x00000002 /* Ignore suid and sgid bits */
+#endif
+
+#ifndef MOUNT_ATTR_NODEV
+#define MOUNT_ATTR_NODEV 0x00000004 /* Disallow access to device special files */
+#endif
+
+#ifndef MOUNT_ATTR_NOEXEC
+#define MOUNT_ATTR_NOEXEC 0x00000008 /* Disallow program execution */
+#endif
+
+#ifndef MOUNT_ATTR__ATIME
+#define MOUNT_ATTR__ATIME 0x00000070 /* Setting on how atime should be updated */
+#endif
+
+#ifndef MOUNT_ATTR_RELATIME
+#define MOUNT_ATTR_RELATIME 0x00000000 /* - Update atime relative to mtime/ctime. */
+#endif
+
+#ifndef MOUNT_ATTR_NOATIME
+#define MOUNT_ATTR_NOATIME 0x00000010 /* - Do not update access times. */
+#endif
+
+#ifndef MOUNT_ATTR_STRICTATIME
+#define MOUNT_ATTR_STRICTATIME 0x00000020 /* - Always perform atime updates */
+#endif
+
+#ifndef MOUNT_ATTR_NODIRATIME
+#define MOUNT_ATTR_NODIRATIME 0x00000080 /* Do not update directory access times */
+#endif
+
+#ifndef MOUNT_ATTR_IDMAP
+#define MOUNT_ATTR_IDMAP 0x00100000
+#endif
+
+#if !HAVE_MOVE_MOUNT
+static inline int move_mount_lxc(int from_dfd, const char *from_pathname,
+				 int to_dfd, const char *to_pathname,
+				 unsigned int flags)
+{
+	return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd,
+		       to_pathname, flags);
+}
+#define move_mount move_mount_lxc
+#else
+extern int move_mount(int from_dfd, const char *from_pathname, int to_dfd,
+		      const char *to_pathname, unsigned int flags);
+#endif
+
+#if !HAVE_OPEN_TREE
+static inline int open_tree_lxc(int dfd, const char *filename, unsigned int flags)
+{
+	return syscall(__NR_open_tree, dfd, filename, flags);
+}
+#define open_tree open_tree_lxc
+#else
+extern int open_tree(int dfd, const char *filename, unsigned int flags);
+#endif
+
+#if !HAVE_FSOPEN
+static inline int fsopen_lxc(const char *fs_name, unsigned int flags)
+{
+	return syscall(__NR_fsopen, fs_name, flags);
+}
+#define fsopen fsopen_lxc
+#else
+extern int fsopen(const char *fs_name, unsigned int flags);
+#endif
+
+#if !HAVE_FSPICK
+static inline int fspick_lxc(int dfd, const char *path, unsigned int flags)
+{
+	return syscall(__NR_fspick, dfd, path, flags);
+}
+#define fspick fspick_lxc
+#else
+extern int fspick(int dfd, const char *path, unsigned int flags);
+#endif
+
+#if !HAVE_FSCONFIG
+static inline int fsconfig_lxc(int fd, unsigned int cmd, const char *key, const void *value, int aux)
+{
+	return syscall(__NR_fsconfig, fd, cmd, key, value, aux);
+}
+#define fsconfig fsconfig_lxc
+#else
+extern int fsconfig(int fd, unsigned int cmd, const char *key, const void *value, int aux);
+#endif
+
+#if !HAVE_FSMOUNT
+static inline int fsmount_lxc(int fs_fd, unsigned int flags, unsigned int attr_flags)
+{
+	return syscall(__NR_fsmount, fs_fd, flags, attr_flags);
+}
+#define fsmount fsmount_lxc
+#else
+extern int fsmount(int fs_fd, unsigned int flags, unsigned int attr_flags);
+#endif
+
+/*
+ * mount_setattr()
+ */
+#if !HAVE_STRUCT_MOUNT_ATTR
+struct mount_attr {
+	__u64 attr_set;
+	__u64 attr_clr;
+	__u64 propagation;
+	__u64 userns_fd;
+};
+#endif
+
+#if !HAVE_MOUNT_SETATTR
+static inline int mount_setattr(int dfd, const char *path, unsigned int flags,
+				struct mount_attr *attr, size_t size)
+{
+	return syscall(__NR_mount_setattr, dfd, path, flags, attr, size);
+}
+#endif
+
+__hidden extern int mnt_attributes_new(unsigned int old_flags, unsigned int *new_flags);
+
+__hidden extern int mnt_attributes_old(unsigned int new_flags, unsigned int *old_flags);
+
+__hidden extern int fs_prepare(const char *fs_name, int dfd_from,
+			       const char *path_from, __u64 o_flags_from,
+			       __u64 resolve_flags_from);
+__hidden extern int fs_set_property(int fd_fs, const char *key, const char *val);
+__hidden extern int fs_set_flag(int fd_fs, const char *key);
+__hidden extern int fs_attach(int fd_fs, int dfd_to, const char *path_to,
+			      __u64 o_flags_to, __u64 resolve_flags_to,
+			      unsigned int attr_flags);
+
+static inline int fs_mount(const char *fs_name, int dfd_from,
+			   const char *path_from, __u64 o_flags_from,
+			   __u64 resolve_flags_from, int dfd_to,
+			   const char *path_to, __u64 o_flags_to,
+			   __u64 resolve_flags_to,
+			   unsigned int attr_flags)
+{
+	__do_close int fd_fs = -EBADF;
+
+	fd_fs = fs_prepare(fs_name, dfd_from, path_from, o_flags_from, resolve_flags_from);
+	if (fd_fs < 0)
+		return -errno;
+	return fs_attach(fd_fs, dfd_to, path_to, o_flags_to, resolve_flags_to, attr_flags);
+}
+
+__hidden extern int __fd_bind_mount(int dfd_from, const char *path_from,
+				    __u64 o_flags_from,
+				    __u64 resolve_flags_from, int dfd_to,
+				    const char *path_to, __u64 o_flags_to,
+				    __u64 resolve_flags_to, __u64 attr_set,
+				    __u64 attr_clr, __u64 propagation,
+				    int userns_fd, bool recursive);
+static inline int fd_mount_idmapped(int dfd_from, const char *path_from,
+				    __u64 o_flags_from,
+				    __u64 resolve_flags_from, int dfd_to,
+				    const char *path_to, __u64 o_flags_to,
+				    __u64 resolve_flags_to, __u64 attr_set,
+				    __u64 attr_clr, __u64 propagation,
+				    int userns_fd, bool recursive)
+{
+	return __fd_bind_mount(dfd_from, path_from, o_flags_from,
+			       resolve_flags_from, dfd_to, path_to, o_flags_to,
+			       resolve_flags_to, attr_set, attr_clr,
+			       propagation, userns_fd, recursive);
+}
+
+static inline int fd_bind_mount(int dfd_from, const char *path_from,
+				__u64 o_flags_from, __u64 resolve_flags_from,
+				int dfd_to, const char *path_to,
+				__u64 o_flags_to, __u64 resolve_flags_to,
+				__u64 attr_set, __u64 attr_clr,
+				__u64 propagation, bool recursive)
+{
+	return __fd_bind_mount(dfd_from, path_from, o_flags_from, resolve_flags_from,
+			       dfd_to, path_to, o_flags_to, resolve_flags_to,
+			       attr_set, attr_clr, propagation, -EBADF, recursive);
+}
+__hidden extern int create_detached_idmapped_mount(const char *path,
+						   int userns_fd, bool recursive,
+						   __u64 attr_set, __u64 attr_clr);
+__hidden extern int move_detached_mount(int dfd_from, int dfd_to,
+					const char *path_to, __u64 o_flags_to,
+					__u64 resolve_flags_to);
+
+__hidden extern int calc_remount_flags_new(int dfd_from, const char *path_from,
+					   __u64 o_flags_from,
+					   __u64 resolve_flags_from,
+					   bool remount, unsigned long cur_flags,
+					   unsigned int *new_flags);
+
+__hidden extern int calc_remount_flags_old(int dfd_from, const char *path_from,
+					   __u64 o_flags_from,
+					   __u64 resolve_flags_from,
+					   bool remount, unsigned long cur_flags,
+					   unsigned int *old_flags);
+
+__hidden extern unsigned long add_required_remount_flags(const char *s,
+							 const char *d,
+							 unsigned long flags);
+
+__hidden extern bool can_use_mount_api(void);
+__hidden extern bool can_use_bind_mounts(void);
+__hidden extern int mount_at(int dfd_from, const char *path_from,
+			     __u64 resolve_flags_from, int dfd_to,
+			     const char *path_to, __u64 resolve_flags_to,
+			     const char *fs_name, unsigned int flags,
+			     const void *data);
+static inline int mount_fd(int fd_from, int fd_to, const char *fs_name,
+			   unsigned int flags, const void *data)
+{
+	return mount_at(fd_from, "", 0, fd_to, "", 0, fs_name, flags, data);
+}
+
+#endif /* __LXC_MOUNT_UTILS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/namespace.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/namespace.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/namespace.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/namespace.h Changed

@@ -3,31 +3,38 @@
 #ifndef __LXC_NAMESPACE_H
 #define __LXC_NAMESPACE_H
 
+#include "config.h"
+
 #include <sched.h>
 #include <unistd.h>
 #include <sys/syscall.h>
 
-enum {
-	LXC_NS_USER,
-	LXC_NS_MNT,
-	LXC_NS_PID,
-	LXC_NS_UTS,
-	LXC_NS_IPC,
-	LXC_NS_NET,
-	LXC_NS_CGROUP,
-	LXC_NS_MAX
-};
-
-extern const struct ns_info {
-	const char *proc_name;
+#include "compiler.h"
+
+typedef enum lxc_namespace_t {
+	LXC_NS_USER	= 0,
+	LXC_NS_MNT	= 1,
+	LXC_NS_PID	= 2,
+	LXC_NS_UTS	= 3,
+	LXC_NS_IPC	= 4,
+	LXC_NS_NET	= 5,
+	LXC_NS_CGROUP	= 6,
+	LXC_NS_TIME	= 7,
+	LXC_NS_MAX	= 8
+} lxc_namespace_t;
+
+__hidden extern const struct ns_info {
+#define MAX_NS_PROC_NAME 6
+	const char proc_nameMAX_NS_PROC_NAME + 1;
+	const char *proc_path;
 	int clone_flag;
 	const char *flag_name;
 	const char *env_name;
 } ns_infoLXC_NS_MAX;
 
-extern int lxc_namespace_2_cloneflag(const char *namespace);
-extern int lxc_namespace_2_ns_idx(const char *namespace);
-extern int lxc_namespace_2_std_identifiers(char *namespaces);
-extern int lxc_fill_namespace_flags(char *flaglist, int *flags);
+__hidden extern int lxc_namespace_2_cloneflag(const char *namespace);
+__hidden extern int lxc_namespace_2_ns_idx(const char *namespace);
+__hidden extern int lxc_namespace_2_std_identifiers(char *namespaces);
+__hidden extern int lxc_fill_namespace_flags(char *flaglist, int *flags);
 
-#endif
+#endif /* __LXC_NAMESPACE_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/network.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/network.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>
@@ -26,10 +25,9 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "../include/netns_ifaddrs.h"
+#include "netns_ifaddrs.h"
 #include "af_unix.h"
 #include "conf.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"
@@ -37,23 +35,90 @@
 #include "network.h"
 #include "nl.h"
 #include "process_utils.h"
+#include "string_utils.h"
 #include "syscall_wrappers.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(network, lxc);
 
-typedef int (*instantiate_cb)(struct lxc_handler *, struct lxc_netdev *);
-typedef int (*instantiate_ns_cb)(struct lxc_netdev *);
+typedef int (*netdev_configure_server_cb)(struct lxc_handler *, struct lxc_netdev *);
+typedef int (*netdev_configure_container_cb)(struct lxc_netdev *);
+typedef int (*netdev_shutdown_server_cb)(struct lxc_handler *, struct lxc_netdev *);
+
+const struct lxc_network_info {
+	const char *name;
+	const char templateIFNAMSIZ;
+	size_t template_len;
+} lxc_network_infoLXC_NET_MAXCONFTYPE + 1 = {
+	LXC_NET_EMPTY		= { "empty",		"emptXXXXXX",  STRLITERALLEN("emptXXXXXX")	},
+	LXC_NET_VETH    	= { "veth",		"vethXXXXXX",  STRLITERALLEN("vethXXXXXX")	},
+	LXC_NET_MACVLAN 	= { "macvlan",		"macvXXXXXX",  STRLITERALLEN("macvXXXXXX")	},
+	LXC_NET_IPVLAN  	= { "ipvlan",		"ipvlXXXXXX",  STRLITERALLEN("ipvlXXXXXX")	},
+	LXC_NET_PHYS    	= { "phys",		"physXXXXXX",  STRLITERALLEN("physXXXXXX")	},
+	LXC_NET_VLAN    	= { "vlan",		"vlanXXXXXX",  STRLITERALLEN("vlanXXXXXX")	},
+	LXC_NET_NONE    	= { "none",		"noneXXXXXX",  STRLITERALLEN("noneXXXXXX")	},
+	LXC_NET_MAXCONFTYPE	= { NULL,		"",	       0				}
+};
+
+const char *lxc_net_type_to_str(int type)
+{
+	if (type < 0 || type > LXC_NET_MAXCONFTYPE)
+		return NULL;
+
+	return lxc_network_infotype.name;
+}
+
+static const char padchar = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+char *lxc_ifname_alnum_case_sensitive(char *template)
+{
+	char nameIFNAMSIZ;
+	size_t i = 0;
+#ifdef HAVE_RAND_R
+	unsigned int seed;
+
+	seed = randseed(false);
+#else
+
+	(void)randseed(true);
+#endif
+
+	if (strlen(template) >= IFNAMSIZ)
+		return NULL;
+
+	/* Generate random names until we find one that doesn't exist. */
+	for (;;) {
+		name0 = '\0';
+		(void)strlcpy(name, template, IFNAMSIZ);
+
+		for (i = 0; i < strlen(name); i++) {
+			if (namei == 'X') {
+#ifdef HAVE_RAND_R
+				namei = padcharrand_r(&seed) % strlen(padchar);
+#else
+				namei = padcharrand() % strlen(padchar);
+#endif
+			}
+		}
+
+		if (if_nametoindex(name) == 0)
+			break;
+	}
+
+	(void)strlcpy(template, name, strlen(template) + 1);
+
+	return template;
+}
 static const char loop_device = "lo";
 
 static int lxc_ip_route_dest(__u16 nlmsg_type, int family, int ifindex, void *dest, unsigned int netmask)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int addrlen, err;
 	struct rtmsg *rt;
@@ -117,14 +182,13 @@
 	return lxc_ip_route_dest(RTM_DELROUTE, AF_INET6, ifindex, dest, netmask);
 }
 
-static int lxc_setup_ipv4_routes(struct lxc_list *ip, int ifindex)
+static int setup_ipv4_routes(struct lxc_netdev *netdev)
 {
-	struct lxc_list *iterator;
+	int ifindex = netdev->priv.veth_attr.ifindex;
+	struct lxc_inetdev *inetdev;
 	int err;
 
-	lxc_list_for_each(iterator, ip) {
-		struct lxc_inetdev *inetdev = iterator->elem;
-
+	list_for_each_entry(inetdev, &netdev->priv.veth_attr.ipv4_routes, head) {
 		err = lxc_ipv4_dest_add(ifindex, &inetdev->addr, inetdev->prefix);
 		if (err)
 			return log_error_errno(-1, -err, "Failed to setup ipv4 route for network device with ifindex %d", ifindex);
@@ -133,14 +197,13 @@
 	return 0;
 }
 
-static int lxc_setup_ipv6_routes(struct lxc_list *ip, int ifindex)
+static int setup_ipv6_routes(struct lxc_netdev *netdev)
 {
-	struct lxc_list *iterator;
 	int err;
+	struct lxc_inet6dev *inet6dev;
+	int ifindex = netdev->priv.veth_attr.ifindex;
 
-	lxc_list_for_each(iterator, ip) {
-		struct lxc_inet6dev *inet6dev = iterator->elem;
-
+	list_for_each_entry(inet6dev, &netdev->priv.veth_attr.ipv6_routes, head) {
 		err = lxc_ipv6_dest_add(ifindex, &inet6dev->addr, inet6dev->prefix);
 		if (err)
 			return log_error_errno(-1, -err, "Failed to setup ipv6 route for network device with ifindex %d", ifindex);
@@ -149,16 +212,18 @@
 	return 0;
 }
 
-static int setup_ipv4_addr_routes(struct lxc_list *ip, int ifindex)
+static int setup_ipv4_addr_routes(struct lxc_netdev *netdev)
 {
-	struct lxc_list *iterator;
 	int err;
+	struct lxc_inetdev *inetdev;
+	int ifindex;
 
-	lxc_list_for_each(iterator, ip) {
-		struct lxc_inetdev *inetdev = iterator->elem;
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
 
+	ifindex = netdev->priv.veth_attr.ifindex;
+	list_for_each_entry(inetdev, &netdev->ipv4_addresses, head) {
 		err = lxc_ipv4_dest_add(ifindex, &inetdev->addr, 32);
-
 		if (err)
 			return log_error_errno(-1, err, "Failed to setup ipv4 address route for network device with eifindex %d", ifindex);
 	}
@@ -166,13 +231,17 @@
 	return 0;
 }
 
-static int setup_ipv6_addr_routes(struct lxc_list *ip, int ifindex)
+static int setup_ipv6_addr_routes(struct lxc_netdev *netdev)
 {
-	struct lxc_list *iterator;
 	int err;
+	struct lxc_inet6dev *inet6dev;
+	int ifindex;
+
+	if (netdev->type != LXC_NET_VETH)
+		return ret_errno(EINVAL);
 
-	lxc_list_for_each(iterator, ip) {
-		struct lxc_inet6dev *inet6dev = iterator->elem;
+	ifindex = netdev->priv.veth_attr.ifindex;
+	list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) {
 
 		err = lxc_ipv6_dest_add(ifindex, &inet6dev->addr, 128);
 		if (err)
@@ -185,7 +254,7 @@
 static int lxc_ip_neigh_proxy(__u16 nlmsg_type, int family, int ifindex, void *dest)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int addrlen, err;
 	struct ndmsg *rt;
@@ -231,29 +300,330 @@
 	if (family != AF_INET && family != AF_INET6)
 		return ret_set_errno(-1, EINVAL);
 
-	ret = snprintf(path, sizeof(path), "/proc/sys/net/%s/conf/%s/%s",
-		       family == AF_INET ? "ipv4" : "ipv6", ifname,
-		       "forwarding");
-	if (ret < 0 || (size_t)ret >= sizeof(path))
+	ret = strnprintf(path, sizeof(path), "/proc/sys/net/%s/conf/%s/%s",
+			 family == AF_INET ? "ipv4" : "ipv6", ifname,
+			 "forwarding");
+	if (ret < 0)
 		return ret_set_errno(-1, E2BIG);
 
 	return lxc_read_file_expect(path, buf, 1, "1");
 }
 
-static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netdev)
+struct bridge_vlan_info {
+	__u16 flags;
+	__u16 vid;
+};
+
+static int lxc_bridge_vlan(unsigned int ifindex, unsigned short operation, unsigned short vlan_id, bool tagged)
+{
+	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
+	struct nl_handler nlh = NL_HANDLER_INIT;
+	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
+	int err;
+	struct ifinfomsg *ifi;
+	struct rtattr *nest;
+	unsigned short bridge_flags = 0;
+	struct bridge_vlan_info vlan_info;
+
+	err = netlink_open(nlh_ptr, NETLINK_ROUTE);
+	if (err)
+		return err;
+
+	nlmsg = nlmsg_alloc(NLMSG_GOOD_SIZE);
+	if (!nlmsg)
+		return ret_errno(ENOMEM);
+
+	answer = nlmsg_alloc_reserve(NLMSG_GOOD_SIZE);
+	if (!answer)
+		return ret_errno(ENOMEM);
+
+	nlmsg->nlmsghdr->nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
+	nlmsg->nlmsghdr->nlmsg_type = operation;
+
+	ifi = nlmsg_reserve(nlmsg, sizeof(struct ifinfomsg));
+	if (!ifi)
+		return ret_errno(ENOMEM);
+	ifi->ifi_family = AF_BRIDGE;
+	ifi->ifi_index = ifindex;
+
+	nest = nla_begin_nested(nlmsg, IFLA_AF_SPEC);
+	if (!nest)
+		return ret_errno(ENOMEM);
+
+	bridge_flags |= BRIDGE_FLAGS_MASTER;
+	if (nla_put_u16(nlmsg, IFLA_BRIDGE_FLAGS, bridge_flags))
+		return ret_errno(ENOMEM);
+
+	vlan_info.vid = vlan_id;
+	vlan_info.flags = 0;
+	if (!tagged)
+		vlan_info.flags = BRIDGE_VLAN_INFO_PVID | BRIDGE_VLAN_INFO_UNTAGGED;
+
+	if (nla_put_buffer(nlmsg, IFLA_BRIDGE_VLAN_INFO, &vlan_info, sizeof(struct bridge_vlan_info)))
+		return ret_errno(ENOMEM);
+
+	nla_end_nested(nlmsg, nest);
+
+	return netlink_transaction(nlh_ptr, nlmsg, answer);
+}
+
+static int lxc_bridge_vlan_add(unsigned int ifindex, unsigned short vlan_id, bool tagged)
+{
+	return lxc_bridge_vlan(ifindex, RTM_SETLINK, vlan_id, tagged);
+}
+
+static int lxc_bridge_vlan_del(unsigned int ifindex, unsigned short vlan_id)
+{
+	return lxc_bridge_vlan(ifindex, RTM_DELLINK, vlan_id, false);
+}
+
+static int lxc_bridge_vlan_add_tagged(unsigned int ifindex, struct lxc_list *vlan_ids)
+{
+	struct lxc_list *iterator;
+	int err;
+
+	lxc_list_for_each(iterator, vlan_ids) {
+		unsigned short vlan_id = PTR_TO_USHORT(iterator->elem);
+
+		err = lxc_bridge_vlan_add(ifindex, vlan_id, true);
+		if (err)
+			return log_error_errno(-1, -err, "Failed to add tagged vlan \"%u\" to ifindex \"%d\"", vlan_id, ifindex);
+	}
+
+	return 0;
+}
+
+static int validate_veth(struct lxc_netdev *netdev)
+{
+	if (netdev->priv.veth_attr.mode != VETH_MODE_BRIDGE || is_empty_string(netdev->link)) {
+		/* Check that veth.vlan.id isn't being used in non bridge veth.mode. */
+		if (netdev->priv.veth_attr.vlan_id_set)
+			return log_error_errno(-1, EINVAL, "Cannot use veth vlan.id when not in bridge mode or no bridge link specified");
+
+		/* Check that veth.vlan.tagged.id isn't being used in non bridge veth.mode. */
+		if (lxc_list_len(&netdev->priv.veth_attr.vlan_tagged_ids) > 0)
+			return log_error_errno(-1, EINVAL, "Cannot use veth vlan.id when not in bridge mode or no bridge link specified");
+	}
+
+	if (netdev->priv.veth_attr.vlan_id_set) {
+		struct lxc_list *it;
+		lxc_list_for_each(it, &netdev->priv.veth_attr.vlan_tagged_ids) {
+			unsigned short i = PTR_TO_USHORT(it->elem);
+			if (i == netdev->priv.veth_attr.vlan_id)
+				return log_error_errno(-1, EINVAL, "Cannot use same veth vlan.id \"%u\" in vlan.tagged.id", netdev->priv.veth_attr.vlan_id);
+		}
+	}
+
+	return 0;
+}
+
+static int setup_veth_native_bridge_vlan(char *veth1, struct lxc_netdev *netdev)
+{
+	int err, rc, veth1index;
+	char pathSTRLITERALLEN("/sys/class/net//bridge/vlan_filtering") + IFNAMSIZ + 1;
+	char buf5; /* Sufficient size to fit max VLAN ID (4094) and null char. */
+
+	/* Skip setup if no VLAN options are specified. */
+	if (!netdev->priv.veth_attr.vlan_id_set && lxc_list_len(&netdev->priv.veth_attr.vlan_tagged_ids) <= 0)
+		return 0;
+
+	/* Check vlan filtering is enabled on parent bridge. */
+	rc = strnprintf(path, sizeof(path), "/sys/class/net/%s/bridge/vlan_filtering", netdev->link);
+	if (rc < 0)
+		return -1;
+
+	rc = lxc_read_from_file(path, buf, sizeof(buf));
+	if (rc < 0)
+		return log_error_errno(rc, errno, "Failed reading from \"%s\"", path);
+
+	bufrc - 1 = '\0';
+
+	if (!strequal(buf, "1"))
+		return log_error_errno(-1, EPERM, "vlan_filtering is not enabled on \"%s\"", netdev->link);
+
+	/* Get veth1 ifindex for use with netlink. */
+	veth1index = if_nametoindex(veth1);
+	if (!veth1index)
+		return log_error_errno(-1, errno, "Failed getting ifindex of \"%s\"", netdev->link);
+
+	/* Configure untagged VLAN settings on bridge port if specified. */
+	if (netdev->priv.veth_attr.vlan_id_set) {
+		unsigned short default_pvid;
+
+		/* Get the bridge's default VLAN PVID. */
+		rc = strnprintf(path, sizeof(path), "/sys/class/net/%s/bridge/default_pvid", netdev->link);
+		if (rc < 0)
+			return -1;
+
+		rc = lxc_read_from_file(path, buf, sizeof(buf));
+		if (rc < 0)
+			return log_error_errno(rc, errno, "Failed reading from \"%s\"", path);
+
+		bufrc - 1 = '\0';
+		err = get_u16(&default_pvid, buf, 0);
+		if (err)
+			return log_error_errno(-1, EINVAL, "Failed parsing default_pvid of \"%s\"", netdev->link);
+
+		/* If the default PVID on the port is not the specified untagged VLAN, then delete it. */
+		if (default_pvid != netdev->priv.veth_attr.vlan_id) {
+			err = lxc_bridge_vlan_del(veth1index, default_pvid);
+			if (err)
+				return log_error_errno(err, errno, "Failed to delete default untagged vlan \"%u\" on \"%s\"", default_pvid, veth1);
+		}
+
+		if (netdev->priv.veth_attr.vlan_id > BRIDGE_VLAN_NONE) {
+			err = lxc_bridge_vlan_add(veth1index, netdev->priv.veth_attr.vlan_id, false);
+			if (err)
+				return log_error_errno(err, errno, "Failed to add untagged vlan \"%u\" on \"%s\"", netdev->priv.veth_attr.vlan_id, veth1);
+		}
+	}
+
+	/* Configure tagged VLAN settings on bridge port if specified. */
+	err = lxc_bridge_vlan_add_tagged(veth1index, &netdev->priv.veth_attr.vlan_tagged_ids);
+	if (err)
+		return log_error_errno(err, errno, "Failed to add tagged vlans on \"%s\"", veth1);
+
+	return 0;
+}
+
+struct ovs_veth_vlan_args {
+	const char *nic;
+	const char *vlan_mode;	/* Port VLAN mode. */
+	short vlan_id;		/* PVID VLAN ID. */
+	char *trunks;		/* Comma delimited list of tagged VLAN IDs. */
+};
+
+static inline void free_ovs_veth_vlan_args(struct ovs_veth_vlan_args *args)
+{
+	free_disarm(args->trunks);
+}
+
+static int lxc_ovs_setup_bridge_vlan_exec(void *data)
+{
+	struct ovs_veth_vlan_args *args = data;
+       __do_free char *vlan_mode = NULL, *tag = NULL, *trunks = NULL;
+
+	if (!args->vlan_mode)
+		return ret_errno(EINVAL);
+
+	vlan_mode = must_concat(NULL, "vlan_mode=", args->vlan_mode, (char *)NULL);
+
+	if (args->vlan_id > BRIDGE_VLAN_NONE) {
+		char buf5;
+		int rc;
+
+		rc = strnprintf(buf, sizeof(buf), "%u", args->vlan_id);
+		if (rc < 0)
+			return log_error_errno(-1, EINVAL, "Failed to parse ovs bridge vlan \"%d\"", args->vlan_id);
+
+		tag = must_concat(NULL, "tag=", buf, (char *)NULL);
+	}
+
+	if (args->trunks)
+		trunks = must_concat(NULL, "trunks=", args->trunks, (char *)NULL);
+
+	/* Detect the combination of vlan_id and trunks specified and convert to ovs-vsctl command. */
+	if (tag && trunks)
+		execlp("ovs-vsctl", "ovs-vsctl", "set", "port", args->nic, vlan_mode, tag, trunks, (char *)NULL);
+	else if (tag)
+		execlp("ovs-vsctl", "ovs-vsctl", "set", "port", args->nic, vlan_mode, tag, (char *)NULL);
+	else if (trunks)
+		execlp("ovs-vsctl", "ovs-vsctl", "set", "port", args->nic, vlan_mode, trunks, (char *)NULL);
+	else
+		return -EINVAL;
+
+	return -errno;
+}
+
+static int setup_veth_ovs_bridge_vlan(char *veth1, struct lxc_netdev *netdev)
+{
+	int taggedLength = lxc_list_len(&netdev->priv.veth_attr.vlan_tagged_ids);
+	struct ovs_veth_vlan_args args;
+	args.nic = veth1;
+	args.vlan_mode = NULL;
+	args.vlan_id = BRIDGE_VLAN_NONE;
+	args.trunks = NULL;
+
+	/* Skip setup if no VLAN options are specified. */
+	if (!netdev->priv.veth_attr.vlan_id_set && taggedLength <= 0)
+		return 0;
+
+	/* Configure untagged VLAN settings on bridge port if specified. */
+	if (netdev->priv.veth_attr.vlan_id_set) {
+		if (netdev->priv.veth_attr.vlan_id == BRIDGE_VLAN_NONE && taggedLength <= 0)
+			return log_error_errno(-1, EINVAL, "Cannot use vlan.id=none with openvswitch bridges when not using vlan.tagged.id");
+
+		/* Configure the untagged 'native' membership settings of the port if VLAN ID specified.
+		 * Also set the vlan_mode=access, which will drop any tagged frames.
+		 * Order is important here, as vlan_mode is set to "access", assuming that vlan.tagged.id is not
+		 * used. If vlan.tagged.id is specified, then we expect it to also change the vlan_mode as needed.
+		 */
+		if (netdev->priv.veth_attr.vlan_id > BRIDGE_VLAN_NONE) {
+			args.vlan_mode = "access";
+			args.vlan_id = netdev->priv.veth_attr.vlan_id;
+		}
+	}
+
+	if (taggedLength > 0) {
+		args.vlan_mode = "trunk"; /* Default to only allowing tagged frames (drop untagged frames). */
+
+		if (netdev->priv.veth_attr.vlan_id > BRIDGE_VLAN_NONE) {
+			/* If untagged vlan mode isn't "none" then allow untagged frames for port's 'native' VLAN. */
+			args.vlan_mode  = "native-untagged";
+		}
+
+		struct lxc_list *iterator;
+		lxc_list_for_each(iterator, &netdev->priv.veth_attr.vlan_tagged_ids) {
+			unsigned short vlan_id = PTR_TO_USHORT(iterator->elem);
+			char buf5; /* Sufficient size to fit max VLAN ID (4094) null char. */
+			int rc;
+
+			rc = strnprintf(buf, sizeof(buf), "%u", vlan_id);
+			if (rc < 0) {
+				free_ovs_veth_vlan_args(&args);
+				return log_error_errno(-1, EINVAL, "Failed to parse tagged vlan \"%u\" for interface \"%s\"", vlan_id, veth1);
+			}
+
+			if (args.trunks)
+				args.trunks = must_concat(NULL, args.trunks, buf, ",", (char *)NULL);
+			else
+				args.trunks = must_concat(NULL, buf, ",", (char *)NULL);
+		}
+	}
+
+	if (args.vlan_mode) {
+		int ret;
+		char cmd_outputPATH_MAX;
+
+		ret = run_command(cmd_output, sizeof(cmd_output), lxc_ovs_setup_bridge_vlan_exec, (void *)&args);
+		if (ret < 0) {
+			free_ovs_veth_vlan_args(&args);
+			return log_error_errno(-1, ret, "Failed to setup openvswitch vlan on port \"%s\": %s", args.nic, cmd_output);
+		}
+	}
+
+	free_ovs_veth_vlan_args(&args);
+	return 0;
+}
+
+static int netdev_configure_server_veth(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	int err;
 	unsigned int mtu = 1500;
 	char *veth1, *veth2;
 	char veth1bufIFNAMSIZ, veth2bufIFNAMSIZ;
 
+	err = validate_veth(netdev);
+	if (err)
+		return err;
+
 	if (!is_empty_string(netdev->priv.veth_attr.pair)) {
 		veth1 = netdev->priv.veth_attr.pair;
 		if (handler->conf->reboot)
 			lxc_netdev_delete_by_name(veth1);
 	} else {
-		err = snprintf(veth1buf, sizeof(veth1buf), "vethXXXXXX");
-		if (err < 0 || (size_t)err >= sizeof(veth1buf))
+		err = strnprintf(veth1buf, sizeof(veth1buf), "vethXXXXXX");
+		if (err < 0)
 			return -1;
 
 		veth1 = lxc_ifname_alnum_case_sensitive(veth1buf);
@@ -264,8 +634,8 @@
 		memcpy(netdev->priv.veth_attr.veth1, veth1, IFNAMSIZ);
 	}
 
-	err = snprintf(veth2buf, sizeof(veth2buf), "vethXXXXXX");
-	if (err < 0 || (size_t)err >= sizeof(veth2buf))
+	err = strnprintf(veth2buf, sizeof(veth2buf), "vethXXXXXX");
+	if (err < 0)
 		return -1;
 
 	veth2 = lxc_ifname_alnum_case_sensitive(veth2buf);
@@ -286,15 +656,33 @@
 		}
 	}
 
-	err = lxc_veth_create(veth1, veth2, handler->pid, mtu);
+	err = lxc_veth_create(veth1, veth2, handler->pid, mtu,
+			      netdev->priv.veth_attr.n_rxqueues, netdev->priv.veth_attr.n_txqueues);
 	if (err)
 		return log_error_errno(-1, -err, "Failed to create veth pair \"%s\" and \"%s\"", veth1, veth2);
 
+	/*
+	 * Veth devices are directly created in the container's network
+	 * namespace so the device doesn't need to be moved into the
+	 * container's network namespace. Make this explicit by setting the
+	 * devices ifindex to 0.
+	 */
+	netdev->ifindex = 0;
+
 	strlcpy(netdev->created_name, veth2, IFNAMSIZ);
 
-	/* changing the high byte of the mac address to 0xfe, the bridge interface
+	 /*
+	  * Since the device won't be moved transient name generation won't
+	  * happen. But the transient name is needed for the container to
+	  * retrieve the ifindex for the device.
+	  */
+	strlcpy(netdev->transient_name, veth2, IFNAMSIZ);
+
+	/*
+	 * Changing the high byte of the mac address to 0xfe, the bridge interface
 	 * will always keep the host's mac address and not take the mac address
-	 * of a container */
+	 * of a container.
+	 */
 	err = setup_private_host_hw_addr(veth1);
 	if (err) {
 		errno = -err;
@@ -331,6 +719,21 @@
 			goto out_delete;
 		}
 		INFO("Attached \"%s\" to bridge \"%s\"", veth1, netdev->link);
+
+		if (is_ovs_bridge(netdev->link)) {
+			err = setup_veth_ovs_bridge_vlan(veth1, netdev);
+			if (err) {
+				SYSERROR("Failed to setup openvswitch bridge vlan on \"%s\"", veth1);
+				lxc_ovs_delete_port(netdev->link, veth1);
+				goto out_delete;
+			}
+		} else {
+			err = setup_veth_native_bridge_vlan(veth1, netdev);
+			if (err) {
+				SYSERROR("Failed to setup native bridge vlan on \"%s\"", veth1);
+				goto out_delete;
+			}
+		}
 	}
 
 	err = lxc_netdev_up(veth1);
@@ -341,13 +744,13 @@
 	}
 
 	/* setup ipv4 routes on the host interface */
-	if (lxc_setup_ipv4_routes(&netdev->priv.veth_attr.ipv4_routes, netdev->priv.veth_attr.ifindex)) {
+	if (setup_ipv4_routes(netdev)) {
 		ERROR("Failed to setup ipv4 routes for network device \"%s\"", veth1);
 		goto out_delete;
 	}
 
 	/* setup ipv6 routes on the host interface */
-	if (lxc_setup_ipv6_routes(&netdev->priv.veth_attr.ipv6_routes, netdev->priv.veth_attr.ifindex)) {
+	if (setup_ipv6_routes(netdev)) {
 		ERROR("Failed to setup ipv6 routes for network device \"%s\"", veth1);
 		goto out_delete;
 	}
@@ -417,14 +820,14 @@
 		}
 
 		/* setup ipv4 address routes on the host interface */
-		err = setup_ipv4_addr_routes(&netdev->ipv4, netdev->priv.veth_attr.ifindex);
+		err = setup_ipv4_addr_routes(netdev);
 		if (err) {
 			SYSERROR("Failed to setup ip address routes for network device \"%s\"", veth1);
 			goto out_delete;
 		}
 
 		/* setup ipv6 address routes on the host interface */
-		err = setup_ipv6_addr_routes(&netdev->ipv6, netdev->priv.veth_attr.ifindex);
+		err = setup_ipv6_addr_routes(netdev);
 		if (err) {
 			SYSERROR("Failed to setup ip address routes for network device \"%s\"", veth1);
 			goto out_delete;
@@ -455,7 +858,7 @@
 	return -1;
 }
 
-static int instantiate_macvlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_configure_server_macvlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	char peerIFNAMSIZ;
 	int err;
@@ -465,8 +868,8 @@
 		return -1;
 	}
 
-	err = snprintf(peer, sizeof(peer), "mcXXXXXX");
-	if (err < 0 || (size_t)err >= sizeof(peer))
+	err = strnprintf(peer, sizeof(peer), "mcXXXXXX");
+	if (err < 0)
 		return -1;
 
 	if (!lxc_ifname_alnum_case_sensitive(peer))
@@ -521,7 +924,7 @@
 			goto on_error;
 	}
 
-	DEBUG("Instantiated macvlan \"%s\" with ifindex is %d and mode %d",
+	DEBUG("Instantiated macvlan \"%s\" with ifindex %d and mode %d",
 	      peer, netdev->ifindex, netdev->priv.macvlan_attr.mode);
 
 	return 0;
@@ -534,7 +937,7 @@
 static int lxc_ipvlan_create(const char *parent, const char *name, int mode, int isolation)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err, index, len;
 	struct ifinfomsg *ifi;
@@ -605,7 +1008,7 @@
 	return netlink_transaction(nlh_ptr, nlmsg, answer);
 }
 
-static int instantiate_ipvlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_configure_server_ipvlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	char peerIFNAMSIZ;
 	int err;
@@ -615,8 +1018,8 @@
 		return -1;
 	}
 
-	err = snprintf(peer, sizeof(peer), "ipXXXXXX");
-	if (err < 0 || (size_t)err >= sizeof(peer))
+	err = strnprintf(peer, sizeof(peer), "ipXXXXXX");
+	if (err < 0)
 		return -1;
 
 	if (!lxc_ifname_alnum_case_sensitive(peer))
@@ -669,7 +1072,7 @@
 			goto on_error;
 	}
 
-	DEBUG("Instantiated ipvlan \"%s\" with ifindex is %d and mode %d", peer,
+	DEBUG("Instantiated ipvlan \"%s\" with ifindex %d and mode %d", peer,
 	      netdev->ifindex, netdev->priv.macvlan_attr.mode);
 
 	return 0;
@@ -679,7 +1082,7 @@
 	return -1;
 }
 
-static int instantiate_vlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_configure_server_vlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	char peerIFNAMSIZ;
 	int err;
@@ -690,9 +1093,9 @@
 		return -1;
 	}
 
-	err = snprintf(peer, sizeof(peer), "vlan%d-%d",
-		       netdev->priv.vlan_attr.vid, vlan_cntr++);
-	if (err < 0 || (size_t)err >= sizeof(peer))
+	err = strnprintf(peer, sizeof(peer), "vlan%d-%d",
+			 netdev->priv.vlan_attr.vid, vlan_cntr++);
+	if (err < 0)
 		return -1;
 
 	err = lxc_vlan_create(netdev->link, peer, netdev->priv.vlan_attr.vid);
@@ -743,7 +1146,7 @@
 		}
 	}
 
-	DEBUG("Instantiated vlan \"%s\" with ifindex is \"%d\"", peer,
+	DEBUG("Instantiated vlan \"%s\" with ifindex \"%d\"", peer,
 	      netdev->ifindex);
 
 	return 0;
@@ -753,7 +1156,7 @@
 	return -1;
 }
 
-static int instantiate_phys(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_configure_server_phys(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	int err, mtu_orig = 0;
 
@@ -817,13 +1220,13 @@
 			return -1;
 	}
 
-	DEBUG("Instantiated phys \"%s\" with ifindex is \"%d\"", netdev->link,
+	DEBUG("Instantiated phys \"%s\" with ifindex \"%d\"", netdev->link,
 	      netdev->ifindex);
 
 	return 0;
 }
 
-static int instantiate_empty(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_configure_server_empty(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	int ret;
 	char *argv = {
@@ -831,7 +1234,12 @@
 	    NULL,
 	};
 
-	netdev->ifindex = 0;
+	/* The loopback device always has index 1. */
+	netdev->ifindex = 1;
+
+	if (!strequal(netdev->name, "lo"))
+		return syserror_set(-EINVAL, "Custom loopback device names not supported");
+
 	if (!netdev->upscript)
 		return 0;
 
@@ -843,45 +1251,44 @@
 	return 0;
 }
 
-static int instantiate_none(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_configure_server_none(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	netdev->ifindex = 0;
 	return 0;
 }
 
-static  instantiate_cb netdev_confLXC_NET_MAXCONFTYPE + 1 = {
-	LXC_NET_VETH    = instantiate_veth,
-	LXC_NET_MACVLAN = instantiate_macvlan,
-	LXC_NET_IPVLAN  = instantiate_ipvlan,
-	LXC_NET_VLAN    = instantiate_vlan,
-	LXC_NET_PHYS    = instantiate_phys,
-	LXC_NET_EMPTY   = instantiate_empty,
-	LXC_NET_NONE    = instantiate_none,
+static netdev_configure_server_cb netdev_configure_serverLXC_NET_MAXCONFTYPE + 1 = {
+	LXC_NET_VETH    = netdev_configure_server_veth,
+	LXC_NET_MACVLAN = netdev_configure_server_macvlan,
+	LXC_NET_IPVLAN  = netdev_configure_server_ipvlan,
+	LXC_NET_VLAN    = netdev_configure_server_vlan,
+	LXC_NET_PHYS    = netdev_configure_server_phys,
+	LXC_NET_EMPTY   = netdev_configure_server_empty,
+	LXC_NET_NONE    = netdev_configure_server_none,
 };
 
-static int __instantiate_ns_common(struct lxc_netdev *netdev)
+static int __netdev_configure_container_common(struct lxc_netdev *netdev)
 {
 	char current_ifnameIFNAMSIZ;
 
-	netdev->ifindex = if_nametoindex(netdev->created_name);
+	netdev->ifindex = if_nametoindex(netdev->transient_name);
 	if (!netdev->ifindex)
 		return log_error_errno(-1,
 				       errno, "Failed to retrieve ifindex for network device with name %s",
-				       netdev->created_name);
+				       netdev->transient_name);
 
 	if (is_empty_string(netdev->name))
 		(void)strlcpy(netdev->name, "eth%d", IFNAMSIZ);
 
-	if (strcmp(netdev->created_name, netdev->name) != 0) {
+	if (!strequal(netdev->transient_name, netdev->name)) {
 		int ret;
 
-		ret = lxc_netdev_rename_by_name(netdev->created_name, netdev->name);
+		ret = lxc_netdev_rename_by_name(netdev->transient_name, netdev->name);
 		if (ret)
 			return log_error_errno(-1, -ret, "Failed to rename network device \"%s\" to \"%s\"",
-					       netdev->created_name,
-					       netdev->name);
+					       netdev->transient_name, netdev->name);
 
-		TRACE("Renamed network device from \"%s\" to \"%s\"", netdev->created_name, netdev->name);
+		TRACE("Renamed network device from \"%s\" to \"%s\"", netdev->transient_name, netdev->name);
 	}
 
 	/*
@@ -897,57 +1304,58 @@
 	 * later on send this information back to the parent.
 	 */
 	(void)strlcpy(netdev->name, current_ifname, IFNAMSIZ);
+	netdev->transient_name0 = '\0';
 
 	return 0;
 }
 
-static int instantiate_ns_veth(struct lxc_netdev *netdev)
+static int netdev_configure_container_veth(struct lxc_netdev *netdev)
 {
 
-	return __instantiate_ns_common(netdev);
+	return __netdev_configure_container_common(netdev);
 }
 
-static int instantiate_ns_macvlan(struct lxc_netdev *netdev)
+static int netdev_configure_container_macvlan(struct lxc_netdev *netdev)
 {
-	return __instantiate_ns_common(netdev);
+	return __netdev_configure_container_common(netdev);
 }
 
-static int instantiate_ns_ipvlan(struct lxc_netdev *netdev)
+static int netdev_configure_container_ipvlan(struct lxc_netdev *netdev)
 {
-	return __instantiate_ns_common(netdev);
+	return __netdev_configure_container_common(netdev);
 }
 
-static int instantiate_ns_vlan(struct lxc_netdev *netdev)
+static int netdev_configure_container_vlan(struct lxc_netdev *netdev)
 {
-	return __instantiate_ns_common(netdev);
+	return __netdev_configure_container_common(netdev);
 }
 
-static int instantiate_ns_phys(struct lxc_netdev *netdev)
+static int netdev_configure_container_phys(struct lxc_netdev *netdev)
 {
-	return __instantiate_ns_common(netdev);
+	return __netdev_configure_container_common(netdev);
 }
 
-static int instantiate_ns_empty(struct lxc_netdev *netdev)
+static int netdev_configure_container_empty(struct lxc_netdev *netdev)
 {
 	return 0;
 }
 
-static int instantiate_ns_none(struct lxc_netdev *netdev)
+static int netdev_configure_container_none(struct lxc_netdev *netdev)
 {
 	return 0;
 }
 
-static  instantiate_ns_cb netdev_ns_confLXC_NET_MAXCONFTYPE + 1 = {
-	LXC_NET_VETH    = instantiate_ns_veth,
-	LXC_NET_MACVLAN = instantiate_ns_macvlan,
-	LXC_NET_IPVLAN  = instantiate_ns_ipvlan,
-	LXC_NET_VLAN    = instantiate_ns_vlan,
-	LXC_NET_PHYS    = instantiate_ns_phys,
-	LXC_NET_EMPTY   = instantiate_ns_empty,
-	LXC_NET_NONE    = instantiate_ns_none,
+static netdev_configure_container_cb netdev_configure_containerLXC_NET_MAXCONFTYPE + 1 = {
+	LXC_NET_VETH    = netdev_configure_container_veth,
+	LXC_NET_MACVLAN = netdev_configure_container_macvlan,
+	LXC_NET_IPVLAN  = netdev_configure_container_ipvlan,
+	LXC_NET_VLAN    = netdev_configure_container_vlan,
+	LXC_NET_PHYS    = netdev_configure_container_phys,
+	LXC_NET_EMPTY   = netdev_configure_container_empty,
+	LXC_NET_NONE    = netdev_configure_container_none,
 };
 
-static int shutdown_veth(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_shutdown_server_veth(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	int ret;
 	char *argv = {
@@ -974,7 +1382,7 @@
 	return 0;
 }
 
-static int shutdown_macvlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_shutdown_server_macvlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	int ret;
 	char *argv = {
@@ -994,7 +1402,7 @@
 	return 0;
 }
 
-static int shutdown_ipvlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_shutdown_server_ipvlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	int ret;
 	char *argv = {
@@ -1014,7 +1422,7 @@
 	return 0;
 }
 
-static int shutdown_vlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_shutdown_server_vlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	int ret;
 	char *argv = {
@@ -1034,7 +1442,7 @@
 	return 0;
 }
 
-static int shutdown_phys(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_shutdown_server_phys(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	int ret;
 	char *argv = {
@@ -1054,7 +1462,7 @@
 	return 0;
 }
 
-static int shutdown_empty(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_shutdown_server_empty(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	int ret;
 	char *argv = {
@@ -1073,25 +1481,25 @@
 	return 0;
 }
 
-static int shutdown_none(struct lxc_handler *handler, struct lxc_netdev *netdev)
+static int netdev_shutdown_server_none(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
 	return 0;
 }
 
-static  instantiate_cb netdev_deconfLXC_NET_MAXCONFTYPE + 1 = {
-	LXC_NET_VETH    = shutdown_veth,
-	LXC_NET_MACVLAN = shutdown_macvlan,
-	LXC_NET_IPVLAN  = shutdown_ipvlan,
-	LXC_NET_VLAN    = shutdown_vlan,
-	LXC_NET_PHYS    = shutdown_phys,
-	LXC_NET_EMPTY   = shutdown_empty,
-	LXC_NET_NONE    = shutdown_none,
+static netdev_shutdown_server_cb netdev_deconfLXC_NET_MAXCONFTYPE + 1 = {
+	LXC_NET_VETH    = netdev_shutdown_server_veth,
+	LXC_NET_MACVLAN = netdev_shutdown_server_macvlan,
+	LXC_NET_IPVLAN  = netdev_shutdown_server_ipvlan,
+	LXC_NET_VLAN    = netdev_shutdown_server_vlan,
+	LXC_NET_PHYS    = netdev_shutdown_server_phys,
+	LXC_NET_EMPTY   = netdev_shutdown_server_empty,
+	LXC_NET_NONE    = netdev_shutdown_server_none,
 };
 
 static int lxc_netdev_move_by_index_fd(int ifindex, int fd, const char *ifname)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err;
 	struct ifinfomsg *ifi;
@@ -1126,7 +1534,7 @@
 int lxc_netdev_move_by_index(int ifindex, pid_t pid, const char *ifname)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err;
 	struct ifinfomsg *ifi;
@@ -1173,8 +1581,8 @@
 
 	len = strlen(ifname) + strlen(PHYSNAME) - 1;
 	path = must_realloc(NULL, len + 1);
-	ret = snprintf(path, len, PHYSNAME, ifname);
-	if (ret < 0 || (size_t)ret >= len)
+	ret = strnprintf(path, len, PHYSNAME, ifname);
+	if (ret < 0)
 		return NULL;
 
 	f = fopen(path, "re");
@@ -1237,8 +1645,10 @@
 	 * the 80211 module, so for now just call out to iw.
 	 */
 	cmd = on_path("iw", NULL);
-	if (!cmd)
+	if (!cmd) {
+		ERROR("Couldn't find the application iw in PATH");
 		return -1;
+	}
 
 	fpid = fork();
 	if (fpid < 0)
@@ -1282,7 +1692,7 @@
 int lxc_netdev_delete_by_index(int ifindex)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err;
 	struct ifinfomsg *ifi;
@@ -1326,7 +1736,7 @@
 int lxc_netdev_rename_by_index(int ifindex, const char *newname)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err, len;
 	struct ifinfomsg *ifi;
@@ -1381,7 +1791,7 @@
 int netdev_set_flag(const char *name, int flag)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err, index, len;
 	struct ifinfomsg *ifi;
@@ -1421,10 +1831,10 @@
 	return netlink_transaction(nlh_ptr, nlmsg, answer);
 }
 
-int netdev_get_flag(const char *name, int *flag)
+static int netdev_get_flag(const char *name, int *flag)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err, index, len;
 	struct ifinfomsg *ifi;
@@ -1484,7 +1894,8 @@
  */
 int lxc_netdev_isup(const char *name)
 {
-	int err, flag;
+	int err;
+	int flag = 0;
 
 	err = netdev_get_flag(name, &flag);
 	if (err)
@@ -1499,9 +1910,10 @@
 int netdev_get_mtu(int ifindex)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
-	int readmore = 0, recv_len = 0;
+	int readmore = 0;
+	__u32 recv_len = 0;
 	int answer_len, err, res;
 	struct ifinfomsg *ifi;
 	struct nlmsghdr *msg;
@@ -1610,7 +2022,7 @@
 int lxc_netdev_set_mtu(const char *name, int mtu)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err, len;
 	struct ifinfomsg *ifi;
@@ -1659,10 +2071,11 @@
 	return netdev_set_flag(name, 0);
 }
 
-int lxc_veth_create(const char *name1, const char *name2, pid_t pid, unsigned int mtu)
+int lxc_veth_create(const char *name1, const char *name2, pid_t pid, unsigned int mtu,
+                    int n_rxqueues, int n_txqueues)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err, len;
 	struct ifinfomsg *ifi;
@@ -1719,6 +2132,12 @@
 	if (nla_put_string(nlmsg, IFLA_IFNAME, name2))
 		return ret_errno(ENOMEM);
 
+	if (n_rxqueues > 0 && nla_put_u32(nlmsg, IFLA_NUM_RX_QUEUES, (unsigned int)n_rxqueues))
+		return ret_errno(ENOMEM);
+
+	if (n_txqueues > 0 && nla_put_u32(nlmsg, IFLA_NUM_TX_QUEUES, (unsigned int)n_txqueues))
+		return ret_errno(ENOMEM);
+
 	if (mtu > 0 && nla_put_u32(nlmsg, IFLA_MTU, mtu))
 		return ret_errno(ENOMEM);
 
@@ -1732,6 +2151,12 @@
 	if (nla_put_string(nlmsg, IFLA_IFNAME, name1))
 		return ret_errno(ENOMEM);
 
+	if (n_txqueues > 0 && nla_put_u32(nlmsg, IFLA_NUM_RX_QUEUES, (unsigned int)n_txqueues))
+		return ret_errno(ENOMEM);
+
+	if (n_rxqueues > 0 && nla_put_u32(nlmsg, IFLA_NUM_TX_QUEUES, (unsigned int)n_rxqueues))
+		return ret_errno(ENOMEM);
+
 	return netlink_transaction(nlh_ptr, nlmsg, answer);
 }
 
@@ -1739,7 +2164,7 @@
 int lxc_vlan_create(const char *parent, const char *name, unsigned short vlanid)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err, len, lindex;
 	struct ifinfomsg *ifi;
@@ -1807,7 +2232,7 @@
 int lxc_macvlan_create(const char *parent, const char *name, int mode)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int err, index, len;
 	struct ifinfomsg *ifi;
@@ -1899,9 +2324,10 @@
 	if (family != AF_INET && family != AF_INET6)
 		return -EINVAL;
 
-	ret = snprintf(path, sizeof(path), "/proc/sys/net/%s/conf/%s/%s",
-		       family == AF_INET ? "ipv4" : "ipv6", ifname, "forwarding");
-	if (ret < 0 || (size_t)ret >= sizeof(path))
+	ret = strnprintf(path, sizeof(path), "/proc/sys/net/%s/conf/%s/%s",
+			 family == AF_INET ? "ipv4" : "ipv6", ifname,
+			 "forwarding");
+	if (ret < 0)
 		return -E2BIG;
 
 	return proc_sys_net_write(path, flag ? "1" : "0");
@@ -1925,10 +2351,10 @@
 	if (family != AF_INET && family != AF_INET6)
 		return -EINVAL;
 
-	ret = snprintf(path, sizeof(path), "/proc/sys/net/%s/conf/%s/%s",
-		       family == AF_INET ? "ipv4" : "ipv6", ifname,
-		       family == AF_INET ? "proxy_arp" : "proxy_ndp");
-	if (ret < 0 || (size_t)ret >= sizeof(path))
+	ret = strnprintf(path, sizeof(path), "/proc/sys/net/%s/conf/%s/%s",
+			 family == AF_INET ? "ipv4" : "ipv6", ifname,
+			 family == AF_INET ? "proxy_arp" : "proxy_ndp");
+	if (ret < 0)
 		return -E2BIG;
 
 	return proc_sys_net_write(path, flag ? "1" : "0");
@@ -1943,10 +2369,10 @@
 	if (family != AF_INET && family != AF_INET6)
 		return ret_set_errno(-1, EINVAL);
 
-	ret = snprintf(path, sizeof(path), "/proc/sys/net/%s/conf/%s/%s",
-		       family == AF_INET ? "ipv4" : "ipv6", ifname,
-		       family == AF_INET ? "proxy_arp" : "proxy_ndp");
-	if (ret < 0 || (size_t)ret >= sizeof(path))
+	ret = strnprintf(path, sizeof(path), "/proc/sys/net/%s/conf/%s/%s",
+			 family == AF_INET ? "ipv4" : "ipv6", ifname,
+			 family == AF_INET ? "proxy_arp" : "proxy_ndp");
+	if (ret < 0)
 		return ret_set_errno(-1, E2BIG);
 
 	return lxc_read_file_expect(path, buf, 1, "1");
@@ -2011,7 +2437,7 @@
 		       void *acast, int prefix)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int addrlen, err;
 	struct ifaddrmsg *ifa;
@@ -2105,7 +2531,7 @@
 			 * the address length is correct, but check here just in
 			 * case.
 			 */
-			if (RTA_PAYLOAD(rta) != addrlen)
+			if (RTA_PAYLOAD(rta) != (unsigned int)addrlen)
 				return -1;
 
 			/* We might have found an IFA_ADDRESS before, which we
@@ -2131,12 +2557,13 @@
 static int ip_addr_get(int family, int ifindex, void **res)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int answer_len, err;
 	struct ifaddrmsg *ifa;
 	struct nlmsghdr *msg;
-	int readmore = 0, recv_len = 0;
+	int readmore = 0;
+	__u32 recv_len = 0;
 
 	err = netlink_open(nlh_ptr, NETLINK_ROUTE);
 	if (err)
@@ -2208,7 +2635,7 @@
 				return ret_errno(EINVAL);
 
 			ifa = (struct ifaddrmsg *)NLMSG_DATA(msg);
-			if (ifa->ifa_index == ifindex) {
+			if (ifa->ifa_index == (__u32)ifindex) {
 				if (ifa_get_local_ip(family, msg, res) < 0)
 					return ret_errno(EINVAL);
 
@@ -2248,7 +2675,7 @@
 static int ip_gateway_add(int family, int ifindex, void *gw)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int addrlen, err;
 	struct rtmsg *rt;
@@ -2311,9 +2738,9 @@
 	struct stat sb;
 	char brdirname22 + IFNAMSIZ + 1 = {0};
 
-	ret = snprintf(brdirname, 22 + IFNAMSIZ + 1, "/sys/class/net/%s/bridge",
-		       bridge);
-	if (ret < 0 || (size_t)ret >= 22 + IFNAMSIZ + 1)
+	ret = strnprintf(brdirname, 22 + IFNAMSIZ + 1,
+			 "/sys/class/net/%s/bridge", bridge);
+	if (ret < 0)
 		return false;
 
 	ret = stat(brdirname, &sb);
@@ -2415,108 +2842,26 @@
 	return err;
 }
 
-static const char *const lxc_network_typesLXC_NET_MAXCONFTYPE + 1 = {
-	LXC_NET_EMPTY   = "empty",
-	LXC_NET_VETH    = "veth",
-	LXC_NET_MACVLAN = "macvlan",
-	LXC_NET_IPVLAN  = "ipvlan",
-	LXC_NET_PHYS    = "phys",
-	LXC_NET_VLAN    = "vlan",
-	LXC_NET_NONE    = "none",
-};
-
-const char *lxc_net_type_to_str(int type)
-{
-	if (type < 0 || type > LXC_NET_MAXCONFTYPE)
-		return NULL;
-
-	return lxc_network_typestype;
-}
-
-static const char padchar = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-char *lxc_ifname_alnum_case_sensitive(char *template)
-{
-	int ret;
-	struct netns_ifaddrs *ifa, *ifaddr;
-	char nameIFNAMSIZ;
-	bool exists = false;
-	size_t i = 0;
-#ifdef HAVE_RAND_R
-	unsigned int seed;
-
-	seed = randseed(false);
-#else
-
-	(void)randseed(true);
-#endif
-
-	if (strlen(template) >= IFNAMSIZ)
-		return NULL;
-
-	/* Get all the network interfaces. */
-	ret = netns_getifaddrs(&ifaddr, -1, &(bool){false});
-	if (ret < 0)
-		return log_error_errno(NULL, errno, "Failed to get network interfaces");
-
-	/* Generate random names until we find one that doesn't exist. */
-	for (;;) {
-		name0 = '\0';
-		(void)strlcpy(name, template, IFNAMSIZ);
-
-		exists = false;
-
-		for (i = 0; i < strlen(name); i++) {
-			if (namei == 'X') {
-#ifdef HAVE_RAND_R
-				namei = padcharrand_r(&seed) % strlen(padchar);
-#else
-				namei = padcharrand() % strlen(padchar);
-#endif
-			}
-		}
-
-		for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-			if (!strcmp(ifa->ifa_name, name)) {
-				exists = true;
-				break;
-			}
-		}
-
-		if (!exists)
-			break;
-	}
-
-	netns_freeifaddrs(ifaddr);
-	(void)strlcpy(template, name, strlen(template) + 1);
-
-	return template;
-}
-
 int setup_private_host_hw_addr(char *veth1)
 {
-	int err, sockfd;
+	__do_close int sockfd = -EBADF;
+	int err;
 	struct ifreq ifr;
 
 	sockfd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
 	if (sockfd < 0)
 		return -errno;
 
-	err = snprintf((char *)ifr.ifr_name, IFNAMSIZ, "%s", veth1);
-	if (err < 0 || (size_t)err >= IFNAMSIZ) {
-		close(sockfd);
-		return -E2BIG;
-	}
+	err = strnprintf((char *)ifr.ifr_name, IFNAMSIZ, "%s", veth1);
+	if (err < 0)
+		return err;
 
 	err = ioctl(sockfd, SIOCGIFHWADDR, &ifr);
-	if (err < 0) {
-		close(sockfd);
+	if (err < 0)
 		return -errno;
-	}
 
 	ifr.ifr_hwaddr.sa_data0 = 0xfe;
 	err = ioctl(sockfd, SIOCSIFHWADDR, &ifr);
-	close(sockfd);
 	if (err < 0)
 		return -errno;
 
@@ -2525,23 +2870,18 @@
 
 int lxc_find_gateway_addresses(struct lxc_handler *handler)
 {
-	struct lxc_list *network = &handler->conf->network;
-	struct lxc_list *iterator;
 	struct lxc_netdev *netdev;
 	int link_index;
 
-	lxc_list_for_each(iterator, network) {
-		netdev = iterator->elem;
-
+	list_for_each_entry(netdev, &handler->conf->netdevs, head) {
 		if (!netdev->ipv4_gateway_auto && !netdev->ipv6_gateway_auto)
 			continue;
 
 		if (netdev->type != LXC_NET_VETH && netdev->type != LXC_NET_MACVLAN)
 			return log_error_errno(-1, EINVAL, "Automatic gateway detection is only supported for veth and macvlan");
 
-		if (is_empty_string(netdev->link)) {
+		if (is_empty_string(netdev->link))
 			return log_error_errno(-1, errno, "Automatic gateway detection needs a link interface");
-		}
 
 		link_index = if_nametoindex(netdev->link);
 		if (!link_index)
@@ -2562,8 +2902,10 @@
 }
 
 #define LXC_USERNIC_PATH LIBEXECDIR "/lxc/lxc-user-nic"
-static int lxc_create_network_unpriv_exec(const char *lxcpath, const char *lxcname,
-					  struct lxc_netdev *netdev, pid_t pid, unsigned int hooks_version)
+static int lxc_create_network_unpriv_exec(const char *lxcpath,
+					  const char *lxcname,
+					  struct lxc_netdev *netdev, pid_t pid,
+					  unsigned int hooks_version)
 {
 	int ret;
 	pid_t child;
@@ -2574,7 +2916,9 @@
 	size_t retlen;
 
 	if (netdev->type != LXC_NET_VETH)
-		return log_error_errno(-1, errno, "Network type %d not support for unprivileged use", netdev->type);
+		return log_error_errno(-1, errno,
+				       "Network type %d not support for unprivileged use",
+				       netdev->type);
 
 	ret = pipe(pipefd);
 	if (ret < 0)
@@ -2610,14 +2954,13 @@
 			_exit(EXIT_FAILURE);
 		}
 
-		ret = snprintf(pidstr, sizeof(pidstr), "%d", pid);
-		if (ret < 0 || ret >= sizeof(pidstr))
+		ret = strnprintf(pidstr, sizeof(pidstr), "%d", pid);
+		if (ret < 0)
 			_exit(EXIT_FAILURE);
 		pidstrsizeof(pidstr) - 1 = '\0';
 
 		INFO("Execing lxc-user-nic create %s %s %s veth %s %s", lxcpath,
-		     lxcname, pidstr, netdev_link,
-		     !is_empty_string(netdev->name) ? netdev->name : "(null)");
+		     lxcname, pidstr, netdev_link, !is_empty_string(netdev->name) ? netdev->name : "(null)");
 		if (!is_empty_string(netdev->name))
 			execlp(LXC_USERNIC_PATH, LXC_USERNIC_PATH, "create",
 			       lxcpath, lxcname, pidstr, "veth", netdev_link,
@@ -2644,7 +2987,8 @@
 	ret = wait_for_pid(child);
 	close(pipefd0);
 	if (ret != 0 || bytes < 0)
-		return log_error(-1, "lxc-user-nic failed to configure requested network: %s", buffer0 != '\0' ? buffer : "(null)");
+		return log_error(-1, "lxc-user-nic failed to configure requested network: %s",
+				 buffer0 != '\0' ? buffer : "(null)");
 	TRACE("Received output \"%s\" from lxc-user-nic", buffer);
 
 	/* netdev->name */
@@ -2654,14 +2998,18 @@
 
 	/*
 	 * lxc-user-nic will take care of proper network device naming. So
-	 * netdev->name and netdev->created_name need to be identical to not
+	 * netdev->name and netdev->transient_name need to be identical to not
 	 * trigger another rename later on.
 	 */
 	retlen = strlcpy(netdev->name, token, IFNAMSIZ);
-	if (retlen < IFNAMSIZ)
-		retlen = strlcpy(netdev->created_name, token, IFNAMSIZ);
+	if (retlen < IFNAMSIZ) {
+		retlen = strlcpy(netdev->transient_name, token, IFNAMSIZ);
+		if (retlen < IFNAMSIZ)
+			retlen = strlcpy(netdev->created_name, token, IFNAMSIZ);
+	}
 	if (retlen >= IFNAMSIZ)
-		return log_error_errno(-1, E2BIG, "Container side veth device name returned by lxc-user-nic is too long");
+		return log_error_errno(-1, E2BIG,
+				       "Container side veth device name returned by lxc-user-nic is too long");
 
 	/* netdev->ifindex */
 	token = strtok_r(NULL, ":", &saveptr);
@@ -2670,7 +3018,8 @@
 
 	ret = lxc_safe_int(token, &netdev->ifindex);
 	if (ret < 0)
-		return log_error_errno(-1, -ret, "Failed to convert string \"%s\" to integer", token);
+		return log_error_errno(-1, -ret,
+				       "Failed to convert string \"%s\" to integer", token);
 
 	/* netdev->priv.veth_attr.veth1 */
 	token = strtok_r(NULL, ":", &saveptr);
@@ -2679,7 +3028,8 @@
 
 	retlen = strlcpy(netdev->priv.veth_attr.veth1, token, IFNAMSIZ);
 	if (retlen >= IFNAMSIZ)
-		return log_error_errno(-1, E2BIG, "Host side veth device name returned by lxc-user-nic is too long");
+		return log_error_errno(-1, E2BIG,
+				       "Host side veth device name returned by lxc-user-nic is too long");
 
 	/* netdev->priv.veth_attr.ifindex */
 	token = strtok_r(NULL, ":", &saveptr);
@@ -2688,7 +3038,8 @@
 
 	ret = lxc_safe_int(token, &netdev->priv.veth_attr.ifindex);
 	if (ret < 0)
-		return log_error_errno(-1, -ret, "Failed to convert string \"%s\" to integer", token);
+		return log_error_errno(-1, -ret,
+				       "Failed to convert string \"%s\" to integer", token);
 
 	if (netdev->upscript) {
 		char *argv = {
@@ -2702,7 +3053,7 @@
 				      netdev->upscript, "up", argv);
 		if (ret < 0)
 			return -1;
-    }
+	}
 
 	return 0;
 }
@@ -2714,7 +3065,7 @@
 	int bytes, ret;
 	pid_t child;
 	int pipefd2;
-	char bufferPATH_MAX = {0};
+	char bufferPATH_MAX = {};
 
 	if (netdev->type != LXC_NET_VETH)
 		return log_error_errno(-1, EINVAL, "Network type %d not support for unprivileged use", netdev->type);
@@ -2786,11 +3137,10 @@
 	return 0;
 }
 
-bool lxc_delete_network_unpriv(struct lxc_handler *handler)
+static bool lxc_delete_network_unpriv(struct lxc_handler *handler)
 {
 	int ret;
-	struct lxc_list *iterator;
-	struct lxc_list *network = &handler->conf->network;
+	struct lxc_netdev *netdev;
 	/* strlen("/proc/") = 6
 	 * +
 	 * INTTYPE_TO_STRLEN(pid_t)
@@ -2808,14 +3158,13 @@
 	if (handler->nsfdLXC_NS_NET < 0)
 		return log_debug(false, "Cannot not guarantee safe deletion of network devices. Manual cleanup maybe needed");
 
-	ret = snprintf(netns_path, sizeof(netns_path), "/proc/%d/fd/%d",
-		       lxc_raw_getpid(), handler->nsfdLXC_NS_NET);
-	if (ret < 0 || ret >= sizeof(netns_path))
+	ret = strnprintf(netns_path, sizeof(netns_path), "/proc/%d/fd/%d",
+			 lxc_raw_getpid(), handler->nsfdLXC_NS_NET);
+	if (ret < 0)
 		return false;
 
-	lxc_list_for_each(iterator, network) {
+	list_for_each_entry(netdev, &handler->conf->netdevs, head) {
 		char *hostveth = NULL;
-		struct lxc_netdev *netdev = iterator->elem;
 
 		/* We can only delete devices whose ifindex we have. If we don't
 		 * have the index it means that we didn't create it.
@@ -2885,7 +3234,6 @@
 }
 
 static int lxc_setup_l2proxy(struct lxc_netdev *netdev) {
-	struct lxc_list *cur, *next;
 	struct lxc_inetdev *inet4dev;
 	struct lxc_inet6dev *inet6dev;
 	char bufinet4INET_ADDRSTRLEN, bufinet6INET6_ADDRSTRLEN;
@@ -2898,14 +3246,14 @@
 
 
 	/* If IPv4 addresses are specified, then check that sysctl is configured correctly. */
-	if (!lxc_list_empty(&netdev->ipv4)) {
+	if (!list_empty(&netdev->ipv4_addresses)) {
 		/* Check for net.ipv4.conf.link.forwarding=1 */
 		if (lxc_is_ip_forwarding_enabled(netdev->link, AF_INET) < 0)
 			return log_error_errno(-1, EINVAL, "Requires sysctl net.ipv4.conf.%s.forwarding=1", netdev->link);
 	}
 
 	/* If IPv6 addresses are specified, then check that sysctl is configured correctly. */
-	if (!lxc_list_empty(&netdev->ipv6)) {
+	if (!list_empty(&netdev->ipv6_addresses)) {
 		/* Check for net.ipv6.conf.link.proxy_ndp=1 */
 		if (lxc_is_ip_neigh_proxy_enabled(netdev->link, AF_INET6) < 0)
 			return log_error_errno(-1, EINVAL, "Requires sysctl net.ipv6.conf.%s.proxy_ndp=1", netdev->link);
@@ -2927,8 +3275,7 @@
 			return log_error_errno(-1, EINVAL, "Failed to retrieve ifindex for \"%s\" routing cleanup", loop_device);
 	}
 
-	lxc_list_for_each_safe(cur, &netdev->ipv4, next) {
-		inet4dev = cur->elem;
+	list_for_each_entry(inet4dev, &netdev->ipv4_addresses, head) {
 		if (!inet_ntop(AF_INET, &inet4dev->addr, bufinet4, sizeof(bufinet4)))
 			return ret_set_errno(-1, -errno);
 
@@ -2943,8 +3290,7 @@
 		}
 	}
 
-	lxc_list_for_each_safe(cur, &netdev->ipv6, next) {
-		inet6dev = cur->elem;
+	list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) {
 		if (!inet_ntop(AF_INET6, &inet6dev->addr, bufinet6, sizeof(bufinet6)))
 			return ret_set_errno(-1, -errno);
 
@@ -3030,10 +3376,10 @@
 	return 0;
 }
 
-static int lxc_delete_l2proxy(struct lxc_netdev *netdev) {
+static int lxc_delete_l2proxy(struct lxc_netdev *netdev)
+{
 	unsigned int lo_ifindex = 0;
-	unsigned int errCount = 0;
-	struct lxc_list *cur, *next;
+	unsigned int err = 0;
 	struct lxc_inetdev *inet4dev;
 	struct lxc_inet6dev *inet6dev;
 
@@ -3042,37 +3388,32 @@
 		/* Retrieve local-loopback interface index for use with IPVLAN static routes. */
 		lo_ifindex = if_nametoindex(loop_device);
 		if (lo_ifindex == 0) {
-			errCount++;
+			err++;
 			ERROR("Failed to retrieve ifindex for \"%s\" routing cleanup", loop_device);
 		}
 	}
 
-	lxc_list_for_each_safe(cur, &netdev->ipv4, next) {
-		inet4dev = cur->elem;
+	list_for_each_entry(inet4dev, &netdev->ipv4_addresses, head) {
 		if (lxc_delete_ipv4_l2proxy(&inet4dev->addr, netdev->link, lo_ifindex) < 0)
-			errCount++;
+			err++;
 	}
 
-	lxc_list_for_each_safe(cur, &netdev->ipv6, next) {
-		inet6dev = cur->elem;
+	list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) {
 		if (lxc_delete_ipv6_l2proxy(&inet6dev->addr, netdev->link, lo_ifindex) < 0)
-			errCount++;
+			err++;
 	}
 
-	if (errCount > 0)
-		return ret_set_errno(-1, EINVAL);
+	if (err > 0)
+		return ret_errno(EINVAL);
 
 	return 0;
 }
 
 static int lxc_create_network_priv(struct lxc_handler *handler)
 {
-	struct lxc_list *iterator;
-	struct lxc_list *network = &handler->conf->network;
-
-	lxc_list_for_each(iterator, network) {
-		struct lxc_netdev *netdev = iterator->elem;
+	struct lxc_netdev *netdev;
 
+	list_for_each_entry(netdev, &handler->conf->netdevs, head) {
 		if (netdev->type < 0 || netdev->type > LXC_NET_MAXCONFTYPE)
 			return log_error_errno(-1, EINVAL, "Invalid network configuration type %d", netdev->type);
 
@@ -3082,44 +3423,134 @@
 				return log_error_errno(-1, errno, "Failed to setup l2proxy");
 		}
 
-		if (netdev_confnetdev->type(handler, netdev))
+		if (netdev_configure_servernetdev->type(handler, netdev))
 			return log_error_errno(-1, errno, "Failed to create network device");
 	}
 
 	return 0;
 }
 
+/*
+ * LXC moves network devices into the target namespace based on their created
+ * name. The created name can either be randomly generated for e.g. veth
+ * devices or it can be the name of the existing device in the server's
+ * namespaces. This is e.g. the case when moving physical devices. However this
+ * can lead to weird clashes. Consider we have a network namespace that has the
+ * following devices:
+
+ * 4: eth1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN group default qlen 1000
+ *    link/ether 00:16:3e:91:d3:ae brd ff:ff:ff:ff:ff:ff permaddr 00:16:3e:e7:5d:10
+ *    altname enp7s0
+ * 5: eth2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN group default qlen 1000
+ *    link/ether 00:16:3e:e7:5d:10 brd ff:ff:ff:ff:ff:ff permaddr 00:16:3e:91:d3:ae
+ *    altname enp8s0
+ *
+ * and the user generates the following network config for their container:
+ *
+ *  lxc.net.0.type = phys
+ *  lxc.net.0.name = eth1
+ *  lxc.net.0.link = eth2
+ *
+ *  lxc.net.1.type = phys
+ *  lxc.net.1.name = eth2
+ *  lxc.net.1.link = eth1
+ *
+ * This would cause LXC to move the devices eth1 and eth2 from the server's
+ * network namespace into the container's network namespace:
+ *
+ * 24: eth1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN group default qlen 1000
+ *     link/ether 00:16:3e:91:d3:ae brd ff:ff:ff:ff:ff:ff permaddr 00:16:3e:e7:5d:10
+ *     altname enp7s0
+ * 25: eth2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN group default qlen 1000
+ *     link/ether 00:16:3e:e7:5d:10 brd ff:ff:ff:ff:ff:ff permaddr 00:16:3e:91:d3:ae
+ *      altname enp8s0
+ *
+ * According to the network config above we now need to rename the network
+ * devices in the container's network namespace. Let's say we start with
+ * renaming eth2 to eth1. This would immediately lead to a clash since the
+ * container's network namespace already contains a network device with that
+ * name. Renaming the other device would have the same problem.
+ *
+ * There are multiple ways to fix this but I'm concerned with keeping the logic
+ * somewhat reasonable which is why we simply start creating transient device
+ * names that are unique which we'll use to move and rename the network device
+ * in the container's network namespace at the same time. And then we rename
+ * based on those random devices names to the target name.
+ *
+ * Note that the transient name is based on the type of network device as
+ * specified in the LXC config. However, that doesn't mean it's correct. LXD
+ * passes veth devices and a range of other network devices (e.g. Infiniband
+ * VFs etc.) via LXC_NET_PHYS even though they're not really "physical" in the
+ * sense we like to think about it so you might see a veth device being
+ * assigned a "physXXXXXX" transient name. That's not a problem.
+ */
+static int create_transient_name(struct lxc_netdev *netdev)
+{
+	const struct lxc_network_info *info;
+
+	if (!is_empty_string(netdev->transient_name))
+		return syserror_set(-EINVAL, "Network device already had a transient name %s",
+				    netdev->transient_name);
+
+	info = &lxc_network_infonetdev->type;
+	strlcpy(netdev->transient_name, info->template, info->template_len + 1);
+
+	if (!lxc_ifname_alnum_case_sensitive(netdev->transient_name))
+		return syserror_set(-EINVAL, "Failed to create transient name for network device %s", netdev->created_name);
+
+	TRACE("Created transient name %s for network device", netdev->transient_name);
+	return 0;
+}
+
+static int netdev_requires_move(const struct lxc_netdev *netdev)
+{
+	if (netdev->type == LXC_NET_EMPTY || netdev->type == LXC_NET_NONE)
+		return false;
+
+	/*
+	 * Veth devices are directly created in the container's network
+	 * namespace so the device doesn't need to be moved into the
+	 * container's network namespace. The transient name will
+	 * already have been set above when we created the veth tunnel.
+	 */
+	if (!netdev->ifindex)
+		return false;
+
+	return true;
+}
+
 int lxc_network_move_created_netdev_priv(struct lxc_handler *handler)
 {
 	pid_t pid = handler->pid;
-	struct lxc_list *network = &handler->conf->network;
-	struct lxc_list *iterator;
+	struct lxc_netdev *netdev;
 
 	if (am_guest_unpriv())
 		return 0;
 
-	lxc_list_for_each(iterator, network) {
+	list_for_each_entry(netdev, &handler->conf->netdevs, head) {
 		__do_free char *physname = NULL;
 		int ret;
-		struct lxc_netdev *netdev = iterator->elem;
 
-		if (!netdev->ifindex)
+		if (!netdev_requires_move(netdev))
 			continue;
 
+		ret = create_transient_name(netdev);
+		if (ret < 0)
+			return ret;
+
 		if (netdev->type == LXC_NET_PHYS)
 			physname = is_wlan(netdev->link);
 
 		if (physname)
-			ret = lxc_netdev_move_wlan(physname, netdev->link, pid, NULL);
+			ret = lxc_netdev_move_wlan(physname, netdev->link, pid, netdev->transient_name);
 		else
-			ret = lxc_netdev_move_by_index(netdev->ifindex, pid, NULL);
+			ret = lxc_netdev_move_by_index(netdev->ifindex, pid, netdev->transient_name);
 		if (ret)
-			return log_error_errno(-1, -ret, "Failed to move network device \"%s\" with ifindex %d to network namespace %d",
-					       netdev->created_name,
-					       netdev->ifindex, pid);
+			return log_error_errno(-1, -ret, "Failed to move network device \"%s\" with ifindex %d to network namespace %d and rename to %s",
+					       netdev->created_name, netdev->ifindex, pid, netdev->transient_name);
 
-		DEBUG("Moved network device \"%s\" with ifindex %d to network namespace of %d",
-		      netdev->created_name, netdev->ifindex, pid);
+		DEBUG("Moved network device \"%s\" with ifindex %d to network namespace of %d and renamed to %s",
+		      maybe_empty(netdev->created_name), netdev->ifindex, pid, netdev->transient_name);
 	}
 
 	return 0;
@@ -3141,13 +3572,10 @@
 	int hooks_version = handler->conf->hooks_version;
 	const char *lxcname = handler->name;
 	const char *lxcpath = handler->lxcpath;
-	struct lxc_list *network = &handler->conf->network;
 	pid_t pid = handler->pid;
-	struct lxc_list *iterator;
-
-	lxc_list_for_each(iterator, network) {
-		struct lxc_netdev *netdev = iterator->elem;
+	struct lxc_netdev *netdev;
 
+	list_for_each_entry(netdev, &handler->conf->netdevs, head) {
 		if (!network_requires_advanced_setup(netdev->type))
 			continue;
 
@@ -3166,15 +3594,13 @@
 	return 0;
 }
 
-bool lxc_delete_network_priv(struct lxc_handler *handler)
+static bool lxc_delete_network_priv(struct lxc_handler *handler)
 {
 	int ret;
-	struct lxc_list *iterator;
-	struct lxc_list *network = &handler->conf->network;
+	struct lxc_netdev *netdev;
 
-	lxc_list_for_each(iterator, network) {
+	list_for_each_entry(netdev, &handler->conf->netdevs, head) {
 		char *hostveth = NULL;
-		struct lxc_netdev *netdev = iterator->elem;
 
 		/* We can only delete devices whose ifindex we have. If we don't
 		 * have the index it means that we didn't create it.
@@ -3196,6 +3622,10 @@
 		}
 
 		if (netdev->type == LXC_NET_PHYS) {
+			/* Physical interfaces are initially returned to the parent namespace
+			 * with their transient name to avoid collisions
+			 */
+			netdev->ifindex = if_nametoindex(netdev->transient_name);
 			ret = lxc_netdev_rename_by_index(netdev->ifindex, netdev->link);
 			if (ret < 0)
 				WARN("Failed to rename interface with index %d "
@@ -3268,6 +3698,12 @@
 			netdev->priv.veth_attr.veth10 = '\0';
 			netdev->priv.veth_attr.ifindex = 0;
 		}
+
+		/* Clear transient name */
+		if (!is_empty_string (netdev->transient_name))
+		{
+			netdev->transient_name0 = '\0';
+		}
 	}
 
 	return true;
@@ -3275,15 +3711,14 @@
 
 int lxc_requests_empty_network(struct lxc_handler *handler)
 {
-	struct lxc_list *network = &handler->conf->network;
-	struct lxc_list *iterator;
+	struct list_head *netdevs = &handler->conf->netdevs;
 	bool found_none = false, found_nic = false;
+	struct lxc_netdev *netdev;
 
-	if (lxc_list_empty(network))
+	if (list_empty(netdevs))
 		return 0;
 
-	lxc_list_for_each (iterator, network) {
-		struct lxc_netdev *netdev = iterator->elem;
+	list_for_each_entry(netdev, netdevs, head) {
 
 		if (netdev->type == LXC_NET_NONE)
 			found_none = true;
@@ -3305,7 +3740,14 @@
 	struct lxc_conf *conf = handler->conf;
 	int ret;
 	char ifnameIFNAMSIZ;
-	struct lxc_list *iterator;
+	struct lxc_netdev *netdev;
+
+	/*
+	 * If we weren't asked to clone a new network namespace, there's
+	 * nothing to restore.
+	 */
+	if (!(handler->ns_clone_flags & CLONE_NEWNET))
+		return 0;
 
 	/* We need CAP_NET_ADMIN in the parent namespace in order to setns() to
 	 * the parent network namespace. We won't have this capability if we are
@@ -3324,9 +3766,7 @@
 	if (ret < 0)
 		return log_error_errno(-1, errno, "Failed to enter network namespace");
 
-	lxc_list_for_each(iterator, &conf->network) {
-		struct lxc_netdev *netdev = iterator->elem;
-
+	list_for_each_entry(netdev, &conf->netdevs, head) {
 		if (netdev->type != LXC_NET_PHYS)
 			continue;
 
@@ -3338,7 +3778,10 @@
 			continue;
 		}
 
-		ret = lxc_netdev_move_by_index_fd(netdev->ifindex, oldfd, netdev->link);
+		/* Restore physical interfaces to host's network namespace with its transient name
+		 * to avoid collisions with the host's other interfaces.
+		 */
+		ret = lxc_netdev_move_by_index_fd(netdev->ifindex, oldfd, netdev->transient_name);
 		if (ret < 0)
 			WARN("Error moving network device \"%s\" back to network namespace", ifname);
 		else
@@ -3380,16 +3823,15 @@
 	return ret;
 }
 
-static int setup_ipv4_addr(struct lxc_list *ip, int ifindex)
+static int setup_ipv4_addr(struct lxc_netdev *netdev)
 {
-	struct lxc_list *iterator;
+	int ifindex = netdev->ifindex;
 	int err;
+	struct lxc_inetdev *inet4dev;
 
-	lxc_list_for_each(iterator, ip) {
-		struct lxc_inetdev *inetdev = iterator->elem;
-
-		err = lxc_ipv4_addr_add(ifindex, &inetdev->addr,
-					&inetdev->bcast, inetdev->prefix);
+	list_for_each_entry(inet4dev, &netdev->ipv4_addresses, head) {
+		err = lxc_ipv4_addr_add(ifindex, &inet4dev->addr,
+					&inet4dev->bcast, inet4dev->prefix);
 		if (err)
 			return log_error_errno(-1, -err, "Failed to setup ipv4 address for network device with ifindex %d", ifindex);
 	}
@@ -3397,14 +3839,13 @@
 	return 0;
 }
 
-static int setup_ipv6_addr(struct lxc_list *ip, int ifindex)
+static int setup_ipv6_addr(struct lxc_netdev *netdev)
 {
-	struct lxc_list *iterator;
 	int err;
+	struct lxc_inet6dev *inet6dev;
+	int ifindex = netdev->ifindex;
 
-	lxc_list_for_each(iterator, ip) {
-		struct lxc_inet6dev *inet6dev = iterator->elem;
-
+	list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) {
 		err = lxc_ipv6_addr_add(ifindex, &inet6dev->addr,
 					&inet6dev->mcast, &inet6dev->acast,
 					inet6dev->prefix);
@@ -3420,23 +3861,16 @@
 	int err;
 	char bufinet4INET_ADDRSTRLEN, bufinet6INET6_ADDRSTRLEN;
 
-	/* empty network namespace */
-	if (!netdev->ifindex && netdev->flags & IFF_UP) {
-		err = lxc_netdev_up("lo");
-		if (err)
-			return log_error_errno(-1, -err, "Failed to set the loopback network device up");
-	}
-
 	/* set a mac address */
 	if (netdev->hwaddr && setup_hw_addr(netdev->hwaddr, netdev->name))
 		return log_error_errno(-1, errno, "Failed to setup hw address for network device \"%s\"", netdev->name);
 
 	/* setup ipv4 addresses on the interface */
-	if (setup_ipv4_addr(&netdev->ipv4, netdev->ifindex))
+	if (setup_ipv4_addr(netdev))
 		return log_error_errno(-1, errno, "Failed to setup ip addresses for network device \"%s\"", netdev->name);
 
 	/* setup ipv6 addresses on the interface */
-	if (setup_ipv6_addr(&netdev->ipv6, netdev->ifindex))
+	if (setup_ipv6_addr(netdev))
 		return log_error_errno(-1, errno, "Failed to setup ipv6 addresses for network device \"%s\"", netdev->name);
 
 	/* set the network device up */
@@ -3456,7 +3890,7 @@
 		if (!(netdev->flags & IFF_UP))
 			return log_error(-1, "Cannot add ipv4 gateway for network device \"%s\" when not bringing up the interface", netdev->name);
 
-		if (lxc_list_empty(&netdev->ipv4))
+		if (list_empty(&netdev->ipv4_addresses))
 			return log_error(-1, "Cannot add ipv4 gateway for network device \"%s\" when not assigning an address", netdev->name);
 
 		/* Setup device route if ipv4_gateway_dev is enabled */
@@ -3493,7 +3927,7 @@
 		if (!(netdev->flags & IFF_UP))
 			return log_error(-1, "Cannot add ipv6 gateway for network device \"%s\" when not bringing up the interface", netdev->name);
 
-		if (lxc_list_empty(&netdev->ipv6) && !IN6_IS_ADDR_LINKLOCAL(netdev->ipv6_gateway))
+		if (list_empty(&netdev->ipv6_addresses) && !IN6_IS_ADDR_LINKLOCAL(netdev->ipv6_gateway))
 			return log_error(-1, "Cannot add ipv6 gateway for network device \"%s\" when not assigning an address", netdev->name);
 
 		/* Setup device route if ipv6_gateway_dev is enabled */
@@ -3530,37 +3964,87 @@
 	return 0;
 }
 
-int lxc_setup_network_in_child_namespaces(const struct lxc_conf *conf,
-					  struct lxc_list *network)
+/**
+ * Consider the following network layout:
+ *
+ *  lxc.net.0.type = phys
+ *  lxc.net.0.link = eth2
+ *  lxc.net.0.name = eth%d
+ *
+ *  lxc.net.1.type = phys
+ *  lxc.net.1.link = eth1
+ *  lxc.net.1.name = eth0
+ *
+ * If we simply follow this order and create the first network first the kernel
+ * will allocate eth0 for the first network but the second network requests
+ * that eth1 be renamed to eth0 in the container's network namespace which
+ * would lead to a clash.
+ *
+ * Note, we don't handle cases like:
+ *
+ *  lxc.net.0.type = phys
+ *  lxc.net.0.link = eth2
+ *  lxc.net.0.name = eth0
+ *
+ *  lxc.net.1.type = phys
+ *  lxc.net.1.link = eth1
+ *  lxc.net.1.name = eth0
+ *
+ * That'll brutally fail of course but there's nothing we can do about it.
+ */
+int lxc_setup_network_in_child_namespaces(const struct lxc_conf *conf)
 {
-	struct lxc_list *iterator;
+	bool needs_second_pass = false;
+	struct lxc_netdev *netdev;
+	const struct list_head *netdevs = &conf->netdevs;
+
+	if (list_empty(netdevs))
+		return 0;
 
-	lxc_list_for_each (iterator, network) {
-		struct lxc_netdev *netdev = iterator->elem;
+	/* Configure all devices that have a specific target name. */
+	list_for_each_entry(netdev, netdevs, head) {
 		int ret;
 
-		ret = netdev_ns_confnetdev->type(netdev);
+		if (is_empty_string(netdev->name) || strequal(netdev->name, "eth%d")) {
+			needs_second_pass = true;
+			continue;
+		}
+
+		ret = netdev_configure_containernetdev->type(netdev);
 		if (!ret)
 			ret = lxc_network_setup_in_child_namespaces_common(netdev);
 		if (ret)
 			return log_error_errno(-1, errno, "Failed to setup netdev");
 	}
+	INFO("Finished setting up network devices with caller assigned names");
 
-	if (!lxc_list_empty(network))
-		INFO("Network has been setup");
+	if (needs_second_pass) {
+		/* Configure all devices that have a kernel assigned name. */
+			list_for_each_entry(netdev, netdevs, head) {
+			int ret;
+
+			if (!is_empty_string(netdev->name) && !strequal(netdev->name, "eth%d"))
+				continue;
+
+			ret = netdev_configure_containernetdev->type(netdev);
+			if (!ret)
+				ret = lxc_network_setup_in_child_namespaces_common(netdev);
+			if (ret)
+				return log_error_errno(-1, errno, "Failed to setup netdev");
+		}
+		INFO("Finished setting up network devices with kernel assigned names");
+	}
 
 	return 0;
 }
 
 int lxc_network_send_to_child(struct lxc_handler *handler)
 {
-	struct lxc_list *iterator;
-	struct lxc_list *network = &handler->conf->network;
 	int data_sock = handler->data_sock0;
+	struct lxc_netdev *netdev;
 
-	lxc_list_for_each(iterator, network) {
+	list_for_each_entry(netdev, &handler->conf->netdevs, head) {
 		int ret;
-		struct lxc_netdev *netdev = iterator->elem;
 
 		if (!network_requires_advanced_setup(netdev->type))
 			continue;
@@ -3569,11 +4053,11 @@
 		if (ret < 0)
 			return -1;
 
-		ret = lxc_send_nointr(data_sock, netdev->created_name, IFNAMSIZ, MSG_NOSIGNAL);
+		ret = lxc_send_nointr(data_sock, netdev->transient_name, IFNAMSIZ, MSG_NOSIGNAL);
 		if (ret < 0)
 			return -1;
 
-		TRACE("Sent network device name \"%s\" to child", netdev->created_name);
+		TRACE("Sent network device name \"%s\" to child", netdev->transient_name);
 	}
 
 	return 0;
@@ -3581,13 +4065,11 @@
 
 int lxc_network_recv_from_parent(struct lxc_handler *handler)
 {
-	struct lxc_list *iterator;
-	struct lxc_list *network = &handler->conf->network;
 	int data_sock = handler->data_sock1;
+	struct lxc_netdev *netdev;
 
-	lxc_list_for_each(iterator, network) {
+	list_for_each_entry(netdev, &handler->conf->netdevs, head) {
 		int ret;
-		struct lxc_netdev *netdev = iterator->elem;
 
 		if (!network_requires_advanced_setup(netdev->type))
 			continue;
@@ -3596,11 +4078,11 @@
 		if (ret < 0)
 			return -1;
 
-		ret = lxc_recv_nointr(data_sock, netdev->created_name, IFNAMSIZ, 0);
+		ret = lxc_recv_nointr(data_sock, netdev->transient_name, IFNAMSIZ, 0);
 		if (ret < 0)
 			return -1;
 
-		TRACE("Received network device name \"%s\" from parent", netdev->created_name);
+		TRACE("Received network device name \"%s\" from parent", netdev->transient_name);
 	}
 
 	return 0;
@@ -3608,16 +4090,15 @@
 
 int lxc_network_send_name_and_ifindex_to_parent(struct lxc_handler *handler)
 {
-	struct lxc_list *iterator, *network;
 	int data_sock = handler->data_sock0;
+	struct lxc_netdev *netdev;
+	struct list_head *netdevs = &handler->conf->netdevs;
 
 	if (!handler->am_root)
 		return 0;
 
-	network = &handler->conf->network;
-	lxc_list_for_each(iterator, network) {
+	list_for_each_entry(netdev, netdevs, head) {
 		int ret;
-		struct lxc_netdev *netdev = iterator->elem;
 
 		/* Send network device name in the child's namespace to parent. */
 		ret = lxc_send_nointr(data_sock, netdev->name, IFNAMSIZ, MSG_NOSIGNAL);
@@ -3630,9 +4111,11 @@
 		ret = lxc_send_nointr(data_sock, &netdev->ifindex, sizeof(netdev->ifindex), MSG_NOSIGNAL);
 		if (ret < 0)
 			return -1;
+
+		TRACE("Sent network device %s with ifindex %d to parent", maybe_empty(netdev->name), netdev->ifindex);
 	}
 
-	if (!lxc_list_empty(network))
+	if (!list_empty(netdevs))
 		TRACE("Sent network device names and ifindices to parent");
 
 	return 0;
@@ -3640,16 +4123,14 @@
 
 int lxc_network_recv_name_and_ifindex_from_child(struct lxc_handler *handler)
 {
-	struct lxc_list *iterator, *network;
 	int data_sock = handler->data_sock1;
+	struct lxc_netdev *netdev;
 
 	if (!handler->am_root)
 		return 0;
 
-	network = &handler->conf->network;
-	lxc_list_for_each(iterator, network) {
+	list_for_each_entry(netdev, &handler->conf->netdevs, head) {
 		int ret;
-		struct lxc_netdev *netdev = iterator->elem;
 
 		/* Receive network device name in the child's namespace to
 		 * parent.
@@ -3664,6 +4145,8 @@
 		ret = lxc_recv_nointr(data_sock, &netdev->ifindex, sizeof(netdev->ifindex), 0);
 		if (ret < 0)
 			return -1;
+
+		TRACE("Received network device %s with ifindex %d from child", maybe_empty(netdev->name), netdev->ifindex);
 	}
 
 	return 0;
@@ -3673,6 +4156,13 @@
 {
 	bool bret;
 
+	/*
+	 * Always expose namespace fd paths to network down hooks via
+	 * environment variables. No need to complicate things by passing them
+	 * as additional hook arguments.
+	 */
+	lxc_expose_namespace_environment(handler);
+
 	if (handler->am_root)
 		bret = lxc_delete_network_priv(handler);
 	else
@@ -3689,7 +4179,7 @@
 	char bufNLMSG_ALIGN(sizeof(struct nlmsghdr)) +
 		 NLMSG_ALIGN(sizeof(struct rtgenmsg)) +
 		 NLMSG_ALIGN(1024);
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	struct nlmsghdr *hdr;
 	struct rtgenmsg *msg;
@@ -3758,7 +4248,7 @@
 
 int lxc_netns_get_nsid(int fd)
 {
-	struct nl_handler nlh;
+	struct nl_handler nlh = NL_HANDLER_INIT;
 	call_cleaner(netlink_close) struct nl_handler *nlh_ptr = &nlh;
 	int ret;
 	ssize_t len;

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/network.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/network.h Changed

@@ -3,6 +3,8 @@
 #ifndef __LXC_NETWORK_H
 #define __LXC_NETWORK_H
 
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <linux/types.h>
 #include <stdbool.h>
@@ -10,6 +12,8 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
+#include "compiler.h"
+#include "hlist.h"
 #include "list.h"
 
 struct lxc_conf;
@@ -37,10 +41,7 @@
 	struct in_addr addr;
 	struct in_addr bcast;
 	unsigned int prefix;
-};
-
-struct lxc_route {
-	struct in_addr addr;
+	struct list_head head;
 };
 
 /*
@@ -55,10 +56,7 @@
 	struct in6_addr mcast;
 	struct in6_addr acast;
 	unsigned int prefix;
-};
-
-struct lxc_route6 {
-	struct in6_addr addr;
+	struct list_head head;
 };
 
 /* Contains information about the host side veth device.
@@ -76,9 +74,14 @@
 	char pairIFNAMSIZ;
 	char veth1IFNAMSIZ;
 	int ifindex;
-	struct lxc_list ipv4_routes;
-	struct lxc_list ipv6_routes;
+	struct list_head ipv4_routes;
+	struct list_head ipv6_routes;
 	int mode; /* bridge, router */
+	int n_rxqueues;
+	int n_txqueues;
+	short vlan_id;
+	bool vlan_id_set;
+	struct lxc_list vlan_tagged_ids;
 };
 
 struct ifla_vlan {
@@ -132,6 +135,7 @@
  * @created_name      : the name with which this interface got created before
  *			being renamed to final_name.
  *			Currenly only used for veth devices.
+ * @transient_name    : temporary name to avoid namespace collisions
  * @hwaddr            : mac address
  * @mtu               : maximum transmission unit
  * @priv              : information specific to the specificed network type
@@ -161,11 +165,12 @@
 	bool l2proxy;
 	char nameIFNAMSIZ;
 	char created_nameIFNAMSIZ;
+	char transient_nameIFNAMSIZ;
 	char *hwaddr;
 	char *mtu;
 	union netdev_p priv;
-	struct lxc_list ipv4;
-	struct lxc_list ipv6;
+	struct list_head ipv4_addresses;
+	struct list_head ipv6_addresses;
 	bool ipv4_gateway_auto;
 	bool ipv4_gateway_dev;
 	struct in_addr *ipv4_gateway;
@@ -174,110 +179,105 @@
 	struct in6_addr *ipv6_gateway;
 	char *upscript;
 	char *downscript;
+	struct list_head head;
 };
 
 /* Convert a string mac address to a socket structure. */
-extern int lxc_convert_mac(char *macaddr, struct sockaddr *sockaddr);
+__hidden extern int lxc_convert_mac(char *macaddr, struct sockaddr *sockaddr);
 
 /* Move a device between namespaces. */
-extern int lxc_netdev_move_by_index(int ifindex, pid_t pid, const char *ifname);
-extern int lxc_netdev_move_by_name(const char *ifname, pid_t pid,
-				   const char *newname);
+__hidden extern int lxc_netdev_move_by_index(int ifindex, pid_t pid, const char *ifname);
+__hidden extern int lxc_netdev_move_by_name(const char *ifname, pid_t pid, const char *newname);
 
 /* Delete a network device. */
-extern int lxc_netdev_delete_by_name(const char *name);
-extern int lxc_netdev_delete_by_index(int ifindex);
+__hidden extern int lxc_netdev_delete_by_name(const char *name);
+__hidden extern int lxc_netdev_delete_by_index(int ifindex);
 
 /* Change the device name. */
-extern int lxc_netdev_rename_by_name(const char *oldname, const char *newname);
-extern int lxc_netdev_rename_by_index(int ifindex, const char *newname);
+__hidden extern int lxc_netdev_rename_by_name(const char *oldname, const char *newname);
+__hidden extern int lxc_netdev_rename_by_index(int ifindex, const char *newname);
 
-extern int netdev_set_flag(const char *name, int flag);
+__hidden extern int netdev_set_flag(const char *name, int flag);
 
 /* Set the device network up or down. */
-extern int lxc_netdev_isup(const char *name);
-extern int lxc_netdev_up(const char *name);
-extern int lxc_netdev_down(const char *name);
+__hidden extern int lxc_netdev_isup(const char *name);
+__hidden extern int lxc_netdev_up(const char *name);
+__hidden extern int lxc_netdev_down(const char *name);
 
 /* Change the mtu size for the specified device. */
-extern int lxc_netdev_set_mtu(const char *name, int mtu);
+__hidden extern int lxc_netdev_set_mtu(const char *name, int mtu);
 
 /* Create a virtual network devices. */
-extern int lxc_veth_create(const char *name1, const char *name2, pid_t pid,
-			   unsigned int mtu);
-extern int lxc_macvlan_create(const char *parent, const char *name, int mode);
-extern int lxc_vlan_create(const char *parent, const char *name,
-			   unsigned short vid);
+__hidden extern int lxc_veth_create(const char *name1, const char *name2, pid_t pid,
+				    unsigned int mtu, int n_rxqueues, int n_txqueues);
+__hidden extern int lxc_macvlan_create(const char *parent, const char *name, int mode);
+__hidden extern int lxc_vlan_create(const char *parent, const char *name, unsigned short vid);
 
 /* Set ip address. */
-extern int lxc_ipv6_addr_add(int ifindex, struct in6_addr *addr,
-			     struct in6_addr *mcast,
-			     struct in6_addr *acast, int prefix);
+__hidden extern int lxc_ipv6_addr_add(int ifindex, struct in6_addr *addr, struct in6_addr *mcast,
+				      struct in6_addr *acast, int prefix);
 
-extern int lxc_ipv4_addr_add(int ifindex, struct in_addr *addr,
-			     struct in_addr *bcast, int prefix);
+__hidden extern int lxc_ipv4_addr_add(int ifindex, struct in_addr *addr, struct in_addr *bcast,
+				      int prefix);
 
 /* Get ip address. */
-extern int lxc_ipv4_addr_get(int ifindex, struct in_addr **res);
-extern int lxc_ipv6_addr_get(int ifindex, struct in6_addr **res);
+__hidden extern int lxc_ipv4_addr_get(int ifindex, struct in_addr **res);
+__hidden extern int lxc_ipv6_addr_get(int ifindex, struct in6_addr **res);
 
 /* Set default route. */
-extern int lxc_ipv4_gateway_add(int ifindex, struct in_addr *gw);
-extern int lxc_ipv6_gateway_add(int ifindex, struct in6_addr *gw);
+__hidden extern int lxc_ipv4_gateway_add(int ifindex, struct in_addr *gw);
+__hidden extern int lxc_ipv6_gateway_add(int ifindex, struct in6_addr *gw);
 
 /* Attach an interface to the bridge. */
-extern int lxc_bridge_attach(const char *bridge, const char *ifname);
-extern int lxc_ovs_delete_port(const char *bridge, const char *nic);
+__hidden extern int lxc_bridge_attach(const char *bridge, const char *ifname);
+__hidden extern int lxc_ovs_delete_port(const char *bridge, const char *nic);
 
-extern bool is_ovs_bridge(const char *bridge);
+__hidden extern bool is_ovs_bridge(const char *bridge);
 
 /* Create default gateway. */
-extern int lxc_route_create_default(const char *addr, const char *ifname,
-				    int gateway);
+__hidden extern int lxc_route_create_default(const char *addr, const char *ifname, int gateway);
 
 /* Delete default gateway. */
-extern int lxc_route_delete_default(const char *addr, const char *ifname,
-				    int gateway);
+__hidden extern int lxc_route_delete_default(const char *addr, const char *ifname, int gateway);
 
 /* Activate neighbor proxying. */
-extern int lxc_neigh_proxy_on(const char *name, int family);
+__hidden extern int lxc_neigh_proxy_on(const char *name, int family);
 
 /* Disable neighbor proxying. */
-extern int lxc_neigh_proxy_off(const char *name, int family);
+__hidden extern int lxc_neigh_proxy_off(const char *name, int family);
 
 /* Activate IP forwarding. */
-extern int lxc_ip_forwarding_on(const char *name, int family);
+__hidden extern int lxc_ip_forwarding_on(const char *name, int family);
 
 /* Disable IP forwarding. */
-extern int lxc_ip_forwarding_off(const char *name, int family);
+__hidden extern int lxc_ip_forwarding_off(const char *name, int family);
 
 /*
  * Generate a new unique network interface name.
  *
  * Allows for 62^n unique combinations.
  */
-extern char *lxc_ifname_alnum_case_sensitive(char *template);
-
-extern const char *lxc_net_type_to_str(int type);
-extern int setup_private_host_hw_addr(char *veth1);
-extern int netdev_get_mtu(int ifindex);
-extern int lxc_network_move_created_netdev_priv(struct lxc_handler *handler);
-extern void lxc_delete_network(struct lxc_handler *handler);
-extern int lxc_find_gateway_addresses(struct lxc_handler *handler);
-extern int lxc_requests_empty_network(struct lxc_handler *handler);
-extern int lxc_restore_phys_nics_to_netns(struct lxc_handler *handler);
-extern int lxc_setup_network_in_child_namespaces(const struct lxc_conf *conf,
-						 struct lxc_list *network);
-extern int lxc_network_send_to_child(struct lxc_handler *handler);
-extern int lxc_network_recv_from_parent(struct lxc_handler *handler);
-extern int lxc_network_send_name_and_ifindex_to_parent(struct lxc_handler *handler);
-extern int lxc_network_recv_name_and_ifindex_from_child(struct lxc_handler *handler);
-extern int lxc_netns_set_nsid(int netns_fd);
-extern int lxc_netns_get_nsid(__s32 fd);
-extern int lxc_create_network(struct lxc_handler *handler);
-
-extern char *is_wlan(const char *ifname);
-extern int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid,
-				const char *newname);
+__hidden extern char *lxc_ifname_alnum_case_sensitive(char *template);
+
+__hidden extern const char *lxc_net_type_to_str(int type);
+__hidden extern int setup_private_host_hw_addr(char *veth1);
+__hidden extern int netdev_get_mtu(int ifindex);
+__hidden extern int lxc_network_move_created_netdev_priv(struct lxc_handler *handler);
+__hidden extern void lxc_delete_network(struct lxc_handler *handler);
+__hidden extern int lxc_find_gateway_addresses(struct lxc_handler *handler);
+__hidden extern int lxc_requests_empty_network(struct lxc_handler *handler);
+__hidden extern int lxc_restore_phys_nics_to_netns(struct lxc_handler *handler);
+__hidden extern int lxc_setup_network_in_child_namespaces(const struct lxc_conf *conf);
+__hidden extern int lxc_network_send_to_child(struct lxc_handler *handler);
+__hidden extern int lxc_network_recv_from_parent(struct lxc_handler *handler);
+__hidden extern int lxc_network_send_name_and_ifindex_to_parent(struct lxc_handler *handler);
+__hidden extern int lxc_network_recv_name_and_ifindex_from_child(struct lxc_handler *handler);
+__hidden extern int lxc_netns_set_nsid(int netns_fd);
+__hidden extern int lxc_netns_get_nsid(__s32 fd);
+__hidden extern int lxc_create_network(struct lxc_handler *handler);
+
+__hidden extern char *is_wlan(const char *ifname);
+__hidden extern int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid,
+					 const char *newname);
 
 #endif /* __LXC_NETWORK_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/nl.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/nl.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/nl.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/nl.h Changed

@@ -3,8 +3,11 @@
 #ifndef __LXC_NL_H
 #define __LXC_NL_H
 
+#include "config.h"
+
 #include <stdio.h>
 
+#include "compiler.h"
 #include "memory_utils.h"
 
 /*
@@ -35,6 +38,8 @@
 	struct sockaddr_nl peer;
 };
 
+#define NL_HANDLER_INIT { .fd = -EBADF }
+
 /*
  * struct nlmsg : the netlink message structure. This message is to be used to
  *  be allocated with netlink_alloc.
@@ -59,7 +64,7 @@
  *
  * Return 0 on success, < 0 otherwise
  */
-int netlink_open(struct nl_handler *handler, int protocol);
+__hidden extern int netlink_open(struct nl_handler *handler, int protocol);
 
 /*
  * netlink_close : close a netlink socket, after this call,
@@ -67,7 +72,7 @@
  *
  * @handler: a handler to the netlink socket
  */
-void netlink_close(struct nl_handler *handler);
+__hidden extern void netlink_close(struct nl_handler *handler);
 define_cleanup_function(struct nl_handler *, netlink_close);
 
 /*
@@ -80,8 +85,8 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-int netlink_rcv(struct nl_handler *handler, struct nlmsg *nlmsg);
-int __netlink_recv(struct nl_handler *handler, struct nlmsghdr *nlmsg);
+__hidden extern int netlink_rcv(struct nl_handler *handler, struct nlmsg *nlmsg);
+__hidden extern int __netlink_recv(struct nl_handler *handler, struct nlmsghdr *nlmsg);
 
 /*
  * netlink_send: send a netlink message to the kernel. It is up
@@ -92,8 +97,8 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-int netlink_send(struct nl_handler *handler, struct nlmsg *nlmsg);
-int __netlink_send(struct nl_handler *handler, struct nlmsghdr *nlmsg);
+__hidden extern int netlink_send(struct nl_handler *handler, struct nlmsg *nlmsg);
+__hidden extern int __netlink_send(struct nl_handler *handler, struct nlmsghdr *nlmsg);
 
 /*
  * netlink_transaction: send a request to the kernel and read the response.
@@ -106,10 +111,10 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-int netlink_transaction(struct nl_handler *handler,
-			struct nlmsg *request, struct nlmsg *answer);
-int __netlink_transaction(struct nl_handler *handler, struct nlmsghdr *request,
-			  struct nlmsghdr *answer);
+__hidden extern int netlink_transaction(struct nl_handler *handler, struct nlmsg *request,
+					struct nlmsg *answer);
+__hidden extern int __netlink_transaction(struct nl_handler *handler, struct nlmsghdr *request,
+					  struct nlmsghdr *answer);
 
 /*
  * nla_put_string: copy a null terminated string to a netlink message
@@ -121,7 +126,7 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-int nla_put_string(struct nlmsg *nlmsg, int attr, const char *string);
+__hidden extern int nla_put_string(struct nlmsg *nlmsg, int attr, const char *string);
 
 /*
  * nla_put_buffer: copy a buffer with a specified size to a netlink
@@ -134,8 +139,7 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-int nla_put_buffer(struct nlmsg *nlmsg, int attr,
-		   const void *data, size_t size);
+__hidden extern int nla_put_buffer(struct nlmsg *nlmsg, int attr, const void *data, size_t size);
 
 /*
  * nla_put_u32: copy an integer to a netlink message attribute
@@ -146,7 +150,7 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-int nla_put_u32(struct nlmsg *nlmsg, int attr, int value);
+__hidden extern int nla_put_u32(struct nlmsg *nlmsg, int attr, int value);
 
 /*
  * nla_put_u16: copy an integer to a netlink message attribute
@@ -157,7 +161,7 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-int nla_put_u16(struct nlmsg *nlmsg, int attr, unsigned short value);
+__hidden extern int nla_put_u16(struct nlmsg *nlmsg, int attr, unsigned short value);
 
 /*
  * nla_put_attr: add an attribute name to a netlink
@@ -167,7 +171,7 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-int nla_put_attr(struct nlmsg *nlmsg, int attr);
+__hidden extern int nla_put_attr(struct nlmsg *nlmsg, int attr);
 
 /*
  * nla_begin_nested: begin the nesting attribute
@@ -178,7 +182,7 @@
  * Returns current nested pointer to be reused
  * to nla_end_nested.
  */
-struct rtattr *nla_begin_nested(struct nlmsg *nlmsg, int attr);
+__hidden extern struct rtattr *nla_begin_nested(struct nlmsg *nlmsg, int attr);
 
 /*
  * nla_end_nested: end the nesting attribute
@@ -188,7 +192,7 @@
  *
  * Returns the current
  */
-void nla_end_nested(struct nlmsg *nlmsg, struct rtattr *attr);
+__hidden extern void nla_end_nested(struct nlmsg *nlmsg, struct rtattr *attr);
 
 /*
  * nlmsg_allocate : allocate a netlink message. The netlink format message
@@ -205,7 +209,7 @@
  *
  * Returns a pointer to the newly allocated netlink message, NULL otherwise
  */
-struct nlmsg *nlmsg_alloc(size_t size);
+__hidden extern struct nlmsg *nlmsg_alloc(size_t size);
 
 /*
  * nlmsg_alloc_reserve: like nlmsg_alloc(), but reserve the whole payload
@@ -214,7 +218,7 @@
  *
  * @size: the capacity of the payload to be allocated.
  */
-struct nlmsg *nlmsg_alloc_reserve(size_t size);
+__hidden extern struct nlmsg *nlmsg_alloc_reserve(size_t size);
 
 /*
  * Reserve room for additional data at the tail of a netlink message
@@ -224,14 +228,14 @@
  *
  * Returns a pointer to newly reserved room or NULL
  */
-void *nlmsg_reserve(struct nlmsg *nlmsg, size_t len);
+__hidden extern void *nlmsg_reserve(struct nlmsg *nlmsg, size_t len);
 
 /*
  * nlmsg_free : free a previously allocate message
  *
  * @nlmsg: the netlink message to be freed
  */
-void nlmsg_free(struct nlmsg *nlmsg);
+__hidden extern void nlmsg_free(struct nlmsg *nlmsg);
 define_cleanup_function(struct nlmsg *, nlmsg_free);
 
 /*
@@ -241,9 +245,9 @@
  *
  * Returns a pointer to the netlink data or NULL if there is no data
  */
-void *nlmsg_data(struct nlmsg *nlmsg);
+__hidden extern void *nlmsg_data(struct nlmsg *nlmsg);
 
-extern int addattr(struct nlmsghdr *n, size_t maxlen, int type,
-		   const void *data, size_t alen);
+__hidden extern int addattr(struct nlmsghdr *n, size_t maxlen, int type,
+			    const void *data, size_t alen);
 
 #endif

_service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/open_utils.h Added

@@ -0,0 +1,87 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#ifndef __LXC_OPEN_UTILS_H
+#define __LXC_OPEN_UTILS_H
+
+#include "config.h"
+
+#include "syscall_numbers.h"
+
+/*
+ * Arguments for how openat2(2) should open the target path. If only @flags and
+ * @mode are non-zero, then openat2(2) operates very similarly to openat(2).
+ *
+ * However, unlike openat(2), unknown or invalid bits in @flags result in
+ * -EINVAL rather than being silently ignored. @mode must be zero unless one of
+ * {O_CREAT, O_TMPFILE} are set.
+ *
+ * @flags: O_* flags.
+ * @mode: O_CREAT/O_TMPFILE file mode.
+ * @resolve: RESOLVE_* flags.
+ */
+#if !HAVE_STRUCT_OPEN_HOW
+struct open_how {
+	__u64 flags;
+	__u64 mode;
+	__u64 resolve;
+};
+#endif
+
+/* how->resolve flags for openat2(2). */
+#ifndef RESOLVE_NO_XDEV
+#define RESOLVE_NO_XDEV		0x01 /* Block mount-point crossings
+					(includes bind-mounts). */
+#endif
+
+#ifndef RESOLVE_NO_MAGICLINKS
+#define RESOLVE_NO_MAGICLINKS	0x02 /* Block traversal through procfs-style
+					"magic-links". */
+#endif
+
+#ifndef RESOLVE_NO_SYMLINKS
+#define RESOLVE_NO_SYMLINKS	0x04 /* Block traversal through all symlinks
+					(implies OEXT_NO_MAGICLINKS) */
+#endif
+
+#ifndef RESOLVE_BENEATH
+#define RESOLVE_BENEATH		0x08 /* Block "lexical" trickery like
+					"..", symlinks, and absolute
+					paths which escape the dirfd. */
+#endif
+
+#ifndef RESOLVE_IN_ROOT
+#define RESOLVE_IN_ROOT		0x10 /* Make all jumps to "/" and ".."
+					be scoped inside the dirfd
+					(similar to chroot(2)). */
+#endif
+
+#define PROTECT_LOOKUP_BENEATH  (RESOLVE_BENEATH | RESOLVE_NO_XDEV | RESOLVE_NO_MAGICLINKS | RESOLVE_NO_SYMLINKS)
+#define PROTECT_LOOKUP_BENEATH_WITH_SYMLINKS (PROTECT_LOOKUP_BENEATH & ~RESOLVE_NO_SYMLINKS)
+#define PROTECT_LOOKUP_BENEATH_WITH_MAGICLINKS (PROTECT_LOOKUP_BENEATH & ~(RESOLVE_NO_SYMLINKS | RESOLVE_NO_MAGICLINKS))
+#define PROTECT_LOOKUP_BENEATH_XDEV (PROTECT_LOOKUP_BENEATH & ~RESOLVE_NO_XDEV)
+
+#define PROTECT_LOOKUP_ABSOLUTE (PROTECT_LOOKUP_BENEATH & ~RESOLVE_BENEATH)
+#define PROTECT_LOOKUP_ABSOLUTE_WITH_SYMLINKS (PROTECT_LOOKUP_ABSOLUTE & ~RESOLVE_NO_SYMLINKS)
+#define PROTECT_LOOKUP_ABSOLUTE_WITH_MAGICLINKS (PROTECT_LOOKUP_ABSOLUTE & ~(RESOLVE_NO_SYMLINKS | RESOLVE_NO_MAGICLINKS))
+#define PROTECT_LOOKUP_ABSOLUTE_XDEV (PROTECT_LOOKUP_ABSOLUTE & ~RESOLVE_NO_XDEV)
+#define PROTECT_LOOKUP_ABSOLUTE_XDEV_SYMLINKS (PROTECT_LOOKUP_ABSOLUTE_WITH_SYMLINKS & ~RESOLVE_NO_XDEV)
+
+#define PROTECT_OPATH_FILE (O_NOFOLLOW | O_PATH | O_CLOEXEC)
+#define PROTECT_OPATH_DIRECTORY (PROTECT_OPATH_FILE | O_DIRECTORY)
+
+#define PROTECT_OPEN_WITH_TRAILING_SYMLINKS (O_CLOEXEC | O_NOCTTY | O_RDONLY)
+#define PROTECT_OPEN (PROTECT_OPEN_WITH_TRAILING_SYMLINKS | O_NOFOLLOW)
+
+#define PROTECT_OPEN_W_WITH_TRAILING_SYMLINKS (O_CLOEXEC | O_NOCTTY | O_WRONLY)
+#define PROTECT_OPEN_W (PROTECT_OPEN_W_WITH_TRAILING_SYMLINKS | O_NOFOLLOW)
+#define PROTECT_OPEN_RW (O_CLOEXEC | O_NOCTTY | O_RDWR | O_NOFOLLOW)
+
+#if !HAVE_OPENAT2
+static inline int openat2(int dfd, const char *filename, struct open_how *how, size_t size)
+{
+	return syscall(__NR_openat2, dfd, filename, how, size);
+}
+#endif /* HAVE_OPENAT2 */
+
+#endif /* __LXC_OPEN_UTILS_H */
+

_service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/pam/meson.build Added

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/pam/pam_cgfs.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/pam/pam_cgfs.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
@@ -23,7 +22,6 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "macro.h"
 #include "memory_utils.h"
@@ -33,18 +31,18 @@
 #include <security/_pam_macros.h>
 #include <security/pam_modules.h>
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
-#ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#if !HAVE_STRLCAT
+#include "strlcat.h"
 #endif
 
-#define pam_cgfs_debug_stream(stream, format, ...)                                \
-	do {                                                                   \
-		fprintf(stream, "%s: %d: %s: " format, __FILE__, __LINE__,     \
-			__func__, __VA_ARGS__);                                \
+#define pam_cgfs_debug_stream(stream, format, ...)                         \
+	do {                                                               \
+		fprintf(stream, "%s: %d: %s: " format, __FILE__, __LINE__, \
+			__func__, __VA_ARGS__);                            \
 	} while (false)
 
 #define pam_cgfs_error(format, ...) pam_cgfs_debug_stream(stderr, format, __VA_ARGS__)
@@ -52,14 +50,11 @@
 #ifdef DEBUG
 #define pam_cgfs_debug(format, ...) pam_cgfs_error(format, __VA_ARGS__)
 #else
-#define pam_cgfs_debug(format, ...)
+#define pam_cgfs_debug(format, ...) \
+	do {                     \
+	} while (false)
 #endif /* DEBUG */
 
-/* Taken over modified from the kernel sources. */
-#define NBITS 32 /* bits in uint32_t */
-#define DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
-#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, NBITS)
-
 static enum cg_mount_mode {
 	CGROUP_UNKNOWN = -1,
 	CGROUP_MIXED = 0,
@@ -72,18 +67,10 @@
 static void append_line(char **dest, size_t oldlen, char *new, size_t newlen);
 static int append_null_to_list(void ***list);
 static void batch_realloc(char **mem, size_t oldlen, size_t newlen);
-static inline void clear_bit(unsigned bit, uint32_t *bitarr)
-{
-	bitarrbit / NBITS &= ~(1 << (bit % NBITS));
-}
 static char *copy_to_eol(char *s);
 static char *get_mountpoint(char *line);
 static bool get_uid_gid(const char *user, uid_t *uid, gid_t *gid);
 static int handle_login(const char *user, uid_t uid, gid_t gid);
-static inline bool is_set(unsigned bit, uint32_t *bitarr)
-{
-	return (bitarrbit / NBITS & (1 << (bit % NBITS))) != 0;
-}
 static bool is_lxcfs(const char *line);
 static bool is_cgv1(char *line);
 static bool is_cgv2(char *line);
@@ -94,10 +81,6 @@
 static void mysyslog(int err, const char *format, ...) __attribute__((sentinel));
 static char *read_file(char *fnam);
 static int recursive_rmdir(char *dirname);
-static inline void set_bit(unsigned bit, uint32_t *bitarr)
-{
-	bitarrbit / NBITS |= (1 << (bit % NBITS));
-}
 static bool string_in_list(char **list, const char *entry);
 static char *string_join(const char *sep, const char **parts, bool use_as_prefix);
 static void trim(char *s);
@@ -1505,7 +1488,7 @@
 	struct passwd pwent;
 	struct passwd *pwentp = NULL;
 	char *buf;
-	size_t bufsize;
+	ssize_t bufsize;
 	int ret;
 
 	bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/parse.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/parse.c Changed

@@ -1,17 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/sendfile.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"
@@ -50,11 +49,12 @@
 
 int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *data)
 {
-	int saved_errno;
-	ssize_t ret = -1, bytes_sent;
-	char *line;
-	int fd = -1, memfd = -1;
+	__do_close int fd = -EBADF, memfd = -EBADF;
+	ssize_t ret = -1;
 	char *buf = NULL;
+	struct stat st = {};
+	ssize_t bytes;
+	char *line;
 
 	memfd = memfd_create(".lxc_config_file", MFD_CLOEXEC);
 	if (memfd < 0) {
@@ -65,8 +65,7 @@
 			goto on_error;
 		}
 
-		TRACE("Failed to create in-memory file. Falling back to "
-		      "temporary file");
+		TRACE("Failed to create in-memory file. Falling back to temporary file");
 		memfd = lxc_make_tmpfile(template, true);
 		if (memfd < 0) {
 			SYSERROR("Failed to create temporary file \"%s\"", template);
@@ -80,10 +79,21 @@
 		goto on_error;
 	}
 
-	/* sendfile() handles up to 2GB. No config file should be that big. */
-	bytes_sent = lxc_sendfile_nointr(memfd, fd, NULL, LXC_SENDFILE_MAX);
-	if (bytes_sent < 0) {
-		SYSERROR("Failed to sendfile \"%s\"", file);
+	ret = fstat(fd, &st);
+	if (ret) {
+		SYSERROR("Failed to stat file \"%s\"", file);
+		goto on_error;
+	}
+
+	if (st.st_size > INT_MAX) {
+		SYSERROR("Excessively large config file \"%s\"", file);
+		goto on_error;
+	}
+
+
+	bytes = __fd_to_fd(fd, memfd);
+	if (bytes < 0) {
+		SYSERROR("Failed to copy config file \"%s\"", file);
 		goto on_error;
 	}
 
@@ -92,7 +102,7 @@
 		SYSERROR("Failed to append zero byte");
 		goto on_error;
 	}
-	bytes_sent++;
+	bytes++;
 
 	ret = lseek(memfd, 0, SEEK_SET);
 	if (ret < 0) {
@@ -101,8 +111,7 @@
 	}
 
 	ret = -1;
-	buf = mmap(NULL, bytes_sent, PROT_READ | PROT_WRITE,
-		   MAP_SHARED | MAP_POPULATE, memfd, 0);
+	buf = mmap(NULL, bytes, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_POPULATE, memfd, 0);
 	if (buf == MAP_FAILED) {
 		buf = NULL;
 		SYSERROR("Failed to mmap");
@@ -117,24 +126,18 @@
 			 * error.
 			 */
 			if (ret < 0)
-				ERROR("Failed to parse config file \"%s\" at "
-				      "line \"%s\"", file, line);
+				ERROR("Failed to parse config file \"%s\" at line \"%s\"",
+				      file, line);
 			break;
 		}
 	}
 
 on_error:
-	saved_errno = errno;
-	if (fd >= 0)
-		close(fd);
-	if (memfd >= 0)
-		close(memfd);
-	if (buf && munmap(buf, bytes_sent)) {
+	if (buf && munmap(buf, bytes)) {
 		SYSERROR("Failed to unmap");
 		if (ret == 0)
 			ret = -1;
 	}
-	errno = saved_errno;
 
 	return ret;
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/parse.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/parse.h Changed

@@ -3,6 +3,8 @@
 #ifndef __LXC_PARSE_H
 #define __LXC_PARSE_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <sys/types.h>
 
@@ -13,17 +15,16 @@
 
 typedef int (*lxc_file_cb)(char *buffer, void *data);
 
-__hot extern int lxc_file_for_each_line(const char *file, lxc_file_cb callback,
-					void *data);
+__hidden __hot extern int lxc_file_for_each_line(const char *file, lxc_file_cb callback, void *data);
 
-__hot extern int lxc_file_for_each_line_mmap(const char *file,
-					     lxc_file_cb callback, void *data);
+__hidden __hot extern int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback,
+						      void *data);
 
 /* mmap() wrapper. lxc_strmmap() will take care to \0-terminate files so that
  * normal string-handling functions can be used on the buffer. */
-extern void *lxc_strmmap(void *addr, size_t length, int prot, int flags, int fd,
-			 off_t offset);
+__hidden extern void *lxc_strmmap(void *addr, size_t length, int prot, int flags, int fd,
+				  off_t offset);
 /* munmap() wrapper. Use it to free memory mmap()ed with lxc_strmmap(). */
-extern int lxc_strmunmap(void *addr, size_t length);
+__hidden extern int lxc_strmunmap(void *addr, size_t length);
 
-#endif
+#endif /* __LXC_PARSE_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/process_utils.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/process_utils.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <sched.h>
 #include <signal.h>
@@ -12,7 +11,6 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "process_utils.h"
@@ -28,7 +26,7 @@
  * The nice thing about this is that we get fork() behavior. That is
  * lxc_raw_clone() returns 0 in the child and the child pid in the parent.
  */
-__returns_twice static pid_t __lxc_raw_clone(unsigned long flags, int *pidfd)
+__returns_twice pid_t lxc_raw_legacy_clone(unsigned long flags, int *pidfd)
 {
 
 #if defined(__s390x__) || defined(__s390__) || defined(__CRIS__)
@@ -92,7 +90,7 @@
 __returns_twice pid_t lxc_raw_clone(unsigned long flags, int *pidfd)
 {
 	pid_t pid;
-	struct lxc_clone_args args = {
+	struct clone_args args = {
 		.flags		= flags,
 		.pidfd		= ptr_to_u64(pidfd),
 	};
@@ -108,7 +106,7 @@
 	pid = lxc_clone3(&args, CLONE_ARGS_SIZE_VER0);
 	if (pid < 0 && errno == ENOSYS) {
 		SYSTRACE("Falling back to legacy clone");
-		return __lxc_raw_clone(flags, pidfd);
+		return lxc_raw_legacy_clone(flags, pidfd);
 	}
 
 	return pid;
@@ -146,14 +144,12 @@
 #define __LXC_STACK_SIZE (8 * 1024 * 1024)
 pid_t lxc_clone(int (*fn)(void *), void *arg, int flags, int *pidfd)
 {
+	__do_free void *stack = NULL;
 	pid_t ret;
-	void *stack;
 
 	stack = malloc(__LXC_STACK_SIZE);
-	if (!stack) {
-		SYSERROR("Failed to allocate clone stack");
-		return -ENOMEM;
-	}
+	if (!stack)
+		return syserror_set(-ENOMEM, "Failed to allocate clone stack");
 
 #ifdef __ia64__
 	ret = __clone2(fn, stack, __LXC_STACK_SIZE, flags | SIGCHLD, arg, pidfd);

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/process_utils.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/process_utils.h Changed

@@ -3,20 +3,22 @@
 #ifndef __LXC_PROCESS_UTILS_H
 #define __LXC_PROCESS_UTILS_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#include <linux/sched.h>
+#include "config.h"
+
 #include <sched.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/syscall.h>
 #include <unistd.h>
 
+#if HAVE_SYS_PIDFD_H
+#include <sys/pidfd.h>
+#endif
+
 #include "compiler.h"
-#include "config.h"
 #include "syscall_numbers.h"
 
 #ifndef CSIGNAL
@@ -137,9 +139,11 @@
 #endif
 
 /* waitid */
+#if !HAVE_SYS_PIDFD_H
 #ifndef P_PIDFD
 #define P_PIDFD 3
 #endif
+#endif
 
 #ifndef CLONE_ARGS_SIZE_VER0
 #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */
@@ -160,7 +164,8 @@
 #define u64_to_ptr(x) ((void *)(uintptr_t)x)
 #endif
 
-struct lxc_clone_args {
+#if !HAVE_STRUCT_CLONE_ARGS
+struct clone_args {
 	__aligned_u64 flags;
 	__aligned_u64 pidfd;
 	__aligned_u64 child_tid;
@@ -173,8 +178,9 @@
 	__aligned_u64 set_tid_size;
 	__aligned_u64 cgroup;
 };
+#endif
 
-__returns_twice static inline pid_t lxc_clone3(struct lxc_clone_args *args, size_t size)
+__returns_twice static inline pid_t lxc_clone3(struct clone_args *args, size_t size)
 {
 	return syscall(__NR_clone3, args, size);
 }
@@ -209,7 +215,7 @@
  * - should call lxc_raw_getpid():
  *   The child should use lxc_raw_getpid() to retrieve its pid.
  */
-extern pid_t lxc_clone(int (*fn)(void *), void *arg, int flags, int *pidfd);
+__hidden extern pid_t lxc_clone(int (*fn)(void *), void *arg, int flags, int *pidfd);
 
 
 /*
@@ -239,7 +245,8 @@
  * - must call lxc_raw_getpid():
  *   The child must use lxc_raw_getpid() to retrieve its pid.
  */
-extern pid_t lxc_raw_clone(unsigned long flags, int *pidfd);
+__hidden extern pid_t lxc_raw_clone(unsigned long flags, int *pidfd);
+__hidden extern pid_t lxc_raw_legacy_clone(unsigned long flags, int *pidfd);
 
 /*
  * lxc_raw_clone_cb() - create a new process
@@ -252,10 +259,10 @@
  * All other comments that apply to lxc_raw_clone() apply to lxc_raw_clone_cb()
  * as well.
  */
-extern pid_t lxc_raw_clone_cb(int (*fn)(void *), void *args,
-			      unsigned long flags, int *pidfd);
+__hidden extern pid_t lxc_raw_clone_cb(int (*fn)(void *), void *args, unsigned long flags,
+				       int *pidfd);
 
-#ifndef HAVE_EXECVEAT
+#if !HAVE_EXECVEAT
 static inline int execveat(int dirfd, const char *pathname, char *const argv,
 			   char *const envp, int flags)
 {
@@ -284,7 +291,19 @@
 #endif
 }
 
-extern int lxc_raw_pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
-				     unsigned int flags);
+__hidden extern int lxc_raw_pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
+					      unsigned int flags);
+
+static inline const char *signal_name(int sig)
+{
+	const char *s;
+
+#if HAVE_SIGDESCR_NP
+	s = sigdescr_np(sig);
+#else
+	s = "UNSUPPORTED";
+#endif
+	return s ?: "INVALID_SIGNAL_NUMBER";
+}
 
 #endif /* __LXC_PROCESS_UTILS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/rexec.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/rexec.c Changed

@@ -1,24 +1,23 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "macro.h"
 #include "memory_utils.h"
 #include "process_utils.h"
+#include "rexec.h"
 #include "string_utils.h"
 #include "syscall_wrappers.h"
 
-#if IS_BIONIC
-#include "../include/fexecve.h"
+#if IS_BIONIC && !HAVE_FEXECVE
+#include "fexecve.h"
 #endif
 
 #define LXC_MEMFD_REXEC_SEALS \
@@ -97,9 +96,9 @@
 	if (memfd < 0) {
 		char templatePATH_MAX;
 
-		ret = snprintf(template, sizeof(template),
-			       P_tmpdir "/.%s_XXXXXX", memfd_name);
-		if (ret < 0 || (size_t)ret >= sizeof(template))
+		ret = strnprintf(template, sizeof(template),
+				 P_tmpdir "/.%s_XXXXXX", memfd_name);
+		if (ret < 0)
 			return;
 
 		tmpfd = lxc_make_tmpfile(template, true);
@@ -126,10 +125,13 @@
 		sent = lxc_sendfile_nointr(memfd >= 0 ? memfd : tmpfd, fd, NULL,
 					   st.st_size - bytes_sent);
 		if (sent < 0) {
-			/* Fallback to shoveling data between kernel- and
+			/*
+			 * Fallback to shoveling data between kernel- and
 			 * userspace.
 			 */
-			lseek(fd, 0, SEEK_SET);
+			if (lseek(fd, 0, SEEK_SET) == (off_t) -1)
+				fprintf(stderr, "Failed to seek to beginning of file");
+
 			if (fd_to_fd(fd, memfd >= 0 ? memfd : tmpfd))
 				break;
 
@@ -147,8 +149,8 @@
 	} else {
 		char procfdLXC_PROC_PID_FD_LEN;
 
-		ret = snprintf(procfd, sizeof(procfd), "/proc/self/fd/%d", tmpfd);
-		if (ret < 0 || (size_t)ret >= sizeof(procfd))
+		ret = strnprintf(procfd, sizeof(procfd), "/proc/self/fd/%d", tmpfd);
+		if (ret < 0)
 			return;
 
 		execfd = open(procfd, O_PATH | O_CLOEXEC);

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/rexec.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/rexec.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/ringbuf.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/ringbuf.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/ringbuf.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/ringbuf.h Changed

@@ -3,11 +3,15 @@
 #ifndef __LXC_RINGBUF_H
 #define __LXC_RINGBUF_H
 
+#include "config.h"
+
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <sys/mman.h>
 
+#include "compiler.h"
+
 /**
  * lxc_ringbuf - Implements a simple and efficient memory mapped ringbuffer.
  * - The "addr" field of struct lxc_ringbuf is considered immutable. Instead the
@@ -29,10 +33,10 @@
  *
  * @paramin size	Size of the new ringbuffer as a power of 2.
  */
-extern int lxc_ringbuf_create(struct lxc_ringbuf *buf, size_t size);
-extern void lxc_ringbuf_move_read_addr(struct lxc_ringbuf *buf, size_t len);
-extern int lxc_ringbuf_write(struct lxc_ringbuf *buf, const char *msg, size_t len);
-extern int lxc_ringbuf_read(struct lxc_ringbuf *buf, char *out, size_t *len);
+__hidden extern int lxc_ringbuf_create(struct lxc_ringbuf *buf, size_t size);
+__hidden extern void lxc_ringbuf_move_read_addr(struct lxc_ringbuf *buf, size_t len);
+__hidden extern int lxc_ringbuf_write(struct lxc_ringbuf *buf, const char *msg, size_t len);
+__hidden extern int lxc_ringbuf_read(struct lxc_ringbuf *buf, char *out, size_t *len);
 
 static inline void lxc_ringbuf_release(struct lxc_ringbuf *buf)
 {

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/rtnl.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/rtnl.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -12,16 +11,15 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "nl.h"
 #include "rtnl.h"
 
-extern int rtnetlink_open(struct rtnl_handler *handler)
+int rtnetlink_open(struct rtnl_handler *handler)
 {
 	return netlink_open(&handler->nlh, NETLINK_ROUTE);
 }
 
-extern void rtnetlink_close(struct rtnl_handler *handler)
+void rtnetlink_close(struct rtnl_handler *handler)
 {
 	netlink_close(&handler->nlh);
 }
@@ -29,20 +27,19 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-align"
 
-extern int rtnetlink_rcv(struct rtnl_handler *handler, struct rtnlmsg *rtnlmsg)
+int rtnetlink_rcv(struct rtnl_handler *handler, struct rtnlmsg *rtnlmsg)
 {
 	return netlink_rcv(&handler->nlh, (struct nlmsg *)&rtnlmsg->nlmsghdr);
 }
 
-extern int rtnetlink_send(struct rtnl_handler *handler, struct rtnlmsg *rtnlmsg)
+int rtnetlink_send(struct rtnl_handler *handler, struct rtnlmsg *rtnlmsg)
 {
 
 	return netlink_send(&handler->nlh, (struct nlmsg *)&rtnlmsg->nlmsghdr);
 }
 
-extern int rtnetlink_transaction(struct rtnl_handler *handler,
-				 struct rtnlmsg *request,
-				 struct rtnlmsg *answer)
+int rtnetlink_transaction(struct rtnl_handler *handler, struct rtnlmsg *request,
+			  struct rtnlmsg *answer)
 {
 	return netlink_transaction(&handler->nlh,
 				   (struct nlmsg *)&request->nlmsghdr,
@@ -51,7 +48,7 @@
 
 #pragma GCC diagnostic pop
 
-extern struct rtnlmsg *rtnlmsg_alloc(size_t size)
+struct rtnlmsg *rtnlmsg_alloc(size_t size)
 {
 	/*
 	size_t len;
@@ -63,4 +60,4 @@
 	return NULL;
 }
 
-extern void rtnlmsg_free(struct rtnlmsg *rtnlmsg) { free(rtnlmsg); }
+void rtnlmsg_free(struct rtnlmsg *rtnlmsg) { free(rtnlmsg); }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/rtnl.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/rtnl.h Changed

@@ -3,6 +3,10 @@
 #ifndef __LXC_RTNL_H
 #define __LXC_RTNL_H
 
+#include "config.h"
+
+#include <compiler.h>
+
 /*
  * Use this as a good size to allocate route netlink messages
  */
@@ -38,14 +42,14 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-extern int rtnetlink_open(struct rtnl_handler *handler);
+__hidden extern int rtnetlink_open(struct rtnl_handler *handler);
 
 /*
  * genetlink_close : close a route netlink socket
  *
  * @handler: the handler of the socket to be closed
  */
-extern void rtnetlink_close(struct rtnl_handler *handler);
+__hidden extern void rtnetlink_close(struct rtnl_handler *handler);
 
 /*
  * rtnetlink_rcv : receive a route netlink socket, it is up
@@ -56,7 +60,7 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-extern int rtnetlink_rcv(struct rtnl_handler *handler, struct rtnlmsg *rtnlmsg);
+__hidden extern int rtnetlink_rcv(struct rtnl_handler *handler, struct rtnlmsg *rtnlmsg);
 
 /*
  * rtnetlink_send : send a route netlink socket, it is up
@@ -67,12 +71,11 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-extern int rtnetlink_send(struct rtnl_handler *handler,
-			  struct rtnlmsg *rtnlmsg);
+__hidden extern int rtnetlink_send(struct rtnl_handler *handler, struct rtnlmsg *rtnlmsg);
 
-struct genlmsg *genlmsg_alloc(size_t size);
+__hidden struct genlmsg *genlmsg_alloc(size_t size);
 
-extern void rtnlmsg_free(struct rtnlmsg *rtnlmsg);
+__hidden extern void rtnlmsg_free(struct rtnlmsg *rtnlmsg);
 
 /*
  * rtnetlink_transaction : send and receive a route netlink message in one shot
@@ -83,8 +86,9 @@
  *
  * Returns 0 on success, < 0 otherwise
  */
-extern int rtnetlink_transaction(struct rtnl_handler *handler,
-				 struct rtnlmsg *request,
-				 struct rtnlmsg *answer);
+__hidden extern int rtnetlink_transaction(struct rtnl_handler *handler, struct rtnlmsg *request,
+					  struct rtnlmsg *answer);
+
+__hidden struct rtnlmsg *rtnlmsg_alloc(size_t size);
 
 #endif /* __LXC_RTNL_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/seccomp.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/seccomp.c Changed

@@ -1,20 +1,20 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <seccomp.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/epoll.h>
 #include <sys/mount.h>
 #include <sys/utsname.h>
 
+#include "lxc.h"
+
 #include "af_unix.h"
 #include "commands.h"
-#include "config.h"
 #include "log.h"
-#include "lxccontainer.h"
 #include "lxcseccomp.h"
 #include "mainloop.h"
 #include "memory_utils.h"
@@ -92,17 +92,17 @@
 	return "invalid action";
 }
 
-static uint32_t get_v2_default_action(char *line)
+static int32_t get_v2_default_action(char *line)
 {
-	uint32_t ret_action = -1;
+	int32_t ret_action = -1;
 
 	while (*line == ' ')
 		line++;
 
-	/* After 'whitelist' or 'blacklist' comes default behavior. */
-	if (strncmp(line, "kill", 4) == 0) {
+	/* After 'allowlist' or 'denylist' comes default behavior. */
+	if (strnequal(line, "kill", 4)) {
 		ret_action = SCMP_ACT_KILL;
-	} else if (strncmp(line, "errno", 5) == 0) {
+	} else if (strnequal(line, "errno", 5)) {
 		int e, ret;
 
 		ret = sscanf(line + 5, "%d", &e);
@@ -112,12 +112,12 @@
 		}
 
 		ret_action = SCMP_ACT_ERRNO(e);
-	} else if (strncmp(line, "allow", 5) == 0) {
+	} else if (strnequal(line, "allow", 5)) {
 		ret_action = SCMP_ACT_ALLOW;
-	} else if (strncmp(line, "trap", 4) == 0) {
+	} else if (strnequal(line, "trap", 4)) {
 		ret_action = SCMP_ACT_TRAP;
 #if HAVE_DECL_SECCOMP_NOTIFY_FD
-	} else if (strncmp(line, "notify", 6) == 0) {
+	} else if (strnequal(line, "notify", 6)) {
 		ret_action = SCMP_ACT_NOTIFY;
 #endif
 	} else if (line0) {
@@ -128,7 +128,7 @@
 	return ret_action;
 }
 
-static uint32_t get_v2_action(char *line, uint32_t def_action)
+static int32_t get_v2_action(char *line, uint32_t def_action)
 {
 	char *p;
 	uint32_t ret;
@@ -170,19 +170,19 @@
 
 static enum scmp_compare parse_v2_rule_op(char *s)
 {
-	if (strcmp(s, "SCMP_CMP_NE") == 0 || strcmp(s, "!=") == 0)
+	if (strequal(s, "SCMP_CMP_NE") || strequal(s, "!="))
 		return SCMP_CMP_NE;
-	else if (strcmp(s, "SCMP_CMP_LT") == 0 || strcmp(s, "<") == 0)
+	else if (strequal(s, "SCMP_CMP_LT") || strequal(s, "<"))
 		return SCMP_CMP_LT;
-	else if (strcmp(s, "SCMP_CMP_LE") == 0 || strcmp(s, "<=") == 0)
+	else if (strequal(s, "SCMP_CMP_LE") || strequal(s, "<="))
 		return SCMP_CMP_LE;
-	else if (strcmp(s, "SCMP_CMP_EQ") == 0 || strcmp(s, "==") == 0)
+	else if (strequal(s, "SCMP_CMP_EQ") || strequal(s, "=="))
 		return SCMP_CMP_EQ;
-	else if (strcmp(s, "SCMP_CMP_GE") == 0 || strcmp(s, ">=") == 0)
+	else if (strequal(s, "SCMP_CMP_GE") || strequal(s, ">="))
 		return SCMP_CMP_GE;
-	else if (strcmp(s, "SCMP_CMP_GT") == 0 || strcmp(s, ">") == 0)
+	else if (strequal(s, "SCMP_CMP_GT") || strequal(s, ">"))
 		return SCMP_CMP_GT;
-	else if (strcmp(s, "SCMP_CMP_MASKED_EQ") == 0 || strcmp(s, "&=") == 0)
+	else if (strequal(s, "SCMP_CMP_MASKED_EQ") || strequal(s, "&="))
 		return SCMP_CMP_MASKED_EQ;
 
 	return _SCMP_CMP_MAX;
@@ -263,13 +263,14 @@
 		return -1;
 
 	/* read optional action which follows the syscall */
-	rules->action = get_v2_action(tmp, def_action);
-	if (rules->action == -1) {
+	ret = get_v2_action(tmp, def_action);
+	if (ret == -1) {
 		ERROR("Failed to interpret action");
-		ret = -1;
 		goto on_error;
 	}
 
+	rules->action = ret;
+
 	ret = 0;
 	rules->args_num = 0;
 	if (!strchr(tmp, ''))
@@ -317,7 +318,7 @@
 	lxc_seccomp_arch_unknown = 999,
 };
 
-int get_hostarch(void)
+static int get_hostarch(void)
 {
 	struct utsname uts;
 	if (uname(&uts) < 0) {
@@ -325,34 +326,34 @@
 		return -1;
 	}
 
-	if (strcmp(uts.machine, "i686") == 0)
+	if (strequal(uts.machine, "i686"))
 		return lxc_seccomp_arch_i386;
 	/* no x32 kernels */
-	else if (strcmp(uts.machine, "x86_64") == 0)
+	else if (strequal(uts.machine, "x86_64"))
 		return lxc_seccomp_arch_amd64;
-	else if (strncmp(uts.machine, "armv7", 5) == 0)
+	else if (strnequal(uts.machine, "armv7", 5))
 		return lxc_seccomp_arch_arm;
-	else if (strncmp(uts.machine, "aarch64", 7) == 0)
+	else if (strnequal(uts.machine, "aarch64", 7))
 		return lxc_seccomp_arch_arm64;
-	else if (strncmp(uts.machine, "ppc64le", 7) == 0)
+	else if (strnequal(uts.machine, "ppc64le", 7))
 		return lxc_seccomp_arch_ppc64le;
-	else if (strncmp(uts.machine, "ppc64", 5) == 0)
+	else if (strnequal(uts.machine, "ppc64", 5))
 		return lxc_seccomp_arch_ppc64;
-	else if (strncmp(uts.machine, "ppc", 3) == 0)
+	else if (strnequal(uts.machine, "ppc", 3))
 		return lxc_seccomp_arch_ppc;
-	else if (strncmp(uts.machine, "mips64", 6) == 0)
+	else if (strnequal(uts.machine, "mips64", 6))
 		return MIPS_ARCH_N64;
-	else if (strncmp(uts.machine, "mips", 4) == 0)
+	else if (strnequal(uts.machine, "mips", 4))
 		return MIPS_ARCH_O32;
-	else if (strncmp(uts.machine, "s390x", 5) == 0)
+	else if (strnequal(uts.machine, "s390x", 5))
 		return lxc_seccomp_arch_s390x;
-	else if (strncmp(uts.machine, "s390", 4) == 0)
+	else if (strnequal(uts.machine, "s390", 4))
 		return lxc_seccomp_arch_s390;
 	return lxc_seccomp_arch_unknown;
 }
 
-scmp_filter_ctx get_new_ctx(enum lxc_hostarch_t n_arch,
-			    uint32_t default_policy_action, bool *needs_merge)
+static scmp_filter_ctx get_new_ctx(enum lxc_hostarch_t n_arch, uint32_t default_policy_action,
+				   bool *needs_merge)
 {
 	int ret;
 	uint32_t arch;
@@ -485,17 +486,24 @@
 	return ctx;
 }
 
-bool do_resolve_add_rule(uint32_t arch, char *line, scmp_filter_ctx ctx,
-			 struct seccomp_v2_rule *rule)
+enum lxc_seccomp_rule_status_t {
+  lxc_seccomp_rule_added = 0,
+  lxc_seccomp_rule_err,
+  lxc_seccomp_rule_undefined_syscall,
+  lxc_seccomp_rule_unsupported_arch,
+};
+
+static enum lxc_seccomp_rule_status_t do_resolve_add_rule(uint32_t arch, char *line, scmp_filter_ctx ctx,
+				struct seccomp_v2_rule *rule)
 {
-	int i, nr, ret;
+	int nr, ret;
 	struct scmp_arg_cmp arg_cmp6;
 
 	ret = seccomp_arch_exist(ctx, arch);
 	if (arch && ret != 0) {
 		errno = -ret;
 		SYSERROR("Seccomp: rule and context arch do not match (arch %d)", arch);
-		return false;
+		return lxc_seccomp_rule_err;
 	}
 
 	/*get the syscall name*/
@@ -503,36 +511,40 @@
 	if (p)
 		*p = '\0';
 
-	if (strncmp(line, "reject_force_umount", 19) == 0) {
+	if (strnequal(line, "reject_force_umount", 19)) {
 		ret = seccomp_rule_add_exact(ctx, SCMP_ACT_ERRNO(EACCES),
 					     SCMP_SYS(umount2), 1,
 					     SCMP_A1(SCMP_CMP_MASKED_EQ, MNT_FORCE, MNT_FORCE));
 		if (ret < 0) {
 			errno = -ret;
 			SYSERROR("Failed loading rule to reject force umount");
-			return false;
+			return lxc_seccomp_rule_err;
 		}
 
 		INFO("Set seccomp rule to reject force umounts");
-		return true;
+		return lxc_seccomp_rule_added;
 	}
 
 	nr = seccomp_syscall_resolve_name(line);
 	if (nr == __NR_SCMP_ERROR) {
-		WARN("Failed to resolve syscall \"%s\"", line);
-		WARN("This syscall will NOT be handled by seccomp");
-		return true;
+		INFO("The syscall%s is is undefined on host native arch", line);
+		return lxc_seccomp_rule_undefined_syscall;
 	}
 
-	if (nr < 0) {
-		WARN("Got negative return value %d for syscall \"%s\"", nr, line);
-		WARN("This syscall will NOT be handled by seccomp");
-		return true;
+	// The syscall resolves to a pseudo syscall and may be available on compat archs.
+	if (nr < 0 && arch == SCMP_ARCH_NATIVE) {
+		DEBUG("The syscall%d:%s is a pseudo syscall and not available on host native arch.", nr, line);
+		return lxc_seccomp_rule_unsupported_arch;
+	}
+
+	if (arch != SCMP_ARCH_NATIVE && seccomp_syscall_resolve_name_arch(arch, line) < 0) {
+		DEBUG("The syscall%d:%s is not supported on compat arch%u", nr, line, arch);
+		return lxc_seccomp_rule_unsupported_arch;
 	}
 
 	memset(&arg_cmp, 0, sizeof(arg_cmp));
-	for (i = 0; i < rule->args_num; i++) {
-		INFO("arg_cmp%d: SCMP_CMP(%u, %llu, %llu, %llu)", i,
+	for (size_t i = 0; i < rule->args_num; i++) {
+		INFO("arg_cmp%zu: SCMP_CMP(%u, %llu, %llu, %llu)", i,
 		     rule->args_valuei.index,
 		     (long long unsigned int)rule->args_valuei.op,
 		     (long long unsigned int)rule->args_valuei.mask,
@@ -549,16 +561,41 @@
 					      rule->args_valuei.value);
 	}
 
+	INFO("Adding %s rule for syscall%d:%s action%d:%s arch%u",
+			  (arch == SCMP_ARCH_NATIVE) ? "native" : "compat",
+			  nr, line, rule->action, get_action_name(rule->action), arch);
+
 	ret = seccomp_rule_add_exact_array(ctx, rule->action, nr,
 					   rule->args_num, arg_cmp);
 	if (ret < 0) {
 		errno = -ret;
-		SYSERROR("Failed loading rule for %s (nr %d action %d (%s))",
-		         line, nr, rule->action, get_action_name(rule->action));
-		return false;
+		SYSERROR("Failed to add rule for syscall%d:%s action%d:%s arch%u",
+		         nr, line, rule->action, get_action_name(rule->action), arch);
+		return lxc_seccomp_rule_err;
 	}
 
-	return true;
+	return lxc_seccomp_rule_added;
+}
+
+/*
+ * It is unfortunate, but we can't simply remove those terms since this would
+ * break way too many users.
+ */
+#define BACKWARDCOMPAT_TERMINOLOGY_DENYLIST "blacklist"
+#define BACKWARDCOMPAT_TERMINOLOGY_ALLOWLIST "whitelist"
+
+static inline bool is_denylist(const char *type)
+{
+	return strnequal(type, "denylist", STRLITERALLEN("denylist")) ||
+	       strnequal(type, BACKWARDCOMPAT_TERMINOLOGY_DENYLIST,
+			 STRLITERALLEN(BACKWARDCOMPAT_TERMINOLOGY_DENYLIST));
+}
+
+static inline bool is_allowlist(const char *type)
+{
+	return strnequal(type, "allowlist", STRLITERALLEN("allowlist")) ||
+	       strnequal(type, BACKWARDCOMPAT_TERMINOLOGY_ALLOWLIST,
+			 STRLITERALLEN(BACKWARDCOMPAT_TERMINOLOGY_ALLOWLIST));
 }
 
 /*
@@ -580,8 +617,8 @@
 	int ret;
 	char *p;
 	enum lxc_hostarch_t cur_rule_arch, native_arch;
-	bool blacklist = false;
-	uint32_t default_policy_action = -1, default_rule_action = -1;
+	bool denylist = false;
+	int32_t default_policy_action = -1, default_rule_action = -1;
 	struct seccomp_v2_rule rule;
 	struct scmp_ctx_info {
 		uint32_t architectures3;
@@ -589,12 +626,10 @@
 		bool needs_merge3;
 	} ctx;
 
-	if (strncmp(line, "blacklist", 9) == 0)
-		blacklist = true;
-	else if (strncmp(line, "whitelist", 9) != 0) {
-		ERROR("Bad seccomp policy style \"%s\"", line);
-		return -1;
-	}
+	if (is_denylist(line))
+		denylist = true;
+	else if (!is_allowlist(line))
+		return log_error(-EINVAL, "Bad seccomp policy style \"%s\"", line);
 
 	p = strchr(line, ' ');
 	if (p) {
@@ -603,8 +638,8 @@
 			return -1;
 	}
 
-	/* for blacklist, allow any syscall which has no rule */
-	if (blacklist) {
+	/* for denylist, allow any syscall which has no rule */
+	if (denylist) {
 		if (default_policy_action == -1)
 			default_policy_action = SCMP_ACT_ALLOW;
 
@@ -618,6 +653,8 @@
 			default_rule_action = SCMP_ACT_ALLOW;
 	}
 
+	DEBUG("Host native arch is %u", seccomp_arch_native());
+
 	memset(&ctx, 0, sizeof(ctx));
 	ctx.architectures0 = SCMP_ARCH_NATIVE;
 	ctx.architectures1 = SCMP_ARCH_NATIVE;
@@ -770,8 +807,8 @@
 		INFO("Processing \"%s\"", line);
 		if (line0 == '') {
 			/* Read the architecture for next set of rules. */
-			if (strcmp(line, "x86") == 0 ||
-			    strcmp(line, "X86") == 0) {
+			if (strequal(line, "x86") ||
+			    strequal(line, "X86")) {
 				if (native_arch != lxc_seccomp_arch_i386 &&
 				    native_arch != lxc_seccomp_arch_amd64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
@@ -779,29 +816,29 @@
 				}
 
 				cur_rule_arch = lxc_seccomp_arch_i386;
-			} else if (strcmp(line, "x32") == 0 ||
-				   strcmp(line, "X32") == 0) {
+			} else if (strequal(line, "x32") ||
+				   strequal(line, "X32")) {
 				if (native_arch != lxc_seccomp_arch_amd64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
 				}
 
 				cur_rule_arch = lxc_seccomp_arch_x32;
-			} else if (strcmp(line, "X86_64") == 0 ||
-				   strcmp(line, "x86_64") == 0) {
+			} else if (strequal(line, "X86_64") ||
+				   strequal(line, "x86_64")) {
 				if (native_arch != lxc_seccomp_arch_amd64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
 				}
 
 				cur_rule_arch = lxc_seccomp_arch_amd64;
-			} else if (strcmp(line, "all") == 0 ||
-				   strcmp(line, "ALL") == 0) {
+			} else if (strequal(line, "all") ||
+				   strequal(line, "ALL")) {
 				cur_rule_arch = lxc_seccomp_arch_all;
 			}
 #ifdef SCMP_ARCH_ARM
-			else if (strcmp(line, "arm") == 0 ||
-				 strcmp(line, "ARM") == 0) {
+			else if (strequal(line, "arm") ||
+				 strequal(line, "ARM")) {
 				if (native_arch != lxc_seccomp_arch_arm &&
 				    native_arch != lxc_seccomp_arch_arm64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
@@ -812,8 +849,8 @@
 			}
 #endif
 #ifdef SCMP_ARCH_AARCH64
-			else if (strcmp(line, "arm64") == 0 ||
-				 strcmp(line, "ARM64") == 0) {
+			else if (strequal(line, "arm64") ||
+				 strequal(line, "ARM64")) {
 				if (native_arch != lxc_seccomp_arch_arm64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
@@ -823,8 +860,8 @@
 			}
 #endif
 #ifdef SCMP_ARCH_PPC64LE
-			else if (strcmp(line, "ppc64le") == 0 ||
-				 strcmp(line, "PPC64LE") == 0) {
+			else if (strequal(line, "ppc64le") ||
+				 strequal(line, "PPC64LE")) {
 				if (native_arch != lxc_seccomp_arch_ppc64le) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
@@ -834,8 +871,8 @@
 			}
 #endif
 #ifdef SCMP_ARCH_PPC64
-			else if (strcmp(line, "ppc64") == 0 ||
-				 strcmp(line, "PPC64") == 0) {
+			else if (strequal(line, "ppc64") ||
+				 strequal(line, "PPC64")) {
 				if (native_arch != lxc_seccomp_arch_ppc64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
@@ -845,8 +882,8 @@
 			}
 #endif
 #ifdef SCMP_ARCH_PPC
-			else if (strcmp(line, "ppc") == 0 ||
-				 strcmp(line, "PPC") == 0) {
+			else if (strequal(line, "ppc") ||
+				 strequal(line, "PPC")) {
 				if (native_arch != lxc_seccomp_arch_ppc &&
 				    native_arch != lxc_seccomp_arch_ppc64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
@@ -857,24 +894,24 @@
 			}
 #endif
 #ifdef SCMP_ARCH_MIPS
-			else if (strcmp(line, "mips64") == 0 ||
-				 strcmp(line, "MIPS64") == 0) {
+			else if (strequal(line, "mips64") ||
+				 strequal(line, "MIPS64")) {
 				if (native_arch != lxc_seccomp_arch_mips64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
 				}
 
 				cur_rule_arch = lxc_seccomp_arch_mips64;
-			} else if (strcmp(line, "mips64n32") == 0 ||
-				   strcmp(line, "MIPS64N32") == 0) {
+			} else if (strequal(line, "mips64n32") ||
+				   strequal(line, "MIPS64N32")) {
 				if (native_arch != lxc_seccomp_arch_mips64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
 				}
 
 				cur_rule_arch = lxc_seccomp_arch_mips64n32;
-			} else if (strcmp(line, "mips") == 0 ||
-				   strcmp(line, "MIPS") == 0) {
+			} else if (strequal(line, "mips") ||
+				   strequal(line, "MIPS")) {
 				if (native_arch != lxc_seccomp_arch_mips &&
 				    native_arch != lxc_seccomp_arch_mips64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
@@ -882,24 +919,24 @@
 				}
 
 				cur_rule_arch = lxc_seccomp_arch_mips;
-			} else if (strcmp(line, "mipsel64") == 0 ||
-				   strcmp(line, "MIPSEL64") == 0) {
+			} else if (strequal(line, "mipsel64") ||
+				   strequal(line, "MIPSEL64")) {
 				if (native_arch != lxc_seccomp_arch_mipsel64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
 				}
 
 				cur_rule_arch = lxc_seccomp_arch_mipsel64;
-			} else if (strcmp(line, "mipsel64n32") == 0 ||
-				   strcmp(line, "MIPSEL64N32") == 0) {
+			} else if (strequal(line, "mipsel64n32") ||
+				   strequal(line, "MIPSEL64N32")) {
 				if (native_arch != lxc_seccomp_arch_mipsel64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
 				}
 
 				cur_rule_arch = lxc_seccomp_arch_mipsel64n32;
-			} else if (strcmp(line, "mipsel") == 0 ||
-				   strcmp(line, "MIPSEL") == 0) {
+			} else if (strequal(line, "mipsel") ||
+				   strequal(line, "MIPSEL")) {
 				if (native_arch != lxc_seccomp_arch_mipsel &&
 				    native_arch != lxc_seccomp_arch_mipsel64) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
@@ -910,8 +947,8 @@
 			}
 #endif
 #ifdef SCMP_ARCH_S390X
-			else if (strcmp(line, "s390x") == 0 ||
-				 strcmp(line, "S390X") == 0) {
+			else if (strequal(line, "s390x") ||
+				 strequal(line, "S390X")) {
 				if (native_arch != lxc_seccomp_arch_s390x) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
@@ -921,8 +958,8 @@
 			}
 #endif
 #ifdef SCMP_ARCH_S390
-			else if (strcmp(line, "s390") == 0 ||
-				strcmp(line, "S390") == 0) {
+			else if (strequal(line, "s390") ||
+				 strequal(line, "S390")) {
 				if (native_arch != lxc_seccomp_arch_s390) {
 					cur_rule_arch = lxc_seccomp_arch_unknown;
 					continue;
@@ -958,43 +995,23 @@
 		}
 #endif
 
-		if (!do_resolve_add_rule(SCMP_ARCH_NATIVE, line,
-					 conf->seccomp.seccomp_ctx, &rule))
-			goto bad_rule;
-
-		INFO("Added native rule for arch %d for %s action %d(%s)",
-		     SCMP_ARCH_NATIVE, line, rule.action,
-		     get_action_name(rule.action));
 
-		if (ctx.architectures0 != SCMP_ARCH_NATIVE) {
-			if (!do_resolve_add_rule(ctx.architectures0, line,
-						 ctx.contexts0, &rule))
-				goto bad_rule;
-
-			INFO("Added compat rule for arch %d for %s action %d(%s)",
-			     ctx.architectures0, line, rule.action,
-			     get_action_name(rule.action));
-		}
-
-		if (ctx.architectures1 != SCMP_ARCH_NATIVE) {
-			if (!do_resolve_add_rule(ctx.architectures1, line,
-						 ctx.contexts1, &rule))
-				goto bad_rule;
+		ret = do_resolve_add_rule(SCMP_ARCH_NATIVE, line,
+					 conf->seccomp.seccomp_ctx, &rule);
+		if (ret == lxc_seccomp_rule_err)
+			goto bad_rule;
+		if (ret == lxc_seccomp_rule_undefined_syscall)
+			continue;
 
-			INFO("Added compat rule for arch %d for %s action %d(%s)",
-			     ctx.architectures1, line, rule.action,
-			     get_action_name(rule.action));
+		for (int i = 0; i < 3; i++ ) {
+			uint32_t arch = ctx.architecturesi;
+			if (arch != SCMP_ARCH_NATIVE && arch != seccomp_arch_native()) {
+				if (lxc_seccomp_rule_err == do_resolve_add_rule(arch, line,
+							ctx.contextsi, &rule))
+					goto bad_rule;
+			}
 		}
 
-		if (ctx.architectures2 != SCMP_ARCH_NATIVE) {
-			if (!do_resolve_add_rule(ctx.architectures2, line,
-						ctx.contexts2, &rule))
-				goto bad_rule;
-
-			INFO("Added native rule for arch %d for %s action %d(%s)",
-			     ctx.architectures2, line, rule.action,
-			     get_action_name(rule.action));
-		}
 	}
 
 	INFO("Merging compat seccomp contexts into main context");
@@ -1079,7 +1096,7 @@
  * the second line has some directives
  * then comes policy subject to the directives
  * right now version must be '1' or '2'
- * the directives must include 'whitelist'(version == 1 or 2) or 'blacklist'
+ * the directives must include 'allowlist'(version == 1 or 2) or 'denylist'
  * (version == 2) and can include 'debug' (though debug is not yet supported).
  */
 static int parse_config(FILE *f, struct lxc_conf *conf)
@@ -1099,8 +1116,8 @@
 		goto bad_line;
 	}
 
-	if (version == 1 && !strstr(line, "whitelist")) {
-		ERROR("Only whitelist policy is supported");
+	if (version == 1 && !strstr(line, "allowlist")) {
+		ERROR("Only allowlist policy is supported");
 		goto bad_line;
 	}
 
@@ -1142,7 +1159,7 @@
 		return true;
 
 	while (getline(&line, &line_bufsz, f) != -1) {
-		if (strncmp(line, "Seccomp:", 8) == 0) {
+		if (strnequal(line, "Seccomp:", 8)) {
 			found = true;
 
 			ret = sscanf(line + 8, "%d", &v);
@@ -1243,14 +1260,16 @@
 /* After load seccomp filter into the kernel successfully, export the current seccomp
  * filter to log file */
 #if HAVE_SCMP_FILTER_CTX
-	if ((lxc_log_get_level() <= LXC_LOG_LEVEL_TRACE ||
-	     conf->loglevel <= LXC_LOG_LEVEL_TRACE) &&
-	    lxc_log_fd >= 0) {
-		ret = seccomp_export_pfc(conf->seccomp.seccomp_ctx, lxc_log_fd);
-		/* Just give an warning when export error */
-		if (ret < 0) {
-			errno = -ret;
-			SYSWARN("Failed to export seccomp filter to log file");
+	if (lxc_log_trace()) {
+		int fd_log;
+
+		fd_log = lxc_log_get_fd();
+		if (fd_log >= 0) {
+			ret = seccomp_export_pfc(conf->seccomp.seccomp_ctx, fd_log);
+			if (ret < 0) {
+				errno = -ret;
+				SYSWARN("Failed to export seccomp filter to log file");
+			}
 		}
 	}
 #endif
@@ -1263,6 +1282,9 @@
 			return -1;
 		}
 
+		if (fd_make_nonblocking(ret))
+			return log_error_errno(-1, errno, "Failed to make seccomp listener fd non-blocking");;
+
 		conf->seccomp.notifier.notify_fd = ret;
 		TRACE("Retrieved new seccomp listener fd %d", ret);
 	}
@@ -1288,6 +1310,7 @@
 	seccomp_notify_free(seccomp->notifier.req_buf, seccomp->notifier.rsp_buf);
 	seccomp->notifier.req_buf = NULL;
 	seccomp->notifier.rsp_buf = NULL;
+	free_disarm(seccomp->notifier.cookie);
 #endif
 }
 
@@ -1322,14 +1345,41 @@
 {
 	resp->id = req->id;
 	resp->error = -ENOSYS;
+	resp->val = 0;
+	resp->flags = 0;
 
 	if (seccomp_notify_respond(fd, resp))
-		SYSERROR("Failed to send default message to seccomp");
+		SYSERROR("Failed to send default message to seccomp notification with id(%llu)",
+			 (long long unsigned int)resp->id);
+	else
+		TRACE("Sent default response for seccomp notification with id(%llu)",
+		      (long long unsigned int)resp->id);
+	memset(resp, 0, handler->conf->seccomp.notifier.sizes.seccomp_notif_resp);
 }
 #endif
 
+int seccomp_notify_cleanup_handler(int fd, void *data)
+{
+#if HAVE_DECL_SECCOMP_NOTIFY_FD
+	struct lxc_handler *hdlr = data;
+	struct lxc_conf *conf = hdlr->conf;
+
+	/* TODO: Make sure that we don't need to free any memory in here. */
+	if (fd == conf->seccomp.notifier.notify_fd)
+		fd = move_fd(conf->seccomp.notifier.notify_fd);
+
+	/*
+	 * If this isn't the main notify_fd it means that someone registered a
+	 * seccomp notify handler through the command socket (e.g. for attach)
+	 * and so we won't touch the container's config.
+	 */
+	close(fd);
+#endif
+	return 0;
+}
+
 int seccomp_notify_handler(int fd, uint32_t events, void *data,
-			   struct lxc_epoll_descr *descr)
+			   struct lxc_async_descr *descr)
 {
 
 #if HAVE_DECL_SECCOMP_NOTIFY_FD
@@ -1337,7 +1387,7 @@
 	__do_close int fd_mem = -EBADF;
 	int ret;
 	ssize_t bytes;
-	int send_fd_list2;
+	int send_fd_list3;
 	struct iovec iov4;
 	size_t iov_len, msg_base_size, msg_full_size;
 	char mem_path6 /* /proc/ */
@@ -1352,12 +1402,18 @@
 	int listener_proxy_fd = conf->seccomp.notifier.proxy_fd;
 	struct seccomp_notify_proxy_msg msg = {0};
 	char *cookie = conf->seccomp.notifier.cookie;
-	uint64_t req_id;
+	__u64 req_id;
+
+	if (events & EPOLLHUP)
+		return log_trace(LXC_MAINLOOP_DISARM, "Removing seccomp notifier fd %d", fd);
 
-	memset(req, 0, sizeof(*req));
+	memset(req, 0, conf->seccomp.notifier.sizes.seccomp_notif);
 	ret = seccomp_notify_receive(fd, req);
 	if (ret) {
-		SYSERROR("Failed to read seccomp notification");
+		if (errno == ENOENT)
+			TRACE("Intercepted system call aborted");
+		else
+			SYSERROR("Failed to read seccomp notification");
 		goto out;
 	}
 
@@ -1378,8 +1434,15 @@
 
 	/* remember the ID in case we receive garbage from the proxy */
 	resp->id = req_id = req->id;
+	TRACE("Received seccomp notification with id(%llu)", (long long unsigned int)req_id);
+
+	ret = strnprintf(mem_path, sizeof(mem_path), "/proc/%d", req->pid);
+	if (ret < 0) {
+		seccomp_notify_default_answer(fd, req, resp, hdlr);
+		SYSERROR("Failed to create path to process's proc directory");
+		goto out;
+	}
 
-	snprintf(mem_path, sizeof(mem_path), "/proc/%d", req->pid);
 	fd_pid = open(mem_path, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
 	if (fd_pid < 0) {
 		seccomp_notify_default_answer(fd, req, resp, hdlr);
@@ -1387,7 +1450,13 @@
 		goto out;
 	}
 
-	snprintf(mem_path, sizeof(mem_path), "/proc/%d/mem", req->pid);
+	ret = strnprintf(mem_path, sizeof(mem_path), "/proc/%d/mem", req->pid);
+	if (ret < 0) {
+		seccomp_notify_default_answer(fd, req, resp, hdlr);
+		SYSERROR("Failed to create path to process's virtual memory");
+		goto out;
+	}
+
 	fd_mem = open(mem_path, O_RDWR | O_CLOEXEC);
 	if (fd_mem < 0) {
 		seccomp_notify_default_answer(fd, req, resp, hdlr);
@@ -1402,7 +1471,7 @@
 	ret = seccomp_notify_id_valid(fd, req->id);
 	if (ret < 0) {
 		seccomp_notify_default_answer(fd, req, resp, hdlr);
-		SYSERROR("Invalid seccomp notify request id");
+		SYSERROR("Invalid seccomp notify request id(%llu)", (long long unsigned int)req->id);
 		goto out;
 	}
 
@@ -1434,10 +1503,10 @@
 
 	send_fd_list0 = fd_pid;
 	send_fd_list1 = fd_mem;
+	send_fd_list2 = fd;
 
 retry:
-	bytes = lxc_abstract_unix_send_fds_iov(listener_proxy_fd, send_fd_list,
-					       2, iov, iov_len);
+	bytes = lxc_abstract_unix_send_fds_iov(listener_proxy_fd, send_fd_list, 3, iov, iov_len);
 	if (bytes != (ssize_t)msg_full_size) {
 		SYSERROR("Failed to forward message to seccomp proxy");
 		if (!reconnected) {
@@ -1461,8 +1530,9 @@
 	}
 
 	if (resp->id != req_id) {
+		ERROR("Proxy returned response with invalid id(%llu) != id(%llu)",
+		      (long long unsigned int)resp->id, (long long unsigned int)req_id);
 		resp->id = req_id;
-		ERROR("Proxy returned response with illegal id");
 		seccomp_notify_default_answer(fd, req, resp, hdlr);
 		goto out;
 	}
@@ -1474,9 +1544,19 @@
 		goto out;
 	}
 
+	if (resp->id != req_id) {
+		ERROR("Proxy returned response with invalid id(%llu) != id(%llu)",
+		      (long long unsigned int)resp->id, (long long unsigned int)req_id);
+		resp->id = req_id;
+	}
+
 	ret = seccomp_notify_respond(fd, resp);
 	if (ret)
 		SYSERROR("Failed to send seccomp notification");
+	else
+		TRACE("Sent response for seccomp notification with id(%llu)",
+		      (long long unsigned int)resp->id);
+	memset(resp, 0, conf->seccomp.notifier.sizes.seccomp_notif_resp);
 
 out:
 #endif
@@ -1498,11 +1578,12 @@
 	       sizeof(conf->seccomp.notifier.proxy_addr));
 	conf->seccomp.notifier.req_buf = NULL;
 	conf->seccomp.notifier.rsp_buf = NULL;
+	conf->seccomp.notifier.cookie = NULL;
 #endif
 }
 
 int lxc_seccomp_setup_proxy(struct lxc_seccomp *seccomp,
-			    struct lxc_epoll_descr *descr,
+			    struct lxc_async_descr *descr,
 			    struct lxc_handler *handler)
 {
 #if HAVE_DECL_SECCOMP_NOTIFY_FD
@@ -1540,9 +1621,11 @@
 			return -1;
 		}
 
-		ret = lxc_mainloop_add_handler(descr,
-					       seccomp->notifier.notify_fd,
-					       seccomp_notify_handler, handler);
+		ret = lxc_mainloop_add_handler(descr, seccomp->notifier.notify_fd,
+					       seccomp_notify_handler,
+					       seccomp_notify_cleanup_handler,
+					       handler,
+					       "seccomp_notify_handler");
 		if (ret < 0) {
 			ERROR("Failed to add seccomp notify handler for %d to mainloop",
 			      notify_fd);
@@ -1575,9 +1658,9 @@
 	if (seccomp->notifier.wants_supervision) {
 		int ret;
 
-		ret = lxc_abstract_unix_recv_fds(socket_fd,
-						 &seccomp->notifier.notify_fd,
-						 1, NULL, 0);
+		ret = lxc_abstract_unix_recv_one_fd(socket_fd,
+						    &seccomp->notifier.notify_fd,
+						    NULL, 0);
 		if (ret < 0)
 			return -1;
 	}
@@ -1588,7 +1671,6 @@
 int lxc_seccomp_add_notifier(const char *name, const char *lxcpath,
 			     struct lxc_seccomp *seccomp)
 {
-
 #if HAVE_DECL_SECCOMP_NOTIFY_FD
 	if (seccomp->notifier.wants_supervision) {
 		int ret;

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/start.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/start.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -25,20 +24,23 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "lxc.h"
+
 #include "af_unix.h"
+#include "attach_options.h"
 #include "caps.h"
-#include "cgroup.h"
+#include "cgroups/cgroup.h"
+#include "cgroups/cgroup_utils.h"
 #include "commands.h"
 #include "commands_utils.h"
+#include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "confile_utils.h"
 #include "error.h"
 #include "file_utils.h"
 #include "list.h"
 #include "log.h"
 #include "lsm/lsm.h"
-#include "lxccontainer.h"
 #include "lxclock.h"
 #include "lxcseccomp.h"
 #include "macro.h"
@@ -60,8 +62,8 @@
 #include <sys/capability.h>
 #endif
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(start, lxc);
@@ -111,23 +113,34 @@
 	}
 }
 
-static int lxc_try_preserve_ns(const int pid, const char *ns)
+static int lxc_try_preserve_namespace(struct lxc_handler *handler,
+				      lxc_namespace_t idx, const char *ns)
 {
-	int fd;
+	__do_close int fd = -EBADF;
+	int ret;
 
-	fd = lxc_preserve_ns(pid, ns);
-	if (fd < 0) {
-		if (errno != ENOENT)
-			return log_error_errno(-EINVAL,
-					       errno, "Failed to preserve %s namespace",
-					       ns);
+	fd = lxc_preserve_ns(handler->pid, ns);
+	if (fd < 0)
+		return -errno;
 
-		return log_warn_errno(-EOPNOTSUPP,
-				      errno, "Kernel does not support preserving %s namespaces",
-				      ns);
-	}
+	ret = strnprintf(handler->nsfd_pathsidx,
+			 sizeof(handler->nsfd_pathsidx), "%s:/proc/%d/fd/%d",
+			 ns_infoidx.proc_name, handler->monitor_pid, fd);
+	if (ret < 0)
+		return ret_errno(EIO);
+
+	/*
+	 * In case LXC is configured for exposing information to hooks as
+	 * argv-style arguments prepare an argv array we can use.
+	 */
+	handler->hook_argvhandler->hook_argc = handler->nsfd_pathsidx;
+	handler->hook_argc++;
 
-	return fd;
+	DEBUG("Preserved %s namespace via fd %d and stashed path as %s",
+	      ns_infoidx.proc_name, fd, handler->nsfd_pathsidx);
+
+	handler->nsfdidx = move_fd(fd);
+	return 0;
 }
 
 /* lxc_try_preserve_namespaces: open /proc/@pid/ns/@ns for each namespace
@@ -135,35 +148,30 @@
  * Return true on success, false on failure.
  */
 static bool lxc_try_preserve_namespaces(struct lxc_handler *handler,
-					int ns_clone_flags, pid_t pid)
+					int ns_clone_flags)
 {
-	int i;
-
-	for (i = 0; i < LXC_NS_MAX; i++)
-		handler->nsfdi = -EBADF;
-
-	for (i = 0; i < LXC_NS_MAX; i++) {
-		int fd;
+	for (lxc_namespace_t ns_idx = 0; ns_idx < LXC_NS_MAX; ns_idx++) {
+		int ret;
+		const char *ns = ns_infons_idx.proc_name;
 
-		if ((ns_clone_flags & ns_infoi.clone_flag) == 0)
+		if ((ns_clone_flags & ns_infons_idx.clone_flag) == 0)
 			continue;
 
-		fd = lxc_try_preserve_ns(pid, ns_infoi.proc_name);
-		if (fd < 0) {
-			/* Do not fail to start container on kernels that do
-			 * not support interacting with namespaces through
-			 * /proc.
-			 */
-			if (fd == -EOPNOTSUPP)
+		ret = lxc_try_preserve_namespace(handler, ns_idx,
+						 ns_infons_idx.proc_name);
+		if (ret < 0) {
+			if (ret == -ENOENT) {
+				SYSERROR("Kernel does not support preserving %s namespaces", ns);
 				continue;
+			}
 
+			/*
+			 * Handle kernels that do not support interacting with
+			 * namespaces through procfs.
+			 */
 			lxc_put_nsfds(handler);
-			return false;
+			return log_error_errno(false, errno, "Failed to preserve %s namespace", ns);
 		}
-
-		handler->nsfdi = fd;
-		DEBUG("Preserved %s namespace via fd %d", ns_infoi.proc_name,
-		      handler->nsfdi);
 	}
 
 	return true;
@@ -182,8 +190,8 @@
 	ssize_t linklen;
 	int ret;
 
-	ret = snprintf(path, PATH_MAX, "/proc/self/fd/%s", direntp->d_name);
-	if (ret < 0 || ret >= PATH_MAX)
+	ret = strnprintf(path, sizeof(path), "/proc/self/fd/%s", direntp->d_name);
+	if (ret < 0)
 		return log_error(false, "Failed to create file descriptor name");
 
 	linklen = readlink(path, link, PATH_MAX);
@@ -192,15 +200,40 @@
 	else if (linklen >= PATH_MAX)
 		return log_error(false, "The name of link path is too long - \"%s\"", path);
 
-	if (strcmp(link, "/dev/log_main")	== 0 ||
-	    strcmp(link, "/dev/log_system")	== 0 ||
-	    strcmp(link, "/dev/log_radio")	== 0)
+	if (strequal(link, "/dev/log_main") ||
+	    strequal(link, "/dev/log_system") ||
+	    strequal(link, "/dev/log_radio"))
 		return true;
 
 	return false;
 }
 #endif
 
+/* Parses the LISTEN_FDS environment variable value.
+ * The returned value is the highest fd number up to which the
+ * file descriptors must be passed to the container process.
+ *
+ * For example, if LISTEN_FDS=2 then 4 is returned and file descriptors 3 and 4
+ * MUST be passed to the container process (in addition to the standard streams)
+ * to support socket activationsystemd-listen-fds.
+ */
+static unsigned int get_listen_fds_max(void)
+{
+	int ret;
+	unsigned int num_fds;
+	const char *val;
+
+	val = getenv("LISTEN_FDS");
+	if (!val)
+		return 0;
+
+	ret = lxc_safe_uint(val, &num_fds);
+	if (ret < 0)
+		return syserror_ret(0, "Failed to parse \"LISTEN_FDS=%s\" environment variable", val);
+
+	return log_trace(num_fds, "Parsed \"LISTEN_FDS=%s\" environment variable", val);
+}
+
 int lxc_check_inherited(struct lxc_conf *conf, bool closeall,
 			int *fds_to_ignore, size_t len_fds)
 {
@@ -208,10 +241,14 @@
 	size_t i;
 	DIR *dir;
 	struct dirent *direntp;
+	unsigned int listen_fds_max;
+	struct lxc_state_client *client, *nclient;
 
 	if (conf && conf->close_all_fds)
 		closeall = true;
 
+	listen_fds_max = get_listen_fds_max();
+
 	/*
 	 * Disable syslog at this point to avoid the above logging
 	 * function to open a new fd and make the check_inherited function
@@ -228,13 +265,12 @@
 
 	while ((direntp = readdir(dir))) {
 		int ret;
-		struct lxc_list *cur;
 		bool matched = false;
 
-		if (strcmp(direntp->d_name, ".") == 0)
+		if (strequal(direntp->d_name, "."))
 			continue;
 
-		if (strcmp(direntp->d_name, "..") == 0)
+		if (strequal(direntp->d_name, ".."))
 			continue;
 
 		ret = lxc_safe_int(direntp->d_name, &fd);
@@ -253,9 +289,7 @@
 
 		/* Keep state clients that wait on reboots. */
 		if (conf) {
-			lxc_list_for_each(cur, &conf->state_clients) {
-				struct lxc_state_client *client = cur->elem;
-
+			list_for_each_entry_safe(client, nclient, &conf->state_clients, head) {
 				if (client->clientfd != fd)
 					continue;
 
@@ -278,6 +312,12 @@
 			continue;
 
 #endif
+
+		if ((size_t)fd <= listen_fds_max) {
+			INFO("Inheriting fd %d (using the LISTEN_FDS environment variable)", fd);
+			continue;
+		}
+
 		if (closeall) {
 			if (close(fd))
 				SYSINFO("Closed inherited fd %d", fd);
@@ -311,7 +351,7 @@
 	if (ret < 0)
 		return -EBADF;
 
-	for (int sig = 0; sig < (sizeof(signals) / sizeof(signals0)); sig++) {
+	for (size_t sig = 0; sig < (sizeof(signals) / sizeof(signals0)); sig++) {
 		ret = sigdelset(&mask, signalssig);
 		if (ret < 0)
 			return -EBADF;
@@ -333,7 +373,7 @@
 }
 
 static int signal_handler(int fd, uint32_t events, void *data,
-			  struct lxc_epoll_descr *descr)
+			  struct lxc_async_descr *descr)
 {
 	int ret;
 	siginfo_t info;
@@ -353,6 +393,9 @@
 	if (ret == 0 && info.si_pid == hdlr->pid)
 		hdlr->init_died = true;
 
+	TRACE("Received signal ssi_signo(%d) for ssi_pid(%d), si_signo(%d), si_pid(%d)",
+	      siginfo.ssi_signo, siginfo.ssi_pid, info.si_signo, info.si_pid);
+
 	/* Try to figure out a reasonable exit status to report. */
 	if (hdlr->init_died) {
 		switch (info.si_code) {
@@ -399,7 +442,7 @@
 	/* More robustness, protect ourself from a SIGCHLD sent
 	 * by a process different from the container init.
 	 */
-	if (siginfo.ssi_pid != hdlr->pid) {
+	if ((__u64)siginfo.ssi_pid != (__u64)hdlr->pid) {
 		NOTICE("Received %d from pid %d instead of container init %d",
 		       siginfo.ssi_signo, siginfo.ssi_pid, hdlr->pid);
 		return hdlr->init_died ? LXC_MAINLOOP_CLOSE
@@ -424,10 +467,13 @@
 int lxc_serve_state_clients(const char *name, struct lxc_handler *handler,
 			    lxc_state_t state)
 {
+	struct lxc_msg msg = {
+		.type	= lxc_msg_state,
+		.value	= state,
+	};
 	size_t retlen;
 	ssize_t ret;
-	struct lxc_list *cur, *next;
-	struct lxc_msg msg = {.type = lxc_msg_state, .value = state};
+	struct lxc_state_client *client, *nclient;
 
 	if (state == THAWED)
 		handler->state = RUNNING;
@@ -436,16 +482,14 @@
 
 	TRACE("Set container state to %s", lxc_state2str(state));
 
-	if (lxc_list_empty(&handler->conf->state_clients))
+	if (list_empty(&handler->conf->state_clients))
 		return log_trace(0, "No state clients registered");
 
 	retlen = strlcpy(msg.name, name, sizeof(msg.name));
 	if (retlen >= sizeof(msg.name))
 		return -E2BIG;
 
-	lxc_list_for_each_safe(cur, &handler->conf->state_clients, next) {
-		struct lxc_state_client *client = cur->elem;
-
+	list_for_each_entry_safe(client, nclient, &handler->conf->state_clients, head) {
 		if (client->statesstate == 0) {
 			TRACE("State %s not registered for state client %d",
 			      lxc_state2str(state), client->clientfd);
@@ -460,10 +504,9 @@
 			SYSERROR("Failed to send message to client");
 
 		/* kick client from list */
-		lxc_list_del(cur);
+		list_del(&client->head);
 		close(client->clientfd);
-		free(cur->elem);
-		free(cur);
+		free(client);
 	}
 
 	return 0;
@@ -531,12 +574,11 @@
 int lxc_poll(const char *name, struct lxc_handler *handler)
 {
 	int ret;
-	bool has_console = true;
-	struct lxc_epoll_descr descr, descr_console;
+	struct lxc_terminal *console = &handler->conf->console;
+	struct lxc_async_descr descr, descr_console;
 
-	if (handler->conf->console.path &&
-	    strcmp(handler->conf->console.path, "none") == 0)
-		has_console = false;
+	if (!wants_console(console))
+		console = NULL;
 
 	ret = lxc_mainloop_open(&descr);
 	if (ret < 0) {
@@ -544,7 +586,7 @@
 		goto out_sigfd;
 	}
 
-	if (has_console) {
+	if (console) {
 		ret = lxc_mainloop_open(&descr_console);
 		if (ret < 0) {
 			ERROR("Failed to create console mainloop");
@@ -552,7 +594,10 @@
 		}
 	}
 
-	ret = lxc_mainloop_add_handler(&descr, handler->sigfd, signal_handler, handler);
+	ret = lxc_mainloop_add_handler(&descr, handler->sigfd,
+				       signal_handler,
+				       default_cleanup_handler,
+				       handler, "signal_handler");
 	if (ret < 0) {
 		ERROR("Failed to add signal handler for %d to mainloop", handler->sigfd);
 		goto out_mainloop_console;
@@ -564,22 +609,12 @@
 		goto out_mainloop_console;
 	}
 
-	if (has_console) {
-		struct lxc_terminal *console = &handler->conf->console;
-
+	if (console) {
 		ret = lxc_terminal_mainloop_add(&descr, console);
 		if (ret < 0) {
 			ERROR("Failed to add console handlers to mainloop");
 			goto out_mainloop_console;
 		}
-
-		ret = lxc_terminal_mainloop_add(&descr_console, console);
-		if (ret < 0) {
-			ERROR("Failed to add console handlers to console mainloop");
-			goto out_mainloop_console;
-		}
-
-		handler->conf->console.descr = &descr;
 	}
 
 	ret = lxc_cmd_mainloop_add(name, &descr, handler);
@@ -591,15 +626,19 @@
 	TRACE("Mainloop is ready");
 
 	ret = lxc_mainloop(&descr, -1);
-	close_prot_errno_disarm(descr.epfd);
+	if (descr.type == LXC_MAINLOOP_EPOLL)
+		close_prot_errno_disarm(descr.epfd);
 	if (ret < 0 || !handler->init_died)
 		goto out_mainloop_console;
 
-	if (has_console)
-		ret = lxc_mainloop(&descr_console, 0);
+	if (console) {
+		ret = lxc_terminal_mainloop_add(&descr_console, console);
+		if (ret == 0)
+			ret = lxc_mainloop(&descr_console, 0);
+	}
 
 out_mainloop_console:
-	if (has_console) {
+	if (console) {
 		lxc_mainloop_close(&descr_console);
 		TRACE("Closed console mainloop");
 	}
@@ -617,7 +656,6 @@
 
 void lxc_put_handler(struct lxc_handler *handler)
 {
-	close_prot_errno_disarm(handler->pinfd);
 	close_prot_errno_disarm(handler->pidfd);
 	close_prot_errno_disarm(handler->sigfd);
 	lxc_put_nsfds(handler);
@@ -659,16 +697,25 @@
 	handler->data_sock0 = -EBADF;
 	handler->data_sock1 = -EBADF;
 	handler->monitor_status_fd = -EBADF;
-	handler->pinfd = -EBADF;
 	handler->pidfd = -EBADF;
 	handler->sigfd = -EBADF;
 	handler->state_socket_pair0 = -EBADF;
 	handler->state_socket_pair1 = -EBADF;
 	if (handler->conf->reboot == REBOOT_NONE)
-		lxc_list_init(&handler->conf->state_clients);
+		INIT_LIST_HEAD(&handler->conf->state_clients);
 
-	for (int i = 0; i < LXC_NS_MAX; i++)
-		handler->nsfdi = -EBADF;
+	for (lxc_namespace_t idx = 0; idx < LXC_NS_MAX; idx++) {
+		handler->nsfdidx = -EBADF;
+
+		if (handler->conf->reboot == REBOOT_NONE)
+			continue;
+
+		handler->nsfd_pathsidx0 = '\0';
+		handler->hook_argvidx = NULL;
+
+		if (handler->hook_argc != 0)
+			handler->hook_argc = 0;
+	}
 
 	handler->name = name;
 	if (daemonize)
@@ -696,7 +743,7 @@
 	}
 
 	if (handler->conf->reboot == REBOOT_NONE) {
-		handler->conf->maincmd_fd = lxc_cmd_init(name, lxcpath, "command");
+		handler->conf->maincmd_fd = lxc_server_init(name, lxcpath, "command");
 		if (handler->conf->maincmd_fd < 0) {
 			ERROR("Failed to set up command socket");
 			goto on_error;
@@ -727,7 +774,7 @@
 	if (status_fd < 0)
 		return log_error_errno(-1, errno, "Failed to open monitor status fd");
 
-	lsm_init();
+	handler->lsm_ops = lsm_init_static();
 	TRACE("Initialized LSM");
 
 	/* Begin by setting the state to STARTING. */
@@ -797,6 +844,10 @@
 		return log_error(-1, "Failed to run lxc.hook.pre-start for container \"%s\"", name);
 	TRACE("Ran pre-start hooks");
 
+	ret = lxc_terminal_parent(conf);
+	if (ret < 0)
+		return log_error(-1, "Failed to allocate terminal");
+
 	/* The signal fd has to be created before forking otherwise if the child
 	 * process exits before we setup the signal fd, the event will be lost
 	 * and the command will be stuck.
@@ -806,37 +857,24 @@
 		return log_error(-1, "Failed to setup SIGCHLD fd handler.");
 	TRACE("Set up signal fd");
 
-	/* Do this after setting up signals since it might unblock SIGWINCH. */
-	ret = lxc_terminal_setup(conf);
-	if (ret < 0) {
-		ERROR("Failed to create console");
-		goto out_restore_sigmask;
-	}
-	TRACE("Created console");
-
-	ret = lxc_terminal_map_ids(conf, &conf->console);
-	if (ret < 0) {
-		ERROR("Failed to chown console");
-		goto out_delete_terminal;
-	}
-	TRACE("Chowned console");
-
 	handler->cgroup_ops = cgroup_init(handler->conf);
 	if (!handler->cgroup_ops) {
 		ERROR("Failed to initialize cgroup driver");
-		goto out_delete_terminal;
+		goto out_restore_sigmask;
 	}
 	TRACE("Initialized cgroup driver");
 
 	ret = lxc_read_seccomp_config(conf);
-	if (ret < 0)
-		return log_error(-1, "Failed loading seccomp policy");
+	if (ret < 0) {
+		ERROR("Failed to read seccomp policy");
+		goto out_restore_sigmask;
+	}
 	TRACE("Read seccomp policy");
 
-	ret = lsm_process_prepare(conf, handler->lxcpath);
+	ret = handler->lsm_ops->prepare(handler->lsm_ops, conf, handler->lxcpath);
 	if (ret < 0) {
 		ERROR("Failed to initialize LSM");
-		goto out_delete_terminal;
+		goto out_restore_sigmask;
 	}
 	TRACE("Initialized LSM");
 
@@ -844,63 +882,47 @@
 	handler->monitor_status_fd = move_fd(status_fd);
 	return 0;
 
-out_delete_terminal:
-	lxc_terminal_delete(&handler->conf->console);
-
 out_restore_sigmask:
 	(void)pthread_sigmask(SIG_SETMASK, &handler->oldmask, NULL);
 
 	return -1;
 }
 
+void lxc_expose_namespace_environment(const struct lxc_handler *handler)
+{
+	for (lxc_namespace_t i = 0; i < LXC_NS_MAX; i++) {
+		int ret;
+		const char *fd_path;
+
+		if (handler->nsfdi < 0)
+			continue;
+
+		fd_path = handler->nsfd_pathsi + strcspn(handler->nsfd_pathsi, "/");
+		ret = setenv(ns_infoi.env_name, fd_path, 1);
+		if (ret < 0)
+			SYSERROR("Failed to set environment variable %s=%s",
+				 ns_infoi.env_name, fd_path);
+		else
+			TRACE("Set environment variable %s=%s",
+			      ns_infoi.env_name, fd_path);
+	}
+}
+
 void lxc_end(struct lxc_handler *handler)
 {
 	int ret;
-	pid_t self;
-	struct lxc_list *cur, *next;
-	char *namespacesLXC_NS_MAX + 1;
-	size_t namespace_count = 0;
 	const char *name = handler->name;
 	struct cgroup_ops *cgroup_ops = handler->cgroup_ops;
+	struct lxc_state_client *client, *nclient;
 
 	/* The STOPPING state is there for future cleanup code which can take
 	 * awhile.
 	 */
 	lxc_set_state(name, handler, STOPPING);
 
-	self = lxc_raw_getpid();
-	for (int i = 0; i < LXC_NS_MAX; i++) {
-		if (handler->nsfdi < 0)
-			continue;
-
-		if (handler->conf->hooks_version == 0)
-			ret = asprintf(&namespacesnamespace_count,
-				      "%s:/proc/%d/fd/%d", ns_infoi.proc_name,
-				      self, handler->nsfdi);
-		else
-			ret = asprintf(&namespacesnamespace_count,
-				      "/proc/%d/fd/%d", self, handler->nsfdi);
-		if (ret < 0) {
-			SYSERROR("Failed to allocate memory");
-			break;
-		}
-
-		if (handler->conf->hooks_version == 0) {
-			namespace_count++;
-			continue;
-		}
-
-		ret = setenv(ns_infoi.env_name, namespacesnamespace_count, 1);
-		if (ret < 0)
-			SYSERROR("Failed to set environment variable %s=%s",
-				 ns_infoi.env_name, namespacesnamespace_count);
-		else
-			TRACE("Set environment variable %s=%s",
-			      ns_infoi.env_name, namespacesnamespace_count);
-
-		namespace_count++;
-	}
-	namespacesnamespace_count = NULL;
+	/* Passing information to hooks via environment variables. */
+	if (handler->conf->hooks_version > 0)
+		lxc_expose_namespace_environment(handler);
 
 	if (handler->conf->reboot > REBOOT_NONE) {
 		ret = setenv("LXC_TARGET", "reboot", 1);
@@ -915,22 +937,21 @@
 	}
 
 	if (handler->conf->hooks_version == 0)
-		ret = run_lxc_hooks(name, "stop", handler->conf, namespaces);
+		ret = run_lxc_hooks(name, "stop", handler->conf, handler->hook_argv);
 	else
 		ret = run_lxc_hooks(name, "stop", handler->conf, NULL);
 	if (ret < 0)
 		ERROR("Failed to run \"lxc.hook.stop\" hook");
 
-	while (namespace_count--)
-		free(namespacesnamespace_count);
-
-	lsm_process_cleanup(handler->conf, handler->lxcpath);
+	handler->lsm_ops->cleanup(handler->lsm_ops, handler->conf, handler->lxcpath);
 
 	if (cgroup_ops) {
 		cgroup_ops->payload_destroy(cgroup_ops, handler);
 		cgroup_ops->monitor_destroy(cgroup_ops, handler);
 	}
 
+	put_lxc_rootfs(&handler->conf->rootfs, true);
+
 	if (handler->conf->reboot == REBOOT_NONE) {
 		/* For all new state clients simply close the command socket.
 		 * This will inform all state clients that the container is
@@ -979,23 +1000,21 @@
 
 	lxc_terminal_delete(&handler->conf->console);
 	lxc_delete_tty(&handler->conf->ttys);
+	close_prot_errno_disarm(handler->conf->devpts_fd);
 
 	/* The command socket is now closed, no more state clients can register
 	 * themselves from now on. So free the list of state clients.
 	 */
-	lxc_list_for_each_safe(cur, &handler->conf->state_clients, next) {
-		struct lxc_state_client *client = cur->elem;
-
+	list_for_each_entry_safe(client, nclient, &handler->conf->state_clients, head) {
 		/* Keep state clients that want to be notified about reboots. */
 		if ((handler->conf->reboot > REBOOT_NONE) &&
 		    (client->statesRUNNING == 2))
 			continue;
 
 		/* close state client socket */
-		lxc_list_del(cur);
+		list_del(&client->head);
 		close(client->clientfd);
-		free(cur->elem);
-		free(cur);
+		free(client);
 	}
 
 	if (handler->conf->ephemeral == 1 && handler->conf->reboot != REBOOT_REQ)
@@ -1031,19 +1050,18 @@
 {
 	struct lxc_handler *handler = data;
 	__lxc_unused __do_close int data_sock0 = handler->data_sock0,
-					   data_sock1 = handler->data_sock1;
+				    data_sock1 = handler->data_sock1;
 	__do_close int devnull_fd = -EBADF, status_fd = -EBADF;
 	int ret;
 	uid_t new_uid;
 	gid_t new_gid;
-	struct lxc_list *iterator;
 	uid_t nsuid = 0;
 	gid_t nsgid = 0;
 
 	lxc_sync_fini_parent(handler);
 
-	if (lxc_abstract_unix_recv_fds(data_sock1, &status_fd, 1, NULL, 0) < 0) {
-		ERROR("Failed to receive status file descriptor to child process");
+	if (lxc_abstract_unix_recv_one_fd(data_sock1, &status_fd, NULL, 0) < 0) {
+		ERROR("Failed to receive status file descriptor from parent process");
 		goto out_warn_father;
 	}
 
@@ -1071,18 +1089,13 @@
 		goto out_warn_father;
 	}
 
-	/* Don't leak the pinfd to the container. */
-	close_prot_errno_disarm(handler->pinfd);
-
-	ret = lxc_sync_wait_parent(handler, LXC_SYNC_STARTUP);
-	if (ret < 0)
+	if (!lxc_sync_wait_parent(handler, START_SYNC_STARTUP))
 		goto out_warn_father;
 
 	/* Unshare CLONE_NEWNET after CLONE_NEWUSER. See
 	 * https://github.com/lxc/lxd/issues/1978.
 	 */
-	if ((handler->ns_clone_flags & (CLONE_NEWNET | CLONE_NEWUSER)) ==
-	    (CLONE_NEWNET | CLONE_NEWUSER)) {
+	if (handler->ns_unshare_flags & CLONE_NEWNET) {
 		ret = unshare(CLONE_NEWNET);
 		if (ret < 0) {
 			SYSERROR("Failed to unshare CLONE_NEWNET");
@@ -1091,25 +1104,10 @@
 		INFO("Unshared CLONE_NEWNET");
 	}
 
-	/* Tell the parent task it can begin to configure the container and wait
-	 * for it to finish.
-	 */
-	ret = lxc_sync_barrier_parent(handler, LXC_SYNC_CONFIGURE);
-	if (ret < 0)
-		goto out_error;
-
-	if (handler->ns_clone_flags & CLONE_NEWNET) {
-		ret = lxc_network_recv_from_parent(handler);
-		if (ret < 0) {
-			ERROR("Failed to receive veth names from parent");
-			goto out_warn_father;
-		}
-	}
-
 	/* If we are in a new user namespace, become root there to have
 	 * privilege over our namespace.
 	 */
-	if (!lxc_list_empty(&handler->conf->id_map)) {
+	if (!list_empty(&handler->conf->id_map)) {
 		if (!handler->conf->root_nsuid_map)
 			nsuid = handler->conf->init_uid;
 
@@ -1119,7 +1117,7 @@
 		/* Drop groups only after we switched to a valid gid in the new
 		 * user namespace.
 		 */
-		if (!lxc_setgroups(0, NULL) &&
+		if (!lxc_drop_groups() &&
 		    (handler->am_root || errno != EPERM))
 			goto out_warn_father;
 
@@ -1158,9 +1156,9 @@
 	if (handler->daemonize && !handler->conf->autodev) {
 		char pathPATH_MAX;
 
-		ret = snprintf(path, sizeof(path), "%s/dev/null",
-			       handler->conf->rootfs.mount);
-		if (ret < 0 || ret >= sizeof(path))
+		ret = strnprintf(path, sizeof(path), "%s/dev/null",
+				 handler->conf->rootfs.mount);
+		if (ret < 0)
 			goto out_warn_father;
 
 		ret = access(path, F_OK);
@@ -1173,9 +1171,11 @@
 		}
 	}
 
-	/* Ask father to setup cgroups and wait for him to finish. */
-	ret = lxc_sync_barrier_parent(handler, LXC_SYNC_CGROUP);
-	if (ret < 0)
+	/*
+	 * Tell the parent task it can begin to configure the container and wait
+	 * for it to finish.
+	 */
+	if (!lxc_sync_wake_parent(handler, START_SYNC_CONFIGURE))
 		goto out_error;
 
 	/* Unshare cgroup namespace after we have setup our cgroups. If we do it
@@ -1190,7 +1190,7 @@
 	 *
 	 *	8:cpuset:/
 	 */
-	if (handler->ns_clone_flags & CLONE_NEWCGROUP) {
+	if (handler->ns_unshare_flags & CLONE_NEWCGROUP) {
 		ret = unshare(CLONE_NEWCGROUP);
 		if (ret < 0) {
 			if (errno != EINVAL) {
@@ -1205,19 +1205,67 @@
 		}
 	}
 
-	/* Add the requested environment variables to the current environment to
-	 * allow them to be used by the various hooks, such as the start hook
-	 * below.
-	 */
-	lxc_list_for_each(iterator, &handler->conf->environment) {
-		ret = putenv((char *)iterator->elem);
+	if (handler->ns_unshare_flags & CLONE_NEWTIME) {
+		ret = unshare(CLONE_NEWTIME);
 		if (ret < 0) {
-			SYSERROR("Failed to set environment variable: %s",
-				 (char *)iterator->elem);
-			goto out_warn_father;
+			if (errno != EINVAL) {
+				SYSERROR("Failed to unshare CLONE_NEWTIME");
+				goto out_warn_father;
+			}
+
+			handler->ns_clone_flags &= ~CLONE_NEWTIME;
+			SYSINFO("Kernel does not support CLONE_NEWTIME");
+		} else {
+			__do_close int timens_fd = -EBADF;
+
+			INFO("Unshared CLONE_NEWTIME");
+
+			if (handler->conf->timens.s_boot)
+				ret = timens_offset_write(CLOCK_BOOTTIME, handler->conf->timens.s_boot, 0);
+			else if (handler->conf->timens.ns_boot)
+				ret = timens_offset_write(CLOCK_BOOTTIME, 0, handler->conf->timens.ns_boot);
+			if (ret) {
+				SYSERROR("Failed to write CLONE_BOOTTIME offset");
+				goto out_warn_father;
+			}
+			TRACE("Wrote CLOCK_BOOTTIME offset");
+
+			if (handler->conf->timens.s_monotonic)
+				ret = timens_offset_write(CLOCK_MONOTONIC, handler->conf->timens.s_monotonic, 0);
+			else if (handler->conf->timens.ns_monotonic)
+				ret = timens_offset_write(CLOCK_MONOTONIC, 0, handler->conf->timens.ns_monotonic);
+			if (ret) {
+				SYSERROR("Failed to write CLONE_MONOTONIC offset");
+				goto out_warn_father;
+			}
+			TRACE("Wrote CLOCK_MONOTONIC offset");
+
+			timens_fd = open("/proc/self/ns/time_for_children", O_RDONLY | O_CLOEXEC);
+			if (timens_fd < 0) {
+				SYSERROR("Failed to open \"/proc/self/ns/time_for_children\"");
+				goto out_warn_father;
+			}
+
+			ret = setns(timens_fd, CLONE_NEWTIME);
+			if (ret) {
+				SYSERROR("Failed to setns(%d(\"/proc/self/ns/time_for_children\"))", timens_fd);
+				goto out_warn_father;
+			}
 		}
 	}
 
+	/*
+	 * Add the requested environment variables to the current environment
+	 * to allow them to be used by the various hooks, such as the start
+	 * hook below.
+	 */
+	ret = lxc_set_environment(handler->conf);
+	if (ret < 0)
+		goto out_warn_father;
+
+	if (!lxc_sync_wait_parent(handler, START_SYNC_POST_CONFIGURE))
+		goto out_warn_father;
+
 	/* Setup the container, ip, names, utsname, ... */
 	ret = lxc_setup(handler);
 	if (ret < 0) {
@@ -1226,7 +1274,7 @@
 	}
 
 	/* Set the label to change to when we exec(2) the container's init. */
-	ret = lsm_process_label_set(NULL, handler->conf, true);
+	ret = handler->lsm_ops->process_label_set(handler->lsm_ops, NULL, handler->conf, true);
 	if (ret < 0)
 		goto out_warn_father;
 
@@ -1243,24 +1291,6 @@
 		DEBUG("Set PR_SET_NO_NEW_PRIVS to block execve() gainable privileges");
 	}
 
-	/* Some init's such as busybox will set sane tty settings on stdin,
-	 * stdout, stderr which it thinks is the console. We already set them
-	 * the way we wanted on the real terminal, and we want init to do its
-	 * setup on its console ie. the pty allocated in lxc_terminal_setup() so
-	 * make sure that that pty is stdin,stdout,stderr.
-	 */
-	 if (handler->conf->console.pts >= 0) {
-		 if (handler->daemonize || !handler->conf->is_execute)
-			 ret = set_stdfds(handler->conf->console.pts);
-		 else
-			 ret = lxc_terminal_set_stdfds(handler->conf->console.pts);
-		 if (ret < 0) {
-			ERROR("Failed to redirect std{in,out,err} to pty file descriptor %d",
-			      handler->conf->console.pts);
-			goto out_warn_father;
-		 }
-	 }
-
 	/* If we mounted a temporary proc, then unmount it now. */
 	tmp_proc_unmount(handler->conf);
 
@@ -1268,12 +1298,6 @@
 	if (ret < 0)
 		goto out_warn_father;
 
-	ret = lxc_seccomp_send_notifier_fd(&handler->conf->seccomp, data_sock0);
-	if (ret < 0) {
-		SYSERROR("Failed to send seccomp notify fd to parent");
-		goto out_warn_father;
-	}
-
 	ret = run_lxc_hooks(handler->name, "start", handler->conf, NULL);
 	if (ret < 0) {
 		ERROR("Failed to run lxc.hook.start for container \"%s\"",
@@ -1283,7 +1307,7 @@
 
 	close_prot_errno_disarm(handler->sigfd);
 
-	if (handler->conf->console.pts < 0 && handler->daemonize) {
+	if (handler->conf->console.pty < 0 && handler->daemonize) {
 		if (devnull_fd < 0) {
 			devnull_fd = open_devnull();
 			if (devnull_fd < 0)
@@ -1310,8 +1334,16 @@
 		}
 	}
 
-	ret = lxc_sync_barrier_parent(handler, LXC_SYNC_CGROUP_LIMITS);
-	if (ret < 0)
+	if (!lxc_sync_barrier_parent(handler, START_SYNC_CGROUP_LIMITS))
+		goto out_warn_father;
+
+	ret = lxc_sync_fds_child(handler);
+	if (ret < 0) {
+		SYSERROR("Failed to sync file descriptors with parent");
+		goto out_warn_father;
+	}
+
+	if (!lxc_sync_wait_parent(handler, START_SYNC_READY_START))
 		goto out_warn_father;
 
 	/* Reset the environment variables the user requested in a clear
@@ -1322,14 +1354,9 @@
 	if (ret < 0)
 		SYSERROR("Failed to clear environment.");
 
-	lxc_list_for_each(iterator, &handler->conf->environment) {
-		ret = putenv((char *)iterator->elem);
-		if (ret < 0) {
-			SYSERROR("Failed to set environment variable: %s",
-				 (char *)iterator->elem);
-			goto out_warn_father;
-		}
-	}
+	ret = lxc_set_environment(handler->conf);
+	if (ret < 0)
+		goto out_warn_father;
 
 	ret = putenv("container=lxc");
 	if (ret < 0) {
@@ -1367,12 +1394,21 @@
 	 * we switched to root in the new user namespace further above. Only
 	 * drop groups if we can, so ensure that we have necessary privilege.
 	 */
-	if (lxc_list_empty(&handler->conf->id_map))
+	if (list_empty(&handler->conf->id_map)) {
 		#if HAVE_LIBCAP
 		if (lxc_proc_cap_is_set(CAP_SETGID, CAP_EFFECTIVE))
 		#endif
-			if (!lxc_setgroups(0, NULL))
-				goto out_warn_father;
+		{
+			if (handler->conf->init_groups.size > 0) {
+				if (!lxc_setgroups(handler->conf->init_groups.list,
+						   handler->conf->init_groups.size))
+					goto out_warn_father;
+			} else {
+				if (!lxc_drop_groups())
+					goto out_warn_father;
+			}
+		}
+	}
 
 	if (!lxc_switch_uid_gid(new_uid, new_gid))
 		goto out_warn_father;
@@ -1404,54 +1440,18 @@
 	 * We want the parent to know something went wrong, so we return a
 	 * special error code.
 	 */
-	lxc_sync_wake_parent(handler, LXC_SYNC_ERROR);
+	lxc_sync_wake_parent(handler, SYNC_ERROR);
 
 out_error:
 	return -1;
 }
 
-static int lxc_recv_ttys_from_child(struct lxc_handler *handler)
-{
-	int i;
-	struct lxc_terminal_info *tty;
-	int ret = -1;
-	int sock = handler->data_sock1;
-	struct lxc_conf *conf = handler->conf;
-	struct lxc_tty_info *ttys = &conf->ttys;
-
-	if (!conf->ttys.max)
-		return 0;
-
-	ttys->tty = malloc(sizeof(*ttys->tty) * ttys->max);
-	if (!ttys->tty)
-		return -1;
-
-	for (i = 0; i < conf->ttys.max; i++) {
-		int ttyfds2;
-
-		ret = lxc_abstract_unix_recv_fds(sock, ttyfds, 2, NULL, 0);
-		if (ret < 0)
-			break;
-
-		tty = &ttys->ttyi;
-		tty->busy = -1;
-		tty->ptmx = ttyfds0;
-		tty->pts = ttyfds1;
-		TRACE("Received pty with ptmx fd %d and pts fd %d from child", tty->ptmx, tty->pts);
-	}
-
-	if (ret < 0)
-		SYSERROR("Failed to receive %zu ttys from child", ttys->max);
-	else
-		TRACE("Received %zu ttys from child", ttys->max);
-
-	return ret;
-}
-
 int resolve_clone_flags(struct lxc_handler *handler)
 {
 	int i;
 	struct lxc_conf *conf = handler->conf;
+	bool wants_timens = conf->timens.s_boot || conf->timens.ns_boot ||
+			    conf->timens.s_monotonic || conf->timens.ns_monotonic;
 
 	for (i = 0; i < LXC_NS_MAX; i++) {
 		if (conf->ns_keep) {
@@ -1461,7 +1461,7 @@
 			if ((conf->ns_clone & ns_infoi.clone_flag))
 				handler->ns_clone_flags |= ns_infoi.clone_flag;
 		} else {
-			if (i == LXC_NS_USER && lxc_list_empty(&handler->conf->id_map))
+			if (i == LXC_NS_USER && list_empty(&handler->conf->id_map))
 				continue;
 
 			if (i == LXC_NS_NET && lxc_requests_empty_network(handler))
@@ -1470,6 +1470,9 @@
 			if (i == LXC_NS_CGROUP && !cgns_supported())
 				continue;
 
+			if (i == LXC_NS_TIME && !wants_timens)
+				continue;
+
 			handler->ns_clone_flags |= ns_infoi.clone_flag;
 		}
 
@@ -1480,6 +1483,25 @@
 		TRACE("Sharing %s namespace", ns_infoi.proc_name);
 	}
 
+	if (wants_timens && (conf->ns_keep & ns_infoLXC_NS_TIME.clone_flag))
+		return log_trace_errno(-1, EINVAL, "Requested to keep time namespace while also specifying offsets");
+
+	/* Deal with namespaces that are unshared. */
+	if (handler->ns_clone_flags & CLONE_NEWTIME)
+		handler->ns_unshare_flags |= CLONE_NEWTIME;
+
+	if (!pure_unified_layout(handler->cgroup_ops) && handler->ns_clone_flags & CLONE_NEWCGROUP)
+		handler->ns_unshare_flags |= CLONE_NEWCGROUP;
+
+	if ((handler->ns_clone_flags & (CLONE_NEWNET | CLONE_NEWUSER)) ==
+	    (CLONE_NEWNET | CLONE_NEWUSER))
+		handler->ns_unshare_flags |= CLONE_NEWNET;
+
+	/* Deal with namespaces that are spawned. */
+	handler->ns_on_clone_flags = handler->ns_clone_flags & ~handler->ns_unshare_flags;
+
+	handler->clone_flags = handler->ns_on_clone_flags | CLONE_PIDFD;
+
 	return 0;
 }
 
@@ -1491,9 +1513,9 @@
  * newer glibc versions where the getpid() cache is removed and the pid/tid is
  * not reset anymore.
  * However, if for whatever reason you - dear committer - somehow need to get the
- * pid of the dummy intermediate process for do_share_ns() you need to call
- * lxc_raw_getpid(). The next lxc_raw_clone() call does not employ CLONE_VM and
- * will be fine.
+ * pid of the placeholder intermediate process for do_share_ns() you need to
+ * call lxc_raw_getpid(). The next lxc_raw_clone() call does not employ
+ * CLONE_VM and will be fine.
  */
 static inline int do_share_ns(void *arg)
 {
@@ -1529,6 +1551,59 @@
 	return 0;
 }
 
+static int core_scheduling(struct lxc_handler *handler)
+{
+	struct lxc_conf *conf = handler->conf;
+	int ret;
+
+	if (!conf->sched_core)
+		return log_trace(0, "No new core scheduling domain requested");
+
+	if (!(handler->ns_clone_flags & CLONE_NEWPID))
+		return syserror_set(-EINVAL, "Core scheduling currently requires a separate pid namespace");
+
+	ret = core_scheduling_cookie_create_threadgroup(handler->pid);
+	if (ret < 0) {
+		if (ret == -ENODEV) {
+			INFO("The kernel doesn't support or doesn't use simultaneous multithreading (SMT)");
+			conf->sched_core = false;
+			return 0;
+		}
+		if (ret == -EINVAL)
+			return syserror("The kernel does not support core scheduling");
+
+		return syserror("Failed to create new core scheduling domain");
+	}
+
+	ret = core_scheduling_cookie_get(handler->pid, &conf->sched_core_cookie);
+	if (ret || !core_scheduling_cookie_valid(conf->sched_core_cookie))
+		return syserror("Failed to retrieve core scheduling domain cookie");
+
+	TRACE("Created new core scheduling domain with cookie %llu",
+	      (llu)conf->sched_core_cookie);
+
+	return 0;
+}
+
+static bool inherits_namespaces(const struct lxc_handler *handler)
+{
+	struct lxc_conf *conf = handler->conf;
+
+	for (lxc_namespace_t i = 0; i < LXC_NS_MAX; i++) {
+		if (conf->ns_sharei)
+			return true;
+	}
+
+	return false;
+}
+
+static inline void resolve_cgroup_clone_flags(struct lxc_handler *handler)
+{
+	handler->clone_flags		&= ~(CLONE_INTO_CGROUP | CLONE_NEWCGROUP);
+	handler->ns_on_clone_flags	&= ~(CLONE_INTO_CGROUP | CLONE_NEWCGROUP);
+	handler->ns_unshare_flags	|= CLONE_NEWCGROUP;
+}
+
 /* lxc_spawn() performs crucial setup tasks and clone()s the new process which
  * exec()s the requested container binary.
  * Note that lxc_spawn() runs in the parent namespaces. Any operations performed
@@ -1542,29 +1617,15 @@
 	int i, ret;
 	char pidstr20;
 	bool wants_to_map_ids;
-	struct lxc_list *id_map;
+	struct list_head *id_map;
 	const char *name = handler->name;
-	const char *lxcpath = handler->lxcpath;
-	bool share_ns = false;
 	struct lxc_conf *conf = handler->conf;
 	struct cgroup_ops *cgroup_ops = handler->cgroup_ops;
 
 	id_map = &conf->id_map;
-	wants_to_map_ids = !lxc_list_empty(id_map);
+	wants_to_map_ids = !list_empty(id_map);
 
-	for (i = 0; i < LXC_NS_MAX; i++) {
-		if (!conf->ns_sharei)
-			continue;
-
-		handler->nsfdi = lxc_inherit_namespace(conf->ns_sharei, lxcpath, ns_infoi.proc_name);
-		if (handler->nsfdi < 0)
-			return -1;
-
-		share_ns = true;
-	}
-
-	ret = lxc_sync_init(handler);
-	if (ret < 0)
+	if (!lxc_sync_init(handler))
 		return -1;
 
 	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0,
@@ -1574,10 +1635,6 @@
 	data_sock0 = handler->data_sock0;
 	data_sock1 = handler->data_sock1;
 
-	ret = resolve_clone_flags(handler);
-	if (ret < 0)
-		goto out_sync_fini;
-
 	if (handler->ns_clone_flags & CLONE_NEWNET) {
 		ret = lxc_find_gateway_addresses(handler);
 		if (ret) {
@@ -1591,32 +1648,11 @@
 		goto out_delete_net;
 	}
 
-	/* If the rootfs is not a blockdev, prevent the container from marking
-	 * it readonly.
-	 * If the container is unprivileged then skip rootfs pinning.
-	 */
-	if (!wants_to_map_ids) {
-		handler->pinfd = pin_rootfs(conf->rootfs.path);
-		if (handler->pinfd == -EBADF)
-			INFO("Failed to pin the rootfs for container \"%s\"", handler->name);
-	}
-
 	/* Create a process in a new set of namespaces. */
-	handler->ns_on_clone_flags = handler->ns_clone_flags;
-	if (handler->ns_clone_flags & CLONE_NEWUSER) {
-		/* If CLONE_NEWUSER and CLONE_NEWNET was requested, we need to
-		 * clone a new user namespace first and only later unshare our
-		 * network namespace to ensure that network devices ownership is
-		 * set up correctly.
-		 */
-		handler->ns_on_clone_flags &= ~CLONE_NEWNET;
-	}
-	/* The cgroup namespace gets unshare()ed not clone()ed. */
-	handler->ns_on_clone_flags &= ~CLONE_NEWCGROUP;
-
-	if (share_ns) {
+	if (inherits_namespaces(handler)) {
 		pid_t attacher_pid;
 
+		resolve_cgroup_clone_flags(handler);
 		attacher_pid = lxc_clone(do_share_ns, handler,
 					 CLONE_VFORK | CLONE_VM | CLONE_FILES, NULL);
 		if (attacher_pid < 0) {
@@ -1629,23 +1665,92 @@
 			SYSERROR("Intermediate process failed");
 			goto out_delete_net;
 		}
+
+		if (handler->pid < 0) {
+			SYSERROR(LXC_CLONE_ERROR);
+			goto out_delete_net;
+		}
 	} else {
-		handler->pid = lxc_raw_clone_cb(do_start, handler,
-						CLONE_PIDFD | handler->ns_on_clone_flags,
-						&handler->pidfd);
-	}
-	if (handler->pid < 0) {
-		SYSERROR(LXC_CLONE_ERROR);
-		goto out_delete_net;
+		int cgroup_fd = -EBADF;
+
+		struct clone_args clone_args = {
+			.flags = handler->clone_flags,
+			.pidfd = ptr_to_u64(&handler->pidfd),
+			.exit_signal = SIGCHLD,
+		};
+
+		if (handler->ns_clone_flags & CLONE_NEWCGROUP) {
+			cgroup_fd = cgroup_unified_fd(cgroup_ops);
+			if (cgroup_fd >= 0) {
+				handler->clone_flags	|= CLONE_INTO_CGROUP;
+				clone_args.flags	|= CLONE_INTO_CGROUP;
+				clone_args.cgroup	= cgroup_fd;
+			}
+		}
+
+		/* Try to spawn directly into target cgroup. */
+		handler->pid = lxc_clone3(&clone_args, CLONE_ARGS_SIZE_VER2);
+		if (handler->pid < 0) {
+			SYSTRACE("Failed to spawn container directly into target cgroup");
+
+			/* Kernel might simply be too old for CLONE_INTO_CGROUP. */
+			resolve_cgroup_clone_flags(handler);
+			clone_args.flags = handler->clone_flags;
+
+			handler->pid = lxc_clone3(&clone_args, CLONE_ARGS_SIZE_VER0);
+		} else if (cgroup_fd >= 0) {
+			TRACE("Spawned container directly into target cgroup via cgroup2 fd %d", cgroup_fd);
+		}
+
+		/* Kernel might be too old for clone3(). */
+		if (handler->pid < 0) {
+			SYSTRACE("Failed to spawn container via clone3()");
+
+		/*
+		 * In contrast to all other architectures arm64 verifies that
+		 * the argument we use to retrieve the pidfd with is
+		 * initialized to 0. But we need to be able to initialize it to
+		 * a negative value such as our customary -EBADF so we can
+		 * detect whether this kernel supports pidfds. If the syscall
+		 * returns and the pidfd variable is set to something >= 0 then
+		 * we know this is a kernel supporting pidfds. But if we can't
+		 * set it to -EBADF then this won't work since 0 is a valid
+		 * file descriptor too. And since legacy clone silently ignores
+		 * unknown flags we are left without any way to detect support
+		 * for pidfds. So let's special-case arm64 to not fail starting
+		 * containers.
+		 */
+		#if defined(__aarch64__)
+			handler->pid = lxc_raw_legacy_clone(handler->clone_flags & ~CLONE_PIDFD, NULL);
+		#else
+			handler->pid = lxc_raw_legacy_clone(handler->clone_flags, &handler->pidfd);
+		#endif
+		}
+
+		if (handler->pid < 0) {
+			SYSERROR(LXC_CLONE_ERROR);
+			goto out_delete_net;
+		}
+
+		if (handler->pid == 0) {
+			(void)do_start(handler);
+			_exit(EXIT_FAILURE);
+		}
 	}
+	if (handler->pidfd < 0)
+		handler->clone_flags &= ~CLONE_PIDFD;
 	TRACE("Cloned child process %d", handler->pid);
 
+	ret = core_scheduling(handler);
+	if (ret < 0)
+		goto out_delete_net;
+
 	/* Verify that we can actually make use of pidfds. */
 	if (!lxc_can_use_pidfd(handler->pidfd))
 		close_prot_errno_disarm(handler->pidfd);
 
-	ret = snprintf(pidstr, 20, "%d", handler->pid);
-	if (ret < 0 || ret >= 20)
+	ret = strnprintf(pidstr, 20, "%d", handler->pid);
+	if (ret < 0)
 		goto out_delete_net;
 
 	ret = setenv("LXC_PID", pidstr, 1);
@@ -1656,7 +1761,7 @@
 		if (handler->ns_on_clone_flags & ns_infoi.clone_flag)
 			INFO("Cloned %s", ns_infoi.flag_name);
 
-	if (!lxc_try_preserve_namespaces(handler, handler->ns_on_clone_flags, handler->pid)) {
+	if (!lxc_try_preserve_namespaces(handler, handler->ns_on_clone_flags)) {
 		ERROR("Failed to preserve cloned namespaces for lxc.hook.stop");
 		goto out_delete_net;
 	}
@@ -1686,26 +1791,18 @@
 		}
 	}
 
-	ret = lxc_sync_wake_child(handler, LXC_SYNC_STARTUP);
-	if (ret < 0)
-		goto out_delete_net;
-
-	ret = lxc_sync_wait_child(handler, LXC_SYNC_CONFIGURE);
-	if (ret < 0)
-		goto out_delete_net;
-
 	if (!cgroup_ops->setup_limits_legacy(cgroup_ops, handler->conf, false)) {
 		ERROR("Failed to setup cgroup limits for container \"%s\"", name);
 		goto out_delete_net;
 	}
 
-	if (!cgroup_ops->payload_enter(cgroup_ops, handler)) {
-		ERROR("Failed to enter cgroups");
+	if (!cgroup_ops->payload_delegate_controllers(cgroup_ops)) {
+		ERROR("Failed to delegate controllers to payload cgroup");
 		goto out_delete_net;
 	}
 
-	if (!cgroup_ops->payload_delegate_controllers(cgroup_ops)) {
-		ERROR("Failed to delegate controllers to payload cgroup");
+	if (!cgroup_ops->payload_enter(cgroup_ops, handler)) {
+		ERROR("Failed to enter cgroups");
 		goto out_delete_net;
 	}
 
@@ -1717,17 +1814,17 @@
 	if (!cgroup_ops->chown(cgroup_ops, handler->conf))
 		goto out_delete_net;
 
+	if (!lxc_sync_barrier_child(handler, START_SYNC_STARTUP))
+		goto out_delete_net;
+
 	/* If not done yet, we're now ready to preserve the network namespace */
 	if (handler->nsfdLXC_NS_NET < 0) {
-		ret = lxc_try_preserve_ns(handler->pid, "net");
+		ret = lxc_try_preserve_namespace(handler, LXC_NS_NET, "net");
 		if (ret < 0) {
-			if (ret != -EOPNOTSUPP) {
+			if (ret != -ENOENT) {
 				SYSERROR("Failed to preserve net namespace");
 				goto out_delete_net;
 			}
-		} else {
-			handler->nsfdLXC_NS_NET = ret;
-			DEBUG("Preserved net namespace via fd %d", ret);
 		}
 	}
 	ret = lxc_netns_set_nsid(handler->nsfdLXC_NS_NET);
@@ -1743,42 +1840,53 @@
 			ERROR("Failed to create the network");
 			goto out_delete_net;
 		}
+	}
 
-		ret = lxc_network_send_to_child(handler);
-		if (ret < 0) {
-			ERROR("Failed to send veth names to child");
-			goto out_delete_net;
-		}
+	ret = setup_proc_filesystem(conf, handler->pid);
+	if (ret < 0) {
+		ERROR("Failed to setup procfs limits");
+		goto out_delete_net;
 	}
 
-	if (!lxc_list_empty(&conf->procs)) {
-		ret = setup_proc_filesystem(&conf->procs, handler->pid);
-		if (ret < 0)
-			goto out_delete_net;
+	ret = setup_resource_limits(conf, handler->pid);
+	if (ret < 0) {
+		ERROR("Failed to setup resource limits");
+		goto out_delete_net;
 	}
 
-	/* Tell the child to continue its initialization. We'll get
-	 * LXC_SYNC_CGROUP when it is ready for us to setup cgroups.
-	 */
-	ret = lxc_sync_barrier_child(handler, LXC_SYNC_POST_CONFIGURE);
-	if (ret < 0)
+	/* Tell the child to continue its initialization. */
+	if (!lxc_sync_wake_child(handler, START_SYNC_POST_CONFIGURE))
+		goto out_delete_net;
+
+	ret = lxc_rootfs_prepare_parent(handler);
+	if (ret) {
+		ERROR("Failed to prepare rootfs");
 		goto out_delete_net;
+	}
 
-	if (!lxc_list_empty(&conf->limits)) {
-		ret = setup_resource_limits(&conf->limits, handler->pid);
+	if (handler->ns_clone_flags & CLONE_NEWNET) {
+		ret = lxc_network_send_to_child(handler);
 		if (ret < 0) {
-			ERROR("Failed to setup resource limits");
+			SYSERROR("Failed to send veth names to child");
 			goto out_delete_net;
 		}
 	}
 
-	ret = lxc_sync_barrier_child(handler, LXC_SYNC_CGROUP_UNSHARE);
-	if (ret < 0)
+	if (!lxc_sync_wait_child(handler, START_SYNC_IDMAPPED_MOUNTS))
+		goto out_delete_net;
+
+	ret = lxc_idmapped_mounts_parent(handler);
+	if (ret) {
+		ERROR("Failed to setup mount entries");
+		goto out_delete_net;
+	}
+
+	if (!lxc_sync_wait_child(handler, START_SYNC_CGROUP_LIMITS))
 		goto out_delete_net;
 
 	/*
-	 * with isolation the limiting devices cgroup was already setup, so
-	 * only setup devices here if we have no namespace directory
+	 * With isolation the limiting devices cgroup was already setup, so
+	 * only setup devices here if we have no namespace directory.
 	 */
 	if (!handler->conf->cgroup_meta.namespace_dir &&
 	    !cgroup_ops->setup_limits_legacy(cgroup_ops, handler->conf, true)) {
@@ -1793,21 +1901,7 @@
 	}
 	TRACE("Set up cgroup2 device controller limits");
 
-	if (handler->ns_clone_flags & CLONE_NEWCGROUP) {
-		/* Now we're ready to preserve the cgroup namespace */
-		ret = lxc_try_preserve_ns(handler->pid, "cgroup");
-		if (ret < 0) {
-			if (ret != -EOPNOTSUPP) {
-				SYSERROR("Failed to preserve cgroup namespace");
-				goto out_delete_net;
-			}
-		} else {
-			handler->nsfdLXC_NS_CGROUP = ret;
-			DEBUG("Preserved cgroup namespace via fd %d", ret);
-		}
-	}
-
-	cgroup_ops->payload_finalize(cgroup_ops);
+	cgroup_ops->finalize(cgroup_ops);
 	TRACE("Finished setting up cgroups");
 
 	/* Run any host-side start hooks */
@@ -1817,44 +1911,60 @@
 		goto out_delete_net;
 	}
 
-	/* Tell the child to complete its initialization and wait for it to exec
-	 * or return an error. (The child will never return
-	 * LXC_SYNC_READY_START+1. It will either close the sync pipe, causing
-	 * lxc_sync_barrier_child to return success, or return a different
-	 * value, causing us to error out).
-	 */
-	ret = lxc_sync_barrier_child(handler, LXC_SYNC_READY_START);
-	if (ret < 0)
+	if (!lxc_sync_wake_child(handler, START_SYNC_FDS))
 		goto out_delete_net;
 
-	if (handler->ns_clone_flags & CLONE_NEWNET) {
-		ret = lxc_network_recv_name_and_ifindex_from_child(handler);
+	if (handler->ns_unshare_flags & CLONE_NEWCGROUP) {
+		/* Now we're ready to preserve the cgroup namespace */
+		ret = lxc_try_preserve_namespace(handler, LXC_NS_CGROUP, "cgroup");
 		if (ret < 0) {
-			ERROR("Failed to receive names and ifindices for network devices from child");
-			goto out_delete_net;
+			if (ret != -ENOENT) {
+				SYSERROR("Failed to preserve cgroup namespace");
+				goto out_delete_net;
+			}
 		}
 	}
 
-	/* Now all networks are created, network devices are moved into place,
-	 * and the correct names and ifindices in the respective namespaces have
-	 * been recorded. The corresponding structs have now all been filled. So
-	 * log them for debugging purposes.
-	 */
-	lxc_log_configured_netdevs(conf);
+	if (handler->ns_unshare_flags & CLONE_NEWTIME) {
+		/* Now we're ready to preserve the time namespace */
+		ret = lxc_try_preserve_namespace(handler, LXC_NS_TIME, "time");
+		if (ret < 0) {
+			if (ret != -ENOENT) {
+				SYSERROR("Failed to preserve time namespace");
+				goto out_delete_net;
+			}
+		}
+	}
 
-	/* Read tty fds allocated by child. */
-	ret = lxc_recv_ttys_from_child(handler);
+	ret = lxc_sync_fds_parent(handler);
 	if (ret < 0) {
-		ERROR("Failed to receive tty info from child process");
+		SYSERROR("Failed to sync file descriptors with child");
 		goto out_delete_net;
 	}
 
-	ret = lxc_seccomp_recv_notifier_fd(&handler->conf->seccomp, data_sock1);
+	ret = lxc_terminal_setup(conf);
 	if (ret < 0) {
-		SYSERROR("Failed to receive seccomp notify fd from child");
+		SYSERROR("Failed to create console");
 		goto out_delete_net;
 	}
 
+	/*
+	 * Tell the child to complete its initialization and wait for it to
+	 * exec or return an error. (The child will never return
+	 * START_SYNC_READY_START+1. It will either close the sync pipe,
+	 * causing lxc_sync_barrier_child to return success, or return a
+	 * different value, causing us to error out).
+	 */
+	if (!lxc_sync_barrier_child(handler, START_SYNC_READY_START))
+		goto out_delete_net;
+
+	/* Now all networks are created, network devices are moved into place,
+	 * and the correct names and ifindices in the respective namespaces have
+	 * been recorded. The corresponding structs have now all been filled. So
+	 * log them for debugging purposes.
+	 */
+	lxc_log_configured_netdevs(conf);
+
 	ret = handler->ops->post_start(handler, handler->data);
 	if (ret < 0)
 		goto out_abort;
@@ -1878,11 +1988,32 @@
 
 out_sync_fini:
 	lxc_sync_fini(handler);
-	close_prot_errno_disarm(handler->pinfd);
 
 	return -1;
 }
 
+static int lxc_inherit_namespaces(struct lxc_handler *handler)
+{
+	const char *lxcpath = handler->lxcpath;
+	struct lxc_conf *conf = handler->conf;
+
+	for (lxc_namespace_t i = 0; i < LXC_NS_MAX; i++) {
+		if (!conf->ns_sharei)
+			continue;
+
+		handler->nsfdi = lxc_inherit_namespace(conf->ns_sharei,
+							lxcpath,
+							ns_infoi.proc_name);
+		if (handler->nsfdi < 0)
+			return -1;
+
+		TRACE("Recording inherited %s namespace with fd %d",
+		      ns_infoi.proc_name, handler->nsfdi);
+	}
+
+	return 0;
+}
+
 int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
 		void *data, const char *lxcpath, bool daemonize, int *error_num)
 {
@@ -1913,20 +2044,47 @@
 		goto out_abort;
 	}
 
+	if (!cgroup_ops->monitor_delegate_controllers(cgroup_ops)) {
+		ERROR("Failed to delegate controllers to monitor cgroup");
+		ret = -1;
+		goto out_abort;
+	}
+
 	if (!cgroup_ops->monitor_enter(cgroup_ops, handler)) {
 		ERROR("Failed to enter monitor cgroup");
 		ret = -1;
 		goto out_abort;
 	}
 
-	if (!cgroup_ops->monitor_delegate_controllers(cgroup_ops)) {
-		ERROR("Failed to delegate controllers to monitor cgroup");
+	ret = resolve_clone_flags(handler);
+	if (ret < 0) {
+		ERROR("Failed to resolve clone flags");
 		ret = -1;
 		goto out_abort;
 	}
 
-	if (geteuid() == 0 && !lxc_list_empty(&conf->id_map)) {
-		/* If the backing store is a device, mount it here and now. */
+	ret = lxc_inherit_namespaces(handler);
+	if (ret) {
+		SYSERROR("Failed to record inherited namespaces");
+		ret = -1;
+		goto out_abort;
+	}
+
+	/* If the rootfs is not a blockdev, prevent the container from marking
+	 * it readonly.
+	 * If the container is unprivileged then skip rootfs pinning.
+	 */
+	ret = lxc_rootfs_init(conf, !list_empty(&conf->id_map));
+	if (ret) {
+		ERROR("Failed to handle rootfs pinning for container \"%s\"", handler->name);
+		ret = -1;
+		goto out_abort;
+	}
+
+	if (geteuid() == 0 && !list_empty(&conf->id_map)) {
+		/*
+		 * Most filesystems can't be mounted inside a userns so handle them here.
+		 */
 		if (rootfs_is_blockdev(conf)) {
 			ret = unshare(CLONE_NEWNS);
 			if (ret < 0) {
@@ -1935,7 +2093,6 @@
 			}
 			INFO("Unshared CLONE_NEWNS");
 
-			turn_into_dependent_mounts();
 			ret = lxc_setup_rootfs_prepare_root(conf, name, lxcpath);
 			if (ret < 0) {
 				ERROR("Error setting up rootfs mount as root before spawn");
@@ -1974,19 +2131,20 @@
 	 * In any case, treat it as a 'halt'.
 	 */
 	if (WIFSIGNALED(status)) {
-		switch(WTERMSIG(status)) {
+		int signal_nr = WTERMSIG(status);
+		switch(signal_nr) {
 		case SIGINT: /* halt */
-			DEBUG("Container \"%s\" is halting", name);
+			DEBUG("%s(%d) - Container \"%s\" is halting", signal_name(signal_nr), signal_nr, name);
 			break;
 		case SIGHUP: /* reboot */
-			DEBUG("Container \"%s\" is rebooting", name);
+			DEBUG("%s(%d) - Container \"%s\" is rebooting", signal_name(signal_nr), signal_nr, name);
 			handler->conf->reboot = REBOOT_REQ;
 			break;
 		case SIGSYS: /* seccomp */
-			DEBUG("Container \"%s\" violated its seccomp policy", name);
+			DEBUG("%s(%d) - Container \"%s\" violated its seccomp policy", signal_name(signal_nr), signal_nr, name);
 			break;
 		default:
-			DEBUG("Unknown exit status for container \"%s\" init %d", name, WTERMSIG(status));
+			DEBUG("%s(%d) - Container \"%s\" init exited", signal_name(signal_nr), signal_nr, name);
 			break;
 		}
 	}
@@ -1995,37 +2153,34 @@
 	if (ret < 0)
 		ERROR("Failed to move physical network devices back to parent network namespace");
 
-	close_prot_errno_disarm(handler->pinfd);
-
 	lxc_monitor_send_exit_code(name, status, handler->lxcpath);
 	lxc_error_set_and_log(handler->pid, status);
 	if (error_num)
 		*error_num = handler->exit_status;
 
-/* These are not the droids you are looking for. */
-__private_goto1:
 	lxc_delete_network(handler);
-
-__private_goto2:
 	detach_block_device(handler->conf);
-
-__private_goto3:
 	lxc_end(handler);
-
 	return ret;
 
-/* These are the droids you are looking for. */
 out_abort:
 	lxc_abort(handler);
-	goto __private_goto3;
+	lxc_end(handler);
+	return ret;
 
 out_detach_blockdev:
 	lxc_abort(handler);
-	goto __private_goto2;
+	detach_block_device(handler->conf);
+	lxc_end(handler);
+	return ret;
 
 out_delete_network:
 	lxc_abort(handler);
-	goto __private_goto1;
+	lxc_restore_phys_nics_to_netns(handler);
+	lxc_delete_network(handler);
+	detach_block_device(handler->conf);
+	lxc_end(handler);
+	return ret;
 }
 
 struct start_args {
@@ -2084,8 +2239,8 @@
 	}
 	INFO("Destroyed rootfs for container \"%s\"", name);
 
-	ret = snprintf(destroy, PATH_MAX, "%s/%s", handler->lxcpath, name);
-	if (ret < 0 || ret >= PATH_MAX) {
+	ret = strnprintf(destroy, sizeof(destroy), "%s/%s", handler->lxcpath, name);
+	if (ret < 0) {
 		ERROR("Error destroying directory for container \"%s\"", name);
 		return;
 	}

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/start.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/start.h Changed

@@ -3,12 +3,16 @@
 #ifndef __LXC_START_H
 #define __LXC_START_H
 
+#include "config.h"
+
+#include <sched.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
+#include "compiler.h"
 #include "conf.h"
 #include "macro.h"
 #include "namespace.h"
@@ -26,25 +30,20 @@
 	 *   list the clone flags that were unshare()ed rather then clone()ed
 	 *   because of ordering requirements (e.g. e.g. CLONE_NEWNET and
 	 *   CLONE_NEWUSER) or implementation details.
-         *
-	 * @ns_keep_flags;
-	 * - The clone flags for the namespaces that the container will inherit
-	 *   from the parent. They are not recorded in the handler itself but
-	 *   are present in the container's config.
 	 *
-	 * @ns_share_flags;
-	 * - The clone flags for the namespaces that the container will share
-	 *   with another process.  They are not recorded in the handler itself
-	 *   but are present in the container's config.
+	 * @ns_unshare_flags
+	 * - Flags for namespaces that were unshared, not cloned.
+	 *
+	 * @clone_flags
+	 * - ns_on_clone flags | other flags used to create container.
 	 */
 	struct /* lxc_ns */ {
-		int ns_clone_flags;
-		int ns_on_clone_flags;
+		unsigned int ns_clone_flags;
+		unsigned int ns_on_clone_flags;
+		unsigned int ns_unshare_flags;
+		__aligned_u64 clone_flags;
 	};
 
-	/* File descriptor to pin the rootfs for privileged containers. */
-	int pinfd;
-
 	/* Signal file descriptor. */
 	int sigfd;
 
@@ -126,11 +125,18 @@
 
 	/* Internal fds that always need to stay open. */
 	int keep_fds3;
+
+	/* Static memory, don't free. */
+	struct lsm_ops *lsm_ops;
+
+	/* The namespace idx is guaranteed to match the stashed namespace path. */
+	char nsfd_pathsLXC_NS_MAX + 1LXC_EXPOSE_NAMESPACE_LEN;
+	/* The namesace idx is _not_ guaranteed to match the stashed namespace path. */
+	lxc_namespace_t hook_argc;
+	char *hook_argvLXC_NS_MAX + 1;
 };
 
 struct execute_args {
-	char *init_path;
-	int init_fd;
 	char *const *argv;
 	int quiet;
 };
@@ -140,20 +146,17 @@
 	int (*post_start)(struct lxc_handler *, void *);
 };
 
-extern int lxc_poll(const char *name, struct lxc_handler *handler);
-extern int lxc_set_state(const char *name, struct lxc_handler *handler,
-			 lxc_state_t state);
-extern int lxc_serve_state_clients(const char *name,
-				   struct lxc_handler *handler,
-				   lxc_state_t state);
-extern void lxc_abort(struct lxc_handler *handler);
-extern struct lxc_handler *lxc_init_handler(struct lxc_handler *old,
-					    const char *name,
-					    struct lxc_conf *conf,
-					    const char *lxcpath, bool daemonize);
-extern void lxc_put_handler(struct lxc_handler *handler);
-extern int lxc_init(const char *name, struct lxc_handler *handler);
-extern void lxc_end(struct lxc_handler *handler);
+__hidden extern int lxc_poll(const char *name, struct lxc_handler *handler);
+__hidden extern int lxc_set_state(const char *name, struct lxc_handler *handler, lxc_state_t state);
+__hidden extern int lxc_serve_state_clients(const char *name, struct lxc_handler *handler,
+					    lxc_state_t state);
+__hidden extern void lxc_abort(struct lxc_handler *handler);
+__hidden extern struct lxc_handler *lxc_init_handler(struct lxc_handler *old, const char *name,
+						     struct lxc_conf *conf, const char *lxcpath,
+						     bool daemonize);
+__hidden extern void lxc_put_handler(struct lxc_handler *handler);
+__hidden extern int lxc_init(const char *name, struct lxc_handler *handler);
+__hidden extern void lxc_end(struct lxc_handler *handler);
 
 /* lxc_check_inherited: Check for any open file descriptors and close them if
  *                      requested.
@@ -162,16 +165,24 @@
  * @paramin fds_to_ignore Array of file descriptors to ignore.
  * @paramin len_fds       Length of fds_to_ignore array.
  */
-extern int lxc_check_inherited(struct lxc_conf *conf, bool closeall,
-			       int *fds_to_ignore, size_t len_fds);
+__hidden extern int lxc_check_inherited(struct lxc_conf *conf, bool closeall, int *fds_to_ignore,
+					size_t len_fds);
 static inline int inherit_fds(struct lxc_handler *handler, bool closeall)
 {
 	return lxc_check_inherited(handler->conf, closeall, handler->keep_fds,
 				   ARRAY_SIZE(handler->keep_fds));
 }
-extern int __lxc_start(struct lxc_handler *, struct lxc_operations *, void *,
-		       const char *, bool, int *);
 
-extern int resolve_clone_flags(struct lxc_handler *handler);
+__hidden extern int __lxc_start(struct lxc_handler *, struct lxc_operations *, void *, const char *,
+				bool, int *);
+
+__hidden extern int resolve_clone_flags(struct lxc_handler *handler);
+__hidden extern void lxc_expose_namespace_environment(const struct lxc_handler *handler);
+
+static inline bool container_uses_namespace(const struct lxc_handler *handler,
+					    unsigned int ns_flag)
+{
+	return (handler->ns_clone_flags & ns_flag);
+}
 
 #endif

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/state.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/state.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/state.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/state.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/btrfs.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/btrfs.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/btrfs.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/btrfs.h Changed

@@ -3,13 +3,17 @@
 #ifndef __LXC_BTRFS_H
 #define __LXC_BTRFS_H
 
+#include "config.h"
+
 #include <byteswap.h>
 #include <linux/types.h> /* __le64, __l32 ... */
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "compiler.h"
+
 #ifndef BTRFS_SUPER_MAGIC
-#  define BTRFS_SUPER_MAGIC       0x9123683E
+#define BTRFS_SUPER_MAGIC 0x9123683E
 #endif
 
 typedef uint8_t u8;
@@ -31,8 +35,7 @@
 
 #define BTRFS_IOCTL_MAGIC 0x94
 #define BTRFS_IOC_SUBVOL_GETFLAGS _IOR(BTRFS_IOCTL_MAGIC, 25, unsigned long long)
-#define BTRFS_IOC_SPACE_INFO _IOWR(BTRFS_IOCTL_MAGIC, 20, \
-                                    struct btrfs_ioctl_space_args)
+#define BTRFS_IOC_SPACE_INFO _IOWR(BTRFS_IOCTL_MAGIC, 20, struct btrfs_ioctl_space_args)
 
 #define BTRFS_FSID_SIZE 16
 struct btrfs_ioctl_fs_info_args {
@@ -42,9 +45,7 @@
 	unsigned long long reserved124;
 };
 
-#define BTRFS_IOC_FS_INFO _IOR(BTRFS_IOCTL_MAGIC, 31, \
-		struct btrfs_ioctl_fs_info_args)
-
+#define BTRFS_IOC_FS_INFO _IOR(BTRFS_IOCTL_MAGIC, 31, struct btrfs_ioctl_fs_info_args)
 
 #define BTRFS_SUBVOL_NAME_MAX 4039
 #define BTRFS_PATH_NAME_MAX 4087
@@ -55,14 +56,10 @@
 };
 
 #define BTRFS_IOCTL_MAGIC 0x94
-#define BTRFS_IOC_SUBVOL_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 24, \
-                                   struct btrfs_ioctl_vol_args_v2)
-#define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, \
-                                   struct btrfs_ioctl_vol_args_v2)
-#define BTRFS_IOC_SUBVOL_CREATE _IOW(BTRFS_IOCTL_MAGIC, 14, \
-                                   struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_SNAP_DESTROY _IOW(BTRFS_IOCTL_MAGIC, 15, \
-                                   struct btrfs_ioctl_vol_args)
+#define BTRFS_IOC_SUBVOL_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 24, struct btrfs_ioctl_vol_args_v2)
+#define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, struct btrfs_ioctl_vol_args_v2)
+#define BTRFS_IOC_SUBVOL_CREATE _IOW(BTRFS_IOCTL_MAGIC, 14, struct btrfs_ioctl_vol_args)
+#define BTRFS_IOC_SNAP_DESTROY _IOW(BTRFS_IOCTL_MAGIC, 15, struct btrfs_ioctl_vol_args)
 
 #define BTRFS_QGROUP_INHERIT_SET_LIMITS (1ULL << 0)
 
@@ -185,8 +182,7 @@
 	char bufBTRFS_SEARCH_ARGS_BUFSIZE;
 };
 
-#define BTRFS_IOC_TREE_SEARCH _IOWR(BTRFS_IOCTL_MAGIC, 17, \
-                                   struct btrfs_ioctl_search_args)
+#define BTRFS_IOC_TREE_SEARCH _IOWR(BTRFS_IOCTL_MAGIC, 17, struct btrfs_ioctl_search_args)
 #define BTRFS_UUID_SIZE 16
 
 struct btrfs_timespec {
@@ -283,8 +279,7 @@
 	__le64 reserved8; /* for future */
 } __attribute__ ((__packed__));
 
-#define BTRFS_IOC_INO_LOOKUP _IOWR(BTRFS_IOCTL_MAGIC, 18, \
-                                   struct btrfs_ioctl_ino_lookup_args)
+#define BTRFS_IOC_INO_LOOKUP _IOWR(BTRFS_IOCTL_MAGIC, 18, struct btrfs_ioctl_ino_lookup_args)
 
 #define BTRFS_INO_LOOKUP_PATH_MAX 4080
 struct btrfs_ioctl_ino_lookup_args {
@@ -362,30 +357,28 @@
 	int num;
 };
 
-extern int btrfs_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
-			    const char *oldname, const char *cname,
-			    const char *oldpath, const char *lxcpath, int snap,
-			    uint64_t newsize, struct lxc_conf *conf);
-extern int btrfs_create(struct lxc_storage *bdev, const char *dest, const char *n,
-			struct bdev_specs *specs, const struct lxc_conf *conf);
-extern int btrfs_destroy(struct lxc_storage *orig);
-extern bool btrfs_detect(const char *path);
-extern int btrfs_mount(struct lxc_storage *bdev);
-extern int btrfs_umount(struct lxc_storage *bdev);
-
-extern char *get_btrfs_subvol_path(int fd, u64 dir_id, u64 objid, char *name,
-				   u16 name_len);
-extern int btrfs_list_get_path_rootid(int fd, u64 *treeid);
-extern bool is_btrfs_fs(const char *path);
-extern int is_btrfs_subvol(const char *path);
-extern bool btrfs_try_remove_subvol(const char *path);
-extern int btrfs_same_fs(const char *orig, const char *new);
-extern int btrfs_snapshot(const char *orig, const char *new);
-extern int btrfs_snapshot_wrapper(void *data);
-extern bool btrfs_create_clone(struct lxc_conf *conf, struct lxc_storage *orig,
-			       struct lxc_storage *new, uint64_t newsize);
-extern bool btrfs_create_snapshot(struct lxc_conf *conf,
-				  struct lxc_storage *orig,
-				  struct lxc_storage *new, uint64_t newsize);
+__hidden extern int btrfs_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
+				     const char *oldname, const char *cname, const char *oldpath,
+				     const char *lxcpath, int snap, uint64_t newsize,
+				     struct lxc_conf *conf);
+__hidden extern int btrfs_create(struct lxc_storage *bdev, const char *dest, const char *n,
+				 struct bdev_specs *specs, const struct lxc_conf *conf);
+__hidden extern int btrfs_destroy(struct lxc_storage *orig);
+__hidden extern bool btrfs_detect(const char *path);
+__hidden extern int btrfs_mount(struct lxc_storage *bdev);
+__hidden extern int btrfs_umount(struct lxc_storage *bdev);
+
+__hidden extern char *get_btrfs_subvol_path(int fd, u64 dir_id, u64 objid, char *name, u16 name_len);
+__hidden extern int btrfs_list_get_path_rootid(int fd, u64 *treeid);
+__hidden extern bool is_btrfs_fs(const char *path);
+__hidden extern int is_btrfs_subvol(const char *path);
+__hidden extern bool btrfs_try_remove_subvol(const char *path);
+__hidden extern int btrfs_same_fs(const char *orig, const char *new);
+__hidden extern int btrfs_snapshot(const char *orig, const char *new);
+__hidden extern int btrfs_snapshot_wrapper(void *data);
+__hidden extern bool btrfs_create_clone(struct lxc_conf *conf, struct lxc_storage *orig,
+					struct lxc_storage *new, uint64_t newsize);
+__hidden extern bool btrfs_create_snapshot(struct lxc_conf *conf, struct lxc_storage *orig,
+					   struct lxc_storage *new, uint64_t newsize);
 
 #endif /* __LXC_BTRFS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/dir.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/dir.c Changed

@@ -1,16 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "memory_utils.h"
+#include "mount_utils.h"
+#include "open_utils.h"
 #include "storage.h"
 #include "utils.h"
 
@@ -126,44 +126,75 @@
 
 int dir_mount(struct lxc_storage *bdev)
 {
-	__do_free char *mntdata = NULL;
-	unsigned long mflags = 0, mntflags = 0, pflags = 0;
+	struct lxc_rootfs *rootfs = bdev->rootfs;
+	struct lxc_mount_options *mnt_opts = &rootfs->mnt_opts;
 	int ret;
-	const char *src;
-
-	if (strcmp(bdev->type, "dir"))
-		return -22;
-
-	if (!bdev->src || !bdev->dest)
-		return -22;
-
-	ret = parse_mntopts(bdev->mntopts, &mntflags, &mntdata);
-	if (ret < 0)
-		return log_error_errno(ret, errno, "Failed to parse mount options \"%s\"", bdev->mntopts);
-
-	ret = parse_propagationopts(bdev->mntopts, &pflags);
-	if (ret < 0)
-		return log_error_errno(-EINVAL, EINVAL, "Failed to parse mount propagation options \"%s\"", bdev->mntopts);
-
-	src = lxc_storage_get_path(bdev->src, bdev->type);
-
-	ret = mount(src, bdev->dest, "bind", MS_BIND | MS_REC | mntflags | pflags, mntdata);
-	if (ret < 0)
-		return log_error_errno(-errno, errno, "Failed to mount \"%s\" on \"%s\"", src, bdev->dest);
-
-	if (ret == 0 && (mntflags & MS_RDONLY)) {
-		mflags = add_required_remount_flags(src, bdev->dest, MS_BIND | MS_REC | mntflags | pflags | MS_REMOUNT);
-		ret = mount(src, bdev->dest, "bind", mflags, mntdata);
-		if (ret < 0)
-			return log_error_errno(-errno, errno, "Failed to remount \"%s\" on \"%s\" read-only with options \"%s\", mount flags \"%lu\", and propagation flags \"%lu\"",
-					       src ? src : "(none)", bdev->dest ? bdev->dest : "(none)", mntdata, mflags, pflags);
-		else
-			DEBUG("Remounted \"%s\" on \"%s\" read-only with options \"%s\", mount flags \"%lu\", and propagation flags \"%lu\"",
-			      src ? src : "(none)", bdev->dest ? bdev->dest : "(none)", mntdata, mflags, pflags);
+	const char *source, *target;
+
+	if (!strequal(bdev->type, "dir"))
+		return syserror_set(-EINVAL, "Invalid storage driver");
+
+	if (is_empty_string(bdev->src))
+		return syserror_set(-EINVAL, "Missing rootfs path");
+
+	if (is_empty_string(bdev->dest))
+		return syserror_set(-EINVAL, "Missing target mountpoint");
+
+	if (rootfs->dfd_idmapped >= 0 && !can_use_bind_mounts())
+		return syserror_set(-EOPNOTSUPP, "Idmapped mount requested but kernel doesn't support new mount API");
+
+	source = lxc_storage_get_path(bdev->src, bdev->type);
+	target = bdev->dest;
+
+	if (can_use_bind_mounts()) {
+		__do_close int fd_source = -EBADF, fd_target = -EBADF;
+
+		fd_target = open_at(-EBADF, target, PROTECT_OPATH_DIRECTORY, 0, 0);
+		if (fd_target < 0)
+			return syserror("Failed to open \"%s\"", target);
+
+		if (rootfs->dfd_idmapped >= 0) {
+			ret = move_detached_mount(rootfs->dfd_idmapped, fd_target, "",
+						  PROTECT_OPATH_DIRECTORY,
+						  PROTECT_LOOKUP_BENEATH);
+		} else {
+			fd_source = open_at(-EBADF, source, PROTECT_OPATH_DIRECTORY, 0, 0);
+			if (fd_source < 0)
+				return syserror("Failed to open \"%s\"", source);
+
+			ret = fd_bind_mount(fd_source, "",
+					    PROTECT_OPATH_DIRECTORY,
+					    PROTECT_LOOKUP_BENEATH,
+					    fd_target, "",
+					    PROTECT_OPATH_DIRECTORY,
+					    PROTECT_LOOKUP_BENEATH,
+					    mnt_opts->attr.attr_set,
+                                            mnt_opts->attr.attr_clr,
+                                            mnt_opts->attr.propagation,
+					    true);
+		}
+	} else {
+		ret = mount(source, target, "bind", MS_BIND | MS_REC | mnt_opts->mnt_flags | mnt_opts->prop_flags, mnt_opts->data);
+		if (!ret && (mnt_opts->mnt_flags & MS_RDONLY)) {
+			unsigned long mflags;
+
+			mflags = add_required_remount_flags(source, target,
+							    MS_BIND |
+							    MS_REC |
+							    mnt_opts->mnt_flags |
+							    MS_REMOUNT);
+
+			ret = mount(source, target, "bind", mflags, mnt_opts->data);
+			if (ret)
+				SYSERROR("Failed to remount \"%s\" on \"%s\" read-only", source, target);
+			else
+				TRACE("Remounted \"%s\" on \"%s\" read-only", source, target);
+		}
 	}
+	if (ret < 0)
+		return syserror_set(ret, "Failed to mount \"%s\" onto \"%s\"", source, target);
 
-	TRACE("Mounted \"%s\" on \"%s\" with options \"%s\", mount flags \"%lu\", and propagation flags \"%lu\"",
-	      src ? src : "(none)", bdev->dest ? bdev->dest : "(none)", mntdata, mflags, pflags);
+	TRACE("Mounted \"%s\" onto \"%s\"", source, target);
 	return 0;
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/dir.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/dir.h Changed

@@ -3,24 +3,28 @@
 #ifndef __LXC_DIR_H
 #define __LXC_DIR_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "compiler.h"
+
 struct lxc_storage;
 
 struct bdev_specs;
 
 struct lxc_conf;
 
-extern int dir_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
-			  const char *oldname, const char *cname,
-			  const char *oldpath, const char *lxcpath, int snap,
-			  uint64_t newsize, struct lxc_conf *conf);
-extern int dir_create(struct lxc_storage *bdev, const char *dest, const char *n,
-		      struct bdev_specs *specs, const struct lxc_conf *conf);
-extern int dir_destroy(struct lxc_storage *orig);
-extern bool dir_detect(const char *path);
-extern int dir_mount(struct lxc_storage *bdev);
-extern int dir_umount(struct lxc_storage *bdev);
+__hidden extern int dir_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
+				   const char *oldname, const char *cname, const char *oldpath,
+				   const char *lxcpath, int snap, uint64_t newsize,
+				   struct lxc_conf *conf);
+__hidden extern int dir_create(struct lxc_storage *bdev, const char *dest, const char *n,
+			       struct bdev_specs *specs, const struct lxc_conf *conf);
+__hidden extern int dir_destroy(struct lxc_storage *orig);
+__hidden extern bool dir_detect(const char *path);
+__hidden extern int dir_mount(struct lxc_storage *bdev);
+__hidden extern int dir_umount(struct lxc_storage *bdev);
 
 #endif /* __LXC_DIR_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/loop.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/loop.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/loop.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/loop.h Changed

@@ -3,24 +3,28 @@
 #ifndef __LXC_LOOP_H
 #define __LXC_LOOP_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "compiler.h"
+
 struct lxc_storage;
 
 struct bdev_specs;
 
 struct lxc_conf;
 
-extern int loop_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
-			   const char *oldname, const char *cname,
-			   const char *oldpath, const char *lxcpath, int snap,
-			   uint64_t newsize, struct lxc_conf *conf);
-extern int loop_create(struct lxc_storage *bdev, const char *dest,
-		       const char *n, struct bdev_specs *specs, const struct lxc_conf *conf);
-extern int loop_destroy(struct lxc_storage *orig);
-extern bool loop_detect(const char *path);
-extern int loop_mount(struct lxc_storage *bdev);
-extern int loop_umount(struct lxc_storage *bdev);
+__hidden extern int loop_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
+				    const char *oldname, const char *cname, const char *oldpath,
+				    const char *lxcpath, int snap, uint64_t newsize,
+				    struct lxc_conf *conf);
+__hidden extern int loop_create(struct lxc_storage *bdev, const char *dest, const char *n,
+				struct bdev_specs *specs, const struct lxc_conf *conf);
+__hidden extern int loop_destroy(struct lxc_storage *orig);
+__hidden extern bool loop_detect(const char *path);
+__hidden extern int loop_mount(struct lxc_storage *bdev);
+__hidden extern int loop_umount(struct lxc_storage *bdev);
 
 #endif /* __LXC_LOOP_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/lvm.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/lvm.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/lvm.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/lvm.h Changed

@@ -3,31 +3,35 @@
 #ifndef __LXC_LVM_H
 #define __LXC_LVM_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "compiler.h"
+
 struct lxc_storage;
 
 struct bdev_specs;
 
 struct lxc_conf;
 
-extern bool lvm_detect(const char *path);
-extern int lvm_mount(struct lxc_storage *bdev);
-extern int lvm_umount(struct lxc_storage *bdev);
-extern int lvm_compare_lv_attr(const char *path, int pos, const char expected);
-extern int lvm_is_thin_volume(const char *path);
-extern int lvm_is_thin_pool(const char *path);
-extern int lvm_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
-			  const char *oldname, const char *cname,
-			  const char *oldpath, const char *lxcpath, int snap,
-			  uint64_t newsize, struct lxc_conf *conf);
-extern int lvm_destroy(struct lxc_storage *orig);
-extern int lvm_create(struct lxc_storage *bdev, const char *dest, const char *n,
-		      struct bdev_specs *specs, const struct lxc_conf *conf);
-extern bool lvm_create_clone(struct lxc_conf *conf, struct lxc_storage *orig,
-			     struct lxc_storage *new, uint64_t newsize);
-extern bool lvm_create_snapshot(struct lxc_conf *conf, struct lxc_storage *orig,
-				struct lxc_storage *new, uint64_t newsize);
+__hidden extern bool lvm_detect(const char *path);
+__hidden extern int lvm_mount(struct lxc_storage *bdev);
+__hidden extern int lvm_umount(struct lxc_storage *bdev);
+__hidden extern int lvm_compare_lv_attr(const char *path, int pos, const char expected);
+__hidden extern int lvm_is_thin_volume(const char *path);
+__hidden extern int lvm_is_thin_pool(const char *path);
+__hidden extern int lvm_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
+				   const char *oldname, const char *cname, const char *oldpath,
+				   const char *lxcpath, int snap, uint64_t newsize,
+				   struct lxc_conf *conf);
+__hidden extern int lvm_destroy(struct lxc_storage *orig);
+__hidden extern int lvm_create(struct lxc_storage *bdev, const char *dest, const char *n,
+			       struct bdev_specs *specs, const struct lxc_conf *conf);
+__hidden extern bool lvm_create_clone(struct lxc_conf *conf, struct lxc_storage *orig,
+				      struct lxc_storage *new, uint64_t newsize);
+__hidden extern bool lvm_create_snapshot(struct lxc_conf *conf, struct lxc_storage *orig,
+					 struct lxc_storage *new, uint64_t newsize);
 
 #endif /* __LXC_LVM_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/nbd.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/nbd.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/nbd.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/nbd.h Changed

@@ -3,28 +3,31 @@
 #ifndef __LXC_NBD_H
 #define __LXC_NBD_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "compiler.h"
+
 struct lxc_storage;
 
 struct bdev_specs;
 
 struct lxc_conf;
 
-extern int nbd_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
-			  const char *oldname, const char *cname,
-			  const char *oldpath, const char *lxcpath, int snap,
-			  uint64_t newsize, struct lxc_conf *conf);
-extern int nbd_create(struct lxc_storage *bdev, const char *dest, const char *n,
-		      struct bdev_specs *specs, const struct lxc_conf *conf);
-extern int nbd_destroy(struct lxc_storage *orig);
-extern bool nbd_detect(const char *path);
-extern int nbd_mount(struct lxc_storage *bdev);
-extern int nbd_umount(struct lxc_storage *bdev);
-
-extern bool attach_nbd(char *src, struct lxc_conf *conf);
-extern void detach_nbd_idx(int idx);
-extern bool requires_nbd(const char *path);
+__hidden extern int nbd_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
+				   const char *oldname, const char *cname, const char *oldpath,
+				   const char *lxcpath, int snap, uint64_t newsize,
+				   struct lxc_conf *conf);
+__hidden extern int nbd_create(struct lxc_storage *bdev, const char *dest, const char *n,
+			       struct bdev_specs *specs, const struct lxc_conf *conf);
+__hidden extern int nbd_destroy(struct lxc_storage *orig);
+__hidden extern bool nbd_detect(const char *path);
+__hidden extern int nbd_mount(struct lxc_storage *bdev);
+__hidden extern int nbd_umount(struct lxc_storage *bdev);
+__hidden extern bool attach_nbd(char *src, struct lxc_conf *conf);
+__hidden extern void detach_nbd_idx(int idx);
+__hidden extern bool requires_nbd(const char *path);
 
 #endif /* __LXC_NBD_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/overlay.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/overlay.c Changed

@@ -1,18 +1,17 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "lxc.h"
+
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
-#include "lxccontainer.h"
 #include "macro.h"
 #include "memory_utils.h"
 #include "overlay.h"
@@ -57,7 +56,7 @@
 		return -1;
 	}
 
-	if (am_guest_unpriv() || !lxc_list_empty(&conf->id_map)) {
+	if (am_guest_unpriv() || !list_empty(&conf->id_map)) {
 		ret = chown_mapped_root(new->dest, conf);
 		if (ret < 0)
 			WARN("Failed to update ownership of %s", new->dest);
@@ -88,7 +87,7 @@
 		if (ret < 0 && errno != EEXIST)
 			return log_error_errno(-errno, errno, "Failed to create directory \"%s\"", work);
 
-		if (am_guest_unpriv() || !lxc_list_empty(&conf->id_map)) {
+		if (am_guest_unpriv() || !list_empty(&conf->id_map)) {
 			__do_free char *lxc_overlay_delta_dir = NULL,
 				       *lxc_overlay_private_dir = NULL;
 
@@ -116,7 +115,7 @@
 			return log_error_errno(-ENOMEM, ENOMEM, "Failed to allocate memory");
 
 		ret = snprintf(new->src, len, "overlay:%s:%s", src, delta);
-		if (ret < 0 || (size_t)ret >= len)
+		if (ret < 0 || ret >= len)
 			return log_error_errno(-EIO, EIO, "Failed to create string");
 	} else if (!strcmp(orig->type, "overlayfs") ||
 		   !strcmp(orig->type, "overlay")) {
@@ -155,7 +154,7 @@
 		if (ret < 0 && errno != EEXIST)
 			return log_error_errno(-errno, errno, "Failed to create directory \"%s\"", ndelta);
 
-		if (am_guest_unpriv() || !lxc_list_empty(&conf->id_map)) {
+		if (am_guest_unpriv() || !list_empty(&conf->id_map)) {
 			__do_free char *lxc_overlay_delta_dir = NULL,
 				       *lxc_overlay_private_dir = NULL;
 
@@ -192,11 +191,11 @@
 		 * don't need to record a dependency. If we would restore would
 		 * also fail.
 		 */
-		clean_old_path = lxc_deslashify(oldpath);
+		clean_old_path = path_simplify(oldpath);
 		if (!clean_old_path)
 			return log_error_errno(-ENOMEM, ENOMEM, "Failed to create clean path for \"%s\"", oldpath);
 
-		clean_new_path = lxc_deslashify(lxcpath);
+		clean_new_path = path_simplify(lxcpath);
 		if (!clean_new_path)
 			return log_error_errno(-ENOMEM, ENOMEM, "Failed to create clean path for \"%s\"", lxcpath);
 
@@ -276,7 +275,7 @@
 	if (ret < 0 && errno != EEXIST)
 		return log_error_errno(-errno, errno, "Failed to create directory \"%s\"", delta);
 
-	if (am_guest_unpriv() || !lxc_list_empty(&conf->id_map)) {
+	if (am_guest_unpriv() || !list_empty(&conf->id_map)) {
 		__do_free char *lxc_overlay_private_dir = NULL;
 
 		lxc_overlay_private_dir = must_make_path(tmp, LXC_OVERLAY_PRIVATE_DIR, NULL);
@@ -414,7 +413,7 @@
 	work = must_make_path(upper, LXC_OVERLAY_WORK_DIR, NULL);
 	upperlastslash - upper = '/';
 
-	ret = parse_mntopts(bdev->mntopts, &mntflags, &mntdata);
+	ret = parse_mntopts_legacy(bdev->mntopts, &mntflags, &mntdata);
 	if (ret < 0) {
 		ERROR("Failed to parse mount options");
 		free(mntdata);
@@ -446,10 +445,10 @@
 			       upper, lower, mntdata);
 
 		len2 = strlen(lower) + strlen(upper) + strlen(work) +
-		       strlen("upperdir=,lowerdir=,workdir=") +
+		       strlen("upperdir=,lowerdir=,workdir=,") +
 		       strlen(mntdata) + 1;
 		options_work = must_realloc(NULL, len2);
-		ret2 = snprintf(options, len2,
+		ret2 = snprintf(options_work, len2,
 				"upperdir=%s,lowerdir=%s,workdir=%s,%s", upper,
 				lower, work, mntdata);
 	} else {
@@ -467,7 +466,7 @@
 				lower, work);
 	}
 
-	if (ret < 0 || ret >= len || ret2 < 0 || ret2 >= len2) {
+	if (ret < 0 || (size_t)ret >= len || ret2 < 0 || (size_t)ret2 >= len2) {
 		ERROR("Failed to create string");
 		free(mntdata);
 		free(dup);
@@ -656,7 +655,7 @@
 /* To be called from lxcapi_clone() in lxccontainer.c: When we clone a container
  * with overlay lxc.mount.entry entries we need to update absolute paths for
  * upper- and workdir. This update is done in two locations:
- * lxc_conf->unexpanded_config and lxc_conf->mount_list. Both updates are done
+ * lxc_conf->unexpanded_config and lxc_conf->mount_entries. Both updates are done
  * independent of each other since lxc_conf->mountlist may contain more mount
  * entries (e.g. from other included files) than lxc_conf->unexpanded_config.
  */
@@ -667,7 +666,7 @@
 	char new_upperPATH_MAX, new_workPATH_MAX, old_upperPATH_MAX,
 	    old_workPATH_MAX;
 	size_t i;
-	struct lxc_list *iterator;
+	struct string_entry *entry;
 	char *cleanpath = NULL;
 	int fret = -1;
 	int ret = 0;
@@ -681,7 +680,7 @@
 
 	/*
 	 * We have to update lxc_conf->unexpanded_config separately from
-	 * lxc_conf->mount_list.
+	 * lxc_conf->mount_entries.
 	 */
 	for (i = 0; i < sizeof(ovl_dirs) / sizeof(ovl_dirs0); i++) {
 		if (!clone_update_unexp_ovl_paths(lxc_conf, lxc_path, newpath,
@@ -700,11 +699,11 @@
 	if (ret < 0 || ret >= PATH_MAX)
 		goto err;
 
-	lxc_list_for_each(iterator, &lxc_conf->mount_list) {
+	list_for_each_entry(entry, &lxc_conf->mount_entries, head) {
 		char *mnt_entry = NULL, *new_mnt_entry = NULL, *tmp = NULL,
 		     *tmp_mnt_entry = NULL;
 
-		mnt_entry = iterator->elem;
+		mnt_entry = entry->val;
 
 		if (strstr(mnt_entry, "overlay"))
 			tmp = "upperdir";
@@ -721,26 +720,26 @@
 		if (ret < 0 || ret >= PATH_MAX)
 			goto err;
 
-		if (strstr(mnt_entry, old_upper)) {
-			tmp_mnt_entry =
-			    lxc_string_replace(old_upper, new_upper, mnt_entry);
-		}
+		if (strstr(mnt_entry, old_upper))
+			tmp_mnt_entry = lxc_string_replace(old_upper, new_upper, mnt_entry);
 
 		if (strstr(mnt_entry, old_work)) {
 			if (tmp_mnt_entry)
-				new_mnt_entry = lxc_string_replace(
-				    old_work, new_work, tmp_mnt_entry);
+				new_mnt_entry = lxc_string_replace(old_work,
+								   new_work,
+								   tmp_mnt_entry);
 			else
-				new_mnt_entry = lxc_string_replace(
-				    old_work, new_work, mnt_entry);
+				new_mnt_entry = lxc_string_replace(old_work,
+								   new_work,
+								   mnt_entry);
 		}
 
 		if (new_mnt_entry) {
-			free(iterator->elem);
-			iterator->elem = strdup(new_mnt_entry);
+			free(entry->val);
+			entry->val = strdup(new_mnt_entry);
 		} else if (tmp_mnt_entry) {
-			free(iterator->elem);
-			iterator->elem = strdup(tmp_mnt_entry);
+			free(entry->val);
+			entry->val = strdup(tmp_mnt_entry);
 		}
 
 		free(new_mnt_entry);

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/overlay.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/overlay.h Changed

@@ -3,6 +3,8 @@
 #ifndef __LXC_OVERLAY_H
 #define __LXC_OVERLAY_H
 
+#include "config.h"
+
 #include <grp.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -10,6 +12,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
+#include "compiler.h"
 #include "storage.h"
 
 struct lxc_storage;
@@ -20,42 +23,42 @@
 
 struct lxc_rootfs;
 
-extern int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
-			  const char *oldname, const char *cname,
-			  const char *oldpath, const char *lxcpath, int snap,
-			  uint64_t newsize, struct lxc_conf *conf);
-extern int ovl_create(struct lxc_storage *bdev, const char *dest, const char *n,
-		      struct bdev_specs *specs, const struct lxc_conf *conf);
-extern int ovl_destroy(struct lxc_storage *orig);
-extern bool ovl_detect(const char *path);
-extern int ovl_mount(struct lxc_storage *bdev);
-extern int ovl_umount(struct lxc_storage *bdev);
+__hidden extern int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
+				   const char *oldname, const char *cname, const char *oldpath,
+				   const char *lxcpath, int snap, uint64_t newsize,
+				   struct lxc_conf *conf);
+__hidden extern int ovl_create(struct lxc_storage *bdev, const char *dest, const char *n,
+			       struct bdev_specs *specs, const struct lxc_conf *conf);
+__hidden extern int ovl_destroy(struct lxc_storage *orig);
+__hidden extern bool ovl_detect(const char *path);
+__hidden extern int ovl_mount(struct lxc_storage *bdev);
+__hidden extern int ovl_umount(struct lxc_storage *bdev);
 
 /* To be called from lxcapi_clone() in lxccontainer.c: When we clone a container
  * with overlay lxc.mount.entry entries we need to update absolute paths for
  * upper- and workdir. This update is done in two locations:
- * lxc_conf->unexpanded_config and lxc_conf->mount_list. Both updates are done
- * independent of each other since lxc_conf->mountlist may container more mount
- * entries (e.g. from other included files) than lxc_conf->unexpanded_config .
+ * lxc_conf->unexpanded_config and lxc_conf->mount_entries. Both updates are
+ * done independent of each other since lxc_conf->mountlist may container more
+ * mount entries (e.g. from other included files) than
+ * lxc_conf->unexpanded_config .
  */
-extern int ovl_update_abs_paths(struct lxc_conf *lxc_conf, const char *lxc_path,
-				const char *lxc_name, const char *newpath,
-				const char *newname);
+__hidden extern int ovl_update_abs_paths(struct lxc_conf *lxc_conf, const char *lxc_path,
+					 const char *lxc_name, const char *newpath,
+					 const char *newname);
 
 /* To be called from functions in lxccontainer.c: Get lower directory for
  * overlay rootfs.
  */
-extern const char *ovl_get_lower(const char *rootfs_path);
+__hidden extern const char *ovl_get_lower(const char *rootfs_path);
 
 /* Get rootfs path for overlay backed containers. Allocated memory must be freed
  * by caller.
  */
-extern char *ovl_get_rootfs(const char *rootfs_path, size_t *rootfslen);
+__hidden extern char *ovl_get_rootfs(const char *rootfs_path, size_t *rootfslen);
 
 /* Create upper- and workdirs for overlay mounts.
  */
-extern int ovl_mkdir(const struct mntent *mntent,
-		     const struct lxc_rootfs *rootfs, const char *lxc_name,
-		     const char *lxc_path);
+__hidden extern int ovl_mkdir(const struct mntent *mntent, const struct lxc_rootfs *rootfs,
+			      const char *lxc_name, const char *lxc_path);
 
 #endif /* __LXC_OVERLAY_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/rbd.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/rbd.c Changed

@@ -1,24 +1,21 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
+#include "config.h"
+
 #include <inttypes.h>	/* Required for PRIu64 to work. */
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "log.h"
 #include "memory_utils.h"
 #include "storage.h"
 #include "storage_utils.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(rbd, lxc);
@@ -29,7 +26,7 @@
 	const char *size;
 };
 
-int rbd_create_wrapper(void *data)
+static int rbd_create_wrapper(void *data)
 {
 	struct rbd_args *args = data;
 
@@ -39,7 +36,7 @@
 	return -1;
 }
 
-int rbd_map_wrapper(void *data)
+static int rbd_map_wrapper(void *data)
 {
 	struct rbd_args *args = data;
 
@@ -49,7 +46,7 @@
 	return -1;
 }
 
-int rbd_unmap_wrapper(void *data)
+static int rbd_unmap_wrapper(void *data)
 {
 	struct rbd_args *args = data;
 
@@ -58,7 +55,7 @@
 	return -1;
 }
 
-int rbd_delete_wrapper(void *data)
+static int rbd_delete_wrapper(void *data)
 {
 	struct rbd_args *args = data;

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/rbd.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/rbd.h Changed

@@ -3,24 +3,28 @@
 #ifndef __LXC_RDB_H
 #define __LXC_RDB_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "compiler.h"
+
 struct lxc_storage;
 
 struct bdev_specs;
 
 struct lxc_conf;
 
-extern int rbd_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
-			  const char *oldname, const char *cname,
-			  const char *oldpath, const char *lxcpath, int snap,
-			  uint64_t newsize, struct lxc_conf *conf);
-extern int rbd_create(struct lxc_storage *bdev, const char *dest, const char *n,
-		      struct bdev_specs *specs, const struct lxc_conf *conf);
-extern int rbd_destroy(struct lxc_storage *orig);
-extern bool rbd_detect(const char *path);
-extern int rbd_mount(struct lxc_storage *bdev);
-extern int rbd_umount(struct lxc_storage *bdev);
+__hidden extern int rbd_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
+				   const char *oldname, const char *cname, const char *oldpath,
+				   const char *lxcpath, int snap, uint64_t newsize,
+				   struct lxc_conf *conf);
+__hidden extern int rbd_create(struct lxc_storage *bdev, const char *dest, const char *n,
+			       struct bdev_specs *specs, const struct lxc_conf *conf);
+__hidden extern int rbd_destroy(struct lxc_storage *orig);
+__hidden extern bool rbd_detect(const char *path);
+__hidden extern int rbd_mount(struct lxc_storage *bdev);
+__hidden extern int rbd_umount(struct lxc_storage *bdev);
 
 #endif /* __LXC_RDB_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/rsync.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/rsync.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <grp.h>
 #include <sched.h>
 #include <stdint.h>
@@ -13,7 +12,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "rsync.h"
 #include "storage.h"
@@ -35,7 +33,7 @@
 	if (!lxc_switch_uid_gid(0, 0))
 		return -1;
 
-	if (!lxc_setgroups(0, NULL))
+	if (!lxc_drop_groups())
 		return -1;
 
 	return lxc_rsync_exec(args->src, args->dest);
@@ -86,17 +84,19 @@
 		ERROR("Failed mounting \"%s\" on \"%s\"", orig->src, orig->dest);
 		return -1;
 	}
+	TRACE("Mounted \"%s\" on \"%s\"", orig->src, orig->dest);
 
 	ret = new->ops->mount(new);
 	if (ret < 0) {
 		ERROR("Failed mounting \"%s\" onto \"%s\"", new->src, new->dest);
 		return -1;
 	}
+	TRACE("Mounted \"%s\" on \"%s\"", new->src, new->dest);
 
 	if (!lxc_switch_uid_gid(0, 0))
 		return -1;
 
-	if (!lxc_setgroups(0, NULL))
+	if (!lxc_drop_groups())
 		return -1;
 
 	src = lxc_storage_get_path(orig->dest, orig->type);

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/rsync.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/rsync.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/storage.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/storage.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -22,7 +21,6 @@
 
 #include "btrfs.h"
 #include "conf.h"
-#include "config.h"
 #include "dir.h"
 #include "error.h"
 #include "log.h"
@@ -42,8 +40,8 @@
 #include "utils.h"
 #include "zfs.h"
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
 #ifndef BLKGETSIZE64
@@ -109,7 +107,7 @@
 };
 
 /* nbd */
-const struct lxc_storage_ops nbd_ops = {
+static const struct lxc_storage_ops nbd_ops = {
     .detect = &nbd_detect,
     .mount = &nbd_mount,
     .umount = &nbd_umount,
@@ -234,7 +232,7 @@
 	return &bdevsi;
 }
 
-struct lxc_storage *storage_get(const char *type)
+static struct lxc_storage *storage_get(const char *type)
 {
 	size_t i;
 	struct lxc_storage *bdev;
@@ -314,6 +312,14 @@
 	const char *oldpath = c->config_path;
 	char cmd_outputPATH_MAX = {0};
 	struct rsync_data data = {0};
+	struct lxc_rootfs new_rootfs = {
+		.managed		= true,
+		.dfd_mnt		= -EBADF,
+		.dfd_dev		= -EBADF,
+		.dfd_host		= -EBADF,
+		.fd_path_pin		= -EBADF,
+		.dfd_idmapped		= -EBADF,
+	};
 
 	if (!src) {
 		ERROR("No rootfs specified");
@@ -329,11 +335,21 @@
 		return NULL;
 	}
 
-	orig = storage_init(c->lxc_conf);
-	if (!orig) {
+	ret = lxc_storage_prepare(c->lxc_conf);
+	if (ret) {
 		ERROR("Failed to detect storage driver for \"%s\"", oldname);
 		return NULL;
 	}
+	orig = c->lxc_conf->rootfs.storage;
+
+	if (c->lxc_conf->rootfs.dfd_idmapped >= 0) {
+		new_rootfs.dfd_idmapped = dup_cloexec(c->lxc_conf->rootfs.dfd_idmapped);
+		if (new_rootfs.dfd_idmapped < 0) {
+			SYSERROR("Failed to duplicate user namespace file descriptor");
+			lxc_storage_put(c->lxc_conf);
+			return NULL;
+		}
+	}
 
 	if (!orig->dest) {
 		size_t len;
@@ -404,6 +420,7 @@
 		goto on_error_put_orig;
 	}
 	TRACE("Initialized %s storage driver", new->type);
+	new->rootfs = &new_rootfs;
 
 	/* create new paths */
 	ret = new->ops->clone_paths(orig, new, oldname, cname, oldpath, lxcpath,
@@ -499,7 +516,7 @@
 	}
 
 on_success:
-	storage_put(orig);
+	lxc_storage_put(c->lxc_conf);
 
 	return new;
 
@@ -507,7 +524,7 @@
 	storage_put(new);
 
 on_error_put_orig:
-	storage_put(orig);
+	lxc_storage_put(c->lxc_conf);
 
 	return NULL;
 }
@@ -587,7 +604,7 @@
 	const struct lxc_storage_type *q;
 	const char *src = conf->rootfs.path;
 	const char *dst = conf->rootfs.mount;
-	const char *mntopts = conf->rootfs.options;
+	const char *mntopts = conf->rootfs.mnt_opts.raw_options;
 
 	BUILD_BUG_ON(LXC_STORAGE_INTERNAL_OVERLAY_RESTORE <= LXC_CLONE_MAXFLAGS);
 
@@ -598,14 +615,13 @@
 	if (!q)
 		return NULL;
 
-	bdev = malloc(sizeof(struct lxc_storage));
+	bdev = zalloc(sizeof(struct lxc_storage));
 	if (!bdev)
 		return NULL;
 
-	memset(bdev, 0, sizeof(struct lxc_storage));
-
-	bdev->ops = q->ops;
-	bdev->type = q->name;
+	bdev->ops	= q->ops;
+	bdev->type	= q->name;
+	bdev->rootfs	= &conf->rootfs;
 
 	if (mntopts)
 		bdev->mntopts = strdup(mntopts);
@@ -644,10 +660,12 @@
 
 void storage_put(struct lxc_storage *bdev)
 {
-	free(bdev->mntopts);
-	free(bdev->src);
-	free(bdev->dest);
-	free(bdev);
+	if (bdev) {
+		free_disarm(bdev->mntopts);
+		free_disarm(bdev->src);
+		free_disarm(bdev->dest);
+		free_disarm(bdev);
+	}
 }
 
 bool rootfs_is_blockdev(struct lxc_conf *conf)

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/storage.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/storage.h Changed

@@ -3,17 +3,22 @@
 #ifndef __LXC_STORAGE_H
 #define __LXC_STORAGE_H
 
+#include "config.h"
+
 #include <stdint.h>
 #include <sys/mount.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #if IS_BIONIC
-#include <../include/lxcmntent.h>
+#include "lxcmntent.h"
 #else
 #include <mntent.h>
 #endif
 
+#include "compiler.h"
+#include "conf.h"
+
 #ifndef MS_DIRSYNC
 #define MS_DIRSYNC 128
 #endif
@@ -85,6 +90,7 @@
 	/* index for the connected nbd device. */
 	int nbd_idx;
 	int flags;
+	struct lxc_rootfs *rootfs;
 };
 
 /**
@@ -99,23 +105,19 @@
  *                  type specifications.  If the <storage type> prefix is not
  *                  detected liblxc will try to detect the storage type.
  */
-extern bool storage_is_dir(struct lxc_conf *conf);
-extern bool storage_can_backup(struct lxc_conf *conf);
-
-extern struct lxc_storage *storage_init(struct lxc_conf *conf);
-
-extern struct lxc_storage *storage_copy(struct lxc_container *c,
-					const char *cname, const char *lxcpath,
-					const char *bdevtype, int flags,
-					const char *bdevdata, uint64_t newsize,
-					bool *needs_rdep);
-extern struct lxc_storage *storage_create(const char *dest, const char *type,
-					  const char *cname,
-					  struct bdev_specs *specs,
-					  const struct lxc_conf *conf);
-extern void storage_put(struct lxc_storage *bdev);
-extern bool storage_destroy(struct lxc_conf *conf);
-extern bool rootfs_is_blockdev(struct lxc_conf *conf);
-extern const char *lxc_storage_get_path(char *src, const char *prefix);
+__hidden extern bool storage_is_dir(struct lxc_conf *conf);
+__hidden extern bool storage_can_backup(struct lxc_conf *conf);
+__hidden extern struct lxc_storage *storage_init(struct lxc_conf *conf);
+__hidden extern struct lxc_storage *storage_copy(struct lxc_container *c, const char *cname,
+						 const char *lxcpath, const char *bdevtype,
+						 int flags, const char *bdevdata, uint64_t newsize,
+						 bool *needs_rdep);
+__hidden extern struct lxc_storage *storage_create(const char *dest, const char *type,
+						   const char *cname, struct bdev_specs *specs,
+						   const struct lxc_conf *conf);
+__hidden extern void storage_put(struct lxc_storage *bdev);
+__hidden extern bool storage_destroy(struct lxc_conf *conf);
+__hidden extern bool rootfs_is_blockdev(struct lxc_conf *conf);
+__hidden extern const char *lxc_storage_get_path(char *src, const char *prefix);
 
 #endif /* #define __LXC_STORAGE_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/storage_utils.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/storage_utils.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/storage_utils.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/storage_utils.h Changed

@@ -3,11 +3,14 @@
 #ifndef __LXC_STORAGE_UTILS_H
 #define __LXC_STORAGE_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
 
+#include "compiler.h"
 #include "conf.h"
 #include "macro.h"
 
@@ -22,20 +25,19 @@
 struct lxc_storage;
 struct lxc_conf;
 
-extern bool attach_block_device(struct lxc_conf *conf);
-extern void detach_block_device(struct lxc_conf *conf);
-extern int blk_getsize(struct lxc_storage *bdev, uint64_t *size);
-extern int detect_fs(struct lxc_storage *bdev, char *type, int len);
-extern int do_mkfs_exec_wrapper(void *args);
-extern int is_blktype(struct lxc_storage *b);
-extern int mount_unknown_fs(const char *rootfs, const char *target,
-			    const char *options);
-extern int find_fstype_cb(char *buffer, void *data);
-extern const char *linkderef(const char *path, char *dest);
-extern bool unpriv_snap_allowed(struct lxc_storage *b, const char *t, bool snap,
-				bool maybesnap);
-extern uint64_t get_fssize(char *s);
-extern bool is_valid_storage_type(const char *type);
-extern int storage_destroy_wrapper(void *data);
+__hidden extern bool attach_block_device(struct lxc_conf *conf);
+__hidden extern void detach_block_device(struct lxc_conf *conf);
+__hidden extern int blk_getsize(struct lxc_storage *bdev, uint64_t *size);
+__hidden extern int detect_fs(struct lxc_storage *bdev, char *type, int len);
+__hidden extern int do_mkfs_exec_wrapper(void *args);
+__hidden extern int is_blktype(struct lxc_storage *b);
+__hidden extern int mount_unknown_fs(const char *rootfs, const char *target, const char *options);
+__hidden extern int find_fstype_cb(char *buffer, void *data);
+__hidden extern const char *linkderef(const char *path, char *dest);
+__hidden extern bool unpriv_snap_allowed(struct lxc_storage *b, const char *t, bool snap,
+					 bool maybesnap);
+__hidden extern uint64_t get_fssize(char *s);
+__hidden extern bool is_valid_storage_type(const char *type);
+__hidden extern int storage_destroy_wrapper(void *data);
 
 #endif /* __LXC_STORAGE_UTILS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/zfs.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/zfs.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -11,7 +10,6 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "parse.h"
 #include "rsync.h"
@@ -28,7 +26,7 @@
 	void *argv;
 };
 
-int zfs_detect_exec_wrapper(void *data)
+static int zfs_detect_exec_wrapper(void *data)
 {
 	struct zfs_args *args = data;
 
@@ -38,7 +36,7 @@
 	return -1;
 }
 
-int zfs_create_exec_wrapper(void *args)
+static int zfs_create_exec_wrapper(void *args)
 {
 	struct zfs_args *zfs_args = args;
 
@@ -47,7 +45,7 @@
 	return -1;
 }
 
-int zfs_delete_exec_wrapper(void *args)
+static int zfs_delete_exec_wrapper(void *args)
 {
 	struct zfs_args *zfs_args = args;
 
@@ -56,7 +54,7 @@
 	return -1;
 }
 
-int zfs_snapshot_exec_wrapper(void *args)
+static int zfs_snapshot_exec_wrapper(void *args)
 {
 	struct zfs_args *zfs_args = args;
 
@@ -65,7 +63,7 @@
 	return -1;
 }
 
-int zfs_clone_exec_wrapper(void *args)
+static int zfs_clone_exec_wrapper(void *args)
 {
 	struct zfs_args *zfs_args = args;
 
@@ -76,7 +74,7 @@
 	return -1;
 }
 
-int zfs_get_parent_snapshot_exec_wrapper(void *args)
+static int zfs_get_parent_snapshot_exec_wrapper(void *args)
 {
 	struct zfs_args *zfs_args = args;
 
@@ -173,7 +171,7 @@
 	if (!bdev->src || !bdev->dest)
 		return -22;
 
-	ret = parse_mntopts(bdev->mntopts, &mntflags, &mntdata);
+	ret = parse_mntopts_legacy(bdev->mntopts, &mntflags, &mntdata);
 	if (ret < 0) {
 		ERROR("Failed to parse mount options");
 		return -22;
@@ -380,7 +378,7 @@
 
 	len -= snapshot_len;
 	ret = snprintf(snapshot + snapshot_len, len, "@%s", snap_name);
-	if (ret < 0 || ret >= len) {
+	if (ret < 0 || (size_t)ret >= len) {
 		ERROR("Failed to create string");
 		free(snapshot);
 		return false;
@@ -514,7 +512,7 @@
 
 	len -= dataset_len - 4;
 	ret = snprintf(new->src + dataset_len + 4, len, "/%s", cname);
-	if (ret < 0 || ret >= len) {
+	if (ret < 0 || (size_t)ret >= len) {
 		ERROR("Failed to create string");
 		return -1;
 	}
@@ -539,7 +537,7 @@
 	}
 
 	ret = snprintf(new->dest, len, "%s/%s/rootfs", lxcpath, cname);
-	if (ret < 0 || ret >= len) {
+	if (ret < 0 || (size_t)ret >= len) {
 		ERROR("Failed to create string \"%s/%s/rootfs\"", lxcpath, cname);
 		return -1;
 	}
@@ -717,7 +715,7 @@
 	}
 
 	ret = snprintf(bdev->src, len, "zfs:%s/%s", zfsroot, n);
-	if (ret < 0 || ret >= len) {
+	if (ret < 0 || (size_t)ret >= len) {
 		ERROR("Failed to create string");
 		return -1;
 	}

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/storage/zfs.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/storage/zfs.h Changed

@@ -3,30 +3,33 @@
 #ifndef __LXC_ZFS_H
 #define __LXC_ZFS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
 
+#include "compiler.h"
+
 struct lxc_storage;
 
 struct bdev_specs;
 
 struct lxc_conf;
 
-extern int zfs_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
-			  const char *oldname, const char *cname,
-			  const char *oldpath, const char *lxcpath, int snap,
-			  uint64_t newsize, struct lxc_conf *conf);
-extern int zfs_create(struct lxc_storage *bdev, const char *dest, const char *n,
-		      struct bdev_specs *specs, const struct lxc_conf *conf);
-extern int zfs_destroy(struct lxc_storage *orig);
-extern bool zfs_detect(const char *path);
-extern int zfs_mount(struct lxc_storage *bdev);
-extern int zfs_umount(struct lxc_storage *bdev);
-
-extern bool zfs_copy(struct lxc_conf *conf, struct lxc_storage *orig,
-		     struct lxc_storage *new, uint64_t newsize);
-extern bool zfs_snapshot(struct lxc_conf *conf, struct lxc_storage *orig,
-			 struct lxc_storage *new, uint64_t newsize);
+__hidden extern int zfs_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
+				   const char *oldname, const char *cname, const char *oldpath,
+				   const char *lxcpath, int snap, uint64_t newsize,
+				   struct lxc_conf *conf);
+__hidden extern int zfs_create(struct lxc_storage *bdev, const char *dest, const char *n,
+			       struct bdev_specs *specs, const struct lxc_conf *conf);
+__hidden extern int zfs_destroy(struct lxc_storage *orig);
+__hidden extern bool zfs_detect(const char *path);
+__hidden extern int zfs_mount(struct lxc_storage *bdev);
+__hidden extern int zfs_umount(struct lxc_storage *bdev);
+__hidden extern bool zfs_copy(struct lxc_conf *conf, struct lxc_storage *orig,
+			      struct lxc_storage *new, uint64_t newsize);
+__hidden extern bool zfs_snapshot(struct lxc_conf *conf, struct lxc_storage *orig,
+				  struct lxc_storage *new, uint64_t newsize);
 
 #endif /* __LXC_ZFS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/string_utils.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/string_utils.c Changed

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
+#include "config.h"
+
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
@@ -26,20 +24,16 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "config.h"
-#include "lxclock.h"
+#include "string_utils.h"
 #include "macro.h"
 #include "memory_utils.h"
-#include "namespace.h"
-#include "parse.h"
-#include "string_utils.h"
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
-#ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#if !HAVE_STRLCAT
+#include "strlcat.h"
 #endif
 
 char **lxc_va_arg_list_to_argv(va_list ap, size_t skip, int do_strdup)
@@ -156,7 +150,7 @@
 bool lxc_string_in_array(const char *needle, const char **haystack)
 {
 	for (; haystack && *haystack; haystack++)
-		if (!strcmp(needle, *haystack))
+		if (strequal(needle, *haystack))
 			return true;
 
 	return false;
@@ -192,93 +186,65 @@
 	return result;
 }
 
-char **lxc_normalize_path(const char *path)
+/* taken from systemd */
+char *path_simplify(const char *path)
 {
-	char **components;
-	char **p;
-	size_t components_len = 0;
-	size_t pos = 0;
+	__do_free char *path_new = NULL;
+	char *f, *t;
+	bool slash = false, ignore_slash = false, absolute;
 
-	components = lxc_string_split(path, '/');
-	if (!components)
+	path_new = strdup(path);
+	if (!path_new)
 		return NULL;
 
-	for (p = components; *p; p++)
-		components_len++;
-
-	/* resolve '.' and '..' */
-	for (pos = 0; pos < components_len;) {
-		if (!strcmp(componentspos, ".") ||
-		    (!strcmp(componentspos, "..") && pos == 0)) {
-			/* eat this element */
-			free(componentspos);
-			memmove(&componentspos, &componentspos + 1,
-				sizeof(char *) * (components_len - pos));
-			components_len--;
-		} else if (!strcmp(componentspos, "..")) {
-			/* eat this and the previous element */
-			free(componentspos - 1);
-			free(componentspos);
-			memmove(&componentspos - 1, &componentspos + 1,
-				sizeof(char *) * (components_len - pos));
-			components_len -= 2;
-			pos--;
-		} else {
-			pos++;
-		}
-	}
-
-	return components;
-}
+	if (is_empty_string(path_new))
+		return move_ptr(path_new);
 
-char *lxc_deslashify(const char *path)
-{
-	char *dup, *p;
-	char **parts = NULL;
-	size_t n, len;
+	absolute = abspath(path_new);
 
-	dup = strdup(path);
-	if (!dup)
-		return NULL;
-
-	parts = lxc_normalize_path(dup);
-	if (!parts) {
-		free(dup);
-		return NULL;
+	f = path_new;
+	if (*f == '.' && (f1 == 0 || f1 == '/')) {
+		ignore_slash = true;
+		f++;
 	}
 
-	/* We'll end up here if path == "///" or path == "". */
-	if (!*parts) {
-		len = strlen(dup);
-		if (!len) {
-			lxc_free_array((void **)parts, free);
-			return dup;
-		}
+	for (t = path_new; *f; f++) {
 
-		n = strcspn(dup, "/");
-		if (n == len) {
-			free(dup);
-			lxc_free_array((void **)parts, free);
+		if (*f == '/') {
+			slash = true;
+			continue;
+		}
 
-			p = strdup("/");
-			if (!p)
-				return NULL;
+		if (slash) {
+			if (*f == '.' && (f1 == 0 || f1 == '/'))
+				continue;
 
-			return p;
+			slash = false;
+			if (ignore_slash)
+				ignore_slash = false;
+			else
+				*(t++) = '/';
 		}
+
+		*(t++) = *f;
 	}
 
-	p = lxc_string_join("/", (const char **)parts, *dup == '/');
-	free(dup);
-	lxc_free_array((void **)parts, free);
-	return p;
+	if (t == path_new) {
+		if (absolute)
+			*(t++) = '/';
+		else
+			*(t++) = '.';
+	}
+
+	*t = 0;
+	return move_ptr(path_new);
 }
 
 char *lxc_append_paths(const char *first, const char *second)
 {
+	__do_free char *result = NULL;
 	int ret;
 	size_t len;
-	char *result = NULL;
 	int pattern_type = 0;
 
 	len = strlen(first) + strlen(second) + 1;
@@ -287,20 +253,18 @@
 		pattern_type = 1;
 	}
 
-	result = calloc(1, len);
+	result = zalloc(len);
 	if (!result)
 		return NULL;
 
 	if (pattern_type == 0)
-		ret = snprintf(result, len, "%s%s", first, second);
+		ret = strnprintf(result, len, "%s%s", first, second);
 	else
-		ret = snprintf(result, len, "%s/%s", first, second);
-	if (ret < 0 || (size_t)ret >= len) {
-		free(result);
+		ret = strnprintf(result, len, "%s/%s", first, second);
+	if (ret < 0)
 		return NULL;
-	}
 
-	return result;
+	return move_ptr(result);
 }
 
 bool lxc_string_in_list(const char *needle, const char *haystack, char _sep)
@@ -314,7 +278,7 @@
 
 	str = must_copy_string(haystack);
 	lxc_iterate_parts(token, str, sep)
-		if (strcmp(needle, token) == 0)
+		if (strequal(needle, token))
 			return 1;
 
 	return 0;
@@ -434,6 +398,9 @@
 	if (state == 'a')
 		complete_word(&result, nextword, p, &result_capacity, &result_count);
 
+	if (result == NULL)
+		return calloc(1, sizeof(char *));
+
 	return realloc(result, (result_count + 1) * sizeof(char *));
 }
 
@@ -473,6 +440,9 @@
 		result_count++;
 	}
 
+	if (result == NULL)
+		return calloc(1, sizeof(char *));
+
 	/* if we allocated too much, reduce it */
 	return realloc(result, (result_count + 1) * sizeof(char *));
 
@@ -667,6 +637,52 @@
 	return 0;
 }
 
+int lxc_safe_int64_residual(const char *restrict numstr,
+			    int64_t *restrict converted, int base,
+			    char *restrict residual, size_t residual_len)
+{
+	char *remaining = NULL;
+	int64_t u;
+
+	if (residual && residual_len == 0)
+		return ret_errno(EINVAL);
+
+	if (!residual && residual_len != 0)
+		return ret_errno(EINVAL);
+
+	memset(residual, 0, residual_len);
+
+	while (isspace(*numstr))
+		numstr++;
+
+	errno = 0;
+	u = strtoll(numstr, &remaining, base);
+	if (errno == ERANGE && u == INT64_MAX)
+		return ret_errno(ERANGE);
+
+	if (remaining == numstr)
+		return -EINVAL;
+
+	if (residual) {
+		size_t len = 0;
+
+		if (*remaining == '\0')
+			goto out;
+
+		len = strlen(remaining);
+		if (len >= residual_len)
+			return ret_errno(EINVAL);
+
+		memcpy(residual, remaining, len);
+	} else if (*remaining != '\0') {
+		return ret_errno(EINVAL);
+	}
+
+out:
+	*converted = u;
+	return 0;
+}
+
 int lxc_safe_int(const char *numstr, int *converted)
 {
 	char *err = NULL;
@@ -770,6 +786,8 @@
 	va_start(args, first);
 	while ((cur = va_arg(args, char *)) != NULL) {
 		buf_len = strlen(cur);
+		if (buf_len == 0)
+			continue;
 
 		full_len += buf_len;
 		if (cur0 != '/')
@@ -852,45 +870,57 @@
 	return ret;
 }
 
-int parse_byte_size_string(const char *s, int64_t *converted)
+int parse_byte_size_string(const char *s, long long int *converted)
 {
 	int ret, suffix_len;
-	long long int conv;
-	int64_t mltpl, overflow;
+	long long int conv, mltpl;
 	char *end;
-	char dupINTTYPE_TO_STRLEN(int64_t);
+	char dupINTTYPE_TO_STRLEN(long long int) = {0};
 	char suffix3 = {0};
+	size_t len;
 
-	if (!s || !strcmp(s, ""))
-		return -EINVAL;
+	if (!s)
+		return ret_errno(EINVAL);
 
-	end = stpncpy(dup, s, sizeof(dup) - 1);
-	if (*end != '\0')
-		return -EINVAL;
+	len = strlen(s);
+	if (len == 0 || len > sizeof(dup) - 1)
+		return ret_errno(EINVAL);
+
+	memcpy(dup, s, len);
 
+	end = dup + len;
 	if (isdigit(*(end - 1)))
 		suffix_len = 0;
 	else if (isalpha(*(end - 1)))
 		suffix_len = 1;
 	else
-		return -EINVAL;
+		return ret_errno(EINVAL);
 
-	if (suffix_len > 0 && (end - 2) == dup && !isdigit(*(end - 2)))
-		return -EINVAL;
+	if (suffix_len > 0) {
+		if ((end - 1) == dup)
+			return ret_errno(EINVAL);
 
-	if (suffix_len > 0 && isalpha(*(end - 2)))
-		suffix_len++;
+		if ((end - 2) == dup) {
+			if (isalpha(*(end - 2)))
+				return ret_errno(EINVAL);
+			/* 1B */
+		} else {
+			if (isalpha(*(end - 2))) /* 12MB */
+				suffix_len++;
+
+			/* 12B */
+		}
 
-	if (suffix_len > 0) {
 		memcpy(suffix, end - suffix_len, suffix_len);
 		*(suffix + suffix_len) = '\0';
 		*(end - suffix_len) = '\0';
 	}
+
 	duplxc_char_right_gc(dup, strlen(dup)) = '\0';
 
 	ret = lxc_safe_long_long(dup, &conv);
-	if (ret < 0)
-		return -ret;
+	if (ret)
+		return ret;
 
 	if (suffix_len != 2) {
 		*converted = conv;
@@ -904,13 +934,11 @@
 	else if (strcasecmp(suffix, "GB") == 0)
 		mltpl = 1024 * 1024 * 1024;
 	else
-		return -EINVAL;
+		return ret_errno(EINVAL);
 
-	overflow = conv * mltpl;
-	if (conv != 0 && (overflow / conv) != mltpl)
-		return -ERANGE;
+	if (check_mul_overflow(conv, mltpl, converted))
+		return ret_errno(ERANGE);
 
-	*converted = overflow;
 	return 0;
 }
 
@@ -966,10 +994,9 @@
 
 int lxc_is_line_empty(const char *line)
 {
-	int i;
 	size_t len = strlen(line);
 
-	for (i = 0; i < len; i++)
+	for (size_t i = 0; i < len; i++)
 		if (linei != ' ' && linei != '\t' &&
 		    linei != '\n' && linei != '\r' &&
 		    linei != '\f' && linei != '\0')

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/string_utils.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/string_utils.h Changed

@@ -3,110 +3,118 @@
 #ifndef __LXC_STRING_UTILS_H
 #define __LXC_STRING_UTILS_H
 
-#include <stdarg.h>
-
 #include "config.h"
 
+#include <stdarg.h>
+
 #include "initutils.h"
 #include "macro.h"
 
-#ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#if !HAVE_STRLCAT
+#include "strlcat.h"
+#endif
+
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
+#endif
+
+#if !HAVE_STRCHRNUL
+#include "strchrnul.h"
 #endif
 
 /* convert variadic argument lists to arrays (for execl type argument lists) */
-extern char **lxc_va_arg_list_to_argv(va_list ap, size_t skip, int do_strdup);
-extern const char **lxc_va_arg_list_to_argv_const(va_list ap, size_t skip);
+__hidden extern char **lxc_va_arg_list_to_argv(va_list ap, size_t skip, int do_strdup);
+__hidden extern const char **lxc_va_arg_list_to_argv_const(va_list ap, size_t skip);
 
 /*
  * Some simple string functions; if they return pointers, they are allocated
  * buffers.
  */
-extern char *lxc_string_replace(const char *needle, const char *replacement,
-				const char *haystack);
-extern bool lxc_string_in_array(const char *needle, const char **haystack);
-extern char *lxc_string_join(const char *sep, const char **parts,
-			     bool use_as_prefix);
-/*
- * Normalize and split path: Leading and trailing / are removed, multiple
- * / are compactified, .. and . are resolved (.. on the top level is considered
- * identical to .).
- * Examples:
- *     /            ->   { NULL }
- *     foo/../bar   ->   { bar, NULL }
- *     ../../       ->   { NULL }
- *     ./bar/baz/.. ->   { bar, NULL }
- *     foo//bar     ->   { foo, bar, NULL }
- */
-extern char **lxc_normalize_path(const char *path);
+__hidden extern char *lxc_string_replace(const char *needle, const char *replacement,
+					 const char *haystack);
+__hidden extern bool lxc_string_in_array(const char *needle, const char **haystack);
+__hidden extern char *lxc_string_join(const char *sep, const char **parts, bool use_as_prefix);
 
-/* remove multiple slashes from the path, e.g. ///foo//bar -> /foo/bar */
-extern char *lxc_deslashify(const char *path);
-extern char *lxc_append_paths(const char *first, const char *second);
+__hidden extern char *lxc_append_paths(const char *first, const char *second);
 
 /*
  * Note: the following two functions use strtok(), so they will never
  *       consider an empty element, even if two delimiters are next to
  *       each other.
  */
-extern bool lxc_string_in_list(const char *needle, const char *haystack,
-			       char sep);
-extern char **lxc_string_split(const char *string, char sep);
-extern char **lxc_string_split_and_trim(const char *string, char sep);
-extern char **lxc_string_split_quoted(char *string);
+__hidden extern bool lxc_string_in_list(const char *needle, const char *haystack, char sep);
+__hidden extern char **lxc_string_split(const char *string, char sep);
+__hidden extern char **lxc_string_split_and_trim(const char *string, char sep);
+__hidden extern char **lxc_string_split_quoted(char *string);
 
 /* Append string to NULL-terminated string array. */
-extern int lxc_append_string(char ***list, char *entry);
+__hidden extern int lxc_append_string(char ***list, char *entry);
 
 /* Some simple array manipulation utilities */
 typedef void (*lxc_free_fn)(void *);
 typedef void *(*lxc_dup_fn)(void *);
-extern int lxc_grow_array(void ***array, size_t *capacity, size_t new_size,
-			  size_t capacity_increment);
-extern void lxc_free_array(void **array, lxc_free_fn element_free_fn);
-extern size_t lxc_array_len(void **array);
+__hidden extern int lxc_grow_array(void ***array, size_t *capacity, size_t new_size,
+				   size_t capacity_increment);
+__hidden extern void lxc_free_array(void **array, lxc_free_fn element_free_fn);
+__hidden extern size_t lxc_array_len(void **array);
 
-extern void **lxc_append_null_to_array(void **array, size_t count);
-extern void remove_trailing_newlines(char *l);
+__hidden extern void **lxc_append_null_to_array(void **array, size_t count);
+__hidden extern void remove_trailing_newlines(char *l);
 
 /* Helper functions to parse numbers. */
-extern int lxc_safe_uint(const char *numstr, unsigned int *converted);
-extern int lxc_safe_int(const char *numstr, int *converted);
-extern int lxc_safe_long(const char *numstr, long int *converted);
-extern int lxc_safe_long_long(const char *numstr, long long int *converted);
-extern int lxc_safe_ulong(const char *numstr, unsigned long *converted);
-extern int lxc_safe_uint64(const char *numstr, uint64_t *converted, int base);
+__hidden extern int lxc_safe_uint(const char *numstr, unsigned int *converted);
+__hidden extern int lxc_safe_int(const char *numstr, int *converted);
+__hidden extern int lxc_safe_long(const char *numstr, long int *converted);
+__hidden extern int lxc_safe_long_long(const char *numstr, long long int *converted);
+__hidden extern int lxc_safe_ulong(const char *numstr, unsigned long *converted);
+__hidden extern int lxc_safe_uint64(const char *numstr, uint64_t *converted, int base);
+__hidden extern int lxc_safe_int64_residual(const char *restrict numstr,
+					    int64_t *restrict converted,
+					    int base, char *restrict residual,
+					    size_t residual_len);
 /* Handles B, kb, MB, GB. Detects overflows and reports -ERANGE. */
-extern int parse_byte_size_string(const char *s, int64_t *converted);
+__hidden extern int parse_byte_size_string(const char *s, long long int *converted);
 
 /*
  * Concatenate all passed-in strings into one path. Do not fail. If any piece
  * is not prefixed with '/', add a '/'.
  */
-__attribute__((sentinel)) extern char *must_concat(size_t *len, const char *first, ...);
-__attribute__((sentinel)) extern char *must_make_path(const char *first, ...);
-__attribute__((sentinel)) extern char *must_append_path(char *first, ...);
+__hidden __attribute__((sentinel)) extern char *must_concat(size_t *len, const char *first, ...);
+__hidden __attribute__((sentinel)) extern char *must_make_path(const char *first, ...);
+__hidden __attribute__((sentinel)) extern char *must_append_path(char *first, ...);
+
+#define must_make_path_relative(__first__, ...)                                \
+	({                                                                     \
+		char *__ptr__;                                                 \
+		if (*__first__ == '/')                                         \
+			__ptr__ = must_make_path(".", __first__, __VA_ARGS__); \
+		else                                                           \
+			__ptr__ = must_make_path(__first__, __VA_ARGS__);      \
+		__ptr__;                                                       \
+	})
 
 /* Return copy of string @entry. Do not fail. */
-extern char *must_copy_string(const char *entry);
+__hidden extern char *must_copy_string(const char *entry);
 
 /* Re-allocate a pointer, do not fail */
-extern void *must_realloc(void *orig, size_t sz);
+__hidden extern void *must_realloc(void *orig, size_t sz);
 
-extern int lxc_char_left_gc(const char *buffer, size_t len);
+__hidden extern int lxc_char_left_gc(const char *buffer, size_t len);
 
-extern int lxc_char_right_gc(const char *buffer, size_t len);
+__hidden extern int lxc_char_right_gc(const char *buffer, size_t len);
 
-extern char *lxc_trim_whitespace_in_place(char *buffer);
+__hidden extern char *lxc_trim_whitespace_in_place(char *buffer);
 
-extern int lxc_is_line_empty(const char *line);
-extern void remove_trailing_slashes(char *p);
+__hidden extern int lxc_is_line_empty(const char *line);
+__hidden extern void remove_trailing_slashes(char *p);
 
 static inline bool is_empty_string(const char *s)
 {
 	return !s || strcmp(s, "") == 0;
 }
 
+#define maybe_empty(s) ((!is_empty_string(s)) ? (s) : ("(null)"))
+
 static inline ssize_t safe_strlcat(char *src, const char *append, size_t len)
 {
 	size_t new_len;
@@ -118,4 +126,68 @@
 	return (ssize_t)new_len;
 }
 
+static inline bool strnequal(const char *str, const char *eq, size_t len)
+{
+	return strncmp(str, eq, len) == 0;
+}
+
+static inline bool strequal(const char *str, const char *eq)
+{
+	return strcmp(str, eq) == 0;
+}
+
+static inline bool dotdot(const char *str)
+{
+	return !!strstr(str, "..");
+}
+
+static inline bool abspath(const char *str)
+{
+	return *str == '/';
+}
+
+static inline char *deabs(char *str)
+{
+	return str + strspn(str, "/");
+}
+
+#define strnprintf(buf, buf_size, ...)                                                    \
+	({                                                                                \
+		int __ret_strnprintf;                                                     \
+		__ret_strnprintf = snprintf(buf, buf_size, ##__VA_ARGS__);                \
+		if (__ret_strnprintf < 0 || (size_t)__ret_strnprintf >= (size_t)buf_size) \
+			__ret_strnprintf = ret_errno(EIO);				  \
+		__ret_strnprintf;                                                         \
+	})
+
+static inline const char *proc_self_fd(int fd)
+{
+	static const char *invalid_fd_path = "/proc/self/fd/-EBADF";
+	static char bufLXC_PROC_SELF_FD_LEN = "/proc/self/fd/";
+
+	if (strnprintf(buf + STRLITERALLEN("/proc/self/fd/"),
+		       INTTYPE_TO_STRLEN(int), "%d", fd) < 0)
+		return invalid_fd_path;
+
+	return buf;
+}
+
+static inline const char *fdstr(__s64 fd)
+{
+	static const char *fdstr_invalid = "-EBADF";
+	static char bufINTTYPE_TO_STRLEN(__s64);
+
+	if (strnprintf(buf, sizeof(buf), "%lld", (long long signed int)fd) < 0)
+		return fdstr_invalid;
+
+	return buf;
+}
+
+#define lxc_iterate_parts(__iterator, __splitme, __separators)                  \
+	for (char *__p = NULL, *__it = strtok_r(__splitme, __separators, &__p); \
+	     (__iterator = __it);                                               \
+	     __iterator = __it = strtok_r(NULL, __separators, &__p))
+
+__hidden extern char *path_simplify(const char *path);
+
 #endif /* __LXC_STRING_UTILS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/sync.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/sync.c Changed

@@ -1,15 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "start.h"
 #include "sync.h"
@@ -17,117 +15,139 @@
 
 lxc_log_define(sync, lxc);
 
-static int __sync_wait(int fd, int sequence)
+bool sync_wait(int fd, int sequence)
 {
 	int sync = -1;
 	ssize_t ret;
 
 	ret = lxc_read_nointr(fd, &sync, sizeof(sync));
-	if (ret < 0) {
-		SYSERROR("Sync wait failure");
-		return -1;
-	}
+	if (ret < 0)
+		return log_error_errno(false, errno, "Sync wait failure");
 
 	if (!ret)
-		return 0;
+		return true;
 
-	if ((size_t)ret != sizeof(sync)) {
-		ERROR("Unexpected sync size: %zu expected %zu", (size_t)ret, sizeof(sync));
-		return -1;
-	}
+	if ((size_t)ret != sizeof(sync))
+		return log_error(false, "Unexpected sync size: %zu expected %zu", (size_t)ret, sizeof(sync));
 
-	if (sync == LXC_SYNC_ERROR) {
-		ERROR("An error occurred in another process "
-		      "(expected sequence number %d)", sequence);
-		return -1;
-	}
+	if (sync == SYNC_ERROR)
+		return log_error(false, "An error occurred in another process (expected sequence number %d)", sequence);
 
-	if (sync != sequence) {
-		ERROR("Invalid sequence number %d. Expected sequence number %d",
-		      sync, sequence);
-		return -1;
-	}
-	return 0;
+	if (sync != sequence)
+		return log_error(false, "Invalid sequence number %d. Expected sequence number %d", sync, sequence);
+
+	return true;
 }
 
-static int __sync_wake(int fd, int sequence)
+bool sync_wake(int fd, int sequence)
 {
 	int sync = sequence;
 
-	if (lxc_write_nointr(fd, &sync, sizeof(sync)) < 0) {
-		SYSERROR("Sync wake failure");
-		return -1;
-	}
-	return 0;
+	if (lxc_write_nointr(fd, &sync, sizeof(sync)) < 0)
+		return log_error_errno(false, errno, "Sync wake failure");
+
+	return true;
 }
 
-static int __sync_barrier(int fd, int sequence)
+static bool __sync_barrier(int fd, int sequence)
 {
-	if (__sync_wake(fd, sequence))
-		return -1;
-	return __sync_wait(fd, sequence+1);
+	if (!sync_wake(fd, sequence))
+		return false;
+
+	return sync_wait(fd, sequence + 1);
 }
 
-int lxc_sync_barrier_parent(struct lxc_handler *handler, int sequence)
+static inline const char *start_sync_to_string(int state)
 {
+	switch (state) {
+	case START_SYNC_STARTUP:
+		return "startup";
+	case START_SYNC_CONFIGURE:
+		return "configure";
+	case START_SYNC_POST_CONFIGURE:
+		return "post-configure";
+	case START_SYNC_CGROUP_LIMITS:
+		return "cgroup-limits";
+	case START_SYNC_IDMAPPED_MOUNTS:
+		return "idmapped-mounts";
+	case START_SYNC_FDS:
+		return "fds";
+	case START_SYNC_READY_START:
+		return "ready-start";
+	case START_SYNC_RESTART:
+		return "restart";
+	case START_SYNC_POST_RESTART:
+		return "post-restart";
+	case SYNC_ERROR:
+		return "error";
+	default:
+		return "invalid sync state";
+	}
+}
+
+bool lxc_sync_barrier_parent(struct lxc_handler *handler, int sequence)
+{
+	TRACE("Child waking parent with sequence %s and waiting for sequence %s",
+	      start_sync_to_string(sequence), start_sync_to_string(sequence + 1));
 	return __sync_barrier(handler->sync_sock0, sequence);
 }
 
-int lxc_sync_barrier_child(struct lxc_handler *handler, int sequence)
+bool lxc_sync_barrier_child(struct lxc_handler *handler, int sequence)
 {
+	TRACE("Parent waking child with sequence %s and waiting with sequence %s",
+	      start_sync_to_string(sequence), start_sync_to_string(sequence + 1));
 	return __sync_barrier(handler->sync_sock1, sequence);
 }
 
-int lxc_sync_wake_parent(struct lxc_handler *handler, int sequence)
+bool lxc_sync_wake_parent(struct lxc_handler *handler, int sequence)
 {
-	return __sync_wake(handler->sync_sock0, sequence);
+	TRACE("Child waking parent with sequence %s", start_sync_to_string(sequence));
+	return sync_wake(handler->sync_sock0, sequence);
 }
 
-int lxc_sync_wait_parent(struct lxc_handler *handler, int sequence)
+bool lxc_sync_wait_parent(struct lxc_handler *handler, int sequence)
 {
-	return __sync_wait(handler->sync_sock0, sequence);
+	TRACE("Child waiting for parent with sequence %s", start_sync_to_string(sequence));
+	return sync_wait(handler->sync_sock0, sequence);
 }
 
-int lxc_sync_wait_child(struct lxc_handler *handler, int sequence)
+bool lxc_sync_wait_child(struct lxc_handler *handler, int sequence)
 {
-	return __sync_wait(handler->sync_sock1, sequence);
+	TRACE("Parent waiting for child with sequence %s", start_sync_to_string(sequence));
+	return sync_wait(handler->sync_sock1, sequence);
 }
 
-int lxc_sync_wake_child(struct lxc_handler *handler, int sequence)
+bool lxc_sync_wake_child(struct lxc_handler *handler, int sequence)
 {
-	return __sync_wake(handler->sync_sock1, sequence);
+	TRACE("Parent waking child with sequence %s", start_sync_to_string(sequence));
+	return sync_wake(handler->sync_sock1, sequence);
 }
 
-int lxc_sync_init(struct lxc_handler *handler)
+bool lxc_sync_init(struct lxc_handler *handler)
 {
 	int ret;
 
 	ret = socketpair(AF_LOCAL, SOCK_STREAM, 0, handler->sync_sock);
-	if (ret) {
-		SYSERROR("failed to create synchronization socketpair");
-		return -1;
-	}
+	if (ret)
+		return log_error_errno(false, errno, "failed to create synchronization socketpair");
 
 	/* Be sure we don't inherit this after the exec */
-	fcntl(handler->sync_sock0, F_SETFD, FD_CLOEXEC);
+	ret = fcntl(handler->sync_sock0, F_SETFD, FD_CLOEXEC);
+	if (ret < 0)
+		return log_error_errno(false, errno, "Failed to make socket close-on-exec");
 
-	return 0;
+	TRACE("Initialized synchronization infrastructure");
+	return true;
 }
 
 void lxc_sync_fini_child(struct lxc_handler *handler)
 {
-	if (handler->sync_sock0 != -1) {
-		close(handler->sync_sock0);
-		handler->sync_sock0 = -1;
-	}
+	close_prot_errno_disarm(handler->sync_sock0);
 }
 
 void lxc_sync_fini_parent(struct lxc_handler *handler)
 {
-	if (handler->sync_sock1 != -1) {
-		close(handler->sync_sock1);
-		handler->sync_sock1 = -1;
-	}
+	close_prot_errno_disarm(handler->sync_sock1);
 }
 
 void lxc_sync_fini(struct lxc_handler *handler)

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/sync.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/sync.h Changed

@@ -3,30 +3,45 @@
 #ifndef __LXC_SYNC_H
 #define __LXC_SYNC_H
 
+#include "config.h"
+
+#include <stdbool.h>
+
+#include "compiler.h"
+
 struct lxc_handler;
 
-enum {
-	LXC_SYNC_STARTUP,
-	LXC_SYNC_CONFIGURE,
-	LXC_SYNC_POST_CONFIGURE,
-	LXC_SYNC_CGROUP,
-	LXC_SYNC_CGROUP_UNSHARE,
-	LXC_SYNC_CGROUP_LIMITS,
-	LXC_SYNC_READY_START,
-	LXC_SYNC_RESTART,
-	LXC_SYNC_POST_RESTART,
-	LXC_SYNC_ERROR = -1 /* Used to report errors from another process */
+enum /* generic */ {
+	SYNC_ERROR			= -1 /* Used to report errors from another process */
+};
+
+enum /* start */ {
+	START_SYNC_STARTUP		=  0,
+	START_SYNC_CONFIGURE		=  1,
+	START_SYNC_POST_CONFIGURE	=  2,
+	START_SYNC_IDMAPPED_MOUNTS	=  3,
+	START_SYNC_CGROUP_LIMITS	=  4,
+	START_SYNC_FDS			=  5,
+	START_SYNC_READY_START		=  6,
+	START_SYNC_RESTART		=  7,
+	START_SYNC_POST_RESTART		=  8,
+};
+
+enum /* attach */ {
+	ATTACH_SYNC_CGROUP	= 0,
 };
 
-int lxc_sync_init(struct lxc_handler *handler);
-void lxc_sync_fini(struct lxc_handler *);
-void lxc_sync_fini_parent(struct lxc_handler *);
-void lxc_sync_fini_child(struct lxc_handler *);
-int lxc_sync_wake_child(struct lxc_handler *, int);
-int lxc_sync_wait_child(struct lxc_handler *, int);
-int lxc_sync_wake_parent(struct lxc_handler *, int);
-int lxc_sync_wait_parent(struct lxc_handler *, int);
-int lxc_sync_barrier_parent(struct lxc_handler *, int);
-int lxc_sync_barrier_child(struct lxc_handler *, int);
-
-#endif
+__hidden extern bool lxc_sync_init(struct lxc_handler *handler);
+__hidden extern void lxc_sync_fini(struct lxc_handler *);
+__hidden extern void lxc_sync_fini_parent(struct lxc_handler *);
+__hidden extern void lxc_sync_fini_child(struct lxc_handler *);
+__hidden extern bool lxc_sync_wake_child(struct lxc_handler *, int);
+__hidden extern bool lxc_sync_wait_child(struct lxc_handler *, int);
+__hidden extern bool lxc_sync_wake_parent(struct lxc_handler *, int);
+__hidden extern bool lxc_sync_wait_parent(struct lxc_handler *, int);
+__hidden extern bool lxc_sync_barrier_parent(struct lxc_handler *, int);
+__hidden extern bool lxc_sync_barrier_child(struct lxc_handler *, int);
+__hidden extern bool sync_wait(int fd, int sequence);
+__hidden extern bool sync_wake(int fd, int sequence);
+
+#endif /* __LXC_SYNC_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/syscall_numbers.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/syscall_numbers.h Changed

@@ -2,9 +2,8 @@
 #ifndef __LXC_SYSCALL_NUMBERS_H
 #define __LXC_SYSCALL_NUMBERS_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <asm/unistd.h>
 #include <errno.h>
 #include <linux/keyctl.h>
@@ -228,9 +227,6 @@
 		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
 			#define __NR_signalfd 5276
 		#endif
-	#else
-		#define -1
-		#warning "__NR_signalfd not defined for your architecture"
 	#endif
 #endif
 
@@ -563,4 +559,183 @@
 	#endif
 #endif
 
+#ifndef __NR_fsopen
+	#if defined __alpha__
+		#define __NR_fsopen 540
+	#elif defined _MIPS_SIM
+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */
+			#define __NR_fsopen 4430
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */
+			#define __NR_fsopen 6430
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
+			#define __NR_fsopen 5430
+		#endif
+	#elif defined __ia64__
+		#define __NR_fsopen (430 + 1024)
+	#else
+		#define __NR_fsopen 430
+	#endif
+#endif
+
+#ifndef __NR_fspick
+	#if defined __alpha__
+		#define __NR_fspick 543
+	#elif defined _MIPS_SIM
+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */
+			#define __NR_fspick 4433
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */
+			#define __NR_fspick 6433
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
+			#define __NR_fspick 5433
+		#endif
+	#elif defined __ia64__
+		#define __NR_fspick (433 + 1024)
+	#else
+		#define __NR_fspick 433
+	#endif
+#endif
+
+#ifndef __NR_fsconfig
+	#if defined __alpha__
+		#define __NR_fsconfig 541
+	#elif defined _MIPS_SIM
+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */
+			#define __NR_fsconfig 4431
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */
+			#define __NR_fsconfig 6431
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
+			#define __NR_fsconfig 5431
+		#endif
+	#elif defined __ia64__
+		#define __NR_fsconfig (431 + 1024)
+	#else
+		#define __NR_fsconfig 431
+	#endif
+#endif
+
+#ifndef __NR_fsmount
+	#if defined __alpha__
+		#define __NR_fsmount 542
+	#elif defined _MIPS_SIM
+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */
+			#define __NR_fsmount 4432
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */
+			#define __NR_fsmount 6432
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
+			#define __NR_fsmount 5432
+		#endif
+	#elif defined __ia64__
+		#define __NR_fsmount (432 + 1024)
+	#else
+		#define __NR_fsmount 432
+	#endif
+#endif
+
+#ifndef __NR_openat2
+	#if defined __alpha__
+		#define __NR_openat2 547
+	#elif defined _MIPS_SIM
+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */
+			#define __NR_openat2 4437
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */
+			#define __NR_openat2 6437
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
+			#define __NR_openat2 5437
+		#endif
+	#elif defined __ia64__
+		#define __NR_openat2 (437 + 1024)
+	#else
+		#define __NR_openat2 437
+	#endif
+#endif
+
+#ifndef __NR_close_range
+	#if defined __alpha__
+		#define __NR_close_range 546
+	#elif defined _MIPS_SIM
+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */
+			#define __NR_close_range (436 + 4000)
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */
+			#define __NR_close_range (436 + 6000)
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
+			#define __NR_close_range (436 + 5000)
+		#endif
+	#elif defined __ia64__
+		#define __NR_close_range (436 + 1024)
+	#else
+		#define __NR_close_range 436
+	#endif
+#endif
+
+#ifndef __NR_mount_setattr
+	#if defined __alpha__
+		#define __NR_mount_setattr 552
+	#elif defined _MIPS_SIM
+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */
+			#define __NR_mount_setattr (442 + 4000)
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */
+			#define __NR_mount_setattr (442 + 6000)
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
+			#define __NR_mount_setattr (442 + 5000)
+		#endif
+	#elif defined __ia64__
+		#define __NR_mount_setattr (442 + 1024)
+	#else
+		#define __NR_mount_setattr 442
+	#endif
+#endif
+
+#ifndef __NR_personality
+	#if defined __alpha__
+		#define __NR_personality 324
+	#elif defined __m68k__
+		#define __NR_personality 136
+	#elif defined __i386__
+		#define __NR_personality 136
+	#elif defined __x86_64__
+		#define __NR_personality 135
+	#elif defined __arm__
+		#define __NR_personality 136
+	#elif defined __aarch64__
+		#define __NR_personality 92
+	#elif defined __s390__
+		#define __NR_personality 136
+	#elif defined __powerpc__
+		#define __NR_personality 136
+	#elif defined __riscv
+		#define __NR_personality -1
+	#elif defined __sparc__
+		#define __NR_personality 191
+	#elif defined __ia64__
+		#define __NR_personality (116 + 1024)
+	#elif defined _MIPS_SIM
+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */
+			#define __NR_personality (136 + 4000)
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */
+			#define __NR_personality (132 + 6000)
+		#endif
+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */
+			#define __NR_personality (132 + 5000)
+		#endif
+	#else
+		#define -1
+		#warning "__NR_personality not defined for your architecture"
+	#endif
+#endif
+
 #endif /* __LXC_SYSCALL_NUMBERS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/syscall_wrappers.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/syscall_wrappers.h Changed

@@ -3,19 +3,19 @@
 #ifndef __LXC_SYSCALL_WRAPPER_H
 #define __LXC_SYSCALL_WRAPPER_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <asm/unistd.h>
 #include <errno.h>
 #include <linux/keyctl.h>
 #include <sched.h>
 #include <stdint.h>
+#include <sys/prctl.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
+#include "macro.h"
 #include "syscall_numbers.h"
 
 #ifdef HAVE_LINUX_MEMFD_H
@@ -26,6 +26,10 @@
 #include <sys/signalfd.h>
 #endif
 
+#if HAVE_SYS_PERSONALITY_H
+#include <sys/personality.h>
+#endif
+
 typedef int32_t key_serial_t;
 
 #if !HAVE_KEYCTL
@@ -51,7 +55,7 @@
 #define F_SEAL_WRITE 0x0008
 #endif
 
-#ifndef HAVE_MEMFD_CREATE
+#if !HAVE_MEMFD_CREATE
 static inline int memfd_create_lxc(const char *name, unsigned int flags)
 {
 	return syscall(__NR_memfd_create, name, flags);
@@ -61,8 +65,8 @@
 extern int memfd_create(const char *name, unsigned int flags);
 #endif
 
-#ifndef HAVE_PIVOT_ROOT
-static int pivot_root(const char *new_root, const char *put_old)
+#if !HAVE_PIVOT_ROOT
+static inline int pivot_root(const char *new_root, const char *put_old)
 {
 	return syscall(__NR_pivot_root, new_root, put_old);
 }
@@ -71,7 +75,7 @@
 #endif
 
 /* Define sethostname() if missing from the C library */
-#ifndef HAVE_SETHOSTNAME
+#if !HAVE_SETHOSTNAME
 static inline int sethostname(const char *name, size_t len)
 {
 	return syscall(__NR_sethostname, name, len);
@@ -79,14 +83,14 @@
 #endif
 
 /* Define setns() if missing from the C library */
-#ifndef HAVE_SETNS
+#if !HAVE_SETNS
 static inline int setns(int fd, int nstype)
 {
 	return syscall(__NR_setns, fd, nstype);
 }
 #endif
 
-#ifndef HAVE_SYS_SIGNALFD_H
+#if !HAVE_SYS_SIGNALFD_H
 struct signalfd_siginfo {
 	uint32_t ssi_signo;
 	int32_t ssi_errno;
@@ -112,15 +116,17 @@
 	int retval;
 
 	retval = syscall(__NR_signalfd4, fd, mask, _NSIG / 8, flags);
+#ifdef __NR_signalfd
 	if (errno == ENOSYS && flags == 0)
 		retval = syscall(__NR_signalfd, fd, mask, _NSIG / 8);
+#endif
 
 	return retval;
 }
 #endif
 
 /* Define unshare() if missing from the C library */
-#ifndef HAVE_UNSHARE
+#if !HAVE_UNSHARE
 static inline int unshare(int flags)
 {
 	return syscall(__NR_unshare, flags);
@@ -130,35 +136,114 @@
 #endif
 
 /* Define faccessat() if missing from the C library */
-#ifndef HAVE_FACCESSAT
+#if !HAVE_FACCESSAT
 static int faccessat(int __fd, const char *__file, int __type, int __flag)
 {
 	return syscall(__NR_faccessat, __fd, __file, __type, __flag);
 }
 #endif
 
-#ifndef HAVE_MOVE_MOUNT
-static inline int move_mount_lxc(int from_dfd, const char *from_pathname,
-				 int to_dfd, const char *to_pathname,
-				 unsigned int flags)
+#ifndef CLOSE_RANGE_UNSHARE
+#define CLOSE_RANGE_UNSHARE	(1U << 1)
+#endif
+
+#ifndef CLOSE_RANGE_CLOEXEC
+#define CLOSE_RANGE_CLOEXEC	(1U << 2)
+#endif
+
+#if !HAVE_CLOSE_RANGE
+static inline int close_range(unsigned int fd, unsigned int max_fd, unsigned int flags)
 {
-	return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd,
-		       to_pathname, flags);
+	return syscall(__NR_close_range, fd, max_fd, flags);
 }
-#define move_mount move_mount_lxc
-#else
-extern int move_mount(int from_dfd, const char *from_pathname, int to_dfd,
-		      const char *to_pathname, unsigned int flags);
 #endif
 
-#ifndef HAVE_OPEN_TREE
-static inline int open_tree_lxc(int dfd, const char *filename, unsigned int flags)
+#if !HAVE_SYS_PERSONALITY_H
+static inline int personality(unsigned long persona)
 {
-	return syscall(__NR_open_tree, dfd, filename, flags);
+	return syscall(__NR_personality, persona);
 }
-#define open_tree open_tree_lxc
-#else
-extern int open_tree(int dfd, const char *filename, unsigned int flags);
 #endif
 
+/* arg1 of prctl() */
+#ifndef PR_SCHED_CORE
+#define PR_SCHED_CORE 62
+#endif
+
+/* arg2 of prctl() */
+#ifndef PR_SCHED_CORE_GET
+#define PR_SCHED_CORE_GET 0
+#endif
+
+#ifndef PR_SCHED_CORE_CREATE
+#define PR_SCHED_CORE_CREATE 1 /* create unique core_sched cookie */
+#endif
+
+#ifndef PR_SCHED_CORE_SHARE_TO
+#define PR_SCHED_CORE_SHARE_TO 2 /* push core_sched cookie to pid */
+#endif
+
+#ifndef PR_SCHED_CORE_SHARE_FROM
+#define PR_SCHED_CORE_SHARE_FROM 3 /* pull core_sched cookie to pid */
+#endif
+
+#ifndef PR_SCHED_CORE_MAX
+#define PR_SCHED_CORE_MAX 4
+#endif
+
+/* arg3 of prctl() */
+#ifndef PR_SCHED_CORE_SCOPE_THREAD
+#define PR_SCHED_CORE_SCOPE_THREAD 0
+#endif
+
+#ifndef PR_SCHED_CORE_SCOPE_THREAD_GROUP
+#define PR_SCHED_CORE_SCOPE_THREAD_GROUP 1
+#endif
+
+#ifndef PR_SCHED_CORE_SCOPE_PROCESS_GROUP
+#define PR_SCHED_CORE_SCOPE_PROCESS_GROUP 2
+#endif
+
+#define INVALID_SCHED_CORE_COOKIE ((__u64)-1)
+
+static inline bool core_scheduling_cookie_valid(__u64 cookie)
+{
+	return (cookie > 0) && (cookie != INVALID_SCHED_CORE_COOKIE);
+}
+
+static inline int core_scheduling_cookie_get(pid_t pid, __u64 *cookie)
+{
+	int ret;
+
+	if (!cookie)
+		return ret_errno(EINVAL);
+
+	ret = prctl(PR_SCHED_CORE, PR_SCHED_CORE_GET, pid,
+		    PR_SCHED_CORE_SCOPE_THREAD, (unsigned long)cookie);
+	if (ret) {
+		*cookie = INVALID_SCHED_CORE_COOKIE;
+		return -errno;
+	}
+
+	return 0;
+}
+
+static inline int core_scheduling_cookie_create_threadgroup(pid_t pid)
+{
+	int ret;
+
+	ret = prctl(PR_SCHED_CORE, PR_SCHED_CORE_CREATE, pid,
+		    PR_SCHED_CORE_SCOPE_THREAD_GROUP, 0);
+	if (ret)
+		return -errno;
+
+	return 0;
+}
+
+static inline int core_scheduling_cookie_share_with(pid_t pid)
+{
+	return prctl(PR_SCHED_CORE, PR_SCHED_CORE_SHARE_FROM, pid,
+		     PR_SCHED_CORE_SCOPE_THREAD, 0);
+}
+
 #endif /* __LXC_SYSCALL_WRAPPER_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/terminal.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/terminal.c Changed

@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
-#include <lxc/lxccontainer.h>
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
@@ -15,24 +13,26 @@
 #include <termios.h>
 #include <unistd.h>
 
+#include "lxc.h"
+
 #include "af_unix.h"
 #include "caps.h"
 #include "commands.h"
 #include "conf.h"
-#include "config.h"
 #include "log.h"
 #include "lxclock.h"
 #include "mainloop.h"
 #include "memory_utils.h"
+#include "open_utils.h"
 #include "start.h"
 #include "syscall_wrappers.h"
 #include "terminal.h"
 #include "utils.h"
 
-#if HAVE_PTY_H
+#if HAVE_OPENPTY
 #include <pty.h>
 #else
-#include <../include/openpty.h>
+#include "openpty.h"
 #endif
 
 #define LXC_TERMINAL_BUFFER_SIZE 1024
@@ -65,11 +65,11 @@
 
 static void lxc_terminal_winch(struct lxc_terminal_state *ts)
 {
-	lxc_terminal_winsz(ts->stdinfd, ts->ptmxfd);
+	lxc_terminal_winsz(ts->stdinfd, ts->ptxfd);
 }
 
 int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
-			     struct lxc_epoll_descr *descr)
+			     struct lxc_async_descr *descr)
 {
 	ssize_t ret;
 	struct signalfd_siginfo siginfo;
@@ -105,7 +105,7 @@
 
 	memset(ts, 0, sizeof(*ts));
 	ts->stdinfd = srcfd;
-	ts->ptmxfd = dstfd;
+	ts->ptxfd = dstfd;
 	ts->sigfd = -1;
 
 	ret = sigemptyset(&mask);
@@ -147,6 +147,16 @@
 	return move_ptr(ts);
 }
 
+int lxc_terminal_signal_sigmask_safe_blocked(struct lxc_terminal *terminal)
+{
+	struct lxc_terminal_state *state = terminal->tty_state;
+
+	if (!state)
+		return 0;
+
+	return pthread_sigmask(SIG_SETMASK, &state->oldmask, NULL);
+}
+
 /**
  * lxc_terminal_signal_fini: uninstall signal handler
  *
@@ -199,8 +209,8 @@
 	len = strlen(terminal->log_path) + sizeof(".1");
 	tmp = must_realloc(NULL, len);
 
-	ret = snprintf(tmp, len, "%s.1", terminal->log_path);
-	if (ret < 0 || (size_t)ret >= len)
+	ret = strnprintf(tmp, len, "%s.1", terminal->log_path);
+	if (ret < 0)
 		return -EFBIG;
 
 	close(terminal->log_fd);
@@ -241,7 +251,7 @@
 		/* This isn't a regular file. so rotating the file seems a
 		 * dangerous thing to do, size limits are also very
 		 * questionable. Let's not risk anything and tell the user that
-		 * he's requesting us to do weird stuff.
+		 * they're requesting us to do weird stuff.
 		 */
 		if (terminal->log_rotate > 0 || terminal->log_size > 0)
 			return -EINVAL;
@@ -260,7 +270,7 @@
 		if (ret < 0)
 			return ret;
 
-		if (bytes_read <= terminal->log_size)
+		if ((uint64_t)bytes_read <= terminal->log_size)
 			return lxc_write_nointr(terminal->log_fd, buf, bytes_read);
 
 		/* Write as much as we can into the buffer and loose the rest. */
@@ -291,7 +301,7 @@
 	if (ret < 0)
 		return ret;
 
-	if (terminal->log_size < bytes_read) {
+	if (terminal->log_size < (uint64_t)bytes_read) {
 		/* Well, this is unfortunate because it means that there is more
 		 * to write than the user has granted us space. There are
 		 * multiple ways to handle this but let's use the simplest one:
@@ -318,48 +328,27 @@
 	return bytes_read;
 }
 
-int lxc_terminal_io_cb(int fd, uint32_t events, void *data,
-		       struct lxc_epoll_descr *descr)
+static int lxc_terminal_ptx_io(struct lxc_terminal *terminal)
 {
-	struct lxc_terminal *terminal = data;
 	char bufLXC_TERMINAL_BUFFER_SIZE;
 	int r, w, w_log, w_rbuf;
 
-	w = r = lxc_read_nointr(fd, buf, sizeof(buf));
-	if (r <= 0) {
-		INFO("Terminal client on fd %d has exited", fd);
-		lxc_mainloop_del_handler(descr, fd);
-
-		if (fd == terminal->ptmx) {
-			terminal->ptmx = -EBADF;
-		} else if (fd == terminal->peer) {
-			lxc_terminal_signal_fini(terminal);
-			terminal->peer = -EBADF;
-		} else {
-			ERROR("Handler received unexpected file descriptor");
-		}
-		close(fd);
+	w = r = lxc_read_nointr(terminal->ptx, buf, sizeof(buf));
+	if (r <= 0)
+		return -1;
 
-		return LXC_MAINLOOP_CLOSE;
-	}
+	w_rbuf = w_log = 0;
+	/* write to peer first */
+	if (terminal->peer >= 0)
+		w = lxc_write_nointr(terminal->peer, buf, r);
 
-	if (fd == terminal->peer)
-		w = lxc_write_nointr(terminal->ptmx, buf, r);
+	/* write to terminal ringbuffer */
+	if (terminal->buffer_size > 0)
+		w_rbuf = lxc_ringbuf_write(&terminal->ringbuf, buf, r);
 
-	w_rbuf = w_log = 0;
-	if (fd == terminal->ptmx) {
-		/* write to peer first */
-		if (terminal->peer >= 0)
-			w = lxc_write_nointr(terminal->peer, buf, r);
-
-		/* write to terminal ringbuffer */
-		if (terminal->buffer_size > 0)
-			w_rbuf = lxc_ringbuf_write(&terminal->ringbuf, buf, r);
-
-		/* write to terminal log */
-		if (terminal->log_fd >= 0)
-			w_log = lxc_terminal_write_log_file(terminal, buf, r);
-	}
+	/* write to terminal log */
+	if (terminal->log_fd >= 0)
+		w_log = lxc_terminal_write_log_file(terminal, buf, r);
 
 	if (w != r)
 		WARN("Short write on terminal r:%d != w:%d", r, w);
@@ -372,6 +361,52 @@
 	if (w_log < 0)
 		TRACE("Failed to write %d bytes to terminal log", r);
 
+	return 0;
+}
+
+static int lxc_terminal_peer_io(struct lxc_terminal *terminal)
+{
+	char bufLXC_TERMINAL_BUFFER_SIZE;
+	int r, w;
+
+	w = r = lxc_read_nointr(terminal->peer, buf, sizeof(buf));
+	if (r <= 0)
+		return -1;
+
+	w = lxc_write_nointr(terminal->ptx, buf, r);
+	if (w != r)
+		WARN("Short write on terminal r:%d != w:%d", r, w);
+
+	return 0;
+}
+
+static int lxc_terminal_ptx_io_handler(int fd, uint32_t events, void *data,
+				       struct lxc_async_descr *descr)
+{
+	struct lxc_terminal *terminal = data;
+	int ret;
+
+	ret = lxc_terminal_ptx_io(data);
+	if (ret < 0)
+		return log_info(LXC_MAINLOOP_CLOSE,
+				"Terminal client on fd %d has exited",
+				terminal->ptx);
+
+	return LXC_MAINLOOP_CONTINUE;
+}
+
+static int lxc_terminal_peer_io_handler(int fd, uint32_t events, void *data,
+					struct lxc_async_descr *descr)
+{
+	struct lxc_terminal *terminal = data;
+	int ret;
+
+	ret = lxc_terminal_peer_io(data);
+	if (ret < 0)
+		return log_info(LXC_MAINLOOP_CLOSE,
+				"Terminal client on fd %d has exited",
+				terminal->peer);
+
 	return LXC_MAINLOOP_CONTINUE;
 }
 
@@ -381,7 +416,9 @@
 
 	if (terminal->peer >= 0) {
 		ret = lxc_mainloop_add_handler(terminal->descr, terminal->peer,
-					       lxc_terminal_io_cb, terminal);
+					       lxc_terminal_peer_io_handler,
+					       default_cleanup_handler,
+					       terminal, "lxc_terminal_peer_io_handler");
 		if (ret < 0) {
 			WARN("Failed to add terminal peer handler to mainloop");
 			return -1;
@@ -391,8 +428,12 @@
 	if (!terminal->tty_state || terminal->tty_state->sigfd < 0)
 		return 0;
 
-	ret = lxc_mainloop_add_handler(terminal->descr, terminal->tty_state->sigfd,
-				       lxc_terminal_signalfd_cb, terminal->tty_state);
+	ret = lxc_mainloop_add_handler(terminal->descr,
+				       terminal->tty_state->sigfd,
+				       lxc_terminal_signalfd_cb,
+				       default_cleanup_handler,
+				       terminal->tty_state,
+				       "lxc_terminal_signalfd_cb");
 	if (ret < 0) {
 		WARN("Failed to add signal handler to mainloop");
 		return -1;
@@ -401,21 +442,22 @@
 	return 0;
 }
 
-int lxc_terminal_mainloop_add(struct lxc_epoll_descr *descr,
+int lxc_terminal_mainloop_add(struct lxc_async_descr *descr,
 			      struct lxc_terminal *terminal)
 {
 	int ret;
 
-	if (terminal->ptmx < 0) {
+	if (terminal->ptx < 0) {
 		INFO("Terminal is not initialized");
 		return 0;
 	}
 
-	ret = lxc_mainloop_add_handler(descr, terminal->ptmx,
-				       lxc_terminal_io_cb, terminal);
+	ret = lxc_mainloop_add_handler(descr, terminal->ptx,
+				       lxc_terminal_ptx_io_handler,
+				       default_cleanup_handler,
+				       terminal, "lxc_terminal_ptx_io_handler");
 	if (ret < 0) {
-		ERROR("Failed to add handler for terminal ptmx fd %d to "
-		      "mainloop", terminal->ptmx);
+		ERROR("Failed to add handler for terminal ptx fd %d to mainloop", terminal->ptx);
 		return -1;
 	}
 
@@ -464,7 +506,7 @@
 #ifdef IEXTEN
 	newtios.c_lflag &= ~IEXTEN;
 #endif
-	newtios.c_oflag &= ~ONLCR;
+	newtios.c_oflag |= ONLCR;
 	newtios.c_oflag |= OPOST;
 	newtios.c_ccVMIN = 1;
 	newtios.c_ccVTIME = 0;
@@ -483,11 +525,11 @@
 {
 	lxc_terminal_signal_fini(terminal);
 
-	close(terminal->proxy.ptmx);
-	terminal->proxy.ptmx = -1;
+	close(terminal->proxy.ptx);
+	terminal->proxy.ptx = -1;
 
-	close(terminal->proxy.pts);
-	terminal->proxy.pts = -1;
+	close(terminal->proxy.pty);
+	terminal->proxy.pty = -1;
 
 	terminal->proxy.busy = -1;
 
@@ -503,7 +545,7 @@
 	struct termios oldtermio;
 	struct lxc_terminal_state *ts;
 
-	if (terminal->ptmx < 0) {
+	if (terminal->ptx < 0) {
 		ERROR("Terminal not set up");
 		return -1;
 	}
@@ -519,51 +561,51 @@
 	}
 
 	/* This is the proxy terminal that will be given to the client, and
-	 * that the real terminal ptmx will send to / recv from.
+	 * that the real terminal ptx will send to / recv from.
 	 */
-	ret = openpty(&terminal->proxy.ptmx, &terminal->proxy.pts, NULL,
+	ret = openpty(&terminal->proxy.ptx, &terminal->proxy.pty, NULL,
 		      NULL, NULL);
 	if (ret < 0) {
 		SYSERROR("Failed to open proxy terminal");
 		return -1;
 	}
 
-	ret = ttyname_r(terminal->proxy.pts, terminal->proxy.name,
+	ret = ttyname_r(terminal->proxy.pty, terminal->proxy.name,
 			sizeof(terminal->proxy.name));
 	if (ret < 0) {
-		SYSERROR("Failed to retrieve name of proxy terminal pts");
+		SYSERROR("Failed to retrieve name of proxy terminal pty");
 		goto on_error;
 	}
 
-	ret = fd_cloexec(terminal->proxy.ptmx, true);
+	ret = fd_cloexec(terminal->proxy.ptx, true);
 	if (ret < 0) {
-		SYSERROR("Failed to set FD_CLOEXEC flag on proxy terminal ptmx");
+		SYSERROR("Failed to set FD_CLOEXEC flag on proxy terminal ptx");
 		goto on_error;
 	}
 
-	ret = fd_cloexec(terminal->proxy.pts, true);
+	ret = fd_cloexec(terminal->proxy.pty, true);
 	if (ret < 0) {
-		SYSERROR("Failed to set FD_CLOEXEC flag on proxy terminal pts");
+		SYSERROR("Failed to set FD_CLOEXEC flag on proxy terminal pty");
 		goto on_error;
 	}
 
-	ret = lxc_setup_tios(terminal->proxy.pts, &oldtermio);
+	ret = lxc_setup_tios(terminal->proxy.pty, &oldtermio);
 	if (ret < 0)
 		goto on_error;
 
-	ts = lxc_terminal_signal_init(terminal->proxy.ptmx, terminal->ptmx);
+	ts = lxc_terminal_signal_init(terminal->proxy.ptx, terminal->ptx);
 	if (!ts)
 		goto on_error;
 
 	terminal->tty_state = ts;
-	terminal->peer = terminal->proxy.pts;
+	terminal->peer = terminal->proxy.pty;
 	terminal->proxy.busy = sockfd;
 	ret = lxc_terminal_mainloop_add_peer(terminal);
 	if (ret < 0)
 		goto on_error;
 
-	NOTICE("Opened proxy terminal with ptmx fd %d and pts fd %d",
-	       terminal->proxy.ptmx, terminal->proxy.pts);
+	NOTICE("Opened proxy terminal with ptx fd %d and pty fd %d",
+	       terminal->proxy.ptx, terminal->proxy.pty);
 	return 0;
 
 on_error:
@@ -573,8 +615,8 @@
 
 int lxc_terminal_allocate(struct lxc_conf *conf, int sockfd, int *ttyreq)
 {
-	int ttynum;
-	int ptmxfd = -1;
+	size_t ttynum;
+	int ptxfd = -1;
 	struct lxc_tty_info *ttys = &conf->ttys;
 	struct lxc_terminal *terminal = &conf->console;
 
@@ -585,12 +627,12 @@
 		if (ret < 0)
 			goto out;
 
-		ptmxfd = terminal->proxy.ptmx;
+		ptxfd = terminal->proxy.ptx;
 		goto out;
 	}
 
 	if (*ttyreq > 0) {
-		if (*ttyreq > ttys->max)
+		if ((size_t)*ttyreq > ttys->max)
 			goto out;
 
 		if (ttys->tty*ttyreq - 1.busy >= 0)
@@ -610,30 +652,29 @@
 	if (ttynum > ttys->max)
 		goto out;
 
-	*ttyreq = ttynum;
+	*ttyreq = (int)ttynum;
 
 out_tty:
 	ttys->ttyttynum - 1.busy = sockfd;
-	ptmxfd = ttys->ttyttynum - 1.ptmx;
+	ptxfd = ttys->ttyttynum - 1.ptx;
 
 out:
-	return ptmxfd;
+	return ptxfd;
 }
 
 void lxc_terminal_free(struct lxc_conf *conf, int fd)
 {
-	int i;
 	struct lxc_tty_info *ttys = &conf->ttys;
 	struct lxc_terminal *terminal = &conf->console;
 
-	for (i = 0; i < ttys->max; i++)
+	for (size_t i = 0; i < ttys->max; i++)
 		if (ttys->ttyi.busy == fd)
 			ttys->ttyi.busy = -1;
 
 	if (terminal->proxy.busy != fd)
 		return;
 
-	lxc_mainloop_del_handler(terminal->descr, terminal->proxy.pts);
+	lxc_mainloop_del_handler(terminal->descr, terminal->proxy.pty);
 	lxc_terminal_peer_proxy_free(terminal);
 }
 
@@ -666,14 +707,14 @@
 		goto on_error_free_tios;
 	}
 
-	ts = lxc_terminal_signal_init(terminal->peer, terminal->ptmx);
+	ts = lxc_terminal_signal_init(terminal->peer, terminal->ptx);
 	terminal->tty_state = ts;
 	if (!ts) {
 		WARN("Failed to install signal handler");
 		goto on_error_free_tios;
 	}
 
-	lxc_terminal_winsz(terminal->peer, terminal->ptmx);
+	lxc_terminal_winsz(terminal->peer, terminal->ptx);
 
 	terminal->tios = malloc(sizeof(*terminal->tios));
 	if (!terminal->tios)
@@ -749,13 +790,15 @@
 		close(terminal->peer);
 	terminal->peer = -1;
 
-	if (terminal->ptmx >= 0)
-		close(terminal->ptmx);
-	terminal->ptmx = -1;
+	if (terminal->ptx >= 0)
+		close(terminal->ptx);
+	terminal->ptx = -1;
+
+	if (terminal->pty >= 0)
+		close(terminal->pty);
+	terminal->pty = -1;
 
-	if (terminal->pts >= 0)
-		close(terminal->pts);
-	terminal->pts = -1;
+	terminal->pty_nr = -1;
 
 	if (terminal->log_fd >= 0)
 		close(terminal->log_fd);
@@ -764,7 +807,7 @@
 
 /**
  * Note that this function needs to run before the mainloop starts. Since we
- * register a handler for the terminal's ptmxfd when we create the mainloop
+ * register a handler for the terminal's ptxfd when we create the mainloop
  * the terminal handler needs to see an allocated ringbuffer.
  */
 static int lxc_terminal_create_ringbuf(struct lxc_terminal *terminal)
@@ -828,31 +871,61 @@
 	return 0;
 }
 
-int lxc_terminal_create(struct lxc_terminal *terminal)
+static int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *terminal)
 {
 	int ret;
 
-	ret = openpty(&terminal->ptmx, &terminal->pts, NULL, NULL, NULL);
+	if (list_empty(&c->id_map))
+		return 0;
+
+	if (is_empty_string(terminal->name) && terminal->pty < 0)
+		return 0;
+
+	if (terminal->pty >= 0)
+		ret = userns_exec_mapped_root(NULL, terminal->pty, c);
+	else
+		ret = userns_exec_mapped_root(terminal->name, -EBADF, c);
+	if (ret < 0)
+		return log_error(-1, "Failed to chown terminal %d(%s)", terminal->pty,
+				 !is_empty_string(terminal->name) ? terminal->name : "(null)");
+
+	TRACE("Chowned terminal %d(%s)", terminal->pty,
+	      !is_empty_string(terminal->name) ? terminal->name : "(null)");
+
+	return 0;
+}
+
+static int lxc_terminal_create_foreign(struct lxc_conf *conf, struct lxc_terminal *terminal)
+{
+	int ret;
+
+	ret = openpty(&terminal->ptx, &terminal->pty, NULL, NULL, NULL);
 	if (ret < 0) {
 		SYSERROR("Failed to open terminal");
 		return -1;
 	}
 
-	ret = ttyname_r(terminal->pts, terminal->name, sizeof(terminal->name));
+	ret = lxc_terminal_map_ids(conf, terminal);
 	if (ret < 0) {
-		SYSERROR("Failed to retrieve name of terminal pts");
+		SYSERROR("Failed to change ownership of terminal multiplexer device");
 		goto err;
 	}
 
-	ret = fd_cloexec(terminal->ptmx, true);
+	ret = ttyname_r(terminal->pty, terminal->name, sizeof(terminal->name));
 	if (ret < 0) {
-		SYSERROR("Failed to set FD_CLOEXEC flag on terminal ptmx");
+		SYSERROR("Failed to retrieve name of terminal pty");
 		goto err;
 	}
 
-	ret = fd_cloexec(terminal->pts, true);
+	ret = fd_cloexec(terminal->ptx, true);
 	if (ret < 0) {
-		SYSERROR("Failed to set FD_CLOEXEC flag on terminal pts");
+		SYSERROR("Failed to set FD_CLOEXEC flag on terminal ptx");
+		goto err;
+	}
+
+	ret = fd_cloexec(terminal->pty, true);
+	if (ret < 0) {
+		SYSERROR("Failed to set FD_CLOEXEC flag on terminal pty");
 		goto err;
 	}
 
@@ -869,19 +942,176 @@
 	return -ENODEV;
 }
 
-int lxc_terminal_setup(struct lxc_conf *conf)
+int lxc_devpts_terminal(int devpts_fd, int *ret_ptx, int *ret_pty,
+			int *ret_pty_nr, bool require_tiocgptpeer)
 {
+	__do_close int fd_devpts = -EBADF, fd_ptx = -EBADF,
+		       fd_opath_pty = -EBADF, fd_pty = -EBADF;
+	int pty_nr = -1;
 	int ret;
-	struct lxc_terminal *terminal = &conf->console;
 
-	if (terminal->path && strcmp(terminal->path, "none") == 0) {
-		INFO("No terminal requested");
+	/*
+	 * When we aren't told what devpts instance to allocate from we assume
+	 * it is the one in the caller's mount namespace.
+	 * This poses a slight complication, a lot of distros will change
+	 * permissions on /dev/ptmx so it can be opened by unprivileged users
+	 * but will not change permissions on /dev/pts/ptmx itself. In
+	 * addition, /dev/ptmx can either be a symlink, a bind-mount, or a
+	 * separate device node. So we need to allow for fairly lax lookup.
+	 */
+	if (devpts_fd < 0)
+		fd_ptx = open_at(-EBADF, "/dev/ptmx", PROTECT_OPEN_RW & ~O_NOFOLLOW,
+				 PROTECT_LOOKUP_ABSOLUTE_XDEV_SYMLINKS, 0);
+	else
+		fd_ptx = open_beneath(devpts_fd, "ptmx", O_RDWR | O_NOCTTY | O_CLOEXEC);
+	if (fd_ptx < 0) {
+		if (errno == ENOSPC)
+			return systrace("Exceeded number of allocatable terminals");
+
+		return syswarn("Failed to open terminal multiplexer device");
+	}
+
+	if (devpts_fd < 0) {
+		fd_devpts = open_at(-EBADF, "/dev/pts", PROTECT_OPATH_DIRECTORY,
+				    PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+		if (fd_devpts < 0)
+			return syswarn("Failed to open devpts instance");
+
+		if (!same_device(fd_devpts, "ptmx", fd_ptx, ""))
+			return syswarn("The acquired ptmx devices don't match");
+		devpts_fd = fd_devpts;
+	}
+
+	ret = unlockpt(fd_ptx);
+	if (ret < 0)
+		return syswarn_set(-ENODEV, "Failed to unlock multiplexer device device");
+
+	fd_pty = ioctl(fd_ptx, TIOCGPTPEER, O_RDWR | O_NOCTTY | O_CLOEXEC);
+	if (fd_pty < 0) {
+		switch (errno) {
+		case ENOTTY:
+			SYSTRACE("Pure fd-based terminal allocation not possible");
+			break;
+		case ENOSPC:
+			SYSTRACE("Exceeded number of allocatable terminals");
+			break;
+		default:
+			SYSWARN("Failed to allocate new pty device");
+			return -errno;
+		}
+
+		/* The caller tells us that they trust the devpts instance. */
+		if (require_tiocgptpeer)
+			return ret_errno(ENODEV);
+	}
+
+	ret = ioctl(fd_ptx, TIOCGPTN, &pty_nr);
+	if (ret)
+		return syswarn_set(-ENODEV, "Failed to retrieve name of terminal pty");
+
+	if (fd_pty < 0) {
+		/*
+		 * If we end up it means that TIOCGPTPEER isn't supported but
+		 * the caller told us they trust the devpts instance so we use
+		 * the pty nr to open the pty side.
+		 */
+		fd_pty = open_at(devpts_fd, fdstr(pty_nr), PROTECT_OPEN_RW,
+				 PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+		if (fd_pty < 0)
+			return syswarn_set(-ENODEV, "Failed to open terminal pty fd by path %d/%d",
+					   devpts_fd, pty_nr);
+	} else {
+		fd_opath_pty = open_at(devpts_fd, fdstr(pty_nr), PROTECT_OPATH_FILE,
+				       PROTECT_LOOKUP_ABSOLUTE_XDEV, 0);
+		if (fd_opath_pty < 0)
+			return syswarn_set(-ENODEV, "Failed to open terminal pty fd by path %d/%d",
+					   devpts_fd, pty_nr);
+
+		if (!same_file_lax(fd_pty, fd_opath_pty))
+			return syswarn_set(-ENODEV, "Terminal file descriptor changed");
+	}
+
+	*ret_ptx = move_fd(fd_ptx);
+	*ret_pty = move_fd(fd_pty);
+	*ret_pty_nr = pty_nr;
+	return 0;
+}
+
+int lxc_terminal_parent(struct lxc_conf *conf)
+{
+	struct lxc_terminal *console = &conf->console;
+	int ret;
+
+	if (!wants_console(&conf->console))
+		return 0;
+
+	/* Allocate console from the container's devpts. */
+	if (conf->pty_max > 1)
 		return 0;
+
+	/* Allocate console for the container from the host's devpts. */
+	ret = lxc_devpts_terminal(-EBADF, &console->ptx, &console->pty,
+				  &console->pty_nr, false);
+	if (ret < 0)
+		return syserror("Failed to allocate console");
+
+	ret = strnprintf(console->name, sizeof(console->name),
+			 "/dev/pts/%d", console->pty_nr);
+	if (ret < 0)
+		return syserror("Failed to create console path");
+
+	return lxc_terminal_map_ids(conf, &conf->console);
+}
+
+static int lxc_terminal_create_native(const char *name, const char *lxcpath,
+				      struct lxc_terminal *terminal)
+{
+	__do_close int devpts_fd = -EBADF;
+	int ret;
+
+	devpts_fd = lxc_cmd_get_devpts_fd(name, lxcpath);
+	if (devpts_fd < 0)
+		return sysinfo("Failed to receive devpts fd");
+
+	ret = lxc_devpts_terminal(devpts_fd, &terminal->ptx, &terminal->pty,
+				  &terminal->pty_nr, true);
+	if (ret < 0)
+		return ret;
+
+	ret = strnprintf(terminal->name, sizeof(terminal->name),
+			 "/dev/pts/%d", terminal->pty_nr);
+	if (ret < 0)
+		return syserror("Failed to create path");
+
+	ret = lxc_terminal_peer_default(terminal);
+	if (ret < 0) {
+		lxc_terminal_delete(terminal);
+		return syswarn_set(-ENODEV, "Failed to allocate proxy terminal");
 	}
 
-	ret = lxc_terminal_create(terminal);
+	return 0;
+}
+
+int lxc_terminal_create(const char *name, const char *lxcpath,
+			struct lxc_conf *conf, struct lxc_terminal *terminal)
+{
+	if (!lxc_terminal_create_native(name, lxcpath, terminal))
+		return 0;
+
+	return lxc_terminal_create_foreign(conf, terminal);
+}
+
+int lxc_terminal_setup(struct lxc_conf *conf)
+{
+	int ret;
+	struct lxc_terminal *terminal = &conf->console;
+
+	if (terminal->path && strequal(terminal->path, "none"))
+		return log_info(0, "No terminal requested");
+
+	ret = lxc_terminal_peer_default(terminal);
 	if (ret < 0)
-		return -1;
+		goto err;
 
 	ret = lxc_terminal_create_log_file(terminal);
 	if (ret < 0)
@@ -930,7 +1160,7 @@
 }
 
 int lxc_terminal_stdin_cb(int fd, uint32_t events, void *cbdata,
-			  struct lxc_epoll_descr *descr)
+			  struct lxc_async_descr *descr)
 {
 	int ret;
 	char c;
@@ -956,21 +1186,21 @@
 		ts->saw_escape = 0;
 	}
 
-	ret = lxc_write_nointr(ts->ptmxfd, &c, 1);
+	ret = lxc_write_nointr(ts->ptxfd, &c, 1);
 	if (ret <= 0)
 		return LXC_MAINLOOP_CLOSE;
 
 	return LXC_MAINLOOP_CONTINUE;
 }
 
-int lxc_terminal_ptmx_cb(int fd, uint32_t events, void *cbdata,
-			   struct lxc_epoll_descr *descr)
+int lxc_terminal_ptx_cb(int fd, uint32_t events, void *cbdata,
+			   struct lxc_async_descr *descr)
 {
 	int r, w;
 	char bufLXC_TERMINAL_BUFFER_SIZE;
 	struct lxc_terminal_state *ts = cbdata;
 
-	if (fd != ts->ptmxfd)
+	if (fd != ts->ptxfd)
 		return LXC_MAINLOOP_CLOSE;
 
 	r = lxc_read_nointr(fd, buf, sizeof(buf));
@@ -984,17 +1214,17 @@
 	return LXC_MAINLOOP_CONTINUE;
 }
 
-int lxc_terminal_getfd(struct lxc_container *c, int *ttynum, int *ptmxfd)
+int lxc_terminal_getfd(struct lxc_container *c, int *ttynum, int *ptxfd)
 {
-	return lxc_cmd_console(c->name, ttynum, ptmxfd, c->config_path);
+	return lxc_cmd_get_tty_fd(c->name, ttynum, ptxfd, c->config_path);
 }
 
 int lxc_console(struct lxc_container *c, int ttynum,
 		int stdinfd, int stdoutfd, int stderrfd,
 		int escape)
 {
-	int ptmxfd, ret, ttyfd;
-	struct lxc_epoll_descr descr;
+	int ptxfd, ret, ttyfd;
+	struct lxc_async_descr descr;
 	struct termios oldtios;
 	struct lxc_terminal_state *ts;
 	struct lxc_terminal terminal = {
@@ -1002,7 +1232,7 @@
 	};
 	int istty = 0;
 
-	ttyfd = lxc_cmd_console(c->name, &ttynum, &ptmxfd, c->config_path);
+	ttyfd = lxc_cmd_get_tty_fd(c->name, &ttynum, &ptxfd, c->config_path);
 	if (ttyfd < 0)
 		return -1;
 
@@ -1010,7 +1240,7 @@
 	if (ret < 0)
 		TRACE("Process is already group leader");
 
-	ts = lxc_terminal_signal_init(stdinfd, ptmxfd);
+	ts = lxc_terminal_signal_init(stdinfd, ptxfd);
 	if (!ts) {
 		ret = -1;
 		goto close_fds;
@@ -1021,8 +1251,8 @@
 
 	istty = isatty(stdinfd);
 	if (istty) {
-		lxc_terminal_winsz(stdinfd, ptmxfd);
-		lxc_terminal_winsz(ts->stdinfd, ts->ptmxfd);
+		lxc_terminal_winsz(stdinfd, ptxfd);
+		lxc_terminal_winsz(ts->stdinfd, ts->ptxfd);
 	} else {
 		INFO("File descriptor %d does not refer to a terminal", stdinfd);
 	}
@@ -1035,7 +1265,9 @@
 
 	if (ts->sigfd != -1) {
 		ret = lxc_mainloop_add_handler(&descr, ts->sigfd,
-					       lxc_terminal_signalfd_cb, ts);
+					       lxc_terminal_signalfd_cb,
+					       default_cleanup_handler,
+					       ts, "lxc_terminal_signalfd_cb");
 		if (ret < 0) {
 			ERROR("Failed to add signal handler to mainloop");
 			goto close_mainloop;
@@ -1043,16 +1275,20 @@
 	}
 
 	ret = lxc_mainloop_add_handler(&descr, ts->stdinfd,
-				       lxc_terminal_stdin_cb, ts);
+				       lxc_terminal_stdin_cb,
+				       default_cleanup_handler,
+				       ts, "lxc_terminal_stdin_cb");
 	if (ret < 0) {
 		ERROR("Failed to add stdin handler");
 		goto close_mainloop;
 	}
 
-	ret = lxc_mainloop_add_handler(&descr, ts->ptmxfd,
-				       lxc_terminal_ptmx_cb, ts);
+	ret = lxc_mainloop_add_handler(&descr, ts->ptxfd,
+				       lxc_terminal_ptx_cb,
+				       default_cleanup_handler,
+				       ts, "lxc_terminal_ptx_cb");
 	if (ret < 0) {
-		ERROR("Failed to add ptmx handler");
+		ERROR("Failed to add ptx handler");
 		goto close_mainloop;
 	}
 
@@ -1093,7 +1329,7 @@
 	lxc_terminal_signal_fini(&terminal);
 
 close_fds:
-	close(ptmxfd);
+	close(ptxfd);
 	close(ttyfd);
 
 	return ret;
@@ -1133,16 +1369,18 @@
 void lxc_terminal_info_init(struct lxc_terminal_info *terminal)
 {
 	terminal->name0 = '\0';
-	terminal->ptmx = -EBADF;
-	terminal->pts = -EBADF;
+	terminal->ptx = -EBADF;
+	terminal->pty = -EBADF;
 	terminal->busy = -1;
+	terminal->pty_nr = -1;
 }
 
 void lxc_terminal_init(struct lxc_terminal *terminal)
 {
 	memset(terminal, 0, sizeof(*terminal));
-	terminal->pts = -EBADF;
-	terminal->ptmx = -EBADF;
+	terminal->pty_nr = -1;
+	terminal->pty = -EBADF;
+	terminal->ptx = -EBADF;
 	terminal->peer = -EBADF;
 	terminal->log_fd = -EBADF;
 	lxc_terminal_info_init(&terminal->proxy);
@@ -1156,24 +1394,3 @@
 		lxc_ringbuf_release(&terminal->ringbuf);
 	lxc_terminal_signal_fini(terminal);
 }
-
-int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *terminal)
-{
-	int ret;
-
-	if (lxc_list_empty(&c->id_map))
-		return 0;
-
-	if (strcmp(terminal->name, "") == 0)
-		return 0;
-
-	ret = userns_exec_mapped_root(terminal->name, terminal->pts, c);
-	if (ret < 0) {
-		return log_error(-1, "Failed to chown terminal %d(%s)",
-				 terminal->pts, terminal->name);
-	}
-
-	TRACE("Chowned terminal %d(%s)", terminal->pts, terminal->name);
-
-	return 0;
-}

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/terminal.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/terminal.h Changed

@@ -3,36 +3,41 @@
 #ifndef __LXC_TERMINAL_H
 #define __LXC_TERMINAL_H
 
+#include "config.h"
+
 #include <signal.h>
 #include <stdio.h>
 
+#include "compiler.h"
 #include "list.h"
 #include "macro.h"
 #include "ringbuf.h"
 
 struct lxc_container;
 struct lxc_conf;
-struct lxc_epoll_descr;
+struct lxc_async_descr;
 
 struct lxc_terminal_info {
-	/* the path name of the pts side */
+	/* the path name of the pty side */
 	char namePATH_MAX;
 
-	/* the file descriptor of the ptmx */
-	int ptmx;
+	/* the file descriptor of the ptx */
+	int ptx;
 
-	/* the file descriptor of the pts */
-	int pts;
+	/* the file descriptor of the pty */
+	int pty;
 
 	/* whether the terminal is currently used */
 	int busy;
+
+	/* the number of the terminal */
+	int pty_nr;
 };
 
 struct lxc_terminal_state {
-	struct lxc_list node;
 	int stdinfd;
 	int stdoutfd;
-	int ptmxfd;
+	int ptxfd;
 
 	/* Escape sequence to use for exiting the terminal. A single char can
 	 * be specified. The terminal can then exited by doing: Ctrl +
@@ -57,11 +62,12 @@
 };
 
 struct lxc_terminal {
-	int pts;
-	int ptmx;
+	int pty_nr;
+	int pty;
+	int ptx;
 	int peer;
 	struct lxc_terminal_info proxy;
-	struct lxc_epoll_descr *descr;
+	struct lxc_async_descr *descr;
 	char *path;
 	char namePATH_MAX;
 	struct termios *tios;
@@ -98,30 +104,32 @@
  *            indication that the console or tty is no longer in use
  * @ttyreq  : the tty requested to be opened, -1 for any, 0 for the console
  */
-extern int  lxc_terminal_allocate(struct lxc_conf *conf, int sockfd, int *ttynum);
+__hidden extern int  lxc_terminal_allocate(struct lxc_conf *conf, int sockfd, int *ttynum);
 
 /**
  * Create a new terminal:
- * - calls openpty() to allocate a ptmx/pts pair
- * - sets the FD_CLOEXEC flag on the ptmx/pts fds
+ * - calls openpty() to allocate a ptx/pty pair
+ * - sets the FD_CLOEXEC flag on the ptx/pty fds
  * - allocates either the current controlling terminal (default) or a user
- *   specified terminal as proxy for the newly created ptmx/pts pair
+ *   specified terminal as proxy for the newly created ptx/pty pair
  * - sets up SIGWINCH handler, winsz, and new terminal settings
  *   (Handlers for SIGWINCH and I/O are not registered in a mainloop.)
  */
-extern int lxc_terminal_create(struct lxc_terminal *console);
+__hidden extern int lxc_terminal_create(const char *name, const char *lxcpath,
+					struct lxc_conf *conf,
+					struct lxc_terminal *console);
 
 /**
  * lxc_terminal_setup: Create a new terminal.
  * - In addition to lxc_terminal_create() also sets up logging.
  */
-extern int lxc_terminal_setup(struct lxc_conf *);
+__hidden extern int lxc_terminal_setup(struct lxc_conf *);
 
 /**
  * Delete a terminal created via lxc_terminal_create() or lxc_terminal_setup():
  * Note, registered handlers are not automatically deleted.
  */
-extern void lxc_terminal_delete(struct lxc_terminal *);
+__hidden extern void lxc_terminal_delete(struct lxc_terminal *);
 
 /**
  * lxc_terminal_free: mark the terminal as unallocated and free any resources
@@ -132,17 +140,17 @@
  *         the terminal is no longer in use. this is used to match
  *         which terminal is being freed.
  */
-extern void lxc_terminal_free(struct lxc_conf *conf, int fd);
+__hidden extern void lxc_terminal_free(struct lxc_conf *conf, int fd);
 
 /**
  * Register terminal event handlers in an open mainloop.
  */
-extern int  lxc_terminal_mainloop_add(struct lxc_epoll_descr *, struct lxc_terminal *);
+__hidden extern int lxc_terminal_mainloop_add(struct lxc_async_descr *, struct lxc_terminal *);
 
 /**
  * Handle SIGWINCH events on the allocated terminals.
  */
-extern void lxc_terminal_sigwinch(int sig);
+__hidden extern void lxc_terminal_sigwinch(int sig);
 
 /**
  * Connect to one of the ttys given to the container via lxc.tty.max.
@@ -153,9 +161,8 @@
  * - registers SIGWINCH, I/O handlers in the mainloop
  * - performs all necessary cleanup operations
  */
-extern int  lxc_console(struct lxc_container *c, int ttynum,
-		        int stdinfd, int stdoutfd, int stderrfd,
-		        int escape);
+__hidden extern int lxc_console(struct lxc_container *c, int ttynum, int stdinfd, int stdoutfd,
+				int stderrfd, int escape);
 
 /**
  * Allocate one of the tty given to the container via lxc.tty.max. Returns an
@@ -163,15 +170,14 @@
  * Set ttynum to -1 to allocate the first available tty, or to a value within
  * the range specified by lxc.tty.max to allocate a specific tty.
  */
-extern int lxc_terminal_getfd(struct lxc_container *c, int *ttynum,
-			      int *ptmxfd);
+__hidden extern int lxc_terminal_getfd(struct lxc_container *c, int *ttynum, int *ptxfd);
 
 /**
  * Make fd a duplicate of the standard file descriptors. The fd is made a
  * duplicate of a specific standard file descriptor iff the standard file
  * descriptor refers to a terminal.
  */
-extern int lxc_terminal_set_stdfds(int fd);
+__hidden extern int lxc_terminal_set_stdfds(int fd);
 
 /**
  * Handler for events on the stdin fd of the terminal. To be registered via the
@@ -179,34 +185,33 @@
  * lxc_terminal_mainloop_add().
  * This function exits the loop cleanly when an EPOLLHUP event is received.
  */
-extern int lxc_terminal_stdin_cb(int fd, uint32_t events, void *cbdata,
-				 struct lxc_epoll_descr *descr);
+__hidden extern int lxc_terminal_stdin_cb(int fd, uint32_t events, void *cbdata,
+					  struct lxc_async_descr *descr);
 
 /**
- * Handler for events on the ptmx fd of the terminal. To be registered via
+ * Handler for events on the ptx fd of the terminal. To be registered via
  * the corresponding functions declared and defined in mainloop.{c,h} or
  * lxc_terminal_mainloop_add().
  * This function exits the loop cleanly when an EPOLLHUP event is received.
  */
-extern int lxc_terminal_ptmx_cb(int fd, uint32_t events, void *cbdata,
-				  struct lxc_epoll_descr *descr);
+__hidden extern int lxc_terminal_ptx_cb(int fd, uint32_t events, void *cbdata,
+					struct lxc_async_descr *descr);
 
 /**
  * Setup new terminal properties. The old terminal settings are stored in
  * oldtios.
  */
-extern int lxc_setup_tios(int fd, struct termios *oldtios);
-
+__hidden extern int lxc_setup_tios(int fd, struct termios *oldtios);
 
 /**
  * lxc_terminal_winsz: propagate winsz from one terminal to another
  *
  * @srcfd
- * - terminal to get size from (typically a pts pty)
+ * - terminal to get size from (typically a pty pty)
  * @dstfd
- * - terminal to set size on (typically a ptmx pty)
+ * - terminal to set size on (typically a ptx pty)
  */
-extern void lxc_terminal_winsz(int srcfd, int dstfd);
+__hidden extern void lxc_terminal_winsz(int srcfd, int dstfd);
 
 /*
  * lxc_terminal_signal_init: install signal handler
@@ -232,26 +237,32 @@
  *
  * This function allocates memory. It is up to the caller to free it.
  */
-extern struct lxc_terminal_state *lxc_terminal_signal_init(int srcfd, int dstfd);
+__hidden extern struct lxc_terminal_state *lxc_terminal_signal_init(int srcfd, int dstfd);
 
 /**
  * Handler for signal events. To be registered via the corresponding functions
  * declared and defined in mainloop.{c,h} or lxc_terminal_mainloop_add().
  */
-extern int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
-				    struct lxc_epoll_descr *descr);
-
-extern int lxc_terminal_write_ringbuffer(struct lxc_terminal *terminal);
-extern int lxc_terminal_create_log_file(struct lxc_terminal *terminal);
-extern int lxc_terminal_io_cb(int fd, uint32_t events, void *data,
-			      struct lxc_epoll_descr *descr);
-
-extern int lxc_make_controlling_terminal(int fd);
-extern int lxc_terminal_prepare_login(int fd);
-extern void lxc_terminal_conf_free(struct lxc_terminal *terminal);
-extern void lxc_terminal_info_init(struct lxc_terminal_info *terminal);
-extern void lxc_terminal_init(struct lxc_terminal *terminal);
-extern int lxc_terminal_map_ids(struct lxc_conf *c,
-				struct lxc_terminal *terminal);
+__hidden extern int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
+					     struct lxc_async_descr *descr);
+
+__hidden extern int lxc_terminal_write_ringbuffer(struct lxc_terminal *terminal);
+__hidden extern int lxc_terminal_create_log_file(struct lxc_terminal *terminal);
+
+__hidden extern int lxc_make_controlling_terminal(int fd);
+__hidden extern int lxc_terminal_prepare_login(int fd);
+__hidden extern void lxc_terminal_conf_free(struct lxc_terminal *terminal);
+__hidden extern void lxc_terminal_info_init(struct lxc_terminal_info *terminal);
+__hidden extern void lxc_terminal_init(struct lxc_terminal *terminal);
+__hidden extern int lxc_terminal_signal_sigmask_safe_blocked(struct lxc_terminal *terminal);
+__hidden extern int lxc_devpts_terminal(int devpts_fd, int *ret_ptx,
+					int *ret_pty, int *ret_pty_nr,
+					bool require_tiocgptpeer);
+__hidden extern int lxc_terminal_parent(struct lxc_conf *conf);
+
+static inline bool wants_console(const struct lxc_terminal *terminal)
+{
+	return !terminal->path || !strequal(terminal->path, "none");
+}
 
 #endif /* __LXC_TERMINAL_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/arguments.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/arguments.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/arguments.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/arguments.h Changed

@@ -3,13 +3,16 @@
 #ifndef __LXC_ARGUMENTS_H
 #define __LXC_ARGUMENTS_H
 
+#include "config.h"
+
 #include <getopt.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
+#include "compiler.h"
 
 struct lxc_arguments;
 
@@ -134,6 +137,7 @@
 #define LXC_COMMON_OPTIONS                                                     \
 	    { "name",        required_argument, 0, 'n'         },              \
 	    { "help",        no_argument,       0, 'h'         },              \
+	    { "help",        no_argument,       0, '?'         },              \
 	    { "usage",       no_argument,       0, OPT_USAGE   },              \
 	    { "version",     no_argument,       0, OPT_VERSION },              \
 	    { "quiet",       no_argument,       0, 'q'         },              \
@@ -152,13 +156,11 @@
 #define OPT_SHARE_UTS OPT_USAGE - 5
 #define OPT_SHARE_PID OPT_USAGE - 6
 
-extern int lxc_arguments_parse(struct lxc_arguments *args, int argc,
-			       char *const argv);
+__hidden extern int lxc_arguments_parse(struct lxc_arguments *args, int argc, char *const argv);
 
-extern int lxc_arguments_str_to_int(struct lxc_arguments *args,
-				    const char *str);
+__hidden extern int lxc_arguments_str_to_int(struct lxc_arguments *args, const char *str);
 
-extern bool lxc_setup_shared_ns(struct lxc_arguments *args, struct lxc_container *c);
+__hidden extern bool lxc_setup_shared_ns(struct lxc_arguments *args, struct lxc_container *c);
 
 #define lxc_info(arg, fmt, args...)                                                \
 	do {                                                                       \

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/include/getsubopt.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/include/getsubopt.c Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/include/meson.build Added

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_attach.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_attach.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_autostart.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_autostart.c Changed

@@ -1,17 +1,15 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "list.h"
 #include "log.h"
 #include "utils.h"
@@ -284,6 +282,11 @@
 	return (c1_order - c2_order);
 }
 
+static int cmporder_reverse(const void *p1, const void *p2)
+{
+	return -1 * cmporder(p1, p2);
+}
+
 static int toss_list(struct lxc_list *c_groups_list)
 {
 	struct lxc_list *it, *next;
@@ -334,7 +337,8 @@
 	if (!my_args.all)
 		c_groups_lists = calloc( count, sizeof( struct lxc_list * ) );
 
-	qsort(&containers0, count, sizeof(struct lxc_container *), cmporder);
+	qsort(&containers0, count, sizeof(struct lxc_container *),
+	      (my_args.shutdown || my_args.hardstop) ? cmporder_reverse : cmporder);
 
 	if (cmd_groups_list && my_args.all)
 		ERROR("Specifying -a (all) with -g (groups) doesn't make sense. All option overrides");
@@ -347,6 +351,7 @@
 	if (!cmd_groups_list)
 		cmd_groups_list = accumulate_list( "" , ",", NULL );
 
+	failed = 0;
 	lxc_list_for_each(cmd_group, cmd_groups_list) {
 		/* Because we may take several passes through the container list
 		 * We'll switch on if the container pointer is NULL and if we
@@ -411,8 +416,10 @@
 					}
 					else {
 						if (!c->shutdown(c, my_args.timeout)) {
-							if (!c->stop(c))
+							if (!c->stop(c)) {
+								failed++;
 								ERROR("Error shutting down container: %s", c->name);
+							}
 						}
 					}
 				}
@@ -424,8 +431,10 @@
 						fflush(stdout);
 					}
 					else {
-						if (!c->stop(c))
+						if (!c->stop(c)) {
+							failed++;
 							ERROR("Error killing container: %s", c->name);
+						}
 					}
 				}
 			} else if (my_args.reboot) {
@@ -437,10 +446,12 @@
 						fflush(stdout);
 					}
 					else {
-						if (!c->reboot(c))
+						if (!c->reboot(c)) {
+							failed++;
 							ERROR("Error rebooting container: %s", c->name);
-						else
+						} else {
 							sleep(get_config_integer(c, "lxc.start.delay"));
+						}
 					}
 				}
 			} else {
@@ -452,10 +463,12 @@
 						fflush(stdout);
 					}
 					else {
-						if (!c->start(c, 0, NULL))
+						if (!c->start(c, 0, NULL)) {
+							failed++;
 							ERROR("Error starting container: %s", c->name);
-						else
+						} else {
 							sleep(get_config_integer(c, "lxc.start.delay"));
+						}
 					}
 				}
 			}
@@ -479,12 +492,9 @@
 	/* clean up any lingering detritus, if container exists here
 	 * then it must have failed to start.
 	 */
-	failed = 0;
 	for (i = 0; i < count; i++) {
-		if (containersi) {
-			failed++;
+		if (containersi)
 			lxc_container_put(containersi);
-		}
 		if (c_groups_lists && c_groups_listsi)
 			toss_list(c_groups_listsi);
 	}

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_cgroup.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_cgroup.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_checkpoint.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_checkpoint.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_config.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_config.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_console.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_console.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_copy.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_copy.c Changed

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -18,15 +17,14 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 #include "storage_utils.h"
 #include "utils.h"
 
-#ifndef HAVE_GETSUBOPT
+#if !HAVE_GETSUBOPT
 #include "include/getsubopt.h"
 #endif
 
@@ -289,6 +287,41 @@
 	return 0;
 }
 
+static char **lxc_normalize_path(const char *path)
+{
+	char **components;
+	size_t components_len = 0;
+	size_t pos = 0;
+
+	components = lxc_string_split(path, '/');
+	if (!components)
+		return NULL;
+
+	/* resolve '.' and '..' */
+	for (pos = 0; pos < components_len;) {
+		if (strequal(componentspos, ".") ||
+		    (strequal(componentspos, "..") && pos == 0)) {
+			/* eat this element */
+			free(componentspos);
+			memmove(&componentspos, &componentspos + 1,
+				sizeof(char *) * (components_len - pos));
+			components_len--;
+		} else if (strequal(componentspos, "..")) {
+			/* eat this and the previous element */
+			free(componentspos - 1);
+			free(componentspos);
+			memmove(&componentspos - 1, &componentspos + 1,
+				sizeof(char *) * (components_len - pos));
+			components_len -= 2;
+			pos--;
+		} else {
+			pos++;
+		}
+	}
+
+	return components;
+}
+
 static char *construct_path(char *path, bool as_prefix)
 {
 	char **components = NULL;
@@ -509,7 +542,7 @@
 	return ret;
 }
 
-static void free_mnts()
+static void free_mnts(void)
 {
 	unsigned int i;
 	struct mnts *n = NULL;

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_create.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_create.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_destroy.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_destroy.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_device.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_device.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_execute.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_execute.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_freeze.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_freeze.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_info.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_info.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_ls.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_ls.c Changed

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#include <dirent.h>
+#include "config.h"
+
 #include <getopt.h>
 #include <limits.h>
 #include <regex.h>
@@ -19,11 +17,11 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
+#include "memory_utils.h"
 #include "utils.h"
 
 lxc_log_define(lxc_ls, lxc);
@@ -197,7 +195,7 @@
 
 	/*
 	 * The lxc parser requires that my_args.name is set. So let's satisfy
-	 * that condition by setting a dummy name which is never used.
+	 * that condition by setting a placeholder name which is never used.
 	 */
 	my_args.name  = "";
 	if (lxc_arguments_parse(&my_args, argc, argv))
@@ -218,17 +216,17 @@
 
 	struct lengths max_len = {
 		/* default header length */
-		.name_length = 4,          /* NAME */
-		.state_length = 5,         /* STATE */
-		.groups_length = 6,        /* GROUPS */
-		.interface_length = 9,     /* INTERFACE */
-		.ipv4_length = 4,          /* IPV4 */
-		.ipv6_length = 4,          /* IPV6 */
-		.init_length = 3,          /* PID */
-		.ram_length = 3,           /* RAM */
-		.swap_length = 4,          /* SWAP */
-		.autostart_length = 9,     /* AUTOSTART */
-		.unprivileged_length = 12, /* UNPRIVILEGED */
+		.name_length		= 4,    /* NAME */
+		.state_length		= 5,    /* STATE */
+		.groups_length		= 6,    /* GROUPS */
+		.interface_length	= 9,    /* INTERFACE */
+		.ipv4_length		= 4,    /* IPV4 */
+		.ipv6_length		= 4,    /* IPV6 */
+		.init_length		= 3,    /* PID */
+		.ram_length		= 3,    /* RAM */
+		.swap_length		= 4,    /* SWAP */
+		.autostart_length	= 9,	/* AUTOSTART */
+		.unprivileged_length	= 12,	/* UNPRIVILEGED */
 	};
 
 	char **grps = NULL;
@@ -289,26 +287,26 @@
 	free(l);
 }
 
-static char *ls_get_config_item(struct lxc_container *c, const char *item,
-		bool running)
+static char *ls_get_config_item(struct lxc_container *c, const char *item, bool running)
 {
+	__do_free char *val = NULL;
+	int len;
+
 	if (running)
 		return c->get_running_config_item(c, item);
 
-	int len = c->get_config_item(c, item, NULL, 0);
+	len = c->get_config_item(c, item, NULL, 0);
 	if (len <= 0)
 		return NULL;
 
-	char *val = malloc((len + 1) * sizeof(*val));
+	val = malloc((len + 1) * sizeof(*val));
 	if (!val)
 		return NULL;
 
-	if (c->get_config_item(c, item, val, len + 1) != len) {
-		free(val);
-		val = NULL;
-	}
+	if (c->get_config_item(c, item, val, len + 1) != len)
+		return NULL;
 
-	return val;
+	return move_ptr(val);
 }
 
 static void ls_free_arr(char **arr, size_t size)
@@ -322,9 +320,8 @@
 }
 
 static int ls_get(struct ls **m, size_t *size, const struct lxc_arguments *args,
-		const char *basepath, const char *parent, unsigned int lvl,
-		char **lockpath, size_t len_lockpath, char **grps_must,
-		size_t grps_must_len)
+		  const char *basepath, const char *parent, unsigned int lvl, char **lockpath,
+		  size_t len_lockpath, char **grps_must, size_t grps_must_len)
 {
 	/* As ls_get() is non-tail recursive we face the inherent danger of
 	 * blowing up the stack at some level of nesting. To have at least some
@@ -597,38 +594,39 @@
 
 static char *ls_get_cgroup_item(struct lxc_container *c, const char *item)
 {
+	__do_free char *val = NULL;
+
 	int len = c->get_cgroup_item(c, item, NULL, 0);
 	if (len <= 0)
 		return NULL;
 
-	char *val = malloc((len + 1) * sizeof(*val));
+	val = malloc((len + 1) * sizeof(*val));
 	if (!val)
 		return NULL;
 
-	if (c->get_cgroup_item(c, item, val, len + 1) != len) {
-		free(val);
-		val = NULL;
-	}
+	if (c->get_cgroup_item(c, item, val, len + 1) != len)
+		return NULL;
 
-	return val;
+	return move_ptr(val);
 }
 
 static char *ls_get_groups(struct lxc_container *c, bool running)
 {
 	int len = 0;
-	char *val = NULL;
+	__do_free char *val = NULL;
 
 	if (running)
 		val = c->get_running_config_item(c, "lxc.group");
 	else
 		len = c->get_config_item(c, "lxc.group", NULL, 0);
 
-	if (!val && (len > 0)) {
+	if (!val && (len > 0 && len < INT_MAX)) {
 		val = malloc((len + 1) * sizeof(*val));
-		if (c->get_config_item(c, "lxc.group", val, len + 1) != len) {
-			free(val);
+		if (!val)
+			return NULL;
+
+		if (c->get_config_item(c, "lxc.group", val, len + 1) != len)
 			return NULL;
-		}
 	}
 
 	if (val) {
@@ -642,7 +640,7 @@
 		val = tmp;
 	}
 
-	return val;
+	return move_ptr(val);
 }
 
 static char *ls_get_ips(struct lxc_container *c, const char *inet)
@@ -681,16 +679,17 @@
  */
 static double ls_get_swap(struct lxc_container *c)
 {
-	char *stat, *swap, *tmp;
+	__do_free char *stat = NULL;
+	char *swap, *tmp;
 	unsigned long long int num = 0;
 
 	stat = ls_get_cgroup_item(c, "memory.stat");
 	if (!stat)
-		goto out;
+		return num;
 
 	swap = strstr(stat, "\nswap");
 	if (!swap)
-		goto out;
+		return num;
 
 	/* start_of_swap_value = '\n' + strlen(swap) + ' ' */
 	swap = 1 + swap + 4 + 1;
@@ -698,16 +697,13 @@
 	/* find end of swap value */
 	tmp = strchr(swap, '\n');
 	if (!tmp)
-		goto out;
+		return num;
 
 	*tmp = '\0';
 
 	num = strtoull(swap, NULL, 0);
 	num = num / 1024 / 1024;
 
-out:
-	free(stat);
-
 	return num;
 }
 
@@ -775,8 +771,7 @@
 	return m;
 }
 
-static void ls_print_names(struct ls *l, struct lengths *lht,
-		size_t size, size_t termwidth, bool list)
+static void ls_print_names(struct ls *l, struct lengths *lht, size_t size, size_t termwidth, bool list)
 {
 	/* If list is empty do nothing. */
 	if (size == 0)
@@ -806,8 +801,8 @@
 		printf("\n");
 }
 
-static void ls_print_fancy_format(struct ls *l, struct lengths *lht,
-		size_t size, const char *fancy_fmt)
+static void ls_print_fancy_format(struct ls *l, struct lengths *lht, size_t size,
+				  const char *fancy_fmt)
 {
 	/* If list is empty do nothing. */
 	if (size == 0)
@@ -908,8 +903,7 @@
 	lxc_free_array((void **)tmp, free);
 }
 
-static void ls_print_table(struct ls *l, struct lengths *lht,
-		size_t size)
+static void ls_print_table(struct ls *l, struct lengths *lht, size_t size)
 {
 	size_t i;
 
@@ -1040,8 +1034,8 @@
 	return ret;
 }
 
-static int ls_remove_lock(const char *path, const char *name,
-		char **lockpath, size_t *len_lockpath, bool recalc)
+static int ls_remove_lock(const char *path, const char *name, char **lockpath, size_t *len_lockpath,
+			  bool recalc)
 {
 	int ret = -1;
 	char *rundir;
@@ -1092,7 +1086,7 @@
 	if (lxc_write_nointr(fd, &slen, sizeof(slen)) != sizeof(slen))
 		return -1;
 
-	if (slen > 0) {
+	if (slen > 0 && slen < SIZE_MAX) {
 		if (lxc_write_nointr(fd, buf, slen) != (ssize_t)slen)
 			return -1;
 	}
@@ -1166,29 +1160,24 @@
 	if (ret != sizeof(slen))
 		return -1;
 
-	if (slen == SIZE_MAX)
-		return -1;
+	ret = -EINVAL;
+	if (slen > 0 && slen < SIZE_MAX) {
+		__do_free char *s = NULL;
 
-	if (slen > 0) {
-		*buf = malloc(sizeof(char) * (slen + 1));
-		if (!*buf)
+		s = malloc(sizeof(char) * (slen + 1));
+		if (!s)
 			return -1;
 
-		ret = lxc_read_nointr(fd, *buf, slen);
-		if (ret != (ssize_t)slen) {
-			free(*buf);
+		ret = lxc_read_nointr(fd, s, slen);
+		if (ret != (ssize_t)slen)
 			return -1;
-		}
-
-		if (slen == SIZE_MAX) {
-			free(*buf);
-			return -1;
-		}
 
 		(*buf)slen = '\0';
+		*buf = move_ptr(s);
+		ret = 0;
 	}
 
-	return 0;
+	return ret;
 }
 
 static int ls_deserialize(int rpipefd, struct ls **m, size_t *len)
@@ -1263,8 +1252,7 @@
 	return 0;
 }
 
-static void ls_field_width(const struct ls *l, const size_t size,
-		struct lengths *lht)
+static void ls_field_width(const struct ls *l, const size_t size, struct lengths *lht)
 {
 	const struct ls *m;
 	size_t i, len = 0;

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_monitor.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_monitor.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_snapshot.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_snapshot.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_start.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_start.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_stop.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_stop.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_top.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_top.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_unfreeze.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_unfreeze.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_unshare.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_unshare.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/tools/lxc_wait.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/lxc_wait.c Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/tools/meson.build Added

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/utils.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/utils.c Changed

@@ -19,8 +19,6 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
-/* Needs to be after sys/mount.h header */
-#include <linux/fs.h>
 #include <sys/param.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
@@ -34,17 +32,18 @@
 #include "lxclock.h"
 #include "memory_utils.h"
 #include "namespace.h"
+#include "open_utils.h"
 #include "parse.h"
 #include "process_utils.h"
 #include "syscall_wrappers.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
-#ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#if !HAVE_STRLCAT
+#include "strlcat.h"
 #endif
 
 #ifndef O_PATH
@@ -80,18 +79,18 @@
 		int rc;
 		struct stat mystat;
 
-		if (!strcmp(direntp->d_name, ".") ||
-		    !strcmp(direntp->d_name, ".."))
+		if (strequal(direntp->d_name, ".") ||
+		    strequal(direntp->d_name, ".."))
 			continue;
 
-		rc = snprintf(pathname, PATH_MAX, "%s/%s", dirname, direntp->d_name);
-		if (rc < 0 || rc >= PATH_MAX) {
+		rc = strnprintf(pathname, sizeof(pathname), "%s/%s", dirname, direntp->d_name);
+		if (rc < 0) {
 			ERROR("The name of path is too long");
 			failed = 1;
 			continue;
 		}
 
-		if (!level && exclude && !strcmp(direntp->d_name, exclude)) {
+		if (!level && exclude && strequal(direntp->d_name, exclude)) {
 			ret = rmdir(pathname);
 			if (ret < 0) {
 				switch (errno) {
@@ -201,12 +200,12 @@
 	char *ptr;
 
 	if (!arg || !*arg)
-		return -1;
+		return ret_errno(EINVAL);
 
 	errno = 0;
 	res = strtoul(arg, &ptr, base);
 	if (!ptr || ptr == arg || *ptr || res > 0xFFFF || errno != 0)
-		return -1;
+		return ret_errno(ERANGE);
 
 	*val = res;
 
@@ -218,6 +217,9 @@
 	const char *tmp = dir;
 	const char *orig = dir;
 
+	if (access(dir, F_OK) != -1)
+		return 0;
+
 	do {
 		__do_free char *makeme = NULL;
 		int ret;
@@ -238,9 +240,11 @@
 	return 0;
 }
 
-char *get_rundir()
+char *get_rundir(void)
 {
-	char *rundir;
+	__do_free char *rundir = NULL;
+	char *static_rundir;
+	int ret;
 	size_t len;
 	const char *homedir;
 	struct stat sb;
@@ -251,9 +255,9 @@
 	if (geteuid() == sb.st_uid || getegid() == sb.st_gid)
 		return strdup(RUNTIME_PATH);
 
-	rundir = getenv("XDG_RUNTIME_DIR");
-	if (rundir)
-		return strdup(rundir);
+	static_rundir = getenv("XDG_RUNTIME_DIR");
+	if (static_rundir)
+		return strdup(static_rundir);
 
 	INFO("XDG_RUNTIME_DIR isn't set in the environment");
 	homedir = getenv("HOME");
@@ -265,8 +269,11 @@
 	if (!rundir)
 		return NULL;
 
-	snprintf(rundir, len, "%s/.cache/lxc/run/", homedir);
-	return rundir;
+	ret = strnprintf(rundir, len, "%s/.cache/lxc/run/", homedir);
+	if (ret < 0)
+		return ret_set_errno(NULL, EIO);
+
+	return move_ptr(rundir);
 }
 
 int wait_for_pid(pid_t pid)
@@ -324,7 +331,25 @@
 	return status;
 }
 
-#ifdef HAVE_OPENSSL
+bool wait_exited(pid_t pid)
+{
+	int status;
+
+	status = lxc_wait_for_pid_status(pid);
+	if (status < 0)
+		return log_error(false, "Failed to reap on child process %d", pid);
+	if (WIFSIGNALED(status))
+		return log_error(false, "Child process %d terminated by signal %d", pid, WTERMSIG(status));
+	if (!WIFEXITED(status))
+		return log_error(false, "Child did not termiate correctly");
+	if (WEXITSTATUS(status))
+		return log_error(false, "Child terminated with error %d", WEXITSTATUS(status));
+
+	TRACE("Reaped child process %d", pid);
+	return true;
+}
+
+#if HAVE_OPENSSL
 #include <openssl/evp.h>
 
 static int do_sha1_hash(const char *buf, int buflen, unsigned char *md_value,
@@ -351,7 +376,8 @@
 	__do_free char *buf = NULL;
 	__do_fclose FILE *f = NULL;
 	int ret;
-	long flen;
+	ssize_t flen;
+	ssize_t nbytes;
 
 	if (!fnam)
 		return -1;
@@ -374,7 +400,8 @@
 	if (!buf)
 		return log_error_errno(-1, ENOMEM, "Out of memory");
 
-	if (fread(buf, 1, flen, f) != flen)
+	nbytes = fread(buf, 1, flen, f);
+	if (nbytes < 0 || nbytes != flen)
 		return log_error_errno(-1, errno, "Failed to read template");
 
 	bufflen = '\0';
@@ -569,15 +596,7 @@
 
 bool dir_exists(const char *path)
 {
-	struct stat sb;
-	int ret;
-
-	ret = stat(path, &sb);
-	if (ret < 0)
-		/* Could be something other than eexist, just say "no". */
-		return false;
-
-	return S_ISDIR(sb.st_mode);
+	return exists_dir_at(-1, path);
 }
 
 /* Note we don't use SHA-1 here as we don't want to depend on HAVE_GNUTLS.
@@ -628,7 +647,7 @@
 			continue;
 
 		*slider2 = '\0';
-		if (strcmp(slider1 + 1, path) == 0) {
+		if (strequal(slider1 + 1, path)) {
 			/* This is the path. Is it shared? */
 			slider1 = strchr(slider2 + 1, ' ');
 			if (slider1 && strstr(slider1, "shared:"))
@@ -663,8 +682,8 @@
 		    + LXC_NAMESPACE_NAME_MAX;
 
 	/* Switch to new ns */
-	ret = snprintf(nspath, sizeof(nspath), "/proc/%d/ns/%s", pid, ns);
-	if (ret < 0 || ret >= sizeof(nspath))
+	ret = strnprintf(nspath, sizeof(nspath), "/proc/%d/ns/%s", pid, ns);
+	if (ret < 0)
 		return false;
 
 	fd = open(nspath, O_RDONLY | O_CLOEXEC);
@@ -709,10 +728,10 @@
 		if (!p2)
 			continue;
 		*p2 = '\0';
-		if (strcmp(p + 1, "/") == 0) {
+		if (strequal(p + 1, "/")) {
 			/* This is '/'. Is it the ramfs? */
 			p = strchr(p2 + 1, '-');
-			if (p && strncmp(p, "- rootfs rootfs ", 16) == 0)
+			if (p && strnequal(p, "- rootfs ", 9))
 				return true;
 		}
 	}
@@ -737,11 +756,10 @@
 
 	lxc_iterate_parts(entry, path, ":") {
 		if (rootfs)
-			ret = snprintf(cmdpath, PATH_MAX, "%s/%s/%s", rootfs,
-				       entry, cmd);
+			ret = strnprintf(cmdpath, sizeof(cmdpath), "%s/%s/%s", rootfs, entry, cmd);
 		else
-			ret = snprintf(cmdpath, PATH_MAX, "%s/%s", entry, cmd);
-		if (ret < 0 || ret >= PATH_MAX)
+			ret = strnprintf(cmdpath, sizeof(cmdpath), "%s/%s", entry, cmd);
+		if (ret < 0)
 			continue;
 
 		if (access(cmdpath, X_OK) == 0)
@@ -751,11 +769,6 @@
 	return NULL;
 }
 
-bool cgns_supported(void)
-{
-	return file_exists("/proc/self/ns/cgroup");
-}
-
 /* historically lxc-init has been under /usr/lib/lxc and under
  * /usr/lib/$ARCH/lxc.  It now lives as $prefix/sbin/init.lxc.
  */
@@ -791,8 +804,8 @@
 	else
 		tmp = empty;
 
-	ret = snprintf(retv, PATH_MAX, "%s/%s/%s", tmp, SBINDIR, "/init.lxc");
-	if (ret < 0 || ret >= PATH_MAX) {
+	ret = strnprintf(retv, PATH_MAX, "%s/%s/%s", tmp, SBINDIR, "/init.lxc");
+	if (ret < 0) {
 		ERROR("The name of path is too long");
 		goto out1;
 	}
@@ -800,8 +813,8 @@
 	if (access(retv, X_OK) == 0)
 		return retv;
 
-	ret = snprintf(retv, PATH_MAX, "%s/%s/%s", tmp, LXCINITDIR, "/lxc/lxc-init");
-	if (ret < 0 || ret >= PATH_MAX) {
+	ret = strnprintf(retv, PATH_MAX, "%s/%s/%s", tmp, LXCINITDIR, "/lxc/lxc-init");
+	if (ret < 0) {
 		ERROR("The name of path is too long");
 		goto out1;
 	}
@@ -809,8 +822,8 @@
 	if (access(retv, X_OK) == 0)
 		return retv;
 
-	ret = snprintf(retv, PATH_MAX, "%s/usr/lib/lxc/lxc-init", tmp);
-	if (ret < 0 || ret >= PATH_MAX) {
+	ret = strnprintf(retv, PATH_MAX, "%s/usr/lib/lxc/lxc-init", tmp);
+	if (ret < 0) {
 		ERROR("The name of path is too long");
 		goto out1;
 	}
@@ -818,8 +831,8 @@
 	if (access(retv, X_OK) == 0)
 		return retv;
 
-	ret = snprintf(retv, PATH_MAX, "%s/sbin/lxc-init", tmp);
-	if (ret < 0 || ret >= PATH_MAX) {
+	ret = strnprintf(retv, PATH_MAX, "%s/sbin/lxc-init", tmp);
+	if (ret < 0) {
 		ERROR("The name of path is too long");
 		goto out1;
 	}
@@ -837,8 +850,8 @@
 	if (rootfs)
 		goto out1;
 
-	ret = snprintf(retv, PATH_MAX, "/init.lxc.static");
-	if (ret < 0 || ret >= PATH_MAX) {
+	ret = strnprintf(retv, PATH_MAX, "/init.lxc.static");
+	if (ret < 0) {
 		WARN("Nonsense - name /lxc.init.static too long");
 		goto out1;
 	}
@@ -877,8 +890,8 @@
 	if (!tpath)
 		return NULL;
 
-	ret = snprintf(tpath, len, "%s/lxc-%s", LXCTEMPLATEDIR, t);
-	if (ret < 0 || ret >= len) {
+	ret = strnprintf(tpath, len, "%s/lxc-%s", LXCTEMPLATEDIR, t);
+	if (ret < 0) {
 		free(tpath);
 		return NULL;
 	}
@@ -928,7 +941,7 @@
 	if (subdirlen < len)
 		return false;
 
-	if (strncmp(subdir, dir, len) != 0)
+	if (!strnequal(subdir, dir, len))
 		return false;
 
 	if (dirlen-1 == '/')
@@ -1079,6 +1092,65 @@
 	return dirfd;
 }
 
+int __safe_mount_beneath_at(int beneath_fd, const char *src, const char *dst, const char *fstype,
+			    unsigned int flags, const void *data)
+{
+	__do_close int source_fd = -EBADF, target_fd = -EBADF;
+	struct open_how how = {
+		.flags		= PROTECT_OPATH_DIRECTORY,
+		.resolve	= PROTECT_LOOKUP_BENEATH_WITH_MAGICLINKS,
+	};
+	int ret;
+	char src_bufLXC_PROC_PID_FD_LEN, tgt_bufLXC_PROC_PID_FD_LEN;
+
+	if (beneath_fd < 0)
+		return -EINVAL;
+
+	if ((flags & MS_BIND) && src && src0 != '/') {
+		source_fd = openat2(beneath_fd, src, &how, sizeof(how));
+		if (source_fd < 0)
+			return -errno;
+		ret = strnprintf(src_buf, sizeof(src_buf), "/proc/self/fd/%d", source_fd);
+		if (ret < 0)
+			return -EIO;
+	} else {
+		src_buf0 = '\0';
+	}
+
+	target_fd = openat2(beneath_fd, dst, &how, sizeof(how));
+	if (target_fd < 0)
+		return log_error_errno(-errno, errno, "Failed to open %d(%s)", beneath_fd, dst);
+	ret = strnprintf(tgt_buf, sizeof(tgt_buf), "/proc/self/fd/%d", target_fd);
+	if (ret < 0)
+		return -EIO;
+
+	if (!is_empty_string(src_buf))
+		ret = mount(src_buf, tgt_buf, fstype, flags, data);
+	else
+		ret = mount(src, tgt_buf, fstype, flags, data);
+
+	return ret;
+}
+
+int safe_mount_beneath(const char *beneath, const char *src, const char *dst, const char *fstype,
+		       unsigned int flags, const void *data)
+{
+	__do_close int beneath_fd = -EBADF;
+	const char *path = beneath ? beneath : "/";
+
+	beneath_fd = openat(-1, path, PROTECT_OPATH_DIRECTORY);
+	if (beneath_fd < 0)
+		return log_error_errno(-errno, errno, "Failed to open %s", path);
+
+	return __safe_mount_beneath_at(beneath_fd, src, dst, fstype, flags, data);
+}
+
+int safe_mount_beneath_at(int beneath_fd, const char *src, const char *dst, const char *fstype,
+			  unsigned int flags, const void *data)
+{
+	return __safe_mount_beneath_at(beneath_fd, src, dst, fstype, flags, data);
+}
+
 /*
  * Safely mount a path into a container, ensuring that the mount target
  * is under the container's @rootfs.  (If @rootfs is NULL, then the container
@@ -1107,8 +1179,8 @@
 		if (srcfd < 0)
 			return srcfd;
 
-		ret = snprintf(srcbuf, sizeof(srcbuf), "/proc/self/fd/%d", srcfd);
-		if (ret < 0 || ret >= (int)sizeof(srcbuf)) {
+		ret = strnprintf(srcbuf, sizeof(srcbuf), "/proc/self/fd/%d", srcfd);
+		if (ret < 0) {
 			close(srcfd);
 			ERROR("Out of memory");
 			return -EINVAL;
@@ -1127,8 +1199,8 @@
 		return destfd;
 	}
 
-	ret = snprintf(destbuf, sizeof(destbuf), "/proc/self/fd/%d", destfd);
-	if (ret < 0 || ret >= (int)sizeof(destbuf)) {
+	ret = strnprintf(destbuf, sizeof(destbuf), "/proc/self/fd/%d", destfd);
+	if (ret < 0) {
 		if (srcfd != -1)
 			close(srcfd);
 
@@ -1152,77 +1224,6 @@
 	return 0;
 }
 
-/*
- * Mount a proc under @rootfs if proc self points to a pid other than
- * my own.  This is needed to have a known-good proc mount for setting
- * up LSMs both at container startup and attach.
- *
- * @rootfs : the rootfs where proc should be mounted
- *
- * Returns < 0 on failure, 0 if the correct proc was already mounted
- * and 1 if a new proc was mounted.
- *
- * NOTE: not to be called from inside the container namespace!
- */
-int lxc_mount_proc_if_needed(const char *rootfs)
-{
-	char pathPATH_MAX = {0};
-	int link_to_pid, linklen, mypid, ret;
-	char linkINTTYPE_TO_STRLEN(pid_t) = {0};
-
-	ret = snprintf(path, PATH_MAX, "%s/proc/self", rootfs);
-	if (ret < 0 || ret >= PATH_MAX) {
-		SYSERROR("The name of proc path is too long");
-		return -1;
-	}
-
-	linklen = readlink(path, link, sizeof(link));
-
-	ret = snprintf(path, PATH_MAX, "%s/proc", rootfs);
-	if (ret < 0 || ret >= PATH_MAX) {
-		SYSERROR("The name of proc path is too long");
-		return -1;
-	}
-
-	/* /proc not mounted */
-	if (linklen < 0) {
-		if (mkdir(path, 0755) && errno != EEXIST)
-			return -1;
-
-		goto domount;
-	} else if (linklen >= sizeof(link)) {
-		linklinklen - 1 = '\0';
-		ERROR("Readlink returned truncated content: \"%s\"", link);
-		return -1;
-	}
-
-	mypid = lxc_raw_getpid();
-	INFO("I am %d, /proc/self points to \"%s\"", mypid, link);
-
-	if (lxc_safe_int(link, &link_to_pid) < 0)
-		return -1;
-
-	/* correct procfs is already mounted */
-	if (link_to_pid == mypid)
-		return 0;
-
-	ret = umount2(path, MNT_DETACH);
-	if (ret < 0)
-		SYSWARN("Failed to umount \"%s\" with MNT_DETACH", path);
-
-domount:
-	/* rootfs is NULL */
-	if (!strcmp(rootfs, ""))
-		ret = mount("proc", path, "proc", 0, NULL);
-	else
-		ret = safe_mount("proc", path, "proc", 0, NULL, rootfs);
-	if (ret < 0)
-		return -1;
-
-	INFO("Mounted /proc in container for security transition");
-	return 1;
-}
-
 int open_devnull(void)
 {
 	int fd = open("/dev/null", O_RDWR);
@@ -1281,8 +1282,8 @@
 	size_t n = 0;
 	bool bret = false;
 
-	ret = snprintf(status, __PROC_STATUS_LEN, "/proc/%d/status", pid);
-	if (ret < 0 || ret >= __PROC_STATUS_LEN)
+	ret = strnprintf(status, sizeof(status), "/proc/%d/status", pid);
+	if (ret < 0)
 		return bret;
 
 	f = fopen(status, "re");
@@ -1292,7 +1293,7 @@
 	while (getline(&line, &n, f) != -1) {
 		char *numstr;
 
-		if (strncmp(line, "SigBlk:", 7))
+		if (!strnequal(line, "SigBlk:", 7))
 			continue;
 
 		numstr = lxc_trim_whitespace_in_place(line + 7);
@@ -1320,13 +1321,11 @@
 	 * are supported by the kernel by passing in the NULL or the empty
 	 * string.
 	 */
-	ret = snprintf(path, __NS_PATH_LEN, "/proc/%d/ns%s%s", pid,
-		       !ns || strcmp(ns, "") == 0 ? "" : "/",
-		       !ns || strcmp(ns, "") == 0 ? "" : ns);
-	if (ret < 0 || (size_t)ret >= __NS_PATH_LEN) {
-		errno = EFBIG;
-		return -1;
-	}
+	ret = strnprintf(path, sizeof(path), "/proc/%d/ns%s%s", pid,
+			 !ns || strequal(ns, "") ? "" : "/",
+			 !ns || strequal(ns, "") ? "" : ns);
+	if (ret < 0)
+		return ret_errno(EIO);
 
 	return open(path, O_RDONLY | O_CLOEXEC);
 }
@@ -1357,14 +1356,32 @@
 }
 
 /* Simple convenience function which enables uniform logging. */
-bool lxc_setgroups(int size, gid_t list)
+bool lxc_drop_groups(void)
 {
-	if (setgroups(size, list) < 0) {
-		SYSERROR("Failed to setgroups()");
-		return false;
+	int ret;
+
+	ret = setgroups(0, NULL);
+	if (ret)
+		return log_error_errno(false, errno, "Failed to drop supplimentary groups");
+
+	NOTICE("Dropped supplimentary groups");
+	return ret == 0;
+}
+
+bool lxc_setgroups(gid_t list, size_t size)
+{
+	int ret;
+
+	ret = setgroups(size, list);
+	if (ret)
+		return log_error_errno(false, errno, "Failed to set supplimentary groups");
+
+	if (size > 0 && lxc_log_trace()) {
+		for (size_t i = 0; i < size; i++)
+			TRACE("Setting supplimentary group %d", listi);
 	}
-	NOTICE("Dropped additional groups");
 
+	NOTICE("Set supplimentary groups");
 	return true;
 }
 
@@ -1382,7 +1399,7 @@
 	}
 
 	while ((dp = readdir(dir))) {
-		if (strncmp(dp->d_name, "loop", 4) != 0)
+		if (!strnequal(dp->d_name, "loop", 4))
 			continue;
 
 		dfd = dirfd(dir);
@@ -1403,8 +1420,8 @@
 			}
 		}
 
-		ret = snprintf(loop_name, LO_NAME_SIZE, "/dev/%s", dp->d_name);
-		if (ret < 0 || ret >= LO_NAME_SIZE) {
+		ret = strnprintf(loop_name, LO_NAME_SIZE, "/dev/%s", dp->d_name);
+		if (ret < 0) {
 			close(fd);
 			fd = -1;
 			continue;
@@ -1438,15 +1455,15 @@
 		goto on_error;
 	}
 
-	ret = snprintf(name_loop, LO_NAME_SIZE, "/dev/loop%d", loop_nr);
-	if (ret < 0 || ret >= LO_NAME_SIZE)
+	ret = strnprintf(name_loop, LO_NAME_SIZE, "/dev/loop%d", loop_nr);
+	if (ret < 0)
 		goto on_error;
 
 	fd_tmp = open(name_loop, O_RDWR | O_CLOEXEC);
 	if (fd_tmp < 0) {
 		/* on Android loop devices are moved under /dev/block, give it a shot */
-		ret = snprintf(name_loop, LO_NAME_SIZE, "/dev/block/loop%d", loop_nr);
-                if (ret < 0 || ret >= LO_NAME_SIZE)
+		ret = strnprintf(name_loop, LO_NAME_SIZE, "/dev/block/loop%d", loop_nr);
+                if (ret < 0)
                         goto on_error;
 
 		fd_tmp = open(name_loop, O_RDWR | O_CLOEXEC);
@@ -1544,7 +1561,7 @@
 	return umounts;
 }
 
-int run_command_internal(char *buf, size_t buf_size, int (*child_fn)(void *), void *args, bool wait_status)
+static int run_command_internal(char *buf, size_t buf_size, int (*child_fn)(void *), void *args, bool wait_status)
 {
 	pid_t child;
 	int ret, fret, pipefd2;
@@ -1629,11 +1646,11 @@
 	int ret;
 	struct stat sb;
 
-	if (!strcmp(nic, "none"))
+	if (strequal(nic, "none"))
 		return true;
 
-	ret = snprintf(path, __LXC_SYS_CLASS_NET_LEN, "/sys/class/net/%s", nic);
-	if (ret < 0 || (size_t)ret >= __LXC_SYS_CLASS_NET_LEN)
+	ret = strnprintf(path, sizeof(path), "/sys/class/net/%s", nic);
+	if (ret < 0)
 		return false;
 
 	ret = stat(path, &sb);
@@ -1687,7 +1704,7 @@
 	while (getline(&line, &n, f) != -1) {
 		char *state;
 
-		if (strncmp(line, "State:", 6))
+		if (!strnequal(line, "State:", 6))
 			continue;
 
 		state = lxc_trim_whitespace_in_place(line + 6);
@@ -1725,28 +1742,6 @@
 	return 0;
 }
 
-int fd_cloexec(int fd, bool cloexec)
-{
-	int oflags, nflags;
-
-	oflags = fcntl(fd, F_GETFD, 0);
-	if (oflags < 0)
-		return -errno;
-
-	if (cloexec)
-		nflags = oflags | FD_CLOEXEC;
-	else
-		nflags = oflags & ~FD_CLOEXEC;
-
-	if (nflags == oflags)
-		return 0;
-
-	if (fcntl(fd, F_SETFD, nflags) < 0)
-		return -errno;
-
-	return 0;
-}
-
 int lxc_rm_rf(const char *dirname)
 {
 	__do_closedir DIR *dir = NULL;
@@ -1762,8 +1757,8 @@
 		__do_free char *pathname = NULL;
 		struct stat mystat;
 
-		if (!strcmp(direntp->d_name, ".") ||
-		    !strcmp(direntp->d_name, ".."))
+		if (strequal(direntp->d_name, ".") ||
+		    strequal(direntp->d_name, ".."))
 			continue;
 
 		pathname = must_make_path(dirname, direntp->d_name, NULL);
@@ -1791,47 +1786,12 @@
 	return fret;
 }
 
-int lxc_setup_keyring(char *keyring_label)
-{
-	key_serial_t keyring;
-	int ret = 0;
-
-	if (keyring_label) {
-		if (lsm_keyring_label_set(keyring_label) < 0) {
-			ERROR("Couldn't set keyring label");
-		}
-	}
-
-	/* Try to allocate a new session keyring for the container to prevent
-	 * information leaks.
-	 */
-	keyring = keyctl(KEYCTL_JOIN_SESSION_KEYRING, prctl_arg(0),
-			 prctl_arg(0), prctl_arg(0), prctl_arg(0));
-	if (keyring < 0) {
-		switch (errno) {
-		case ENOSYS:
-			DEBUG("The keyctl() syscall is not supported or blocked");
-			break;
-		case EACCES:
-			__fallthrough;
-		case EPERM:
-			DEBUG("Failed to access kernel keyring. Continuing...");
-			break;
-		default:
-			SYSERROR("Failed to create kernel keyring");
-			break;
-		}
-	}
-
-	return ret;
-}
-
 bool lxc_can_use_pidfd(int pidfd)
 {
 	int ret;
 
 	if (pidfd < 0)
-		return log_error(false, "Kernel does not support pidfds");
+		return log_trace(false, "Kernel does not support pidfds");
 
 	/*
 	 * We don't care whether or not children were in a waitable state. We
@@ -1871,13 +1831,13 @@
 
 	devnull_fd = open_devnull();
 	if (devnull_fd < 0)
-		return log_warn_errno(-1, errno, "Failed to open \"/dev/null\"");
+		return log_trace_errno(-1, errno, "Failed to open \"/dev/null\"");
 
 	ret = fstat(devnull_fd, &st_null);
 	if (ret)
-		return log_warn_errno(-errno, errno, "Failed to stat \"/dev/null\"");
+		return log_trace_errno(-errno, errno, "Failed to stat \"/dev/null\"");
 
-	for (int i = 0; i < ARRAY_SIZE(std_fds); i++) {
+	for (size_t i = 0; i < ARRAY_SIZE(std_fds); i++) {
 		ret = fstat(std_fdsi, &st);
 		if (ret) {
 			SYSWARN("Failed to stat standard I/O file descriptor %d", std_fdsi);
@@ -1890,17 +1850,98 @@
 
 		ret = fchown(std_fdsi, uid, st.st_gid);
 		if (ret) {
-			SYSWARN("Failed to chown standard I/O file descriptor %d to uid %d and gid %d",
-				std_fdsi, uid, st.st_gid);
+			SYSTRACE("Failed to chown standard I/O file descriptor %d to uid %d and gid %d",
+			         std_fdsi, uid, st.st_gid);
 			fret = -1;
+			continue;
 		}
 
 		ret = fchmod(std_fdsi, 0700);
 		if (ret) {
-			SYSWARN("Failed to chmod standard I/O file descriptor %d", std_fdsi);
+			SYSTRACE("Failed to chmod standard I/O file descriptor %d", std_fdsi);
 			fret = -1;
 		}
 	}
 
 	return fret;
 }
+
+bool multiply_overflow(int64_t base, uint64_t mult, int64_t *res)
+{
+	if (base > 0 && base > (int64_t)(INT64_MAX / mult))
+		return false;
+
+	if (base < 0 && base < (int64_t)(INT64_MIN / mult))
+		return false;
+
+	*res = (int64_t)(base * mult);
+	return true;
+}
+
+int print_r(int fd, const char *path)
+{
+	__do_close int dfd = -EBADF, dfd_dup = -EBADF;
+	__do_closedir DIR *dir = NULL;
+	int ret = 0;
+	struct dirent *direntp;
+	struct stat st;
+
+	if (is_empty_string(path)) {
+		char bufLXC_PROC_SELF_FD_LEN;
+
+		ret = strnprintf(buf, sizeof(buf), "/proc/self/fd/%d", fd);
+		if (ret < 0)
+			return ret_errno(EIO);
+
+		/*
+		 * O_PATH file descriptors can't be used so we need to re-open
+		 * just in case.
+		 */
+		dfd = openat(-EBADF, buf, O_CLOEXEC | O_DIRECTORY, 0);
+	} else {
+		dfd = openat(fd, path, O_CLOEXEC | O_DIRECTORY, 0);
+	}
+	if (dfd < 0)
+		return -1;
+
+	dfd_dup = dup_cloexec(dfd);
+	if (dfd_dup < 0)
+		return -1;
+
+	dir = fdopendir(dfd);
+	if (!dir)
+		return -1;
+	/* Transfer ownership to fdopendir(). */
+	move_fd(dfd);
+
+	while ((direntp = readdir(dir))) {
+		if (!strcmp(direntp->d_name, ".") ||
+		    !strcmp(direntp->d_name, ".."))
+			continue;
+
+		ret = fstatat(dfd_dup, direntp->d_name, &st, AT_SYMLINK_NOFOLLOW);
+		if (ret < 0 && errno != ENOENT)
+			break;
+
+		ret = 0;
+		if (S_ISDIR(st.st_mode))
+			ret = print_r(dfd_dup, direntp->d_name);
+		else
+			INFO("mode(%o):uid(%d):gid(%d) -> %d/%s\n",
+			     (st.st_mode & ~S_IFMT), st.st_uid, st.st_gid, dfd_dup,
+			     direntp->d_name);
+		if (ret < 0 && errno != ENOENT)
+			break;
+	}
+
+	if (is_empty_string(path))
+		ret = fstatat(fd, "", &st, AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH);
+	else
+		ret = fstatat(fd, path, &st, AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW);
+	if (ret)
+		return -1;
+	else
+		INFO("mode(%o):uid(%d):gid(%d) -> %s",
+		     (st.st_mode & ~S_IFMT), st.st_uid, st.st_gid, maybe_empty(path));
+	return ret;
+}

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/utils.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/utils.h Changed

@@ -3,24 +3,19 @@
 #ifndef __LXC_UTILS_H
 #define __LXC_UTILS_H
 
-/* Properly support loop devices on 32bit systems. */
-#define _FILE_OFFSET_BITS 64
-
-#ifndef MAX_GRBUF_SIZE
-#define MAX_GRBUF_SIZE 65536
-#endif
-
 #include <errno.h>
 #include <linux/loop.h>
 #include <linux/types.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
 #include <unistd.h>
 
+#include "compiler.h"
 #include "file_utils.h"
 #include "initutils.h"
 #include "macro.h"
@@ -29,15 +24,15 @@
 #include "string_utils.h"
 
 /* returns 1 on success, 0 if there were any failures */
-extern int lxc_rmdir_onedev(const char *path, const char *exclude);
-extern int get_u16(unsigned short *val, const char *arg, int base);
-extern int mkdir_p(const char *dir, mode_t mode);
-extern char *get_rundir(void);
+__hidden extern int lxc_rmdir_onedev(const char *path, const char *exclude);
+__hidden extern int get_u16(unsigned short *val, const char *arg, int base);
+__hidden extern int mkdir_p(const char *dir, mode_t mode);
+__hidden extern char *get_rundir(void);
 
 /* Define getline() if missing from the C library */
-#ifndef HAVE_GETLINE
-#ifdef HAVE_FGETLN
-#include <../include/getline.h>
+#if !HAVE_GETLINE
+#if !HAVE_FGETLN
+#include "getline.h"
 #endif
 #endif
 
@@ -64,14 +59,14 @@
  * Returns pointer to struct lxc_popen_FILE, that should be freed with lxc_pclose().
  * On error returns NULL.
  */
-extern struct lxc_popen_FILE *lxc_popen(const char *command);
+__hidden extern struct lxc_popen_FILE *lxc_popen(const char *command);
 
 /* pclose() replacement to be used on struct lxc_popen_FILE *,
  * returned by lxc_popen().
  * Waits for associated process to terminate, returns its exit status and
  * frees resources, pointed to by struct lxc_popen_FILE *.
  */
-extern int lxc_pclose(struct lxc_popen_FILE *fp);
+__hidden extern int lxc_pclose(struct lxc_popen_FILE *fp);
 
 static inline void __auto_lxc_pclose__(struct lxc_popen_FILE **f)
 {
@@ -83,16 +78,17 @@
 /*
  * wait on a child we forked
  */
-extern int wait_for_pid(pid_t pid);
-extern int lxc_wait_for_pid_status(pid_t pid);
-extern int wait_for_pidfd(int pidfd);
+__hidden extern int wait_for_pid(pid_t pid);
+__hidden extern int lxc_wait_for_pid_status(pid_t pid);
+__hidden extern int wait_for_pidfd(int pidfd);
+__hidden extern bool wait_exited(pid_t pid);
 
 #if HAVE_OPENSSL
-extern int sha1sum_file(char *fnam, unsigned char *md_value, unsigned int *md_len);
+__hidden extern int sha1sum_file(char *fnam, unsigned char *md_value, unsigned int *md_len);
 #endif
 
 /* initialize rand with urandom */
-extern int randseed(bool);
+__hidden extern int randseed(bool);
 
 /* are we unprivileged with respect to our namespaces */
 inline static bool am_guest_unpriv(void) {
@@ -126,52 +122,50 @@
 /*
  * parse /proc/self/uid_map to find what @orig maps to
  */
-extern uid_t get_ns_uid(uid_t orig);
+__hidden extern uid_t get_ns_uid(uid_t orig);
 /*
  * parse /proc/self/gid_map to find what @orig maps to
  */
-extern gid_t get_ns_gid(gid_t orig);
+__hidden extern gid_t get_ns_gid(gid_t orig);
 
-extern bool dir_exists(const char *path);
+__hidden extern bool dir_exists(const char *path);
 
 #define FNV1A_64_INIT ((uint64_t)0xcbf29ce484222325ULL)
-extern uint64_t fnv_64a_buf(void *buf, size_t len, uint64_t hval);
-
-extern bool is_shared_mountpoint(const char *path);
-extern int detect_shared_rootfs(void);
-extern bool detect_ramfs_rootfs(void);
-extern char *on_path(const char *cmd, const char *rootfs);
-extern bool cgns_supported(void);
-extern char *choose_init(const char *rootfs);
-extern bool switch_to_ns(pid_t pid, const char *ns);
-extern char *get_template_path(const char *t);
-extern int safe_mount(const char *src, const char *dest, const char *fstype,
-		      unsigned long flags, const void *data,
-		      const char *rootfs);
-extern int lxc_mount_proc_if_needed(const char *rootfs);
-extern int open_devnull(void);
-extern int set_stdfds(int fd);
-extern int null_stdfds(void);
-extern int lxc_preserve_ns(const int pid, const char *ns);
+__hidden extern uint64_t fnv_64a_buf(void *buf, size_t len, uint64_t hval);
+
+__hidden extern bool is_shared_mountpoint(const char *path);
+__hidden extern int detect_shared_rootfs(void);
+__hidden extern bool detect_ramfs_rootfs(void);
+__hidden extern char *on_path(const char *cmd, const char *rootfs);
+__hidden extern char *choose_init(const char *rootfs);
+__hidden extern bool switch_to_ns(pid_t pid, const char *ns);
+__hidden extern char *get_template_path(const char *t);
+__hidden extern int safe_mount(const char *src, const char *dest, const char *fstype,
+			       unsigned long flags, const void *data, const char *rootfs);
+__hidden extern int open_devnull(void);
+__hidden extern int set_stdfds(int fd);
+__hidden extern int null_stdfds(void);
+__hidden extern int lxc_preserve_ns(const int pid, const char *ns);
 
 /* Check whether a signal is blocked by a process. */
-extern bool task_blocks_signal(pid_t pid, int signal);
+__hidden extern bool task_blocks_signal(pid_t pid, int signal);
 
 /* Switch to a new uid and gid.
  * If LXC_INVALID_{G,U}ID is passed then the set{g,u}id() will not be called.
  */
-extern bool lxc_switch_uid_gid(uid_t uid, gid_t gid);
-extern bool lxc_setgroups(int size, gid_t list);
+__hidden extern bool lxc_switch_uid_gid(uid_t uid, gid_t gid);
+__hidden extern bool lxc_setgroups(gid_t list, size_t size);
+__hidden extern bool lxc_drop_groups(void);
 
 /* Find an unused loop device and associate it with source. */
-extern int lxc_prepare_loop_dev(const char *source, char *loop_dev, int flags);
+__hidden extern int lxc_prepare_loop_dev(const char *source, char *loop_dev, int flags);
 
 /* Clear all mounts on a given node.
  * >= 0 successfully cleared. The number returned is the number of umounts
  *      performed.
  * < 0  error umounting. Return -errno.
  */
-extern int lxc_unstack_mountpoint(const char *path, bool lazy);
+__hidden extern int lxc_unstack_mountpoint(const char *path, bool lazy);
 
 /*
  * run_command runs a command and collect it's std{err,out} output in buf.
@@ -185,8 +179,7 @@
  *                     function must exec.
  * @paramin args     Arguments to be passed to child_fn.
  */
-extern int run_command(char *buf, size_t buf_size, int (*child_fn)(void *),
-		       void *args);
+__hidden extern int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void *args);
 
 /*
  * run_command runs a command and collect it's std{err,out} output in buf, returns exit status.
@@ -200,16 +193,10 @@
  *                     function must exec.
  * @paramin args     Arguments to be passed to child_fn.
  */
-extern int run_command_status(char *buf, size_t buf_size, int (*child_fn)(void *),
-		       void *args);
-
-/* return copy of string @entry;  do not fail. */
-extern char *must_copy_string(const char *entry);
-
-/* Re-allocate a pointer, do not fail */
-extern void *must_realloc(void *orig, size_t sz);
+__hidden extern int run_command_status(char *buf, size_t buf_size, int (*child_fn)(void *),
+				       void *args);
 
-extern bool lxc_nic_exists(char *nic);
+__hidden extern bool lxc_nic_exists(char *nic);
 
 static inline uint64_t lxc_getpagesize(void)
 {
@@ -230,16 +217,14 @@
  * If the caller passes in 0 they will receive 0 in return since this is invalid
  * input and 0 is not a power of 2.
  */
-extern uint64_t lxc_find_next_power2(uint64_t n);
+__hidden extern uint64_t lxc_find_next_power2(uint64_t n);
 
 /* Set a signal the child process will receive after the parent has died. */
-extern int lxc_set_death_signal(int signal, pid_t parent, int parent_status_fd);
-extern int fd_cloexec(int fd, bool cloexec);
-extern int lxc_rm_rf(const char *dirname);
-extern int lxc_setup_keyring(char *keyring_label);
-extern bool lxc_can_use_pidfd(int pidfd);
+__hidden extern int lxc_set_death_signal(int signal, pid_t parent, int parent_status_fd);
+__hidden extern int lxc_rm_rf(const char *dirname);
+__hidden extern bool lxc_can_use_pidfd(int pidfd);
 
-extern int fix_stdio_permissions(uid_t uid);
+__hidden extern int fix_stdio_permissions(uid_t uid);
 
 static inline bool uid_valid(uid_t uid)
 {
@@ -251,4 +236,62 @@
 	return gid != LXC_INVALID_GID;
 }
 
+__hidden extern bool multiply_overflow(int64_t base, uint64_t mult, int64_t *res);
+
+__hidden extern int safe_mount_beneath(const char *beneath, const char *src, const char *dst,
+				       const char *fstype, unsigned int flags, const void *data);
+__hidden extern int safe_mount_beneath_at(int beneat_fd, const char *src, const char *dst,
+					  const char *fstype, unsigned int flags, const void *data);
+__hidden __lxc_unused int print_r(int fd, const char *path);
+
+static inline int copy_struct_from_client(__u32 server_size, void *dst,
+					  __u32 client_size, const void *src)
+{
+	__u32 size = min(server_size, client_size);
+	__u32 rest = min(server_size, client_size) - size;
+
+	/* Deal with trailing bytes. */
+	if (client_size < server_size) {
+		memset(dst + size, 0, rest);
+	} else if (client_size > server_size) {
+		/* TODO: Actually come up with a nice way to test for 0. */
+		return 0;
+	}
+
+	memcpy(dst, src, size);
+	return 0;
+}
+
+static inline __u32 copy_struct_to_client(__u32 client_size, void *dst,
+					  __u32 server_size, const void *src)
+{
+	__u32 size = min(server_size, client_size);
+	memcpy(dst, src, size);
+	return size;
+}
+
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+static inline int is_in_comm(const char *s)
+{
+	__do_free char *buf = NULL;
+	__do_free char *comm = NULL;
+	size_t buf_size;
+
+	buf = file_to_buf("/proc/self/comm", &buf_size);
+	if (!buf)
+		return -1;
+
+	if (buf_size == 0)
+		return -1;
+
+	comm = malloc(buf_size + 1);
+	if (!comm)
+		return -1;
+	memcpy(comm, buf, buf_size);
+	commbuf_size = '\0';
+
+	return strstr(comm, s) != NULL;
+}
+#endif /* FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */
+
 #endif /* __LXC_UTILS_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/uuid.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/uuid.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/lxc/uuid.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/lxc/uuid.h Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/aa.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/aa.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/api_reboot.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/api_reboot.c Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/arch_parse.c Added

@@ -0,0 +1,73 @@
+/* liblxcapi
+ *
+ * Copyright © 2021 Christian Brauner <christian.brauner@ubuntu.com>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "lxc/lxccontainer.h"
+
+#include "lxctest.h"
+#include "../lxc/lxc.h"
+#include "../lxc/memory_utils.h"
+
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
+#endif
+
+static const char *const arches = {
+    "arm",   "armel",	"armhf",   "armv7l",	"athlon",  "i386",   "i486",
+    "i586",  "i686",	"linux32", "mips",	"mipsel",  "ppc",    "powerpc",
+    "x86",   "aarch64", "amd64",   "arm64",	"linux64", "mips64", "mips64el",
+    "ppc64", "ppc64el", "ppc64le", "powerpc64", "riscv64", "s390x",  "x86_64",
+};
+
+static bool parse_valid_architectures(void)
+{
+	__put_lxc_container struct lxc_container *c = NULL;
+
+	c = lxc_container_new("parse-arch", NULL);
+	if (!c)
+		return test_error_ret(false, "Failed to create container \"parse_arch\"");
+
+	for (size_t i = 0; i < ARRAY_SIZE(arches); i++) {
+		const char *arch = archesi;
+
+		if (!c->set_config_item(c, "lxc.arch", arch))
+			return test_error_ret(false, "Failed to set \"lxc.arch=%s\"", arch);
+
+		if (!c->clear_config_item(c, "lxc.arch"))
+			return test_error_ret(false, "Failed to clear \"lxc.arch=%s\"", arch);
+	}
+
+	return true;
+}
+
+int main(int argc, char *argv)
+{
+	if (!parse_valid_architectures())
+		exit(EXIT_FAILURE);
+
+	exit(EXIT_SUCCESS);
+}

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/attach.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/attach.c Changed

@@ -19,6 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
@@ -32,8 +34,8 @@
 
 #include <lxc/lxccontainer.h>
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
 #define TSTNAME    "lxc-attach-test"
@@ -47,14 +49,16 @@
 static const char *lsm_config_key = NULL;
 static const char *lsm_label = NULL;
 
+struct lsm_ops *lsm_ops;
+
 static void test_lsm_detect(void)
 {
-	if (lsm_enabled()) {
-		if (!strcmp(lsm_name(), "SELinux")) {
+	if (lsm_ops->enabled(lsm_ops)) {
+		if (!strcmp(lsm_ops->name, "SELinux")) {
 			lsm_config_key = "lxc.selinux.context";
 			lsm_label      = "unconfined_u:unconfined_r:lxc_t:s0-s0:c0.c1023";
 		}
-		else if (!strcmp(lsm_name(), "AppArmor")) {
+		else if (!strcmp(lsm_ops->name, "AppArmor")) {
 			lsm_config_key = "lxc.apparmor.profile";
 			if (file_exists("/proc/self/ns/cgroup"))
 				lsm_label      = "lxc-container-default-cgns";
@@ -62,7 +66,7 @@
 				lsm_label      = "lxc-container-default";
 		}
 		else {
-			TSTERR("unknown lsm %s enabled, add test code here", lsm_name());
+			TSTERR("unknown lsm %s enabled, add test code here", lsm_ops->name);
 			exit(EXIT_FAILURE);
 		}
 	}
@@ -78,7 +82,7 @@
 
 static int test_attach_lsm_func_func(void* payload)
 {
-	TSTOUT("%s", lsm_process_label_get(syscall(SYS_getpid)));
+	TSTOUT("%s", lsm_ops->process_label_get(lsm_ops, syscall(SYS_getpid)));
 	return 0;
 }
 
@@ -319,8 +323,7 @@
 		goto out1;
 	}
 	if (ct->is_defined(ct)) {
-		ct->stop(ct);
-		ct->destroy(ct);
+		test_ct_destroy(ct);
 		ct = lxc_container_new(name, lxcpath);
 	}
 	if (!ct->createl(ct, template, NULL, NULL, 0, NULL)) {
@@ -328,7 +331,7 @@
 		goto out2;
 	}
 
-	if (lsm_enabled())
+	if (lsm_ops->enabled(lsm_ops))
 		test_attach_lsm_set_config(ct);
 
 	ct->want_daemonize(ct, true);
@@ -368,7 +371,7 @@
 		goto err2;
 	}
 
-	if (lsm_enabled()) {
+	if (lsm_ops->enabled(lsm_ops)) {
 		ret = test_attach_lsm_cmd(ct);
 		if (ret < 0) {
 			TSTERR("attach lsm cmd test failed");
@@ -398,6 +401,8 @@
 
 	(void)strlcpy(template, P_tmpdir"/attach_XXXXXX", sizeof(template));
 
+	lsm_ops = lsm_init_static();
+
 	i = lxc_make_tmpfile(template, false);
 	if (i < 0) {
 		lxc_error("Failed to create temporary log file for container %s\n", TSTNAME);

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/basic.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/basic.c Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/capabilities.c Added

@@ -0,0 +1,259 @@
+/* liblxcapi
+ *
+ * Copyright © 2021 Christian Brauner <christian.brauner@ubuntu.com>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "lxccontainer.h"
+#include "attach_options.h"
+
+#include "caps.h"
+#include "lxctest.h"
+#include "utils.h"
+
+#if HAVE_LIBCAP
+__u32 *cap_bset_bits = NULL;
+__u32 last_cap = 0;
+
+static int capabilities_allow(void *payload)
+{
+	for (__u32 cap = 0; cap <= last_cap; cap++) {
+		bool bret;
+
+		if (!is_set(cap, cap_bset_bits))
+			continue;
+
+		if (cap == CAP_MKNOD)
+			bret = cap_get_bound(cap) == CAP_SET;
+		else
+			bret = cap_get_bound(cap) != CAP_SET;
+		if (!bret) {
+			lxc_error("Capability %d unexpectedly raised or lowered\n", cap);
+			return EXIT_FAILURE;
+		}
+	}
+
+	return EXIT_SUCCESS;
+}
+
+static int capabilities_deny(void *payload)
+{
+	for (__u32 cap = 0; cap <= last_cap; cap++) {
+		bool bret;
+
+		if (!is_set(cap, cap_bset_bits))
+			continue;
+
+		if (cap == CAP_MKNOD)
+			bret = cap_get_bound(cap) != CAP_SET;
+		else
+			bret = cap_get_bound(cap) == CAP_SET;
+		if (!bret) {
+			lxc_error("Capability %d unexpectedly raised or lowered\n", cap);
+			return EXIT_FAILURE;
+		}
+	}
+
+	return EXIT_SUCCESS;
+}
+
+static int run(int (*test)(void *), bool allow)
+{
+	int fd_log = -EBADF, fret = -1;
+	lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT;
+	int ret;
+	pid_t pid;
+	struct lxc_container *c;
+	struct lxc_log log;
+	char templatesizeof(P_tmpdir"/capabilities_XXXXXX");
+
+	(void)strlcpy(template, P_tmpdir"/capabilities_XXXXXX", sizeof(template));
+
+	fd_log = lxc_make_tmpfile(template, false);
+	if (fd_log < 0) {
+		lxc_error("%s", "Failed to create temporary log file for container \"capabilities\"");
+		return fret;
+	}
+
+	log.name = "capabilities";
+	log.file = template;
+	log.level = "TRACE";
+	log.prefix = "capabilities";
+	log.quiet = false;
+	log.lxcpath = NULL;
+
+	if (lxc_log_init(&log))
+		return fret;
+
+	c = lxc_container_new("capabilities", NULL);
+	if (!c) {
+		lxc_error("%s\n", "Failed to create container \"capabilities\"");
+		return fret;
+	}
+
+	if (c->is_defined(c)) {
+		lxc_error("%s\n", "Container \"capabilities\" is defined");
+		goto on_error_put;
+	}
+
+	if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
+		lxc_error("%s\n", "Failed to create busybox container \"capabilities\"");
+		goto on_error_put;
+	}
+
+	if (!c->is_defined(c)) {
+		lxc_error("%s\n", "Container \"capabilities\" is not defined");
+		goto on_error_destroy;
+	}
+
+	if (!c->clear_config_item(c, "lxc.cap.drop")) {
+		lxc_error("%s\n", "Failed to clear config item \"lxc.cap.drop\"");
+		goto on_error_destroy;
+	}
+
+	if (!c->clear_config_item(c, "lxc.cap.keep")) {
+		lxc_error("%s\n", "Failed to clear config item \"lxc.cap.drop\"");
+		goto on_error_destroy;
+	}
+
+	if (allow) {
+		if (!c->set_config_item(c, "lxc.cap.keep", "mknod")) {
+			lxc_error("%s\n", "Failed to set config item \"lxc.cap.keep=mknod\"");
+			goto on_error_destroy;
+		}
+	} else {
+		if (!c->set_config_item(c, "lxc.cap.drop", "mknod")) {
+			lxc_error("%s\n", "Failed to set config item \"lxc.cap.drop=mknod\"");
+			goto on_error_destroy;
+		}
+	}
+
+	if (!c->want_daemonize(c, true)) {
+		lxc_error("%s\n", "Failed to mark container \"capabilities\" daemonized");
+		goto on_error_destroy;
+	}
+
+	if (!c->startl(c, 0, NULL)) {
+		lxc_error("%s\n", "Failed to start container \"capabilities\" daemonized");
+		goto on_error_destroy;
+	}
+
+	ret = c->attach(c, test, NULL, &attach_options, &pid);
+	if (ret < 0) {
+		lxc_error("%s\n", "Failed to run function in container \"capabilities\"");
+		goto on_error_stop;
+	}
+
+	ret = wait_for_pid(pid);
+	if (ret) {
+		lxc_error("%s\n", "Function \"capabilities\" failed");
+		goto on_error_stop;
+	}
+
+	fret = 0;
+
+on_error_stop:
+	if (c->is_running(c) && !c->stop(c))
+		lxc_error("%s\n", "Failed to stop container \"capabilities\"");
+
+on_error_destroy:
+	if (!c->destroy(c))
+		lxc_error("%s\n", "Failed to destroy container \"capabilities\"");
+
+on_error_put:
+	lxc_container_put(c);
+
+	if (fret == EXIT_SUCCESS) {
+		lxc_debug("All capability %s tests passed\n", allow ? "allow" : "deny");
+	} else {
+		int fd;
+
+		fd = open(template, O_RDONLY);
+		if (fd >= 0) {
+			char buf4096;
+			ssize_t buflen;
+			while ((buflen = read(fd, buf, 1024)) > 0) {
+				buflen = write(STDERR_FILENO, buf, buflen);
+				if (buflen <= 0)
+					break;
+			}
+			close(fd);
+		}
+	}
+	(void)unlink(template);
+
+	return fret;
+}
+
+static void __attribute__((constructor)) capabilities_init(void)
+{
+	int ret;
+	__u32 nr_u32;
+
+	ret = lxc_caps_last_cap(&last_cap);
+	if (ret || last_cap > 200)
+		_exit(EXIT_FAILURE);
+
+	nr_u32 = BITS_TO_LONGS(last_cap);
+	cap_bset_bits = zalloc(nr_u32 * sizeof(__u32));
+	if (!cap_bset_bits)
+		_exit(EXIT_FAILURE);
+
+	for (__u32 cap_bit = 0; cap_bit <= last_cap; cap_bit++) {
+		if (prctl(PR_CAPBSET_READ, prctl_arg(cap_bit)) == 0)
+			continue;
+
+		set_bit(cap_bit, cap_bset_bits);
+	}
+}
+
+static void __attribute__((destructor)) capabilities_exit(void)
+{
+	free(cap_bset_bits);
+}
+
+int main(int argc, char *argv)
+{
+	if (run(capabilities_allow, true))
+		exit(EXIT_FAILURE);
+
+	if (run(capabilities_deny, false))
+		exit(EXIT_FAILURE);
+
+	exit(EXIT_SUCCESS);
+}
+
+#else /* !HAVE_LIBCAP */
+
+int main(int argc, char *argv)
+{
+	lxc_debug("%s\n", "Capabilities not supported. Skipping.");
+	exit(EXIT_SUCCESS);
+}
+#endif

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/cgpath.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/cgpath.c Changed

@@ -16,6 +16,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
+#include "config.h"
+
 #include <lxc/lxccontainer.h>
 
 #include <limits.h>
@@ -30,11 +33,13 @@
 #include <sys/stat.h>
 
 #include "cgroup.h"
-#include "lxc.h"
 #include "commands.h"
+#include "lxc.h"
+#include "lxctest.h"
+#include "utils.h"
 
-#ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
 #endif
 
 #define MYNAME "lxctest1"
@@ -50,12 +55,31 @@
  */
 static int test_running_container(const char *lxcpath, const char *name)
 {
+	__do_close int fd_log = -EBADF;
 	int ret = -1;
 	struct lxc_container *c = NULL;
+	struct lxc_log log = {};
+	char templatesizeof(P_tmpdir"/attach_XXXXXX");
 	char *cgrelpath;
 	char  relpathPATH_MAX+1;
 	char  valueNAME_MAX, value_saveNAME_MAX;
-	struct cgroup_ops *cgroup_ops;
+	call_cleaner(cgroup_exit) struct cgroup_ops *cgroup_ops = NULL;
+
+	(void)strlcpy(template, P_tmpdir"/attach_XXXXXX", sizeof(template));
+
+	fd_log = lxc_make_tmpfile(template, false);
+	if (fd_log < 0) {
+		lxc_error("Failed to create temporary log file for container %s\n", name);
+		exit(EXIT_FAILURE);
+	}
+	log.name = name;
+	log.file = template;
+	log.level = "TRACE";
+	log.prefix = "cgpath";
+	log.quiet = false;
+	log.lxcpath = NULL;
+	if (lxc_log_init(&log))
+		goto err1;
 
 	sprintf(relpath, DEFAULT_PAYLOAD_CGROUP_PREFIX "%s", name);
 
@@ -83,33 +107,33 @@
 		goto err3;
 
 	/* test get/set value using memory.soft_limit_in_bytes file */
-	ret = cgroup_ops->get(cgroup_ops, "memory.soft_limit_in_bytes", value,
-			      sizeof(value), c->name, c->config_path);
-	if (ret < 0) {
+	ret = cgroup_ops->get(cgroup_ops, "pids.max", value, sizeof(value),
+			      c->name, c->config_path);
+        if (ret < 0) {
 		TSTERR("cgroup_get failed");
 		goto err3;
 	}
 	(void)strlcpy(value_save, value, NAME_MAX);
 
-	ret = cgroup_ops->set(cgroup_ops, "memory.soft_limit_in_bytes", "512M",
+	ret = cgroup_ops->set(cgroup_ops, "pids.max", "10000",
 			      c->name, c->config_path);
 	if (ret < 0) {
 		TSTERR("cgroup_set failed %d %d", ret, errno);
 		goto err3;
 	}
-	ret = cgroup_ops->get(cgroup_ops, "memory.soft_limit_in_bytes", value,
+	ret = cgroup_ops->get(cgroup_ops, "pids.max", value,
 			      sizeof(value), c->name, c->config_path);
 	if (ret < 0) {
 		TSTERR("cgroup_get failed");
 		goto err3;
 	}
-	if (strcmp(value, "536870912\n")) {
+	if (strcmp(value, "10000\n")) {
 		TSTERR("cgroup_set_bypath failed to set value >%s<", value);
 		goto err3;
 	}
 
 	/* restore original value */
-	ret = cgroup_ops->set(cgroup_ops, "memory.soft_limit_in_bytes",
+	ret = cgroup_ops->set(cgroup_ops, "pids.max",
 			      value_save, c->name, c->config_path);
 	if (ret < 0) {
 		TSTERR("cgroup_set failed");
@@ -123,6 +147,17 @@
 err2:
 	lxc_container_put(c);
 err1:
+
+	if (ret != 0) {
+		char buf4096;
+		ssize_t buflen;
+		while ((buflen = read(fd_log, buf, 1024)) > 0) {
+			buflen = write(STDERR_FILENO, buf, buflen);
+			if (buflen <= 0)
+				break;
+		}
+	}
+	(void)unlink(template);
 	return ret;
 }
 
@@ -148,6 +183,7 @@
 	if (c->is_defined(c)) {
 		c->stop(c);
 		c->destroy(c);
+		lxc_container_put(c);
 		c = lxc_container_new(name, lxcpath);
 	}
 	c->set_config_item(c, "lxc.net.0.type", "empty");
@@ -173,7 +209,7 @@
 	return ret;
 }
 
-int main()
+int main(int argc, char *argv)
 {
 	int ret = EXIT_FAILURE;

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/clonetest.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/clonetest.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/concurrent.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/concurrent.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/config_jump_table.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/config_jump_table.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/console.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/console.c Changed

@@ -19,6 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <lxc/lxccontainer.h>
 
 #include <errno.h>
@@ -37,14 +39,14 @@
 } while (0)
 
 static void test_console_close_all(int ttyfdMAXCONSOLES,
-				   int ptmxfdMAXCONSOLES)
+				   int ptxfdMAXCONSOLES)
 {
 	int i;
 
 	for (i = 0; i < MAXCONSOLES; i++) {
-		if (ptmxfdi != -1) {
-			close(ptmxfdi);
-			ptmxfdi = -1;
+		if (ptxfdi != -1) {
+			close(ptxfdi);
+			ptxfdi = -1;
 		}
 
 		if (ttyfdi != -1) {
@@ -59,14 +61,14 @@
 	int nrconsoles, i, ret = -1;
 	int ttynum  MAXCONSOLES;
 	int ttyfd   MAXCONSOLES;
-	int ptmxfdMAXCONSOLES;
+	int ptxfdMAXCONSOLES;
 
 	for (i = 0; i < MAXCONSOLES; i++)
-		ttynumi = ttyfdi = ptmxfdi = -1;
+		ttynumi = ttyfdi = ptxfdi = -1;
 
 	ttynum0 = 1;
 
-	ret = c->console_getfd(c, &ttynum0, &ptmxfd0);
+	ret = c->console_getfd(c, &ttynum0, &ptxfd0);
 	if (ret < 0) {
 		TSTERR("console allocate failed");
 		goto err1;
@@ -79,12 +81,12 @@
 	}
 
 	/* attempt to alloc same ttynum */
-	ret = c->console_getfd(c, &ttynum0, &ptmxfd1);
+	ret = c->console_getfd(c, &ttynum0, &ptxfd1);
 	if (ret != -1) {
 		TSTERR("console allocate should fail for allocated ttynum %d", ttynum0);
 		goto err2;
 	}
-	close(ptmxfd0); ptmxfd0 = -1;
+	close(ptxfd0); ptxfd0 = -1;
 	close(ttyfd0); ttyfd0 = -1;
 
 	/* ensure we can allocate all consoles, we do this a few times to
@@ -92,7 +94,7 @@
 	 */
 	for (i = 0; i < 10; i++) {
 		for (nrconsoles = 0; nrconsoles < MAXCONSOLES; nrconsoles++) {
-			ret = c->console_getfd(c, &ttynumnrconsoles, &ptmxfdnrconsoles);
+			ret = c->console_getfd(c, &ttynumnrconsoles, &ptxfdnrconsoles);
 			if (ret < 0)
 				break;
 			ttyfdnrconsoles = ret;
@@ -103,13 +105,13 @@
 			goto err2;
 		}
 
-		test_console_close_all(ttyfd, ptmxfd);
+		test_console_close_all(ttyfd, ptxfd);
 	}
 
 	ret = 0;
 
 err2:
-	test_console_close_all(ttyfd, ptmxfd);
+	test_console_close_all(ttyfd, ptxfd);
 
 err1:
 	return ret;

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/console_log.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/console_log.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/containertests.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/containertests.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/createtest.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/createtest.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/criu_check_feature.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/criu_check_feature.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/cve-2019-5736.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/cve-2019-5736.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/destroytest.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/destroytest.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/device_add_remove.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/device_add_remove.c Changed

@@ -16,17 +16,46 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <lxc/lxccontainer.h>
 
+#include "lxctest.h"
+#include "memory_utils.h"
+#include "utils.h"
+
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
+#endif
+
 #define NAME "device_add_remove_test"
 #define DEVICE "/dev/loop-control"
 
 int main(int argc, char *argv)
 {
+	__do_close int fd_log = -EBADF;
 	int ret = 1;
-	struct lxc_container *c;
+	struct lxc_log log = {};
+	struct lxc_container *c = NULL;
+	char templatesizeof(P_tmpdir"/attach_XXXXXX");
+
+	(void)strlcpy(template, P_tmpdir"/attach_XXXXXX", sizeof(template));
+
+	fd_log = lxc_make_tmpfile(template, false);
+	if (fd_log < 0) {
+		lxc_error("Failed to create temporary log file for container %s\n", NAME);
+		exit(EXIT_FAILURE);
+	}
+	log.name = NAME;
+	log.file = template;
+	log.level = "TRACE";
+	log.prefix = "device_add_remove";
+	log.quiet = false;
+	log.lxcpath = NULL;
+	if (lxc_log_init(&log))
+		goto out;
 
 	c = lxc_container_new(NAME, NULL);
 	if (!c) {
@@ -69,6 +98,18 @@
 	ret = 0;
 
 out:
-	lxc_container_put(c);
+	if (ret != 0) {
+		char buf4096;
+		ssize_t buflen;
+		while ((buflen = read(fd_log, buf, 1024)) > 0) {
+			buflen = write(STDERR_FILENO, buf, buflen);
+			if (buflen <= 0)
+				break;
+		}
+	}
+	(void)unlink(template);
+
+	if (c)
+		lxc_container_put(c);
 	return ret;
 }

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/fuzz-lxc-cgroup-init.c Added

@@ -0,0 +1,52 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include "config.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "cgroups/cgroup.h"
+#include "conf.h"
+#include "confile.h"
+#include "lxctest.h"
+#include "utils.h"
+
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+	int fd = -1;
+	char tmpf = "/tmp/fuzz-lxc-cgroup-init-XXXXXX";
+	struct lxc_conf *conf = NULL;
+	int ret;
+	struct cgroup_ops *ops;
+
+	/*
+	 * 100Kb should probably be enough to trigger all the issues
+	 * we're interested in without any timeouts
+	 */
+	if (size > 102400)
+		return 0;
+
+	fd = lxc_make_tmpfile(tmpf, false);
+	lxc_test_assert_abort(fd >= 0);
+	lxc_write_nointr(fd, data, size);
+	close(fd);
+
+	conf = lxc_conf_init();
+	lxc_test_assert_abort(conf);
+
+	/* Test cgroup_init() with valid config. */
+	ops = cgroup_init(conf);
+	cgroup_exit(ops);
+
+	ret = lxc_config_read(tmpf, conf, false);
+	if (ret == 0) {
+		/* Test cgroup_init() with likely garbage config. */
+		ops = cgroup_init(conf);
+		cgroup_exit(ops);
+	}
+	lxc_conf_free(conf);
+
+	(void) unlink(tmpf);
+
+	return 0;
+}
+

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/fuzz-lxc-config-read.c Added

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/fuzz-lxc-define-load.c Added

@@ -0,0 +1,66 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include "config.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "conf.h"
+#include "confile.h"
+#include "lxctest.h"
+#include "utils.h"
+
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+	__do_free char *new_str = NULL;
+	struct lxc_container *c = NULL;
+	struct lxc_list defines;
+	struct lxc_list *it;
+	__do_close int devnull_fd = -EBADF;
+
+	if (size > 102400)
+		return 0;
+
+	c = lxc_container_new("FUZZ", NULL);
+	lxc_test_assert_abort(c);
+
+	new_str = (char *)malloc(size+1);
+	lxc_test_assert_abort(new_str);
+	memcpy(new_str, data, size);
+	new_strsize = '\0';
+
+	lxc_list_init(&defines);
+
+	if (lxc_config_define_add(&defines, new_str) < 0)
+		goto out;
+
+	if (!lxc_config_define_load(&defines, c))
+		goto out;
+
+	devnull_fd = open_devnull();
+	lxc_test_assert_abort(devnull_fd >= 0);
+
+	lxc_list_for_each(it, &defines) {
+		__do_free char *val = NULL;
+		struct new_config_item *config_item = it->elem;
+		int len;
+
+		len = c->get_config_item(c, config_item->key, NULL, 0);
+		if (len < 0)
+			continue;
+
+		val = (char *)malloc(len + 1);
+		lxc_test_assert_abort(val);
+
+		if (c->get_config_item(c, config_item->key, val, len + 1) != len)
+			continue;
+
+		if (len > 0)
+			dprintf(devnull_fd, "%s/%s\n", config_item->key, val);
+	}
+
+out:
+	lxc_container_put(c);
+	lxc_config_define_free(&defines);
+
+	return 0;
+}

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/get_item.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/get_item.c Changed

@@ -16,6 +16,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
+#include "config.h"
+
 #include <lxc/lxccontainer.h>
 
 #include <unistd.h>
@@ -27,17 +30,40 @@
 #include <errno.h>
 #include <string.h>
 
-#include "lxc/state.h"
+#include "state.h"
 #include "lxctest.h"
+#include "utils.h"
+
+#if !HAVE_STRLCPY
+#include "strlcpy.h"
+#endif
 
 #define MYNAME "lxctest1"
 
 int main(int argc, char *argv)
 {
-	int ret;
-	struct lxc_container *c;
+	int fd_log, ret;
+	struct lxc_container *c = NULL;
 	int fret = EXIT_FAILURE;
 	char v12, v2256, v32048;
+	struct lxc_log log = {};
+	char templatesizeof(P_tmpdir"/attach_XXXXXX");
+
+	(void)strlcpy(template, P_tmpdir"/attach_XXXXXX", sizeof(template));
+
+	fd_log = lxc_make_tmpfile(template, false);
+	if (fd_log < 0) {
+		lxc_error("Failed to create temporary log file for container %s\n", MYNAME);
+		exit(EXIT_FAILURE);
+	}
+	log.name = MYNAME;
+	log.file = template;
+	log.level = "TRACE";
+	log.prefix = "get_item";
+	log.quiet = false;
+	log.lxcpath = NULL;
+	if (lxc_log_init(&log))
+		goto out;
 
 	if ((c = lxc_container_new("testxyz", NULL)) == NULL) {
 		fprintf(stderr, "%d: error opening lxc_container %s\n", __LINE__, MYNAME);
@@ -136,6 +162,59 @@
 	}
 	printf("lxc.init_gid returned %d %s\n", ret, v2);
 
+	if (c->set_config_item(c, "lxc.init.groups", "10,20,foo,40")) {
+		fprintf(stderr, "%d: managed to set lxc.init.groups to '10,20,foo,40'\n", __LINE__);
+		goto out;
+	}
+
+	if (!c->set_config_item(c, "lxc.init.groups", "10,20,30,40")) {
+		fprintf(stderr, "%d: managed to set lxc.init.groups to '10,20,30,40'\n", __LINE__);
+		goto out;
+	}
+
+	ret = c->get_config_item(c, "lxc.init.groups", v2, 255);
+	if (ret < 0) {
+		fprintf(stderr, "%d: failed to get lxc.init.groups\n", __LINE__);
+		goto out;
+	}
+	ret = strcmp("10,20,30,40", v2);
+	printf("%d: lxc.init.groups returned %d %s\n", __LINE__, ret, v2);
+	if (ret != 0) {
+		goto out;
+	}
+
+	if (!c->set_config_item(c, "lxc.init.groups", "50,60,70,80")) {
+		fprintf(stderr, "%d: failed to set lxc.init.groups to '50,60,70,80'\n", __LINE__);
+		goto out;
+	}
+
+	ret = c->get_config_item(c, "lxc.init.groups", v2, 255);
+	if (ret < 0) {
+		fprintf(stderr, "%d: failed to get lxc.init.groups\n", __LINE__);
+		goto out;
+	}
+	ret = strcmp("10,20,30,40,50,60,70,80", v2);
+	printf("%d: lxc.init.groups returned %d %s\n", __LINE__, ret, v2);
+	if (ret != 0) {
+		goto out;
+	}
+
+	if (!c->set_config_item(c, "lxc.init.groups", "")) {
+		fprintf(stderr, "%d: failed to set lxc.init.groups to ''\n", __LINE__);
+		goto out;
+	}
+
+	ret = c->get_config_item(c, "lxc.init.groups", v2, 255);
+	if (ret < 0) {
+		fprintf(stderr, "%d: failed to get lxc.init.groups\n", __LINE__);
+		goto out;
+	}
+	ret = strcmp("", v2);
+	printf("%d: lxc.init.groups returned %d %s\n", __LINE__, ret, v2);
+	if (ret != 0) {
+		goto out;
+	}
+
 #define HNAME "hostname1"
 	// demonstrate proper usage:
 	char *alloced;
@@ -600,6 +679,11 @@
 		goto out;
 	}
 
+	if (lxc_config_item_is_supported("lxc.arch.nonsense")) {
+		fprintf(stderr, "%d: failed to detect \"lxc.arch.nonsense\" as unsupported configuration item\n", __LINE__);
+		goto out;
+	}
+
 	if (c->set_config_item(c, "lxc.notaconfigkey", "invalid")) {
 		fprintf(stderr, "%d: Managed to set \"lxc.notaconfigkey\"\n", __LINE__);
 		goto out;
@@ -614,6 +698,17 @@
 		c->destroy(c);
 		lxc_container_put(c);
 	}
+	if (fret != EXIT_SUCCESS) {
+		char buf4096;
+		ssize_t buflen;
+		while ((buflen = read(fd_log, buf, 1024)) > 0) {
+			buflen = write(STDERR_FILENO, buf, buflen);
+			if (buflen <= 0)
+				break;
+		}
+		close(fd_log);
+	}
+	(void)unlink(template);
 
 	exit(fret);
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/getkeys.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/getkeys.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/list.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/list.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/locktests.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/locktests.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-apparmor-generated -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-apparmor-generated Changed

@@ -18,13 +18,12 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-if ! which apparmor_parser >/dev/null 2>&1; then
+if ! command -v apparmor_parser >/dev/null 2>&1; then
 	echo 'SKIP: test for generated apparmor profiles: apparmor_parser missing'
 fi
 exit 0
 
 DONE=0
-KNOWN_RELEASES="precise trusty xenial yakkety zesty"
 LOGFILE="/tmp/lxc-test-$$.log"
 cleanup() {
 	lxc-destroy -n $CONTAINER_NAME >/dev/null 2>&1 || true
@@ -39,29 +38,13 @@
 	echo "PASS"
 }
 
-ARCH=i386
-if type dpkg >/dev/null 2>&1; then
-	ARCH=$(dpkg --print-architecture)
-fi
-
 trap cleanup EXIT HUP INT TERM
 set -eu
 
 # Create a container
 CONTAINER_NAME=lxc-test-apparmor-generated
 
-# default release is trusty, or the systems release if recognized
-release=trusty
-if  -f /etc/lsb-release ; then
-    . /etc/lsb-release
-    rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
-        rels="$KNOWN_RELEASES"
-    for r in $rels; do
-         "$DISTRIB_CODENAME" = "$r"  && release="$r"
-    done
-fi
-
-lxc-create -t download -n $CONTAINER_NAME -B dir -- -d ubuntu -r $release -a $ARCH
+lxc-create -t busybox -n $CONTAINER_NAME -B dir
 CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs.path -H) | sed -e 's/dir://')
 cp $CONTAINER_PATH/config $CONTAINER_PATH/config.bak
 
@@ -71,8 +54,8 @@
 # Start it
 lxc-start -n $CONTAINER_NAME -lDEBUG -o "$LOGFILE"
 lxc-wait -n $CONTAINER_NAME -t 5 -s RUNNING || (echo "Container didn't start" && exit 1)
-pid=`lxc-info -p -H -n $CONTAINER_NAME`
-profile=`cat /proc/$pid/attr/current`
+pid=$(lxc-info -p -H -n $CONTAINER_NAME)
+profile=$(cat /proc/$pid/attr/current)
 expected_profile="lxc-${CONTAINER_NAME}_</var/lib/lxc>//&:lxc-${CONTAINER_NAME}_<-var-lib-lxc>:unconfined (enforce)"
 lxc-stop -n $CONTAINER_NAME -k
 if  "x$profile" != "x$expected_profile" ; then

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-apparmor-mount -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-apparmor-mount Changed

@@ -48,15 +48,15 @@
 run_cmd() {
 	sudo -i -u $TUSER \
 	    env http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
-	        XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $*
+	        XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) ASAN_OPTIONS=${ASAN_OPTIONS:-} \
+		UBSAN_OPTIONS=${UBSAN_OPTIONS:-} $*
 }
 
 DONE=0
-KNOWN_RELEASES="precise trusty xenial yakkety zesty"
 MOUNTSR=/sys/kernel/security/apparmor/features/mount
-dnam=`mktemp -d`
-logfile=`mktemp`
-cname=`basename $dnam`
+dnam=$(mktemp -d)
+logfile=$(mktemp)
+cname=$(basename $dnam)
 cleanup() {
 	run_cmd lxc-destroy -f -n $cname || true
 	umount -l $MOUNTSR || true
@@ -91,16 +91,11 @@
 # of an empty directory over the securityfs 'mount' directory
 # be removed, we need to do this as non-root.
 
-which newuidmap >/dev/null 2>&1 || { echo "'newuidmap' command is missing" >&2; exit 1; }
+command -v newuidmap >/dev/null 2>&1 || { echo "'newuidmap' command is missing" >&2; exit 1; }
 # create a test user
 TUSER=lxcunpriv
 HDIR=/home/$TUSER
 
-ARCH=i386
-if type dpkg >/dev/null 2>&1; then
-	ARCH=$(dpkg --print-architecture)
-fi
-
 deluser $TUSER && rm -Rf $HDIR || true
 useradd $TUSER
 
@@ -124,7 +119,7 @@
 
 cd $HDIR
 
-if which cgm >/dev/null 2>&1; then
+if command -v cgm >/dev/null 2>&1; then
 	cgm create all $TUSER
 	cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER)
 	cgm movepid all $TUSER $$
@@ -153,29 +148,13 @@
 fi
 
 
-run_cmd mkdir -p $HDIR/.cache/lxc
- -d /var/cache/lxc/download  && \
-    cp -R /var/cache/lxc/download $HDIR/.cache/lxc && \
-    chown -R $TUSER: $HDIR/.cache/lxc
-
-# default release is trusty, or the systems release if recognized
-release=trusty
-if  -f /etc/lsb-release ; then
-    . /etc/lsb-release
-    rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
-        rels="$KNOWN_RELEASES"
-    for r in $rels; do
-         "$DISTRIB_CODENAME" = "$r"  && release="$r"
-    done
-fi
-
-run_cmd lxc-create -t download -n $cname -- -d ubuntu -r $release -a $ARCH
+run_cmd lxc-create -t busybox -n $cname
 
 echo "test default confined container"
 run_cmd lxc-start -n $cname -d -lDEBUG -o "$logfile"
 run_cmd lxc-wait -n $cname -s RUNNING
-pid=`run_cmd lxc-info -p -H -n $cname`
-profile=`cat /proc/$pid/attr/current`
+pid=$(run_cmd lxc-info -p -H -n $cname)
+profile=$(cat /proc/$pid/attr/current)
 if  "x$profile" != "x${default_profile}" ; then
 	echo "FAIL: confined container was in profile $profile"
 	exit 1
@@ -187,8 +166,8 @@
 echo "lxc.apparmor.profile = unconfined" >> $HDIR/.local/share/lxc/$cname/config
 run_cmd lxc-start -n $cname -d -lDEBUG -o "$logfile"
 run_cmd lxc-wait -n $cname -s RUNNING
-pid=`run_cmd lxc-info -p -H -n $cname`
-profile=`cat /proc/$pid/attr/current`
+pid=$(run_cmd lxc-info -p -H -n $cname)
+profile=$(cat /proc/$pid/attr/current)
 if  "x$profile" != "xunconfined" ; then
 	echo "FAIL: unconfined container was in profile $profile"
 	exit 1
@@ -203,7 +182,7 @@
 sed -i '/apparmor.profile/d' $HDIR/.local/share/lxc/$cname/config
 run_cmd lxc-start -n $cname -d || true
 sleep 3
-pid=`run_cmd lxc-info -p -H -n $cname` || true
+pid=$(run_cmd lxc-info -p -H -n $cname) || true
 if  -n "$pid" -a "$pid" != "-1" ; then
 	echo "FAIL: confined container started without mount restrictions"
 	echo "pid was $pid"
@@ -214,12 +193,12 @@
 echo "lxc.apparmor.profile = unconfined" >> $HDIR/.local/share/lxc/$cname/config
 run_cmd lxc-start -n $cname -d -lDEBUG -o "$logfile"
 run_cmd lxc-wait -n $cname -s RUNNING
-pid=`run_cmd lxc-info -p -H -n $cname`
+pid=$(run_cmd lxc-info -p -H -n $cname)
 if  "$pid" = "-1" ; then
 	echo "FAIL: unconfined container failed to start without mount restrictions"
 	exit 1
 fi
-profile=`cat /proc/$pid/attr/current`
+profile=$(cat /proc/$pid/attr/current)
 if  "x$profile" != "xunconfined" ; then
 	echo "FAIL: confined container was in profile $profile"
 	exit 1
@@ -232,12 +211,12 @@
 echo "lxc.apparmor.allow_incomplete = 1" >> $HDIR/.local/share/lxc/$cname/config
 run_cmd lxc-start -n $cname -d -lDEBUG -o "$logfile"
 run_cmd lxc-wait -n $cname -s RUNNING
-pid=`run_cmd lxc-info -p -H -n $cname`
+pid=$(run_cmd lxc-info -p -H -n $cname)
 if  "$pid" = "-1" ; then
 	echo "FAIL: excepted container failed to start without mount restrictions"
 	exit 1
 fi
-profile=`cat /proc/$pid/attr/current`
+profile=$(cat /proc/$pid/attr/current)
 if  "x$profile" != "x${default_profile}" ; then
 	echo "FAIL: confined container was in profile $profile"
 	exit 1

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-automount -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-automount Changed

@@ -55,8 +55,8 @@
 echo "lxc.mount.auto = proc:mixed sys:mixed" >> $config
 
 lxc-start -n lxc-test-automount
-pid=`lxc-info -n lxc-test-automount -p -H`
-cg=`awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup`
+pid=$(lxc-info -n lxc-test-automount -p -H)
+cg=$(awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup)
 notfound=0
 stat /proc/$pid/root/sys/fs/cgroup/freezer || notfound=1
  $notfound -ne 0 
@@ -75,7 +75,7 @@
 sed -i '/lxc.mount.auto/d' $config
 echo "lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed" >> $config
 lxc-start -n lxc-test-automount
-pid=`lxc-info -n lxc-test-automount -p -H`
+pid=$(lxc-info -n lxc-test-automount -p -H)
 notfound=0
 stat /proc/$pid/root/sys/fs/cgroup/freezer || notfound=1
  $notfound -ne 1 
@@ -98,8 +98,8 @@
 sed -i '/lxc.mount.auto/d' $config
 echo "lxc.mount.auto = cgroup:ro proc:mixed sys:mixed" >> $config
 lxc-start -n lxc-test-automount
-pid=`lxc-info -n lxc-test-automount -p -H`
-cg=`awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup`
+pid=$(lxc-info -n lxc-test-automount -p -H)
+cg=$(awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup)
 notfound=0
 stat /proc/$pid/root/sys/fs/cgroup/freezer || notfound=1
  $notfound -ne 1 
@@ -122,8 +122,8 @@
 sed -i '/lxc.mount.auto/d' $config
 echo "lxc.mount.auto = cgroup:rw proc:mixed sys:mixed" >> $config
 lxc-start -n lxc-test-automount
-pid=`lxc-info -n lxc-test-automount -p -H`
-cg=`awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup`
+pid=$(lxc-info -n lxc-test-automount -p -H)
+cg=$(awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup)
 notfound=0
 stat /proc/$pid/root/sys/fs/cgroup/freezer || notfound=1
  $notfound -ne 1 
@@ -149,8 +149,8 @@
 sed -i '/lxc.mount.auto/d' $config
 echo "lxc.mount.auto = cgroup-full:mixed  proc:mixed sys:mixed" >> $config
 lxc-start -n lxc-test-automount
-pid=`lxc-info -n lxc-test-automount -p -H`
-cg=`awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup`
+pid=$(lxc-info -n lxc-test-automount -p -H)
+cg=$(awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup)
 notfound=0
 stat /proc/$pid/root/sys/fs/cgroup/freezer || notfound=1
  $notfound -ne 1 
@@ -174,8 +174,8 @@
 sed -i '/lxc.mount.auto/d' $config
 echo "lxc.mount.auto = cgroup-full:ro proc:mixed sys:mixed" >> $config
 lxc-start -n lxc-test-automount
-pid=`lxc-info -n lxc-test-automount -p -H`
-cg=`awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup`
+pid=$(lxc-info -n lxc-test-automount -p -H)
+cg=$(awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup)
 notfound=0
 stat /proc/$pid/root/sys/fs/cgroup/freezer || notfound=1
  $notfound -ne 1 
@@ -198,8 +198,8 @@
 sed -i '/lxc.mount.auto/d' $config
 echo "lxc.mount.auto = cgroup-full:rw proc:mixed sys:mixed" >> $config
 lxc-start -n lxc-test-automount
-pid=`lxc-info -n lxc-test-automount -p -H`
-cg=`awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup`
+pid=$(lxc-info -n lxc-test-automount -p -H)
+cg=$(awk -F: '/freezer/ { print $3 }' /proc/$pid/cgroup)
 notfound=0
 stat /proc/$pid/root/sys/fs/cgroup/freezer || notfound=1
  $notfound -ne 1

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-autostart -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-autostart Changed

@@ -22,7 +22,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 DONE=0
-KNOWN_RELEASES="precise trusty xenial yakkety zesty"
 cleanup() {
 	lxc-destroy -n $CONTAINER_NAME >/dev/null 2>&1 || true
 
@@ -33,29 +32,13 @@
 	echo "PASS"
 }
 
-ARCH=i386
-if type dpkg >/dev/null 2>&1; then
-	ARCH=$(dpkg --print-architecture)
-fi
-
 trap cleanup EXIT HUP INT TERM
 set -eu
 
 # Create a container
 CONTAINER_NAME=lxc-test-auto
 
-# default release is trusty, or the systems release if recognized
-release=trusty
-if  -f /etc/lsb-release ; then
-    . /etc/lsb-release
-    rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
-        rels="$KNOWN_RELEASES"
-    for r in $rels; do
-         "$DISTRIB_CODENAME" = "$r"  && release="$r"
-    done
-fi
-
-lxc-create -t download -n $CONTAINER_NAME -B dir -- -d ubuntu -r $release -a $ARCH
+lxc-create -t busybox -n $CONTAINER_NAME -B dir
 CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs.path -H) | sed -e 's/dir://')
 cp $CONTAINER_PATH/config $CONTAINER_PATH/config.bak

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-checkpoint-restore -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-checkpoint-restore Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-cloneconfig -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-cloneconfig Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-createconfig -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-createconfig Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-fuzzers Added

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-lxc-attach -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-lxc-attach Changed

@@ -45,17 +45,21 @@
 
 allocate_pty="nopty"
 
+ATTACH_LOG=$(mktemp --dry-run)
+
 FAIL() {
 	echo -n "Failed " >&2
 	echo "$*" >&2
+	cat "${ATTACH_LOG}"
+	rm -f "${ATTACH_LOG}" || true
         lxc-destroy -n busy -f
 	exit 1
 }
 
 # Create a container, start it and wait for it to be in running state.
-lxc-create -t busybox -n busy || FAIL "creating busybox container"
-lxc-start -n busy -d || FAIL "starting busybox container"
-lxc-wait -n busy -s RUNNING || FAIL "waiting for busybox container to run"
+lxc-create -t busybox -n busy -l trace -o "${ATTACH_LOG}" || FAIL "creating busybox container"
+lxc-start -n busy -d -l trace -o "${ATTACH_LOG}" || FAIL "starting busybox container"
+lxc-wait -n busy -s RUNNING -l trace -o "${ATTACH_LOG}" || FAIL "waiting for busybox container to run"
 
 if  -t 0  &&  -t 1  &&  -t 2 ; then
 	allocate_pty="pty"
@@ -67,8 +71,8 @@
 # stdin  --> attached to pty
 # stdout --> attached to pty
 # stderr --> attached to pty
-for i in `seq 1 100`; do
-	attach=$(lxc-attach -n busy -- hostname || FAIL "to allocate or setup pty")
+for i in $(seq 1 100); do
+	attach=$(lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- hostname || FAIL "to allocate or setup pty")
 	if  "$attach" != "busy" ; then
 		FAIL "lxc-attach -n busy -- hostname"
 	fi
@@ -77,7 +81,7 @@
 # stdin  --> /dev/null
 # stdout --> attached to pty
 # stderr --> attached to pty
-attach=$(lxc-attach -n busy -- hostname < /dev/null || FAIL "to allocate or setup pty")
+attach=$(lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- hostname < /dev/null || FAIL "to allocate or setup pty")
 if  "$attach" != "busy" ; then
         FAIL "lxc-attach -n busy -- hostname < /dev/null"
 fi
@@ -85,7 +89,7 @@
 # stdin  --> attached to pty
 # stdout --> /dev/null
 # stderr --> attached to pty
-attach=$(lxc-attach -n busy -- hostname > /dev/null || FAIL "to allocate or setup pty")
+attach=$(lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- hostname > /dev/null || FAIL "to allocate or setup pty")
 if  -n "$attach" ; then
         FAIL "lxc-attach -n busy -- hostname > /dev/null"
 fi
@@ -93,7 +97,7 @@
 # stdin  --> attached to pty
 # stdout --> attached to pty
 # stderr --> /dev/null
-attach=$(lxc-attach -n busy -- hostname 2> /dev/null || FAIL "to allocate or setup pty")
+attach=$(lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- hostname 2> /dev/null || FAIL "to allocate or setup pty")
 if  "$attach" != "busy" ; then
         FAIL "lxc-attach -n busy -- hostname 2> /dev/null < /dev/null"
 fi
@@ -101,7 +105,7 @@
 # stdin  --> /dev/null
 # stdout --> attached to pty
 # stderr --> /dev/null
-attach=$(lxc-attach -n busy -- hostname 2> /dev/null < /dev/null || FAIL "to allocate or setup pty")
+attach=$(lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- hostname 2> /dev/null < /dev/null || FAIL "to allocate or setup pty")
 if  "$attach" != "busy" ; then
         FAIL "lxc-attach -n busy -- hostname 2> /dev/null < /dev/null"
 fi
@@ -114,7 +118,7 @@
 # stdin  --> attached to pty
 # stdout --> /dev/null
 # stderr --> attached to pty
-attach=$( ( lxc-attach -n busy -- sh -c 'hostname >&2' > /dev/null ) 2>&1 || FAIL "to allocate or setup pty")
+attach=$( ( lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- sh -c 'hostname >&2' > /dev/null ) 2>&1 || FAIL "to allocate or setup pty")
 if  "$attach" != "busy" ; then
         FAIL "lxc-attach -n busy -- sh -c 'hostname >&2' > /dev/null"
 fi
@@ -126,7 +130,7 @@
 # stdin  --> attached to pty
 # stdout --> attach to pty
 # stderr --> /dev/null
-attach=$( ( lxc-attach -n busy -- sh -c 'hostname >&2' 2> /dev/null ) 2>&1 || FAIL "to allocate or setup pty")
+attach=$( ( lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- sh -c 'hostname >&2' 2> /dev/null ) 2>&1 || FAIL "to allocate or setup pty")
 if  -n "$attach" ; then
         FAIL "lxc-attach -n busy -- sh -c 'hostname >&2' 2> /dev/null"
 fi
@@ -136,7 +140,7 @@
 # stdout --> /dev/null
 # stderr --> attached to pty
 # (As we expect the exit code of the command to be 1 we ignore it.)
-attach=$(lxc-attach -n busy -- sh -c 'rm 2>&1' > /dev/null || true)
+attach=$(lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- sh -c 'rm 2>&1' > /dev/null || true)
 if  -n "$attach" ; then
         FAIL "lxc-attach -n busy -- sh -c 'rm 2>&1' > /dev/null"
 fi
@@ -146,7 +150,7 @@
 # - stdout --> attached to pty
 # - stderr --> /dev/null
 # (As we expect the exit code of the command to be 1 we ignore it.)
-attach=$(lxc-attach -n busy -- sh -c 'rm 2>&1' 2> /dev/null || true)
+attach=$(lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- sh -c 'rm 2>&1' 2> /dev/null || true)
 if  -z "$attach" ; then
         FAIL "lxc-attach -n busy -- sh -c 'rm 2>&1' 2> /dev/null"
 fi
@@ -154,7 +158,7 @@
 # stdin  --> $in
 # stdout --> attached to pty
 # stderr --> attached to pty
-attach=$(echo hostname | lxc-attach -n busy -- || FAIL "to allocate or setup pty")
+attach=$(echo hostname | lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- || FAIL "to allocate or setup pty")
 if  "$attach" != "busy" ; then
         FAIL "echo hostname | lxc-attach -n busy --"
 fi
@@ -165,7 +169,7 @@
 out=$(mktemp /tmp/out_XXXX)
 err=$(mktemp /tmp/err_XXXX)
 trap "rm -f $out $err" EXIT INT QUIT PIPE
-lxc-attach -n busy -- sh -c 'echo OUT; echo ERR >&2' > $out 2> $err || FAIL "to allocate or setup pty"
+lxc-attach -n busy -l trace -o "${ATTACH_LOG}" -- sh -c 'echo OUT; echo ERR >&2' > $out 2> $err || FAIL "to allocate or setup pty"
 outcontent=$(cat $out)
 errcontent=$(cat $err)
 if  "$outcontent" != "OUT"  ||  "$errcontent" != "ERR" ; then
@@ -181,7 +185,7 @@
 out=$(mktemp /tmp/out_XXXX)
 err=$(mktemp /tmp/err_XXXX)
 trap "rm -f $out $err" EXIT INT QUIT PIPE
-echo "hostname; rm" | lxc-attach -n busy > $out 2> $err || true
+echo "hostname; rm" | lxc-attach -n busy -l trace -o "${ATTACH_LOG}" > $out 2> $err || true
 outcontent=$(cat $out)
 errcontent=$(cat $err)
 if  "$outcontent" != "busy"  ||  -z "$errcontent" ; then
@@ -191,5 +195,6 @@
 rm -f $out $err
 
 lxc-destroy -n busy -f
+rm -f "${ATTACH_LOG}" || true
 
 exit 0

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-no-new-privs -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-no-new-privs Changed

@@ -44,63 +44,26 @@
 EOF
 fi
 
-ARCH=i386
-if type dpkg >/dev/null 2>&1; then
-	ARCH=$(dpkg --print-architecture)
-fi
-
-lxc-create -t download -n c1 -- -d ubuntu -r xenial -a $ARCH
+lxc-create -t busybox -n c1
 echo "lxc.no_new_privs = 1" >> /var/lib/lxc/c1/config
 
 lxc-start -n c1
 p1=$(lxc-info -n c1 -p -H)
- "$p1" != "-1"  || { echo "Failed to start container c1 (run $count)"; false; }
-sleep 5s
-lxc-attach -n c1 --clear-env -- apt update -y
-lxc-attach -n c1 --clear-env -- apt install -y gcc make
-
-# Here documents don't seem to like sudo -i.
-lxc-attach -n c1 --clear-env -- /bin/bash -c "cat <<EOF > /nnptest.c
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
+ "$p1" != "-1"  || { echo "Failed to start container c1"; false; }
 
-int main(int argc, char *argv)
-{
-      printf(\"%d\n\", geteuid());
-}
+lxc-attach -n c1 --clear-env -- mkdir -p /home/ubuntu
+lxc-attach -n c1 --clear-env -- /bin/sh -c "cat <<EOF >> /etc/passwd
+ubuntu:x:1000:1000:ubuntu:/home/ubuntu:/bin/sh
 EOF"
-lxc-attach -n c1 --clear-env -- cat /nnptest.c
-lxc-attach -n c1 --clear-env -- make -C / nnptest
-lxc-attach -n c1 --clear-env -- chmod u+s /nnptest
 
 # Check that lxc-attach obeys PR_SET_NO_NEW_PRIVS when it is set.
-NNP_EUID=$(lxc-attach -n c1 --clear-env -- sudo -u ubuntu /nnptest)
-if  "$NNP_EUID" -ne 1000 ; then
-	exit 1
-fi
+! lxc-attach -n c1 --clear-env --uid 1000 --gid 1000 -- ping -c 1 127.0.0.1 || { echo "Managed to ping localhost"; false; }
 lxc-stop -n c1 -k
 
 # Check that lxc-attach obeys PR_SET_NO_NEW_PRIVS when it is not set.
 sed -i 's/lxc.no_new_privs = 1/lxc.no_new_privs = 0/' /var/lib/lxc/c1/config
 lxc-start -n c1
-NNP_EUID=$(lxc-attach -n c1 --clear-env -- sudo -u ubuntu /nnptest)
-if  "$NNP_EUID" -ne 0 ; then
-	exit 1
-fi
+lxc-attach -n c1 --clear-env --uid 1000 --gid 1000 -- ping -c 1 127.0.0.1 || { echo "Managed to ping localhost"; false; }
 lxc-stop -n c1 -k
 
-# Check that lxc-execute and lxc-start obey PR_SET_NO_NEW_PRIVS when it is set.
-NNP_EUID=$(lxc-execute -n c1 -- sudo -u ubuntu /nnptest)
-if  "$NNP_EUID" -ne 0 ; then
-	exit 1
-fi
-
-# Check that lxc-execute and lxc-start obey PR_SET_NO_NEW_PRIVS when it is not set.
-sed -i 's/lxc.no_new_privs = 0/lxc.no_new_privs = 1/' /var/lib/lxc/c1/config
-NNP_EUID=$(lxc-execute -n c1 -- sudo -u ubuntu /nnptest)
-if  "$NNP_EUID" -ne 1000 ; then
-	exit 1
-fi
-
 DONE=1

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-procsys Added

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# lxc: linux Container library
+
+# Authors:
+# Motiejus Jakštys <motiejus@jakstys.lt>
+#
+# Ensure that when /proc and/or /sys do not exist in the container,
+# it is started successfully anyway.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+set -ex
+FAIL() {
+	echo -n "Failed " >&2
+	echo "$*" >&2
+	lxc-destroy -n lxc-test-procsys -f
+	exit 1
+}
+
+lxc-destroy -n lxc-test-procsys -f || :
+lxc-create -t busybox -n lxc-test-procsys
+rmdir /var/lib/lxc/lxc-test-procsys/rootfs/{proc,sys}
+
+lxc-start -n lxc-test-procsys
+lxc-wait -n lxc-test-procsys -s RUNNING || FAIL "waiting for busybox container to run"
+
+lxc-attach -n lxc-test-procsys -- sh -c 'test -f /proc/version' || FAIL "/proc/version not found"
+lxc-attach -n lxc-test-procsys -- sh -c 'test -d /sys/fs' || FAIL "/sys/fs not found"
+
+lxc-destroy -n lxc-test-procsys -f
+exit 0

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-rootfs -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-rootfs Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-snapdeps -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-snapdeps Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-symlink -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-symlink Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-unpriv -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-unpriv Changed

@@ -42,7 +42,7 @@
         mkdir ${MOUNTDIR}/{lowerdir,upperdir,workdir,overlayfs}
         mount -t overlayfs -o lowerdir="${MOUNTDIR}/lowerdir",upperdir="${MOUNTDIR}/upperdir",workdir="${MOUNTDIR}/workdir" none "${MOUNTDIR}/overlayfs"
 
-        CORRECT_LINK_TARGET="${MOUNTDIR}/overlayfs/dummy_file"
+        CORRECT_LINK_TARGET="${MOUNTDIR}/overlayfs/placeholder_file"
         exec 9> "${CORRECT_LINK_TARGET}"
 
         DETECTED_LINK_TARGET=$(readlink -q /proc/$$/fd/9)
@@ -62,15 +62,20 @@
         fi
 fi
 
-which newuidmap >/dev/null 2>&1 || { echo "'newuidmap' command is missing" >&2; exit 1; }
+command -v newuidmap >/dev/null 2>&1 || { echo "'newuidmap' command is missing" >&2; exit 1; }
 
 DONE=0
-KNOWN_RELEASES="precise trusty xenial yakkety zesty"
+UNPRIV_LOG=$(mktemp --dry-run)
 cleanup() {
 	cd /
 
-	run_cmd lxc-stop -n c2 -k || true
-	run_cmd lxc-stop -n c1 -k || true
+	if  $DONE -eq 0 ; then
+		cat "${UNPRIV_LOG}"
+	fi
+	rm -f "${UNPRIV_LOG}" || true
+
+	run_cmd lxc-stop -n c2 -k -l trace -o "${UNPRIV_LOG}" || true
+	run_cmd lxc-stop -n c1 -k -l trace -o "${UNPRIV_LOG}" || true
 	pkill -u $(id -u $TUSER) -9 || true
 
 	sed -i '/lxcunpriv/d' /run/lxc/nics /etc/lxc/lxc-usernet
@@ -84,24 +89,21 @@
 		echo "FAIL"
 		exit 1
 	fi
+
 	echo "PASS"
 }
 
 run_cmd() {
 	sudo -i -u $TUSER \
 	    env http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
-	        XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $*
+	        XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) ASAN_OPTIONS=${ASAN_OPTIONS:-} \
+		UBSAN_OPTIONS=${UBSAN_OPTIONS:-} $*
 }
 
 # create a test user
 TUSER=lxcunpriv
 HDIR=/home/$TUSER
 
-ARCH=i386
-if type dpkg >/dev/null 2>&1; then
-	ARCH=$(dpkg --print-architecture)
-fi
-
 trap cleanup EXIT SIGHUP SIGINT SIGTERM
 set -eu
 
@@ -128,7 +130,7 @@
 
 cd $HDIR
 
-if which cgm >/dev/null 2>&1; then
+if command -v cgm >/dev/null 2>&1; then
 	cgm create all $TUSER
 	cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER)
 	cgm movepid all $TUSER $$
@@ -156,62 +158,45 @@
 	done
 fi
 
-# default release is trusty, or the systems release if recognized
-release=trusty
-if  -f /etc/lsb-release ; then
-    . /etc/lsb-release
-    rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
-        rels="$KNOWN_RELEASES"
-    for r in $rels; do
-         "$DISTRIB_CODENAME" = "$r"  && release="$r"
-    done
-fi
-
-# Copy the download template cache if available
-run_cmd mkdir -p $HDIR/.cache/lxc
- -d /var/cache/lxc/download  && \
-    cp -R /var/cache/lxc/download $HDIR/.cache/lxc && \
-    chown -R $TUSER: $HDIR/.cache/lxc
-
-run_cmd lxc-create -t download -n c1 -- -d ubuntu -r $release -a $ARCH
+run_cmd lxc-create -t busybox -n c1 -l trace -o "${UNPRIV_LOG}"
 
 # Make sure we can start it - twice
 
-for count in `seq 1 2`; do
-    run_cmd lxc-start -n c1 -d
+for count in $(seq 1 2); do
+    run_cmd lxc-start -n c1 -d -l trace -o "${UNPRIV_LOG}"
 
-    p1=$(run_cmd lxc-info -n c1 -p -H)
+    p1=$(run_cmd lxc-info -n c1 -p -H -l trace -o "${UNPRIV_LOG}")
      "$p1" != "-1"  || { echo "Failed to start container c1 (run $count)"; false; }
 
-    run_cmd lxc-info -n c1
-    run_cmd lxc-attach -n c1 -- /bin/true
+    run_cmd lxc-info -n c1 -l trace -o "${UNPRIV_LOG}"
+    run_cmd lxc-attach -n c1 -l trace -o "${UNPRIV_LOG}" -- /bin/true
 
-    run_cmd lxc-stop -n c1 -k
+    run_cmd lxc-stop -n c1 -k -l trace -o "${UNPRIV_LOG}"
 done
 
-run_cmd lxc-copy -s -n c1 -N c2
-run_cmd lxc-start -n c2 -d
-p1=$(run_cmd lxc-info -n c2 -p -H)
+run_cmd lxc-copy -s -n c1 -N c2 -l trace -o "${UNPRIV_LOG}"
+run_cmd lxc-start -n c2 -d -l trace -o "${UNPRIV_LOG}"
+p1=$(run_cmd lxc-info -n c2 -p -H -l trace -o "${UNPRIV_LOG}")
  "$p1" != "-1"  || { echo "Failed to start container c2"; false; }
 
-run_cmd lxc-stop -n c2 -k
+run_cmd lxc-stop -n c2 -k -l trace -o "${UNPRIV_LOG}"
 
-if which cgm >/dev/null 2>&1; then
+if command -v cgm >/dev/null 2>&1; then
     echo "Testing containers under different cgroups per subsystem"
     run_cmd cgm create freezer x1/x2
     cgm movepid freezer x1 $$
-    run_cmd lxc-start -n c1 -d
-    p1=$(run_cmd lxc-info -n c1 -p -H)
+    run_cmd lxc-start -n c1 -d -l trace -o "${UNPRIV_LOG}"
+    p1=$(run_cmd lxc-info -n c1 -p -H -l trace -o "${UNPRIV_LOG}")
      "$p1" != "-1"  || { echo "Failed to start container c1"; false; }
-    run_cmd lxc-info -n c1
-    run_cmd lxc-attach -n c1 -- /bin/true
-    run_cmd lxc-cgroup -n c1 freezer.state
+    run_cmd lxc-info -n c1 -l trace -o "${UNPRIV_LOG}"
+    run_cmd lxc-attach -n c1 -l trace -o "${UNPRIV_LOG}" -- /bin/true
+    run_cmd lxc-cgroup -n c1 freezer.state -l trace -o "${UNPRIV_LOG}"
 
     echo "Testing lxc-attach and lxc-cgroup from different cgroup"
     cgm movepid freezer x2 $$
-    run_cmd lxc-attach -n c1 -- /bin/true
-    run_cmd lxc-cgroup -n c1 freezer.state
-    run_cmd lxc-cgroup -n c1 memory.limit_in_bytes
+    run_cmd lxc-attach -n c1 -l trace -o "${UNPRIV_LOG}" -- /bin/true
+    run_cmd lxc-cgroup -n c1 -l trace -o "${UNPRIV_LOG}" freezer.state
+    run_cmd lxc-cgroup -n c1 -l trace -o "${UNPRIV_LOG}" memory.limit_in_bytes
 fi
 
 DONE=1

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-usernic.in -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-usernic.in Changed

@@ -24,7 +24,6 @@
 # This test assumes an Ubuntu host
 
 DONE=0
-KNOWN_RELEASES="precise trusty xenial yakkety zesty"
 LXC_USER_NIC="@LIBEXECDIR@/lxc/lxc-user-nic"
 
 cleanup() {
@@ -60,14 +59,10 @@
 run_cmd() {
 	sudo -i -u usernic-user \
 	    env http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
-	        XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) $*
+	        XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) ASAN_OPTIONS=${ASAN_OPTIONS:-} \
+		UBSAN_OPTIONS=${UBSAN_OPTIONS:-} $*
 }
 
-ARCH=i386
-if type dpkg >/dev/null 2>&1; then
-	ARCH=$(dpkg --print-architecture)
-fi
-
 set -eu
 trap cleanup EXIT SIGHUP SIGINT SIGTERM
 
@@ -85,7 +80,7 @@
 lxc.idmap = g 0 910000 10000
 EOF
 
-if which cgm >/dev/null 2>&1; then
+if command -v cgm >/dev/null 2>&1; then
 	cgm create all usernic-user
 	cgm chown all usernic-user $(id -u usernic-user) $(id -g usernic-user)
 	cgm movepid all usernic-user $$
@@ -116,37 +111,14 @@
 mkdir -p /run/user/$(id -u usernic-user)
 chown -R usernic-user: /run/user/$(id -u usernic-user) /home/usernic-user
 
-# Copy the download template cache if available
-run_cmd "mkdir -p /home/usernic-user/.cache/lxc"
- -d /var/cache/lxc/download  && \
-    cp -R /var/cache/lxc/download /home/usernic-user/.cache/lxc && \
-    chown -R usernic-user: /home/usernic-user/.cache/lxc
-
-
 # Create two test bridges
 brctl addbr usernic-br0
 brctl addbr usernic-br1
 ifconfig usernic-br0 0.0.0.0 up
 ifconfig usernic-br1 0.0.0.0 up
 
-ARCH=i386
-if type dpkg >/dev/null 2>&1; then
-	ARCH=$(dpkg --print-architecture)
-fi
-
-# default release is trusty, or the systems release if recognized
-release=trusty
-if  -f /etc/lsb-release ; then
-    . /etc/lsb-release
-    rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
-        rels="$KNOWN_RELEASES"
-    for r in $rels; do
-         "$DISTRIB_CODENAME" = "$r"  && release="$r"
-    done
-fi
-
 # Create three containers
-run_cmd "lxc-create -t download -n b1 -- -d ubuntu -r $release -a $ARCH"
+run_cmd "lxc-create -t busybox -n b1"
 run_cmd "lxc-start -n b1 -d"
 p1=$(run_cmd "lxc-info -n b1 -p -H")

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-usernsexec -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-usernsexec Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc-test-utils.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc-test-utils.c Changed

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
@@ -43,12 +43,12 @@
 #include "macro.h"
 #include "utils.h"
 
-void test_lxc_deslashify(void)
+void test_path_simplify(void)
 {
 	char *s = "/A///B//C/D/E/";
 	char *t;
 
-	t = lxc_deslashify(s);
+	t = path_simplify(s);
 	if (!t)
 		exit(EXIT_FAILURE);
 
@@ -57,7 +57,7 @@
 
 	s = "/A";
 
-	t = lxc_deslashify(s);
+	t = path_simplify(s);
 	if (!t)
 		exit(EXIT_FAILURE);
 
@@ -65,7 +65,7 @@
 	free(t);
 
 	s = "";
-	t = lxc_deslashify(s);
+	t = path_simplify(s);
 	if (!t)
 		exit(EXIT_FAILURE);
 
@@ -74,7 +74,7 @@
 
 	s = "//";
 
-	t = lxc_deslashify(s);
+	t = path_simplify(s);
 	if (!t)
 		exit(EXIT_FAILURE);
 
@@ -254,13 +254,13 @@
 	lxc_test_assert_abort((-EINVAL == lxc_safe_uint("-123", &n)));
 
 	ret = snprintf(numstr, sizeof(numstr), "%" PRIu64, (uint64_t)UINT_MAX);
-	if (ret < 0 || ret >= sizeof(numstr))
+	if (ret < 0 || (size_t)ret >= sizeof(numstr))
 		exit(EXIT_FAILURE);
 
 	lxc_test_assert_abort((0 == lxc_safe_uint(numstr, &n)) && n == UINT_MAX);
 
 	ret = snprintf(numstr, sizeof(numstr), "%" PRIu64, (uint64_t)UINT_MAX + 1);
-	if (ret < 0 || ret >= sizeof(numstr))
+	if (ret < 0 || (size_t)ret >= sizeof(numstr))
 		exit(EXIT_FAILURE);
 
 	lxc_test_assert_abort((-ERANGE == lxc_safe_uint(numstr, &n)));
@@ -287,25 +287,25 @@
 	char numstrINTTYPE_TO_STRLEN(uint64_t);
 
 	ret = snprintf(numstr, sizeof(numstr), "%" PRIu64, (uint64_t)INT_MAX);
-	if (ret < 0 || ret >= sizeof(numstr))
+	if (ret < 0 || (size_t)ret >= sizeof(numstr))
 		exit(EXIT_FAILURE);
 
 	lxc_test_assert_abort((0 == lxc_safe_int(numstr, &n)) && n == INT_MAX);
 
 	ret = snprintf(numstr, sizeof(numstr), "%" PRIu64, (uint64_t)INT_MAX + 1);
-	if (ret < 0 || ret >= sizeof(numstr))
+	if (ret < 0 || (size_t)ret >= sizeof(numstr))
 		exit(EXIT_FAILURE);
 
 	lxc_test_assert_abort((-ERANGE == lxc_safe_int(numstr, &n)));
 
 	ret = snprintf(numstr, sizeof(numstr), "%" PRId64, (int64_t)INT_MIN);
-	if (ret < 0 || ret >= sizeof(numstr))
+	if (ret < 0 || (size_t)ret >= sizeof(numstr))
 		exit(EXIT_FAILURE);
 
 	lxc_test_assert_abort((0 == lxc_safe_int(numstr, &n)) && n == INT_MIN);
 
 	ret = snprintf(numstr, sizeof(numstr), "%" PRId64, (int64_t)INT_MIN - 1);
-	if (ret < 0 || ret >= sizeof(numstr))
+	if (ret < 0 || (size_t)ret >= sizeof(numstr))
 		exit(EXIT_FAILURE);
 
 	lxc_test_assert_abort((-ERANGE == lxc_safe_int(numstr, &n)));
@@ -403,7 +403,7 @@
 void test_parse_byte_size_string(void)
 {
 	int ret;
-	int64_t n;
+	long long int n;
 
 	ret = parse_byte_size_string("0", &n);
 	if (ret < 0) {
@@ -551,7 +551,7 @@
 
 		sigemptyset(&mask);
 
-		for (i = 0; i < (sizeof(signals) / sizeof(signals0)); i++) {
+		for (i = 0; (size_t)i < (sizeof(signals) / sizeof(signals0)); i++) {
 			ret = sigaddset(&mask, signalsi);
 			if (ret < 0)
 				_exit(EXIT_FAILURE);
@@ -563,7 +563,7 @@
 			_exit(EXIT_FAILURE);
 		}
 
-		for (i = 0; i < (sizeof(signals) / sizeof(signals0)); i++) {
+		for (i = 0; (size_t)i < (sizeof(signals) / sizeof(signals0)); i++) {
 			if (!task_blocks_signal(getpid(), signalsi)) {
 				lxc_error("Failed to detect blocked signal "
 					  "(idx = %d, signal number = %d)\n",
@@ -594,11 +594,20 @@
 	return;
 }
 
+void test_is_in_comm(void)
+{
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+	lxc_test_assert_abort(is_in_comm("fuzz-lxc-") == 0);
+	lxc_test_assert_abort(is_in_comm("lxc-test") == 1);
+	lxc_test_assert_abort(is_in_comm("") == 1);
+#endif /* FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */
+}
+
 int main(int argc, char *argv)
 {
 	test_lxc_string_replace();
 	test_lxc_string_in_array();
-	test_lxc_deslashify();
+	test_path_simplify();
 	test_detect_ramfs_rootfs();
 	test_lxc_safe_uint();
 	test_lxc_safe_int();
@@ -606,6 +615,7 @@
 	test_parse_byte_size_string();
 	test_lxc_config_net_is_hwaddr();
 	test_task_blocks_signal();
+	test_is_in_comm();
 
 	exit(EXIT_SUCCESS);
 }

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxc_raw_clone.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxc_raw_clone.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxcpath.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxcpath.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/lxctest.h -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/lxctest.h Changed

@@ -24,18 +24,20 @@
 #ifndef __LXC_TEST_H_
 #define __LXC_TEST_H_
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#define lxc_debug_stream(stream, format, ...)                                  \
-	do {                                                                   \
-		fprintf(stream, "%s: %d: %s: " format, __FILE__, __LINE__,     \
-			__func__, __VA_ARGS__);                                \
+#define lxc_debug_stream(stream, format, ...)                         \
+	do {                                                          \
+		fprintf(stream, "%s: %d: %s: " format "\n", __FILE__, \
+			__LINE__, __func__, ##__VA_ARGS__);           \
 	} while (false)
 
-#define lxc_error(format, ...) lxc_debug_stream(stderr, format, __VA_ARGS__)
-#define lxc_debug(format, ...) lxc_debug_stream(stdout, format, __VA_ARGS__)
+#define lxc_error(format, ...) lxc_debug_stream(stderr, format, ##__VA_ARGS__)
+#define lxc_debug(format, ...) lxc_debug_stream(stdout, format, ##__VA_ARGS__)
 
 #define lxc_test_assert_stringify(expression, stringify_expression)            \
 	do {                                                                   \
@@ -48,4 +50,11 @@
 
 #define lxc_test_assert_abort(expression) lxc_test_assert_stringify(expression, #expression)
 
+#define test_error_ret(__ret__, format, ...)                  \
+	({                                                    \
+		typeof(__ret__) __internal_ret__ = (__ret__); \
+		fprintf(stderr, format, ##__VA_ARGS__);       \
+		__internal_ret__;                             \
+	})
+
 #endif /* __LXC_TEST_H */

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/may_control.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/may_control.c Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/meson.build Added

@@ -0,0 +1,433 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+tests_common_sources = liblxc_sources + include_sources + netns_ifaddrs_sources
+
+if want_tests
+    test_programs += executable(
+        'lxc-test-arch-parse',
+        files('arch_parse.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-apparmor',
+        files('aa.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-api-reboot',
+        files('api_reboot.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-attach',
+        files('attach.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-basic',
+        files('basic.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-capabilities',
+        files('capabilities.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-cgpath',
+        files('cgpath.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-clonetest',
+        files('clonetest.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-concurrent',
+        files('concurrent.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-config-jump-table',
+        files('config_jump_table.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-console',
+        files('console.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-console-log',
+        files('console_log.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-containertests',
+        files('containertests.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-createtest',
+        files('createtest.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-criu-check-feature',
+        files('criu_check_feature.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-cve-2019-5736',
+        files('cve-2019-5736.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-destroytest',
+        files('destroytest.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-device-add-remove',
+        files('device_add_remove.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-get_item',
+        files('get_item.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-getkeys',
+        files('getkeys.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-list',
+        files('list.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-locktests',
+        files('locktests.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-utils',
+        files('lxc-test-utils.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-raw-clone',
+        files('lxc_raw_clone.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-lxcpath',
+        files('lxcpath.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-may-control',
+        files('may_control.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-mount-injection',
+        files('mount_injection.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-parse-config-file',
+        files('parse_config_file.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-proc-pid',
+        files('proc_pid.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-reboot',
+        files('reboot.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-rootfs-options',
+        files('rootfs_options.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-saveconfig',
+        files('saveconfig.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-share-ns',
+        files('share_ns.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-shortlived',
+        files('shortlived.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-shutdowntest',
+        files('shutdowntest.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-snapshot',
+        files('snapshot.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-startone',
+        files('startone.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-state-server',
+        files('state_server.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-sys-mixed',
+        files('sys_mixed.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += executable(
+        'lxc-test-sysctls',
+        files('sysctls.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: liblxc_dep,
+        install: true)
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-apparmor-generated',
+        output: 'lxc-test-apparmor-generated')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-apparmor-mount',
+        output: 'lxc-test-apparmor-mount')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-automount',
+        output: 'lxc-test-automount')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-autostart',
+        output: 'lxc-test-autostart')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-checkpoint-restore',
+        output: 'lxc-test-checkpoint-restore')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-cloneconfig',
+        output: 'lxc-test-cloneconfig')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-createconfig',
+        output: 'lxc-test-createconfig')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-exit-code',
+        output: 'lxc-test-exit-code')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-lxc-attach',
+        output: 'lxc-test-lxc-attach')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-no-new-privs',
+        output: 'lxc-test-no-new-privs')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-procsys',
+        output: 'lxc-test-procsys')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-rootfs',
+        output: 'lxc-test-rootfs')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-snapdeps',
+        output: 'lxc-test-snapdeps')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-symlink',
+        output: 'lxc-test-symlink')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-unpriv',
+        output: 'lxc-test-unpriv')
+
+    test_programs += configure_file(
+        configuration: conf,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-usernic.in',
+        output: 'lxc-test-usernic')
+
+    test_programs += configure_file(
+        configuration: dummy_config_data,
+        install: true,
+        install_dir: bindir,
+        input: 'lxc-test-usernsexec',
+        output: 'lxc-test-usernsexec')
+endif
+
+if want_oss_fuzz
+    test_programs += executable(
+        'fuzz-lxc-cgroup-init',
+        files('fuzz-lxc-cgroup-init.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: fuzzing_engine, oss_fuzz_dependencies,
+        link_with: liblxc_static,
+        install: false,
+        install_dir: bindir)
+
+    test_programs += executable(
+        'fuzz-lxc-config-read',
+        files('fuzz-lxc-config-read.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: fuzzing_engine, oss_fuzz_dependencies,
+        link_with: liblxc_static,
+        install: false,
+        install_dir: bindir)
+
+    test_programs += executable(
+        'fuzz-lxc-define-load',
+        files('fuzz-lxc-define-load.c') + tests_common_sources,
+        include_directories: liblxc_includes,
+        dependencies: fuzzing_engine, oss_fuzz_dependencies,
+        link_with: liblxc_static,
+        install: false,
+        install_dir: bindir)
+endif

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/mount_injection.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/mount_injection.c Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/oss-fuzz.sh Added

@@ -0,0 +1,68 @@
+#!/bin/bash
+
+set -ex
+
+export LC_CTYPE=C.UTF-8
+
+export CC=${CC:-clang}
+export CXX=${CXX:-clang++}
+clang_version="$($CC --version | sed -nr 's/.*version (^ +?) .*/\1/p' | sed -r 's/-$//')"
+
+SANITIZER=${SANITIZER:-address -fsanitize-address-use-after-scope}
+flags="-O1 -fno-omit-frame-pointer -g -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=$SANITIZER"
+
+clang_lib="/usr/lib64/clang/${clang_version}/lib/linux"
+ -d "$clang_lib"  || clang_lib="/usr/lib/clang/${clang_version}/lib/linux"
+
+export CFLAGS=${CFLAGS:-$flags}
+export CXXFLAGS=${CXXFLAGS:-$flags}
+export LDFLAGS=${LDFLAGS:--L${clang_lib}}
+
+export OUT=${OUT:-$(pwd)/out}
+mkdir -p $OUT
+
+apt-get update -qq
+apt-get install --yes --no-install-recommends \
+    build-essential docbook2x doxygen git \
+    wget xz-utils systemd-coredump pkgconf libsystemd-dev
+apt-get remove --yes lxc-utils liblxc-common liblxc1 liblxc-dev
+
+# make sure we have a new enough meson version
+pip3 install meson ninja
+
+# Sanitized build
+meson setup san_build \
+	-Dprefix=/usr \
+	-Db_lundef=false \
+	-Dtests=false \
+	-Dpam-cgroup=false \
+	-Dwerror=true \
+	-Dtools=false \
+	-Dcommands=false \
+	-Dcapabilities=false \
+	-Dapparmor=false \
+	-Dopenssl=false \
+	-Dselinux=false \
+	-Dseccomp=false \
+	-Db_lto=false \
+	-Db_pie=false \
+	-Dthread-safety=false \
+	-Doss-fuzz=true
+ninja -C san_build -v
+
+for fuzz_target_source in src/tests/fuzz-lxc*.c; do
+    fuzz_target_name=$(basename "$fuzz_target_source" ".c")
+    cp "san_build/src/tests/$fuzz_target_name" "$OUT"
+done
+
+perl -lne 'if (/config_jump_table\\\s*=/../^}/) { /"(^"+)"/ && print "$1=" }' src/lxc/confile.c >san_build/doc/examples/keys.conf
+ -s san_build/doc/examples/keys.conf 
+
+perl -lne 'if (/config_jump_table_net\\\s*=/../^}/) { /"(^"+)"/ && print "lxc.net.$1=" }' src/lxc/confile.c >san_build/doc/examples/lxc-net-keys.conf
+ -s san_build/doc/examples/lxc-net-keys.conf 
+
+zip -r $OUT/fuzz-lxc-config-read_seed_corpus.zip san_build/doc/examples
+
+mkdir fuzz-lxc-define-load_seed_corpus
+perl -lne '/(^=+)/ && print "printf $1= >fuzz-lxc-define-load_seed_corpus/$1"' san_build/doc/examples/{keys,lxc-net-keys}.conf | bash
+zip -r $OUT/fuzz-lxc-define-load_seed_corpus.zip fuzz-lxc-define-load_seed_corpus

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/parse_config_file.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/parse_config_file.c Changed

@@ -16,6 +16,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
+#include "config.h"
+
 #include <lxc/lxccontainer.h>
 
 #include <errno.h>
@@ -30,7 +33,7 @@
 
 #include "conf.h"
 #include "confile_utils.h"
-#include "lxc/state.h"
+#include "state.h"
 #include "lxctest.h"
 #include "utils.h"
 
@@ -368,17 +371,35 @@
 		goto non_test_error;
 	}
 
-	if (set_get_compare_clear_save_load(c, "lxc.apparmor.profile", "unconfined", tmpf, true) < 0) {
+	ret = set_get_compare_clear_save_load(c, "lxc.apparmor.profile", "unconfined", tmpf, true);
+#if HAVE_APPARMOR
+	if (ret < 0)
+#else
+	if (ret == 0)
+#endif
+	{
 		lxc_error("%s\n", "lxc.apparmor.profile");
 		goto non_test_error;
 	}
 
-	if (set_get_compare_clear_save_load(c, "lxc.apparmor.allow_incomplete", "1", tmpf, true) < 0) {
+	ret = set_get_compare_clear_save_load(c, "lxc.apparmor.allow_incomplete", "1", tmpf, true);
+#if HAVE_APPARMOR
+	if (ret < 0)
+#else
+	if (ret == 0)
+#endif
+	{
 		lxc_error("%s\n", "lxc.apparmor.allow_incomplete");
 		goto non_test_error;
 	}
 
-	if (set_get_compare_clear_save_load(c, "lxc.selinux.context", "system_u:system_r:lxc_t:s0:c22", tmpf, true) < 0) {
+	ret = set_get_compare_clear_save_load(c, "lxc.selinux.context", "system_u:system_r:lxc_t:s0:c22", tmpf, true);
+#if HAVE_SELINUX
+	if (ret < 0)
+#else
+	if (ret == 0)
+#endif
+	{
 		lxc_error("%s\n", "lxc.selinux.context");
 		goto non_test_error;
 	}
@@ -776,6 +797,21 @@
 		return -1;
 	}
 
+	if (set_get_compare_clear_save_load_network(c, "lxc.net.0.veth.vlan.id", "none", tmpf, false, "veth")) {
+		lxc_error("%s\n", "lxc.net.0.veth.vlan.id");
+		return -1;
+	}
+
+	if (set_get_compare_clear_save_load_network(c, "lxc.net.0.veth.vlan.id", "2", tmpf, true, "veth")) {
+		lxc_error("%s\n", "lxc.net.0.veth.vlan.id");
+		return -1;
+	}
+
+	if (set_get_compare_clear_save_load_network(c, "lxc.net.0.veth.vlan.tagged.id", "2", tmpf, true, "veth")) {
+		lxc_error("%s\n", "lxc.net.0.veth.vlan.tagged.id");
+		return -1;
+	}
+
 	if (set_get_compare_clear_save_load(c, "lxc.net.0.script.up", "/some/up/path", tmpf, true)) {
 		lxc_error("%s\n", "lxc.net.0.script.up");
 		goto non_test_error;
@@ -862,15 +898,13 @@
 		goto non_test_error;
 	}
 
-	ret = set_get_compare_clear_save_load(c, "lxc.hook.version", "2", tmpf, true);
-	if (ret == 0) {
-		lxc_error("%s\n", "lxc.hook.version");
+	if (c->set_config_item(c, "lxc.hook.version", "2")) {
+		lxc_error("%s\n", "Managed to set to set invalid config item \"lxc.hook.version\" to \"2\"");
 		goto non_test_error;
 	}
 
-	ret = set_get_compare_clear_save_load(c, "lxc.monitor.signal.pdeath", "SIGKILL", tmpf, true);
-	if (ret == 0) {
-		lxc_error("%s\n", "lxc.hook.version");
+	if (!c->set_config_item(c, "lxc.monitor.signal.pdeath", "SIGKILL")) {
+		lxc_error("%s\n", "Failed to set to set invalid config item \"lxc.monitor.signal.pdeath\" to \"SIGKILL\"");
 		goto non_test_error;
 	}
 
@@ -884,6 +918,21 @@
 		return -1;
 	}
 
+	if (c->set_config_item(c, "lxc.log.file=", "./")) {
+		lxc_error("%s\n", "Managed to set to set invalid config item \"lxc.log.file\" to \"./\"");
+		return -1;
+	}
+
+	if (c->set_config_item(c, "lxc.hook.versionasdfsadfsadf", "1")) {
+		lxc_error("%s\n", "Managed to set to set invalid config item \"lxc.hook.versionasdfsadfsadf\" to \"2\"");
+		goto non_test_error;
+	}
+
+	if (set_get_compare_clear_save_load(c, "lxc.sched.core", "1", tmpf, true) < 0) {
+		lxc_error("%s\n", "lxc.sched.core");
+		goto non_test_error;
+	}
+
 	fret = EXIT_SUCCESS;
 
 non_test_error:

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/proc_pid.c Added

@@ -0,0 +1,170 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "lxccontainer.h"
+#include "attach_options.h"
+
+#include "lxctest.h"
+#include "utils.h"
+
+#define CONTAINER_NAME "test-proc-pid"
+#define PROC_INIT_PATH "/proc/1/oom_score_adj"
+#define PROC_SELF_PATH "/proc/self/oom_score_adj"
+
+static int check_oom_score_adj(void *payload)
+{
+	__do_close int fd = -EBADF;
+	char bufINTTYPE_TO_STRLEN(__s64);
+	ssize_t ret;
+
+	fd = open(PROC_INIT_PATH, O_RDONLY | O_CLOEXEC | O_NOFOLLOW);
+	if (fd < 0) {
+		lxc_error("Failed to open " PROC_INIT_PATH);
+		return EXIT_FAILURE;
+	}
+
+	ret = lxc_read_nointr(fd, buf, sizeof(buf));
+	if (ret < 0 || (size_t)ret >= sizeof(buf)) {
+		lxc_error("Failed to read " PROC_INIT_PATH);
+		return EXIT_FAILURE;
+	}
+
+	bufret = '\0';
+	remove_trailing_newlines(buf);
+
+	if (!strequal(buf,  "-1000")) {
+		lxc_error("Unexpected value %s for " PROC_INIT_PATH, buf);
+		return EXIT_FAILURE;
+	}
+
+	return EXIT_SUCCESS;
+}
+
+int main(int argc, char *argv)
+{
+	int fd_log = -EBADF, fret = EXIT_FAILURE;
+	lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT;
+	int ret;
+	pid_t pid;
+	struct lxc_container *c;
+	struct lxc_log log;
+	char templatesizeof(P_tmpdir "/" CONTAINER_NAME "_XXXXXX");
+
+	if (!file_exists(PROC_SELF_PATH)) {
+		lxc_debug("The sysctl path \"" PROC_SELF_PATH "\" needed for this test does not exist. Skipping");
+		exit(EXIT_SUCCESS);
+	}
+
+	(void)strlcpy(template, P_tmpdir "/" CONTAINER_NAME "_XXXXXX", sizeof(template));
+
+	fd_log = lxc_make_tmpfile(template, false);
+	if (fd_log < 0) {
+		lxc_error("%s", "Failed to create temporary log file for container \"capabilities\"");
+		return fret;
+	}
+
+	log.name	= CONTAINER_NAME;
+	log.file	= template;
+	log.level	= "TRACE";
+	log.prefix	= CONTAINER_NAME;
+	log.quiet	= false;
+	log.lxcpath	= NULL;
+
+	if (lxc_log_init(&log))
+		exit(fret);
+
+	c = lxc_container_new(CONTAINER_NAME, NULL);
+	if (!c) {
+		lxc_error("%s", "Failed to create container " CONTAINER_NAME);
+		exit(fret);
+	}
+
+	if (c->is_defined(c)) {
+		lxc_error("%s\n", "Container " CONTAINER_NAME " is defined");
+		goto on_error_put;
+	}
+
+	if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
+		lxc_error("%s\n", "Failed to create busybox container " CONTAINER_NAME);
+		goto on_error_put;
+	}
+
+	if (!c->is_defined(c)) {
+		lxc_error("%s\n", "Container " CONTAINER_NAME " is not defined");
+		goto on_error_destroy;
+	}
+
+	if (!c->set_config_item(c, "lxc.mount.auto", "proc:rw")) {
+		lxc_error("%s\n", "Failed to set config item \"lxc.mount.auto=proc:rw\"");
+		goto on_error_destroy;
+	}
+
+	if (!c->clear_config_item(c, "lxc.proc.oom_score_adj")) {
+		lxc_error("%s\n", "Failed to clear config item \"lxc.proc.oom_score_adj\"");
+		goto on_error_destroy;
+	}
+
+	if (!c->set_config_item(c, "lxc.proc.oom_score_adj", "-1000")) {
+		lxc_error("%s\n", "Failed to set config item \"lxc.proc.oom_score_adj=-1000\"");
+		goto on_error_destroy;
+	}
+
+	if (!c->want_daemonize(c, true)) {
+		lxc_error("%s\n", "Failed to mark container " CONTAINER_NAME " daemonized");
+		goto on_error_destroy;
+	}
+
+	if (!c->startl(c, 0, NULL)) {
+		lxc_error("%s\n", "Failed to start container " CONTAINER_NAME " daemonized");
+		goto on_error_destroy;
+	}
+
+	/* Leave some time for the container to write something to the log. */
+	sleep(2);
+
+	ret = c->attach(c, check_oom_score_adj, NULL, &attach_options, &pid);
+	if (ret < 0) {
+		lxc_error("%s\n", "Failed to run function in container " CONTAINER_NAME);
+		goto on_error_stop;
+	}
+
+	ret = wait_for_pid(pid);
+	if (ret < 0) {
+		lxc_error("%s\n", "Function "CONTAINER_NAME" failed");
+		goto on_error_stop;
+	}
+
+	fret = 0;
+
+on_error_stop:
+	if (c->is_running(c) && !c->stop(c))
+		lxc_error("%s\n", "Failed to stop container " CONTAINER_NAME);
+
+on_error_destroy:
+	if (!c->destroy(c))
+		lxc_error("%s\n", "Failed to destroy container " CONTAINER_NAME);
+
+on_error_put:
+	lxc_container_put(c);
+
+	if (fret == EXIT_SUCCESS) {
+		lxc_debug("All \"/proc/<pid>\" tests passed\n");
+	} else {
+		char buf4096;
+		ssize_t buflen;
+
+		while ((buflen = read(fd_log, buf, 1024)) > 0) {
+			buflen = write(STDERR_FILENO, buf, buflen);
+			if (buflen <= 0)
+				break;
+		}
+	}
+	close_prot_errno_disarm(fd_log);
+	(void)unlink(template);
+
+	exit(fret);
+}

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/reboot.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/reboot.c Changed

@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "config.h"
+
 #include <alloca.h>
 #include <stdio.h>
 #include <sched.h>
@@ -27,13 +30,17 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "lxc/namespace.h"
+#include "namespace.h"
 
-#include <sched.h>
-#include <linux/sched.h>
 #include <linux/reboot.h>
 
+/*
+ * glibc clone(2) wrapper function prototypes as defined in that manpage. Most
+ * architectures use clone(...), but ia64 uses __clone2(...).
+ */
 int clone(int (*fn)(void *), void *child_stack, int flags, void *arg, ...);
+int __clone2(int (*fn)(void *), void *stack_base, size_t stack_size, \
+		int flags, void *arg, ...);
 
 static int do_reboot(void *arg)
 {
@@ -52,7 +59,12 @@
 	int status;
 	pid_t ret;
 
+#if defined(__ia64__)
+	ret = __clone2(do_reboot, stack, stack_size, \
+			CLONE_NEWPID | SIGCHLD, &cmd);
+#else
 	ret = clone(do_reboot, stack, CLONE_NEWPID | SIGCHLD, &cmd);
+#endif
 	if (ret < 0) {
 		printf("failed to clone: %s\n", strerror(errno));
 		return -1;

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/rootfs_options.c Added

@@ -0,0 +1,159 @@
+/* liblxcapi
+ *
+ * Copyright © 2021 Christian Brauner <christian.brauner@ubuntu.com>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "lxccontainer.h"
+#include "attach_options.h"
+
+#ifdef HAVE_STATVFS
+#include <sys/statvfs.h>
+#endif
+
+#include "lxctest.h"
+#include "utils.h"
+
+static int has_mount_properties(const char *path, unsigned int flags)
+{
+#ifdef HAVE_STATVFS
+	int ret;
+	struct statvfs sb;
+
+	ret = statvfs(path, &sb);
+	if (ret < 0)
+		return -errno;
+
+	if ((sb.f_flag & flags) == flags)
+		return 0;
+
+	return -EINVAL;
+
+#else
+	return -EOPNOTSUPP;
+#endif
+}
+
+static int rootfs_options(void *payload)
+{
+	int ret;
+
+	ret = has_mount_properties("/",
+				   MS_NODEV |
+				   MS_NOSUID |
+				   MS_RDONLY);
+	if (ret != 0) {
+		if (ret == -EOPNOTSUPP)
+			return EXIT_SUCCESS;
+
+		return EXIT_FAILURE;
+	}
+
+	return EXIT_SUCCESS;
+}
+
+int main(int argc, char *argv)
+{
+	int fret = EXIT_FAILURE;
+	lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT;
+	int ret;
+	pid_t pid;
+	struct lxc_container *c;
+
+	c = lxc_container_new("rootfs-options", NULL);
+	if (!c) {
+		lxc_error("%s", "Failed to create container \"rootfs-options\"");
+		exit(fret);
+	}
+
+	if (c->is_defined(c)) {
+		lxc_error("%s\n", "Container \"rootfs-options\" is defined");
+		goto on_error_put;
+	}
+
+	if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
+		lxc_error("%s\n", "Failed to create busybox container \"rootfs-options\"");
+		goto on_error_put;
+	}
+
+	if (!c->is_defined(c)) {
+		lxc_error("%s\n", "Container \"rootfs-options\" is not defined");
+		goto on_error_put;
+	}
+
+	c->clear_config(c);
+
+	if (!c->set_config_item(c, "lxc.rootfs.options", "nodev,nosuid,ro")) {
+		lxc_error("%s\n", "Failed to set config item \"lxc.mount.auto=sys:mixed\"");
+		goto on_error_put;
+	}
+
+	if (!c->load_config(c, NULL)) {
+		lxc_error("%s\n", "Failed to load config for container \"rootfs-options\"");
+		goto on_error_stop;
+	}
+
+	if (!c->want_daemonize(c, true)) {
+		lxc_error("%s\n", "Failed to mark container \"rootfs-options\" daemonized");
+		goto on_error_stop;
+	}
+
+	if (!c->startl(c, 0, NULL)) {
+		lxc_error("%s\n", "Failed to start container \"rootfs-options\" daemonized");
+		goto on_error_stop;
+	}
+
+	/* Leave some time for the container to write something to the log. */
+	sleep(2);
+
+	ret = c->attach(c, rootfs_options, NULL, &attach_options, &pid);
+	if (ret < 0) {
+		lxc_error("%s\n", "Failed to run function in container \"rootfs-options\"");
+		goto on_error_stop;
+	}
+
+	ret = wait_for_pid(pid);
+	if (ret < 0) {
+		lxc_error("%s\n", "Function \"rootfs-options\" failed");
+		goto on_error_stop;
+	}
+
+	fret = 0;
+
+on_error_stop:
+	if (c->is_running(c) && !c->stop(c))
+		lxc_error("%s\n", "Failed to stop container \"rootfs-options\"");
+
+	if (!c->destroy(c))
+		lxc_error("%s\n", "Failed to destroy container \"rootfs-options\"");
+
+on_error_put:
+	lxc_container_put(c);
+	exit(fret);
+}

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/saveconfig.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/saveconfig.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/share_ns.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/share_ns.c Changed

@@ -16,7 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#include "config.h"
+
 #include <alloca.h>
 #include <errno.h>
 #include <pthread.h>
@@ -137,7 +138,7 @@
 		lxc_error("Failed to retrieve ipc namespace for container \"%s\"\n", name);
 		goto out;
 	}
-	ns_bufret == 0 ? ret : ret - 1 = '\0';
+	ns_bufret = '\0';
 
 	if (strcmp(args->inherited_ipc_ns, ns_buf) != 0) {
 		lxc_error("Failed to inherit ipc namespace from container \"owning-ns\": %s != %s\n", args->inherited_ipc_ns, ns_buf);
@@ -157,7 +158,7 @@
 		lxc_error("Failed to retrieve ipc namespace for container \"%s\"\n", name);
 		goto out;
 	}
-	ns_bufret == 0 ? ret : ret - 1 = '\0';
+	ns_bufret = '\0';
 
 	if (strcmp(args->inherited_net_ns, ns_buf) != 0) {
 		lxc_error("Failed to inherit net namespace from container \"owning-ns\": %s != %s\n", args->inherited_net_ns, ns_buf);
@@ -287,7 +288,7 @@
 
 		lxc_debug("Starting namespace sharing test iteration %d\n", j);
 
-		for (i = 0; i < nthreads; i++) {
+		for (i = 0; (size_t)i < nthreads; i++) {
 			memset(&argsi, 0, sizeof(struct thread_args));
 			memset(&threadsi, 0, sizeof(pthread_t));
 
@@ -302,7 +303,7 @@
 				goto on_error_stop;
 		}
 
-		for (i = 0; i < nthreads; i++) {
+		for (i = 0; (size_t)i < nthreads; i++) {
 			ret = pthread_join(threadsi, NULL);
 			if (ret != 0)
 				goto on_error_stop;

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/shortlived.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/shortlived.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/shutdowntest.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/shutdowntest.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/snapshot.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/snapshot.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/startone.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/startone.c Changed

_service:tar_scm:lxc-4.0.3.tar.gz/src/tests/state_server.c -> _service:tar_scm:lxc-5.0.2.tar.gz/src/tests/state_server.c Changed

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/sys_mixed.c Added

@@ -0,0 +1,154 @@
+/* liblxcapi
+ *
+ * Copyright © 2021 Christian Brauner <christian.brauner@ubuntu.com>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "lxccontainer.h"
+#include "attach_options.h"
+
+#ifdef HAVE_STATVFS
+#include <sys/statvfs.h>
+#endif
+
+#include "lxctest.h"
+#include "utils.h"
+
+static int is_read_only(const char *path)
+{
+#ifdef HAVE_STATVFS
+	int ret;
+	struct statvfs sb;
+
+	ret = statvfs(path, &sb);
+	if (ret < 0)
+		return -errno;
+
+	return (sb.f_flag & MS_RDONLY) > 0;
+#else
+	return -EOPNOTSUPP;
+#endif
+}
+
+static int sys_mixed(void *payload)
+{
+	int ret;
+
+	ret = is_read_only("/sys");
+	if (ret == -EOPNOTSUPP)
+		return 0;
+
+	if (ret <= 0)
+		return -1;
+
+	if (is_read_only("/sys/devices/virtual/net"))
+		return -1;
+
+	return 0;
+}
+
+int main(int argc, char *argv)
+{
+	int fret = EXIT_FAILURE;
+	lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT;
+	int ret;
+	pid_t pid;
+	struct lxc_container *c;
+
+	c = lxc_container_new("sys-mixed", NULL);
+	if (!c) {
+		lxc_error("%s", "Failed to create container \"sys-mixed\"");
+		exit(fret);
+	}
+
+	if (c->is_defined(c)) {
+		lxc_error("%s\n", "Container \"sys-mixed\" is defined");
+		goto on_error_put;
+	}
+
+	if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
+		lxc_error("%s\n", "Failed to create busybox container \"sys-mixed\"");
+		goto on_error_put;
+	}
+
+	if (!c->is_defined(c)) {
+		lxc_error("%s\n", "Container \"sys-mixed\" is not defined");
+		goto on_error_put;
+	}
+
+	c->clear_config(c);
+
+	if (!c->load_config(c, NULL)) {
+		lxc_error("%s\n", "Failed to load config for container \"sys-mixed\"");
+		goto on_error_stop;
+	}
+
+	if (!c->set_config_item(c, "lxc.mount.auto", "sys:mixed")) {
+		lxc_error("%s\n", "Failed to set config item \"lxc.mount.auto=sys:mixed\"");
+		goto on_error_put;
+	}
+
+	if (!c->want_daemonize(c, true)) {
+		lxc_error("%s\n", "Failed to mark container \"sys-mixed\" daemonized");
+		goto on_error_stop;
+	}
+
+	if (!c->startl(c, 0, NULL)) {
+		lxc_error("%s\n", "Failed to start container \"sys-mixed\" daemonized");
+		goto on_error_stop;
+	}
+
+	/* Leave some time for the container to write something to the log. */
+	sleep(2);
+
+	ret = c->attach(c, sys_mixed, NULL, &attach_options, &pid);
+	if (ret < 0) {
+		lxc_error("%s\n", "Failed to run function in container \"sys-mixed\"");
+		goto on_error_stop;
+	}
+
+	ret = wait_for_pid(pid);
+	if (ret < 0) {
+		lxc_error("%s\n", "Failed to run function in container \"sys-mixed\"");
+		goto on_error_stop;
+	}
+
+	fret = 0;
+
+on_error_stop:
+	if (c->is_running(c) && !c->stop(c))
+		lxc_error("%s\n", "Failed to stop container \"sys-mixed\"");
+
+	if (!c->destroy(c))
+		lxc_error("%s\n", "Failed to destroy container \"sys-mixed\"");
+
+on_error_put:
+	lxc_container_put(c);
+	exit(fret);
+}

_service:tar_scm:lxc-5.0.2.tar.gz/src/tests/sysctls.c Added

@@ -0,0 +1,171 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "lxccontainer.h"
+#include "attach_options.h"
+
+#include "lxctest.h"
+#include "utils.h"
+
+#define CONTAINER_NAME "test-proc-sys"
+#define SYSCTL_PATH "/proc/sys/net/ipv4/ip_forward"
+#define SYSCTL_CONFIG_KEY "lxc.sysctl.net.ipv4.ip_forward"
+#define SYSCTL_CONFIG_VALUE "1"
+
+static int check_sysctls(void *payload)
+{
+	__do_close int fd = -EBADF;
+	char bufINTTYPE_TO_STRLEN(__u64);
+	ssize_t ret;
+
+	fd = open(SYSCTL_PATH, O_RDONLY | O_CLOEXEC | O_NOFOLLOW);
+	if (fd < 0) {
+		lxc_error("Failed to open " SYSCTL_PATH);
+		return EXIT_FAILURE;
+	}
+
+	ret = lxc_read_nointr(fd, buf, sizeof(buf));
+	if (ret < 0 || (size_t)ret >= sizeof(buf)) {
+		lxc_error("Failed to read " SYSCTL_PATH);
+		return EXIT_FAILURE;
+	}
+
+	bufret = '\0';
+	remove_trailing_newlines(buf);
+
+	if (!strequal(buf,  SYSCTL_CONFIG_VALUE)) {
+		lxc_error("Unexpected value %s for " SYSCTL_PATH, buf);
+		return EXIT_FAILURE;
+	}
+
+	return EXIT_SUCCESS;
+}
+
+int main(int argc, char *argv)
+{
+	int fd_log = -EBADF, fret = EXIT_FAILURE;
+	lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT;
+	int ret;
+	pid_t pid;
+	struct lxc_container *c;
+	struct lxc_log log;
+	char templatesizeof(P_tmpdir "/" CONTAINER_NAME "_XXXXXX");
+
+	if (!file_exists(SYSCTL_PATH)) {
+		lxc_debug("The sysctl path \"" SYSCTL_PATH "\" needed for this test does not exist. Skipping");
+		exit(EXIT_SUCCESS);
+	}
+
+	(void)strlcpy(template, P_tmpdir "/" CONTAINER_NAME "_XXXXXX", sizeof(template));
+
+	fd_log = lxc_make_tmpfile(template, false);
+	if (fd_log < 0) {
+		lxc_error("%s", "Failed to create temporary log file for container \"capabilities\"");
+		return fret;
+	}
+
+	log.name	= CONTAINER_NAME;
+	log.file	= template;
+	log.level	= "TRACE";
+	log.prefix	= CONTAINER_NAME;
+	log.quiet	= false;
+	log.lxcpath	= NULL;
+
+	if (lxc_log_init(&log))
+		exit(fret);
+
+	c = lxc_container_new(CONTAINER_NAME, NULL);
+	if (!c) {
+		lxc_error("%s", "Failed to create container " CONTAINER_NAME);
+		exit(fret);
+	}
+
+	if (c->is_defined(c)) {
+		lxc_error("%s\n", "Container " CONTAINER_NAME " is defined");
+		goto on_error_put;
+	}
+
+	if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
+		lxc_error("%s\n", "Failed to create busybox container " CONTAINER_NAME);
+		goto on_error_put;
+	}
+
+	if (!c->is_defined(c)) {
+		lxc_error("%s\n", "Container " CONTAINER_NAME " is not defined");
+		goto on_error_destroy;
+	}
+
+	if (!c->set_config_item(c, "lxc.mount.auto", "proc:rw")) {
+		lxc_error("%s\n", "Failed to set config item \"lxc.mount.auto=proc:rw\"");
+		goto on_error_destroy;
+	}
+
+	if (!c->clear_config_item(c, SYSCTL_CONFIG_KEY)) {
+		lxc_error("%s\n", "Failed to clear config item \"" SYSCTL_CONFIG_KEY "\"");
+		goto on_error_destroy;
+	}
+
+	if (!c->set_config_item(c, SYSCTL_CONFIG_KEY, SYSCTL_CONFIG_VALUE)) {
+		lxc_error("%s\n", "Failed to set config item \"" SYSCTL_CONFIG_KEY "\"");
+		goto on_error_destroy;
+	}
+
+	if (!c->want_daemonize(c, true)) {
+		lxc_error("%s\n", "Failed to mark container " CONTAINER_NAME " daemonized");
+		goto on_error_destroy;
+	}
+
+	if (!c->startl(c, 0, NULL)) {
+		lxc_error("%s\n", "Failed to start container " CONTAINER_NAME " daemonized");
+		goto on_error_destroy;
+	}
+
+	/* Leave some time for the container to write something to the log. */
+	sleep(2);
+
+	ret = c->attach(c, check_sysctls, NULL, &attach_options, &pid);
+	if (ret < 0) {
+		lxc_error("%s\n", "Failed to run function in container " CONTAINER_NAME);
+		goto on_error_stop;
+	}
+
+	ret = wait_for_pid(pid);
+	if (ret < 0) {
+		lxc_error("%s\n", "Function "CONTAINER_NAME" failed");
+		goto on_error_stop;
+	}
+
+	fret = 0;
+
+on_error_stop:
+	if (c->is_running(c) && !c->stop(c))
+		lxc_error("%s\n", "Failed to stop container " CONTAINER_NAME);
+
+on_error_destroy:
+	if (!c->destroy(c))
+		lxc_error("%s\n", "Failed to destroy container " CONTAINER_NAME);
+
+on_error_put:
+	lxc_container_put(c);
+
+	if (fret == EXIT_SUCCESS) {
+		lxc_debug("All sysctl tests passed\n");
+	} else {
+		char buf4096;
+		ssize_t buflen;
+
+		while ((buflen = read(fd_log, buf, 1024)) > 0) {
+			buflen = write(STDERR_FILENO, buf, buflen);
+			if (buflen <= 0)
+				break;
+		}
+	}
+	close_prot_errno_disarm(fd_log);
+	(void)unlink(template);
+
+	exit(fret);
+}

_service:tar_scm:lxc-4.0.3.tar.gz/templates/lxc-busybox.in -> _service:tar_scm:lxc-5.0.2.tar.gz/templates/lxc-busybox.in Changed

@@ -23,10 +23,10 @@
 LXC_MAPPED_UID=
 LXC_MAPPED_GID=
 
-BUSYBOX_EXE=`which busybox`
+BUSYBOX_EXE=$(command -v busybox)
 
 # Make sure the usual locations are in PATH
-export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+export PATH="$PATH:/usr/sbin:/usr/bin:/sbin:/bin"
 
 in_userns() {
    -e /proc/self/uid_map  || { echo no; return; }
@@ -86,23 +86,6 @@
   # shellcheck disable=SC2086
   chmod 755 ${fstree} || return 1
 
-  # minimal devices needed for busybox
-  if  "${USERNS}" = "yes" ; then
-    for dev in tty console tty0 tty1 ram0 null urandom; do
-      echo "lxc.mount.entry = /dev/${dev} dev/${dev} none bind,optional,create=file 0 0" >> "${path}/config"
-    done
-  else
-    mknod -m 666 "${rootfs}/dev/tty" c 5 0       || res=1
-    mknod -m 666 "${rootfs}/dev/console" c 5 1   || res=1
-    mknod -m 666 "${rootfs}/dev/tty0" c 4 0      || res=1
-    mknod -m 666 "${rootfs}/dev/tty1" c 4 0      || res=1
-    mknod -m 666 "${rootfs}/dev/tty5" c 4 0      || res=1
-    mknod -m 600 "${rootfs}/dev/ram0" b 1 0      || res=1
-    mknod -m 666 "${rootfs}/dev/null" c 1 3      || res=1
-    mknod -m 666 "${rootfs}/dev/zero" c 1 5      || res=1
-    mknod -m 666 "${rootfs}/dev/urandom" c 1 9   || res=1
-  fi
-  
   # make /tmp accessible to any user (with sticky bit)
   chmod 1777 "${rootfs}/tmp" || return 1
 
@@ -138,8 +121,8 @@
   chmod 644 "${rootfs}/etc/inittab" || return 1
 
   # Look for the pathname of "default.script" from the help of udhcpc
-  DEF_SCRIPT=`${BUSYBOX_EXE} udhcpc --help 2>&1 | egrep -- '-s.*Run PROG' | cut -d'/' -f2- | cut -d')' -f1`
-  DEF_SCRIPT_DIR=`dirname /${DEF_SCRIPT}`
+  DEF_SCRIPT=$(${BUSYBOX_EXE} udhcpc --help 2>&1 | egrep -- '-s.*Run PROG' | cut -d'/' -f2- | cut -d')' -f1)
+  DEF_SCRIPT_DIR=$(dirname /${DEF_SCRIPT})
   mkdir -p ${rootfs}/${DEF_SCRIPT_DIR}
   chmod 644 ${rootfs}/${DEF_SCRIPT_DIR} || return 1
 
@@ -227,14 +210,15 @@
 lxc.signal.halt = SIGUSR1
 lxc.signal.reboot = SIGTERM
 lxc.uts.name = "${name}"
-lxc.tty.max = 1
+lxc.autodev = 1
+lxc.tty.max = 5
 lxc.pty.max = 1
 lxc.cap.drop = sys_module mac_admin mac_override sys_time
 
 # When using LXC with apparmor, uncomment the next line to run unconfined:
 #lxc.apparmor.profile = unconfined
 
-lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
+lxc.mount.auto = cgroup:mixed proc:mixed sys:ro
 lxc.mount.entry = shm dev/shm tmpfs defaults,create=dir 0 0
 lxc.mount.entry = mqueue dev/mqueue mqueue defaults,optional,create=dir 0 0
 EOF

_service:tar_scm:lxc-4.0.3.tar.gz/templates/lxc-download.in -> _service:tar_scm:lxc-5.0.2.tar.gz/templates/lxc-download.in Changed

@@ -21,9 +21,9 @@
 
 set -eu
 
-LOCALSTATEDIR="@LOCALSTATEDIR@"
-LXC_HOOK_DIR="@LXCHOOKDIR@"
-LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
+LOCALSTATEDIR=@LOCALSTATEDIR@
+LXC_HOOK_DIR=@LXCHOOKDIR@
+LXC_TEMPLATE_CONFIG=@LXCTEMPLATECONFIG@
 
 # Defaults
 DOWNLOAD_ARCH=
@@ -33,18 +33,13 @@
 DOWNLOAD_FLUSH_CACHE="false"
 DOWNLOAD_FORCE_CACHE="false"
 DOWNLOAD_INTERACTIVE="false"
-DOWNLOAD_KEYID="0xE7FB0CAEC8173D669066514CBAEFF88C22F6E216"
 DOWNLOAD_LIST_IMAGES="false"
 DOWNLOAD_MODE="system"
-DOWNLOAD_READY_GPG="false"
 DOWNLOAD_RELEASE=
 DOWNLOAD_SERVER="images.linuxcontainers.org"
-DOWNLOAD_SHOW_GPG_WARNING="true"
-DOWNLOAD_SHOW_HTTP_WARNING="true"
 DOWNLOAD_TARGET="system"
 DOWNLOAD_URL=
 DOWNLOAD_USE_CACHE="false"
-DOWNLOAD_VALIDATE="true"
 DOWNLOAD_VARIANT="default"
 DOWNLOAD_TEMP=
 
@@ -54,18 +49,8 @@
 LXC_PATH=
 LXC_ROOTFS=
 
-if  -z "${DOWNLOAD_KEYSERVER:-}" ; then
-  DOWNLOAD_KEYSERVER="hkp://pool.sks-keyservers.net"
-
-  # Deal with GPG over http proxy
-  if  -n "${http_proxy:-}" ; then
-    DOWNLOAD_KEYSERVER="hkp://p80.pool.sks-keyservers.net:80"
-    DOWNLOAD_GPG_PROXY="--keyserver-options http-proxy=\"${http_proxy}\""
-  fi
-fi
-
 # Make sure the usual locations are in PATH
-export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+export PATH="$PATH:/usr/sbin:/usr/bin:/sbin:/bin"
 
 # Some useful functions
 cleanup() {
@@ -85,83 +70,13 @@
 }
 
 download_file() {
-  if ! wget_wrapper -T 30 -q "https://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then
-    if ! wget_wrapper -T 30 -q "http://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then
-      if  "$3" = "noexit" ; then
-        return 1
-      else
-        echo "ERROR: Failed to download http://${DOWNLOAD_SERVER}/$1" 1>&2
-        exit 1
-      fi
-    elif  "${DOWNLOAD_SHOW_HTTP_WARNING}" = "true" ; then
-      DOWNLOAD_SHOW_HTTP_WARNING="false"
-      echo "WARNING: Failed to download the file over HTTPs" 1>&2
-      echo "         The file was instead download over HTTP " 1>&2
-      echo "A server replay attack may be possible!" 1>&2
-    fi
-  fi
-}
-
-download_sig() {
-  if ! download_file "$1" "$2" noexit; then
-    if  "${DOWNLOAD_VALIDATE}" = "true" ; then
-      if  "$3" = "normal" ; then
-        echo "ERROR: Failed to download http://${DOWNLOAD_SERVER}/$1" 1>&2
-        exit 1
-      else
-        return 1
-      fi
+  if ! wget_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -T 30 -q "https://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then
+    if  "$3" = "noexit" ; then
+      return 1
     else
-      return 0
-    fi
-  fi
-}
-
-gpg_setup() {
-  if  "${DOWNLOAD_VALIDATE}" = "false" ; then
-    return
-  fi
-
-  if  "${DOWNLOAD_READY_GPG}" = "true" ; then
-    return
-  fi
-
-  echo "Setting up the GPG keyring"
-
-  mkdir -p "${DOWNLOAD_TEMP}/gpg"
-  chmod 700 "${DOWNLOAD_TEMP}/gpg"
-  export GNUPGHOME="${DOWNLOAD_TEMP}/gpg"
-
-  success=
-  for _ in $(seq 3); do
-    if $(gpg --keyserver "${DOWNLOAD_KEYSERVER}" ${DOWNLOAD_GPG_PROXY:-} \
-      --recv-keys "${DOWNLOAD_KEYID}" >/dev/null 2>&1); then
-      success=1
-      break
-    fi
-    break
-  done
-
-  if  -z "${success}" ; then
-    echo "ERROR: Unable to fetch GPG key from keyserver"
-    exit 1
-  fi
-
-  DOWNLOAD_READY_GPG="true"
-}
-
-gpg_validate() {
-  if  "${DOWNLOAD_VALIDATE}" = "false" ; then
-    if  "${DOWNLOAD_SHOW_GPG_WARNING}" = "true" ; then
-      echo "WARNING: Running without gpg validation!" 1>&2
+      echo "ERROR: Failed to download https://${DOWNLOAD_SERVER}/$1" 1>&2
+      exit 1
     fi
-    DOWNLOAD_SHOW_GPG_WARNING="false"
-    return 0
-  fi
-
-  if ! gpg --verify "$1" >/dev/null 2>&1; then
-    echo "ERROR: Invalid signature for $1" 1>&2
-    exit 1
   fi
 }
 
@@ -218,9 +133,6 @@
 Optional arguments:
  --variant <variant> : Variant of the image (default: "default")
  --server <server> : Image server (default: "images.linuxcontainers.org")
- --keyid <keyid> : GPG keyid (default: 0x...)
- --keyserver <keyserver> : GPG keyserver to use. Environment variable: DOWNLOAD_KEYSERVER
- --no-validate : Disable GPG validation (not recommended)
  --flush-cache : Flush the local copy (if present)
  --force-cache : Force the use of the local copy even if expired
 
@@ -231,16 +143,12 @@
  --mapped-uid <map> : A uid map (user namespaces)
  --mapped-gid <map> : A gid map (user namespaces)
 
-Environment Variables:
-DOWNLOAD_KEYSERVER : The URL of the key server to use, instead of the default.
-                     Can be further overridden by using optional argument --keyserver
-
 EOF
   return 0
 }
 
 if ! options=$(getopt -o d:r:a:hl -l dist:,release:,arch:,help,list,variant:,\
-server:,keyid:,keyserver:,no-validate,flush-cache,force-cache,name:,path:,\
+server:,flush-cache,force-cache,name:,path:,\
 rootfs:,mapped-uid:,mapped-gid: -- "$@"); then
   usage
   exit 1
@@ -256,9 +164,6 @@
     -a|--arch)     DOWNLOAD_ARCH="$2"; shift 2;;
     --variant)     DOWNLOAD_VARIANT="$2"; shift 2;;
     --server)      DOWNLOAD_SERVER="$2"; shift 2;;
-    --keyid)       DOWNLOAD_KEYID="$2"; shift 2;;
-    --keyserver)   DOWNLOAD_KEYSERVER="$2"; shift 2;;
-    --no-validate) DOWNLOAD_VALIDATE="false"; shift 1;;
     --flush-cache) DOWNLOAD_FLUSH_CACHE="true"; shift 1;;
     --force-cache) DOWNLOAD_FORCE_CACHE="true"; shift 1;;
     --name)        LXC_NAME="$2"; shift 2;;
@@ -278,15 +183,6 @@
   fi
 done
 
-# Check for GPG
-if  "${DOWNLOAD_VALIDATE}" = "true" ; then
-  if ! command -V gpg >/dev/null 2>&1; then
-    echo "ERROR: Missing recommended tool: gpg" 1>&2
-    echo "You can workaround this by using --no-validate" 1>&2
-    exit 1
-  fi
-fi
-
 # Check that we have all variables we need
 if  -z "${LXC_NAME}"  ||  -z "${LXC_PATH}"  ||  -z "${LXC_ROOTFS}" ; then
   if  "${DOWNLOAD_LIST_IMAGES}" != "true" ; then
@@ -327,28 +223,21 @@
   DOWNLOAD_TEMP="${DOWNLOAD_TEMP}/tmp/lxc-download.$$"
 elif  -n "${DOWNLOAD_TEMP}" ; then
   mkdir -p "${DOWNLOAD_TEMP}"
-  DOWNLOAD_TEMP="$(mktemp -p ${DOWNLOAD_TEMP} -d)"
+  DOWNLOAD_TEMP="$(mktemp -p "${DOWNLOAD_TEMP}" -d)"
 else
   DOWNLOAD_TEMP="${DOWNLOAD_TEMP}$(mktemp -d)"
 fi
 
 # Simply list images
 if  "${DOWNLOAD_LIST_IMAGES}" = "true"  ||  "${DOWNLOAD_INTERACTIVE}" = "true" ; then
-  # Initialize GPG
-  gpg_setup
-
   # Grab the index
   DOWNLOAD_INDEX_PATH="/meta/1.0/index-${DOWNLOAD_MODE}"
 
   echo "Downloading the image index"
-  if ! download_file "${DOWNLOAD_INDEX_PATH}.${DOWNLOAD_COMPAT_LEVEL}" "${DOWNLOAD_TEMP}/index" noexit ||
-     ! download_sig "${DOWNLOAD_INDEX_PATH}.${DOWNLOAD_COMPAT_LEVEL}.asc" "${DOWNLOAD_TEMP}/index.asc" noexit; then
+  if ! download_file "${DOWNLOAD_INDEX_PATH}.${DOWNLOAD_COMPAT_LEVEL}" "${DOWNLOAD_TEMP}/index" noexit; then
     download_file "${DOWNLOAD_INDEX_PATH}" "${DOWNLOAD_TEMP}/index" normal
-    download_sig "${DOWNLOAD_INDEX_PATH}.asc" "${DOWNLOAD_TEMP}/index.asc" normal
   fi
 
-  gpg_validate "${DOWNLOAD_TEMP}/index.asc"
-
   # Parse it
   echo ""
   echo "---"
@@ -423,21 +312,14 @@
 
 # Download what's needed
 if  "${DOWNLOAD_USE_CACHE}" = "false" ; then
-  # Initialize GPG
-  gpg_setup
-
   # Grab the index
   DOWNLOAD_INDEX_PATH="/meta/1.0/index-${DOWNLOAD_MODE}"
 
   echo "Downloading the image index"
-  if ! download_file "${DOWNLOAD_INDEX_PATH}.${DOWNLOAD_COMPAT_LEVEL}" "${DOWNLOAD_TEMP}/index" noexit ||
-     ! download_sig "${DOWNLOAD_INDEX_PATH}.${DOWNLOAD_COMPAT_LEVEL}.asc" "${DOWNLOAD_TEMP}/index.asc" noexit; then
+  if ! download_file "${DOWNLOAD_INDEX_PATH}.${DOWNLOAD_COMPAT_LEVEL}" "${DOWNLOAD_TEMP}/index" noexit; then
     download_file "${DOWNLOAD_INDEX_PATH}" "${DOWNLOAD_TEMP}/index" normal
-    download_sig "${DOWNLOAD_INDEX_PATH}.asc" "${DOWNLOAD_TEMP}/index.asc" normal
   fi
 
-  gpg_validate "${DOWNLOAD_TEMP}/index.asc"
-
   # Parse it
   while IFS=';' read -r f1 f2 f3 f4 f5 f6; do
     if  "${f1}" != "${DOWNLOAD_DIST}"  || \
@@ -468,13 +350,9 @@
     # Download the actual files
     echo "Downloading the rootfs"
     download_file "${DOWNLOAD_URL}/rootfs.tar.xz" "${DOWNLOAD_TEMP}/rootfs.tar.xz" normal
-    download_sig "${DOWNLOAD_URL}/rootfs.tar.xz.asc" "${DOWNLOAD_TEMP}/rootfs.tar.xz.asc" normal
-    gpg_validate "${DOWNLOAD_TEMP}/rootfs.tar.xz.asc"
 
     echo "Downloading the metadata"
     download_file "${DOWNLOAD_URL}/meta.tar.xz" "${DOWNLOAD_TEMP}/meta.tar.xz" normal
-    download_sig "$DOWNLOAD_URL/meta.tar.xz.asc" "${DOWNLOAD_TEMP}/meta.tar.xz.asc" normal
-    gpg_validate "${DOWNLOAD_TEMP}/meta.tar.xz.asc"
 
     if  -d "${LXC_CACHE_PATH}" ; then
       rm -Rf "${LXC_CACHE_PATH}"

_service:tar_scm:lxc-4.0.3.tar.gz/templates/lxc-local.in -> _service:tar_scm:lxc-5.0.2.tar.gz/templates/lxc-local.in Changed

_service:tar_scm:lxc-4.0.3.tar.gz/templates/lxc-oci.in -> _service:tar_scm:lxc-5.0.2.tar.gz/templates/lxc-oci.in Changed

_service:tar_scm:lxc-5.0.2.tar.gz/templates/meson.build Added