Message ID | 20180419152709.5534-1-aconole@redhat.com |
---|---|
State | Accepted |
Delegated to: | Russell Bryant |
Headers | show |
Series | [ovs-dev,v3] rhel: user/group openvswitch does not exist | expand |
On 19/04/18 16:27, Aaron Conole wrote: > From: Alan Pevec <alan.pevec@redhat.com> > > Default ownership[1] for config files is failing on an empty system: > Running scriptlet: openvswitch-2.9.0-3.fc28.x86_64 > warning: user openvswitch does not exist - using root > warning: group openvswitch does not exist - using root > ... > > Required user/group need to be created in %pre as documented in > Fedora guideline[2] > > [1] https://github.com/openvswitch/ovs/commit/951d79e638ecdb3b1dcd19df1adb2ff91fe61af8 > > [2] https://fedoraproject.org/wiki/Packaging:UsersAndGroups#Dynamic_allocation > > Submitted-at: https://github.com/openvswitch/ovs/pull/223 > Signed-off-by: Alan Pevec <alan.pevec@redhat.com> > Co-authored-by: Aaron Conole <aconole@redhat.com> > Signed-off-by: Aaron Conole <aconole@redhat.com> Reviewed-by: Markos Chandras <mchandras@suse.de>
Markos Chandras <mchandras@suse.de> writes: > On 19/04/18 16:27, Aaron Conole wrote: >> From: Alan Pevec <alan.pevec@redhat.com> >> >> Default ownership[1] for config files is failing on an empty system: >> Running scriptlet: openvswitch-2.9.0-3.fc28.x86_64 >> warning: user openvswitch does not exist - using root >> warning: group openvswitch does not exist - using root >> ... >> >> Required user/group need to be created in %pre as documented in >> Fedora guideline[2] >> >> [1] >> https://github.com/openvswitch/ovs/commit/951d79e638ecdb3b1dcd19df1adb2ff91fe61af8 >> >> [2] https://fedoraproject.org/wiki/Packaging:UsersAndGroups#Dynamic_allocation >> >> Submitted-at: https://github.com/openvswitch/ovs/pull/223 >> Signed-off-by: Alan Pevec <alan.pevec@redhat.com> >> Co-authored-by: Aaron Conole <aconole@redhat.com> >> Signed-off-by: Aaron Conole <aconole@redhat.com> > > Reviewed-by: Markos Chandras <mchandras@suse.de> Thanks Markos. Timothy, Russell, sorry I forgot to CC you, it seems.
On Mon, Apr 30, 2018 at 3:27 PM, Aaron Conole <aconole@redhat.com> wrote: > Markos Chandras <mchandras@suse.de> writes: > >> On 19/04/18 16:27, Aaron Conole wrote: >>> From: Alan Pevec <alan.pevec@redhat.com> >>> >>> Default ownership[1] for config files is failing on an empty system: >>> Running scriptlet: openvswitch-2.9.0-3.fc28.x86_64 >>> warning: user openvswitch does not exist - using root >>> warning: group openvswitch does not exist - using root >>> ... >>> >>> Required user/group need to be created in %pre as documented in >>> Fedora guideline[2] >>> >>> [1] >>> https://github.com/openvswitch/ovs/commit/951d79e638ecdb3b1dcd19df1adb2ff91fe61af8 >>> >>> [2] https://fedoraproject.org/wiki/Packaging:UsersAndGroups#Dynamic_allocation >>> >>> Submitted-at: https://github.com/openvswitch/ovs/pull/223 >>> Signed-off-by: Alan Pevec <alan.pevec@redhat.com> >>> Co-authored-by: Aaron Conole <aconole@redhat.com> >>> Signed-off-by: Aaron Conole <aconole@redhat.com> >> >> Reviewed-by: Markos Chandras <mchandras@suse.de> > > Thanks Markos. > > Timothy, Russell, sorry I forgot to CC you, it seems. Thanks, applied to master and branch-2.9.
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 658eb206c..04909c8d3 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -92,8 +92,7 @@ Requires: openssl hostname iproute module-init-tools #Upstream kernel commit 4f647e0a3c37b8d5086214128614a136064110c3 #Requires: kernel >= 3.15.0-0 -Requires(post): /usr/bin/getent -Requires(post): /usr/sbin/useradd +Requires(pre): shadow-utils Requires(post): /usr/bin/sed %if %{with dpdk} Requires(post): /usr/sbin/usermod @@ -384,17 +383,23 @@ rm -rf $RPM_BUILD_ROOT fi %endif +%pre +getent group openvswitch >/dev/null || groupadd -r openvswitch +getent passwd openvswitch >/dev/null || \ + useradd -r -g openvswitch -d / -s /sbin/nologin \ + -c "Open vSwitch Daemons" openvswitch + +%if %{with dpdk} + getent group hugetlbfs >/dev/null || groupadd hugetlbfs + usermod -a -G hugetlbfs openvswitch +%endif +exit 0 + %post if [ $1 -eq 1 ]; then - getent passwd openvswitch >/dev/null || \ - useradd -r -d / -s /sbin/nologin -c "Open vSwitch Daemons" openvswitch - sed -i 's:^#OVS_USER_ID=:OVS_USER_ID=:' /etc/sysconfig/openvswitch %if %{with dpdk} - getent group hugetlbfs >/dev/null || \ - groupadd hugetlbfs - usermod -a -G hugetlbfs openvswitch sed -i \ 's@OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="openvswitch:hugetlbfs"@'\ /etc/sysconfig/openvswitch