diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-01-28 13:28:29 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-01-28 13:28:29 +0000 |
commit | deb13a1ee5fd5ce2373468c0d9e7d08ea8b94b7d (patch) | |
tree | 5e0e55cc9a41b5e91bf9c21e8846bc03df47c471 | |
parent | c7c6053d6513768bc52100dae3e8a8b7ee035f8c (diff) | |
download | drakx-deb13a1ee5fd5ce2373468c0d9e7d08ea8b94b7d.tar drakx-deb13a1ee5fd5ce2373468c0d9e7d08ea8b94b7d.tar.gz drakx-deb13a1ee5fd5ce2373468c0d9e7d08ea8b94b7d.tar.bz2 drakx-deb13a1ee5fd5ce2373468c0d9e7d08ea8b94b7d.tar.xz drakx-deb13a1ee5fd5ce2373468c0d9e7d08ea8b94b7d.zip |
- fix handling LVM VGs with "-" in the name (#37267)
-rw-r--r-- | perl-install/install/NEWS | 1 | ||||
-rw-r--r-- | perl-install/lvm.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index e65624a97..6a05e333e 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- fix handling LVM VGs with "-" in the name (#37267) - call X with -nolisten tcp to avoid "security" issues (#18320) (nb: this implies "xhost+" helper prog is not useful anymore) - do not propose ext4dev filesystem during install (#37157) diff --git a/perl-install/lvm.pm b/perl-install/lvm.pm index f33b22522..28a7cb41a 100644 --- a/perl-install/lvm.pm +++ b/perl-install/lvm.pm @@ -15,7 +15,7 @@ use run_program; #- for partition_table_xxx emulation sub new { my ($class, $name) = @_; - $name =~ s/\W/_/g; + $name =~ s/[^\w-]/_/g; $name = substr($name, 0, 63); # max length must be < NAME_LEN / 2 where NAME_LEN is 128 bless { disks => [], VG_name => $name }, $class; } |