From c24d5aa413fd470821594f13eed08f79ce14270c Mon Sep 17 00:00:00 2001
From: T Z <zawoor@wmi.amu.edu.pl>
Date: Thu, 8 Aug 2019 14:09:30 +0200
Subject: [PATCH] Code fixes.

---
 buster-amd64/bin/dist_iso      | 33 +++++++++------------------------
 buster-amd64/bin/rootfs_config |  4 +---
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/buster-amd64/bin/dist_iso b/buster-amd64/bin/dist_iso
index f7d469a..1135f27 100755
--- a/buster-amd64/bin/dist_iso
+++ b/buster-amd64/bin/dist_iso
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 VERSION=$1
 ARCH=$2
@@ -29,7 +29,8 @@ cp ${OUTPUT}/netboot/${ARCH}/initrd.img $TEMP_DIR/rescue/$ARCH
 
 #memtest
 
-echo -e "Preparing memtest...\n"
+echo "Preparing memtest..."
+echo
 
 TEMP_DIR_MEMTEST=$(mktemp -d)
 
@@ -53,7 +54,9 @@ rm -r "${TEMP_DIR_MEMTEST}"
 
 #GRUB
 
-echo -e "Preparing GRUB...\n"
+echo
+echo "Preparing GRUB..."
+echo
 
 TEMP_DIR_GRUB=$(mktemp -d)
 
@@ -200,27 +203,9 @@ terminal-border: "0"
     color = "#999" }
 EOF
 
-
-echo -e "\nGenerating iso...\n"
-
-#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"
+echo
+echo "Generating iso..."
+echo
 
 xorriso -as mkisofs \
   -quiet \
diff --git a/buster-amd64/bin/rootfs_config b/buster-amd64/bin/rootfs_config
index d0348a7..8793a2a 100755
--- a/buster-amd64/bin/rootfs_config
+++ b/buster-amd64/bin/rootfs_config
@@ -76,6 +76,4 @@ rsync -avS ${TARGET}/etc/skel/ ${TARGET}/root/
 echo zfs >> ${TARGET}/etc/modules
 
 mkdir ${TARGET}/etc/bash_completion.d
-for i in zfs; do
-    cp ${TARGET}/usr/share/bash-completion/completions/${i} ${TARGET}/etc/bash_completion.d/
-done
+cp ${TARGET}/usr/share/bash-completion/completions/zfs ${TARGET}/etc/bash_completion.d/