various fixes and improvements

diff --git a/README b/README
index f71f64306ed774aeadfba8b42c9a97ee2a2bcdea..3e6123b51c2ef09566d1c740010769115b7c0bad 100644 (file)
--- a/README
+++ b/README
@@ -6,20 +6,18 @@ not added a pxe rom, I use a minimal debian stable subvolume which acts
 like a pxe rom). I use this for bare metal and vms, and two scripts
 which can run post boot so I use them on vps distributed image as well.
 
 like a pxe rom). I use this for bare metal and vms, and two scripts
 which can run post boot so I use them on vps distributed image as well.
 

-Features people may find useful: installs encrypted trisquel belenos, ,
-debian jessie, debian stretch, ubuntu 16.04, and arch (havne't done
-recently, probably a bit broken), in a multi-boot setup using multiple
-subvolumes of a single btrfs filesystem.  Utilizes multiple disks, with
-scripts to automatically decrypt on intentional reboots, but not after
-shutdown or power loss.
+Features people may find useful: installs encrypted trisquel, debian,
+ubuntu, and arch (havne't done recently, probably a bit broken), in a
+multi-boot setup using multiple subvolumes of a single btrfs filesystem.
+Utilizes multiple disks, with scripts to automatically decrypt on
+intentional reboots, but not after shutdown or power loss.

 
 The partititioning and filesystem script is at
 
 The partititioning and filesystem script is at

-fai/config/hooks/partition.DEFAULT. Other debian based distros at least
-as new as ubuntu 14.04 should work fine, and I'm planning to add Fedora
-support. Disks are grouped as ssd or hdd and raided in raid 1 or raid 0
-per configuration. The base partitions are divided into boot, swap, and
-root, (only boot is unencrypted). There are scripts to resize those
-partitions post-provision and while the system is running.
+fai/config/hooks/partition.DEFAULT. Disks are grouped as ssd or hdd and
+raided in raid 1 or raid 0 per configuration. The base partitions are
+divided into boot, swap, and root, (only boot is unencrypted). There are
+scripts to resize those partitions post-provision and while the system
+is running.

 
 People who use fai may find these things as useful examples: it uses
 dnsmasq (on a openwrt machine) for dhcp instead of the isc
 
 People who use fai may find these things as useful examples: it uses
 dnsmasq (on a openwrt machine) for dhcp instead of the isc

diff --git a/arch-pxe b/arch-pxe
index e480b5d7173ebb8d1c0dc639494c9180d18a19b9..52885b32138928b9330c941396a4c4f655482f96 100755 (executable)
--- a/arch-pxe
+++ b/arch-pxe
@@ -27,7 +27,8 @@ Usage: ${0##*/}
 Setup arch pxe boot server from the base image
 
 Requires manually downloading image. Image path is hardcoded below to
 Setup arch pxe boot server from the base image
 
 Requires manually downloading image. Image path is hardcoded below to

-/a/opt/image_name. Run pxe-server HOST|default arch to enable it.
+/a/opt/image_name without .iso on the end. adjust the code for a new image. After this, run pxe-server.
+HOST|default arch to enable it.

 
 -h|--help  Print help and exit.
 EOF
 
 -h|--help  Print help and exit.
 EOF


@@ -42,11 +43,16 @@ esac
 x="$(readlink -f "$BASH_SOURCE")"
 script_dir="${x%/*}"
 cd /a/opt
 x="$(readlink -f "$BASH_SOURCE")"
 script_dir="${x%/*}"
 cd /a/opt

-iso="archlinux-2017.02.01-dual"
-sfs=$iso/arch/x86_64/airootfs.sfs
+iso="parabola-systemd-cli-x86_64-netinstall-2017.10.18-00.07-alpha"

 rm -rf $iso
 ex $iso.iso
 rm -rf $iso
 ex $iso.iso

-sed -i --follow-symlinks -f - $iso/arch/boot/syslinux/archiso_pxe64.cfg <<EOF
+n=parabola
+if [[ ! -e $iso/parabola ]]; then
+    n=arch
+fi
+sfs=$iso/$n/x86_64/*.sfs
+
+sed -i --follow-symlinks -f - $iso/$n/boot/syslinux/${n}iso_pxe64.cfg <<EOF

 1itotaltimeout 1
 /^LABEL arch64_nfs/a menu default
 s/^APPEND .*/\0 script=arch-iso-init/
 1itotaltimeout 1
 /^LABEL arch64_nfs/a menu default
 s/^APPEND .*/\0 script=arch-iso-init/


@@ -64,7 +70,7 @@ s cp $script_dir/arch-iso-init squashfs-root/root
 s rm $sfs
 s mksquashfs squashfs-root $sfs -comp xz
 # file transfer to wrt is slow, so remove some useless files
 s rm $sfs
 s mksquashfs squashfs-root $sfs -comp xz
 # file transfer to wrt is slow, so remove some useless files

-rm $iso/arch/i686/airootfs.sfs $iso/arch/boot/i686/archiso.img
+rm -f $iso/$n/i686/airootfs.sfs $iso/$n/boot/i686/${n}iso.img

 pushd $(dirname $sfs); md5sum ${sfs##*/} > airootfs.md5; popd
 
 # seems if you've done a pxe boot, mounted the nfs,
 pushd $(dirname $sfs); md5sum ${sfs##*/} > airootfs.md5; popd
 
 # seems if you've done a pxe boot, mounted the nfs,

diff --git a/bash-trace b/bash-trace
deleted file mode 100644 (file)
index 61f8ae52edb9958c799001e43a1f91b8f8994f74..0000000000000000000000000000000000000000
--- a/bash-trace
+++ /dev/null
@@ -1,48 +0,0 @@
-# meant to be sourced. copy/pasted from https://iankelling.org/git/?p=errhandle;a=summary
-
-bash-trace() {
-    local -i argc_index=0 arg frame i start=${1:-1} max_indent=8 indent
-    local source
-    local extdebug=false
-    if [[ $(shopt -p extdebug) == *-s* ]]; then
-        extdebug=true
-    fi
-
-    for ((frame=0; frame < ${#FUNCNAME[@]}-1; frame++)); do
-        argc=${BASH_ARGC[frame]}
-        argc_index+=$argc
-        ((frame < start)) && continue
-        if (( ${#BASH_SOURCE[@]} > 1 )); then
-            source="${BASH_SOURCE[frame+1]}:${BASH_LINENO[frame]}:"
-        fi
-        indent=$((frame-start+1))
-        indent=$((indent < max_indent ? indent : max_indent))
-        printf "%${indent}s↳%sin \`%s" '' "$source" "${FUNCNAME[frame]}"
-        if $extdebug; then
-            for ((i=argc_index-1; i >= argc_index-argc; i--)); do
-                printf " %s" "${BASH_ARGV[i]}"
-            done
-        fi
-        echo \'
-    done
-}
-
-
-errcatch() {
-    set -E; shopt -s extdebug
-    _err-trap() {
-        err=$?
-        exec >&2
-        set +x
-        echo "${BASH_SOURCE[1]}:${BASH_LINENO[0]}:in \`$BASH_COMMAND' returned $err"
-        bash-trace 2
-        set -e
-        "${_errcatch_cleanup[@]}"
-        echo "$0: exiting with code $err"
-        exit $err
-    }
-    trap _err-trap ERR
-    set -o pipefail
-}
-
-errcatch

diff --git a/bash-trace b/bash-trace
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..765667536598e1a37f270ce1ca8239ff911d4b9c
--- /dev/null
+++ b/bash-trace
@@ -0,0 +1 @@
+./fai/config/files/boot/bash-trace/DEFAULT
\ No newline at end of file

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 8ac4a27d7fd7175d9bac221d2e8a0034411904f1..3169fd3299c76d62996754b0630f2679e5a70505 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -25,7 +25,8 @@
 # The base distro:
 # UBUNTU, DEBIAN
 #
 # The base distro:
 # UBUNTU, DEBIAN
 #

-# The base disto version, which is also the basefile name if it exists:
+# The base disto version, which is also the basefile name if it exists.
+# Debian stable basefile gets built by faisetup and gets used otherwise,:

 # STRETCH64, XENIAL64, BELENOS64, FLIDAS64
 #
 # The distro subvol name, we can add as many of these as we want:
 # STRETCH64, XENIAL64, BELENOS64, FLIDAS64
 #
 # The distro subvol name, we can add as many of these as we want:

diff --git a/fai/config/distro-install-common/libreboot_grub.cfg b/fai/config/distro-install-common/libreboot_grub.cfg
index 69e1c52db3a1eaa3a4d543f350ca1f1c1fdff0cb..4610044a7e60b6d3cfd1f785bdff581a12f30a39 100644 (file)
--- a/fai/config/distro-install-common/libreboot_grub.cfg
+++ b/fai/config/distro-install-common/libreboot_grub.cfg
@@ -14,17 +14,18 @@ function save_chosen {
 }
 
 # fai_check is so we can act like a pxe boot, but just for fai, and by
 }
 
 # fai_check is so we can act like a pxe boot, but just for fai, and by

-# using /debian_bootstrap to do it.  We toggle on and off the grub var
+# using /stretch_bootstrap to do it.  We toggle on and off the grub var

 # did_fai_check so we can do the check every other boot. Then
 # /debian_bootstrap checks for that var on boot and if we want to do a
 # did_fai_check so we can do the check every other boot. Then
 # /debian_bootstrap checks for that var on boot and if we want to do a

-# fai check, it does it, then reboots. But it also sets did_fai_check to
-# a 3rd state os_true which means we did the fai check, and we don't
-# want to do it again. This is useful for systems without libreboot.
+# fai check, it does it, then reboots. But fai-check also sets
+# did_fai_check to a 3rd state os_true which means we did the fai check,
+# and we don't want to do it again. This is useful for systems without
+# libreboot, although it's not used yet.

 
 # We don't set this to fai check so we can't get into
 # an infinite reboot cycle. We depend on the os to
 # create the initial grubenv file.
 
 # We don't set this to fai check so we can't get into
 # an infinite reboot cycle. We depend on the os to
 # create the initial grubenv file.

-set default=/debianstable_bootstrap # could use 0 here.
+set default=/debianstretch_bootstrap # could use 0 here.

 set timeout=1
 
 for part in (ahci*4) (ata*4); do
 set timeout=1
 
 for part in (ahci*4) (ata*4); do


@@ -42,7 +43,7 @@ done
 
 did_fai_check=false
 
 
 did_fai_check=false
 

-bs_dir=/debianstable_bootstrap
+bs_dir=/debianstretch_bootstrap

 menuentry $bs_dir --id=$bs_dir {
     # note, we might be able to use $chosen and avoid setting this here,
     # and set it inside save_chosen. but I haven't tested it,
 menuentry $bs_dir --id=$bs_dir {
     # note, we might be able to use $chosen and avoid setting this here,
     # and set it inside save_chosen. but I haven't tested it,

diff --git a/fai/config/files/boot/bash-trace/DEFAULT b/fai/config/files/boot/bash-trace/DEFAULT
new file mode 100644 (file)
index 0000000..61f8ae5
--- /dev/null
+++ b/fai/config/files/boot/bash-trace/DEFAULT
@@ -0,0 +1,48 @@
+# meant to be sourced. copy/pasted from https://iankelling.org/git/?p=errhandle;a=summary
+
+bash-trace() {
+    local -i argc_index=0 arg frame i start=${1:-1} max_indent=8 indent
+    local source
+    local extdebug=false
+    if [[ $(shopt -p extdebug) == *-s* ]]; then
+        extdebug=true
+    fi
+
+    for ((frame=0; frame < ${#FUNCNAME[@]}-1; frame++)); do
+        argc=${BASH_ARGC[frame]}
+        argc_index+=$argc
+        ((frame < start)) && continue
+        if (( ${#BASH_SOURCE[@]} > 1 )); then
+            source="${BASH_SOURCE[frame+1]}:${BASH_LINENO[frame]}:"
+        fi
+        indent=$((frame-start+1))
+        indent=$((indent < max_indent ? indent : max_indent))
+        printf "%${indent}s↳%sin \`%s" '' "$source" "${FUNCNAME[frame]}"
+        if $extdebug; then
+            for ((i=argc_index-1; i >= argc_index-argc; i--)); do
+                printf " %s" "${BASH_ARGV[i]}"
+            done
+        fi
+        echo \'
+    done
+}
+
+
+errcatch() {
+    set -E; shopt -s extdebug
+    _err-trap() {
+        err=$?
+        exec >&2
+        set +x
+        echo "${BASH_SOURCE[1]}:${BASH_LINENO[0]}:in \`$BASH_COMMAND' returned $err"
+        bash-trace 2
+        set -e
+        "${_errcatch_cleanup[@]}"
+        echo "$0: exiting with code $err"
+        exit $err
+    }
+    trap _err-trap ERR
+    set -o pipefail
+}
+
+errcatch

diff --git a/fai/config/files/boot/chboot/DEFAULT b/fai/config/files/boot/chboot/DEFAULT
index 8a093d9e32287de91e36266bd87bcb65fae7fc3f..ed65c80595ca871327046cb5866b2dd9459406cc 100755 (executable)
--- a/fai/config/files/boot/chboot/DEFAULT
+++ b/fai/config/files/boot/chboot/DEFAULT
@@ -16,7 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 

-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
+x="$(readlink -f "$BASH_SOURCE")"
+f="${x%/*}/bash-trace"
+if [[ -e $f ]]; then
+    source $f
+else
+    source ${x%/*}/../bash-trace/DEFAULT
+fi

 
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 
 
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 


@@ -32,10 +38,10 @@ For example, boot_debianjessie.
 For a system without libreboot, which is failing completely to
 boot on one distro, here is how I did a chboot for it:
 # arch-pxe had been run previously
 For a system without libreboot, which is failing completely to
 boot on one distro, here is how I did a chboot for it:
 # arch-pxe had been run previously

-pxe-server treetowl arch
-# reboot treetowl into arch live env
+pxe-server some_hostname arch
+# reboot some_hostname into arch live env

 pxe-server # disable pxe server
 pxe-server # disable pxe server

-ssh root@treetowl
+ssh root@some_hostname

 lsblk # identify boot dev. if boot dev is a raid, this could be repeated on all boot devs.
 mount /dev/sdd3 /mnt
 mount_point=/mnt/boot_debiantesting # the subvol i want to chboot to
 lsblk # identify boot dev. if boot dev is a raid, this could be repeated on all boot devs.
 mount /dev/sdd3 /mnt
 mount_point=/mnt/boot_debiantesting # the subvol i want to chboot to

diff --git a/fai/config/files/root/fai-check/VOL_STRETCH_BOOTSTRAP b/fai/config/files/root/fai-check/VOL_STRETCH_BOOTSTRAP
index b20e8e9cf5ae2865f96a386a5fe21d932a201391..7c405e6fb216a031cf36fa8d0cc31df011e27ff0 100755 (executable)
--- a/fai/config/files/root/fai-check/VOL_STRETCH_BOOTSTRAP
+++ b/fai/config/files/root/fai-check/VOL_STRETCH_BOOTSTRAP
@@ -68,8 +68,6 @@ for dev in $(btrfs fi show / | sed -rn 's#^\s*devid\s.*\s([^0-9 ]+)\S+$#\1#p' \
             # connection. So, we wait for 10 seconds.
             # ref: https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
             try-kexec ||:
             # connection. So, we wait for 10 seconds.
             # ref: https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
             try-kexec ||:

-        else
-            return 0

         fi
     else
         # we make sure there is only 1 grubenv,
         fi
     else
         # we make sure there is only 1 grubenv,

diff --git a/fai/config/hooks/extrbase.DEFAULT b/fai/config/hooks/extrbase.DEFAULT
index 4efa226eb86846ae5a1c39b0b3d99516b5046064..1d1a93194f13c9ece85dd904dc56fbe2a8baf8fc 100755 (executable)
--- a/fai/config/hooks/extrbase.DEFAULT
+++ b/fai/config/hooks/extrbase.DEFAULT
@@ -5,4 +5,3 @@ if ifclass VM && ! ifclass demohost; then
     exit 0
 fi
 
     exit 0
 fi
 

-#chattr -Rf +C /target

diff --git a/fai/config/hooks/instsoft.DEBIAN b/fai/config/hooks/instsoft.DEBIAN
index 13c517a991ee6d73fa7edb7eed7c3ce6609a9739..355f46d4f1a0743c8a940b3b7b59df149af8d6e5 100755 (executable)
--- a/fai/config/hooks/instsoft.DEBIAN
+++ b/fai/config/hooks/instsoft.DEBIAN
@@ -10,11 +10,12 @@ fi
 fcopy -Bi /etc/apt/apt.conf.d/force_confdef
 ainsl -a  /etc/ucf.conf "^conf_force_conffold=YES"
 
 fcopy -Bi /etc/apt/apt.conf.d/force_confdef
 ainsl -a  /etc/ucf.conf "^conf_force_conffold=YES"
 

-# in case the locales are already included inside the base file (Ubuntu)
-if [ -f $target/usr/sbin/locale-gen ]; then
-    $ROOTCMD dpkg-reconfigure -fnoninteractive locales
-    exit
-fi
+# ian: on flidas this gives an error: update-locale: Error: invalid locale settings:  LANG=en_US.UTF-8
+# # in case the locales are already included inside the base file (Ubuntu)
+# if [ -f $target/usr/sbin/locale-gen ]; then
+#     $ROOTCMD dpkg-reconfigure -fnoninteractive locales
+#     exit
+# fi

 
 # if we want to install locales, install them now
 install_packages -l 2>/dev/null | egrep  -q  ' locales|locales '
 
 # if we want to install locales, install them now
 install_packages -l 2>/dev/null | egrep  -q  ' locales|locales '

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index ca7b86dbcd31f399fddc7b722cf018e36f20a196..7a1967b2268b002bb3f76d8a734df652db99d6f8 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -18,12 +18,49 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 

+# for calling outside of FAI, first
+# source /a/bin/fai-wrapper
+# then to set classes with: fai-setclass OPT1...
+# which sets CLASS_OPT1=true...
+#
+# OPTIONS:
+#
+# environment variables:
+#
+# HOSTNAME: if frodo, we exclude 2 devices from the /boot array, which
+# the bios does not see. if demohost, we set the luks password to just
+# 'x'.
+#
+# SPECIAL_DISK: For use outside of fai. A base disk name like
+# /dev/sdk. If set, we just cryptsetup and partition this one disk then
+# exit. This is useful for partitioning a disk in preparation to replace
+# a failed or failing disk from a raid10 array.
+#
+# classes:
+#
+# REPARTITION: forces repartitioning even if we detect the proper amount
+# of partitions already exist.
+#
+# ROTATIONAL: forces to install onto hdds instead of sdds. normally sdds
+# are chosen if they exist.
+#
+# PARTITION_PROMPT: command line prompt before partitioning
+#
+# RAID0: forces raid0 filesystem. Normally with 4+ devices, we use
+# raid10.
+
+if [[ $SPECIAL_DISK ]]; then
+    export CLASS_REPARTITION=true
+fi
+

 # # fai's setup-storage won't do btrfs on luks,
 # # so we do it ourself :)
 # inspiration taken from files in fai-setup-storage package
 
 # # fai's setup-storage won't do btrfs on luks,
 # # so we do it ourself :)
 # inspiration taken from files in fai-setup-storage package
 

+# if we are not running in fai, skiptask won't be defined, so carry on.
+skiptask partition || ! type skiptask
+

 
 

-skiptask partition || ! type skiptask # for running not in fai

 
 #### begin configuration
 
 
 #### begin configuration
 


@@ -81,7 +118,7 @@ devbyid() {
     local f
     for f in $FAI/distro-install-common/devbyid \
                  /a/bin/fai/fai/config/distro-install-common/devbyid; do
     local f
     for f in $FAI/distro-install-common/devbyid \
                  /a/bin/fai/fai/config/distro-install-common/devbyid; do

-        if [[ -e $f ]]; then $f "$@"; fi
+        if [[ -e $f ]]; then $f "$@"; break; fi

     done
 
 }
     done
 
 }


@@ -196,7 +233,7 @@ fi
 
 if [[ ! $DISTRO ]]; then
     if ifclass VOL_STRETCH_BOOTSTRAP; then
 
 if [[ ! $DISTRO ]]; then
     if ifclass VOL_STRETCH_BOOTSTRAP; then

-        DISTRO=stretch_bootstrap
+        DISTRO=debianstretch_bootstrap

     elif ifclass VOL_STRETCH; then
         DISTRO=debianstretch
     elif ifclass VOL_TESTING; then
     elif ifclass VOL_STRETCH; then
         DISTRO=debianstretch
     elif ifclass VOL_TESTING; then


@@ -232,11 +269,11 @@ if [[ ! -e $luks_dir/host-$HOSTNAME ]]; then
     exit 1
 fi
 
     exit 1
 fi
 

-if ifclass tp; then
-    lukspw=$(cat $luks_dir/traci)
-else
-    lukspw=$(cat $luks_dir/iank)
-fi
+lukspw=$(cat $luks_dir/iank)
+# # ian: disabled while I use the tp host.
+# if ifclass tp; then
+#     lukspw=$(cat $luks_dir/traci)
+# fi

 if ifclass demohost; then
     lukspw=x
 fi
 if ifclass demohost; then
     lukspw=x
 fi


@@ -255,27 +292,37 @@ for dev in ${devs[@]}; do
 done
 shopt -s nullglob
 if $partition; then
 done
 shopt -s nullglob
 if $partition; then

-    for dev in ${devs[@]}; do
-        # if we repartition to the same as an old partition,
-        # we don't want any old fses hanging around.
-        for (( i=1; i <= lastn; i++ )); do
-            x=$(add-part $dev $i)
-            [[ -e $x ]] || continue
-            count_down=10
-            # wipefs has failed, manual run works, google suggests timing issue
-            while ! wipefs -a $x; do
-                sleep 2
-                count_down=$((count_down - 1))
-                (( count_down > 0 )) || exit 1
+
+    ### begin wipefs
+    if [[ ! $SPECIAL_DISK ]]; then
+        for dev in ${devs[@]}; do
+            # if we repartition to the same as an old partition,
+            # we don't want any old fses hanging around.
+            for (( i=1; i <= lastn; i++ )); do
+                x=$(add-part $dev $i)
+                [[ -e $x ]] || continue
+                count_down=10
+                # wipefs has failed, manual run works, google suggests timing issue
+                while ! wipefs -a $x; do
+                    sleep 2
+                    count_down=$((count_down - 1))
+                    (( count_down > 0 )) || exit 1
+                done

             done
         done
             done
         done

-    done
+    fi
+    ### end wipefs
+

     for dev in ${devs[@]}; do
     for dev in ${devs[@]}; do

+        if [[ $SPECIAL_DISK ]]; then
+            dev=$(devbyid $SPECIAL_DISK)
+        fi
+

         # parted will round up the disk size. Do -1 so we can have
         # fully 1MiB unit partitions for easy resizing of the last partition.
         # Otherwise we would pass in -0 for the end argument for the last partition.
         #
         # parted will round up the disk size. Do -1 so we can have
         # fully 1MiB unit partitions for easy resizing of the last partition.
         # Otherwise we would pass in -0 for the end argument for the last partition.
         #

-        # parted print error output is expected. example:
+        # Note: parted print error output is expected. example:

         # Error: /dev/vda: unrecognised disk label
         disk_mib=$(( $(parted -m $dev unit MiB print | \
                            sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1))
         # Error: /dev/vda: unrecognised disk label
         disk_mib=$(( $(parted -m $dev unit MiB print | \
                            sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1))


@@ -350,6 +397,10 @@ if $partition; then
 
         cryptsetup luksOpen `rootdev` `root-cryptname` \
                    --key-file $luks_dir/host-$HOSTNAME
 
         cryptsetup luksOpen `rootdev` `root-cryptname` \
                    --key-file $luks_dir/host-$HOSTNAME

+
+        if [[ $SPECIAL_DISK ]]; then
+            exit 0
+        fi

     done
     ls -la /dev/btrfs-control # this was probably for debugging...
     sleep 1
     done
     ls -la /dev/btrfs-control # this was probably for debugging...
     sleep 1


@@ -365,7 +416,7 @@ else
 fi
 
 
 fi
 
 

-if [[ $DISTRO != stretch_bootstrap ]]; then
+if [[ $DISTRO != debianstretch_bootstrap ]]; then

     # bootstrap distro doesn't use separate encrypted root.
     mount -o subvolid=0 $first_root_crypt /mnt
     # systemd creates subvolumes we want to delete.
     # bootstrap distro doesn't use separate encrypted root.
     mount -o subvolid=0 $first_root_crypt /mnt
     # systemd creates subvolumes we want to delete.


@@ -403,7 +454,7 @@ btrfs subvolume set-default 0 /mnt # already default, just ensuring it.
 mkdir -p /mnt/grub2
 cp $FAI/distro-install-common/libreboot_grub.cfg /mnt/grub2
 
 mkdir -p /mnt/grub2
 cp $FAI/distro-install-common/libreboot_grub.cfg /mnt/grub2
 

-if [[ $DISTRO == stretch_bootstrap ]]; then
+if [[ $DISTRO == debianstretch_bootstrap ]]; then

     # this is just convenience for the libreboot_grub config
     # so we can glob the other ones easier.
     boot_vol=$DISTRO
     # this is just convenience for the libreboot_grub config
     # so we can glob the other ones easier.
     boot_vol=$DISTRO


@@ -422,7 +473,7 @@ grub-editenv /mnt/grubenv set did_fai_check=true
 grub-editenv /mnt/grubenv set last_boot=/$boot_vol
 umount /mnt
 
 grub-editenv /mnt/grubenv set last_boot=/$boot_vol
 umount /mnt
 

-if [[ $DISTRO == stretch_bootstrap ]]; then
+if [[ $DISTRO == debianstretch_bootstrap ]]; then

     cat > /tmp/fai/fstab <<EOF
 $first_boot_dev  /  btrfs  noatime,subvol=$boot_vol  0 0
 EOF
     cat > /tmp/fai/fstab <<EOF
 $first_boot_dev  /  btrfs  noatime,subvol=$boot_vol  0 0
 EOF

diff --git a/fai/config/package_config/DEBIAN b/fai/config/package_config/DEBIAN
index fb14b468023d2490d4f4a552d6525f55f0ce1c92..d3e19e45c6363757921450e5ef43066dac427500 100644 (file)
--- a/fai/config/package_config/DEBIAN
+++ b/fai/config/package_config/DEBIAN
@@ -23,12 +23,16 @@ PACKAGES install DHCPC
 isc-dhcp-client
 
 # ian: note everything after the grub package should be refactored into
 isc-dhcp-client
 
 # ian: note everything after the grub package should be refactored into

-# a new class.
+# a new class. This line is duplicated in UBUNTU
+# lsof is used in my btrfs util scritps.
+# netcat is used for proxy.
+# resolvconf because if we don't install it now we have to reboot for it to
+# take effect.

 PACKAGES install GRUB_PC
 PACKAGES install GRUB_PC

-grub-pc cryptsetup btrfs-tools sudo bridge-utils netcat-openbsd resolvconf
+grub-pc cryptsetup btrfs-tools sudo bridge-utils netcat-openbsd resolvconf lsof

 
 PACKAGES install GRUB_EFI
 
 PACKAGES install GRUB_EFI

-grub-efi cryptsetup btrfs-tools sudo bridge-utils netcat-openbsd resolvconf
+grub-efi cryptsetup btrfs-tools sudo bridge-utils netcat-openbsd resolvconf lsof

 
 
 #resolvconf because dpkg-reconfigure on it has this message in flidas:
 
 
 #resolvconf because dpkg-reconfigure on it has this message in flidas:

diff --git a/fai/config/package_config/UBUNTU b/fai/config/package_config/UBUNTU
index 1c7f8e0aa826c13035d87e5ba721c6d7a6c26690..4cd78c4ca85e06404db0ffbb6ac0be6f012459e0 100644 (file)
--- a/fai/config/package_config/UBUNTU
+++ b/fai/config/package_config/UBUNTU
@@ -13,7 +13,7 @@ PACKAGES install DHCPC
 isc-dhcp-client
 
 PACKAGES install GRUB_PC
 isc-dhcp-client
 
 PACKAGES install GRUB_PC

-grub-pc cryptsetup btrfs-tools bridge-utils netcat-openbsd
+grub-pc cryptsetup btrfs-tools bridge-utils netcat-openbsd lsof

 
 PACKAGES install XORG
 ubuntu-desktop
 
 PACKAGES install XORG
 ubuntu-desktop

diff --git a/faiserver-setup b/faiserver-setup
index 78786c26dd35bbbe572cb74dd95379401618b013..491cfda4107b274ef69f378b1c6fbe390df8dacd 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -43,8 +43,6 @@ esac
 
 e() { echo "$@"; "$@"; }
 
 
 e() { echo "$@"; "$@"; }
 

-# When stretch becomes stable, change this to stretch.
-# I\'ve tested this with stretch, it works, but notably,

 # the automatic basefile getting will be for stretch
 # instead of jessie, so if you install jessie, you need
 # to setup the basefile and it\'s corresponding class.
 # the automatic basefile getting will be for stretch
 # instead of jessie, so if you install jessie, you need
 # to setup the basefile and it\'s corresponding class.


@@ -181,7 +179,7 @@ fi
 if armhf; then
   cd /srv/fai
   rm -rf nfsroot
 if armhf; then
   cd /srv/fai
   rm -rf nfsroot

-  tar Jxf /a/bin/fai-basefiles/base.tar.xz
+  tar Jxf /a/bin/fai-basefiles/basefiles/STRETCH64.tar.xz

   # background: Can't build the nfsroot on my arm system now.  First,
   # fai-make-nfsroot won't work out of the box. One idea to make it work
   # is by installing qemu-user-static, then copying qemu-x86_64-static
   # background: Can't build the nfsroot on my arm system now.  First,
   # fai-make-nfsroot won't work out of the box. One idea to make it work
   # is by installing qemu-user-static, then copying qemu-x86_64-static


@@ -231,8 +229,10 @@ EOF
   # seem contradictory, but it works.
   fai-setup -evag
 
   # seem contradictory, but it works.
   fai-setup -evag
 

-else
-    e fai-setup -e -vf
+else # not armhf
+    # note, this copies the -B arg to
+    # /srv/fai/nfsroot/var/tmp/base.tar.xz
+    e fai-setup -evf -B /a/bin/fai-basefiles/basefiles/STRETCH64.tar.xz

     # make the faiserver also the apt proxy server
     apt-get -y install apt-cacher-ng
 fi
     # make the faiserver also the apt proxy server
     apt-get -y install apt-cacher-ng
 fi

diff --git a/install-chboot b/install-chboot
index 098b23220cb6355a4065b180c0f480badab0e733..acb6531f835a1888963070e41ea42215ae0309dc 100755 (executable)
--- a/install-chboot
+++ b/install-chboot
@@ -48,6 +48,7 @@ for dir in $mount_point/*; do
     if [[ -e $dir/boot ]]; then
         dir=$dir/boot
     fi
     if [[ -e $dir/boot ]]; then
         dir=$dir/boot
     fi

+    e install -m 755 -o root -g root bash-trace $dir

     e install -m 755 -o root -g root chboot $dir
 done
 e umount $mount_point
     e install -m 755 -o root -g root chboot $dir
 done
 e umount $mount_point

diff --git a/myfai-chboot-local b/myfai-chboot-local
index 6d7e019607869a4ecfff4a12feab8807caf38acb..d16f3b14961bb6cc9163f1a428496d7b86ade3cc 100755 (executable)
--- a/myfai-chboot-local
+++ b/myfai-chboot-local
@@ -34,18 +34,23 @@ host=$1
 # assuming ipv4, or else we might need to deal with multiple addresses
 # in an ipv4 + ipv6 network.
 my_ip=$(ip -4 route get 8.8.8.8 | sed -nr 's,^.*src\s+(\S+).*,\1,p')
 # assuming ipv4, or else we might need to deal with multiple addresses
 # in an ipv4 + ipv6 network.
 my_ip=$(ip -4 route get 8.8.8.8 | sed -nr 's,^.*src\s+(\S+).*,\1,p')

-if [[ $x =~ [[:space:]] ]]; then
+if [[ ! $my_ip || $my_ip =~ [[:space:]] ]]; then

     echo "$0: error: failed to get \$my_ip, got: $my_ip"
     exit 1
 fi
 
 if [[ $host == default ]]; then
     echo "$0: error: failed to get \$my_ip, got: $my_ip"
     exit 1
 fi
 
 if [[ $host == default ]]; then

-    ip=$network
+    ip='*'

 elif [[ $host == [0-9]*.[0-9]*.[0-9]*.[0-9]* ]]; then
 elif [[ $host == [0-9]*.[0-9]*.[0-9]*.[0-9]* ]]; then

-    ip=$host
+    ip=$host/32

 else
     type -t host &>/dev/null || apt-get -y install dnsutils
     ip=$(host $host | sed -rn 's/^\S+ has address //p;T;q')/32
 else
     type -t host &>/dev/null || apt-get -y install dnsutils
     ip=$(host $host | sed -rn 's/^\S+ has address //p;T;q')/32

+    if [[ ! $ip || $ip =~ [[:space:]] ]]; then
+        echo "$0: error: failed to get \$my_ip, got: $my_ip"
+        exit 1
+    fi
+

 fi
 
 if modprobe nfsd &>/dev/null; then
 fi
 
 if modprobe nfsd &>/dev/null; then

diff --git a/pxe-server b/pxe-server
index 7fced849def066ca634f42b3ab20f27708c9bc94..b1700beab398c08cdc9b1a9b60b99112209b0008 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -64,7 +64,7 @@ dhcp=true
 redep=true
 acks=2
 wait=false
 redep=true
 acks=2
 wait=false

-temp=$(getopt -l help harSw "$@") || usage 1
+temp=$(getopt -l help adrSwh "$@") || usage 1

 eval set -- "$temp"
 while true; do
     case $1 in
 eval set -- "$temp"
 while true; do
     case $1 in


@@ -90,6 +90,12 @@ case $# in
         ;;
 esac
 
         ;;
 esac
 

+if $wait && ! $dhcp; then
+    echo "$0: error -w conflicts with -d, choose one or other"
+    exit 1
+fi
+
+

 if [[ $host && $host != default ]]; then
     host_tag="tag:$host,"
 fi
 if [[ $host && $host != default ]]; then
     host_tag="tag:$host,"
 fi

diff --git a/wrt-setup b/wrt-setup
index 4be2e41a9c905f3c46130a5ff511bbbf61b559c0..24aa3a03e55ff53af93229afa0d832c27f60893a 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -91,28 +91,32 @@ mkdir -p /run/archiso/bootmnt
 # todo: at some later time, i found /mnt/usb not mounted, watch to see if
 # that is the case after running this or rebooting.
 # wiki says safe to do in case of fstab changes:
 # todo: at some later time, i found /mnt/usb not mounted, watch to see if
 # that is the case after running this or rebooting.
 # wiki says safe to do in case of fstab changes:

-cedit /etc/config/fstab <<'EOF' || { v block umount; v block mount; }
-config global automount
-      option from_fstab 1
-      option anon_mount 1
-
-config global autoswap
-      option from_fstab 1
-      option anon_swap 1
-
-config mount
-      option target    /mnt/usb
-      option device    /dev/sda2
-      option fstype    ext4
-      option options   rw,async,noatime,nodiratime
-      option enabled   1
-      option enabled_fsck 0
-
-config swap
-      option device    /dev/sda1
-      option enabled   1

 
 

-EOF
+## ian: commented and replaced with just an echo
+## since usb port seems to be busted.
+echo | cedit /etc/config/fstab
+# cedit /etc/config/fstab <<'EOF' || { v block umount; v block mount; }
+# config global automount
+#       option from_fstab 1
+#       option anon_mount 1
+
+# config global autoswap
+#       option from_fstab 1
+#       option anon_swap 1
+
+# config mount
+#       option target  /mnt/usb
+#       option device  /dev/sda2
+#       option fstype  ext2
+#       option options rw,async,noatime,nodiratime
+#       option enabled 1
+#       option enabled_fsck 0
+
+# config swap
+#       option device  /dev/sda1
+#       option enabled 1
+
+# EOF

 
 
 
 
 
 


@@ -261,14 +265,15 @@ dnsmasq_restart=false
 v cedit /etc/hosts <<EOF || dnsmasq_restart=true
 127.0.1.1 wrt
 192.168.1.1 wrt
 v cedit /etc/hosts <<EOF || dnsmasq_restart=true
 127.0.1.1 wrt
 192.168.1.1 wrt

-192.168.1.2 treetowl b8.nz faiserver
+192.168.1.2 treetowl

 192.168.1.3 frodo
 192.168.1.4 htpc
 192.168.1.3 frodo
 192.168.1.4 htpc

-192.168.1.5 x2
+192.168.1.5 x2 faiserver b8.nz

 192.168.1.6 demohost
 #192.168.1.7 faiserver
 192.168.1.8 tp
 192.168.1.9 n5
 192.168.1.6 demohost
 #192.168.1.7 faiserver
 192.168.1.8 tp
 192.168.1.9 n5

+192.168.1.10 kw

 72.14.176.105 li
 45.33.9.11 lj
 138.68.10.24 dopub
 72.14.176.105 li
 45.33.9.11 lj
 138.68.10.24 dopub


@@ -365,6 +370,7 @@ dhcp-host=c4:43:8f:f2:79:1f,set:n5,192.168.1.9,n5
 # so might as well use it.
 # hostname is the name it uses according to telnet
 dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,192.168.1.251,switch9429ca
 # so might as well use it.
 # hostname is the name it uses according to telnet
 dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,192.168.1.251,switch9429ca

+dhcp-host=10:78:d2:da:28:4f,set:kw,192.168.1.10,kw

 
 
 # template
 
 
 # template