projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
schroot-dsa/config: fix mirror without default-mirror file
[mirror/dsa-puppet.git]
/
modules
/
schroot
/
manifests
/
init.pp
diff --git
a/modules/schroot/manifests/init.pp
b/modules/schroot/manifests/init.pp
index
1716fbb
..
14bb914
100644
(file)
--- a/
modules/schroot/manifests/init.pp
+++ b/
modules/schroot/manifests/init.pp
@@
-33,6
+33,13
@@
class schroot {
source => 'puppet:///modules/schroot/schroot-setup.d/99porterbox-extra-sources',
require => Package['schroot'],
}
source => 'puppet:///modules/schroot/schroot-setup.d/99porterbox-extra-sources',
require => Package['schroot'],
}
+ if ($::lsbmajdistrelease >= 8) {
+ file { '/etc/schroot/setup.d/99builddsourceslist':
+ mode => '0555',
+ source => 'puppet:///modules/schroot/schroot-setup.d/99builddsourceslist',
+ require => Package['schroot'],
+ }
+ }
file { '/usr/local/sbin/setup-dchroot':
mode => '0555',
file { '/usr/local/sbin/setup-dchroot':
mode => '0555',
@@
-65,7
+72,7
@@
class schroot {
if $has_srv_buildd {
file { '/etc/schroot/buildd/config':
if $has_srv_buildd {
file { '/etc/schroot/buildd/config':
- content => "CHROOT_FILE_UNPACK_DIR=/srv/buildd/unpack",
+ content => "CHROOT_FILE_UNPACK_DIR=/srv/buildd/unpack
\n
",
require => Package['schroot'],
}
}
require => Package['schroot'],
}
}