2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

2017-04: Retroactive Updates

Browse source 
* Updated drive detection to support NVMe drives (SMART and badblocks)
* Misc cleanup
This commit is contained in:
Alan Mason 2017-12-06 17:57:27 -08:00
parent 1297501714
commit 18e9e0b332
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archlive/airootfs/usr/local/bin/hw-diags-inner
View file

@ -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

1
archlive/packages.both
View file

@ -11,7 +11,6 @@ chntpw
cmatrix
colordiff
conky
cower
crda
curl
darkhttpd

2
archlive/pacman.conf
View file

@ -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

4
build-wk
View file

@ -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)"