Devel-Version wird jetzt nichtmehr automatisch gebaut.
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Tue, 10 Jul 2007 23:05:43 +0000 (23:05 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Tue, 10 Jul 2007 23:05:43 +0000 (23:05 +0000)
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@670 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

doc/packages-list.txt
src/install+setup/install/main.c
tools/make-functions

index a270cad..c2907bd 100644 (file)
@@ -29,7 +29,6 @@
 * 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
 * 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
index d300dfb..6d31754 100644 (file)
@@ -14,7 +14,7 @@
 #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
@@ -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/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"ext3 ");
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        }
 
index 36df4c1..53eb7d9 100644 (file)
@@ -479,7 +479,7 @@ batch_script() {
        fi
 
        echo "### RUNNING BUILD"
-       $0 build --devel
+       $0 build #--devel
        evaluate 1 mail_me ERROR
 
        echo "### UPLOADING ISO"