build impro

Slax/debian/build

@@ -5,12 +5,15 @@
 . ./copy
 
 # now run build script
+SKIPINITRFS=true
 cd ../../
-./build
+. ./build
 
+# re-setup initrd to include aufs
 apt-get update
 apt-get install aufs-dkms
 
-# and re-setup initrd to include aufs
-./initramfs/initramfs_create
+cd initramfs
+. ./initramfs_create
 
+cp -f $INITRAMFS.img $LIVEKITDATA/$LIVEKITNAME/boot/initrfs.img

build

@@ -31,10 +31,12 @@ if [ "$MKISOFS" = "" ]; then
 fi
 
 # build initramfs image
+if [ "$SKIPINITRFS" = "" ]; then
    echo "Building intramfs image..."
    cd initramfs
-INITRAMFS=$(./initramfs_create "$LIVEKITNAME")
+   INITRAMFS=$(./initramfs_create)
    cd ..
+fi
 
 # create live kit filesystem (cpio archive)
 rm -Rf "$LIVEKITDATA"
@@ -42,7 +44,11 @@ BOOT="$LIVEKITDATA"/"$LIVEKITNAME"/boot
 mkdir -p "$BOOT"
 mkdir -p "$BOOT"/../changes
 mkdir -p "$BOOT"/../modules
+
+if [ "$INITRAMFS" != "" ]; then
    mv "$INITRAMFS" $BOOT/initrfs.img
+fi
+
 cp bootfiles/* $BOOT
 cat bootfiles/syslinux.cfg | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" > $BOOT/syslinux.cfg
 cat bootfiles/bootinst.bat | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" | sed -r "s:\\\\boot\\\\:\\\\$LIVEKITNAME\\\\boot\\\\:" > $BOOT/bootinst.bat
@@ -82,6 +88,5 @@ echo "Creating ZIP for USB boot..."
 rm -f "$TARGET/$LIVEKITNAME-$ARCH.zip"
 zip -0 -r "$TARGET/$LIVEKITNAME-$ARCH.zip" *
 
-cd ..
-#rm -Rf "$LIVEKITDATA"
 echo "finished. Find your results in $TARGET"
+cd $CWD