]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
plamo: Update because rc script of plamo was updated
authorKATOH Yasufumi <karma@jazz.email.ne.jp>
Wed, 11 Dec 2013 07:19:23 +0000 (16:19 +0900)
committerStéphane Graber <stgraber@ubuntu.com>
Wed, 11 Dec 2013 15:20:40 +0000 (10:20 -0500)
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>
templates/lxc-plamo.in

index bc4f80bca64a45ed610f7f3d7cdf676284115564..bcf226c36af0836553873306a5f543227436919f 100644 (file)
@@ -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