bootdisk: installer-pkgs (HEAD)

[malekith]

Module name:	bootdisk
Changes by:	malekith	03/02/17 22:13:57

Modified files:
	installer-pkgs

Log message:
- always create /tmp/poldekrc
- put source = there, don't use -s option
- (preparation for additional sources)

Index: installer-pkgs
===================================================================
RCS file: /cvsroot/bootdisk/batch-installer/installer-pkgs,v
diff -d -u -r1.80 -r1.81
--- installer-pkgs	17 Dec 2002 16:57:15 -0000	1.80
+++ installer-pkgs	17 Feb 2003 21:13:56 -0000	1.81
@@ -155,31 +155,31 @@
 	export TMPDIR=/installer/tmp
 	poldek_log=/dest/installer/poldek.log
 	echo -n > $poldek_log
-	poldek_opt="--mercy --mkdir --cachedir=/dest/installer/tmp"
-	poldek_opt="$poldek_opt --log=$poldek_log"
+	poldek_opt="--mercy --mkdir --log=$poldek_log --conf=/tmp/poldekrc"
 	poldek_opt="$poldek_opt --install-dist=/dest -v --pset $pkgsfile"
 
+	echo "cachedir = /dest/installer/tmp" > /tmp/poldekrc
+
 	case "$source" in 
 	    cdrom)
 	    	if test -r ${source_mountpoint}${source_dir}/.pkgsplit.conf ; then
-		  cp ${source_mountpoint}${source_dir}/.poldekrc /tmp/poldekrc
+		  cat ${source_mountpoint}${source_dir}/.poldekrc >> /tmp/poldekrc
 		  cp ${source_mountpoint}${source_dir}/.pkgsplit.conf /tmp/pkgsplit.conf
-		  poldek_opt="$poldek_opt --conf=/tmp/poldekrc --split-conf=/tmp/pkgsplit.conf"
+		  poldek_opt="$poldek_opt --split-conf=/tmp/pkgsplit.conf"
 		else
-		  poldek_opt="$poldek_opt --noconf -s $dir/"
+		  echo "source = cdrom $dir/" >> /tmp/poldekrc
 		fi
 		;;
 	    *)
-		poldek_opt="$poldek_opt -s $dir/"
+		echo "source = $source $dir/" >> /tmp/poldekrc
 		case "$net_proxy" in
 		  "" | none )
 		    : nothing
 		    ;;
 		  * )
 		    export SNARF_PROXY="$net_proxy"
-		    echo "ftp_get       = /bin/snarf %P %D" > /tmp/poldekrc
+		    echo "ftp_get       = /bin/snarf %P %D" >> /tmp/poldekrc
 		    echo "http_get      = /bin/snarf %P %D" >> /tmp/poldekrc
-		    poldek_opt="$poldek_opt --conf=/tmp/poldekrc"
 		    ;;
 		esac
 		;;