cleaned up by remnants of 32bit linbo (#106).

linuxmuster · Nov 19, 2023 · 7a80e76 · 7a80e76
1 parent a680043
commit 7a80e76
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 56 deletions.
diff --git a/serverfs/usr/share/linuxmuster/linbo/templates/grub.cfg.global b/serverfs/usr/share/linuxmuster/linbo/templates/grub.cfg.global
@@ -1,6 +1,6 @@
 # global part of group specific grub.cfg template for linbo net boot
 # thomas@linuxmuster.net
-# 20210202
+# 20231119
 #
 
 # if you don't want this file being overwritten by import_workstations remove the following line:
@@ -25,17 +25,9 @@ terminal_output gfxterm
 
 background_color 42,68,87
 
-# 32bit pae, non pae or 64bit kernel
-if cpuid -l; then
- set linbo_kernel=/linbo64
- set linbo_initrd=/linbofs64.lz
-elif cpuid -p; then
- set linbo_kernel=/linbo
- set linbo_initrd=/linbofs.lz
-else
- set linbo_kernel=/linbo-np
- set linbo_initrd=/linbofs-np.lz
-fi
+# kernel & initrd
+set linbo_kernel=/linbo64
+set linbo_initrd=/linbofs64.lz
 
 # theme settings (modify for custom theme)
 set theme=/boot/grub/themes/linbo/theme.txt

diff --git a/serverfs/usr/share/linuxmuster/linbo/templates/grub.cfg.local b/serverfs/usr/share/linuxmuster/linbo/templates/grub.cfg.local
@@ -1,7 +1,7 @@
 #
 # default grub.cfg, local boot version (placed in linbo cache)
 # thomas@linuxmuster.net
-# 20231118
+# 20231119
 #
 
 set default=0
@@ -120,17 +120,9 @@ menuentry 'OS localboot' {
 
 # boot linbo local from cache in failsafe mode
 menuentry 'LINBO' {
- # 32bit pae, non pae or 64bit kernel
- if cpuid -l; then
-  set linbo_kernel=/linbo64
-  set linbo_initrd=/linbofs64.lz
- elif cpuid -p; then
-  set linbo_kernel=/linbo
-  set linbo_initrd=/linbofs.lz
- else
-  set linbo_kernel=/linbo-np
-  set linbo_initrd=/linbofs-np.lz
- fi
+ # kernel & initrd
+ set linbo_kernel=/linbo64
+ set linbo_initrd=/linbofs64.lz
 
  set root="${linboroot}"
  if [ -e "$linbo_kernel" -a -e "$linbo_initrd" ]; then

diff --git a/serverfs/usr/share/linuxmuster/linbo/templates/grub.cfg.pxe b/serverfs/usr/share/linuxmuster/linbo/templates/grub.cfg.pxe
@@ -1,7 +1,7 @@
 #
 # default grub.cfg, pxe boot version (placed on server, don't edit!)
 # thomas@linuxmuster.net
-# 20231118
+# 20231119
 #
 
 set timeout=0
@@ -148,17 +148,9 @@ menuentry 'Default' {
  set root="${netroot}"
  set gfxpayload=640x480x16
 
- # 32bit pae, non pae or 64bit kernel
- if cpuid -l; then
-  set linbo_kernel=/linbo64
-  set linbo_initrd=/linbofs64.lz
- elif cpuid -p; then
-  set linbo_kernel=/linbo
-  set linbo_initrd=/linbofs.lz
- else
-  set linbo_kernel=/linbo-np
-  set linbo_initrd=/linbofs-np.lz
- fi
+ # kernel and initrd
+ set linbo_kernel=/linbo64
+ set linbo_initrd=/linbofs64.lz
  echo "LINBO netboot in failsafe mode"
  echo -n "Loading $linbo_kernel .."
  linux $linbo_kernel quiet netboot nomodeset

diff --git a/serverfs/usr/share/linuxmuster/linbo/templates/linbo-remote.pxe b/serverfs/usr/share/linuxmuster/linbo/templates/linbo-remote.pxe
diff --git a/serverfs/usr/share/linuxmuster/linbo/templates/linbo.cfg.iso b/serverfs/usr/share/linuxmuster/linbo/templates/linbo.cfg.iso
@@ -1,6 +1,6 @@
 # grub.cfg fuer linbo isoboot
 # thomas@linuxmuster.net
-# 20201127
+# 20231119
 #
 
 set default=0
@@ -9,20 +9,10 @@ set timeout=10
 
 set gfxpayload=800x600x16
 
-# 32bit pae, non pae or 64bit kernel
-if cpuid -l; then
- set linbo_kernel=/linbo64
- set linbo_initrd=/linbofs64.lz
- set NAME="LINBO (64bit)"
-elif cpuid -p; then
- set linbo_kernel=/linbo
- set linbo_initrd=/linbofs.lz
- set NAME="LINBO (32bit)"
-else
- set linbo_kernel=/linbo-np
- set linbo_initrd=/linbofs-np.lz
- set NAME="LINBO (32bit non pae)"
-fi
+# kernel & initrd
+set linbo_kernel=/linbo64
+set linbo_initrd=/linbofs64.lz
+set NAME="LINBO (64bit)"
 
 # theme settings (modify for custom theme)
 set theme=/boot/grub/themes/linbo/theme.txt