summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Clobus <rclobus@rclobus.nl>2019-06-12 13:55:10 +0200
committerRoland Clobus <rclobus@rclobus.nl>2019-06-16 12:47:28 +0200
commitab8c09eca1eaf8079ae28ed35b9fafcbbc29d4d2 (patch)
tree70161e516c9cccc1cd8fb92a937a8cbd72116bcd
parente9af6d559fbcbe3717444fc5b7e4342acbc20a8e (diff)
downloadvyos-live-build-ab8c09eca1eaf8079ae28ed35b9fafcbbc29d4d2.tar.gz
vyos-live-build-ab8c09eca1eaf8079ae28ed35b9fafcbbc29d4d2.zip
--initramfs support none and live-boot
-rw-r--r--manpages/en/lb_config.16
-rwxr-xr-xscripts/build/config2
2 files changed, 4 insertions, 4 deletions
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index ebfb2bccc..d0864f064 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -107,7 +107,7 @@
.br
[\fB\-\-ignore\-system\-defaults\fR]
.br
- [\fB\-\-initramfs\fR auto|none|live\-boot|casper]
+ [\fB\-\-initramfs\fR none|live\-boot]
.br
[\fB\-\-initramfs\-compression\fR bzip2|gzip|lzma]
.br
@@ -325,8 +325,8 @@ defines the name of an optional to be included splash screen graphic for the gru
defines the default options that will be appended to (almost) every gzip call during the building of the image. By default, this is set to \-\-best to use highest (but slowest) compression. Dynamically, if the host system supports it, also \-\-rsyncable is added.
.IP "\fB\-\-ignore\-system\-defaults\fR" 4
\fBlb config\fR by default reads system defaults from \fI/etc/live/build.conf\fR and \fI/etc/live/build/*\fR when generating a new live system config directory. This is useful if you want to set global settings, such as mirror locations, and don't want to specify them all of the time.
-.IP "\fB\-\-initramfs\fR auto|none|live\-boot|casper" 4
-sets the name of package that contains the live system specific initramfs modification. By default, auto is used, which means that at build time of the image rather than on configuration time, the value will be expanded to casper when building ubuntu systems, to live\-boot for all other systems. Using 'none' is useful if the resulting system image should not be a live image (experimental).
+.IP "\fB\-\-initramfs\fR none|live\-boot" 4
+sets the name of the package that contains the live system specific initramfs modification and defaults to live\-boot. Using 'none' is useful if the resulting system image should not be a live image (experimental).
.IP "\fB\-\-initramfs\-compression\fR bzip2|gzip|lzma]
defines the compression program to be used to compress the initramfs. Defaults to gzip.
.IP "\fB\-\-interactive\fR shell" 4
diff --git a/scripts/build/config b/scripts/build/config
index 6c23cc6a0..d584e57d1 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -65,7 +65,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--grub-splash FILE]\n\
\t [--gzip-options OPTION|\"OPTIONS\"]\n\
\t [--ignore-system-defaults]\n\
-\t [--initramfs auto|none|live-boot]\n\
+\t [--initramfs none|live-boot]\n\
\t [--initramfs-compression bzip2|gzip|lzma]\n\
\t [--initsystem sysvinit|systemd|none]\n\
\t [--image-name [NAME]\n\