From 18e9e0b3329630a15a31ea1500068316af9e9327 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Wed, 6 Dec 2017 17:57:27 -0800
Subject: [PATCH] 2017-04: Retroactive Updates

* Updated drive detection to support NVMe drives (SMART and badblocks)
* Misc cleanup
---
 archlive/airootfs/usr/local/bin/hw-diags-inner | 2 +-
 archlive/packages.both                         | 1 -
 archlive/pacman.conf                           | 2 +-
 build-wk                                       | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/archlive/airootfs/usr/local/bin/hw-diags-inner b/archlive/airootfs/usr/local/bin/hw-diags-inner
index b5084e57..f72d734f 100644
--- a/archlive/airootfs/usr/local/bin/hw-diags-inner
+++ b/archlive/airootfs/usr/local/bin/hw-diags-inner
@@ -60,7 +60,7 @@ OUT="$TMP_DIR/hw-diags.out"
 
 ## Some code borrowed from stackoverflow.com/a/10020397
 ARCH_DRIVES=($(ls -l /dev/disk/by-label | grep -iE 'ARCH.*[hs]d[a-z]' | sed -r 's#.*/([hs]d[a-z])[0-9]+#\1#' | sort | uniq))
-DRIVES=($(inxi -Dxx -c 0 | grep -E "ID-[0-9]+" | sed -r 's#.*/dev/([hs]d[a-z]).*#\1#' | sort))
+DRIVES=($(inxi -Dxx -c 0 | grep -E "ID-[0-9]+" | sed -r 's#.*/dev/([hs]d[a-z]|nvme[0-9]n[0-9]).*#\1#' | sort))
 for d in "${ARCH_DRIVES[@]}"; do
     DRIVES=(${DRIVES[@]//*$d*})
 done
diff --git a/archlive/packages.both b/archlive/packages.both
index 6292f689..75016011 100644
--- a/archlive/packages.both
+++ b/archlive/packages.both
@@ -11,7 +11,6 @@ chntpw
 cmatrix
 colordiff
 conky
-cower
 crda
 curl
 darkhttpd
diff --git a/archlive/pacman.conf b/archlive/pacman.conf
index aed6a94d..feb74a44 100644
--- a/archlive/pacman.conf
+++ b/archlive/pacman.conf
@@ -71,7 +71,7 @@ LocalFileSigLevel = Optional
 
 [customrepo]
 SigLevel = Optional TrustAll
-Server = file:///root/wk-arch/custom-repo/$arch
+Server = file:///home/wkadmin/wk-arch/custom-repo/$arch
 
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
diff --git a/build-wk b/build-wk
index 4214508c..03ae31da 100644
--- a/build-wk
+++ b/build-wk
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # Set Vars
-LOG_DIR="/D_Drive/ArchBuilds/BuildLogs"
-OUT_DIR="/D_Drive/ArchBuilds"
+LOG_DIR="/ArchBuilds/BuildLogs"
+OUT_DIR="/ArchBuilds"
 TMP_DIR="/ScratchDir"
 DATE="$(date +%F)"
 DATETIME="$(date +%F_%H%M)"