aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-04-02 20:52:16 +0000
committerOlivier Blin <oblin@mandriva.com>2008-04-02 20:52:16 +0000
commit68f8cbf92e0d027708a51c34cab7e08c9b873f99 (patch)
tree6dabcfb6b919cd4188ae3926ab0d727f3d190245 /lib
parent1069b2264fc1f1c0257fb747516694455760b0d3 (diff)
downloadiurt-68f8cbf92e0d027708a51c34cab7e08c9b873f99.tar
iurt-68f8cbf92e0d027708a51c34cab7e08c9b873f99.tar.gz
iurt-68f8cbf92e0d027708a51c34cab7e08c9b873f99.tar.bz2
iurt-68f8cbf92e0d027708a51c34cab7e08c9b873f99.tar.xz
iurt-68f8cbf92e0d027708a51c34cab7e08c9b873f99.zip
do not force incorrect symlink in /lib/modules if already present
Diffstat (limited to 'lib')
-rw-r--r--lib/Iurt/DKMS.pm12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/Iurt/DKMS.pm b/lib/Iurt/DKMS.pm
index 5c793a2..e7a1abf 100644
--- a/lib/Iurt/DKMS.pm
+++ b/lib/Iurt/DKMS.pm
@@ -227,11 +227,15 @@ sub dkms_compile {
system("sudo rm -f $dkms_conf");
$ok or next;
- plog('DEBUG', "symlink from /lib/modules/$modulesdir/build to /usr/src/$sourcedir");
+ # symlink modules build dir if not using devel package
+ my $modules_build_dir = "$chroot_tmp/lib/modules/$modulesdir/build";
+ if (! -e $modules_build_dir) {
+ plog('DEBUG', "symlink from $modules_build_dir to /usr/src/$sourcedir");
- if (system("sudo ln -sf /usr/src/$sourcedir $chroot_tmp/lib/modules/$modulesdir/build")) {
- plog('ERR', "linking failed ($!)");
- next;
+ if (system("sudo ln -sf /usr/src/$sourcedir $modules_build_dir")) {
+ plog('ERR', "linking failed ($!)");
+ next;
+ }
}
foreach my $cmd ('add', 'build') {