From 35d3ebf86293385163a5053600463c0a223916b1 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 5 Oct 2019 17:41:53 -0500 Subject: script: Add stuff from @sroracle's comments --- devel/script/2_keys.xml | 10 +++++++--- devel/script/3_ondisk.xml | 5 +---- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'devel/script') diff --git a/devel/script/2_keys.xml b/devel/script/2_keys.xml index 5db959b..ef729ee 100644 --- a/devel/script/2_keys.xml +++ b/devel/script/2_keys.xml @@ -84,6 +84,10 @@ hostname gwyn.foxkit.internal Format The pkginstall key is a space-separated list of APK packages. They must be available in the repositories used during the installation process. pkginstall must appear at least once in a HorizonScript. There is no limit to the number of times pkginstall may be specified; each one will append to the list of packages to install. + + Default + If no anchor package (adelie-core, adelie-base, adelie-base-posix, adelie-base-lsb) is specified in any pkginstall key, adelie-core will be added automatically. + Examples @@ -153,7 +157,7 @@ rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59 Default - If the language key is not present, no setting will be defined for the LANG or LC_ALL environment variables. Most software treats this as either "C.UTF-8" or "en_US.UTF-8". No language packs will be installed for software that supports multiple language; due to English being the de facto language of software engineering, this implies all software will run in English. + If the language key is not present, no setting will be defined for the LANG environment variable. Otherwise, this setting will be written to /etc/profile.d/00-language.sh for the definition of the LANG environment variable. Most software treats this as either "C.UTF-8" or "en_US.UTF-8". No language packs will be installed for software that supports multiple language; due to English being the de facto language of software engineering, this implies all software will run in English. Examples @@ -257,7 +261,7 @@ firmware false The prefix or network mask. The value must be either: A whole number in the range of 1-32 for IPv4 addresses, or 1-64 for IPv6 addresses. - An IPv4 network mask, in the format octet.octet.octet.octet. + An IPv4 network mask, in the format octet.octet.octet.octet. This format cannot be used for IPv6 addresses. Optionally, the default gateway. The value specified must be a valid IP address of the same family as the IP address specified in item 3. @@ -302,7 +306,7 @@ netaddress eth0 198.51.100.37 24 198.51.100.1 Format - The nameserver key takes either an IPv4 address or IPv6 address. Any other value is invalid. The nameserver may appear up to four times in a HorizonScript, or be omitted. It is valid to specify nameserver even if network is false, but name queries will not function properly without a network configuration. + The nameserver key takes either an IPv4 address or IPv6 address. Any other value is invalid. The nameserver may appear up to three times in a HorizonScript, or be omitted. It is valid to specify nameserver even if network is false, but name queries will not function properly without a network configuration. Default diff --git a/devel/script/3_ondisk.xml b/devel/script/3_ondisk.xml index 951989e..4a64599 100644 --- a/devel/script/3_ondisk.xml +++ b/devel/script/3_ondisk.xml @@ -1,8 +1,5 @@ On-Disk Format -
- TBD - TODO: you really thought we figured this out? :( -
+ HorizonScript is a text file. Empty lines are ignored. If a line starts with an octothorpe or hash symbol (#), the line is ignored as a comment. Whitespace preceding a key is not significant, but may not precede a comment. -- cgit v1.2.3-60-g2f50