1 files changed, 9 insertions, 18 deletions

diff --git a/old-school/menu-select b/old-school/menu-select
index 1dbd847..9b340ac 100755
--- a/old-school/menu-select
+++ b/old-school/menu-select
@@ -62,28 +62,18 @@ hwclock_to_system()
 
 case "$1" in
   boot-ram)
-    mkdir /cdrom /btrfs
-    bootwait samizdat-cdrom
-
-    losetup_layers || error
-    modprobe btrfs || error
-    btrfs device scan || error
-    uuid=$(choose_uuid) || error
-    [ "$uuid" ] || error
-
-    mount -t btrfs -o loop,subvol=ROOT UUID="$uuid" /btrfs
     memtotal=$(sed -ne 's/MemTotal: *//p' /proc/meminfo)
     ramdisk=$((1024 * ${memtotal% *} / 2))
     [ $ramdisk -ge 256 ] || ramdisk=256
     modprobe brd rd_size=$ramdisk
 
-    btrfs device add /dev/ram0 /btrfs
-    mount -o rw,remount /btrfs
-    mount -o move /btrfs /root
-    mkdir /root/cdrom
-    mount -o move /cdrom /root/cdrom
-
-    bootdone root-mounted
+    init_gpg || error
+    init_samizdat /dev/ram0 '' || {
+        umount /root/cdrom
+        umount /root/outerfs
+        umount /root
+        error
+    }
   ;;
   boot-overwrite|boot-new|boot-luks)
     dev="$2"
@@ -109,7 +99,8 @@ case "$1" in
 
     start_meter "Allocating ${megs}MB in '$loopfile' on $dev..."
 
-    if init_samizdat "$loopfile" "$megs" "$loopfile"k; then
+    if init_samizdat_blockdev "$loopfile" "$megs" "$loopfile"k &&
+            init_samizdat /dev/mapper/samizdatcrypt "$imgfile"; then
       stop_meter done.
     else
       stop_meter error!