!37 Add fallback to hostname determination

From: @hugel Reviewed-by: @shenyangyang01 Signed-off-by: @shenyangyang01
Add fallback to hostname determination
2025-02-07 01:46:20 +00:00 · 2025-02-06 16:03:58 +08:00 · 2022-05-06 08:40:48 +00:00 · 2022-05-06 11:37:20 +08:00 · 2021-05-31 17:34:29 +08:00 · 2021-05-28 16:39:49 +08:00
7 changed files with 57 additions and 197 deletions
--- a/0018-csh.login-set-PATH-again-if-empty-to-prevent-interpr.patch
+++ b/0018-csh.login-set-PATH-again-if-empty-to-prevent-interpr.patch
@ -1,59 +0,0 @@
-From ead65179f83ba4359795055cde76c4f46417951d Mon Sep 17 00:00:00 2001
-From: Martin Osvald <mosvald@redhat.com>
-Date: Thu, 29 Aug 2019 09:31:31 +0200
-Subject: [PATCH 18/23] csh.login: set PATH again (if empty) to prevent
- interpreter error (#1744106)
-
---
- csh.login | 36 ++++++++++++++++++++++--------------
- 1 file changed, 22 insertions(+), 14 deletions(-)
-
-diff --git a/csh.login b/csh.login
-index 51902e8..e4b1990 100644
--- a/csh.login
-+++ b/csh.login
-@@ -2,20 +2,28 @@
- 
- # System wide environment and startup programs, for login setup
- 
-#add sbin directories to the path
-foreach p ( /usr/local/sbin /usr/sbin )
-	switch (":${PATH}:")
-	case "*:${p}:*":
-		breaksw
-	default:
-		if ( $uid == 0 ) then
-                        set path = ( ${p} ${path:q} )
-		else
-                        set path = ( ${path:q} ${p} )
-		endif
-		breaksw
-	endsw
-end
-+if ( ! ${?PATH} ) then
-+        if ( $uid == 0 ) then
-+		setenv PATH "/usr/local/sbin:/usr/sbin:/usr/local/bin:/usr/bin"
-+        else
-+		setenv PATH "/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin"
-+        endif
-+else
-+	#add sbin directories to the path
-+	foreach p ( /usr/local/sbin /usr/sbin )
-+		switch (":${PATH}:")
-+		case "*:${p}:*":
-+			breaksw
-+		default:
-+			if ( $uid == 0 ) then
-+	                        set path = ( ${p} ${path:q} )
-+			else
-+	                        set path = ( ${path:q} ${p} )
-+			endif
-+			breaksw
-+		endsw
-+	end
-+endif
- 
- setenv HOSTNAME `/usr/bin/hostname`
- set history=1000
-- 
-1.8.3.1
--- a/0020-lang.csh-fix-several-variable-substitution-bugs-and-.patch
+++ b/0020-lang.csh-fix-several-variable-substitution-bugs-and-.patch
@ -1,100 +0,0 @@
-From b22cf3a3665fe6a3b05c1188a91db884b5a18c72 Mon Sep 17 00:00:00 2001
-From: Martin Osvald <mosvald@redhat.com>
-Date: Thu, 29 Aug 2019 12:42:33 +0200
-Subject: [PATCH 20/23] lang.csh: fix several variable substitution bugs and
- typos (#1746749)
-
---
- lang.csh | 73 ++++++++++++++++++++++++++++----------------------------
- 1 file changed, 37 insertions(+), 36 deletions(-)
-
-diff --git a/lang.csh b/lang.csh
-index c9ed880..d9cdcce 100644
--- a/lang.csh
-+++ b/lang.csh
-@@ -58,45 +58,46 @@ endif
- # The ${LANG} manipulation is necessary only in virtual terminal (a.k.a. console - /dev/tty*):
- set in_console=`tty | grep -vc -e '/dev/tty'`
- 
-if (${?LANG} && ${?TERM} == 'linux' && in_console == 0) then
-    set utf8_used=`echo ${LANG} | grep --quiet -E -i -e '^.+\.utf-?8$'; echo $?`
-+if (${?LANG} && ${?TERM}) then
-+    if (${TERM} == 'linux' && $in_console == 0) then
-+        set utf8_used=`echo ${LANG} | grep --quiet -E -i -e '^.+\.utf-?8$'; echo $?`
- 
-    if (${utf8_used} == 0) then
-        switch (${LANG})
-            case en_IN*:
-                breaksw
-+        if (${utf8_used} == 0) then
-+            switch (${LANG})
-+                case en_IN*:
-+                    breaksw
-+                case ja*:
-+                case ko*:
-+                case si*:
-+                case zh*:
-+                case ar*:
-+                case fa*:
-+                case he*:
-+                case *_IN*:
-+                    setenv LANG en_US.UTF-8
-+                    breaksw
-+            endsw
-+        else
-+            switch (${LANG})
-+                case en_IN*:
-+                    breaksw
-+                case ja*:
-+                case ko*:
-+                case si*:
-+                case zh*:
-+                case ar*:
-+                case fa*:
-+                case he*:
-+                case *_IN*:
-+                    setenv LANG en_US
-+                    breaksw
-+            endsw
-+        endif
- 
-            case ja*:
-            case ko*:
-            case si*:
-            case zh*:
-            case ar*:
-            case fa*:
-            case he*:
-            case *_IN*:
-                setenv LANG en_US.UTF-8
-                breaksw
-        endsw
-    else
-        switch (${LANG})
-            case en_IN*:
-                breaksw
-            case ja*:
-            case ko*:
-            case si*:
-            case zh*:
-            m case ar*:
-            case fa*:
-            case he*:
-            case *_IN*:
-                setenv LANG en_US
-                breaksw
-        endsw
-+        # NOTE: We are not exporting the ${LANG} here again on purpose.
-+        #       If user starts GUI session from console manually, then
-+        #       the previously set LANG should be okay to use.
-     endif
-
-    # NOTE: We are not exporting the ${LANG} here again on purpose.
-    #       If user starts GUI session from console manually, then
-    #       the previously set LANG should be okay to use.
- endif
- 
- unset in_console utf8_used
-- 
-2.19.1
-
--- a/0022-fix-lang.csh-script-so-it-doesn-t-break-tcsh-e-scrip.patch
+++ b/0022-fix-lang.csh-script-so-it-doesn-t-break-tcsh-e-scrip.patch
@ -1,26 +0,0 @@
-From ef35ac39f3b280e03590cc13362b1086e843b3ca Mon Sep 17 00:00:00 2001
-From: Martin Osvald <mosvald@redhat.com>
-Date: Fri, 30 Aug 2019 16:51:35 +0200
-Subject: [PATCH 22/23] fix lang.csh script so it doesn't break tcsh -e scripts
- (#1620004) II
-
---
- lang.csh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lang.csh b/lang.csh
-index 3ebd023..f81de15 100644
--- a/lang.csh
-+++ b/lang.csh
-@@ -66,7 +66,7 @@ set in_console=`tty | grep -vc -e '/dev/tty'`
- 
- if (${?LANG} && ${?TERM}) then
-     if (${TERM} == 'linux' && $in_console == 0) then
-        set utf8_used=`echo ${LANG} | grep --quiet -E -i -e '^.+\.utf-?8$'; echo $?`
-+        set utf8_used=`echo ${LANG} | grep -vc -E -i -e '^.+\.utf-?8$'`
- 
-         if (${utf8_used} == 0) then
-             switch (${LANG})
-- 
-2.19.1
-
--- a/Add-fallback-to-hostname-determination.patch
+++ b/Add-fallback-to-hostname-determination.patch
@ -0,0 +1,32 @@
+From ddd74b5d971a734c7e88cda3764f7e059f163b51 Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Jul 14 2021 10:26:33 +0000
+Subject: 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)
+
+Reference:https://pagure.io/setup/c/ddd74b5d971a734c7e88cda3764f7e059f163b51
+Conflict:Adjusting the command execution sequence and add a prompt.
+
+---
+
+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/hostname 2>/dev/null) || \
+HOSTNAME=$(/usr/bin/uname -n 2>/dev/null) || \
+HOSTNAME=$(/usr/bin/hostnamectl --transient 2>/dev/null) || echo "System commands: hostname uname and hostnamectl, which do not exist."
+
+ HISTSIZE=1000
+ if [ "$HISTCONTROL" = "ignorespace" ] ; then
+     export HISTCONTROL=ignoreboth
+--
+2.27.0
--- a/setup-2.13.3.tar.bz2
+++ b/setup-2.13.3.tar.bz2
--- a/setup-2.13.7.tar.bz2
+++ b/setup-2.13.7.tar.bz2
--- a/setup.spec
+++ b/setup.spec
@ -1,24 +1,22 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.13.3
+Version: 2.13.7
 Release: 4
 License: Public Domain
 Group: System Environment/Base
 URL: https://pagure.io/setup/
 Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
-Patch9000: support-filesystems-xfs.patch
-Patch9001: source-cshlocal-when-login.patch
+Patch0: support-filesystems-xfs.patch
+Patch1: source-cshlocal-when-login.patch
+Patch2: Add-fallback-to-hostname-determination.patch
 BuildArch: noarch
+BuildRequires: systemd
 BuildRequires: bash tcsh perl-interpreter
 #require system release for saner dependency order
 Requires: system-release
 Conflicts: filesystem < 3
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21

-Patch6000: 0018-csh.login-set-PATH-again-if-empty-to-prevent-interpr.patch
-Patch6001: 0020-lang.csh-fix-several-variable-substitution-bugs-and-.patch
-Patch6002: 0022-fix-lang.csh-script-so-it-doesn-t-break-tcsh-e-scrip.patch
-
 %description
 The setup package contains a set of important system configuration and
 setup files, such as passwd, group, and profile.
@ -120,6 +118,21 @@ end
 %{_tmpfilesdir}/%{name}.conf

 %changelog
+* Thu Feb 6 2025 hugel <gengqihu2@h-partners.com> - 2.13.7-4
+- Add fallback to hostname determination
+
+* Fri May 6 2022 konglidong <konglidong@uniontech.com> - 2.13.7-3
+- modify bogus date in %changelog
+
+* Fri May 28 2021 panxiaohe <panxiaohe@huawei.com> - 2.13.7-2
+- Add systemd to BuildRequires to use _tmpfilesdir macro
+
+* Sat Aug 29 2020 zoulin <zoulin13@huawei.com> - 2.13.7-1
+- Type:enhancement
+- ID:NA
+- SUG:restart
+- DESC:Update setup to 2.13.7
+
 * Thu Dec 19 2019 jiangchuangang <jiangchuangang@huawei.com> - 2.13.3-4
 - Type:enhancement
 - ID:NA
@ -313,10 +326,10 @@ end
 * Wed Jan 16 2013 Ondrej Vasik <ovasik@redhat.com> 2.8.64-1
 - correct handling of 256 color terminals in bashrc

-* Mon Dec 02 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.63-1
+* Sun Dec 02 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.63-1
 - ovirtagent created by ovirt-guest-agent

-* Mon Dec 02 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.62-1
+* Sun Dec 02 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.62-1
 - rename rhevagent uidgid reservation to ovirtagent

 * Fri Nov 02 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.61-1
@ -330,7 +343,7 @@ end
 - update /etc/services to match with latest IANA
  assignments

-* Mon Aug 21 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.58-1
+* Tue Aug 21 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.58-1
 - reserve 110:110 for jetty (#849927)

 * Mon Aug 06 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.57-1
@ -873,7 +886,7 @@ end
 * Wed Aug 28 2002 Preston Brown <pbrown@redhat.com> 2.5.19-1
 - fix bug #61129 (~ substitution)

-* Wed Aug 15 2002 Jens Petersen <petersen@redhat.com> 2.5.18-1
+* Thu Aug 15 2002 Jens Petersen <petersen@redhat.com> 2.5.18-1
 - bring back the screen case in /etc/bashrc, since /etc/screenrc no
  longer sets defhstatus (#60596, #60597)

@ -1095,7 +1108,7 @@ end
 * Wed Feb 16 2000 Bill Nottingham <notting@redhat.com>
 - don't set prompt in /etc/profile (it's done in /etc/bashrc)

-* Fri Feb  5 2000 Bill Nottingham <notting@redhat.com>
+* Sat Feb  5 2000 Bill Nottingham <notting@redhat.com>
 - yet more inputrc tweaks from Hans de Goede (hans@highrise.nl)

 * Sun Jan 30 2000 Bill Nottingham <notting@redhat.com>
Author	SHA1	Message	Date
openeuler-ci-bot	f2fced005e	!37 Add fallback to hostname determination From: @hugel Reviewed-by: @shenyangyang01 Signed-off-by: @shenyangyang01	2025-02-07 01:46:20 +00:00
hugel	29dc737098	Add fallback to hostname determination	2025-02-06 16:03:58 +08:00
openeuler-ci-bot	c963f7c3f5	!16 【轻量级PR】修正changelog中的错误日期 From: @konglidong Reviewed-by: @overweight Signed-off-by: @overweight	2022-05-06 08:40:48 +00:00
konglidong	7ee1305ad3	modify bogus date in %changelog	2022-05-06 11:37:20 +08:00
openeuler-ci-bot	1ef7b9b1c5	!10 Add systemd to BuildRequires to use _tmpfilesdir macro From: @panxh_purple Reviewed-by: @overweight Signed-off-by: @overweight	2021-05-31 17:34:29 +08:00
panxiaohe	8507e5f7ab	Add systemd to BuildRequires to use _tmpfilesdir macro	2021-05-28 16:39:49 +08:00
openeuler-ci-bot	e734bfb65b	!5 Add bc and systemd to BuildRequires From: @panxh_purple Reviewed-by: @overweight Signed-off-by: @overweight	2021-05-27 18:50:31 +08:00
panxiaohe	dc75f35b6c	Add bc and systemd to BuildRequires	2021-05-27 17:36:31 +08:00
openeuler-ci-bot	32857d6d46	!4 Update setup to 2.13.7 Merge pull request !4 from 邹林/openEuler-20.03-LTS	2020-08-31 15:51:41 +08:00
zou_lin77	2fa2b8deab	Update setup to 2.13.7	2020-08-29 14:11:56 +08:00