From f09c8bbb0b555c60e681ed4f9bbab7773c61c7cf Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 15 May 2001 10:02:23 +0000
Subject: added missing Aurora, added icewm-light that may be usefull.

---
 rescue/tree/etc/oem | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'rescue')

diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index 078eaf05a..1efea7457 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -102,7 +102,11 @@ $hd_size > $min_size or die "hard disk is too small to contain oem install (${hd
 
 my ($fat_pos, $resize_fat_size, $root_size);
 if (@hd_parts == 1 && $hd_parts[$fat_pos = 0]{fstype} eq 'FAT' ||
-    @hd_parts == 2 && $hd_parts[0]{type} eq 'extended' && $hd_parts[$fat_pos = 1]{fstype} eq 'FAT') {
+    @hd_parts == 2 && $hd_parts[0]{type} eq 'primary' && $hd_parts[$fat_pos = 1]{fstype} eq 'FAT' ||
+    @hd_parts == 3 && $hd_parts[0]{type} eq 'primary' && $hd_parts[1]{type} eq 'primary' && $hd_parts[$fat_pos = 2]{fstype} eq 'FAT' ||
+    @hd_parts == 2 && $hd_parts[0]{type} eq 'extended' && $hd_parts[$fat_pos = 1]{fstype} eq 'FAT' ||
+    @hd_parts == 3 && $hd_parts[0]{type} eq 'extended' && $hd_parts[1]{type} eq 'primary' && $hd_parts[$fat_pos = 5]{fstype} eq 'FAT' ||
+    @hd_parts == 3 && $hd_parts[0]{type} eq 'primary' && $hd_parts[1]{type} eq 'extended' && $hd_parts[$fat_pos = 5]{fstype} eq 'FAT') {
     if ($hd_size - $hd_parts[$fat_pos]{end} > $min_size) {
 	#- check first if there are some available space left on the disk.
 	#- so we are using it, root_size is fixed to match hard disk size.
@@ -126,7 +130,7 @@ unless ($root_size) {
 
 #- launch parted to edit partition table, start at minor.
 #- point define where we start.
-my $minor = defined $resize_fat_size && $fat_pos > 0 ? 6 : 5;
+my $minor = defined $resize_fat_size && $hd_parts[0]{type} eq 'extended' ? 6 : 5;
 my $point = 0.0;
 
 if (defined $resize_fat_size) {
@@ -460,9 +464,9 @@ sub select_packages {
     pkgs::setSelectedFromCompssList($o->{packages}, $o->{compssUsersChoice}, 4, 0);
 
     #- package that have to selected here as a bonus for oem install.
-    foreach (qw(cups cups-drivers drakprofile draksync irda-utils numlock raidtools reiserfs-utils
+    foreach (qw(cups cups-drivers drakprofile draksync irda-utils numlock raidtools reiserfs-utils icewm-light
 		Mesa Mesa-demos alsa alsa-utils
-		Aurora xawtv kwintv xscreensaver-gl Mesa-demos xmms-mesa bzflag csmash gltron spacecup chromium tuxracer
+		xawtv kwintv xscreensaver-gl Mesa-demos xmms-mesa bzflag csmash gltron spacecup chromium tuxracer
                 glibc vim-minimal kernel kernel22
 		sox aumix xawtv gatos kwintv sane-frontends gphoto gnome-toaster gcombust xcdroast apmd cdlabelgen
                )) {
@@ -472,7 +476,7 @@ sub select_packages {
 
     #- special packages that are to be move to closure always ...
     foreach (qw(kernel-smp kernel-linus kernel-secure hackkernel-smp hackkernel-linus hackkernel-secure
-		Aurora xawtv kwintv xscreensaver-gl xmms-mesa bzflag csmash gltron spacecup chromium tuxracer
+		xawtv kwintv xscreensaver-gl xmms-mesa bzflag csmash gltron spacecup chromium tuxracer
 		kernel22-smp kernel22-secure alsa imwheel nfs-utils-clients lvm usbd reiserfsprogs
 		sox aumix xawtv gatos kwintv sane-frontends gphoto gnome-toaster gcombust xcdroast apmd cdlabelgen
 		)) {
-- 
cgit v1.2.1