Skip to content

Commit 4c8f232

Browse files
authored
Merge pull request #96 from ekohl/drop-check-prereqs
Stop passing --[no-]check-prereqs to install.rb
2 parents bfa6149 + 3c3b86d commit 4c8f232

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

configs/components/puppet.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,18 @@
122122
configdir = File.join(settings[:sysconfdir], 'puppet', 'etc')
123123
logdir = File.join(settings[:sysconfdir], 'puppet', 'var', 'log')
124124
piddir = File.join(settings[:sysconfdir], 'puppet', 'var', 'run')
125-
prereqs = "--check-prereqs"
126125
else
127126
vardir = File.join(settings[:prefix], 'cache')
128127
publicdir = File.join(settings[:prefix], 'public')
129128
configdir = settings[:puppet_configdir]
130129
logdir = settings[:logdir]
131130
piddir = settings[:piddir]
132-
prereqs = "--no-check-prereqs"
133131
end
134132

135133
pkg.install do
136134
[
137135
"#{settings[:host_ruby]} install.rb \
138136
--ruby=#{File.join(settings[:bindir], 'ruby')} \
139-
#{prereqs} \
140137
--bindir=#{settings[:bindir]} \
141138
--configdir=#{configdir} \
142139
--sitelibdir=#{settings[:ruby_vendordir]} \

0 commit comments

Comments
 (0)