[systemd-commits] 2 commits - Makefile.am TODO src/core

[Lennart Poettering]

 Makefile.am                |    5 +++++
 TODO                       |    9 ---------
 src/core/macros.systemd.in |   17 +++++++++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

New commits:
commit 92b5814007dc5c9c44e94e717be6f53e24c356c0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Nov 16 20:01:50 2012 +0100

    update TODO

diff --git a/TODO b/TODO
index 982c281..1046ebf 100644
--- a/TODO
+++ b/TODO
@@ -17,16 +17,10 @@ F18:
 
 * Retest multi-seat
 
-* add rpm macros for %rulesdir, %hwdbdir, update rules/hwdb call
-
 Features:
 
-* RPM macros for message catalog update
-
 * man page for catalog APIs
 
-* When switching root, first try pivot_root, only then fall back to overmounting, to deal sanely with both the initial and later switch roots
-
 * When shutdown.target is queued begin with an asynchronous sync()?
 
 * Add ConditionBatteryPower= or ConditionACPower=? (but definitely not both)
@@ -39,9 +33,6 @@ Features:
 
 * declare the local journal protocol stable in the wiki interface chart
 
-* introduce ntp.service (or suchlike) as symlink that is used to arbitrate between various
-  NTP implementations
-
 * sd-journal: don't return fields > a threshold by default
 * journal: reuse XZ context
 * sd-journal: speed up sd_journal_get_data() with transparent hash table in bg

commit 1b0fcd7411da6ae2cdb9d72100333987ce1aef44
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Nov 16 19:54:19 2012 +0100

    rpm: update RPM macros to include definitions for more drop-in directories and for reloading/rebuilding configuration
    
    More specifically this adds a number of macros that resolve to
    directories for udev rules, hwdb entries, tmpfiles and sysctl.
    
    Thsi also includes three new macros for rebuilding the hwbd/catalog
    index when a package drops in new files

diff --git a/Makefile.am b/Makefile.am
index 403b46b..7860174 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3750,6 +3750,11 @@ SED_PROCESS = \
 		-e 's, at userunitdir\@,$(userunitdir),g' \
 		-e 's, at systempresetdir\@,$(systempresetdir),g' \
 		-e 's, at userpresetdir\@,$(userpresetdir),g' \
+		-e 's, at udevhwdbdir\@,$(udevhwdbdir),g' \
+		-e 's, at udevrulesdir\@,$(udevrulesdir),g' \
+		-e 's, at catalogdir\@,$(catalogdir),g' \
+		-e 's, at tmpfilesdir\@,$(tmpfilesdir),g' \
+		-e 's, at sysctldir\@,$(sysctldir),g' \
 		-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 		-e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's, at PACKAGE_URL\@,$(PACKAGE_URL),g' \
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
index e521df3..f77082c 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -21,6 +21,11 @@
 
 %_unitdir @systemunitdir@
 %_presetdir @systempresetdir@
+%_udevhwdbdir @udevhwdbdir@
+%_udevrulesdir @udevrulesdir@
+%_journalcatalogdir @catalogdir@
+%_tmpfilesdir @tmpfilesdir@
+%_sysctldir @sysctldir@
 
 %systemd_requires \
 Requires(post): systemd \
@@ -54,3 +59,15 @@ if [ $1 -ge 1 ] ; then \
         @rootbindir@/systemctl try-restart %{?*} >/dev/null 2>&1 || : \
 fi \
 %{nil}
+
+%udev_hwdb_update() \
+ at rootbindir@/udevadm hwdb --update >/dev/null 2>&1 || : \
+%{nil}
+
+%udev_rules_update() \
+ at rootbindir@/udevadm control --reload >/dev/null 2>&1 || : \
+%{nil}
+
+%journal_catalog_update() \
+ at rootbindir@/journalctl --update-catalog >/dev/null 2>&1 || : \
+%{nil}