X-Git-Url: https://git.tld-linux.org/?p=tld-builder.git;a=blobdiff_plain;f=admin%2Finstall-chroot.sh;h=306780dfcc578cc16adaafaff075b8c83756abea;hp=f8ec492fef06698c2f3ebb8ed7fb7c763209b4ea;hb=b999f53d4bf5d44586ecf028876e8bc20b5fd2ce;hpb=37463eaa22f48f5fecbb90e69ef67a69e0bf9788

diff --git a/admin/install-chroot.sh b/admin/install-chroot.sh
index f8ec492..306780d 100755
--- a/admin/install-chroot.sh
+++ b/admin/install-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-DIST="th"
-DISTTAG="PLD 3.0 (Th)"
+DIST="ti"
+DISTTAG="TLD Linux"
 
 die () {
   echo "$0: $*" 1>&2
@@ -21,9 +21,9 @@ EOF
 }
 
 default_config () {
-  builder_pkgs="rpm-build poldek pwdutils net-tools which rpm-perlprov rpm-php-pearprov rpm-pythonprov bash vim"
+  builder_pkgs="rpm-build poldek pwdutils net-tools which rpm-perlprov rpm-php-pearprov rpm-pythonprov bash vim util-linux"
   builder_uid=`id -u`
-  dist_url="ftp://ftp.$DIST.pld-linux.org"
+  dist_url="ftp://ftp.tld-linux.org"
 
   case "$chroot_type" in
   src )
@@ -67,13 +67,13 @@ EOF
 [source]
 name=main
 type=pndir
-path=$dist_url/dists/$DIST/PLD/$arch/RPMS/
+path=$dist_url/TLD/stable/main/$arch/RPMS/
 pri=6
 
 [source]
 name=main
 type=pndir
-path=$dist_url/dists/$DIST/PLD/noarch/RPMS/
+path=$dist_url/TLD/stable/main/noarch/RPMS/
 pri=6
 
 EOF
@@ -104,13 +104,13 @@ set -x
 rm -rf rpm
 mkdir rpm
 cd rpm
-git clone $git_server/rpm-build-tools rpm-build-tools
+git clone $git_server/packages/rpm-build-tools rpm-build-tools
 ./rpm-build-tools/builder.sh --init-rpm-dir
-echo "%packager       PLD bug tracking system ( http://bugs.pld-linux.org/ )">~/.rpmmacros
-echo "%vendor         PLD">>~/.rpmmacros
+echo "%packager       TLD bug tracking system ( http://bugs.tld-linux.org/ )">~/.rpmmacros
+echo "%vendor         TLD">>~/.rpmmacros
 echo "%distribution   $DISTTAG">>~/.rpmmacros
 git config --global user.name $git_user
-git config --global user.email ${git_user}@pld-linux.org
+git config --global user.email ${git_user}@tld-linux.org
 EOF
   chb "sh" < install-specs
   rm install-specs
@@ -124,8 +124,8 @@ rm -rf rpm
 mkdir rpm
 cd rpm
 mkdir SPECS SOURCES SRPMS RPMS BUILD
-echo "%packager       PLD bug tracking system ( http://bugs.pld-linux.org/ )">~/.rpmmacros
-echo "%vendor         PLD">>~/.rpmmacros
+echo "%packager       TLD bug tracking system ( http://bugs.tld-linux.org/ )">~/.rpmmacros
+echo "%vendor         TLD">>~/.rpmmacros
 echo "%distribution   $DISTTAG">>~/.rpmmacros
 EOF
   chb "sh" < install-bt
@@ -151,7 +151,7 @@ cachedir = $chroot_dir/spools/poldek
 keep_downloads = no
 EOF
 
-cat > install-$chroot_name.sh <<EOF
+cat > install-$chroot_type.sh <<EOF
 #!/bin/sh
 set -x
 cd $PWD
@@ -159,16 +159,16 @@ rm -rf $chroot_dir
 mkdir -p $chroot_dir/spools/poldek
 mkdir $chroot_dir/dev
 mknod $chroot_dir/dev/null -m 666 c 1 3
-rpm --root $chroot_dir --initdb
+rpm --root $chroot_dir -qa
 poldek --conf poldek.conf --root $chroot_dir --ask -i\
 	$builder_pkgs $builder_arch_pkgs
 EOF
-chmod 755 install-$chroot_name.sh
+chmod 755 install-$chroot_type.sh
 
 echo "About to remove '$chroot_dir' and install it again, using"
-echo "install-$chroot_name.sh:"
+echo "install-$chroot_type.sh:"
 echo 
-cat install-$chroot_name.sh
+cat install-$chroot_type.sh
 echo 
 cat <<EOF
 what to do?
@@ -182,7 +182,7 @@ case "$ans" in
   r )
     ;;
   s )
-    sudo ./install-$chroot_name.sh
+    sudo ./install-$chroot_type.sh
     ;;
   * )
     echo "bye"
@@ -200,7 +200,7 @@ cachedir = /spools/poldek
 keep_downloads = no
 EOF
 
-chr "useradd -u "$builder_uid" -c 'PLD $chroot_name builder' -d /home/users/builder -m -g users -s /bin/sh builder"
+chr "useradd -u "$builder_uid" -c 'TLD $chroot_type builder' -d /home/users/builder -m -g users -s /bin/sh builder"
 chr "cat > /etc/resolv.conf" < /etc/resolv.conf
 chr "cat > /etc/mtab" < /dev/null
 chr "mkdir -p /spools/ready/" < /dev/null