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, next, updated. a2f63d7e2e9eebcef66dfb92dfff749e4857e445
Date: Sun, 17 Apr 2016 20:48:46 +0100	[thread overview]
Message-ID: <20160417194846.BB6B31081BDF@git01.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2912 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, next has been updated
       via  a2f63d7e2e9eebcef66dfb92dfff749e4857e445 (commit)
       via  8f31e52dbcef59c43fdede570aa9bebbe05b21fd (commit)
      from  0e664ce92f8f183d8b26869cae99a9955ac4db8b (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 a2f63d7e2e9eebcef66dfb92dfff749e4857e445
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sun Apr 17 20:50:49 2016 +0200

    lcdproc 0.5.7: Fixes for rootfile
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 8f31e52dbcef59c43fdede570aa9bebbe05b21fd
Author: Eberhard Beilharz <eb1(a)sil.org>
Date:   Sat Apr 16 23:28:11 2016 +0200

    Add missing end-quote to xen-image-maker
    
    Signed-off-by: Eberhard Beilharz <eb1(a)sil.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/packages/lcdproc   | 1 +
 config/xen-image/xen-image-maker.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/packages/lcdproc b/config/rootfiles/packages/lcdproc
index 8bef5a3..d2a59e0 100644
--- a/config/rootfiles/packages/lcdproc
+++ b/config/rootfiles/packages/lcdproc
@@ -44,6 +44,7 @@ usr/lib/lcdproc
 #usr/lib/lcdproc/mtc_s16209x.so
 #usr/lib/lcdproc/picolcd.so
 #usr/lib/lcdproc/pyramid.so
+#usr/lib/lcdproc/rawserial.so
 #usr/lib/lcdproc/sdeclcd.so
 #usr/lib/lcdproc/sed1330.so
 #usr/lib/lcdproc/sed1520.so
diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh
index 07414f7..bd29855 100644
--- a/config/xen-image/xen-image-maker.sh
+++ b/config/xen-image/xen-image-maker.sh
@@ -130,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 "  root (hd0)                        >> $MNThdd/boot/grub/grub.conf
+echo "  root (hd0)"                       >> $MNThdd/boot/grub/grub.conf
 echo "  kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE" \
 					  >> $MNThdd/boot/grub/grub.conf
 echo "  initrd /initramfs-$KVER-ipfire-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf


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

                 reply	other threads:[~2016-04-17 19:48 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=20160417194846.BB6B31081BDF@git01.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