diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2006-01-11 18:20:59 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2006-01-11 18:20:59 +0000 |
| commit | ab69be96d04873cec1b7e6558a00c9939124e435 (patch) | |
| tree | b2f375f2dee20dca89f4d472309860007a4647fb | |
| parent | be28d627ade5863f2dac156428e5aaf072b71a94 (diff) | |
| download | ports-ab69be96d04873cec1b7e6558a00c9939124e435.tar.gz ports-ab69be96d04873cec1b7e6558a00c9939124e435.zip | |
Add MASTER_SITE_LOCAL to the list of MASTER_SITES. Get rid of debugging
in the rc.d script. Make the script actually avoid rewiping the disk
once it's been labled.
Notes
Notes:
svn path=/head/; revision=153282
| -rw-r--r-- | sysutils/diskprep/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/diskprep/files/diskprep.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sysutils/diskprep/Makefile b/sysutils/diskprep/Makefile index 25118aa3f801..38b0867facee 100644 --- a/sysutils/diskprep/Makefile +++ b/sysutils/diskprep/Makefile @@ -7,9 +7,11 @@ PORTNAME= diskprep PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils -MASTER_SITES= http://people.freebsd.org/~brooks/diskprep/ +MASTER_SITES= http://people.freebsd.org/~brooks/diskprep/ \ + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= brooks MAINTAINER= brooks@FreeBSD.org COMMENT= A program to prepare disks for use based on a config file diff --git a/sysutils/diskprep/files/diskprep.in b/sysutils/diskprep/files/diskprep.in index 8c16c8ef0db4..d4419c0df00c 100644 --- a/sysutils/diskprep/files/diskprep.in +++ b/sysutils/diskprep/files/diskprep.in @@ -6,8 +6,6 @@ # BEFORE: fsck localswap # KEYWORD: nojail -rc_debug=YES - . /etc/rc.subr name="diskprep" @@ -20,7 +18,7 @@ diskprep_prestart() { if [ -n "${diskprep_label}" ]; then # If our label exists, we're done. - if [ -c /dev/label/${curlabel} ]; then + if [ -c /dev/label/${diskprep_label} ]; then return 0 fi command_args="$command_args -l $diskprep_label" |