fix(live): Rename "root" to "live-root" to avoid confusion with "root/root"

live/Makefile

@@ -24,7 +24,7 @@ ARCH = $(shell uname -m)
 # 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-PXE.tar.xz
+all: $(DESTDIR) $(COPY_FILES) $(DESTDIR)/config-cdroot.tar.xz $(DESTDIR)/live-root.tar.xz $(DESTDIR)/live-root-PXE.tar.xz
 
 # clean the destination directory (but keep the .osc directory if it is present)
 clean:

live/src/agama-installer.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr 23 08:39:34 UTC 2025 - Ladislav Slezák <lslezak@suse.com>
+
+- Rename "root" source directory to "live-root" to avoid confusion
+  with root/root directory
+- Removed duplicate files which are located in root/root
+  (live-root/root now)
+
 -------------------------------------------------------------------
 Wed Apr 23 05:47:23 UTC 2025 - Ladislav Slezák <lslezak@suse.com>
 

live/src/agama-installer.kiwi

@@ -98,7 +98,7 @@
         <package name="NetworkManager-config-server"/>
         <package name="dracut-kiwi-oem-repart"/>
         <package name="dracut-kiwi-oem-dump"/>
-        <archive name="root-PXE.tar.xz"/>
+        <archive name="live-root-PXE.tar.xz"/>
     </packages>
 
     <!-- common set of packages (SSH-based and remote installation, etc.) -->
@@ -156,7 +156,7 @@
         <package name="qrencode"/>
         <package name="qemu-guest-agent" />
         <package name="aaa_base-extras"/>
-        <archive name="root.tar.xz"/>
+        <archive name="live-root.tar.xz"/>
     </packages>
 
     <!-- packages for local installation (desktop, browser, etc.) -->

live/test/info_cmdline_test.rb

@@ -3,7 +3,7 @@
 require "cheetah"
 
 describe "info-cmdline-conf.sh" do
-  let(:script_path) { File.expand_path("../root/usr/bin/info-cmdline-conf.sh", __dir__, ) }
+  let(:script_path) { File.expand_path("../live-root/usr/bin/info-cmdline-conf.sh", __dir__, ) }
 
   context "There is no info parameter" do
     let(:source_path) { File.expand_path("fixtures/source/cmdline", __dir__, ) }

live/test/kernel_cmdline_test.rb

@@ -3,7 +3,7 @@
 
 describe "kernel-cmdline-conf.sh" do
   it "filters out any agama params" do
-    script_path = File.expand_path("../root/usr/bin/kernel-cmdline-conf.sh", __dir__, )
+    script_path = File.expand_path("../live-root/usr/bin/kernel-cmdline-conf.sh", __dir__, )
     source_path = File.expand_path("fixtures/source/cmdline", __dir__, )
     expected_path = File.expand_path("fixtures/expected/cmdline", __dir__, )
     tmpdir = Dir.mktmpdir do |tmpdir|