From c36414a5cbe472deafb18d570932de0ddc3c9af4 Mon Sep 17 00:00:00 2001 From: David Farning Date: Wed, 03 Feb 2010 17:21:38 +0000 Subject: update ISO template --- diff --git a/USR-master/.disk/base_installable b/USR-master/.disk/base_installable new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/USR-master/.disk/base_installable diff --git a/USR-master/.disk/casper-uuid-generic b/USR-master/.disk/casper-uuid-generic new file mode 100644 index 0000000..b30f3b3 --- /dev/null +++ b/USR-master/.disk/casper-uuid-generic @@ -0,0 +1 @@ +f99f65b4-f670-4a37-9230-3c40d7c55d9a diff --git a/USR-master/.disk/cd_type b/USR-master/.disk/cd_type new file mode 100644 index 0000000..daab660 --- /dev/null +++ b/USR-master/.disk/cd_type @@ -0,0 +1 @@ +full_cd/single diff --git a/USR-master/.disk/info b/USR-master/.disk/info new file mode 100644 index 0000000..f967b56 --- /dev/null +++ b/USR-master/.disk/info @@ -0,0 +1 @@ +Ubuntu 10.04 "Lucid Lynx" - Alpha i386 (20100202) \ No newline at end of file diff --git a/USR-master/.disk/release_notes_url b/USR-master/.disk/release_notes_url new file mode 100644 index 0000000..8c57512 --- /dev/null +++ b/USR-master/.disk/release_notes_url @@ -0,0 +1 @@ +http://www.ubuntu.com/getubuntu/releasenotes?os=ubuntu&ver=10.04&lang=${LANG} diff --git a/USR-master/README.diskdefines b/USR-master/README.diskdefines new file mode 100644 index 0000000..1e64ca6 --- /dev/null +++ b/USR-master/README.diskdefines @@ -0,0 +1,9 @@ +#define DISKNAME Ubuntu 10.04 "Lucid Lynx" - Alpha i386 +#define TYPE binary +#define TYPEbinary 1 +#define ARCH i386 +#define ARCHi386 1 +#define DISKNUM 1 +#define DISKNUM1 1 +#define TOTALNUM 0 +#define TOTALNUM0 1 diff --git a/USR-master/dists/lucid/Release b/USR-master/dists/lucid/Release new file mode 100644 index 0000000..c1c57bf --- /dev/null +++ b/USR-master/dists/lucid/Release @@ -0,0 +1,30 @@ +Origin: Ubuntu +Label: Ubuntu +Suite: lucid +Version: 10.04 +Codename: lucid +Date: Tue, 02 Feb 2010 7:23:31 UTC +Architectures: i386 +Components: main restricted +Description: Ubuntu Lucid 10.04 +MD5Sum: + 7037879de6915394b6ec6f38d850e813 1280 restricted/binary-i386/Packages.gz + 59773390a87a4cc9fbbb5ac926c4d210 100 restricted/binary-i386/Release + 38c0c3a19c9fbe8090ac6cbd02145cb5 2503 restricted/binary-i386/Packages + c24d772b911f525b667829ce8ccec408 7427 main/binary-i386/Packages.gz + 02ee6eaffeb82c5a0051d495243c0165 94 main/binary-i386/Release + ca3a037b943ccf11c03f6c1ece4a8134 22792 main/binary-i386/Packages +SHA1: + 98a5d8e67b3857c47f224db11ab588ad8cb5ccd2 1280 restricted/binary-i386/Packages.gz + 4396ba67a008e2a06964f1507e92cbfc8884aa12 100 restricted/binary-i386/Release + 40d84381a472b703d64d1d73a9787d51535366aa 2503 restricted/binary-i386/Packages + 11ffc4233f92c64c2d4ee7da68f7d8e026487393 7427 main/binary-i386/Packages.gz + 69f0fdfed70fe61502e551f135248d8629885b89 94 main/binary-i386/Release + ee5d55da40da13b346040cf58081da4b3b360a58 22792 main/binary-i386/Packages +SHA256: + 4e2f057915709d588f7e762c8b83673594c719efa4bc51668a930eb29e0ba7be 1280 restricted/binary-i386/Packages.gz + 26c6c737ad3b145710b745b918b661189e292732c2180e9e0eeee96683d8614f 100 restricted/binary-i386/Release + ad1bd145fe3d76929f2d302dda691a555303c64d28e60f7010d29794e6fdb3fd 2503 restricted/binary-i386/Packages + ab958de05507c6681d6b8585b9335205dc1d73b56e87aee561e1592f33743b42 7427 main/binary-i386/Packages.gz + 095f73f9d2fbbc1c1a84426708978959610be17282420ae96f426deb26d54009 94 main/binary-i386/Release + db664d30d7505db140b4801833e847e48679f163d28f34ffafad9848cb4da6d7 22792 main/binary-i386/Packages diff --git a/USR-master/dists/lucid/Release.gpg b/USR-master/dists/lucid/Release.gpg new file mode 100644 index 0000000..2947852 --- /dev/null +++ b/USR-master/dists/lucid/Release.gpg @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQBLZ9wjRhgUM/u3VFERAkaFAJ9YDdeNybFgqM681yac8F0zTwnYagCfYhPr +mPYLeLiet4hzu/172ID9DM8= +=zddg +-----END PGP SIGNATURE----- diff --git a/USR-master/dists/lucid/main/binary-i386/Packages.gz b/USR-master/dists/lucid/main/binary-i386/Packages.gz new file mode 100644 index 0000000..df5fff0 --- /dev/null +++ b/USR-master/dists/lucid/main/binary-i386/Packages.gz Binary files differ diff --git a/USR-master/dists/lucid/main/binary-i386/Release b/USR-master/dists/lucid/main/binary-i386/Release new file mode 100644 index 0000000..2f3a46c --- /dev/null +++ b/USR-master/dists/lucid/main/binary-i386/Release @@ -0,0 +1,6 @@ +Archive: lucid +Version: 10.04 +Component: main +Origin: Ubuntu +Label: Ubuntu +Architecture: i386 diff --git a/USR-master/dists/lucid/restricted/binary-i386/Packages.gz b/USR-master/dists/lucid/restricted/binary-i386/Packages.gz new file mode 100644 index 0000000..f9d1208 --- /dev/null +++ b/USR-master/dists/lucid/restricted/binary-i386/Packages.gz Binary files differ diff --git a/USR-master/dists/lucid/restricted/binary-i386/Release b/USR-master/dists/lucid/restricted/binary-i386/Release new file mode 100644 index 0000000..444c0f7 --- /dev/null +++ b/USR-master/dists/lucid/restricted/binary-i386/Release @@ -0,0 +1,6 @@ +Archive: lucid +Version: 10.04 +Component: restricted +Origin: Ubuntu +Label: Ubuntu +Architecture: i386 diff --git a/USR-master/dists/stable b/USR-master/dists/stable new file mode 120000 index 0000000..d5a19a3 --- /dev/null +++ b/USR-master/dists/stable @@ -0,0 +1 @@ +lucid \ No newline at end of file diff --git a/USR-master/dists/unstable b/USR-master/dists/unstable new file mode 120000 index 0000000..d5a19a3 --- /dev/null +++ b/USR-master/dists/unstable @@ -0,0 +1 @@ +lucid \ No newline at end of file diff --git a/USR-master/install/README.sbm b/USR-master/install/README.sbm new file mode 100644 index 0000000..4087670 --- /dev/null +++ b/USR-master/install/README.sbm @@ -0,0 +1,43 @@ +About the Smart Boot Manager image +---------------------------------- + + The file `sbm.bin' that is available in this directory may be useful + to you if you are not able to directly boot the first CD because your + BIOS may be too old and may not support ISOLINUX. + + Then, instead of booting on the CD directly, you create a Smart Boot + Manager floppy image by using the sbm.bin disk image. You can create this + floppy with rawrite (under DOS) or with dd (under Linux). Now you can + boot on this floppy disk and it will detect your CDROM and let you boot + on it bypassing any BIOS limitation. + +What is SBM ? + + Smart Boot Manager or briefly SmartBtmgr (SBM), is an OS independent + Boot Manager - a program that is loaded by the bios before any + operating system and allows you to choose which operating system to + boot. + + SBM is included in Debian in two ways, the package bmconf allows us to + install and configure an old version of SBM and sbm wich is the latest + version of SBM with an installer. + +What's the use of SBM on the CD then ? + + SBM includes an IDE driver that allows us to boot the cds even on + machines with a BIOS that wouldn't support booting from CD, provided our + CDROM is an IDE one, that is, so you can make a SBM floppy and boot from + it and then tell it to boot from your CDROM. + + Also, there are some cases where the BIOS would allow booting from the CD + but isolinux fails to boot from there, in this case you can either boot + using a CD other than the first, as the others don't use isolinux, or you + can make a SBM floppy and boot from this floppy and then tell SBM to boot + your CDROM. + +How do you make a SBM floppy ? + + If you have SBM installed on a box you can run sbminst. Otherwise you can + put the sbm.bin floppy image that we provide with our cds onto a floppy + just like you would do with a rescue image. + diff --git a/USR-master/install/mt86plus b/USR-master/install/mt86plus new file mode 100644 index 0000000..cf2b847 --- /dev/null +++ b/USR-master/install/mt86plus Binary files differ diff --git a/USR-master/install/sbm.bin b/USR-master/install/sbm.bin new file mode 100644 index 0000000..b6e2415 --- /dev/null +++ b/USR-master/install/sbm.bin Binary files differ diff --git a/USR-master/pics/blue-lowerleft.png b/USR-master/pics/blue-lowerleft.png new file mode 100644 index 0000000..2a2245e --- /dev/null +++ b/USR-master/pics/blue-lowerleft.png Binary files differ diff --git a/USR-master/pics/blue-lowerright.png b/USR-master/pics/blue-lowerright.png new file mode 100644 index 0000000..7e66271 --- /dev/null +++ b/USR-master/pics/blue-lowerright.png Binary files differ diff --git a/USR-master/pics/blue-upperleft.png b/USR-master/pics/blue-upperleft.png new file mode 100644 index 0000000..a58d0ec --- /dev/null +++ b/USR-master/pics/blue-upperleft.png Binary files differ diff --git a/USR-master/pics/blue-upperright.png b/USR-master/pics/blue-upperright.png new file mode 100644 index 0000000..2f36849 --- /dev/null +++ b/USR-master/pics/blue-upperright.png Binary files differ diff --git a/USR-master/pics/debian.jpg b/USR-master/pics/debian.jpg new file mode 100644 index 0000000..db62d7a --- /dev/null +++ b/USR-master/pics/debian.jpg Binary files differ diff --git a/USR-master/pics/logo-50.jpg b/USR-master/pics/logo-50.jpg new file mode 100644 index 0000000..542f0a4 --- /dev/null +++ b/USR-master/pics/logo-50.jpg Binary files differ diff --git a/USR-master/pics/red-lowerleft.png b/USR-master/pics/red-lowerleft.png new file mode 100644 index 0000000..caca9c5 --- /dev/null +++ b/USR-master/pics/red-lowerleft.png Binary files differ diff --git a/USR-master/pics/red-lowerright.png b/USR-master/pics/red-lowerright.png new file mode 100644 index 0000000..c27056c --- /dev/null +++ b/USR-master/pics/red-lowerright.png Binary files differ diff --git a/USR-master/pics/red-upperleft.png b/USR-master/pics/red-upperleft.png new file mode 100644 index 0000000..c1e3301 --- /dev/null +++ b/USR-master/pics/red-upperleft.png Binary files differ diff --git a/USR-master/pics/red-upperright.png b/USR-master/pics/red-upperright.png new file mode 100644 index 0000000..54d17ca --- /dev/null +++ b/USR-master/pics/red-upperright.png Binary files differ diff --git a/USR-master/pool/main/b/b43-fwcutter/b43-fwcutter_012-1_i386.deb b/USR-master/pool/main/b/b43-fwcutter/b43-fwcutter_012-1_i386.deb new file mode 100644 index 0000000..a736068 --- /dev/null +++ b/USR-master/pool/main/b/b43-fwcutter/b43-fwcutter_012-1_i386.deb Binary files differ diff --git a/USR-master/pool/main/b/build-essential/build-essential_11.4_i386.deb b/USR-master/pool/main/b/build-essential/build-essential_11.4_i386.deb new file mode 100644 index 0000000..d7696d1 --- /dev/null +++ b/USR-master/pool/main/b/build-essential/build-essential_11.4_i386.deb Binary files differ diff --git a/USR-master/pool/main/d/dkms/dkms_2.1.1.1-0ubuntu3_all.deb b/USR-master/pool/main/d/dkms/dkms_2.1.1.1-0ubuntu3_all.deb new file mode 100644 index 0000000..772c696 --- /dev/null +++ b/USR-master/pool/main/d/dkms/dkms_2.1.1.1-0ubuntu3_all.deb Binary files differ diff --git a/USR-master/pool/main/d/dpkg/dpkg-dev_1.15.4.1ubuntu1_all.deb b/USR-master/pool/main/d/dpkg/dpkg-dev_1.15.4.1ubuntu1_all.deb new file mode 100644 index 0000000..67018c7 --- /dev/null +++ b/USR-master/pool/main/d/dpkg/dpkg-dev_1.15.4.1ubuntu1_all.deb Binary files differ diff --git a/USR-master/pool/main/f/fakeroot/fakeroot_1.14.4-1ubuntu1_i386.deb b/USR-master/pool/main/f/fakeroot/fakeroot_1.14.4-1ubuntu1_i386.deb new file mode 100644 index 0000000..753d5a8 --- /dev/null +++ b/USR-master/pool/main/f/fakeroot/fakeroot_1.14.4-1ubuntu1_i386.deb Binary files differ diff --git a/USR-master/pool/main/g/gcc-4.4/g++-4.4_4.4.3-2ubuntu1_i386.deb b/USR-master/pool/main/g/gcc-4.4/g++-4.4_4.4.3-2ubuntu1_i386.deb new file mode 100644 index 0000000..1a9cb04 --- /dev/null +++ b/USR-master/pool/main/g/gcc-4.4/g++-4.4_4.4.3-2ubuntu1_i386.deb Binary files differ diff --git a/USR-master/pool/main/g/gcc-4.4/libstdc++6-4.4-dev_4.4.3-2ubuntu1_i386.deb b/USR-master/pool/main/g/gcc-4.4/libstdc++6-4.4-dev_4.4.3-2ubuntu1_i386.deb new file mode 100644 index 0000000..f185752 --- /dev/null +++ b/USR-master/pool/main/g/gcc-4.4/libstdc++6-4.4-dev_4.4.3-2ubuntu1_i386.deb Binary files differ diff --git a/USR-master/pool/main/g/gcc-defaults/g++_4.4.2-3ubuntu1_i386.deb b/USR-master/pool/main/g/gcc-defaults/g++_4.4.2-3ubuntu1_i386.deb new file mode 100644 index 0000000..990244e --- /dev/null +++ b/USR-master/pool/main/g/gcc-defaults/g++_4.4.2-3ubuntu1_i386.deb Binary files differ diff --git a/USR-master/pool/main/l/linux-wlan-ng/linux-wlan-ng-doc_0.2.9+dfsg-2ubuntu2_all.deb b/USR-master/pool/main/l/linux-wlan-ng/linux-wlan-ng-doc_0.2.9+dfsg-2ubuntu2_all.deb new file mode 100644 index 0000000..2c03040 --- /dev/null +++ b/USR-master/pool/main/l/linux-wlan-ng/linux-wlan-ng-doc_0.2.9+dfsg-2ubuntu2_all.deb Binary files differ diff --git a/USR-master/pool/main/l/linux-wlan-ng/linux-wlan-ng_0.2.9+dfsg-2ubuntu2_i386.deb b/USR-master/pool/main/l/linux-wlan-ng/linux-wlan-ng_0.2.9+dfsg-2ubuntu2_i386.deb new file mode 100644 index 0000000..428aed9 --- /dev/null +++ b/USR-master/pool/main/l/linux-wlan-ng/linux-wlan-ng_0.2.9+dfsg-2ubuntu2_i386.deb Binary files differ diff --git a/USR-master/pool/main/l/lupin/lupin-support_0.27_all.deb b/USR-master/pool/main/l/lupin/lupin-support_0.27_all.deb new file mode 100644 index 0000000..f92eae3 --- /dev/null +++ b/USR-master/pool/main/l/lupin/lupin-support_0.27_all.deb Binary files differ diff --git a/USR-master/pool/main/m/mouseemu/mouseemu_0.16-0ubuntu4_i386.deb b/USR-master/pool/main/m/mouseemu/mouseemu_0.16-0ubuntu4_i386.deb new file mode 100644 index 0000000..1e71e7d --- /dev/null +++ b/USR-master/pool/main/m/mouseemu/mouseemu_0.16-0ubuntu4_i386.deb Binary files differ diff --git a/USR-master/pool/main/n/ndisgtk/ndisgtk_0.8.4-1_i386.deb b/USR-master/pool/main/n/ndisgtk/ndisgtk_0.8.4-1_i386.deb new file mode 100644 index 0000000..27fbe8b --- /dev/null +++ b/USR-master/pool/main/n/ndisgtk/ndisgtk_0.8.4-1_i386.deb Binary files differ diff --git a/USR-master/pool/main/n/ndiswrapper/ndiswrapper-common_1.54-2ubuntu1_all.deb b/USR-master/pool/main/n/ndiswrapper/ndiswrapper-common_1.54-2ubuntu1_all.deb new file mode 100644 index 0000000..af9e7df --- /dev/null +++ b/USR-master/pool/main/n/ndiswrapper/ndiswrapper-common_1.54-2ubuntu1_all.deb Binary files differ diff --git a/USR-master/pool/main/n/ndiswrapper/ndiswrapper-utils-1.9_1.54-2ubuntu1_i386.deb b/USR-master/pool/main/n/ndiswrapper/ndiswrapper-utils-1.9_1.54-2ubuntu1_i386.deb new file mode 100644 index 0000000..a6cbb4b --- /dev/null +++ b/USR-master/pool/main/n/ndiswrapper/ndiswrapper-utils-1.9_1.54-2ubuntu1_i386.deb Binary files differ diff --git a/USR-master/pool/main/p/patch/patch_2.6-2_i386.deb b/USR-master/pool/main/p/patch/patch_2.6-2_i386.deb new file mode 100644 index 0000000..bfdd526 --- /dev/null +++ b/USR-master/pool/main/p/patch/patch_2.6-2_i386.deb Binary files differ diff --git a/USR-master/pool/main/p/pptp-linux/pptp-linux_1.7.2-4_i386.deb b/USR-master/pool/main/p/pptp-linux/pptp-linux_1.7.2-4_i386.deb new file mode 100644 index 0000000..610da72 --- /dev/null +++ b/USR-master/pool/main/p/pptp-linux/pptp-linux_1.7.2-4_i386.deb Binary files differ diff --git a/USR-master/pool/main/s/setserial/setserial_2.17-45.2_i386.deb b/USR-master/pool/main/s/setserial/setserial_2.17-45.2_i386.deb new file mode 100644 index 0000000..a448b9b --- /dev/null +++ b/USR-master/pool/main/s/setserial/setserial_2.17-45.2_i386.deb Binary files differ diff --git a/USR-master/pool/main/u/ubiquity/oem-config-gtk_2.1.15_all.deb b/USR-master/pool/main/u/ubiquity/oem-config-gtk_2.1.15_all.deb new file mode 100644 index 0000000..5153476 --- /dev/null +++ b/USR-master/pool/main/u/ubiquity/oem-config-gtk_2.1.15_all.deb Binary files differ diff --git a/USR-master/pool/main/u/ubiquity/oem-config_2.1.15_all.deb b/USR-master/pool/main/u/ubiquity/oem-config_2.1.15_all.deb new file mode 100644 index 0000000..6903188 --- /dev/null +++ b/USR-master/pool/main/u/ubiquity/oem-config_2.1.15_all.deb Binary files differ diff --git a/USR-master/pool/restricted/b/bcmwl/bcmwl-kernel-source_5.10.91.9+bdcom-0ubuntu5_i386.deb b/USR-master/pool/restricted/b/bcmwl/bcmwl-kernel-source_5.10.91.9+bdcom-0ubuntu5_i386.deb new file mode 100644 index 0000000..7b9eea7 --- /dev/null +++ b/USR-master/pool/restricted/b/bcmwl/bcmwl-kernel-source_5.10.91.9+bdcom-0ubuntu5_i386.deb Binary files differ diff --git a/USR-master/pool/restricted/s/sl-modem/sl-modem-daemon_2.9.11~20080817-3ubuntu4_i386.deb b/USR-master/pool/restricted/s/sl-modem/sl-modem-daemon_2.9.11~20080817-3ubuntu4_i386.deb new file mode 100644 index 0000000..33d6572 --- /dev/null +++ b/USR-master/pool/restricted/s/sl-modem/sl-modem-daemon_2.9.11~20080817-3ubuntu4_i386.deb Binary files differ diff --git a/USR-master/preseed/USR.seed b/USR-master/preseed/USR.seed index 6a9a58d..f7e98ff 100644 --- a/USR-master/preseed/USR.seed +++ b/USR-master/preseed/USR.seed @@ -1,7 +1,6 @@ -# Install the Ubuntu desktop. -tasksel tasksel/first multiselect ubuntu-desktop -# On live DVDs, don't spend huge amounts of time removing substantial -# application packages pulled in by language packs. Given that we clearly -# have the space to include them on the DVD, they're useful and we might as -# well keep them installed. -ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org +# Only install the standard system and language packs. +tasksel tasksel/first multiselect +d-i pkgsel/language-pack-patterns string +# No language support packages. +d-i pkgsel/install-language-support boolean false + diff --git a/USR-master/ubuntu b/USR-master/ubuntu new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/USR-master/ubuntu diff --git a/usr-chroot.sh b/usr-chroot.sh index 5e62020..9c312a7 100755 --- a/usr-chroot.sh +++ b/usr-chroot.sh @@ -6,7 +6,7 @@ ## Login ## ## Started on Fri Jan 1 03:35:38 2010 David Farning -## Last update Mon Feb 1 17:03:17 2010 David Farning +## Last update Tue Feb 2 17:58:36 2010 David Farning ## cat << EOF > /etc/apt/sources.list @@ -34,9 +34,7 @@ apt-get install --force-yes --yes ubuntu-sugar-remix sugar-activities apt-get install --yes casper lupin-casper apt-get install --yes discover1 os-prober apt-get install --force-yes -y linux-image-generic -apt-get install -y ubiquity ubiquity-casper ubiquity-frontend-gtk ubiquity-slideshow-ubuntu - -#/bin/bash +apt-get install -y ubiquity-frontend-gtk apt-get clean diff --git a/usr-push.sh b/usr-push.sh deleted file mode 100644 index 4e080ff..0000000 --- a/usr-push.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -## -## USR-push.sh -## -## Made by David Farning -## Login -## -## Started on Sun Jan 31 18:57:46 2010 David Farning -## Last update Sun Jan 31 19:04:50 2010 David Farning -## - -set -eu - -${RELEASE}=$1 - -rsync --verbose --progress --compress ${RELEASE}.iso sunjammer.sugarlabs.org:public_html/${RELEASE}.iso -rsync --verbose --progress --compress ${RELEASE}.vdi sunjammer.sugarlabs.org:public_html/${RELEASE}.vdi -rsync --verbose --progress --compress ${RELEASE}.vmdk sunjammer.sugarlabs.org:public_html/${RELEASE}.vmdk -rsync --verbose --progress --compress ${RELEASE}.ovf sunjammer.sugarlabs.org:public_html/${RELEASE}.ovf - diff --git a/usr-scratch.sh b/usr-scratch.sh index e7d709f..0a7ec5f 100755 --- a/usr-scratch.sh +++ b/usr-scratch.sh @@ -6,7 +6,7 @@ ## Login ## ## Started on Sat Jan 9 03:45:30 2010 David Farning -## Last update Mon Feb 1 19:46:59 2010 David Farning +## Last update Tue Feb 2 20:22:01 2010 David Farning ## set -eu @@ -141,7 +141,7 @@ function do_debootstrap() { prepare_chroot in_chroot - cp casper $CHROOT/etc/init.d/casper + #cp casper $CHROOT/etc/init.d/casper clean_chroot # restore_ssd @@ -154,13 +154,11 @@ function prepare_image_directory() rm -rf ${IMAGE} || failure "Failed to remove directory ${IMAGE}" fi mkdir -p ${IMAGE} + cp -a USR-master/* ${IMAGE}/ } function pack_squashfs() { - prepare_image_directory - cp -a USR-master/* ${IMAGE}/ - echo "Updating files lists..." ${CCMD} dpkg-query -W --showformat='${Package} ${Version}\n' > ${IMAGE}/casper/filesystem.manifest || failure "Cannot update filesystem.manifest, error=$?" @@ -237,7 +235,15 @@ function build_vm(){ } function upload_files(){ - rsync --compress ${ISO} sunjammer.sugarlabs.org:public_html/${DIST}-${ARCH}-${DATE}.iso + RELEASE=${DIST}-${ARCH}-${DATE} + 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} + 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 @@ -285,10 +291,10 @@ all) COLUMNS=500 do_debootstrap 2>&1 3>&1 0>&1 | COLUMNS=500 tee $LOG COLUMNS=500 build_vm 2>&1 3>&1 0>&1 | COLUMNS=500 tee -a $LOG COLUMNS=500 upload_files 2>&1 3>&1 0>&1 | COLUMNS=500 tee -a $LOG ;; -debug) do_debootstrapG +debug) do_debootstrap pack_squashfs pack_iso - build_vm - upload_files + #build_vm + #upload_files ;; esac -- cgit v0.9.1