From dcf7b4e2a9b84679117ae8006c418a9134431fc8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 5 Aug 2004 03:37:58 +0000
Subject: fix backward compatibility {type} field in partitions and manualFstab

---
 perl-install/install_any.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_any.pm')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 0b1ce16b6..5b5b5e32f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -987,8 +987,12 @@ sub loadO {
 
     #- handle backward compatibility for things that changed
     foreach (@{$o->{partitions} || []}, @{$o->{manualFstab} || []}) {
-	if (my $pt_type = delete $_->{type}) {
-	    fs::type::set_pt_type($_, $pt_type);
+	if (my $type = delete $_->{type}) {
+	    if ($type =~ /^(0x)?(\d*)$/) {
+		fs::type::set_pt_type($_, $type);
+	    } else {
+		fs::type::set_fs_type($_, $type);
+	    }
 	}
     }
 
-- 
cgit v1.2.1