... Viel zu tun :D

[people/pmueller/ipfire-2.x.git] / lfs / cdrom

diff --git a/lfs/cdrom b/lfs/cdrom
index 0b6125e20f33716245844b637c7ec3656c547cd6..439b9a41576aa434922b0fd011aeaad6c4bb1408 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -38,19 +38,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 
 objects = $(DL_FILE) \
-       rawwritewin-0.7.zip \
-       install-en-1.4.0.pdf.zip \
-       quickstart-en.pdf.zip
+       rawwritewin-0.7.zip
 
 $(DL_FILE)                  = $(DL_FROM)/$(DL_FILE)
 rawwritewin-0.7.zip         = http://uranus.it.swin.edu.au/~jn/linux/rawwritewin-0.7.zip
-install-en-1.4.0.pdf.zip    = $(URL_SFNET)/ipcop/install-en-1.4.0.pdf.zip
-quickstart-en.pdf.zip       = http://www.ipcop.org/1.4.0/en/quickstart/quickstart-en.pdf.zip
 
 $(DL_FILE)_MD5                  = 7dac6ea496014d32dbce6c50feb254ca
 rawwritewin-0.7.zip_MD5         = 0130b497c8c3bc7d136a4236b0d9fbf6
-install-en-1.4.0.pdf.zip_MD5    = 07e0b5131f1434010d8a00571f9acd81
-quickstart-en.pdf.zip_MD5       = ca77ef5f1efca6bc519cc42acfd69aa4
 
 install : $(TARGET)
 
@@ -82,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # Compress root filesystem
        # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
-       mkdir -p /install/cdrom/{doc,dosutils,images}
+       mkdir -p /install/cdrom/{doc,dosutils}
        find $(DIR_SRC)/config/rootfiles/common -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
        find $(DIR_SRC)/config/rootfiles/ver_$(IPFVER) -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
        tar -c -C / --files-from=/tmp/ROOTFILES \
@@ -96,13 +90,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Other files
        sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt > /install/cdrom/README.txt
        cp $(DIR_SRC)/doc/COPYING                               /install/cdrom/
-       cp /install/images/*.img                                /install/cdrom/images
-       unzip $(DIR_DL)/install-en-1.4.0.pdf.zip -d     /install/cdrom/doc
-       unzip $(DIR_DL)/quickstart-en.pdf.zip -d                /install/cdrom/doc
        cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt} /install/cdrom/doc
        cp $(DIR_DL)/rawrite.exe                                /install/cdrom/dosutils
        unzip -j -L $(DIR_DL)/rawwritewin*.zip -x "*.txt" -d /install/cdrom/dosutils
 
+       # Configuration
+       mkdir -p /install/cdrom/boot
+       cp $(DIR_SRC)/config/kernel/unattended.conf    /install/cdrom/boot/unattended.conf
+
        # Make the ISO
        mkdir -p /install/cdrom/boot/isolinux; \
        dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog; \
@@ -113,4 +108,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp /usr/lib/syslinux/isolinux.bin           /install/cdrom/boot/isolinux/isolinux.bin; \
        cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
            -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-           -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE).iso
+           -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(IPFVER).iso