diff options
-rwxr-xr-x | src/parted-usb.sh | 57 |
1 files changed, 39 insertions, 18 deletions
diff --git a/src/parted-usb.sh b/src/parted-usb.sh index e688473..4047331 100755 --- a/src/parted-usb.sh +++ b/src/parted-usb.sh | |||
@@ -62,7 +62,7 @@ make_target_bootable() | |||
62 | sync | 62 | sync |
63 | } | 63 | } |
64 | 64 | ||
65 | release_target() | 65 | release_target_kernel_resources() |
66 | { | 66 | { |
67 | umount "$mnt" | 67 | umount "$mnt" |
68 | kpartx -d "$dev" | 68 | kpartx -d "$dev" |
@@ -92,7 +92,9 @@ add_keys() | |||
92 | initrd_suffix=.samizdat | 92 | initrd_suffix=.samizdat |
93 | add_initrd() | 93 | add_initrd() |
94 | { | 94 | { |
95 | rsync -aL --info=STATS "${1}vmlinuz${2}" "${1}initrd.img${2}${initrd_suffix}" "$mnt"/linux/ | 95 | mkdir -p "$mnt"/linux |
96 | rsync -aL --info=STATS "${1}vmlinuz${2}" "$mnt"/linux/vmlinuz | ||
97 | rsync -aL --info=STATS "${1}initrd.img${2}${initrd_suffix}" "$mnt"/linux/initrd.img | ||
96 | } | 98 | } |
97 | 99 | ||
98 | add_grub_cfg() | 100 | add_grub_cfg() |
@@ -101,7 +103,7 @@ add_grub_cfg() | |||
101 | cp -aL "$GRUB_CONFIG" "$mnt"/boot/grub | 103 | cp -aL "$GRUB_CONFIG" "$mnt"/boot/grub |
102 | } | 104 | } |
103 | 105 | ||
104 | add_all() | 106 | individualize() |
105 | { | 107 | { |
106 | add_keys | 108 | add_keys |
107 | add_initrd "$samizdat_linux_dir"/ "${version_suffix}" | 109 | add_initrd "$samizdat_linux_dir"/ "${version_suffix}" |
@@ -117,8 +119,25 @@ sanity_checks() | |||
117 | done | 119 | done |
118 | } | 120 | } |
119 | 121 | ||
122 | create_template() | ||
123 | { | ||
124 | local target="${1}.tmp" | ||
120 | 125 | ||
126 | if [ ! -e "${target%.tmp}" ] | ||
127 | then | ||
128 | initialize_target | ||
129 | partition_target | ||
130 | make_target_bootable | ||
131 | release_target_kernel_resources | ||
132 | mv -T "$target" "${target%.tmp}" | ||
133 | fi | ||
134 | } | ||
121 | 135 | ||
136 | individualize_target_from() | ||
137 | { | ||
138 | cp -T --reflink=always "$1" "$target" | ||
139 | with_target "$target" individualize | ||
140 | } | ||
122 | 141 | ||
123 | . samizdat-paths.sh || die 'samizdat-paths.sh not found' | 142 | . samizdat-paths.sh || die 'samizdat-paths.sh not found' |
124 | samizdat_linux_dir=/boot | 143 | samizdat_linux_dir=/boot |
@@ -126,27 +145,29 @@ samizdat_linux_dir=/boot | |||
126 | : ${GRUB_CONFIG:=conf/grub.cfg} | 145 | : ${GRUB_CONFIG:=conf/grub.cfg} |
127 | start_keys=64 # megs | 146 | start_keys=64 # megs |
128 | end_keys=256 # megs | 147 | end_keys=256 # megs |
129 | target=fallacy.img.tmp | 148 | |
149 | if [ "$1" ] | ||
150 | then | ||
151 | version_suffix=-$1 | ||
152 | fi | ||
153 | |||
130 | 154 | ||
131 | sanity_checks | 155 | sanity_checks |
132 | set -e | 156 | set -e |
157 | template=boot-disk.template.img | ||
158 | target=boot-disk.img.tmp | ||
159 | final=${target%.tmp} | ||
160 | create_template "$template" | ||
161 | individualize_target_from "$template" | ||
162 | mv -T "$target" "$final" | ||
133 | 163 | ||
134 | if [ ! -e "$target" ] | ||
135 | then | ||
136 | initialize_target | ||
137 | partition_target | ||
138 | make_target_bootable | ||
139 | release_target | ||
140 | fi | ||
141 | 164 | ||
142 | if [ "$1" ] | 165 | installer_target=target-disk.img |
166 | rm -f "$installer_target" | ||
167 | if [ ! -e "$installer_target" ] | ||
143 | then | 168 | then |
144 | version_suffix=-$1 | 169 | fallocate -l 10G "$installer_target" |
145 | fi | 170 | fi |
146 | cp --reflink=always "$target" "$target".keyed | ||
147 | with_target "$target".keyed add_all | ||
148 | |||
149 | qemu-system-x86_64 -enable-kvm -smp 2 -m 512 -k en-us -vga qxl -drive file="$target".keyed,format=raw | ||
150 | 171 | ||
151 | # rm -f "$target" | 172 | qemu-system-x86_64 -enable-kvm -smp 2 -m 512 -k en-us -vga qxl -drive file="$final",format=raw -drive file="$installer_target",format=raw |
152 | 173 | ||