diff options
Diffstat (limited to 'perl-install/standalone/diskdrake')
| -rwxr-xr-x | perl-install/standalone/diskdrake | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index a9966f804..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,6 +34,8 @@ use fs; use log; use c; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/diskdrake_hd.png"; + my %options; my @l = @ARGV; while (my $e = shift @l) { @@ -73,41 +75,36 @@ my $all_hds = fsedit::get_hds({}, $in); fs::get_raw_hds('', $all_hds); -fs::get_info_from_fstab($all_hds, ''); -fs::merge_info_from_mtab([ fsedit::get_really_all_fstab($all_hds) ]); +fs::get_info_from_fstab($all_hds); +fs::merge_info_from_mtab([ fs::get::really_all_fstab($all_hds) ]); $all_hds->{current_fstab} = fs::fstab_to_string($all_hds, ''); if ($type eq 'list-hd') { - print partition_table::description($_), "\n" foreach fsedit::get_all_fstab($all_hds); + print partition_table::description($_), "\n" foreach fs::get::fstab($all_hds); } elsif ($type eq 'change-geometry') { - $para =~ s|^/dev/||; my ($device, undef, $heads, $sectors) = $para =~ /(.+)=(\d+,)?(\d+),(\d+)$/ or die "usage: diskdrake --change-geometry=<device>=[<cylinders>,]<heads>,<sectors>\n"; - my $hd = find { $_->{device} eq $device } @{$all_hds->{hds}}; + my $hd = fs::get::device2part($device, $all_hds->{hds}); put_in_hash($hd->{geom}, { heads => $heads, sectors => $sectors }); $hd->{isDirty} = 1; 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; - $para =~ s|^/dev/||; my ($raw_hd) = $para ? - first(grep { $para eq $_->{device} } @{$all_hds->{raw_hds}}) || die "unknown removable $para\n" : + fs::get::device2part($para, $all_hds->{raw_hds}) || die "unknown removable $para\n" : $in->ask_from_listf('', '', \&diskdrake::interactive::format_raw_hd_info, $all_hds->{raw_hds}) or $in->exit(0); if (!$raw_hd->{mntpoint}) { my $mntpoint = detect_devices::suggest_mount_point($raw_hd); - $raw_hd->{mntpoint} ||= find { !fsedit::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::set_default_options($raw_hd, - useSupermount => $useSupermount, + fs::mount_options::set_default($raw_hd, security => security::level::get(), lang::fs_options(lang::read())); } |