[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

debdiff pour les fixes cloud-initramfs-tools



Hi Julien,

Here's my patch for cloud-initramfs-tools, so that it may eventually
work as expected, as we discussed on IRC. If you could apply my patch,
and upload the fixed version in Sid, that would be super nice.

For folks who didn't follow, cloud-initramfs-growroot, which is to be
installed in the cloud image you want to build, resize the partition of
your image from the initrd. But there was 2 problems:
1/ it needs sed and awk which were not present by default
2/ there's a check of the output with --dry-run of growpart which fails,
that I disabled in my patch

With the above changes, my partition was resized as expected. My target
is an OpenStack cloud image (running with KVM), but maybe other cloud
users will find this helpful, which is why I am CC-ing debian-cloud@l.d.o.

Cheers,

Thomas Goirand (zigo)
diff -Nru cloud-initramfs-tools-0.18.debian1/debian/changelog cloud-initramfs-tools-0.18.debian1~bpo70+1/debian/changelog
--- cloud-initramfs-tools-0.18.debian1/debian/changelog	2013-01-29 13:19:01.000000000 +0000
+++ cloud-initramfs-tools-0.18.debian1~bpo70+1/debian/changelog	2013-05-22 10:44:46.000000000 +0000
@@ -1,3 +1,10 @@
+cloud-initramfs-tools (0.18.debian1~bpo70+1) wheezy-backports; urgency=low
+
+  * Rebuild for wheezy-backports.
+  * Added sed and awk in the growroot hook.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 22 May 2013 07:32:34 +0000
+
 cloud-initramfs-tools (0.18.debian1) unstable; urgency=low
 
   * Package for Debian
diff -Nru cloud-initramfs-tools-0.18.debian1/debian/patches/disable-growroot-dryrun-output-checking.patch cloud-initramfs-tools-0.18.debian1~bpo70+1/debian/patches/disable-growroot-dryrun-output-checking.patch
--- cloud-initramfs-tools-0.18.debian1/debian/patches/disable-growroot-dryrun-output-checking.patch	1970-01-01 00:00:00.000000000 +0000
+++ cloud-initramfs-tools-0.18.debian1~bpo70+1/debian/patches/disable-growroot-dryrun-output-checking.patch	2013-05-23 17:22:43.000000000 +0000
@@ -0,0 +1,17 @@
+--- a/growroot/scripts/local-bottom/growroot	2013-05-23 17:20:31.205934131 +0000
++++ b/growroot/scripts/local-bottom/growroot	2013-05-23 17:21:30.240001384 +0000
+@@ -56,10 +56,10 @@
+ # if growpart would change something, --dry-run will write something like
+ #  CHANGE: partition=1 start=2048 old: size=1024000 end=1026048 new: size=2089192,end=2091240
+ # anything else, exit
+-case "${out}" in
+-	CHANGE:*) :;;
+-	*) exit 0;;
+-esac
++#case "${out}" in
++#	CHANGE:*) :;;
++#	*) exit 0;;
++#esac
+ 
+ # There was something to do, unmount and resize
+ umount "${rootmnt}" ||
diff -Nru cloud-initramfs-tools-0.18.debian1/debian/patches/series cloud-initramfs-tools-0.18.debian1~bpo70+1/debian/patches/series
--- cloud-initramfs-tools-0.18.debian1/debian/patches/series	2013-01-29 14:13:22.000000000 +0000
+++ cloud-initramfs-tools-0.18.debian1~bpo70+1/debian/patches/series	2013-05-23 17:23:12.000000000 +0000
@@ -1 +1,2 @@
 remove-wait-for-root.patch
+disable-growroot-dryrun-output-checking.patch
diff -Nru cloud-initramfs-tools-0.18.debian1/growroot/hooks/growroot cloud-initramfs-tools-0.18.debian1~bpo70+1/growroot/hooks/growroot
--- cloud-initramfs-tools-0.18.debian1/growroot/hooks/growroot	2013-01-29 13:12:20.000000000 +0000
+++ cloud-initramfs-tools-0.18.debian1~bpo70+1/growroot/hooks/growroot	2013-05-22 10:44:27.000000000 +0000
@@ -12,5 +12,7 @@
 copy_exec /sbin/sfdisk /sbin
 copy_exec /usr/bin/growpart /sbin
 copy_exec /sbin/udevadm /sbin
+copy_exec /usr/bin/awk /bin
+copy_exec /bin/sed /bin
 
 # vi: ts=4 noexpandtab

Reply to: