[Ovirt-devel] [Fwd: [PATCH node] fix halt patch]

[Mike Burns]

-------- Forwarded Message --------
> From: Alan Pevec <apevec at redhat.com>
> To: mburns at redhat.com
> Cc: Alan Pevec <apevec at redhat.com>
> Subject: [PATCH node] fix halt patch
> Date: Wed, 24 Mar 2010 19:25:39 +0100
> 
> (copy/paste whitespace damage)
> ---
>  recipe/common-post.ks |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/recipe/common-post.ks b/recipe/common-post.ks
> index 0a2e180..c6ef496 100644
> --- a/recipe/common-post.ks
> +++ b/recipe/common-post.ks
> @@ -180,17 +180,17 @@ sed -i 's/preferred_names = \[ \]/preferred_names = [ "^\/dev\/mapper", "^\/dev\
>  
>  # prevent node from hanging on reboot due to /etc mounts
>  patch -d /etc/init.d/ -p0 <<\EOF
> ---- halt.orig  2010-03-15 16:01:13.677585448 -0400
> -+++ halt       2010-03-15 16:01:39.798581069 -0400
> -@@ -138,7 +138,7 @@ __umount_loop '$3 ~ /^rpc_pipefs$/ || $3
> +--- halt.orig	2009-12-05 00:44:29.000000000 +0000
> ++++ halt	2010-03-24 18:12:36.000000000 +0000
> +@@ -138,7 +138,7 @@
>       $"Unmounting pipe file systems (retry): " \
>       -f
> -
> + 
>  -LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/dev/{next}
>  +LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/etc|^\/dev/{next}
> -    $3 == "tmpfs" || $3 == "proc" {print $2 ; next}
> -    /(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next}
> -   {print $2}' /proc/mounts \
> + 	$3 == "tmpfs" || $3 == "proc" {print $2 ; next}
> + 	/(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next}
> + 	{print $2}' /proc/mounts \
>  EOF
>  
>  # Need this for F12 findfs calls


acked and pushed