Removing leftover url= option, this ain't gonna work this way, see fetch=.

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index a9c0f13..753fceb 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -8,7 +8,7 @@ echo "/root/lib" >> /etc/ld.so.conf
 echo "/root/usr/lib" >> /etc/ld.so.conf
 
 mountpoint="/live/image"
-ext_mountpoint="/ext_volume"
+alt_mountpoint="/media"
 LIVE_MEDIA_PATH="live"
 
 root_persistence="live-rw"
@@ -339,25 +339,6 @@ Arguments ()
                                export NOPRESEED
                                ;;
 
-                       url=*)
-                               URL_LOCATION="${ARGUMENT#url=}"
-
-                               mount -o bind /sys /root/sys
-                               mount -o bind /proc /root/proc
-                               mount -o bind /dev /root/dev
-
-                               mkdir -p /root/var/run/network
-                               [ "${NETBOOT}" ] || chroot /root dhclient eth0
-                               chroot /root wget -P /tmp "${URL_LOCATION}"
-                               [ "${NETBOOT}" ] || chroot /root ifconfig eth0 down
-
-                               umount /root/sys
-                               umount /root/proc
-                               umount /root/dev
-
-                               LOCATIONS="/tmp/$(basename ${URL_LOCATION}) ${LOCATIONS}"
-                               ;;
-
                        */*=*)
                                question="${ARGUMENT%%=*}"
                                value="${ARGUMENT#*=}"
@@ -804,8 +785,8 @@ do_httpmount ()
                                iso|squashfs|tgz|tar)
                                        if [ "${extension}" = "iso" ]
                                        then
-                                               mkdir -p "${ext_mountpoint}"
-                                               dest="${ext_mountpoint}"
+                                               mkdir -p "${alt_mountpoint}"
+                                               dest="${alt_mountpoint}"
                                        else
                                                local dest="${mountpoint}/${LIVE_MEDIA_PATH}"
                                                mount -t ramfs ram "${mountpoint}"
@@ -859,10 +840,10 @@ do_httpmount ()
 
        if [ ${rc} != 0 ]
        then
-               if [ -d "${ext_mountpoint}" ]
+               if [ -d "${alt_mountpoint}" ]
                then
-                       umount "${ext_mountpoint}"
-                       rmdir "${ext_mountpoint}"
+                       umount "${alt_mountpoint}"
+                       rmdir "${alt_mountpoint}"
                fi
                umount "${mountpoint}"
        elif [ "${webfile}"  != "FETCH" ] ; then