Date: Sun, 23 Jul 2000 17:49:57 -0500 (CDT) From: Tim Zingelman <zingelman@fnal.gov> To: John Baldwin <jhb@pike.osd.bsdi.com> Cc: Kris Kennaway <kris@FreeBSD.ORG>, stable@FreeBSD.ORG Subject: Re: sysinstall resetting USA_RESIDENT=NO Message-ID: <Pine.GSO.4.21.0007231742520.28714-200000@nova.fnal.gov> In-Reply-To: <200007232232.PAA25039@pike.osd.bsdi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. ---559023410-1804928587-964392597=:28714 Content-Type: TEXT/PLAIN; charset=US-ASCII On Sun, 23 Jul 2000, John Baldwin wrote: > No, he's right. sysinstall is definitely broken in this respect, and > I'm definitely interested in your patches to fix it. :) The patches are attached... In either the case that no make.conf exists, or one exists without a USA_RESIDENT line in it, the line is added, regardless of if I have confirmed that the default NO is correct or not. In the case that make.conf has a USA_RESIDENT line, I only overwrite that line if the user has answered the question 'are you really a us resident'. Let me know if you have any questions. Thanks. - Tim ---559023410-1804928587-964392597=:28714 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="temp.difs" Content-Transfer-Encoding: BASE64 Content-ID: <Pine.GSO.4.21.0007231749570.28714@nova.fnal.gov> Content-Description: Content-Disposition: attachment; filename="temp.difs" SW5kZXg6IGNvbmZpZy5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1Mg ZmlsZTogL3Vzci9DVlMvc3JjL3JlbGVhc2Uvc3lzaW5zdGFsbC9jb25maWcu Yyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTU2LjIuMw0KZGlmZiAtYyAt cjEuMTU2LjIuMyBjb25maWcuYw0KKioqIGNvbmZpZy5jCTIwMDAvMDcvMTYg MTc6Mjk6NTgJMS4xNTYuMi4zDQotLS0gY29uZmlnLmMJMjAwMC8wNy8yMyAy MjozODoyOQ0KKioqKioqKioqKioqKioqDQoqKiogMzcxLDM3OCAqKioqDQog ICAgICBjaGFyICpsaW5lc1tNQVhfTElORVNdOw0KICAgICAgaW50IGksIG5s aW5lczsNCiAgICAgIEZJTEUgKmZwOw0KICANCiEgICAgIGlmICghZmlsZV9y ZWFkYWJsZShjb25maWcpKSB7DQogIAljaGFyICpsaW5lID0gbWFsbG9jKDIx KTsNCiAgCXNwcmludGYobGluZSwgIlVTQV9SRVNJREVOVD0lc1xuIiwgVVNB UmVzaWRlbnQgPyAiWUVTIiA6ICJOTyIpOw0KICAJbGluZXNbMF0gPSBsaW5l Ow0KLS0tIDM3MSwzNzkgLS0tLQ0KICAgICAgY2hhciAqbGluZXNbTUFYX0xJ TkVTXTsNCiAgICAgIGludCBpLCBubGluZXM7DQogICAgICBGSUxFICpmcDsN CisgICAgIGJvb2wgbmVlZFJlc0xpbmU9VFJVRTsNCiAgDQohICAgICBpZiAo IWZpbGVfcmVhZGFibGUoY29uZmlnKSkgeyAgLyogY3JlYXRlIGluaXRpYWwg ZmlsZSAqLw0KICAJY2hhciAqbGluZSA9IG1hbGxvYygyMSk7DQogIAlzcHJp bnRmKGxpbmUsICJVU0FfUkVTSURFTlQ9JXNcbiIsIFVTQVJlc2lkZW50ID8g IllFUyIgOiAiTk8iKTsNCiAgCWxpbmVzWzBdID0gbGluZTsNCioqKioqKioq KioqKioqKg0KKioqIDM4NCwzOTMgKioqKg0KICAJICAgIHJldHVybjsNCiAg CWZvciAoaSA9IDA7IGkgPCBubGluZXM7IGkrKykgew0KICAJICAgIGlmICgh c3RybmNtcChsaW5lc1tpXSwgIlVTQV9SRVNJREVOVCIsIDEyKSkgew0KISAJ CWZyZWUobGluZXNbaV0pOw0KISAJCWxpbmVzW2ldID0gbWFsbG9jKDIxKTsJ LyogYmlnIGVub3VnaCAqLw0KISAJCXNwcmludGYobGluZXNbaV0sICJVU0Ff UkVTSURFTlQ9JXNcbiIsIFVTQVJlc2lkZW50ID8gIllFUyIgOiAiTk8iKTsN CiAgCSAgICB9DQogIAl9DQogICAgICB9DQogICAgICBpZiAoKGZwID0gZm9w ZW4oY29uZmlnLCAidyIpKSAhPSBOVUxMKSB7DQotLS0gMzg1LDQwMiAtLS0t DQogIAkgICAgcmV0dXJuOw0KICAJZm9yIChpID0gMDsgaSA8IG5saW5lczsg aSsrKSB7DQogIAkgICAgaWYgKCFzdHJuY21wKGxpbmVzW2ldLCAiVVNBX1JF U0lERU5UIiwgMTIpKSB7DQohIAkJaWYgKFVTQVJlc1ZhbGlkKSB7ICAvKiB3 ZSBoYXZlIGFza2VkLCBzbyBsZXRzIG92ZXJ3cml0ZSAqLw0KISAJCSAgICBm cmVlKGxpbmVzW2ldKTsNCiEgCQkgICAgbGluZXNbaV0gPSBtYWxsb2MoMjEp OwkvKiBiaWcgZW5vdWdoICovDQohIAkJICAgIHNwcmludGYobGluZXNbaV0s ICJVU0FfUkVTSURFTlQ9JXNcbiIsIFVTQVJlc2lkZW50ID8gIllFUyIgOiAi Tk8iKTsNCiEgCQl9DQohIAkJbmVlZFJlc0xpbmU9RkFMU0U7DQogIAkgICAg fQ0KKyAJfQ0KKyAJaWYgKG5lZWRSZXNMaW5lKSB7ICAvKiBhZGQgVVNBX1JF U0lERU5UIGxpbmUgdG8gZXhpc3RpbmcgZmlsZSAqLw0KKyAJY2hhciAqbGlu ZSA9IG1hbGxvYygyMSk7DQorIAlzcHJpbnRmKGxpbmUsICJVU0FfUkVTSURF TlQ9JXNcbiIsIFVTQVJlc2lkZW50ID8gIllFUyIgOiAiTk8iKTsNCisgCWxp bmVzW25saW5lcysrXSA9IGxpbmU7DQogIAl9DQogICAgICB9DQogICAgICBp ZiAoKGZwID0gZm9wZW4oY29uZmlnLCAidyIpKSAhPSBOVUxMKSB7DQpJbmRl eDogZGlzdC5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTog L3Vzci9DVlMvc3JjL3JlbGVhc2Uvc3lzaW5zdGFsbC9kaXN0LmMsdg0KcmV0 cmlldmluZyByZXZpc2lvbiAxLjE3NS4yLjINCmRpZmYgLWMgLXIxLjE3NS4y LjIgZGlzdC5jDQoqKiogZGlzdC5jCTIwMDAvMDcvMjAgMDE6NTM6MzkJMS4x NzUuMi4yDQotLS0gZGlzdC5jCTIwMDAvMDcvMjMgMDY6MjE6MDENCioqKioq KioqKioqKioqKg0KKioqIDQwNSw0MTAgKioqKg0KLS0tIDQwNSw0MTEgLS0t LQ0KICANCiAgICAgIGRpYWxvZ19jbGVhcl9ub3JlZnJlc2goKTsNCiAgICAg IFVTQVJlc2lkZW50ID0gIW1zZ1llc05vKCJBcmUgeW91IGFjdHVhbGx5IHJl c2lkZW50IGluIHRoZSBVbml0ZWQgU3RhdGVzPyIpOw0KKyAgICAgVVNBUmVz VmFsaWQgPSBUUlVFOw0KICANCiAgICAgIGRpc3RWZXJpZnlGbGFncygpOw0K ICAgICAgcmV0dXJuIGkgfCBESVRFTV9SRURSQVcgfCBESVRFTV9SRVNUT1JF Ow0KSW5kZXg6IGdsb2JhbHMuYw0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K UkNTIGZpbGU6IC91c3IvQ1ZTL3NyYy9yZWxlYXNlL3N5c2luc3RhbGwvZ2xv YmFscy5jLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4yNA0KZGlmZiAtYyAt cjEuMjQgZ2xvYmFscy5jDQoqKiogZ2xvYmFscy5jCTIwMDAvMDMvMTIgMDM6 NTc6MjUJMS4yNA0KLS0tIGdsb2JhbHMuYwkyMDAwLzA3LzIzIDA2OjIwOjI0 DQoqKioqKioqKioqKioqKioNCioqKiA0OCw1MyAqKioqDQotLS0gNDgsNTQg LS0tLQ0KICBCb29sZWFuCQlDb2xvckRpc3BsYXk7CS8qIEFyZSB3ZSBvbiBh IGNvbG9yIGRpc3BsYXk/ICovDQogIEJvb2xlYW4JCU9uVlRZOwkJLyogQXJl IHdlIG9uIGEgVlRZPyAqLw0KICBCb29sZWFuCQlVU0FSZXNpZGVudDsJLyog QXJlIHdlIGNyeXB0b2dyYXBoaWNhbGx5IGNoYWxsZW5nZWQ/ICovDQorIEJv b2xlYW4JCVVTQVJlc1ZhbGlkOwkvKiBIYXZlIHdlIGFza2VkIHlldD8gKi8N CiAgVmFyaWFibGUJKlZhckhlYWQ7CS8qIFRoZSBoZWFkIG9mIHRoZSB2YXJp YWJsZSBjaGFpbiAqLw0KICBEZXZpY2UJCSptZWRpYURldmljZTsJLyogV2hl cmUgd2UncmUgaW5zdGFsbGluZyBmcm9tICovDQogIGludAkJQm9vdE1ncjsJ LyogV2hpY2ggYm9vdCBtYW5hZ2VyIHdlJ3JlIHVzaW5nICovDQoqKioqKioq KioqKioqKioNCioqKiA3MCw3MyAqKioqDQotLS0gNzEsNzUgLS0tLQ0KICAg ICAgbWVkaWFEZXZpY2UgPSBOVUxMOw0KICAgICAgUnVubmluZ0FzSW5pdCA9 IEZBTFNFOw0KICAgICAgVVNBUmVzaWRlbnQgPSBGQUxTRTsNCisgICAgIFVT QVJlc1ZhbGlkID0gRkFMU0U7DQogIH0NCkluZGV4OiBzeXNpbnN0YWxsLmgN Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvdXNyL0NWUy9z cmMvcmVsZWFzZS9zeXNpbnN0YWxsL3N5c2luc3RhbGwuaCx2DQpyZXRyaWV2 aW5nIHJldmlzaW9uIDEuMTg2LjIuNg0KZGlmZiAtYyAtcjEuMTg2LjIuNiBz eXNpbnN0YWxsLmgNCioqKiBzeXNpbnN0YWxsLmgJMjAwMC8wNy8yMSAyMDo0 Mzo0OAkxLjE4Ni4yLjYNCi0tLSBzeXNpbnN0YWxsLmgJMjAwMC8wNy8yMyAw NjoyNDo0Ng0KKioqKioqKioqKioqKioqDQoqKiogMzQ3LDM1MiAqKioqDQot LS0gMzQ3LDM1MyAtLS0tDQogIGV4dGVybiBCb29sZWFuCQlDb2xvckRpc3Bs YXk7CQkvKiBBcmUgd2Ugb24gYSBjb2xvciBkaXNwbGF5PwkJCSovDQogIGV4 dGVybiBCb29sZWFuCQlPblZUWTsJCQkvKiBPbiBhIHN5c2NvbnMgVlRZPwkJ CQkqLw0KICBCb29sZWFuCQkJVVNBUmVzaWRlbnQ7CQkvKiBBcmUgd2UgY3J5 cHRvZ3JhcGhpY2FsbHkgY2hhbGxlbmdlZD8JCSovDQorIEJvb2xlYW4JCQlV U0FSZXNWYWxpZDsJCS8qIEhhdmUgd2UgYXNrZWQgeWV0PyAqLw0KICBleHRl cm4gVmFyaWFibGUJCSpWYXJIZWFkOwkJLyogVGhlIGhlYWQgb2YgdGhlIHZh cmlhYmxlIGNoYWluCQkqLw0KICBleHRlcm4gRGV2aWNlCQkqbWVkaWFEZXZp Y2U7CQkvKiBXaGVyZSB3ZSdyZSBnZXR0aW5nIG91ciBkaXN0cmlidXRpb24g ZnJvbQkqLw0KICBleHRlcm4gdW5zaWduZWQgaW50CURpc3RzOwkJCS8qIFdo aWNoIGRpc3RyaWJ1dGlvbnMgd2Ugd2FudAkJCSovDQo= ---559023410-1804928587-964392597=:28714-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.GSO.4.21.0007231742520.28714-200000>