summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-06-06 12:57:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-06-06 12:57:51 +0000
commitcc61d6c4c26160e9cf3f920ffd02e9b616c3a0d9 (patch)
treee3d7fe18787a12815dfcd38d7b757966989e9db8
parent2d64dfc9f7ef978e86a5bc07c03b683c8eb0c466 (diff)
downloaddrakx-cc61d6c4c26160e9cf3f920ffd02e9b616c3a0d9.tar
drakx-cc61d6c4c26160e9cf3f920ffd02e9b616c3a0d9.tar.gz
drakx-cc61d6c4c26160e9cf3f920ffd02e9b616c3a0d9.tar.bz2
drakx-cc61d6c4c26160e9cf3f920ffd02e9b616c3a0d9.tar.xz
drakx-cc61d6c4c26160e9cf3f920ffd02e9b616c3a0d9.zip
stricter regexp when looking /dev/xxx otherwise it is used also for nfs names
and causes havoc
-rw-r--r--perl-install/fs.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 1af9d6910..c01207220 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -77,11 +77,11 @@ sub read_fstab {
$dev = $h->{device} = $e->{device};
}
}
- if ($dev =~ m,/(tmp|dev)/,) {
+ if ($dev =~ m,^/(tmp|dev)/,) {
($h->{major}, $h->{minor}) = unmakedev((stat "$prefix$dev")[6]);
my $symlink = readlink("$prefix$dev");
- $dev =~ s,/(tmp|dev)/,,;
+ $dev =~ s,^/(tmp|dev)/,,;
if ($symlink =~ m|^[^/]+$|) {
$h->{device_alias} = $dev;