again process profile.d scripts in noninteractive shells, but do not
display stderr/stdout messages, fix wrong prompt in tcsh/csh, reserve
rquotad port in /etc/services, export PATH after processing profile.d
scripts, assign uidgid for audio,video and puppet
This commit is contained in:
Ondrej Vasik
parent
d224699478
commit
b1d379572b
176
setup-2.7.4.patch
Normal file
176
setup-2.7.4.patch
Normal file
@ -0,0 +1,176 @@
|
||||
diff -urNp setup-2.7.4-orig/bashrc setup-2.7.4/bashrc
|
||||
--- setup-2.7.4-orig/bashrc 2008-10-10 18:29:39.000000000 +0200
|
||||
+++ setup-2.7.4/bashrc 2008-11-14 09:37:24.000000000 +0100
|
||||
@@ -49,14 +49,18 @@ if ! shopt -q login_shell ; then # We're
|
||||
fi
|
||||
}
|
||||
|
||||
- # Only run profile.d scripts if we are no login shell and interactive
|
||||
- if [ "$PS1" ]; then
|
||||
- for i in /etc/profile.d/*.sh; do
|
||||
- if [ -r "$i" ]; then
|
||||
+ # Only display echos from profile.d scripts if we are no login shell
|
||||
+ # and interactive - otherwise just process them to set envvars
|
||||
+ for i in /etc/profile.d/*.sh; do
|
||||
+ if [ -r "$i" ]; then
|
||||
+ if [ "$PS1" ]; then
|
||||
. $i
|
||||
+ else
|
||||
+ . $i &>/dev/null
|
||||
fi
|
||||
- done
|
||||
- fi
|
||||
+ fi
|
||||
+ done
|
||||
+
|
||||
unset i
|
||||
unset pathmunge
|
||||
fi
|
||||
diff -urNp setup-2.7.4-orig/csh.cshrc setup-2.7.4/csh.cshrc
|
||||
--- setup-2.7.4-orig/csh.cshrc 2008-10-10 18:29:39.000000000 +0200
|
||||
+++ setup-2.7.4/csh.cshrc 2008-11-14 11:57:12.000000000 +0100
|
||||
@@ -13,7 +13,7 @@ endif
|
||||
if ($?prompt) then
|
||||
if ($?tcsh) then
|
||||
set promptchars='$#'
|
||||
- set prompt='[%u@%m %c]%# '
|
||||
+ set prompt='[%n@%m %c]%# '
|
||||
# make completion work better by default
|
||||
set autolist
|
||||
else
|
||||
@@ -54,15 +54,17 @@ limit coredumpsize 0
|
||||
|
||||
# Check if we aren't a loginshell and do stuff if we aren't
|
||||
if (! $?loginsh) then
|
||||
- if ($?prompt) then
|
||||
- if ( -d /etc/profile.d ) then
|
||||
- set nonomatch
|
||||
- foreach i ( /etc/profile.d/*.csh )
|
||||
- if ( -r $i ) then
|
||||
- source $i
|
||||
- endif
|
||||
- end
|
||||
- unset i nonomatch
|
||||
- endif
|
||||
- endif
|
||||
+ if ( -d /etc/profile.d ) then
|
||||
+ set nonomatch
|
||||
+ foreach i ( /etc/profile.d/*.csh )
|
||||
+ if ( -r $i ) then
|
||||
+ if ($?prompt) then
|
||||
+ source $i
|
||||
+ else
|
||||
+ source $i >&/dev/null
|
||||
+ endif
|
||||
+ endif
|
||||
+ end
|
||||
+ unset i nonomatch
|
||||
+ endif
|
||||
endif
|
||||
diff -urNp setup-2.7.4-orig/csh.login setup-2.7.4/csh.login
|
||||
--- setup-2.7.4-orig/csh.login 2008-10-10 18:29:39.000000000 +0200
|
||||
+++ setup-2.7.4/csh.login 2008-11-14 09:49:42.000000000 +0100
|
||||
@@ -21,14 +21,16 @@ if ( ! -f $HOME/.inputrc ) then
|
||||
setenv INPUTRC /etc/inputrc
|
||||
endif
|
||||
|
||||
-if ($?prompt) then
|
||||
- if ( -d /etc/profile.d ) then
|
||||
- set nonomatch
|
||||
- foreach i ( /etc/profile.d/*.csh )
|
||||
- if ( -r $i ) then
|
||||
- source $i
|
||||
- endif
|
||||
- end
|
||||
- unset i nonomatch
|
||||
- endif
|
||||
+if ( -d /etc/profile.d ) then
|
||||
+ set nonomatch
|
||||
+ foreach i ( /etc/profile.d/*.csh )
|
||||
+ if ( -r $i ) then
|
||||
+ if ($?prompt) then
|
||||
+ source $i
|
||||
+ else
|
||||
+ source $i >& /dev/null
|
||||
+ endif
|
||||
+ endif
|
||||
+ end
|
||||
+ unset i nonomatch
|
||||
endif
|
||||
diff -urNp setup-2.7.4-orig/profile setup-2.7.4/profile
|
||||
--- setup-2.7.4-orig/profile 2008-10-10 18:29:39.000000000 +0200
|
||||
+++ setup-2.7.4/profile 2008-11-14 12:07:36.000000000 +0100
|
||||
@@ -39,7 +39,7 @@ if [ -x /usr/bin/id ]; then
|
||||
MAIL="/var/spool/mail/$USER"
|
||||
fi
|
||||
|
||||
-HOSTNAME=`/bin/hostname`
|
||||
+HOSTNAME=`/bin/hostname 2>/dev/null`
|
||||
HISTSIZE=1000
|
||||
|
||||
if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ]; then
|
||||
@@ -50,9 +50,15 @@ export PATH USER LOGNAME MAIL HOSTNAME H
|
||||
|
||||
for i in /etc/profile.d/*.sh ; do
|
||||
if [ -r "$i" ]; then
|
||||
- . $i
|
||||
+ if [ "$PS1" ]; then
|
||||
+ . $i
|
||||
+ else
|
||||
+ . $i &>/dev/null
|
||||
+ fi
|
||||
fi
|
||||
done
|
||||
|
||||
+export PATH
|
||||
+
|
||||
unset i
|
||||
unset pathmunge
|
||||
diff -urNp setup-2.7.4-orig/services setup-2.7.4/services
|
||||
--- setup-2.7.4-orig/services 2008-10-10 18:29:39.000000000 +0200
|
||||
+++ setup-2.7.4/services 2008-11-14 11:55:48.000000000 +0100
|
||||
@@ -246,6 +246,8 @@ phonebook 767/tcp # Network phonebook
|
||||
phonebook 767/udp
|
||||
rsync 873/tcp # rsync
|
||||
rsync 873/udp # rsync
|
||||
+rquotad 875/tcp # rquota daemon
|
||||
+rquotad 875/udp # rquota daemon
|
||||
telnets 992/tcp
|
||||
telnets 992/udp
|
||||
imaps 993/tcp # IMAP over SSL
|
||||
diff -urNp setup-2.7.4-orig/uidgid setup-2.7.4/uidgid
|
||||
--- setup-2.7.4-orig/uidgid 2008-10-10 18:29:39.000000000 +0200
|
||||
+++ setup-2.7.4/uidgid 2008-11-18 10:58:44.000000000 +0100
|
||||
@@ -39,6 +39,7 @@ netdump 34 34 /var/crash /bin/bash net
|
||||
utempter - 35 - - libutempter
|
||||
rpm 37 37 /var/lib/rpm /bin/bash rpm
|
||||
ntp 38 38 /etc/ntp /sbin/nologin ntp
|
||||
+video - 39 - -
|
||||
dip - 40 - - setup
|
||||
mailman 41 41 /var/mailman /bin/false mailman
|
||||
gdm 42 42 /var/gdm /bin/bash gdm
|
||||
@@ -50,6 +51,7 @@ mailnull 47 47 /var/spool/mqueue /dev/nu
|
||||
apache 48 48 /var/www /bin/false apache
|
||||
wnn 49 49 /home/wnn /bin/bash FreeWnn
|
||||
smmsp 51 51 /var/spool/mqueue /dev/null sendmail
|
||||
+puppet 52 52 /var/lib/puppet /sbin/nologin puppet
|
||||
tomcat 53 53 /var/lib/tomcat /sbin/nologin tomcat
|
||||
lock - 54 - - lockdev
|
||||
ldap 55 55 /var/lib/ldap /bin/false openldap-servers
|
||||
@@ -60,6 +62,7 @@ tss 59 59 - /sbin/nologin trousers
|
||||
piranha 60 60 /etc/sysconfig/ha /dev/null piranha
|
||||
prelude-manager 61 61 - /sbin/nologin prelude-manager
|
||||
snortd 62 62 - /sbin/nologin snortd
|
||||
+audio - 63 - -
|
||||
condor 64 64 /var/lib/condor /sbin/nologin condord
|
||||
wine - 66 - - wine
|
||||
pegasus 66 65 /var/lib/Pegasus /sbin/nologin tog-pegasus
|
||||
@@ -83,7 +86,7 @@ jonas 82 82 /var/lib/jonas /sbin/nolog
|
||||
clamav 83 83 /tmp /sbin/nologin clamav
|
||||
screen - 84 - - screen
|
||||
quaggavt - 85 - - quagga
|
||||
-sabayon 86 86 - /sbin/nologin sabayon
|
||||
+sabayon 86 86 - /sbin/nologin sabayon
|
||||
polkituser 87 - / /sbin/nologin PolicyKit
|
||||
wbpriv - 88 - - samba-common
|
||||
postfix 89 89 /var/spool/postfix /bin/true postfix
|
||||
17
setup.spec
17
setup.spec
@ -1,14 +1,15 @@
|
||||
Summary: A set of system configuration and setup files
|
||||
Name: setup
|
||||
Version: 2.7.4
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: Public Domain
|
||||
Group: System Environment/Base
|
||||
Source: setup-%{version}.tar.bz2
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
BuildRequires: bash tcsh perl
|
||||
Conflicts: initscripts < 4.26, bash <= 2.0.4-21
|
||||
Conflicts: initscripts < 4.26, bash <= 2.0.4-21
|
||||
Patch1: setup-2.7.4.patch
|
||||
|
||||
%description
|
||||
The setup package contains a set of important system configuration and
|
||||
@ -16,6 +17,7 @@ setup files, such as passwd, group, and profile.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
# Run any sanity checks.
|
||||
@ -76,6 +78,17 @@ rm -rf %{buildroot}
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
|
||||
|
||||
%changelog
|
||||
* Tue Nov 18 2008 Ondrej Vasik <ovasik@redhat.com> 2.7.4-2
|
||||
- again process profile.d scripts in noninteractive shells,
|
||||
but do not display stderr/stdout messages(#457243)
|
||||
- fix wrong prompt for csh/tcsh (#443854)
|
||||
- don't show error message about missing hostname in profile
|
||||
(#301481)
|
||||
- reserve rquotad port 875 in /etc/services (#455859)
|
||||
- export PATH after processing profile.d scripts (#449286)
|
||||
- assign gid's for audio (:63) and video (:39) group(#458843),
|
||||
assign uidgid pair (52:52) for puppet (#471918)
|
||||
|
||||
* Thu Oct 09 2008 Phil Knirsch <pknirsch@redhat.com> 2.7.4-1
|
||||
- Include new serviceslint for speedup (#465642)
|
||||
- Cleaned up services due to newly discovered bugs in it with new serviceslint
|
||||
|
||||
Loading…
Reference in New Issue
Block a user