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, next, updated.
 a35a0a4e5f3a0e9f1e5c50fb924284ac9163d6f6
Date: Sun, 26 May 2013 16:33:14 +0200
Message-ID: <20130526143314.E131120161@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3922076919216770533=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3922076919216770533==
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, next has been updated
       via  a35a0a4e5f3a0e9f1e5c50fb924284ac9163d6f6 (commit)
      from  c3ab47cd913eb07f1d8f55abf0d93969f02eca37 (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 a35a0a4e5f3a0e9f1e5c50fb924284ac9163d6f6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 26 16:32:06 2013 +0200

    usb-stick: changes for new syslinux / menu.

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

Summary of changes:
 lfs/usb-stick | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/lfs/usb-stick b/lfs/usb-stick
index 30a1475..1bfc8a1 100644
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2012  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2013  IPFire Team  <info(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      =
  #
@@ -62,9 +62,9 @@ define COPY_TO_IMG
 	losetup $$LOOPDEV $$IMAGE && \
 	mount -t vfat $$LOOPDEV /install/mnt && \
 	cp -fR /install/cdrom/* /install/mnt && \
-	mv /install/mnt/boot/isolinux/{instroot,vmlinuz,splash.lss,*\.msg,memtest} =
/install/mnt && \
-	rm -rf /install/mnt/boot/isolinux && \
-	cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/mnt/syslinux.cfg && \
+	mv /install/mnt/boot/isolinux /install/mnt/boot/syslinux && \
+	mv /install/mnt/boot/syslinux/isolinux.cfg \
+	   /install/mnt/boot/syslinux/syslinux.cfg && \
 	umount /install/mnt && \
 	losetup -d $$LOOPDEV && \
 	syslinux $$IMAGE


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

--===============3922076919216770533==--