From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Wed, 11 Dec 2013 07:19:23 +0000 (+0900)
Subject: plamo: Update because rc script of plamo was updated
X-Git-Tag: lxc-1.0.0.beta1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dc296145715c36795ad0ad561f115afdd758223;p=thirdparty%2Flxc.git

plamo: Update because rc script of plamo was updated

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

diff --git a/templates/lxc-plamo.in b/templates/lxc-plamo.in
index bc4f80bca..bcf226c36 100644
--- a/templates/lxc-plamo.in
+++ b/templates/lxc-plamo.in
@@ -195,7 +195,7 @@ configure_plamo() {
   # disable pam_loginuid.so in /etc/pam.d/login (for libvirt's lxc driver)
   sed -i '/pam_loginuid/s/^/#/' $rootfs/etc/pam.d/login
   # glibc configure
-  cp $rootfs/etc/ld.so.conf.new $rootfs/etc/ld.so.conf
+  mv $rootfs/etc/ld.so.conf{.new,}
   chroot $rootfs ldconfig
   # root password
   echo "Setting root password to 'root'..."
@@ -211,7 +211,7 @@ configure_plamo() {
 	EOF
   # /etc/rc.d/rc.M
   ed - $rootfs/etc/rc.d/rc.M <<- "EOF"
-	247,248d
+	259,260d
 	56,79d
 	31,38d
 	w