summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-08-27 16:53:40 +0000
committerdamien <damien@mandriva.com>2001-08-27 16:53:40 +0000
commitb706220ef9ea230f9537df5380507cee52c96333 (patch)
treeab69051f5b7a6798fb4b1b11a457b5d4d9014846
parentad2d59848e1c0ed30971fb6d9238e409cbc08682 (diff)
downloaddrakx-b706220ef9ea230f9537df5380507cee52c96333.tar
drakx-b706220ef9ea230f9537df5380507cee52c96333.tar.gz
drakx-b706220ef9ea230f9537df5380507cee52c96333.tar.bz2
drakx-b706220ef9ea230f9537df5380507cee52c96333.tar.xz
drakx-b706220ef9ea230f9537df5380507cee52c96333.zip
add_devfslink
-rw-r--r--perl-install/any.pm10
-rw-r--r--perl-install/mouse.pm2
2 files changed, 9 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 2522aac35..ce688e846 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -399,8 +399,9 @@ sub pppConfig {
my ($in, $modem, $prefix) = @_;
$modem or return;
- symlinkf($modem->{device}, "$prefix/dev/modem") or log::l("creation of $prefix/dev/modem failed")
- if $modem->{device} ne "/dev/modem";
+ if ($modem->{device} ne "/dev/modem") {
+ symlinkf($modem->{device}, "$prefix/dev/modem") ? add_devfslink($prefix, "$prefix/dev/modem") : or log::l("creation of $prefix/dev/modem failed")
+ }
$in->do_pkgs->install('ppp') if !$::testing;
my %toreplace;
@@ -828,4 +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/");
+}
+
1;
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 19d6bb9c6..661c32291 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -181,7 +181,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" or log::l("creating $prefix/dev/mouse symlink failed");
+ symlinkf $mouse->{device}, "$prefix/dev/mouse" ? add_devfslink($prefix, "$prefix/dev/mouse") : log::l("creating $prefix/dev/mouse symlink failed");
if (arch() =~ /ppc/) {
my $s = join('',