Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8ac8d5285cfbd7be248820d1b6d0706e18bb112b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8ac8d5285cfbd7be248820d1b6d0706e18bb112b)
  • Date: Mon, 13 Feb 2023 11:57:49 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

smgl/systemd/CONFLICTS | 3 ++-
smgl/systemd/FINAL | 3 +++
smgl/systemd/HISTORY | 5 +++++
smgl/systemd/INSTALL | 3 +--
smgl/systemd/PREPARE | 23 +++++++++++++++++++++++
utils/dbus/DETAILS | 2 +-
utils/dbus/HISTORY | 3 +++
7 files changed, 38 insertions(+), 4 deletions(-)

New commits:
commit 8ac8d5285cfbd7be248820d1b6d0706e18bb112b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dbus: => 1.14.6

commit 8b9b2acb58ad0acb75827e8c957a28889c48ec4a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

systemd - add warnings in prepare

diff --git a/smgl/systemd/CONFLICTS b/smgl/systemd/CONFLICTS
index da8a343..ed3c756 100755
--- a/smgl/systemd/CONFLICTS
+++ b/smgl/systemd/CONFLICTS
@@ -1,4 +1,5 @@
#conflicts simpleinit-msb &&
conflicts initng &&
conflicts upstart &&
-conflicts eudev
+conflicts eudev &&
+conflicts elogind
diff --git a/smgl/systemd/FINAL b/smgl/systemd/FINAL
index 4bb47f4..5769bff 100644
--- a/smgl/systemd/FINAL
+++ b/smgl/systemd/FINAL
@@ -22,3 +22,6 @@ create_account systemd-resolve

create_group systemd-coredump
create_account systemd-coredump
+
+# this may fail for external reasons; fix them manually
+systemctl preset-all || true
diff --git a/smgl/systemd/HISTORY b/smgl/systemd/HISTORY
index 78300c7..a60e397 100644
--- a/smgl/systemd/HISTORY
+++ b/smgl/systemd/HISTORY
@@ -1,3 +1,8 @@
+2023-02-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * PREPARE: added
+ * INSTALL , FINAL: move 'systemctl preset-all' to final
+ * CONFLICTS: add elogind
+
2022-12-22 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 252.4

diff --git a/smgl/systemd/INSTALL b/smgl/systemd/INSTALL
index 790ca6a..5df0513 100755
--- a/smgl/systemd/INSTALL
+++ b/smgl/systemd/INSTALL
@@ -5,5 +5,4 @@ fi &&

ln -sfn ../modules "$INSTALL_ROOT/etc/modules-load.d/modules.conf" &&

-systemd-machine-id-setup --root="$INSTALL_ROOT" --print &&
-systemctl preset-all
+systemd-machine-id-setup --root="$INSTALL_ROOT" --print
diff --git a/smgl/systemd/PREPARE b/smgl/systemd/PREPARE
new file mode 100755
index 0000000..b88f02f
--- /dev/null
+++ b/smgl/systemd/PREPARE
@@ -0,0 +1,23 @@
+gzd() {
+ message "checking $1:"
+ grep ":$1[(,:].*on" /var/state/sorcery/depends \
+ |cut -d: -f-4 |sort |uniq
+
+}
+
+
+message "\n${PROBLEM_COLOR}Warning!\n" \
+ "SystemD is very intrusive.\n" \
+ "It has many features which which replace other spells, which will
be removed.\n" \
+ "Any spell which depends on the removed spells must be
reconfigured.\n" \
+ "" \
+ "" \
+ "$MESSAGE_COLOR" \
+ "Existing init scripts should be replaced by systemd service files" \
+ ""
+for SP in elogind eudev chrony simpleinit-msb init upstart initng;do
+ if spell_ok $SP;then
+ gzd $SP
+ fi
+done
+message "$DEFAULT_COLOR"
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 118b7ad..3505788 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -2,7 +2,7 @@
if [[ "${DBUS_BRANCH}" == "devel" ]]; then
VERSION=1.15.4
else
- VERSION=1.14.4
+ VERSION=1.14.6
fi
SECURITY_PATCH=18
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 8bcb2af..65b4d55 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2023-02-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.14.6
+
2023-02-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: devel version 1.15.4




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8ac8d5285cfbd7be248820d1b6d0706e18bb112b), Treeve Jelbert, 02/13/2023

Archive powered by MHonArc 2.6.24.

Top of Page