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 b8e2ca20a1fb71b2460a0ef97d462cd55e796b02 (commit) via c5685c2420e9a67e6a81e36bbba9f78b5fc268a3 (commit) via fac85ccd444d51e64c38ec9939d9532e273ffd93 (commit) via 942d7058e5de7f362c4996c0ede72fca13ed2798 (commit) from 0d08de33a65c31386be41132230f9fba9028166c (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 b8e2ca20a1fb71b2460a0ef97d462cd55e796b02 Merge: c5685c2 0d08de3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 12 22:59:50 2010 +0100

Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

commit c5685c2420e9a67e6a81e36bbba9f78b5fc268a3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 12 22:05:31 2010 +0100

installer: Skip welcome message in unattended mode.

commit fac85ccd444d51e64c38ec9939d9532e273ffd93 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 12 20:17:24 2010 +0100

installer: Last message should make clear that the system will reboot.

commit 942d7058e5de7f362c4996c0ede72fca13ed2798 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 12 20:08:32 2010 +0100

installer: Quietly drop error messages from umount commands at the end.

Sometimes, they say that their mountpoint was already umounted and so the user won't be annoyed.

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

Summary of changes: src/install+setup/install/main.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)

Difference in files: diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index d18f16b..9ea3f31 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -151,10 +151,10 @@ int main(int argc, char *argv[])

newtPushHelpLine(ctr[TR_HELPLINE]);

- sprintf(message, ctr[TR_WELCOME], NAME); - newtWinMessage(title, ctr[TR_OK], message); - if (!unattended) { + sprintf(message, ctr[TR_WELCOME], NAME); + newtWinMessage(title, ctr[TR_OK], message); + if (disclaimerbox(discl_msg)==0) { errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]); goto EXIT; @@ -553,7 +553,7 @@ int main(int argc, char *argv[]) if (!unattended) { sprintf(message, ctr[TR_CONGRATULATIONS_LONG], NAME, SNAME, NAME); - newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message); + newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_PRESS_OK_TO_REBOOT], message); }

allok = 1; @@ -605,13 +605,13 @@ EXIT:

newtFinished();

- system("/bin/umount /harddisk/proc"); - system("/bin/umount /harddisk/dev"); - system("/bin/umount /harddisk/sys"); + system("/bin/umount /harddisk/proc >/dev/null 2>&1"); + system("/bin/umount /harddisk/dev >/dev/null 2>&1"); + system("/bin/umount /harddisk/sys >/dev/null 2>&1");

- system("/bin/umount /harddisk/var"); - system("/bin/umount /harddisk/boot"); - system("/bin/umount /harddisk"); + system("/bin/umount /harddisk/var >/dev/null 2>&1"); + system("/bin/umount /harddisk/boot >/dev/null 2>&1"); + system("/bin/umount /harddisk >/dev/null 2>&1");

if (!(allok)) system("/etc/halt");

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