diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-08-03 05:41:59 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-08-03 05:41:59 +0000 |
commit | f8d30c05a05c1c01b3f8a758c54f4af07d7b114e (patch) | |
tree | 195d64c8532c126b49c0e71f649d08fbfe8f330b /perl-install/standalone | |
parent | 607de8e2fa2b83e8b9cefd4ced24d3b4e24fc007 (diff) | |
download | drakx-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar drakx-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar.gz drakx-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar.bz2 drakx-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar.xz drakx-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.zip |
many functions in fsedit don't modify anything, they are simply accessors.
create fs::get and move them into it
- device2part(), up_mount_point() moved from fs to fs::get
- part2hd(), file2part(), has_mntpoint(), mntpoint2part(), empty_all_hds() moved from fsedit to fs::get
- fsedit::get_root() -> fs::get::root()
- fsedit::get_root_() -> fs::get::root_()
- fsedit::get_really_all_fstab() -> fs::get::really_all_fstab()
- fsedit::get_all_fstab_and_holes() -> fs::get::fstab_and_holes()
- fsedit::get_all_fstab() -> fs::get::fstab()
- fsedit::get_all_holes() -> fs::get::holes()
- fsedit::all_free_space -> fs::get::free_space()
- fsedit::get_really_all_fstab() -> fs::get::really_all_fstab()
- fsedit::get_fstab_and_holes() -> fs::get::hds_fstab_and_holes()
- fsedit::get_holes() -> fs::get::hds_holes()
- fsedit::get_fstab() -> fs::get::hds_fstab()
- fsedit::free_space() -> fs::get::hds_free_space()
- fsedit::get_visible_fstab() unused, removed
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-x | perl-install/standalone/bootloader-config | 4 | ||||
-rwxr-xr-x | perl-install/standalone/diskdrake | 6 | ||||
-rwxr-xr-x | perl-install/standalone/drakboot | 2 | ||||
-rwxr-xr-x | perl-install/standalone/drakupdate_fstab | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config index 56245dcd3..cf2fbcb56 100755 --- a/perl-install/standalone/bootloader-config +++ b/perl-install/standalone/bootloader-config @@ -57,7 +57,7 @@ my $all_hds = fsedit::get_hds(); fs::get_info_from_fstab($all_hds, ''); my $hds = $all_hds->{hds}; -my $bootloader = bootloader::read([ fsedit::get_fstab(@$hds) ]) or die "Cannot find a boot loader installed\n"; +my $bootloader = bootloader::read([ fs::get::fstab($all_hds) ]) or die "Cannot find a boot loader installed\n"; $action =~ s/-/_/g; @@ -100,7 +100,7 @@ sub add_kernel() { my $kernel_str = bootloader::vmlinuz2kernel_str($image); - my $root_part = fsedit::get_root([ fsedit::get_fstab(@$hds) ]); + my $root_part = fs::get::root([ fs::get::fstab($all_hds) ]); my %opts = ( root => "/dev/$root_part->{device}", initrd_options => $initrd_options, diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index f8fbda251..870d115b0 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -74,12 +74,12 @@ 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::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,7 +100,7 @@ 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'; diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index b03056148..d6b72bdde 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -44,7 +44,7 @@ my $in = 'interactive'->vnew('su'); my $all_hds = fsedit::get_hds(); fs::get_raw_hds('', $all_hds); fs::get_info_from_fstab($all_hds, ''); -my $fstab = [ fsedit::get_all_fstab($all_hds) ]; +my $fstab = [ fs::get::fstab($all_hds) ]; my $bootloader = bootloader::read($fstab); if (!$in->isa('interactive::gtk') || any { /^--boot$/ } @ARGV) { diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab index 77c07ef89..711df4e45 100755 --- a/perl-install/standalone/drakupdate_fstab +++ b/perl-install/standalone/drakupdate_fstab @@ -108,7 +108,7 @@ sub set_mount_point { $mntpoint = "/mnt/$mntpoint"; foreach ('', 2 .. 10) { - next if fsedit::mntpoint2part("$mntpoint$_", $fstab); + next if fs::get::mntpoint2part("$mntpoint$_", $fstab); $part->{mntpoint} = "$mntpoint$_"; return 1; } |