[PATCH 1/1] switch_root: Fix undefined fd and minor tweak

[Andrei Gherzan]

On Fri, Mar 24, 2017 at 3:56 PM, Andrei Gherzan <andrei at gherzan.com> wrote:
> Signed-off-by: Andrei Gherzan <andrei at gherzan.com>
> ---
>  util-linux/switch_root.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
> index aaee35a3e..cae61d5ac 100644
> --- a/util-linux/switch_root.c
> +++ b/util-linux/switch_root.c
> @@ -96,6 +96,7 @@ int switch_root_main(int argc UNUSED_PARAM, char **argv)
>         struct stat st;
>         struct statfs stfs;
>         dev_t rootdev;
> +       int fd;
>
>         // Parse args (-c console)
>         opt_complementary = "-2"; // minimum 2 params
> @@ -141,8 +142,7 @@ int switch_root_main(int argc UNUSED_PARAM, char **argv)
>
>         // If a new console specified, redirect stdin/stdout/stderr to it
>         if (console) {
> -               int fd = open_or_warn(console, O_RDWR);
> -               if (fd >= 0) {
> +               if ((fd = open_or_warn(console, O_RDWR)) >= 0) {
>                         xmove_fd(fd, 0);
>                         xdup2(0, 1);
>                         xdup2(0, 2);
> --
> 2.12.0
>

Friendly ping on this.