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, next has been updated via ef7d03bb34fb5e86ac495d4eb698a80e6ed784af (commit) via c5da0e64c2141f21baad0d00418dd09f65efe13c (commit) via 23ed79cb4910cf6c869399aab6457003dbcaa79d (commit) from 156bae21d4bc8f94ebe59b2e18c1702b192bf84d (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 ef7d03bb34fb5e86ac495d4eb698a80e6ed784af Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Aug 12 18:05:11 2010 +0200
Fix special character output at setup.
commit c5da0e64c2141f21baad0d00418dd09f65efe13c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Aug 12 18:04:14 2010 +0200
Remove unmounting errors after installation.
commit 23ed79cb4910cf6c869399aab6457003dbcaa79d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Aug 12 18:02:58 2010 +0200
Remove tar sterr output on installscreen. Add eject to installer.
-----------------------------------------------------------------------
Summary of changes: config/install/halt | 12 ++++-------- config/rootfiles/installer/eject | 1 + src/initscripts/init.d/firstsetup | 1 + src/install+setup/install/main.c | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) create mode 120000 config/rootfiles/installer/eject
Difference in files: diff --git a/config/install/halt b/config/install/halt index 1518f7d..90a0c80 100644 --- a/config/install/halt +++ b/config/install/halt @@ -8,13 +8,9 @@ sleep 3 echo "Sending all processes the KILL signal..." /sbin/killall5 -9 sleep 3 -echo "Unmounting filesystems" -/bin/umount /tmp -/bin/umount /sys -/bin/umount /dev/pts -/bin/umount /dev -/bin/umount /root -/bin/umount /proc -echo "Unmounting root" +echo "Unmounting filesystems..." +/bin/umount -a > /dev/null 2>&1 +echo "Unmounting root..." /bin/mount -n -o remount,ro / +echo "Rebooting..." /sbin/reboot -f diff --git a/config/rootfiles/installer/eject b/config/rootfiles/installer/eject new file mode 120000 index 0000000..54928be --- /dev/null +++ b/config/rootfiles/installer/eject @@ -0,0 +1 @@ +../common/eject \ No newline at end of file diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup index 892031b..cef0b8a 100644 --- a/src/initscripts/init.d/firstsetup +++ b/src/initscripts/init.d/firstsetup @@ -1,4 +1,5 @@ #!/bin/bash +export LANG=en_US.utf8 /usr/local/sbin/setup /dev/tty2 INSTALL echo Restarting udev... killall udevd diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index ff0b3a2..d023b69 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -441,7 +441,7 @@ int main(int argc, char *argv[]) }
snprintf(commandstring, STRING_SIZE, - "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma"); + "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma 2>/dev/null"); if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT, ctr[TR_INSTALLING_FILES])) @@ -538,7 +538,7 @@ int main(int argc, char *argv[]) } mysystem("umount /cdrom"); - snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive); + snprintf(commandstring, STRING_SIZE, "/usr/bin/eject /dev/%s", sourcedrive); mysystem(commandstring);
if (!unattended) {
hooks/post-receive -- IPFire 2.x development tree