Re: [PATCH 07/12] tools/pygrub: store kernels in /var/run/xen/pygrub

[Andrew Cooper <andrew.cooper3@citrix.com>]

On 24/04/14 09:36, Olaf Hering wrote:
> Move location of temporary bootfiles from /var/run/xend/boot to
> /var/run/xen/pygrub. Create the subdirectory if does not exist, unless
> --output-directory=<dir> was specified.
>
> The reason for this change is that all entrys below /var/run have to be
> created at runtime in case /var/run is cleared on every boot.
>
> v3:
>  use /var/run/xen/pygrub instead of /var/run/pygrub
> v2:
>  update exception handling for python 2.4
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> ---
>  tools/pygrub/src/pygrub | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
> index 54fecee..7759b1a 100644
> --- a/tools/pygrub/src/pygrub
> +++ b/tools/pygrub/src/pygrub
> @@ -14,6 +14,7 @@
>  #
>  
>  import os, sys, string, struct, tempfile, re, traceback
> +import errno
>  import copy
>  import logging
>  import platform
> @@ -757,7 +758,7 @@ if __name__ == "__main__":
>      debug = False
>      not_really = False
>      output_format = "sxp"
> -    output_directory = "/var/run/xend/boot"
> +    output_directory = None
>  
>      # what was passed in
>      incfg = { "kernel": None, "ramdisk": None, "args": "" }
> @@ -813,6 +814,16 @@ if __name__ == "__main__":
>      if debug:
>  	logging.basicConfig(level=logging.DEBUG)
>  
> +    if output_directory is None:
> +        output_directory = "/var/run/xen/pygrub"
> +        try:
> +            os.mkdir(output_directory, 0700)
> +        except OSError, exc:
> +            if exc.errno == errno.EEXIST and os.path.isdir(output_directory):
> +                pass
> +            else:
> +                raise

if not (exc.errno == errno.EEXIST and os.path.isdir(output_directory)):
    raise

There is no need for the pass statement.

~Andrew