pool/sysuser-tools
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 701787 from home:kukuk:branches:Base:System

Browse Source 
- Fix default home directory [bsc#1105934]
- Use _rpmmacrodir for macro file

OBS-URL: https://build.opensuse.org/request/show/701787
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysuser-tools?expand=0&rev=15
This commit is contained in:
Thorsten Kukuk 2019-05-09 13:51:43 +00:00 committed by Git OBS Bridge
parent 2f5a50dce3
commit aff93c9d23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysuser-tools.changes
View File

@ -1,7 +1,13 @@
-------------------------------------------------------------------
Thu May 9 13:23:56 CEST 2019 - kukuk@suse.de
- Fix default home directory [bsc#1105934]
- Use _rpmmacrodir for macro file
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 9 13:51:42 UTC 2017 - dimstar@opensuse.org Mon Oct 9 13:51:42 UTC 2017 - dimstar@opensuse.org
- Furhter enhance sysusers-generate-pre: inside the build - Further enhance sysusers-generate-pre: inside the build
environment, it can be acceptable to be failing to create the environment, it can be acceptable to be failing to create the
users (e.g when building sysuser-tools or system-user-root, since users (e.g when building sysuser-tools or system-user-root, since
those two packages have to be speificallty excluded). Always those two packages have to be speificallty excluded). Always

8
sysuser-tools.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package sysuser-tools # spec file for package sysuser-tools
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -54,12 +54,12 @@ and groups from it like systemd-sysusers would do.
install -D -m 755 %{SOURCE0} %{buildroot}%{_prefix}/lib/rpm/sysusers.prov install -D -m 755 %{SOURCE0} %{buildroot}%{_prefix}/lib/rpm/sysusers.prov
install -D -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/rpm/fileattrs/sysusers.attr install -D -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/rpm/fileattrs/sysusers.attr
install -D -m 755 %{SOURCE2} %{buildroot}%{_prefix}/lib/rpm/sysusers-generate-pre install -D -m 755 %{SOURCE2} %{buildroot}%{_prefix}/lib/rpm/sysusers-generate-pre
install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.sysusers install -D -m 644 %{SOURCE3} %{buildroot}%{_rpmmacrodir}/macros.sysusers
install -D -m 755 %{SOURCE4} %{buildroot}%{_sbindir}/sysusers2shadow install -D -m 755 %{SOURCE4} %{buildroot}%{_sbindir}/sysusers2shadow
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_sysconfdir}/rpm/macros.sysusers %{_rpmmacrodir}/macros.sysusers
%{_prefix}/lib/rpm/sysusers.prov %{_prefix}/lib/rpm/sysusers.prov
%{_prefix}/lib/rpm/fileattrs/sysusers.attr %{_prefix}/lib/rpm/fileattrs/sysusers.attr
%{_prefix}/lib/rpm/sysusers-generate-pre %{_prefix}/lib/rpm/sysusers-generate-pre

2
sysusers2shadow.sh
View File

@ -22,6 +22,8 @@ do
fi fi
if [ ! -z "${arr[4]}" -a "${arr[4]}" != "-" ]; then if [ ! -z "${arr[4]}" -a "${arr[4]}" != "-" ]; then
ARGUMENTS="-d ${arr[4]} $ARGUMENTS" ARGUMENTS="-d ${arr[4]} $ARGUMENTS"
else
ARGUMENTS="-d / $ARGUMENTS"
fi fi
/usr/bin/getent group ${arr[1]} >> /dev/null /usr/bin/getent group ${arr[1]} >> /dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then