commit everything for steve

3 files changed, 6 insertions, 9 deletions

diff --git a/src/initrd.sh b/src/initrd.sh
index e363c83..2ec278d 100755
--- a/src/initrd.sh
+++ b/src/initrd.sh
@@ -11,7 +11,6 @@ initrd=${samizdat_linux_dir}/initrd.img
 vmlinuz=${samizdat_linux_dir}/vmlinuz
 
 conf_dir=$samizdat_initramfs_conf_dir
-apt_dependencies=$samizdat_initrd_files_dir/initrd-dependencies.txt
 
 get_kernel_version()
 {
@@ -44,9 +43,6 @@ force_rebuild()
 
 rebuild()
 {
-    [ ! -f "$apt_dependencies" ] ||
-        sudo apt-get install -q=10 --no-upgrade -y $(cat "$apt_dependencies")
-
     set -ex
     cp -f /boot/vmlinuz-"${kernel_version}" "$vmlinuz"
     /usr/sbin/mkinitramfs -d "$conf_dir" -o "$initrd" "${kernel_version}" || force_rebuild
diff --git a/src/mkinitramfs-samizdat b/src/mkinitramfs-samizdat
index 4fc6866..566389e 100755
--- a/src/mkinitramfs-samizdat
+++ b/src/mkinitramfs-samizdat
@@ -5,15 +5,16 @@ f()
     sudo /usr/sbin/mkinitramfs \
          -d /usr/local/lib/samizdat-rhizome/initramfs-tools/ \
          -o "/boot/initrd.img-$1.samizdat" \
-         -k "$1"
+         -k "$1" || return
+    sudo ln -sf "initrd.img-$1.samizdat" /boot/initrd.img
 }
 
 if [ "$1" ]
 then
-  f "$1"
+  f "$1" || exit
+  sudo ln -sf "vmlinuz-$1" /boot/vmlinuz
 else
   l=$(readlink /boot/vmlinuz)
   v=${l#vmlinuz-}
   f "$v"
-  ln -sf "initrd.img-$v.samizdat" /boot/initrd.img
 fi
diff --git a/src/parted-usb.sh b/src/parted-usb.sh
index d6d0873..919aae2 100755
--- a/src/parted-usb.sh
+++ b/src/parted-usb.sh
@@ -217,9 +217,9 @@ samizdat_linux_dir=/boot
 
 
 
-#ROOTFS=rootfs/samizdat.seed.btrfs
+ROOTFS=rootfs/samizdat-gold.seed.btrfs
 #PATCHFS=rootfs/samizdat.patch.btrfs
-#GPG_INPUT_DIR=/root/.gnupg
+GPG_INPUT_DIR=/root/.gnupg
 
 : ${GPG_INPUT_DIR:=/cdrom/gnupghome}
 : ${GRUB_CONFIG:=conf/grub.cfg}