On 03/12/2010 12:55 AM, Jesse Keating wrote:
On Sat, 2010-03-06 at 18:47 +0100, Jeroen van Meeuwen wrote:
> On 03/06/2010 06:11 PM, Todd Zullinger wrote:
>> Jeroen van Meeuwen wrote:
>>> The builds I'm talking about are executed through Koji; The only thing I
>>> can find is that /etc/mock/site-defaults.cfg has:
>>>
>>> # config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g
%(gid)s
>>> -d %(home)s -n %(user)s' # Fedora/RedHat
>>>
>>> whereas /etc/mock/site-defaults.cfg.rpmnew has:
>>>
>>> # config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g
%(gid)s
>>> -d %(home)s -N %(user)s' # Fedora/RedHat
>>
>> As an aside, the comment "Fedora/RedHat" is now untrue. It should
>> read "Fedora/RedHat > 6" perhaps.
>>
>>> So I suppose the default changed and is used for EL-5 builds.
>>>
>>> Given that my Fedora builders build EL-5 packages as well, how would I
>>> fix this? In Koji or in mock?
>>
>> You can override the defaults from site-defaults in your epel config
>> files. Adding:
>>
>> config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s
-d %(home)s -n %(user)s'
>>
>> to epel-{4,5}*.cfg should make mock use the right command for EL
>> builds.
>>
>
> Koji writes out it's own mock configuration files though. As a result,
> /etc/mock/koji/*.cfg (per buildroot) uses the mock default -n/-N. Either
> one is incompatible with the other, and I have not found an alternative.
>
> No setting in any epel*-*.cfg in /etc/mock/. can change that wrt. to
> what Koji executes. Instead, I've removed the -n/-N in
> /etc/mock/site-defaults.cfg
I've submitted a new mock update that reverts the -n/-N change. Testing
+ karma would be appreciated.
If it's really reverted wouldn't that introduce the incompatibility
question with F-12+? Did you do something else then revert the -n/-N
change like remove -n/-N altogether maybe?
-- Jeroen