From 260069cca78e865b629a7a49d3bbb6e2a8d37ab7 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 8 Oct 2013 18:40:48 +0300 Subject: [PATCH] systemd: rework machine-idd service - always set a *valid* machine-id - start machine-id.service before journald --- packages/sysutils/systemd/scripts/systemd-machine-id-setup | 4 +--- packages/sysutils/systemd/system.d/machine-id.service | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/systemd/scripts/systemd-machine-id-setup b/packages/sysutils/systemd/scripts/systemd-machine-id-setup index 0d45f5a29e..0b3c40ac25 100755 --- a/packages/sysutils/systemd/scripts/systemd-machine-id-setup +++ b/packages/sysutils/systemd/scripts/systemd-machine-id-setup @@ -34,8 +34,6 @@ elif [ -e "/sys/class/net/wlan0/address" ]; then MAC_ADRESS=`cat /sys/class/net/wlan0/address` fi -if [ -n "$MAC_ADRESS" ]; then - MACHINEID=`echo $MAC_ADRESS | md5sum | cut -f1 -d" "` -fi +MACHINEID=`echo $MAC_ADRESS | md5sum | cut -f1 -d" "` echo "$MACHINEID" > /run/machine-id diff --git a/packages/sysutils/systemd/system.d/machine-id.service b/packages/sysutils/systemd/system.d/machine-id.service index 4e92ad9df2..8fa728ec8b 100644 --- a/packages/sysutils/systemd/system.d/machine-id.service +++ b/packages/sysutils/systemd/system.d/machine-id.service @@ -2,6 +2,7 @@ Description=Setup machine-id DefaultDependencies=no After=local-fs.target +Before=systemd-journald.service [Service] Type=oneshot