added stop-hook entries

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 5a3209a435ad4f6981d12e954ca2c49a97a22331..0e3421b027928cd17eed958befa2831f4bedf119 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -163,7 +163,7 @@ return -1;
 #endif
 
 char *lxchook_names[NUM_LXC_HOOKS] = {
-       "pre-start", "pre-mount", "mount", "autodev", "start", "post-stop", "clone", "destroy" };
+       "pre-start", "pre-mount", "mount", "autodev", "start", "stop", "post-stop", "clone", "destroy" };
 
 typedef int (*instantiate_cb)(struct lxc_handler *, struct lxc_netdev *);
 
@@ -4024,6 +4024,8 @@ int run_lxc_hooks(const char *name, char *hook, struct lxc_conf *conf,
                which = LXCHOOK_AUTODEV;
        else if (strcmp(hook, "start") == 0)
                which = LXCHOOK_START;
+       else if (strcmp(hook, "stop") == 0)
+               which = LXCHOOK_STOP;
        else if (strcmp(hook, "post-stop") == 0)
                which = LXCHOOK_POSTSTOP;
        else if (strcmp(hook, "clone") == 0)

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 5aebd9167957639293204996b943eaedba9fe364..1374d4a79be331bd8ee13a0701bed6fcfc2c2b0d 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -279,7 +279,7 @@ enum {
  */
 enum lxchooks {
        LXCHOOK_PRESTART, LXCHOOK_PREMOUNT, LXCHOOK_MOUNT, LXCHOOK_AUTODEV,
-       LXCHOOK_START, LXCHOOK_POSTSTOP, LXCHOOK_CLONE, LXCHOOK_DESTROY,
+       LXCHOOK_START, LXCHOOK_STOP, LXCHOOK_POSTSTOP, LXCHOOK_CLONE, LXCHOOK_DESTROY,
        NUM_LXC_HOOKS};
 extern char *lxchook_names[NUM_LXC_HOOKS];
 

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 670d95740077af0f1fbed21d86167a4b96825624..f7d68140025b72ebfda048a9974a8d84f90991b8 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -137,6 +137,7 @@ static struct lxc_config_t config[] = {
        { "lxc.hook.mount",           config_hook                 },
        { "lxc.hook.autodev",         config_hook                 },
        { "lxc.hook.start",           config_hook                 },
+       { "lxc.hook.stop",            config_hook                 },
        { "lxc.hook.post-stop",       config_hook                 },
        { "lxc.hook.clone",           config_hook                 },
        { "lxc.hook.destroy",         config_hook                 },
@@ -1085,6 +1086,8 @@ static int config_hook(const char *key, const char *value,
                return add_hook(lxc_conf, LXCHOOK_MOUNT, copy);
        else if (strcmp(key, "lxc.hook.start") == 0)
                return add_hook(lxc_conf, LXCHOOK_START, copy);
+       else if (strcmp(key, "lxc.hook.stop") == 0)
+               return add_hook(lxc_conf, LXCHOOK_STOP, copy);
        else if (strcmp(key, "lxc.hook.post-stop") == 0)
                return add_hook(lxc_conf, LXCHOOK_POSTSTOP, copy);
        else if (strcmp(key, "lxc.hook.clone") == 0)