.gear/rules              |  2 ++
 .gear/tags/list          |  1 +
 ChangeLog                |  3 ++
 bin/mount-image-callback |  4 +--
 cloud-utils.spec         | 82 ++++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog         |  6 ++++
 6 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..3d6a376
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: @version@:.
+diff: @version@:. . name=@name@-@version@.patch
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..74c4476
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+d5995ec48970176827df37ce710aa6a686e8e387 0.30
diff --git a/ChangeLog b/ChangeLog
index 8089046..817f3ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+0.31
+ - mount-image-callback: mount with -o 'rw' or -o 'ro' (LP: #1663722)
+
 0.30
  - ubuntu-cloudimg-query: fix xenial default to be ebs-ssd
     as traditional ebs are no longer available. (LP: #1593451)
diff --git a/bin/mount-image-callback b/bin/mount-image-callback
index 4c5b163..3d4dae6 100755
--- a/bin/mount-image-callback
+++ b/bin/mount-image-callback
@@ -345,7 +345,7 @@ mount_nbd() {
 	assert_nbd_support || return
 	connect_nbd "$img" "$fmt" "$ptnum" "$rwmode" || return
 	local ptnum="$_RET_PT" mdev="$_RET_DEV" nbd="$_RET_NBD"
-	if ( set -f; mount -o "$romode" $opts "$mdev" "$img_mp" ); then
+	if ( set -f; mount -o "$rwmode" $opts "$mdev" "$img_mp" ); then
 		debug 1 "mounted $mdev via qemu-nbd $nbd"
 	else
 		error "failed to mount $mdev"
@@ -479,7 +479,7 @@ mount_callback_umount() {
 			fi
 			return 1
 		fi
-		mount_nbd "$img" "$img_mp" "$fmt" "$ptnum" "$opts" || return
+		mount_nbd "$img" "$img_mp" "$fmt" "$ptnum" "$rwmode" "$opts" || return
 		UMOUNTS[${#UMOUNTS[@]}]="$img_mp"
 	fi
 
diff --git a/cloud-utils.spec b/cloud-utils.spec
new file mode 100644
index 0000000..03e6d80
--- /dev/null
+++ b/cloud-utils.spec
@@ -0,0 +1,82 @@
+
+Summary: Cloud image management utilities
+Name: cloud-utils
+Version: 0.30
+Release: alt1%ubt
+License: GPLv3
+Group: System/Configuration/Boot and Init
+Url: https://launchpad.net/cloud-utils
+
+Source: %name-%version.tar
+Patch: %name-%version.patch
+
+BuildArch: noarch
+BuildRequires(pre): rpm-build-ubt
+
+Requires: cloud-utils-growpart
+Requires: gawk
+Requires: e2fsprogs
+Requires: euca2ools
+Requires: file
+Requires: qemu-img
+Requires: util-linux
+
+%description
+This package provides a useful set of utilities for managing cloud images.
+
+The euca2ools package (a dependency of cloud-utils) provides an Amazon EC2 API
+compatible set of utilities for bundling kernels, ramdisks, and root
+filesystems, and uploading them to either EC2 or UEC.
+
+The tasks associated with image bundling are often tedious and repetitive. The
+cloud-utils package provides several scripts that wrap the complicated tasks
+with a much simpler interface.
+
+%package growpart
+Summary: Script for growing a partition
+Group: System/Configuration/Boot and Init
+
+Requires: gawk
+Requires: gdisk
+Requires: sfdisk
+Requires: util-linux
+
+%description growpart
+This package provides the growpart script for growing a partition. It is
+primarily used in cloud images in conjunction with the dracut-modules-growroot
+package to grow the root partition on first boot.
+
+%prep
+%setup
+%patch -p1
+
+%build
+
+%install
+%makeinstall_std
+
+# Exclude Ubuntu-specific tools
+rm -f %buildroot%_bindir/*ubuntu*
+
+%files
+%doc ChangeLog
+%_bindir/*
+%_man1dir/*
+%exclude %_bindir/growpart
+%exclude %_man1dir/growpart.*
+
+%files growpart
+%doc ChangeLog
+%_bindir/growpart
+%_man1dir/growpart.*
+
+%changelog
+* Thu Sep 28 2017 Alexey Shabalin <shaba@altlinux.ru> 0.30-alt1%ubt
+- 0.30
+
+* Tue Nov 22 2016 Alexey Shabalin <shaba@altlinux.ru> 0.29-alt1.20161024
+- bzr snapshot 20161024
+
+* Thu Dec 03 2015 Alexey Shabalin <shaba@altlinux.ru> 0.27-alt1.20151203
+- Initial build upstream snapshot
+
diff --git a/debian/changelog b/debian/changelog
index cf30c16..a79c93a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cloud-utils (0.31~bzrREVNO-1~trunk1) UNRELEASED; urgency=low
+
+  * mount-image-callback: mount with -o 'rw' or -o 'ro' (LP: #1663722)
+
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 10 Feb 2017 13:36:41 -0600
+
 cloud-utils (0.30~bzrREVNO-1~trunk1) UNRELEASED; urgency=low
 
   * debian/copyright: fix lintian file-without-copyright-information.