Re-enabling 04_fix_no_medium_found_error as 04_drop_usage_of_fstype.dpatch
authorMichael Prokop <mika@grml.org>
Thu, 23 Apr 2009 09:21:17 +0000 (11:21 +0200)
committerMichael Prokop <mika@grml.org>
Thu, 23 Apr 2009 09:31:58 +0000 (11:31 +0200)
debian/changelog
debian/patches/00list
debian/patches/04_drop_usage_of_fstype.dpatch [moved from debian/patches/04_fix_no_medium_found_error.dpatch with 62% similarity]

index 5ab1b4c..1dca07a 100644 (file)
@@ -1,3 +1,12 @@
+live-initramfs (1.157.1-1grml.03) unstable; urgency=low
+
+  * Re-enabling 04_fix_no_medium_found_error as
+    04_drop_usage_of_fstype.dpatch, otherwise live-snapshot will fail
+    in a running live-system because fstype is an executable
+    on grml, whereas it's just a shell function in live-initramfs.
+
+ -- Michael Prokop <mika@grml.org>  Thu, 23 Apr 2009 11:20:03 +0200
+
 live-initramfs (1.157.1-1grml.02) unstable; urgency=low
 
   * Updating to Debian's git version 03f7e0ea30d52158973ff47bcdebd9932501d143.
index 551f94e..448be62 100644 (file)
@@ -1,6 +1,7 @@
 01_add_rsync.dpatch
 02_more_verbose_toram.dpatch
 03_grml_version_file_hook.dpatch
+04_drop_usage_of_fstype.dpatch
 05_boot_failure_message_grml.dpatch
 06_support_fromiso_isofrom.dpatch
 07_support_findiso.dpatch
similarity index 62%
rename from debian/patches/04_fix_no_medium_found_error.dpatch
rename to debian/patches/04_drop_usage_of_fstype.dpatch
index a57da2f..aac30c9 100755 (executable)
@@ -1,14 +1,16 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_no_medium_found_error.dpatch <mika@grml.org>
+## 04_drop_usage_of_fstype.dpatch <mika@grml.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the "cannot open /dev/scd0: No medium found" issue
+## DP: Avoid the use of fstype in a running live system, as it's
+## DP: a executable and not a shell function and causes problems
+## DP: for example within live-snapshot
 
 @DPATCH@
 
 --- a/scripts/live-helpers
 +++ b/scripts/live-helpers
-@@ -67,24 +67,6 @@ is_supported_fs ()
+@@ -76,24 +76,6 @@ is_supported_fs ()
  
  get_fstype ()
  {
@@ -22,7 +24,7 @@
 -          return
 -      fi
 -
--      eval $(fstype ${1} 2>/dev/null)
+-      eval $(fstype ${1} 2>/dev/null)
 -
 -      if [ "${FSTYPE}" != "unknown" ]
 -      then