[gnome-build-meta/valentindavid/eos-installer: 8/13] Add volume descriptor in installer ISO to ease osinfo detection

[Jordan Petridis <jpetridis src gnome org>]

commit ceaae6d74f3a68367e686ac83472e2386d637b70
Author: Valentin David <valentin david codethink co uk>
Date:   Tue Mar 10 11:21:52 2020 +0100

    Add volume descriptor in installer ISO to ease osinfo detection

 elements/iso/eos-installer-extra.bst                               | 7 ++++++-
 elements/iso/image.bst                                             | 6 +++---
 elements/iso/initramfs.bst                                         | 4 ++--
 ...{run-mount-installercd.mount => run-mount-installercd.mount.in} | 2 +-
 project.conf                                                       | 2 ++
 5 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/elements/iso/eos-installer-extra.bst b/elements/iso/eos-installer-extra.bst
index 5e4d4182..96e26476 100644
--- a/elements/iso/eos-installer-extra.bst
+++ b/elements/iso/eos-installer-extra.bst
@@ -20,7 +20,7 @@ sources:
 - kind: local
   path: files/eos-installer-extra/eos-installer.preset
 - kind: local
-  path: files/eos-installer-extra/run-mount-installercd.mount
+  path: files/eos-installer-extra/run-mount-installercd.mount.in
 - kind: local
   path: files/eos-installer-extra/eos-installer.session
 - kind: local
@@ -39,6 +39,11 @@ sources:
   path: files/eos-installer-extra/session.conf
 
 config:
+  build-commands:
+  - |
+    sed 's/@VOLUME_ID@/%{installer-volume-id}/g' run-mount-installercd.mount.in \
+      >run-mount-installercd.mount
+
   install-commands:
   - |
     dir="$(pkg-config --variable=systemdsystemunitdir systemd)"
diff --git a/elements/iso/image.bst b/elements/iso/image.bst
index 6ceaa8ce..7b4ac3a3 100644
--- a/elements/iso/image.bst
+++ b/elements/iso/image.bst
@@ -38,7 +38,7 @@ config:
     prepare-image.sh \
        --sysroot /sysroot \
        --seed "%{uuidnamespace}" \
-       --rootsource LABEL=GNOME-OS-INSTALLER \
+       --rootsource LABEL="%{installer-volume-id}" \
        --rootfstype iso9660 \
        --noboot >/dev/null
 
@@ -87,8 +87,8 @@ config:
     cat >/stage-2/genimage.cfg <<EOF
     image installer.iso {
         iso {
-            extraargs = "-e /efi.img -no-emul-boot -boot-load-size 4 -efi-boot-part --efi-boot-image"
-            volume-id = "GNOME-OS-INSTALLER"
+            extraargs = "-e /efi.img -no-emul-boot -boot-load-size 4 -efi-boot-part --efi-boot-image -sysid 
LINUX -publisher GNOME"
+            volume-id = "%{installer-volume-id}"
         }
     }
     config {
diff --git a/elements/iso/initramfs.bst b/elements/iso/initramfs.bst
index 72be2aad..c4f9a00a 100644
--- a/elements/iso/initramfs.bst
+++ b/elements/iso/initramfs.bst
@@ -35,7 +35,7 @@ config:
   - |
     prepare-image.sh \
        --seed "%{uuidnamespace}" \
-       --rootsource LABEL=GNOME-OS-INSTALLER \
+       --rootsource LABEL="%{installer-volume-id}" \
        --rootfstype iso9660 \
        --noboot >/dev/null
 
@@ -45,7 +45,7 @@ config:
            --kernel-image "/boot/vmlinuz" \
            --no-machineid \
            --kver "$(ls -1 /usr/lib/modules | head -n1)" \
-           --kernel-cmdline "rw quiet splash root=live:LABEL=GNOME-OS-INSTALLER" \
+           --kernel-cmdline 'rw quiet splash root=live:LABEL=%{installer-volume-id}' \
            --add dmsquash-live \
            --add plymouth \
            --install grep \
diff --git a/files/eos-installer-extra/run-mount-installercd.mount 
b/files/eos-installer-extra/run-mount-installercd.mount.in
similarity index 82%
rename from files/eos-installer-extra/run-mount-installercd.mount
rename to files/eos-installer-extra/run-mount-installercd.mount.in
index 2cebf68b..626bab8f 100644
--- a/files/eos-installer-extra/run-mount-installercd.mount
+++ b/files/eos-installer-extra/run-mount-installercd.mount.in
@@ -2,7 +2,7 @@
 Description=Mount installer CD
 
 [Mount]
-What=LABEL=GNOME-OS-INSTALLER
+What=LABEL=@VOLUME_ID@
 Where=/run/mount/installercd
 Type=iso9660
 Options=ro,nodev,nosuid,noexec,nofail,allow_other
diff --git a/project.conf b/project.conf
index 85c1d208..cb95b320 100644
--- a/project.conf
+++ b/project.conf
@@ -212,6 +212,8 @@ shell:
 
 variables:
   branch: master
+  branch-nice-name: Nightly #Should be %{branch} if not master
+  installer-volume-id: "GNOME-OS-%{branch-nice-name}-%{arch}"
   qualifier: ''
   flatpak-branch: '%{branch}%{qualifier}'
   ostree-layer: user