summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Clobus <rclobus@rclobus.nl>2019-06-16 13:12:06 +0200
committerRoland Clobus <rclobus@rclobus.nl>2019-06-16 13:12:06 +0200
commit1837f6a40bfbc4cf13852bd3d480fd188f133910 (patch)
tree13e89e93abc843c70b1bbfcadbdd446d4c99d1e6
parenta844199e300cd312e8ef0050e7f870996e85290a (diff)
downloadvyos-live-build-1837f6a40bfbc4cf13852bd3d480fd188f133910.tar.gz
vyos-live-build-1837f6a40bfbc4cf13852bd3d480fd188f133910.zip
Reordered the command line options to make them in alphabetical order
-rw-r--r--manpages/en/lb_config.1104
-rwxr-xr-xscripts/build/config58
2 files changed, 81 insertions, 81 deletions
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index b8418ccbb..3dcd125e5 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -19,8 +19,6 @@
.br
[\fB\-\-apt\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
.br
- [\fB\-\-aptitude\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
-.br
[\fB\-\-apt\-pipeline\fR \fIDEPTH\fR]
.br
[\fB\-\-apt\-recommends\fR true|false]
@@ -29,12 +27,18 @@
.br
[\fB\-\-apt\-source\-archives\fR true|false]
.br
+ [\fB\-\-aptitude\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
+.br
[\-a|\fB\-\-architectures\fR \fIARCHITECTURE\fR]
.br
- [\-b|\fB\-\-binary\-images\fR iso|iso\-hybrid|netboot|tar|hdd]
+ [\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI"ARCHIVE_AREAS"\fR]
+.br
+ [\fB\-\-backports\fR true|false]
.br
[\fB\-\-binary\-filesystem\fR fat16|fat32|ext2|ext3|ext4|ntfs]
.br
+ [\-b|\fB\-\-binary\-images\fR iso|iso\-hybrid|netboot|tar|hdd]
+.br
[\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR]
.br
[\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR]
@@ -51,6 +55,8 @@
.br
[\fB\-\-breakpoints]
.br
+ [\fB\-\-build\-with\-chroot\fR true|false]
+.br
[\fB\-\-cache\fR true|false]
.br
[\fB\-\-cache\-indices\fR true|false]
@@ -61,22 +67,18 @@
.br
[\fB\-\-checksums\fR md5|sha1|sha224|sha256|sha384|sha512|none]
.br
- [\fB\-\-color]
-.br
- [\fB\-\-compression\fR bzip2|gzip|lzip|xz|none]
-.br
- [\fB\-\-config\fR \fIGIT_URL::GIT_BRANCH\fR]
-.br
- [\fB\-\-zsync\fR true|false]
-.br
- [\fB\-\-build\-with\-chroot\fR true|false]
-.br
[\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|jffs2|none]
.br
[\fB\-\-clean\fR]
.br
+ [\fB\-\-color]
+.br
+ [\fB\-\-compression\fR bzip2|gzip|lzip|xz|none]
+.br
[\-c|\fB\-\-conffile\fR \fIFILE\fR]
.br
+ [\fB\-\-config\fR \fIGIT_URL::GIT_BRANCH\fR]
+.br
[\fB\-\-debconf\-frontend\fR dialog|editor|noninteractive|readline]
.br
[\fB\-\-debconf\-priority\fR low|medium|high|critical]
@@ -85,10 +87,10 @@
.br
[\fB\-\-debian\-installer\-distribution\fR daily|\fICODENAME\fR]
.br
- [\fB\-\-debian\-installer\-preseedfile\fR \fIFILE\fR|\fIURL\fR]
-.br
[\fB\-\-debian\-installer\-gui\fR true|false]
.br
+ [\fB\-\-debian\-installer\-preseedfile\fR \fIFILE\fR|\fIURL\fR]
+.br
[\fB\-\-debootstrap\-options\fR \fIOPTIONS\fR]
.br
[\fB\-\-debootstrap\-script\fR \fISCRIPT\fR]
@@ -97,10 +99,6 @@
.br
[\-d|\fB\-\-distribution\fR \fICODENAME\fR]
.br
- [\fB\-\-parent\-distribution\fR \fICODENAME\fR]
-.br
- [\fB\-\-parent\-debian\-installer\-distribution\fR \fICODENAME\fR]
-.br
[\fB\-\-dump\fR]
.br
[\fB\-\-fdisk\fR fdisk|fdisk.dist]
@@ -115,6 +113,12 @@
.br
[\fB\-\-gzip\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
.br
+ [\fB\-\-hdd\-label\fR \fILABEL\fR]
+.br
+ [\fB\-\-hdd\-partition\-start\fR \fISTART\fR]
+.br
+ [\fB\-\-hdd\-size\fR \fISIZE\fR]
+.br
[\fB\-\-ignore\-system\-defaults\fR]
.br
[\fB\-\-image\-name\fR \fINAME\fR]
@@ -127,14 +131,6 @@
.br
[\fB\-\-interactive\fR shell]
.br
- [\fB\-\-isohybrid\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
-.br
- [\fB\-\-hdd\-label\fR \fILABEL\fR]
-.br
- [\fB\-\-hdd\-size\fR \fISIZE\fR]
-.br
- [\fB\-\-hdd\-partition\-start\fR \fISTART\fR]
-.br
[\fB\-\-iso\-application\fR \fINAME\fR]
.br
[\fB\-\-iso\-preparer\fR \fINAME\fR]
@@ -143,6 +139,8 @@
.br
[\fB\-\-iso\-volume\fR \fINAME\fR]
.br
+ [\fB\-\-isohybrid\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
+.br
[\fB\-\-jffs2\-eraseblock\fR \fISIZE\fR]
.br
[\fB\-\-keyring\-packages\fR \fIPACKAGE\fI|\fI"PACKAGES"\fR]
@@ -157,18 +155,6 @@
.br
[\fB\-\-memtest\fR memtest86+|memtest86|none]
.br
- [\-m|\fB\-\-parent\-mirror\-bootstrap\fR \fIURL\fR]
-.br
- [\fB\-\-parent\-mirror\-chroot\fR \fIURL\fR]
-.br
- [\fB\-\-parent\-mirror\-chroot\-security\fR \fIURL\fR]
-.br
- [\fB\-\-parent\-mirror\-binary\fR \fIURL\fR]
-.br
- [\fB\-\-parent\-mirror\-binary\-security\fR \fIURL\fR]
-.br
- [\fB\-\-parent\-mirror\-debian\-installer\fR \fIURL\fR]
-.br
[\fB\-\-mirror\-bootstrap\fR \fIURL\fR]
.br
[\fB\-\-mirror\-chroot\fR \fIURL\fR]
@@ -183,7 +169,13 @@
.br
[\fB\-\-mode\fR debian|progress-linux]
.br
- [\fB\-\-system\fR live|normal]
+ [\fB\-\-net\-cow\-filesystem\fR nfs|cfs]
+.br
+ [\fB\-\-net\-cow\-mountoptions\fR \fIOPTIONS\fR]
+.br
+ [\fB\-\-net\-cow\-path\fR \fIPATH\fR]
+.br
+ [\fB\-\-net\-cow\-server\fR \fIIP\fR|\fIHOSTNAME\fR]
.br
[\fB\-\-net\-root\-filesystem\fR nfs|cfs]
.br
@@ -193,25 +185,31 @@
.br
[\fB\-\-net\-root\-server\fR \fIIP\fR|\fIHOSTNAME\fR]
.br
- [\fB\-\-net\-cow\-filesystem\fR nfs|cfs]
+ [\fB\-\-net\-tarball\fR true|false]
.br
- [\fB\-\-net\-cow\-mountoptions\fR \fIOPTIONS\fR]
+ [\fB\-\-onie\fR true|false]
.br
- [\fB\-\-net\-cow\-path\fR \fIPATH\fR]
+ [\fB\-\-onie\-kernel\-cmdline\fR \fI"OPTION1 OPTION2"\fR]
.br
- [\fB\-\-net\-cow\-server\fR \fIIP\fR|\fIHOSTNAME\fR]
+ [\fB\-\-parent\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI"ARCHIVE_AREAS"\fR]
.br
- [\fB\-\-net\-tarball\fR true|false]
+ [\fB\-\-parent\-debian\-installer\-distribution\fR \fICODENAME\fR]
.br
- [\fB\-\-onie\fR true|false]
+ [\fB\-\-parent\-distribution\fR \fICODENAME\fR]
.br
- [\fB\-\-onie\-kernel\-cmdline\fR \fI"OPTION1 OPTION2"\fR]
+ [\fB\-\-parent\-mirror\-binary\fR \fIURL\fR]
.br
- [\fB\-\-quiet\fR]
+ [\fB\-\-parent\-mirror\-binary\-security\fR \fIURL\fR]
.br
- [\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI"ARCHIVE_AREAS"\fR]
+ [\-m|\fB\-\-parent\-mirror\-bootstrap\fR \fIURL\fR]
.br
- [\fB\-\-parent\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI"ARCHIVE_AREAS"\fR]
+ [\fB\-\-parent\-mirror\-chroot\fR \fIURL\fR]
+.br
+ [\fB\-\-parent\-mirror\-chroot\-security\fR \fIURL\fR]
+.br
+ [\fB\-\-parent\-mirror\-debian\-installer\fR \fIURL\fR]
+.br
+ [\fB\-\-quiet\fR]
.br
[\fB\-\-security\fR true|false]
.br
@@ -223,17 +221,19 @@
.br
[\fB\-\-swap\-file\-size MB]
.br
+ [\fB\-\-system\fR live|normal]
+.br
[\fB\-\-tasksel\fR apt|aptitude|tasksel]
.br
[\fB\-\-uefi\-secure\-boot\fR \fIauto|enable|disable\fR]
.br
[\fB\-\-updates\fR true|false]
.br
- [\fB\-\-backports\fR true|false]
-.br
[\fB\-\-verbose\fR]
.br
[\fB\-\-win32\-loader true|false]
+.br
+ [\fB\-\-zsync\fR true|false]
.\" FIXME
.SH DESCRIPTION
diff --git a/scripts/build/config b/scripts/build/config
index 5b8093c71..177754b20 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -21,14 +21,16 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-http-proxy URL]\n\
\t [--apt-indices true|false]\n\
\t [--apt-options OPTION|\"OPTIONS\"]\n\
-\t [--aptitude-options OPTION|\"OPTIONS\"]\n\
\t [--apt-pipeline DEPTH]\n\
\t [--apt-recommends true|false]\n\
\t [--apt-secure true|false]\n\
\t [--apt-source-archives true|false]\n\
+\t [--aptitude-options OPTION|\"OPTIONS\"]\n\
\t [-a|--architectures ARCHITECTURE]\n\
-\t [-b|--binary-images iso|iso-hybrid|netboot|tar|hdd]\n\
+\t [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
+\t [--backports true|false]\n\
\t [--binary-filesystem fat16|fat32|ext2|ext3|ext4|ntfs]\n\
+\t [-b|--binary-images iso|iso-hybrid|netboot|tar|hdd]\n\
\t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
\t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
\t [--bootappend-live-failsafe PARAMETER|\"PARAMETERS\"]\n\
@@ -37,31 +39,28 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--bootstrap-qemu-exclude PACKAGES]\n\
\t [--bootstrap-qemu-static PATH]\n\
\t [--breakpoints]\n\
+\t [--build-with-chroot true|false]\n\
\t [--cache true|false]\n\
\t [--cache-indices true|false]\n\
\t [--cache-packages true|false]\n\
\t [--cache-stages STAGE|\"STAGES\"]\n\
\t [--checksums md5|sha1|sha224|sha256|sha384|sha512|none]\n\
-\t [--color]\n\
-\t [--compression bzip2|gzip|lzip|xz|none]\n\
-\t [--config GIT_URL::GIT_BRANCH]\n\
-\t [--zsync true|false]\n\
-\t [--build-with-chroot true|false]\n\
\t [--chroot-filesystem ext2|ext3|ext4|squashfs|jffs2|none]\n\
\t [--clean]\n\
+\t [--color]\n\
+\t [--compression bzip2|gzip|lzip|xz|none]\n\
\t [-c|--conffile FILE]\n\
+\t [--config GIT_URL::GIT_BRANCH]\n\
\t [--debconf-frontend dialog|editor|noninteractive|readline]\n\
\t [--debconf-priority low|medium|high|critical]\n\
\t [--debian-installer true|cdrom|netinst|netboot|businesscard|live|false]\n\
\t [--debian-installer-distribution daily|CODENAME]\n\
-\t [--debian-installer-preseedfile FILE|URL]\n\
\t [--debian-installer-gui true|false]\n\
+\t [--debian-installer-preseedfile FILE|URL]\n\
\t [--debootstrap-options OPTIONS]\n\
\t [--debootstrap-script SCRIPT]\n\
\t [--debug]\n\
\t [-d|--distribution CODENAME]\n\
-\t [--parent-distribution CODENAME]\n\
-\t [--parent-debian-installer-distribution CODENAME]\n\
\t [--dump]\n\
\t [--fdisk fdisk|fdisk.dist]\n\
\t [--firmware-binary true|false]\n\
@@ -69,20 +68,20 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--force]\n\
\t [--grub-splash FILE]\n\
\t [--gzip-options OPTION|\"OPTIONS\"]\n\
+\t [--hdd-label LABEL]\n\
+\t [--hdd-partition-start START]\n\
+\t [--hdd-size SIZE]\n\
\t [--ignore-system-defaults]\n\
\t [--image-name NAME]\n\
\t [--initramfs none|live-boot]\n\
\t [--initramfs-compression bzip2|gzip|lzma]\n\
\t [--initsystem sysvinit|systemd|none]\n\
\t [--interactive shell]\n\
-\t [--isohybrid-options OPTION|\"OPTIONS\"]\n\
-\t [--hdd-label LABEL]\n\
-\t [--hdd-size SIZE]\n\
-\t [--hdd-partition-start START]\n\
\t [--iso-application NAME]\n\
\t [--iso-preparer NAME]\n\
\t [--iso-publisher NAME]\n\
\t [--iso-volume NAME]\n\
+\t [--isohybrid-options OPTION|\"OPTIONS\"]\n\
\t [--jffs2-eraseblock SIZE]\n\
\t [--keyring-packages PACKAGE|\"PACKAGES\"]\n\
\t [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"]\n\
@@ -90,12 +89,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--loadlin true|false]\n\
\t [--losetup losetup|losetup.orig]\n\
\t [--memtest memtest86+|memtest86|none]\n\
-\t [-m|--parent-mirror-bootstrap URL]\n\
-\t [--parent-mirror-chroot URL]\n\
-\t [--parent-mirror-chroot-security URL]\n\
-\t [--parent-mirror-binary URL]\n\
-\t [--parent-mirror-binary-security URL]\n\
-\t [--parent-mirror-debian-installer URL]\n\
\t [--mirror-bootstrap URL]\n\
\t [--mirror-chroot URL]\n\
\t [--mirror-chroot-security URL]\n\
@@ -103,32 +96,39 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--mirror-binary-security URL]\n\
\t [--mirror-debian-installer URL]\n\
\t [--mode debian|progress-linux]\n\
-\t [--system live|normal]\n\
-\t [--net-root-filesystem nfs|cfs]\n\
-\t [--net-root-mountoptions OPTIONS]\n\
-\t [--net-root-path PATH]\n\
-\t [--net-root-server IP|HOSTNAME]\n\
\t [--net-cow-filesystem nfs|cfs]\n\
\t [--net-cow-mountoptions OPTIONS]\n\
\t [--net-cow-path PATH]\n\
\t [--net-cow-server IP|HOSTNAME]\n\
+\t [--net-root-filesystem nfs|cfs]\n\
+\t [--net-root-mountoptions OPTIONS]\n\
+\t [--net-root-path PATH]\n\
+\t [--net-root-server IP|HOSTNAME]\n\
\t [--net-tarball true|false]\n\
\t [--onie true|false]\n\
\t [--onie-kernel-cmdline \"OPTION1 OPTION2\"]\n\
-\t [--quiet]\n\
-\t [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
\t [--parent-archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
+\t [--parent-debian-installer-distribution CODENAME]\n\
+\t [--parent-distribution CODENAME]\n\
+\t [--parent-mirror-binary URL]\n\
+\t [--parent-mirror-binary-security URL]\n\
+\t [-m|--parent-mirror-bootstrap URL]\n\
+\t [--parent-mirror-chroot URL]\n\
+\t [--parent-mirror-chroot-security URL]\n\
+\t [--parent-mirror-debian-installer URL]\n\
+\t [--quiet]\n\
\t [--security true|false]\n\
\t [--source true|false]\n\
\t [-s|--source-images iso|netboot|tar|hdd]\n\
\t [--swap-file-path PATH]\n\
\t [--swap-file-size MB]\n\
+\t [--system live|normal]\n\
\t [--tasksel apt|aptitude|tasksel]\n\
\t [--uefi-secure-boot auto|enable|disable]\n\
\t [--updates true|false]\n\
-\t [--backports true|false]\n\
\t [--verbose]\n\
-\t [--win32-loader true|false]"
+\t [--win32-loader true|false]\n\
+\t [--zsync true|false]"
Local_arguments ()