From 6a67052d83a0eef3645cf711c3f42ca7c884c384 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Mon, 8 Oct 2018 15:47:40 -0600 Subject: [PATCH 1/3] Show SMART for parent dev if child dev selected --- .bin/Scripts/functions/ddrescue.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.bin/Scripts/functions/ddrescue.py b/.bin/Scripts/functions/ddrescue.py index 4af88e84..eba04452 100644 --- a/.bin/Scripts/functions/ddrescue.py +++ b/.bin/Scripts/functions/ddrescue.py @@ -859,11 +859,14 @@ def run_ddrescue(state, pass_settings): height_ddrescue = height - height_smart - height_journal # Show SMART status + smart_dev = state.source_path + if state.source.parent: + smart_dev = state.source.parent smart_pane = tmux_splitw( '-bdvl', str(height_smart), '-PF', '#D', 'watch', '--color', '--no-title', '--interval', '300', - 'ddrescue-tui-smart-display', state.source_path) + 'ddrescue-tui-smart-display', smart_dev) # Show systemd journal output journal_pane = tmux_splitw( From 1cb7de08f3b3c0d10ab240b59a89cdc0f7f3c1fd Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Wed, 10 Oct 2018 15:47:48 -0600 Subject: [PATCH 2/3] Add small delay to network startup * Will hopefully allow test-stations to update the hostname more reliably --- .linux_items/include/airootfs/etc/skel/.update_network | 1 + 1 file changed, 1 insertion(+) diff --git a/.linux_items/include/airootfs/etc/skel/.update_network b/.linux_items/include/airootfs/etc/skel/.update_network index 97b5783b..e7119a37 100755 --- a/.linux_items/include/airootfs/etc/skel/.update_network +++ b/.linux_items/include/airootfs/etc/skel/.update_network @@ -5,6 +5,7 @@ # Connect connect-to-network +sleep 2s IP="$(ip a show scope global \ | grep inet \ From bf354edeae8513cda96d31eb488ce454d35134c0 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Wed, 10 Oct 2018 15:48:18 -0600 Subject: [PATCH 3/3] Fix hw-sensor bug caused by upstream code --- .bin/Scripts/hw-sensors | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.bin/Scripts/hw-sensors b/.bin/Scripts/hw-sensors index 2a1a46e0..f251c589 100755 --- a/.bin/Scripts/hw-sensors +++ b/.bin/Scripts/hw-sensors @@ -67,7 +67,11 @@ def get_feature_string(chip, feature): for sf in sfs: name = sf.name[skipname:].decode("utf-8").strip() - val = sensors.get_value(chip, sf.number) + try: + val = sensors.get_value(chip, sf.number) + except Exception: + # Ignore upstream sensor bugs and lie instead + val = -123456789 if 'alarm' in name: # Skip continue