ugly update for 0201 release

1 files changed, 11 insertions, 57 deletions

diff --git a/usr-scratch.sh b/usr-scratch.sh
index 55caa2f..9068ef3 100755
--- a/usr-scratch.sh
+++ b/usr-scratch.sh
@@ -6,7 +6,7 @@
 ## Login   <dfarning@acer>
 ## 
 ## Started on  Sat Jan  9 03:45:30 2010 David Farning
-## Last update Thu Jan 14 06:04:12 2010 David Farning
+## Last update Sun Jan 31 19:04:58 2010 David Farning
 ##
 
 set -eu
@@ -88,7 +88,8 @@ function prepare_chroot()
 function in_chroot()
 {
     cp usr-chroot.sh ${CHROOT}   
-    ${CCMD} /usr-chroot.sh
+    ${CCMD} ./usr-chroot.sh
+    #rm ${CHROOT}/usr-chroot.sh
 }
 
 function clean_chroot()
@@ -130,11 +131,6 @@ function do_debootstrap() {
 
     cp casper $CHROOT/etc/init.d/casper
 
-#    ${CCMD} update-usbids.sh
-#    ${CCMD} update-pciids
-
-    ${CCMD} update-initramfs -uv
-
     clean_chroot
 #    restore_ssd
 }
@@ -167,6 +163,7 @@ pack_squashfs()
         rm -f ${IMAGE}/casper/filesystem.squashfs || failure "Cannot remove ${IMAGE}/casper/filesystem.squashfs to make room for created squashfs image, error=$?"
     fi
 
+    printf $(du -sx --block-size=1 ${CHROOT} | cut -f1) > ${IMAGE}/casper/filesystem.size
     mksquashfs ${CHROOT} ${IMAGE}/casper/filesystem.squashfs || failure "Failed to create squashfs image to ${IMAGE}/casper/filesystem.squashfs, error=$?"
 
     chmod 644  ${IMAGE}/casper/filesystem.squashfs
@@ -179,42 +176,19 @@ pack_iso(){
 
     echo "Updating md5sums..."
     pushd ${CHROOT}
-    #rm md5sum.txt
-#    find . -type f | grep -v boot.cat | grep -v md5sum.txt | grep -v isolinux.bin | grep -v pdf$ | grep -v md5sum | xargs md5sum >> md5sum.txt
+    find . -type f -print0 | xargs -0 md5sum | grep -v "\./md5sum.txt" > md5sum.txt
     popd
 
-    LIVECD_ISO_DESCRIPTION="Ubuntu Sugar Remix LiveCD"
-
-    echo "ISO description set to: ${LIVECD_ISO_DESCRIPTION}"
-
-    if [ ${ARCH} = "x86_64" ]; then
-        echo "#FIXME this has not been tested"
-#	mkisofs -o "$NEW_FILES_DIR/$NEW_ISO_FILE_NAME" \
-#		-b "isolinux/isolinux.bin" -c "isolinux/boot.cat" \
-#		-p "Ubuntu Customization Kit - http://uck.sf.net" \
-#		-no-emul-boot -V "$LIVECD_ISO_DESCRIPTION" -r -J -l \
-#		-x "$ISO_REMASTER_DIR"/casper/manifest.diff \
-#		$MKISOFS_EXTRA_OPTIONS \
-#		"$ISO_REMASTER_DIR"
-    else
-    	mkisofs -o ${ISO} \
-		-b "isolinux/isolinux.bin" -c "isolinux/boot.cat" \
-		-no-emul-boot -boot-load-size 4 -boot-info-table \
-		-cache-inodes -r -J -l \
-		${IMAGE}
-    fi
+    mkisofs -o ${ISO} \
+	-b "isolinux/isolinux.bin" -c "isolinux/boot.cat" \
+	-no-emul-boot -boot-load-size 4 -boot-info-table \
+	-cache-inodes -r -J -l \
+	${IMAGE}
 
     RESULT=$?
     if [ $RESULT -ne 0 ]; then
     	failure "Failed to pack ISO image, error=${RESULT}"
     fi
-
-
-#NAME=${DIST}_${VERSION}_$ARCH
-#[ $ARCH = "i386" ] && NAME=${DIST}_${VERSION}_i686
-#mkisofs -D -r -V "${NAME}" -cache-inodes -J -l -b isolinux/isolinux.bin \
-#   -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
-#   -o iso/${NAME}.iso $DIST-master
 }
 
 
@@ -237,7 +211,6 @@ esac
 export DEBIAN_FRONTEND=noninteractive
 
 MIRROR="http://10.0.02:3142/archive.ubuntu.com/ubuntu"
-
 DIST="USR"
 CHROOT=${DIST}-${ARCH}-FS
 IMAGE=${DIST}-${ARCH}-IMAGE
@@ -246,25 +219,6 @@ LOG=${CHROOT}.log
 CCMD="chroot ${CHROOT}"
 echo ${CCMD}
 
-
-do_debootstrap
+#do_debootstrap
 pack_squashfs
 pack_iso
-
-###################################################################################
-#case $ACTION in
-#debootstrap)	COLUMNS=500 do_debootstrap 2>&1 3>&1 0>&1 | COLUMNS=500 tee $LOG
-#		;;
-#iso)		COLUMNS=500 pack_iso 2>&1 3>&1 0>&1 | COLUMNS=500 tee $LOG
-#		;;
-#torrent)	COLUMNS=500 DO_TORRENT 2>&1 3>&1 0>&1 | COLUMNS=500 tee $LOG
-#		;;
-#squash)		COLUMNS=500 pack_squashfs 2>&1 3>&1 0>&1 | COLUMNS=500 tee $LOG
-#		;;
-#source)		COLUMNS=500 DO_SOURCE 2>&1 3>&1 0>&1 | COLUMNS=500 tee $LOG
-#		;;
-#all)		COLUMNS=500 do_debootstrap 2>&1 3>&1 0>&1 | COLUMNS=500 tee $LOG
-#		COLUMNS=500 pack_squashfs 2>&1 3>&1 0>&1 | COLUMNS=500 tee -a $LOG
-#		COLUMNS=500 pack_iso 2>&1 3>&1 0>&1 | COLUMNS=500 tee -a $LOG
-#		;;
-#esac
\ No newline at end of file