Date: Mon, 23 May 2016 01:00:27 -0400 From: Allan Jude <allanjude@freebsd.org> To: Andriy Voskoboinyk <avos@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r298946 - head/usr.sbin/bsdinstall/scripts Message-ID: <e01538e8-0b18-754a-5949-47a85533ecab@freebsd.org> In-Reply-To: <186c070f-eb81-370d-b215-1d9f370918b8@freebsd.org> References: <201605022140.u42LeYFK051507@repo.freebsd.org> <186c070f-eb81-370d-b215-1d9f370918b8@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------26E0DFE394FD6CFD610C9DF3 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 2016-05-23 00:49, Allan Jude wrote: > On 2016-05-02 17:40, Andriy Voskoboinyk wrote: >> Author: avos >> Date: Mon May 2 21:40:34 2016 >> New Revision: 298946 >> URL: https://svnweb.freebsd.org/changeset/base/298946 >> >> Log: >> bsdinstall: fix static address assignment for protected wireless networks. >> >> Filter out IFCONFIG_PREFIX variable (which may contain WPA keyword) >> from ifconfig parameters. >> >> PR: 169199 >> >> Modified: >> head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 >> >> Modified: head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 >> ============================================================================== >> --- head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 Mon May 2 21:23:05 2016 (r298945) >> +++ head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 Mon May 2 21:40:34 2016 (r298946) >> @@ -84,7 +84,7 @@ retval=$? >> >> if [ "$BSDINSTALL_CONFIGCURRENT" ]; then >> . $BSDINSTALL_TMPETC/._rc.conf.net >> - ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE` >> + ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE | sed "s|$2||"` >> if [ "$defaultrouter" ]; then >> route delete -inet default >> route add -inet default $defaultrouter >> > > This breaks static assignment of IP addresses to wired interfaces: > > sed: first RE may not be empty > > I wrote this patch for the issue. Unless you see a better way to do it? -- Allan Jude --------------26E0DFE394FD6CFD610C9DF3 Content-Type: text/plain; charset=UTF-8; name="bsdinstall_netif.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="bsdinstall_netif.patch" SW5kZXg6IHVzci5zYmluL2JzZGluc3RhbGwvc2NyaXB0cy9uZXRjb25maWdfaXB2NAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSB1c3Iuc2Jpbi9ic2RpbnN0YWxsL3NjcmlwdHMvbmV0Y29uZmlnX2lw djQJKHJldmlzaW9uIDMwMDQzNikKKysrIHVzci5zYmluL2JzZGluc3RhbGwvc2NyaXB0cy9u ZXRjb25maWdfaXB2NAkod29ya2luZyBjb3B5KQpAQCAtODQsNyArODQsMTEgQEAKIAogaWYg WyAiJEJTRElOU1RBTExfQ09ORklHQ1VSUkVOVCIgXTsgdGhlbgogCS4gJEJTRElOU1RBTExf VE1QRVRDLy5fcmMuY29uZi5uZXQKLQlpZmNvbmZpZyAkSU5URVJGQUNFIGBldmFsIGVjaG8g XFxcJGlmY29uZmlnXyRJTlRFUkZBQ0UgfCBzZWQgInN8JDJ8fCJgCisJaWYgWyAtbiAiJDIi IF07IHRoZW4KKwkJaWZjb25maWcgJElOVEVSRkFDRSBgZXZhbCBlY2hvIFxcXCRpZmNvbmZp Z18kSU5URVJGQUNFIHwgc2VkICJzfCQyfHwiYAorCWVsc2UKKwkJaWZjb25maWcgJElOVEVS RkFDRSBgZXZhbCBlY2hvIFxcXCRpZmNvbmZpZ18kSU5URVJGQUNFYAorCWZpCiAJaWYgWyAi JGRlZmF1bHRyb3V0ZXIiIF07IHRoZW4KIAkJcm91dGUgZGVsZXRlIC1pbmV0IGRlZmF1bHQK IAkJcm91dGUgYWRkIC1pbmV0IGRlZmF1bHQgJGRlZmF1bHRyb3V0ZXIK --------------26E0DFE394FD6CFD610C9DF3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e01538e8-0b18-754a-5949-47a85533ecab>