[gentoo-commits] proj/releng:master commit in: releases/specs/amd64/livegui/, releases/specs/amd64/livegui/files/

[Andreas K. Hüttel]

commit:     3ad3619fd89c992782fab945d7f3cfb25b8c6517
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 00:08:08 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 00:08:08 2022 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=3ad3619f

Next LiveGUI experiment

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 releases/specs/amd64/livegui/files/fsscript-stage2.sh | 10 ++++++++++
 releases/specs/amd64/livegui/livegui-stage1.spec      |  1 +
 releases/specs/amd64/livegui/livegui-stage2.spec      |  4 ++++
 3 files changed, 15 insertions(+)

diff --git a/releases/specs/amd64/livegui/files/fsscript-stage2.sh 
b/releases/specs/amd64/livegui/files/fsscript-stage2.sh
new file mode 100755
index 00000000..8b74df2a
--- /dev/null
+++ b/releases/specs/amd64/livegui/files/fsscript-stage2.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo Running LiveGUI stage2 fsscript ...
+
+source /etc/profile
+env-update
+source /tmp/envscript
+
+# No we don't want to run xdm...
+sed -e '/^DISPLAYMANAGER=/s/.*/DISPLAYMANAGER="sddm"/' -i 
/etc/conf.d/display-manager

diff --git a/releases/specs/amd64/livegui/livegui-stage1.spec 
b/releases/specs/amd64/livegui/livegui-stage1.spec
index 38421f76..39fe47c1 100644
--- a/releases/specs/amd64/livegui/livegui-stage1.spec
+++ b/releases/specs/amd64/livegui/livegui-stage1.spec
@@ -15,6 +15,7 @@ livecd/use:
        jpeg2k
        livecd
        modules
+       networkmanager
        openexr
        opus
        postproc

diff --git a/releases/specs/amd64/livegui/livegui-stage2.spec 
b/releases/specs/amd64/livegui/livegui-stage2.spec
index f68e5755..79df39e4 100644
--- a/releases/specs/amd64/livegui/livegui-stage2.spec
+++ b/releases/specs/amd64/livegui/livegui-stage2.spec
@@ -13,6 +13,10 @@ livecd/iso: livegui-amd64-@TIMESTAMP@.iso
 livecd/type: gentoo-release-livecd
 livecd/volid: Gentoo amd64 LiveGUI @TIMESTAMP@
 
+livecd/fsscript: 
@REPO_DIR@/releases/specs/amd64/livegui/files/fsscript-stage2.sh
+livecd/rcadd: udev|sysinit udev-mount|sysinit acpid|default dbus|default 
gpm|default NetworkManager|default
+livecd/unmerge: net-misc/netifrc
+
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources