Adding initial support for making initsystem configurable.

3 files changed, 37 insertions, 1 deletions

diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image
index 6a6c2c872..cdbbe3837 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_linux-image
@@ -77,6 +77,31 @@ EOF
 			echo ${LB_INITRAMFS} >> chroot/root/chroot_packages
 		fi
 
+		# Queue installation of live-config
+		if [ "${LB_INITSYSTEM}" != "none" ]
+		then
+			echo "live-config live-config-${LB_INITSYSTEM}" >> chroot/root/chroot_packages
+		fi
+
+		# Do initsystem specific hacks (FIXME)
+		case "${LB_INITSYSTEM}" in
+			sysvinit)
+
+				;;
+
+			runit)
+
+				;;
+
+			systemd)
+
+				;;
+
+			upstart)
+
+				;;
+		esac
+
 		# Creating stage file
 		Create_stagefile .stage/chroot_linux-image
 		;;
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 605492417..c83cbe048 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -78,6 +78,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--ignore-system-defaults]\n\
 \t    [--includes PATH|none]\n\
 \t    [--initramfs auto|none|live-boot|casper]\n\
+\t    [--initsystem sysvinit|runit|systemd|upstart|none]\n\
 \t    [--interactive shell]\n\
 \t    [--isohybrid-options OPTION|\"OPTIONS\"]\n\
 \t    [--iso-application NAME]\n\
@@ -138,7 +139,7 @@ Local_arguments ()
 	LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitute-options:,
 		apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,
 		cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
-		initramfs:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:,
+		initramfs:,initsystem:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:,
 		templates:,architectures:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
 		distribution:,parent-distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:,
 		mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
@@ -299,6 +300,11 @@ Local_arguments ()
 				shift 2
 				;;
 
+			--initsystem)
+				LB_INITSYSTEM="${2}"
+				shift 2
+				;;
+
 			--fdisk)
 				LB_FDISK="${2}"
 				shift 2
@@ -872,6 +878,10 @@ LB_DEBCONF_PRIORITY="${LB_DEBCONF_PRIORITY}"
 # (Default: ${LB_INITRAMFS})
 LB_INITRAMFS="${LB_INITRAMFS}"
 
+# \$LB_INITSYSTEM: set init system
+# (Default: ${LB_INITSYSTEM})
+LB_INITSYSTEM="${LB_INITSYSTEM}"
+
 # \$LB_FDISK: set fdisk program
 # (Default: autodetected)
 LB_FDISK="${LB_FDISK}"
diff --git a/scripts/build/lb_source_debian b/scripts/build/lb_source_debian
index 84c400b08..7964ccbb4 100755
--- a/scripts/build/lb_source_debian
+++ b/scripts/build/lb_source_debian
@@ -56,6 +56,7 @@ cat >> source-selection.txt << EOF
 ${LB_BOOTLOADER}
 live-helper
 ${LB_INITRAMFS}
+live-config-${LB_INITSYSTEM}
 dosfstools
 genisoimage
 parted