From 91d0f33533c1f8060a997a83ba9916a15d756aa7 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sat, 20 Jul 2002 10:17:42 +0000 Subject: (devfssymlinkf): use devfs names for devfs/conf.d/xxx.conf, but not for the symlink in /dev (which is used when devfs is not) --- perl-install/any.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index 0cf943425..906b3d2f4 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -942,16 +942,17 @@ sub report_bug { sub devfssymlinkf { my ($o_if, $of, $prefix) = @_; + my $if = $o_if->{device}; - my $if = $o_if->{devfs_device}; - $if ||= devices::to_devfs($o_if->{device}); - $if ||= $o_if->{device}; + my $devfs_if = $o_if->{devfs_device}; + $devsfs_if ||= devices::to_devfs($o_if->{device}); + $devsfs_if ||= $o_if->{device}; symlinkf($if, "$prefix/dev/$of"); output_p("$prefix/etc/devfs/conf.d/$of.conf", -"REGISTER ^$if\$ CFUNCTION GLOBAL symlink $if $of -UNREGISTER ^$if\$ CFUNCTION GLOBAL unlink $of +"REGISTER ^$devfs_if\$ CFUNCTION GLOBAL symlink $devfs_if $of +UNREGISTER ^$devfs_if\$ CFUNCTION GLOBAL unlink $of "); } -- cgit v1.2.1