Source Mage code commit list

[David Kowis <scm AT sourcemage.org>]

GIT changes to devel-systemd grimoire by David Kowis <dkowis AT shlrm.org>:

 disk/udev/BUILD          |    4 ++++
 disk/udev/HISTORY        |    3 +++
 smgl/systemd/HISTORY     |    2 ++
 smgl/systemd/INSTALL     |    4 ++++
 smgl/systemd/UP_TRIGGERS |    7 +++++--
 utils/dbus/BUILD         |    4 ++++
 utils/dbus/HISTORY       |    3 +++
 7 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit 0ca4c67464687e366578bf73c0c1361726f1f05d
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

    dbus: adding logic to handle installation of systemd stuff

commit 058fff3d7a7d7af5626681800afd58fd7a448966
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

    udev: adding logic to handle systemd installation stuffs

commit d93025540a839084233f614999babc8e68465bb6
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

    systemd: more tweaks to get the spell to 100%

diff --git a/disk/udev/BUILD b/disk/udev/BUILD
index 4f92773..4c30078 100755
--- a/disk/udev/BUILD
+++ b/disk/udev/BUILD
@@ -1,3 +1,7 @@
+if spell_ok systemd; then
+  # if systemd is installed then we need to tell udev to install it's stuff
+  OPTS="$OPTS --with-systemdsystemunitdir=${INSTALL_ROOT}/lib/systemd/system"
+fi &&
 OPTS="--prefix=$INSTALL_ROOT/usr \
       --sbindir=$INSTALL_ROOT/sbin \
       --libexecdir=$INSTALL_ROOT/lib/udev \
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 0f83070..ac1d38f 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2011-12-20 David Kowis <dkowis AT shlrm.org>
+  * BUILD: included logic to handle when systemd is installed
+
 2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 173
 
diff --git a/smgl/systemd/HISTORY b/smgl/systemd/HISTORY
index 283c455..352a6a6 100644
--- a/smgl/systemd/HISTORY
+++ b/smgl/systemd/HISTORY
@@ -2,6 +2,8 @@
        * DEPENDS: added additional dependencies
        * CONFIGURE: added configure options
        * BUILD: set the root directory correctly
+  * INSTALL: added logic to barf out one more config file that's needed
+  * UP_TRIGGERS: Set the triggers to fire only if we're doing a fresh install
 
 2011-12-19 David Kowis <dkowis AT shlrm.org>
   * DEPENDS: needs intltool to successfully build
diff --git a/smgl/systemd/INSTALL b/smgl/systemd/INSTALL
new file mode 100755
index 0000000..0fd61f7
--- /dev/null
+++ b/smgl/systemd/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+if ! [ -f ${INSTALL_ROOT}/etc/vconsole.conf ]; then
+  echo "FONT=default8x16" > ${INSTALL_ROOT}/etc/vconsole.conf
+fi
diff --git a/smgl/systemd/UP_TRIGGERS b/smgl/systemd/UP_TRIGGERS
old mode 100644
new mode 100755
index d304c5c..332f4d0
--- a/smgl/systemd/UP_TRIGGERS
+++ b/smgl/systemd/UP_TRIGGERS
@@ -1,2 +1,5 @@
-up_trigger udev cast_self
-up_trigger dbus cast_self
+# only force a rebuild on these if it's a fresh install
+if ! spell_ok systemd ; then
+  up_trigger udev cast_self
+  up_trigger dbus cast_self
+fi
diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
index 3fe0422..f210caf 100755
--- a/utils/dbus/BUILD
+++ b/utils/dbus/BUILD
@@ -1,3 +1,7 @@
+if spell_ok systemd; then
+  # if systemd is installed, then include this. Needed for systemd to work
+  OPTS=" --with-systemdsystemunitdir=${INSTALL_ROOT}/lib/systemd/system"
+fi &&
 if [ "$DBUS_SELINUX" == "y" ]; then
    OPTS="--enable-selinux  $OPTS"
 fi  &&
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 5754e00..613ec4d 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2011-12-20 David Kowis <dkowis AT shlrm.org>
+  * BUILD: adding logic to handle installation of systemd stuff
+
 2011-08-03 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.4.14