alpine: updating files for PXE boot

5 files changed, 22 insertions, 12 deletions

diff --git a/src/distros/alpine/cfg.label b/src/distros/alpine/cfg.label
index f25044a..e2cb5a4 100644
--- a/src/distros/alpine/cfg.label
+++ b/src/distros/alpine/cfg.label
@@ -3,5 +3,5 @@ label alpine@VERSION@@ARCH@
     MENU LABEL Alpine Linux @VERSION@ (@ARCH@)
     kernel /boot/alpine/@VERSION@/@ARCH@/vmlinuz
     initrd /boot/alpine/@VERSION@/@ARCH@/initrd
-    append modloop=/boot/alpine/@VERSION@/@ARCH@/modloop alpine_repo=/boot/alpine/@VERSION@/apks/
+    append modules=loop,squashfs,sd-mod,usb-storage modloop=/boot/alpine/@VERSION@/@ARCH@/modloop alpine_repo=/boot/alpine/@VERSION@/apks
 
diff --git a/src/distros/alpine/cfg.label.pxe b/src/distros/alpine/cfg.label.pxe
index bb2cdf0..a2d8fe4 100644
--- a/src/distros/alpine/cfg.label.pxe
+++ b/src/distros/alpine/cfg.label.pxe
@@ -3,6 +3,6 @@ label alpine@VERSION@@ARCH@
     MENU LABEL Alpine Linux @VERSION@ (@ARCH@)
     kernel /boot/alpine/@VERSION@/@ARCH@/vmlinuz
     initrd /boot/alpine/@VERSION@/@ARCH@/initrd
-    append modloop=@NETBOOT_HTTP@/boot/alpine/@VERSION@/@ARCH@/modloop alpine_repo=@NETBOOT_HTTP@/boot/alpine/@VERSION@/apks/
+    append ip=dhcp modloop=@NETBOOT_HTTP@/boot/alpine/@VERSION@/@ARCH@/modloop modules=loop,squashfs,sd-mod,usb-storage alpine_repo=@NETBOOT_HTTP@/boot/alpine/@VERSION@/apks
 
 
diff --git a/src/distros/alpine/hashes/alpine-3.13.2-x86-iso.sha512 b/src/distros/alpine/hashes/alpine-3.13.2-x86-iso.sha512
new file mode 100644
index 0000000..1cae438
--- /dev/null
+++ b/src/distros/alpine/hashes/alpine-3.13.2-x86-iso.sha512
@@ -0,0 +1 @@
+66249ad623b894c4feee47d7873b0e229fe559f5ac6402510e088f1d71b867b318a5868329c093a00c177fa1f210965f7a7e67164a71c62e8147fe8a16724913  alpine-standard-3.13.2-x86.iso
diff --git a/src/distros/alpine/hashes/alpine-3.13.2-x86_64-iso.sha512 b/src/distros/alpine/hashes/alpine-3.13.2-x86_64-iso.sha512
new file mode 100644
index 0000000..90f825a
--- /dev/null
+++ b/src/distros/alpine/hashes/alpine-3.13.2-x86_64-iso.sha512
@@ -0,0 +1 @@
+e94abc9daeb2ec30b592f3d49cdcde88af7547f53fac7a6acfa7f6784463f47393696b151f84e977bd6f5b586d6748c7c4a86553b1601f07fe7cd4574d813d64  /home/syzdek/alpine-standard-3.13.2-x86_64.iso
diff --git a/src/distros/alpine/make.boot b/src/distros/alpine/make.boot
index 0947870..8b58e5c 100644
--- a/src/distros/alpine/make.boot
+++ b/src/distros/alpine/make.boot
@@ -6,42 +6,50 @@ DOWNLOAD_FILES		+= \
                            boot/alpine/@VERSION@/apks/@ARCH@/.iperd
 
 
+tmp/boot/alpine/alpine-@VERSION@-@ARCH@-iso/.iperd-extracted:
+        ./src/scripts/download.sh \
+           -k \
+           -H $(ALPINE_HASHES)/alpine-@VERSION@-@ARCH@-iso.sha512 \
+           -e tmp/boot/alpine/alpine-@VERSION@-@ARCH@-iso \
+           -t tmp/boot/alpine/alpine-@VERSION@-@ARCH@.iso.tmp \
+           tmp/boot/alpine/alpine-@VERSION@-@ARCH@.iso \
+           $(MIRROR_ALPINE)/@CODENAME@/releases/@ARCH@/alpine-standard-@VERSION@-@ARCH@.iso
+
+
 tmp/boot/alpine/alpine-@VERSION@-@ARCH@/.iperd-extracted:
         ./src/scripts/download.sh \
            -k \
            -H $(ALPINE_HASHES)/alpine-@VERSION@-@ARCH@.sha512 \
            -e tmp/boot/alpine/alpine-@VERSION@-@ARCH@ \
-           -t tmp/boot/alpine/alpine-@VERSION@-@ARCH@.iso.tmp \
-           boot/alpine/alpine-@VERSION@-@ARCH@.iso \
-           $(MIRROR_ALPINE)/@CODENAME@/releases/@ARCH@/alpine-standard-@VERSION@-@ARCH@.iso
+           -t tmp/boot/alpine/alpine-@VERSION@-@ARCH@.tar.gz.tmp \
+           tmp/boot/alpine/alpine-@VERSION@-@ARCH@.tar.gz \
+           $(MIRROR_ALPINE)/@CODENAME@/releases/@ARCH@/alpine-netboot-@VERSION@-@ARCH@.tar.gz
 
 
 boot/alpine/@VERSION@/@ARCH@/vmlinuz: tmp/boot/alpine/alpine-@VERSION@-@ARCH@/.iperd-extracted
         @rm -f "$(@)"
         @mkdir -p "$$(dirname "$(@)")"
-        cp tmp/boot/alpine/alpine-@VERSION@-@ARCH@/boot/vmlinuz-hardened "$(@)"
+        cp tmp/boot/alpine/alpine-@VERSION@-@ARCH@/boot/vmlinuz-lts "$(@)"
         @touch "$(@)"
 
 
 boot/alpine/@VERSION@/@ARCH@/initrd: tmp/boot/alpine/alpine-@VERSION@-@ARCH@/.iperd-extracted
         @rm -f "$(@)"
         @mkdir -p "$$(dirname "$(@)")"
-        cp tmp/boot/alpine/alpine-@VERSION@-@ARCH@/boot/initramfs-hardened "$(@)"
+        cp tmp/boot/alpine/alpine-@VERSION@-@ARCH@/boot/initramfs-lts "$(@)"
         @touch "$(@)"
 
 
 boot/alpine/@VERSION@/@ARCH@/modloop: tmp/boot/alpine/alpine-@VERSION@-@ARCH@/.iperd-extracted
         @rm -f "$(@)"
         @mkdir -p "$$(dirname "$(@)")"
-        cp tmp/boot/alpine/alpine-@VERSION@-@ARCH@/boot/modloop-hardened "$(@)"
+        cp tmp/boot/alpine/alpine-@VERSION@-@ARCH@/boot/modloop-lts "$(@)"
         @test -f "$(@)" && touch "$(@)"
 
 
-boot/alpine/@VERSION@/apks/@ARCH@/.iperd: tmp/boot/alpine/alpine-@VERSION@-@ARCH@/.iperd-extracted
+boot/alpine/@VERSION@/apks/@ARCH@/.iperd: tmp/boot/alpine/alpine-@VERSION@-@ARCH@-iso/.iperd-extracted
         @rm -Rf boot/alpine/@VERSION@/apks/@ARCH@
         @mkdir -p "$$(dirname "$(@)")"
-        rsync -r \
-           tmp/boot/alpine/alpine-@VERSION@-@ARCH@/apks/@ARCH@/ \
-           boot/alpine/@VERSION@/apks/@ARCH@
+        @rsync -rav tmp/boot/alpine/alpine-@VERSION@-@ARCH@-iso/apks/@ARCH@/ boot/alpine/@VERSION@/apks/@ARCH@
         @touch "$(@)"