0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch 4.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102
  1. From 301445311b5161c61270163c8921b729ab9e10d8 Mon Sep 17 00:00:00 2001
  2. From: Luke Shumaker <lukeshu@parabola.nu>
  3. Date: Wed, 25 May 2016 12:23:40 -0400
  4. Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
  5. instead of "Linux"
  6. ---
  7. man/kernel-install.xml | 2 +-
  8. man/os-release.xml | 2 +-
  9. src/analyze/analyze.c | 2 +-
  10. src/core/main.c | 4 ++--
  11. src/firstboot/firstboot.c | 2 +-
  12. src/kernel-install/90-loaderentry.install | 2 +-
  13. 6 files changed, 7 insertions(+), 7 deletions(-)
  14. diff --git a/man/kernel-install.xml b/man/kernel-install.xml
  15. index cd9756662a..9ead6ea39b 100644
  16. --- a/man/kernel-install.xml
  17. +++ b/man/kernel-install.xml
  18. @@ -88,7 +88,7 @@
  19. <replaceable>PRETTY_NAME</replaceable> parameter specified
  20. in <filename>/etc/os-release</filename> or
  21. <filename>/usr/lib/os-release</filename> (if the former is
  22. - missing), or "Linux
  23. + missing), or "GNU/Linux
  24. <replaceable>KERNEL-VERSION</replaceable>", if unset. If
  25. the file <filename>initrd</filename> is found next to the
  26. <filename>linux</filename> file, the initrd will be added to
  27. diff --git a/man/os-release.xml b/man/os-release.xml
  28. index a51edf3b8a..9ff4b7e8c2 100644
  29. --- a/man/os-release.xml
  30. +++ b/man/os-release.xml
  31. @@ -187,7 +187,7 @@
  32. suitable for presentation to the user. May or may not contain
  33. a release code name or OS version of some kind, as suitable.
  34. If not set, defaults to
  35. - <literal>PRETTY_NAME="Linux"</literal>. Example:
  36. + <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:
  37. <literal>PRETTY_NAME="Fedora 17 (Beefy
  38. Miracle)"</literal>.</para></listitem>
  39. </varlistentry>
  40. diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
  41. index de0fe6eba8..9f239c8eeb 100644
  42. --- a/src/analyze/analyze.c
  43. +++ b/src/analyze/analyze.c
  44. @@ -712,7 +712,7 @@ static int analyze_plot(int argc, char *argv[], void *userdata) {
  45. svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
  46. if (use_full_bus)
  47. svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",
  48. - isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name,
  49. + isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name,
  50. strempty(host->hostname),
  51. strempty(host->kernel_name),
  52. strempty(host->kernel_release),
  53. diff --git a/src/core/main.c b/src/core/main.c
  54. index 44dd8348be..9a4fc26425 100644
  55. --- a/src/core/main.c
  56. +++ b/src/core/main.c
  57. @@ -1234,11 +1234,11 @@ static int status_welcome(void) {
  58. return status_printf(NULL, false, false,
  59. "\nWelcome to \x1B[%sm%s\x1B[0m!\n",
  60. isempty(ansi_color) ? "1" : ansi_color,
  61. - isempty(pretty_name) ? "Linux" : pretty_name);
  62. + isempty(pretty_name) ? "GNU/Linux" : pretty_name);
  63. else
  64. return status_printf(NULL, false, false,
  65. "\nWelcome to %s!\n",
  66. - isempty(pretty_name) ? "Linux" : pretty_name);
  67. + isempty(pretty_name) ? "GNU/Linux" : pretty_name);
  68. }
  69. static int write_container_id(void) {
  70. diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
  71. index a98e53b3a3..41b212e32d 100644
  72. --- a/src/firstboot/firstboot.c
  73. +++ b/src/firstboot/firstboot.c
  74. @@ -87,7 +87,7 @@ static void print_welcome(void) {
  75. "Failed to read os-release file, ignoring: %m");
  76. printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",
  77. - isempty(pretty_name) ? "Linux" : pretty_name);
  78. + isempty(pretty_name) ? "GNU/Linux" : pretty_name);
  79. press_any_key();
  80. diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
  81. index a271cdb8a0..29047ccbff 100644
  82. --- a/src/kernel-install/90-loaderentry.install
  83. +++ b/src/kernel-install/90-loaderentry.install
  84. @@ -40,7 +40,7 @@ elif [[ -f /usr/lib/os-release ]]; then
  85. fi
  86. if ! [[ $PRETTY_NAME ]]; then
  87. - PRETTY_NAME="Linux $KERNEL_VERSION"
  88. + PRETTY_NAME="GNU/Linux $KERNEL_VERSION"
  89. fi
  90. declare -a BOOT_OPTIONS
  91. --
  92. 2.18.0