summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-02-14 14:50:43 +0000
committerColin Guthrie <colin@mageia.org>2013-02-14 14:50:43 +0000
commitc52383f56f1cdf26b8acd2b89a296cc8d5e44966 (patch)
treed3304a565c21e615d6e8f9294b19d1177eb71f90 /perl-install
parentecd8db27c8ffb76ebf799e0de0dcf64c3ce256fe (diff)
downloaddrakx-c52383f56f1cdf26b8acd2b89a296cc8d5e44966.tar
drakx-c52383f56f1cdf26b8acd2b89a296cc8d5e44966.tar.gz
drakx-c52383f56f1cdf26b8acd2b89a296cc8d5e44966.tar.bz2
drakx-c52383f56f1cdf26b8acd2b89a296cc8d5e44966.tar.xz
drakx-c52383f56f1cdf26b8acd2b89a296cc8d5e44966.zip
(call_blkid) add a code comment about blkid -p to prevent accidental revert in the future
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs/type.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 528804655..174cbe222 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -271,6 +271,7 @@ sub fs_type_from_magic {
sub call_blkid {
my ($part) = @_;
+ # IMPORTANT: Always use the -p argument with blkid. See r7324 commit msg
my %h = map {
if_(/(.*?)=(.*)/, $1 => $2);
} run_program::get_stdout_raw({ timeout => 30 }, 'blkid', '2>', '/dev/null', '-o', 'udev', '-p', devices::make($part->{device}));