From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 93d772a59e671d2d4fa8bd58a9de0fa5bb9b43f1 Date: Sat, 14 Sep 2013 22:23:55 +0200 Message-ID: <20130914202355.688DA20F93@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5272551793834606999==" List-Id: --===============5272551793834606999== 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, fifteen has been updated via 93d772a59e671d2d4fa8bd58a9de0fa5bb9b43f1 (commit) from 1a78fe5e2dd19a6c7959ec52e175ee7a70cc29e8 (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 93d772a59e671d2d4fa8bd58a9de0fa5bb9b43f1 Author: Arne Fitzenreiter Date: Sat Sep 14 22:22:58 2013 +0200 xen-image-maker: add FSTYPE variable because ct'-server not support ext4. ----------------------------------------------------------------------- Summary of changes: config/xen-image/xen-image-maker.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image= -maker.sh index 038b578..4a7c7f2 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -42,6 +42,8 @@ SIZEboot=3D30 SIZEswap=3D512 SIZEroot=3D512 SIZEvar=3D950 +# ct'server does not support ext4 so change this to ext3. +FSTYPE=3Dext4 =20 ############################################################################= ## =20 @@ -86,11 +88,11 @@ mkswap $IMGswap =20 #Create rootimage dd bs=3D1M if=3D/dev/zero of=3D$IMGroot count=3D$SIZEroot -mkfs.ext4 -F $IMGroot +mkfs.$FSTYPE -F $IMGroot =20 #Create varimage dd bs=3D1M if=3D/dev/zero of=3D$IMGvar count=3D$SIZEvar -mkfs.ext4 -F $IMGvar +mkfs.$FSTYPE -F $IMGvar =20 echo -------------------------------------------------------- echo - Intall IPFire to the Images ... @@ -152,7 +154,7 @@ 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 =20 -sed -i -e "s|FSTYPE|ext4|g" $MNThdd/etc/fstab +sed -i -e "s|FSTYPE|$FSTYPE|g" $MNThdd/etc/fstab =20 #Remove root / fstab check rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S19checkfstab hooks/post-receive -- IPFire 2.x development tree --===============5272551793834606999==--