[gnome-build-meta/jjardon/gnome_3_37_92: 8/44] Add volume descriptor in installer ISO to ease osinfo detection
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/jjardon/gnome_3_37_92: 8/44] Add volume descriptor in installer ISO to ease osinfo detection
- Date: Sat, 12 Sep 2020 15:31:42 +0000 (UTC)
commit 3bd5e37832267c05f2a32577c58964a1d0c34044
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 7c13ac16..824f48f9 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 70646910..102e9a71 100644
--- a/elements/iso/image.bst
+++ b/elements/iso/image.bst
@@ -39,7 +39,7 @@ config:
prepare-image.sh \
--sysroot /sysroot \
--seed "%{uuidnamespace}" \
- --rootsource LABEL=GNOME-OS-INSTALLER \
+ --rootsource LABEL="%{installer-volume-id}" \
--rootfstype iso9660 \
--noboot >/dev/null
@@ -88,8 +88,8 @@ config:
cat >/build/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 36aacdd6..cd61ad3e 100644
--- a/project.conf
+++ b/project.conf
@@ -213,6 +213,8 @@ shell:
variables:
branch: '3.38'
qualifier: 'beta'
+ branch-nice-name: '%{branch}'
+ installer-volume-id: "GNOME-OS-%{branch-nice-name}-%{arch}"
flatpak-branch: '%{branch}%{qualifier}'
ostree-layer: user
ostree-branch: "gnome-os/%{branch}/%{arch}-%{ostree-layer}"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]