summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-13 04:33:50 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-13 04:33:50 +0000
commit967d8ec6e7be57b1cdfc4ff1538044bc07b4db53 (patch)
tree9058f29a529d3b7a9ef15cc0cd5624c0f2f5396f
parent4b962e51805bd35269788b7e7fb96b84635651c8 (diff)
downloaddrakx-967d8ec6e7be57b1cdfc4ff1538044bc07b4db53.tar
drakx-967d8ec6e7be57b1cdfc4ff1538044bc07b4db53.tar.gz
drakx-967d8ec6e7be57b1cdfc4ff1538044bc07b4db53.tar.bz2
drakx-967d8ec6e7be57b1cdfc4ff1538044bc07b4db53.tar.xz
drakx-967d8ec6e7be57b1cdfc4ff1538044bc07b4db53.zip
move functions using /proc/partitions out of fsedit to fs::proc_partitions
-rwxr-xr-xrescue/guessmounts4
-rwxr-xr-xrescue/lsparts4
-rwxr-xr-xrescue/restore_ms_boot6
3 files changed, 9 insertions, 5 deletions
diff --git a/rescue/guessmounts b/rescue/guessmounts
index 76aff3b4c..3f3a4e208 100755
--- a/rescue/guessmounts
+++ b/rescue/guessmounts
@@ -15,7 +15,7 @@
use lib qw(../perl-install /usr/lib/libDrakX);
use common;
use fs;
-
+use fs::proc_partitions;
my @proc_mounts = fs::read_fstab('', '/proc/mounts');
@@ -36,7 +36,7 @@ mkdir_p($target);
my @fstab;
my $root;
-foreach (devices::read_proc_partitions_raw()) {
+foreach (fs::proc_partitions::read_raw()) {
my $dev = devices::make($_->{dev});
my $fs = find {
diff --git a/rescue/lsparts b/rescue/lsparts
index 8dff460d2..9f0fac925 100755
--- a/rescue/lsparts
+++ b/rescue/lsparts
@@ -18,8 +18,8 @@
use lib qw(../perl-install /usr/lib/libDrakX);
use common;
-use devices;
use fs::type;
+use fs::proc_partitions;
my $params = join '', @ARGV;
my $verbose = $params =~ /-v/;
@@ -27,7 +27,7 @@ my $verbose = $params =~ /-v/;
$params =~ /-h/ and die "usage: lsparts [-v]\n";
-foreach (devices::read_proc_partitions_raw()) {
+foreach (fs::proc_partitions::read_raw()) {
if (my $err = $_->{size} <= 1 ?
"Skipping <$_->{dev}> because too little blocks ($_->{size})" :
$_->{dev} !~ /\d$/ ?
diff --git a/rescue/restore_ms_boot b/rescue/restore_ms_boot
index c9eaf550e..b31fd112e 100755
--- a/rescue/restore_ms_boot
+++ b/rescue/restore_ms_boot
@@ -16,12 +16,13 @@ use lib qw(../perl-install /usr/lib/libDrakX);
use common;
use bootloader;
use fs;
+use fs::proc_partitions;
my @choices = map {
my $type = typeFromMagic(devices::make($_->{dev}));
if_($type && member($type, bootloader::main_method_choices()) , [ $_->{dev}, $type ]);
-} devices::read_proc_partitions_raw();
+} fs::proc_partitions::read_raw();
my $choice;
@@ -54,6 +55,9 @@ Ok? <press Enter to continue, 'n' and Enter to cancel> ";
#-------------------------------------------------
#- $Log$
+#- Revision 1.5 2005/06/13 04:33:50 prigaux
+#- move functions using /proc/partitions out of fsedit to fs::proc_partitions
+#-
#- Revision 1.4 2005/05/19 08:59:54 prigaux
#- rewrite using DrakX modules
#-