summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbert schulze <spambemyguest@googlemail.com>2010-04-09 12:50:31 +0200
committermaximilian attems <maks@debian.org>2010-04-09 15:32:12 +0200
commit6e9a3ba17b49c08cd2d42d320c5258fa142e5e93 (patch)
tree7ad1195cf5a6108af30a7715546a948bc5138f1d
parent29166fa1d5311ee2c582ecb7e997ea855148dda0 (diff)
downloadinitramfs-tools-6e9a3ba17b49c08cd2d42d320c5258fa142e5e93.tar.gz
initramfs-tools-6e9a3ba17b49c08cd2d42d320c5258fa142e5e93.zip
mkinitramfs: add LZO support
Albin Tonnerre sent a patch fixing the initramfs LZO decompression, so heres my fix for initramfs-tools to have compete compression support. Tell me if you want me to open a new bugreport. On a side note: this will only work with a patched kernel (might be upstream with 2.6.34), its a good idea to include a warning for those running 2.6.33 from experimental [ adding it on TODO of Lenny linux-2.6 2.6.32 ] Signed-off-by: maximilian attems <maks@debian.org>
-rw-r--r--conf/initramfs.conf2
-rwxr-xr-xmkinitramfs2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/initramfs.conf b/conf/initramfs.conf
index 18c6c7e..2aa380f 100644
--- a/conf/initramfs.conf
+++ b/conf/initramfs.conf
@@ -36,7 +36,7 @@ BUSYBOX=y
KEYMAP=n
#
-# COMPRESS: [ gzip | bzip2 | lzma ]
+# COMPRESS: [ gzip | bzip2 | lzma | lzop ]
#
COMPRESS=gzip
diff --git a/mkinitramfs b/mkinitramfs
index ad03580..837bbd1 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -139,7 +139,7 @@ if ! command -v ${compress} >/dev/null 2>&1; then
echo "No ${COMPRESS} in ${PATH}, using gzip"
fi
-if ! `grep -q -i config_rd_${COMPRESS}=y /boot/config-${version}` ; then
+if ! `grep -q -i ^config_rd_${COMPRESS%p} /boot/config-${version}` ; then
compress=gzip
[ "${verbose}" = y ] && \
echo "linux-2.6 misses ${COMPRESS} support, using gzip"