From c61ac386c2dbf70c629d8e5364c5872563510aed Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Thu, 21 Apr 2011 15:36:16 +0200
Subject: script tuning :) + vesamenu

---
 install-usb | 40 +++++++---------------------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

(limited to 'install-usb')

diff --git a/install-usb b/install-usb
index 5b63c67..f6f2246 100755
--- a/install-usb
+++ b/install-usb
@@ -10,7 +10,9 @@ fi
 OUT_DEV=$1
 SYSLINUX=$ROOT_DIR/contrib/syslinux/latest
 
-[ ! -f $SYSLINUX/Makefile ] && $ROOT_DIR/contrib/syslinux/fetch.sh
+PATH="$PATH:$ROOT_DIR/bin/"
+
+[ ! -f $SYSLINUX/Makefile ] && env.setup-syslinux.sh
 
 if [ -z $OUT_DEV ]; then
     echo "no dev"
@@ -31,45 +33,17 @@ mkdir -p /media/openslx-stick/boot
 
 $SYSLINUX/extlinux/extlinux -i /media/openslx-stick/boot
 
-bash $ROOT_DIR/bin/build-preboot-kernel
+[ ! -f $ROOT_DIR/build/kernel-preboot-latest ] && build.kernel.sh
 cp -v $ROOT_DIR/build/kernel-preboot-latest /media/openslx-stick/boot/kernel
 
-bash $ROOT_DIR/bin/initramfs.update
+#[ ! -f $ROOT_DIR/build/initramfs-default ] && build.initramfs.sh
+build.initramfs.sh
 cp -v $ROOT_DIR/build/initramfs-default /media/openslx-stick/boot/init
 
 cp -v $SYSLINUX/com32/menu/menu.c32 /media/openslx-stick/boot/
 cp -v $SYSLINUX/com32/menu/vesamenu.c32 /media/openslx-stick/boot/
 
-cat > /media/openslx-stick/boot/extlinux.conf << EOF
-TIMEOUT 100
-PROMPT 0
-DEFAULT menu.c32
-
-MENU TITLE Welcome to OpenSLX PreBoot USB Ext2/3 (Mini Linux/Kexec)
-LABEL SLXSTDBOOT
-  MENU LABEL OpenSLX PreBoot - Stateless Netboot Linux ...
-  KERNEL kernel
-  APPEND initrd=init vga=0x317
-  TEXT HELP
-         Use this (default) entry if you have configured your client.
-         You have chance to edit the kernel commandline by hitting the
-         TAB key (e.g. for adding debug=3 to it for bug hunting) ...
-  ENDTEXT
-LABEL DEBUGBOOT
-  MENU LABEL OpenSLX PreBoot - Debug Mode
-  KERNEL kernel
-  APPEND initrd=init vga=0x317  debug=3
-  TEXT HELP
-         Use this to start the preboot environment with debug shells.
-  ENDTEXT
-LABEL LOCALBOOT
-  MENU LABEL LOCALBOOT
-  LOCALBOOT -1
-  TEXT HELP
-         Gets you out of here by booting from next device in BIOS boot
-         order.
-  ENDTEXT
-EOF
+cp -v $ROOT_DIR/config/extlinux/* /media/openslx-stick/boot
 
 sync
 umount /media/openslx-stick
-- 
cgit v1.2.3-55-g7522