Commit 76116304 authored by Michael Biebl's avatar Michael Biebl
Browse files

Remove umount*.service files for Debian

With the introduction of native shutdown/reboot, the killall.service was
removed (as this functionality was moved into systemd-shutdown).
Without killall.service though, the umount*.service files no longer work
correctly.
Wit native mount support those files are also no longer necessary, so
remove them.
parent 9c73736d
......@@ -328,13 +328,6 @@ dist_systemunit_DATA += \
units/fedora/plymouth-halt.service
endif
if TARGET_DEBIAN_OR_UBUNTU
dist_systemunit_DATA += \
units/debian/umountfs.service \
units/debian/umountnfs.service \
units/debian/umountroot.service
endif
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/xdm.service
......@@ -1294,13 +1287,6 @@ if TARGET_GENTOO
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_DEBIAN_OR_UBUNTU
$(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 )
......
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
[Unit]
Description=Turn off swap and umount all local file systems
DefaultDependencies=no
Before=reboot.service poweroff.service halt.service umountroot.service
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/etc/init.d/umountfs stop
StandardOutput=tty
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
[Unit]
Description=Umount all network file systems
DefaultDependencies=no
Before=reboot.service poweroff.service halt.service umountfs.service
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/etc/init.d/umountnfs.sh stop
StandardOutput=tty
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
[Unit]
Description=Mount the root file system read-only
DefaultDependencies=no
Before=reboot.service poweroff.service halt.service
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/etc/init.d/umountroot stop
StandardOutput=tty
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment