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>

Complete use of autoconf prefix in lxc-debian
dc21287c · dlezcano · 79cf945c · dc21287c
Commit dc21287c authored Jan 29, 2009 by dlezcano
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

lxc-debian.in scripts/lxc-debian.in +8 -3

No files found.
--- a/scripts/lxc-debian.in
+++ b/scripts/lxc-debian.in
 #!/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