diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2010-09-09 14:10:39 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-09-09 14:10:39 -0700 |
| commit | d000689490bbc3508f18b878757b3d2bb04d8a69 (patch) | |
| tree | 40388b9f23e75fc4c0884f7fb076f2d6382e1136 /conf | |
| parent | b9c92a3bb82e860c8368eb7933f5ec4ddcd74bcb (diff) | |
| parent | 3963c563cf1ea4b1126a4c1949181029a0ff2305 (diff) | |
| download | initramfs-tools-d000689490bbc3508f18b878757b3d2bb04d8a69.tar.gz initramfs-tools-d000689490bbc3508f18b878757b3d2bb04d8a69.zip | |
Merge remote branch 'debian/master' into upstream
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/initramfs.conf | 15 | ||||
| -rw-r--r-- | conf/update-initramfs.conf | 6 |
2 files changed, 14 insertions, 7 deletions
diff --git a/conf/initramfs.conf b/conf/initramfs.conf index a2bd8db..bc9060b 100644 --- a/conf/initramfs.conf +++ b/conf/initramfs.conf @@ -2,13 +2,13 @@ # initramfs.conf # Configuration file for mkinitramfs(8). See initramfs.conf(5). # -# Note that configuration options from this file can be overriden +# Note that configuration options from this file can be overridden # by config files in the /etc/initramfs-tools/conf.d directory. # # MODULES: [ most | netboot | dep | list ] # -# most - Add all framebuffer, acpi, filesystem, and harddrive drivers. +# most - Add most filesystem and all harddrive drivers. # # dep - Try and guess which modules to load. # @@ -36,6 +36,12 @@ BUSYBOX=y KEYMAP=n # +# COMPRESS: [ gzip | bzip2 | lzma | lzop ] +# + +COMPRESS=gzip + +# # NFS Section of the config. # @@ -52,10 +58,11 @@ BOOT=local # # DEVICE: ... # -# Specify the network interface, like eth0 +# Specify a specific network interface, like eth0 +# Overridden by optional ip= bootarg # -DEVICE=eth0 +DEVICE= # # NFSROOT: [ auto | HOST:MOUNT ] diff --git a/conf/update-initramfs.conf b/conf/update-initramfs.conf index c08c6ed..31823e2 100644 --- a/conf/update-initramfs.conf +++ b/conf/update-initramfs.conf @@ -1,4 +1,4 @@ -# +# # Configuration file for update-initramfs(8) # @@ -14,7 +14,7 @@ update_initramfs=yes # # backup_initramfs [ yes | no ] # -# Default is yes +# Default is no # If set to no leaves no .bak backup files. -backup_initramfs=yes +backup_initramfs=no |