Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 294214 Details for
Bug 174629
diskless patches do not apply correctly
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
patch to fix patches for rhel4.7
system-config-netboot-0.1.40-patch-for-patches.patch (text/plain), 8.56 KB, created by
Radek Brich
on 2008-02-07 15:21:53 UTC
(
hide
)
Description:
patch to fix patches for rhel4.7
Filename:
MIME Type:
Creator:
Radek Brich
Created:
2008-02-07 15:21:53 UTC
Size:
8.56 KB
patch
obsolete
>Index: rhel4/diskless/halt.patch >=================================================================== >--- rhel4/diskless/halt.patch (revision 1049) >+++ rhel4/diskless/halt.patch (working copy) >@@ -1,11 +1,11 @@ >---- etc/init.d/halt.prediskless 2003-10-17 12:25:19.000000000 -0400 >-+++ etc/init.d/halt 2003-10-17 12:25:19.000000000 -0400 >+--- etc/init.d/halt.prediskless 2007-01-15 10:15:54.000000000 +0100 >++++ etc/init.d/halt 2008-02-06 14:59:41.000000000 +0100 > @@ -25,7 +25,7 @@ > halt_get_remaining() { > awk '$2 ~ /^\/$|^\/proc|^\/dev/{next} > $3 == "tmpfs" || $3 == "proc" {print $2 ; next} >-- /(^#|loopfs|autofs|devfs|^none|^\/dev\/ram|^\/dev\/root)/ {next} >-+ /(^#|loopfs|autofs|devfs|^none|^\/dev|^\/dev\/root)/ {next} >+- /(^#|loopfs|autofs|sysfs|devfs|^none|^\/dev\/ram|^\/dev\/root)/ {next} >++ /(^#|loopfs|autofs|sysfs|devfs|^none|^\/dev|^\/dev\/root)/ {next} > {print $2}' /proc/mounts > } > >Index: rhel4/diskless/netfs.patch >=================================================================== >--- rhel4/diskless/netfs.patch (revision 1049) >+++ rhel4/diskless/netfs.patch (working copy) >@@ -1,15 +1,60 @@ >---- /diskless/i386/9/root/etc/init.d/netfs~ 2003-01-06 23:58:31.000000000 -0500 >-+++ /diskless/i386/9/root/etc/init.d/netfs 2003-03-12 09:56:24.000000000 -0500 >-@@ -23,7 +23,7 @@ >- SMBFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "smbfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab` >+--- /diskless/rhel4/root/etc/rc.d/init.d/netfs.prediskless 2006-11-20 22:06:45.000000000 +0100 >++++ /diskless/rhel4/root/etc/rc.d/init.d/netfs 2008-02-06 12:03:24.000000000 +0100 >+@@ -26,11 +26,11 @@ > NCPFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "ncpfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab` >- NETDEVMTAB=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" { print $2 }' /proc/mounts` >--NFSMTAB=`LC_ALL=C awk '!/^#/ && $3 == "nfs" && $2 != "/" { print $2 }' /proc/mounts` >-+NFSMTAB=`LC_ALL=C awk '!/^#/ && $3 == "nfs" && $2 != "/" && $2 != "/.snapshot" { print $2 }' /proc/mounts` >+ NETDEVFSTAB=`LC_ALL=C awk '!/^#/ && $4 ~/_netdev/ && $4 !~ /noauto/ { print $1 }' /etc/fstab` >+ >+-NFSMTAB=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $3 != "nfsd" && $2 != "/" { print $2 }' /proc/mounts` >++NFSMTAB=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $3 != "nfsd" && $2 != "/" && $2 != "/.snapshot" { print $2 }' /proc/mounts` > SMBMTAB=`LC_ALL=C awk '!/^#/ && $3 == "smbfs" { print $2 }' /proc/mounts` >+ CIFSMTAB=`LC_ALL=C awk '!/^#/ && $3 == "cifs" { print $2 }' /proc/mounts` > NCPMTAB=`LC_ALL=C awk '!/^#/ && $3 == "ncpfs" { print $2 }' /proc/mounts` >+-NETDEVMTAB=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" { print $2 }' /etc/mtab` >++NETDEVMTAB=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" && $2 != "/.snapshot" { print $2 }' /etc/mtab` > >-@@ -90,16 +90,16 @@ >+ # See how we were called. >+ case "$1" in >+@@ -96,8 +96,8 @@ >+ ;; >+ stop) >+ # Unmount loopback stuff first >+- remaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts` >+- devremaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts` >++ remaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" && $2 != "/.snapshot" {print $2}' /proc/mounts` >++ devremaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" && $2 != "/.snapshot" {print $1}' /proc/mounts` >+ [ -n "$remaining" ] && { >+ sig= >+ retry=3 >+@@ -112,8 +112,8 @@ >+ losetup $dev >/dev/null 2>&1 && \ >+ action $"Detaching loopback device $dev: " losetup -d $dev >+ done >+- remaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts` >+- devremaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts` >++ remaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" && $2 != "/.snapshot" {print $2}' /proc/mounts` >++ devremaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" && $2 != "/.snapshot" {print $1}' /proc/mounts` >+ [ -z "$remaining" ] && break >+ /sbin/fuser -k -m $sig $remaining >/dev/null >+ sleep 5 >+@@ -124,7 +124,7 @@ >+ [ -n "$NETDEVMTAB" ] && { >+ sig= >+ retry=3 >+- remaining=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" {print $2}' /etc/mtab` >++ remaining=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" && $2 != "/.snapshot" {print $2}' /etc/mtab` >+ while [ -n "$remaining" -a "$retry" -gt 0 ] >+ do >+ if [ "$retry" -lt 3 ]; then >+@@ -133,7 +133,7 @@ >+ action $"Unmounting network block filesystems: " umount -a -O _netdev >+ fi >+ sleep 2 >+- remaining=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" {print $2}' /etc/mtab` >++ remaining=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" && $2 != "/.snapshot" {print $2}' /etc/mtab` >+ [ -z "$remaining" ] && break >+ /sbin/fuser -k -m $sig $remaining >/dev/null >+ sleep 5 >+@@ -144,7 +144,7 @@ > [ -n "$NFSMTAB" ] && { > sig= > retry=3 >@@ -18,11 +63,8 @@ > while [ -n "$remaining" -a "$retry" -gt 0 ] > do > if [ "$retry" -lt 3 ]; then >-- action $"Unmounting NFS filesystems (retry): " umount -f -l -a -t nfs >-+ action $"Unmounting NFS filesystems (retry): " umount -f -l $remaining >- else >-- action $"Unmounting NFS filesystems: " umount -f -l -a -t nfs >-+ action $"Unmounting NFS filesystems: " umount -f -l $remaining >+@@ -153,7 +153,7 @@ >+ action $"Unmounting NFS filesystems: " umount -f -l $remaining > fi > sleep 2 > - remaining=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $2 != "/" {print $2}' /proc/mounts` >Index: rhel4/diskless/rc.sysinit.patch >=================================================================== >--- rhel4/diskless/rc.sysinit.patch (revision 1049) >+++ rhel4/diskless/rc.sysinit.patch (working copy) >@@ -1,40 +1,20 @@ >---- rc.d/rc.sysinit.prediskless 2003-09-10 15:14:16.000000000 -0400 >-+++ rc.d/rc.sysinit 2003-10-22 14:14:54.000000000 -0400 >-@@ -243,7 +243,7 @@ >+--- rc.d/rc.sysinit.prediskless 2007-08-02 16:44:26.000000000 +0200 >++++ rc.d/rc.sysinit 2008-02-07 15:40:51.000000000 +0100 >+@@ -374,7 +374,7 @@ >+ fi > >- > _RUN_QUOTACHECK=0 > -ROOTFSTYPE=`awk '/ \/ / && ($3 !~ /rootfs/) { print $3 }' /proc/mounts` > +ROOTFSTYPE=`awk '/ \/ / && ($3 !~ /rootfs/) { print $3 }' /proc/mounts | sed -n '\$p'` >- if [ -z "$fastboot" -a "X$ROOTFSTYPE" != "Xnfs" ]; then >+ if [ -z "$fastboot" -a "$READONLY" != "yes" -a "X$ROOTFSTYPE" != "Xnfs" -a "X$ROOTFSTYPE" != "Xnfs4" ]; then > > STRING=$"Checking root filesystem" >-@@ -322,8 +322,9 @@ >+@@ -481,7 +481,7 @@ > # Remount the root filesystem read-write. > update_boot_stage RCmountfs > state=`awk '/ \/ / && ($3 !~ /rootfs/) { print $4 }' /proc/mounts` >--[ "$state" != "rw" ] && \ >-+if [ "$state" != "rw" -a "X$ROOTFSTYPE" != "Xnfs" ]; then >+-[ "$state" != "rw" -a "$READONLY" != "yes" ] && \ >++[ "$state" != "rw" -a "$READONLY" != "yes" -a "X$ROOTFSTYPE" != "Xnfs" ] && \ > action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw / >-+fi > >- # LVM initialization >- if [ -f /etc/lvmtab ]; then >-@@ -338,7 +339,7 @@ >- action $"Activating swap partitions: " swapon -a -e >- >- # Clear mtab >--> /etc/mtab >-+> :/etc/mtab >/dev/null 2>&1 >- >- # Remove stale backups >- rm -f /etc/mtab~ /etc/mtab~~ >-@@ -807,7 +808,7 @@ >- } > /var/log/ksyms.0 >- chmod 600 /var/log/ksyms.0 >- # create the crash indicator flag to warn on crashes, offer fsck with timeout >--touch /.autofsck >-+touch /.autofsck >/dev/null 2>&1 >- kill -TERM `/sbin/pidof getkey` >/dev/null 2>&1 >- } & >- if strstr "$cmdline" confirm ; then >+ # LVM2 initialization >Index: rhel4/diskless/xfs.patch >=================================================================== >--- rhel4/diskless/xfs.patch (revision 1049) >+++ rhel4/diskless/xfs.patch (working copy) >@@ -1,15 +1,15 @@ >---- root/etc/init.d/xfs~ 2003-01-13 14:52:10.000000000 -0500 >-+++ root/etc/init.d/xfs 2003-01-16 15:08:08.000000000 -0500 >-@@ -56,7 +56,7 @@ >+--- root/etc/init.d/xfs.prediskless 2008-01-18 21:56:17.000000000 +0100 >++++ root/etc/init.d/xfs 2008-02-06 11:53:25.000000000 +0100 >+@@ -61,7 +61,7 @@ > start() { >- if [ -L /usr/X11R6/bin/X ]; then >- echo -n $"Starting $prog: " >-- [ -x /usr/sbin/chkfontpath ] && buildfontlist >-+# [ -x /usr/sbin/chkfontpath ] && buildfontlist >- rm -fr /tmp/.font-unix >- daemon xfs -droppriv -daemon >- ret=$? >-@@ -82,7 +82,7 @@ >+ FONT_UNIX_DIR=/tmp/.font-unix >+ echo -n $"Starting $prog: " >+- [ -x /usr/sbin/chkfontpath ] && buildfontlist >++# [ -x /usr/sbin/chkfontpath ] && buildfontlist >+ # Clean out .font-unix dir, and recreate it with the proper ownership and >+ # permissions. >+ # Make sure .font-unix dir, exists. >+@@ -94,7 +94,7 @@ > reload() { > if [ -f /var/lock/subsys/xfs ]; then > echo -n $"Reloading $prog: "
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 174629
: 294214