aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-01 14:57:48 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-01 14:57:48 +0200
commit82ba1c16587d331d9dff59997a8f5e723d57903a (patch)
tree0b59c44fa8e3252884ceb4c05afcedddaa72a9be
parentcea95db3790bb98085288a4234c9dd9272c4e1ad (diff)
Naming cleanup
-rwxr-xr-xbootstrap2
-rwxr-xr-xbuildos4
-rw-r--r--doc/manual.cli30
-rwxr-xr-xinit2
4 files changed, 19 insertions, 19 deletions
diff --git a/bootstrap b/bootstrap
index 8fdfd8a..c95edff 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /usr/bin/env bash
-# Bootstrap build2 buildos.
+# Bootstrap build2 Build OS.
#
# Assumptions/expectations:
#
diff --git a/buildos b/buildos
index d3f1652..e9c6acd 100755
--- a/buildos
+++ b/buildos
@@ -29,7 +29,7 @@ function error ()
exit 1
}
-info "starting buildos monitor..."
+info "starting build os monitor..."
# Parse the kernel command line. This is complicated by the fact that the
# values can be quoted, for example:
@@ -280,7 +280,7 @@ function print ()
done
}
-print | email "starting buildos monitor"
+print | email "starting build os monitor"
if [ -z "$buildid_url" ]; then
info "no buildos.buildid_url specified, not monitoring for new os builds"
diff --git a/doc/manual.cli b/doc/manual.cli
index 6648eec..9e90297 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -3,7 +3,7 @@
// license : MIT; see accompanying LICENSE file
"\name=build2-buildos-manual"
-"\subject=buildos"
+"\subject=Build OS"
"\title=Operating System"
// NOTES
@@ -14,16 +14,16 @@
"
\h0#preface|Preface|
-This document describes \c{buildos}, the \c{build2} operating system.
+This document describes Build OS, the \c{build2} operating system.
\h1#intro|Introduction|
-\c{buildos} is a Debian GNU/Linux-based in-memory network-booted operating
-system specialized for autonomous building of software using the \c{build2}
+Build OS is a Debian GNU/Linux-based in-memory network-booted operating system
+specialized for autonomous building of software using the \c{build2}
toolchain. It's primary purpose is to run the \c{build2} build bot (\c{bbot}),
build slave (\c{bslave}), or both.
-A machine that run an instance of \c{buildos} is called a \i{build host}. A
+A machine that run an instance of Build OS is called a \i{build host}. A
build host runs the \c{bbot} and/or \c{bslave} in the \i{agent mode}. The
actual building is performed in the virtual machines and/or containers. For
\c{bbot} it is normally one-shot virtual machines and for \c{bslave} it is
@@ -80,8 +80,8 @@ the following subdirectories:
\h1#boot|Booting|
-\c{buildos} is normally booted from the network using PXE but can also be
-booted locally from the kernel image and initrd directly.
+Build OS is normally booted over the network using PXE but can also be booted
+locally from the kernel image and initrd directly.
\h#boot-reboot|Reboot|
@@ -103,7 +103,7 @@ PXELINUX. That is, you have configured a TFTP server that hosts the
\c{pxelinux} initial bootstrap program (NBP) and configured a DHCP
server to direct PXE client to this server/NBP.
-To setup PXE boot of \c{buildos}, perform the following steps:
+To setup PXE boot of Build OS, perform the following steps:
\ol|
@@ -129,7 +129,7 @@ prompt 1
timeout 50
label buildos
- menu label buildos
+ menu label Build OS
kernel /buildos/buildos-image
initrd /buildos/buildos-initrd
append buildos.smtp_relay=example.org buildos.admin_email=admin@example.org buildos.buildid_url=tftp://<os-host>/buildos/buildos-buildid buildos.toolchain_url=https://<toolchain-host>/toolchain.sha256 buildos.toolchain_trust=<repo-fp>
@@ -156,9 +156,9 @@ $ sudo kvm \
\h#boot-local|Local Boot|
-During testing it is often useful to boot \c{buildos} directly from the
-kernel image and initrd files. As an example, here is how this can be done
-using QEMU/KVM:
+During testing it is often useful to boot Build OS directly from the kernel
+image and initrd files. As an example, here is how this can be done using
+QEMU/KVM:
\
sudo kvm \
@@ -262,14 +262,14 @@ with \c{dnsmasq} configured as a DHCP on this interface.
Normally, \c{br0} is used for \c{bslave} virtual machines/container (since
they may need to be accessed directly) and \c{br1} \- for \c{bbot} virtual
-machines. You can view the bridge configuration on a booted \c{buildos}
-instance by examining \c{/etc/network/interfaces}.
+machines. You can view the bridge configuration on a booted Build OS instance
+by examining \c{/etc/network/interfaces}.
@@ TODO: private network parameters.
\h#config-email|Email|
-A \c{buildos} instance sends various notifications (including all messages to
+A Build OS instance sends various notifications (including all messages to
\c{root}) to the admin email address. The admin email is specified with
the \c{buildos.admin_email} kernel command line parameter.
diff --git a/init b/init
index c4fd7e0..694dcb0 100755
--- a/init
+++ b/init
@@ -1,6 +1,6 @@
#!/bin/bash
-# Init script for build2 buildos.
+# Init script for build2 Build OS.
#
# Loosely based on the one that comes in Debian initrd.img (since we are
# using its kernel image as is).