Commit 69ea4204 authored by Harald Sitter's avatar Harald Sitter

split stdout and stderr

lest calamares fails to parse output :O
parent e4f6b72e
......@@ -37,10 +37,16 @@ File.write('/sbin/sfdisk', <<-EOF)
set -ex
echo "" >> /tmp/sfdisk.log
echo "" >> /tmp/sfdisk.log
echo "" >> /tmp/sfdisk.log
echo "sfdisk $@" >> /tmp/sfdisk.log
/sbin/sfdisk.orig "$@" 2>&1 | tee -a /tmp/sfdisk.log
echo "" >> /tmp/sfdisk-stdout.log
echo "" >> /tmp/sfdisk-stdout.log
echo "" >> /tmp/sfdisk-stdout.log
echo "sfdisk $@" >> /tmp/sfdisk-stdout.log
echo "" >> /tmp/sfdisk-stderr.log
echo "" >> /tmp/sfdisk-stderr.log
echo "" >> /tmp/sfdisk-stderr.log
echo "sfdisk $@" >> /tmp/sfdisk-stderr.log
/sbin/sfdisk.orig "$@" > >(tee -a /tmp/sfdisk-stdout.log) 2> >(tee -a sfdisk-stderr.log >&2)
EOF
File.chmod(0o755, '/sbin/sfdisk')
......@@ -196,7 +196,8 @@ sub upload_calamares_logs {
# Even newer:
upload_logs '/home/neon/.cache/calamares/session.log', failok => 1;
upload_logs '/tmp/sfdisk.log', failok => 1;
upload_logs '/tmp/sfdisk-stdout.log', failok => 1;
upload_logs '/tmp/sfdisk-stderr.log', failok => 1;
}
sub post_fail_hook {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment