소스 검색

Grml changes

* Move grml from utils to live menu
* Enable grml menu on live arm menu

Closes: https://github.com/netbootxyz/netboot.xyz/issues/1549
Antony Messerli 4 달 전
부모
커밋
19c80072a4
3개의 변경된 파일1개의 추가작업 그리고 9개의 파일을 삭제
  1. 0 8
      roles/netbootxyz/defaults/main.yml
  2. 1 0
      roles/netbootxyz/templates/menu/live-arm.ipxe.j2
  3. 0 1
      roles/netbootxyz/templates/menu/live-grml.ipxe.j2

+ 0 - 8
roles/netbootxyz/defaults/main.yml

@@ -688,10 +688,6 @@ utilitiesefi:
     enabled: true
     name: GParted
     type: ipxemenu
-  grml:
-    enabled: true
-    name: Grml
-    type: ipxemenu
   kaspersky:
     enabled: true
     name: Kaspersky Rescue Disk
@@ -813,10 +809,6 @@ utilitiespcbios64:
     enabled: true
     name: GParted
     type: ipxemenu
-  grml:
-    enabled: true
-    name: Grml
-    type: ipxemenu
   kaspersky:
     enabled: true
     name: Kaspersky Rescue Disk

+ 1 - 0
roles/netbootxyz/templates/menu/live-arm.ipxe.j2

@@ -6,6 +6,7 @@ goto ${menu} ||
 menu Live Boot Distributions - Current Arch [ ${arch} ]
 item --gap Live Boot Distributions
 item live-fedora ${space} Fedora
+item live-grml ${space} Grml
 choose menu || goto live_exit
 echo ${cls}
 goto ${menu} ||

+ 0 - 1
roles/netbootxyz/templates/menu/grml.ipxe.j2 → roles/netbootxyz/templates/menu/live-grml.ipxe.j2

@@ -17,7 +17,6 @@ iseq ${os_arch} {{ value.arch }} && item {{ value.version }}-{{ value.flavor }}-
 choose live_version || goto live_exit
 goto ${live_version}
 
-
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "grml" %}
 :{{ value.version }}-{{ value.flavor }}-{{ value.arch }}