aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Iurt
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2016-10-14 15:53:34 +0100
committerPascal Terjan <pterjan@gmail.com>2016-10-14 15:53:34 +0100
commit4674403d78ff86ea6b5d900c9f44588af08648fe (patch)
treed8c7e1cd54a9c496bf5919a558ef114512c195e4 /lib/Iurt
parentfd6c519a86a943c9ba955a456be6b451e5f72003 (diff)
downloadiurt-4674403d78ff86ea6b5d900c9f44588af08648fe.tar
iurt-4674403d78ff86ea6b5d900c9f44588af08648fe.tar.gz
iurt-4674403d78ff86ea6b5d900c9f44588af08648fe.tar.bz2
iurt-4674403d78ff86ea6b5d900c9f44588af08648fe.tar.xz
iurt-4674403d78ff86ea6b5d900c9f44588af08648fe.zip
Write macros to /etc/rpm/macros
None is user specific and install_lang will only work there.
Diffstat (limited to 'lib/Iurt')
-rw-r--r--lib/Iurt/Chroot.pm5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index 982c116..43a9ceb 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -16,7 +16,6 @@ our @EXPORT = qw(
clean_chroot
create_build_chroot
create_temp_chroot
- dump_rpmmacros
remove_chroot
);
@@ -69,7 +68,7 @@ sub clean_and_build_chroot {
return;
}
- if (!dump_rpmmacros($run, $config, "$chroot/home/builder/.rpmmacros")) {
+ if (!dump_rpmmacros($run, $config, "$chroot/etc/rpm/macros")) {
plog('ERROR', "Failed to dump macros");
return;
}
@@ -185,8 +184,6 @@ sub add_local_user {
sudo($config, '--chroot', $chroot_tmp, 'usermod', '-d', "/home/$luser", '-u', $uid, '-o', '-l', $luser, 'root');
}
- dump_rpmmacros($run, $config, "$chroot_tmp/home/$luser/.rpmmacros") or return;
-
1;
}