From e7b766f01bbb6a609fe693da4fd3dcaf88313e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Wed, 23 Mar 2016 11:29:07 +0100
Subject: [PATCH] Move hook scripts to the location expected by live-build 4.x

And drop compatibility with live-build 3.x at the same time.
---
 .../common/hooks/accessibility-menu.binary    | 15 ------------
 kali-config/common/hooks/forensic-menu.binary | 15 ------------
 kali-config/common/hooks/kali-hacks.chroot    | 14 -----------
 .../hooks/live/accessibility-menu.binary      | 16 ++++++++++++-
 .../common/hooks/live/forensic-menu.binary    | 16 ++++++++++++-
 .../common/hooks/live/kali-hacks.chroot       | 15 +++++++++++-
 .../common/hooks/live/persistence-menu.binary | 23 ++++++++++++++++++-
 kali-config/common/hooks/live/sleep.chroot    | 23 ++++++++++++++++++-
 .../common/hooks/persistence-menu.binary      | 22 ------------------
 kali-config/common/hooks/sleep.chroot         | 22 ------------------
 10 files changed, 88 insertions(+), 93 deletions(-)
 delete mode 100755 kali-config/common/hooks/accessibility-menu.binary
 delete mode 100755 kali-config/common/hooks/forensic-menu.binary
 delete mode 100755 kali-config/common/hooks/kali-hacks.chroot
 mode change 120000 => 100755 kali-config/common/hooks/live/accessibility-menu.binary
 mode change 120000 => 100755 kali-config/common/hooks/live/forensic-menu.binary
 mode change 120000 => 100755 kali-config/common/hooks/live/kali-hacks.chroot
 mode change 120000 => 100755 kali-config/common/hooks/live/persistence-menu.binary
 mode change 120000 => 100755 kali-config/common/hooks/live/sleep.chroot
 delete mode 100755 kali-config/common/hooks/persistence-menu.binary
 delete mode 100755 kali-config/common/hooks/sleep.chroot

diff --git a/kali-config/common/hooks/accessibility-menu.binary b/kali-config/common/hooks/accessibility-menu.binary
deleted file mode 100755
index 75cebb7..0000000
--- a/kali-config/common/hooks/accessibility-menu.binary
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ ! -d isolinux ]; then
-    cd binary
-fi
-
-cat >>isolinux/install.cfg <<END
-
-label installspk
-	menu label Install with ^speech synthesis
-	linux /install/gtk/vmlinuz
-	initrd /install/gtk/initrd.gz
-	append video=vesa:ywrap,mtrr vga=788 speakup.synth=soft -- quiet
-END
-
diff --git a/kali-config/common/hooks/forensic-menu.binary b/kali-config/common/hooks/forensic-menu.binary
deleted file mode 100755
index d0c764b..0000000
--- a/kali-config/common/hooks/forensic-menu.binary
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ ! -d isolinux ]; then
-    cd binary
-fi
-
-cat >>isolinux/live.cfg <<END
-
-label live-forensic
-	menu label Live (^forensic mode)
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live noconfig=sudo username=root hostname=kali noswap noautomount
-END
-
diff --git a/kali-config/common/hooks/kali-hacks.chroot b/kali-config/common/hooks/kali-hacks.chroot
deleted file mode 100755
index 60de4c5..0000000
--- a/kali-config/common/hooks/kali-hacks.chroot
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Manually enabling pulseaudio for root since autospawning does
-# not work for root
-# See https://bugs.kali.org/view.php?id=2392
-systemctl --user enable pulseaudio.service || true
-
-# Disable the udev rules renaming the network interfaces (can also be
-# achieved with kernel command line net.ifnames=0 but we don't have a nice
-# way to set it on the installed system)
-mkdir -p /etc/systemd/network
-ln -sf /dev/null /etc/systemd/network/90-mac-for-usb.link
-ln -sf /dev/null /etc/systemd/network/99-default.link
-update-initramfs -u
diff --git a/kali-config/common/hooks/live/accessibility-menu.binary b/kali-config/common/hooks/live/accessibility-menu.binary
deleted file mode 120000
index 1ac7dd0..0000000
--- a/kali-config/common/hooks/live/accessibility-menu.binary
+++ /dev/null
@@ -1 +0,0 @@
-../accessibility-menu.binary
\ No newline at end of file
diff --git a/kali-config/common/hooks/live/accessibility-menu.binary b/kali-config/common/hooks/live/accessibility-menu.binary
new file mode 100755
index 0000000..75cebb7
--- /dev/null
+++ b/kali-config/common/hooks/live/accessibility-menu.binary
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ ! -d isolinux ]; then
+    cd binary
+fi
+
+cat >>isolinux/install.cfg <<END
+
+label installspk
+	menu label Install with ^speech synthesis
+	linux /install/gtk/vmlinuz
+	initrd /install/gtk/initrd.gz
+	append video=vesa:ywrap,mtrr vga=788 speakup.synth=soft -- quiet
+END
+
diff --git a/kali-config/common/hooks/live/forensic-menu.binary b/kali-config/common/hooks/live/forensic-menu.binary
deleted file mode 120000
index 641c336..0000000
--- a/kali-config/common/hooks/live/forensic-menu.binary
+++ /dev/null
@@ -1 +0,0 @@
-../forensic-menu.binary
\ No newline at end of file
diff --git a/kali-config/common/hooks/live/forensic-menu.binary b/kali-config/common/hooks/live/forensic-menu.binary
new file mode 100755
index 0000000..d0c764b
--- /dev/null
+++ b/kali-config/common/hooks/live/forensic-menu.binary
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ ! -d isolinux ]; then
+    cd binary
+fi
+
+cat >>isolinux/live.cfg <<END
+
+label live-forensic
+	menu label Live (^forensic mode)
+	linux /live/vmlinuz
+	initrd /live/initrd.img
+	append boot=live noconfig=sudo username=root hostname=kali noswap noautomount
+END
+
diff --git a/kali-config/common/hooks/live/kali-hacks.chroot b/kali-config/common/hooks/live/kali-hacks.chroot
deleted file mode 120000
index ee9791c..0000000
--- a/kali-config/common/hooks/live/kali-hacks.chroot
+++ /dev/null
@@ -1 +0,0 @@
-../kali-hacks.chroot
\ No newline at end of file
diff --git a/kali-config/common/hooks/live/kali-hacks.chroot b/kali-config/common/hooks/live/kali-hacks.chroot
new file mode 100755
index 0000000..60de4c5
--- /dev/null
+++ b/kali-config/common/hooks/live/kali-hacks.chroot
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Manually enabling pulseaudio for root since autospawning does
+# not work for root
+# See https://bugs.kali.org/view.php?id=2392
+systemctl --user enable pulseaudio.service || true
+
+# Disable the udev rules renaming the network interfaces (can also be
+# achieved with kernel command line net.ifnames=0 but we don't have a nice
+# way to set it on the installed system)
+mkdir -p /etc/systemd/network
+ln -sf /dev/null /etc/systemd/network/90-mac-for-usb.link
+ln -sf /dev/null /etc/systemd/network/99-default.link
+update-initramfs -u
diff --git a/kali-config/common/hooks/live/persistence-menu.binary b/kali-config/common/hooks/live/persistence-menu.binary
deleted file mode 120000
index a7bc183..0000000
--- a/kali-config/common/hooks/live/persistence-menu.binary
+++ /dev/null
@@ -1 +0,0 @@
-../persistence-menu.binary
\ No newline at end of file
diff --git a/kali-config/common/hooks/live/persistence-menu.binary b/kali-config/common/hooks/live/persistence-menu.binary
new file mode 100755
index 0000000..30a398b
--- /dev/null
+++ b/kali-config/common/hooks/live/persistence-menu.binary
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ ! -d isolinux ]; then
+    cd binary
+fi
+
+cat >>isolinux/live.cfg <<END
+
+label live-persistence
+    menu label ^Live USB Persistence              (check kali.org/prst)
+    linux /live/vmlinuz
+    initrd /live/initrd.img
+    append boot=live noconfig=sudo username=root hostname=kali persistence
+
+label live-encrypted-persistence
+    menu label ^Live USB Encrypted Persistence    (check kali.org/prst)
+    linux /live/vmlinuz
+    initrd /live/initrd.img
+    append boot=live persistent=cryptsetup persistence-encryption=luks noconfig=sudo username=root hostname=kali persistence
+
+END
+
diff --git a/kali-config/common/hooks/live/sleep.chroot b/kali-config/common/hooks/live/sleep.chroot
deleted file mode 120000
index 5f6a1a8..0000000
--- a/kali-config/common/hooks/live/sleep.chroot
+++ /dev/null
@@ -1 +0,0 @@
-../sleep.chroot
\ No newline at end of file
diff --git a/kali-config/common/hooks/live/sleep.chroot b/kali-config/common/hooks/live/sleep.chroot
new file mode 100755
index 0000000..3ba3a76
--- /dev/null
+++ b/kali-config/common/hooks/live/sleep.chroot
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+kali_menu_version=$(dpkg-query -W -f'${Version}\n' kali-menu)
+kali_menu_pidfile="/var/lock/kali-menu"
+
+# Wait until update-kali-menu is over
+if dpkg --compare-versions "$kali_menu_version" ge 2015.3.0; then
+    # This version puts the PID in its lock file
+    if [ -s $kali_menu_pidfile ]; then
+	pid=$(cat $kali_menu_pidfile)
+	while [ -n "$pid" ] && [ -e /proc/$pid ]; do
+	    echo "Sleeping 10 seconds as update-kali-menu is still running (pid $pid)..."
+	    sleep 10
+	done
+    fi
+else
+    # This version lacks PID info, we match on process name instead
+    while pgrep -f update-kali-menu >/dev/null; do
+	echo "Sleeping 10 seconds as update-kali-menu is still running..."
+	sleep 10
+    done
+fi
diff --git a/kali-config/common/hooks/persistence-menu.binary b/kali-config/common/hooks/persistence-menu.binary
deleted file mode 100755
index 30a398b..0000000
--- a/kali-config/common/hooks/persistence-menu.binary
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-if [ ! -d isolinux ]; then
-    cd binary
-fi
-
-cat >>isolinux/live.cfg <<END
-
-label live-persistence
-    menu label ^Live USB Persistence              (check kali.org/prst)
-    linux /live/vmlinuz
-    initrd /live/initrd.img
-    append boot=live noconfig=sudo username=root hostname=kali persistence
-
-label live-encrypted-persistence
-    menu label ^Live USB Encrypted Persistence    (check kali.org/prst)
-    linux /live/vmlinuz
-    initrd /live/initrd.img
-    append boot=live persistent=cryptsetup persistence-encryption=luks noconfig=sudo username=root hostname=kali persistence
-
-END
-
diff --git a/kali-config/common/hooks/sleep.chroot b/kali-config/common/hooks/sleep.chroot
deleted file mode 100755
index 3ba3a76..0000000
--- a/kali-config/common/hooks/sleep.chroot
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-kali_menu_version=$(dpkg-query -W -f'${Version}\n' kali-menu)
-kali_menu_pidfile="/var/lock/kali-menu"
-
-# Wait until update-kali-menu is over
-if dpkg --compare-versions "$kali_menu_version" ge 2015.3.0; then
-    # This version puts the PID in its lock file
-    if [ -s $kali_menu_pidfile ]; then
-	pid=$(cat $kali_menu_pidfile)
-	while [ -n "$pid" ] && [ -e /proc/$pid ]; do
-	    echo "Sleeping 10 seconds as update-kali-menu is still running (pid $pid)..."
-	    sleep 10
-	done
-    fi
-else
-    # This version lacks PID info, we match on process name instead
-    while pgrep -f update-kali-menu >/dev/null; do
-	echo "Sleeping 10 seconds as update-kali-menu is still running..."
-	sleep 10
-    done
-fi