changes

initramfs/init

@@ -2,53 +2,30 @@
 # Initial script for Linux Live Kit
 # Author: Tomas M <http://www.linux-live.org/>
 
-export PATH=.:/:/usr/sbin:/usr/bin:/sbin:/bin
-
-. /.config
-. /linuxkitlib
-
-mount -n -t proc proc /proc
-mount -n -t sysfs sysfs /sys
-mount -n -o remount,rw rootfs /
-ln -sf /proc/mounts /etc/mtab # this allows us to use umount -a
-
-# Don't print kernel messages to konsole any longer
-echo "0" >/proc/sys/kernel/printk
-
-# Activate zram (auto-compression of RAM)
-# Compressed RAM consumes 1/2 or even 1/4 of original size
-# Setup static size of 500MB
-echo "Setting dynamic RAM compression using ZRAM"
-modprobe zram
-echo $((512*1024*1024)) > /sys/block/zram0/disksize
-mkswap /dev/zram0
-swapon /dev/zram0 -p 32767
-echo 100 > /proc/sys/vm/swappiness
-
 MEMORYDIR=/memory
 UNIONDIR=/union
 
-# Setup empty union
-mkdir $MEMORYDIR
-mkdir $UNIONDIR
-mount -t ramfs ramfs $MEMORYDIR
-mount -t aufs -o xino=$MEMORYDIR/xino,br=$MEMORYDIR none $UNIONDIR
+export PATH=.:/:/usr/sbin:/usr/bin:/sbin:/bin
 
-# find LiveKit data
+. /.config
+. /livekitlib
 
+init_proc
+init_devs
+init_aufs
+init_zram
+init_union $MEMORYDIR $UNIONDIR
+
+# find data dir with filesystem bundles
+DATA="$(find_data $LIVEKITNAME)"
+
+# copy to RAM if needed
 
 # add data to union
+union_append_bundles "$DATA"
 
+# possibly switch root
 
 # testing message
-echo
-echo
-echo
-echo "          If you see this message, then the test passed OK."
-echo "          Thank you for testing. That's all for now :)"
-echo "          It's now safe to turn off your computer ..."
-echo
-echo
-echo
-echo
+echo "If you see this message, then something went terribly wrong. Sorry!"
 /bin/bash

initramfs/initramfs_create

@@ -35,19 +35,20 @@ copy_including_deps()
 rm -Rf $INITRAMFS
 mkdir -p $INITRAMFS/{bin,dev,etc,lib,lib64,mnt,proc,root,run,sbin,sys,tmp,usr,var/log}
 
-modprobe zram
-copy_including_deps /dev/zram0
+#tar -C $INITRAMFS -xf initrd-tree.tar.gz
+#rm $INITRAMFS/* 2>/dev/null # only files
+#copy_including_deps /lib64/libc.so.*
+#copy_including_deps /lib64/libm.so.*
 
-copy_including_deps /dev/console /dev/null /dev/fb0 /dev/zero
 copy_including_deps /dev/ram /dev/systty /dev/fuse
 copy_including_deps /dev/tty /dev/tty?
-copy_including_deps /bin/bash /bin/mount /bin/mkdir
+copy_including_deps /bin/bash /bin/mount /bin/umount /bin/mkdir
 copy_including_deps /bin/ln /bin/cat /bin/ls /bin/free
 copy_including_deps /sbin/blkid /sbin/swapon /sbin/mkswap /sbin/modprobe
 copy_including_deps /bin/grep /bin/egrep /bin/cut /bin/tr
 copy_including_deps /sbin/lsmod
 copy_including_deps /sbin/fdisk
-
+copy_including_deps /bin/uname
 copy_including_deps /usr/bin/vi
 copy_including_deps /usr/bin/strace
 
@@ -71,4 +72,4 @@ find . -print | cpio -o -H newc 2>/dev/null | gzip -f --best >$INITRAMFS.img
 echo $INITRAMFS.img
 
 cd ..
-#rm -Rf $INITRAMFS
+rm -Rf $INITRAMFS