summaryrefslogtreecommitdiffstats
path: root/scripts/mk-images
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2004-03-30 18:15:08 +0000
committerJeremy Katz <katzj@redhat.com>2004-03-30 18:15:08 +0000
commit40c95db3dca68c870d532a583299d7b319aa653a (patch)
treec89c7ad399478eeb0129135d2af778414230c5e3 /scripts/mk-images
parentf298ea82d47bb0bc8a8525526d6e569206b4765d (diff)
downloadanaconda-40c95db3dca68c870d532a583299d7b319aa653a.tar.gz
anaconda-40c95db3dca68c870d532a583299d7b319aa653a.tar.xz
anaconda-40c95db3dca68c870d532a583299d7b319aa653a.zip
minor fixes towards getting s390 working with my changes from last week
Diffstat (limited to 'scripts/mk-images')
-rwxr-xr-xscripts/mk-images6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index 17aeb7e81..047c8e591 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -387,6 +387,7 @@ EOF
# setup xinetd for telnet
cp -f $IMGPATH/etc/xinetd.conf $MBD_DIR/etc/xinetd.conf
+ mkdir -p $MBD_DIR_/etc/xinetd.d
cat > $MBD_DIR/etc/xinetd.d/telnet <<EOF
service telnet
{
@@ -448,7 +449,7 @@ EOF
cp -f $IMGPATH/usr/sbin/xinetd $MBD_DIR/sbin/xinetd
cp -f $IMGPATH/usr/sbin/in.telnetd $MBD_DIR/sbin/in.telnetd
cp -f $IMGPATH/usr/bin/bash $MBD_DIR/sbin/bash
- cp -f $IMGPATH/sbin/busybox $MBD_DIR/sbin/busybox
+ cp -f $IMGPATH/usr/bin/busybox $MBD_DIR/sbin/busybox
# make some symlinks
ln -sf bash $MBD_DIR/sbin/sh
@@ -579,7 +580,6 @@ makeinitrd() {
MBD_MNTPOINT=/tmp/makebootdisk.mount.$$
MBD_TMPIMAGE=/tmp/makebootdisk.image.$$
MBD_BOOTTREE=/tmp/makebootdisk.tree.$$
- INITBIN=init
rm -rf $MBD_DIR MBD_FSIMAGE
mkdir -p $MBD_DIR/modules
@@ -622,7 +622,7 @@ EOF
install -s -m 755 $LOADERBINDIR/$LOADERBIN $MBD_DIR/sbin/loader
if [ "$BUILDARCH" != "s390" -a "$BUILDARCH" != "s390x" ]; then
- install -s -m 755 $LOADERBINDIR/$INITBIN $MBD_DIR/sbin
+ install -s -m 755 $LOADERBINDIR/init $MBD_DIR/sbin
else
install -s -m 755 $LOADERBINDIR/shutdown $MBD_DIR/sbin/shutdown
install -m 755 $IMGPATH/usr/lib/anaconda-runtime/loader/linuxrc.s390 $MBD_DIR/linuxrc