X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-iank;h=1234474396cab62da1f83b97e1c97b031b852636;hp=9f0c56e19acff9db9037a048abdd01c125564950;hb=78a1427fc167ccee73d448054a9c40c19d737ed3;hpb=19fcc3931853969ed5aa97897795557d324cae39

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index 9f0c56e..1234474 100755
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -60,7 +60,16 @@ fcopy -riBM /etc/apt
 sleep 1
 f=$FAI_ROOT/var/cache/apt/pkgcache.bin
 if [[ ! -r $f ]] || (( $(( $(date +%s) - $(stat -c %Y $f ) )) > 60*60*2 )); then
-  $ROOTCMD apt-get update
+  i=0
+  while fuser $FAI_ROOT/var/lib/dpkg/lock &>/dev/null; do
+    sleep 1
+    i=$(( i+1 ))
+    if (( i > 300 )); then
+      echo "error: timed out waiting for /var/lib/dpkg/lock" >&2
+      exit 1
+    fi
+    $ROOTCMD apt-get update
+  done
 fi
 
 
@@ -108,13 +117,17 @@ EOF
 if [[ $FAI_ACTION != dirinstall ]]; then
 
 
+  # luks options, see man systemd-cryptsetup-generator
+  # all i know is that with luks.crypttab=no, swap still timed out on boot.
+  # and with rd.luks.crypttab=no, it works.
+  cmdline="rd.luks.crypttab=no console=ttyS0"
   if ifclass LINODE; then
     speed=19200
-    # luks.crypttab=no see man systemd-cryptsetup-generator
-    cmdline="luks.crypttab=no console=ttyS0,${speed}n8"
+    cmdline+=",${speed}n8"
+    cmdline="rd.luks.crypttab=no console=ttyS0,${speed}n8"
   else
     speed=115200
-    cmdline="luks.crypttab=no console=ttyS0,${speed} console=tty0"
+    cmdline+=",${speed}n8 console=tty0"
   fi
 
   cat >$FAI_ROOT/etc/grub.d/40_custom <<EOF
@@ -151,7 +164,7 @@ sed -i '/^ *GRUB_HIDDEN_TIMEOUT/d' /etc/default/grub
 update-grub2
 EOF
 
-  if [[ ! FAI_WRAPPER ]]; then
+  if [[ ! $FAI_WRAPPER ]]; then
     chroot $FAI_ROOT bash <<EOF
 # Just include all of them for now incase we are creating
 # an install for a different machine.. in distro-begin, we