updated isohybrid-acritox

4 files changed, 7 insertions, 68 deletions

diff --git a/config/binary_iso/isoimage.sort b/config/binary_iso/isoimage.sort
index 5ae4594..8d1c749 100644
--- a/config/binary_iso/isoimage.sort
+++ b/config/binary_iso/isoimage.sort
@@ -1,7 +1,6 @@
-binary/boot.catalog +9
-binary/boot.isohybrid +7
-binary/boot.efi.img +5
-binary/boot.iso.img +3
+binary/boot.isohybrid +9
+binary/boot.catalog +7
+binary/efi/boot/*.efi +5
 binary/boot +1
 binary/*/*.squashfs -1
 binary/*.squashfs -1
diff --git a/config/binary_local-hooks/isohybrid-acritox b/config/binary_local-hooks/isohybrid-acritox
index e7c2931..4a600e5 100755
--- a/config/binary_local-hooks/isohybrid-acritox
+++ b/config/binary_local-hooks/isohybrid-acritox
@@ -1,5 +1,5 @@
 #!/bin/bash
-# generate binary/boot.isohybrid for isohybrid-acritox
+# generate space-file (binary/boot.isohybrid) for isohybrid-acritox
 
 [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ] || exit 0
 
@@ -11,8 +11,9 @@ grub2|burg)
 	;;
 esac
 
+size=$((3*1024)) # 3MB
 chroot chroot grub-mkimage -d /usr/lib/grub/i386-pc -o "/boot.isohybrid" -O i386-pc biosdisk iso9660
-for i in $(seq 64); do echo -n "ACRITOX!"; done > binary/boot.isohybrid
-cat chroot/boot.isohybrid >> binary/boot.isohybrid
+perl -e "print '<ACRITOX-HYBRID>'x(64*$size);" > binary/boot.isohybrid
+dd if=chroot/boot.isohybrid of=binary/boot.isohybrid bs=1M conv=notrunc
 rm -f chroot/boot.isohybrid
 
diff --git a/config/binary_local-hooks/mkefipart-fat b/config/binary_local-hooks/mkefipart-fat
deleted file mode 100755
index a81d520..0000000
--- a/config/binary_local-hooks/mkefipart-fat
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkefipart-fat - written by Andreas Loibl <andreas@andreas-loibl.de>
-# 
-# Generate an image for a FAT-EFI-partition
-
-case "$LB_BOOTLOADER" in
-grub2|burg)
-	;;
-*)
-	exit 0
-	;;
-esac
-
-
-if [ ! -x /usr/bin/mmd ]; then
-	echo "Error: mtools are needed! Run: apt-get install mtools"
-	exit 1
-fi
-
-img=binary/boot.efi.img
-[ "$1" ] && img="$1"
-rm -f "$img"
-
-# Stuff boot*.efi into a FAT filesystem, 
-# (x+1023)/1024*1024 rounds up to multiple of MB.
-mkfs.msdos -n KANOTIX_EFI -C "$img" \
-	$(( ($(stat -c %s binary/efi/boot/boot*.efi | awk '{s+=$1} END {print s}') / 1024 + 1023) \
-	    / 1024 * 1024 ))
-mmd -i "$img" ::efi
-mmd -i "$img" ::efi/boot
-for file in binary/efi/boot/boot*.efi
-do
-	mcopy -i "$img" $file "::efi/boot/$(basename "$file")"
-done
-
-# hide the FAT-EFI-partition from the Mac Bootloader by f***ing up the "EFI" directory entry
-mattrib -i "$img" +h ::efi
-sed -i -e '0,/EFI        /s/EFI        /efi        /' "$img"
-
-exit 0
diff --git a/config/binary_local-hooks/mkembeddediso b/config/binary_local-hooks/mkembeddediso
deleted file mode 100755
index c2e4ce9..0000000
--- a/config/binary_local-hooks/mkembeddediso
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-# mkembeddediso - written by Andreas Loibl <andreas@andreas-loibl.de>
-# 
-# Generate space on the ISO for an offset copy of the ISO file table
-
-case "$LB_BOOTLOADER" in
-grub2|burg)
-	;;
-*)
-	exit 0
-	;;
-esac
-
-
-img=binary/boot.iso.img
-[ "$1" ] && img="$1"
-rm -f "$img"
-
-dd if=/dev/zero bs=512k count=1 of="$img" >/dev/null 2>/dev/null
-
-exit 0