Douglas Schilling Landgraf has uploaded a new change for review. Change subject: spec: replace a patch with sed cmd ......................................................................
spec: replace a patch with sed cmd Currently we patch /etc/puppet/puppet.conf after installation of puppet plugin to comment server and certname. This patch replaces the patch approach with a sed command which is simpler to maintain. Change-Id: Ic6d7f39fcd3d67b6f429d056706739617d2a9dcb Signed-off-by: Douglas Schilling Landgraf <[email protected]> --- M ovirt-node.spec.in 1 file changed, 1 insertion(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/01/33001/1 diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 8e1890c..937d261 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -188,18 +188,7 @@ patch -d /usr/share/ruby/vendor_ruby/facter -p0 < \ %endif %{app_root}/puppet-plugin/puppet-operatingsystem.rb.patch -cd /etc/puppet -patch -p0 << EOF ---- puppet.conf 2013-03-21 14:55:43.969130799 -0700 -+++ puppet.conf.new 2013-03-21 14:56:02.690178578 -0700 -@@ -1,4 +1,6 @@ - [main] -+# server = "" -+# certname = "" - # The Puppet log directory. - # The default value is '$vardir/log'. - logdir = /var/log/puppet -EOF +sed -i -e "/server/ s/^/# /;/certname/ s/^/# /;" /etc/puppet/puppet.conf %if %{is_el6} echo 'files /var/lib/puppet' >> /etc/rwtab -- To view, visit http://gerrit.ovirt.org/33001 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6d7f39fcd3d67b6f429d056706739617d2a9dcb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
