From 9c6a7d37391beb4943abffe609f821e5710a0b3f Mon Sep 17 00:00:00 2001
From: Josep Puigdemont <josep.puigdemont@enea.com>
Date: Thu, 27 Feb 2014 12:33:06 +0100
Subject: Update Linux Containers to lxc-1.0.0

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 ...-chpasswd-functionality-for-busybox-hosts.patch | 70 ----------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 recipes-containers/lxc/files/lxc-0.9.0-enable-chroot-chpasswd-functionality-for-busybox-hosts.patch

(limited to 'recipes-containers/lxc/files/lxc-0.9.0-enable-chroot-chpasswd-functionality-for-busybox-hosts.patch')

diff --git a/recipes-containers/lxc/files/lxc-0.9.0-enable-chroot-chpasswd-functionality-for-busybox-hosts.patch b/recipes-containers/lxc/files/lxc-0.9.0-enable-chroot-chpasswd-functionality-for-busybox-hosts.patch
deleted file mode 100644
index d07c6580..00000000
--- a/recipes-containers/lxc/files/lxc-0.9.0-enable-chroot-chpasswd-functionality-for-busybox-hosts.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 4ddc14bd0866ff769421857044dd14867f1944d5 Mon Sep 17 00:00:00 2001
-From: Bogdan Purcareata <bogdan.purcareata@freescale.com>
-Date: Thu, 11 Apr 2013 16:15:43 +0300
-Subject: [PATCH v2] lxc-template: enable chroot + chpasswd functionality for
- Busybox hosts
-
-This patch supports the scenario where a user wants to install a
-busybox container on a busybox host.
-
-When running the template, in order to change the root password,
-the template needs to do the chroot. On busybox-powered hosts, chroot
-is not part of the coreutils package - it's part of busybox. And the
-busybox implementation or chroot only works if it has /lib in the new
-root populated with the right binaries (or at least that's the
-solution I found to make it work).
-
-The temporarily bind-mounts /lib in the NEWROOT, chroots there,
-changes the password, goes back and unmounts. This set of operations
-is contained in a new MOUNT namespace, using the lxc-unshare call.
-
-Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com>
----
- templates/lxc-busybox.in | 30 ++++++++++++++++++++++++++++--
- 1 file changed, 28 insertions(+), 2 deletions(-)
-
-diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
-index cb425ec..2ca2bfd 100644
---- a/templates/lxc-busybox.in
-+++ b/templates/lxc-busybox.in
-@@ -189,9 +189,35 @@ configure_busybox()
-     # passwd exec must be setuid
-     chmod +s $rootfs/bin/passwd
-     touch $rootfs/etc/shadow
--    echo "setting root passwd to root"
--    echo "root:root" | chroot $rootfs chpasswd
- 
-+    # setting passwd for root
-+    CHPASSWD_FILE=$rootfs/root/chpasswd.sh
-+
-+    cat <<EOF >$CHPASSWD_FILE
-+echo "setting root password to \"root\""
-+
-+mount --bind /lib $rootfs/lib
-+if [ \$? -ne 0 ]; then
-+    echo "Failed bind-mounting /lib at $rootfs/lib"
-+    exit 1
-+fi
-+
-+chroot $rootfs chpasswd <<EOFF 2>/dev/null
-+root:root
-+EOFF
-+
-+
-+if [ \$? -ne 0 ]; then
-+    echo "Failed to change root password"
-+    exit 1
-+fi
-+
-+umount $rootfs/lib
-+
-+EOF
-+
-+    lxc-unshare -s MOUNT -- /bin/sh < $CHPASSWD_FILE
-+    rm $CHPASSWD_FILE
- 
-     # add ssh functionality if dropbear package available on host
-     which dropbear >/dev/null 2>&1
--- 
-1.7.11.7
-
-- 
cgit v1.2.3-54-g00ecf