diff options
| author | David Zeuthen <davidz@redhat.com> | 2012-01-21 17:12:39 -0500 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2012-01-21 17:12:39 -0500 |
| commit | 321aaa95fc879ff85f7b4c611e8aa8f759425b2d (patch) | |
| tree | 2f72e2aed5f74737b3cb1405b11895f58401ce90 | |
| parent | 0d5aeb6715d981c5344f1f1bb24b02253f3c979b (diff) | |
Rename systemd service to udisks2 and fix a couple of typos
Signed-off-by: David Zeuthen <davidz@redhat.com>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/org.freedesktop.UDisks2.service.in | 2 | ||||
| -rw-r--r-- | data/udisks2.service.in (renamed from data/udisks.service.in) | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 04c0bc4..fb28f7b 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,8 @@ echo " privlibdir: ${privlibdir} slashlibdir: ${slashlibdir} slashsbindir: ${slashsbindir} - introspection: ${found_introspection} + introspection: ${found_introspection} + systemdsystemunitdir: ${systemdsystemunitdir} compiler: ${CC} cflags: ${CFLAGS} diff --git a/data/Makefile.am b/data/Makefile.am index 6118d47..ee19da0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -15,14 +15,14 @@ dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf) $(dbusconf_DATA): $(dbusconf_in_files) Makefile cp $< $@ -systemdservice_in_files = udisks.service.in +systemdservice_in_files = udisks2.service.in if HAVE_SYSTEMD systemdservicedir = $(systemdsystemunitdir) systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) $(systemdservice_DATA): $(systemdservice_in_files) Makefile - @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + @sed -e "s|\@privlibdir\@|$(privlibdir)|" $< > $@ endif udevrulesdir = $(slashlibdir)/udev/rules.d diff --git a/data/org.freedesktop.UDisks2.service.in b/data/org.freedesktop.UDisks2.service.in index 3d5d0c1..41de57c 100644 --- a/data/org.freedesktop.UDisks2.service.in +++ b/data/org.freedesktop.UDisks2.service.in @@ -2,4 +2,4 @@ Name=org.freedesktop.UDisks2 Exec=@privlibdir@/udisksd --no-debug User=root -SystemdService=udisks.service +SystemdService=udisks2.service diff --git a/data/udisks.service.in b/data/udisks2.service.in index 234fc33..32ba13d 100644 --- a/data/udisks.service.in +++ b/data/udisks2.service.in @@ -1,5 +1,5 @@ [Unit] -Description=Enumerate, Query and Manipulate Storage Devices +Description=Storage Daemon [Service] Type=dbus |