summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/mk-images10
-rw-r--r--scripts/mk-images.i3862
2 files changed, 10 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index 18aeed7ff..613a25e7b 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -231,6 +231,7 @@ makemainmodules() {
makebootdisk() {
EXTRAKERNELPATH=""
EXTRAINITRDPATH=""
+ PCMCIA=""
while [ $(echo $1 | cut -c1-2) = "--" ]; do
if [ $1 = "--kernelto" ]; then
EXTRAKERNELPATH=$2
@@ -238,6 +239,9 @@ makebootdisk() {
elif [ $1 = "--initrdto" ]; then
EXTRAINITRDPATH=$2
shift; shift
+ elif [ $1 = "--pcmcia" ]; then
+ PCMCIA=yes
+ shift
fi
done
MBD_FILENAME=$IMAGEPATH/$1
@@ -364,6 +368,11 @@ EOF
exit 1
fi
+ if [ -n "$PCMCIA" ]; then
+ mkdir -p $MBD_BOOTTREE/etc
+ cp -a $KERNELROOT/etc/pcmcia $MBD_BOOTTREE/etc
+ fi
+
if [ -n "$EXTRAKERNELPATH" ]; then
mkdir -p $EXTRAKERNELPATH
cp -a $KERNELROOT/boot/vmlinuz-* $EXTRAKERNELPATH/vmlinuz
@@ -374,7 +383,6 @@ EOF
cp -a $MBD_FSIMAGE $EXTRAINITRDPATH/initrd.img
fi
- rmdir $MBD_BOOTTREE
rm -f $MBD_FILENAME
mv -f $MBD_TMPIMAGE $MBD_FILENAME
rm -rf $MBD_TMPIMAGE $MBD_FSIMAGE $MBD_MNTPOINT $MBD_BOOTTREE
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index d4f3dee4b..b245e7af3 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -12,7 +12,7 @@ makebootdisk --kernelto $TOPDESTPATH/images/pxeboot \
de600 de620 depca dgrs eepro100 eepro hp-plus hp
hp100 ibmtr ni52 old_tulip tulip ne nfs vfat"
-makebootdisk pcmcia.img loader-pcmcia "$PCMCIAMODULES"
+makebootdisk --pcmcia pcmcia.img loader-pcmcia "$PCMCIAMODULES"
makedriverdisk "Supplemental Drivers" "drivers" "+scsi +net"