Browse Source

add unlocked git to initramfs

Émile Morel 9 years ago
parent
commit
4d178c78da
2 changed files with 4 additions and 3 deletions
  1. 1 0
      olinux/create_arm_debootstrap.sh
  2. 3 3
      olinux/create_device.sh

+ 1 - 0
olinux/create_arm_debootstrap.sh

@@ -278,6 +278,7 @@ EOT
       mkdir -p $TARGET_DIR/etc/initramfs-tools/root/www/cgi-bin
       cp /olinux/script/initramfs/index.html $TARGET_DIR/etc/initramfs-tools/root/www/
       cp /olinux/script/initramfs/unicorn.gif $TARGET_DIR/etc/initramfs-tools/root/www/
+      cp /olinux/script/initramfs/unlocked.gif $TARGET_DIR/etc/initramfs-tools/root/www/
       cp /olinux/script/initramfs/post.sh $TARGET_DIR/etc/initramfs-tools/root/www/cgi-bin/
       chroot_deb $TARGET_DIR "update-initramfs -u -k all"
     fi

+ 3 - 3
olinux/create_device.sh

@@ -159,12 +159,12 @@ if [ "${TYPE}" = "loop" ] ; then
   umount $MNT1
   losetup -d $DEVICE
 else
-  if [ -n $ENCRYPT ] ; then
-    umount $MNT1/boot
+  if [ -z $ENCRYPT ] ; then
     umount $MNT1
-    cryptsetup luksClose olinux 
   else
+    umount $MNT1/boot
     umount $MNT1
+    cryptsetup luksClose olinux 
   fi
   if [ `file ${DEB_DIR} | grep 'DOS/MBR'` ] ; then
     umount $MNT2