On 22/06/2019 14:23, Bruce Dubbs via blfs-dev wrote:
> On 6/22/19 2:03 AM, Pierre Labastie via blfs-dev wrote:
>> On 21/06/2019 16:54, Bruce Dubbs via blfs-dev wrote:
>>> On 6/21/19 2:15 AM, Pierre Labastie via blfs-dev wrote:
>>>> On 21/06/2019 00:57, Bruce Dubbs via blfs-dev wrote:
>
>>> What I've done is to checkout the full repo:
>>>
>>> svn://svn.linuxfromscratch.org/BLFS
>>> cd BLFS/branches/BOOK-elogind
>>> make
>>>
>>> to get the book rendered. One of the problems is that BLFS/trunk/BOOK is a
>>> moving target. DJ has been merging trunk into elogind periodically and it
>>> needs to be done again. I think that after the next merge, you should be
>>> able
>>> to start a test build and any changes to trunk after the test build kicks
>>> off
>>> wouldn't materially affect the results.
>>>
>>
>> As far as I understand, the merge is complete as of this morning (maybe
>> missing node.js). I realize that jhalfs needs a tarball for blfs-bootscripts,
>> which, as far as I know, does not exist yet for elogind. Would it be possible
>> to create one, and have the elogind book point to it? I could (try to) do
>> that, but it is maybe too early.
>
> It is not too early. The current trunk bootscripts work. That's what I used
> for my testing so far. The new bootscripts that are needed are there.
>
> I'm not sure how jhalfs accesses bootscripts, but a symlink in the tree should
> be enough.
jhalfs accesses bootscripts by using the link to the tarball given on page
"Chapter 2. Important Information/BLFS Boot Scripts". If this tarball contains
the elogind bootscripts, all is well. But it does not seem to. As far as I can
see, the blfs-bootscripts in trunk and in the bootscripts-elogind branch
differ (diff attached).
Regards
Pierre
diff -Naur '-I$Last' '-I$Date' --exclude .svn blfs-bootscripts/blfs/init.d/accounts-daemon bootscripts-elogind/blfs/init.d/accounts-daemon
--- blfs-bootscripts/blfs/init.d/accounts-daemon 1970-01-01 01:00:00.000000000 +0100
+++ bootscripts-elogind/blfs/init.d/accounts-daemon 2019-06-22 08:58:24.999198359 +0200
@@ -0,0 +1,58 @@
+#!/bin/sh
+# Begin /etc/init.d/accounts-daemon
+
+### BEGIN INIT INFO
+# Provides: accounts-daemon
+# Required-Start: $local_fs dbus elogind
+# Should-Start: $remote_fs $syslog
+# Required-Stop: $local_fs
+# Should-Stop: $remote_fs $syslog
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
+# Short-Description: Starts accounts-daemon.
+# Description: Starts accounts-daemon daemon.
+# X-LFS-Provided-By: BLFS
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+BIN_FILE="/usr/libexec/accounts-daemon"
+GVFS_DISABLE_FUSE=1
+GIO_USE_VFS=local
+GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1
+
+export GVFS_DISABLE_FUSE GIO_USE_VFS GVFS_REMOTE_VOLUME_MONITOR_IGNORE
+
+#$LastChangedBy: dj $
+#$Date: 2019-05-19 06:57:03 +0200 (dim. 19 mai 2019) $
+
+case "$1" in
+ start)
+ log_info_msg "Starting accounts-daemon..."
+ start_daemon ${BIN_FILE} &
+ evaluate_retval
+ ;;
+
+ stop)
+ log_info_msg "Stopping accounts-daemon..."
+ killproc ${BIN_FILE}
+ evaluate_retval
+ ;;
+
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+
+ status)
+ statusproc ${BIN_FILE}
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+# End /etc/init.d/accounts-daemon
diff -Naur '-I$Last' '-I$Date' --exclude .svn blfs-bootscripts/blfs/init.d/elogind bootscripts-elogind/blfs/init.d/elogind
--- blfs-bootscripts/blfs/init.d/elogind 1970-01-01 01:00:00.000000000 +0100
+++ bootscripts-elogind/blfs/init.d/elogind 2019-06-22 08:58:24.999198359 +0200
@@ -0,0 +1,67 @@
+#!/bin/sh
+########################################################################
+# Begin elogind
+#
+# Description : Startup script for elogind
+#
+# Authors : DJ Lucas - [email protected]
+#
+# Version : BLFS 8.4
+#
+########################################################################
+
+### BEGIN INIT INFO
+# Provides: elogind
+# Required-Start: dbus mountcgroupfs
+# Should-Start:
+# Required-Stop:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Manages user sessions
+# Description: Starts the elogind user session management daemon
+# X-LFS-Provided-By: BLFS
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+case "${1}" in
+ start)
+ install -vdm755 /run/systemd > /dev/null 2>&1 &&
+ log_info_msg "Startng elogind Session Manager..." &&
+ test -d /run/systemd && start_daemon /lib/elogind/elogind -D
+ evaluate_retval
+ ;;
+
+ stop)
+ log_info_msg "Stopping elogind Session Manager..."
+ killproc /lib/elogind/elogind
+ evaluate_retval
+ ;;
+
+ reload)
+ log_info_msg "Reloading elogind Session Manager..."
+ pid=`pidofproc elogind`
+ kill -HUP "${pid}"
+ evaluate_retval
+ ;;
+
+ restart)
+ ${0} stop
+ sleep 1
+ ${0} start
+ ;;
+
+ status)
+ statusproc /lib/elogind/elogind
+ ;;
+
+ *)
+ echo "Usage: ${0} {start|stop|reload|restart|status}"
+ exit 1
+ ;;
+esac
+
+exit 0
+
+# End /etc/init.d/elogind
diff -Naur '-I$Last' '-I$Date' --exclude .svn blfs-bootscripts/blfs/init.d/gdm bootscripts-elogind/blfs/init.d/gdm
--- blfs-bootscripts/blfs/init.d/gdm 2014-03-28 22:39:43.000000000 +0100
+++ bootscripts-elogind/blfs/init.d/gdm 2019-06-22 08:58:24.999198359 +0200
@@ -5,6 +5,7 @@
# Description : GDM Boot Script
#
# Authors : Armin K. <[email protected]>
+# DJ Lucas <[email protected]>
#
# Version : BLFS SVN
#
@@ -12,10 +13,12 @@
### BEGIN INIT INFO
# Provides: gdm
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
+# Required-Start: $local_fs
+# Should-Start: $remote_fs
+# Required-Stop: $local_fs
+# Should-Stop: $remote_fs
+# Default-Start: 5
+# Default-Stop: 0 1 2 3 4 6
# Short-Description: GNOME Display Manager
# X-LFS-Provided-By: BLFS
### END INIT INFO
diff -Naur '-I$Last' '-I$Date' --exclude .svn blfs-bootscripts/blfs/init.d/mountcgroupfs bootscripts-elogind/blfs/init.d/mountcgroupfs
--- blfs-bootscripts/blfs/init.d/mountcgroupfs 1970-01-01 01:00:00.000000000 +0100
+++ bootscripts-elogind/blfs/init.d/mountcgroupfs 2019-06-22 08:58:24.999198359 +0200
@@ -0,0 +1,66 @@
+#!/bin/sh
+########################################################################
+# Begin mountcgroupfs
+#
+# Description : Mount /sys/fs/cgroup{,/unified}
+#
+# Authors : DJ Lucas - [email protected]
+#
+# Version : BLFS 8.4
+#
+########################################################################
+
+### BEGIN INIT INFO
+# Provides: mountcgroupfs
+# Required-Start: mountvirtfs
+# Should-Start:
+# Required-Stop:
+# Should-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Mounts cgroup and cgroup v2 filesystems.
+# Description: Mounts /sys/fs/cgroup (cgroup).
+# Mounts /sys/fs/cgroup/unified (cgroup2).
+# X-LFS-Provided-By: BLFS
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+case "${1}" in
+ start)
+ log_info_msg "Mounting cgroup file systems:"
+ # Make sure /sys is available before doing anything
+ if mountpoint /sys >/dev/null; then
+ failed=0
+
+ # cgroup v1
+ mkdir -p /sys/fs/cgroup 2>&1> /dev/null
+ log_info_msg2 " ${INFO}/sys/fs/cgroup"
+ mount -t cgroup cgroup /sys/fs/cgroup || failed=1
+
+ # cgroup v2
+ mkdir -p /sys/fs/cgroup/unified 2>&1> /dev/null || failed=1
+ log_info_msg2 " ${INFO}/sys/fs/cgroup/unified"
+ mount -t cgroup2 none /sys/fs/cgroup/unified || failed=1
+
+ # /run/user
+ mkdir -p /run/user 2>&1> /dev/null || failed=1
+ log_info_msg2 " ${INFO}/run/user"
+ mount -t tmpfs none /run/user -o mode=755 || failed=1
+ else
+ failed=1
+ fi
+
+
+ (exit ${failed})
+ evaluate_retval
+ exit $failed
+ ;;
+
+ *)
+ echo "Usage: ${0} {start}"
+ exit 1
+ ;;
+esac
+
+# End /etc/init.d/mountcgroupfs
diff -Naur '-I$Last' '-I$Date' --exclude .svn blfs-bootscripts/ChangeLog bootscripts-elogind/ChangeLog
--- blfs-bootscripts/ChangeLog 2019-04-02 19:13:40.167705056 +0200
+++ bootscripts-elogind/ChangeLog 2019-06-22 08:58:25.159201894 +0200
@@ -1,6 +1,11 @@
2019-03-13 Bruce Dubbs <[email protected]>
* Allow bridge to be created without INTERFACE_COMPONENTS
+2018-12-16 DJ Lucas <[email protected]>
+ * Add elogind bootscript
+ * Add mountcgroupfs bootscript
+ * Restore gdm bootscript
+
2018-01-05 Bruce Dubbs <[email protected]>
* Add lightdm bootscript
diff -Naur '-I$Last' '-I$Date' --exclude .svn blfs-bootscripts/Makefile bootscripts-elogind/Makefile
--- blfs-bootscripts/Makefile 2018-05-12 17:42:32.291688252 +0200
+++ bootscripts-elogind/Makefile 2019-06-22 08:58:25.159201894 +0200
@@ -39,6 +39,16 @@
install-service-wpa: create-service-dir
install -m ${MODE} blfs/services/wpa ${LIBDIR}
+install-accounts-daemon: create-dirs
+ install -m ${MODE} blfs/init.d/accounts-daemon ${EXTDIR}/rc.d/init.d/
+ ln -sf ../init.d/accounts-daemon ${EXTDIR}/rc.d/rc0.d/K22accounts-daemon
+ ln -sf ../init.d/accounts-daemon ${EXTDIR}/rc.d/rc1.d/K22accounts-daemon
+ ln -sf ../init.d/accounts-daemon ${EXTDIR}/rc.d/rc2.d/S36accounts-daemon
+ ln -sf ../init.d/accounts-daemon ${EXTDIR}/rc.d/rc3.d/S36accounts-daemon
+ ln -sf ../init.d/accounts-daemon ${EXTDIR}/rc.d/rc4.d/S36accounts-daemon
+ ln -sf ../init.d/accounts-daemon ${EXTDIR}/rc.d/rc5.d/S36accounts-daemon
+ ln -sf ../init.d/accounts-daemon ${EXTDIR}/rc.d/rc6.d/K22accounts-daemon
+
install-acpid: create-dirs
install -m ${MODE} blfs/init.d/acpid ${EXTDIR}/rc.d/init.d/
ln -sf ../init.d/acpid ${EXTDIR}/rc.d/rc0.d/K32acpid
@@ -170,6 +180,16 @@
ln -sf ../init.d/dovecot ${EXTDIR}/rc.d/rc5.d/S27dovecot
ln -sf ../init.d/dovecot ${EXTDIR}/rc.d/rc6.d/K78dovecot
+install-elogind: create-dirs install-mountcgroupfs
+ install -m ${MODE} blfs/init.d/elogind ${EXTDIR}/rc.d/init.d/
+ ln -sf ../init.d/elogind ${EXTDIR}/rc.d/rc0.d/K24elogind
+ ln -sf ../init.d/elogind ${EXTDIR}/rc.d/rc1.d/K24elogind
+ ln -sf ../init.d/elogind ${EXTDIR}/rc.d/rc2.d/S31elogind
+ ln -sf ../init.d/elogind ${EXTDIR}/rc.d/rc3.d/S31elogind
+ ln -sf ../init.d/elogind ${EXTDIR}/rc.d/rc4.d/S31elogind
+ ln -sf ../init.d/elogind ${EXTDIR}/rc.d/rc5.d/S31elogind
+ ln -sf ../init.d/elogind ${EXTDIR}/rc.d/rc6.d/K24elogind
+
install-wicd: create-dirs
install -m ${MODE} blfs/init.d/wicd ${EXTDIR}/rc.d/init.d/
ln -sf ../init.d/wicd ${EXTDIR}/rc.d/rc0.d/K20wicd
@@ -287,6 +307,10 @@
ln -sf ../init.d/lxdm ${EXTDIR}/rc.d/rc5.d/S95lxdm
ln -sf ../init.d/lxdm ${EXTDIR}/rc.d/rc6.d/K05lxdm
+install-mountcgroupfs: create-dirs
+ install -m ${MODE} blfs/init.d/mountcgroupfs ${EXTDIR}/rc.d/init.d/
+ ln -sf ../init.d/mountcgroupfs ${EXTDIR}/rc.d/rcS.d/S55mountcgroupfs
+
install-mysql: create-dirs
install -m ${MODE} blfs/init.d/mysql ${EXTDIR}/rc.d/init.d/
ln -sf ../init.d/mysql ${EXTDIR}/rc.d/rc0.d/K26mysql
@@ -592,6 +616,16 @@
rm -f ${EXTDIR}/rc.d/rc5.d/S68atd
rm -f ${EXTDIR}/rc.d/rc6.d/K29atd
+uninstall-accounts-daemon:
+ rm -f ${EXTDIR}/rc.d/init.d/accounts-daemon
+ rm -f ${EXTDIR}/rc.d/rc0.d/K22accounts-daemon
+ rm -f ${EXTDIR}/rc.d/rc1.d/K22accounts-daemon
+ rm -f ${EXTDIR}/rc.d/rc2.d/S36accounts-daemon
+ rm -f ${EXTDIR}/rc.d/rc3.d/S36accounts-daemon
+ rm -f ${EXTDIR}/rc.d/rc4.d/S36accounts-daemon
+ rm -f ${EXTDIR}/rc.d/rc5.d/S36accounts-daemon
+ rm -f ${EXTDIR}/rc.d/rc6.d/K22accounts-daemon
+
uninstall-acpid:
rm -f ${EXTDIR}/rc.d/init.d/acpid
rm -f ${EXTDIR}/rc.d/rc0.d/K32acpid
@@ -725,6 +759,16 @@
rm -f ${EXTDIR}/rc.d/rc5.d/S27dovecot
rm -f ${EXTDIR}/rc.d/rc6.d/K78dovecot
+uninstall-elogind:
+ rm -f ${EXTDIR}/rc.d/init.d/elogind
+ rm -f ${EXTDIR}/rc.d/rc0.d/K24elogind
+ rm -f ${EXTDIR}/rc.d/rc1.d/K24elogind
+ rm -f ${EXTDIR}/rc.d/rc2.d/S31elogind
+ rm -f ${EXTDIR}/rc.d/rc3.d/S31elogind
+ rm -f ${EXTDIR}/rc.d/rc4.d/S31elogind
+ rm -f ${EXTDIR}/rc.d/rc5.d/S31elogind
+ rm -f ${EXTDIR}/rc.d/rc6.d/K24elogind
+
uninstall-exim:
rm -f ${EXTDIR}/rc.d/init.d/exim
rm -f ${EXTDIR}/rc.d/rc0.d/K25exim
@@ -821,6 +865,10 @@
rm -f ${EXTDIR}/rc.d/rc5.d/S95lxdm
rm -f ${EXTDIR}/rc.d/rc6.d/K05lxdm
+uninstall-mountcgroupfs:
+ rm -f ${EXTDIR}/rc.d/init.d/mountcgroupfs
+ rm -f ${EXTDIR}/rc.d/rcS.d/S55mountcgroupfs
+
uninstall-mysql:
rm -f ${EXTDIR}/rc.d/init.d/mysql
rm -f ${EXTDIR}/rc.d/rc0.d/K26mysql
@@ -1092,6 +1140,7 @@
install-service-ipx \
install-service-pppoe \
install-atd \
+ install-accounts-daemon \
install-acpid \
install-alsa \
install-avahi \
@@ -1104,6 +1153,7 @@
install-wicd \
install-dhcpd \
install-dovecot \
+ install-elogind \
install-exim \
install-fcron \
install-gdm \
@@ -1112,6 +1162,8 @@
install-iptables \
install-krb5 \
install-lprng \
+ install-lxdm \
+ install-mountcgroupfs \
install-mysql \
install-netfs \
install-networkmanager \
@@ -1138,6 +1190,7 @@
install-winbindd \
install-xinetd \
uninstall-atd \
+ uninstall-accounts-daemon \
uninstall-acpid \
uninstall-alsa \
uninstall-avahi \
@@ -1150,6 +1203,7 @@
uninstall-wicd \
uninstall-dhcpd \
uninstall-dovecot \
+ uninstall-elogind \
uninstall-exim \
uninstall-fcron \
uninstall-gdm \
@@ -1158,6 +1212,8 @@
uninstall-iptables \
uninstall-krb5 \
uninstall-lprng \
+ uninstall-lxdm \
+ uninstall-mountcgroupfs \
uninstall-mysql \
uninstall-netfs \
uninstall-networkmanager \
--
http://lists.linuxfromscratch.org/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
