config: tidy config files

1 files changed, 101 insertions, 101 deletions

diff --git a/scripts/build/config b/scripts/build/config
index 4f7f5960f..74a892b54 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -973,104 +973,104 @@ fi
 cat > config/common << EOF
 # config/common - common options for live-build(7)
 
-# \$LB_CONFIGURATION_VERSION: version of live-build used to build config (config format version)
+# Version of live-build used to build config (config format version)
 LB_CONFIGURATION_VERSION="${LB_CONFIGURATION_VERSION}"
 
-# \$LB_APT: set package manager
+# Set package manager
 LB_APT="${LB_APT}"
 
-# \$LB_APT_FTP_PROXY: set apt/aptitude ftp proxy
+# Set apt/aptitude ftp proxy
 LB_APT_FTP_PROXY="${LB_APT_FTP_PROXY}"
 
-# \$LB_APT_HTTP_PROXY: set apt/aptitude http proxy
+# Set apt/aptitude http proxy
 LB_APT_HTTP_PROXY="${LB_APT_HTTP_PROXY}"
 
-# \$LB_APT_PIPELINE: set apt/aptitude pipeline depth
+# Set apt/aptitude pipeline depth
 LB_APT_PIPELINE="${LB_APT_PIPELINE}"
 
-# \$LB_APT_RECOMMENDS: set apt/aptitude recommends
+# Set apt/aptitude recommends
 LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS}"
 
-# \$LB_APT_SECURE: set apt/aptitude security
+# Set apt/aptitude security
 LB_APT_SECURE="${LB_APT_SECURE}"
 
-# \$LB_APT_SOURCE_ARCHIVES: set apt/aptitude source entries in sources.list
+# Set apt/aptitude source entries in sources.list
 LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES}"
 
-# \$LB_CACHE: control cache
+# Control cache
 LB_CACHE="${LB_CACHE}"
 
-# \$LB_CACHE_INDICES: control if downloaded package indices should be cached
+# Control if downloaded package indices should be cached
 LB_CACHE_INDICES="${LB_CACHE_INDICES}"
 
-# \$LB_CACHE_PACKAGES: control if downloaded packages files should be cached
+# Control if downloaded packages files should be cached
 LB_CACHE_PACKAGES="${LB_CACHE_PACKAGES}"
 
-# \$LB_CACHE_STAGES: control if completed stages should be cached
+# Control if completed stages should be cached
 LB_CACHE_STAGES="${LB_CACHE_STAGES}"
 
-# \$LB_DEBCONF_FRONTEND: set debconf(1) frontend to use
+# Set debconf(1) frontend to use
 LB_DEBCONF_FRONTEND="${LB_DEBCONF_FRONTEND}"
 
-# \$LB_DEBCONF_PRIORITY: set debconf(1) priority to use
+# Set debconf(1) priority to use
 LB_DEBCONF_PRIORITY="${LB_DEBCONF_PRIORITY}"
 
-# \$LB_INITRAMFS: set initramfs hook
+# Set initramfs hook
 LB_INITRAMFS="${LB_INITRAMFS}"
 
-# \$LB_INITRAMFS_COMPRESSION: set initramfs compression
+# Set initramfs compression
 LB_INITRAMFS_COMPRESSION="${LB_INITRAMFS_COMPRESSION}"
 
-# \$LB_INITSYSTEM: set init system
+# Set init system
 LB_INITSYSTEM="${LB_INITSYSTEM}"
 
-# \$LB_MODE: set distribution mode
+# Set distribution mode
 LB_MODE="${LB_MODE}"
 
-# \$LB_SYSTEM: set system type
+# Set system type
 LB_SYSTEM="${LB_SYSTEM}"
 
-# \$LB_IMAGE_NAME: set base name of the image
+# Set base name of the image
 LB_IMAGE_NAME="${LB_IMAGE_NAME}"
 
-# \$APT_OPTIONS: set options to use with apt
+# Set options to use with apt
 APT_OPTIONS="${APT_OPTIONS}"
 
-# \$APTITUDE_OPTIONS: set options to use with aptitude
+# Set options to use with aptitude
 APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
 
-# \$DEBOOTSTRAP_OPTIONS: set options to use with debootstrap
+# Set options to use with debootstrap
 DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS}"
 
-# \$DEBOOTSTRAP_SCRIPT: set script to use with debootstrap
+# Set script to use with debootstrap
 DEBOOTSTRAP_SCRIPT="${DEBOOTSTRAP_SCRIPT}"
 
-# \$GZIP_OPTIONS: set options to use with gzip
+# Set options to use with gzip
 GZIP_OPTIONS="${GZIP_OPTIONS}"
 
 # live-build options
 
-# \$_BREAKPOINTS: enable breakpoints
+# Enable breakpoints
 # If set here, overrides the command line option
 #_BREAKPOINTS="${_BREAKPOINTS}"
 
-# \$_DEBUG: enable debug
+# Enable debug
 # If set here, overrides the command line option
 #_DEBUG="${_DEBUG}"
 
-# \$_COLOR: enable color
+# Enable color
 # If set here, overrides the command line option
 #_COLOR="${_COLOR}"
 
-# \$_FORCE: enable force
+# Enable force
 # If set here, overrides the command line option
 #_FORCE="${_FORCE}"
 
-# \$_QUIET: enable quiet
+# Enable quiet
 # If set here, overrides the command line option
 #_QUIET="${_QUIET}"
 
-# \$_VERBOSE: enable verbose
+# Enable verbose
 # If set here, overrides the command line option
 #_VERBOSE="${_VERBOSE}"
 EOF
@@ -1079,79 +1079,79 @@ EOF
 cat > config/bootstrap << EOF
 # config/bootstrap - options for live-build(7), bootstrap stage
 
-# \$LB_ARCHITECTURE: select architecture to use
+# Select architecture to use
 LB_ARCHITECTURE="${LB_ARCHITECTURE}"
 
-# \$LB_DISTRIBUTION: select distribution to use
+# Select distribution to use
 LB_DISTRIBUTION="${LB_DISTRIBUTION}"
 
-# \$LB_PARENT_DISTRIBUTION: select parent distribution to use
+# Select parent distribution to use
 LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
 
-# \$LB_DISTRIBUTION_CHROOT: select distribution to use in the chroot
+# Select distribution to use in the chroot
 LB_DISTRIBUTION_CHROOT="${LB_DISTRIBUTION_CHROOT}"
 
-# \$LB_PARENT_DISTRIBUTION_CHROOT: select parent distribution to use in the chroot
+# Select parent distribution to use in the chroot
 LB_PARENT_DISTRIBUTION_CHROOT="${LB_PARENT_DISTRIBUTION_CHROOT}"
 
-# \$LB_DISTRIBUTION_BINARY: select distribution to use in the final image
+# Select distribution to use in the final image
 LB_DISTRIBUTION_BINARY="${LB_DISTRIBUTION_BINARY}"
 
-# \$LB_PARENT_DISTRIBUTION_BINARY: select parent distribution to use in the final image
+# Select parent distribution to use in the final image
 LB_PARENT_DISTRIBUTION_BINARY="${LB_PARENT_DISTRIBUTION_BINARY}"
 
-# \$LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use
+# Select parent distribution for debian-installer to use
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"
 
-# \$LB_ARCHIVE_AREAS: select archive areas to use
+# Select archive areas to use
 LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}"
 
-# \$LB_PARENT_ARCHIVE_AREAS: select parent archive areas to use
+# Select parent archive areas to use
 LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS}"
 
-# \$LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
+# Set parent mirror to bootstrap from
 LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP}"
 
-# \$LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from
+# Set parent mirror to fetch packages from
 LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT}"
 
-# \$LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from
+# Set security parent mirror to fetch packages from
 LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY}"
 
-# \$LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image
+# Set parent mirror which ends up in the image
 LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY}"
 
-# \$LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image
+# Set security parent mirror which ends up in the image
 LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY}"
 
-# \$LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror
+# Set debian-installer parent mirror
 LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}"
 
-# \$LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
+# Set mirror to bootstrap from
 LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP}"
 
-# \$LB_MIRROR_CHROOT: set mirror to fetch packages from
+# Set mirror to fetch packages from
 LB_MIRROR_CHROOT="${LB_MIRROR_CHROOT}"
 
-# \$LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
+# Set security mirror to fetch packages from
 LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY}"
 
-# \$LB_MIRROR_BINARY: set mirror which ends up in the image
+# Set mirror which ends up in the image
 LB_MIRROR_BINARY="${LB_MIRROR_BINARY}"
 
-# \$LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# Set security mirror which ends up in the image
 LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}"
 
-# \$LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
+# Set debian-installer mirror
 LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}"
 
-# \$LB_BOOTSTRAP_QEMU_ARCHITECTURE: architectures to use foreign bootstrap
+# Set architectures to use foreign bootstrap
 LB_BOOTSTRAP_QEMU_ARCHITECTURE="${LB_BOOTSTRAP_QEMU_ARCHITECTURE}"
 
-# \$LB_BOOTSTRAP_QEMU_EXCLUDE: packages to exclude during foreign bootstrap
+# Set packages to exclude during foreign bootstrap
 LB_BOOTSTRAP_QEMU_EXCLUDE="${LB_BOOTSTRAP_QEMU_EXCLUDE}"
 
-# \$LB_BOOTSTRAP_QEMU_STATIC: static qemu binary for foreign bootstrap
+# Set static qemu binary for foreign bootstrap
 LB_BOOTSTRAP_QEMU_STATIC="${LB_BOOTSTRAP_QEMU_STATIC}"
 EOF
 
@@ -1166,31 +1166,31 @@ mkdir -p config/preseed
 cat > config/chroot << EOF
 # config/chroot - options for live-build(7), chroot stage
 
-# \$LB_CHROOT_FILESYSTEM: set chroot filesystem
+# Set chroot filesystem
 LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}"
 
-# \$LB_UNION_FILESYSTEM: set union filesystem
+# Set union filesystem
 LB_UNION_FILESYSTEM="${LB_UNION_FILESYSTEM}"
 
-# \$LB_INTERACTIVE: set interactive build
+# Set interactive build
 LB_INTERACTIVE="${LB_INTERACTIVE}"
 
-# \$LB_KEYRING_PACKAGES: set keyring packages
+# Set keyring packages
 LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES}"
 
-# \$LB_LINUX_FLAVOURS_WITH_ARCH: set kernel flavour to use (with arch)
+# Set kernel flavour to use (with arch)
 LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS_WITH_ARCH}"
 
-# \$LB_LINUX_PACKAGES: set kernel packages to use
+# Set kernel packages to use
 LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES}"
 
-# \$LB_SECURITY: enable security updates
+# Enable security updates
 LB_SECURITY="${LB_SECURITY}"
 
-# \$LB_UPDATES: enable updates updates
+# Enable updates updates
 LB_UPDATES="${LB_UPDATES}"
 
-# \$LB_BACKPORTS: enable backports updates
+# Enable backports updates
 LB_BACKPORTS="${LB_BACKPORTS}"
 EOF
 
@@ -1205,107 +1205,107 @@ mkdir -p config/bootloaders
 cat > config/binary << EOF
 # config/binary - options for live-build(7), binary stage
 
-# \$LB_IMAGE_TYPE: set image type
+# Set image type
 LB_IMAGE_TYPE="${LB_IMAGE_TYPE}"
 
-# \$LB_BINARY_FILESYSTEM: set image filesystem
+# Set image filesystem
 LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM}"
 
-# \$LB_APT_INDICES: set apt/aptitude generic indices
+# Set apt/aptitude generic indices
 LB_APT_INDICES="${LB_APT_INDICES}"
 
-# \$LB_BOOTAPPEND_LIVE: set boot parameters
+# Set boot parameters
 LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE}"
 
-# \$LB_BOOTAPPEND_INSTALL: set boot parameters
+# Set boot parameters
 LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL}"
 
-# \$LB_BOOTAPPEND_LIVE_FAILSAFE: set boot parameters
+# Set boot parameters
 LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE}"
 
-# \$LB_BOOTLOADERS: set bootloaders
+# Set bootloaders
 LB_BOOTLOADERS="${LB_BOOTLOADERS}"
 
-# \$LB_CHECKSUMS: set checksums
+# Set checksums
 LB_CHECKSUMS="${LB_CHECKSUMS}"
 
-# \$LB_COMPRESSION: set compression
+# Set compression
 LB_COMPRESSION="${LB_COMPRESSION}"
 
-# \$LB_ZSYNC: set zsync
+# Set zsync
 LB_ZSYNC="${LB_ZSYNC}"
 
-# \${LB_BUILD_WITH_CHROOT: control if we build binary images chrooted
+# Control if we build binary images chrooted
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
 LB_BUILD_WITH_CHROOT="${LB_BUILD_WITH_CHROOT}"
 
-# \$LB_DEBIAN_INSTALLER: set debian-installer
+# Set debian-installer
 LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER}"
 
-# \$LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
+# Set debian-installer suite
 LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION}"
 
-# \$LB_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
+# Set debian-installer preseed filename/url
 LB_DEBIAN_INSTALLER_PRESEEDFILE="${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
 
-# \$LB_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer
+# Toggle use of GUI debian-installer
 LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI}"
 
-# \$LB_HDD_LABEL: set hdd label
+# Set hdd label
 LB_HDD_LABEL="${LB_HDD_LABEL}"
 
-# \$LB_HDD_SIZE: set hdd filesystem size
+# Set hdd filesystem size
 LB_HDD_SIZE="${LB_HDD_SIZE}"
 
-# \$LB_HDD_PARTITION_START: set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout.
+# Set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout.
 LB_HDD_PARTITION_START="${LB_HDD_PARTITION_START}"
 
-# \$LB_ISO_APPLICATION: set iso author
+# Set iso author
 LB_ISO_APPLICATION="${LB_ISO_APPLICATION}"
 
-# \$LB_ISO_PREPARER: set iso preparer
+# Set iso preparer
 LB_ISO_PREPARER="${LB_ISO_PREPARER}"
 
-# \$LB_ISO_PUBLISHER: set iso publisher
+# Set iso publisher
 LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER}"
 
-# \$LB_ISO_VOLUME: set iso volume (max 32 chars)
+# Set iso volume (max 32 chars)
 LB_ISO_VOLUME="${LB_ISO_VOLUME}"
 
-# \$LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
+# Set jffs2 eraseblock size
 LB_JFFS2_ERASEBLOCK=""
 
-# \$LB_MEMTEST: set memtest
+# Set memtest
 LB_MEMTEST="${LB_MEMTEST}"
 
-# \$LB_LOADLIN: set loadlin
+# Set loadlin
 LB_LOADLIN="${LB_LOADLIN}"
 
-# \$LB_WIN32_LOADER: set win32-loader
+# Set win32-loader
 LB_WIN32_LOADER="${LB_WIN32_LOADER}"
 
-# \$LB_NET_TARBALL: set net tarball
+# Set net tarball
 LB_NET_TARBALL="${LB_NET_TARBALL}"
 
-# \$LB_ONIE: set onie
+# Set onie
 LB_ONIE="${LB_ONIE}"
 
-# \$LB_ONIE_KERNEL_CMDLINE: set onie additional kernel cmdline options
+# Set onie additional kernel cmdline options
 LB_ONIE_KERNEL_CMDLINE="${LB_ONIE_KERNEL_CMDLINE}"
 
-# \$LB_FIRMWARE_BINARY: include firmware packages in debian-installer
+# Set inclusion of firmware packages in debian-installer
 LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY}"
 
-# \$LB_FIRMWARE_CHROOT: include firmware packages in the live image
+# Set inclusion of firmware packages in the live image
 LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT}"
 
-# \$LB_SWAP_FILE_PATH: set swap file path
+# Set swap file path
 LB_SWAP_FILE_PATH="${LB_SWAP_FILE_PATH}"
 
-# \$LB_SWAP_FILE_SIZE: set swap file size
+# Set swap file size
 LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE}"
 
-# \$LB_UEFI_SECURE_BOOT: enable/disable UEFI secure boot
+# Enable/disable UEFI secure boot support
 LB_UEFI_SECURE_BOOT="${LB_UEFI_SECURE_BOOT}"
 EOF
 
@@ -1313,10 +1313,10 @@ EOF
 cat > config/source << EOF
 # config/source - options for live-build(7), source stage
 
-# \$LB_SOURCE: set source option
+# Set source option
 LB_SOURCE="${LB_SOURCE}"
 
-# \$LB_SOURCE_IMAGES: set image type
+# Set image type
 LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}"
 EOF