Hi Daniel, You'll find the 0.9.alpha3 pull request below.
Based on what you did last time, the following should do the trick:
- Review the pull request
- Use "git pull --edit --no-ff --stat git://github.com/lxc/lxc.git",
that should do a real merge, letting you do a proper Sign-off of the
changes.
- Update the version number to 0.9~alpha3
- Commit and tag
Major changes include:
- Android support
- New lua binding
- User namespace support
- Oracle template
- Manpage updates
- POSIX shell support for most scripts
- Improved systemd support
- Various API improvements
- Logging improvements
As usual, we've run the regression tests on the current staging branch
and all passed. I also test built on both Ubuntu 13.04 and cross-built
to Android 4.2.
The staging branch has remained stable pretty much the whole time since
the alpha1 release with only some brief regressions that got fixed
almost immediately.
Thanks to everyone involved!
Stéphane
---------
The following changes since commit 56655134e462ceaf86b51838e4e825c2f3964922:
Version 0.9.0.alpha2 (2012-12-14 09:42:55 +0100)
are available in the git repository at:
git://github.com/lxc/lxc.git staging
for you to fetch changes up to 83c98d825e4e644b18276dde5deaa555ee36b629:
Update Lua API (2013-02-11 17:37:10 -0500)
----------------------------------------------------------------
Alexander Vladimirov (4):
Update lxc-archlinux template to work with systemd
Set umask before populating /dev and restore it after.
Add 'config' option to lxc-archlinux template and fix getopt string
Update lxc-archlinux template.
Christian Seiler (1):
Multiple IP addresses: add them in the correct order
Dwight Engen (18):
lxc-destroy container only if it is in the STOPPED state
fix open check (0 is a valid fd)
separate console device from console log
oracle template: add support for creating ol4 container from ovm
template
fix lxc-wait waiting forever for FREEZING, FROZEN, THAWED states
document lxc-console escape sequence and argument
oracle template: drop additional capabilities
oracle template: use url arg to wget repo file
fix lxc-shutdown argument parsing
oracle template: fix lxc-shutdown with upstart SIGPWR handler
use pkg-config to ensure python3-devel is installed
use which instead of type
include python files in make dist and rpm
oracle template: fix sudo lxc-create on ubuntu
add lua binding for the lxc API
Rename /etc/lxc/lxc.conf to /etc/lxc/default.conf.
oracle template: improve compatibility with old ol4, 5
Update Lua API
Kyle Russell (1):
Fix compile warning on uninitialized return value
Matthias Brugger (1):
lxc-setcap.in: Set path to lxc-init
Maximilian Seesslen (1):
fixed RELEASE_URL for fedora releases higher than 16
Michael H. Warfield (1):
MAKEDEV call, add autodev hooks, add environment variables for
hook scripts.
Natanael Copa (18):
define MS_SHARED if needed
templates: initial support for Alpine Linux
lxc-destroy: use posix shell instead of bash
legacy/lxc-ls: use posix shell instead of bash
lxc-clone: use posix shell instead of bash
lxc-netstat: use posix shell instead of bash
lxc-netstat: improve finding fs mountpoint of hierarchy
legacy/lxc-ls: improve finding fs mountpoint of hierarchy
cleanup: use lxc-info --state-is
lxc-shutdown: use posix shell instead of bash
lxc-ps: use posix shell and awk instead of bash
templates: install lxc-alpine
lxc-alpine: indent fixes
lxc-alpine: add --repository option
lxc-alpine: add support for setting arch from command line
lxc-alpine: add support for installing optional packages
lxc-checkconfig: fix colors when using dash
lxc-ps: fix order of output and fix --lxc opt
Purcareata Bogdan-B43198 (1):
Add Dropbear SSH support for lxc-busybox template
Serge Hallyn (16):
Support MS_SHARED /
Clear environment for container
remove logfile and loglevel from struct lxc_conf
clean up syncs
setup cgroups from parent
Implement userid mappings (enable user namespaces)
don't leak the rootfs.pin fd into the container
use a default per-container logfile
use a default per-container logfile
use a default per-container logfile
setup_mount_entries: ignore mount failure if 'optional'
Switch from use of LXCPATH to a configurable default_lxc_path
Add man page for lxc-clone
add lxc-unshare man page, and make 'lxc-unshare -h' work.
lxc api: fix some config_path oddities
pass lxcpath to lxc_command
Stéphane Graber (41):
kill -s expects the signal name without SIG
configure.ac: Add code to detect bionic C library
configure.ac: Cleanup, comments, indent, ...
Replace all reference to ushort by unsigned short
Support both getline and fgetln
No need to link against rt and util on bionic
Replace get_current_dir_name by getcwd
Add/remove extra includes
conf.c: Define LO_FLAGS_AUTOCLEAR if it's not
clone: Support bionic's clone() defintion
tty.h: Ship our own minimal openpty.h
Don't hard depend on capability.h and libcap
personality.h: Make the personality code optional
Workaround missing functions in other libc
Make utmpx.h optional
Add a bionic_alphasort function on bionic
Replace strdupa call by standard strdup
caps.h: Rename __errno to ___errno
Add local implementation of mntent.h
conf.c: Cleanup __S_ISTYPE
lxc_unshare: Replace getpw*_r by getpw*
tests/Makefile.am: Update for bionic
Don't call setup_mount_entries if the list is empty
Makefile.am: Add missing liblxc symlink
Define PR_CAPBSET_READ when missing
utmp.h: Don't fail when utmpx.h isn't present
Fix header name in lxcmntent.h
Add check for sys/timerfd.h
Rename utmp.c/utmp.h to lxcutmp.c/lxcutmp.h
Build lxcutmp.c without timerfd.h or utmpx.h
Fix check for openpty
lxcutmp.c: Fix typo causing build failure
lxc-oracle.in: Clear trailing whitespaces
conf.c: Cast st_uid and st_gid to int
Revert "use a default per-container logfile"
Revert "use a default per-container logfile"
Drop lxc-setcap and lxc-setuid
lxc.functions isn't a shell script
Add missing manpages
lxc-create: Improve the layout of the config
python-lxc: Update for new calls
Tomohiro Matsuyama (1):
Add missing option -t/--fstype.
.gitignore | 3 +-
Makefile.am | 11 +-
README | 2 +-
config/Makefile.am | 14 +-
config/{lxc.conf.libvirt => default.conf.libvirt} | 0
config/{lxc.conf.ubuntu => default.conf.ubuntu} | 0
config/{lxc.conf.unknown => default.conf.unknown} | 0
configure.ac | 274 +++++++++-----
doc/Makefile.am | 31 +-
doc/lxc-checkconfig.sgml.in | 98 +++++
doc/lxc-clone.sgml.in | 194 ++++++++++
doc/lxc-console.sgml.in | 23 +-
doc/lxc-device.sgml.in | 174 +++++++++
doc/lxc-info.sgml.in | 164 +++++++++
doc/lxc-ls.sgml.in | 2 +
doc/lxc-netstat.sgml.in | 143 ++++++++
doc/lxc-ps.sgml.in | 2 +-
doc/lxc-start-ephemeral.sgml.in | 239 ++++++++++++
doc/lxc-start.sgml.in | 28 +-
doc/lxc-top.sgml.in | 164 +++++++++
doc/lxc-unshare.sgml.in | 161 ++++++++
doc/lxc-version.sgml.in | 96 +++++
doc/lxc.conf.sgml.in | 162 +++++++++
lxc.spec.in | 28 +-
src/Makefile.am | 2 +-
src/include/getline.c | 31 ++
src/include/getline.h | 6 +
src/include/lxcmntent.c | 173 +++++++++
src/include/lxcmntent.h | 32 ++
src/include/openpty.c | 72 ++++
src/include/openpty.h | 14 +
src/lua-lxc/Makefile.am | 26 ++
src/lua-lxc/core.c | 412
+++++++++++++++++++++
src/lua-lxc/lxc.lua | 424
++++++++++++++++++++++
src/lua-lxc/test/apitest.lua | 326 +++++++++++++++++
src/lxc/Makefile.am | 61 +++-
src/lxc/arguments.h | 1 +
src/lxc/attach.c | 34 +-
src/lxc/caps.c | 10 +-
src/lxc/caps.h | 44 ++-
src/lxc/cgroup.c | 9 +-
src/lxc/commands.c | 64 ++--
src/lxc/commands.h | 11 +-
src/lxc/conf.c | 399
+++++++++++++++++---
src/lxc/conf.h | 43 ++-
src/lxc/confile.c | 163 ++++++---
src/lxc/confile.h | 2 +
src/lxc/console.c | 74 +++-
src/lxc/execute.c | 4 +-
src/lxc/freezer.c | 6 +
src/lxc/legacy/lxc-ls.in | 22 +-
src/lxc/log.c | 162 ++++++++-
src/lxc/log.h | 8 +-
src/lxc/lxc-checkconfig.in | 8 +-
src/lxc/lxc-clone.in | 69 ++--
src/lxc/lxc-create.in | 11 +-
src/lxc/lxc-destroy.in | 48 ++-
src/lxc/lxc-netstat.in | 19 +-
src/lxc/lxc-ps.in | 97 +++--
src/lxc/lxc-setcap.in | 133 -------
src/lxc/lxc-setuid.in | 130 -------
src/lxc/lxc-shutdown.in | 60 +--
src/lxc/lxc-top | 242 ++++++++++++
src/lxc/lxc.functions.in | 33 ++
src/lxc/lxc.h | 13 +-
src/lxc/lxc_attach.c | 18 +-
src/lxc/lxc_cgroup.c | 2 +-
src/lxc/lxc_checkpoint.c | 2 +-
src/lxc/lxc_console.c | 6 +-
src/lxc/lxc_execute.c | 13 +-
src/lxc/lxc_freeze.c | 2 +-
src/lxc/lxc_info.c | 8 +-
src/lxc/lxc_init.c | 2 +-
src/lxc/lxc_kill.c | 6 +-
src/lxc/lxc_monitor.c | 2 +-
src/lxc/lxc_restart.c | 11 +-
src/lxc/lxc_start.c | 111 +++---
src/lxc/lxc_stop.c | 7 +-
src/lxc/lxc_unfreeze.c | 2 +-
src/lxc/lxc_unshare.c | 29 +-
src/lxc/lxc_wait.c | 4 +-
src/lxc/lxccontainer.c | 147 ++++++--
src/lxc/lxccontainer.h | 17 +-
src/lxc/lxclock.c | 1 +
src/lxc/{utmp.c => lxcutmp.c} | 69 ++++
src/lxc/{utmp.h => lxcutmp.h} | 2 +
src/lxc/namespace.c | 1 -
src/lxc/namespace.h | 9 +-
src/lxc/network.c | 2 +-
src/lxc/network.h | 2 +-
src/lxc/nl.c | 2 +-
src/lxc/nl.h | 2 +-
src/lxc/parse.c | 23 ++
src/lxc/restart.c | 4 +-
src/lxc/start.c | 150 +++++++-
src/lxc/start.h | 5 +-
src/lxc/state.c | 12 +-
src/lxc/state.h | 2 +-
src/lxc/stop.c | 6 +-
src/lxc/sync.h | 2 +
src/lxc/utils.c | 58 ++-
src/lxc/utils.h | 7 +-
src/python-lxc/Makefile.am | 2 +
src/python-lxc/lxc.c | 42 ++-
src/python-lxc/lxc/__init__.py.in | 20 +-
src/tests/Makefile.am | 11 +-
src/tests/containertests.c | 6 +-
src/tests/createtest.c | 2 +-
src/tests/destroytest.c | 4 +-
src/tests/get_item.c | 8 +-
src/tests/getkeys.c | 2 +-
src/tests/lxcpath.c | 85 +++++
src/tests/saveconfig.c | 4 +-
src/tests/shutdowntest.c | 2 +-
src/tests/startone.c | 4 +-
templates/Makefile.am | 5 +-
templates/lxc-alpine.in | 219 +++++++++++
templates/lxc-archlinux.in | 365 +++++--------------
templates/lxc-busybox.in | 35 +-
templates/lxc-fedora.in | 6 +-
templates/lxc-oracle.in | 221 ++++++++---
templates/lxc-ubuntu.in | 8 +-
122 files changed, 6048 insertions(+), 1262 deletions(-)
rename config/{lxc.conf.libvirt => default.conf.libvirt} (100%)
rename config/{lxc.conf.ubuntu => default.conf.ubuntu} (100%)
rename config/{lxc.conf.unknown => default.conf.unknown} (100%)
create mode 100644 doc/lxc-checkconfig.sgml.in
create mode 100644 doc/lxc-clone.sgml.in
create mode 100644 doc/lxc-device.sgml.in
create mode 100644 doc/lxc-info.sgml.in
create mode 100644 doc/lxc-netstat.sgml.in
create mode 100644 doc/lxc-start-ephemeral.sgml.in
create mode 100644 doc/lxc-top.sgml.in
create mode 100644 doc/lxc-unshare.sgml.in
create mode 100644 doc/lxc-version.sgml.in
create mode 100644 src/include/getline.c
create mode 100644 src/include/getline.h
create mode 100644 src/include/lxcmntent.c
create mode 100644 src/include/lxcmntent.h
create mode 100644 src/include/openpty.c
create mode 100644 src/include/openpty.h
create mode 100644 src/lua-lxc/Makefile.am
create mode 100644 src/lua-lxc/core.c
create mode 100755 src/lua-lxc/lxc.lua
create mode 100755 src/lua-lxc/test/apitest.lua
mode change 100644 => 100755 src/lxc/lxc-clone.in
delete mode 100644 src/lxc/lxc-setcap.in
delete mode 100644 src/lxc/lxc-setuid.in
create mode 100755 src/lxc/lxc-top
create mode 100644 src/lxc/lxc.functions.in
rename src/lxc/{utmp.c => lxcutmp.c} (89%)
rename src/lxc/{utmp.h => lxcutmp.h} (97%)
create mode 100644 src/tests/lxcpath.c
create mode 100644 templates/lxc-alpine.in
--
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
