experimental grub simplification

3 files changed, 10 insertions, 24 deletions

diff --git a/partitions/part3.conf b/partitions/part3.conf
index 63d44ea..0692e76 100644
--- a/partitions/part3.conf
+++ b/partitions/part3.conf
@@ -1,4 +1,4 @@
 name=samizdat-boot
 type=boot
-allocation=200M
+allocation=2G
 rebuild=always
diff --git a/src/partvi b/src/partvi
index 3b622ed..0db57cb 100755
--- a/src/partvi
+++ b/src/partvi
@@ -1,26 +1,5 @@
 #!/bin/bash
 
-add_initrd()
-{
-    initrd_suffix=.samizdat
-    $sudo mkdir -p "$mnt"/linux
-    $sudo rsync  -aL --info=STATS "${1}vmlinuz${2}" "$mnt"/linux/vmlinuz
-    $sudo rsync  -aL --info=STATS "${1}initrd.img${2}${2:+$initrd_suffix}" "$mnt"/linux/initrd.img
-}
-
-add_grub_cfg()
-{
-    $sudo mkdir -p "$mnt"/grub
-    $sudo cp -aL "$GRUB_CONFIG" "$mnt"/grub
-}
-
-install_boot_dir()
-{
-    local mnt="$1"
-    add_grub_cfg
-    add_initrd "$samizdat_linux_dir"/ "${version_suffix}"
-}
-
 msg() { printf '%s: %s: %s\n' "$0" "$1" "$2" >&2; }
 die() { msg Error "${*:-Exiting on fatal error.}"; exit 1; }
 warn() { msg Warning "${*:-Something is wrong.}"; }
@@ -315,7 +294,14 @@ copy_data_to_mounted_target_filesystems()
     case "$type" in
         boot)
             BOOT_DIR=$mnt
-            install_boot_dir "$mnt"
+            $sudo rsync -a --info=STATS /boot/ "$mnt"/
+            while mountpoint -q /boot
+            do
+                $sudo umount /boot
+            done
+            $sudo mount --bind "$mnt" /boot
+            $sudo update-grub
+            $sudo umount /boot
             ;;
         samizdat-keys)
             $sudo rsync  -a  --info=STATS  "$GPG_INPUT_DIR"/ "$mnt"/gnupghome/
diff --git a/src/samizdat-paths.in b/src/samizdat-paths.in
index c1773fe..c3037d3 100644
--- a/src/samizdat-paths.in
+++ b/src/samizdat-paths.in
@@ -8,6 +8,6 @@ samizdat_bindir=PREFIX/bin
       samizdat_isolinux_dir=${samizdat_libdir}/isolinux
          samizdat_linux_dir=${samizdat_libdir}/isolinux/linux
       samizdat_grub_efi_dir=${samizdat_libdir}/grub-efi
-samizdat_initramfs_conf_dir=${samizdat_libdir}/initramfs-tools
+samizdat_initramfs_conf_dir=/etc/initramfs-tools
 
 samizdat_iso_dir=.