Devel-Version wird jetzt nichtmehr automatisch gebaut.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@670 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index a270cad84ffe5607ceb03ca8a1982628bb89930b..c2907bd9fb385f996b99ede6a87ab00e69690872 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -29,7 +29,6 @@
 * Net-Server-0.93
 * Net_SSLeay.pm-1.25
 * Python-2.4.3
 * Net-Server-0.93
 * Net_SSLeay.pm-1.25
 * Python-2.4.3

-* SnortSnarf-050314.1

 * Text-Tabs+Wrap-2005.0824
 * URI-1.35
 * Unix-Syslog-0.100
 * Text-Tabs+Wrap-2005.0824
 * URI-1.35
 * Unix-Syslog-0.100


@@ -196,7 +195,6 @@
 * oinkmaster-2.0
 * openldap-2.3.20
 * openssh-4.3p2
 * oinkmaster-2.0
 * openldap-2.3.20
 * openssh-4.3p2

-* openssl-0.9.8d

 * openssl-0.9.8e
 * openswan-2.4.8
 * openvpn-2.0.9
 * openssl-0.9.8e
 * openswan-2.4.8
 * openvpn-2.0.9

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index d300dfbc0f5fd066c39b4da16b25e8794de6ee75..6d31754b279776718ee76dfcbf060113d4ead3d9 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -14,7 +14,7 @@
 #define CDROM_INSTALL 0
 #define URL_INSTALL 1
 #define DISK_INSTALL 2
 #define CDROM_INSTALL 0
 #define URL_INSTALL 1
 #define DISK_INSTALL 2

-#define INST_FILECOUNT 6000
+#define INST_FILECOUNT 6200

 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 #define REISER4 0
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 #define REISER4 0


@@ -578,6 +578,7 @@ int main(int argc, char *argv[])
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        } else if (fstype == EXT3) {
                replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        } else if (fstype == EXT3) {
                replace("/harddisk/etc/fstab", "FSTYPE", "ext3");

+               replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"ext3 ");

                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        }
 
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        }
 

diff --git a/tools/make-functions b/tools/make-functions
index 36df4c1ce53de3db2a8c91ac5952d0b7a20c54fb..53eb7d9180aa4c6ea2b62339b4166a1db46313fe 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -479,7 +479,7 @@ batch_script() {
        fi
 
        echo "### RUNNING BUILD"
        fi
 
        echo "### RUNNING BUILD"

-       $0 build --devel
+       $0 build #--devel

        evaluate 1 mail_me ERROR
 
        echo "### UPLOADING ISO"
        evaluate 1 mail_me ERROR
 
        echo "### UPLOADING ISO"