From 85aa0fb94d870aae7e793f44816fd1652042b1bb Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Fri, 22 Apr 2016 13:48:17 -0400
Subject: remove some cruft

---
 old-school/init.functions |  2 +-
 old-school/lvm-create.sh  | 30 ------------------------------
 old-school/menu-select    |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)

(limited to 'old-school')

diff --git a/old-school/init.functions b/old-school/init.functions
index 3b5027b..7209b04 100644
--- a/old-school/init.functions
+++ b/old-school/init.functions
@@ -218,7 +218,7 @@ remove_squashfs_mistakes()
   rm -rf "$rootmnt"/etc/samizdat/samizdat-receive-hooks
   rm -f "$rootmnt"/etc/adjtime
 }
-patchroot()
+patchroot_UNUSED()
 {
   test -e "$rootmnt"/samizdat-filesystem-is-new || return
   echo Patching livecd root -- $(date) >> /dev/tty7
diff --git a/old-school/lvm-create.sh b/old-school/lvm-create.sh
index 44873ef..e6f4eea 100644
--- a/old-school/lvm-create.sh
+++ b/old-school/lvm-create.sh
@@ -13,20 +13,6 @@ luks_secret()
   case $parms in *x*) set -x; set -x ;; esac
 }
 
-mount_squashfs_images()
-{
-  modprobe squashfs
-  find_squashfs_root | while read dirname basename; do
-    [ -n "$dirname" -a -n "$basename" ] || continue
-    local f="$dirname/$basename"
-    [ -f "$f" ] || return
-    local name=${basename%.squashfs}
-    mkdir -p /squashes/$name
-    mount -r -o loop "$f" /squashes/$name
-  done
-  bootdone squashfs-root
-}
-
 floor4()
 {
   # Negatives round up, but aren't used.
@@ -40,22 +26,6 @@ ceil4()
   printf '%d\n' "$x"
 }
 
-mount_aufs_branches()
-{
-  local new="$1"
-
-  mkdir /overlay
-  mount -t${ROOT_FS_TYPE} /dev/mapper/samizdat-root /overlay || return
-
-  if [ "$new" ]; then
-    cp -a /gpg /overlay || return
-    touch /overlay/samizdat-filesystem-is-new
-  fi
-  bootdone rw-overlay
-  mirror_cdrom || return
-  mount_squashfs_images || return
-}
-
 init_samizdat()
 {
   local imgfile="$1" megs="$2" keyfile="$3" dev
diff --git a/old-school/menu-select b/old-school/menu-select
index 5f0848f..55360b6 100755
--- a/old-school/menu-select
+++ b/old-school/menu-select
@@ -65,7 +65,7 @@ case "$1" in
     mkdir /cdrom /btrfs
     bootwait samizdat-cdrom
     mount -t btrfs -o loop,subvol=ROOT /cdrom/live/filesystem.btrfs /btrfs
-    modprobe brd rd_size=$((256 * 1024 * 2))
+    modprobe brd rd_size=$((256 * 1024 * 2)) # TODO: choose intelligently
     btrfs device add /dev/ram0 /btrfs
     mount -o rw,remount /btrfs
     mount -o move /btrfs /root
-- 
cgit v1.2.3