Modify structure for compatibility with live-build 5.x

And change sleep.chroot to wait for update-kali-menu to disappear.

kali-config/common/hooks/accessibility-menu.binary

@@ -1,6 +1,10 @@
 #!/bin/sh
 
-cat >>binary/isolinux/install.cfg <<END
+if [ ! -d isolinux ]; then
+    cd binary
+fi
+
+cat >>isolinux/install.cfg <<END
 
 label installspk
 	menu label Install with ^speech synthesis

kali-config/common/hooks/forensic-menu.binary

@@ -1,6 +1,10 @@
 #!/bin/sh
 
-cat >>binary/isolinux/live.cfg <<END
+if [ ! -d isolinux ]; then
+    cd binary
+fi
+
+cat >>isolinux/live.cfg <<END
 
 label live-forensic
 	menu label Live (^forensic mode)

kali-config/common/hooks/live/accessibility-menu.binary

@@ -0,0 +1 @@
+../accessibility-menu.binary

kali-config/common/hooks/live/forensic-menu.binary

@@ -0,0 +1 @@
+../forensic-menu.binary

kali-config/common/hooks/live/persistence-menu.binary

@@ -0,0 +1 @@
+../persistence-menu.binary

kali-config/common/hooks/live/sleep.chroot

@@ -0,0 +1 @@
+../sleep.chroot

kali-config/common/hooks/persistence-menu.binary

@@ -1,6 +1,10 @@
 #!/bin/sh
 
-cat >>binary/isolinux/live.cfg <<END
+if [ ! -d isolinux ]; then
+    cd binary
+fi
+
+cat >>isolinux/live.cfg <<END
 
 label live-persistence
     menu label ^Live USB Persistence              (check kali.org/prst)

kali-config/common/hooks/sleep.chroot

@@ -1,3 +1,7 @@
 #!/bin/bash
-# sleep for 30 between chroot and binary stages. Helps in WM's such as XFCE and LXDE.
-sleep 30
+
+# Sleep until update-kali-menu disappeared
+while pgrep -f update-kali-menu >/dev/null; do
+    echo "Sleeping 10 seconds as update-kali-menu is still running..."
+    sleep 10
+done