cleanup install-on-metal.sh, assuming it's used from initrd v2

cmd/dkl-local-server/bootv2.go

@@ -81,7 +81,7 @@ func buildInitrd(out io.Writer, ctx *renderContext) (err error) {
 	cat.AppendDir("/etc/ssh", 0o700)
 
 	// XXX do we want bootstrap-stage keys instead of the real host key?
-	for _, format := range []string{"rsa", "dsa", "ecdsa", "ed25519"} {
+	for _, format := range []string{"rsa", "ecdsa", "ed25519"} {
 		keyPath := "/etc/ssh/ssh_host_" + format + "_key"
 		cat.AppendBytes(cfg.FileContent(keyPath), keyPath, 0o600)
 	}

cmd/dkl-local-server/ssh-secrets.go

@@ -32,7 +32,6 @@ func getSSHKeyPairs(host string) (pairs []SSHKeyPair, err error) {
 genLoop:
 	for _, keyType := range []string{
 		"rsa",
-		"dsa",
 		"ecdsa",
 		"ed25519",
 	} {

install-on-metal.sh

@@ -1,37 +1,23 @@
 #! /bin/sh
 
 if [ $# -ne 2 ]; then
-    echo "USAGE: $0 <device> <base url>"
+    echo "USAGE: $0 <device>"
 fi
 
 dev=$1
-base_url=$2
-
-: ${MP:=/mnt}
 
 set -ex
 
-mkdir -p $MP
+apk add sgdisk
 
 [[ $dev =~ nvme ]] &&
     devp=${dev}p ||
     devp=${dev}
 
-if vgdisplay storage; then
-    # the system is already installed, just upgrade
-    mount -t vfat ${devp}1 $MP
-    curl ${base_url}/boot.tar |tar xv -C $MP
-    umount $MP
+zcat boot.img.gz | dd of=$dev
 
-else
-    sgdisk --clear $dev
+sgdisk --move-second-header --new=3:0:0 $dev
 
-    curl ${base_url}/boot.img.lz4 |lz4cat >$dev
+pvcreate ${devp}3
+vgcreate storage ${devp}3
 
-    sgdisk --move-second-header --new=3:0:0 $dev
-
-    pvcreate ${devp}3
-    vgcreate storage ${devp}3
-fi
-
-while umount $MP; do true; done