root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed correct systemd-user-sessions startup

Browse source
This commit is contained in:
Tobias Powalowski 2023-11-08 20:22:01 +01:00
parent 51f525e1cb
commit 2b0f31b28f
3 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
usr/lib/archboot/cpio/hooks/base_common
View file

@ -116,11 +116,18 @@ inputrc,mke2fs.conf,nsswitch.conf,protocols,request-key.conf,securetty,services}
_map _dir /etc/tmpfiles.d /etc/modules-load.d /etc/binfmt.d/
_file_rename /usr/share/archboot/base/etc/locale.conf /etc/locale.conf
_file_rename /usr/share/archboot/base/etc/vconsole.conf /etc/vconsole.conf
_file_rename /usr/share/archboot/base/etc/systemd/system/getty@.service /etc/systemd/system/getty@.service
_file_rename /usr/share/archboot/base/etc/systemd/system/serial-getty@.service /etc/systemd/system/serial-getty@.service
_file_rename /usr/share/archboot/base/etc/systemd/system/windowkeys.service /etc/systemd/system/windowkeys.service
_file_rename /usr/share/archboot/base/etc/systemd/journald.conf.d/fw-tty12.conf /etc/systemd/journald.conf.d/fw-tty12.conf
_symlink /etc/systemd/system/multi-user.target.wants/windowkeys.service /etc/systemd/system/windowkeys.service
_file_rename /usr/share/archboot/base/etc/systemd/system/systemd-user-sessions.service \
/etc/systemd/system/systemd-user-sessions.service
_file_rename /usr/share/archboot/base/etc/systemd/system/getty@.service \
/etc/systemd/system/getty@.service
_file_rename /usr/share/archboot/base/etc/systemd/system/serial-getty@.service \
/etc/systemd/system/serial-getty@.service
_file_rename /usr/share/archboot/base/etc/systemd/system/windowkeys.service \
/etc/systemd/system/windowkeys.service
_file_rename /usr/share/archboot/base/etc/systemd/journald.conf.d/fw-tty12.conf \
/etc/systemd/journald.conf.d/fw-tty12.conf
_symlink /etc/systemd/system/multi-user.target.wants/windowkeys.service \
/etc/systemd/system/windowkeys.service
### use: systemctl status for everything
### use: systemctl list-dependencies for tree
### disable systemd mounts:
@ -176,8 +183,8 @@ inputrc,mke2fs.conf,nsswitch.conf,protocols,request-key.conf,securetty,services}
_map _file /etc/{pacman.conf,makepkg.conf,pacman.d/mirrorlist}
# add pacman initialization of gpg keys
_dir /etc/pacman.d/gnupg
_file_rename /usr/share/archboot/base/etc/systemd/system/pacman-init.service /etc/systemd/system/pacman-init.service
_file_rename /usr/share/archboot/base/etc/systemd/system/pacman-init.service \
/etc/systemd/system/pacman-init.service
### add nss p11-kit and ca certificates
_map _binary p11-kit trust certutil cmsutil crlutil modutil nss-config pk12util \
shlibsign signtool signver ssltap symkeyutil update-ca-trust

3
usr/share/archboot/base/etc/systemd/system/getty@.service
View file

@ -11,8 +11,7 @@
Description=Getty on %I
Documentation=man:agetty(8) man:systemd-getty-generator(8)
Documentation=http://0pointer.de/blog/projects/serial-console.html
After=windowkeys.service systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target
Wants=windowkeys.service systemd-user-sessions.service
After=systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target
# If additional gettys are spawned during boot then we should make
# sure that this is synchronized before getty.target, even though

19
usr/share/archboot/base/etc/systemd/system/systemd-user-sessions.service Normal file
View file

@ -0,0 +1,19 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
[Unit]
Description=Permit User Sessions
Documentation=man:systemd-user-sessions.service(8)
After=remote-fs.target nss-user-lookup.target network.target home.mount systemd-tmpfiles-setup.service
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/lib/systemd/systemd-user-sessions start
ExecStop=/usr/lib/systemd/systemd-user-sessions stop