summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2016-04-22 13:48:17 -0400
committerAndrew Cady <d@jerkface.net>2016-04-22 18:50:58 -0400
commit85aa0fb94d870aae7e793f44816fd1652042b1bb (patch)
treea15106ddc2d1318a6544d71f304dfea0da9423b9
parentf609b54511e04770950c9fbf6407977828f4d426 (diff)
remove some cruft
-rw-r--r--old-school/init.functions2
-rw-r--r--old-school/lvm-create.sh30
-rwxr-xr-xold-school/menu-select2
3 files changed, 2 insertions, 32 deletions
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()
218 rm -rf "$rootmnt"/etc/samizdat/samizdat-receive-hooks 218 rm -rf "$rootmnt"/etc/samizdat/samizdat-receive-hooks
219 rm -f "$rootmnt"/etc/adjtime 219 rm -f "$rootmnt"/etc/adjtime
220} 220}
221patchroot() 221patchroot_UNUSED()
222{ 222{
223 test -e "$rootmnt"/samizdat-filesystem-is-new || return 223 test -e "$rootmnt"/samizdat-filesystem-is-new || return
224 echo Patching livecd root -- $(date) >> /dev/tty7 224 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()
13 case $parms in *x*) set -x; set -x ;; esac 13 case $parms in *x*) set -x; set -x ;; esac
14} 14}
15 15
16mount_squashfs_images()
17{
18 modprobe squashfs
19 find_squashfs_root | while read dirname basename; do
20 [ -n "$dirname" -a -n "$basename" ] || continue
21 local f="$dirname/$basename"
22 [ -f "$f" ] || return
23 local name=${basename%.squashfs}
24 mkdir -p /squashes/$name
25 mount -r -o loop "$f" /squashes/$name
26 done
27 bootdone squashfs-root
28}
29
30floor4() 16floor4()
31{ 17{
32 # Negatives round up, but aren't used. 18 # Negatives round up, but aren't used.
@@ -40,22 +26,6 @@ ceil4()
40 printf '%d\n' "$x" 26 printf '%d\n' "$x"
41} 27}
42 28
43mount_aufs_branches()
44{
45 local new="$1"
46
47 mkdir /overlay
48 mount -t${ROOT_FS_TYPE} /dev/mapper/samizdat-root /overlay || return
49
50 if [ "$new" ]; then
51 cp -a /gpg /overlay || return
52 touch /overlay/samizdat-filesystem-is-new
53 fi
54 bootdone rw-overlay
55 mirror_cdrom || return
56 mount_squashfs_images || return
57}
58
59init_samizdat() 29init_samizdat()
60{ 30{
61 local imgfile="$1" megs="$2" keyfile="$3" dev 31 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
65 mkdir /cdrom /btrfs 65 mkdir /cdrom /btrfs
66 bootwait samizdat-cdrom 66 bootwait samizdat-cdrom
67 mount -t btrfs -o loop,subvol=ROOT /cdrom/live/filesystem.btrfs /btrfs 67 mount -t btrfs -o loop,subvol=ROOT /cdrom/live/filesystem.btrfs /btrfs
68 modprobe brd rd_size=$((256 * 1024 * 2)) 68 modprobe brd rd_size=$((256 * 1024 * 2)) # TODO: choose intelligently
69 btrfs device add /dev/ram0 /btrfs 69 btrfs device add /dev/ram0 /btrfs
70 mount -o rw,remount /btrfs 70 mount -o rw,remount /btrfs
71 mount -o move /btrfs /root 71 mount -o move /btrfs /root