From: Thayne Harbaugh This patch makes gen_init_cpio more complete by adding symlink, pipe and socket support. It updates scripts/gen_initramfs_list.sh to support the new types. The patch applies to the recent mm series that already have the updated gen_init_cpio and gen_initramfs_list.sh. Signed-off-by: Andrew Morton --- 25-akpm/Documentation/early-userspace/README | 22 ++-- 25-akpm/drivers/block/Kconfig | 6 - 25-akpm/scripts/gen_initramfs_list.sh | 18 ++- 25-akpm/usr/gen_init_cpio.c | 136 ++++++++++++++++++++++++--- 4 files changed, 158 insertions(+), 24 deletions(-) diff -puN Documentation/early-userspace/README~gen_init_cpio-symlink-pipe-socket-support Documentation/early-userspace/README --- 25/Documentation/early-userspace/README~gen_init_cpio-symlink-pipe-socket-support 2004-12-03 20:55:54.341620392 -0800 +++ 25-akpm/Documentation/early-userspace/README 2004-12-03 20:55:54.349619176 -0800 @@ -1,7 +1,7 @@ Early userspace support ======================= -Last update: 2003-08-21 +Last update: 2004-11-12 "Early userspace" is a set of libraries and programs that provide @@ -17,14 +17,22 @@ It consists of several major infrastruct - initramfs, a chunk of code that unpacks the compressed cpio image midway through the kernel boot process. - klibc, a userspace C library, currently packaged separately, that is - optimised for correctness and small size. + optimized for correctness and small size. The cpio file format used by initramfs is the "newc" (aka "cpio -c") -format, and is documented in the file "buffer-format.txt". If you -want to generate your own cpio files directly instead of hacking on -gen_init_cpio, you will need to short-circuit the build process in -usr/ so that gen_init_cpio does not get run, then simply pop your own -initramfs_data.cpio.gz file into place. +format, and is documented in the file "buffer-format.txt". There are +three ways to add an early userspace filesystem: + +1) Put your gzip'ed cpio in usr/initramfs_data.cpio.gz. + +2) Set CONFIG_INITRAMFS_SOURCE to the filename of a gen_init_cpio +input file. This provides the most flexibility and allows creation of +archives with files not owned by the build user. This means that an +unprivileged user can create an early userspace with files owned by +root. + +3) Set CONFIG_INITRAMFS_SOURCE to point to a directory containing the +files for your filesystem. Where's this all leading? diff -puN drivers/block/Kconfig~gen_init_cpio-symlink-pipe-socket-support drivers/block/Kconfig --- 25/drivers/block/Kconfig~gen_init_cpio-symlink-pipe-socket-support 2004-12-03 20:55:54.343620088 -0800 +++ 25-akpm/drivers/block/Kconfig 2004-12-03 20:55:54.350619024 -0800 @@ -371,10 +371,14 @@ config INITRAMFS_SOURCE file dir nod + slink + pipe + sock Where: - name of the file/dir/nod in the archive + name of the file/dir/nod/etc in the archive location of the file in the current filesystem + link target mode/permissions of the file user id (0=root) group id (0=root) diff -puN scripts/gen_initramfs_list.sh~gen_init_cpio-symlink-pipe-socket-support scripts/gen_initramfs_list.sh --- 25/scripts/gen_initramfs_list.sh~gen_init_cpio-symlink-pipe-socket-support 2004-12-03 20:55:54.344619936 -0800 +++ 25-akpm/scripts/gen_initramfs_list.sh 2004-12-03 20:55:54.351618872 -0800 @@ -9,8 +9,6 @@ # # The output is suitable for gen_init_cpio as found in usr/Makefile. # -# TODO: Add support for symlinks, sockets and pipes when gen_init_cpio -# supports them. simple_initramfs() { cat <<-EOF @@ -25,12 +23,19 @@ simple_initramfs() { filetype() { local argv1="$1" - if [ -f "${argv1}" ]; then + # 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 @@ -52,6 +57,8 @@ print_mtime() { parse() { local location="$1" local name="${location/${srcdir}//}" + # change '//' into '/' + name="${name//\/\///}" local mode="$2" local uid="$3" local gid="$4" @@ -79,6 +86,11 @@ parse() { 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}" ;; diff -puN usr/gen_init_cpio.c~gen_init_cpio-symlink-pipe-socket-support usr/gen_init_cpio.c --- 25/usr/gen_init_cpio.c~gen_init_cpio-symlink-pipe-socket-support 2004-12-03 20:55:54.346619632 -0800 +++ 25-akpm/usr/gen_init_cpio.c 2004-12-03 20:55:54.352618720 -0800 @@ -10,13 +10,19 @@ #include #include +/* + * Original work by Jeff Garzik + * + * External file lists, symlink, pipe and fifo support by Thayne Harbaugh + */ + #define xstr(s) #s #define str(s) xstr(s) static unsigned int offset; static unsigned int ino = 721; -struct file_type { +struct file_handler { const char *type; int (*handler)(const char *line); }; @@ -91,7 +97,55 @@ static void cpio_trailer(void) } } -static int cpio_mkdir(const char *name, unsigned int mode, +static int cpio_mkslink(const char *name, const char *target, + unsigned int mode, uid_t uid, gid_t gid) +{ + char s[256]; + time_t mtime = time(NULL); + + sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" + "%08X%08X%08X%08X%08X%08X%08X", + "070701", /* magic */ + ino++, /* ino */ + S_IFLNK | mode, /* mode */ + (long) uid, /* uid */ + (long) gid, /* gid */ + 1, /* nlink */ + (long) mtime, /* mtime */ + strlen(target) + 1, /* filesize */ + 3, /* major */ + 1, /* minor */ + 0, /* rmajor */ + 0, /* rminor */ + (unsigned)strlen(name) + 1,/* namesize */ + 0); /* chksum */ + push_hdr(s); + push_string(name); + push_pad(); + push_string(target); + push_pad(); + return 0; +} + +static int cpio_mkslink_line(const char *line) +{ + char name[PATH_MAX + 1]; + char target[PATH_MAX + 1]; + unsigned int mode; + int uid; + int gid; + int rc = -1; + + if (5 != sscanf(line, "%" str(PATH_MAX) "s %" str(PATH_MAX) "s %o %d %d", name, target, &mode, &uid, &gid)) { + fprintf(stderr, "Unrecognized dir format '%s'", line); + goto fail; + } + rc = cpio_mkslink(name, target, mode, uid, gid); + fail: + return rc; +} + +static int cpio_mkgeneric(const char *name, unsigned int mode, uid_t uid, gid_t gid) { char s[256]; @@ -101,7 +155,7 @@ static int cpio_mkdir(const char *name, "%08X%08X%08X%08X%08X%08X%08X", "070701", /* magic */ ino++, /* ino */ - S_IFDIR | mode, /* mode */ + mode, /* mode */ (long) uid, /* uid */ (long) gid, /* gid */ 2, /* nlink */ @@ -118,7 +172,33 @@ static int cpio_mkdir(const char *name, return 0; } -static int cpio_mkdir_line(const char *line) +enum generic_types { + GT_DIR, + GT_PIPE, + GT_SOCK +}; + +struct generic_type { + const char *type; + mode_t mode; +}; + +static struct generic_type generic_type_table[] = { + [GT_DIR] = { + .type = "dir", + .mode = S_IFDIR + }, + [GT_PIPE] = { + .type = "pipe", + .mode = S_IFIFO + }, + [GT_SOCK] = { + .type = "sock", + .mode = S_IFSOCK + } +}; + +static int cpio_mkgeneric_line(const char *line, enum generic_types gt) { char name[PATH_MAX + 1]; unsigned int mode; @@ -127,14 +207,31 @@ static int cpio_mkdir_line(const char *l int rc = -1; if (4 != sscanf(line, "%" str(PATH_MAX) "s %o %d %d", name, &mode, &uid, &gid)) { - fprintf(stderr, "Unrecognized dir format '%s'", line); + fprintf(stderr, "Unrecognized %s format '%s'", + line, generic_type_table[gt].type); goto fail; } - rc = cpio_mkdir(name, mode, uid, gid); + mode |= generic_type_table[gt].mode; + rc = cpio_mkgeneric(name, mode, uid, gid); fail: return rc; } +static int cpio_mkdir_line(const char *line) +{ + return cpio_mkgeneric_line(line, GT_DIR); +} + +static int cpio_mkpipe_line(const char *line) +{ + return cpio_mkgeneric_line(line, GT_PIPE); +} + +static int cpio_mksock_line(const char *line) +{ + return cpio_mkgeneric_line(line, GT_SOCK); +} + static int cpio_mknod(const char *name, unsigned int mode, uid_t uid, gid_t gid, char dev_type, unsigned int maj, unsigned int min) @@ -286,12 +383,16 @@ void usage(const char *prog) "describe the files to be included in the initramfs archive:\n" "\n" "# a comment\n" - "file \n" + "file \n" "dir \n" "nod \n" + "slink \n" + "pipe \n" + "sock \n" "\n" - " name of the file/dir/nod in the archive\n" + " name of the file/dir/nod/etc in the archive\n" " location of the file in the current filesystem\n" + " link target\n" " mode/permissions of the file\n" " user id (0=root)\n" " group id (0=root)\n" @@ -309,7 +410,7 @@ void usage(const char *prog) prog); } -struct file_type file_type_table[] = { +struct file_handler file_handler_table[] = { { .type = "file", .handler = cpio_mkfile_line, @@ -320,6 +421,15 @@ struct file_type file_type_table[] = { .type = "dir", .handler = cpio_mkdir_line, }, { + .type = "slink", + .handler = cpio_mkslink_line, + }, { + .type = "pipe", + .handler = cpio_mkpipe_line, + }, { + .type = "sock", + .handler = cpio_mksock_line, + }, { .type = NULL, .handler = NULL, } @@ -382,10 +492,10 @@ int main (int argc, char *argv[]) ec = -1; } - for (type_idx = 0; file_type_table[type_idx].type; type_idx++) { + for (type_idx = 0; file_handler_table[type_idx].type; type_idx++) { int rc; - if (! strcmp(line, file_type_table[type_idx].type)) { - if ((rc = file_type_table[type_idx].handler(args))) { + if (! strcmp(line, file_handler_table[type_idx].type)) { + if ((rc = file_handler_table[type_idx].handler(args))) { ec = rc; fprintf(stderr, " line %d\n", line_nr); } @@ -393,7 +503,7 @@ int main (int argc, char *argv[]) } } - if (NULL == file_type_table[type_idx].type) { + if (NULL == file_handler_table[type_idx].type) { fprintf(stderr, "unknown file type line %d: '%s'\n", line_nr, line); } _