diff --git a/live/Makefile b/live/Makefile index 598cde6388..3585e7e041 100644 --- a/live/Makefile +++ b/live/Makefile @@ -14,7 +14,7 @@ FLAVOR = openSUSE # files to copy from src/ COPY_FILES = $(patsubst $(SRCDIR)/%,$(DESTDIR)/%,$(wildcard $(SRCDIR)/*)) -all: $(DESTDIR) $(COPY_FILES) $(DESTDIR)/config-cdroot.tar.xz $(DESTDIR)/root.tar.xz $(DESTDIR)/root-ALP-PXE.tar.xz +all: $(DESTDIR) $(COPY_FILES) $(DESTDIR)/config-cdroot.tar.xz $(DESTDIR)/root.tar.xz # clean the destination directory (but keep the .osc directory if it is present) clean: diff --git a/live/agama-live.kiwi b/live/agama-live.kiwi index 5b03f485df..3e4df52e3a 100644 --- a/live/agama-live.kiwi +++ b/live/agama-live.kiwi @@ -10,10 +10,7 @@ - - - 7.0.0 @@ -26,72 +23,27 @@ bgrt openSUSE - + - + - + - - - - - - true - true - /dev/ram1 - false - false - - 3000 - - - - - - - true - true - /dev/ram1 - false - false - - 1900 - - - - - - - true - true - /dev/ram1 - false - false - - 1900 - - - - - - - @@ -165,13 +117,8 @@ - - - - - - + diff --git a/live/root-ALP-PXE/etc/dracut.conf.d/90-brd.conf b/live/root-ALP-PXE/etc/dracut.conf.d/90-brd.conf deleted file mode 100644 index 815bd630f3..0000000000 --- a/live/root-ALP-PXE/etc/dracut.conf.d/90-brd.conf +++ /dev/null @@ -1 +0,0 @@ -add_drivers+=" brd " diff --git a/live/src/_multibuild b/live/src/_multibuild index 2384047547..4cd8407d1a 100644 --- a/live/src/_multibuild +++ b/live/src/_multibuild @@ -1,7 +1,4 @@ openSUSE openSUSE-Playwright - ALP - ALP-Playwright - ALP-PXE diff --git a/web/src/components/overview/ProductSection.jsx b/web/src/components/overview/ProductSection.jsx index 4ef26e2520..1ba0523abc 100644 --- a/web/src/components/overview/ProductSection.jsx +++ b/web/src/components/overview/ProductSection.jsx @@ -44,7 +44,7 @@ const Content = ({ isLoading = false }) => { return ( - {/* TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite) */} + {/* TRANSLATORS: %s is replaced by a product name (e.g. SLES) */} {isRegistered ? sprintf(_("%s (registered)"), productName) : productName} ); diff --git a/web/src/components/product/ProductPage.jsx b/web/src/components/product/ProductPage.jsx index 983e6533a6..bf10f12392 100644 --- a/web/src/components/product/ProductPage.jsx +++ b/web/src/components/product/ProductPage.jsx @@ -198,7 +198,7 @@ const DeregisterProductPopup = ({ />

{ - // TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite) + // TRANSLATORS: %s is replaced by a product name (e.g. SLES) sprintf(_("Do you want to deregister %s?"), selectedProduct.name) }

diff --git a/web/src/components/product/ProductSelector.test.jsx b/web/src/components/product/ProductSelector.test.jsx index 6475f87f0a..5f956409a8 100644 --- a/web/src/components/product/ProductSelector.test.jsx +++ b/web/src/components/product/ProductSelector.test.jsx @@ -28,11 +28,6 @@ import { createClient } from "~/client"; jest.mock("~/client"); const products = [ - { - id: "ALP-Dolomite", - name: "ALP Dolomite", - description: "ALP Dolomite description" - }, { id: "Tumbleweed", name: "openSUSE Tumbleweed", @@ -53,7 +48,6 @@ it("shows an option for each product", async () => { installerRender(); await screen.findByRole("grid", { name: "Available products" }); - screen.getByRole("row", { name: /ALP Dolomite/ }); screen.getByRole("row", { name: /openSUSE Tumbleweed/ }); screen.getByRole("row", { name: /openSUSE MicroOS/ }); });