Feature/8343 Simplify menu install on iso #8348 backported

inverse-inc · Oct 15, 2024 · ec91575 · ec91575
1 parent 4e5a007
commit ec91575
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 36 deletions.
diff --git a/ci/debian-installer/build-and-upload.sh b/ci/debian-installer/build-and-upload.sh
@@ -10,6 +10,9 @@ then
   PF_VERSION+=${BASH_REMATCH[1]};
   PF_VERSION+=.0;
   echo "Maintenance Branch detected, try to match tag version with PF version = $PF_VERSION"
+elif [[ "$PF_VERSION" =~ ^.*\/.*$ ]];
+then
+  PF_VERSION="`echo $PF_VERSION | sed -r 's/\//-/g'`"
 fi
 
 PF_RELEASE="`echo $PF_RELEASE | sed -r 's/.*\b([0-9]+\.[0-9]+)\.[0-9]+/\1/g'`"

diff --git a/ci/debian-installer/create-debian-installer.sh b/ci/debian-installer/create-debian-installer.sh
@@ -8,13 +8,13 @@ function clean() {
   chmod a+rw $ISO_OUT
 }
 
-ISO_IN=${ISO_IN:-debian-12.4.0-amd64-netinst.iso}
+ISO_IN=${ISO_IN:-debian-12.6.0-amd64-netinst.iso}
 ISO_OUT=${ISO_OUT:-packetfence-debian-installer.iso}
 
 trap clean EXIT
 
 if ! [ -f $ISO_IN ]; then
-	wget https://cdimage.debian.org/cdimage/archive/12.4.0/amd64/iso-cd/$ISO_IN
+	wget https://cdimage.debian.org/cdimage/archive/12.6.0/amd64/iso-cd/$ISO_IN
 fi
 
 rm -fr isofiles/
@@ -31,9 +31,10 @@ chmod -w -R isofiles/install.amd/
 
 chmod a+w isofiles/isolinux/gtk.cfg isofiles/isolinux/drkgtk.cfg isofiles/boot/grub/grub.cfg
 cp gtk.cfg isofiles/isolinux/gtk.cfg
-cp gtk.cfg isofiles/isolinux/drkgtk.cfg
+cp drkgtk.cfg isofiles/isolinux/drkgtk.cfg
+cp menu.cfg isofiles/isolinux/menu.cfg
 cp grub.cfg isofiles/boot/grub/grub.cfg
-chmod 0444 isofiles/isolinux/gtk.cfg isofiles/isolinux/drkgtk.cfg isofiles/boot/grub/grub.cfg
+chmod 0444 isofiles/isolinux/*
 
 cp postinst-debian-installer.sh isofiles/
 cd isofiles

diff --git a/ci/debian-installer/drkgtk.cfg b/ci/debian-installer/drkgtk.cfg
@@ -0,0 +1,7 @@
+default installdark
+label installdark
+	menu label ^Install Debian with PacketFence
+	menu default
+	kernel /install.amd/vmlinuz
+	append vga=788 net.ifnames=0 initrd=/install.amd/initrd.gz --- quiet 
+
diff --git a/ci/debian-installer/grub.cfg b/ci/debian-installer/grub.cfg
@@ -24,7 +24,7 @@ fi
 insmod play
 play 960 440 1 0 4 440 1
 set theme=/boot/grub/theme/1
-menuentry --hotkey=i 'Install' {
+menuentry --hotkey=i 'Install Debian Only' {
     set background_color=black
     linux    /install.amd/vmlinuz vga=788 net.ifnames=0 --- quiet 
     initrd   /install.amd/initrd.gz
@@ -34,55 +34,25 @@ submenu --hotkey=a 'Advanced options ...' {
     set menu_color_highlight=white/blue
     set theme=/boot/grub/theme/1-1
     set gfxpayload=keep
-    menuentry '... Graphical expert install' {
-        set background_color=black
-        linux    /install.amd/vmlinuz priority=low vga=788 --- 
-        initrd   /install.amd/gtk/initrd.gz
-    }
     menuentry '... Graphical rescue mode' {
         set background_color=black
         linux    /install.amd/vmlinuz vga=788 rescue/enable=true --- quiet  
         initrd   /install.amd/gtk/initrd.gz
     }
-    menuentry '... Graphical automated install' {
-        set background_color=black
-        linux    /install.amd/vmlinuz auto=true priority=critical vga=788 --- quiet 
-        initrd   /install.amd/gtk/initrd.gz
-    }
-    menuentry --hotkey=x '... Expert install' {
-        set background_color=black
-        linux    /install.amd/vmlinuz priority=low vga=788 --- 
-        initrd   /install.amd/initrd.gz
-    }
     menuentry --hotkey=r '... Rescue mode' {
         set background_color=black
         linux    /install.amd/vmlinuz vga=788 rescue/enable=true --- quiet 
         initrd   /install.amd/initrd.gz
     }
-    menuentry --hotkey=a '... Automated install' {
-        set background_color=black
-        linux    /install.amd/vmlinuz auto=true priority=critical vga=788 --- quiet 
-        initrd   /install.amd/initrd.gz
-    }
     submenu --hotkey=s '... Speech-enabled advanced options ...' {
         set menu_color_normal=cyan/blue
         set menu_color_highlight=white/blue
         set theme=/boot/grub/theme/1-1-1
         set gfxpayload=keep
-        menuentry --hotkey=x '... Expert speech install' {
-            set background_color=black
-            linux    /install.amd/vmlinuz priority=low vga=788 speakup.synth=soft --- 
-            initrd   /install.amd/gtk/initrd.gz
-        }
         menuentry --hotkey=r '... Rescue speech mode' {
             set background_color=black
             linux    /install.amd/vmlinuz vga=788 rescue/enable=true speakup.synth=soft --- quiet  
             initrd   /install.amd/gtk/initrd.gz
         }
-        menuentry --hotkey=a '... Automated speech install' {
-            set background_color=black
-            linux    /install.amd/vmlinuz auto=true priority=critical vga=788 speakup.synth=soft --- quiet 
-            initrd   /install.amd/gtk/initrd.gz
-        }
     }
 }
diff --git a/ci/debian-installer/gtk.cfg b/ci/debian-installer/gtk.cfg
@@ -1,6 +1,6 @@
 default install
 label install
-	menu label ^Install PacketFence
+	menu label ^Install Debian with PacketFence
 	menu default
 	kernel /install.amd/vmlinuz
 	append vga=788 net.ifnames=0 initrd=/install.amd/initrd.gz --- quiet 

diff --git a/ci/debian-installer/menu.cfg b/ci/debian-installer/menu.cfg
@@ -0,0 +1,34 @@
+menu hshift 4
+menu width 70
+
+menu title PacketFence Debian installer menu (BIOS mode)
+include stdmenu.cfg
+include gtk.cfg
+menu begin advanced
+    menu label ^Advanced options
+        menu title Advanced options
+        include stdmenu.cfg
+        label mainmenu
+                menu label ^Back..
+                menu exit
+        include rqtxt.cfg
+menu end
+menu begin dark
+    menu label Accessible ^dark contrast installer menu
+        menu title PacketFence Debian installer (dark contrast)
+        include drkmenu.cfg
+        label mainmenu
+                menu label ^Back..
+                menu exit
+        include drkgtk.cfg
+        menu begin advanced
+            menu label ^Advanced options
+                menu title Advanced options
+                include drkmenu.cfg
+                label mainmenu
+                        menu label ^Back..
+                        menu exit
+                include rqdrk.cfg
+        menu end
+        include x86drkme.cfg
+menu end