Turn d4619b77 into a quilt patch

Otherwise dpkg-source (rightfully) complains that there are
untracked local changes.

diff --git a/debian/patches/33_retry_phram.patch b/debian/patches/33_retry_phram.patch
new file mode 100644 (file)
index 0000000..3ec0bc1
--- /dev/null
+++ b/debian/patches/33_retry_phram.patch
@@ -0,0 +1,21 @@
+commit d4619b77a669c70ae68d5da34de7655ffef80e04
+Author: Michael Prokop <mika@grml.org>
+Date:   Mon Jul 11 12:42:24 2011 +0200
+
+    Try loading phram module twice to fix loading issue.
+    
+    phram doesn't work on first modprobe, when loading once again it seems
+    to work. So let's try it this way.
+
+diff --git a/scripts/live b/scripts/live
+index 23d0bbc..e5d3186 100755
+--- a/scripts/live
++++ b/scripts/live
+@@ -1840,6 +1840,7 @@ mountroot ()
+                               then
+                                       # We found a memdisk, set up phram
+                                       modprobe phram phram=memdisk,${MEMDISK}
++                                      modprobe phram phram=memdisk,${MEMDISK}
+ 
+                                       # Load mtdblock, the memdisk will be /dev/mtdblock0
+                                       modprobe mtdblock

diff --git a/debian/patches/series b/debian/patches/series
index fd69bf2..ba40f7a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 30_support_multiarch_dns.patch
 31_package_rename.patch
 32_add_kms.patch
+33_retry_phram.patch

diff --git a/scripts/live b/scripts/live
index 584193e..8ffbc20 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -1952,7 +1952,6 @@ mountroot ()
                                then
                                        # We found a memdisk, set up phram
                                        modprobe phram phram=memdisk,${MEMDISK}
-                                       modprobe phram phram=memdisk,${MEMDISK}
 
                                        # Load mtdblock, the memdisk will be /dev/mtdblock0
                                        modprobe mtdblock