This code review is for removal of the packaging area (it's now in IPS), removal of lcompress and addition of the use of the compress flag in lofiadm, and a few misc bug fixes.
The code review is posted at :http://cr.opensolaris.org/~jeanm/distro_constructor/ Since the slimcd_post_processing.tar file hasn't been removed yet, here's the diffs: diff -c old new usr_microroot_files: *************** *** 47,49 **** --- 47,51 ---- usr/lib/libm.so usr/lib/libfstyp.so usr/share/lib/zoneinfo/Asia/Calcutta + usr/lib/libz.so + usr/lib/libz.so.1 diff -c old new bootcd_skel.files: *************** *** 4,10 **** f 0644 root:root boot/solaris/bootenv.rc f 0644 root:sys boot/grub/menu.lst f 0644 root:root boot/grub/sx-boot.xpm.gz - f 0755 root:sys kernel/fs/hsfs f 0555 root:bin lib/svc/method/live-devices-local f 0555 root:bin lib/svc/method/live-fs-root f 0555 root:bin lib/svc/method/live-fs-usr diff -c old new post_process *************** *** 171,284 **** mkdirs $MICROROOT ./livecd_dirs_list copyfiles "" $MICROROOT ./livecd_links_list - # - # Copy extra binaries from various packages including - # Free and Open Source software packages - # - # This loop goes through all the subdirectories of "packages" - # if the subdirectory is mentioned in "packages"/buildpkg.list, - # that package has been installed in TARGET - # and the binaries should be transferred from TARGET to PROTO/TARGET. - # Otherwise the package binaries are in the same subdirectory - # of TARGET/<package> and should be transferred to PROTO. - # - - debug_print "Copying Package files" - - # - # Minimal package registry - # - PACKAGEDIR=./packages - TARGET=/ - - mkdir -p $PROTO/pkgs - if [ $? != 0 ] ; then - echo "WARNING: Error creating $PROTO/pkgs" - fi - - for d in `cat $PACKAGEDIR/cdpkg.list` - do - # If package includes an installation script, use it - if [[ -x $PACKAGEDIR/$d/install.live ]]; then - echo $d - $PACKAGEDIR/$d/install.live $PACKAGEDIR/$d $PROTO - $PACKAGEDIR/$d/install.live $PACKAGEDIR/$d $MICROROOT - continue - fi - # Install using file list - flist="" - if [[ -f "$PACKAGEDIR/$d/${d}.files.livecd" ]] - then - flist="$PACKAGEDIR/$d/${d}.files.livecd" - - elif [[ -f "$PACKAGEDIR/$d/${d}.files" ]] - then - flist="$PACKAGEDIR/$d/${d}.files" - fi - - if [[ "x$flist" != "x" ]] - then - echo $d - grep "^$d/" $PACKAGEDIR/buildpkg.list > /dev/null - if [ $? -ne 0 ] - then - mkdir -p "$PROTO/pkgs/$d" - if [ $? != 0 ] ; then - echo "WARNING: Error creating $PROTO/pkgs/$d" - fi - mkdir -p "$MICROROOT/pkgs/$d" - if [ $? != 0 ] ; then - echo "WARNING: Error creating $MICROROOT/pkgs/$d" - fi - cp "$flist" "$PROTO/pkgs/$d" - if [ $? != 0 ] ; then - echo "WARNING: Error copying from $flist to $PROTO/pkgs/$d" - fi - cp "$flist" "$MICROROOT/pkgs/$d" - if [ $? != 0 ] ; then - echo "WARNING: Error copying from $flist to $MICROROOT/pkgs/$d" - fi - - if [ -f "$PACKAGEDIR/$d/installprefix" ] - then - pref=`cat "$PACKAGEDIR/$d/installprefix"` - copyfiles "$PACKAGEDIR/$d" "$PROTO/$pref" "$flist" - copyfiles "$PACKAGEDIR/$d" "$MICROROOT/$pref" "$flist" - else - copyfiles "$PACKAGEDIR/$d" "$PROTO" "$flist" - copyfiles "$PACKAGEDIR/$d" "$MICROROOT" "$flist" - fi - else - mkdir -p "$PROTO/pkgs/$d" - if [ $? != 0 ] ; then - echo "WARNING: Error creating $PROTO/pkgs/$d" - fi - mkdir -p "$MICROROOT/pkgs/$d" - if [ $? != 0 ] ; then - echo "WARNING: Error creating $MICROROOT/pkgs/$d" - fi - cp "$flist" "$PROTO/pkgs/$d" - if [ $? != 0 ] ; then - echo "WARNING: Error copying from $flist to $PROTO/pkgs/$d" - fi - cp "$flist" "$MICROROOT/pkgs/$d" - if [ $? != 0 ] ; then - echo "WARNING: Error copying from $flist to $MICROROOT/pkgs/$d" - fi - - if [ -f "$PACKAGEDIR/$d/installprefix" ] - then - pref=`cat "$PACKAGEDIR/$d/installprefix"` - copyfiles "$TARGET" "$PROTO/$pref" "$flist" - copyfiles "$TARGET" "$MICROROOT/$pref" "$flist" - else - copyfiles "$TARGET" "$PROTO/$TARGET" "$flist" - copyfiles "$TARGET" "$MICROROOT/$TARGET" "$flist" - fi - fi - fi - done - debug_print "Backing up skeleton files before modification to PROTO area" # First save the originals for use in installation Jean
