Complete use of autoconf prefix in lxc-debian

From: Matt Helsley <matthltc@us.ibm.com>

The lxc-debian script does not consistently address the lxc lock as
@LOCALSTATEDIR@/lock/subsys/lxc. Make consistent use of the autotools
substitution to completely enable configure --prefixes.

I also added a comment explaining why some of the paths didn't need
autoconf substitutions for anyone who wants to understand the script.
Also, to separate it from the container contents proper, I moved the
CACHE variable initialization above the container-internal path
variables.

Signed-off-by: Matt Helsley <matthltc@us.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/scripts/lxc-debian.in b/scripts/lxc-debian.in
index fa244ad0f3c02b44d85f094facee1aee3728c218..2942edd8ccc050d43535224d1f2cf66f465b025f 100755 (executable)
--- a/scripts/lxc-debian.in
+++ b/scripts/lxc-debian.in
@@ -1,18 +1,21 @@
 #!/bin/bash
 # set -ex
 
+CACHE="@LOCALSTATEDIR@/cache/lxc/debian"
+
 NAME="debian"
 CONFFILE="lxc.conf"
 MNTFILE="mount.conf"
 UTSNAME=
 IPV4="172.20.0.21"
 GATEWAY="172.20.0.1"
+
+# These paths are within the container so do not need to obey configure prefixes
 INTERFACES="/etc/network/interfaces"
 INITTAB="/etc/inittab"
 HOSTNAME="/etc/hostname"
 FSTAB="/etc/fstab"
 SSHD_CONFIG="/etc/ssh/sshd_config"
-CACHE="@LOCALSTATEDIR@/cache/lxc/debian"
 
 ################################################################################
 #                    debian custom configuration files
@@ -186,9 +189,11 @@ create() {
 
     # check if the rootfs does already exist
     if [ ! -e "$ROOTFS" ]; then
+           mkdir -p @LOCALSTATEDIR@/lock/subsys/
        (
            flock -n -x 200 
 
+
            RES=$?
            if [ "$RES" != "0" ]; then
                echo "Cache repository is busy."
@@ -228,7 +233,7 @@ create() {
             # make a local copy of the minidebian
            echo -n "Copying rootfs ..."
            cp -a $CACHE/rootfs-$ARCH $ROOTFS && echo "Done." || exit
-       ) 200>/var/lock/subsys/lxc
+       ) 200> "@LOCALSTATEDIR@/lock/subsys/lxc"
     fi
 
 write_lxc_mounts
@@ -340,7 +345,7 @@ purge() {
        rm --preserve-root --one-file-system -rf $CACHE && echo "Done." || exit 1
        exit 0
 
-    ) 200>/var/lock/subsys/lxc
+    ) 200> "@LOCALSTATEDIR@/lock/subsys/lxc"
 }
 
 if [ "$(id -u)" != "0" ]; then