From d0425d581b273b3d62f4294c200b46d70ad29da2 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Mon, 28 Sep 2015 23:25:06 +0200 Subject: [PATCH] Managed repo/norepo preseed based on Virtual machine status, as usual. --- roles/kickstart/tasks/kickstart.yml | 4 +++- roles/pxe/templates/pxelinux.cfg/default | 18 +++--------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/roles/kickstart/tasks/kickstart.yml b/roles/kickstart/tasks/kickstart.yml index 60bbe6a..081e63f 100644 --- a/roles/kickstart/tasks/kickstart.yml +++ b/roles/kickstart/tasks/kickstart.yml @@ -61,12 +61,14 @@ template: src: preseed/edubuntu.seed dest: /var/lib/nethserver/ibay/ks/preseed/edubuntu.seed + when: ansible_bios_version != "VirtualBox" sudo: yes - name: Copia preseed senza repo copy: src: preseed/edubuntu-nomirror.seed - dest: /var/lib/nethserver/ibay/ks/preseed/edubuntu-nomirror.seed + dest: /var/lib/nethserver/ibay/ks/preseed/edubuntu.seed + when: ansible_bios_version == "VirtualBox" sudo: yes - name: Copia script post-installazione per client diff --git a/roles/pxe/templates/pxelinux.cfg/default b/roles/pxe/templates/pxelinux.cfg/default index 8da6bd4..7d09ffc 100644 --- a/roles/pxe/templates/pxelinux.cfg/default +++ b/roles/pxe/templates/pxelinux.cfg/default @@ -23,29 +23,17 @@ MENU BEGIN MENU TITLE Edubuntu Classica LABEL edubuntu-64 - MENU LABEL Installa Edubuntu 64 bit (nomirror) - LINUX /ubuntu/14.04/amd64/linux - INITRD /ubuntu/14.04/amd64/initrd.gz - APPEND locale=it_IT.UTF-8 keyboard-configuration/layoutcode=it url=http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/edubuntu-nomirror.seed - -LABEL edubuntu-64-mirr - MENU LABEL Installa Edubuntu 64 bit (con mirror) + MENU LABEL Installa Edubuntu 64 bit LINUX /ubuntu/14.04/amd64/linux INITRD /ubuntu/14.04/amd64/initrd.gz APPEND locale=it_IT.UTF-8 keyboard-configuration/layoutcode=it url=http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/edubuntu.seed LABEL edubuntu-32 - MENU LABEL Installa Edubuntu 32 bit (nomirror) - LINUX /ubuntu/14.04/i386/linux - INITRD /ubuntu/14.04/i386/initrd.gz - APPEND locale=it_IT.UTF-8 keyboard-configuration/layoutcode=it url=http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/edubuntu-nomirror.seed - -LABEL edubuntu-32-mirr - MENU LABEL Installa Edubuntu 32 bit (con mirror) + MENU LABEL Installa Edubuntu 32 bit LINUX /ubuntu/14.04/i386/linux INITRD /ubuntu/14.04/i386/initrd.gz APPEND locale=it_IT.UTF-8 keyboard-configuration/layoutcode=it url=http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/edubuntu.seed - + MENU SEPARATOR LABEL return-edu