[Lunar-commits] <moonbase> systemd: some small adjustements.

[Jean-Michel Bruenn]

commit f49dbc0554dfe11ab732279f9d5767e5ba6285c7
Author: Jean-Michel Bruenn <wdp at lunar-linux.org>
Date:   Sat Aug 6 19:31:20 2011 +0200

    systemd: some small adjustements.
    
    just corrected BUILD and added machine-id-setup to POST_INSTALL
    without that, systemd complains on boot that it couldn't find
    the id.
---
 zbeta/systemd/BUILD        |    8 ++++----
 zbeta/systemd/POST_INSTALL |    4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/zbeta/systemd/BUILD b/zbeta/systemd/BUILD
index 87e8538..b181cce 100644
--- a/zbeta/systemd/BUILD
+++ b/zbeta/systemd/BUILD
@@ -15,21 +15,21 @@
   # a not existing hostname is set to lunar.
   if [ ! -f /etc/hostname ]; then
     cp $SCRIPT_DIRECTORY/files/hostname /etc/hostname
-  fi &&
+  fi
   # vconsole.conf defaults to us-layout
   if [ ! -f /etc/vconsole.conf ]; then
     cp $SCRIPT_DIRECTORY/files/vconsole.conf /etc/vconsole.conf
-  fi &&
+  fi
   # os-release should properly show lunar
   # todo: we might replace this with some auto-generated
   #       values from /etc/lunar.release in the future.
   if [ ! -f /etc/os-release ]; then
     cp $SCRIPT_DIRECTORY/files/os-release /etc/os-release
-  fi &&
+  fi 
   # last but not least the locale settings, defaulting to US
   if [ ! -f /etc/locale.conf ]; then
     cp $SCRIPT_DIRECTORY/files/locale.conf /etc/locale.conf
-  fi &&
+  fi 
 
   default_build
 
diff --git a/zbeta/systemd/POST_INSTALL b/zbeta/systemd/POST_INSTALL
index ead2fbc..ae10f72 100644
--- a/zbeta/systemd/POST_INSTALL
+++ b/zbeta/systemd/POST_INSTALL
@@ -1,2 +1,6 @@
 lin -c udev
 lin -c dbus
+# generate the machine id
+if [ -x /bin/systemd-machine-id-setup ]; then
+  /bin/systemd-machine-id-setup
+fi