Removing lb_chroot_sysvinit in favour of a hook, which is the appropriate way to handle this.

3 files changed, 1 insertions, 73 deletions

diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index 1dff0bdd2..5c9fd61ec 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -64,7 +64,6 @@ lb chroot_install-packages ${*}
 lb chroot_localization ${*}
 lb chroot_local-includes ${*}
 lb chroot_local-patches ${*}
-lb chroot_sysvinit ${*}
 lb chroot_local-hooks ${*}
 lb chroot_hooks ${*}
 lb chroot_hacks ${*}
diff --git a/scripts/build/lb_chroot_sysvinit b/scripts/build/lb_chroot_sysvinit
deleted file mode 100755
index d4dc0a405..000000000
--- a/scripts/build/lb_chroot_sysvinit
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-##
-## live-build 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
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'configure sysvinit')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Configuring package sysvinit"
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_sysvinit
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LB_SYSVINIT}" = "true" ]
-then
-	# Disable all
-	for FILE in chroot/etc/init.d/*
-	do
-		Chroot chroot "update-rc.d -f $(basename ${FILE}) remove"
-	done
-
-	# Re-enable all required (taken from -f standard chroot)
-	for PACKAGE in ${LB_INITRAMFS} console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux
-	do
-		if [ -f chroot/var/lib/dpkg/info/${PACKAGE}.postinst ]
-		then
-			# Re-configure if existing
-			Chroot chroot "/var/lib/dpkg/info/${PACKAGE}.postinst configure"
-		fi
-	done
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_sysvinit
-fi
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index ad8059600..484b3a330 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -121,7 +121,6 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--source true|false]\n\
 \t    [-s|--source-images iso|net|tar|usb-hdd]\n\
 \t    [--syslinux-theme THEME_SUFFIX]\n\
-\t    [--sysvinit true|false]\n\
 \t    [--tasksel aptitude|tasksel]\n\
 \t    [--tasks TASK|\"TASKS\"]\n\
 \t    [--templates PATH]\n\
@@ -143,7 +142,7 @@ Local_arguments ()
 		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:,
 		gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
-		packages:,package-lists:,tasks:,security:,volatile:,backports:,sysvinit:,binary-filesystem:,binary-images:,
+		packages:,package-lists:,tasks:,security:,volatile:,backports:,binary-filesystem:,binary-images:,
 		apt-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,compression:,build-with-chroot:,
 		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
 		grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:,
@@ -519,11 +518,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--sysvinit)
-				LB_SYSVINIT="${2}"
-				shift 2
-				;;
-
 			# config/binary
 			--binary-filesystem)
 				LB_BINARY_FILESYSTEM="${2}"
@@ -1094,10 +1088,6 @@ LB_VOLATILE="${LB_VOLATILE}"
 # \$LB_BACKPORTS: enable backports updates
 # (Default: ${LB_BACKPORTS})
 LB_BACKPORTS="${LB_BACKPORTS}"
-
-# \$LB_SYSVINIT: enable sysvinit
-# (Default: ${LB_SYSVINIT})
-LB_SYSVINIT="${LB_SYSVINIT}"
 EOF
 
 # Creating lb_binary_* configuration