diff options
author | xtraeme <xtraeme> | 2004-02-27 05:28:06 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2004-02-27 05:28:06 +0000 |
commit | 1f665553274ab0ac97a178d2d4cc4a4e9f0809cd (patch) | |
tree | 9f73b4f902c507281e34fc5767d32966eed5e176 /sysutils | |
parent | ec64eaef07c52bff9e1dca581563b2545607bf87 (diff) | |
download | pkgsrc-1f665553274ab0ac97a178d2d4cc4a4e9f0809cd.tar.gz |
err fixed the problem in checkconf().
Diffstat (limited to 'sysutils')
-rwxr-xr-x | sysutils/mklivecd/files/mklivecd.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh index aa717591879..9c9c0a9f173 100755 --- a/sysutils/mklivecd/files/mklivecd.sh +++ b/sysutils/mklivecd/files/mklivecd.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: mklivecd.sh,v 1.2 2004/02/27 01:32:31 xtraeme Exp $ +# $NetBSD: mklivecd.sh,v 1.3 2004/02/27 05:28:06 xtraeme Exp $ # # Copyright (c) 2004 Juan RP <xtraeme@NetBSD.org> # All rights reserved. @@ -168,6 +168,8 @@ EOF echo "=> Configuration file created, now please edit it." echo "=> Path: $config_file" + elif [ -f $config_file -a $target != "config" ]; then + showmsg "Using $config_file" else showmsg "$config_file already exists!" bye 1 @@ -323,7 +325,7 @@ do_cdlive() cat > $ISODIR/etc/rc.d/root <<_EOF_ #!/bin/sh # -# \$NetBSD: mklivecd.sh,v 1.2 2004/02/27 01:32:31 xtraeme Exp $ +# \$NetBSD: mklivecd.sh,v 1.3 2004/02/27 05:28:06 xtraeme Exp $ # # PROVIDE: root @@ -575,7 +577,9 @@ if [ -z "$config_file" ]; then config_file=$config_dir/mklivecd.conf fi -case "$1" in +target=$1 + +case "$target" in iso) checkconf do_cdlive iso |