yoda: slight improvements

2 files changed, 9 insertions, 4 deletions

diff --git a/bin/byo b/bin/byo
index 93bb7f0..33ba3b7 100755
--- a/bin/byo
+++ b/bin/byo
@@ -2,23 +2,26 @@
 # Backup to yoda
 [ "$USER" = root ] || exec sudo "$0" "$@"
 
-usage='Usage: byo [-cdk] [/dev/sda2]
+usage='Usage: byo [-cdkx] [/dev/sda2]
 Backup local disk to yoda external disk.
 
 Options:
   -c  close and umount yoda
   -d  dedupe yoda
   -k  do not umount and close yoda
+  -x  enable debug traces
 '
 
-while getopts :Ccdk opt; do
+while getopts :Ccdkx opt; do
 	case $opt in
-	(C|c|d|k) eval "opt$opt=$opt" ;;
+	(C|c|d|k|x) eval "opt$opt=$opt" ;;
 	(*) printf %s "$usage"; exit 1 ;;
 	esac
 done
 shift $((OPTIND - 1))
 
+[ "$optx" ] && set -x
+
 dev=$1
 yoda_uuid='8c463221-6bb7-414e-9060-c9570bb3a6bb'
 [ "$dev" ] || dev=$(blkid --uuid "$yoda_uuid")
diff --git a/bin/yoda b/bin/yoda
index 8ff9e81..a5d5c5b 100755
--- a/bin/yoda
+++ b/bin/yoda
@@ -138,12 +138,13 @@ EOT
 
 	cat > /mnt/etc/locale.gen << \EOT
 en_US.UTF-8 UTF-8
+en_GB.UTF-8 UTF-8
 fr_FR.UTF-8 UTF-8
 EOT
 
 	echo yoda > /mnt/etc/hostname
 	echo 'KEYMAP=fr-latin1' > /mnt/etc/vconsole.conf
-	echo 'LANG=en_US.UTF-8' > /mnt/etc/locale.conf
+	echo 'LANG=en_GB.UTF-8' > /mnt/etc/locale.conf
 	ln -sf /usr/share/zoneinfo/Europe/Paris /mnt/etc/localtime
 
   cat > /mnt/etc/systemd/network/20-wired.network << \EOT
@@ -171,6 +172,7 @@ EOT
   cat > /mnt/etc/systemd/resolved.conf << \EOT
 [Resolve]
 DNSSEC=no
+DNSOverTLS=no
 EOT
 
   packages="linux linux-firmware intel-ucode amd-ucode sof-firmware \