From a95757706473c2bf1db481948cf05a526df4a714 Mon Sep 17 00:00:00 2001 From: Wenl4ng <15861868579@163.com> Date: Tue, 10 Dec 2024 14:42:45 +0800 Subject: [PATCH] 1 --- mock.spec | 5 ++++- mock_config.default | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mock.spec b/mock.spec index 031a7bb..7f499f3 100644 --- a/mock.spec +++ b/mock.spec @@ -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 2.2-3 +- fix useradd in site-defaults.cfg + * Thu Nov 10 2022 xu_ping 2.2-2 - fix source url diff --git a/mock_config.default b/mock_config.default index dc73cf2..bb05402 100644 --- a/mock_config.default +++ b/mock_config.default @@ -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 -""" \ No newline at end of file +""" -- Gitee