fixes

Slax/debian/copy

@@ -1,3 +1,5 @@
 #!/bin/bash
 
 (cd rootcopy && cp --parents -afr * /)
+
+cp ../../tools/dir2sb /usr/bin

Slax/debian/install

@@ -4,5 +4,3 @@ apt-get dist-upgrade
 apt-get install mc squashfs-tools genisoimage zip
 apt-get remove libicu* libperl* libxml2 mime-support perl \
     perl-modules-5.24 sgml-base shared-mime-info xdg-user-dirs xml-core
-
-cp ../../tools/dir2sb /usr/bin

bootinfo.txt

@@ -5,12 +5,13 @@
 # Lines containing # are ignored
 #
 Thank you for using mylinux!
-Steps to make it bootable from your USB device:
+If you are reading this from a CD, it is already bootable.
+Steps to make it bootable from your USB device are following:
 
-1) Extract the contents of ZIP archive to your USB drive.
+1) Copy the entire /mylinux/ directory to your USB drive.
    If you are using Windows, you will get for example E:\mylinux\
-   You probably already did this, just make sure you extracted
-   the archive to your USB drive and not to your local harddisk.
+   You probably already did this - just make sure you are on your
+   USB drive now and not on your local harddisk.
 
 2) Now navigate to directory /mylinux/boot/ on your USB drive.
    In Windows, it will be E:\mylinux\boot\ for example.

build

@@ -68,25 +68,21 @@ if [ -d rootcopy ]; then
    cp -a rootcopy $LIVEKITDATA/$LIVEKITNAME/
 fi
 
-# create ISO for CD image
-echo "Creating ISO file for CD boot..."
 cd "$LIVEKITDATA"
-TARGET=/mnt/z
-if [ ! -d $TARGET ]; then
-   TARGET=/tmp
-fi
-
 ARCH=$(uname -m)
-
-$MKISOFS -o "$TARGET/$LIVEKITNAME-$ARCH.iso" -v -J -R -D -A "$LIVEKITNAME" -V "$LIVEKITNAME" \
--no-emul-boot -boot-info-table -boot-load-size 4 \
--b "$LIVEKITNAME"/boot/isolinux.bin -c "$LIVEKITNAME"/boot/isolinux.boot . \
->/dev/null 2>/dev/null
+TARGET=/tmp
 
 cat "$CWD/bootinfo.txt" | fgrep -v "#" | sed -r "s/mylinux/$LIVEKITNAME/" | sed -r "s/\$/
/" > readme.txt
-echo "Creating ZIP for USB boot..."
-rm -f "$TARGET/$LIVEKITNAME-$ARCH.zip"
-zip -0 -r "$TARGET/$LIVEKITNAME-$ARCH.zip" *
 
-echo "finished. Find your results in $TARGET"
+echo cd ../../ '&&' $MKISOFS -o "$TARGET/$LIVEKITNAME-$ARCH.iso" -v -J -R -D -A "$LIVEKITNAME" -V "$LIVEKITNAME" \
+-no-emul-boot -boot-info-table -boot-load-size 4 \
+-b "$LIVEKITNAME"/boot/isolinux.bin -c "$LIVEKITNAME"/boot/isolinux.boot . \
+> "$LIVEKITNAME"/boot/make_iso
+
+echo zip -0 -r "$TARGET/$LIVEKITNAME-$ARCH.zip" '*' \
+> "$LIVEKITNAME"/boot/make_zip
+
+echo "-----------------------------"
+echo "Finished. Find your result in $LIVEKITDATA"
+echo "You may need to use make_iso or make_zip from $LIVEKITDATA/$LIVEKITNAME/boot/"
 cd $CWD

tools/dir2sb

@@ -16,4 +16,4 @@ if [ -e "$2" ]; then
    exit 3
 fi
 
-mksquashfs "$1" "$2" -comp xz -b 512K $3 $4 $5 $6 $7 $8 $9
+mksquashfs "$1" "$2" -comp xz -b 512K -keep-as-directory