Merge ef178f8cd8 into 19fc237476

packages/debian/rules

@@ -6,3 +6,9 @@
 
 %:
 	dh $@
+
+
+DESTDIR = $(CURDIR)/debian/sanoid
+override_dh_auto_install:
+	install -d $(DESTDIR)/etc/sanoid
+	install -m 664 sanoid.defaults.conf $(DESTDIR)/etc/sanoid

packages/debian/sanoid-prune.service

@@ -3,8 +3,6 @@ Description=Cleanup ZFS Pool
 Requires=zfs.target
 After=zfs.target sanoid.service
 ConditionFileNotEmpty=/etc/sanoid/sanoid.conf
-Before=syncoid.service
-Wants=syncoid.service
 
 [Service]
 Environment=TZ=UTC

packages/debian/sanoid.examples

@@ -1,3 +1,4 @@
 sanoid.conf
 debian/syncoid.conf
 debian/syncoid.timer
+debian/syncoid.service

packages/debian/sanoid.install

@@ -1,7 +1,7 @@
 syncoid /usr/sbin/
 sanoid /usr/sbin/
 findoid /usr/sbin/
+sleepymutex /usr/sbin/
 sanoid.defaults.conf /usr/share/sanoid/
 debian/sanoid-prune.service /lib/systemd/system
-debian/syncoid.service /lib/systemd/system
 CHANGELIST /usr/share/doc/sanoid/changelog

packages/debian/syncoid.service

@@ -1,14 +1,11 @@
 [Unit]
 Description=Transfer ZFS Snapshots
 Documentation=man:syncoid(8)
-Requires=local-fs.target sanoid.service
-After=local-fs.target sanoid-prune.service
+Requires=local-fs.target
+Wants=sanoid.service
 ConditionFileNotEmpty=/etc/sanoid/syncoid.conf
 
 [Service]
 EnvironmentFile=/etc/sanoid/syncoid.conf
 Type=oneshot
 ExecStart=/usr/sbin/syncoid $DEBUG $OPTS $EXCLUDES $INCLUDES $SSHOPTS $SOURCE $TARGET
-
-[Install]
-WantedBy=sanoid.service