diff options
Diffstat (limited to 'usr-scratch.sh')
-rwxr-xr-x | usr-scratch.sh | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/usr-scratch.sh b/usr-scratch.sh index 0a7ec5f..5e81569 100755 --- a/usr-scratch.sh +++ b/usr-scratch.sh @@ -6,20 +6,19 @@ ## Login <dfarning@acer> ## ## Started on Sat Jan 9 03:45:30 2010 David Farning -## Last update Tue Feb 2 20:22:01 2010 David Farning +## Last update Mon Feb 8 18:13:17 2010 David Farning ## set -eu function usage() { - echo "The script needs 3 parameters: + echo "The script needs 2 parameters: * Action to do: debootstrap|iso|squash|all * Architecture to build: i386|amd64 - * build date - Usage: $0 debootstrap|iso|squash|source|all|torrent i386|amd64 XXXX" + Usage: $0 debootstrap|iso|squash|source|all|torrent i386|amd64" } function failure() @@ -125,8 +124,7 @@ function prepare_filesystem_directory() function do_debootstrap() { - date - echo "DIST=${DIST} + echo " DIST=${DIST} ARCH=${ARCH} CHROOT=${CHROOT}" @@ -137,14 +135,11 @@ function do_debootstrap() { prepare_filesystem_directory debootstrap --arch=${ARCH} lucid ${CHROOT} ${MIRROR} -# replace_ssd +# replace_ssd prepare_chroot in_chroot - - #cp casper $CHROOT/etc/init.d/casper - clean_chroot -# restore_ssd +# restore_ssd } function prepare_image_directory() @@ -154,7 +149,7 @@ function prepare_image_directory() rm -rf ${IMAGE} || failure "Failed to remove directory ${IMAGE}" fi mkdir -p ${IMAGE} - cp -a USR-master/* ${IMAGE}/ + cp -a ${ISOTEMPLATE}/* ${IMAGE}/ } function pack_squashfs() @@ -204,11 +199,6 @@ function pack_iso(){ function build_vm(){ VM=${DIST}-${ARCH}-${DATE} -#if ! VBoxManage list runningvms | grep -qs "^\"${VM}\""; then -# break -# fi - - VBoxManage createvm --name ${VM} --ostype Ubuntu --register VBoxManage modifyvm ${VM} --memory 2048 VBoxManage modifyvm ${VM} --cpus 3 @@ -236,14 +226,18 @@ function build_vm(){ function upload_files(){ RELEASE=${DIST}-${ARCH}-${DATE} + LOGIN=dfarning@sunjammer.sugarlabs.org + for TYPE in iso vmdk ovf mf; do + FILE=${RELEASE}.${TYPE} + chown dfarning:dfarning ~/usr/output/${FILE} + chmod 0777 ~/usr/output/${FILE} + rsync --compress --verbose --progress ~/usr/output/${FILE} ${LOGIN}:staging/${FILE} + done for TYPE in iso vmdk ovf mf; do - chown dfarning:dfarning ~/usr/output/${RELEASE}.${TYPE} - chmod 0777 ~/usr/output/${RELEASE}.${TYPE} - rsync --compress --verbose --progress ~/usr/output/${RELEASE}.${TYPE} dfarning@sunjammer.sugarlabs.org:public_html/${RELEASE}.${TYPE} + FILE=${RELEASE}.${TYPE} + ssh ${LOGIN} "mv stagingmkdir/'${FILE}'public_html/'${FILE}'" + #ssh ${LOGIN} "ln -s public_html/'${FILE}' public_html/'${DIST}'-'${ARCH}'-current.'${TYPE}'" done -# for TYPE in iso vmdk ovf mf; do -# ssh dfarning@sunjammer.sugarlabs.org 'cp staging/${RELEASE}.${TYPE} public_html/${RELELASE}.${TYPE}' -# done } case $1 in @@ -262,14 +256,15 @@ i386|amd64) ARCH=$2 ;; esac -DATE=$3 +DATE=$(date +"%Y%m%d") export DEBIAN_FRONTEND=noninteractive MIRROR="http://10.0.02:3142/archive.ubuntu.com/ubuntu" DIST="USR" -CHROOT=build/${ARCH}-FS -IMAGE=build/${ARCH}-IMAGE +CHROOT=build/${ARCH}-fs +IMAGE=build/${ARCH}-image +ISOTEMPLATE=templates/iso ISO=output/${DIST}-${ARCH}-${DATE}.iso LOG=logs/${DIST}-${ARCH}-${DATE}.log CCMD="chroot ${CHROOT}" |