From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 26 May 2013 14:32:06 +0000 (+0200)
Subject: usb-stick: changes for new syslinux / menu.
X-Git-Tag: v2.13-core69~8^2~9
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a35a0a4e5f3a0e9f1e5c50fb924284ac9163d6f6

usb-stick: changes for new syslinux / menu.
---

diff --git a/lfs/usb-stick b/lfs/usb-stick
index 30a1475774..1bfc8a167e 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@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@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