From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, core125,
 updated. 8e68bb83c68485337739093dbf17141fd098bfeb
Date: Sun, 11 Nov 2018 10:05:48 +0000
Message-ID: <20181111100548.826B91081BB0@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8555468883485410677=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============8555468883485410677==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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, core125 has been updated
       via  8e68bb83c68485337739093dbf17141fd098bfeb (commit)
      from  a0f37487475e510f12b5ced95b897af05598c7c5 (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 8e68bb83c68485337739093dbf17141fd098bfeb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Nov 10 11:03:37 2018 +0100

    xen-image: enlarge partitions and remove extra /var partition
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/xen-image/ipfire.cfg         |  5 ++---
 config/xen-image/xen-image-maker.sh | 17 +++--------------
 2 files changed, 5 insertions(+), 17 deletions(-)

Difference in files:
diff --git a/config/xen-image/ipfire.cfg b/config/xen-image/ipfire.cfg
index 38bfdff5e..3d2ab311c 100644
--- a/config/xen-image/ipfire.cfg
+++ b/config/xen-image/ipfire.cfg
@@ -1,6 +1,6 @@
 bootloader =3D '/usr/bin/pygrub'
=20
-memory =3D 256
+memory =3D 512
 name =3D "ipfire-xen"
=20
 acpi=3D1
@@ -19,6 +19,5 @@ vif         =3D [
 disk =3D [
 		'file:./ipfire-boot.img,xvda1,w',
 		'file:./ipfire-swap.img,xvda2,w',
-		'file:./ipfire-root.img,xvda3,w',
-		'file:./ipfire-var.img,xvda4,w'
+		'file:./ipfire-root.img,xvda3,w'
 	] #### Change path
diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image=
-maker.sh
index 7c70a6445..ae20f295a 100644
--- a/config/xen-image/xen-image-maker.sh
+++ b/config/xen-image/xen-image-maker.sh
@@ -2,7 +2,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2016  Arne Fitzenreiter  <arne_f(a)ipfire.org>         =
    #
+# Copyright (C) 2007-2018  Arne Fitzenreiter  <arne_f(a)ipfire.org>         =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -29,10 +29,9 @@ KERN_PACK=3DxxxKERN_PACKxxx
 KRNDOWN=3Dhttp://mirror0.ipfire.org/pakfire2/$VERSION/paks
 CONSOLE=3Dhvc0
=20
-SIZEboot=3D64
+SIZEboot=3D128
 SIZEswap=3D512
-SIZEroot=3D1024
-SIZEvar=3D1024
+SIZEroot=3D3072
 FSTYPE=3Dext3
=20
 ############################################################################=
##
@@ -47,7 +46,6 @@ MNThdd=3D$TMPDIR/harddisk
 IMGboot=3D./$SNAME-boot.img
 IMGswap=3D./$SNAME-swap.img
 IMGroot=3D./$SNAME-root.img
-IMGvar=3D./$SNAME-var.img
=20
 KERNEL=3Dlinux-$KERN_TYPE-$KVER-$KERN_PACK.ipfire
=20
@@ -61,13 +59,11 @@ if [ "$XEN_IMG_TYPE" =3D=3D "xva" ]; then
 	P1=3Dxvda
 	P2=3Dxvdb
 	P3=3Dxvdc
-	P4=3Dxvde
 else
 	# old style xen image partition names
 	P1=3Dxvda1
 	P2=3Dxvda2
 	P3=3Dxvda3
-	P4=3Dxvda4
 fi
=20
 rm -rf $TMPDIR && mkdir -p $MNThdd && mkdir -p $ISODIR
@@ -99,10 +95,6 @@ mkswap $IMGswap
 dd bs=3D1M if=3D/dev/zero of=3D$IMGroot count=3D$SIZEroot
 mkfs.$FSTYPE -F $IMGroot
=20
-#Create varimage
-dd bs=3D1M if=3D/dev/zero of=3D$IMGvar count=3D$SIZEvar
-mkfs.$FSTYPE -F $IMGvar
-
 echo --------------------------------------------------------
 echo - Install IPFire to the images ...
 echo --------------------------------------------------------
@@ -113,7 +105,6 @@ mkdir $MNThdd/boot
 mkdir $MNThdd/var
 mkdir $MNThdd/var/log
 mount -o loop $IMGboot $MNThdd/boot
-mount -o loop $IMGvar $MNThdd/var
=20
 # Install IPFire without kernel modules
 xz -d < $ISODIR/distro.img > $TMPDIR/$SNAME-$VERSION.tar
@@ -167,7 +158,6 @@ chroot $MNThdd /usr/bin/perl -e "require '/var/ipfire/lan=
g.pl'; &Lang::BuildCach
 echo "/dev/$P1 /boot auto defaults 1 3" > $MNThdd/etc/fstab
 echo "/dev/$P2 swap swap defaults 0 0" >> $MNThdd/etc/fstab
 echo "/dev/$P3 / auto defaults 1 1"    >> $MNThdd/etc/fstab
-echo "/dev/$P4 /var auto defaults 1 2" >> $MNThdd/etc/fstab
=20
=20
 #Remove root / fstab check
@@ -199,7 +189,6 @@ sed -i -e "s|^video|#video|g" $MNThdd/etc/sysconfig/modul=
es
 umount $MNThdd/proc
 umount $MNThdd/dev
 umount $MNThdd/sys
-umount $MNThdd/var
 umount $MNThdd/boot
 umount $MNThdd
=20


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

--===============8555468883485410677==--