summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rwxr-xr-xinitrd.sh4
-rw-r--r--isolinux/advanced.cfg7
-rw-r--r--isolinux/install.cfg11
-rw-r--r--isolinux/isolinux.cfg8
-rw-r--r--isolinux/live.cfg12
-rw-r--r--isolinux/menu.cfg17
-rw-r--r--isolinux/pxelinux.cfg/default8
-rw-r--r--isolinux/splash.pngbin99459 -> 0 bytes
-rw-r--r--isolinux/stdmenu.cfg15
-rwxr-xr-xold-school/grok-block2
-rw-r--r--old-school/lvm-create.sh5
-rwxr-xr-xqemu.sh4
-rwxr-xr-xxorriso.sh23
14 files changed, 24 insertions, 96 deletions
diff --git a/.gitignore b/.gitignore
index d4b44b5..a84ebf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@ debian-live-8.4.0-amd64-gnome-desktop.disk
2debian-live-8.4.0-amd64-gnome-desktop.iso 2debian-live-8.4.0-amd64-gnome-desktop.iso
3boot 3boot
4var 4var
5isolinux/live/initrd.img 5isolinux/linux/initrd.img
6isolinux/live/vmlinuz 6isolinux/linux/vmlinuz
7gnupghome 7gnupghome
8secrets 8secrets
diff --git a/initrd.sh b/initrd.sh
index 1eca9bb..0cc6bb3 100755
--- a/initrd.sh
+++ b/initrd.sh
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3initrd=isolinux/live/initrd.img 3initrd=isolinux/linux/initrd.img
4vmlinuz=isolinux/live/vmlinuz 4vmlinuz=isolinux/linux/vmlinuz
5 5
6version=$(uname -r) 6version=$(uname -r)
7conf_dir=initramfs-tools 7conf_dir=initramfs-tools
diff --git a/isolinux/advanced.cfg b/isolinux/advanced.cfg
deleted file mode 100644
index 373451a..0000000
--- a/isolinux/advanced.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
1label hdt
2 menu label ^Hardware Detection Tool (HDT)
3 com32 hdt.c32
4
5label memtest
6 menu label ^Memory Diagnostic Tool (memtest86+)
7 linux /live/memtest
diff --git a/isolinux/install.cfg b/isolinux/install.cfg
deleted file mode 100644
index 23fcdb8..0000000
--- a/isolinux/install.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
1label install
2 menu label ^Install
3 linux /install/vmlinuz
4 initrd /install/initrd.gz
5 append vga=788 --- quiet
6
7label installgui
8 menu label ^Graphical install
9 linux /install/gtk/vmlinuz
10 initrd /install/gtk/initrd.gz
11 append video=vesa:ywrap,mtrr vga=788 --- quiet
diff --git a/isolinux/isolinux.cfg b/isolinux/isolinux.cfg
index ae49ae2..3cb8f33 100644
--- a/isolinux/isolinux.cfg
+++ b/isolinux/isolinux.cfg
@@ -1,5 +1,5 @@
1default live-amd64 1default samizdat
2label live-amd64 2label samizdat
3 linux /live/vmlinuz 3 linux linux/vmlinuz
4 initrd /live/initrd.img 4 initrd linux/initrd.img
5 append boot=samizdat components quiet splash 5 append boot=samizdat components quiet splash
diff --git a/isolinux/live.cfg b/isolinux/live.cfg
deleted file mode 100644
index 23f4b76..0000000
--- a/isolinux/live.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
1label live-amd64
2 menu label ^Samizdat (amd64)
3 menu default
4 linux /live/vmlinuz
5 initrd /live/initrd.img
6 append boot=samizdat components quiet splash
7
8label live-amd64-failsafe
9 menu label ^Samizdat (amd64 failsafe)
10 linux /live/vmlinuz
11 initrd /live/initrd.img
12 append boot=samizdat components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal
diff --git a/isolinux/menu.cfg b/isolinux/menu.cfg
deleted file mode 100644
index dbc32f1..0000000
--- a/isolinux/menu.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
1menu hshift 7
2menu width 60
3
4menu title Boot menu
5include stdmenu.cfg
6include live.cfg
7include install.cfg
8menu begin advanced
9 menu title ^Advanced options
10 include stdmenu.cfg
11 label mainmenu
12 menu label ^Back..
13 menu exit
14 include advanced.cfg
15menu end
16
17menu clear
diff --git a/isolinux/pxelinux.cfg/default b/isolinux/pxelinux.cfg/default
index af54e61..8e0a05f 100644
--- a/isolinux/pxelinux.cfg/default
+++ b/isolinux/pxelinux.cfg/default
@@ -1,5 +1,5 @@
1default live-amd64 1default samizdat
2label live-amd64 2label samizdat
3 linux /live/vmlinuz 3 linux linux/vmlinuz
4 initrd /live/initrd.img 4 initrd linux/initrd.img
5 append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.iso nbddev=/dev/nbd0 ip=dhcp 5 append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.iso nbddev=/dev/nbd0 ip=dhcp
diff --git a/isolinux/splash.png b/isolinux/splash.png
deleted file mode 100644
index 52d9a8b..0000000
--- a/isolinux/splash.png
+++ /dev/null
Binary files differ
diff --git a/isolinux/stdmenu.cfg b/isolinux/stdmenu.cfg
deleted file mode 100644
index 671b16f..0000000
--- a/isolinux/stdmenu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
1menu background splash.png
2menu color title * #FFFFFFFF *
3menu color border * #00000000 #00000000 none
4menu color sel * #ffffffff #76a1d0ff *
5menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
6menu color tabmsg * #ffffffff #00000000 *
7menu color help 37;40 #ffdddd00 #00000000 none
8menu vshift 12
9menu rows 10
10menu helpmsgrow 15
11# The command line must be at least one line from the bottom.
12menu cmdlinerow 16
13menu timeoutrow 16
14menu tabmsgrow 18
15menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/old-school/grok-block b/old-school/grok-block
index 006a090..75d5120 100755
--- a/old-school/grok-block
+++ b/old-school/grok-block
@@ -72,7 +72,7 @@ retry_mount()
72gpg_verify() 72gpg_verify()
73{ 73{
74 bootwait samizdat-cdrom 74 bootwait samizdat-cdrom
75 gpg2 --lock-never --no-permission-warning --no-auto-check-trustdb --no-options --homedir /cdrom/samizdat/gpg/gnupghome --verify "$1" 75 gpg2 --lock-never --no-permission-warning --no-auto-check-trustdb --no-options --homedir /cdrom/gnupghome --verify "$1"
76} 76}
77is_lvm() 77is_lvm()
78{ 78{
diff --git a/old-school/lvm-create.sh b/old-school/lvm-create.sh
index b6d38d2..5a7657d 100644
--- a/old-school/lvm-create.sh
+++ b/old-school/lvm-create.sh
@@ -28,7 +28,7 @@ ceil4()
28 28
29losetup_layers() 29losetup_layers()
30{ 30{
31 for fs in /cdrom/live/*.btrfs; do 31 for fs in /cdrom/rootfs/*.btrfs; do
32 fs_rw=/"${fs##*/}".rw 32 fs_rw=/"${fs##*/}".rw
33 dd if=/dev/zero of="$fs_rw" bs=1M count=10 33 dd if=/dev/zero of="$fs_rw" bs=1M count=10
34 losetup_snapshot "$fs" "$fs_rw" || return 34 losetup_snapshot "$fs" "$fs_rw" || return
@@ -228,7 +228,8 @@ init_gpg()
228{ 228{
229 bootwait samizdat-cdrom 229 bootwait samizdat-cdrom
230 export GNUPGHOME=/gpg/gnupghome 230 export GNUPGHOME=/gpg/gnupghome
231 (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/samizdat/gpg/ /gpg/) 231 mkdir -p "$GNUPGHOME"
232 (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/gnupghome/ "$GNUPGHOME")
232 233
233 if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then 234 if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then
234 clear 235 clear
diff --git a/qemu.sh b/qemu.sh
index 11c10f2..e384e85 100755
--- a/qemu.sh
+++ b/qemu.sh
@@ -13,8 +13,8 @@ layered=${iso%.iso}.layered.iso
13# NET='user,tftp=isolinux,bootfile=/pxelinux.0' 13# NET='user,tftp=isolinux,bootfile=/pxelinux.0'
14NET='tap,vlan=0,ifname=tap0,script=no,downscript=no' 14NET='tap,vlan=0,ifname=tap0,script=no,downscript=no'
15 15
16initrd=isolinux/live/initrd.img 16initrd=isolinux/linux/initrd.img
17kernel=isolinux/live/vmlinuz 17kernel=isolinux/linux/vmlinuz
18kcmdline='boot=samizdat components quiet splash' 18kcmdline='boot=samizdat components quiet splash'
19 19
20sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \ 20sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \
diff --git a/xorriso.sh b/xorriso.sh
index b5f7e46..944682e 100755
--- a/xorriso.sh
+++ b/xorriso.sh
@@ -3,10 +3,8 @@
3outdev=debian-live-8.4.0-amd64-standard.btrfs.isohybrid2 3outdev=debian-live-8.4.0-amd64-standard.btrfs.isohybrid2
4indev=debian-live-8.4.0-amd64-standard.iso 4indev=debian-live-8.4.0-amd64-standard.iso
5volid=SamizdatLive 5volid=SamizdatLive
6squashfs_iso_path=live/filesystem.squashfs
7btrfs_iso_path=live/filesystem.btrfs
8btrfs_filesystem=debian-live-8.4.0-amd64-standard.btrfs 6btrfs_filesystem=debian-live-8.4.0-amd64-standard.btrfs
9gpg_iso_path=samizdat/gpg/gnupghome 7gpg_iso_path=gnupghome
10gnupghome=gnupghome 8gnupghome=gnupghome
11secrets=secrets 9secrets=secrets
12 10
@@ -47,19 +45,6 @@ set -ex
47# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/ 45# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/
48# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/efiboot.img 46# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/efiboot.img
49 47
50# -boot_image isolinux dir=isolinux \
51# -boot_image isolinux next -boot_image isolinux system_area=/usr/lib/ISOLINUX/isohdpfx.bin \
52
53# -add "${btrfs_iso_path}=${btrfs_filesystem}" -- \
54# -add "${gpg_iso_path}=${gnupghome}" -- \
55
56
57
58
59# -rm "$squashfs_iso_path" -- \
60# -rm_r isolinux live -- \
61# -add isolinux=isolinux -- \
62
63xorriso \ 48xorriso \
64 -drive_class clear_list all \ 49 -drive_class clear_list all \
65 -outdev "$outdev"~ \ 50 -outdev "$outdev"~ \
@@ -68,7 +53,11 @@ xorriso \
68 -volid "$volid" \ 53 -volid "$volid" \
69 -pathspecs on \ 54 -pathspecs on \
70 \ 55 \
71 -add live=isolinux/live/ isolinux -- \ 56 \
57 -add isolinux -- \
58 -add "rootfs/${btrfs_filesystem}=${btrfs_filesystem}" -- \
59 -add "${gpg_iso_path}=${gnupghome}" -- \
60 \
72 \ 61 \
73 -as mkisofs \ 62 -as mkisofs \
74 -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \ 63 -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \