turns out that [ -f ] returns true in bash !

[bootcd.git] / prep.sh

diff --git a/prep.sh b/prep.sh
index 05a7a69..c9308da 100755 (executable)
--- 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)
@@ -60,7 +60,7 @@ install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac
 
 # Install initscripts
 echo "* Installing initscripts"
-for file in pl_functions pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot pl_wrapper ; do
+for file in pl_functions pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot ; do
     sed -i -e "s,@PLDISTRO@,$pldistro,g" -e "s,@FCDISTRO@,$fcdistro,g" initscripts/$file
     install -D -m 755 initscripts/$file $bootcd/etc/init.d/$file
 done
@@ -98,11 +98,20 @@ if [ -d $bootcd/etc/systemd/system ] ; then
     for file in pl_boot.service pl_boot.target ; do
         install -D -m 644 systemd/$file $bootcd/etc/systemd/system
     done
-    echo "* Enabling getty on tty2"
+    echo "* Configuration BootCD to start up pl_boot"
+    # first attempt was to totally replace everything with pl_boot.target
+    # this however leads to physical f21 nodes not starting up properly
+    # because biosdevname is not properly honored and so pl_netinit gets confused
     # select pl_boot target this way instead of using kargs, as kargs apply to kexec boot as well
-    ln -sf /etc/systemd/system/pl_boot.target $bootcd/etc/systemd/system/default.target
-    [ -d $bootcd/etc/systemd/system/pl_boot.target.wants ] || mkdir -p $bootcd/etc/systemd/system/pl_boot.target.wants
-    ln -sf /usr/lib/systemd/system/getty@.service $bootcd/etc/systemd/system/pl_boot.target.wants/getty@tty2.service
+    # ln -sf /etc/systemd/system/pl_boot.target $bootcd/etc/systemd/system/default.target
+    #[ -d $bootcd/etc/systemd/system/pl_boot.target.wants ] || mkdir -p $bootcd/etc/systemd/system/pl_boot.target.wants
+    # Let's try another approach completely
+    # xxx if that worked we would not need pl_boot.target at all
+    mkdir -p $bootcd/etc/systemd/system/default.target.wants
+    ln -sf /etc/systemd/system/pl_boot.service $bootcd/etc/systemd/system/default.target.wants
+    echo "* Enabling getty on tty2"
+    #ln -sf /usr/lib/systemd/system/getty@.service $bootcd/etc/systemd/system/pl_boot.target.wants/getty@tty2.service
+    ln -sf /usr/lib/systemd/system/getty@.service $bootcd/etc/systemd/system/default.target.wants/getty@tty2.service
 fi
 
 # Install fallback node configuration file
@@ -117,12 +126,52 @@ 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
+    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
 
+# patch - Thierry - dec. 2015
+# somehow we see this good-old code produce a bootcd without a /kernel
+# this is odd because as far as rpm is concerned, the name should not have changed
+# anyways, at this point, here's what can be found in /boot
+# [root@2015-12-07--f23-bcd boot]# pwd
+# /build/BUILD/bootcd-lxc-f23-x86_64-5.3/bootcd/build/bootcd/boot
+# [root@2015-12-07--f23-bcd boot]# ls -R
+# .:
+# 8adf0b93a7f44be69499d21fa18ab5b8  loader
+# 
+# ./8adf0b93a7f44be69499d21fa18ab5b8:
+# 4.2.6-301.fc23.x86_64
+# 
+# ./8adf0b93a7f44be69499d21fa18ab5b8/4.2.6-301.fc23.x86_64:
+# initrd  linux
+# 
+# ./loader:
+# entries
+# 
+# ./loader/entries:
+# 8adf0b93a7f44be69499d21fa18ab5b8-4.2.6-301.fc23.x86_64.conf
+
+# second chance if first approach would not work
+if [ ! -f $isofs/kernel ] ; then
+    kernel=$(find $bootcd/boot -name linux)
+    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
+
+if [ ! -f $isofs/kernel ] ; then
+    echo "* BootCD prep.sh : FATAL: could not locate kernel - exiting"
+    exit 1
+fi
+
 # Don't need /boot anymore
 rm -rf $bootcd/boot