bin/182574: freebsd-update can not update custom release with custom kernels

[Anes Mukhametov]

>Number:         182574
>Category:       bin
>Synopsis:       freebsd-update can not update custom release with custom kernels
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 02 14:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Anes Mukhametov
>Release:        FreeBSD 9.2-STABLE
>Organization:
>Environment:

	
>Description:
        I use custom FreeBSD releases which include more than one custom kernel.
        In my case I can't update with freebsd-update, it fails with fetch_metadata_bogus.

        The reason is custom kernel path /boot/kernel.CUSTOMKERNEL is invalid for freebsd-update.
        Attached patch fixes this behaviour.

>How-To-Repeat:
        Build your own release with more than one kernel (GENERIC+XENHVM for example). Set up freebsd-update server and try to update.

>Fix:

	

--- freebsd-update.sh.diff begins here ---
Index: usr.sbin/freebsd-update/freebsd-update.sh
===================================================================
--- usr.sbin/freebsd-update/freebsd-update.sh	(revision 254897)
+++ usr.sbin/freebsd-update/freebsd-update.sh	(working copy)
@@ -1206,7 +1206,7 @@
 
 	# Check that the first four fields make sense.
 	if gunzip -c < files/$1.gz |
-	    grep -qvE "^[a-z]+\|[0-9a-z]+\|${P}+\|[fdL-]\|"; then
+	    grep -qvE "^[a-z]+\|[0-9a-zA-Z\.]+\|${P}+\|[fdL-]\|"; then
 		fetch_metadata_bogus ""
 		return 1
 	fi
--- freebsd-update.sh.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: