System information

@@ -21,7 +21,7 @@
# Source an auxiliary options file if we have one, and pick up OPTIONS,
# SLAPD_OPTIONS, SLURPD_OPTIONS, SLAPD_LDAPS, SLAPD_LDAPI, and maybe
-# KRB5_KTNAME.
+# KRB5_KTNAME and SLURPD_KRB5CCNAME.
if [ -r /etc/sysconfig/ldap ] ; then
. /etc/sysconfig/ldap
fi
@@ -114,7 +114,7 @@
echo -n $"$file is not readable by \"$user\"" ; warning ; echo
fi
# Unaccessible TLS configuration files.
- tlsconfigs=`LANG=C egrep
'^(TLSCACertificateFile|TLSCertificateFile|TLSCertificateKeyFile)[[:space:]]'
/etc/openldap/slapd.conf | awk '{print $2}'`
+ tlsconfigs=`LANG=C egrep
'^(TLS_CACERT|TLSCACertificateFile|TLSCertificateFile|TLSCertificateKeyFile)[[:spac
e:]]' /etc/openldap/slapd.conf /etc/openldap/ldap.conf | awk '{print $2}'`
for file in $ tlsconfigs ; do
if ! testasuser $user -r $file ; then
echo -n $"$file is not readable by \"$user\"" ; warning ; echo
@@ -167,6 +167,9 @@
if grep -q "^replogfile" /etc/openldap/slapd.conf; then
prog=`basenam e ${slurpd}`
echo -n $"Starting $prog: "
+ if [ -n "$SLURPD_KRB5CCNAME" ]; then
+ export KRB5CCNAME="$SLURPD_KRB5CCNAME";
+ fi
daemon ${slurpd} $OPTIONS $SLURPD_OPTIONS
RETVAL=$?
echo
initscripts-8.45.19.EL-1.i386.rpm: /etc/rc.d/rc.sysinit
---
+++
@@ -143,7 +143,7 @@
skip=""
# Parse the src field for UUID= and convert to real device names
if [ "$ {src%%=*}" == "UUID" ]; then
- src=`/sbin/blkid -t "$src" -o device|(read oneline;echo $oneline)`
+ src=$ (/sbin/blkid -t "$src" -l -o device)
elif [ "${src/^\/dev\/disk\/by-uuid\/}" != "$src" ]; then
src=$ (__readlink $src)
fi
@@ -458,6 +458,13 @@
fi
fi
+if [ -f /etc/crypttab ]; then
+ s=$"Starting disk encryption:"
+ echo "$s"
+ init_crypto 0 && success "$s" || failure "$ s"
+ echo
+fi
+
if [ -f /fastboot ] || strstr "$cmdline" fastboot ; then
fastboot=yes
fi
@@ -533,7 +540,7 @@
mountopts=
13. Configuration Changes From Previous Release
197