System ist mittels LFS Bootscripte startbar.

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 04186ee5966eeee98839b9d6c76cc98b152b4264..da6b4b4ab1ab3854cf4323348ce455348216de7a 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -550,28 +550,27 @@ buildinstaller() {
   ipfiremake uClibc
   installmake busybox
   installmake udev
-  installmake sysvinit
+  installmake slang
+  installmake newt
   installmake gettext
-  installmake e2fsprogs
+  installmake kbd
+  installmake popt
+  installmake kudzu
+  installmake sysvinit
   installmake misc-progs
+  installmake e2fsprogs
+  installmake reiserfsprogs
   installmake sysfsutils
-#  installmake hwinfo
-  installmake slang
   installmake util-linux
-  installmake reiserfsprogs
-  installmake newt
   installmake pciutils
   installmake pcmciautils
-  installmake kbd
-  installmake popt
-  installmake kudzu
   installmake installer
-  installmake scsi.img
-  installmake driver.img
+  installmake scsi.img # this is to be deleted
+  installmake driver.img       # this is to be deleted
   installmake initrd
-  installmake boot.img
-#  ipfiremake as86
-#  ipfiremake mbr
+  installmake boot.img # this is to be deleted
+#  ipfiremake as86             # this is to be deleted
+#  ipfiremake mbr              # this is to be deleted
 }
 
 buildpackages() {
@@ -596,9 +595,9 @@ buildpackages() {
   # packages-list.txt is ready to be displayed for wiki page
   beautify message DONE
 
-  # Create ISO for CDROM
+  # Create images for install
   ipfiremake cdrom
-  rm -f $LFS/install/images/*usb*
+  ipfiremake pxe
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
 #  ipfirepackages
@@ -936,10 +935,9 @@ svn)
                clear
                if [ -f /usr/bin/mcedit ]; then
                        export EDITOR=/usr/bin/mcedit
-               else
-                       if [ -f /usr/bin/nano ]; then
-                               export EDITOR=/usr/bin/nano
-                       fi
+               fi
+               if [ -f /usr/bin/nano ]; then
+                       export EDITOR=/usr/bin/nano
                fi
                echo -ne "Selecting editor $EDITOR..."
                beautify message DONE
@@ -1083,6 +1081,20 @@ batch)
 watch)
        watch_screen
        ;;
+pxe)
+       case "$2" in
+         start)
+               start_tftpd
+               ;;
+         stop)
+               stop_tftpd
+               ;;
+         reload)
+               reload_tftpd
+               ;;              
+       esac
+       exit 0
+       ;;
 "")
        clear
        svn info