Accepting request 991570 from systemsmanagement:cockpit

OBS-URL: https://build.opensuse.org/request/show/991570
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=22

cockpit.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 28 08:41:13 UTC 2022 - Jacek Tomasiak <jtomasiak@suse.com>
+
+- Update suse-microos-branding.patch for new /etc/os-release ID.
+- Add storage-btrfs.patch to enable BTRFS use in cockpit-storage.
+
 -------------------------------------------------------------------
 Thu Jun 23 09:27:17 UTC 2022 - Adam Majer <adam.majer@suse.de>
 

cockpit.spec

@@ -63,6 +63,7 @@ Patch1:         0001-selinux-allow-login-to-read-motd-file.patch
 Patch2:         hide-docs.patch
 Patch3:         suse-microos-branding.patch
 Patch4:         css-overrides.patch
+Patch5:         storage-btrfs.patch
 # SLE Micro specific patches
 Patch100:       remove-pwscore.patch
 Patch101:       hide-pcp.patch
@@ -183,6 +184,7 @@ Requires: subscription-manager-cockpit
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %if 0%{?sle_version}
 %patch100 -p1

storage-btrfs.patch

@@ -0,0 +1,14 @@
+diff --git a/pkg/storaged/format-dialog.jsx b/pkg/storaged/format-dialog.jsx
+index 05b1096..22db61b 100644
+--- a/pkg/storaged/format-dialog.jsx
++++ b/pkg/storaged/format-dialog.jsx
+@@ -162,7 +162,8 @@ export function format_dialog(client, path, start, size, enable_dos_extended) {
+     }
+ 
+     const filesystem_options = [];
+-    add_fsys("xfs", { value: "xfs", title: "XFS " + _("(recommended)") });
++    add_fsys("btrfs", { value: "btrfs", title: "BTRFS " + _("(recommended)") });
++    add_fsys("xfs", { value: "xfs", title: "XFS" });
+     add_fsys("ext4", { value: "ext4", title: "EXT4" });
+     add_fsys("vfat", { value: "vfat", title: "VFAT" });
+     add_fsys("ntfs", { value: "ntfs", title: "NTFS" });

suse-microos-branding.patch

@@ -8,11 +8,11 @@ to be available during build and installed on the target system to work
 properly.
 ---
  Makefile.am                            |  1 +
- src/branding/suse-microos/Makefile.am  | 11 ++++
+ src/branding/sle-micro/Makefile.am  | 11 ++++
- src/branding/suse-microos/branding.css | 87 ++++++++++++++++++++++++++
+ src/branding/sle-micro/branding.css | 87 ++++++++++++++++++++++++++
  3 files changed, 99 insertions(+)
- create mode 100644 src/branding/suse-microos/Makefile.am
+ create mode 100644 src/branding/sle-micro/Makefile.am
- create mode 100644 src/branding/suse-microos/branding.css
+ create mode 100644 src/branding/sle-micro/branding.css
 
 diff --git a/Makefile.am b/Makefile.am
 index fb619f3f253..ec761210a52 100644
@@ -22,32 +22,32 @@ index fb619f3f253..ec761210a52 100644
  include src/branding/fedora/Makefile.am
  include src/branding/kubernetes/Makefile.am
  include src/branding/opensuse/Makefile.am
-+include src/branding/suse-microos/Makefile.am
++include src/branding/sle-micro/Makefile.am
  include src/branding/registry/Makefile.am
  include src/branding/rhel/Makefile.am
  include src/branding/scientific/Makefile.am
-diff --git a/src/branding/suse-microos/Makefile.am b/src/branding/suse-microos/Makefile.am
+diff --git a/src/branding/sle-micro/Makefile.am b/src/branding/sle-micro/Makefile.am
 new file mode 100644
 index 00000000000..3f4b762afa5
 --- /dev/null
-+++ b/src/branding/suse-microos/Makefile.am
++++ b/src/branding/sle-micro/Makefile.am
 @@ -0,0 +1,11 @@
-+susemicroosbrandingdir = $(datadir)/cockpit/branding/suse-microos
++slemicrobrandingdir = $(datadir)/cockpit/branding/sle-micro
 +
-+dist_susemicroosbranding_DATA = \
++dist_slemicrobranding_DATA = \
-+	src/branding/suse-microos/branding.css \
++	src/branding/sle-micro/branding.css \
 +	$(NULL)
 +
 +install-data-hook::
-+	$(LN_S) -f /usr/share/wallpapers/SLEdefault/contents/images/1920x1200.png $(DESTDIR)$(susemicroosbrandingdir)/default-1920x1200.png
++	$(LN_S) -f /usr/share/wallpapers/SLEdefault/contents/images/1920x1200.png $(DESTDIR)$(slemicrobrandingdir)/default-1920x1200.png
-+	$(LN_S) -f /usr/share/pixmaps/distribution-logos/square-hicolor.svg $(DESTDIR)$(susemicroosbrandingdir)/square-hicolor.svg
++	$(LN_S) -f /usr/share/pixmaps/distribution-logos/square-hicolor.svg $(DESTDIR)$(slemicrobrandingdir)/square-hicolor.svg
-+	$(LN_S) -f /usr/share/pixmaps/distribution-logos/favicon.ico $(DESTDIR)$(susemicroosbrandingdir)/favicon.ico
++	$(LN_S) -f /usr/share/pixmaps/distribution-logos/favicon.ico $(DESTDIR)$(slemicrobrandingdir)/favicon.ico
-+	$(LN_S) -f /usr/share/pixmaps/distribution-logos/apple-touch-icon.png $(DESTDIR)$(susemicroosbrandingdir)/apple-touch-icon.png
++	$(LN_S) -f /usr/share/pixmaps/distribution-logos/apple-touch-icon.png $(DESTDIR)$(slemicrobrandingdir)/apple-touch-icon.png
-diff --git a/src/branding/suse-microos/branding.css b/src/branding/suse-microos/branding.css
+diff --git a/src/branding/sle-micro/branding.css b/src/branding/sle-micro/branding.css
 new file mode 100644
 index 00000000000..e3c7939c464
 --- /dev/null
-+++ b/src/branding/suse-microos/branding.css
++++ b/src/branding/sle-micro/branding.css
 @@ -0,0 +1,87 @@
 +/* Extra overrides */
 +:root {