From: TAMUKI Shoichi <tamuki@linet.gr.jp>
Date: Tue, 19 Aug 2014 00:29:49 +0000 (+0900)
Subject: Update plamo template
X-Git-Tag: lxc-1.1.0.alpha2~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea00a202cde59a23daba00b64ec92fb9a748327a;p=thirdparty%2Flxc.git

Update plamo template

- If "installpkg" command does not exist, lxc-plamo temporarily
  install the command with static linked tar command into the lxc
  cache directory.  The tar command does not refer to passwd/group
  files, which means that only a few files/directories are extracted
  with wrong user/group ownership.  To avoid this, the installpkg
  command now uses the standard tar command in the system.
- Change mode to 666 for $rootfs/dev/null to allow write access for
  all users.
- Small fix in usage message.

Signed-off-by: TAMUKI Shoichi <tamuki@linet.gr.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
---

diff --git a/templates/lxc-plamo.in b/templates/lxc-plamo.in
index 24ecb7e6f..82a9e7839 100644
--- a/templates/lxc-plamo.in
+++ b/templates/lxc-plamo.in
@@ -128,6 +128,7 @@ install_plamo() {
       echo "Installing 'installpkg' command into $dlcache/sbin..."
       ( cd $dlcache ; tar xpJf hdsetup-*.txz ; rm -rf tmp usr var )
       sed -i "/ldconfig/!s@/sbin@$dlcache&@g" $dlcache/sbin/installpkg*
+      sed -i "/^TAR=/s@tar@`which tar`@g" $dlcache/sbin/installpkg2
       PATH=$dlcache/sbin:$PATH
     fi
     echo "Installing packages to $rtcache..."
@@ -148,6 +149,7 @@ install_plamo() {
 
 configure_plamo() {
   # create /dev
+  chmod    666 $rootfs/dev/null
   mknod -m 666 $rootfs/dev/zero c 1 5
   chmod    666 $rootfs/dev/random
   mknod -m 666 $rootfs/dev/urandom c 1 9
@@ -303,7 +305,7 @@ cleanup() {
 usage() {
   cat <<- EOF
 	$prog [-h|--help] -p|--path=<path> -n|--name=<name> --rootfs=<rootfs>
-	          [--clean] [-r|--release=<release>] [-a|--arch=<arch>]
+	          [-c|--clean] [-r|--release=<release>] [-a|--arch=<arch>]
 	          [-b|--bindhome=<user>]
 	release: $release
 	arch: x86 or x86_64: defaults to host arch