add backtrace script and improve config file instructions

config/aarch64/desktop-minimal.toml

@@ -1,3 +1,14 @@
 # Default desktop configuration
 
 include = ["../desktop-minimal.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/aarch64/server-minimal.toml

@@ -1,3 +1,14 @@
 # Minimal configuration
 
 include = ["../server-minimal.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/i686/desktop-minimal.toml

@@ -1,3 +1,14 @@
 # Default desktop configuration
 
 include = ["../desktop-minimal.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/i686/desktop.toml

@@ -1,3 +1,14 @@
 # Default desktop configuration
 
 include = ["../desktop.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/i686/dev.toml

@@ -1,3 +1,14 @@
 # Configuration for development, includes cargo and rustc
 
 include = ["../dev.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/i686/server-minimal.toml

@@ -1,3 +1,14 @@
 # Minimal configuration
 
 include = ["../server-minimal.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/i686/server.toml

@@ -1,3 +1,14 @@
 # Default server configuration
 
 include = ["../server.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/x86_64/desktop-contain.toml

@@ -2,6 +2,17 @@
 
 include = ["../desktop.toml"]
 
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}
+
 # Override orbital init to use contain_orblogin
 [[files]]
 path = "/etc/init.d/20_orbital"

config/x86_64/desktop-minimal.toml

@@ -1,3 +1,14 @@
 # Default desktop configuration
 
 include = ["../desktop-minimal.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/x86_64/desktop.toml

@@ -1,3 +1,14 @@
 # Default desktop configuration
 
 include = ["../desktop.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/x86_64/dev.toml

@@ -1,3 +1,14 @@
 # Configuration for development, includes cargo and rustc
 
 include = ["../dev.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/x86_64/server-minimal.toml

@@ -1,3 +1,14 @@
 # Minimal configuration
 
 include = ["../server-minimal.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/x86_64/server.toml

@@ -1,3 +1,14 @@
 # Default server configuration
 
 include = ["../server.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

scripts/backtrace.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+usage()
+{
+    echo "Usage: $0 -r recipe [ -e command_name ] [ -R ] [ -X | -6 | -A ] [[ -b backtracefile ] | [ addr1 ... ]]"
+    echo
+    echo "Print the backtrace contained in the backtracefile."
+    echo "Symbols are taken from the executable for the given recipe."
+    echo "If no backtracefile is given, decode the given addresses instead."
+    echo "This command must be run in the 'redox' directory."
+    echo
+    echo "-X for x86_64, -6 for i686, -A for aarch64 (x86_64 is the default)."
+    echo "To read from stdin, use '-b -'"
+    echo "The name of the executable must match what Cargo believes it to be."
+    echo "If the executalbe is named 'recipe_command', just use 'command' as the name."
+    echo "The debug version of the executable is used if available."
+    echo "The release version is used if no debug version exists."
+    echo "-R to force the use of the 'release' version of the executable."
+    echo "Make sure the executable is the one that produced the backtrace."
+    exit 1
+}
+
+ARCH="x86_64"
+
+while getopts ":b:e:r:hRXA6" opt
+do
+    case "$opt" in
+        X) ARCH="x86_64";;
+        A) ARCH="aarch64";;
+        6) ARCH="i686";;
+        b) INFILE="$OPTARG";;
+        e) COMMAND="$OPTARG";;
+        i) INST="$OPTARG";;
+        r) RECIPE_NAME="$OPTARG";;
+        R) RELEASE=true;;
+	h) usage;;
+	\?) echo "Unknown option -$OPTARG, try -h for help"; exit;;
+        :) echo "-$OPTARG requires a value"; exit;;
+	esac
+done
+shift $((OPTIND -1))
+
+if [ -z "$RECIPE_NAME" ]
+then
+    usage
+fi
+
+if [ -z "$INFILE" -a $# = 0 ]
+then
+    usage
+fi
+
+# if no command name is given, assume it's the same as the recipe name
+RECIPE_DIR="$(cd cookbook; target/release/find_recipe $RECIPE_NAME)"
+if [ -z "$COMMAND" ]
+then
+    COMMAND="$RECIPE_NAME"
+fi
+
+# look for the debug version of the command
+EXECUTABLE=cookbook/"$RECIPE_DIR"/target/"$ARCH"-unknown-redox/build/target/"$ARCH"-unknown-redox/debug/"$COMMAND"
+
+# try the release version next
+if [ ! -f "$EXECUTABLE" -o ! -z "$RELEASE" ]
+then
+    EXECUTABLE=cookbook/"$RECIPE_DIR"/target/"$ARCH"-unknown-redox/build/target/"$ARCH"-unknown-redox/release/"$COMMAND"
+fi
+
+if [ $# -ne 0 ]
+then
+    addr2line --demangle=rust --inlines --pretty-print --functions --exe="$EXECUTABLE" $@
+else
+    sed '/^\s*$/d; s/^.*0x\([0-9a-f]*\).*$/\1/g' "$INFILE" | addr2line --demangle=rust --inlines --pretty-print --functions --exe="$EXECUTABLE"
+fi
+