summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-30 17:20:24 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-30 17:20:24 +0000
commit18aaa8cd39e680fc54116128c24469f7afadb78d (patch)
tree0eadc07e4baaf0908acc03f8e2d5a5a8eb723c22 /perl-install/install_steps.pm
parentef3718f16c93ed0ac9ea6da7bc22730a21bf2c23 (diff)
downloaddrakx-18aaa8cd39e680fc54116128c24469f7afadb78d.tar
drakx-18aaa8cd39e680fc54116128c24469f7afadb78d.tar.gz
drakx-18aaa8cd39e680fc54116128c24469f7afadb78d.tar.bz2
drakx-18aaa8cd39e680fc54116128c24469f7afadb78d.tar.xz
drakx-18aaa8cd39e680fc54116128c24469f7afadb78d.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 36e80e7f1..d0a5b2b21 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -150,8 +150,8 @@ sub doPartitionDisksAfter {
if (my $s = delete $o->{stage1_hd}) {
my ($part) = grep { $_->{device} eq $s->{device} } @{$o->{fstab}};
$part->{isMounted} ?
- symlinkf("$o->{prefix}$part->{mntpoint}", "/tmp/hdimage") :
- eval { fs::mount($s->{dev}, "/tmp/hdimage", $s->{fs}) };
+ do { rmdir "/tmp/hdimage" ; symlinkf("$o->{prefix}$part->{mntpoint}", "/tmp/hdimage") } :
+ eval { fs::mount($s->{device}, "/tmp/hdimage", $s->{type}) };
}
cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/rhimage nfs| &&
@@ -381,8 +381,10 @@ Consoles 1,3,4,7 may also contain interesting information";
#- create /etc/sysconfig/desktop file according to user choice and presence of /usr/bin/kdm or /usr/bin/gdm.
my $f = "$o->{prefix}/etc/sysconfig/desktop";
if ($o->{compssUsersChoice}{KDE} && -x "$o->{prefix}/usr/bin/kdm") {
+ log::l("setting desktop to KDE");
output($f, "KDE\n");
} elsif ($o->{compssUsersChoice}{Gnome} && -x "$o->{prefix}/usr/bin/gdm") {
+ log::l("setting desktop to GNOME");
output($f, "GNOME\n");
}