public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <20130914202355.688DA20F93@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2294 bytes --]

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 <arne_f(a)ipfire.org>
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=30
 SIZEswap=512
 SIZEroot=512
 SIZEvar=950
+# ct'server does not support ext4 so change this to ext3.
+FSTYPE=ext4
 
 ##############################################################################
 
@@ -86,11 +88,11 @@ mkswap $IMGswap
 
 #Create rootimage
 dd bs=1M if=/dev/zero of=$IMGroot count=$SIZEroot
-mkfs.ext4 -F $IMGroot
+mkfs.$FSTYPE -F $IMGroot
 
 #Create varimage
 dd bs=1M if=/dev/zero of=$IMGvar count=$SIZEvar
-mkfs.ext4 -F $IMGvar
+mkfs.$FSTYPE -F $IMGvar
 
 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
 
-sed -i -e "s|FSTYPE|ext4|g" $MNThdd/etc/fstab
+sed -i -e "s|FSTYPE|$FSTYPE|g" $MNThdd/etc/fstab
 
 #Remove root / fstab check
 rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S19checkfstab


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

                 reply	other threads:[~2013-09-14 20:23 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130914202355.688DA20F93@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox