Ryan Barry has uploaded a new change for review. Change subject: Fix rc.sysinit patching on 6.6 ......................................................................
Fix rc.sysinit patching on 6.6 rc.sysinit changed a bit. Make the patch apply cleanly. Change-Id: I6738243cd637e8595712fc84861532b175a29555 Signed-off-by: Ryan Barry <[email protected]> --- M recipe/centos6-post.ks M recipe/rhevh6-post.ks 2 files changed, 45 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/96/34796/1 diff --git a/recipe/centos6-post.ks b/recipe/centos6-post.ks index c209ab0..55c93b8 100644 --- a/recipe/centos6-post.ks +++ b/recipe/centos6-post.ks @@ -114,6 +114,25 @@ fi disable_selinux() { +EOF_rc_sysinit + +if grep -q 6.6 /etc/system-release; then + patch -d /etc/rc.d -p0 << \EOF_rc_sysinit +@@ -513,9 +513,9 @@ + # filesystems are NOT unmounted in single user mode. + # The 'no' applies to all listed filesystem types. See mount(8). + if [ "$READONLY" != "yes" ] ; then +- action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,glusterfs -O no_netdev ++ action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,glusterfs,noproc,nosysfs,nodevpts -O no_netdev + else +- action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2i,glusterfs -O no_netdev ++ action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2i,glusterfs,noproc,nosysfs,nodevpts -O no_netdev + fi + + # Update quotas if necessary +EOF_rc_sysinit +else + patch -d /etc/rc.d -p0 << \EOF_rc_sysinit @@ -503,9 +503,9 @@ # filesystems are NOT unmounted in single user mode. # The 'no' applies to all listed filesystem types. See mount(8). @@ -127,6 +146,7 @@ # Update quotas if necessary EOF_rc_sysinit +fi # rhbz#675868 # Modify start_udev diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks index eab0fae..553d074 100644 --- a/recipe/rhevh6-post.ks +++ b/recipe/rhevh6-post.ks @@ -114,19 +114,39 @@ fi disable_selinux() { -@@ -497,9 +497,9 @@ +EOF_rc_sysinit + +if grep -q 6.6 /etc/system-release; then + patch -d /etc/rc.d -p0 << \EOF_rc_sysinit +@@ -513,9 +513,9 @@ # filesystems are NOT unmounted in single user mode. # The 'no' applies to all listed filesystem types. See mount(8). if [ "$READONLY" != "yes" ] ; then -- action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev -+ action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,noproc,nosysfs,nodevpts -O no_netdev +- action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,glusterfs -O no_netdev ++ action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,glusterfs,noproc,nosysfs,nodevpts -O no_netdev else -- action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev -+ action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,noproc,nosysfs,nodevpts -O no_netdev +- action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2i,glusterfs -O no_netdev ++ action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2i,glusterfs,noproc,nosysfs,nodevpts -O no_netdev fi # Update quotas if necessary EOF_rc_sysinit +else + patch -d /etc/rc.d -p0 << \EOF_rc_sysinit +@@ -503,9 +503,9 @@ + # filesystems are NOT unmounted in single user mode. + # The 'no' applies to all listed filesystem types. See mount(8). + if [ "$READONLY" != "yes" ] ; then +- action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev ++ action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,noproc,nosysfs,nodevpts -O no_netdev + else +- action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev ++ action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,noproc,nosysfs,nodevpts -O no_netdev + fi + + # Update quotas if necessary +EOF_rc_sysinit +fi # rhbz#675868 # Modify start_udev -- To view, visit http://gerrit.ovirt.org/34796 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6738243cd637e8595712fc84861532b175a29555 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Ryan Barry <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
