[systemd-devel] [PATCH] switch-root: do not use close old_root_fd after rm_rf_children()

[Harald Hoyer]

Ah.. forget that old patch... slipped in the patch mail queue

Am 12.07.2012 08:44, schrieb harald at redhat.com:
> From: Harald Hoyer <harald at redhat.com>
> 
> rm_rf_children() has already closed the fd with closedir().
> ---
>  src/core/switch-root.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/core/switch-root.c b/src/core/switch-root.c
> index ed0a31e..9832a52 100644
> --- a/src/core/switch-root.c
> +++ b/src/core/switch-root.c
> @@ -111,8 +111,10 @@ int switch_root(const char *new_root) {
>  
>                  if (fstat(old_root_fd, &rb) < 0)
>                          log_warning("Failed to stat old root directory, leaving: %m");
> -                else
> +                else {
>                          rm_rf_children(old_root_fd, false, false, &rb);
> +                        old_root_fd = -1;
> +                }
>          }
>  
>          r = 0;
>