add docker group, small docs update

diff --git a/README b/README
index 974fcc879eef8bab726bcec91267f954aeb6e914..f939a7d795295506aa6547832f4ab3a051607fe4 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Multi-boot/distro btrfs provisioning
+PXE install w multi-boot, btrfs & Libreboot support
 
 Some things are specific to my home network, and uses files with secrets
 that are not in this repo. Uses pxe or pxe-kexec (on libreboot, I have
@@ -64,7 +64,7 @@ wrt-setup-remote  # setup my router in general: dhcp, dns, etc.
 
 arch-init-remote # install arch after it's been booted into it's setup env
 dsfull # install & post-install a new fai distro
-fai-kexec # kexec to fai tftp server that pxe would normally point to
+fai-kexec # Kexec this or a remote machine using host faiserver
 arch-revm # test arch install on a fresh vm
 fai-revm  # test fai install on a fresh vm
 live-kexec # fai kexec from upstream live cds, e.g. curl live-kexec|bash

diff --git a/fai-kexec b/fai-kexec
index a49abe1cb743f36423fa1a70267171c772e61d4a..ae59f7cb3d6d56da7d5f742385152860cee541be 100755 (executable)
--- a/fai-kexec
+++ b/fai-kexec
@@ -22,10 +22,11 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 usage() {
     cat <<'EOF'
 usage: $0 [-h|--help] [SERVER]
-kexec to SERVER (faiserver by default), pxe boot from it's tftp server
+Kexec this or a remote machine using host faiserver
 
-This does what pxe would do, but skipping boot sequence up to and
-including the pxe dhcp.
+If SERVER argument, ssh to root@SERVER before doing kexec. This does
+what pxe would do, but skipping boot sequence up to and including the
+pxe dhcp.
 
 EOF
     exit $1

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 90082de579047090c387b05f944cb5f710e9cb80..3b07687d9fa636c897891def4c4305ab5051d149 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -61,6 +61,8 @@ fi
 # comparing ian's groups to traci, I see none she should join on arch
 $ROOTCMD usermod -a -G traci ian
 
+getent group docker &>/dev/null || groupadd -r docker
+usermod -a -G docker ian
 
 # based on unison error, with 8192 from
 # sysctl -a | grep fs.inotify.max_user_watches