add copyright, fix arch

[automated-distro-installer] / arch-init

diff --git a/arch-init b/arch-init
index 0ce3bf01d1bfc3d6f981d4fa9148840f4bd196d9..e22b37a7ffdd08d7e71a47e1735b82ecf91526ca 100755 (executable)
--- a/arch-init
+++ b/arch-init
@@ -1,6 +1,19 @@
 #!/bin/bash -x
+# Copyright (C) 2016 Ian Kelling
 
-# see t.org for how to call
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
@@ -26,7 +39,6 @@ curl -s 'https://www.archlinux.org/mirrorlist/?country=US&protocol=https&ip_vers
 
 . /a/bin/fai/fai-wrapper
 export LUKS_DIR=/root/luks
-export HOSTNAME=$hostname
 export DISTRO=arch
 partition_script=/a/bin/fai/fai/config/hooks/partition.DEFAULT
 chmod +x $partition_script
@@ -67,7 +79,7 @@ if ! $already_partitioned; then
 fi
 
 # https://wiki.archlinux.org/index.php/Dm-crypt/Device_encryption#Keyfiles
-cp /root/luks/host-$hostname /mnt/crypto_keyfile.bin
+cp /root/luks/host-$HOSTNAME /mnt/crypto_keyfile.bin
 chmod 600 /mnt/crypto_keyfile.bin
 
 
@@ -104,7 +116,7 @@ rm -f /mnt/etc/resolv.conf
 ln -s /run/systemd/resolve/resolv.conf /mnt/etc/resolv.conf
 
 # not necsesary, but makes reboot go fast.
-#umount -R /mnt; sleep 1
+umount -R /mnt; sleep 1
 
 # causes 255 exit code, so doing this from the caller script.
 # reboot now