From eab65b766f170ff777186657cab4554d778b05b5 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 18 Feb 2013 02:53:13 +0100 Subject: [PATCH] setup: break up lines for status output --- .gitignore | 1 + src/setup/setup.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 5b58623..9075c11 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gummiboot.so /gummibootia32.efi /gummibootx64.efi +/test-disk diff --git a/src/setup/setup.c b/src/setup/setup.c index 8b7a781..7320459 100644 --- a/src/setup/setup.c +++ b/src/setup/setup.c @@ -439,15 +439,14 @@ static int print_efi_option(uint16_t id, bool in_order) { goto finish; } - if (path) - printf("\t%s (%s on /dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x)", - strna(title), path, - partition[0], partition[1], partition[2], partition[3], partition[4], partition[5], partition[6], partition[7], - partition[8], partition[9], partition[10], partition[11], partition[12], partition[13], partition[14], partition[15]); - else - printf("\t%s", strna(title)); + printf("\t%s%s\n", strna(title), in_order ? " [ENABLED]" : ""); + if (path) { + printf("\t\t%s\n", path); + printf("\t\t/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n", + partition[0], partition[1], partition[2], partition[3], partition[4], partition[5], partition[6], partition[7], + partition[8], partition[9], partition[10], partition[11], partition[12], partition[13], partition[14], partition[15]); + } - printf("\n"); finish: free(title); free(path); -- 2.7.4