X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=dsfull;h=54ee3661a8a5d3c5569c6d89ed1cc55d1f5c7e7e;hb=1885f9677fdf2bfeac95285cf13a7d60273d096a;hp=c6f18759b4e711ebb33cf7c28eac1a8282962e46;hpb=da12892acf1eda37539938f2dd726f815b377e7a;p=automated-distro-installer
diff --git a/dsfull b/dsfull
index c6f1875..54ee366 100755
--- a/dsfull
+++ b/dsfull
@@ -1,11 +1,21 @@
#!/bin/bash -l
# Copyright (C) 2016 Ian Kelling
-# This program is under GPL v. 3 or later, see
-# distro setup full. (assuming we already synced data files to the host)
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+cleanup() { :; }
+trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
reboot=true
if [[ $1 == -r ]]; then
@@ -13,21 +23,81 @@ if [[ $1 == -r ]]; then
shift
fi
+usage() {
+ cat <