From 2a0b9a1a1c74166a39f7ef48acde453c593abd2f56172a803b92e3518a32535a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Thu, 16 May 2024 15:32:48 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main elemental revision
 de3f1286f2079594742a4b3c2c52cc29

---
 elemental-2.1.0.tar => elemental-2.1.1.tar | Bin 51200 -> 51200 bytes
 elemental-rpmlintrc                        |   6 +++---
 elemental.changes                          |  11 +++++++++++
 elemental.spec                             |  18 +++++++++---------
 4 files changed, 23 insertions(+), 12 deletions(-)
 rename elemental-2.1.0.tar => elemental-2.1.1.tar (81%)

diff --git a/elemental-2.1.0.tar b/elemental-2.1.1.tar
similarity index 81%
rename from elemental-2.1.0.tar
rename to elemental-2.1.1.tar
index 66c0026fd73af5cee0e4bb4c7379975dd8f2cc52095571e7f9d6991663a91c03..7464e3d2958811841e4d008371bc0c9f59607f1ab364c96020d449bba8c83fb8 100644
GIT binary patch
delta 2373
zcmaKt-EQ1O6vyMHq^)5|)es3*1WmT9ZA0bVnXx^V5~)F=eD$K@vqA_|jCVF`W!Fw@
zZ`3F$L{tI^ZW1hR5JK<*aFKW5j(6Zq%FK>y`;04mv9iX$^L^&OC#Q=ir;E#c!lyjS
z{E0>Tq)&3vw$D)KY}i|2*!3vE*j>PcQsONjHz$k3bHivE2FaH%90A0k#L<z95OHn7
zbYux440}XJE(1iQL|h#)Awmgj<njVU9M2VAu&SulT9g&FA%b1n$mLatxUN%qSyNt+
zhEQggfz}nWw0foNyXyEwt>YA9yU}rAcH^3t53hkSQEEG)?xLub)+Jfg((2VR)*y(Z
zQMi*2+E|ZAT-uz?YEL)q4+rV~%umOo)C%J1Uc%EfjPvc=?R@z4`pdSnK%Cm*P{#1n
z>T|<*(pJV+6xXbyO_U|G^M5}?Mt*hq@1HKbDD&=uHWJ1hs!zQK5znCw<R(C<gPG`R
z(V&gi6&Z*^#3pjp3&d9QVi2JYt)}iNWK%;tr}DC;klPS(oZ1F%x1N)^+<^$Su^38`
z%UjCJyAWZRRk^&UkoO_t+HU3L1BHAH5W)y;Y}<VeVV(#CCE!zlP;ARwAo3YRh({WC
z>T`hDgfd(f{e?>RONe0C7LzXe;wxmRArw~#SI8J3)Wfwvp&CGxwF#!SzQwM*j77Y7
z*LdSPx)Y-)&QLOoP&Vc$3#U9mqc}lflnOPS_*oc7Xv&A7kHl%hgZO|ahbTQvGd|7#
z%m(>iSvNnq*E-+b``I`@#Se^P^AjyiRuhm^rTI`ps8<zxsER!X2=UzJ{W)H%$$v2B
z!ETN(Z|KS(E=1#69k1OemBE@@@?=n*Bzz|nWhVV}eD)D}MO;j+p&qRX)#K-lw@uN=
z2Xja1%?)&9BJo^DZ_1p|C`{4}g(DP--}GsN`EU*;dsAfXBg@*Kg*-pK`;s+3&bTn?
zZX+w=2%}z43?Q2&ky$tnccM7q!e@SVcjcD!Du>A<|Eo#iSIsHNCgP)2d=P;opZ|03
zk|z`V-ypz&A7tSHFYLeRr#v|b1ODtx`9o1BF&~*`;HMmQx}+m&p0o1?ZOmU~{HkZ=
z(bm@d_4Nwk!8k^pPf~w}Z=x<nN5L)G)kmGurU)oK%15~1sUMi8JkRkv>&050XbXi|
zV=cY~2z9*LT0T~5`5i=vT@&Q*74n0Ih<~;6^8MIamOA+hK!kirorJ>ktA;Qc2qM1$
WM97!Z(5BxZLWNM4x%~0uwf_J;z%*?D

delta 1700
zcmZvcU279j5Qei|Q?+!PVo{^CAr&klHlCUDrJxX@-Y6K+A|j&JCW^N8qX~N92YV%=
zpiPgzKt$?w{*G7v5j}^q>}Jk-vscf)^UlmWC*6tDow(N9>}~a)4c0c7u>~z=V3rS?
zCx+dnIjJ>jF1e~OKon4EN&|6s6h%oCF;km(LlA+M43K>kkzBA4nWTsU;30B=AP9`>
z5SgL~A}e{Brijqms@Q&AM@bU9jwTPs>(Bds1XJM%lyX1N5oA9s&+B1x(sbv^&=8P`
zyu?DX-<6o9E|?Uhb`McRN>v!0^G1&Z2xl@cbkrlK2?9zf>xH^MLlG@R3270;h5&2~
zvZ0+#4!VxcQG|m_N`{>GUM^4sg(y0@=#h4SXkDmW^2iEBtVp49IjK4?S15v<+q`97
zu6mVg6j8tml}?6Wb?{`Xw{6-h4bz=otfQ!a7&`})b}6}V=U7zj57xE^X7Tzd(^-9Q
zet)Qq{;W2lVRL48V#XP}L90r^3S&2Y)msDs1+sK;w*y3j^-gzshafh9u04v}r3h$V
zir_thaNrE{cJF(;4=KW=EV91tkw*byACX+;u}7W~1T~Bm+VDGlF*weo!e9eR>SBT~
zH=<F}{}yG#eiex7vFmv4Mc)R9O>J)Nowt?}1hgz4P`Y5)o-hxVPS)){X+)6m;wG~f
z^J5?h?tP%k`9u(uY|PkaZ|n<2?7bDI^3@}|0fJ+3HA&4S@;gCn+}x>9FFyiAyFwKC
eNf6t!DrISpBB*#V>R*2wqqLqz|NEGBoc;q<BW?2l

diff --git a/elemental-rpmlintrc b/elemental-rpmlintrc
index 506bb18..df893bc 100644
--- a/elemental-rpmlintrc
+++ b/elemental-rpmlintrc
@@ -1,5 +1,5 @@
-# ignore rclink missing checks
-addFilter("W: suse-missing-rclink");
+# ignore complaints due to not compressed source. Sources are really small anyway.
+addFilter("W: source-not-compressed");
 
 # ignore fhs complaints
-addFilter("W: suse-filelist-forbidden-fhs23");
+addFilter("E: filelist-forbidden-fhs23");
diff --git a/elemental.changes b/elemental.changes
index eeae6e5..2d97162 100644
--- a/elemental.changes
+++ b/elemental.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 26 12:01:26 UTC 2024 - David Cassany <dcassany@suse.com>
+
+- Update to version v2.1.1
+  * Move bootargs to /etc/elemental
+  * Include boot assessment installation as part of elemental init
+  * Do not start elemental-register timer manually
+  * Add an elemental-register checker
+  * Adding an network-online checker for elemental
+  * Add wireless-regdb for aarch64 
+
 -------------------------------------------------------------------
 Wed Mar 13 20:24:13 UTC 2024 - David Cassany <dcassany@suse.com>
 
diff --git a/elemental.spec b/elemental.spec
index 59ac557..0a46588 100644
--- a/elemental.spec
+++ b/elemental.spec
@@ -19,7 +19,7 @@
 %define oemdir %{systemdir}/oem
 
 Name:           elemental
-Version:        2.1.0
+Version:        2.1.1
 Release:        0
 Summary:        A Rancher and Kubernetes optimized immutable Linux distribution
 License:        Apache-2.0
@@ -30,8 +30,8 @@ Source1:        LICENSE
 Source2:        README.md
 Source3:        %{name}-rpmlintrc
 
-Requires:       elemental-toolkit >= 2.0.0
-Requires:       elemental-toolkit < 2.1.0
+Requires:       elemental-toolkit >= 2.1.0
+Requires:       elemental-toolkit < 2.2.0
 Requires:       elemental-register
 Requires:       elemental-system-agent
 Requires:       elemental-support
@@ -67,9 +67,6 @@ cp -a framework/files/* %{buildroot}
 
 rm -rf %{buildroot}/var/log/journal
 
-# remove placeholders
-rm -rf %{buildroot}/usr/libexec/.placeholder
-
 %pre
 %if 0%{?suse_version}
 %service_add_pre elemental-populate-node-labels.service
@@ -142,8 +139,10 @@ rm -rf %{buildroot}/usr/libexec/.placeholder
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE
-%dir %{_sysconfdir}/cos
-%config %{_sysconfdir}/cos/bootargs.cfg
+%dir %{_sysconfdir}/elemental
+%config %{_sysconfdir}/elemental/bootargs.cfg
+%dir %{_sysconfdir}/elemental/config.d
+%config %{_sysconfdir}/elemental/config.d/*
 %dir %{_sysconfdir}/dracut.conf.d
 %config %{_sysconfdir}/dracut.conf.d/51-certificates-initrd.conf
 %config %{_sysconfdir}/dracut.conf.d/99-elemental-systemd.conf
@@ -159,7 +158,8 @@ rm -rf %{buildroot}/usr/libexec/.placeholder
 %{_unitdir}/elemental-populate-node-labels.service
 %{_unitdir}/elemental-system-agent.service
 %{_sbindir}/elemental-populate-node-labels
-%dir /usr/libexec
+%dir %{_libexecdir}/elemental-checker
+%{_libexecdir}/elemental-checker/elemental-register.sh
 %dir %{systemdir}
 %dir %{oemdir}
 %{oemdir}/*