Changeset 535

Timestamp:

05/16/08 18:04:25 (7 months ago)

Author:

free

Message:

Remove cdrom APT sources

Location:

cdd-utils/trunk

Files:

• debian/changelog (modified) (1 diff)
• lib/system.sh (modified) (1 diff)

cdd-utils/trunk/debian/changelog

@@ -15 +15 @@
   * Fix ownership of /etc and /usr, they must be owned by root not bin
   * Support custom gdm theme
+  * Remove cdrom APT sources
 
  -- Free Ekanayaka <free@64studio.com>  Thu, 08 May 2008 21:55:32 +0200

cdd-utils/trunk/lib/system.sh

@@ -71 +71 @@
         echo "deb http://apt.64studio.com/$suite/stable $mother main" > $list
     fi
-    # Comment the cdrom source, we install from the internet
+    # Remove the cdrom sources, we install from the internet
     if [ -e /etc/apt/sources.list ]; then
-        sed -i -e 's/^\(deb cdrom:.*\)/#\1/g' /etc/apt/sources.list
+        sed -i -e '/^.*deb cdrom:.*/ d' /etc/apt/sources.list
     fi
     if ! [ -e /proc/net/route ]; then
         mount /proc
     fi
+    if is_ubuntu; then return; fi # We are done
     if route -n | grep -q ^0.0.0.0; then
         apt-get update > /dev/null 2>&1