From ellisw at panasas.com Fri May 15 17:01:20 2015 From: ellisw at panasas.com (Ellis H. Wilson III) Date: Fri, 15 May 2015 13:01:00 -0400 Subject: RFC: Patches to achieve bsdinstall script without dialogs In-Reply-To: <55117618.8020308@freebsd.org> References: <54EF7B40.2030706@panasas.com> <551172FC.1010508@panasas.com> <55117618.8020308@freebsd.org> Message-ID: <5556264C.7080708@panasas.com> On 03/24/2015 10:35 AM, Allan Jude wrote: > These changes look ok to me. > > 2 main things: These would need to be based on HEAD not 10.1 in order to > be committed Nathan, Allan, et. al.: Please see attached for a new set of patches based off of HEAD. Sorry this took some time for me to get back to. Notes follow: The following experienced no real changes between 10.1 (which my last patches were based on) and HEAD, and therefore can be deemed completely safe: usr.sbin/bsdconfig/share/common.subr usr.sbin/bsdinstall/scripts/checksum usr.sbin/bsdinstall/scripts/script The following experienced changes, but the existing patch went through without any problems. I visually inspected it afterwards and it looked perfectly fine: usr.sbin/bsdinstall/partedit/scripted.c The following experienced minor changes such that the patch failed, but only needed minor modifications to achieve the same intent: usr.sbin/bsdinstall/partedit/partedit.h usr.sbin/bsdinstall/partedit/partedit.c The following was significantly changed from the 10.1 version. Since the new version used dpv, which makes ASCII output difficult, the cleanest solution I could identify was to forward port some of the old logic. There may be a better way to do this, but this is my attempt. I defer to the original author's best judgement. usr.sbin/bsdinstall/distextract/distextract.c All of our machines are running 10.1 or older, so I wasn't able to compile and test the changes above since they lack dpv. I therefore fired up a VM and made sure they at least compile. Particularly in the last case (distextract), the patch should be tested before being committed. I apologize I don't have the resources to do this myself currently. Best, ellis -------------- next part -------------- A non-text attachment was scrubbed... Name: checksum.patch Type: text/x-patch Size: 1941 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: common.subr.patch Type: text/x-patch Size: 726 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: distextract.c.patch Type: text/x-patch Size: 11570 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: partedit.c.patch Type: text/x-patch Size: 5731 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: partedit.h.patch Type: text/x-patch Size: 647 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: script.patch Type: text/x-patch Size: 1641 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: scripted.c.patch Type: text/x-patch Size: 1589 bytes Desc: not available URL: