diff options
Diffstat (limited to 'perl-install/standalone/diskdrake')
| -rwxr-xr-x | perl-install/standalone/diskdrake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index 8d9854a9f..7e5645509 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -1,7 +1,7 @@ #!/usr/bin/perl # DiskDrake -# Copyright (C) 1999-2004 Mandrakesoft (pixel@mandrakesoft.com) +# Copyright (C) 1999-2008 Mandriva (pixel) # # 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 @@ -34,7 +34,7 @@ use fs; use log; use c; -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/diskdrake_hd.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/diskdrake_hd.png"; my %options; my @l = @ARGV; @@ -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,14 +99,12 @@ 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'; require security::level; require lang; fs::mount_options::set_default($raw_hd, - useSupermount => $useSupermount, security => security::level::get(), lang::fs_options(lang::read())); } |