3 files changed, 43 insertions, 14 deletions

diff --git a/usr/Kconfig b/usr/Kconfig
index c2c7fe2f717d..65b845bd4e3e 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -46,7 +46,7 @@ config INITRAMFS_ROOT_GID
           If you are not sure, leave it set to "0".
 
 config RD_GZIP
-        bool "Support initial ramdisks compressed using gzip" if EMBEDDED
+        bool "Support initial ramdisks compressed using gzip" if EXPERT
         default y
         depends on BLK_DEV_INITRD
         select DECOMPRESS_GZIP
@@ -55,8 +55,8 @@ config RD_GZIP
           If unsure, say Y.
 
 config RD_BZIP2
-        bool "Support initial ramdisks compressed using bzip2" if EMBEDDED
-        default !EMBEDDED
+        bool "Support initial ramdisks compressed using bzip2" if EXPERT
+        default !EXPERT
         depends on BLK_DEV_INITRD
         select DECOMPRESS_BZIP2
         help
@@ -64,17 +64,26 @@ config RD_BZIP2
           If unsure, say N.
 
 config RD_LZMA
-        bool "Support initial ramdisks compressed using LZMA" if EMBEDDED
-        default !EMBEDDED
+        bool "Support initial ramdisks compressed using LZMA" if EXPERT
+        default !EXPERT
         depends on BLK_DEV_INITRD
         select DECOMPRESS_LZMA
         help
           Support loading of a LZMA encoded initial ramdisk or cpio buffer
           If unsure, say N.
 
+config RD_XZ
+        bool "Support initial ramdisks compressed using XZ" if EXPERT
+        default !EXPERT
+        depends on BLK_DEV_INITRD
+        select DECOMPRESS_XZ
+        help
+          Support loading of a XZ encoded initial ramdisk or cpio buffer.
+          If unsure, say N.
+
 config RD_LZO
-        bool "Support initial ramdisks compressed using LZO" if EMBEDDED
-        default !EMBEDDED
+        bool "Support initial ramdisks compressed using LZO" if EXPERT
+        default !EXPERT
         depends on BLK_DEV_INITRD
         select DECOMPRESS_LZO
         help
@@ -139,6 +148,15 @@ config INITRAMFS_COMPRESSION_LZMA
           three. Compression is slowest. The initramfs size is about 33%
           smaller with LZMA in comparison to gzip.
 
+config INITRAMFS_COMPRESSION_XZ
+        bool "XZ"
+        depends on RD_XZ
+        help
+          XZ uses the LZMA2 algorithm. The initramfs size is about 30%
+          smaller with XZ in comparison to gzip. Decompression speed
+          is better than that of bzip2 but worse than gzip and LZO.
+          Compression is slow.
+
 config INITRAMFS_COMPRESSION_LZO
         bool "LZO"
         depends on RD_LZO
diff --git a/usr/Makefile b/usr/Makefile
index 6faa444b7087..029ffe6cd0d8 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -15,6 +15,9 @@ suffix_$(CONFIG_INITRAMFS_COMPRESSION_BZIP2)  = .bz2
 # Lzma
 suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZMA)   = .lzma
 
+# XZ
+suffix_$(CONFIG_INITRAMFS_COMPRESSION_XZ)     = .xz
+
 # Lzo
 suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZO)   = .lzo
 
@@ -50,7 +53,7 @@ endif
 quiet_cmd_initfs = GEN     $@
       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
 
-targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.lzo initramfs_data.cpio
+targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.xz initramfs_data.cpio.lzo initramfs_data.cpio
 # do not try to update files included in initramfs
 $(deps_initramfs): ;
 
diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index b2b3c2d1cf8b..7f06884ecd41 100644
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -104,6 +104,8 @@ static int cpio_mkslink(const char *name, const char *target,
         char s[256];
         time_t mtime = time(NULL);
 
+        if (name[0] == '/')
+                name++;
         sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
                "%08X%08X%08X%08X%08X%08X%08X",
                 "070701",               /* magic */
@@ -152,6 +154,8 @@ static int cpio_mkgeneric(const char *name, unsigned int mode,
         char s[256];
         time_t mtime = time(NULL);
 
+        if (name[0] == '/')
+                name++;
         sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
                "%08X%08X%08X%08X%08X%08X%08X",
                 "070701",               /* magic */
@@ -245,6 +249,8 @@ static int cpio_mknod(const char *name, unsigned int mode,
         else
                 mode |= S_IFCHR;
 
+        if (name[0] == '/')
+                name++;
         sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
                "%08X%08X%08X%08X%08X%08X%08X",
                 "070701",               /* magic */
@@ -303,18 +309,18 @@ static int cpio_mkfile(const char *name, const char *location,
 
         mode |= S_IFREG;
 
-        retval = stat (location, &buf);
-        if (retval) {
-                fprintf (stderr, "File %s could not be located\n", location);
-                goto error;
-        }
-
         file = open (location, O_RDONLY);
         if (file < 0) {
                 fprintf (stderr, "File %s could not be opened for reading\n", location);
                 goto error;
         }
 
+        retval = fstat(file, &buf);
+        if (retval) {
+                fprintf(stderr, "File %s could not be stat()'ed\n", location);
+                goto error;
+        }
+
         filebuf = malloc(buf.st_size);
         if (!filebuf) {
                 fprintf (stderr, "out of memory\n");
@@ -332,6 +338,8 @@ static int cpio_mkfile(const char *name, const char *location,
                 /* data goes on last link */
                 if (i == nlinks) size = buf.st_size;
 
+                if (name[0] == '/')
+                        name++;
                 namesize = strlen(name) + 1;
                 sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
                        "%08lX%08X%08X%08X%08X%08X%08X",