diff --git a/README b/README index 6b0f7ba..0b7e6b8 100644 --- a/README +++ b/README @@ -13,10 +13,10 @@ Note: make a directory such as /a and put these scripts there. Be warned, if you put it to /tmp, some distros may erase it on reboot. -* Before you start building your Kit, edit the file ./.config +* Before you start building your Kit, edit the file ./config Most importantly change the LIVEKITNAME variable. -* Make sure your kernel is in /boot/vmlinuz or change the path in ./.config +* Make sure your kernel is in /boot/vmlinuz or change the path in ./config Your kernel must support squashfs and aufs. Debian Jessie's kernel does. * You may also wish to replace boot graphics in ./bootfiles/bootlogo.png diff --git a/Slax/debian/build b/Slax/debian/build index 5a403d8..1e2f06d 100755 --- a/Slax/debian/build +++ b/Slax/debian/build @@ -18,5 +18,5 @@ apt-get install aufs-dkms cd initramfs . ./initramfs_create -cp -f $INITRAMFS.img $LIVEKITDATA/$LIVEKITNAME/boot/initrfs.img +mv -f $INITRAMFS.img $LIVEKITDATA/$LIVEKITNAME/boot/initrfs.img cp -f $CWD/bootfiles/* $LIVEKITDATA/$LIVEKITNAME/boot/ diff --git a/build b/build index 5431f19..b2b8ef1 100755 --- a/build +++ b/build @@ -8,7 +8,7 @@ echo "Changing current directory to $CHANGEDIR" CWD="$(pwd)" cd $CHANGEDIR -. ./.config || exit 1 +. ./config || exit 1 . ./livekitlib || exit 1 # only root can continue, because only root can read all files from your system @@ -79,7 +79,7 @@ echo cd ../../ '&&' $MKISOFS -o "$TARGET/$LIVEKITNAME-$ARCH.iso" -v -J -R -D -A -b "$LIVEKITNAME"/boot/isolinux.bin -c "$LIVEKITNAME"/boot/isolinux.boot . \ > "$LIVEKITNAME"/boot/make_iso -echo zip -0 -r "$TARGET/$LIVEKITNAME-$ARCH.zip" '*' \ +echo cd ../../ '&&' zip -0 -r "$TARGET/$LIVEKITNAME-$ARCH.zip" '*' \ > "$LIVEKITNAME"/boot/make_zip echo "-----------------------------" diff --git a/.config b/config similarity index 100% rename from .config rename to config diff --git a/initramfs/init b/initramfs/init index 35069a2..6b87069 100644 --- a/initramfs/init +++ b/initramfs/init @@ -4,7 +4,7 @@ export PATH=.:/:/usr/sbin:/usr/bin:/sbin:/bin -. /lib/.config +. /lib/config . /lib/livekitlib transfer_initramfs diff --git a/initramfs/initramfs_create b/initramfs/initramfs_create index 600d171..54d4007 100755 --- a/initramfs/initramfs_create +++ b/initramfs/initramfs_create @@ -3,7 +3,7 @@ # Author: Tomas M # -. ../.config +. ../config INITRAMFS=/tmp/$LIVEKITNAME-initramfs-$$ @@ -119,7 +119,7 @@ cp cleanup $INITRAMFS/lib chmod a+x $INITRAMFS/lib/cleanup ln -s ../init $INITRAMFS/bin/init cp ../livekitlib $INITRAMFS/lib/ -cp ../.config $INITRAMFS/lib/ +cp ../config $INITRAMFS/lib/ cd $INITRAMFS find . -print | cpio -o -H newc 2>/dev/null | xz -f --extreme --check=crc32 >$INITRAMFS.img diff --git a/tools/isolinux.bin.update b/tools/isolinux.bin.update index 4b19c42..7d05f43 100755 --- a/tools/isolinux.bin.update +++ b/tools/isolinux.bin.update @@ -1,7 +1,7 @@ #!/bin/bash # This script will update the file ../bootfiles/isolinux.bin to match -# your LiveKit name used in ../.config +# your LiveKit name used in ../config # # Requires: wget, tar, gzip, make, gcc, nasm, perl, glibc-devel, libuuid-devel (e2fsprogs) # @@ -15,7 +15,7 @@ PKG=syslinux-4.06 PKGTGZ=$PKG.tar.gz DL="http://www.kernel.org/pub/linux/utils/boot/syslinux/$PKGTGZ" -. ../.config +. ../config # download, unpack, and patch syslinux if [ ! -d $PKG ]; then