Code fixes.

This commit is contained in:
Tomasz Zaworski 2019-08-08 14:09:30 +02:00
parent 30c7a0612a
commit c24d5aa413
2 changed files with 10 additions and 27 deletions

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
VERSION=$1 VERSION=$1
ARCH=$2 ARCH=$2
@ -29,7 +29,8 @@ cp ${OUTPUT}/netboot/${ARCH}/initrd.img $TEMP_DIR/rescue/$ARCH
#memtest #memtest
echo -e "Preparing memtest...\n" echo "Preparing memtest..."
echo
TEMP_DIR_MEMTEST=$(mktemp -d) TEMP_DIR_MEMTEST=$(mktemp -d)
@ -53,7 +54,9 @@ rm -r "${TEMP_DIR_MEMTEST}"
#GRUB #GRUB
echo -e "Preparing GRUB...\n" echo
echo "Preparing GRUB..."
echo
TEMP_DIR_GRUB=$(mktemp -d) TEMP_DIR_GRUB=$(mktemp -d)
@ -200,27 +203,9 @@ terminal-border: "0"
color = "#999" } color = "#999" }
EOF EOF
echo
echo -e "\nGenerating iso...\n" echo "Generating iso..."
echo
#genisoimage -o ${OUTPUT}/${FILENAME} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "$TEMP_DIR"
#isohybrid.pl ${OUTPUT}/${FILENAME}
#xorriso -as mkisofs \
# -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
# -c isolinux/boot.cat \
# -b isolinux/isolinux.bin \
# -no-emul-boot \
# -boot-load-size 4 \
# -boot-info-table \
# -eltorito-alt-boot \
# -e "--interval:appended_partition_2:all::" \
# -no-emul-boot \
# -isohybrid-gpt-basdat \
# -o "${OUTPUT}/${FILENAME}" \
# -append_partition 2 0xef ${TEMP_DIR_GRUB}/efi.img \
# -partition_cyl_align all \
# "$TEMP_DIR"
xorriso -as mkisofs \ xorriso -as mkisofs \
-quiet \ -quiet \

View File

@ -76,6 +76,4 @@ rsync -avS ${TARGET}/etc/skel/ ${TARGET}/root/
echo zfs >> ${TARGET}/etc/modules echo zfs >> ${TARGET}/etc/modules
mkdir ${TARGET}/etc/bash_completion.d mkdir ${TARGET}/etc/bash_completion.d
for i in zfs; do cp ${TARGET}/usr/share/bash-completion/completions/zfs ${TARGET}/etc/bash_completion.d/
cp ${TARGET}/usr/share/bash-completion/completions/${i} ${TARGET}/etc/bash_completion.d/
done