Merge pull request #209 from endlessm/208-fix-signed-kernel-image-deployment-path

sign-kernel: Fix the signed kernel image deployment path

Author: starnight

elements/signing/signed-kernel-endless.bst

@@ -15,12 +15,10 @@ config:
   # Output path for the signed kernel.
   output: "%{install-root}/boot/vmlinuz.signed"
 
-public:
-  initial-scripts:
-    script:
-      - |
-        echo "Installing signed kernel to location expected by OSTree."
-        sysroot="$1"
-        version="$(ls -1 /${sysroot}/usr/lib/modules | head -n1)"
-        mkdir -p "/${sysroot}/usr/lib/modules/${version}"
-        cp /boot/vmlinuz.signed "/${sysroot}/usr/lib/modules/${version}/vmlinuz"
+  install-commands:
+  - |
+    echo "Installing signed kernel to location expected by OSTree."
+    sysroot="$1"
+    version="$(ls -1 /${sysroot}/usr/lib/modules | head -n1)"
+    mkdir -p "${install-root}/usr/lib/modules/${version}"
+    cp "${install-root}/boot/vmlinuz.signed" "${install-root}/usr/lib/modules/${version}/vmlinuz"

elements/signing/signed-kernel-snakeoil.bst

@@ -16,19 +16,15 @@ config:
         --cert VENDOR-snakeoil.crt \
         --output "%{install-root}/boot/vmlinuz.signed" \
         "/boot/vmlinuz"
+  - |
+    echo "Installing signed kernel to location expected by OSTree."
+    sysroot="$1"
+    version="$(ls -1 /${sysroot}/usr/lib/modules | head -n1)"
+    mkdir -p "%{install-root}/usr/lib/modules/${version}"
+    cp "%{install-root}/boot/vmlinuz.signed" "%{install-root}/usr/lib/modules/${version}/vmlinuz"
 
 sources:
 - kind: local
   path: files/boot-keys/VENDOR-snakeoil.key
 - kind: local
   path: files/boot-keys/VENDOR-snakeoil.crt
-
-public:
-  initial-scripts:
-    script:
-      - |
-        echo "Installing signed kernel to location expected by OSTree."
-        sysroot="$1"
-        version="$(ls -1 /${sysroot}/usr/lib/modules | head -n1)"
-        mkdir -p "/${sysroot}/usr/lib/modules/${version}"
-        cp /boot/vmlinuz.signed "/${sysroot}/usr/lib/modules/${version}/vmlinuz"