From 739e602794b9683d7a0db89342dc9d111cb8400d Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Fri, 30 Aug 2013 18:08:51 -0300 Subject: [PATCH] %s/@LOCALSTATEDIR@/\/var/g --- boxes/templates/ubuntu | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/boxes/templates/ubuntu b/boxes/templates/ubuntu index 4245fb9..e962166 100755 --- a/boxes/templates/ubuntu +++ b/boxes/templates/ubuntu @@ -92,7 +92,7 @@ EOF fi # generate new SSH keys - if [ -x $rootfs@LOCALSTATEDIR@/lib/dpkg/info/openssh-server.postinst ]; then + if [ -x $rootfs/var/lib/dpkg/info/openssh-server.postinst ]; then cat > $rootfs/usr/sbin/policy-rc.d << EOF #!/bin/sh exit 101 @@ -101,7 +101,7 @@ EOF rm -f $rootfs/etc/ssh/ssh_host_*key* mv $rootfs/etc/init/ssh.conf $rootfs/etc/init/ssh.conf.disabled - DPKG_MAINTSCRIPT_PACKAGE=openssh DPKG_MAINTSCRIPT_NAME=postinst chroot $rootfs @LOCALSTATEDIR@/lib/dpkg/info/openssh-server.postinst configure + DPKG_MAINTSCRIPT_PACKAGE=openssh DPKG_MAINTSCRIPT_NAME=postinst chroot $rootfs /var/lib/dpkg/info/openssh-server.postinst configure mv $rootfs/etc/init/ssh.conf.disabled $rootfs/etc/init/ssh.conf rm -f $rootfs/usr/sbin/policy-rc.d @@ -313,8 +313,8 @@ install_ubuntu() rootfs=$1 release=$2 flushcache=$3 - cache="@LOCALSTATEDIR@/cache/lxc/$release" - mkdir -p @LOCALSTATEDIR@/lock/subsys/ + cache="/var/cache/lxc/$release" + mkdir -p /var/lock/subsys/ ( flock -x 200 @@ -348,7 +348,7 @@ install_ubuntu() return 0 - ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-ubuntu + ) 200>/var/lock/subsys/lxc-ubuntu return $? }