This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via e515c0b965acd78429cdcb6bac9e26ecdb6c6e51 (commit) via 40fff54d2bb52006b1af97248985d7362d15470d (commit) via c91d1354c4a565c82cfb857c2d1316c39d25d8be (commit) via 2d5bc4419fdf8032c0ccf55245a17173a07225c0 (commit) from f5fe9e1bae8e9fe7eed67203fc7612f1d5ababfe (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit e515c0b965acd78429cdcb6bac9e26ecdb6c6e51 Merge: 40fff54 f5fe9e1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 2 00:09:35 2010 +0100

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

commit 40fff54d2bb52006b1af97248985d7362d15470d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 2 00:08:48 2010 +0100

Fix unattended installation.

commit c91d1354c4a565c82cfb857c2d1316c39d25d8be Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Dec 1 20:00:08 2010 +0100

Fix splashscreen on USB-Stick installer. Remove extra option page. Add missing unattended.conf to USB-Stick.

commit 2d5bc4419fdf8032c0ccf55245a17173a07225c0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Dec 1 08:47:48 2010 +0100

Remove empty lines at installer options help.

-----------------------------------------------------------------------

Summary of changes: config/syslinux/boot.msg | 6 ++---- config/syslinux/options.msg | 30 ------------------------------ config/syslinux/syslinux.cfg | 6 ++---- lfs/cdrom | 3 +-- lfs/usb-stick | 6 +++--- src/install+setup/install/main.c | 9 +++++---- src/install+setup/install/unattended.c | 4 ++-- 7 files changed, 15 insertions(+), 49 deletions(-) delete mode 100644 config/syslinux/options.msg

Difference in files: diff --git a/config/syslinux/boot.msg b/config/syslinux/boot.msg index f200881..dd6fc1f 100644 --- a/config/syslinux/boot.msg +++ b/config/syslinux/boot.msg @@ -2,9 +2,7 @@ splash.lss

- - To install IPFire on your system, press the 04<ENTER>07 key. + - To disable vga mode, type: 04novga <ENTER>07. + - To test the memory in your system type: 04memtest <ENTER>07.

- - Use the function keys listed below for more information. - -0f[F1-Main] [F2-Options]07 diff --git a/config/syslinux/options.msg b/config/syslinux/options.msg deleted file mode 100644 index 57a38c2..0000000 --- a/config/syslinux/options.msg +++ /dev/null @@ -1,30 +0,0 @@ -00 - - - 0fInstaller Boot Options07 - - - To disable vga mode, type: 04novga <ENTER>07. - - - To test the memory in your system type: 04memtest <ENTER>07. - - - To install in unattended mode, type: 04unattended <ENTER>07. - - - - - - - - - - - - - - - - - - - -0f[F1-Main] [F2-Options]07 diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg index ac9bdc3..68ad82a 100644 --- 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 0c4668d..064769d 100644 --- 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 76b9702..acfa409 100644 --- 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 5de914f..ca2d5bd 100644 --- 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 cfdf331..3e2f3f0 100644 --- 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;

hooks/post-receive -- IPFire 2.x development tree