Changeset 236 for quickinst/quickinst

Timestamp:

04.12.2008 23:13:41 (20 months ago)

Author:

henning

Message:

quickinst:
avoid link loop on existing pacman cache in new root
not only use stated mirror at pacman bootstrap

File:

• quickinst/quickinst (modified) (3 diffs)

quickinst/quickinst

@@ -79 +79 @@
         mkdir -p $(dirname $cache)
         mkdir -p $target/var/lib/pacman
-        ln -s /var/cache/pacman/pkg $cache
+        [ ! -d $cache ] &&
+                ln -s /var/cache/pacman/pkg $cache
 } || {
         mkdir -p $cache
@@ -122 +123 @@
         cp /etc/resolv.conf etc/resolv.conf
 
+        echo -e "[core]\nServer = $source" > /tmp/pacman.conf
+
         mkdir sys proc dev 2> /dev/null
 
         [ $on_arch ] && {
-                pacman --noconfirm -r $target -Sfy base $addpkgs || exit 1
+                pacman --noconfirm --config /tmp/pacman.conf \
+                        -r $target -Sfy base $addpkgs || exit 1
         } || {
                 mount -o bind /dev dev
@@ -132 +136 @@
 
                 chroot $target /bin/bash <<EOF
-                        pacman --noconfirm -Sfy base $addpkgs || exit 1
+                        pacman --noconfirm --config /tmp/pacman.conf \
+                                -Sfy base $addpkgs || exit 1
 EOF
         }