diff options
| -rwxr-xr-x | scripts/build/binary | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_rootfs | 6 | ||||
| -rwxr-xr-x | scripts/build/bootstrap | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_upstart | 84 | ||||
| -rwxr-xr-x | scripts/build/config | 4 | ||||
| -rwxr-xr-x | scripts/build/installer | 2 |
7 files changed, 2 insertions, 100 deletions
diff --git a/scripts/build/binary b/scripts/build/binary index bc09ad6e7..0e9059a9c 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -48,7 +48,6 @@ then lb chroot_resolv install ${@} lb chroot_hostname install ${@} lb chroot_sysv-rc install ${@} - lb chroot_upstart install ${@} lb chroot_apt install-binary ${@} lb chroot_archives chroot install ${@} fi @@ -95,7 +94,6 @@ then lb chroot_hostname remove ${@} lb chroot_resolv remove ${@} lb chroot_hosts remove ${@} - lb chroot_upstart remove ${@} lb chroot_sysv-rc remove ${@} lb chroot_dpkg remove ${@} lb chroot_debianchroot remove ${@} diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index f4fa0f67e..6c797acb3 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -150,7 +150,6 @@ case "${LB_CHROOT_FILESYSTEM}" in lb chroot_resolv remove ${@} lb chroot_hosts remove ${@} lb chroot_sysv-rc remove ${@} - lb chroot_upstart remove ${@} lb chroot_dpkg remove ${@} lb chroot_debianchroot remove ${@} lb chroot_sysfs remove ${@} @@ -168,7 +167,6 @@ case "${LB_CHROOT_FILESYSTEM}" in lb chroot_debianchroot install ${@} lb chroot_dpkg install ${@} lb chroot_sysv-rc install ${@} - lb chroot_upstart install ${@} lb chroot_hosts install ${@} lb chroot_resolv install ${@} lb chroot_hostname install ${@} @@ -240,7 +238,6 @@ case "${LB_CHROOT_FILESYSTEM}" in lb chroot_resolv remove ${@} lb chroot_hosts remove ${@} lb chroot_sysv-rc remove ${@} - lb chroot_upstart remove ${@} lb chroot_dpkg remove ${@} lb chroot_debianchroot remove ${@} lb chroot_sysfs remove ${@} @@ -258,7 +255,6 @@ case "${LB_CHROOT_FILESYSTEM}" in lb chroot_debianchroot install ${@} lb chroot_dpkg install ${@} lb chroot_sysv-rc install ${@} - lb chroot_upstart install ${@} lb chroot_hosts install ${@} lb chroot_resolv install ${@} lb chroot_hostname install ${@} @@ -377,7 +373,6 @@ case "${LB_CHROOT_FILESYSTEM}" in lb chroot_resolv remove ${@} lb chroot_hosts remove ${@} lb chroot_sysv-rc remove ${@} - lb chroot_upstart remove ${@} lb chroot_dpkg remove ${@} lb chroot_debianchroot remove ${@} lb chroot_sysfs remove ${@} @@ -395,7 +390,6 @@ case "${LB_CHROOT_FILESYSTEM}" in lb chroot_debianchroot install ${@} lb chroot_dpkg install ${@} lb chroot_sysv-rc install ${@} - lb chroot_upstart install ${@} lb chroot_hosts install ${@} lb chroot_resolv install ${@} lb chroot_hostname install ${@} diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap index eafa08de4..486f99cc3 100755 --- a/scripts/build/bootstrap +++ b/scripts/build/bootstrap @@ -49,7 +49,6 @@ 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 ${@} @@ -63,7 +62,6 @@ 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 ${@} diff --git a/scripts/build/chroot b/scripts/build/chroot index 6229d4135..025bec8af 100755 --- a/scripts/build/chroot +++ b/scripts/build/chroot @@ -44,7 +44,6 @@ 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 ${@} @@ -81,7 +80,6 @@ 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 ${@} diff --git a/scripts/build/chroot_upstart b/scripts/build/chroot_upstart deleted file mode 100755 index 23ff47689..000000000 --- a/scripts/build/chroot_upstart +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2015 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 - -# Setting static variables -DESCRIPTION="$(Echo 'manage /sbin/initctl')" -HELP="" -USAGE="${PROGRAM} {install|remove} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -# Requiring stage file -Require_stagefile .build/config .build/bootstrap - -# Check if system uses upstart -if [ ! -e chroot/sbin/initctl ] -then - exit 0 -fi - -case "${1}" in - install) - Echo_message "Configuring file /sbin/initctl" - - # Checking stage file - Check_stagefile .build/chroot_upstart - - # Checking lock file - Check_lockfile .lock - - # Creating lock file - Create_lockfile .lock - - # Create custom initctl file - Chroot chroot dpkg-divert --rename --quiet --add /sbin/initctl - -cat > chroot/sbin/initctl << EOF -#!/bin/sh -echo "All runlevel operations denied by policy" >&2 -exit 101 -EOF - - chmod 0755 chroot/sbin/initctl - - # Creating stage file - Create_stagefile .build/chroot_upstart - ;; - - remove) - Echo_message "Deconfiguring file /sbin/initctl" - - # Checking lock file - Check_lockfile .lock - - # Creating lock file - Create_lockfile .lock - - # Remove custom initctl file - rm -f chroot/sbin/initctl - Chroot chroot dpkg-divert --rename --quiet --remove /sbin/initctl - - # Removing stage file - rm -f .build/chroot_upstart - ;; - - *) - Usage - ;; -esac diff --git a/scripts/build/config b/scripts/build/config index 633590cba..8c05dcf36 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -63,7 +63,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--ignore-system-defaults]\n\ \t [--initramfs auto|none|live-boot]\n\ \t [--initramfs-compression bzip2|gzip|lzma]\n\ -\t [--initsystem sysvinit|systemd|upstart|none]\n\ +\t [--initsystem sysvinit|systemd|none]\n\ \t [--image-name [NAME]\n\ \t [--interactive shell]\n\ \t [--isohybrid-options OPTION|\"OPTIONS\"]\n\ @@ -1343,7 +1343,7 @@ then echo "live-config-systemd" >> config/package-lists/live.list.chroot ;; - sysvinit|upstart) + sysvinit) echo "live-config-${LB_INITSYSTEM}" >> config/package-lists/live.list.chroot echo "sysvinit-core" >> config/package-lists/live.list.chroot ;; diff --git a/scripts/build/installer b/scripts/build/installer index 34c53fffd..f60fe8136 100755 --- a/scripts/build/installer +++ b/scripts/build/installer @@ -45,7 +45,6 @@ then 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 ${@} @@ -66,7 +65,6 @@ then 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 ${@} |