Changeset 249 for floppyfw

Timestamp:

07/18/08 11:08:35 (4 years ago)

Author:

root

Message:

Big sync, adding stuff from 3.0 and some other smallies.

Location:

floppyfw

Files:

• Makefile (modified) (1 diff)
• configs/config-linux-2.6 (modified) (1 diff)
• files/config (modified) (2 diffs)
• files/dmz-fw.ini (modified) (2 diffs)
• files/udhcpcrenew.sh (modified) (1 diff)
• patches/kernel-2.6/010-lzma-init-ia32.patch (modified) (3 diffs)
• patches/kernel-2.6/015-lzma-vmlinuz-x86.patch (modified) (1 diff)
• scripts/modpick.pl (modified) (2 diffs)
• target/packages/make_packages.sh (modified) (1 diff)

floppyfw/Makefile

@@ -45 +45 @@
 SED=/usr/bin/perl -p -i -e
 LZMAD=lzmacat
-LZMAC=lzma -c
+# LZMAC=lzma -c
+LZMAC=lzmacomp
 RM=rm -f
 # For now, it's only this anyway:

floppyfw/configs/config-linux-2.6

@@ -65 +65 @@
 CONFIG_LZMA_INITRD=y
 # CONFIG_LZMA_INITRD_KMALLOC_ONLY is not set
-CONFIG_LZMA_INITRAM_FS=y
-CONFIG_LZMA_INITRAM_FS_SMALLMEM=y
+# CONFIG_LZMA_INITRAM_FS is not set
+# CONFIG_LZMA_INITRAM_FS_SMALLMEM is not set
 # CONFIG_LZMA_INITRAM_FS_KMALLOC_ONLY is not set
 CONFIG_INITRAMFS_SOURCE=""

floppyfw/files/config

@@ -187 +187 @@
 #
 # This is just to set up the network, you have to edit firewall.ini to 
-# be able to do ahything useful with this.
+# be able to do anything useful with this.
 #
 # This can also be set up as the device/LAN for an open WLAN.
+#
+# Please note that enabling this automatically opens up for DNS requests to
+# the floppyfw from DMZ.
 #
 
@@ -201 +204 @@
 
 #
-# This switch (is not working yet) will turn on or off NAT to the outside 
-# network.
+# This switch will turn on or off NAT to the outside network.
 #
 
 DMZ_USE_NAT=y
 
-# This is the ports you will allow to the inside. SSH is the only one I'd 
-# trust, if any.
-DMZ_ALLOW_PORTS_INSIDE="ssh"
-
-# And for the outside. NEVER ALLOW SMTP if used as an open WLAN.
-DMZ_ALLOW_PORTS_OUTSIDE="ssh,www,https,ftp,domain,pop3,pop3s,imap3,imaps"
+# What traffic do you want to allow from DMZ to OUTSIDE?
+# Specifying "all" will allow all traffic, "none" will block all. TCP based
+# protocols can be specified in a comma separated list like this:
+# DMZ_ALLOW_TO_OUTSIDE="ssh,www,https,ftp,domain,pop3,pop3s,imap3,imaps"
+DMZ_ALLOW_TO_OUTSIDE="all"
+
+# What traffic do you want to allow from DMZ to INSIDE?
+# Specifying "all" will allow all traffic, "none" will block all. TCP based
+# protocols can be specified in a comma separated list like this:
+# DMZ_ALLOW_TO_INSIDE="ssh,ftp"
+DMZ_ALLOW_TO_INSIDE="none"
+
+# What traffic do you want to allow from INSIDE to DMZ?
+# Specifying "all" will allow all traffic, "none" will block all. TCP based
+# protocols can be specified in a comma separated list like this:
+# DMZ_ALLOW_FROM_INSIDE="ssh,ftp,http,https,smtp"
+DMZ_ALLOW_FROM_INSIDE="all"
 
 # This is to set a traffic shaping rule to restrict the bandwidth.

floppyfw/files/dmz-fw.ini

@@ -24 +24 @@
 echo "Setting up DMZ."
 
+# We will automatically accept DNS requests.
+iptables -A INPUT -i ${DMZ_DEVICE} -p TCP --dport 53 -j ACCEPT
+iptables -A INPUT -i ${DMZ_DEVICE} -p UDP --dport 53 -j ACCEPT
+
 if [ "$DMZ_USE_NAT" = "y" ]
  then
@@ -31 +35 @@
 # Open ports:
 # The big caveat here is thet multiport only supports 15 ports..
-if [ -n "$DMZ_ALLOW_PORTS_INSIDE" ]
+# We will try to pad that by giving the admin more options..
+if [ -n "$DMZ_ALLOW_TO_OUTSIDE" ]
 then
-  iptables -A FORWARD -p tcp -i $DMZ_DEVICE -m multiport --dports $DMZ_ALLOW_PORTS_INSIDE -o $INSIDE_DEVICE -j ACCEPT
+  case "$DMZ_ALLOW_TO_OUTSIDE" in
+    all) iptables -A FORWARD -i $DMZ_DEVICE -o $OUTSIDE_DEVICE -j ACCEPT
+        ;;
+    none) echo "No ports opened to OUTSIDE from DMZ"
+        ;;
+    *) iptables -A FORWARD -p tcp -i $DMZ_DEVICE -m multiport --dports $DMZ_ALLOW_TO_OUTSIDE -o $OUTSIDE_DEVICE -j ACCEPT
+        ;;
+  esac
 fi
 
-if [ -n "$DMZ_ALLOW_PORTS_OUTSIDE" ]
+if [ -n "$DMZ_ALLOW_TO_INSIDE" ]
 then
-  iptables -A FORWARD -p tcp -i $DMZ_DEVICE -m multiport --dports $DMZ_ALLOW_PORTS_OUTSIDE -o $OUTSIDE_DEVICE -j ACCEPT
+  case "$DMZ_ALLOW_TO_INSIDE" in
+    all) iptables -A FORWARD -i $DMZ_DEVICE -o $INSIDE_DEVICE -j ACCEPT
+        ;;
+    none) echo "No ports opened to INSIDE from DMZ"
+        ;;
+    *) iptables -A FORWARD -p tcp -i $DMZ_DEVICE -m multiport --dports $DMZ_ALLOW_TO_INSIDE -o $INSIDE_DEVICE -j ACCEPT
+        ;;
+  esac
+fi
+
+if [ -n "$DMZ_ALLOW_FROM_INSIDE" ]
+then
+  case "$DMZ_ALLOW_FROM_INSIDE" in
+    all) iptables -A FORWARD -i $INSIDE_DEVICE -o $DMZ_DEVICE -j ACCEPT
+        ;;
+    none) echo "No ports opened to DMZ from INSIDE"
+        ;;
+    *) iptables -A FORWARD -p tcp -i $INSIDE_DEVICE -m multiport --dports $DMZ_ALLOW_FROM_INSIDE -o $DMZ_DEVICE -j ACCEPT
+        ;;
+  esac
 fi
 

floppyfw/files/udhcpcrenew.sh

@@ -151 +151 @@
 #
 . /etc/config
+
 
 #

floppyfw/patches/kernel-2.6/010-lzma-init-ia32.patch

@@ -364 +364 @@
                 len -= inptr;
         }
-diff -urN linux-2.6.24/init/initramfs.c.orig linux-2.6.24-lzma-initrd/init/initramfs.c.orig
---- linux-2.6.24/init/initramfs.c.orig  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24-lzma-initrd/init/initramfs.c.orig      2008-01-24 23:58:37.000000000 +0100
-@@ -0,0 +1,585 @@
-+#include <linux/init.h>
-+#include <linux/fs.h>
-+#include <linux/slab.h>
-+#include <linux/types.h>
-+#include <linux/fcntl.h>
-+#include <linux/delay.h>
-+#include <linux/string.h>
-+#include <linux/syscalls.h>
-+
-+static __initdata char *message;
-+static void __init error(char *x)
-+{
-+       if (!message)
-+               message = x;
-+}
-+
-+static void __init *malloc(size_t size)
-+{
-+       return kmalloc(size, GFP_KERNEL);
-+}
-+
-+static void __init free(void *where)
-+{
-+       kfree(where);
-+}
-+
-+/* link hash */
-+
-+#define N_ALIGN(len) ((((len) + 1) & ~3) + 2)
-+
-+static __initdata struct hash {
-+       int ino, minor, major;
-+       mode_t mode;
-+       struct hash *next;
-+       char name[N_ALIGN(PATH_MAX)];
-+} *head[32];
-+
-+static inline int hash(int major, int minor, int ino)
-+{
-+       unsigned long tmp = ino + minor + (major << 3);
-+       tmp += tmp >> 5;
-+       return tmp & 31;
-+}
-+
-+static char __init *find_link(int major, int minor, int ino,
-+                             mode_t mode, char *name)
-+{
-+       struct hash **p, *q;
-+       for (p = head + hash(major, minor, ino); *p; p = &(*p)->next) {
-+               if ((*p)->ino != ino)
-+                       continue;
-+               if ((*p)->minor != minor)
-+                       continue;
-+               if ((*p)->major != major)
-+                       continue;
-+               if (((*p)->mode ^ mode) & S_IFMT)
-+                       continue;
-+               return (*p)->name;
-+       }
-+       q = (struct hash *)malloc(sizeof(struct hash));
-+       if (!q)
-+               panic("can't allocate link hash entry");
-+       q->major = major;
-+       q->minor = minor;
-+       q->ino = ino;
-+       q->mode = mode;
-+       strcpy(q->name, name);
-+       q->next = NULL;
-+       *p = q;
-+       return NULL;
-+}
-+
-+static void __init free_hash(void)
-+{
-+       struct hash **p, *q;
-+       for (p = head; p < head + 32; p++) {
-+               while (*p) {
-+                       q = *p;
-+                       *p = q->next;
-+                       free(q);
-+               }
-+       }
-+}
-+
-+/* cpio header parsing */
-+
-+static __initdata unsigned long ino, major, minor, nlink;
-+static __initdata mode_t mode;
-+static __initdata unsigned long body_len, name_len;
-+static __initdata uid_t uid;
-+static __initdata gid_t gid;
-+static __initdata unsigned rdev;
-+
-+static void __init parse_header(char *s)
-+{
-+       unsigned long parsed[12];
-+       char buf[9];
-+       int i;
-+
-+       buf[8] = '\0';
-+       for (i = 0, s += 6; i < 12; i++, s += 8) {
-+               memcpy(buf, s, 8);
-+               parsed[i] = simple_strtoul(buf, NULL, 16);
-+       }
-+       ino = parsed[0];
-+       mode = parsed[1];
-+       uid = parsed[2];
-+       gid = parsed[3];
-+       nlink = parsed[4];
-+       body_len = parsed[6];
-+       major = parsed[7];
-+       minor = parsed[8];
-+       rdev = new_encode_dev(MKDEV(parsed[9], parsed[10]));
-+       name_len = parsed[11];
-+}
-+
-+/* FSM */
-+
-+static __initdata enum state {
-+       Start,
-+       Collect,
-+       GotHeader,
-+       SkipIt,
-+       GotName,
-+       CopyFile,
-+       GotSymlink,
-+       Reset
-+} state, next_state;
-+
-+static __initdata char *victim;
-+static __initdata unsigned count;
-+static __initdata loff_t this_header, next_header;
-+
-+static __initdata int dry_run;
-+
-+static inline void __init eat(unsigned n)
-+{
-+       victim += n;
-+       this_header += n;
-+       count -= n;
-+}
-+
-+static __initdata char *collected;
-+static __initdata int remains;
-+static __initdata char *collect;
-+
-+static void __init read_into(char *buf, unsigned size, enum state next)
-+{
-+       if (count >= size) {
-+               collected = victim;
-+               eat(size);
-+               state = next;
-+       } else {
-+               collect = collected = buf;
-+               remains = size;
-+               next_state = next;
-+               state = Collect;
-+       }
-+}
-+
-+static __initdata char *header_buf, *symlink_buf, *name_buf;
-+
-+static int __init do_start(void)
-+{
-+       read_into(header_buf, 110, GotHeader);
-+       return 0;
-+}
-+
-+static int __init do_collect(void)
-+{
-+       unsigned n = remains;
-+       if (count < n)
-+               n = count;
-+       memcpy(collect, victim, n);
-+       eat(n);
-+       collect += n;
-+       if ((remains -= n) != 0)
-+               return 1;
-+       state = next_state;
-+       return 0;
-+}
-+
-+static int __init do_header(void)
-+{
-+       if (memcmp(collected, "070707", 6)==0) {
-+               error("incorrect cpio method used: use -H newc option");
-+               return 1;
-+       }
-+       if (memcmp(collected, "070701", 6)) {
-+               error("no cpio magic");
-+               return 1;
-+       }
-+       parse_header(collected);
-+       next_header = this_header + N_ALIGN(name_len) + body_len;
-+       next_header = (next_header + 3) & ~3;
-+       if (dry_run) {
-+               read_into(name_buf, N_ALIGN(name_len), GotName);
-+               return 0;
-+       }
-+       state = SkipIt;
-+       if (name_len <= 0 || name_len > PATH_MAX)
-+               return 0;
-+       if (S_ISLNK(mode)) {
-+               if (body_len > PATH_MAX)
-+                       return 0;
-+               collect = collected = symlink_buf;
-+               remains = N_ALIGN(name_len) + body_len;
-+               next_state = GotSymlink;
-+               state = Collect;
-+               return 0;
-+       }
-+       if (S_ISREG(mode) || !body_len)
-+               read_into(name_buf, N_ALIGN(name_len), GotName);
-+       return 0;
-+}
-+
-+static int __init do_skip(void)
-+{
-+       if (this_header + count < next_header) {
-+               eat(count);
-+               return 1;
-+       } else {
-+               eat(next_header - this_header);
-+               state = next_state;
-+               return 0;
-+       }
-+}
-+
-+static int __init do_reset(void)
-+{
-+       while(count && *victim == '\0')
-+               eat(1);
-+       if (count && (this_header & 3))
-+               error("broken padding");
-+       return 1;
-+}
-+
-+static int __init maybe_link(void)
-+{
-+       if (nlink >= 2) {
-+               char *old = find_link(major, minor, ino, mode, collected);
-+               if (old)
-+                       return (sys_link(old, collected) < 0) ? -1 : 1;
-+       }
-+       return 0;
-+}
-+
-+static void __init clean_path(char *path, mode_t mode)
-+{
-+       struct stat st;
-+
-+       if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
-+               if (S_ISDIR(st.st_mode))
-+                       sys_rmdir(path);
-+               else
-+                       sys_unlink(path);
-+       }
-+}
-+
-+static __initdata int wfd;
-+
-+static int __init do_name(void)
-+{
-+       state = SkipIt;
-+       next_state = Reset;
-+       if (strcmp(collected, "TRAILER!!!") == 0) {
-+               free_hash();
-+               return 0;
-+       }
-+       if (dry_run)
-+               return 0;
-+       clean_path(collected, mode);
-+       if (S_ISREG(mode)) {
-+               int ml = maybe_link();
-+               if (ml >= 0) {
-+                       int openflags = O_WRONLY|O_CREAT;
-+                       if (ml != 1)
-+                               openflags |= O_TRUNC;
-+                       wfd = sys_open(collected, openflags, mode);
-+
-+                       if (wfd >= 0) {
-+                               sys_fchown(wfd, uid, gid);
-+                               sys_fchmod(wfd, mode);
-+                               state = CopyFile;
-+                       }
-+               }
-+       } else if (S_ISDIR(mode)) {
-+               sys_mkdir(collected, mode);
-+               sys_chown(collected, uid, gid);
-+               sys_chmod(collected, mode);
-+       } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
-+                  S_ISFIFO(mode) || S_ISSOCK(mode)) {
-+               if (maybe_link() == 0) {
-+                       sys_mknod(collected, mode, rdev);
-+                       sys_chown(collected, uid, gid);
-+                       sys_chmod(collected, mode);
-+               }
-+       }
-+       return 0;
-+}
-+
-+static int __init do_copy(void)
-+{
-+       if (count >= body_len) {
-+               sys_write(wfd, victim, body_len);
-+               sys_close(wfd);
-+               eat(body_len);
-+               state = SkipIt;
-+               return 0;
-+       } else {
-+               sys_write(wfd, victim, count);
-+               body_len -= count;
-+               eat(count);
-+               return 1;
-+       }
-+}
-+
-+static int __init do_symlink(void)
-+{
-+       collected[N_ALIGN(name_len) + body_len] = '\0';
-+       clean_path(collected, 0);
-+       sys_symlink(collected + N_ALIGN(name_len), collected);
-+       sys_lchown(collected, uid, gid);
-+       state = SkipIt;
-+       next_state = Reset;
-+       return 0;
-+}
-+
-+static __initdata int (*actions[])(void) = {
-+       [Start]         = do_start,
-+       [Collect]       = do_collect,
-+       [GotHeader]     = do_header,
-+       [SkipIt]        = do_skip,
-+       [GotName]       = do_name,
-+       [CopyFile]      = do_copy,
-+       [GotSymlink]    = do_symlink,
-+       [Reset]         = do_reset,
-+};
-+
-+static int __init write_buffer(char *buf, unsigned len)
-+{
-+       count = len;
-+       victim = buf;
-+
-+       while (!actions[state]())
-+               ;
-+       return len - count;
-+}
-+
-+static void __init flush_buffer(char *buf, unsigned len)
-+{
-+       int written;
-+       if (message)
-+               return;
-+       while ((written = write_buffer(buf, len)) < len && !message) {
-+               char c = buf[written];
-+               if (c == '0') {
-+                       buf += written;
-+                       len -= written;
-+                       state = Start;
-+               } else if (c == 0) {
-+                       buf += written;
-+                       len -= written;
-+                       state = Reset;
-+               } else
-+                       error("junk in compressed archive");
-+       }
-+}
-+
-+/*
-+ * gzip declarations
-+ */
-+
-+#define OF(args)  args
-+
-+#ifndef memzero
-+#define memzero(s, n)     memset ((s), 0, (n))
-+#endif
-+
-+typedef unsigned char  uch;
-+typedef unsigned short ush;
-+typedef unsigned long  ulg;
-+
-+#define WSIZE 0x8000    /* window size--must be a power of two, and */
-+                       /*  at least 32K for zip's deflate method */
-+
-+static uch *inbuf;
-+static uch *window;
-+
-+static unsigned insize;  /* valid bytes in inbuf */
-+static unsigned inptr;   /* index of next byte to be processed in inbuf */
-+static unsigned outcnt;  /* bytes in output buffer */
-+static long bytes_out;
-+
-+#define get_byte()  (inptr < insize ? inbuf[inptr++] : -1)
-+               
-+/* Diagnostic functions (stubbed out) */
-+#define Assert(cond,msg)
-+#define Trace(x)
-+#define Tracev(x)
-+#define Tracevv(x)
-+#define Tracec(c,x)
-+#define Tracecv(c,x)
-+
-+#define STATIC static
-+#define INIT __init
-+
-+static void __init flush_window(void);
-+static void __init error(char *m);
-+static void __init gzip_mark(void **);
-+static void __init gzip_release(void **);
-+
-+#include "../lib/inflate.c"
-+
-+static void __init gzip_mark(void **ptr)
-+{
-+}
-+
-+static void __init gzip_release(void **ptr)
-+{
-+}
-+
-+/* ===========================================================================
-+ * Write the output window window[0..outcnt-1] and update crc and bytes_out.
-+ * (Used for the decompressed data only.)
-+ */
-+static void __init flush_window(void)
-+{
-+       ulg c = crc;         /* temporary variable */
-+       unsigned n;
-+       uch *in, ch;
-+
-+       flush_buffer(window, outcnt);
-+       in = window;
-+       for (n = 0; n < outcnt; n++) {
-+               ch = *in++;
-+               c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
-+       }
-+       crc = c;
-+       bytes_out += (ulg)outcnt;
-+       outcnt = 0;
-+}
-+
-+static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
-+{
-+       int written;
-+       dry_run = check_only;
-+       header_buf = malloc(110);
-+       symlink_buf = malloc(PATH_MAX + N_ALIGN(PATH_MAX) + 1);
-+       name_buf = malloc(N_ALIGN(PATH_MAX));
-+       window = malloc(WSIZE);
-+       if (!window || !header_buf || !symlink_buf || !name_buf)
-+               panic("can't allocate buffers");
-+       state = Start;
-+       this_header = 0;
-+       message = NULL;
-+       while (!message && len) {
-+               loff_t saved_offset = this_header;
-+               if (*buf == '0' && !(this_header & 3)) {
-+                       state = Start;
-+                       written = write_buffer(buf, len);
-+                       buf += written;
-+                       len -= written;
-+                       continue;
-+               }
-+               if (!*buf) {
-+                       buf++;
-+                       len--;
-+                       this_header++;
-+                       continue;
-+               }
-+               this_header = 0;
-+               insize = len;
-+               inbuf = buf;
-+               inptr = 0;
-+               outcnt = 0;             /* bytes in output buffer */
-+               bytes_out = 0;
-+               crc = (ulg)0xffffffffL; /* shift register contents */
-+               makecrc();
-+               gunzip();
-+               if (state != Reset)
-+                       error("junk in gzipped archive");
-+               this_header = saved_offset + inptr;
-+               buf += inptr;
-+               len -= inptr;
-+       }
-+       free(window);
-+       free(name_buf);
-+       free(symlink_buf);
-+       free(header_buf);
-+       return message;
-+}
-+
-+static int __initdata do_retain_initrd;
-+
-+static int __init retain_initrd_param(char *str)
-+{
-+       if (*str)
-+               return 0;
-+       do_retain_initrd = 1;
-+       return 1;
-+}
-+__setup("retain_initrd", retain_initrd_param);
-+
-+extern char __initramfs_start[], __initramfs_end[];
-+#ifdef CONFIG_BLK_DEV_INITRD
-+#include <linux/initrd.h>
-+#include <linux/kexec.h>
-+
-+static void __init free_initrd(void)
-+{
-+#ifdef CONFIG_KEXEC
-+       unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
-+       unsigned long crashk_end   = (unsigned long)__va(crashk_res.end);
-+#endif
-+       if (do_retain_initrd)
-+               goto skip;
-+
-+#ifdef CONFIG_KEXEC
-+       /*
-+        * If the initrd region is overlapped with crashkernel reserved region,
-+        * free only memory that is not part of crashkernel region.
-+        */
-+       if (initrd_start < crashk_end && initrd_end > crashk_start) {
-+               /*
-+                * Initialize initrd memory region since the kexec boot does
-+                * not do.
-+                */
-+               memset((void *)initrd_start, 0, initrd_end - initrd_start);
-+               if (initrd_start < crashk_start)
-+                       free_initrd_mem(initrd_start, crashk_start);
-+               if (initrd_end > crashk_end)
-+                       free_initrd_mem(crashk_end, initrd_end);
-+       } else
-+#endif
-+               free_initrd_mem(initrd_start, initrd_end);
-+skip:
-+       initrd_start = 0;
-+       initrd_end = 0;
-+}
-+
-+#endif
-+
-+static int __init populate_rootfs(void)
-+{
-+       char *err = unpack_to_rootfs(__initramfs_start,
-+                        __initramfs_end - __initramfs_start, 0);
-+       if (err)
-+               panic(err);
-+#ifdef CONFIG_BLK_DEV_INITRD
-+       if (initrd_start) {
-+#ifdef CONFIG_BLK_DEV_RAM
-+               int fd;
-+               printk(KERN_INFO "checking if image is initramfs...");
-+               err = unpack_to_rootfs((char *)initrd_start,
-+                       initrd_end - initrd_start, 1);
-+               if (!err) {
-+                       printk(" it is\n");
-+                       unpack_to_rootfs((char *)initrd_start,
-+                               initrd_end - initrd_start, 0);
-+                       free_initrd();
-+                       return 0;
-+               }
-+               printk("it isn't (%s); looks like an initrd\n", err);
-+               fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700);
-+               if (fd >= 0) {
-+                       sys_write(fd, (char *)initrd_start,
-+                                       initrd_end - initrd_start);
-+                       sys_close(fd);
-+                       free_initrd();
-+               }
-+#else
-+               printk(KERN_INFO "Unpacking initramfs...");
-+               err = unpack_to_rootfs((char *)initrd_start,
-+                       initrd_end - initrd_start, 0);
-+               if (err)
-+                       panic(err);
-+               printk(" done\n");
-+               free_initrd();
-+#endif
-+       }
-+#endif
-+       return 0;
-+}
-+rootfs_initcall(populate_rootfs);
 diff -urN linux-2.6.24/init/Kconfig linux-2.6.24-lzma-initrd/init/Kconfig
 --- linux-2.6.24/init/Kconfig   2008-01-24 23:58:37.000000000 +0100
@@ -1004 +415 @@
  
  source "usr/Kconfig"
-diff -urN linux-2.6.24/init/Kconfig.orig linux-2.6.24-lzma-initrd/init/Kconfig.orig
---- linux-2.6.24/init/Kconfig.orig      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24-lzma-initrd/init/Kconfig.orig  2008-01-24 23:58:37.000000000 +0100
-@@ -0,0 +1,764 @@
-+config DEFCONFIG_LIST
-+       string
-+       depends on !UML
-+       option defconfig_list
-+       default "/lib/modules/$UNAME_RELEASE/.config"
-+       default "/etc/kernel-config"
-+       default "/boot/config-$UNAME_RELEASE"
-+       default "arch/$ARCH/defconfig"
-+
-+menu "General setup"
-+
-+config EXPERIMENTAL
-+       bool "Prompt for development and/or incomplete code/drivers"
-+       ---help---
-+         Some of the various things that Linux supports (such as network
-+         drivers, file systems, network protocols, etc.) can be in a state
-+         of development where the functionality, stability, or the level of
-+         testing is not yet high enough for general use. This is usually
-+         known as the "alpha-test" phase among developers. If a feature is
-+         currently in alpha-test, then the developers usually discourage
-+         uninformed widespread use of this feature by the general public to
-+         avoid "Why doesn't this work?" type mail messages. However, active
-+         testing and use of these systems is welcomed. Just be aware that it
-+         may not meet the normal level of reliability or it may fail to work
-+         in some special cases. Detailed bug reports from people familiar
-+         with the kernel internals are usually welcomed by the developers
-+         (before submitting bug reports, please read the documents
-+         <file:README>, <file:MAINTAINERS>, <file:REPORTING-BUGS>,
-+         <file:Documentation/BUG-HUNTING>, and
-+         <file:Documentation/oops-tracing.txt> in the kernel source).
-+
-+         This option will also make obsoleted drivers available. These are
-+         drivers that have been replaced by something else, and/or are
-+         scheduled to be removed in a future kernel release.
-+
-+         Unless you intend to help test and develop a feature or driver that
-+         falls into this category, or you have a situation that requires
-+         using these features, you should probably say N here, which will
-+         cause the configurator to present you with fewer choices. If
-+         you say Y here, you will be offered the choice of using features or
-+         drivers that are currently considered to be in the alpha-test phase.
-+
-+config BROKEN
-+       bool
-+
-+config BROKEN_ON_SMP
-+       bool
-+       depends on BROKEN || !SMP
-+       default y
-+
-+config LOCK_KERNEL
-+       bool
-+       depends on SMP || PREEMPT
-+       default y
-+
-+config INIT_ENV_ARG_LIMIT
-+       int
-+       default 32 if !UML
-+       default 128 if UML
-+       help
-+         Maximum of each of the number of arguments and environment
-+         variables passed to init from the kernel command line.
-+
-+
-+config LOCALVERSION
-+       string "Local version - append to kernel release"
-+       help
-+         Append an extra string to the end of your kernel version.
-+         This will show up when you type uname, for example.
-+         The string you set here will be appended after the contents of
-+         any files with a filename matching localversion* in your
-+         object and source tree, in that order.  Your total string can
-+         be a maximum of 64 characters.
-+
-+config LOCALVERSION_AUTO
-+       bool "Automatically append version information to the version string"
-+       default y
-+       help
-+         This will try to automatically determine if the current tree is a
-+         release tree by looking for git tags that belong to the current
-+         top of tree revision.
-+
-+         A string of the format -gxxxxxxxx will be added to the localversion
-+         if a git-based tree is found.  The string generated by this will be
-+         appended after any matching localversion* files, and after the value
-+         set in CONFIG_LOCALVERSION.
-+
-+         (The actual string used here is the first eight characters produced
-+         by running the command:
-+
-+           $ git rev-parse --verify HEAD
-+
-+         which is done within the script "scripts/setlocalversion".)
-+
-+config SWAP
-+       bool "Support for paging of anonymous memory (swap)"
-+       depends on MMU && BLOCK
-+       default y
-+       help
-+         This option allows you to choose whether you want to have support
-+         for so called swap devices or swap files in your kernel that are
-+         used to provide more virtual memory than the actual RAM present
-+         in your computer.  If unsure say Y.
-+
-+config SYSVIPC
-+       bool "System V IPC"
-+       ---help---
-+         Inter Process Communication is a suite of library functions and
-+         system calls which let processes (running programs) synchronize and
-+         exchange information. It is generally considered to be a good thing,
-+         and some programs won't run unless you say Y here. In particular, if
-+         you want to run the DOS emulator dosemu under Linux (read the
-+         DOSEMU-HOWTO, available from <http://www.tldp.org/docs.html#howto>),
-+         you'll need to say Y here.
-+
-+         You can find documentation about IPC with "info ipc" and also in
-+         section 6.4 of the Linux Programmer's Guide, available from
-+         <http://www.tldp.org/guides.html>.
-+
-+config SYSVIPC_SYSCTL
-+       bool
-+       depends on SYSVIPC
-+       depends on SYSCTL
-+       default y
-+
-+config POSIX_MQUEUE
-+       bool "POSIX Message Queues"
-+       depends on NET && EXPERIMENTAL
-+       ---help---
-+         POSIX variant of message queues is a part of IPC. In POSIX message
-+         queues every message has a priority which decides about succession
-+         of receiving it by a process. If you want to compile and run
-+         programs written e.g. for Solaris with use of its POSIX message
-+         queues (functions mq_*) say Y here.
-+
-+         POSIX message queues are visible as a filesystem called 'mqueue'
-+         and can be mounted somewhere if you want to do filesystem
-+         operations on message queues.
-+
-+         If unsure, say Y.
-+
-+config BSD_PROCESS_ACCT
-+       bool "BSD Process Accounting"
-+       help
-+         If you say Y here, a user level program will be able to instruct the
-+         kernel (via a special system call) to write process accounting
-+         information to a file: whenever a process exits, information about
-+         that process will be appended to the file by the kernel.  The
-+         information includes things such as creation time, owning user,
-+         command name, memory usage, controlling terminal etc. (the complete
-+         list is in the struct acct in <file:include/linux/acct.h>).  It is
-+         up to the user level program to do useful things with this
-+         information.  This is generally a good idea, so say Y.
-+
-+config BSD_PROCESS_ACCT_V3
-+       bool "BSD Process Accounting version 3 file format"
-+       depends on BSD_PROCESS_ACCT
-+       default n
-+       help
-+         If you say Y here, the process accounting information is written
-+         in a new file format that also logs the process IDs of each
-+         process and it's parent. Note that this file format is incompatible
-+         with previous v0/v1/v2 file formats, so you will need updated tools
-+         for processing it. A preliminary version of these tools is available
-+         at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
-+
-+config TASKSTATS
-+       bool "Export task/process statistics through netlink (EXPERIMENTAL)"
-+       depends on NET
-+       default n
-+       help
-+         Export selected statistics for tasks/processes through the
-+         generic netlink interface. Unlike BSD process accounting, the
-+         statistics are available during the lifetime of tasks/processes as
-+         responses to commands. Like BSD accounting, they are sent to user
-+         space on task exit.
-+
-+         Say N if unsure.
-+
-+config TASK_DELAY_ACCT
-+       bool "Enable per-task delay accounting (EXPERIMENTAL)"
-+       depends on TASKSTATS
-+       help
-+         Collect information on time spent by a task waiting for system
-+         resources like cpu, synchronous block I/O completion and swapping
-+         in pages. Such statistics can help in setting a task's priorities
-+         relative to other tasks for cpu, io, rss limits etc.
-+
-+         Say N if unsure.
-+
-+config TASK_XACCT
-+       bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
-+       depends on TASKSTATS
-+       help
-+         Collect extended task accounting data and send the data
-+         to userland for processing over the taskstats interface.
-+
-+         Say N if unsure.
-+
-+config TASK_IO_ACCOUNTING
-+       bool "Enable per-task storage I/O accounting (EXPERIMENTAL)"
-+       depends on TASK_XACCT
-+       help
-+         Collect information on the number of bytes of storage I/O which this
-+         task has caused.
-+
-+         Say N if unsure.
-+
-+config USER_NS
-+       bool "User Namespaces (EXPERIMENTAL)"
-+       default n
-+       depends on EXPERIMENTAL
-+       help
-+         Support user namespaces.  This allows containers, i.e.
-+         vservers, to use user namespaces to provide different
-+         user info for different servers.  If unsure, say N.
-+
-+config PID_NS
-+       bool "PID Namespaces (EXPERIMENTAL)"
-+       default n
-+       depends on EXPERIMENTAL
-+       help
-+         Suport process id namespaces.  This allows having multiple
-+         process with the same pid as long as they are in different
-+         pid namespaces.  This is a building block of containers.
-+
-+         Unless you want to work with an experimental feature
-+         say N here.
-+
-+config AUDIT
-+       bool "Auditing support"
-+       depends on NET
-+       help
-+         Enable auditing infrastructure that can be used with another
-+         kernel subsystem, such as SELinux (which requires this for
-+         logging of avc messages output).  Does not do system-call
-+         auditing without CONFIG_AUDITSYSCALL.
-+
-+config AUDITSYSCALL
-+       bool "Enable system-call auditing support"
-+       depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64)
-+       default y if SECURITY_SELINUX
-+       help
-+         Enable low-overhead system-call auditing infrastructure that
-+         can be used independently or with another kernel subsystem,
-+         such as SELinux.  To use audit's filesystem watch feature, please
-+         ensure that INOTIFY is configured.
-+
-+config AUDIT_TREE
-+       def_bool y
-+       depends on AUDITSYSCALL && INOTIFY
-+
-+config IKCONFIG
-+       tristate "Kernel .config support"
-+       ---help---
-+         This option enables the complete Linux kernel ".config" file
-+         contents to be saved in the kernel. It provides documentation
-+         of which kernel options are used in a running kernel or in an
-+         on-disk kernel.  This information can be extracted from the kernel
-+         image file with the script scripts/extract-ikconfig and used as
-+         input to rebuild the current kernel or to build another kernel.
-+         It can also be extracted from a running kernel by reading
-+         /proc/config.gz if enabled (below).
-+
-+config IKCONFIG_PROC
-+       bool "Enable access to .config through /proc/config.gz"
-+       depends on IKCONFIG && PROC_FS
-+       ---help---
-+         This option enables access to the kernel configuration file
-+         through /proc/config.gz.
-+
-+config LOG_BUF_SHIFT
-+       int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
-+       range 12 21
-+       default 17 if S390 || LOCKDEP
-+       default 16 if X86_NUMAQ || IA64
-+       default 15 if SMP
-+       default 14
-+       help
-+         Select kernel log buffer size as a power of 2.
-+         Defaults and Examples:
-+                    17 => 128 KB for S/390
-+                    16 => 64 KB for x86 NUMAQ or IA-64
-+                    15 => 32 KB for SMP
-+                    14 => 16 KB for uniprocessor
-+                    13 =>  8 KB
-+                    12 =>  4 KB
-+
-+config CGROUPS
-+       bool "Control Group support"
-+       help
-+         This option will let you use process cgroup subsystems
-+         such as Cpusets
-+
-+         Say N if unsure.
-+
-+config CGROUP_DEBUG
-+       bool "Example debug cgroup subsystem"
-+       depends on CGROUPS
-+       help
-+         This option enables a simple cgroup subsystem that
-+         exports useful debugging information about the cgroups
-+         framework
-+
-+         Say N if unsure
-+
-+config CGROUP_NS
-+        bool "Namespace cgroup subsystem"
-+        depends on CGROUPS
-+        help
-+          Provides a simple namespace cgroup subsystem to
-+          provide hierarchical naming of sets of namespaces,
-+          for instance virtual servers and checkpoint/restart
-+          jobs.
-+
-+config CPUSETS
-+       bool "Cpuset support"
-+       depends on SMP && CGROUPS
-+       help
-+         This option will let you create and manage CPUSETs which
-+         allow dynamically partitioning a system into sets of CPUs and
-+         Memory Nodes and assigning tasks to run only within those sets.
-+         This is primarily useful on large SMP or NUMA systems.
-+
-+         Say N if unsure.
-+
-+config FAIR_GROUP_SCHED
-+       bool "Fair group CPU scheduler"
-+       default y
-+       help
-+         This feature lets CPU scheduler recognize task groups and control CPU
-+         bandwidth allocation to such task groups.
-+
-+choice
-+       depends on FAIR_GROUP_SCHED
-+       prompt "Basis for grouping tasks"
-+       default FAIR_USER_SCHED
-+
-+config FAIR_USER_SCHED
-+       bool "user id"
-+       help
-+         This option will choose userid as the basis for grouping
-+         tasks, thus providing equal CPU bandwidth to each user.
-+
-+config FAIR_CGROUP_SCHED
-+       bool "Control groups"
-+       depends on CGROUPS
-+       help
-+         This option allows you to create arbitrary task groups
-+         using the "cgroup" pseudo filesystem and control
-+         the cpu bandwidth allocated to each such task group.
-+         Refer to Documentation/cgroups.txt for more information
-+         on "cgroup" pseudo filesystem.
-+
-+endchoice
-+
-+config CGROUP_CPUACCT
-+       bool "Simple CPU accounting cgroup subsystem"
-+       depends on CGROUPS
-+       help
-+         Provides a simple Resource Controller for monitoring the
-+         total CPU consumed by the tasks in a cgroup
-+
-+config SYSFS_DEPRECATED
-+       bool "Create deprecated sysfs files"
-+       default y
-+       help
-+         This option creates deprecated symlinks such as the
-+         "device"-link, the <subsystem>:<name>-link, and the
-+         "bus"-link. It may also add deprecated key in the
-+         uevent environment.
-+         None of these features or values should be used today, as
-+         they export driver core implementation details to userspace
-+         or export properties which can't be kept stable across kernel
-+         releases.
-+
-+         If enabled, this option will also move any device structures
-+         that belong to a class, back into the /sys/class hierarchy, in
-+         order to support older versions of udev.
-+
-+         If you are using a distro that was released in 2006 or later,
-+         it should be safe to say N here.
-+
-+config PROC_PID_CPUSET
-+       bool "Include legacy /proc/<pid>/cpuset file"
-+       depends on CPUSETS
-+       default y
-+
-+config RELAY
-+       bool "Kernel->user space relay support (formerly relayfs)"
-+       help
-+         This option enables support for relay interface support in
-+         certain file systems (such as debugfs).
-+         It is designed to provide an efficient mechanism for tools and
-+         facilities to relay large amounts of data from kernel space to
-+         user space.
-+
-+         If unsure, say N.
-+
-+config BLK_DEV_INITRD
-+       bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
-+       depends on BROKEN || !FRV
-+       help
-+         The initial RAM filesystem is a ramfs which is loaded by the
-+         boot loader (loadlin or lilo) and that is mounted as root
-+         before the normal boot procedure. It is typically used to
-+         load modules needed to mount the "real" root file system,
-+         etc. See <file:Documentation/initrd.txt> for details.
-+
-+         If RAM disk support (BLK_DEV_RAM) is also included, this
-+         also enables initial RAM disk (initrd) support and adds
-+         15 Kbytes (more on some other architectures) to the kernel size.
-+
-+         If unsure say Y.
-+
-+if BLK_DEV_INITRD
-+
-+source "usr/Kconfig"
-+
-+endif
-+
-+config CC_OPTIMIZE_FOR_SIZE
-+       bool "Optimize for size (Look out for broken compilers!)"
-+       default y
-+       depends on ARM || H8300 || SUPERH || EXPERIMENTAL
-+       help
-+         Enabling this option will pass "-Os" instead of "-O2" to gcc
-+         resulting in a smaller kernel.
-+
-+         WARNING: some versions of gcc may generate incorrect code with this
-+         option.  If problems are observed, a gcc upgrade may be needed.
-+
-+         If unsure, say N.
-+
-+config SYSCTL
-+       bool
-+
-+menuconfig EMBEDDED
-+       bool "Configure standard kernel features (for small systems)"
-+       help
-+         This option allows certain base kernel options and settings
-+          to be disabled or tweaked. This is for specialized
-+          environments which can tolerate a "non-standard" kernel.
-+          Only use this if you really know what you are doing.
-+
-+config UID16
-+       bool "Enable 16-bit UID system calls" if EMBEDDED
-+       depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
-+       default y
-+       help
-+         This enables the legacy 16-bit UID syscall wrappers.
-+
-+config SYSCTL_SYSCALL
-+       bool "Sysctl syscall support" if EMBEDDED
-+       default y
-+       select SYSCTL
-+       ---help---
-+         sys_sysctl uses binary paths that have been found challenging
-+         to properly maintain and use.  The interface in /proc/sys
-+         using paths with ascii names is now the primary path to this
-+         information.
-+
-+         Almost nothing using the binary sysctl interface so if you are
-+         trying to save some space it is probably safe to disable this,
-+         making your kernel marginally smaller.
-+
-+         If unsure say Y here.
-+
-+config KALLSYMS
-+        bool "Load all symbols for debugging/ksymoops" if EMBEDDED
-+        default y
-+        help
-+          Say Y here to let the kernel print out symbolic crash information and
-+          symbolic stack backtraces. This increases the size of the kernel
-+          somewhat, as all symbols have to be loaded into the kernel image.
-+
-+config KALLSYMS_ALL
-+       bool "Include all symbols in kallsyms"
-+       depends on DEBUG_KERNEL && KALLSYMS
-+       help
-+          Normally kallsyms only contains the symbols of functions, for nicer
-+          OOPS messages.  Some debuggers can use kallsyms for other
-+          symbols too: say Y here to include all symbols, if you need them 
-+          and you don't care about adding 300k to the size of your kernel.
-+
-+          Say N.
-+
-+config KALLSYMS_EXTRA_PASS
-+       bool "Do an extra kallsyms pass"
-+       depends on KALLSYMS
-+       help
-+          If kallsyms is not working correctly, the build will fail with
-+          inconsistent kallsyms data.  If that occurs, log a bug report and
-+          turn on KALLSYMS_EXTRA_PASS which should result in a stable build.
-+          Always say N here unless you find a bug in kallsyms, which must be
-+          reported.  KALLSYMS_EXTRA_PASS is only a temporary workaround while
-+          you wait for kallsyms to be fixed.
-+
-+
-+config HOTPLUG
-+       bool "Support for hot-pluggable devices" if EMBEDDED
-+       default y
-+       help
-+         This option is provided for the case where no hotplug or uevent
-+         capabilities is wanted by the kernel.  You should only consider
-+         disabling this option for embedded systems that do not use modules, a
-+         dynamic /dev tree, or dynamic device discovery.  Just say Y.
-+
-+config PRINTK
-+       default y
-+       bool "Enable support for printk" if EMBEDDED
-+       help
-+         This option enables normal printk support. Removing it
-+         eliminates most of the message strings from the kernel image
-+         and makes the kernel more or less silent. As this makes it
-+         very difficult to diagnose system problems, saying N here is
-+         strongly discouraged.
-+
-+config BUG
-+       bool "BUG() support" if EMBEDDED
-+       default y
-+       help
-+          Disabling this option eliminates support for BUG and WARN, reducing
-+          the size of your kernel image and potentially quietly ignoring
-+          numerous fatal conditions. You should only consider disabling this
-+          option for embedded systems with no facilities for reporting errors.
-+          Just say Y.
-+
-+config ELF_CORE
-+       default y
-+       bool "Enable ELF core dumps" if EMBEDDED
-+       help
-+         Enable support for generating core dumps. Disabling saves about 4k.
-+
-+config BASE_FULL
-+       default y
-+       bool "Enable full-sized data structures for core" if EMBEDDED
-+       help
-+         Disabling this option reduces the size of miscellaneous core
-+         kernel data structures. This saves memory on small machines,
-+         but may reduce performance.
-+
-+config FUTEX
-+       bool "Enable futex support" if EMBEDDED
-+       default y
-+       select RT_MUTEXES
-+       help
-+         Disabling this option will cause the kernel to be built without
-+         support for "fast userspace mutexes".  The resulting kernel may not
-+         run glibc-based applications correctly.
-+
-+config ANON_INODES
-+       bool
-+
-+config EPOLL
-+       bool "Enable eventpoll support" if EMBEDDED
-+       default y
-+       select ANON_INODES
-+       help
-+         Disabling this option will cause the kernel to be built without
-+         support for epoll family of system calls.
-+
-+config SIGNALFD
-+       bool "Enable signalfd() system call" if EMBEDDED
-+       select ANON_INODES
-+       default y
-+       help
-+         Enable the signalfd() system call that allows to receive signals
-+         on a file descriptor.
-+
-+         If unsure, say Y.
-+
-+config TIMERFD
-+       bool "Enable timerfd() system call" if EMBEDDED
-+       select ANON_INODES
-+       depends on BROKEN
-+       default y
-+       help
-+         Enable the timerfd() system call that allows to receive timer
-+         events on a file descriptor.
-+
-+         If unsure, say Y.
-+
-+config EVENTFD
-+       bool "Enable eventfd() system call" if EMBEDDED
-+       select ANON_INODES
-+       default y
-+       help
-+         Enable the eventfd() system call that allows to receive both
-+         kernel notification (ie. KAIO) or userspace notifications.
-+
-+         If unsure, say Y.
-+
-+config SHMEM
-+       bool "Use full shmem filesystem" if EMBEDDED
-+       default y
-+       depends on MMU
-+       help
-+         The shmem is an internal filesystem used to manage shared memory.
-+         It is backed by swap and manages resource limits. It is also exported
-+         to userspace as tmpfs if TMPFS is enabled. Disabling this
-+         option replaces shmem and tmpfs with the much simpler ramfs code,
-+         which may be appropriate on small systems without swap.
-+
-+config VM_EVENT_COUNTERS
-+       default y
-+       bool "Enable VM event counters for /proc/vmstat" if EMBEDDED
-+       help
-+         VM event counters are needed for event counts to be shown.
-+         This option allows the disabling of the VM event counters
-+         on EMBEDDED systems.  /proc/vmstat will only show page counts
-+         if VM event counters are disabled.
-+
-+config SLUB_DEBUG
-+       default y
-+       bool "Enable SLUB debugging support" if EMBEDDED
-+       depends on SLUB
-+       help
-+         SLUB has extensive debug support features. Disabling these can
-+         result in significant savings in code size. This also disables
-+         SLUB sysfs support. /sys/slab will not exist and there will be
-+         no support for cache validation etc.
-+
-+choice
-+       prompt "Choose SLAB allocator"
-+       default SLUB
-+       help
-+          This option allows to select a slab allocator.
-+
-+config SLAB
-+       bool "SLAB"
-+       help
-+         The regular slab allocator that is established and known to work
-+         well in all environments. It organizes cache hot objects in
-+         per cpu and per node queues. SLAB is the default choice for
-+         a slab allocator.
-+
-+config SLUB
-+       bool "SLUB (Unqueued Allocator)"
-+       help
-+          SLUB is a slab allocator that minimizes cache line usage
-+          instead of managing queues of cached objects (SLAB approach).
-+          Per cpu caching is realized using slabs of objects instead
-+          of queues of objects. SLUB can use memory efficiently
-+          and has enhanced diagnostics.
-+
-+config SLOB
-+       depends on EMBEDDED
-+       bool "SLOB (Simple Allocator)"
-+       help
-+          SLOB replaces the SLAB allocator with a drastically simpler
-+          allocator.  SLOB is more space efficient than SLAB but does not
-+          scale well (single lock for all operations) and is also highly
-+          susceptible to fragmentation. SLUB can accomplish a higher object
-+          density. It is usually better to use SLUB instead of SLOB.
-+
-+endchoice
-+
-+endmenu                # General setup
-+
-+config SLABINFO
-+       bool
-+       depends on PROC_FS
-+       depends on SLAB || SLUB
-+       default y
-+
-+config RT_MUTEXES
-+       boolean
-+       select PLIST
-+
-+config TINY_SHMEM
-+       default !SHMEM
-+       bool
-+
-+config BASE_SMALL
-+       int
-+       default 0 if BASE_FULL
-+       default 1 if !BASE_FULL
-+
-+menuconfig MODULES
-+       bool "Enable loadable module support"
-+       help
-+         Kernel modules are small pieces of compiled code which can
-+         be inserted in the running kernel, rather than being
-+         permanently built into the kernel.  You use the "modprobe"
-+         tool to add (and sometimes remove) them.  If you say Y here,
-+         many parts of the kernel can be built as modules (by
-+         answering M instead of Y where indicated): this is most
-+         useful for infrequently used options which are not required
-+         for booting.  For more information, see the man pages for
-+         modprobe, lsmod, modinfo, insmod and rmmod.
-+
-+         If you say Y here, you will need to run "make
-+         modules_install" to put the modules under /lib/modules/
-+         where modprobe can find them (you may need to be root to do
-+         this).
-+
-+         If unsure, say Y.
-+
-+config MODULE_UNLOAD
-+       bool "Module unloading"
-+       depends on MODULES
-+       help
-+         Without this option you will not be able to unload any
-+         modules (note that some modules may not be unloadable
-+         anyway), which makes your kernel slightly smaller and
-+         simpler.  If unsure, say Y.
-+
-+config MODULE_FORCE_UNLOAD
-+       bool "Forced module unloading"
-+       depends on MODULE_UNLOAD && EXPERIMENTAL
-+       help
-+         This option allows you to force a module to unload, even if the
-+         kernel believes it is unsafe: the kernel will remove the module
-+         without waiting for anyone to stop using it (using the -f option to
-+         rmmod).  This is mainly for kernel developers and desperate users.
-+         If unsure, say N.
-+
-+config MODVERSIONS
-+       bool "Module versioning support"
-+       depends on MODULES
-+       help
-+         Usually, you have to use modules compiled with your kernel.
-+         Saying Y here makes it sometimes possible to use modules
-+         compiled for different kernels, by adding enough information
-+         to the modules to (hopefully) spot any changes which would
-+         make them incompatible with the kernel you are running.  If
-+         unsure, say N.
-+
-+config MODULE_SRCVERSION_ALL
-+       bool "Source checksum for all modules"
-+       depends on MODULES
-+       help
-+         Modules which contain a MODULE_VERSION get an extra "srcversion"
-+         field inserted into their modinfo section, which contains a
-+         sum of the source files which made it.  This helps maintainers
-+         see exactly which source was used to build a module (since
-+         others sometimes change the module source without updating
-+         the version).  With this option, such a "srcversion" field
-+         will be created for all modules.  If unsure, say N.
-+
-+config KMOD
-+       bool "Automatic kernel module loading"
-+       depends on MODULES
-+       help
-+         Normally when you have selected some parts of the kernel to
-+         be created as kernel modules, you must load them (using the
-+         "modprobe" command) before you can use them. If you say Y
-+         here, some parts of the kernel will be able to load modules
-+         automatically: when a part of the kernel needs a module, it
-+         runs modprobe with the appropriate arguments, thereby
-+         loading the module if it is available.  If unsure, say Y.
-+
-+config STOP_MACHINE
-+       bool
-+       default y
-+       depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
-+       help
-+         Need stop_machine() primitive.
-+
-+source "block/Kconfig"
-+
-+config PREEMPT_NOTIFIERS
-+       bool
 diff -urN linux-2.6.24/init/LzmaDecode.c linux-2.6.24-lzma-initrd/init/LzmaDecode.c
 --- linux-2.6.24/init/LzmaDecode.c      1970-01-01 01:00:00.000000000 +0100
@@ -2499 +1142 @@
 +
 +#endif
+diff -Nur linux-2.6.24.org/scripts/gen_lzma_initramfs_list.sh linux-2.6.24.new/scripts/gen_lzma_initramfs_list.sh
+--- linux-2.6.20.org/scripts/gen_lzma_initramfs_list.sh 1970-01-01 07:30:00.000000000 +0730
++++ linux-2.6.20.new/scripts/gen_lzma_initramfs_list.sh 2007-03-27 19:52:49.000000000 +0800
+@@ -0,0 +1,292 @@
++#!/bin/bash
++# Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org>
++# Copyright (c) 2006           Sam Ravnborg <sam@ravnborg.org>
++#
++# Released under the terms of the GNU GPL
++#
++# Generate a cpio packed initramfs. It uses gen_init_cpio to generate
++# the cpio archive, and gzip to pack it.
++# The script may also be used to generate the inputfile used for gen_init_cpio
++# This script assumes that gen_init_cpio is located in usr/ directory
++
++# error out on errors
++set -e
++
++usage() {
++cat << EOF
++Usage:
++$0 [-o <file>] [-u <uid>] [-g <gid>] { -s | -d | <cpio_source>} ...
++       -o <file>      Create lzma initramfs file named <file> using
++                      gen_init_cpio and lzma
++       -u <uid>       User ID to map to user ID 0 (root).
++                      <uid> is only meaningful if <cpio_source>
++                      is a directory.
++       -g <gid>       Group ID to map to group ID 0 (root).
++                      <gid> is only meaningful if <cpio_source>
++                      is a directory.
++       <cpio_source>  File list or directory for cpio archive.
++                      If <cpio_source> is a .cpio file it will be used
++                      as direct input to initramfs.
++       -s             Create lzma file with small dictionary size
++       -d             Output the default cpio list.
++
++All options except -o and -l may be repeated and are interpreted
++sequentially and immediately.  -u and -g states are preserved across
++<cpio_source> options so an explicit "-u 0 -g 0" is required
++to reset the root/group mapping.
++EOF
++}
++
++list_default_initramfs() {
++       # echo usr/kinit/kinit
++       :
++}
++
++default_initramfs() {
++       cat <<-EOF >> ${output}
++               # This is a very simple, default initramfs
++
++               dir /dev 0755 0 0
++               nod /dev/console 0600 0 0 c 5 1
++               dir /root 0700 0 0
++               # file /kinit usr/kinit/kinit 0755 0 0
++               # slink /init kinit 0755 0 0
++       EOF
++}
++
++filetype() {
++       local argv1="$1"
++
++       # symlink test must come before file test
++       if [ -L "${argv1}" ]; then
++               echo "slink"
++       elif [ -f "${argv1}" ]; then
++               echo "file"
++       elif [ -d "${argv1}" ]; then
++               echo "dir"
++       elif [ -b "${argv1}" -o -c "${argv1}" ]; then
++               echo "nod"
++       elif [ -p "${argv1}" ]; then
++               echo "pipe"
++       elif [ -S "${argv1}" ]; then
++               echo "sock"
++       else
++               echo "invalid"
++       fi
++       return 0
++}
++
++list_print_mtime() {
++       :
++}
++
++print_mtime() {
++       local my_mtime="0"
++
++       if [ -e "$1" ]; then
++               my_mtime=$(find "$1" -printf "%T@\n" | sort -r | head -n 1)
++       fi
++
++       echo "# Last modified: ${my_mtime}" >> ${output}
++       echo "" >> ${output}
++}
++
++list_parse() {
++       echo "$1 \\"
++}
++
++# for each file print a line in following format
++# <filetype> <name> <path to file> <octal mode> <uid> <gid>
++# for links, devices etc the format differs. See gen_init_cpio for details
++parse() {
++       local location="$1"
++       local name="${location/${srcdir}//}"
++       # change '//' into '/'
++       name="${name//\/\///}"
++       local mode="$2"
++       local uid="$3"
++       local gid="$4"
++       local ftype=$(filetype "${location}")
++       # remap uid/gid to 0 if necessary
++       [ "$uid" -eq "$root_uid" ] && uid=0
++       [ "$gid" -eq "$root_gid" ] && gid=0
++       local str="${mode} ${uid} ${gid}"
++
++       [ "${ftype}" == "invalid" ] && return 0
++       [ "${location}" == "${srcdir}" ] && return 0
++
++       case "${ftype}" in
++               "file")
++                       str="${ftype} ${name} ${location} ${str}"
++                       ;;
++               "nod")
++                       local dev_type=
++                       local maj=$(LC_ALL=C ls -l "${location}" | \
++                                       gawk '{sub(/,/, "", $5); print $5}')
++                       local min=$(LC_ALL=C ls -l "${location}" | \
++                                       gawk '{print $6}')
++
++                       if [ -b "${location}" ]; then
++                               dev_type="b"
++                       else
++                               dev_type="c"
++                       fi
++                       str="${ftype} ${name} ${str} ${dev_type} ${maj} ${min}"
++                       ;;
++               "slink")
++                       local target=$(LC_ALL=C ls -l "${location}" | \
++                                       gawk '{print $11}')
++                       str="${ftype} ${name} ${target} ${str}"
++                       ;;
++               *)
++                       str="${ftype} ${name} ${str}"
++                       ;;
++       esac
++
++       echo "${str}" >> ${output}
++
++       return 0
++}
++
++unknown_option() {
++       printf "ERROR: unknown option \"$arg\"\n" >&2
++       printf "If the filename validly begins with '-', " >&2
++       printf "then it must be prefixed\n" >&2
++       printf "by './' so that it won't be interpreted as an option." >&2
++       printf "\n" >&2
++       usage >&2
++       exit 1
++}
++
++list_header() {
++       :
++}
++
++header() {
++       printf "\n#####################\n# $1\n" >> ${output}
++}
++
++# process one directory (incl sub-directories)
++dir_filelist() {
++       ${dep_list}header "$1"
++
++       srcdir=$(echo "$1" | sed -e 's://*:/:g')
++       dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" 2>/dev/null)
++
++       # If $dirlist is only one line, then the directory is empty
++       if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
++               ${dep_list}print_mtime "$1"
++
++               echo "${dirlist}" | \
++               while read x; do
++                       ${dep_list}parse ${x}
++               done
++       fi
++}
++
++# if only one file is specified and it is .cpio file then use it direct as fs
++# if a directory is specified then add all files in given direcotry to fs
++# if a regular file is specified assume it is in gen_initramfs format
++input_file() {
++       source="$1"
++       if [ -f "$1" ]; then
++               ${dep_list}header "$1"
++               is_cpio="$(echo "$1" | sed 's/^.*\.cpio/cpio/')"
++               if [ $2 -eq 0 -a ${is_cpio} == "cpio" ]; then
++                       cpio_file=$1
++                       [ ! -z ${dep_list} ] && echo "$1"
++                       return 0
++               fi
++               if [ -z ${dep_list} ]; then
++                       print_mtime "$1" >> ${output}
++                       cat "$1"         >> ${output}
++               else
++                       cat "$1" | while read type dir file perm ; do
++                               if [ "$type" == "file" ]; then
++                                       echo "$file \\";
++                               fi
++                       done
++               fi
++       elif [ -d "$1" ]; then
++               dir_filelist "$1"
++       else
++               echo "  ${prog}: Cannot open '$1'" >&2
++               exit 1
++       fi
++}
++
++prog=$0
++root_uid=0
++root_gid=0
++dep_list=
++cpio_file=
++cpio_list=
++output="/dev/stdout"
++output_file=""
++opt=""
++
++arg="$1"
++case "$arg" in
++       "-l")   # files included in initramfs - used by kbuild
++               dep_list="list_"
++               echo "deps_initramfs := \\"
++               shift
++               ;;
++       "-o")   # generate lzma-ed cpio image named $1
++               shift
++               output_file="$1"
++               cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
++               output=${cpio_list}
++               shift
++               ;;
++esac
++while [ $# -gt 0 ]; do
++       arg="$1"
++       shift
++       case "$arg" in
++               "-u")   # map $1 to uid=0 (root)
++                       root_uid="$1"
++                       shift
++                       ;;
++               "-g")   # map $1 to gid=0 (root)
++                       root_gid="$1"
++                       shift
++                       ;;
++               "-s")
++                       #opt="-d16"# Use smaller compression level
++                       ;;
++               "-d")   # display default initramfs list
++                       default_list="$arg"
++                       ${dep_list}default_initramfs
++                       ;;
++               "-h")
++                       usage
++                       exit 0
++                       ;;
++               *)
++                       case "$arg" in
++                               "-"*)
++                                       unknown_option
++                                       ;;
++                               *)      # input file/dir - process it
++                                       input_file "$arg" "$#"
++                                       ;;
++                       esac
++                       ;;
++       esac
++done
++
++# If output_file is set we will generate cpio archive and lzma it
++# we are carefull to delete tmp files
++if [ ! -z ${output_file} ]; then
++       if [ -z ${cpio_file} ]; then
++               cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)"
++               usr/gen_init_cpio ${cpio_list} > ${cpio_tfile}
++       else
++               cpio_tfile=${cpio_file}
++       fi
++       rm ${cpio_list}
++       lzma -z ${cpio_tfile} ${opt} -c > ${output_file}
++       [ -z ${cpio_file} ] && rm ${cpio_tfile}
++fi
++exit 0
+diff -Nur linux-2.6.20-orig/usr/Makefile linux-2.6.20-new/usr/Makefile
+--- linux-2.6.20-orig/usr/Makefile      2007-02-20 14:34:32.000000000 +0800
++++ linux-2.6.20-new/usr/Makefile       2007-03-27 19:53:30.000000000 +0800
+@@ -19,6 +19,7 @@
+ 
+ hostprogs-y := gen_init_cpio
+ initramfs   := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh
++lzma_initramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_lzma_initramfs_list.sh
+ ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \
+                        $(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d)
+ ramfs-args  := \
+@@ -36,6 +37,14 @@
+ quiet_cmd_initfs = GEN     $@
+       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
+ 
++ifdef CONFIG_LZMA_INITRAM_FS_SMALLMEM
++quiet_cmd_lzma_initfs = LZRAMFS $@
++      cmd_lzma_initfs = $(lzma_initramfs) -o $@ $(ramfs-args) -s $(ramfs-input)
++else
++quiet_cmd_lzma_initfs = LZRAMFS $@
++      cmd_lzma_initfs = $(lzma_initramfs) -o $@ $(ramfs-args) $(ramfs-input)
++endif
++
+ targets := initramfs_data.cpio.gz
+ # do not try to update files included in initramfs
+ $(deps_initramfs): ;
+@@ -48,5 +57,9 @@
+ # 4) arguments to gen_initramfs.sh changes
+ $(obj)/initramfs_data.cpio.gz: $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
+        $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.gz.d
++ifdef CONFIG_LZMA_INITRAM_FS
++       $(call if_changed,lzma_initfs)
++else
+        $(call if_changed,initfs)
++endif
+ 

floppyfw/patches/kernel-2.6/015-lzma-vmlinuz-x86.patch

@@ -1323 +1323 @@
 +#
 +quiet_cmd_lzma = LZMA    $@
-+cmd_lzma = lzma -fcz < $< > $@
-+
-+
- 
++#cmd_lzma = lzma -fcz < $< > $@
++cmd_lzma = lzma -z $< -c > $@
++
++
+ 

floppyfw/scripts/modpick.pl

@@ -102 +102 @@
 }
 
-my ($modext) = ".ko";
+my $foo;
+my ($modext) = ".o";
+$kernelversion =~ /^2\.4/ ? $foo = ".ko" : $foo = ".o";
+print STDERR "FOO:$foo - $kernelversion";
 
 # $debug = 1;
@@ -276 +279 @@
 
                                 ($module) = ( $p =~ /(.*$modext)/ );
-                                # ($module) = ( $p =~ /(.*\.ko)/ );
 
 print STDERR "MODP: $p ($module) \n" if ($debug);

floppyfw/target/packages/make_packages.sh

@@ -22 +22 @@
         ;;
         lzma)
-                COMP="lzma -c"
+                # COMP="lzma -c"
+                COMP="lzmacomp"
                 EXT=.tar.lz
         ;;
         ffw)
-                COMP="lzma -c"
+                # COMP="lzma -c"
+                COMP="lzmacomp"
                 EXT=.ffw
         ;;