import setup-2.13.7-9.el9

i9c-beta changed/i9c-beta/setup-2.13.7-9.el9
MSVSphere Packaging Team 2 years ago
commit 4fd20cc03d

1
.gitignore vendored

@ -0,0 +1 @@
SOURCES/setup-2.13.7.tar.bz2

@ -0,0 +1 @@
a1120010a76a7415975de6a977114e0805063b60 SOURCES/setup-2.13.7.tar.bz2

@ -0,0 +1,13 @@
diff --git a/bashrc b/bashrc
index d19a7c1..d462ac7 100644
--- a/bashrc
+++ b/bashrc
@@ -19,8 +19,6 @@ if [ -z "$BASHRCSOURCED" ]; then
xterm*|vte*)
if [ -e /etc/sysconfig/bash-prompt-xterm ]; then
PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm
- elif [ "${VTE_VERSION:-0}" -ge 3405 ]; then
- PROMPT_COMMAND="__vte_prompt_command"
else
PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
fi

@ -0,0 +1,12 @@
diff --git a/csh.login b/csh.login
index e4b1990..18c5136 100644
--- a/csh.login
+++ b/csh.login
@@ -23,6 +23,7 @@ else
breaksw
endsw
end
+ unset p
endif
setenv HOSTNAME `/usr/bin/hostname`

@ -0,0 +1,43 @@
diff --git a/bashrc b/bashrc
index d462ac7..b0740cb 100644
--- a/bashrc
+++ b/bashrc
@@ -65,15 +65,8 @@ if [ -z "$BASHRCSOURCED" ]; then
esac
}
- # By default, we want umask to get set. This sets it for non-login shell.
- # Current threshold for system reserved uid/gids is 200
- # You could check uidgid reservation validity in
- # /usr/share/doc/setup-*/uidgid file
- if [ $UID -gt 199 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
- umask 002
- else
- umask 022
- fi
+ # Set default umask for non-login shell only if it is set to 0
+ [ `umask` -eq 0 ] && umask 022
SHELL=/bin/bash
# Only display echos from profile.d scripts if we are no login shell
diff --git a/csh.cshrc b/csh.cshrc
index eda4aa7..8f169a1 100644
--- a/csh.cshrc
+++ b/csh.cshrc
@@ -2,14 +2,8 @@
#
# csh configuration for all shell invocations.
-# By default, we want this to get set.
-# Even for non-interactive, non-login shells.
-# Current threshold for system reserved uid/gids is 200
-# You could check uidgid reservation validity in
-# /usr/share/doc/setup-*/uidgid file
-if ($uid > 199 && "`/usr/bin/id -gn`" == "`/usr/bin/id -un`") then
- umask 002
-else
+# Set default umask for non-login shell only if it is set to 0
+if ( `umask` == 0 ) then
umask 022
endif

@ -0,0 +1,58 @@
commit ddd74b5d971a734c7e88cda3764f7e059f163b51
Author: Pavel Zhukov <pzhukov@redhat.com>
Date: Wed Jul 14 11:43:39 2021 +0200
Add fallback to hostname determination
Use hostname in case if hostnamectl is not available/not functional.
fallback to uname in case if both hostname and hostnamectl are
missed (in containers)
diff --git a/profile b/profile
index 783fe17..542add4 100644
--- a/profile
+++ b/profile
@@ -42,7 +42,10 @@ else
pathmunge /usr/sbin after
fi
-HOSTNAME=`/usr/bin/hostnamectl --transient 2>/dev/null`
+HOSTNAME=$(/usr/bin/hostnamectl --transient 2>/dev/null) || \
+HOSTNAME=$(/usr/bin/hostname 2>/dev/null) || \
+HOSTNAME=$(/usr/bin/uname -n)
+
HISTSIZE=1000
if [ "$HISTCONTROL" = "ignorespace" ] ; then
export HISTCONTROL=ignoreboth
commit f20b64fc99267d2343aa9141cf709ac1131bc178
Author: Pavel Zhukov <pzhukov@redhat.com>
Date: Thu Jul 15 10:31:57 2021 +0200
Do not use hostnamectl in csh
diff --git a/csh.cshrc b/csh.cshrc
index c3a37a3..eda4aa7 100644
--- a/csh.cshrc
+++ b/csh.cshrc
@@ -20,7 +20,7 @@ if ($?prompt) then
# make completion work better by default
set autolist
else
- set prompt=\[$user@`/usr/bin/hostnamectl --transient | cut -d'.' -f1`\]\$\
+ set prompt=\[$user@`/usr/bin/hostname`\]\$\
endif
endif
diff --git a/csh.login b/csh.login
index 2da86c9..e4b1990 100644
--- a/csh.login
+++ b/csh.login
@@ -25,7 +25,7 @@ else
end
endif
-setenv HOSTNAME `/usr/bin/hostnamectl --transient`
+setenv HOSTNAME `/usr/bin/hostname`
set history=1000
if ( -d /etc/profile.d ) then

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save