Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/syslinux/boot.msg b/config/syslinux/boot.msg
index f200881633d098e6e3c67f5fff5528baf0981cd4..dd6fc1fd079f671323c616587ea81b13afbd61a7 100644 (file)
--- a/config/syslinux/boot.msg
+++ b/config/syslinux/boot.msg
@@ -2,9 +2,7 @@
 \18splash.lss
 
 
-
  -  To install IPFire on your system, press the \ f04<ENTER>\ f07 key.
+ -  To disable vga mode, type: \ f04novga <ENTER>\ f07.  
+ -  To test the memory in your system type: \ f04memtest <ENTER>\ f07.
 
- -  Use the function keys listed below for more information.
-
-\ f0f[F1-Main] [F2-Options]\ f07

diff --git a/config/syslinux/options.msg b/config/syslinux/options.msg
deleted file mode 100644 (file)
index 57a38c2..0000000
--- a/config/syslinux/options.msg
+++ /dev/null
@@ -1,30 +0,0 @@
-\ f00
-\f 
-
-                       \ f0fInstaller Boot Options\ f07
-
- -  To disable vga mode, type: \ f04novga <ENTER>\ f07.  
-
- -  To test the memory in your system type: \ f04memtest <ENTER>\ f07.
-
- -  To install in unattended mode, type: \ f04unattended <ENTER>\ f07.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-\ f0f[F1-Main] [F2-Options]\ f07

diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index ac9bdc322a07b0ffc87c1d5ad16e843143ac7595..68ad82afd721b9eea16af87732e3e6ebece44e14 100644 (file)
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -1,16 +1,14 @@
 TIMEOUT 5000
 DISPLAY boot.msg
 PROMPT 1
-F1 boot.msg
-F2 options.msg
-DEFAULT vmlinuz 
+DEFAULT vmlinuz
   APPEND initrd=instroot vga=791 splash=silent ro
 LABEL novga
   KERNEL vmlinuz
   APPEND initrd=instroot ro
 LABEL unattended
   KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot vga=791 splash=silent unattended ro
+  APPEND initrd=instroot vga=791 splash=silent unattended ro
 LABEL memtest
   KERNEL memtest
   APPEND -

diff --git a/lfs/cdrom b/lfs/cdrom
index 0c4668d8988c5dcb73986685f235deef041efa27..064769de127c74f5ee03ad5137b8bca84040ea09 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -84,7 +84,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz; \
        cp $(DIR_SRC)/config/syslinux/syslinux.cfg  /install/cdrom/boot/isolinux/isolinux.cfg; \
        cp $(DIR_SRC)/config/syslinux/boot.msg      /install/cdrom/boot/isolinux/boot.msg; \
-       cp $(DIR_SRC)/config/syslinux/options.msg   /install/cdrom/boot/isolinux/options.msg; \
        cp $(DIR_SRC)/config/syslinux/splash.lss    /install/cdrom/boot/isolinux/splash.lss; \
        cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest; \
        cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin; \

diff --git a/lfs/usb-stick b/lfs/usb-stick
index 76b97024fcebec6685f5c0b4c706ecd64c0fa8e4..acfa409395b45a93b88d7a17e10dbce06ff3c7bf 100644 (file)
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -66,8 +66,8 @@ define COPY_TO_IMG
        losetup $$LOOPDEV $$IMAGE && \
        mount -t vfat $$LOOPDEV /install/mnt && \
        cp -fR /install/cdrom/* /install/mnt && \
-       mv /install/mnt/boot/isolinux/{instroot,vmlinuz,*\.msg,memtest} /install/mnt && \
-       rm -rf /install/mnt/boot && \
+       mv /install/mnt/boot/isolinux/{instroot,vmlinuz,splash.lss,*\.msg,memtest} /install/mnt && \
+       rm -rf /install/mnt/boot/isolinux && \
        cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/mnt/syslinux.cfg && \
        umount /install/mnt && \
        losetup -d $$LOOPDEV && \

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 5de914f7612c02106428bfd217a93e12d7debeaa..ca2d5bd619b2b7d68da0ea2b7b17d27957992186 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -557,10 +557,11 @@ EXIT:
                fclose(flog);
                newtFinished();
 
-//             if (!unattended) {
-//                     if (system("/usr/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
-//                             printf("Unable to run setup.\n");
-//             }
+               if (unattended) {
+                       // Remove Setup autorun after boot
+                       if (system("rm -f /harddisk/etc/rc.d/rcsysinit.d/S75firstsetup"))
+                               printf("Unable to disable setup autorun.\n");
+               }
 
                if (system("/bin/umount /harddisk/proc"))
                        printf("Unable to umount /harddisk/proc.\n"); 

diff --git a/src/install+setup/install/unattended.c b/src/install+setup/install/unattended.c
index cfdf3314549efdb6b2ca652c81aaa27bde8a2c74..3e2f3f08865f932782b98b5d69cfcd1c7e51d2e9 100644 (file)
--- a/src/install+setup/install/unattended.c
+++ b/src/install+setup/install/unattended.c
@@ -131,7 +131,7 @@ int unattended_setup(struct keyvalue *unattendedkv) {
     /* set root password */
     fprintf(flog, "unattended: setting root password\n");
     snprintf(commandstring, STRING_SIZE,
-           "/sbin/chroot /harddisk /bin/sh -c \"echo 'root:%s' | /usr/sbin/chpasswd\"", root_password);
+           "/usr/sbin/chroot /harddisk /bin/sh -c \"echo 'root:%s' | /usr/sbin/chpasswd\"", root_password);
     if (mysystem(commandstring)) {
        errorbox("unattended: ERROR setting root password");
        return 0;
@@ -140,7 +140,7 @@ int unattended_setup(struct keyvalue *unattendedkv) {
     /* set admin password */
     fprintf(flog, "unattended: setting admin password\n");
     snprintf(commandstring, STRING_SIZE,
-           "/sbin/chroot /harddisk /usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", admin_password);
+           "/usr/sbin/chroot /harddisk /usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", admin_password);
     if (mysystem(commandstring)) {
        errorbox("unattended: ERROR setting admin password");
        return 0;