File project.diff of Package systemd-presets-branding-MicroOS
--- 50-default-MicroOS.preset.orig
+++ 50-default-MicroOS.preset
@@ -2,8 +2,7 @@ enable transactional-update.timer
enable create-dirs-from-rpmdb.service
enable rebootmgr.service
enable issue-add-ssh-keys.service
-enable sshd.service
-enable tallow.service
+enable ignition-firstboot-complete.service
enable cloud-config.service
enable cloud-final.service
enable cloud-init-local.service
@@ -12,6 +11,11 @@ enable health-checker.service
enable kubelet.service
enable container-image-prune.timer
disable purge-kernels.service
+enable sshd.service
+# pulled in by kiwi stuff by default
+disable lvm2-monitor.service
# optional packages
enable man-db-create.service
+# this one is just plain broken
+disable btrfsmaintenance-refresh.service
--- systemd-presets-branding-MicroOS.changes.orig
+++ systemd-presets-branding-MicroOS.changes
@@ -1,190 +1,9 @@
-------------------------------------------------------------------
-Wed Apr 22 15:46:36 UTC 2020 - Richard Brown <rbrown@suse.com>
+Thu Oct 8 11:35:50 UTC 2020 - jsrain@suse.com
-- Enable container-image-prune.timer by default
+- enable the sshd service by default
-------------------------------------------------------------------
-Mon Mar 23 10:03:58 UTC 2020 - Richard Brown <rbrown@suse.com>
-
-- Enable kubelet by default (as expected by kubeadm) [boo#1167369]
-
--------------------------------------------------------------------
-Wed Jun 12 14:55:43 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
- shortcut the build queues by allowing usage of systemd-mini
-
--------------------------------------------------------------------
-Mon Mar 4 12:44:59 CET 2019 - kukuk@suse.de
-
-- Obsolete old CaaSP version to fix migration
-
--------------------------------------------------------------------
-Tue Feb 19 15:13:56 CET 2019 - kukuk@suse.de
-
-- Make MicroOS specific (remove CaaSP specific services)
-
--------------------------------------------------------------------
-Mon Feb 18 11:47:30 CET 2019 - kukuk@suse.de
-
-- Enable tallow by default.
-
--------------------------------------------------------------------
-Tue Sep 25 17:10:35 CEST 2018 - kukuk@suse.de
-
-- Enable update-checker-migration.timer to check for new product
- versions [bsc#1109777].
-
--------------------------------------------------------------------
-Fri Apr 20 13:57:25 CEST 2018 - kukuk@suse.de
-
-- Enable create-dirs-from-rpmdb.service for transactional-updates
-
--------------------------------------------------------------------
-Thu Mar 8 10:47:57 UTC 2018 - dimstar@opensuse.org
-
-- Also drop 99-default-disable.preset: the default preset to
- disable all not-explicitly listed services is part of
- systemd-presets-common-SUSE.
-
--------------------------------------------------------------------
-Wed Mar 7 17:14:25 UTC 2018 - dimstar@opensuse.org
-
-- FATE#322139: split out common service configuration from branding
- presets:
- + Copy only the %theme specific file from
- systemd-preset-branding-theme into our file list; the rest is
- brought in as part of dependencies.
- + Require the new systemd-presets-common-SUSE package, also as
- Requoires(pre), as it contains the executables used.
-
--------------------------------------------------------------------
-Tue Jan 16 13:23:19 CET 2018 - kukuk@suse.de
-
-- Enable man-db-create.service if installed
-
--------------------------------------------------------------------
-Tue Dec 12 11:51:59 CET 2017 - kukuk@suse.de
-
-- Copy new default-SUSE.preset
-- Cleanup 70-default-CAASP.preset
-
--------------------------------------------------------------------
-Mon Dec 11 16:17:30 CET 2017 - kukuk@suse.de
-
-- If we do a fresh installation, call systemctl preset-all in the
- %posttrans section. Some services need to be installed before
- systemd or do not strictly require systemd, so systemd would only
- be installed after them and the systemd units of this package
- never enabled.
-
--------------------------------------------------------------------
-Fri Dec 8 07:49:36 UTC 2017 - kukuk@suse.com
-
-- Fix %pre/%post preset calls
-- Copy branding-preset-states script from main branding package
-
--------------------------------------------------------------------
-Thu Aug 3 10:19:54 CEST 2017 - kukuk@suse.de
-
-- Fix building on SLE15
-
--------------------------------------------------------------------
-Tue Jun 20 08:57:10 CEST 2017 - kukuk@suse.de
-
-- Enable ca-ceertificates.{path,service} by default
-
--------------------------------------------------------------------
-Mon May 29 13:52:14 CEST 2017 - kukuk@suse.de
-
-- Enable apparmor by default
-
--------------------------------------------------------------------
-Tue May 2 12:55:21 CEST 2017 - kukuk@suse.de
-
-- Workaround broken util-linux fixes for [bsc#1029775]
-
--------------------------------------------------------------------
-Tue Apr 18 16:03:49 CEST 2017 - kukuk@suse.de
-
-- Enable adjust-cloud-cfg by default
-
--------------------------------------------------------------------
-Wed Apr 12 16:28:31 CEST 2017 - kukuk@suse.de
-
-- Enable setup-salt-minion service by default
-
--------------------------------------------------------------------
-Wed Apr 12 13:49:39 CEST 2017 - kukuk@suse.de
-
-- Enable audit daemon by default
-
--------------------------------------------------------------------
-Tue Apr 4 20:38:39 CEST 2017 - kukuk@suse.de
-
-- Container-feeder is now enabled by YaST2
-
--------------------------------------------------------------------
-Mon Apr 3 11:41:17 CEST 2017 - kukuk@suse.de
-
-- Enable health-checker.service per default
-
--------------------------------------------------------------------
-Tue Mar 28 13:47:51 CEST 2017 - kukuk@suse.de
-
-- Workaround for bad idea to remove systemd macros in factory why
- other products still depend on them.
-
--------------------------------------------------------------------
-Fri Mar 10 11:22:01 CET 2017 - kukuk@suse.de
-
-- Add container-feeder.service
-
--------------------------------------------------------------------
-Fri Jan 20 21:51:22 CET 2017 - kukuk@suse.de
-
-- Adjust to make workable with SLE and openSUSE
-
--------------------------------------------------------------------
-Tue Jan 17 17:20:49 CET 2017 - kukuk@suse.de
-
-- Enable cloud-init services
-
--------------------------------------------------------------------
-Sat Jan 14 12:01:36 CET 2017 - kukuk@suse.de
-
-- Rename from casp to caasp
-
--------------------------------------------------------------------
-Thu Dec 15 12:18:31 CET 2016 - kukuk@suse.de
-
-- Remove snapper again
-- Add sshd, since installer has no configuration dialog anymore
- for this
-
--------------------------------------------------------------------
-Fri Nov 25 19:35:36 CET 2016 - kukuk@suse.de
-
-- Enable issue-generator
-
--------------------------------------------------------------------
-Wed Nov 23 15:23:47 CET 2016 - kukuk@suse.de
-
-- Enable snapper-timeline.timer and snapper-cleanup.timer by
- default
-
--------------------------------------------------------------------
-Sat Nov 19 10:29:13 CET 2016 - kukuk@suse.de
-
-- Enable rebootmgr.service by default
-
--------------------------------------------------------------------
-Wed Nov 16 22:38:27 CET 2016 - kukuk@suse.de
-
-- Enable logrotate and transactional-update by default
-
--------------------------------------------------------------------
-Tue Nov 15 12:58:52 CET 2016 - kukuk@suse.de
-
-- Initial version
+Wed Jul 1 09:42:14 UTC 2020 - jsrain@suse.com
+- initial version based on openSUSE MicroOS
--- systemd-presets-branding-MicroOS.spec.orig
+++ systemd-presets-branding-MicroOS.spec
@@ -17,29 +17,34 @@
%define generic_name systemd-presets-branding
-
Name: systemd-presets-branding-MicroOS
-Version: 20200323
+Version: 20200810
Release: 0
-Summary: Systemd default presets for openSUSE MicroOS
+Summary: Systemd default presets for %{?!is_opensuse:SUSE }MicroOS
License: MIT
Group: System/Base
Source0: 50-default-MicroOS.preset
+BuildRequires: pkgconfig
+%if 0%{?is_opensuse}
BuildRequires: systemd-presets-branding-openSUSE
+%else
+BuildRequires: systemd-presets-branding-SLE
+%endif
BuildRequires: pkgconfig(systemd)
#!BuildIgnore: systemd-presets-branding
Requires: systemd-presets-common-SUSE
+# FIXME: use proper Requires(pre/post/preun/...)
PreReq: coreutils
# systemd-presets-common-SUSE provides
Requires(pre): systemd-presets-common-SUSE
-Supplements: packageand(systemd:branding-MicroOS)
+Supplements: (systemd and branding-%{?!is_opensuse:SUSE_}MicroOS)
Conflicts: systemd-presets-branding
Provides: systemd-presets-branding = %{version}
Obsoletes: systemd-presets-branding-CAASP < 15.1
BuildArch: noarch
%description
-Default presets for systemd on openSUSE MicroOS
+Default presets for systemd on %{?!is_opensuse:SUSE }MicroOS
%prep
%setup -q -T -c
@@ -50,7 +55,11 @@ Default presets for systemd on openSUSE
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset
install -m644 %{SOURCE0} %{buildroot}%{_prefix}/lib/systemd/system-preset/
# Copy default presets and script
+%if 0%{?is_opensuse}
install -m644 %{_prefix}/lib/systemd/system-preset/90-default-openSUSE.preset %{buildroot}%{_prefix}/lib/systemd/system-preset/
+%else
+install -m644 %{_prefix}/lib/systemd/system-preset/90-default-SLE.preset %{buildroot}%{_prefix}/lib/systemd/system-preset/
+%endif
%pre
# On initial installation, branding-preset-states does not yet exist,
@@ -86,7 +95,6 @@ fi
rm -f /run/rpm-%{name}-preset-all
%files
-%defattr(-,root,root)
%{_prefix}/lib/systemd/system-preset/*
%changelog
