diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-01-20 12:59:55 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-01-20 12:59:55 +0000 |
| commit | d758d6dbc2481a1c8ec01955d90d16890d6a2afc (patch) | |
| tree | 8d3fcb360bd3ab114046e55c3f3151e3b2162ff6 | |
| parent | ce50b8a596980b7af41bd83426c94a5058430163 (diff) | |
| download | drakx-d758d6dbc2481a1c8ec01955d90d16890d6a2afc.tar drakx-d758d6dbc2481a1c8ec01955d90d16890d6a2afc.tar.gz drakx-d758d6dbc2481a1c8ec01955d90d16890d6a2afc.tar.bz2 drakx-d758d6dbc2481a1c8ec01955d90d16890d6a2afc.tar.xz drakx-d758d6dbc2481a1c8ec01955d90d16890d6a2afc.zip | |
fix mount point /tmp/image for the cdrom in generated /etc/fstab
| -rw-r--r-- | perl-install/fs.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm index c1f6ec5d6..797b21836 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -168,10 +168,12 @@ sub merge_info_from_mtab { foreach (@l1, @l2) { log::l("found mounted partition on $_->{device} with $_->{mntpoint}"); - if ($::isInstall && $_->{mntpoint} eq '/tmp/hdimage') { - log::l("found hdimage on $_->{device}"); + if ($::isInstall && $_->{mntpoint} =~ m!/tmp/(image|hdimage)!) { $_->{real_mntpoint} = delete $_->{mntpoint}; - $_->{mntpoint} = common::usingRamdisk() && "/mnt/hd"; #- remap for hd install. + if ($_->{real_mntpoint} eq '/tmp/hdimage') { + log::l("found hdimage on $_->{device}"); + $_->{mntpoint} = common::usingRamdisk() && "/mnt/hd"; #- remap for hd install. + } } $_->{isMounted} = $_->{isFormatted} = 1; delete $_->{options}; |