]> git.pld-linux.org Git - projects/pld-builder.new.git/commitdiff
Replace chroot_name to chroot_type
authorKacper Kornet <draenog@pld-linux.org>
Fri, 30 Nov 2012 19:48:26 +0000 (19:48 +0000)
committerKacper Kornet <draenog@pld-linux.org>
Fri, 30 Nov 2012 19:49:40 +0000 (19:49 +0000)
The setting of chroot_name was removed in 9d637 but it was still used in
few places. Replace it with chroot_type there.

admin/install-chroot.sh

index f8ec492fef06698c2f3ebb8ed7fb7c763209b4ea..538d5006f541e58f946a18c4638cba1f26c67c81 100755 (executable)
@@ -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
@@ -163,12 +163,12 @@ rpm --root $chroot_dir --initdb
 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 'PLD $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
This page took 0.114593 seconds and 4 git commands to generate.