IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7849 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9898206eba5a742f66fde5b3250f3ac3974022b9
by git＠ipfire.org 12 Jun '10

12 Jun '10

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 9898206eba5a742f66fde5b3250f3ac3974022b9 (commit) from 15af725ea401ba1436abd848080e62188e79e4be (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 9898206eba5a742f66fde5b3250f3ac3974022b9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 12 11:26:45 2010 +0200 Fix patching order for xen-patches. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index cf609f2..a4bf286 100644 --- a/lfs/linux +++ b/lfs/linux @@ -111,9 +111,9 @@ ifeq "$(XEN)" "1" mkdir -p $(DIR_SRC)/xen-patches cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2.tar.bz2 - for x in `find $(DIR_SRC)/xen-patches/ -type f`; do \ + for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \ echo "*********** [Patch: $$x]"; \ - patch -d $(DIR_APP) -p1 < $$x || break; \ + cd $(DIR_APP) && pwd && patch -Np1 < $$x || exit 1; \ done rm -rf $(DIR_SRC)/xen-patches hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 15af725ea401ba1436abd848080e62188e79e4be
by git＠ipfire.org 12 Jun '10

12 Jun '10

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 15af725ea401ba1436abd848080e62188e79e4be (commit) from 5f3b20eac388e41aaa3f0f8e215aa70326d23b5c (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 15af725ea401ba1436abd848080e62188e79e4be Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Thu Jun 10 12:11:03 2010 +0200 Fixed some naming and length problems in the outgoing gui. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/outgoingfw.cgi | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) Difference in files: diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index be16beb..a9e8d92 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -465,14 +465,14 @@ END unless ($outfwsettings{'SIP'}) { $outfwsettings{'DISPLAY_SIP'} = 'ALL'; } else { $outfwsettings{'DISPLAY_SIP'} = $outfwsettings{'SIP'}; } unless ($outfwsettings{'SMAC'}) { $outfwsettings{'DISPLAY_SMAC'} = 'ALL'; } else { $outfwsettings{'DISPLAY_SMAC'} = $outfwsettings{'SMAC'}; } print <<END - <tr><td width='14%' align='right'>$Lang::tr{'source ip'}: + <tr><td width='14%' align='right'>$Lang::tr{'source ip or net'}: <td width='14%' align='left'>$outfwsettings{'DISPLAY_SIP'} <td width='44%' colspan='2' align='center'> END ; } print <<END - <tr><td width='14%' align='right'>$Lang::tr{'time'} - </td> + <tr><td width='14%' align='right'>$Lang::tr{'time'} - </td> <td width='14%' align='left'> END ; @@ -656,10 +656,10 @@ END <optgroup label='---'> <option value='all' $selected{'SNET'}{'ALL'}>$Lang::tr{'all'}</option> <optgroup label='$Lang::tr{'ip address'}'> - <option value='ip' $selected{'SNET'}{'ip'}>$Lang::tr{'source ip'}</option> + <option value='ip' $selected{'SNET'}{'ip'}>$Lang::tr{'source ip or net'}</option> <option value='red' $selected{'SNET'}{'red'}>$Lang::tr{'red'} IP</option> </optgroup> - <optgroup label='$Lang::tr{'alt vpns'}'> + <optgroup label='$Lang::tr{'alt vpn'}'> <option value='ipsec' $selected{'SNET'}{'ipsec'}>IPSEC $Lang::tr{'interface'}</option> <option value='ovpn' $selected{'SNET'}{'ovpn'}>OpenVPN $Lang::tr{'interface'}</option> </optgroup> @@ -686,8 +686,8 @@ END </optgroup> </select> </td> - <td width='20%' align='right' colspan='2'>$Lang::tr{'source ip'}: <img src='/blob.gif' /></td> - <td width='30%' align='left' colspan='2'><input type='text' name='SIP' maxlength='15' value='$outfwsettings{'SIP'}' /></td> + <td width='20%' align='right' colspan='2'>$Lang::tr{'source ip or net'}<img src='/blob.gif' /></td> + <td width='30%' align='left' colspan='2'><input type='text' name='SIP' value='$outfwsettings{'SIP'}' /></td> </tr> <tr> <td width='20%' align='right'>$Lang::tr{'logging'}:</td> @@ -700,10 +700,10 @@ END <td width='20%' align='right' colspan='2' /> <td width='30%' align='left' colspan='2' /> <tr> - <td width='20%' align='right'>$Lang::tr{'destination ip'}: <img src='/blob.gif' /></td> - <td width='30%' align='left'><input type='text' name='DIP' maxlength='15' value='$outfwsettings{'DIP'}' /></td> - <td width='20%' align='right' colspan='2'>$Lang::tr{'destination port'}: <img src='/blob.gif' /></td> - <td width='30%' align='left' colspan='2'><input type='text' name='DPORT' maxlength='11' value='$outfwsettings{'DPORT'}' /></td> + <td width='20%' align='right'>$Lang::tr{'destination ip or net'}: <img src='/blob.gif' /></td> + <td width='30%' align='left'><input type='text' name='DIP' value='$outfwsettings{'DIP'}' /></td> + <td width='20%' align='right' colspan='2'>$Lang::tr{'destination port'}(s) <img src='/blob.gif' /></td> + <td width='30%' align='left' colspan='2'><input type='text' name='DPORT' value='$outfwsettings{'DPORT'}' /></td> </tr> <tr> <td width='20%' align='right'>$Lang::tr{'time'}:</td> hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 920306ed5c25f95aeb7ed86498b120a4114bc00b
by git＠ipfire.org 11 Jun '10

11 Jun '10

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 3.x development tree". The branch, master has been updated via 920306ed5c25f95aeb7ed86498b120a4114bc00b (commit) from 458a706340ccd6bdc8b571e9b02281f760599396 (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 920306ed5c25f95aeb7ed86498b120a4114bc00b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 10 22:54:48 2010 +0200 libtool: Update to 2.2.10. ----------------------------------------------------------------------- Summary of changes: pkgs/core/libtool/libtool.nm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/core/libtool/libtool.nm b/pkgs/core/libtool/libtool.nm index dbf3c1b..d8d5cde 100644 --- a/pkgs/core/libtool/libtool.nm +++ b/pkgs/core/libtool/libtool.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libtool -PKG_VER = 2.2.8 +PKG_VER = 2.2.10 PKG_REL = 0 PKG_MAINTAINER = hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5f3b20eac388e41aaa3f0f8e215aa70326d23b5c
by git＠ipfire.org 11 Jun '10

11 Jun '10

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 5f3b20eac388e41aaa3f0f8e215aa70326d23b5c (commit) from ecb061e4f93ac6ff2a0162a992e244c9a045d02b (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 5f3b20eac388e41aaa3f0f8e215aa70326d23b5c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 12 00:01:20 2010 +0200 Increase length of the password dialog to 50 chars. ----------------------------------------------------------------------- Summary of changes: src/install+setup/setup/passwords.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/src/install+setup/setup/passwords.c b/src/install+setup/setup/passwords.c index 4b9e61b..31d559d 100644 --- a/src/install+setup/setup/passwords.c +++ b/src/install+setup/setup/passwords.c @@ -85,7 +85,7 @@ int getpassword(char *password, char *text) done = 1; sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN); rc = newtWinEntries(title, text, - 50, 5, 5, 20, entries, ctr[TR_OK], ctr[TR_CANCEL], NULL); + 70, 5, 5, 50, entries, ctr[TR_OK], ctr[TR_CANCEL], NULL); if (rc != 2) { hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ecb061e4f93ac6ff2a0162a992e244c9a045d02b
by git＠ipfire.org 11 Jun '10

11 Jun '10

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 ecb061e4f93ac6ff2a0162a992e244c9a045d02b (commit) from 6814863fd1e473bfcf18d403f64f6cbdfc17cfaf (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 ecb061e4f93ac6ff2a0162a992e244c9a045d02b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 11 22:18:20 2010 +0200 Add bootoption to skip an initskript. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/38/filelists/files | 1 + src/initscripts/init.d/rc | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index ab3698a..ed358da 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -3,6 +3,7 @@ etc/issue etc/e2fsck.conf etc/httpd/conf/vhosts.d/ipfire-interface.conf etc/rc.d/init.d/leds +etc/rc.d/init.d/rc etc/rc.d/init.d/snort etc/rc.d/rc0.d/K79leds etc/rc.d/rc3.d/S21leds diff --git a/src/initscripts/init.d/rc b/src/initscripts/init.d/rc index 38d4ae2..94e7a08 100644 --- a/src/initscripts/init.d/rc +++ b/src/initscripts/init.d/rc @@ -71,8 +71,12 @@ fi #Start all functions in this runlevel for i in $( ls -v ${rc_base}/rc${runlevel}.d/S* 2> /dev/null) do + suffix=${i#$rc_base/rc$runlevel.d/S[0-9][0-9]} + + # Skip if initskript is disabled at bootprompt + grep "skipinit=$suffix" /proc/cmdline > /dev/null && continue + if [ "${previous}" != "N" ]; then - suffix=${i#$rc_base/rc$runlevel.d/S[0-9][0-9]} stop=$rc_base/rc$runlevel.d/K[0-9][0-9]$suffix prev_start=$rc_base/rc$previous.d/S[0-9][0-9]$suffix hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6814863fd1e473bfcf18d403f64f6cbdfc17cfaf
by git＠ipfire.org 10 Jun '10

10 Jun '10

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 6814863fd1e473bfcf18d403f64f6cbdfc17cfaf (commit) via 735fce60d63398c90bbc022962098da6efea4489 (commit) via 8599471a58287a3f97034442263487931e53f877 (commit) from 00d59063dbd08c073b1fa500ba2fcff17483439c (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 6814863fd1e473bfcf18d403f64f6cbdfc17cfaf Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Thu Jun 10 23:02:31 2010 +0200 Added go-down image to core38 commit 735fce60d63398c90bbc022962098da6efea4489 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Thu Jun 10 22:47:20 2010 +0200 wlanap.cgi now with graphical button commit 8599471a58287a3f97034442263487931e53f877 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Thu Jun 10 22:43:15 2010 +0200 A very very very nice button for stopping services. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/38/filelists/files | 1 + html/cgi-bin/wlanap.cgi | 12 ++++++------ html/html/images/go-down.png | Bin 683 -> 652 bytes 3 files changed, 7 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index 1156910..ab3698a 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -152,3 +152,4 @@ var/ipfire/updatexlrator/updxlrator-lib.pl var/log/cache var/log/updatexlrator usr/local/bin/vpn-watch +srv/web/ipfire/html/images/go-down.png diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 5bbb0d1..2e12a65 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -307,13 +307,12 @@ if ( $wlan_card_status ne '' ){ print "<br />"; print "<table width='95%' cellspacing='0' border='0'>"; print "<tr align='center'>"; -print "<td colspan='4'><hr size='1'></td>"; print "</tr>"; print "<tr align='center'>"; print "<td width='40%'> </td>"; -print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='submit' name='ACTION' value='$Lang::tr{'start'}' /></form></td>"; -print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='submit' name='ACTION' value='$Lang::tr{'stop'}' /></form></td>"; -print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='submit' name='ACTION' value='$Lang::tr{'restart'}' /></form></td>"; +print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'start'}' /><input type='image' alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' /></form></td>"; +print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'stop'}' /><input type='image' alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' /></form></td>"; +print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'restart'}' /><input type='image' alt='$Lang::tr{'restart'}' title='$Lang::tr{'restart'}' src='/images/view-refresh.png' /></form></td>"; print "</tr>"; print "</table>"; }else{ @@ -424,9 +423,10 @@ END print <<END <br /> <table width='95%' cellspacing='0'> -<tr><td align='center'><hr size='1'> +<tr><td align='center'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></form></td> + <input type='hidden' name='ACTION' value=$Lang::tr{'save'} /> + <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td> </tr> </table> END diff --git a/html/html/images/go-down.png b/html/html/images/go-down.png index 3dd7fcc..7234c29 100644 Binary files a/html/html/images/go-down.png and b/html/html/images/go-down.png differ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 00d59063dbd08c073b1fa500ba2fcff17483439c
by git＠ipfire.org 08 Jun '10

08 Jun '10

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 00d59063dbd08c073b1fa500ba2fcff17483439c (commit) from f9677eeac1eea0028115917a1a0238d62ec7b9f7 (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 00d59063dbd08c073b1fa500ba2fcff17483439c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 8 21:55:13 2010 +0200 Core38 updater: fix wait for pakfire end. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/38/update.sh | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) Difference in files: diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index 1b1e86a..f15ea1f 100644 --- a/config/rootfiles/core/38/update.sh +++ b/config/rootfiles/core/38/update.sh @@ -239,23 +239,23 @@ sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf # # After pakfire has ended run it again and update the lists and do upgrade # -echo '#!/bin/bash' > /tmp/pakfire_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pakfire_update -echo ' sleep 1' >> /tmp/pakfire_update -echo 'done' >> /tmp/pakfire_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pakfire_update -echo ' sleep 1' >> /tmp/pakfire_update -echo 'done' >> /tmp/pakfire_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pakfire_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pakfire_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pakfire_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pakfire_update -echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pakfire_update -echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!"' >> /tmp/pakfire_update -echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** "' >> /tmp/pakfire_update -# -chmod +x /tmp/pakfire_update -/tmp/pakfire_update & +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** "' >> /tmp/pak_update +# +chmod +x /tmp/pak_update +/tmp/pak_update & # echo echo Please wait until pakfire has ended... hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f9677eeac1eea0028115917a1a0238d62ec7b9f7
by git＠ipfire.org 08 Jun '10

08 Jun '10

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 f9677eeac1eea0028115917a1a0238d62ec7b9f7 (commit) via fb35962cca894498fc48a9249255600d776777c0 (commit) from c8783a6ae53a40fc2b84035074f30f8d85fdf17c (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 f9677eeac1eea0028115917a1a0238d62ec7b9f7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 8 19:21:35 2010 +0200 Run pakfire update/upgrade again after core38 updater has finished. commit fb35962cca894498fc48a9249255600d776777c0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 8 19:20:29 2010 +0200 Add setup to core38 (it is branded with version number). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/38/filelists/files | 1 + config/rootfiles/core/38/update.sh | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index 8290804..1156910 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -44,6 +44,7 @@ etc/rc.d/init.d/modules usr/local/bin/ipsecctrl usr/local/bin/syslogdctrl usr/local/bin/wirelessctrl +usr/local/sbin/setup usr/sbin/openvpn opt/pakfire/lib/functions.sh usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index 9af7aad..1b1e86a 100644 --- a/config/rootfiles/core/38/update.sh +++ b/config/rootfiles/core/38/update.sh @@ -237,7 +237,26 @@ chmod 644 /etc/sysconfig/modules # sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf # -# This core-update need a reboot -/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg" -/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!" -/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** " +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pakfire_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pakfire_update +echo ' sleep 1' >> /tmp/pakfire_update +echo 'done' >> /tmp/pakfire_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pakfire_update +echo ' sleep 1' >> /tmp/pakfire_update +echo 'done' >> /tmp/pakfire_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pakfire_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pakfire_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pakfire_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pakfire_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pakfire_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!"' >> /tmp/pakfire_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** "' >> /tmp/pakfire_update +# +chmod +x /tmp/pakfire_update +/tmp/pakfire_update & +# +echo +echo Please wait until pakfire has ended... +echo hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c8783a6ae53a40fc2b84035074f30f8d85fdf17c
by git＠ipfire.org 07 Jun '10

07 Jun '10

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 c8783a6ae53a40fc2b84035074f30f8d85fdf17c (commit) via 4594712a1777fdd03b51491cf82bd06d45c16472 (commit) from b6785f2ef8bce570e6db66add579a2a89ee1ec78 (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 c8783a6ae53a40fc2b84035074f30f8d85fdf17c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 8 00:08:09 2010 +0200 Change version to 2.7 on core38. commit 4594712a1777fdd03b51491cf82bd06d45c16472 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jun 7 23:56:16 2010 +0200 Set version to "2.7". ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/38/filelists/files | 1 + config/rootfiles/core/38/update.sh | 16 ++++++++++++++++ html/cgi-bin/samba.cgi | 2 +- make.sh | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index 6c7f0c6..8290804 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -1,4 +1,5 @@ etc/system-release +etc/issue etc/e2fsck.conf etc/httpd/conf/vhosts.d/ipfire-interface.conf etc/rc.d/init.d/leds diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index 59a718c..9af7aad 100644 --- a/config/rootfiles/core/38/update.sh +++ b/config/rootfiles/core/38/update.sh @@ -24,6 +24,19 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # +OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` +# +# Test if we running on xen +# +uname -r | grep "ipfire-xen"; +if [ ${?} = 0 ]; then + #Xen Kernel is active + NEWVERSION="2.7-xen" +else + #Normal Kernel + NEWVERSION="2.7" +fi +# KVER="2.6.32.15" ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` @@ -220,6 +233,9 @@ echo "cryptodev" >> /etc/sysconfig/modules echo "" >> /etc/sysconfig/modules echo "# End /etc/sysconfig/modules" >> /etc/sysconfig/modules chmod 644 /etc/sysconfig/modules +# Change version of Pakfire.conf +# +sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf # # This core-update need a reboot /usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg" diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 4d90914..13a7a82 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -77,7 +77,7 @@ my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd'); $sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'NETBIOSNAME'} = 'IPFire'; -$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.5'; +$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.7'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'share'; $sambasettings{'OSLEVEL'} = '33'; diff --git a/make.sh b/make.sh index b6281bb..9eca589 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.6" # Version number +VERSION="2.7" # Version number CORE="38" # Core Level (Filename) PAKFIRE_CORE="38" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. b6785f2ef8bce570e6db66add579a2a89ee1ec78
by git＠ipfire.org 07 Jun '10

07 Jun '10

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 b6785f2ef8bce570e6db66add579a2a89ee1ec78 (commit) from 5111b6c08b568300c50cb3079ed7d8b6976e17e1 (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 b6785f2ef8bce570e6db66add579a2a89ee1ec78 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jun 7 23:41:36 2010 +0200 Fix linux-xen install/uninstall for updating ct'server. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 2 +- src/paks/linux-xen/install.sh | 4 +++- src/paks/linux-xen/uninstall.sh | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index b77c560..cf609f2 100644 --- a/lfs/linux +++ b/lfs/linux @@ -35,7 +35,7 @@ CFLAGS = CXXFLAGS = PROG = linux-xen -PAK_VER = 9 +PAK_VER = 10 DEPS = "" # Normal build or XEN build. diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index d6ad9f1..eb2285b 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -54,6 +54,8 @@ if [ ${?} = 0 ]; then #Xen Kernel is active #Set grub default entry to this kernel sed -i -e "s|^default saved|default $ENTRY|g" /boot/grub/grub.conf + #Remove ramdisk of normal kernel (not enough space) + rm -f /boot/ipfirerd-$KVER.img else #Normal Kernel #pygrub crash with "default saved" diff --git a/src/paks/linux-xen/uninstall.sh b/src/paks/linux-xen/uninstall.sh index ca65ef7..fe23165 100644 --- a/src/paks/linux-xen/uninstall.sh +++ b/src/paks/linux-xen/uninstall.sh @@ -17,10 +17,10 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh remove_files -mv -f /boot/grub/grub-backup-2.6.32.*.-xen.conf /boot/grub/grub.conf +mv -f /boot/grub/grub-backup-2.6.32.*-xen.conf /boot/grub/grub.conf hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM