Merge branch 'master' of https://git.labolyon.fr/DTux/config_pxe_lalis

auto_inst.cfg.pl

@@ -782,42 +782,6 @@ $o = {
 			'timeout' => 5,
 			'crushMbr' => 1,
 		},
-       'partitioning' => {
-			   'auto_allocate' => '1',
-			   'clearall' => 1,
-			   'eraseBadPartitions' => 0,
-			   'no_bad_drives' => 0,
-			 },
-       'partitions' => [
-			{
-			   'fs_type' => 'ext4',
-			   'hd' => 'sda',
-			   'mntpoint' => '/boot',
-			   'options' => 'relatime,acl',
-			   'size' => 1562500
-			 },
-			 {
-			   'fs_type' => 'ext4',
-			   'hd' => 'sda',
-			   'mntpoint' => '/',
-			   'options' => 'relatime,acl',
-			   'size' => 39062500
-			 },
-			 {
-			   'fs_type' => 'swap',
-			   'hd' => 'sda',
-			   'mntpoint' => 'swap',
-			   'options' => 'defaults',
-			   'size' => 7812500
-			 },
-			 {
-			   'fs_type' => 'ext4',
-			   'hd' => 'sda',
-			   'mntpoint' => '/home',
-			   'options' => 'relatime,acl',
-			   'ratio' => 100
-			 },
-		       ],
        'security' => 1,
        'security_user' => undef,
        'superuser' => {
@@ -838,8 +802,8 @@ $o = {
 		      'gid' => undef,
 		      'groups' => [],
 		      'icon' => 'default',
-		      'name' => 'utilisateur',
+		      'name' => 'lalis',
-		      'password' => 'utilisateur',
+		      'password' => 'lalis',
 		      'realname' => undef,
 		      'shell' => '/bin/bash',
 		      'uid' => undef

auto_inst.cfg_upgrade.pl

@@ -4,19 +4,7 @@
 # You can do this with 'perl -cw auto_inst.cfg.pl' or by executing this file
 # (note the '#!/usr/bin/perl -cw' on the first line).
 $o = {
-       'X' => {
+		'isUpgrade' => 1,
-				'monitors' => [
-				{
-				  'VendorName' => 'Plug\'n Play',
-				  'manually_chosen' => 1
-				}
-			      ],
-			'resolution_wanted' => 'x'
-			},
-       'authentication' => {
-			     'sha512' => 1,
-			     'shadow' => 1
-			   },
 		'autoExitInstall' => '1',
 		'default_packages' => [
 			'acpi',
@@ -727,29 +715,6 @@ $o = {
 			'numlock' => 1,
 			'HDPARM' => 1
 		},
-       'mouse' => {
-		    'EmulateWheel' => undef,
-		    'MOUSETYPE' => 'ps/2',
-		    'Protocol' => 'ExplorerPS/2',
-		    'device' => 'input/mice',
-		    'evdev_mice' => [
-				      {
-					'HWheelRelativeAxisButtons' => '7 6',
-					'device' => '/dev/input/by-id/usb-noserial-event-mouse'
-				      }
-				    ],
-		    'evdev_mice_all' => [
-					  {
-					    'HWheelRelativeAxisButtons' => '7 6',
-					    'device' => '/dev/input/by-id/usb-noserial-event-mouse'
-					  }
-					],
-		    'name' => 'Any PS/2 & USB mice',
-		    'nbuttons' => 7,
-		    'synaptics' => undef,
-		    'type' => 'Universal',
-		    'wacom' => []
-		  },
 		'net' => {
 			'PROFILE' => 'default',
 			'ethernet' => {},

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
+label 6
-    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
     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
 

help.txt

@@ -1,15 +1,9 @@
 Images disponibles:
 ---------------------
-Par défaut Mageia 6 64 bits
+Par défaut Mageia 6 64 bits ( option 1 )
 1 : 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
+5 : Mageia 6 64 bits upgrade from Mageia 5 64 bits
-6 : Cauldron 32 bits
+6 : Mageia 6 32 bits upgrade from Mageia 5 64 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