-rm /remaster/iso/boot/isolinux/boot.msg
-sed 3,4d /live/image/boot/isolinux/boot.msg \
+if [ -r /remaster/iso/boot/isolinux/boot.msg ] ; then
+ rm /remaster/iso/boot/isolinux/boot.msg
+fi
+
+# make sure we support usb sticks as well:
+if [ -d /live/image/boot/isolinux ] ; then
+ BOOTSTUFF=/live/image/boot/isolinux
+else
+ BOOTSTUFF=/live/image
+fi
+
+[ -d /remaster/iso/boot/isolinux ] || mkdir -p /remaster/iso/boot/isolinux
+
+sed 3,4d "${BOOTSTUFF}"/boot.msg \