minor files

diff --git a/README b/README
index c61f18908f4f65e5e2e8a3fd2f7955b8cd6bd967..328751471791e8238aceaface448c14fc9ff53ac 100644 (file)
--- a/README
+++ b/README
@@ -68,6 +68,9 @@ Before doing a fai install, you will need to populate a class file.  I
 use one called 5-multi-boot, which you can see example of in
 fai/config/class/50-host-classes.
 
+Before doing a fai install, you will need to populate /q/root/luks and
+/q/root/shadow, see their references.
+
 
 
 All scripts meant to be used directly are listed here:

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index a7745b7bbf44241512822648706470b00fe0d0e5..3948073df0ec311cbc01bc9efe63e52011b3409a 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -17,10 +17,6 @@ if [[ -e $src && -e $dst ]]; then
     cp -rT $src $dst
 fi
 
-if ifclass VOL_STRETCH_BOOTSTRAP; then
-    exit 0
-fi
-
 TPW=/q/root/shadow/traci-simple
 if ifclass tp; then
     ROOTPW=/q/root/shadow/standard
@@ -51,7 +47,14 @@ au() { # add user. i don't use adduser for portability
 }
 
 chpw root "$ROOTPW"
-# 9 = user already exists. so we are idempotent.
+
+# only setup root pass for bootstrap vol
+if ifclass VOL_STRETCH_BOOTSTRAP; then
+  exit 0
+fi
+
+
+# return of 9 = user already exists. so we are idempotent.
 au iank
 chpw iank "$ROOTPW"
 

diff --git a/fai/config/files/etc/apt/sources.list.d/stretch.list/STRETCH b/fai/config/files/etc/apt/sources.list.d/stretch.list/STRETCH_FREE
similarity index 100%
rename from fai/config/files/etc/apt/sources.list.d/stretch.list/STRETCH
rename to fai/config/files/etc/apt/sources.list.d/stretch.list/STRETCH_FREE

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index ddcf53d16c631a8d39a435fb8582f2a798bee5dc..63537c2594d334ae9b76c79da8de35b693a5d9bd 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -145,7 +145,10 @@ $(cat $disk/queue/rotational)"; exit 1 ;;
     esac
 done
 
-# install all ssds, or if there are none, all hdds
+# install all ssds, or if there are none, all hdds.
+# Note, usb flash disks are seen as rotational, which is
+# very odd, but convenient for ignoring them here.
+# TODO: find a reliable way to ignore them.
 if ! ifclass ROTATIONAL && (( ${#ssds[@]} > 0 )); then
     short_devs=( ${ssds[@]} )
 else

diff --git a/lk b/lk
index 51b91d955d5d637a8f49c59c3f345bd96053b23d..dbe9d2ea7115ac87328d03f770c6435db6068aea 100644 (file)
--- a/lk
+++ b/lk
@@ -23,7 +23,9 @@ fai kexec from upstream live cds, i.e. curl|bash
 You can copy this to a http server, then wget -O- url|sudo bash
 curl is sometimes not preinstalled on a live cd.
 
-This has been tested on trisquel belenos and ubuntu xenial.
+This has been tested on trisquel belenos and ubuntu xenial & 18.10.
+With 18.10 on an x200, kexec was unreliable, resulting in freezes and
+kernel panics.
 
 If the screen just sits in a weird color inverted, corrupted looking state,
 it's probably nothing wrong with the computer, but a problem

diff --git a/mymk-basefile b/mymk-basefile
index 2a7f453b7f63e8052db82390e5089dacc6b2833f..4136bb8256ef91c9ff98e80dc993fd10b9bcb31f 100755 (executable)
--- a/mymk-basefile
+++ b/mymk-basefile
@@ -23,7 +23,10 @@ Args I've used before:
 
 -h|--help  Print help and exit.
 
-Note: Uses GNU getopt options parsing style
+Note: Uses GNU getopt options parsing style.
+
+Usage of mk-basefile:
+
 EOF
   $script_dir/fai/config/basefiles/mk-basefile -h
   exit $1