Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (6ad19db8aac4cf0d38e574794f4c96b50f1ab48d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (6ad19db8aac4cf0d38e574794f4c96b50f1ab48d)
  • Date: Tue, 14 Oct 2025 15:59:11 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

smgl/init.d/HISTORY | 5 +++++
smgl/init.d/init.d/devices | 8 ++++----
smgl/init.d/init.d/mountall.sh | 2 +-
utils/dbus/HISTORY | 4 ++++
utils/dbus/init.d/smgl-messagebus | 7 ++++---
5 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 6ad19db8aac4cf0d38e574794f4c96b50f1ab48d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

init.d: mountall.sh: Don't cleanup /var/run if it's a symlink

Since mountall.sh runs later than udev, it removes it's pidfile and
socket;
if using /run the cleanup becomes unnecessary, but this doesn't solve the
bug proper, either the cleanup needs to be removed or moved to run much
earlier.

commit eec19bff597b84bb9300b15549f3c956532fdd63
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dbus: init.d: Only NEEDS=devices

commit 68f9b2070af8418832cc4a1e12ffef8bbd295094
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dbus: init.d: Simplify PID check

commit 08f4c3222b843c5a9e95d213b89792f20fbb9bbf
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dbus: init.d: Use /run/dbus for the pidfile

commit f2321571bb292a1f1ac4dcc833441197de8d2bcc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

init.d: devices: Use tmpfs instead of ramfs

diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 6d4d3d2..8e65966 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,8 @@
+2025-10-14 Ismael Luceno <ismael AT sourcemage.org>
+ * init.d/devices: Use tmpfs instead of ramfs
+ * init.d/mountall.sh: Don't cleanup /var/run if it's a symlink
+ (workaround; the cleanup removes udevd's socket)
+
2023-08-24 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* init.d/devices: Don't let mkdir fail if the path already exists (-p)
diff --git a/smgl/init.d/init.d/devices b/smgl/init.d/init.d/devices
index 2d5e3eb..fac11ce 100755
--- a/smgl/init.d/init.d/devices
+++ b/smgl/init.d/init.d/devices
@@ -16,13 +16,13 @@ udev_mknodes()
start_udev()
{ (
. /etc/udev/udev.conf
- echo "Checking if devtmpfs or ramfs is used for $udev_root ..."
+ echo "Checking if devtmpfs or tmpfs is used for $udev_root ..."
if findmnt devtmpfs > /dev/null 2>&1; then
echo "devtmpfs is used for $udev_root"
else
- echo "ramfs is used for $udev_root"
- echo "Mounting ramfs at $udev_root"
- mount -n -t ramfs none $udev_root
+ echo "tmpfs is used for $udev_root"
+ echo "Mounting tmpfs at $udev_root"
+ mount -n -t tmpfs none $udev_root
fi
# create some needed stuff
udev_mknodes
diff --git a/smgl/init.d/init.d/mountall.sh b/smgl/init.d/init.d/mountall.sh
index ffe2c22..984b3e4 100755
--- a/smgl/init.d/init.d/mountall.sh
+++ b/smgl/init.d/init.d/mountall.sh
@@ -156,7 +156,7 @@ start()

#As per FHS sm bug #10509
echo "Cleaning out /var/run..."
- [ -d /var/run ] && recursive_rm /var/run/*
+ ! [ -h /var/run ] && [ -d /var/run ] && recursive_rm /var/run/*
evaluate_retval

if [ "$CLEAN_TMP" == "yes" ] ; then
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index c2d184a..6aa5a44 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,7 @@
+2025-10-14 Ismael Luceno <ismael AT sourcemage.org>
+ * init.d/smgl-messagebus: Use /run/dbus for the pidfile;
+ Simplified PID check; Wait only for the devices service;
+
2025-02-28 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.16.2

diff --git a/utils/dbus/init.d/smgl-messagebus
b/utils/dbus/init.d/smgl-messagebus
index 77da6e3..c3588fd 100755
--- a/utils/dbus/init.d/smgl-messagebus
+++ b/utils/dbus/init.d/smgl-messagebus
@@ -3,8 +3,8 @@
PROGRAM=/usr/bin/dbus-daemon
ARGS="--system"
RUNLEVEL=3
-NEEDS="+remote_fs"
-PIDFILE=/var/run/dbus/pid
+NEEDS="devices"
+PIDFILE=/run/dbus/pid

. /etc/init.d/smgl_init

@@ -14,7 +14,8 @@ start() {
# make sure there is actually a process there...
if [ -f $PIDFILE ]; then
echo "Found $PIDFILE doing extra checks..."
- if ! ps ax | grep "dbus-daemon" | grep -q $(cat $PIDFILE) ; then
+ local pid=$(cat "$PIDFILE")
+ if ! grep -q "^$PROGRAM" /proc/"$pid"/cmdline; then
print_status warning "$PIDFILE exists, but messagebus is not running
under this PID"
echo "Attempting cleanup and new startup..."
rm -f $PIDFILE


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (6ad19db8aac4cf0d38e574794f4c96b50f1ab48d), Ismael Luceno, 10/14/2025

Archive powered by MHonArc 2.6.24.

Top of Page