!16 修复init失败的问题

From: @jinzig 
Reviewed-by: @mywaaagh_admin 
Signed-off-by: @mywaaagh_admin
This commit is contained in:
openeuler-ci-bot 2024-11-07 00:44:30 +00:00 committed by Gitee
commit 9a8b71138e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 3 deletions

View File

@ -6,7 +6,7 @@
Summary: Builds packages inside chroots
Name: mock
Version: 2.2
Release: 2
Release: 3
License: GPLv2+
Source: https://github.com/rpm-software-management/mock/releases/download/mock-2.2-1/%{name}-%{version}.tar.gz
URL: https://github.com/rpm-software-management/mock/
@ -148,6 +148,9 @@ install -p -m 0644 %{SOURCE1} %{buildroot}/etc/mock/site-defaults.cfg
%endif
%changelog
* Wed Nov 06 2024 jinzhiguang <jinzhiguang@kylinos.cn> 2.2-3
- fix useradd in site-defaults.cfg
* Thu Nov 10 2022 xu_ping <xuping33@h-partners.com> 2.2-2
- fix source url

View File

@ -12,7 +12,7 @@ config_opts['target_arch'] = '{{ target_arch }}'
config_opts['use_bootstrap_container'] = False
config_opts['dnf_disable_plugins'] = ['local', 'spacewalk']
config_opts['use_nspawn'] = False
config_opts['useradd'] = '/usr/sbin/useradd -o -m -u %(uid)s -g %(gid)s -d %(home)s -N %(user)s'
config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} -N {{chrootuser}}'
config_opts['yum.conf'] = """
[main]
@ -38,4 +38,4 @@ baseurl=http://9.82.1.253/productrepo/openEuler1.0/EULEROS_BASIC/ARM64/openEuler
enabled=1
gpgcheck=0
gpgkey=http://9.82.1.253/productrepo/openEuler1.0/EULEROS_BASIC/ARM64/openEuler1.0/2020-03-20-06-30-06/RPM-GPG-KEY-openEuler
"""
"""