Fix systemd provider; use Puppet exit codes

0fde7c30 · James T. Lee · 6cc96cd9 · 0fde7c30
Commit 0fde7c30 authored Dec 17, 2020 by James T. Lee
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

amd64-server.haswell/Containerfile amd64-server.haswell/Containerfile +2 -10

No files found.
--- a/amd64-server.haswell/Containerfile
+++ b/amd64-server.haswell/Containerfile
@@ -2,13 +2,5 @@ FROM nest/stage0:amd64-server.haswell
 ARG FACTER_build
 ARG FACTER_makeopts
 RUN git clone --depth=1 https://gitlab.james.tl/nest/gentoo/portage.git /var/cache/portage/gentoo
-RUN puppet agent --onetime \
+RUN sed -i 's/confine/#confine/' /usr/lib*/ruby/gems/*/gems/puppet-*/lib/puppet/provider/service/systemd.rb
-    --verbose \
+RUN puppet agent --test --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [[ $? == 0 || $? == 2 ]]
-    --no-daemonize \
-    --no-splay \
-    --show_diff \
-    --certname ci \
-    --logdir /var/log/puppet \
-    --rundir /var/run/puppet \
-    --vardir /var/lib/puppet \
-    --runtimeout 0