diff options
| author | Peter Jones <pjones@redhat.com> | 2007-01-18 23:20:37 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2007-01-18 23:20:37 +0000 |
| commit | 575a80dd1442dceee78282b6f7f4d562754d9e83 (patch) | |
| tree | d50efbd008de42c5887a808eb4295d06b045057e | |
| parent | 760d0f06c2d5804154ffd331deaddf05f95ac313 (diff) | |
| download | initscripts-r8-45-15-EL.tar initscripts-r8-45-15-EL.tar.gz initscripts-r8-45-15-EL.tar.bz2 initscripts-r8-45-15-EL.tar.xz initscripts-r8-45-15-EL.zip | |
- copy dhclient lease files from the initrd into /var/lib/dhclient sor8-45-15-EL
the network doesn't get reset during startup with iscsi /
Resolves: #218791
| -rw-r--r-- | initscripts.spec | 7 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec index b4c3342b..42cbebbd 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.45.14.EL +Version: 8.45.15.EL License: GPL Group: System Environment/Base Release: 1 @@ -193,6 +193,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu Jan 18 2007 Peter Jones <pjones@redhat.com> 8.45.15.EL-1 +- copy dhclient lease files from the initrd into /var/lib/dhclient so + the network doesn't get reset during startup with iscsi / + Resolves: #218791 + * Mon Jan 15 2007 Bill Nottingham <notting@redhat.com> 8.45.14.EL-1 - set MACADDR, if specified, before bringing up bonding master/slaves (#218792) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 0ae5b1f9..bcbc9ce4 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -701,9 +701,14 @@ state=`LC_ALL=C awk '/ \/ / && ($3 !~ /rootfs/) { print $4 }' /proc/mounts` [ "$state" != "rw" -a "$READONLY" != "yes" ] && \ action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw / +for lease in /dev/.dhclient* ; do + leasebase=$(basename $lease) + mv $lease /var/lib/dhclient/${leasebase##.} +done + # Clean up SELinux labels if [ -n "$SELINUX_STATE" ]; then - restorecon /etc/mtab /etc/ld.so.cache /etc/blkid/blkid.tab /etc/resolv.conf >/dev/null 2>&1 + restorecon /etc/mtab /etc/ld.so.cache /etc/blkid/blkid.tab /etc/resolv.conf /var/lib/dhclient/ /var/lib/dhclient/* >/dev/null 2>&1 fi # Clear mtab |