summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-10-31 13:09:03 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-10-31 13:46:36 +0000
commit6cb9cce938f32cd37db9b4f9eb28697a34ddacf4 (patch)
tree357cbe679d8fe651cccb21e3ee9ef23b3d458640
parentUpdating boot menu texts. (diff)
downloadsystem-images-6cb9cce938f32cd37db9b4f9eb28697a34ddacf4.tar.xz
system-images-6cb9cce938f32cd37db9b4f9eb28697a34ddacf4.zip
Updating install and live boot menu entries.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rw-r--r--images/base-system/config/bootloaders/extlinux/install.cfg12
-rw-r--r--images/base-system/config/bootloaders/extlinux/live.cfg.in2
-rw-r--r--images/base-system/config/bootloaders/isolinux/install.cfg12
-rw-r--r--images/base-system/config/bootloaders/isolinux/live.cfg.in2
-rw-r--r--images/base-system/config/bootloaders/pxelinux/install.cfg12
-rw-r--r--images/base-system/config/bootloaders/pxelinux/live.cfg.in2
-rw-r--r--images/base-system/config/bootloaders/syslinux/install.cfg12
-rw-r--r--images/base-system/config/bootloaders/syslinux/live.cfg.in2
-rw-r--r--images/container-server/config/bootloaders/extlinux/install.cfg12
-rw-r--r--images/container-server/config/bootloaders/extlinux/live.cfg.in2
-rw-r--r--images/container-server/config/bootloaders/isolinux/install.cfg12
-rw-r--r--images/container-server/config/bootloaders/isolinux/live.cfg.in2
-rw-r--r--images/container-server/config/bootloaders/pxelinux/install.cfg12
-rw-r--r--images/container-server/config/bootloaders/pxelinux/live.cfg.in2
-rw-r--r--images/container-server/config/bootloaders/syslinux/install.cfg12
-rw-r--r--images/container-server/config/bootloaders/syslinux/live.cfg.in2
-rw-r--r--images/gnome-desktop/config/bootloaders/extlinux/install.cfg12
-rw-r--r--images/gnome-desktop/config/bootloaders/extlinux/live.cfg.in2
-rw-r--r--images/gnome-desktop/config/bootloaders/isolinux/install.cfg12
-rw-r--r--images/gnome-desktop/config/bootloaders/isolinux/live.cfg.in2
-rw-r--r--images/gnome-desktop/config/bootloaders/pxelinux/install.cfg12
-rw-r--r--images/gnome-desktop/config/bootloaders/pxelinux/live.cfg.in2
-rw-r--r--images/gnome-desktop/config/bootloaders/syslinux/install.cfg12
-rw-r--r--images/gnome-desktop/config/bootloaders/syslinux/live.cfg.in2
24 files changed, 84 insertions, 84 deletions
diff --git a/images/base-system/config/bootloaders/extlinux/install.cfg b/images/base-system/config/bootloaders/extlinux/install.cfg
index ba09752..30685cf 100644
--- a/images/base-system/config/bootloaders/extlinux/install.cfg
+++ b/images/base-system/config/bootloaders/extlinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/base-system/config/bootloaders/extlinux/live.cfg.in b/images/base-system/config/bootloaders/extlinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/base-system/config/bootloaders/extlinux/live.cfg.in
+++ b/images/base-system/config/bootloaders/extlinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/base-system/config/bootloaders/isolinux/install.cfg b/images/base-system/config/bootloaders/isolinux/install.cfg
index ba09752..30685cf 100644
--- a/images/base-system/config/bootloaders/isolinux/install.cfg
+++ b/images/base-system/config/bootloaders/isolinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/base-system/config/bootloaders/isolinux/live.cfg.in b/images/base-system/config/bootloaders/isolinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/base-system/config/bootloaders/isolinux/live.cfg.in
+++ b/images/base-system/config/bootloaders/isolinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/base-system/config/bootloaders/pxelinux/install.cfg b/images/base-system/config/bootloaders/pxelinux/install.cfg
index ba09752..30685cf 100644
--- a/images/base-system/config/bootloaders/pxelinux/install.cfg
+++ b/images/base-system/config/bootloaders/pxelinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/base-system/config/bootloaders/pxelinux/live.cfg.in b/images/base-system/config/bootloaders/pxelinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/base-system/config/bootloaders/pxelinux/live.cfg.in
+++ b/images/base-system/config/bootloaders/pxelinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/base-system/config/bootloaders/syslinux/install.cfg b/images/base-system/config/bootloaders/syslinux/install.cfg
index ba09752..30685cf 100644
--- a/images/base-system/config/bootloaders/syslinux/install.cfg
+++ b/images/base-system/config/bootloaders/syslinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/base-system/config/bootloaders/syslinux/live.cfg.in b/images/base-system/config/bootloaders/syslinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/base-system/config/bootloaders/syslinux/live.cfg.in
+++ b/images/base-system/config/bootloaders/syslinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/container-server/config/bootloaders/extlinux/install.cfg b/images/container-server/config/bootloaders/extlinux/install.cfg
index ba09752..30685cf 100644
--- a/images/container-server/config/bootloaders/extlinux/install.cfg
+++ b/images/container-server/config/bootloaders/extlinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/container-server/config/bootloaders/extlinux/live.cfg.in b/images/container-server/config/bootloaders/extlinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/container-server/config/bootloaders/extlinux/live.cfg.in
+++ b/images/container-server/config/bootloaders/extlinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/container-server/config/bootloaders/isolinux/install.cfg b/images/container-server/config/bootloaders/isolinux/install.cfg
index ba09752..30685cf 100644
--- a/images/container-server/config/bootloaders/isolinux/install.cfg
+++ b/images/container-server/config/bootloaders/isolinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/container-server/config/bootloaders/isolinux/live.cfg.in b/images/container-server/config/bootloaders/isolinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/container-server/config/bootloaders/isolinux/live.cfg.in
+++ b/images/container-server/config/bootloaders/isolinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/container-server/config/bootloaders/pxelinux/install.cfg b/images/container-server/config/bootloaders/pxelinux/install.cfg
index ba09752..30685cf 100644
--- a/images/container-server/config/bootloaders/pxelinux/install.cfg
+++ b/images/container-server/config/bootloaders/pxelinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/container-server/config/bootloaders/pxelinux/live.cfg.in b/images/container-server/config/bootloaders/pxelinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/container-server/config/bootloaders/pxelinux/live.cfg.in
+++ b/images/container-server/config/bootloaders/pxelinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/container-server/config/bootloaders/syslinux/install.cfg b/images/container-server/config/bootloaders/syslinux/install.cfg
index ba09752..30685cf 100644
--- a/images/container-server/config/bootloaders/syslinux/install.cfg
+++ b/images/container-server/config/bootloaders/syslinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/container-server/config/bootloaders/syslinux/live.cfg.in b/images/container-server/config/bootloaders/syslinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/container-server/config/bootloaders/syslinux/live.cfg.in
+++ b/images/container-server/config/bootloaders/syslinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/gnome-desktop/config/bootloaders/extlinux/install.cfg b/images/gnome-desktop/config/bootloaders/extlinux/install.cfg
index ba09752..30685cf 100644
--- a/images/gnome-desktop/config/bootloaders/extlinux/install.cfg
+++ b/images/gnome-desktop/config/bootloaders/extlinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/gnome-desktop/config/bootloaders/extlinux/live.cfg.in b/images/gnome-desktop/config/bootloaders/extlinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/gnome-desktop/config/bootloaders/extlinux/live.cfg.in
+++ b/images/gnome-desktop/config/bootloaders/extlinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/gnome-desktop/config/bootloaders/isolinux/install.cfg b/images/gnome-desktop/config/bootloaders/isolinux/install.cfg
index ba09752..30685cf 100644
--- a/images/gnome-desktop/config/bootloaders/isolinux/install.cfg
+++ b/images/gnome-desktop/config/bootloaders/isolinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/gnome-desktop/config/bootloaders/isolinux/live.cfg.in b/images/gnome-desktop/config/bootloaders/isolinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/gnome-desktop/config/bootloaders/isolinux/live.cfg.in
+++ b/images/gnome-desktop/config/bootloaders/isolinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/gnome-desktop/config/bootloaders/pxelinux/install.cfg b/images/gnome-desktop/config/bootloaders/pxelinux/install.cfg
index ba09752..30685cf 100644
--- a/images/gnome-desktop/config/bootloaders/pxelinux/install.cfg
+++ b/images/gnome-desktop/config/bootloaders/pxelinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/gnome-desktop/config/bootloaders/pxelinux/live.cfg.in b/images/gnome-desktop/config/bootloaders/pxelinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/gnome-desktop/config/bootloaders/pxelinux/live.cfg.in
+++ b/images/gnome-desktop/config/bootloaders/pxelinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
diff --git a/images/gnome-desktop/config/bootloaders/syslinux/install.cfg b/images/gnome-desktop/config/bootloaders/syslinux/install.cfg
index ba09752..30685cf 100644
--- a/images/gnome-desktop/config/bootloaders/syslinux/install.cfg
+++ b/images/gnome-desktop/config/bootloaders/syslinux/install.cfg
@@ -1,11 +1,11 @@
label install
menu label ^Install
- linux /install/vmlinuz
- initrd /install/initrd.gz
- append vga=788 @APPEND_INSTALL@ --- quiet
-
-label installgui
- menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+label install-failsafe
+ menu label Install (failsafe)
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/images/gnome-desktop/config/bootloaders/syslinux/live.cfg.in b/images/gnome-desktop/config/bootloaders/syslinux/live.cfg.in
index 97ceb92..a405349 100644
--- a/images/gnome-desktop/config/bootloaders/syslinux/live.cfg.in
+++ b/images/gnome-desktop/config/bootloaders/syslinux/live.cfg.in
@@ -6,7 +6,7 @@ label live-@FLAVOUR@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
+ menu label Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@