From: Lennart Poettering Date: Fri, 9 Jul 2010 22:22:38 +0000 (+0200) Subject: build-sys: drop special name hack for dbus.service since a native service file is... X-Git-Tag: v3~69 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=83bda35801aa3d7ed180ec374a4bcdfe9dc1a8e4 build-sys: drop special name hack for dbus.service since a native service file is now shipped upstream dbus --- diff --git a/Makefile.am b/Makefile.am index 115197e6c..f6ae7d62c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,6 +129,7 @@ dist_systemunit_DATA = \ units/sigpwr.target \ units/sockets.target \ units/swap.target \ + units/dbus.target \ units/systemd-initctl.socket \ units/systemd-logger.socket \ units/dev-hugepages.automount \ @@ -152,8 +153,7 @@ nodist_systemunit_DATA = \ units/multi-user.target \ units/systemd-initctl.service \ units/systemd-logger.service \ - units/syslog.target \ - units/dbus.target + units/syslog.target dist_sessionunit_DATA = \ units/session/default.target @@ -171,7 +171,6 @@ EXTRA_DIST = \ units/systemd-initctl.service.in \ units/systemd-logger.service.in \ units/syslog.target.in \ - units/dbus.target.in \ units/session/exit.service.in \ systemd.pc.in @@ -573,7 +572,6 @@ SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \ -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \ - -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \ -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \ -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ diff --git a/configure.ac b/configure.ac index 45b7ada4d..e7c74cb5f 100644 --- a/configure.ac +++ b/configure.ac @@ -101,7 +101,7 @@ PKG_CHECK_MODULES(UDEV, [ libudev >= 154 ]) AC_SUBST(UDEV_CFLAGS) AC_SUBST(UDEV_LIBS) -PKG_CHECK_MODULES(DBUS, [ dbus-1 ]) +PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.3.2 ]) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) @@ -215,7 +215,6 @@ fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` # Default generic names -SPECIAL_DBUS_SERVICE=dbus.service SPECIAL_SYSLOG_SERVICE=syslog.service # Location of the init scripts as mandated by LSB @@ -228,17 +227,16 @@ case $with_distro in SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d SYSTEM_SYSVRCND_PATH=/etc/rc.d - # A little background why we define these special unit + # A little background why we define this special unit # names here in configure.ac: SysV services currently # cannot have aliases. As long as syslog is started - # via a SysV init script we hence define these names - # to the actual SysV name here. Later on when SysV - # init scripts are not used anymore it is advisable to - # use the generic names instead and use symlinks in - # the unit directories to point to the right native - # unit file. - - SPECIAL_DBUS_SERVICE=messagebus.service + # via a SysV init script we hence define this name to + # the actual SysV name here. Later on when SysV init + # scripts are not used anymore it is advisable to use + # the generic name instead and use symlinks in the + # unit directories to point to the right native unit + # file. + SPECIAL_SYSLOG_SERVICE=rsyslog.service AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL]) M4_DISTRO_FLAG=-DTARGET_FEDORA=1 @@ -270,7 +268,6 @@ case $with_distro in slackware) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d SYSTEM_SYSVRCND_PATH=/etc/rc.d - SPECIAL_DBUS_SERVICE=messagebus.service AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware]) M4_DISTRO_FLAG=-DTARGET_SLACKWARE=1 ;; @@ -279,8 +276,6 @@ case $with_distro in [AC_MSG_ERROR([With --distro=other, you must pass --with-sysvinit-path= to configure])]) AS_IF([test "x$with_sysvrcd_path" = "x"], [AC_MSG_ERROR([With --distro=other, you must pass --with-sysvrcd-path= to configure])]) - AS_IF([test "x$with_dbus_service" = "x"], - [AC_MSG_ERROR([With --distro=other, you must pass --with-dbus-service= to configure])]) AS_IF([test "x$with_syslog_service" = "x"], [AC_MSG_ERROR([With --distro=other, you must pass --with-syslog-service= to configure])]) ;; @@ -301,12 +296,6 @@ AC_ARG_WITH([sysvrcd-path], [SYSTEM_SYSVRCND_PATH="$withval"], []) -AC_ARG_WITH([dbus-service], - [AS_HELP_STRING([--with-dbus-service=UNIT], - [Specify the name of the special DBus service @<:@default=based on distro@:>@])], - [SPECIAL_DBUS_SERVICE="$withval"], - []) - AC_ARG_WITH([syslog-service], [AS_HELP_STRING([--with-syslog-service=UNIT], [Specify the name of the special syslog service @<:@default=based on distro@:>@])], @@ -315,7 +304,6 @@ AC_ARG_WITH([syslog-service], AC_SUBST(SYSTEM_SYSVINIT_PATH) AC_SUBST(SYSTEM_SYSVRCND_PATH) -AC_SUBST(SPECIAL_DBUS_SERVICE) AC_SUBST(SPECIAL_SYSLOG_SERVICE) AC_SUBST(M4_DISTRO_FLAG) @@ -326,7 +314,6 @@ AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch) AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) -AC_DEFINE_UNQUOTED(SPECIAL_DBUS_SERVICE, ["$SPECIAL_DBUS_SERVICE"], [D-Bus service name]) AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name]) AC_ARG_WITH([dbuspolicydir], @@ -382,7 +369,6 @@ echo " SysV init scripts: ${SYSTEM_SYSVINIT_PATH} SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} Syslog service: ${SPECIAL_SYSLOG_SERVICE} - D-Bus service: ${SPECIAL_DBUS_SERVICE} Gtk: ${have_gtk} tcpwrap: ${have_tcpwrap} PAM: ${have_pam} diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in index 49dc3892c..ac9f0f5a6 100644 --- a/man/systemd.special.xml.in +++ b/man/systemd.special.xml.in @@ -50,7 +50,7 @@ basic.target, ctrl-alt-del.target, - @SPECIAL_DBUS_SERVICE@, + dbus.service, dbus.target, default.target, display-manager.service, @@ -134,7 +134,7 @@ - @SPECIAL_DBUS_SERVICE@ + dbus.service A special unit for the D-Bus system bus. As soon as @@ -160,7 +160,7 @@ ensure that this target pulls in a service unit with the name or alias of - @SPECIAL_DBUS_SERVICE@ + dbus.service (or a socket unit that activates this service). diff --git a/src/special.h b/src/special.h index 8cb500b8a..9ddabde3a 100644 --- a/src/special.h +++ b/src/special.h @@ -56,10 +56,7 @@ #define SPECIAL_HALT_TARGET "halt.target" #define SPECIAL_POWEROFF_TARGET "poweroff.target" #define SPECIAL_REBOOT_TARGET "reboot.target" - -#ifndef SPECIAL_DBUS_SERVICE #define SPECIAL_DBUS_SERVICE "dbus.service" -#endif #ifndef SPECIAL_SYSLOG_SERVICE #define SPECIAL_SYSLOG_SERVICE "syslog.service" diff --git a/units/.gitignore b/units/.gitignore index 75d3bfd0e..ea85dc081 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -6,4 +6,3 @@ graphical.target multi-user.target getty@.service remote-fs.target -dbus.target diff --git a/units/dbus.target.in b/units/dbus.target similarity index 56% rename from units/dbus.target.in rename to units/dbus.target index 6faf58d65..63897685c 100644 --- a/units/dbus.target.in +++ b/units/dbus.target @@ -9,9 +9,3 @@ [Unit] Description=D-Bus - -# As soon as D-Bus has native files this explicit dependency should be -# dropped, and replaced by an alias symlink in the .wants/ directory, -# to either the .service or .socket unit of the D-Bus service. -Requires=@SPECIAL_DBUS_SERVICE@ -After=@SPECIAL_DBUS_SERVICE@