From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 16 Nov 2022 11:27:30 +0000 (+0100)
Subject: Merge pull request #24555 from medhefgo/bootctl
X-Git-Tag: v253-rc1~518
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8d6b1608e9dd554d499eab0e6527d1f6177a85e;p=thirdparty%2Fsystemd.git

Merge pull request #24555 from medhefgo/bootctl

bootctl: Small improvements
---

b8d6b1608e9dd554d499eab0e6527d1f6177a85e
diff --cc src/shared/bootspec.c
index 0afc41d200b,40dc88f8dcc..ff5cd9bc1fb
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@@ -1260,9 -1282,13 +1266,13 @@@ static void boot_entry_file_list
          assert(p);
          assert(ret_status);
  
 -        int status = chase_symlinks_and_access(p, root, CHASE_PREFIX_ROOT, F_OK, NULL, NULL);
 +        int status = chase_symlinks_and_access(p, root, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, F_OK, NULL, NULL);
  
-         printf("%13s%s ", strempty(field), field ? ":" : " ");
+         /* Note that this shows two '/' between the root and the file. This is intentional to highlight (in
+          * the abscence of color support) to the user that the boot loader is only interested in the second
+          * part of the file. */
+         printf("%13s%s %s%s/%s", strempty(field), field ? ":" : " ", ansi_grey(), root, ansi_normal());
+ 
          if (status < 0) {
                  errno = -status;
                  printf("%s%s%s (%m)\n", ansi_highlight_red(), p, ansi_normal());