Commit cbd967df authored by David Johnson's avatar David Johnson

Ensure the local fs is up before whacking fstab in swap fixup.

The remount-root-fs unit changed names in 16 to systemd-remount-fs ,
and I didn't see the race in the first round of testing, I guess.
parent 9c456003
......@@ -126,6 +126,12 @@ systemd-install: dir-install
$(INSTALL) -m 644 $(SRCDIR)/ntp.service $(SYSETCDIR)/systemd/system
ln -sf $(SYSETCDIR)/systemd/system/ntp.service \
$(SYSETCDIR)/systemd/system/multi-user.target.wants/ntp.service
$(INSTALL) -m 644 -o root -g $(DIRGROUP) \
$(SRCDIR)/emulab-fstab-fixup.service $(SYSETCDIR)/systemd/system
ln -sf $(SYSETCDIR)/systemd/system/emulab-fstab-fixup.service \
$(SYSETCDIR)/systemd/system/multi-user.target.wants/emulab-fstab-fixup.service
# Kick the init process to read our newly-installed unit files
# (i.e., so an immediate tbprepare will work...)
@if [ -z "$(DESTDIR)" ]; then \
systemctl daemon-reload; \
fi
......
[Unit]
Description=Emulab fstab fixup (swap)
Before=swap.target
After=systemd-remount-fs.service
DefaultDependencies=no
Conflicts=shutdown.target
[Service]
Type=oneshot
RemainAfterExit=no
ExecStart=/usr/local/etc/emulab/initscripts/emulab-systemd-swaps
Restart=no
[Install]
WantedBy=multi-user.target
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