manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dropping support for upstart. 

Ubuntu switched to systemd too, no point in keeping
upstart support arround anymore.
This commit is contained in:
Daniel Baumann 2015-05-03 16:12:28 +02:00
parent 32211e1458
commit 50b0b6f125
7 changed files with 2 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build/binary
View File

@ -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 ${@}

6
scripts/build/binary_rootfs
View File

@ -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 ${@}

2
scripts/build/bootstrap
View File

@ -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 ${@}

2
scripts/build/chroot
View File

@ -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 ${@}

84
scripts/build/chroot_upstart
View File

@ -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

4
scripts/build/config
View File

@ -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
;;

2
scripts/build/installer
View File

@ -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 ${@}