ubuntu-daily: DVDs are not usefully jigdoable any more

[bin.git] / ubuntu-daily

diff --git a/ubuntu-daily b/ubuntu-daily
index 177160c92fdb57b3b5efa3e8ebbfab32a5758c50..cadbc517970a83747dcab0ba853cf4b1ea3f00ee 100755 (executable)
--- a/ubuntu-daily
+++ b/ubuntu-daily
@@ -1,9 +1,9 @@
 #! /bin/sh
 
 PROJECT=
-CURRENT_DIST=maverick
+CURRENT_DIST=oneiric
 DIST="$CURRENT_DIST"
-BASE=antimony:cdimage/www/full
+BASE=cdimage.ubuntu.com::cdimage
 RSYNC=false
 HTTP=false
 
@@ -13,14 +13,14 @@ Usage: $0 [options] image_type architecture
 
 Options:
   -f|--flavour FLAVOUR         Flavour (default: ubuntu).
-  -d|--dist DIST               Distribution (default: maverick).
-  -a|--anonymous               Don't use privileged access.
+  -d|--dist DIST               Distribution (default: oneiric).
+  -a|--authenticated           Use privileged access.
   -r|--rsync                   Force rsync.
   -h|--http                    Force HTTP only (no reuse).
 EOF
 }
 
-eval set -- "$(getopt -o f:d:arh -l help,flavour:,dist:,anonymous,rsync,http -- "$@")" || { usage >&2; exit 2; }
+eval set -- "$(getopt -o f:d:arh -l help,flavour:,dist:,authenticated,rsync,http -- "$@")" || { usage >&2; exit 2; }
 while :; do
        case $1 in
                --help)
@@ -38,8 +38,8 @@ while :; do
                        DIST="$2"
                        shift 2
                        ;;
-               -a|--anonymous)
-                       BASE=cdimage.ubuntu.com::cdimage
+               -a|--authenticated)
+                       BASE=antimony:cdimage/www/full
                        shift
                        ;;
                -r|--rsync)
@@ -59,14 +59,7 @@ if $HTTP; then
        BASE="http://cdimage.ubuntu.com"
 fi
 
-case $2 in
-       hppa*|ia64*|lpia*|powerpc*|sparc*)
-               PREFIX=ports/
-               ;;
-       *)
-               PREFIX=
-               ;;
-esac
+PREFIX=
 if [ "$DIST" != "$CURRENT_DIST" ]; then
        PREFIX="$DIST/$PREFIX"
 fi
@@ -102,7 +95,7 @@ case $1 in
 esac
 
 case $1 in
-       install|alternate|server|addon|serveraddon|dvd) ;;
+       install|alternate|server|addon|serveraddon)     ;;
        *)
                $HTTP || RSYNC=:
                ;;
@@ -126,7 +119,7 @@ else
                EXISTING=:
                mv "$LOCAL.iso" "$LOCAL.iso.old"
                mkdir -p "old-$2"
-               sudo mount -o loop "$LOCAL.iso.old" "old-$2"
+               sudo mount -o loop,ro "$LOCAL.iso.old" "old-$2"
        fi
        ionice -c2 -n7 jigdo-lite "$LOCAL.jigdo"
        if $EXISTING; then