Add initial support for LZMA
authorMichael Prokop <devnull@localhost>
Sun, 25 Nov 2007 20:41:43 +0000 (21:41 +0100)
committerMichael Prokop <devnull@localhost>
Sun, 25 Nov 2007 20:41:43 +0000 (21:41 +0100)
debian/changelog
debian/patches/00list
debian/patches/03_support_for_lzma.diff [new file with mode: 0644]
patches/grml_patch_add_rsync.diff [deleted file]
patches/grml_patch_toram.diff [deleted file]

index 3139799..a40e5ed 100644 (file)
@@ -1,6 +1,7 @@
 live-initramfs (1.110.7-2~grml.01) unstable; urgency=low
 
   * Rebase grml's version on live-initramfs (1.110.7-1).
+  * Add initial support for LZMA.
 
  -- Michael Prokop <mika@grml.org>  Sun, 25 Nov 2007 21:17:52 +0100
 
index 6caeaf8..0cce1fd 100644 (file)
@@ -1,2 +1,3 @@
 01_add_rsync.dpatch
 02_more_verbose_toram.diff
+03_support_for_lzma.diff
diff --git a/debian/patches/03_support_for_lzma.diff b/debian/patches/03_support_for_lzma.diff
new file mode 100644 (file)
index 0000000..dfdfa07
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/hooks/live       2007-11-01 23:05:08.000000000 +0100
++++ b/hooks/live       2007-11-25 21:39:28.000000000 +0100
+@@ -78,6 +78,8 @@
+ copy_exec /sbin/losetup /sbin
+ manual_add_modules loop
+ manual_add_modules squashfs
++manual_add_modules sqlzma
++manual_add_modules unlzma
+ # Filesystem: unionfs/aufs
+ manual_add_modules unionfs
diff --git a/patches/grml_patch_add_rsync.diff b/patches/grml_patch_add_rsync.diff
deleted file mode 100644 (file)
index 1c84c62..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/hooks/live       2007-11-01 22:26:49.063100777 +0100
-+++ b/hooks/live       2007-11-01 22:27:28.560386219 +0100
-@@ -74,6 +74,8 @@
- # Filesystem: ext3
- manual_add_modules ext3
-+copy_exec /usr/bin/rsync
-+
- # Filesystem: squashfs
- copy_exec /sbin/losetup /sbin
- manual_add_modules loop
diff --git a/patches/grml_patch_toram.diff b/patches/grml_patch_toram.diff
deleted file mode 100644 (file)
index 48150d7..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/scripts/live     2007-11-01 22:25:41.567739580 +0100
-+++ b/scripts/live     2007-11-01 23:03:02.413731337 +0100
-@@ -609,9 +609,19 @@
-       else
-               if [ -n "${MODULETORAMFILE}" ]
-               then
--                      cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
--              else
--                      cp -a ${copyfrom}/* ${copyto}   # "cp -a" from busybox also copies hidden files
-+                        log_begin_msg "Copying $MODULETORAMFILE to RAM" >/dev/console
-+                      if [ -x /usr/bin/rsync ] ; then
-+                         rsync -a --progress ${MODULETORAMFILE} ${copyto} 1>/dev/console # copy only the filesystem module
-+                      else
-+                         cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
-+                      fi
-+              else
-+                        log_begin_msg "Copying medium to RAM" >/dev/console
-+                      if [ -x /usr/bin/rsync ] ; then
-+                         rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console  # "cp -a" from busybox also copies hidden files
-+                      else
-+                         cp -a ${copyfrom}/* ${copyto}   # "cp -a" from busybox also copies hidden files
-+                      fi
-               fi
-               livefs_root