From 83eb2c37009874672764765ec3bf3b59286c7391 Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Sat, 14 Jan 2012 08:57:23 +0000 Subject: In the rc.d scripts, change assignments to rcvar to use the literal name_enable wherever possible, and ${name}_enable when it's not, to prepare for the demise of set_rcvar(). In cases where I had to hand-edit unusual instances also modify formatting slightly to be more uniform (and in some cases, correct). This includes adding some $FreeBSD$ tags, and most importantly moving rcvar= to right after name= so it's clear that one is derived from the other. --- sysutils/diskprep/files/diskprep.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'sysutils/diskprep/files/diskprep.in') diff --git a/sysutils/diskprep/files/diskprep.in b/sysutils/diskprep/files/diskprep.in index d4419c0df00c..c41d01e67705 100644 --- a/sysutils/diskprep/files/diskprep.in +++ b/sysutils/diskprep/files/diskprep.in @@ -1,6 +1,8 @@ #!/bin/sh # $Aero: util/diskprep/diskprep.rc,v 1.1 2005/08/06 00:50:59 brooks Exp $ +# $FreeBSD$ +# # PROVIDE: diskprep # REQUIRE: disks # BEFORE: fsck localswap @@ -9,7 +11,12 @@ . /etc/rc.subr name="diskprep" -rc_var=`set_rcvar` +rcvar=diskprep_enable + +load_rc_config $name + +# Needs default value for _enable ?? + start_precmd="diskprep_prestart" stop_cmd=":" command="/usr/local/sbin/diskprep" @@ -32,6 +39,4 @@ diskprep_prestart() command_args="$command_args $diskprep_disk" } -load_rc_config $name - run_rc_command "$1" -- cgit v1.2.3