[node-patches] Change in ovirt-node[master]: spec: replace a patch with sed cmd

fabiand at redhat.com fabiand at redhat.com
Wed Oct 1 09:47:20 UTC 2014


Fabian Deutsch has posted comments on this change.

Change subject: spec: replace a patch with sed cmd
......................................................................


Patch Set 3: Code-Review-1

(1 comment)

http://gerrit.ovirt.org/#/c/33001/3/ovirt-node.spec.in
File ovirt-node.spec.in:

Line 187: %else
Line 188: patch -d /usr/share/ruby/vendor_ruby/facter -p0 < \
Line 189: %endif
Line 190:    %{app_root}/puppet-plugin/puppet-operatingsystem.rb.patch
Line 191: sed -i -e "/server/ s/^/# /;/certname/ s/^/# /;" /etc/puppet/puppet.conf
This is to greedy, imagine the folölowing lines which will be affected:

    # and the server will do 

or

    enable_server_security = True

The last line would be commented out and might lead to issues.

Please adjust the match expression to only comment out the correct lines.
Line 192: 
Line 193: %if %{is_el6}
Line 194: echo 'files /var/lib/puppet' >> /etc/rwtab
Line 195: %endif


-- 
To view, visit http://gerrit.ovirt.org/33001
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic6d7f39fcd3d67b6f429d056706739617d2a9dcb
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-HasComments: Yes



More information about the node-patches mailing list