summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-08-28 15:04:29 +0000
committerdamien <damien@mandriva.com>2001-08-28 15:04:29 +0000
commit2c349adbcc5062aed193dacda8a9cf65e497adef (patch)
tree25449bc449d714951703ffea43d841c31e5a2d25 /perl-install
parent406b440a5c6ca5a820c8ac4fc88aef7b5230903a (diff)
downloaddrakx-2c349adbcc5062aed193dacda8a9cf65e497adef.tar
drakx-2c349adbcc5062aed193dacda8a9cf65e497adef.tar.gz
drakx-2c349adbcc5062aed193dacda8a9cf65e497adef.tar.bz2
drakx-2c349adbcc5062aed193dacda8a9cf65e497adef.tar.xz
drakx-2c349adbcc5062aed193dacda8a9cf65e497adef.zip
updated for devfssumlinkf
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm8
-rw-r--r--perl-install/mouse.pm2
2 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 87545a2a5..2696017d2 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -400,7 +400,7 @@ sub pppConfig {
$modem or return;
if ($modem->{device} ne "/dev/modem") {
- symlinkf($modem->{device}, "$prefix/dev/modem") ? add_devfslink($prefix, "$prefix/dev/modem") : log::l("creation of $prefix/dev/modem failed")
+ devfssymlinkf($modem->{device}, 'modem', $prefix) or log::l("creation of $prefix/dev/modem failed")
}
$in->do_pkgs->install('ppp') if !$::testing;
@@ -829,9 +829,9 @@ sub report_bug {
map_index { even($::i) ? header($_) : $_ } @other;
}
-sub add_devfslink {
- my ($prefix, $link) = @_;
- commands::cp("-f", $link, "$prefix/lib/dev-state/");
+sub devfssymlinkf {
+ my ($if, $of, $prefix) = @_;
+ symlinkf($if, "$prefix/$_") foreach ("dev/$of", "lib/dev-state/$of");
}
1;
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 7a74dd857..c488c83f2 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -182,7 +182,7 @@ 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));
- symlinkf ($mouse->{device}, "$prefix/dev/mouse") ? any::add_devfslink($prefix, "$prefix/dev/mouse") : log::l("creating $prefix/dev/mouse symlink failed");
+ any::devfssymlinkf ($mouse->{device}, 'mouse', $prefix) or log::l("creating $prefix/dev/mouse symlink failed");
if (arch() =~ /ppc/) {
my $s = join('',