[projects/pld-builder.new/rpm5: 1/3] Replace chroot_name to chroot_type
draenog
draenog at pld-linux.org
Fri Nov 30 21:41:37 CET 2012
commit 2e3cadc7319bdd83358ef159da1f1067cfd28160
Author: Kacper Kornet <draenog at pld-linux.org>
Date: Fri Nov 30 19:48:26 2012 +0000
Replace chroot_name to chroot_type
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 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/admin/install-chroot.sh b/admin/install-chroot.sh
index f8ec492..538d500 100755
--- a/admin/install-chroot.sh
+++ b/admin/install-chroot.sh
@@ -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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/2140bd2850b3f0fdbfb11edc328bad3d853601df
More information about the pld-cvs-commit
mailing list