diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-04-25 12:26:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-04-25 12:26:16 +0000 |
| commit | 126777bc019a54afb4ec51299f2cf9d2841698aa (patch) | |
| tree | 97f76e571902ead55ba138f1156a4b4f00b9b779 /perl-install/standalone/diskdrake | |
| parent | f1f67448efc714873378dfeb8279fae68054a90a (diff) | |
| download | drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.gz drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.bz2 drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.xz drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.zip | |
re-sync after the big svn loss
Diffstat (limited to 'perl-install/standalone/diskdrake')
| -rwxr-xr-x | perl-install/standalone/diskdrake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index a3f2cb74f..a1c09ccd0 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -1,7 +1,7 @@ #!/usr/bin/perl # DiskDrake -# Copyright (C) 1999-2005 Mandriva (pixel@mandrakesoft.com) +# Copyright (C) 1999-2006 Mandriva (pixel@mandrakesoft.com) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -90,8 +90,7 @@ if ($type eq 'list-hd') { partition_table::write($hd); } elsif ($type eq 'hd') { require diskdrake::interactive; - diskdrake::interactive::main($in, $all_hds, 0, '', sub { - exec("drakhelp --id diskdrake") unless fork() }); + diskdrake::interactive::main($in, $all_hds, ''); } elsif ($type eq 'removable') { require diskdrake::removable; my ($raw_hd) = $para ? @@ -100,7 +99,7 @@ if ($type eq 'list-hd') { if (!$raw_hd->{mntpoint}) { my $mntpoint = detect_devices::suggest_mount_point($raw_hd); - $raw_hd->{mntpoint} ||= find { !fs::get::has_mntpoint($_, $all_hds) } map { "/mnt/$mntpoint$_" } '', 2 .. 10; + $raw_hd->{mntpoint} ||= find { !fs::get::has_mntpoint($_, $all_hds) } map { "/media/$mntpoint$_" } '', 2 .. 10; $raw_hd->{is_removable} = 1; #- force removable flag my $useSupermount = 'magicdev'; |