Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=9f5c50fff6a40388619983f0876c8b72ffb5464e

commit 9f5c50fff6a40388619983f0876c8b72ffb5464e
Author: James Buren <[email protected]>
Date:   Sun Oct 20 06:13:54 2013 -0500

try to fix iso/rootfs usage of stable repo

diff --git a/bin/create-iso b/bin/create-iso
index 88875ac..0c26c2b 100755
--- a/bin/create-iso
+++ b/bin/create-iso
@@ -63,7 +63,7 @@ if [ -n "$FVBE_ISO_PACKAGES" ]; then
MIRROR="http://ftp.frugalware.org/pub/frugalware/frugalware-current/frugalware-$FVBE_ARCH";
elif [ "$FVBE_ROOTFS_REPOSITORY" = "stable" ]; then
FDB=frugalware.fdb
-    
MIRROR="http://ftp.frugalware.org/pub/frugalware/frugalware-stable/frugalware-$FVBE_ARCH";
+    
MIRROR="http://ftp.frugalware.org/pub/frugalware/frugalware-$FVBE_ISO_RELEASE/frugalware-$FVBE_ARCH";
fi
mkdir -p $FVBE_ROOT/packages
while read line; do
diff --git a/bin/create-rootfs b/bin/create-rootfs
index 2608f54..6eb2660 100755
--- a/bin/create-rootfs
+++ b/bin/create-rootfs
@@ -11,9 +11,12 @@ fi

if [ "$FVBE_ROOTFS_REPOSITORY" = "current" ]; then
FDB=frugalware-current.fdb
+  
MIRROR="http://ftp.frugalware.org/pub/frugalware/frugalware-current/frugalware-$FVBE_ARCH";
elif [ "$FVBE_ROOTFS_REPOSITORY" = "stable" ]; then
FDB=frugalware.fdb
+  
MIRROR="http://ftp.frugalware.org/pub/frugalware/frugalware-$FVBE_ISO_RELEASE/frugalware-$FVBE_ARCH";
fi
+REPO=${FDB/.fdb/}

# Cleanup from a previous run.
cp /proc/mounts mounts
@@ -48,8 +51,8 @@ mount -o bind /var/cache/pacman-g2 
$FVBE_ROOT/var/cache/pacman-g2
cat > pacman-g2.conf << EOF
[options]
LogFile = /var/log/pacman-g2.log
-[frugalware$(test "$FVBE_ROOTFS_REPOSITORY" = "current" -o 
"$FVBE_ROOTFS_REPOSITORY" = "testing" && echo -n "-$FVBE_ROOTFS_REPOSITORY")]
-Server = http://ftp.frugalware.org/pub/frugalware/frugalware$(test 
"$FVBE_ROOTFS_REPOSITORY" = "current" -o "$FVBE_ROOTFS_REPOSITORY" = "testing" 
&& echo -n "-$FVBE_ROOTFS_REPOSITORY")/frugalware-$FVBE_ARCH
+[$REPO]
+Server = $MIRROR
EOF

# Setup root directory with pacman-g2.
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to