Sync from SUSE:SLFO:Main systemd-default-settings revision e36fc2d0e9eceaef963d46998534541c

This commit is contained in:
Adrian Schröter 2024-05-04 01:01:16 +02:00
commit 2da8dbfa1a
5 changed files with 247 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

14
_service Normal file
View File

@ -0,0 +1,14 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="versionformat">@PARENT_TAG@</param>
<param name="url">https://github.com/openSUSE/systemd-default-settings.git</param>
<param name="scm">git</param>
<param name="revision">main</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
<param name="compression">gz</param>
<param name="file">*.tar</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

BIN
systemd-default-settings-0.7-1-g6b8dde1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,83 @@
-------------------------------------------------------------------
Tue Sep 21 08:20:59 UTC 2021 - Franck Bui <fbui@suse.com>
- Import commit 6b8dde1d4f867aff713af6d6830510a84fad58d2
6b8dde1 Convert more drop-ins into early ones
-------------------------------------------------------------------
Mon Feb 22 16:49:16 UTC 2021 - Franck Bui <fbui@suse.com>
- Import 0.7
2a61f77 Convert our configuration file dropins into 'early' ones
-------------------------------------------------------------------
Wed Feb 17 08:40:19 UTC 2021 - Franck Bui <fbui@suse.com>
- Import 0.6
d3fab7c Introduce SLE-Micro branding
-------------------------------------------------------------------
Thu Nov 26 16:04:48 UTC 2020 - Franck Bui <fbui@suse.com>
- Fix typo introduced by the previous change (bsc#1179183)
-------------------------------------------------------------------
Thu Nov 19 14:29:34 UTC 2020 - Franck Bui <fbui@suse.com>
- Issue a daemon-reload in %post of the main package
-------------------------------------------------------------------
Thu Nov 19 06:26:27 UTC 2020 - Franck Bui <fbui@suse.com>
- Import 0.5
0c5e241 SLE: turn off RemoveIPC by default for logind (fate#320125)
cb6914f SLE: restore ProtectHostname=no for udevd (bsc#1178374)
7e332a6 Add a header in all each drop-ins
465e1c7 Makefile: simplify 'archive' target
-------------------------------------------------------------------
Tue Oct 27 15:00:12 UTC 2020 - Franck Bui <fbui@suse.com>
- Import 0.4
a97bb54 Makefile: don't generate the rpm file lists anymore
5473da6 Makefile: introduce 'archive' target
-------------------------------------------------------------------
Mon Oct 26 14:40:56 UTC 2020 - Franck Bui <fbui@suse.com>
- Make sure the release number between the main and the branding
packages match
-------------------------------------------------------------------
Fri Oct 23 08:09:00 UTC 2020 - Franck Bui <fbui@suse.com>
- Import 0.3
d299248 List drop-in directories in SUSE.list exclusively
e4651a7 Disable memory accounting by default for all distros (jsc#PM-2229 jsc#PM-2230)
-------------------------------------------------------------------
Tue Oct 13 08:43:43 UTC 2020 - Franck Bui <fbui@suse.com>
- Import 0.2
cc4e951 timesyncd: add default ntp servers for SUSE and openSUSE distros
-------------------------------------------------------------------
Mon Oct 12 14:46:51 UTC 2020 - Franck Bui <fbui@suse.com>
- Introduce "upstream" branding sub-package
Installing this branding sub-package is supposed to restore upstream
defaults by uninstalling all custom drop-ins installed by other
branding sub-packages.
-------------------------------------------------------------------
Tue Oct 6 07:15:44 UTC 2020 - Franck Bui <fbui@suse.com>
- Initial revision

View File

@ -0,0 +1,124 @@
#
# spec file for package systemd-default-settings
#
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define extra_version -1-g6b8dde1
Name: systemd-default-settings
URL: https://github.com/openSUSE/systemd-default-settings
Version: 0.7
Release: 0
Summary: Customization of systemd default settings for SUSE distributions
License: GPL-2.0-or-later
Group: System/Base
Source0: %{name}-%{version}%{extra_version}.tar.gz
BuildArch: noarch
BuildRequires: systemd-rpm-macros
Requires: %{name}-branding = %{version}-%{release}
%description
This package overrides some of the upstream default settings which are
better suited for openSUSE or SLE distributions.
This package should not be installed alone but is supposed to be
pulled in by the branding package instead.
%package branding-SLE
Summary: Specific customization of systemd defaults settings for SLE
Group: System/Base
Requires: %{name} = %{version}-%{release}
Supplements: packageand(%{name}:branding-SLE)
Provides: %{name}-branding = %{version}-%{release}
Conflicts: otherproviders(%{name}-branding)
%description branding-SLE
This package overrides some of the upstream default settings to make
them better suited for SLE distributions.
%package branding-openSUSE
Summary: Specific customization of systemd defaults settings for openSUSE
Group: System/Base
Requires: %{name} = %{version}-%{release}
Supplements: packageand(%{name}:branding-openSUSE)
Provides: %{name}-branding = %{version}-%{release}
Conflicts: otherproviders(%{name}-branding)
%description branding-openSUSE
This package overrides some of the upstream default settings to make
them better suited for openSUSE distributions.
%package branding-upstream
Summary: Restore upstream systemd defaults settings
Group: System/Base
Provides: %{name}-branding = %{version}-%{release}
Conflicts: %{name}
Conflicts: otherproviders(%{name}-branding)
%description branding-upstream
Installing this package restores some of the upstream default settings
by uninstalling all drop-ins shipped by %{name} and its branding sub
package.
%package branding-SLE-Micro
Summary: Specific customization of systemd defaults settings for SLE-Micro
Group: System/Base
Requires: %{name} = %{version}-%{release}
Supplements: packageand(%{name}:branding-SLE-Micro)
Provides: %{name}-branding = %{version}-%{release}
Conflicts: otherproviders(%{name}-branding)
%description branding-SLE-Micro
This package overrides some of the upstream default settings to make
them better suited for SLE-Micro distributions.
%prep
%setup -q -n %name-%{version}%{extra_version}
%build
%install
%make_install
find %{buildroot} -name \*.d -type d -printf "%%%%dir /%%P\n" >SUSE.list
find %{buildroot} -name \*-defaults-SUSE.conf -printf "/%%P\n" >>SUSE.list
find %{buildroot} -name \*-defaults-SLE.conf -printf "/%%P\n" >SLE.list
find %{buildroot} -name \*-defaults-openSUSE.conf -printf "/%%P\n" >openSUSE.list
find %{buildroot} -name \*-defaults-SLE-Micro.conf -printf "/%%P\n" >SLE-Micro.list
%post
# Reloading PID1 is probably not enough as some changes will require
# service restarts or even a reboot. But it might be useful in a few
# cases so...
[ -x /usr/bin/systemctl ] &&
/usr/bin/systemctl daemon-reload || :
%files -f SUSE.list
%defattr(-,root,root)
%files branding-SLE -f SLE.list
%defattr(-,root,root)
%files branding-openSUSE -f openSUSE.list
%defattr(-,root,root)
%files branding-upstream
%defattr(-,root,root)
%files branding-SLE-Micro -f SLE.list -f SLE-Micro.list
%defattr(-,root,root)
%changelog