Skip to content

Commit 86c888f

Browse files
authored
Merge pull request #5 from JedMeister/17.x-update
17.x update
2 parents 4d8d1a0 + 3b6f0d6 commit 86c888f

28 files changed

+530
-427
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
*.pyc
2+
__pycache__/
3+
.mypy_cache/

85-ebsmount.rules.in

Lines changed: 0 additions & 9 deletions
This file was deleted.

Makefile

Lines changed: 0 additions & 79 deletions
This file was deleted.

cmd_manual.py

Lines changed: 0 additions & 101 deletions
This file was deleted.

cmd_udev.py

Lines changed: 0 additions & 92 deletions
This file was deleted.

conf/85-ebsmount.rules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# udev rules to trigger the ebsmount systemd service.
2+
3+
# Amazon EC2
4+
KERNEL=="xvd[a-z]|nvme[0-26]n[0-26]", SUBSYSTEM=="block", ACTION=="add", RUN+="/usr/bin/systemctl start ebsmount@%k"
5+
KERNEL=="xvd[a-z]|nvme[0-26]n[0-26]", SUBSYSTEM=="block", ACTION=="remove", RUN+="/usr/bin/systemctl stop ebsmount@%k"
6+
7+
# OpenStack
8+
KERNEL=="vd[a-z]*", SUBSYSTEM=="block", ACTION=="add", RUN+="@PATH_BIN@/ebsmount-udev add"
9+
KERNEL=="vd[a-z]*", SUBSYSTEM=="block", ACTION=="remove", RUN+="@PATH_BIN@/ebsmount-udev remove"
File renamed without changes.

debian/changelog

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
ebsmount (0.96) artful; urgency=low
2+
3+
* Change the device name detection pattern in `85-ebsmount.rules.in` to `KERNEL=="xvd[a-z]|nvme[0-26]n[0-26]"`.
4+
* Upgrade to Ubuntu Artful.
5+
6+
-- Roy Liu <[email protected]> Sat, 10 Feb 2018 00:00:00 -0400
7+
8+
ebsmount (0.95) yakkety; urgency=low
9+
10+
* Update the `ebsmount-udev` script to work with systemd mount namespaces.
11+
* Upgrade to Ubuntu Yakkety.
12+
13+
-- Roy Liu <[email protected]> Tue, 14 Mar 2017 00:00:00 -0400
14+
15+
ebsmount (0.94+3-0ubuntu4) precise; urgency=low
16+
17+
* Add the patch 0004: Change the range of virtual block devices detected by
18+
udev from xv[f-p] to xv[a-z].
19+
* Import the work of Ubuntu maintainers Scott Moser ([email protected]) and
20+
Logan Rosen ([email protected]).
21+
22+
-- Roy Liu <[email protected]> Wed, 28 Nov 2012 00:00:00 -0500

debian/control

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
Source: ebsmount
22
Section: misc
33
Priority: optional
4-
Maintainer: Alon Swartz <alon@turnkeylinux.org>
4+
Maintainer: Jeremy Davis <jeremy@turnkeylinux.org>
55
Build-Depends:
66
debhelper (>= 10),
7-
python-all (>= 2.6.6-3~),
8-
Standards-Version: 4.0.0
9-
X-Python-Version: >= 2.6
7+
python3-all (>= 3.6~),
8+
dh-python,
9+
turnkey-conffile
10+
Standards-Version: 4.1.1
11+
Homepage: https://github.com/turnkeylinux/ebsmount
1012

1113
Package: ebsmount
12-
Architecture: any
14+
Architecture: all
1315
Depends:
14-
dh-python,
1516
${misc:Depends},
16-
${python:Depends},
17-
turnkey-pylib,
1817
udev,
19-
Description: Automatically mount EC2/Eucalyptus EBS devices
18+
turnkey-conffile
19+
Description: Automatically mount EC2/OpenStack EBS devices
2020
Automatically mounts EBS (Elastic Block Storage) devices when they are
2121
attached, supports formatted devices as well as partitions, uniquely
2222
identifiable mount points, and hooking scripts execution upon mount.

debian/ebsmount.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
source -- /usr/share/debconf/confmodule
6+
7+
if ( [[ "$1" == "configure" ]] && [[ -z "$2" ]] ) || [[ "$1" == "reconfigure" ]]; then
8+
9+
db_input medium ebsmount/enable_hooks || true
10+
db_go
11+
fi

0 commit comments

Comments
 (0)