summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Howard <ben.howard@ubuntu.com>2015-03-09 06:26:48 -0600
committerusd-importer <ubuntu-server@lists.ubuntu.com>2015-03-09 12:53:34 +0000
commitf9cd6b27fad4d9fdf557138966f2d34cae234edb (patch)
treeb162abab788d16b2b9c2cb95812d33028dc83d83
parent379762a303b368246edd6419b4bfbe9b76ce517c (diff)
downloadvyos-walinuxagent-f9cd6b27fad4d9fdf557138966f2d34cae234edb.tar.gz
vyos-walinuxagent-f9cd6b27fad4d9fdf557138966f2d34cae234edb.zip
Import patches-unapplied version 2.0.8-0ubuntu7 to ubuntu/vivid-proposed
Imported using git-ubuntu import. Changelog parent: 379762a303b368246edd6419b4bfbe9b76ce517c New changelog entries: * Added /lib/udev/rules.d/66-azure-storage.rules: create symlinks for /dev/disk/azure/{root,resource} to correctly identify disks (LP: #1411582).
-rw-r--r--debian/66-azure-storage.rules17
-rw-r--r--debian/changelog8
-rw-r--r--debian/install1
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/66-azure-storage.rules b/debian/66-azure-storage.rules
new file mode 100644
index 0000000..1b64824
--- /dev/null
+++ b/debian/66-azure-storage.rules
@@ -0,0 +1,17 @@
+ACTION!="add|change", GOTO="azure_end"
+SUBSYSTEM!="block", GOTO="azure_end"
+ATTRS{ID_VENDOR}!="Msft", GOTO="azure_end"
+ATTRS{ID_MODEL}!="Virtual_Disk", GOTO="azure_end"
+
+# Root has a GUID of 0000 as the second value
+# The resource/resource has GUID of 0001 as the second value
+ATTRS{device_id}=="?00000000-0000-*", ENV{fabric_name}="root", GOTO="azure_names"
+ATTRS{device_id}=="?00000000-0001-*", ENV{fabric_name}="resource", GOTO="azure_names"
+GOTO="azure_end"
+
+# Create the symlinks
+LABEL="azure_names"
+ENV{DEVTYPE}=="disk", SYMLINK+="disk/azure/$env{fabric_name}"
+ENV{DEVTYPE}=="partition", SYMLINK+="disk/azure/$env{fabric_name}-part%n"
+
+LABEL="azure_end"
diff --git a/debian/changelog b/debian/changelog
index 17060d7..54b65f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+walinuxagent (2.0.8-0ubuntu7) vivid; urgency=medium
+
+ * Added /lib/udev/rules.d/66-azure-storage.rules: create symlinks for
+ /dev/disk/azure/{root,resource} to correctly identify disks
+ (LP: #1411582).
+
+ -- Ben Howard <ben.howard@ubuntu.com> Mon, 09 Mar 2015 06:26:48 -0600
+
walinuxagent (2.0.8-0ubuntu6) vivid; urgency=medium
* Changed systemd unit file to allow for cloud-init to run first.
diff --git a/debian/install b/debian/install
index 3f1da87..27589a6 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,3 @@
config/91_walinuxagent.cfg etc/cloud/cloud.cfg.d
debian/ephemeral-disk-warning.conf etc/init
+debian/66-azure-storage.rules lib/udev/rules.d