X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fusb-stick;h=1bfc8a167e2c934b66a92dee8a7c8b997908a8a1;hp=4c5e716b03871e19f8404337175f76a3af39eacb;hb=7b906cb23ae0220adb9916cad34c2d90dbb7bdca;hpb=ff1580d89dbe3916fdcd8523d33eb422b2907341

diff --git a/lfs/usb-stick b/lfs/usb-stick
index 4c5e716b0..1bfc8a167 100644
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  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
@@ -92,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	COUNT=$$((`du -k -s $(IMGfs) | awk '{print $$1}'` + 32 )); \
 	dd bs=1k if=/dev/zero of=$(IMGhdd) count=$$COUNT
 	# write mbr before partitioning save a 'not msdos fs' warning from sfdisk
-	/usr/local/sbin/install-mbr -f $(IMGhdd)
+	/usr/sbin/install-mbr -f $(IMGhdd)
 	echo -e "0,,6,*\n;\n;\n;" | sfdisk -qLD -H 64 -S 32 $(IMGhdd)
 	# copy the entire partition, make the fs and dd back
 	dd if=$(IMGfs) of=$(IMGhdd) bs=512 seek=32