Merge branch 'debian-next' into master-next

[live-boot-grml.git] / debian / patches / 33_retry_phram.patch

diff --git a/debian/patches/33_retry_phram.patch b/debian/patches/33_retry_phram.patch
index 40389e9..b124cbd 100644 (file)
--- a/debian/patches/33_retry_phram.patch
+++ b/debian/patches/33_retry_phram.patch
@@ -7,9 +7,9 @@ Date:   Mon Jul 11 12:42:24 2011 +0200
     phram doesn't work on first modprobe, when loading once again it seems
     to work. So let's try it this way.
 
     phram doesn't work on first modprobe, when loading once again it seems
     to work. So let's try it this way.
 

---- a/scripts/live
-+++ b/scripts/live
-@@ -1576,6 +1576,7 @@
+--- a/scripts/boot/9990-main.sh
++++ b/scripts/boot/9990-main.sh
+@@ -60,6 +60,7 @@

                                then
                                        # We found a memdisk, set up phram
                                        modprobe phram phram=memdisk,${MEMDISK}
                                then
                                        # We found a memdisk, set up phram
                                        modprobe phram phram=memdisk,${MEMDISK}