linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 23:07:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak /usr/share/{x,wayland-}sessions files

Browse Source 
Don't create a "deprecated directory, just remove spurious files
also fix starting gnome-wayland from lightdm
This commit is contained in:
Pierre Labastie 2023-02-26 22:02:44 +01:00
parent 8fdbeef95c
commit 863248381f
4 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnome/platform/gnome-session.xml
View File

@ -153,16 +153,18 @@ ninja</userinput></screen>
<screen role="root"><userinput>mv -v /usr/share/doc/gnome-session{,-&gnome-session-version;}</userinput></screen>
<para>This package creates two Xorg based .desktop files in the
/usr/share/xsessions/ directory. Only one is needed in a
BLFS system, so prevent the extra file showing up as an option
in a window manager. Also differentiate the X11 and Wayland versions
of Gnome. As the &root; user:</para>
<para>
This package creates two Xorg based <filename>.desktop</filename> files
in the <filename class="directory">/usr/share/xsessions/</filename>
directory, and two Wayland based <filename>.desktop</filename> files in
the <filename class="directory">/usr/share/wayland-sessions/</filename>
directory. Only one is needed in each directory on a BLFS system, so
prevent the extra files showing up as options in a display manager. As
the &root; user:
</para>
<screen role="root"><userinput>mkdir -p /usr/share/xsessions/deprecated &amp;&amp;
mv -v /usr/share/xsessions/gnome-xorg.desktop /usr/share/xsessions/deprecated &amp;&amp;
sed -i '/Name/s/$/ (X11)/' /usr/share/xsessions/gnome.desktop
</userinput></screen>
<screen role="root"><userinput>rm -v /usr/share/xsessions/gnome.desktop &amp;&amp;
rm -v /usr/share/wayland-sessions/gnome.desktop</userinput></screen>
<para revision="sysv">
Now, as the <systemitem class="username">root</systemitem> user,
@ -171,6 +173,18 @@ sed -i '/Name/s/$/ (X11)/' /usr/share/xsessions/gnome.desktop
<screen role="root" revision="sysv"><userinput>rm -rv /tmp/{*.d,*.target,*.service}</userinput></screen>
<!-- this part is not needed on systemd, since the dbus session is created
by systemd-user.-->
<para revision="sysv">
The startup sequence of gnome-wayland needs to create a dbus session.
On SysV, this has to be added to the shipped
<filename>gnome-wayland.desktop</filename> file, which is written for
systemd. As the &root; user:
</para>
<screen role="root" revision="sysv"><userinput>sed -e 's@^Exec=@&amp;/usr/bin/dbus-run-session @' \
-i /usr/share/wayland-sessions/gnome-wayland.desktop</userinput></screen>
</sect2>
<sect2 role="commands">

13
x/wm/icewm.xml
View File

@ -135,13 +135,14 @@ rm /usr/share/xsessions/icewm.desktop</userinput></screen>
-->
<screen role="root"><userinput>make install</userinput></screen>
<para>This package creates two .desktop files in the
/usr/share/xsessions/ directory. Both are not needed in a
BLFS system, so prevent the extra file showing up as an option
in a window manager. As the &root; user:</para>
<para>
This package creates two <filename>.desktop</filename> files in the
<filename class="directory">/usr/share/xsessions/</filename> directory.
Both are not needed in a BLFS system, so prevent the extra file showing
up as an option in a display manager. As the &root; user:
</para>
<screen role="root"><userinput>mkdir -p /usr/share/xsessions/deprecated &amp;&amp;
mv -v /usr/share/xsessions/icewm.desktop /usr/share/xsessions/deprecated</userinput></screen>
<screen role="root"><userinput>rm -v /usr/share/xsessions/icewm.desktop</userinput></screen>
</sect2>

13
x/wm/openbox.xml
View File

@ -129,13 +129,14 @@ make</userinput></screen>
<screen role="root"><userinput>make install</userinput></screen>
<para>This package creates three .desktop files in the
/usr/share/xsessions/ directory. Two of these are not appropriate in a
BLFS system, so prevent the extra files showing up as options
in a window manager. As the &root; user:</para>
<para>
This package creates three <filename>.desktop</filename> files in the
<filename class="directory">/usr/share/xsessions/</filename> directory.
Two of these are not appropriate in a BLFS system, so prevent the extra
files showing up as options in a display manager. As the &root; user:
</para>
<screen role="root"><userinput>mkdir -p /usr/share/xsessions/deprecated &amp;&amp;
mv -v /usr/share/xsessions/openbox-{gnome,kde}.desktop /usr/share/xsessions/deprecated</userinput></screen>
<screen role="root"><userinput>rm -v /usr/share/xsessions/openbox-{gnome,kde}.desktop</userinput></screen>
</sect2>

13
x/wm/sawfish.xml
View File

@ -128,13 +128,14 @@ make</userinput></screen>
<screen role="root"><userinput>make install</userinput></screen>
<para>This package creates six .desktop files in the
/usr/share/xsessions/ directory. All but one are needed in a
BLFS system, so prevent the extra files showing up as options
in a window manager. As the &root; user:</para>
<para>
This package creates six <filename>.desktop</filename> files in the
<filename class="directory">/usr/share/xsessions/</filename> directory.
All but one are needed in a BLFS system, so prevent the extra files
showing up as options in a display manager. As the &root; user:
</para>
<screen role="root"><userinput>mkdir -p /usr/share/xsessions/deprecated &amp;&amp;
mv -v /usr/share/xsessions/sawfish-*.desktop /usr/share/xsessions/deprecated</userinput></screen>
<screen role="root"><userinput>rm -v /usr/share/xsessions/sawfish-*.desktop</userinput></screen>
</sect2>
<!--