Breaking out installer integration into an own stage.

3 files changed, 79 insertions, 0 deletions

diff --git a/scripts/build/build b/scripts/build/build
index 7b70f35ce..f5cd2f87a 100755
--- a/scripts/build/build
+++ b/scripts/build/build
@@ -70,6 +70,9 @@ lb bootstrap ${@}
 # Customizing chroot
 lb chroot ${@}
 
+# Building installer images
+lb installer ${@}
+
 # Building binary images
 lb binary ${@}
 
diff --git a/scripts/build/installer b/scripts/build/installer
new file mode 100755
index 000000000..093a79360
--- /dev/null
+++ b/scripts/build/installer
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+set -e
+
+# Including common functions
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
+
+# Automatically populating config tree
+if [ -x auto/config ] && [ ! -e .build/config ]
+then
+	Echo_message "Automatically populating config tree."
+	lb config
+fi
+
+# Setting static variables
+DESCRIPTION="$(Echo 'preparing installer images')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Setup cleanup function
+Setup_cleanup
+
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
+then
+	# Configuring chroot
+	lb chroot_devpts install ${@}
+	lb chroot_proc install ${@}
+	lb chroot_selinuxfs install ${@}
+	lb chroot_sysfs install ${@}
+	lb chroot_debianchroot install ${@}
+	lb chroot_dpkg install ${@}
+	lb chroot_tmpfs install ${@}
+	lb chroot_sysv-rc install ${@}
+	lb chroot_upstart install ${@}
+	lb chroot_hosts install ${@}
+	lb chroot_resolv install ${@}
+	lb chroot_hostname install ${@}
+	lb chroot_apt install ${@}
+	lb chroot_archives chroot install ${@}
+fi
+
+# Building installer
+lb installer_debian-installer ${@}
+
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
+then
+	# Deconfiguring chroot
+	lb chroot_archives chroot remove ${@}
+	lb chroot_apt remove ${@}
+	lb chroot_hostname remove ${@}
+	lb chroot_resolv remove ${@}
+	lb chroot_hosts remove ${@}
+	lb chroot_sysv-rc remove ${@}
+	lb chroot_upstart remove ${@}
+	lb chroot_tmpfs remove ${@}
+	lb chroot_dpkg remove ${@}
+	lb chroot_debianchroot remove ${@}
+	lb chroot_sysfs remove ${@}
+	lb chroot_selinuxfs remove ${@}
+	lb chroot_proc remove ${@}
+	lb chroot_devpts remove ${@}
+fi
diff --git a/scripts/build/binary_debian-installer b/scripts/build/installer_debian-installer
index 9cd11f721..9cd11f721 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/installer_debian-installer