Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
527049cdb2
3 changed files with 10 additions and 2 deletions
|
|
@ -859,11 +859,14 @@ def run_ddrescue(state, pass_settings):
|
||||||
height_ddrescue = height - height_smart - height_journal
|
height_ddrescue = height - height_smart - height_journal
|
||||||
|
|
||||||
# Show SMART status
|
# Show SMART status
|
||||||
|
smart_dev = state.source_path
|
||||||
|
if state.source.parent:
|
||||||
|
smart_dev = state.source.parent
|
||||||
smart_pane = tmux_splitw(
|
smart_pane = tmux_splitw(
|
||||||
'-bdvl', str(height_smart),
|
'-bdvl', str(height_smart),
|
||||||
'-PF', '#D',
|
'-PF', '#D',
|
||||||
'watch', '--color', '--no-title', '--interval', '300',
|
'watch', '--color', '--no-title', '--interval', '300',
|
||||||
'ddrescue-tui-smart-display', state.source_path)
|
'ddrescue-tui-smart-display', smart_dev)
|
||||||
|
|
||||||
# Show systemd journal output
|
# Show systemd journal output
|
||||||
journal_pane = tmux_splitw(
|
journal_pane = tmux_splitw(
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,11 @@ def get_feature_string(chip, feature):
|
||||||
|
|
||||||
for sf in sfs:
|
for sf in sfs:
|
||||||
name = sf.name[skipname:].decode("utf-8").strip()
|
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:
|
if 'alarm' in name:
|
||||||
# Skip
|
# Skip
|
||||||
continue
|
continue
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
|
|
||||||
# Connect
|
# Connect
|
||||||
connect-to-network
|
connect-to-network
|
||||||
|
sleep 2s
|
||||||
|
|
||||||
IP="$(ip a show scope global \
|
IP="$(ip a show scope global \
|
||||||
| grep inet \
|
| grep inet \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue