diff -Nru lxc-1.1.0~rc4/config/apparmor/abstractions/start-container lxc-1.1.0/config/apparmor/abstractions/start-container --- lxc-1.1.0~rc4/config/apparmor/abstractions/start-container 2015-01-29 22:58:23.000000000 +0000 +++ lxc-1.1.0/config/apparmor/abstractions/start-container 2015-01-30 13:12:41.000000000 +0000 @@ -13,7 +13,7 @@ mount -> /usr/lib/lxc/{**,}, mount fstype=devpts -> /dev/pts/, mount options=bind /dev/pts/ptmx/ -> /dev/ptmx/, - mount options=bind /dev/pts/** -> /dev/tty*/, + mount options=bind /dev/pts/** -> /dev/**, mount options=(rw, make-slave) -> **, mount fstype=debugfs, # allow pre-mount hooks to stage mounts under /var/lib/lxc// diff -Nru lxc-1.1.0~rc4/config/init/sysvinit/Makefile.in lxc-1.1.0/config/init/sysvinit/Makefile.in --- lxc-1.1.0~rc4/config/init/sysvinit/Makefile.in 2015-01-29 22:58:29.000000000 +0000 +++ lxc-1.1.0/config/init/sysvinit/Makefile.in 2015-01-30 13:12:46.000000000 +0000 @@ -387,8 +387,8 @@ 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@install-data-local: @INIT_SCRIPT_SYSV_FALSE@uninstall-local: +@INIT_SCRIPT_SYSV_FALSE@install-data-local: clean: clean-am clean-am: clean-generic mostlyclean-am diff -Nru lxc-1.1.0~rc4/configure lxc-1.1.0/configure --- lxc-1.1.0~rc4/configure 2015-01-29 22:58:28.000000000 +0000 +++ lxc-1.1.0/configure 2015-01-30 13:12:46.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lxc 1.1.0.rc4. +# Generated by GNU Autoconf 2.69 for lxc 1.1.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='lxc' PACKAGE_TARNAME='lxc' -PACKAGE_VERSION='1.1.0.rc4' -PACKAGE_STRING='lxc 1.1.0.rc4' +PACKAGE_VERSION='1.1.0' +PACKAGE_STRING='lxc 1.1.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1435,7 +1435,7 @@ # 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 1.1.0.rc4 to adapt to many kinds of systems. +\`configure' configures lxc 1.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lxc 1.1.0.rc4:";; + short | recursive ) echo "Configuration of lxc 1.1.0:";; esac cat <<\_ACEOF @@ -1665,7 +1665,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lxc configure 1.1.0.rc4 +lxc configure 1.1.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2130,7 +2130,7 @@ 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 1.1.0.rc4, which was +It was created by lxc $as_me 1.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2603,7 +2603,6 @@ LXC_VERSION_BASE=1.1.0 -LXC_VERSION_BETA=rc4 LXC_VERSION_MAJOR=1 @@ -2612,7 +2611,7 @@ LXC_VERSION_MICRO=0 -LXC_VERSION=1.1.0.rc4 +LXC_VERSION=1.1.0 @@ -3133,7 +3132,7 @@ # Define the identity of the package. PACKAGE='lxc' - VERSION='1.1.0.rc4' + VERSION='1.1.0' cat >>confdefs.h <<_ACEOF @@ -9875,7 +9874,7 @@ # 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 1.1.0.rc4, which was +This file was extended by lxc $as_me 1.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9945,7 +9944,7 @@ 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 1.1.0.rc4 +lxc config.status 1.1.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru lxc-1.1.0~rc4/configure.ac lxc-1.1.0/configure.ac --- lxc-1.1.0~rc4/configure.ac 2015-01-29 22:58:23.000000000 +0000 +++ lxc-1.1.0/configure.ac 2015-01-30 13:12:41.000000000 +0000 @@ -4,7 +4,7 @@ m4_define([lxc_version_major], 1) m4_define([lxc_version_minor], 1) m4_define([lxc_version_micro], 0) -m4_define([lxc_version_beta], [rc4]) +m4_define([lxc_version_beta], []) m4_define([lxc_version_base], [lxc_version_major.lxc_version_minor.lxc_version_micro]) m4_define([lxc_version], diff -Nru lxc-1.1.0~rc4/debian/changelog lxc-1.1.0/debian/changelog --- lxc-1.1.0~rc4/debian/changelog 2015-01-29 23:04:10.000000000 +0000 +++ lxc-1.1.0/debian/changelog 2015-01-30 13:17:15.000000000 +0000 @@ -1,3 +1,9 @@ +lxc (1.1.0-0ubuntu1) vivid; urgency=medium + + * New upstream release (1.1.0) + + -- Stéphane Graber Fri, 30 Jan 2015 14:17:14 +0100 + lxc (1.1.0~rc4-0ubuntu1) vivid; urgency=medium * New upstream release (1.1.0~rc4) diff -Nru lxc-1.1.0~rc4/debian/.git-dpm lxc-1.1.0/debian/.git-dpm --- lxc-1.1.0~rc4/debian/.git-dpm 2015-01-29 23:03:32.000000000 +0000 +++ lxc-1.1.0/debian/.git-dpm 2015-01-30 13:16:02.000000000 +0000 @@ -1,8 +1,8 @@ # see git-dpm(1) from git-dpm package -2b2dcf0730171b61fc9ea5d22b718c6bc60854e7 -2b2dcf0730171b61fc9ea5d22b718c6bc60854e7 -2b2dcf0730171b61fc9ea5d22b718c6bc60854e7 -2b2dcf0730171b61fc9ea5d22b718c6bc60854e7 -lxc_1.1.0~rc4.orig.tar.gz -2514cc30918bc126f6a48ec53626db994ea973b2 -833672 +9ffc975a63030b3860aa06d53c5e3437fef91b8c +9ffc975a63030b3860aa06d53c5e3437fef91b8c +9ffc975a63030b3860aa06d53c5e3437fef91b8c +9ffc975a63030b3860aa06d53c5e3437fef91b8c +lxc_1.1.0.orig.tar.gz +97ce6e23f59b8520067128dacf0c12557e97cc6a +833398 diff -Nru lxc-1.1.0~rc4/doc/ja/lxc.container.conf.sgml.in lxc-1.1.0/doc/ja/lxc.container.conf.sgml.in --- lxc-1.1.0~rc4/doc/ja/lxc.container.conf.sgml.in 2015-01-29 22:58:23.000000000 +0000 +++ lxc-1.1.0/doc/ja/lxc.container.conf.sgml.in 2015-01-30 13:12:41.000000000 +0000 @@ -1075,15 +1075,28 @@ + + + (or ): + /sys/devices/virtual/net のみ書き込み可能で、その他の /sys はリードオンリーでマウントします。 + + + - (or ): + : /sys を、セキュリティとコンテナの隔離の目的でリードオンリーでマウントします。 diff -Nru lxc-1.1.0~rc4/lxc.spec lxc-1.1.0/lxc.spec --- lxc-1.1.0~rc4/lxc.spec 2015-01-29 23:01:04.000000000 +0000 +++ lxc-1.1.0/lxc.spec 2015-01-30 13:13:44.000000000 +0000 @@ -52,8 +52,8 @@ # 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 "xrc4" != "x" -%global beta_rel rc4 +%if "x" != "x" +%global beta_rel %global beta_dot .%{beta_rel} %else %global norm_rel 1 diff -Nru lxc-1.1.0~rc4/src/lxc/version.h lxc-1.1.0/src/lxc/version.h --- lxc-1.1.0~rc4/src/lxc/version.h 2015-01-29 23:01:07.000000000 +0000 +++ lxc-1.1.0/src/lxc/version.h 2015-01-30 13:13:47.000000000 +0000 @@ -26,6 +26,6 @@ #define LXC_VERSION_MAJOR 1 #define LXC_VERSION_MINOR 1 #define LXC_VERSION_MICRO 0 -#define LXC_VERSION "1.1.0.rc4" +#define LXC_VERSION "1.1.0" #endif diff -Nru lxc-1.1.0~rc4/templates/lxc-centos.in lxc-1.1.0/templates/lxc-centos.in --- lxc-1.1.0~rc4/templates/lxc-centos.in 2015-01-29 22:58:23.000000000 +0000 +++ lxc-1.1.0/templates/lxc-centos.in 2015-01-30 13:12:41.000000000 +0000 @@ -270,7 +270,6 @@ # set minimal fstab cat < $rootfs_path/etc/fstab /dev/root / rootfs defaults 0 0 -none /dev/shm tmpfs nosuid,nodev 0 0 EOF # create lxc compatibility init script @@ -280,14 +279,19 @@ env container pre-start script - if [ "x$container" != "xlxc" -a "x$container" != "xlibvirt" ]; then + if [ "x\$container" != "xlxc" -a "x\$container" != "xlibvirt" ]; then stop; fi - initctl start tty TTY=console + rm -f /var/lock/subsys/* rm -f /var/run/*.pid + [ -e /etc/mtab ] || ln -s /proc/mounts /etc/mtab + mkdir -p /dev/shm + mount -t tmpfs -o nosuid,nodev tmpfs /dev/shm + + initctl start tty TTY=console telinit 3 - exit 0; + exit 0 end script EOF elif [ "$release" = "5" ]; then diff -Nru lxc-1.1.0~rc4/templates/lxc-oracle.in lxc-1.1.0/templates/lxc-oracle.in --- lxc-1.1.0~rc4/templates/lxc-oracle.in 2015-01-29 22:58:23.000000000 +0000 +++ lxc-1.1.0/templates/lxc-oracle.in 2015-01-30 13:12:41.000000000 +0000 @@ -297,13 +297,13 @@ if [ $container_release_major = "4" -o $container_release_major = "5" ]; then grep -q "mount -t tmpfs tmpfs /dev/shm" $container_rootfs/etc/rc.sysinit if [ $? -eq 1 ]; then - echo "mount -t tmpfs tmpfs /dev/shm" >>$container_rootfs/etc/rc.sysinit - echo "mount -t tmpfs tmpfs /dev/shm" >>$container_rootfs/etc/rc.d/rc.sysinit + echo "mkdir -p /dev/shm && mount -t tmpfs tmpfs /dev/shm" >>$container_rootfs/etc/rc.sysinit + echo "mkdir -p /dev/shm && mount -t tmpfs tmpfs /dev/shm" >>$container_rootfs/etc/rc.d/rc.sysinit fi fi if [ $container_release_major = "6" ]; then - sed -i 's|mount -n -o remount /dev/shm >/dev/null 2>&1$|mount -t tmpfs tmpfs /dev/shm # LXC|' $container_rootfs/etc/rc.sysinit - sed -i 's|mount -n -o remount /dev/shm >/dev/null 2>&1$|mount -t tmpfs tmpfs /dev/shm # LXC|' $container_rootfs/etc/rc.d/rc.sysinit + sed -i 's|mount -n -o remount /dev/shm >/dev/null 2>&1$|mkdir -p /dev/shm && mount -t tmpfs tmpfs /dev/shm # LXC|' $container_rootfs/etc/rc.sysinit + sed -i 's|mount -n -o remount /dev/shm >/dev/null 2>&1$|mkdir -p /dev/shm && mount -t tmpfs tmpfs /dev/shm # LXC|' $container_rootfs/etc/rc.d/rc.sysinit fi # there might be other services that are useless but the below set is a good start diff -Nru lxc-1.1.0~rc4/templates/lxc-ubuntu-cloud.in lxc-1.1.0/templates/lxc-ubuntu-cloud.in --- lxc-1.1.0~rc4/templates/lxc-ubuntu-cloud.in 2015-01-29 22:58:23.000000000 +0000 +++ lxc-1.1.0/templates/lxc-ubuntu-cloud.in 2015-01-30 13:12:41.000000000 +0000 @@ -25,7 +25,7 @@ HOOK_DIR="@LXCHOOKDIR@" CLONE_HOOK_FN="$HOOK_DIR/ubuntu-cloud-prep" LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@" -KNOWN_RELEASES="lucid precise quantal saucy trusty" +KNOWN_RELEASES="precise trusty utopic vivid" skip_arch_check=${UCTEMPLATE_SKIP_ARCH_CHECK:-0} # Make sure the usual locations are in PATH diff -Nru lxc-1.1.0~rc4/templates/lxc-ubuntu.in lxc-1.1.0/templates/lxc-ubuntu.in --- lxc-1.1.0~rc4/templates/lxc-ubuntu.in 2015-01-29 22:58:23.000000000 +0000 +++ lxc-1.1.0/templates/lxc-ubuntu.in 2015-01-30 13:12:41.000000000 +0000 @@ -536,28 +536,6 @@ EOF chmod +x $rootfs/usr/sbin/policy-rc.d - if [ ! -f $rootfs/etc/init/container-detect.conf ]; then - # Make sure we have a working resolv.conf - cresolvonf="${rootfs}/etc/resolv.conf" - mv $cresolvonf ${cresolvonf}.lxcbak - cat /etc/resolv.conf > ${cresolvonf} - - # for lucid, if not trimming, then add the ubuntu-virt - # ppa and install lxcguest - if [ $release = "lucid" ]; then - chroot $rootfs apt-get update - install_packages $rootfs "python-software-properties" - chroot $rootfs add-apt-repository ppa:ubuntu-virt/ppa - fi - - chroot $rootfs apt-get update - chroot $rootfs apt-get install --force-yes -y lxcguest - - # Restore old resolv.conf - rm -f ${cresolvonf} - mv ${cresolvonf}.lxcbak ${cresolvonf} - fi - # If the container isn't running a native architecture, setup multiarch if [ -x "$(ls -1 ${rootfs}/usr/bin/qemu-*-static 2>/dev/null)" ]; then dpkg_version=$(chroot $rootfs dpkg-query -W -f='${Version}' dpkg)