Merge pull request #1045 from thtanaka/console-login-ol72

Unable to login via console in OL7.2
This commit is contained in:
Serge Hallyn 2016-06-09 16:38:49 -05:00 committed by GitHub
commit 56c80e0d4d

View File

@ -145,21 +145,25 @@ EOF
# OL7 has systemd, no rc.sysinit # OL7 has systemd, no rc.sysinit
if [ $container_release_major = "7" ]; then if [ $container_release_major = "7" ]; then
# from mhw in the fedora template: We do need to disable the # with newer systemd (OL7.2), getty service include container-getty.service
# "ConditionalPathExists=/dev/tty0" line or no gettys are started on # let that be the one who manage the getty service instead
# the ttys in the container. Lets do it in an override copy of the if [ ! -f $container_rootfs/usr/lib/systemd/system/container-getty@.service ]; then
# service so it can still pass rpm verifies and not be automatically # from mhw in the fedora template: We do need to disable the
# updated by a new systemd version. # "ConditionalPathExists=/dev/tty0" line or no gettys are started on
sed -e 's/^ConditionPathExists=/#LXC ConditionPathExists=/' \ # the ttys in the container. Lets do it in an override copy of the
< $container_rootfs/usr/lib/systemd/system/getty\@.service \ # service so it can still pass rpm verifies and not be automatically
> $container_rootfs/etc/systemd/system/getty\@.service # updated by a new systemd version.
# Setup getty service on the 4 ttys we are going to allow in the sed -e 's/^ConditionPathExists=/#LXC ConditionPathExists=/' \
# default config. Number should match lxc.tty < $container_rootfs/usr/lib/systemd/system/getty\@.service \
( cd $container_rootfs/etc/systemd/system/getty.target.wants > $container_rootfs/etc/systemd/system/getty\@.service
for i in 1 2 3 4 ; do ln -sf ../getty\@.service getty@tty${i}.service; done ) # Setup getty service on the 4 ttys we are going to allow in the
# We only want to spawn a getty on /dev/console in lxc, libvirt-lxc # default config. Number should match lxc.tty
# symlinks /dev/console to /dev/tty1 ( cd $container_rootfs/etc/systemd/system/getty.target.wants
sed -i '/Before=getty.target/a ConditionVirtualization=lxc' $container_rootfs/usr/lib/systemd/system/console-getty.service for i in 1 2 3 4 ; do ln -sf ../getty\@.service getty@tty${i}.service; done )
# We only want to spawn a getty on /dev/console in lxc, libvirt-lxc
# symlinks /dev/console to /dev/tty1
sed -i '/Before=getty.target/a ConditionVirtualization=lxc' $container_rootfs/usr/lib/systemd/system/console-getty.service
fi
# disable some systemd services, set default boot, sigpwr target # disable some systemd services, set default boot, sigpwr target
rm -f $container_rootfs/usr/lib/systemd/system/sysinit.target.wants/kmod-static-nodes.service rm -f $container_rootfs/usr/lib/systemd/system/sysinit.target.wants/kmod-static-nodes.service