X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=prep.sh;h=8c7dc013ce79f67b800fe3954b632a2fd580875f;hb=refs%2Fheads%2Fmaster;hp=c6ac2940d2bc0b6f8f4eefe41861c753e8801b98;hpb=02bba449b6768a757bfef779172d8a1c88571fb5;p=bootcd.git

diff --git a/prep.sh b/prep.sh
index c6ac294..8c7dc01 100755
--- a/prep.sh
+++ b/prep.sh
@@ -48,9 +48,14 @@ echo "* Creating fedora root image"
 pl_root_makedevs $bootcd
 pkgsfile=$(pl_locateDistroFile ../build/ $pldistro bootcd.pkgs) 
 pl_root_mkfedora $bootcd $pldistro $pkgsfile
+echo "** DBG1 - contents of /boot after mkfedora"
+ls -R $bootcd/boot
 pl_root_tune_image $bootcd
+echo "** DBG2 - contents of /boot after tune_image"
+ls -R $bootcd/boot
 
 # Add site_admin console account to BootCD: with root priv, and self passwd
+echo "* Creating site_admin account"
 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
 
@@ -126,11 +131,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
+    if [ -f "$kernel" ] ; then
+        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
 
@@ -159,10 +165,10 @@ done
 # second chance if first approach would not work
 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
+    if [ -f "$kernel" ] ; then
+        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