Misc fixes.

5 files changed, 84 insertions, 100 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82e6564b913b..db1ca44a53d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu May 19 15:48:34 UTC 2016
+# Wed Jul 27 12:37:51 UTC 2016
 pkgbase = sedutil
 	pkgdesc = TCG OPAL 2.00 SED Management Program
 	pkgver = 1.12
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Drive-Trust-Alliance/sedutil
 	install = sedutil.install
 	arch = i686
@@ -14,9 +14,9 @@ pkgbase = sedutil
 	optdepends = yubikey-personalization: for yubikey support
 	backup = etc/linuxpba/linuxpba.conf
 	source = sedutil-1.12.tar.gz::https://github.com/Drive-Trust-Alliance/sedutil/archive/1.12.tar.gz
-	source = extlinux.conf
+	source = syslinux.cfg
 	source = mklinuxpba-initramfs
-	source = mklinuxpba-bios
+	source = mklinuxpba-diskimg
 	source = linuxpba-arch
 	source = linuxpba.conf.etc
 	source = linuxpba.conf.lib
@@ -25,9 +25,9 @@ pkgbase = sedutil
 	source = getpasswd.c
 	source = includes.patch
 	sha256sums = 5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1
-	sha256sums = 5ab7ef67fea0f4e370d8f0a4da87636a1df18e0edb0152d08f906f38280cc0e8
+	sha256sums = 40d785c16a28a5a8a43050d1731174482ee24459be215d2e4e27ffba3b2e28b2
 	sha256sums = 77c725e4eee095dbede512d2bca13b8f2c139a67b9b87a11d98be94e6df0e1d7
-	sha256sums = c599c6066f23aa403cd7c4c43b9b9900079cdbb7bc0b97c79e70a2383864646f
+	sha256sums = cbef4e615d75bb241a7dbea97c1b8b7105cac8cac2206c592f58bcda6f8957ed
 	sha256sums = 6aa4a9cb90da2d1b0f5eae6a9b487d6b7504d40b44ac62ec70edeef15ed40ee3
 	sha256sums = 6bf64faa4e413bac489e83518daf6963760cc4474ea2b848d0192402214c0efb
 	sha256sums = a110e6d6da0fd658412d8c79f7f2cbc58a9b0067c34c34c94c8f623801eecc78
diff --git a/PKGBUILD b/PKGBUILD
index d11b9e182a25..ce843681be76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=sedutil
 pkgver=1.12
-pkgrel=2
+pkgrel=3
 pkgdesc="TCG OPAL 2.00 SED Management Program"
 arch=('i686' 'x86_64')
 url="https://github.com/Drive-Trust-Alliance/sedutil"
@@ -13,9 +13,9 @@ optdepends=('syslinux: to create a bootable PBA disk image'
 backup=('etc/linuxpba/linuxpba.conf')
 install=sedutil.install
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Drive-Trust-Alliance/${pkgname}/archive/${pkgver}.tar.gz"
-        'extlinux.conf'
+        'syslinux.cfg'
         'mklinuxpba-initramfs'
-        'mklinuxpba-bios'
+        'mklinuxpba-diskimg'
         'linuxpba-arch'
         'linuxpba.conf.etc'
         'linuxpba.conf.lib'
@@ -24,9 +24,9 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Drive-Trust-Alliance/${
         'getpasswd.c'
         'includes.patch')
 sha256sums=('5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1'
-            '5ab7ef67fea0f4e370d8f0a4da87636a1df18e0edb0152d08f906f38280cc0e8'
+            '40d785c16a28a5a8a43050d1731174482ee24459be215d2e4e27ffba3b2e28b2'
             '77c725e4eee095dbede512d2bca13b8f2c139a67b9b87a11d98be94e6df0e1d7'
-            'c599c6066f23aa403cd7c4c43b9b9900079cdbb7bc0b97c79e70a2383864646f'
+            'cbef4e615d75bb241a7dbea97c1b8b7105cac8cac2206c592f58bcda6f8957ed'
             '6aa4a9cb90da2d1b0f5eae6a9b487d6b7504d40b44ac62ec70edeef15ed40ee3'
             '6bf64faa4e413bac489e83518daf6963760cc4474ea2b848d0192402214c0efb'
             'a110e6d6da0fd658412d8c79f7f2cbc58a9b0067c34c34c94c8f623801eecc78'
@@ -59,7 +59,7 @@ package() {
     install -Dm644 "linux/PSIDRevert_LINUX.txt" "${pkgdir}/usr/share/doc/${pkgname}/PSIDRevert.txt"
     install -Dm755 "LinuxPBA/dist/Release_$CARCH/GNU-Linux/linuxpba" "${pkgdir}/usr/bin/linuxpba"
     install -Dm755 "${srcdir}/mklinuxpba-initramfs" "${pkgdir}/usr/bin/mklinuxpba-initramfs"
-    install -Dm755 "${srcdir}/mklinuxpba-bios" "${pkgdir}/usr/bin/mklinuxpba-bios"
+    install -Dm755 "${srcdir}/mklinuxpba-diskimg" "${pkgdir}/usr/bin/mklinuxpba-diskimg"
     install -Dm755 "${srcdir}/linuxpba-arch" "${pkgdir}/usr/bin/linuxpba-arch"
     install -Dm755 "${srcdir}/getpasswd" "${pkgdir}/usr/bin/getpasswd"
 
@@ -67,5 +67,5 @@ package() {
     install -Dm644 "${srcdir}/linuxpba.install" "${pkgdir}/usr/lib/initcpio/install/linuxpba"
     install -Dm644 "${srcdir}/linuxpba.conf.etc" "${pkgdir}/etc/linuxpba/linuxpba.conf"
     install -Dm644 "${srcdir}/linuxpba.conf.lib" "${pkgdir}/usr/lib/linuxpba/linuxpba.conf"
-    install -Dm644 "${srcdir}/extlinux.conf" "${pkgdir}/usr/lib/linuxpba/extlinux.conf"
+    install -Dm644 "${srcdir}/syslinux.cfg" "${pkgdir}/usr/lib/linuxpba/syslinux.cfg"
 }
diff --git a/mklinuxpba-bios b/mklinuxpba-bios
deleted file mode 100755
index cadefd7e2bd4..000000000000
--- a/mklinuxpba-bios
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-if [[ ! -e /usr/bin/extlinux ]]
-then
-    echo "syslinux is not installed: nothing to do."
-    exit 1
-fi
-
-mklinuxpba-initramfs
-
-kernel_release="$(uname -r)"
-
-case "${kernel_release##*-}" in
-    "ARCH")
-        kernel_image="vmlinuz-linux"
-    ;;
-    "lts")
-        kernel_image="vmlinuz-linux-lts"
-    ;;
-    *)
-        echo "The currenly running kernel is not supported."
-        exit 1
-    ;;
-esac
-
-linux_size=$(stat --printf="%s" /boot/$kernel_image)
-pba_size=$(stat --printf="%s" /boot/linuxpba.img)
-fallback_pba_size=$(stat --printf="%s" /boot/linuxpba-fallback.img)
-if [[ -e /boot/intel-ucode.img ]]
-then
-    intelucode_size=$(stat --printf="%s" /boot/intel-ucode.img)
-else
-    intelucode_size=0
-fi
-
-diskimg_size=$(( (linux_size+pba_size+intelucode_size)/1024+3072 ))
-fallback_diskimg_size=$(( (linux_size+fallback_pba_size+intelucode_size)/1024+3072 ))
-
-mkdir -p "/tmp/linuxpba/mnt"
-pushd "/tmp/linuxpba/"
-
-cp /usr/lib/syslinux/bios/mbr.bin linuxpba.diskimg
-truncate -s "${diskimg_size}k" linuxpba.diskimg
-echo -e "8,,,*\nwrite" | sfdisk linuxpba.diskimg
-loopdev="$(losetup --show -f -o 4096 linuxpba.diskimg)"
-sync
-mkfs.ext4 -L linuxpba "$loopdev"
-mount "$loopdev" mnt
-extlinux -i mnt
-if [[ -e /boot/intel-ucode.img ]]
-then
-    cp /boot/intel-ucode.img mnt
-    cp /usr/lib/linuxpba/extlinux.conf mnt
-else
-    sed 's/intel-ucode.img,//' /usr/lib/linuxpba/extlinux.conf > mnt/extlinux.conf
-fi
-cp /boot/linuxpba.img mnt
-cp /boot/$kernel_image mnt
-umount mnt
-losetup -d "$loopdev"
-
-cp /usr/lib/syslinux/bios/mbr.bin linuxpba-fallback.diskimg
-truncate -s "${fallback_diskimg_size}k" linuxpba-fallback.diskimg
-echo -e "8,,,*\nwrite" | sfdisk linuxpba-fallback.diskimg
-loopdev="$(losetup --show -f -o 4096 linuxpba-fallback.diskimg)"
-sync
-mkfs.ext4 -L linuxpba "$loopdev"
-mount "$loopdev" mnt
-extlinux -i mnt
-if [[ -e /boot/intel-ucode.img ]]
-then
-    cp /boot/intel-ucode.img mnt
-    cp /usr/lib/linuxpba/extlinux.conf mnt
-else
-    sed 's/intel-ucode.img,//' /usr/lib/linuxpba/extlinux.conf > mnt/extlinux.conf
-fi
-cp /boot/linuxpba-fallback.img mnt/linuxpba.img
-cp /boot/$kernel_image mnt
-umount mnt
-losetup -d "$loopdev"
-
-mv linuxpba.diskimg linuxpba-fallback.diskimg /boot
-cd /tmp
-rmdir -p linuxpba/mnt
-popd
diff --git a/mklinuxpba-diskimg b/mklinuxpba-diskimg
new file mode 100755
index 000000000000..a5b5d4713f00
--- /dev/null
+++ b/mklinuxpba-diskimg
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+mkdiskimg () {
+    # Prepare image file
+    cp /usr/lib/syslinux/bios/gptmbr.bin $1
+    truncate -s 32M $1
+    sgdisk -n 1:0:0 $1
+    sgdisk -t 1:ef00 $1
+    sgdisk -A 1:set:2 $1
+    loopdev="$(losetup --show -f $1)"
+    partprobe $loopdev
+    mkfs.fat -n SEDUTILPBA "${loopdev}p1"
+    syslinux -i "${loopdev}p1"
+    
+    # Mount image and copy files
+    mount "${loopdev}p1" mnt
+    mkdir -p mnt/EFI/BOOT
+    cp /boot/$2 mnt/vmlinuz-linux
+    cp /boot/$3 mnt/linuxpba.img
+    cp /usr/lib/linuxpba/syslinux.cfg mnt/syslinux.cfg
+    if [[ -e /boot/intel-ucode.img ]]
+    then
+        cp /boot/intel-ucode.img mnt/intel-ucode.img
+    else
+        sed -i 's/\/intel-ucode.img,//' mnt/syslinux.cfg
+    fi
+    cp mnt/syslinux.cfg mnt/EFI/BOOT/syslinux.cfg
+    cp /usr/lib/syslinux/efi64/syslinux.efi mnt/EFI/BOOT/BOOTX64.EFI
+    cp /usr/lib/syslinux/efi64/ldlinux.e64 mnt/EFI/BOOT
+    
+    # Unmount image
+    umount mnt
+    losetup -d "$loopdev"
+}
+
+
+if [[ ! -e /usr/bin/extlinux ]]
+then
+    echo "syslinux is not installed: nothing to do."
+    exit 1
+fi
+
+mklinuxpba-initramfs
+
+kernel_release="$(uname -r)"
+
+case "${kernel_release##*-}" in
+    "ARCH")
+        kernel_image="vmlinuz-linux"
+    ;;
+    "lts")
+        kernel_image="vmlinuz-linux-lts"
+    ;;
+    *)
+        echo "The currenly running kernel is not supported."
+        exit 1
+    ;;
+esac
+
+mkdir -p "/tmp/linuxpbatemp/mnt"
+pushd "/tmp/linuxpbatemp"
+
+mkdiskimg linuxpba.diskimg $kernel_image linuxpba.img
+mkdiskimg linuxpba-fallback.diskimg $kernel_image linuxpba-fallback.img
+
+mv linuxpba.diskimg linuxpba-fallback.diskimg /boot
+cd /tmp
+rmdir -p linuxpbatemp/mnt
+popd
diff --git a/extlinux.conf b/syslinux.cfg
index 6a99c45f7662..5d7751a71e3f 100644
--- a/extlinux.conf
+++ b/syslinux.cfg
@@ -2,6 +2,6 @@ default linuxpba
 prompt 0
 noescape 1
 label linuxpba
-    kernel vmlinuz-linux
-    initrd intel-ucode.img,linuxpba.img
+    kernel /vmlinuz-linux
+    initrd /intel-ucode.img,/linuxpba.img
     append quiet libata.allow_tpm=1 loglevel=0