[X2Go-Commits] [live-build-x2go] 20/44: Revert "looks like bootloader configuration with a custom splash logo won't work" - this is better handled outside git
git-admin at x2go.org
git-admin at x2go.org
Mon Nov 28 19:37:13 CET 2022
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/openbox-magic-pixel-workaround-buster-heuler
in repository live-build-x2go.
commit aa881867a5dde453a0449b015c2410533e0654fa
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Mon Jun 22 01:55:32 2020 +0200
Revert "looks like bootloader configuration with a custom splash logo won't work" - this is better handled outside git
This reverts commit e6b22e0b72237b99943e66b3eac71fbb68f81124.
---
config/bootloaders/extlinux/advanced.cfg | 7 ---
config/bootloaders/extlinux/extlinux.conf | 4 --
config/bootloaders/extlinux/hdt.c32 | 1 -
config/bootloaders/extlinux/install.cfg | 11 -----
config/bootloaders/extlinux/ldlinux.c32 | 1 -
config/bootloaders/extlinux/libcom32.c32 | 1 -
config/bootloaders/extlinux/libgpl.c32 | 1 -
config/bootloaders/extlinux/libmenu.c32 | 1 -
config/bootloaders/extlinux/libutil.c32 | 1 -
config/bootloaders/extlinux/live.cfg.in | 12 -----
config/bootloaders/extlinux/menu.cfg | 17 -------
config/bootloaders/extlinux/stdmenu.cfg | 15 ------
config/bootloaders/extlinux/vesamenu.c32 | 1 -
config/bootloaders/grub-legacy/menu.lst | 9 ----
config/bootloaders/grub-legacy/splash.xpm.gz | Bin 32047 -> 0 bytes
config/bootloaders/grub-pc/dejavu-bold-14.pf2 | Bin 191158 -> 0 bytes
config/bootloaders/grub-pc/dejavu-bold-16.pf2 | Bin 212142 -> 0 bytes
config/bootloaders/grub-pc/grub.cfg | 58 -----------------------
config/bootloaders/grub-pc/live-theme/theme.txt | 51 --------------------
config/bootloaders/grub-pc/splash.png | Bin 19557 -> 0 bytes
config/bootloaders/isolinux/advanced.cfg | 7 ---
config/bootloaders/isolinux/hdt.c32 | 1 -
config/bootloaders/isolinux/install.cfg | 11 -----
config/bootloaders/isolinux/isolinux.bin | 1 -
config/bootloaders/isolinux/isolinux.cfg | 4 --
config/bootloaders/isolinux/ldlinux.c32 | 1 -
config/bootloaders/isolinux/libcom32.c32 | 1 -
config/bootloaders/isolinux/libgpl.c32 | 1 -
config/bootloaders/isolinux/libmenu.c32 | 1 -
config/bootloaders/isolinux/libutil.c32 | 1 -
config/bootloaders/isolinux/live.cfg.in | 12 -----
config/bootloaders/isolinux/menu.cfg | 17 -------
config/bootloaders/isolinux/stdmenu.cfg | 15 ------
config/bootloaders/isolinux/vesamenu.c32 | 1 -
config/bootloaders/pxelinux/advanced.cfg | 7 ---
config/bootloaders/pxelinux/hdt.c32 | 1 -
config/bootloaders/pxelinux/install.cfg | 11 -----
config/bootloaders/pxelinux/ldlinux.c32 | 1 -
config/bootloaders/pxelinux/libcom32.c32 | 1 -
config/bootloaders/pxelinux/libgpl.c32 | 1 -
config/bootloaders/pxelinux/libmenu.c32 | 1 -
config/bootloaders/pxelinux/libutil.c32 | 1 -
config/bootloaders/pxelinux/live.cfg.in | 12 -----
config/bootloaders/pxelinux/menu.cfg | 17 -------
config/bootloaders/pxelinux/pxelinux.0 | 1 -
config/bootloaders/pxelinux/pxelinux.cfg/default | 4 --
config/bootloaders/pxelinux/stdmenu.cfg | 15 ------
config/bootloaders/pxelinux/vesamenu.c32 | 1 -
config/bootloaders/syslinux/advanced.cfg | 7 ---
config/bootloaders/syslinux/hdt.c32 | 1 -
config/bootloaders/syslinux/install.cfg | 11 -----
config/bootloaders/syslinux/ldlinux.c32 | 1 -
config/bootloaders/syslinux/libcom32.c32 | 1 -
config/bootloaders/syslinux/libgpl.c32 | 1 -
config/bootloaders/syslinux/libmenu.c32 | 1 -
config/bootloaders/syslinux/libutil.c32 | 1 -
config/bootloaders/syslinux/live.cfg.in | 12 -----
config/bootloaders/syslinux/menu.cfg | 17 -------
config/bootloaders/syslinux/stdmenu.cfg | 15 ------
config/bootloaders/syslinux/syslinux.cfg | 4 --
config/bootloaders/syslinux/vesamenu.c32 | 1 -
61 files changed, 412 deletions(-)
diff --git a/config/bootloaders/extlinux/advanced.cfg b/config/bootloaders/extlinux/advanced.cfg
deleted file mode 100644
index 373451a..0000000
--- a/config/bootloaders/extlinux/advanced.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-label hdt
- menu label ^Hardware Detection Tool (HDT)
- com32 hdt.c32
-
-label memtest
- menu label ^Memory Diagnostic Tool (memtest86+)
- linux /live/memtest
diff --git a/config/bootloaders/extlinux/extlinux.conf b/config/bootloaders/extlinux/extlinux.conf
deleted file mode 100644
index a3e3eab..0000000
--- a/config/bootloaders/extlinux/extlinux.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-include menu.cfg
-default vesamenu.c32
-prompt 0
-timeout 0
diff --git a/config/bootloaders/extlinux/hdt.c32 b/config/bootloaders/extlinux/hdt.c32
deleted file mode 120000
index f84c641..0000000
--- a/config/bootloaders/extlinux/hdt.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/hdt.c32
\ No newline at end of file
diff --git a/config/bootloaders/extlinux/install.cfg b/config/bootloaders/extlinux/install.cfg
deleted file mode 100644
index ba09752..0000000
--- a/config/bootloaders/extlinux/install.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/config/bootloaders/extlinux/ldlinux.c32 b/config/bootloaders/extlinux/ldlinux.c32
deleted file mode 120000
index df554c7..0000000
--- a/config/bootloaders/extlinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/ldlinux.c32
\ No newline at end of file
diff --git a/config/bootloaders/extlinux/libcom32.c32 b/config/bootloaders/extlinux/libcom32.c32
deleted file mode 120000
index 44ab36b..0000000
--- a/config/bootloaders/extlinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libcom32.c32
\ No newline at end of file
diff --git a/config/bootloaders/extlinux/libgpl.c32 b/config/bootloaders/extlinux/libgpl.c32
deleted file mode 120000
index 81c83fb..0000000
--- a/config/bootloaders/extlinux/libgpl.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libgpl.c32
\ No newline at end of file
diff --git a/config/bootloaders/extlinux/libmenu.c32 b/config/bootloaders/extlinux/libmenu.c32
deleted file mode 120000
index 2491ff9..0000000
--- a/config/bootloaders/extlinux/libmenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libmenu.c32
\ No newline at end of file
diff --git a/config/bootloaders/extlinux/libutil.c32 b/config/bootloaders/extlinux/libutil.c32
deleted file mode 120000
index 478194e..0000000
--- a/config/bootloaders/extlinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libutil.c32
\ No newline at end of file
diff --git a/config/bootloaders/extlinux/live.cfg.in b/config/bootloaders/extlinux/live.cfg.in
deleted file mode 100644
index 97ceb92..0000000
--- a/config/bootloaders/extlinux/live.cfg.in
+++ /dev/null
@@ -1,12 +0,0 @@
-label live- at FLAVOUR@
- menu label ^Live (@FLAVOUR@)
- menu default
- linux @LINUX@
- initrd @INITRD@
- append @APPEND_LIVE@
-
-label live- at FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
- linux @LINUX@
- initrd @INITRD@
- append @APPEND_LIVE_FAILSAFE@
diff --git a/config/bootloaders/extlinux/menu.cfg b/config/bootloaders/extlinux/menu.cfg
deleted file mode 100644
index 9368260..0000000
--- a/config/bootloaders/extlinux/menu.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-menu hshift 0
-menu width 82
-
-menu title Boot menu
-include stdmenu.cfg
-include live.cfg
-include install.cfg
-menu begin advanced
- menu title ^Advanced options
- include stdmenu.cfg
- label mainmenu
- menu label ^Back..
- menu exit
- include advanced.cfg
-menu end
-
-menu clear
diff --git a/config/bootloaders/extlinux/stdmenu.cfg b/config/bootloaders/extlinux/stdmenu.cfg
deleted file mode 100644
index 671b16f..0000000
--- a/config/bootloaders/extlinux/stdmenu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-menu background splash.png
-menu color title * #FFFFFFFF *
-menu color border * #00000000 #00000000 none
-menu color sel * #ffffffff #76a1d0ff *
-menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
-menu color tabmsg * #ffffffff #00000000 *
-menu color help 37;40 #ffdddd00 #00000000 none
-menu vshift 12
-menu rows 10
-menu helpmsgrow 15
-# The command line must be at least one line from the bottom.
-menu cmdlinerow 16
-menu timeoutrow 16
-menu tabmsgrow 18
-menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/config/bootloaders/extlinux/vesamenu.c32 b/config/bootloaders/extlinux/vesamenu.c32
deleted file mode 120000
index 84e2eff..0000000
--- a/config/bootloaders/extlinux/vesamenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/vesamenu.c32
\ No newline at end of file
diff --git a/config/bootloaders/grub-legacy/menu.lst b/config/bootloaders/grub-legacy/menu.lst
deleted file mode 100644
index 3b866e5..0000000
--- a/config/bootloaders/grub-legacy/menu.lst
+++ /dev/null
@@ -1,9 +0,0 @@
-default 0
-color cyan/blue white/blue
-splashimage /boot/grub/splash.xpm.gz
-
-LINUX_LIVE
-
-LINUX_INSTALL
-
-MEMTEST
diff --git a/config/bootloaders/grub-legacy/splash.xpm.gz b/config/bootloaders/grub-legacy/splash.xpm.gz
deleted file mode 100644
index 6c1bf9a..0000000
Binary files a/config/bootloaders/grub-legacy/splash.xpm.gz and /dev/null differ
diff --git a/config/bootloaders/grub-pc/dejavu-bold-14.pf2 b/config/bootloaders/grub-pc/dejavu-bold-14.pf2
deleted file mode 100644
index 9b093b2..0000000
Binary files a/config/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ
diff --git a/config/bootloaders/grub-pc/dejavu-bold-16.pf2 b/config/bootloaders/grub-pc/dejavu-bold-16.pf2
deleted file mode 100644
index 11e7f7a..0000000
Binary files a/config/bootloaders/grub-pc/dejavu-bold-16.pf2 and /dev/null differ
diff --git a/config/bootloaders/grub-pc/grub.cfg b/config/bootloaders/grub-pc/grub.cfg
deleted file mode 100644
index a809375..0000000
--- a/config/bootloaders/grub-pc/grub.cfg
+++ /dev/null
@@ -1,58 +0,0 @@
-set default=0
-
-loadfont $prefix/dejavu-bold-16.pf2
-loadfont $prefix/dejavu-bold-14.pf2
-loadfont $prefix/unicode.pf2
-set gfxmode=auto
-insmod all_video
-insmod gfxterm
-insmod png
-
-set color_normal=light-gray/black
-set color_highlight=white/black
-
-if [ -e /isolinux/splash.png ]; then
- # binary_syslinux modifies the theme file to point to the correct
- # background picture
- set theme=/boot/grub/live-theme/theme.txt
-elif [ -e /boot/grub/splash.png ]; then
- set theme=/boot/grub/live-theme/theme.txt
-else
- set menu_color_normal=cyan/blue
- set menu_color_highlight=white/blue
-fi
-
-terminal_output gfxterm
-
-insmod play
-play 960 440 1 0 4 440 1
-
-# Live boot
-LINUX_LIVE
-
-# You can add more entries like this
-# menuentry "Alternate live boot" {
-# linux KERNEL_LIVE APPEND_LIVE custom options here
-# initrd INITRD_LIVE
-# }
-# menuentry "Alternate graphical installer" {
-# linux KERNEL_GI APPEND_GI custom options here
-# initrd INITRD_GI
-# }
-# menuentry "Alternate textual installer" {
-# linux KERNEL_DI APPEND_DI custom options here
-# initrd INITRD_DI
-# }
-
-# Installer (if any)
-LINUX_INSTALL
-
-submenu 'Advanced options...' {
-
-# More installer entries (if any)
-LINUX_ADVANCED_INSTALL
-
-# Memtest (if any)
-MEMTEST
-
-}
diff --git a/config/bootloaders/grub-pc/live-theme/theme.txt b/config/bootloaders/grub-pc/live-theme/theme.txt
deleted file mode 100644
index 4ceef4b..0000000
--- a/config/bootloaders/grub-pc/live-theme/theme.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-desktop-image: "../splash.png"
-title-color: "#ffffff"
-title-font: "DejaVu Sans Bold 16"
-title-text: "Live Boot Menu with GRUB"
-message-font: "Unifont Regular 16"
-terminal-font: "Unifont Regular 16"
-
-#help bar at the bottom
-+ label {
- top = 100%-50
- left = 0
- width = 100%
- height = 20
- text = "@KEYMAP_SHORT@"
- align = "center"
- color = "#ffffff"
- font = "DejaVu Sans Bold 14"
-}
-
-#boot menu
-+ boot_menu {
- left = 10%
- width = 80%
- top = 52%
- height = 48%-80
- item_color = "#a8a8a8"
- item_font = "DejaVu Sans Bold 14"
- selected_item_color= "#ffffff"
- selected_item_font = "DejaVu Sans Bold 14"
- item_height = 16
- item_padding = 0
- item_spacing = 4
- icon_width = 0
- icon_heigh = 0
- item_icon_space = 0
-}
-
-#progress bar
-+ progress_bar {
- id = "__timeout__"
- left = 15%
- top = 100%-80
- height = 16
- width = 70%
- font = "DejaVu Sans Regular 14"
- text_color = "#000000"
- fg_color = "#ffffff"
- bg_color = "#a8a8a8"
- border_color = "#ffffff"
- text = "@TIMEOUT_NOTIFICATION_LONG@"
-}
diff --git a/config/bootloaders/grub-pc/splash.png b/config/bootloaders/grub-pc/splash.png
deleted file mode 100644
index 11b8405..0000000
Binary files a/config/bootloaders/grub-pc/splash.png and /dev/null differ
diff --git a/config/bootloaders/isolinux/advanced.cfg b/config/bootloaders/isolinux/advanced.cfg
deleted file mode 100644
index 373451a..0000000
--- a/config/bootloaders/isolinux/advanced.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-label hdt
- menu label ^Hardware Detection Tool (HDT)
- com32 hdt.c32
-
-label memtest
- menu label ^Memory Diagnostic Tool (memtest86+)
- linux /live/memtest
diff --git a/config/bootloaders/isolinux/hdt.c32 b/config/bootloaders/isolinux/hdt.c32
deleted file mode 120000
index f84c641..0000000
--- a/config/bootloaders/isolinux/hdt.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/hdt.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/install.cfg b/config/bootloaders/isolinux/install.cfg
deleted file mode 100644
index ba09752..0000000
--- a/config/bootloaders/isolinux/install.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/config/bootloaders/isolinux/isolinux.bin b/config/bootloaders/isolinux/isolinux.bin
deleted file mode 120000
index 33a2ad6..0000000
--- a/config/bootloaders/isolinux/isolinux.bin
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/ISOLINUX/isolinux.bin
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/isolinux.cfg b/config/bootloaders/isolinux/isolinux.cfg
deleted file mode 100644
index a3e3eab..0000000
--- a/config/bootloaders/isolinux/isolinux.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-include menu.cfg
-default vesamenu.c32
-prompt 0
-timeout 0
diff --git a/config/bootloaders/isolinux/ldlinux.c32 b/config/bootloaders/isolinux/ldlinux.c32
deleted file mode 120000
index df554c7..0000000
--- a/config/bootloaders/isolinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/ldlinux.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/libcom32.c32 b/config/bootloaders/isolinux/libcom32.c32
deleted file mode 120000
index 44ab36b..0000000
--- a/config/bootloaders/isolinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libcom32.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/libgpl.c32 b/config/bootloaders/isolinux/libgpl.c32
deleted file mode 120000
index 81c83fb..0000000
--- a/config/bootloaders/isolinux/libgpl.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libgpl.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/libmenu.c32 b/config/bootloaders/isolinux/libmenu.c32
deleted file mode 120000
index 2491ff9..0000000
--- a/config/bootloaders/isolinux/libmenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libmenu.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/libutil.c32 b/config/bootloaders/isolinux/libutil.c32
deleted file mode 120000
index 478194e..0000000
--- a/config/bootloaders/isolinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libutil.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/live.cfg.in b/config/bootloaders/isolinux/live.cfg.in
deleted file mode 100644
index 97ceb92..0000000
--- a/config/bootloaders/isolinux/live.cfg.in
+++ /dev/null
@@ -1,12 +0,0 @@
-label live- at FLAVOUR@
- menu label ^Live (@FLAVOUR@)
- menu default
- linux @LINUX@
- initrd @INITRD@
- append @APPEND_LIVE@
-
-label live- at FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
- linux @LINUX@
- initrd @INITRD@
- append @APPEND_LIVE_FAILSAFE@
diff --git a/config/bootloaders/isolinux/menu.cfg b/config/bootloaders/isolinux/menu.cfg
deleted file mode 100644
index 9368260..0000000
--- a/config/bootloaders/isolinux/menu.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-menu hshift 0
-menu width 82
-
-menu title Boot menu
-include stdmenu.cfg
-include live.cfg
-include install.cfg
-menu begin advanced
- menu title ^Advanced options
- include stdmenu.cfg
- label mainmenu
- menu label ^Back..
- menu exit
- include advanced.cfg
-menu end
-
-menu clear
diff --git a/config/bootloaders/isolinux/stdmenu.cfg b/config/bootloaders/isolinux/stdmenu.cfg
deleted file mode 100644
index 671b16f..0000000
--- a/config/bootloaders/isolinux/stdmenu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-menu background splash.png
-menu color title * #FFFFFFFF *
-menu color border * #00000000 #00000000 none
-menu color sel * #ffffffff #76a1d0ff *
-menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
-menu color tabmsg * #ffffffff #00000000 *
-menu color help 37;40 #ffdddd00 #00000000 none
-menu vshift 12
-menu rows 10
-menu helpmsgrow 15
-# The command line must be at least one line from the bottom.
-menu cmdlinerow 16
-menu timeoutrow 16
-menu tabmsgrow 18
-menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/config/bootloaders/isolinux/vesamenu.c32 b/config/bootloaders/isolinux/vesamenu.c32
deleted file mode 120000
index 84e2eff..0000000
--- a/config/bootloaders/isolinux/vesamenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/vesamenu.c32
\ No newline at end of file
diff --git a/config/bootloaders/pxelinux/advanced.cfg b/config/bootloaders/pxelinux/advanced.cfg
deleted file mode 100644
index 373451a..0000000
--- a/config/bootloaders/pxelinux/advanced.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-label hdt
- menu label ^Hardware Detection Tool (HDT)
- com32 hdt.c32
-
-label memtest
- menu label ^Memory Diagnostic Tool (memtest86+)
- linux /live/memtest
diff --git a/config/bootloaders/pxelinux/hdt.c32 b/config/bootloaders/pxelinux/hdt.c32
deleted file mode 120000
index f84c641..0000000
--- a/config/bootloaders/pxelinux/hdt.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/hdt.c32
\ No newline at end of file
diff --git a/config/bootloaders/pxelinux/install.cfg b/config/bootloaders/pxelinux/install.cfg
deleted file mode 100644
index ba09752..0000000
--- a/config/bootloaders/pxelinux/install.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/config/bootloaders/pxelinux/ldlinux.c32 b/config/bootloaders/pxelinux/ldlinux.c32
deleted file mode 120000
index df554c7..0000000
--- a/config/bootloaders/pxelinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/ldlinux.c32
\ No newline at end of file
diff --git a/config/bootloaders/pxelinux/libcom32.c32 b/config/bootloaders/pxelinux/libcom32.c32
deleted file mode 120000
index 44ab36b..0000000
--- a/config/bootloaders/pxelinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libcom32.c32
\ No newline at end of file
diff --git a/config/bootloaders/pxelinux/libgpl.c32 b/config/bootloaders/pxelinux/libgpl.c32
deleted file mode 120000
index 81c83fb..0000000
--- a/config/bootloaders/pxelinux/libgpl.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libgpl.c32
\ No newline at end of file
diff --git a/config/bootloaders/pxelinux/libmenu.c32 b/config/bootloaders/pxelinux/libmenu.c32
deleted file mode 120000
index 2491ff9..0000000
--- a/config/bootloaders/pxelinux/libmenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libmenu.c32
\ No newline at end of file
diff --git a/config/bootloaders/pxelinux/libutil.c32 b/config/bootloaders/pxelinux/libutil.c32
deleted file mode 120000
index 478194e..0000000
--- a/config/bootloaders/pxelinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libutil.c32
\ No newline at end of file
diff --git a/config/bootloaders/pxelinux/live.cfg.in b/config/bootloaders/pxelinux/live.cfg.in
deleted file mode 100644
index 97ceb92..0000000
--- a/config/bootloaders/pxelinux/live.cfg.in
+++ /dev/null
@@ -1,12 +0,0 @@
-label live- at FLAVOUR@
- menu label ^Live (@FLAVOUR@)
- menu default
- linux @LINUX@
- initrd @INITRD@
- append @APPEND_LIVE@
-
-label live- at FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
- linux @LINUX@
- initrd @INITRD@
- append @APPEND_LIVE_FAILSAFE@
diff --git a/config/bootloaders/pxelinux/menu.cfg b/config/bootloaders/pxelinux/menu.cfg
deleted file mode 100644
index 9368260..0000000
--- a/config/bootloaders/pxelinux/menu.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-menu hshift 0
-menu width 82
-
-menu title Boot menu
-include stdmenu.cfg
-include live.cfg
-include install.cfg
-menu begin advanced
- menu title ^Advanced options
- include stdmenu.cfg
- label mainmenu
- menu label ^Back..
- menu exit
- include advanced.cfg
-menu end
-
-menu clear
diff --git a/config/bootloaders/pxelinux/pxelinux.0 b/config/bootloaders/pxelinux/pxelinux.0
deleted file mode 120000
index f723d02..0000000
--- a/config/bootloaders/pxelinux/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/PXELINUX/pxelinux.0
\ No newline at end of file
diff --git a/config/bootloaders/pxelinux/pxelinux.cfg/default b/config/bootloaders/pxelinux/pxelinux.cfg/default
deleted file mode 100644
index a3e3eab..0000000
--- a/config/bootloaders/pxelinux/pxelinux.cfg/default
+++ /dev/null
@@ -1,4 +0,0 @@
-include menu.cfg
-default vesamenu.c32
-prompt 0
-timeout 0
diff --git a/config/bootloaders/pxelinux/stdmenu.cfg b/config/bootloaders/pxelinux/stdmenu.cfg
deleted file mode 100644
index 671b16f..0000000
--- a/config/bootloaders/pxelinux/stdmenu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-menu background splash.png
-menu color title * #FFFFFFFF *
-menu color border * #00000000 #00000000 none
-menu color sel * #ffffffff #76a1d0ff *
-menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
-menu color tabmsg * #ffffffff #00000000 *
-menu color help 37;40 #ffdddd00 #00000000 none
-menu vshift 12
-menu rows 10
-menu helpmsgrow 15
-# The command line must be at least one line from the bottom.
-menu cmdlinerow 16
-menu timeoutrow 16
-menu tabmsgrow 18
-menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/config/bootloaders/pxelinux/vesamenu.c32 b/config/bootloaders/pxelinux/vesamenu.c32
deleted file mode 120000
index 84e2eff..0000000
--- a/config/bootloaders/pxelinux/vesamenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/vesamenu.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/advanced.cfg b/config/bootloaders/syslinux/advanced.cfg
deleted file mode 100644
index 373451a..0000000
--- a/config/bootloaders/syslinux/advanced.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-label hdt
- menu label ^Hardware Detection Tool (HDT)
- com32 hdt.c32
-
-label memtest
- menu label ^Memory Diagnostic Tool (memtest86+)
- linux /live/memtest
diff --git a/config/bootloaders/syslinux/hdt.c32 b/config/bootloaders/syslinux/hdt.c32
deleted file mode 120000
index f84c641..0000000
--- a/config/bootloaders/syslinux/hdt.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/hdt.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/install.cfg b/config/bootloaders/syslinux/install.cfg
deleted file mode 100644
index ba09752..0000000
--- a/config/bootloaders/syslinux/install.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/config/bootloaders/syslinux/ldlinux.c32 b/config/bootloaders/syslinux/ldlinux.c32
deleted file mode 120000
index df554c7..0000000
--- a/config/bootloaders/syslinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/ldlinux.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/libcom32.c32 b/config/bootloaders/syslinux/libcom32.c32
deleted file mode 120000
index 44ab36b..0000000
--- a/config/bootloaders/syslinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libcom32.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/libgpl.c32 b/config/bootloaders/syslinux/libgpl.c32
deleted file mode 120000
index 81c83fb..0000000
--- a/config/bootloaders/syslinux/libgpl.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libgpl.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/libmenu.c32 b/config/bootloaders/syslinux/libmenu.c32
deleted file mode 120000
index 2491ff9..0000000
--- a/config/bootloaders/syslinux/libmenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libmenu.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/libutil.c32 b/config/bootloaders/syslinux/libutil.c32
deleted file mode 120000
index 478194e..0000000
--- a/config/bootloaders/syslinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/libutil.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/live.cfg.in b/config/bootloaders/syslinux/live.cfg.in
deleted file mode 100644
index 97ceb92..0000000
--- a/config/bootloaders/syslinux/live.cfg.in
+++ /dev/null
@@ -1,12 +0,0 @@
-label live- at FLAVOUR@
- menu label ^Live (@FLAVOUR@)
- menu default
- linux @LINUX@
- initrd @INITRD@
- append @APPEND_LIVE@
-
-label live- at FLAVOUR@-failsafe
- menu label ^Live (@FLAVOUR@ failsafe)
- linux @LINUX@
- initrd @INITRD@
- append @APPEND_LIVE_FAILSAFE@
diff --git a/config/bootloaders/syslinux/menu.cfg b/config/bootloaders/syslinux/menu.cfg
deleted file mode 100644
index 9368260..0000000
--- a/config/bootloaders/syslinux/menu.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-menu hshift 0
-menu width 82
-
-menu title Boot menu
-include stdmenu.cfg
-include live.cfg
-include install.cfg
-menu begin advanced
- menu title ^Advanced options
- include stdmenu.cfg
- label mainmenu
- menu label ^Back..
- menu exit
- include advanced.cfg
-menu end
-
-menu clear
diff --git a/config/bootloaders/syslinux/stdmenu.cfg b/config/bootloaders/syslinux/stdmenu.cfg
deleted file mode 100644
index 671b16f..0000000
--- a/config/bootloaders/syslinux/stdmenu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-menu background splash.png
-menu color title * #FFFFFFFF *
-menu color border * #00000000 #00000000 none
-menu color sel * #ffffffff #76a1d0ff *
-menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
-menu color tabmsg * #ffffffff #00000000 *
-menu color help 37;40 #ffdddd00 #00000000 none
-menu vshift 12
-menu rows 10
-menu helpmsgrow 15
-# The command line must be at least one line from the bottom.
-menu cmdlinerow 16
-menu timeoutrow 16
-menu tabmsgrow 18
-menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/config/bootloaders/syslinux/syslinux.cfg b/config/bootloaders/syslinux/syslinux.cfg
deleted file mode 100644
index a3e3eab..0000000
--- a/config/bootloaders/syslinux/syslinux.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-include menu.cfg
-default vesamenu.c32
-prompt 0
-timeout 0
diff --git a/config/bootloaders/syslinux/vesamenu.c32 b/config/bootloaders/syslinux/vesamenu.c32
deleted file mode 120000
index 84e2eff..0000000
--- a/config/bootloaders/syslinux/vesamenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios/vesamenu.c32
\ No newline at end of file
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
More information about the x2go-commits
mailing list