diff options
| author | Florent Villard <warly@mandriva.com> | 2004-10-26 15:39:48 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2004-10-26 15:39:48 +0000 |
| commit | 6232ba7d7aa0ffb1a0f75cbaf559430f9671685a (patch) | |
| tree | 5d20a7193ff8d021f1fb1e163e61659e47e7c991 | |
| parent | a0e443600dce2622570bef00eb2ece83c78664e1 (diff) | |
| download | drakx-backup-do-not-use-6232ba7d7aa0ffb1a0f75cbaf559430f9671685a.tar drakx-backup-do-not-use-6232ba7d7aa0ffb1a0f75cbaf559430f9671685a.tar.gz drakx-backup-do-not-use-6232ba7d7aa0ffb1a0f75cbaf559430f9671685a.tar.bz2 drakx-backup-do-not-use-6232ba7d7aa0ffb1a0f75cbaf559430f9671685a.tar.xz drakx-backup-do-not-use-6232ba7d7aa0ffb1a0f75cbaf559430f9671685a.zip | |
include support of the oem configuration file to display the correct product name
| -rw-r--r-- | perl-install/install_any.pm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 1348fc5dc..aa4eecfca 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -1061,8 +1061,18 @@ sub find_root_parts { if ($s) { chomp($s); $s =~ s/\s+for\s+\S+//; + my $oem_file = "$handle->{dir}/etc/sysconfig/oem"; + my $t; + if (-f $oem_file) { + my $oem = cat_("$handle->{dir}/etc/sysconfig/oem") if -f "$handle->{dir}/etc/sysconfig/oem"; + my ($company) = $oem =~ /company=(.*)/i; + my ($system) = $oem =~ /system=(.*)/i; + my ($product) = $oem =~ /product=(.*)/i; + $t = "$company $system $product" + } + $t ||= $s; log::l("find_root_parts found $_->{device}: $s"); - { release => $s, part => $_ }; + { release => $t, real_release => $s, part => $_ }; } else { () } } @$fstab; } |