SVN: bootdisk/trunk/scripts/mkinstaller

[hawk]

Author: hawk
Date: Wed Apr  4 23:59:43 2007
New Revision: 8425

Modified:
   bootdisk/trunk/scripts/mkinstaller
Log:
- support squashfs intird


Modified: bootdisk/trunk/scripts/mkinstaller
==============================================================================
--- bootdisk/trunk/scripts/mkinstaller	(original)
+++ bootdisk/trunk/scripts/mkinstaller	Wed Apr  4 23:59:43 2007
@@ -19,6 +19,7 @@
 outfile=
 in_dir=
 romfs=
+squashfs=
 in_initrd=
 etc_files=
 exact_size=
@@ -161,6 +162,9 @@
     -R)
       romfs=yes
       ;;
+    -Q)
+      squashfs=yes
+      ;;
     *)
       cat <<EOF
 USAGE: $0 [options]
@@ -181,6 +185,7 @@
   -a use syslinux with -s option (slow, stupid and safe)
      In most cases not needed.
   -R use genromfs instead of genext2fs.
+  -Q use squashfs instead of genext2fs.
 
 Options to modify image content:
   -p PACKAGES
@@ -398,10 +403,15 @@
   if test "$romfs" ; then
     echo -n "Making devices..."
     for i in `cat $tarbz2_dir/config/dev_genromfs`; do
-	touch $dir/$i
+      touch $dir/$i
     done
     echo "done"
     genromfs -d $dir -f $initrd
+  elif test "$squashfs" ; then
+    echo -n "Making devices..."
+      sh scripts/makedev $tarbz2_dir/config/dev_make $dir/dev/
+    echo "done"
+    mksquashfs $dir $initrd -noappend
   else
     genext2fs -e 0 -i 2000 -b $size \
   	-d $dir \
@@ -421,13 +431,18 @@
     verb "cleaning $dir"
     rm -rf $dir
   fi
-  initrdgz=$(mktemp $tmp/initrdgz-XXXXXX)
-  add_clean $initrdgz
-  verb "compressing image to $initrdgz"
-  gzip < $initrd > $initrdgz
-  rm -f $initrd
-  make_bootdisk $initrdgz
-  rm -f $initrdgz
+  if test "$squashfs" ; then
+    make_bootdisk $initrd
+    rm -f $initrd
+  else
+    initrdgz=$(mktemp $tmp/initrdgz-XXXXXX)
+    add_clean $initrdgz
+    verb "compressing image to $initrdgz"
+    gzip < $initrd > $initrdgz
+    rm -f $initrd
+    make_bootdisk $initrdgz
+    rm -f $initrdgz
+  fi
 }
 
 # let's make bootdisk
@@ -457,7 +472,13 @@
   info "Kernel-kb-size: $kernel_size"
   initrd_size=$((($(file_size $1)+1023)/1024))
   verb "installing initrd image ($initrd_size kb)"
-  mcopy $1 w:initrd.gz
+  if test "$squashfs" ; then
+    mcopy $1 w:initrd.sqf
+    sed -i -e 's/initrd.gz/initrd.sqf/g' $tarbz2_dir/floppy/syslinux.cfg
+  else
+    mcopy $1 w:initrd.gz
+    sed -i -e 's/initrd.sqf/initrd.gz/g' $tarbz2_dir/floppy/syslinux.cfg
+  fi
   info "Initrd-kb-size: $initrd_size"
   free_size=$(($count-$kernel_size-$initrd_size-25))
   verb "approx free space = $free_size kb"