Permalink
Browse files

templates: Consistent use of locking

Move to per-template lock (except for oracle that's per-container).
Also ensure that the path used for the lock is relative to LOCALSTATEDIR.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
  • Loading branch information...
1 parent 75350ec commit fe253caa8b98854445aaf6ee253545ee1f13beb1 @stgraber stgraber committed Dec 5, 2012
@@ -228,7 +228,7 @@ install_altlinux()
return 1
fi
return 0
- ) 200>@LOCALSTATEDIR@/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-altlinux
return $?
}
@@ -325,7 +325,7 @@ clean()
echo -n "Purging the download cache for ALTLinux-$release..."
rm --preserve-root --one-file-system -rf $cache && echo "Done." || exit 1
exit 0
- ) 200>@LOCALSTATEDIR@/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-altlinux
}
usage()
View
@@ -191,7 +191,7 @@ install_debian()
return 0
- ) 200>@LOCALSTATEDIR@/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-debian
return $?
}
@@ -261,7 +261,7 @@ clean()
rm --preserve-root --one-file-system -rf $cache && echo "Done." || exit 1
exit 0
- ) 200>@LOCALSTATEDIR@/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-debian
}
usage()
View
@@ -233,7 +233,7 @@ install_fedora()
fi
return 0
- ) 200>@LOCALSTATEDIR@/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-fedora
return $?
}
@@ -301,7 +301,7 @@ clean()
echo -n "Purging the download cache for Fedora-$release..."
rm --preserve-root --one-file-system -rf $cache && echo "Done." || exit 1
exit 0
- ) 200>@LOCALSTATEDIR@/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-fedora
}
usage()
View
@@ -166,7 +166,7 @@ install_debian()
return 1
fi
return 0
- ) 200>@LOCALSTATEDIR@/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-lenny
return $?
}
@@ -234,7 +234,7 @@ clean()
echo -n "Purging the download cache..."
rm --preserve-root --one-file-system -rf $cache && echo "Done." || exit 1
exit 0
- ) 200>@LOCALSTATEDIR@/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-lenny
}
usage()
@@ -242,7 +242,7 @@ install_opensuse()
fi
return 0
- ) 200>@LOCALSTATEDIR@/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-opensuse
return $?
}
@@ -314,7 +314,7 @@ clean()
echo -n "Purging the download cache..."
rm --preserve-root --one-file-system -rf $cache && echo "Done." || exit 1
exit 0
- ) 200>@LOCALSTATEDIR@/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-opensuse
}
usage()
View
@@ -337,7 +337,7 @@ container_rootfs_create()
fi
done
- mkdir -p /var/lock/subsys/
+ mkdir -p @LOCALSTATEDIR@/lock/subsys/lxc
(
flock -x 200
if [ $? -ne 0 ]; then
@@ -433,7 +433,7 @@ container_rootfs_create()
echo "Rebuilding rpm database"
rm -f $container_rootfs/var/lib/rpm/__db*
chroot $container_rootfs rpm --rebuilddb >/dev/null 2>&1
- ) 200>/var/lock/subsys/lxc-oracle-$name
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-oracle-$name
}
usage()
@@ -395,7 +395,7 @@ EOF
echo "If you do not have a meta-data service, this container will likely be useless."
fi
-) 200>@LOCALSTATEDIR@/lock/subsys/lxc-ubucloud
+) 200>@LOCALSTATEDIR@/lock/subsys/lxc-ubuntu-cloud
copy_configuration $path $rootfs $name $arch $release
View
@@ -259,7 +259,7 @@ install_ubuntu()
release=$2
flushcache=$3
cache="@LOCALSTATEDIR@/cache/lxc/$release"
- mkdir -p /var/lock/subsys/
+ mkdir -p @LOCALSTATEDIR@/lock/subsys/
(
flock -x 200
@@ -293,7 +293,7 @@ install_ubuntu()
return 0
- ) 200>/var/lock/subsys/lxc
+ ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-ubuntu
return $?
}

0 comments on commit fe253ca

Please sign in to comment.