systemd-update-utmp \
systemd-random-seed \
systemd-shutdownd \
- systemd-auto-console-getty
+ systemd-modules-load \
+ systemd-remount-api-vfs \
+ systemd-kmsg-syslogd
noinst_PROGRAMS = \
test-engine \
test-job-type \
test-ns \
test-loopback \
+ test-hostname \
test-daemon \
test-cgroup \
test-env-replace
units/network.target \
units/nss-lookup.target \
units/mail-transfer-agent.target \
+ units/http-daemon.target \
units/poweroff.target \
units/reboot.target \
units/rescue.target \
units/systemd-initctl.socket \
units/systemd-logger.socket \
units/systemd-shutdownd.socket \
- units/systemd-auto-console-getty.service \
+ units/systemd-kmsg-syslogd.socket \
units/dev-hugepages.automount \
units/dev-hugepages.mount \
units/dev-mqueue.automount \
units/sys-kernel-debug.mount \
units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
+ units/tmp.mount \
units/var-lock.mount \
units/var-lock.service \
units/var-run.mount \
units/var-run.service \
+ units/hwclock-load.service \
+ units/hwclock-save.service \
+ units/sysctl.service \
+ units/remount-rootfs.service \
units/printer.target \
units/bluetooth.target \
units/smartcard.target
nodist_systemunit_DATA = \
units/sysinit.target \
units/getty@.service \
+ units/serial-getty@.service \
units/graphical.target \
units/remote-fs.target \
units/multi-user.target \
units/systemd-initctl.service \
units/systemd-logger.service \
units/systemd-shutdownd.service \
- units/systemd-auto-console-getty.service \
+ units/systemd-kmsg-syslogd.service \
+ units/systemd-modules-load.service \
+ units/systemd-remount-api-vfs.service \
units/systemd-update-utmp-runlevel.service \
units/systemd-update-utmp-shutdown.service \
units/systemd-random-seed-save.service \
EXTRA_DIST = \
units/sysinit.target.m4 \
units/getty@.service.m4 \
+ units/serial-getty@.service.m4 \
units/graphical.target.m4 \
units/multi-user.target.m4 \
units/remote-fs.target.m4 \
units/systemd-initctl.service.in \
units/systemd-logger.service.in \
units/systemd-shutdownd.service.in \
- units/systemd-auto-console-getty.service.in \
+ units/systemd-kmsg-syslogd.service.in \
+ units/systemd-modules-load.service.in \
+ units/systemd-remount-api-vfs.service.in \
units/systemd-update-utmp-runlevel.service.in \
units/systemd-update-utmp-shutdown.service.in \
units/systemd-random-seed-save.service.in \
units/fedora/plymouth-halt.service
endif
+if TARGET_DEBIAN
+dist_systemunit_DATA += \
+ units/debian/halt.service \
+ units/debian/killall.service \
+ units/debian/poweroff.service \
+ units/debian/reboot.service \
+ units/debian/fsck.target \
+ units/debian/umountfs.service \
+ units/debian/umountnfs.service \
+ units/debian/umountroot.service
+endif
+
if TARGET_SUSE
dist_systemunit_DATA += \
units/suse/halt.service \
src/path.c \
src/load-dropin.c \
src/execute.c \
+ src/exit-status.c \
src/dbus.c \
src/dbus-manager.c \
src/dbus-unit.c \
src/hostname-setup.c \
src/loopback-setup.c \
src/kmod-setup.c \
- src/modprobe-setup.c \
src/specifier.c \
src/unit-name.c \
src/fdset.c \
test_loopback_LDADD = \
libsystemd-basic.la
+test_hostname_SOURCES = \
+ src/test-hostname.c \
+ src/hostname-setup.c
+
+test_hostname_LDADD = \
+ libsystemd-basic.la
+
test_daemon_SOURCES = \
src/test-daemon.c \
src/sd-daemon.c
systemd_shutdownd_LDADD = \
libsystemd-basic.la
-systemd_auto_console_getty_SOURCES = \
- src/auto-console-getty.c \
- src/dbus-common.c
+systemd_modules_load_SOURCES = \
+ src/modules-load.c
-systemd_auto_console_getty_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+systemd_modules_load_CFLAGS = \
+ $(AM_CFLAGS)
-systemd_auto_console_getty_LDADD = \
- libsystemd-basic.la \
- $(DBUS_LIBS)
+systemd_modules_load_LDADD = \
+ libsystemd-basic.la
+
+systemd_remount_api_vfs_SOURCES = \
+ src/remount-api-vfs.c \
+ src/mount-setup.c
+
+systemd_remount_api_vfs_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_remount_api_vfs_LDADD = \
+ libsystemd-basic.la
systemd_cgroups_agent_SOURCES = \
src/cgroups-agent.c \
libsystemd-basic.la \
$(DBUS_LIBS)
+systemd_kmsg_syslogd_SOURCES = \
+ src/kmsg-syslogd.c \
+ src/sd-daemon.c \
+ src/fdset.c
+
+systemd_kmsg_syslogd_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_kmsg_syslogd_LDADD = \
+ libsystemd-basic.la
+
systemctl_SOURCES = \
src/systemctl.c \
src/utmp-wtmp.c \
src/path-lookup.c \
src/sd-daemon.c \
src/cgroup-show.c \
- src/cgroup-util.c
+ src/cgroup-util.c \
+ src/exit-status.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd
- $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \
- echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway."
( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
rm -f session && \
$(LN_S) $(pkgsysconfdir)/session session )
$(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \
$(LN_S) $(systemunitdir)/rescue.target kbrequest.target )
( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
- rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service systemd-auto-console-getty.service && \
+ rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty2.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty3.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
- $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service && \
- $(LN_S) $(systemunitdir)/systemd-auto-console-getty.service systemd-auto-console-getty.service )
+ $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f getty.target remote-fs.target && \
$(LN_S) $(systemunitdir)/getty.target getty.target && \
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
+if TARGET_DEBIAN
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/umount.target.wants
+ ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
+ rm -f umountfs.service umountnfs.service umountroot.service && \
+ $(LN_S) ../umountfs.service umountfs.service && \
+ $(LN_S) ../umountnfs.service umountnfs.service && \
+ $(LN_S) ../umountroot.service umountroot.service )
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f runlevel5.target && \
+ $(LN_S) multi-user.target runlevel5.target )
+endif
if !TARGET_SUSE
+if !TARGET_DEBIAN
( cd $(DESTDIR)$(systemunitdir) && \
rm -f fsck.target && \
$(LN_S) sysinit.target fsck.target )
endif
+endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
--with-rootdir=$$dc_install_base/$(rootdir)
upload: all distcheck
- cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/
+ cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
scp man/*.html tango:public/systemd-man/