X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=prep.sh;h=4b851de3ff8aa661c165daf9b2b6448005f5a16a;hb=1d27d76a69c0a26d85750e367d01e3a87be97295;hp=1765934b512c5bb57428c90336c2a09d39141798;hpb=f7518050cb637ff55750717d226f5118dd58819c;p=bootcd.git

diff --git a/prep.sh b/prep.sh
index 1765934..4b851de 100755
--- a/prep.sh
+++ b/prep.sh
@@ -51,7 +51,7 @@ pl_root_mkfedora $bootcd $pldistro $pkgsfile
 pl_root_tune_image $bootcd
 
 # Add site_admin console account to BootCD: with root priv, and self passwd
-CRYPT_SA_PASSWORD=$(python -c "import crypt, random, string; salt = [random.choice(string.letters + string.digits + \"./\") for i in range(0,8)] ; print crypt.crypt('site_admin', '\$1\$' + \"\".join(salt) + '\$')")
+CRYPT_SA_PASSWORD=$(python3 -c "import crypt, random, string; salt = [random.choice(string.ascii_letters + string.digits + \"./\") for i in range(0,8)] ; print(crypt.crypt('site_admin', '\$1\$' + \"\".join(salt) + '\$'))")
 chroot ${bootcd} /usr/sbin/useradd -p "$CRYPT_SA_PASSWORD" -o -g 0 -u 0 -m site_admin
 
 # Install ipnmac (for SuperMicro machines with IPMI)
@@ -126,11 +126,12 @@ isofs=$PWD/build/isofs
 install -d -m 755 $isofs
 
 # Copy the kernel out
+echo "* BootCD - locating kernel"
 for kernel in $bootcd/boot/vmlinuz-* ; do
     if [ -f $kernel ] ; then
-	install -D -m 644 $kernel $isofs/kernel
-	echo "* BootCD kernel (1) created from $kernel"
-	echo "* kernel created (1) from $kernel" > $isofs/kernel.from
+        echo "* BootCD kernel (1) creating from $kernel"
+        echo "* kernel created (1) from $kernel" > $isofs/kernel.from
+        install -D -m 644 $kernel $isofs/kernel
     fi
 done
 
@@ -160,9 +161,9 @@ done
 if [ ! -f $isofs/kernel ] ; then
     kernel=$(find $bootcd/boot -name linux)
     if [ -f $kernel ] ; then
-	install -D -m 644 $kernel $isofs/kernel
-	echo "* BootCD kernel (2) created from $kernel"
-	echo "* kernel created (2) from $kernel" > $isofs/kernel.from
+        echo "* BootCD kernel (2) creating from $kernel"
+        echo "* kernel created (2) from $kernel" > $isofs/kernel.from
+        install -D -m 644 $kernel $isofs/kernel
     fi
 fi