aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>2001-03-14 03:26:40 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>2001-03-14 03:26:40 +0000
commit56d6f15dcae8a1afcaad797b3582a3f710deca97 (patch)
treefb802aa31e992b74696ee19d8fba8282751d0c61 /usr.sbin
parented6fd55a5922a7d657ce1c59dbf21e4e9c109b06 (diff)
downloadsrc-56d6f15dcae8a1afcaad797b3582a3f710deca97.tar.gz
src-56d6f15dcae8a1afcaad797b3582a3f710deca97.zip
OK, *now* we only sort the file once (red face).
Notes
Notes: svn path=/head/; revision=74227
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sade/config.c2
-rw-r--r--usr.sbin/sysinstall/config.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 7a651dc6db2c..d84b2499ea7c 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -409,7 +409,7 @@ configRC_conf(void)
fclose(rcSite);
/* Tidy up the resulting file if it's late enough in the installation
for sort and uniq to be available */
- if (file_readable("/usr/bin/sort") && file_readable("/usr/bin/uniq"))
+ if (RunningAsInit && file_readable("/usr/bin/sort") && file_readable("/usr/bin/uniq"))
(void)vsystem("sort /etc/rc.conf | uniq > /etc/rc.conf.new && mv /etc/rc.conf.new /etc/rc.conf");
}
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 7a651dc6db2c..d84b2499ea7c 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -409,7 +409,7 @@ configRC_conf(void)
fclose(rcSite);
/* Tidy up the resulting file if it's late enough in the installation
for sort and uniq to be available */
- if (file_readable("/usr/bin/sort") && file_readable("/usr/bin/uniq"))
+ if (RunningAsInit && file_readable("/usr/bin/sort") && file_readable("/usr/bin/uniq"))
(void)vsystem("sort /etc/rc.conf | uniq > /etc/rc.conf.new && mv /etc/rc.conf.new /etc/rc.conf");
}