Merge pull request #42 from 128technology/develop

Develop

Author: laneshields

README.md

@@ -4,8 +4,11 @@ This repository contains files and instructions that can be used to setup a basi
 
 This software is provided as a 128T Community supported application and is not maintained by 128 Technology officially.  Any issues can be reported through this github repository with no guarantee that a fix will be provided and no SLA for any fix timeframes.
 
-> **Current Release: v1.2, July 22, 2021
->
+> **Current Release: v1.2.1, August 16, 2021
+> * Updates from v1.2:
+> * Disable getty in containers to avoid taking over screen on attached monitor/console
+> * Create kickstart pre section to eject USB disks to avoid overwriting devices that force PXE boot
+> 
 > * Updates from v1.1:
 > * Introduced database schema versions - no more need to manually handle tables on upgrades (including this one)
 > * Allow toggling of ISO post install behavior between default "shutdown" and "reboot" - useful when using a default quickstart

webapp/Dockerfile

@@ -1,7 +1,7 @@
 FROM centos:7
 
 RUN yum -y install epel-release
-RUN yum -y install python3 openssl redis nfs-utils xorriso
+RUN yum -y install python3 openssl redis nfs-utils xorriso rpcbind
 
 ENV VIRTUAL_ENV=/opt/venv
 RUN python3 -m venv $VIRTUAL_ENV
@@ -23,11 +23,14 @@ COPY conf.d-celery /etc/conf.d/celery
 COPY proxy.conf /etc/conf.d/proxy.conf
 COPY webapp.service /etc/systemd/system
 COPY setup_scripts.sh /opt/
+COPY eject_usb_disks.sh /opt/
 
 RUN systemctl enable celery
 RUN systemctl enable webapp
 RUN systemctl enable redis
-RUN systemctl enable nfs
+RUN systemctl enable rpcbind.service
+RUN systemctl enable rpcbind.socket
+RUN systemctl disable [email protected]
 
 ENV LC_ALL=en_US.UTF-8
 ENV FLASK_APP="blaster.factory"

webapp/blaster/constants.py

@@ -13,6 +13,7 @@
 UEFI_TFTPBOOT_DIR = '/opt/tftpboot.uefi'
 BIOS_TFTPBOOT_DIR = '/opt/tftpboot.bios'
 SCRIPT_KS_SNIPPET = '/opt/setup_scripts.sh'
+EJECT_USB_KS_SNIPPET = '/opt/eject_usb_disks.sh'
 UEFI_IP = '192.168.128.4'
 BIOS_IP = '192.168.128.3'
 NFS_IP = '192.168.128.128'

webapp/blaster/tasks.py

@@ -18,6 +18,9 @@
     '%include /mnt/install/repo/setup_scripts.sh\n',
     '# Notify blaster this system has completed blasting\n',
     'curl -XPOST http://192.168.128.128/node/add/`dmidecode --string system-serial-number`\n',
+    '%end\n',
+    '%pre\n',
+    '%include /mnt/install/repo/eject_usb_disks.sh\n',
     '%end\n'
 ]
 
@@ -193,6 +196,8 @@ def stage_image(name):
 
     print(f"Setting up snippet to stage bootstrap scripts for image {name}")
     shutil.copyfile(constants.SCRIPT_KS_SNIPPET, nfs_dir / 'setup_scripts.sh')
+    print(f"Setting up snippet to eject USB drives before install for image {name}")
+    shutil.copyfile(constants.EJECT_USB_KS_SNIPPET, nfs_dir / 'eject_usb_disks.sh')
 
     print(f"Updating password hashes for image {name}")
     update_password(name)

webapp/eject_usb_disks.sh

@@ -0,0 +1,5 @@
+for usb_drive in /dev/disk/by-path/*usb*; do
+  USB_DEV=`readlink $usb_drive | xargs basename`
+  echo "offline" > /sys/block/$USB_DEV/device/state
+  echo "1" > /sys/block/$USB_DEV/device/delete
+done