Package: btrfs-tools
Version: 0.19+20120328-4
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

In Ubuntu, the attached patch was applied to achieve the following:

  * Add fsck.btrfs to the initramfs (LP: 1002782)
  * Add postinst/postrm scripts to update initramfs
  
fsck.btrfs can only be run on unmounted filesystems, if the rootfs is
on btrfs, fsck.btrfs should be available in the initramfs to be
possible to run it. Potentially this can be made optional, depending
on rootfs actually being on btrfs.

Also I have noticed that update-initramfs is not triggered in the
postinst & postrm scripts, this is now added since initramfs-tools
does not ship a file trigger, looks like by design.

Thanks for considering the patch.


- -- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal'), (100, 'quantal-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.4.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJP6FoOAAoJEIh7YGGLPBau1lcP/i/afIg5209S7Ng23V/ttuKc
IYGD5r/638nd7OzNo9ElL4/3SolA3SDybDHGylCw3kQrQWWCnRy/jRcUSgQwiIIO
oLXJvJ2qPCNdPs6nY0S0wY6IPec54DgbkgeP9wbfJFfOgp637bXo4aCPKusAUv0F
ovZ2UdIc0WbtIfBnpPB5lAxt1q1iXubuSoYPutPnN7IqJ4XF/iA1m3pfRM2bWk4w
9D6VxNoq7aSt0zfCCnxAbTRVh7XVSlApBrt5i56CCu2aEvseNvwNwyWdLVhe2xeZ
CgPsZEOQJU3BVEFb2EcLBCkrSDcT8OlmsTOxSE6H4W+74TuF0hbjFhyR610a1nG1
UhBDW2saX+Lg7pheTwx8C53556/kWAVA9pbdthDmMR5XRw9VvTfTIWggLzvYosbM
bnhVHtVQ2XrXf2IUdyW/il8J+NdH/wVrAUDYLgACU97vEoWDahlxnDXsjl/4UAwR
5427GeAuewYRCgojoLegcIN1HwQqTZlO6A7s3wi49jbUB4qleZo0ylQV8Pxk3lyU
JKnRJG8y6EeX02LOeldCPQ/S7SnrBvX8cRXfvzprjL9SSypcsANZsanPmx110Zfo
nS5EhrgRskMEfm4kRZNIWKl7r0ihSyc3MowAbAdH23bMl2aSoTyUlXyn3KarnBNh
UYyUGGcFCmMz+qE83lLJ
=8LEb
-----END PGP SIGNATURE-----
diff -Nru btrfs-tools-0.19+20120328/debian/changelog btrfs-tools-0.19+20120328/debian/changelog
diff -Nru btrfs-tools-0.19+20120328/debian/local/btrfs.hook btrfs-tools-0.19+20120328/debian/local/btrfs.hook
--- btrfs-tools-0.19+20120328/debian/local/btrfs.hook	2011-12-10 10:33:06.000000000 +0000
+++ btrfs-tools-0.19+20120328/debian/local/btrfs.hook	2012-06-25 11:23:29.000000000 +0100
@@ -21,4 +21,5 @@
 if [ -x /sbin/btrfs ]
 then
 	copy_exec /sbin/btrfs /sbin
+	copy_exec /sbin/fsck.btrfs /sbin
 fi
diff -Nru btrfs-tools-0.19+20120328/debian/postinst btrfs-tools-0.19+20120328/debian/postinst
--- btrfs-tools-0.19+20120328/debian/postinst	1970-01-01 01:00:00.000000000 +0100
+++ btrfs-tools-0.19+20120328/debian/postinst	2012-06-25 12:15:21.000000000 +0100
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postinst script for btrfs-tools
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+	if [ -x /usr/sbin/update-initramfs ]; then
+	    update-initramfs -u
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff -Nru btrfs-tools-0.19+20120328/debian/postrm btrfs-tools-0.19+20120328/debian/postrm
--- btrfs-tools-0.19+20120328/debian/postrm	1970-01-01 01:00:00.000000000 +0100
+++ btrfs-tools-0.19+20120328/debian/postrm	2012-06-25 12:14:37.000000000 +0100
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postrm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|disapper)
+	if [ -x /usr/sbin/update-initramfs ]; then
+	    update-initramfs -u
+	fi
+    ;;
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Reply via email to