diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-19 21:19:21 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-19 21:19:21 +0000 |
| commit | 66ff0e21bc1f61bd1968fb754a6930bce2f80a45 (patch) | |
| tree | 404cfe4f1d55cbc7312a1cd3f650fdfaf898bde2 | |
| parent | c3469dbbba8df03e28b992a1a1467a047241ca10 (diff) | |
| download | drakx-66ff0e21bc1f61bd1968fb754a6930bce2f80a45.tar drakx-66ff0e21bc1f61bd1968fb754a6930bce2f80a45.tar.gz drakx-66ff0e21bc1f61bd1968fb754a6930bce2f80a45.tar.bz2 drakx-66ff0e21bc1f61bd1968fb754a6930bce2f80a45.tar.xz drakx-66ff0e21bc1f61bd1968fb754a6930bce2f80a45.zip | |
(devfssymlinkf): use devfs_device instead of device when available
| -rw-r--r-- | perl-install/any.pm | 9 | ||||
| -rw-r--r-- | perl-install/mouse.pm | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 69519938d..7d94bc826 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -445,7 +445,7 @@ sub pppConfig { $modem or return; if ($modem->{device} ne "/dev/modem") { - devfssymlinkf($modem->{device}, 'modem', $prefix) or log::l("creation of $prefix/dev/modem failed") + devfssymlinkf($modem, 'modem', $prefix) or log::l("creation of $prefix/dev/modem failed") } $in->do_pkgs->install('ppp') if !$::testing; @@ -943,7 +943,8 @@ sub report_bug { } sub devfssymlinkf { - my ($if, $of, $prefix) = @_; + my ($o_if, $of, $prefix) = @_; + my $if = $o_if->{devfs_device} || $o_if->{device}; symlinkf($if, "$prefix/dev/$of"); output_p("$prefix/etc/devfs/conf.d/$of.conf", @@ -1138,10 +1139,10 @@ sub config_dvd { log::l("configuring DVD"); #- create /dev/dvd symlink each_index { - devfssymlinkf($_->{device}, 'dvd' . ($::i ? $::i + 1 : ''), $prefix); + devfssymlinkf($_, 'dvd' . ($::i ? $::i + 1 : ''), $prefix); } @dvds; if (my $raw_dev = alloc_raw_device($prefix, 'dvd')) { - devfssymlinkf($raw_dev, 'rdvd', $prefix); + devfssymlinkf({ device => $raw_dev }, 'rdvd', $prefix); } } } diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 2caacff2b..db5914ff3 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -203,8 +203,8 @@ sub write { local $mouse->{XEMU3} = bool2yesno($mouse->{nbuttons} < 3); local $mouse->{WHEEL} = bool2yesno($mouse->{nbuttons} > 3); setVarsInSh("$prefix/etc/sysconfig/mouse", $mouse, qw(MOUSETYPE XMOUSETYPE FULLNAME XEMU3 WHEEL device)); - any::devfssymlinkf ($mouse->{device}, 'mouse', $prefix) or log::l("creating $prefix/dev/mouse symlink failed"); - $mouse->{auxmouse} and any::devfssymlinkf ($mouse->{auxmouse}{device}, 'mouse1', $prefix) or log::l("creating $prefix/dev/mouse1 symlink failed"); + any::devfssymlinkf($mouse, 'mouse', $prefix) or log::l("creating $prefix/dev/mouse symlink failed"); + $mouse->{auxmouse} and any::devfssymlinkf($mouse->{auxmouse}, 'mouse1', $prefix) or log::l("creating $prefix/dev/mouse1 symlink failed"); if (arch() =~ /ppc/) { my $s = join('', |