Re: RFC 7217: /etc/{rc,netstart} [4/8]

2017-07-15 Thread Robert Peichaer
On Sat, Jul 15, 2017 at 05:09:43PM +, Florian Obser wrote:
> netstart & simplification suggested by naddy
> 
> OK?
> 
> diff --git etc/netstart etc/netstart
> index 71890bc7a5b..047eef1ab83 100644
> --- etc/netstart
> +++ etc/netstart
> @@ -190,6 +190,8 @@ if $PRINT_ONLY && (($# == 0)); then
>   exit 1
>  fi
>  
> +$PRINT_ONLY || sysctl -q "net.inet6.ip6.soiikey=$( +
>  # If we were invoked with a list of interface names, just reconfigure these
>  # interfaces (or bridges), add default routes and return.
>  if (($# > 0)); then
> diff --git etc/rc etc/rc
> index 48e5671335f..a2e23b163a1 100644
> --- etc/rc
> +++ etc/rc
> @@ -154,6 +154,12 @@ make_keys() {
>   fi
>  
>   ssh-keygen -A
> +
> + if [[ ! -f /etc/soii.key ]]; then
> + openssl rand -hex 16 > /etc/soii.key && \
> + chmod 600 /etc/soii.key && sysctl -q \
> + "net.inet6.ip6.soiikey=$( + fi
>  }
>  
>  # Re-link libraries, placing the objects in a random order.

OK

-- 
-=[rpe]=-



RFC 7217: /etc/{rc,netstart} [4/8]

2017-07-15 Thread Florian Obser
netstart & simplification suggested by naddy

OK?

diff --git etc/netstart etc/netstart
index 71890bc7a5b..047eef1ab83 100644
--- etc/netstart
+++ etc/netstart
@@ -190,6 +190,8 @@ if $PRINT_ONLY && (($# == 0)); then
exit 1
 fi
 
+$PRINT_ONLY || sysctl -q "net.inet6.ip6.soiikey=$( 0)); then
diff --git etc/rc etc/rc
index 48e5671335f..a2e23b163a1 100644
--- etc/rc
+++ etc/rc
@@ -154,6 +154,12 @@ make_keys() {
fi
 
ssh-keygen -A
+
+   if [[ ! -f /etc/soii.key ]]; then
+   openssl rand -hex 16 > /etc/soii.key && \
+   chmod 600 /etc/soii.key && sysctl -q \
+   "net.inet6.ip6.soiikey=$(