Detect lxc containers

This commit is contained in:
Sonny 2018-09-30 13:50:45 +02:00
parent fda37efc28
commit ddae640f77
2 changed files with 10 additions and 6 deletions

View file

@ -50,7 +50,7 @@ fi
# Show different prompts for vm users or "normal" users # Show different prompts for vm users or "normal" users
if [ "$color_prompt" = yes ]; then if [ "$color_prompt" = yes ]; then
if [ $VM = true ]; then if [ "$CONTAINER_OR_VM" = true ]; then
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
else else
PS1="\[\033[1;33m\]\u\[\033[1;34m\]@\[\033[1;32m\]\h \[\033[1;34m\]\w\\[\033[0;37m\]$ " PS1="\[\033[1;33m\]\u\[\033[1;34m\]@\[\033[1;32m\]\h \[\033[1;34m\]\w\\[\033[0;37m\]$ "

View file

@ -4,15 +4,19 @@ export SYSTEMD_EDITOR="/usr/bin/vim"
export PAGER=less export PAGER=less
export BROWSER=/usr/bin/firefox export BROWSER=/usr/bin/firefox
CONTAINER_OR_VM=false
SSH_ENV="$HOME/.ssh/environment"
VM=false if [ -z "$(which systemd-detect-virt)" ] || [ "$(systemd-detect-virt)" != "none" ]; then
if [ "$(grep hypervisor /proc/cpuinfo)" ]; then CONTAINER_OR_VM=true
VM=true
fi fi
export VM export CONTAINER_OR_VM
if [ ! -f $SSH_ENV ]; then
mkdir $HOME/.ssh && touch $HOME/.ssh/environment
fi
SSH_ENV="$HOME/.ssh/environment"
function start_agent { function start_agent {
/usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}" /usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
chmod 600 "${SSH_ENV}" chmod 600 "${SSH_ENV}"