small bug fixes and improvements

[automated-distro-installer] / arch-init

diff --git a/arch-init b/arch-init
index 007780771eeb2a08bdb0ea33f71379a35712980e..0ce3bf01d1bfc3d6f981d4fa9148840f4bd196d9 100755 (executable)
--- a/arch-init
+++ b/arch-init
@@ -7,7 +7,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 cd $(dirname $(readlink -f "$BASH_SOURCE"))
 
-export hostname="$1"
+export HOSTNAME="$1"
 mirror=$2
 TPPASS="$(cat /root/shadow/traci-simple)"
 
@@ -57,7 +57,7 @@ export bootn=3
 export swapn=2
 export BOOT_DEVICE
 export ROOT_PARTITIONS
-sed -ri "/^crypt_dev_\S+$rootn /d" /tmp/fai/crypttab
+sed -ri --follow-symlinks "/^crypt_dev_\S+$rootn /d" /tmp/fai/crypttab
 
 if ! $already_partitioned; then
     mount -o subvol=root_$DISTRO $ROOT_PARTITION /mnt