From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 24 Aug 2014 07:46:54 +0000 (+0000)
Subject: Since rcctl(8) can changes the position of such and such variable, sort
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d335cf34e3135f509f4b5434a216b279474f3fca;p=openbsd

Since rcctl(8) can changes the position of such and such variable, sort
the file so that we always have a consistent output.

ok schwarze@ jasper@
---

diff --git a/usr.sbin/rcctl/rcctl.sh b/usr.sbin/rcctl/rcctl.sh
index fe4e0217b21..82637810ae0 100644
--- a/usr.sbin/rcctl/rcctl.sh
+++ b/usr.sbin/rcctl/rcctl.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: rcctl.sh,v 1.12 2014/08/24 07:33:26 ajacoutot Exp $
+# $OpenBSD: rcctl.sh,v 1.13 2014/08/24 07:46:54 ajacoutot Exp $
 #
 # Copyright (c) 2014 Antoine Jacoutot <ajacoutot@openbsd.org>
 #
@@ -45,6 +45,7 @@ rcconf_edit_begin()
 
 rcconf_edit_end()
 {
+	sort -u -o ${_TMP_RCCONF} ${_TMP_RCCONF} || exit 1
 	mv ${_TMP_RCCONF} /etc/rc.conf.local || exit 1
 	if [ ! -s /etc/rc.conf.local ]; then
 		rm /etc/rc.conf.local || exit 1