File git-31-cc9e34e45854d7313e07a0f4b2cc41b720a16003... of Package aaa_base.4819

Overview Repositories Revisions Requests Users Attributes Meta

File git-31-cc9e34e45854d7313e07a0f4b2cc41b720a16003.patch of Package aaa_base.4819

From cc9e34e45854d7313e07a0f4b2cc41b720a16003 Mon Sep 17 00:00:00 2001
From: Werner Fink <werner@suse.de>
Date: Mon, 14 Aug 2017 15:33:23 +0200
Subject: [PATCH] Restore the is variable within /etc/profile

after loading /etc/bash.bashrc. This enables loading
the personal ~/.bashrc again.

Signed-off-by: Werner Fink <werner@suse.de>
---
 files/etc/bash.bashrc |    5 ++++-
 files/etc/profile     |    3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/files/etc/bash.bashrc b/files/etc/bash.bashrc
--- a/files/etc/bash.bashrc
+++ b/files/etc/bash.bashrc
@@ -9,6 +9,7 @@
 #
 # Check which shell is reading this file
 #
+: ${_is_save:=unset}
 if test -z "$is" ; then
  if test -f /proc/mounts ; then
   if ! is=$(readlink /proc/$$/exe 2>/dev/null) ; then
@@ -348,7 +349,9 @@ zsh)  test -s /etc/zsh.zshrc.local   &&
 ash)  test -s /etc/ash.ashrc.local   && . /etc/ash.ashrc.local
 esac
 test -s /etc/sh.shrc.local && . /etc/sh.shrc.local
-unset is
+if test "$_is_save" = "unset" ; then
+    unset is _is_save
+fi
 
 if test -n "$restricted" -a -z "$PROFILEREAD" ; then
     PATH=/usr/lib/restricted/bin
diff --git a/files/etc/profile b/files/etc/profile
--- a/files/etc/profile
+++ b/files/etc/profile
@@ -336,7 +336,10 @@ if test -z "$_SOURCED_FOR_SSH" ; then
     # Note that ksh always reads /etc/ksh.kshrc
     #
     if test "$is" != ksh -a "$is" != zsh ; then
+	_is_save=$is
 	test -r /etc/bash.bashrc && . /etc/bash.bashrc
+	is=$_is_save
+	unset _is_save
     fi
     if test -n "$restricted" ; then
 	readonly _HOMEBASHRC=true

Places

File git-31-cc9e34e45854d7313e07a0f4b2cc41b720a16003.patch of Package aaa_base.4819

Places