From bc7cd08473b5bbd97504dfe2ec0493c119951249 Mon Sep 17 00:00:00 2001 From: Daniel Tartavel Date: Thu, 25 Oct 2018 17:55:10 +0200 Subject: [PATCH] =?UTF-8?q?Suppression=20de=20la=20configuration=20relativ?= =?UTF-8?q?e=20=C3=A0=20Cauldron?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- default.pxe_config | 31 ++----------------------------- help.txt | 10 ++-------- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/default.pxe_config b/default.pxe_config index a1768b2..5fde66b 100644 --- a/default.pxe_config +++ b/default.pxe_config @@ -8,15 +8,6 @@ F1 help.txt label local LOCALBOOT 0 -label 5 - KERNEL images/vmlinuz-cauldron64 - APPEND initrd=images/cauldron64.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/cauldron/ auto_install=/mageia/distrib/cauldron_auto_inst.cfg.pl root=/dev/ram3 rw - -label 6 - KERNEL images/vmlinuz-cauldron - APPEND initrd=images/cauldron.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/cauldron/ auto_install=/mageia/distrib/cauldron_auto_inst.cfg.pl root=/dev/ram3 rw - - label 2 KERNEL images/vmlinuz-mageia6 APPEND initrd=images/mageia6.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/6/ auto_install=/mageia/distrib/6_auto_inst.cfg.pl root=/dev/ram3 rw @@ -25,15 +16,6 @@ label 1 KERNEL images/vmlinuz-mageia6_64 APPEND initrd=images/mageia6_64.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/6/ auto_install=/mageia/distrib/6_auto_inst.cfg.pl root=/dev/ram3 rw -label 7 - KERNEL images/vmlinuz-cauldron64 - APPEND initrd=images/cauldron64.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/cauldron/ auto_install=/mageia/distrib/cauldron_auto_inst.cfg_fullauto.pl root=/dev/ram3 rw - -label 8 - KERNEL images/vmlinuz-cauldron - APPEND initrd=images/cauldron.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/cauldron/ auto_install=/mageia/distrib/cauldron_auto_inst.cfg_fullauto.pl root=/dev/ram3 rw - - label 4 KERNEL images/vmlinuz-mageia6 APPEND initrd=images/mageia6.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/6/ auto_install=/mageia/distrib/6_auto_inst.cfg_fullauto.pl root=/dev/ram3 rw @@ -42,20 +24,11 @@ label 3 KERNEL images/vmlinuz-mageia6_64 APPEND initrd=images/mageia6_64.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/6/ auto_install=/mageia/distrib/6_auto_inst.cfg_fullauto.pl root=/dev/ram3 rw -label 11 - KERNEL images/vmlinuz-cauldron64 - APPEND initrd=images/cauldron64.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/cauldron/ auto_install=/mageia/distrib/cauldron_auto_inst.cfg_upgrade.pl root=/dev/ram3 rw - -label 12 - KERNEL images/vmlinuz-cauldron - APPEND initrd=images/cauldron.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/cauldron/ auto_install=/mageia/distrib/cauldron_auto_inst.cfg_upgrade.pl root=/dev/ram3 rw - - -label 10 +label 6 KERNEL images/vmlinuz-mageia6 APPEND initrd=images/mageia6.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/6/ auto_install=/mageia/distrib/cauldron_auto_inst.cfg_upgrade.pl root=/dev/ram3 rw -label 9 +label 5 KERNEL images/vmlinuz-mageia6_64 APPEND initrd=images/mageia6_64.rdz ramdisk_size=128000 vga=788 automatic=method:http,interface:auto,network:dhcp,server:192.168.1.253,directory:/mageia/distrib/6/ auto_install=/mageia/distrib/cauldron_auto_inst.cfg_upgrade.pl root=/dev/ram3 rw diff --git a/help.txt b/help.txt index 6426aa7..21c3e0e 100644 --- a/help.txt +++ b/help.txt @@ -5,11 +5,5 @@ Par défaut Mageia 6 64 bits 2 : Mageia 6 32 bits 3 : Mageia 6 64 bits full auto ( DANGER: supprime toutes les partitions ) 4 : Mageia 6 32 bits full auto ( DANGER: supprime toutes les partitions ) -5 : Cauldron 64 bits -6 : Cauldron 32 bits -7 : Cauldron 64 bits full auto ( DANGER: supprime toutes les partitions ) -8 : Cauldron 32 bits full auto ( DANGER: supprime toutes les partitions ) -9 : Mageia 6 64 bits upgrade from Mageia 5 64 bits -10: Mageia 6 32 bits upgrade from Mageia 5 64 bits -11: Cauldron 64 bits upgrade from Mageia 6 64 bits -12: Cauldron 32 bits upgrade from Mageia 6 64 bits +5 : Mageia 6 64 bits upgrade from Mageia 5 64 bits +6 : Mageia 6 32 bits upgrade from Mageia 5 64 bits