46 files changed, 32 insertions, 30 deletions
diff --git a/dracut/INSTALL b/builder/INSTALL
index e52f0c39..e52f0c39 100644
--- a/dracut/INSTALL
+++ b/builder/INSTALL
diff --git a/dracut/dnbd3-qcow2-rootfs/TODO b/builder/dnbd3-qcow2-rootfs/TODO
index 2e92a1d0..2e92a1d0 100644
--- a/dracut/dnbd3-qcow2-rootfs/TODO
+++ b/builder/dnbd3-qcow2-rootfs/TODO
diff --git a/dracut/dnbd3-qcow2-rootfs/binaries/busybox b/builder/dnbd3-qcow2-rootfs/binaries/busybox
index 7eceacf7..7eceacf7 100755
--- a/dracut/dnbd3-qcow2-rootfs/binaries/busybox
+++ b/builder/dnbd3-qcow2-rootfs/binaries/busybox
diff --git a/dracut/dnbd3-qcow2-rootfs/binaries/dnbd3-client b/builder/dnbd3-qcow2-rootfs/binaries/dnbd3-client
index 76924b49..76924b49 100755
--- a/dracut/dnbd3-qcow2-rootfs/binaries/dnbd3-client
+++ b/builder/dnbd3-qcow2-rootfs/binaries/dnbd3-client
diff --git a/dracut/dnbd3-qcow2-rootfs/binaries/systemd-preserve-process-marker b/builder/dnbd3-qcow2-rootfs/binaries/systemd-preserve-process-marker
index 45beb51d..45beb51d 100755
--- a/dracut/dnbd3-qcow2-rootfs/binaries/systemd-preserve-process-marker
+++ b/builder/dnbd3-qcow2-rootfs/binaries/systemd-preserve-process-marker
diff --git a/dracut/dnbd3-qcow2-rootfs/debugging_tools/busybox b/builder/dnbd3-qcow2-rootfs/debugging_tools/busybox
index 1212ae20..1212ae20 100755
--- a/dracut/dnbd3-qcow2-rootfs/debugging_tools/busybox
+++ b/builder/dnbd3-qcow2-rootfs/debugging_tools/busybox
diff --git a/dracut/dnbd3-qcow2-rootfs/debugging_tools/endless b/builder/dnbd3-qcow2-rootfs/debugging_tools/endless
index de7a8c0a..de7a8c0a 100755
--- a/dracut/dnbd3-qcow2-rootfs/debugging_tools/endless
+++ b/builder/dnbd3-qcow2-rootfs/debugging_tools/endless
diff --git a/dracut/dnbd3-qcow2-rootfs/debugging_tools/endless.c b/builder/dnbd3-qcow2-rootfs/debugging_tools/endless.c
index 22c9bc50..22c9bc50 100644
--- a/dracut/dnbd3-qcow2-rootfs/debugging_tools/endless.c
+++ b/builder/dnbd3-qcow2-rootfs/debugging_tools/endless.c
diff --git a/dracut/dnbd3-qcow2-rootfs/debugging_tools/nbd-client b/builder/dnbd3-qcow2-rootfs/debugging_tools/nbd-client
index 7bb2207f..7bb2207f 100755
--- a/dracut/dnbd3-qcow2-rootfs/debugging_tools/nbd-client
+++ b/builder/dnbd3-qcow2-rootfs/debugging_tools/nbd-client
diff --git a/dracut/dnbd3-qcow2-rootfs/debugging_tools/nbd-debugging.ko b/builder/dnbd3-qcow2-rootfs/debugging_tools/nbd-debugging.ko
index 47cf6cd6..47cf6cd6 100644
--- a/dracut/dnbd3-qcow2-rootfs/debugging_tools/nbd-debugging.ko
+++ b/builder/dnbd3-qcow2-rootfs/debugging_tools/nbd-debugging.ko
diff --git a/dracut/dnbd3-qcow2-rootfs/debugging_tools/network.functions b/builder/dnbd3-qcow2-rootfs/debugging_tools/network.functions
index 89ca5a20..89ca5a20 100644
--- a/dracut/dnbd3-qcow2-rootfs/debugging_tools/network.functions
+++ b/builder/dnbd3-qcow2-rootfs/debugging_tools/network.functions
diff --git a/dracut/dnbd3-qcow2-rootfs/debugging_tools/qemu-nbd b/builder/dnbd3-qcow2-rootfs/debugging_tools/qemu-nbd
index b34a3ff7..b34a3ff7 100755
--- a/dracut/dnbd3-qcow2-rootfs/debugging_tools/qemu-nbd
+++ b/builder/dnbd3-qcow2-rootfs/debugging_tools/qemu-nbd
diff --git a/dracut/dnbd3-qcow2-rootfs/debugging_tools/qemu-nbd-systemd-mark b/builder/dnbd3-qcow2-rootfs/debugging_tools/qemu-nbd-systemd-mark
index 03c2a6b1..03c2a6b1 100755
--- a/dracut/dnbd3-qcow2-rootfs/debugging_tools/qemu-nbd-systemd-mark
+++ b/builder/dnbd3-qcow2-rootfs/debugging_tools/qemu-nbd-systemd-mark
diff --git a/dracut/dnbd3-qcow2-rootfs/debugging_tools/setup-network.sh b/builder/dnbd3-qcow2-rootfs/debugging_tools/setup-network.sh
index 3b32a68c..3b32a68c 100644
--- a/dracut/dnbd3-qcow2-rootfs/debugging_tools/setup-network.sh
+++ b/builder/dnbd3-qcow2-rootfs/debugging_tools/setup-network.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/hooks/cmdline/enable-sysrq.sh b/builder/dnbd3-qcow2-rootfs/hooks/cmdline/enable-sysrq.sh
index f779aa7a..f779aa7a 100755
--- a/dracut/dnbd3-qcow2-rootfs/hooks/cmdline/enable-sysrq.sh
+++ b/builder/dnbd3-qcow2-rootfs/hooks/cmdline/enable-sysrq.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/hooks/cmdline/expand-kcl-ip.sh b/builder/dnbd3-qcow2-rootfs/hooks/cmdline/expand-kcl-ip.sh
index 9f617b09..9f617b09 100755
--- a/dracut/dnbd3-qcow2-rootfs/hooks/cmdline/expand-kcl-ip.sh
+++ b/builder/dnbd3-qcow2-rootfs/hooks/cmdline/expand-kcl-ip.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/hooks/cmdline/mark-root-device.sh b/builder/dnbd3-qcow2-rootfs/hooks/cmdline/mark-root-device.sh
index b7282521..b7282521 100755
--- a/dracut/dnbd3-qcow2-rootfs/hooks/cmdline/mark-root-device.sh
+++ b/builder/dnbd3-qcow2-rootfs/hooks/cmdline/mark-root-device.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/hooks/mount/mount-root-device.sh b/builder/dnbd3-qcow2-rootfs/hooks/mount/mount-root-device.sh
index d02f9002..d02f9002 100755
--- a/dracut/dnbd3-qcow2-rootfs/hooks/mount/mount-root-device.sh
+++ b/builder/dnbd3-qcow2-rootfs/hooks/mount/mount-root-device.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/hooks/pre-mount/fetch-config.sh b/builder/dnbd3-qcow2-rootfs/hooks/pre-mount/fetch-config.sh
index a90481c8..a90481c8 100755
--- a/dracut/dnbd3-qcow2-rootfs/hooks/pre-mount/fetch-config.sh
+++ b/builder/dnbd3-qcow2-rootfs/hooks/pre-mount/fetch-config.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/hooks/pre-mount/mount-qcow.sh b/builder/dnbd3-qcow2-rootfs/hooks/pre-mount/mount-qcow.sh
index d70492bf..d70492bf 100755
--- a/dracut/dnbd3-qcow2-rootfs/hooks/pre-mount/mount-qcow.sh
+++ b/builder/dnbd3-qcow2-rootfs/hooks/pre-mount/mount-qcow.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/hooks/pre-pivot/mount-tmp.sh b/builder/dnbd3-qcow2-rootfs/hooks/pre-pivot/mount-tmp.sh
index 3e702064..3e702064 100755
--- a/dracut/dnbd3-qcow2-rootfs/hooks/pre-pivot/mount-tmp.sh
+++ b/builder/dnbd3-qcow2-rootfs/hooks/pre-pivot/mount-tmp.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/hooks/pre-udev/lo-setup.sh b/builder/dnbd3-qcow2-rootfs/hooks/pre-udev/lo-setup.sh
index 9103afd9..9103afd9 100755
--- a/dracut/dnbd3-qcow2-rootfs/hooks/pre-udev/lo-setup.sh
+++ b/builder/dnbd3-qcow2-rootfs/hooks/pre-udev/lo-setup.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/hooks/pre-udev/load-dnbd3-nbd-modules.sh b/builder/dnbd3-qcow2-rootfs/hooks/pre-udev/load-dnbd3-nbd-modules.sh
index 29f9f210..29f9f210 100755
--- a/dracut/dnbd3-qcow2-rootfs/hooks/pre-udev/load-dnbd3-nbd-modules.sh
+++ b/builder/dnbd3-qcow2-rootfs/hooks/pre-udev/load-dnbd3-nbd-modules.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/kernel_modules/dnbd3.ko b/builder/dnbd3-qcow2-rootfs/kernel_modules/dnbd3.ko
index d7b7ce3b..d7b7ce3b 100755
--- a/dracut/dnbd3-qcow2-rootfs/kernel_modules/dnbd3.ko
+++ b/builder/dnbd3-qcow2-rootfs/kernel_modules/dnbd3.ko
diff --git a/dracut/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko b/builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko
index e8c3f40f..e8c3f40f 100644
--- a/dracut/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko
+++ b/builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko
diff --git a/dracut/dnbd3-qcow2-rootfs/module-setup.sh b/builder/dnbd3-qcow2-rootfs/module-setup.sh
index b3f14c1d..b3f14c1d 100644
--- a/dracut/dnbd3-qcow2-rootfs/module-setup.sh
+++ b/builder/dnbd3-qcow2-rootfs/module-setup.sh
diff --git a/dracut/dnbd3-qcow2-rootfs/readme.md b/builder/dnbd3-qcow2-rootfs/readme.md
index 9ad0f968..9ad0f968 100644
--- a/dracut/dnbd3-qcow2-rootfs/readme.md
+++ b/builder/dnbd3-qcow2-rootfs/readme.md
diff --git a/dracut/dnbd3-qcow2-rootfs/scripts/prepare-disks b/builder/dnbd3-qcow2-rootfs/scripts/prepare-disks
index 2e68dd9e..2e68dd9e 100755
--- a/dracut/dnbd3-qcow2-rootfs/scripts/prepare-disks
+++ b/builder/dnbd3-qcow2-rootfs/scripts/prepare-disks
diff --git a/dracut/dnbd3-qcow2-rootfs/scripts/setup-qcow2 b/builder/dnbd3-qcow2-rootfs/scripts/setup-qcow2
index 70babc17..70babc17 100755
--- a/dracut/dnbd3-qcow2-rootfs/scripts/setup-qcow2
+++ b/builder/dnbd3-qcow2-rootfs/scripts/setup-qcow2
diff --git a/dracut/dnbd3-qcow2-rootfs/systemd-preserve-process-marker.c b/builder/dnbd3-qcow2-rootfs/systemd-preserve-process-marker.c
index 8f0fc108..8f0fc108 100644
--- a/dracut/dnbd3-qcow2-rootfs/systemd-preserve-process-marker.c
+++ b/builder/dnbd3-qcow2-rootfs/systemd-preserve-process-marker.c
diff --git a/dracut/dnbd3-qcow2-rootfs/udev/70-openslx-disk.rules b/builder/dnbd3-qcow2-rootfs/udev/70-openslx-disk.rules
index 3f5e382f..3f5e382f 100644
--- a/dracut/dnbd3-qcow2-rootfs/udev/70-openslx-disk.rules
+++ b/builder/dnbd3-qcow2-rootfs/udev/70-openslx-disk.rules
diff --git a/blacklists/README b/packager/blacklists/README
index ed3fe459..ed3fe459 100644
--- a/blacklists/README
+++ b/packager/blacklists/README
diff --git a/blacklists/essential/fontcache b/packager/blacklists/essential/fontcache
index 13d60d44..13d60d44 100644
--- a/blacklists/essential/fontcache
+++ b/packager/blacklists/essential/fontcache
diff --git a/blacklists/essential/linux-base b/packager/blacklists/essential/linux-base
index c3d023d7..c3d023d7 100644
--- a/blacklists/essential/linux-base
+++ b/packager/blacklists/essential/linux-base
diff --git a/blacklists/essential/linux-extended b/packager/blacklists/essential/linux-extended
index 3d81000a..3d81000a 100644
--- a/blacklists/essential/linux-extended
+++ b/packager/blacklists/essential/linux-extended
diff --git a/blacklists/essential/other-files b/packager/blacklists/essential/other-files
index d35a5736..d35a5736 100644
--- a/blacklists/essential/other-files
+++ b/packager/blacklists/essential/other-files
diff --git a/blacklists/essential/policykit b/packager/blacklists/essential/policykit
index 2f42c0e0..2f42c0e0 100644
--- a/blacklists/essential/policykit
+++ b/packager/blacklists/essential/policykit
diff --git a/blacklists/essential/temp-files b/packager/blacklists/essential/temp-files
index 50955d08..50955d08 100644
--- a/blacklists/essential/temp-files
+++ b/packager/blacklists/essential/temp-files
diff --git a/blacklists/essential/tm-scripts b/packager/blacklists/essential/tm-scripts
index 393effea..393effea 100644
--- a/blacklists/essential/tm-scripts
+++ b/packager/blacklists/essential/tm-scripts
diff --git a/blacklists/package-managers/apt b/packager/blacklists/package-managers/apt
index 5e019138..5e019138 100644
--- a/blacklists/package-managers/apt
+++ b/packager/blacklists/package-managers/apt
diff --git a/blacklists/package-managers/rpm b/packager/blacklists/package-managers/rpm
index 0527ee75..0527ee75 100644
--- a/blacklists/package-managers/rpm
+++ b/packager/blacklists/package-managers/rpm
diff --git a/blacklists/package-managers/yast b/packager/blacklists/package-managers/yast
index 9de1ec05..9de1ec05 100644
--- a/blacklists/package-managers/yast
+++ b/packager/blacklists/package-managers/yast
diff --git a/blacklists/package-managers/yum b/packager/blacklists/package-managers/yum
index 8b137891..8b137891 100644
--- a/blacklists/package-managers/yum
+++ b/packager/blacklists/package-managers/yum
diff --git a/blacklists/package-managers/zypper b/packager/blacklists/package-managers/zypper
index fbab85d7..fbab85d7 100644
--- a/blacklists/package-managers/zypper
+++ b/packager/blacklists/package-managers/zypper
diff --git a/mltk-ng b/packager/openslx
index 74503307..6a75fc47 100755
--- a/mltk-ng
+++ b/packager/openslx
@@ -1,46 +1,48 @@
 #!/bin/bash
 # ------------------------------------------------------------------------------
 #
-#                        Mini-Linux Toolkit Next Gen
+#                        OpenSLX Toolkit Next Gen
+#
+# ------------------------------------------------------------------------------
+#
+# The next generation toolkit to build a stateless linux system bootable
+# over the network. Composed of dracut-built initramfs and a full system clone.
+#
+# ------------------------------------------------------------------------------
+#
+#                           OpenSLX-NG Functions
 #
 # ------------------------------------------------------------------------------
-
-declare -rg ARG0="$0"
-declare -rg SELF="$(readlink -f "$ARG0")"
-declare -rg ROOT_DIR="$(dirname "${SELF}")"
-declare -rg MLTK_PID="$$"
-
-banner() {
-        echo -e "\033[38;5;202m\t           __   __   __    "
-        echo -e "\033[38;5;202m\t.--------.|  | |  |_|  |--."
-        echo -e "\033[38;5;208m\t|        ||  |_|   _|    < "
-        echo -e "\033[38;5;214m\t|__|__|__||____|____|__|__|"
-        echo -e "\033[38;5;214m\t "
-        echo -e "\033[38;5;220m\t                 ** OpenSLX Project // 2015 **"
-        echo -e "\033[38;5;226m\t                    http://lab.openslx.org/"
-        echo -e "\033[00m"
-}
-
-
 pinfo() {
 	echo -e "\033[38;5;10m[info]\033[0m $@"
 }
 
 perror() {
 	echo -e "\033[38;5;9m[error]\033[0m $@"
-	kill "$MLTK_PID"
+	kill "$SELF_PID"
 	exit 1
 }
 
 print_usage() {
-	perror "./mltk-ng <remote_ip> <stage4_sync_dir> <target_qcow2_container>"
+	perror "$ARG0 <remote_ip> <stage4_sync_dir> <target_qcow2_container>"
 }
 
+# ------------------------------------------------------------------------------
+#
+#                           OpenSLX-NG Main Code
+#
+# ------------------------------------------------------------------------------
+
+declare -rg ARG0="$0"
+declare -rg SELF="$(readlink -f "$ARG0")"
+declare -rg ROOT_DIR="$(dirname "${SELF}")"
+declare -rg SELF_PID="$$"
+
 # root check
 if [ "$(id -u)" -ne 0 ]; then
 	perror "ERROR: You need to be root to use this toolkit."
 else
-	banner
+	pinfo ""
 fi
 
 # do we even have tools?
@@ -49,7 +51,7 @@ for TOOL in qemu-img qemu-nbd mkfs.ext4; do
 done
 
 # let's keep it simple for now, just source our main functions file
-. ${ROOT_DIR}/mltk-ng.functions || perror "Could not source functions."
+. "${ROOT_DIR}/$ARG0".functions || perror "Could not source functions."
 
 # ok, now check that we have 3 args
 [ $# -ne 3 ] && print_usage
@@ -61,6 +63,6 @@ valid_ip "$1" || perror "'$1' is not a valid IP adress, aborting..."
 
 # all good, let's start
 pinfo " ## RUNNING ##"
-clone_stage4 $1 $2
-export_qcow2 $2 $3
+clone_stage4 $1 $2 || perror "Failed to clone stage4 with: $1 $2"
+export_qcow2 $2 $3 || perror "Failed to export stage4 with: $2 $3"
 pinfo " ## COMPLETE ##"
diff --git a/mltk-ng.functions b/packager/openslx.functions
index 363c16d8..5fabdbe0 100755
--- a/mltk-ng.functions
+++ b/packager/openslx.functions
@@ -1,14 +1,14 @@
 # ------------------------------------------------------------------------------
 #
-#                          Functions for MLTK-NG
+#                          Functions for OpenSLX-NG
 #
 # ------------------------------------------------------------------------------
 #
-# check if we have mltk-ng environement variables to check
-# if we actually got sourced by it.
-if [ -z "${MLTK_PID}" -o  -z "${ROOT_DIR}" ]; then
+# check if we have our environement variables to check
+# if we actually got sourced by the main script
+if [ -z "${SELF_PID}" -o  -z "${ROOT_DIR}" ]; then
 	# not using perror, since we probably don't have it.
-	echo "Neither MLTK_PID nor ROOT_DIR is set. Was this included by mltk-ng?"
+	echo "Neither SELF_PID nor ROOT_DIR is set. Was this included by OpenSLX-NG?"
 	exit 1
 fi