From 0dfc2c80edfb832812d94e65418595ebf72d444a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 9 Apr 2008 10:26:07 -0400 Subject: add sit tunnel type (#441635) --- sysconfig/network-scripts/network-functions | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 82dd05dd..1a170418 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -111,6 +111,9 @@ source_config () GRE | IPIP) DEVICETYPE="tunnel" ;; + SIT | sit) + DEVICETYPE="sit" + ;; esac [ -z "$DEVICETYPE" ] && DEVICETYPE=`echo ${DEVICE} | sed "s/[0-9]*$//"` [ -z "$REALDEVICE" -a -n "$PARENTDEVICE" ] && REALDEVICE=$PARENTDEVICE -- cgit v1.2.1 From 1e610b947935fa07f427c06bb0490d92ab67a0ae Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 9 Apr 2008 16:28:50 -0400 Subject: Handle encrpyted LVs. (#441728) This so needs to die. --- rc.d/rc.sysinit | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 0f0a238b..1c149227 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -362,6 +362,13 @@ if [ -c /dev/mapper/control ]; then 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 -- cgit v1.2.1 From 8159d78bb7d57483673da0bfbf49f74fd1671fec Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 9 Apr 2008 17:00:57 -0400 Subject: Fix serial to wait for rcS to complete as well runlevel isn't actually set when udev is run. Oops. --- event.d/serial | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/event.d/serial b/event.d/serial index 80695338..6869090e 100644 --- a/event.d/serial +++ b/event.d/serial @@ -4,6 +4,10 @@ stop on runlevel [016] instance pre-start script + while /bin/true ; do + LANG=C /sbin/initctl status rcS | grep -wq "rcS (stop) waiting" && break + sleep 1 + done while /bin/true ; do runlevel=$(/sbin/runlevel | /bin/awk '{ print $2 }') case "$runlevel" in -- cgit v1.2.1 From 2c92b1c09ab68926b9b4ecc72a85d92edf1590f1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 14 Apr 2008 12:32:54 -0400 Subject: Require event-compat-sysv for now (#442291) --- initscripts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 26c00156..93b8d67c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -17,7 +17,7 @@ Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 3.0 %if with_upstart -Requires: upstart +Requires: upstart, event-compat-sysv %else Requires: SysVinit >= 2.85-38 %endif -- cgit v1.2.1 From 9ffff0219cc67d20a1a006465b82fb73e2873dbb Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 15 Apr 2008 12:55:37 -0400 Subject: find is now in /bin. Use it. (#192991, #244941, #432818, #442178, #239914) --- initscripts.spec | 2 +- rc.d/rc.sysinit | 22 +++------------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 93b8d67c..964dbdc3 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -21,7 +21,7 @@ Requires: upstart, event-compat-sysv %else Requires: SysVinit >= 2.85-38 %endif -Requires: /sbin/ip, /sbin/arping, net-tools +Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find Requires: /etc/redhat-release, dev Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 115-1 diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 1c149227..db761415 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -427,7 +427,6 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then mount_dirs() { if [ -e "$1" ]; then mkdir -p "$RW_MOUNT$1" - # fixme: find is bad find "$1" -type d -print0 | cpio -p -0vd "$RW_MOUNT" &>/dev/null mount -n --bind "$RW_MOUNT$1" "$1" fi @@ -751,24 +750,9 @@ rm -f /fastboot /fsckoptions /forcefsck /.autofsck /forcequotacheck /halt \ _NEED_XFILES= [ -f /var/run/utmpx -o -f /var/log/wtmpx ] && _NEED_XFILES=1 -# Clean up /var. I'd use find, but /usr may not be mounted. -for afile in /var/lock/* /var/run/* ; do - if [ -d "$afile" ]; then - case "$afile" in - */news|*/mon) ;; - */sudo) rm -f $afile/*/* ;; - */vmware) rm -rf $afile/*/* ;; - */samba) rm -rf $afile/*/* ;; - */screen) rm -rf $afile/* ;; - */cvs) rm -rf $afile/* ;; - */dovecot) rm -f $afile/*/* ;; - */cups) rm -f $afile/*/* ;; - *) rm -f $afile/* ;; - esac - else - rm -f $afile - fi -done +# Clean up /var. +rm -rf /var/lock/cvs/* /var/run/screen/* +find /var/lock /var/run -type f -exec rm -f {} \; rm -f /var/lib/rpm/__db* &> /dev/null rm -f /var/gdm/.gdmfifo &> /dev/null -- cgit v1.2.1 From bcb9c84d3662b3e583f59004a62dbeab95bbba21 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 15 Apr 2008 13:02:37 -0400 Subject: 8.70-1 --- initscripts.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 964dbdc3..0194ccfa 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.69 +Version: 8.70 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -232,6 +232,14 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Apr 15 2008 Bill Nottingham - 8.70-1 +- find is now in /bin. Use it. (#192991, #239914, #244941, #442178) +- require event-compat-sysv for now (#442291) +- fix serial event to wait properly +- handle encrypted LVs properly (#441728) +- add a sit tunnel type (#441635) +- translation updates: ru + * Tue Apr 8 2008 Bill Nottingham - 8.69-1 - Bring up lo whenever it shows up, not just in network/NM - fix shutdown-related oddities (#438444) -- cgit v1.2.1 From b8fbfde343e39337bcbddc33cab0bc30ee4fb0e3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 15 Apr 2008 13:16:38 -0400 Subject: properly handle symlinks, sockets --- rc.d/rc.sysinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index db761415..5c0328ea 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -752,7 +752,7 @@ _NEED_XFILES= # Clean up /var. rm -rf /var/lock/cvs/* /var/run/screen/* -find /var/lock /var/run -type f -exec rm -f {} \; +find -L /var/lock /var/run ! -type d -exec rm -f {} \; rm -f /var/lib/rpm/__db* &> /dev/null rm -f /var/gdm/.gdmfifo &> /dev/null -- cgit v1.2.1 From 37638eda01ac8743d6dbd85f1d699619571432a0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 23 Apr 2008 14:07:26 -0400 Subject: There is no more GDM_LANG - handle pre-existing LANG (#372151, ) --- lang.csh | 25 ++++++++++--------------- lang.sh | 21 +++++++-------------- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/lang.csh b/lang.csh index 72f39435..6a4867b7 100755 --- a/lang.csh +++ b/lang.csh @@ -3,24 +3,19 @@ set sourced=0 if ($?LANG) then set sourced=1 -else - foreach file (/etc/sysconfig/i18n $HOME/.i18n) - if ( -f $file ) then - eval `grep -v '^[:blank:]*#' $file | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'` - endif - set sourced=1 - end + set saved_lang=$LANG endif -if ($?GDM_LANG) then - set sourced=1 - setenv LANG $GDM_LANG - if ($?LANGUAGE) then - unsetenv LANGUAGE - endif - if ("$GDM_LANG" == "zh_CN.GB18030") then - setenv LANGUAGE "zh_CN.GB18030:zh_CN.GB2312:zh_CN" +foreach file (/etc/sysconfig/i18n $HOME/.i18n) + if ( -f $file ) then + eval `grep -v '^[:blank:]*#' $file | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'` + set sourced=1 endif +end + +if ($?saved_lang) then + setenv LANG $saved_lang + unset saved_lang endif if ($sourced == 1) then diff --git a/lang.sh b/lang.sh index 62364d06..705e7a58 100755 --- a/lang.sh +++ b/lang.sh @@ -2,22 +2,15 @@ sourced=0 -if [ -n "$LANG" ]; then - sourced=1 -else - for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do - [ -f $langfile ] && . $langfile && sourced=1 - done -fi +saved_lang="$LANG" +for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do + [ -f $langfile ] && . $langfile && sourced=1 +done -if [ -n "$GDM_LANG" ]; then - sourced=1 - LANG="$GDM_LANG" - unset LANGUAGE - if [ "$GDM_LANG" = "zh_CN.GB18030" ]; then - export LANGUAGE="zh_CN.GB18030:zh_CN.GB2312:zh_CN" - fi +if [ -n "$saved_lang" ]; then + LANG="$saved_lang" fi +unset saved_lang if [ "$sourced" = 1 ]; then [ -n "$LANG" ] && export LANG || unset LANG -- cgit v1.2.1 From 462db3ecfb1aad47105e6efccff9e55cef83f42f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 23 Apr 2008 15:29:52 -0400 Subject: do a much better check for network availability Avoids nasty 'FAILED' messages when using NetworkManager. --- rc.d/init.d/netfs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 6769c132..1ad100bb 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -17,9 +17,6 @@ . /etc/init.d/functions . /etc/sysconfig/network -# Check that networking is up. -[ "${NETWORKING}" = "no" ] && exit 0 - NFSFSTAB=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $3 != "nfsd" && $4 !~ /noauto/ { print $2 }' /etc/fstab` SMBFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "smbfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab` CIFSFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "cifs" && $4 !~ /noauto/ { print $2 }' /etc/fstab` @@ -35,6 +32,7 @@ NETDEVMTAB=`LC_ALL=C awk '$4 ~ /_netdev/ && $2 != "/" { print $2 }' /etc/mtab` # See how we were called. case "$1" in start) + [ ! -f /var/lock/subsys/network -a ! -f /var/lock/subsys/NetworkManager ] && exit 0 [ -n "$NFSFSTAB" ] && { [ ! -f /var/lock/subsys/rpcbind ] && service rpcbind start -- cgit v1.2.1 From 7853f03ff901f9ef2c45a810871de14b7d476251 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 23 Apr 2008 15:33:18 -0400 Subject: 8.71-1 --- initscripts.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 0194ccfa..70a04c5c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.70 +Version: 8.71 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -232,6 +232,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Wed Apr 23 2008 Bill Nottingham - 8.71-1 +- adjust to gdm using LANG instead of GDM_LANG (#372151, ) +- rework netfs' check for networking availability to properly handle both network + and NetworkManager + * Tue Apr 15 2008 Bill Nottingham - 8.70-1 - find is now in /bin. Use it. (#192991, #239914, #244941, #442178) - require event-compat-sysv for now (#442291) -- cgit v1.2.1 From 9f0c9be19a6324b161a699b68fadb4ea2349edc3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 24 Apr 2008 14:16:58 -0400 Subject: note that ETHTOOL_OPTS really should be done as udev rules --- sysconfig.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sysconfig.txt b/sysconfig.txt index 0be8a84c..825db894 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -672,12 +672,6 @@ Files in /etc/sysconfig/network-scripts/ Managed from /etc/sysconfig/network-scripts/ifup-ipx ARP=yes|no (adds 'arp' flag to ifconfig, for use with the ethertap device) - ETHTOOL_OPTS=... - Any device-specific options supported by ethtool. For example, - if you wanted to force 100Mb full duplex: - ETHTOOL_OPTS="speed 100 duplex full autoneg off" - Note that changing speed or duplex settings almost always - requires disabling autonegotiation with 'autoneg off'. LINKDELAY=