IPFire-SCM May 2014

ipfire-scm@lists.ipfire.org

1 participants
65 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 05a48c2b2a09e8a5c67276dd2c372d4fbc023017
by git＠ipfire.org 25 May '14

25 May '14

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 05a48c2b2a09e8a5c67276dd2c372d4fbc023017 (commit) via 5346fd16195c48bd34e53458b57995699e427627 (commit) from 8f31e2c38d331bf27c4c0610f59a2df2683dac03 (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 05a48c2b2a09e8a5c67276dd2c372d4fbc023017 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 26 00:07:38 2014 +0200 close core78. commit 5346fd16195c48bd34e53458b57995699e427627 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 26 00:06:40 2014 +0200 core78: add sshd initskript to updater. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/78/filelists/files | 1 + make.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core/78/filelists/files index 15c629b..6b9f795 100644 --- a/config/rootfiles/core/78/filelists/files +++ b/config/rootfiles/core/78/filelists/files @@ -1,5 +1,6 @@ etc/system-release etc/issue +etc/rc.d/init.d/sshd srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat diff --git a/make.sh b/make.sh index 041f696..398c91c 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number CORE="78" # Core Level (Filename) -PAKFIRE_CORE="77" # Core Level (PAKFIRE) +PAKFIRE_CORE="78" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8f31e2c38d331bf27c4c0610f59a2df2683dac03
by git＠ipfire.org 25 May '14

25 May '14

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 8f31e2c38d331bf27c4c0610f59a2df2683dac03 (commit) via c3ab884ca5e581448f051c75e5162428a3230d6c (commit) from 022438b50b801bc480e9585c81efb4356ac91102 (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 8f31e2c38d331bf27c4c0610f59a2df2683dac03 Merge: c3ab884 022438b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 25 10:06:05 2014 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit c3ab884ca5e581448f051c75e5162428a3230d6c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 25 10:03:58 2014 +0200 Revert "kernel: change compression of pae kernel to bz2." This reverts commit 3e8286210f4e167c9ad2bb20b7fe3a56d2435b52. bz2 is not supported by debian xen. So users that have problems with xz compression need to update the pygrub on the host. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire-pae | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 775ed0e..4f71362 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.39-ipfire Kernel Configuration +# Linux/x86 3.10.40-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -55,9 +55,9 @@ CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set -CONFIG_KERNEL_BZIP2=y +# CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_XZ is not set +CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 022438b50b801bc480e9585c81efb4356ac91102
by git＠ipfire.org 24 May '14

24 May '14

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 022438b50b801bc480e9585c81efb4356ac91102 (commit) from b5d2be5d9b51c463e8892db74afb2372123199ae (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 022438b50b801bc480e9585c81efb4356ac91102 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat May 24 15:05:56 2014 +0200 setddns.pl: Fix function call of udmedia and twodns. ----------------------------------------------------------------------- Summary of changes: src/scripts/setddns.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index e26c524..5e77fce 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -651,7 +651,7 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server)"); } } - elsif ($settings{'SERVICE'} eq 'udmedia.de') { + elsif ($settings{'SERVICE'} eq 'udmedia') { # use proxy ? my %proxysettings; &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); @@ -685,7 +685,7 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server, check your credentials---$out-$response--)"); } } - elsif ($settings{'SERVICE'} eq 'twodns.de') { + elsif ($settings{'SERVICE'} eq 'twodns') { # use proxy ? my %proxysettings; &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b5d2be5d9b51c463e8892db74afb2372123199ae
by git＠ipfire.org 23 May '14

23 May '14

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 b5d2be5d9b51c463e8892db74afb2372123199ae (commit) from 4680b4a38f2e67e64e00b0e59b979610fa44f4d5 (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 b5d2be5d9b51c463e8892db74afb2372123199ae Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri May 23 22:16:17 2014 +0200 installer: increase size of root partition. ----------------------------------------------------------------------- Summary of changes: src/install+setup/install/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index e61f94d..db7a6cc 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -321,10 +321,10 @@ int main(int argc, char *argv[]) swap_file = memory / 4; /* Calculating Root-Size dependend of Max Disk Space */ - if ( disk < 756 ) - root_partition = 200; - else if ( disk >= 756 && disk <= 3072 ) - root_partition = 512; + if ( disk < 2048 ) + root_partition = 1024; + else if ( disk >= 2048 && disk <= 3072 ) + root_partition = 1536; else root_partition = 2048; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4680b4a38f2e67e64e00b0e59b979610fa44f4d5
by git＠ipfire.org 22 May '14

22 May '14

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 4680b4a38f2e67e64e00b0e59b979610fa44f4d5 (commit) from 42c439e45d76ca42048f8cf46bf3ec9a7c7b0ad9 (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 4680b4a38f2e67e64e00b0e59b979610fa44f4d5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu May 22 23:54:43 2014 +0200 qemu: bump package version to force reinstall. ----------------------------------------------------------------------- Summary of changes: lfs/qemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/qemu b/lfs/qemu index d68b97d..2fc0476 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 PROG = qemu -PAK_VER = 13 +PAK_VER = 14 DEPS = "sdl" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 42c439e45d76ca42048f8cf46bf3ec9a7c7b0ad9
by git＠ipfire.org 22 May '14

22 May '14

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 42c439e45d76ca42048f8cf46bf3ec9a7c7b0ad9 (commit) via 85ce9e1b971d21f44a185de4800b187d4a05ec6c (commit) from fded6faa72d581114e25ddb17bcc607625736fdc (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 42c439e45d76ca42048f8cf46bf3ec9a7c7b0ad9 Merge: 85ce9e1 fded6fa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu May 22 23:53:24 2014 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 85ce9e1b971d21f44a185de4800b187d4a05ec6c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu May 22 23:52:46 2014 +0200 kernel: update intel vendor modules. ----------------------------------------------------------------------- Summary of changes: lfs/e1000e | 4 ++-- lfs/igb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/e1000e b/lfs/e1000e index 58c99c4..10a42ee 100644 --- a/lfs/e1000e +++ b/lfs/e1000e @@ -27,7 +27,7 @@ include Config VERSUFIX = ipfire$(KCFG) MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e -VER = 2.5.4 +VER = 3.0.4 THISAPP = e1000e-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8a57fc73335bf1ab0e16a02ecccdae76 +$(DL_FILE)_MD5 = 2d8364cd2043ef5c71291a4ca8b8084e install : $(TARGET) diff --git a/lfs/igb b/lfs/igb index 9303ffb..b8aadc4 100644 --- a/lfs/igb +++ b/lfs/igb @@ -27,7 +27,7 @@ include Config VERSUFIX = ipfire$(KCFG) MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/ -VER = 5.0.6 +VER = 5.1.2 THISAPP = igb-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 701717fbbba6065af4ff5138bd3a3a9c +$(DL_FILE)_MD5 = c222b04f7e43afffc105d0d0db60c6c0 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fded6faa72d581114e25ddb17bcc607625736fdc
by git＠ipfire.org 22 May '14

22 May '14

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 fded6faa72d581114e25ddb17bcc607625736fdc (commit) via c0e0848f999ed8944ae551047fdea32bfee88d03 (commit) via 8e59a6022bf7cb225c3509be2964833cce0e630c (commit) via 763190af8e3272a1edd582e1e1736bfc8c0c1baa (commit) from 9d707db06eef14a519ed1e5091a6d12f50b452d4 (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 fded6faa72d581114e25ddb17bcc607625736fdc Merge: 9d707db c0e0848 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 22 23:11:43 2014 +0200 Merge remote-tracking branch 'ms/firewall-block-green' into next commit c0e0848f999ed8944ae551047fdea32bfee88d03 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 20 11:41:23 2014 +0200 firewall: Allow blocking access to GREEN from GREEN. commit 8e59a6022bf7cb225c3509be2964833cce0e630c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 20 11:27:24 2014 +0200 firewall: Rename GUIINPUT chain to ICMPINPUT. The name of the chain does not really explain what it does. commit 763190af8e3272a1edd582e1e1736bfc8c0c1baa Merge: 30b1c1c 33df321 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 20 11:25:48 2014 +0200 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/firewall/firewall-policy | 3 +++ src/initscripts/init.d/firewall | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/firewall/firewall-policy b/config/firewall/firewall-policy index 96b9b2f..4ba1ace 100755 --- a/config/firewall/firewall-policy +++ b/config/firewall/firewall-policy @@ -57,6 +57,9 @@ HAVE_OPENVPN="true" # INPUT +# Allow access from GREEN +iptables -A POLICYIN -i "${GREEN_DEV}" -j ACCEPT + # IPsec INPUT case "${HAVE_IPSEC},${POLICY}" in true,MODE1) ;; diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index 8371781..7a18502 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -120,10 +120,10 @@ iptables_init() { iptables -N IPTVFORWARD iptables -A FORWARD -j IPTVFORWARD - # filtering from GUI - iptables -N GUIINPUT - iptables -A INPUT -j GUIINPUT - iptables -A GUIINPUT -p icmp --icmp-type 8 -j ACCEPT + # Allow to ping the firewall. + iptables -N ICMPINPUT + iptables -A INPUT -j ICMPINPUT + iptables -A ICMPINPUT -p icmp --icmp-type 8 -j ACCEPT # Accept everything on loopback iptables -N LOOPBACK @@ -179,7 +179,10 @@ iptables_init() { iptables -t nat -A POSTROUTING -j IPSECNAT # localhost and ethernet. - iptables -A INPUT -i $GREEN_DEV -m conntrack --ctstate NEW -j ACCEPT ! -p icmp + # Always allow accessing the web GUI from GREEN. + iptables -N GUIINPUT + iptables -A INPUT -j GUIINPUT + iptables -A GUIINPUT -i "${GREEN_DEV}" -p tcp --dport 444 -j ACCEPT # WIRELESS chains iptables -N WIRELESSINPUT hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9d707db06eef14a519ed1e5091a6d12f50b452d4
by git＠ipfire.org 22 May '14

22 May '14

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 9d707db06eef14a519ed1e5091a6d12f50b452d4 (commit) from e52d2c3bb529d70ac17567a1b795f4a51a9b1467 (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 9d707db06eef14a519ed1e5091a6d12f50b452d4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu May 22 21:21:53 2014 +0200 xen-image-maker: fix linux-pae metafile create. ----------------------------------------------------------------------- Summary of changes: config/xen-image/xen-image-maker.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 06f9f2e..4f63280 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -138,16 +138,16 @@ echo "# savedefault 0" >> $MNThdd/boot/grub/grub.conf ln -s grub.conf $MNThdd/boot/grub/menu.lst #create the meta-info of linux-kernel package -echo "" > $MNThdd/opt/pakfire/db/meta/linux-$KERN_TYPE -echo "Name: linux-$KERN_TYPE" >> $MNThdd/opt/pakfire/db/meta/linux-$KERN_TYPE -echo "ProgVersion: $KVER" >> $MNThdd/opt/pakfire/db/meta/linux-$KERN_TYPE -echo "Release: $KERN_PACK" >> $MNThdd/opt/pakfire/db/meta/linux-$KERN_TYPE -echo "" >> $MNThdd/opt/pakfire/db/meta/linux-$KERN_TYPE -echo "" > $MNThdd/opt/pakfire/db/installed/linux-$KERN_TYPE -echo "Name: linux-$KERN_TYPE" >> $MNThdd/opt/pakfire/db/installed/linux-$KERN_TYPE -echo "ProgVersion: $KVER" >> $MNThdd/opt/pakfire/db/installed/linux-$KERN_TYPE -echo "Release: $KERN_PACK" >> $MNThdd/opt/pakfire/db/installed/linux-$KERN_TYPE -echo "" >> $MNThdd/opt/pakfire/db/installed/linux-$KERN_TYPE +echo "" > $MNThdd/opt/pakfire/db/meta/meta-linux-$KERN_TYPE +echo "Name: linux-$KERN_TYPE" >> $MNThdd/opt/pakfire/db/meta/meta-linux-$KERN_TYPE +echo "ProgVersion: $KVER" >> $MNThdd/opt/pakfire/db/meta/meta-linux-$KERN_TYPE +echo "Release: $KERN_PACK" >> $MNThdd/opt/pakfire/db/meta/meta-linux-$KERN_TYPE +echo "" >> $MNThdd/opt/pakfire/db/meta/meta-linux-$KERN_TYPE +echo "" > $MNThdd/opt/pakfire/db/installed/meta-linux-$KERN_TYPE +echo "Name: linux-$KERN_TYPE" >> $MNThdd/opt/pakfire/db/installed/meta-linux-$KERN_TYPE +echo "ProgVersion: $KVER" >> $MNThdd/opt/pakfire/db/installed/meta-linux-$KERN_TYPE +echo "Release: $KERN_PACK" >> $MNThdd/opt/pakfire/db/installed/meta-linux-$KERN_TYPE +echo "" >> $MNThdd/opt/pakfire/db/installed/meta-linux-$KERN_TYPE #Set default configuration echo "LANGUAGE=en" >> $MNThdd/var/ipfire/main/settings hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e52d2c3bb529d70ac17567a1b795f4a51a9b1467
by git＠ipfire.org 22 May '14

22 May '14

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 e52d2c3bb529d70ac17567a1b795f4a51a9b1467 (commit) from 61cf8114ea71d62fe953cd4a9d97e8a8ca8fbf30 (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 e52d2c3bb529d70ac17567a1b795f4a51a9b1467 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu May 22 20:56:10 2014 +0200 xen-image-maker: fix variable in README file. ----------------------------------------------------------------------- Summary of changes: config/xen-image/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/xen-image/README b/config/xen-image/README index a59b6fa..5748121 100644 --- a/config/xen-image/README +++ b/config/xen-image/README @@ -20,5 +20,5 @@ other usefull commands from the Dom0: - look what is going on: "xm top" or "xm list" This script can also build a Citrix XenCenter xva image. -- run "XEN_IMAGE_TYPE=xva sh xen-image-maker.sh" to build an xva image. +- run "XEN_IMG_TYPE=xva sh xen-image-maker.sh" to build an xva image. - import the vm with "xe vm-import file=ipfire.xfa" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 61cf8114ea71d62fe953cd4a9d97e8a8ca8fbf30
by git＠ipfire.org 22 May '14

22 May '14

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 61cf8114ea71d62fe953cd4a9d97e8a8ca8fbf30 (commit) via 3c4c5466ce687de0d33e6dab9cfff4f8f2e6c96a (commit) via 51fe9ff8e369bb123d81fe51bef6e9a7da026aa2 (commit) from d2dcd8b2e28face37be18ced3c2f22624e7e567a (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 61cf8114ea71d62fe953cd4a9d97e8a8ca8fbf30 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu May 22 18:40:13 2014 +0200 xen-image-maker: add support vor XenCenter xva image output. commit 3c4c5466ce687de0d33e6dab9cfff4f8f2e6c96a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu May 22 08:11:11 2014 +0200 xen-image-maker: default fs to ext3. many xen server still not support ext4. commit 51fe9ff8e369bb123d81fe51bef6e9a7da026aa2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu May 22 08:08:56 2014 +0200 xen-image-maker: remove legacy xen kernel. ----------------------------------------------------------------------- Summary of changes: config/xen-image/README | 4 +++ config/xen-image/ipfire.cfg | 8 +++--- config/xen-image/xen-image-maker.sh | 50 ++++++++++++++++++++++++------------- 3 files changed, 40 insertions(+), 22 deletions(-) Difference in files: diff --git a/config/xen-image/README b/config/xen-image/README index 3813572..a59b6fa 100644 --- a/config/xen-image/README +++ b/config/xen-image/README @@ -18,3 +18,7 @@ other usefull commands from the Dom0: - shutdown the fire: "xm shutdown ipfire-xen" - reset the fire: "xm destroy ipfire-xen" - look what is going on: "xm top" or "xm list" + +This script can also build a Citrix XenCenter xva image. +- run "XEN_IMAGE_TYPE=xva sh xen-image-maker.sh" to build an xva image. +- import the vm with "xe vm-import file=ipfire.xfa" diff --git a/config/xen-image/ipfire.cfg b/config/xen-image/ipfire.cfg index 594c82a..38bfdff 100644 --- a/config/xen-image/ipfire.cfg +++ b/config/xen-image/ipfire.cfg @@ -17,8 +17,8 @@ vif = [ disk = [ - 'file:/mnt/test/ipfire-boot.img,xvda1,w', - 'file:/mnt/test/ipfire-swap.img,xvda2,w', - 'file:/mnt/test/ipfire-root.img,xvda3,w', - 'file:/mnt/test/ipfire-var.img,xvda4,w' + 'file:./ipfire-boot.img,xvda1,w', + 'file:./ipfire-swap.img,xvda2,w', + 'file:./ipfire-root.img,xvda3,w', + 'file:./ipfire-var.img,xvda4,w' ] #### Change path diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 1a2a004..06f9f2e 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -28,23 +28,12 @@ KVER=xxxKVERxxx KERN_PACK=xxxKERN_PACKxxx KRNDOWN=http://mirror0.ipfire.org/pakfire2/$VERSION/paks CONSOLE=hvc0 -############################################################################### -# If you really want to use outdated legacy kernel uncomment this lines. ##### -# Not recommended!!! ########################################################## -###################### -#KERN_TYPE=xen -#KVER=2.6.32.61 -#KERN_PACK=29 -#KRNDOWN=http://mirror0.ipfire.org/pakfire2/2.15/paks -#CONSOLE=xvc0 -############################################################################### SIZEboot=64 SIZEswap=512 SIZEroot=1024 SIZEvar=1024 -# ct'server does not support ext4 so change this to ext3. -FSTYPE=ext4 +FSTYPE=ext3 ############################################################################## @@ -62,6 +51,25 @@ IMGvar=./$SNAME-var.img KERNEL=linux-$KERN_TYPE-$KVER-$KERN_PACK.ipfire +if [ "$XEN_IMG_TYPE" == "xva" ]; then + # download xva.py if it not exist. + if [ ! -e xva.py ]; then + wget http://source.ipfire.org/source-2.x/xva.py + fi + # XenCenter use other devicenames and + # xvdd seems to be reserved (converter bug?). + P1=xvda + P2=xvdb + P3=xvdc + P4=xvde +else + # old style xen image partition names + P1=xvda1 + P2=xvda2 + P3=xvda3 + P4=xvda4 +fi + rm -rf $TMPDIR && mkdir -p $MNThdd && mkdir -p $ISODIR echo -------------------------------------------------------- echo - Download $SOURCEISO ... @@ -108,7 +116,8 @@ mount -o loop $IMGboot $MNThdd/boot mount -o loop $IMGvar $MNThdd/var # Install IPFire without kernel modules -tar -C $MNThdd/ -xvf $ISODIR/$SNAME-$VERSION.tlz --lzma \ +xz -d < $ISODIR/$SNAME-$VERSION.tlz > $TMPDIR/$SNAME-$VERSION.tar +tar -C $MNThdd/ -xvf $TMPDIR/$SNAME-$VERSION.tar \ --exclude=lib/modules* --exclude=boot* --numeric-owner #Install Kernel @@ -121,7 +130,7 @@ mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf -echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/xvda3 rootdelay=10 panic=10 console=$CONSOLE ro" \ +echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE ro" \ >> $MNThdd/boot/grub/grub.conf echo " initrd /ipfirerd-$KVER-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf echo "# savedefault 0" >> $MNThdd/boot/grub/grub.conf @@ -150,10 +159,10 @@ mount --bind /proc $MNThdd/proc mount --bind /dev $MNThdd/dev mount --bind /sys $MNThdd/sys chroot $MNThdd /usr/bin/perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" -sed -i -e "s|DEVICE1|/dev/xvda1|g" $MNThdd/etc/fstab -sed -i -e "s|DEVICE2|/dev/xvda2|g" $MNThdd/etc/fstab -sed -i -e "s|DEVICE3|/dev/xvda3|g" $MNThdd/etc/fstab -sed -i -e "s|DEVICE4|/dev/xvda4|g" $MNThdd/etc/fstab +sed -i -e "s|DEVICE1|/dev/$P1|g" $MNThdd/etc/fstab +sed -i -e "s|DEVICE2|/dev/$P2|g" $MNThdd/etc/fstab +sed -i -e "s|DEVICE3|/dev/$P3|g" $MNThdd/etc/fstab +sed -i -e "s|DEVICE4|/dev/$P4|g" $MNThdd/etc/fstab sed -i -e "s|FSTYPE|$FSTYPE|g" $MNThdd/etc/fstab @@ -192,6 +201,11 @@ umount $MNThdd umount $ISODIR rm -rf ./ipfire-tmp + +if [ "$XEN_IMG_TYPE" == "xva" ]; then + python xva.py --sparse -c $SNAME.cfg -f $SNAME.xva + rm -f $SNAME*.img +fi echo -------------------------------------------------------- echo - Done. echo -------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2014