commit everything for steve

8 files changed, 23 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 53c643b..d0dd637 100644
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@ include user.mk
 
 .PHONY: submodules build-submodules $(SUBMODULES)
 $(SUBMODULES): stack
-        @a=$$(cd $@ && git status -uno -s) && (if test -z "$$a"; then set -x; git submodule update --init $@/; fi)
+        @a=$$(cd $@ && git status -uno -s) && (if test -z "$$a"; then set -x; git submodule update --init --recursive $@/; fi)
         $(MAKE) -C $@ $(cmd)
 
 submodules: build-submodules
@@ -135,7 +135,7 @@ build-submodules: $(SUBMODULES)
 
 .PHONY: update-submodules
 update-submodules:
-        git submodule update --init
+        git submodule update --init --recursive
 
 install-submodules: cmd=install
 install-submodules: update-submodules $(INSTALL_SUBMODULES)
@@ -351,3 +351,6 @@ install-stamp: install-bin-programs samizdat-paths.sh ${compiled_programs}
         $(CP) ${initramfs_conf_files} ${instdir}${samizdat_initramfs_conf_dir}
         $(CP) ${isolinux_files} ${instdir}${samizdat_isolinux_dir}
         touch $@
+
+bootclean:
+        rm -f samizdat.disk.img boot-disk.template.img boot-disk.img
diff --git a/build-deps.control b/build-deps.control
index c6560a3..3feb347 100644
--- a/build-deps.control
+++ b/build-deps.control
@@ -3,7 +3,9 @@ Build-Depends: bridge-utils,
                build-essential,
                cryptsetup,
                devscripts,
+               eatmydata,
                equivs,
+               kpartx,
                libbz2-dev,
                libdpkg-perl,
                libgmp-dev,
@@ -12,4 +14,5 @@ Build-Depends: bridge-utils,
                libz-dev,
                parted,
                qemu-system-x86,
+               strace,
                uml-utilities
diff --git a/rootfs/samizdat-gold.yaml b/rootfs/samizdat-gold.yaml
index f91d13a..4810ac8 100644
--- a/rootfs/samizdat-gold.yaml
+++ b/rootfs/samizdat-gold.yaml
@@ -16,4 +16,6 @@ packages:
 - ../ssh_8.3p1-1_all.deb
 - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb
 - sshfs
-
+- firmware-adi
+- firmware-ivtv
+- firmware-b43legacy-installer
diff --git a/rootfs/samizdat.patch.yaml b/rootfs/samizdat.patch.yaml
index 2067801..b440cb4 100644
--- a/rootfs/samizdat.patch.yaml
+++ b/rootfs/samizdat.patch.yaml
@@ -1,5 +1,5 @@
 parent: samizdat
-seedme: 210000000
+seedme: 350000000
 apt-update: true
 binaries:
 - './samizdat-update-apt-cache.sh'
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml
index cf82ce8..4696b67 100644
--- a/rootfs/samizdat.yaml
+++ b/rootfs/samizdat.yaml
@@ -7,17 +7,18 @@ binaries:
 - cokiki
 - hosts
 packages:
-- sudo
+# - sudo
 - dbus-x11
 
 skel-files: []
 
 chroot-commands:
+#- "dpkg-statoverride"
 - "useradd u -G sudo -m -p '' -s /bin/bash"
 # - 'loginctl enable-linger u'
-- "dpkg --configure sudo"
-- "touch /var/lib/sudo/lectured/u"
-- "echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u"
+#- "dpkg --configure sudo"
+#- "touch /var/lib/sudo/lectured/u"
+- "mkdir -p /etc/sudoers.d; echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u"
 
 - "systemctl enable debug-shell"
 - "DEBIAN_FRONTEND=noninteractive apt-get -f install; true"
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}