diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-12-27 21:47:08 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-12-27 21:47:08 +0000 |
| commit | 878d786d14319e5cd8305d4d678e49c64dd9cc07 (patch) | |
| tree | 3655a4b7305c2a4fcb7e8e049a661a7e6026127a /perl-install/install_any.pm | |
| parent | a5a0b5ba7e8ed4d5a0722dd9f88e3521119b2545 (diff) | |
| download | drakx-878d786d14319e5cd8305d4d678e49c64dd9cc07.tar drakx-878d786d14319e5cd8305d4d678e49c64dd9cc07.tar.gz drakx-878d786d14319e5cd8305d4d678e49c64dd9cc07.tar.bz2 drakx-878d786d14319e5cd8305d4d678e49c64dd9cc07.tar.xz drakx-878d786d14319e5cd8305d4d678e49c64dd9cc07.zip | |
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 139ef21a8..11b9c56a2 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -595,34 +595,34 @@ sub kdeicons_postinstall($) { open F, "$prefix/etc/fstab" or log::l("failed to read $prefix/etc/fstab"), return; foreach (<F>) { - if (/^\/dev\/(\S+)\s+\/mnt\/cdrom (\d*)\s+/x) { + if (m|^/dev/(\S+)\s+/mnt/cdrom(\d*)\s+|) { my %toreplace = ( device => $1, id => $2 ); template2userfile($prefix, "/usr/share/cdrom.fsdev.kdelnk.in", "Desktop/Cd-Rom". ($2 && "_$2") .".kdelnk", 1, %toreplace); - } elsif (/^\/dev\/(\S+)\s+\/mnt\/zip (\d*)\s+/x) { + } elsif (m|^/dev/(\S+)\s+/mnt/zip(\d*)\s+|) { my %toreplace = ( device => $1, id => $2 ); template2userfile($prefix, "/usr/share/zip.fsdev.kdelnk.in", "Desktop/Zip". ($2 && "_$2") .".kdelnk", 1, %toreplace); - } elsif (/^\/dev\/(\S+)\s+\/mnt\/floppy (\d*)\s+/x) { + } elsif (m|^/dev/(\S+)\s+/mnt/floppy(\d*)\s+|) { my %toreplace = ( device => $1, id => $2 ); template2userfile($prefix, "/usr/share/floppy.fsdev.kdelnk.in", "Desktop/Floppy". ($2 && "_$2") .".kdelnk", 1, %toreplace); - } elsif (/^\/mnt\/cdrom (\d*)\s+\/mnt\/cdrom\d*\s+supermount/x) { + } elsif (m|^/mnt/cdrom(\d*)\s+/mnt/cdrom\d*\s+supermount|) { my %toreplace = ( id => $1 ); - template2userfile($prefix, "/usr/share/cdrom.kdelnk.in", "Desktop/Cd-Rom". ($2 && "_$2") .".kdelnk", + template2userfile($prefix, "/usr/share/cdrom.kdelnk.in", "Desktop/Cd-Rom". ($1 && "_$1") .".kdelnk", 1, %toreplace); - } elsif (/^\/mnt\/zip (\d*)\s+\/mnt\/zip\d*\s+supermount/x) { + } elsif (m|^/mnt/zip(\d*)\s+/mnt/zip\d*\s+supermount|) { my %toreplace = ( id => $1 ); - template2userfile($prefix, "/usr/share/zip.kdelnk.in", "Desktop/Zip". ($2 && "_$2") .".kdelnk", + template2userfile($prefix, "/usr/share/zip.kdelnk.in", "Desktop/Zip". ($1 && "_$1") .".kdelnk", 1, %toreplace); - } elsif (/^\/mnt\/floppy (\d*)\s+\/mnt\/floppy\d*\s+supermount/x) { + } elsif (m|^/mnt/floppy(\d*)\s+/mnt/floppy\d*\s+supermount|) { my %toreplace = ( id => $1 ); - template2userfile($prefix, "/usr/share/floppy.kdelnk.in", "Desktop/Floppy". ($2 && "_$2") .".kdelnk", + template2userfile($prefix, "/usr/share/floppy.kdelnk.in", "Desktop/Floppy". ($1 && "_$1") .".kdelnk", 1, %toreplace); - } elsif (/^\/dev\/(\S+)\s+\/mnt\/DOS_ (\S*)\s+/x) { - my %toreplace = ( device => $1, id => $2, mntpoint => "/mnt/DOS_$2" ); + } elsif (m|^/dev/(\S+)\s+(/mnt/DOS_\S*)\s+|) { + my %toreplace = ( device => $1, id => $2, mntpoint => $2 ); template2userfile($prefix, "/usr/share/Dos_.kdelnk.in", "Desktop/Dos_$2.kdelnk", 1, %toreplace); - } elsif (/^\/dev\/(\S+)\s+(\S*)\s+vfat\s+/x) { + } elsif (m|^/dev/(\S+)\s+(\S*)\s+vfat\s+|) { my %toreplace = ( device => $1, id => $1, mntpoint => $2 ); template2userfile($prefix, "/usr/share/Dos_.kdelnk.in", "Desktop/Dos_$1.kdelnk", 1, %toreplace); } |