Explorar o código

Update clonzilla for multi arch

Antony Messerli %!s(int64=3) %!d(string=hai) anos
pai
achega
fc456fc9b5
Modificáronse 1 ficheiros con 8 adicións e 5 borrados
  1. 8 5
      roles/netbootxyz/templates/menu/clonezilla.ipxe.j2

+ 8 - 5
roles/netbootxyz/templates/menu/clonezilla.ipxe.j2

@@ -3,20 +3,23 @@
 goto ${menu} ||
 goto ${menu} ||
 
 
 :live_menu
 :live_menu
+set os_arch ${arch}
+iseq ${os_arch} x86_64 && set os_arch amd64 ||
+iseq ${os_arch} i386 && set os_arch i686 ||
 set os Clonezilla
 set os Clonezilla
 menu ${os}
 menu ${os}
 item --gap ${os} Versions
 item --gap ${os} Versions
 item debian ${space} ${os} Debian Based
 item debian ${space} ${os} Debian Based
 item ubuntu ${space} ${os} Ubuntu Based
 item ubuntu ${space} ${os} Ubuntu Based
 choose live_version || goto live_exit
 choose live_version || goto live_exit
-menu ${os} ${live_version}
+menu ${os} ${live_version} - ${os_arch}
 item --gap ${os} Flavors
 item --gap ${os} Flavors
 goto ${live_version}
 goto ${live_version}
 
 
 :debian
 :debian
 {% for key, value in endpoints.items() %}
 {% for key, value in endpoints.items() %}
-{% if value.os == "clonezilla" and value.version == "debian" %}
-item {{ value.path }} ${space} {{ value.os | title }} {{ value.version | title }} {{ value.flavor | title }}
+{% if value.os == "clonezilla" and "debian" in key %}
+iseq ${os_arch} {{ value.arch }} && item {{ value.path }} ${space} {{ value.os | title }} {{ value.version | title }} {{ value.flavor | title }} ||
 {% endif %}
 {% endif %}
 {% endfor %}
 {% endfor %}
 choose path || goto live_menu
 choose path || goto live_menu
@@ -24,8 +27,8 @@ goto clonezilla-boot
 
 
 :ubuntu
 :ubuntu
 {% for key, value in endpoints.items() %}
 {% for key, value in endpoints.items() %}
-{% if value.os == "clonezilla" and value.version == "ubuntu" %}
-item {{ value.path }} ${space} {{ value.os | title }} {{ value.version | title }} {{ value.flavor | title }}
+{% if value.os == "clonezilla" and "ubuntu" in key %}
+iseq ${os_arch} {{ value.arch }} && item {{ value.path }} ${space} {{ value.os | title }} {{ value.version | title }} {{ value.flavor | title }} ||
 {% endif %}
 {% endif %}
 {% endfor %}
 {% endfor %}
 choose path || goto live_menu
 choose path || goto live_menu