diff --git a/init_mystuff.sh b/init_mystuff.sh index dbf6a8c..84663a4 100755 --- a/init_mystuff.sh +++ b/init_mystuff.sh @@ -3,13 +3,12 @@ set -ex _user=alfoldi _hostname=nokia-l13g4-sisu +_hostname=192.168.1.139 _port=22 # _hostname=localhost # _port=12222 -# _ssh=alfoldi@nokia-l13g4-sisu -# _ssh="-e 'ssh -p 12222' alfoldi@localhost" echo " Host nokia-sisu HostName $_hostname @@ -26,7 +25,7 @@ sudo mkdir -p /persists/sops/age/ sudo chown $USER -R /persists/sops/age/ '" -my_rsync --mkpath ~/.config/sops/age/keys.txt nokia-sisu:/persists/sops/age/ +my_rsync --mkpath /persists/sops/age/keys.txt nokia-sisu:/persists/sops/age/ my_rsync ~/.ssh/ nokia-sisu:~/.ssh ssh -qF /tmp/sisu.ssh nokia-sisu <<'EOF' diff --git a/qemu.sh b/qemu.sh index 4524212..8d4a669 100755 --- a/qemu.sh +++ b/qemu.sh @@ -16,7 +16,7 @@ fi ## Create a virtual disk first ## Uncomment 'create' if test-disk missing -qemu-img create -f qcow2 /tmp/test-disk.qcow2 20G +# qemu-img create -f qcow2 /tmp/test-disk.qcow2 200G # Boot the ISO as USB with the virtual disk as install target qemu-system-x86_64 \ diff --git a/templates/user-data.tmpl b/templates/user-data.tmpl index 0495212..52a30c6 100644 --- a/templates/user-data.tmpl +++ b/templates/user-data.tmpl @@ -143,11 +143,11 @@ autoinstall: [connection] wifi.powersave = 2 - - path: /etc/dconf/db/local.d/99-custom-gnome - permissions: "0644" - owner: root:root - content: | - # do not remove it + # - path: /etc/dconf/db/local.d/99-custom-gnome + # permissions: "0644" + # owner: root:root + # content: | + # # do not remove it - path: /etc/dconf/profile/user owner: root:root @@ -178,11 +178,14 @@ autoinstall: # - mkdir -p /target/etc/himmelblau late-commands: - - bash -x /cdrom/nocloud/wifi.sh - - mkdir -p /target/home/${TARGET_USER}/nocloud - - cp /cdrom/nocloud/* /target/home/${TARGET_USER}/nocloud/ - - cat /cdrom/nocloud/my.dconf > /target/etc/dconf/db/local.d/99-custom-gnome - - curtin in-target -- systemctl disable systemd-networkd-wait-online.service + - | + set -ex + bash -x /cdrom/nocloud/wifi.sh + mkdir -p /target/home/${TARGET_USER}/nocloud + mkdir -p /target/etc/dconf/db/local.d/ + cp /cdrom/nocloud/* /target/home/${TARGET_USER}/nocloud/ + cat /cdrom/nocloud/my.dconf > /target/etc/dconf/db/local.d/99-custom-gnome + curtin in-target -- systemctl disable systemd-networkd-wait-online.service updates: all shutdown: poweroff