summaryrefslogtreecommitdiff
path: root/sysutils/mklivecd
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2007-04-12 22:31:16 +0000
committerxtraeme <xtraeme>2007-04-12 22:31:16 +0000
commit95a8caef34de70e12b17f9799fb396b69f787d98 (patch)
tree766b9d76ab6252ee781d70321afcec2fa0b7c9c9 /sysutils/mklivecd
parentc243d54093fd54bd897d8def2ec7435efad57d29 (diff)
downloadpkgsrc-95a8caef34de70e12b17f9799fb396b69f787d98.tar.gz
Do the same for MULTIPLE_KERNELS, check if the kernel is found in
~/.mklivecd before showing informative messages.
Diffstat (limited to 'sysutils/mklivecd')
-rwxr-xr-xsysutils/mklivecd/files/mklivecd.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh
index f8d958581bf..261a74e6a4e 100755
--- a/sysutils/mklivecd/files/mklivecd.sh
+++ b/sysutils/mklivecd/files/mklivecd.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mklivecd.sh,v 1.40 2007/04/12 22:26:19 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.41 2007/04/12 22:31:16 xtraeme Exp $
#
# Copyright (c) 2004-2007 Juan Romero Pardines.
# All rights reserved.
@@ -400,6 +400,11 @@ do_build_kernels()
eval bootkern=\$KERNEL_CONFIG_${K}
eval kernname=\$KERNEL_NAME_${K}
+ if [ ! -d $WORKDIR/$kernname -a ! -f $bootkern ]; then
+ showmsg "couldn't find $bootkern, exiting."
+ bye 1
+ fi
+
cd $WORKDIR
showmsg "Building kernel: $bootkern.."
@@ -410,11 +415,6 @@ do_build_kernels()
mkdir $WORKDIR/$kernname
fi
- if [ ! -d $WORKDIR/$kernname -a ! -f $bootkern ]; then
- showmsg "couldn't find $bootkern, exiting."
- bye 1
- fi
-
config -s $SOURCEDIR/sys -b $WORKDIR/$kernname $bootkern
cd $kernname
make depend && make
@@ -672,7 +672,7 @@ do_cdlive()
cat > $ISODIR/etc/rc.d/root <<_EOF_
#!/bin/sh
#
-# \$NetBSD: mklivecd.sh,v 1.40 2007/04/12 22:26:19 xtraeme Exp $
+# \$NetBSD: mklivecd.sh,v 1.41 2007/04/12 22:31:16 xtraeme Exp $
#
# PROVIDE: root