IPFire-SCM January 2012

ipfire-scm@lists.ipfire.org

1 participants
54 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.11-core56, created. 5db3741f3721d32fe4eacac0c0bacf981fbfedc8
by git＠ipfire.org 26 Jan '12

26 Jan '12

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 tag, v2.11-core56 has been created at 5db3741f3721d32fe4eacac0c0bacf981fbfedc8 (commit) - Log ----------------------------------------------------------------- commit 5db3741f3721d32fe4eacac0c0bacf981fbfedc8 Merge: 11cbd00 c0ec897 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 26 17:46:56 2012 +0100 Merge branch 'master' into core56 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core56, created. 5db3741f3721d32fe4eacac0c0bacf981fbfedc8
by git＠ipfire.org 26 Jan '12

26 Jan '12

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, core56 has been created at 5db3741f3721d32fe4eacac0c0bacf981fbfedc8 (commit) - Log ----------------------------------------------------------------- commit 5db3741f3721d32fe4eacac0c0bacf981fbfedc8 Merge: 11cbd00 c0ec897 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 26 17:46:56 2012 +0100 Merge branch 'master' into core56 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c0ec89791d264825da02d18003443be3d18506b5
by git＠ipfire.org 26 Jan '12

26 Jan '12

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 c0ec89791d264825da02d18003443be3d18506b5 (commit) from 834ca786da89d5e61ec881d4f065a9c5ef92d287 (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 c0ec89791d264825da02d18003443be3d18506b5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 26 17:43:59 2012 +0100 finish core56. ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index dba36b4..6e576e0 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number CORE="56" # Core Level (Filename) -PAKFIRE_CORE="55" # Core Level (PAKFIRE) +PAKFIRE_CORE="56" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c0ec89791d264825da02d18003443be3d18506b5
by git＠ipfire.org 26 Jan '12

26 Jan '12

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 c0ec89791d264825da02d18003443be3d18506b5 (commit) from 834ca786da89d5e61ec881d4f065a9c5ef92d287 (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 c0ec89791d264825da02d18003443be3d18506b5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 26 17:43:59 2012 +0100 finish core56. ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index dba36b4..6e576e0 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number CORE="56" # Core Level (Filename) -PAKFIRE_CORE="55" # Core Level (PAKFIRE) +PAKFIRE_CORE="56" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 834ca786da89d5e61ec881d4f065a9c5ef92d287
by git＠ipfire.org 26 Jan '12

26 Jan '12

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 834ca786da89d5e61ec881d4f065a9c5ef92d287 (commit) via 2a3329bce4445711a0f5f982bee7648f7ed40cb8 (commit) via 1ccf0a2b880095fddc42c609ab05f67e3141bc75 (commit) via edc2be7080a64a27bd077b91b5eeec912e8baf2e (commit) via b4c77ffb891f956f2b3c017bd55090a57e3b9862 (commit) from e247eb7cec0c628fb1d0a07e9cec3ced925b53d9 (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 834ca786da89d5e61ec881d4f065a9c5ef92d287 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 26 17:39:00 2012 +0100 initscripts: rootfile update. commit 2a3329bce4445711a0f5f982bee7648f7ed40cb8 Merge: 1ccf0a2 b4c77ff Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 24 21:44:16 2012 +0100 Merge commit 'origin/static-routes' commit 1ccf0a2b880095fddc42c609ab05f67e3141bc75 Merge: edc2be7 e247eb7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 24 20:53:06 2012 +0100 Merge commit 'origin/next' commit edc2be7080a64a27bd077b91b5eeec912e8baf2e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 24 18:17:14 2012 +0100 flash-images: activate autoresize also on arm. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 3 +++ config/rootfiles/common/i586/initscripts | 2 ++ lfs/flash-images | 8 ++++---- .../init.d/networking/red.down/10-static-routes | 4 ++++ .../init.d/networking/red.up/10-static-routes | 4 ++++ 5 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 src/initscripts/init.d/networking/red.down/10-static-routes create mode 100644 src/initscripts/init.d/networking/red.up/10-static-routes Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index a7f0fed..eaa6352 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -220,3 +220,6 @@ etc/sysconfig/modules etc/sysconfig/rc etc/sysconfig/rc.local etc/init.d +etc/rc.d/init.d/networking/red.down/10-static-routes +etc/rc.d/init.d/networking/red.up/10-static-routes +#etc/rc.d/init.d/transmission diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 91e3308..882628a 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -223,3 +223,5 @@ etc/sysconfig/modules etc/sysconfig/rc etc/sysconfig/rc.local etc/init.d +etc/rc.d/init.d/networking/red.down/10-static-routes +etc/rc.d/init.d/networking/red.up/10-static-routes diff --git a/lfs/flash-images b/lfs/flash-images index 4c99822..daf3ec1 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -111,15 +111,15 @@ ifneq "$(MACHINE_TYPE)" "arm" sed -i -e "s|ROOT|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/boot/grub/grub.conf ln -s grub.conf $(MNThdd)/boot/grub/menu.lst + # Copy grub files manually + cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ +endif + # Setup symlink for partresize at first boot... ln -sf ../init.d/partresize $(MNThdd)/etc/rc.d/rcsysinit.d/S25partresize # Setup symlink for fsresize at second boot... ln -sf ../init.d/fsresize $(MNThdd)/etc/rc.d/rcsysinit.d/S26fsresize - # Copy grub files manually - cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ -endif - # Unmount umount $(MNThdd)/proc umount $(MNThdd)/dev diff --git a/src/initscripts/init.d/networking/red.down/10-static-routes b/src/initscripts/init.d/networking/red.down/10-static-routes new file mode 100644 index 0000000..f8f00a7 --- /dev/null +++ b/src/initscripts/init.d/networking/red.down/10-static-routes @@ -0,0 +1,4 @@ +#!/bin/bash + +# Update the static routes. +exec /etc/rc.d/init.d/static-routes start diff --git a/src/initscripts/init.d/networking/red.up/10-static-routes b/src/initscripts/init.d/networking/red.up/10-static-routes new file mode 100644 index 0000000..f8f00a7 --- /dev/null +++ b/src/initscripts/init.d/networking/red.up/10-static-routes @@ -0,0 +1,4 @@ +#!/bin/bash + +# Update the static routes. +exec /etc/rc.d/init.d/static-routes start hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 834ca786da89d5e61ec881d4f065a9c5ef92d287
by git＠ipfire.org 26 Jan '12

26 Jan '12

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 834ca786da89d5e61ec881d4f065a9c5ef92d287 (commit) via 2a3329bce4445711a0f5f982bee7648f7ed40cb8 (commit) via 1ccf0a2b880095fddc42c609ab05f67e3141bc75 (commit) via edc2be7080a64a27bd077b91b5eeec912e8baf2e (commit) via b4c77ffb891f956f2b3c017bd55090a57e3b9862 (commit) via e247eb7cec0c628fb1d0a07e9cec3ced925b53d9 (commit) from 76b8277500d32f633dd9d044d4593aa8a4d17013 (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 834ca786da89d5e61ec881d4f065a9c5ef92d287 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 26 17:39:00 2012 +0100 initscripts: rootfile update. commit 2a3329bce4445711a0f5f982bee7648f7ed40cb8 Merge: 1ccf0a2 b4c77ff Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 24 21:44:16 2012 +0100 Merge commit 'origin/static-routes' commit 1ccf0a2b880095fddc42c609ab05f67e3141bc75 Merge: edc2be7 e247eb7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 24 20:53:06 2012 +0100 Merge commit 'origin/next' commit edc2be7080a64a27bd077b91b5eeec912e8baf2e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 24 18:17:14 2012 +0100 flash-images: activate autoresize also on arm. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 3 +++ config/rootfiles/common/i586/initscripts | 2 ++ config/rootfiles/core/56/filelists/files | 1 + lfs/flash-images | 8 ++++---- .../init.d/networking/red.down/10-static-routes | 4 ++++ .../init.d/networking/red.up/10-static-routes | 4 ++++ src/scripts/readhash | 2 +- 7 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 src/initscripts/init.d/networking/red.down/10-static-routes create mode 100644 src/initscripts/init.d/networking/red.up/10-static-routes Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index a7f0fed..eaa6352 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -220,3 +220,6 @@ etc/sysconfig/modules etc/sysconfig/rc etc/sysconfig/rc.local etc/init.d +etc/rc.d/init.d/networking/red.down/10-static-routes +etc/rc.d/init.d/networking/red.up/10-static-routes +#etc/rc.d/init.d/transmission diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 91e3308..882628a 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -223,3 +223,5 @@ etc/sysconfig/modules etc/sysconfig/rc etc/sysconfig/rc.local etc/init.d +etc/rc.d/init.d/networking/red.down/10-static-routes +etc/rc.d/init.d/networking/red.up/10-static-routes diff --git a/config/rootfiles/core/56/filelists/files b/config/rootfiles/core/56/filelists/files index 58c1960..7b1d4c0 100644 --- a/config/rootfiles/core/56/filelists/files +++ b/config/rootfiles/core/56/filelists/files @@ -8,3 +8,4 @@ srv/web/ipfire/cgi-bin/media.cgi usr/local/bin/hddshutdown usr/local/bin/makegraphs usr/local/bin/openvpnctrl +usr/local/bin/readhash diff --git a/lfs/flash-images b/lfs/flash-images index 4c99822..daf3ec1 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -111,15 +111,15 @@ ifneq "$(MACHINE_TYPE)" "arm" sed -i -e "s|ROOT|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/boot/grub/grub.conf ln -s grub.conf $(MNThdd)/boot/grub/menu.lst + # Copy grub files manually + cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ +endif + # Setup symlink for partresize at first boot... ln -sf ../init.d/partresize $(MNThdd)/etc/rc.d/rcsysinit.d/S25partresize # Setup symlink for fsresize at second boot... ln -sf ../init.d/fsresize $(MNThdd)/etc/rc.d/rcsysinit.d/S26fsresize - # Copy grub files manually - cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ -endif - # Unmount umount $(MNThdd)/proc umount $(MNThdd)/dev diff --git a/src/initscripts/init.d/networking/red.down/10-static-routes b/src/initscripts/init.d/networking/red.down/10-static-routes new file mode 100644 index 0000000..f8f00a7 --- /dev/null +++ b/src/initscripts/init.d/networking/red.down/10-static-routes @@ -0,0 +1,4 @@ +#!/bin/bash + +# Update the static routes. +exec /etc/rc.d/init.d/static-routes start diff --git a/src/initscripts/init.d/networking/red.up/10-static-routes b/src/initscripts/init.d/networking/red.up/10-static-routes new file mode 100644 index 0000000..f8f00a7 --- /dev/null +++ b/src/initscripts/init.d/networking/red.up/10-static-routes @@ -0,0 +1,4 @@ +#!/bin/bash + +# Update the static routes. +exec /etc/rc.d/init.d/static-routes start diff --git a/src/scripts/readhash b/src/scripts/readhash index 63a3e0f..8c187d5 100644 --- a/src/scripts/readhash +++ b/src/scripts/readhash @@ -13,7 +13,7 @@ VARNAME='[A-Za-z_][A-zA-z0-9_]*' # For the assigned value we only accept a limited number of characters - none # of which are shell metachars -VARCHARS='A-Za-z0-9=/,._@#+-' +VARCHARS='A-Za-z0-9=/,.:_@#+-' VARVAL="[${VARCHARS}]*" sed -ne "s/$${VARNAME}$=$${VARVAL}$$/\1=\2/p" $1 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, static-routes, created. b4c77ffb891f956f2b3c017bd55090a57e3b9862
by git＠ipfire.org 23 Jan '12

23 Jan '12

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, static-routes has been created at b4c77ffb891f956f2b3c017bd55090a57e3b9862 (commit) - Log ----------------------------------------------------------------- commit b4c77ffb891f956f2b3c017bd55090a57e3b9862 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 23 22:32:32 2012 +0100 Reload static routes after a connecting to the internet. BUg 10007. Some users claimed, that not all static routes are set up correctly at boot time. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e247eb7cec0c628fb1d0a07e9cec3ced925b53d9
by git＠ipfire.org 23 Jan '12

23 Jan '12

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 e247eb7cec0c628fb1d0a07e9cec3ced925b53d9 (commit) from 76b8277500d32f633dd9d044d4593aa8a4d17013 (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 e247eb7cec0c628fb1d0a07e9cec3ced925b53d9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 23 22:09:31 2012 +0100 Allow : character in configuration files. According to bug #10006, it is needed in some DSL credentials. As : is not a special character in shell code (at least if {} is not allowed either) we can safely use it. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/56/filelists/files | 1 + src/scripts/readhash | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/56/filelists/files b/config/rootfiles/core/56/filelists/files index 58c1960..7b1d4c0 100644 --- a/config/rootfiles/core/56/filelists/files +++ b/config/rootfiles/core/56/filelists/files @@ -8,3 +8,4 @@ srv/web/ipfire/cgi-bin/media.cgi usr/local/bin/hddshutdown usr/local/bin/makegraphs usr/local/bin/openvpnctrl +usr/local/bin/readhash diff --git a/src/scripts/readhash b/src/scripts/readhash index 63a3e0f..8c187d5 100644 --- a/src/scripts/readhash +++ b/src/scripts/readhash @@ -13,7 +13,7 @@ VARNAME='[A-Za-z_][A-zA-z0-9_]*' # For the assigned value we only accept a limited number of characters - none # of which are shell metachars -VARCHARS='A-Za-z0-9=/,._@#+-' +VARCHARS='A-Za-z0-9=/,.:_@#+-' VARVAL="[${VARCHARS}]*" sed -ne "s/$${VARNAME}$=$${VARVAL}$$/\1=\2/p" $1 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 76b8277500d32f633dd9d044d4593aa8a4d17013
by git＠ipfire.org 22 Jan '12

22 Jan '12

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 76b8277500d32f633dd9d044d4593aa8a4d17013 (commit) from 55bec7f58fa5b38a8ce37d3667730c80e85f2577 (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 76b8277500d32f633dd9d044d4593aa8a4d17013 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 22 10:57:35 2012 +0100 flash-images: increase size of root partition. Minimal media-size is now 2GB. ----------------------------------------------------------------------- Summary of changes: lfs/flash-images | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/flash-images b/lfs/flash-images index 0b07704..4c99822 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -44,15 +44,15 @@ md5 : ############################################################################### # Installation Details ############################################################################### -IMGinst := /install/images/$(SNAME)-$(VERSION).1gb-ext2.$(MACHINE)-full-core$(CORE).img -IMGinsts := /install/images/$(SNAME)-$(VERSION).1gb-ext2-scon.$(MACHINE)-full-core$(CORE).img +IMGinst := /install/images/$(SNAME)-$(VERSION).2gb-ext2.$(MACHINE)-full-core$(CORE).img +IMGinsts := /install/images/$(SNAME)-$(VERSION).2gb-ext2-scon.$(MACHINE)-full-core$(CORE).img MNThdd := /install/harddisk IMGpart := /install/images/part_area IMGboot := /install/images/bootfs # don't change SIZEboot this without checking Image size SIZEboot := 20 IMGroot := /install/images/rootfs -SIZEroot := 500 +SIZEroot := 1400 IMGvar := /install/images/varfs SIZEvar := 430 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 76b8277500d32f633dd9d044d4593aa8a4d17013
by git＠ipfire.org 22 Jan '12

22 Jan '12

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 76b8277500d32f633dd9d044d4593aa8a4d17013 (commit) from 55bec7f58fa5b38a8ce37d3667730c80e85f2577 (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 76b8277500d32f633dd9d044d4593aa8a4d17013 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 22 10:57:35 2012 +0100 flash-images: increase size of root partition. Minimal media-size is now 2GB. ----------------------------------------------------------------------- Summary of changes: lfs/flash-images | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/flash-images b/lfs/flash-images index 0b07704..4c99822 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -44,15 +44,15 @@ md5 : ############################################################################### # Installation Details ############################################################################### -IMGinst := /install/images/$(SNAME)-$(VERSION).1gb-ext2.$(MACHINE)-full-core$(CORE).img -IMGinsts := /install/images/$(SNAME)-$(VERSION).1gb-ext2-scon.$(MACHINE)-full-core$(CORE).img +IMGinst := /install/images/$(SNAME)-$(VERSION).2gb-ext2.$(MACHINE)-full-core$(CORE).img +IMGinsts := /install/images/$(SNAME)-$(VERSION).2gb-ext2-scon.$(MACHINE)-full-core$(CORE).img MNThdd := /install/harddisk IMGpart := /install/images/part_area IMGboot := /install/images/bootfs # don't change SIZEboot this without checking Image size SIZEboot := 20 IMGroot := /install/images/rootfs -SIZEroot := 500 +SIZEroot := 1400 IMGvar := /install/images/varfs SIZEvar := 430 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 January 2012