Add extra patch for fixing output message and partially revert 2ad3c30d9ef0cc1ea2c7df...
authorUlrich Dangel <mru@grml.org>
Sun, 12 Jun 2011 03:33:12 +0000 (05:33 +0200)
committerUlrich Dangel <mru@grml.org>
Mon, 13 Jun 2011 11:11:52 +0000 (13:11 +0200)
debian/patches/01_fix_output_file.patch [new file with mode: 0644]
debian/patches/series
scripts/live

diff --git a/debian/patches/01_fix_output_file.patch b/debian/patches/01_fix_output_file.patch
new file mode 100644 (file)
index 0000000..4dce5d4
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/scripts/live
++++ b/scripts/live
+@@ -1590,7 +1590,7 @@
+                               loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+                               devname="${loopdevname}"
+                       else
+-                              echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
++                              echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
+                       fi
+               fi
+       fi
index b5d2910..cfc8b5d 100644 (file)
@@ -1,3 +1,4 @@
+01_fix_output_file.patch
 03_grml_version_file_hook.patch
 05_boot_failure_message_grml.patch
 07_support_findiso.patch
index 5681362..57a4d32 100755 (executable)
@@ -1590,7 +1590,7 @@ check_dev ()
                                loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
                                devname="${loopdevname}"
                        else
-                               echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
+                               echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
                        fi
                fi
        fi