Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

5 files changed, 56 insertions, 0 deletions

diff --git a/remote/rootfs/rootfs-stage32/data/etc/profile b/remote/rootfs/rootfs-stage32/data/etc/profile
index 3784e784..ff29e9c5 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/profile
+++ b/remote/rootfs/rootfs-stage32/data/etc/profile
@@ -35,6 +35,7 @@ if [ "$PS1" ]; then
     export EDITOR='/bin/vi'
     export INPUTRC=/etc/inputrc
     export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
+    export TERMINFO='/lib/terminfo'
 
     ### Some aliases
     alias ps2='ps facux '
@@ -55,3 +56,8 @@ for i in /etc/profile.d/*.sh ; do
         . $i
     fi
 done
+
+if [ -s "$HOME/.bashrc" ]; then
+    . "$HOME/.bashrc"
+fi
+
diff --git a/remote/rootfs/rootfs-stage32/data/lib/terminfo/l/linux b/remote/rootfs/rootfs-stage32/data/lib/terminfo/l/linux
new file mode 100644
index 00000000..48d722f8
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/lib/terminfo/l/linux
diff --git a/remote/rootfs/rootfs-stage32/data/root/.bashrc b/remote/rootfs/rootfs-stage32/data/root/.bashrc
new file mode 100644
index 00000000..6266b0f4
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/root/.bashrc
@@ -0,0 +1,48 @@
+[ -z "$PS1" ] && return
+HISTCONTROL=ignoredups:ignorespace
+shopt -s histappend
+HISTSIZE=1000
+HISTFILESIZE=2000
+shopt -s checkwinsize
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+case "$TERM" in
+    xterm-color) color_prompt=yes;;
+esac
+force_color_prompt=yes
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+alias ll='ls -alFh'
+alias la='ls -A'
+alias l='ls -CF'
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+export PATH=/root/bin:$PATH
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index d421cf1b..90faa567 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -23,6 +23,7 @@ REQUIRED_BINARIES="	bash
 			ps
 			scp
 			ssh
+			tput
 			xterm
 			ckbcomp"
 REQUIRED_LIBRARIES="	libcap
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index b337ab50..3fdfe499 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -25,6 +25,7 @@ REQUIRED_BINARIES="	bash
 			ps
 			scp
 			ssh
+			tput
 			xterm"
 REQUIRED_LIBRARIES="	libcap
 			libcidn