X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=config%2FConfig-images.in;h=5c2e79e41e4f8940c83b1ceec211fe2c32ed1f40;hp=636a868d593c3446fbd4804f8e51e5373e3486fa;hb=e39e1ba005b36cbd350b72b90b52f38c56b245e2;hpb=5fd7e00d9d8e624e460342e40a450566f2b70907 diff --git a/config/Config-images.in b/config/Config-images.in index 636a868d59..5c2e79e41e 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -10,7 +10,7 @@ menu "Target Images" bool "ramdisk" default y if USES_INITRAMFS help - Embed the rootfs into the kernel (initramfs) + Embed the root filesystem into the kernel (initramfs). choice prompt "Compression" @@ -48,7 +48,7 @@ menu "Target Images" prompt "Use external cpio" if TARGET_ROOTFS_INITRAMFS default "" help - Kernel uses specified external cpio as INITRAMFS_SOURCE + Kernel uses specified external cpio as INITRAMFS_SOURCE. comment "Root filesystem archives" @@ -56,13 +56,13 @@ menu "Target Images" bool "cpio.gz" default y if USES_CPIOGZ help - Build a compressed cpio archive of the the root filesystem + Build a compressed cpio archive of the root filesystem. config TARGET_ROOTFS_TARGZ bool "tar.gz" default y if USES_TARGZ help - Build a compressed tar archive of the the root filesystem + Build a compressed tar archive of the root filesystem. comment "Root filesystem images" @@ -70,28 +70,28 @@ menu "Target Images" bool "ext4" default y if USES_EXT4 help - Build a ext4 root filesystem + Build an ext4 root filesystem. - config TARGET_ROOTFS_MAXINODE + config TARGET_EXT4_MAXINODE int "Maximum number of inodes in root filesystem" depends on TARGET_ROOTFS_EXT4FS default 6000 help - Allows you to change the maximum number of inodes in the root filesystem + Select the maximum number of inodes in the root filesystem. - config TARGET_ROOTFS_RESERVED_PCT + config TARGET_EXT4_RESERVED_PCT int "Percentage of reserved blocks in root filesystem" depends on TARGET_ROOTFS_EXT4FS default 0 help - Allows you to change the percentage of reserved blocks in the root filesystem + Select the percentage of reserved blocks in the root filesystem. choice - prompt "Root filesystem block size"" + prompt "Root filesystem block size" default TARGET_EXT4_BLOCKSIZE_4K - depends TARGET_ROOTFS_EXT4FS + depends on TARGET_ROOTFS_EXT4FS help - Allows you to change the block size of the root filesystem + Select the block size of the root filesystem. config TARGET_EXT4_BLOCKSIZE_4K bool "4k" @@ -108,51 +108,57 @@ menu "Target Images" default 4096 if TARGET_EXT4_BLOCKSIZE_4K default 2048 if TARGET_EXT4_BLOCKSIZE_2K default 1024 if TARGET_EXT4_BLOCKSIZE_1K - depends TARGET_ROOTFS_EXT4FS + depends on TARGET_ROOTFS_EXT4FS config TARGET_EXT4_JOURNAL bool "Create a journaling filesystem" depends on TARGET_ROOTFS_EXT4FS default n help - Create an ext4 filesystem with a journal + Create an ext4 filesystem with a journal. config TARGET_ROOTFS_ISO bool "iso" default n depends on TARGET_x86_generic help - Create some bootable ISO image + Create a bootable ISO image. config TARGET_ROOTFS_JFFS2 bool "jffs2" default y if USES_JFFS2 help - Build a jffs2 root filesystem + Build a JFFS2 root filesystem. config TARGET_ROOTFS_JFFS2_NAND bool "jffs2 for NAND" default y if USES_JFFS2_NAND depends on USES_JFFS2_NAND help - Build a jffs2 root filesystem for NAND flash + Build a JFFS2 root filesystem for NAND flash. - config TARGET_ROOTFS_SQUASHFS + menuconfig TARGET_ROOTFS_SQUASHFS bool "squashfs" default y if USES_SQUASHFS help - Build a squashfs-lzma root filesystem + Build a squashfs-lzma root filesystem. + + config TARGET_SQUASHFS_BLOCK_SIZE + int "Block size (in KiB)" + depends on TARGET_ROOTFS_SQUASHFS + default 64 if LOW_MEMORY_FOOTPRINT + default 256 menuconfig TARGET_ROOTFS_UBIFS bool "ubifs" default y if USES_UBIFS depends on USES_UBIFS help - Build a ubifs root filesystem + Build a UBIFS root filesystem. choice prompt "compression" - default TARGET_UBIFS_COMPRESSION_NONE + default TARGET_UBIFS_COMPRESSION_ZLIB depends on TARGET_ROOTFS_UBIFS help Select compression type @@ -171,7 +177,7 @@ menu "Target Images" bool "free space fixup" if TARGET_ROOTFS_UBIFS default y help - The file-system free space has to be fixed up on first mount + The filesystem free space has to be fixed up on first mount. config TARGET_UBIFS_JOURNAL_SIZE string @@ -223,14 +229,14 @@ menu "Target Images" bool "Build VirtualBox image files (VDI)" depends on TARGET_x86 || TARGET_x86_64 select GRUB_IMAGES - select TARGET_ROOTFS_EXT4FS + select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 config VMDK_IMAGES bool "Build VMware image files (VMDK)" depends on TARGET_x86 || TARGET_x86_64 select GRUB_IMAGES - select TARGET_ROOTFS_EXT4FS + select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 config TARGET_IMAGES_PAD @@ -256,16 +262,17 @@ menu "Target Images" depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 default 48 help - Allows you to change the root filesystem partition size + Select the root filesystem partition size. config TARGET_ROOTFS_PARTNAME string "Root partition on target device" depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES default "/dev/xvda2" if TARGET_x86_xen_domu - default "/dev/sda2" if ! TARGET_x86_xen_domu + default "/dev/sda2" if TARGET_x86 && ! TARGET_x86_xen_domu help - The root partition on the final device. If you don't know, - you probably want the default (/dev/sda2). + Override the root partition on the final device. If left empty, + it will be mounted by PARTUUID which makes the kernel find the + appropriate disk automatically. menuconfig TARGET_ROOTFS_INCLUDE_KERNEL @@ -273,7 +280,7 @@ menu "Target Images" depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS default n help - Include the kernel image in the rootfs. Typically the image is placed + Include the kernel image in the rootfs. Typically, the image is placed below /boot. config TARGET_ROOTFS_INCLUDE_UIMAGE