diff options
Diffstat (limited to 'perl-install/standalone/diskdrake')
| -rwxr-xr-x | perl-install/standalone/diskdrake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index f8fbda251..77d30bedc 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -34,6 +34,8 @@ use fs; use log; use c; +$ugtk2::wm_icon = "/usr/share/mcc/themes/default/diskdrake_hd.png"; + my %options; my @l = @ARGV; while (my $e = shift @l) { @@ -73,13 +75,13 @@ 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"; @@ -100,13 +102,13 @@ if ($type eq 'list-hd') { 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 { "/mnt/$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, + fs::mount_options::set_default($raw_hd, useSupermount => $useSupermount, security => security::level::get(), lang::fs_options(lang::read())); |