Merge pull request #5 from JedMeister/17.x-update

17.x update
turnkeylinux · Mar 30, 2022 · 86c888f · 86c888f
2 parents 4d8d1a0 + 3b6f0d6
commit 86c888f
Show file tree

Hide file tree

Showing 28 changed files with 530 additions and 427 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 *.pyc
+__pycache__/
+.mypy_cache/
diff --git a/85-ebsmount.rules.in b/85-ebsmount.rules.in
diff --git a/Makefile b/Makefile
diff --git a/cmd_manual.py b/cmd_manual.py
diff --git a/cmd_udev.py b/cmd_udev.py
diff --git a/conf/85-ebsmount.rules b/conf/85-ebsmount.rules
@@ -0,0 +1,9 @@
+# udev rules to trigger the ebsmount systemd service.
+
+# Amazon EC2
+KERNEL=="xvd[a-z]|nvme[0-26]n[0-26]", SUBSYSTEM=="block", ACTION=="add", RUN+="/usr/bin/systemctl start ebsmount@%k"
+KERNEL=="xvd[a-z]|nvme[0-26]n[0-26]", SUBSYSTEM=="block", ACTION=="remove", RUN+="/usr/bin/systemctl stop ebsmount@%k"
+
+# OpenStack
+KERNEL=="vd[a-z]*", SUBSYSTEM=="block", ACTION=="add", RUN+="@PATH_BIN@/ebsmount-udev add"
+KERNEL=="vd[a-z]*", SUBSYSTEM=="block", ACTION=="remove", RUN+="@PATH_BIN@/ebsmount-udev remove"
diff --git a/ebsmount.conf → conf/ebsmount.conf b/ebsmount.conf → conf/ebsmount.conf
diff --git a/debian/changelog b/debian/changelog
@@ -0,0 +1,22 @@
+ebsmount (0.96) artful; urgency=low
+
+  * Change the device name detection pattern in `85-ebsmount.rules.in` to `KERNEL=="xvd[a-z]|nvme[0-26]n[0-26]"`.
+  * Upgrade to Ubuntu Artful.
+
+ -- Roy Liu <[email protected]>  Sat, 10 Feb 2018 00:00:00 -0400
+
+ebsmount (0.95) yakkety; urgency=low
+
+  * Update the `ebsmount-udev` script to work with systemd mount namespaces.
+  * Upgrade to Ubuntu Yakkety.
+
+ -- Roy Liu <[email protected]>  Tue, 14 Mar 2017 00:00:00 -0400
+
+ebsmount (0.94+3-0ubuntu4) precise; urgency=low
+
+  * Add the patch 0004: Change the range of virtual block devices detected by
+    udev from xv[f-p] to xv[a-z].
+  * Import the work of Ubuntu maintainers Scott Moser ([email protected]) and
+    Logan Rosen ([email protected]).
+
+ -- Roy Liu <[email protected]>  Wed, 28 Nov 2012 00:00:00 -0500
diff --git a/debian/control b/debian/control
@@ -1,22 +1,22 @@
 Source: ebsmount
 Section: misc
 Priority: optional
-Maintainer: Alon Swartz <alon@turnkeylinux.org>
+Maintainer: Jeremy Davis <jeremy@turnkeylinux.org>
 Build-Depends:
  debhelper (>= 10),
- python-all (>= 2.6.6-3~),
-Standards-Version: 4.0.0
-X-Python-Version: >= 2.6
+ python3-all (>= 3.6~),
+ dh-python,
+ turnkey-conffile
+Standards-Version: 4.1.1
+Homepage: https://github.com/turnkeylinux/ebsmount
 
 Package: ebsmount
-Architecture: any
+Architecture: all
 Depends:
- dh-python,
  ${misc:Depends},
- ${python:Depends},
- turnkey-pylib,
  udev,
-Description: Automatically mount EC2/Eucalyptus EBS devices
+ turnkey-conffile
+Description: Automatically mount EC2/OpenStack EBS devices
  Automatically mounts EBS (Elastic Block Storage) devices when they are
  attached, supports formatted devices as well as partitions, uniquely
  identifiable mount points, and hooking scripts execution upon mount.
diff --git a/debian/ebsmount.config b/debian/ebsmount.config
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+source -- /usr/share/debconf/confmodule
+
+if ( [[ "$1" == "configure" ]] && [[ -z "$2" ]] ) || [[ "$1" == "reconfigure" ]]; then
+
+    db_input medium ebsmount/enable_hooks || true
+    db_go
+fi
diff --git a/debian/ebsmount.install b/debian/ebsmount.install
@@ -0,0 +1,2 @@
+conf/85-ebsmount.rules  usr/lib/udev/rules.d/
+conf/*.conf             etc/
diff --git a/debian/ebsmount.lintian-overrides b/debian/ebsmount.lintian-overrides
@@ -0,0 +1,4 @@
+config-does-not-load-confmodule
+executable-not-elf-or-script
+hyphen-used-as-minus-sign
+postinst-does-not-load-confmodule