Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-07 00:41:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop creating upstart jobs for serial getty.

Browse Source
This commit is contained in:
Dimitri John Ledkov 2017-08-14 17:02:01 +01:00
commit 55508d96f7
2 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,7 +1,11 @@
livecd-rootfs (2.449) UNRELEASED; urgency=medium livecd-rootfs (2.449) UNRELEASED; urgency=medium
[ Balint Reczey ]
* Use VMDKstream in a more future-proof way * Use VMDKstream in a more future-proof way
[ Dimitri John Ledkov ]
* Drop creating upstart jobs for serial getty.
-- Balint Reczey <rbalint@ubuntu.com> Mon, 24 Jul 2017 20:39:35 +0200 -- Balint Reczey <rbalint@ubuntu.com> Mon, 24 Jul 2017 20:39:35 +0200
livecd-rootfs (2.448) artful; urgency=medium livecd-rootfs (2.448) artful; urgency=medium

42
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
View File

@ -20,36 +20,6 @@ _xchroot() {
#### COMMON architecture independent functions #### COMMON architecture independent functions
arch=$(_xchroot "${rootd}" dpkg --print-architecture) arch=$(_xchroot "${rootd}" dpkg --print-architecture)
add_serial_console() {
condev=$1
idir="$rootd/etc/init"
cat << EOF > "${idir}/${condev}.conf"
# CONDEV - getty
#
# This service maintains a getty on CONDEV from the point the system is
# started until it is shut down again.
start on stopped rc RUNLEVEL=[2345] and (
not-container or
container CONTAINER=lxc or
container CONTAINER=lxc-libvirt)
stop on runlevel [!2345]
pre-start script
# getty will not be started if the serial console is not present
stty -F /dev/CONDEV -a 2> /dev/null > /dev/null || { stop ; exit 0; }
end script
respawn
script
exec /sbin/getty -L CONDEV 115200 vt102
end script
${CLOUD_IMG_STR}
EOF
sed -i "s/CONDEV/${condev}/g" "$idir/${condev}.conf"
}
fake_cloud_init() { fake_cloud_init() {
# If the cloud does not provide a meta-data service this should be run # If the cloud does not provide a meta-data service this should be run
# This will setup a nocloud datasource. # This will setup a nocloud datasource.
@ -157,8 +127,6 @@ fi
case $arch in case $arch in
# ARM images are special # ARM images are special
armhf|arm64) armhf|arm64)
echo "Configuring ARM Serial Port"
add_serial_console ttyAMA0
# Dirty hack because SUBARCH doesn't exist when running chroot hooks, # Dirty hack because SUBARCH doesn't exist when running chroot hooks,
# and we don't want raspi2 images to depend on a cloud data source: # and we don't want raspi2 images to depend on a cloud data source:
if _xchroot "${rootd}" dpkg -l linux-image-raspi2 2>/dev/null | grep -q '^.i'; then if _xchroot "${rootd}" dpkg -l linux-image-raspi2 2>/dev/null | grep -q '^.i'; then
@ -169,15 +137,7 @@ case $arch in
exit 0 exit 0
;; ;;
## Add ttyS0 for i386/amd64 for Trusty and newer powerpc|ppc64el|s390x)
i386|amd64)
add_serial_console ttyS0
;;
powerpc|ppc64el)
add_serial_console hvc0
exit 0
;;
s390x)
exit 0 exit 0
;; ;;
esac esac