diff options
Diffstat (limited to 'perl-install/standalone/diskdrake')
| -rwxr-xr-x | perl-install/standalone/diskdrake | 113 |
1 files changed, 81 insertions, 32 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index 6696f29f4..7e5645509 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -1,7 +1,7 @@ #!/usr/bin/perl # DiskDrake -# Copyright (C) 1999 MandrakeSoft (pixel@linux-mandrake.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 @@ -23,50 +23,99 @@ use lib qw(/usr/lib/libDrakX); -use common qw(:common :functional); -use diskdrake; -use interactive_gtk; + +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + +use common; +use interactive; use detect_devices; use fsedit; use fs; use log; use c; -local $_ = join '', @ARGV; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/diskdrake_hd.png"; -/-h/ and die "usage: diskdrake [--expert] [--testing]\n"; +my %options; +my @l = @ARGV; +while (my $e = shift @l) { + my ($option) = $e =~ /--?(.*)/ or next; + if ($option =~ /(.*?)=(.*)/) { + $options{$1} = $2; + } else { + $options{$option} = ''; + } +} -$::expert = /-expert/; -$::testing = /-testing/; -$::isStandalone = 1; +my @types = qw(hd nfs smb dav removable fileshare list-hd change-geometry); +my ($type, $para) = ('hd', ''); +foreach (@types) { + if (exists $options{$_}) { + $para = delete $options{$_}; + $type = $_; + last; + } +} +keys %options and die "usage: diskdrake [--expert] [--testing] [--{" . join(",", @types) . "}]\n"; if ($>) { $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; } -#if ($ARGV[0] eq '-l') { -# $@ and print "Error\n"; -# $::expert = 1; -# print diskdrake::get_info($_, $hds->[0]) foreach fsedit::get_fstab($hds->[0]); -# exit !$@; -#} -my $in = interactive_gtk->new; -my $hds = - catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } - sub { - my ($err) = $@ =~ /(.*) at /; - $@ =~ /overlapping/ and $in->ask_warn('', $@), return 1; - $in->ask_okcancel(_("Error"), -[_("I can't read your partition table, it's too corrupted for me :( -I'll try to go on blanking bad partitions"), $err]); - }; - -$SIG{__DIE__} = sub { chomp (my $m = $_[0]); log::l("ERROR: $m") }; -my $fstab = [ fsedit::get_fstab(@$hds) ]; - -fs::get_mntpoints_from_fstab($fstab); -fs::check_mounted($fstab); -diskdrake::main($hds, {}, $in); +my $in = 'interactive'->vnew('su'); + +if ($type eq 'fileshare') { + require any; + any::fileshare_config($in, ''); + $in->exit(0); +} + +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([ 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 fs::get::fstab($all_hds); +} elsif ($type eq 'change-geometry') { + my ($device, undef, $heads, $sectors) = $para =~ /(.+)=(\d+,)?(\d+),(\d+)$/ or die "usage: diskdrake --change-geometry=<device>=[<cylinders>,]<heads>,<sectors>\n"; + 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, ''); +} elsif ($type eq 'removable') { + require diskdrake::removable; + my ($raw_hd) = $para ? + 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 { !fs::get::has_mntpoint($_, $all_hds) } map { "/media/$mntpoint$_" } '', 2 .. 10; + $raw_hd->{is_removable} = 1; #- force removable flag + + require security::level; + require lang; + fs::mount_options::set_default($raw_hd, + security => security::level::get(), + lang::fs_options(lang::read())); + } + diskdrake::removable::main($in, $all_hds, $raw_hd); +} elsif ($type eq 'dav') { + require diskdrake::dav; + diskdrake::dav::main($in, $all_hds); +} else { + $in->ask_warn('', "Sorry only a gtk frontend is available") if !$in->isa('interactive::gtk'); + require diskdrake::smbnfs_gtk; + diskdrake::smbnfs_gtk::main($in, $all_hds, $type); +} $in->exit(0); |