diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-05 07:47:36 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-05 07:47:36 +0000 |
commit | 0a23f36bd52f14f68cc394c37ef7a9af0c406caa (patch) | |
tree | 96cf9a72f416f0c2175055e43e1fbe2e3918ef1b /perl-install/install_steps.pm | |
parent | 51fd51c2f560620d0e5c73a824d7677661f9c385 (diff) | |
download | drakx-backup-do-not-use-0a23f36bd52f14f68cc394c37ef7a9af0c406caa.tar drakx-backup-do-not-use-0a23f36bd52f14f68cc394c37ef7a9af0c406caa.tar.gz drakx-backup-do-not-use-0a23f36bd52f14f68cc394c37ef7a9af0c406caa.tar.bz2 drakx-backup-do-not-use-0a23f36bd52f14f68cc394c37ef7a9af0c406caa.tar.xz drakx-backup-do-not-use-0a23f36bd52f14f68cc394c37ef7a9af0c406caa.zip |
big renaming of field {type} to {pt_type},
this will allow defining {fs_type} which will always be a string
whereas {pt_type} will always be a number
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r-- | perl-install/install_steps.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index eda66496e..ec83e3fd9 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -215,7 +215,7 @@ sub doPartitionDisksAfter { cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/nfsimage| && !any { $_->{mntpoint} eq "/mnt/nfs" } @{$o->{all_hds}{nfss}} and - push @{$o->{all_hds}{nfss}}, { type => 'nfs', mntpoint => "/mnt/nfs", device => $1, options => "noauto,ro,nosuid,soft,rsize=8192,wsize=8192" }; + push @{$o->{all_hds}{nfss}}, { pt_type => 'nfs', mntpoint => "/mnt/nfs", device => $1, options => "noauto,ro,nosuid,soft,rsize=8192,wsize=8192" }; } #------------------------------------------------------------------------------ @@ -243,7 +243,7 @@ sub ask_mntpoint_s {#-}}} $m{$m} = 1; #- in case the type does not correspond, force it to ext3 - $_->{type} = 0x483 if $m =~ m|^/| && !isTrueFS($_) && !isOtherAvailableFS($_); + $_->{pt_type} = 0x483 if $m =~ m|^/| && !isTrueFS($_) && !isOtherAvailableFS($_); } 1; } @@ -269,7 +269,7 @@ sub choosePartitionsToFormat($$) { my $t = fsedit::typeOfPart($_->{device}); $_->{toFormatUnsure} ||= #- if detected dos/win, it's not precise enough to just compare the types (too many of them) - (!$t || isOtherAvailableFS({ type => $t }) ? !isOtherAvailableFS($_) : $t != $_->{type}); + (!$t || isOtherAvailableFS({ pt_type => $t }) ? !isOtherAvailableFS($_) : $t != $_->{pt_type}); } } } |