@@ -141,22 +141,22 @@ function createIsoImage() {
141
141
142
142
# Create EFI boot image
143
143
createEfiImage || exit $?
144
- cp $EFIBOOT_IMG $STEP_DIR || exit 41
144
+ cp $EFIBOOT_IMG $STEP_DIR || exit 42
145
145
146
146
# Copy IsoLinux files
147
147
148
148
cp $SRC_DIR /bios/core/isolinux.bin \
149
149
$SRC_DIR /bios/com32/elflink/ldlinux/ldlinux.c32 \
150
- $STEP_DIR || exit 42
150
+ $STEP_DIR || exit 43
151
151
152
152
# Copy kernel and initramfs on the ISO image
153
153
154
154
cp $KERNEL $STEP_DIR /kernel.img &&
155
- cp $INITRAMFS $STEP_DIR /initram.gz || exit 43
155
+ cp $INITRAMFS $STEP_DIR /initram.gz || exit 44
156
156
157
157
# Create ISO image
158
158
159
- mkdir -p ` dirname $OUTPUT ` || exit 44
159
+ mkdir -p ` dirname $OUTPUT ` || exit 45
160
160
161
161
# http://wiki.osdev.org/Bootable_El-Torito_CD_with_GRUB_Legacy#Mkisofs_says_Uh_oh.2C_I_cant_find_the_boot_image
162
162
# genisoimage looks for its boot image as a subdirectory of the filesystem on the CD
@@ -170,9 +170,9 @@ function createIsoImage() {
170
170
-eltorito-alt-boot \
171
171
-efi-boot efiboot.img \
172
172
-no-emul-boot \
173
- $STEP_DIR || exit 45
173
+ $STEP_DIR || exit 46
174
174
175
- $SRC_DIR /bios/utils/isohybrid $OUTPUT || exit 46
175
+ $SRC_DIR /bios/utils/isohybrid $OUTPUT || exit 47
176
176
}
177
177
178
178
@@ -182,7 +182,7 @@ case $MACHINE in
182
182
img) # FAT partition
183
183
STEP_DIR=$IMG_DIR
184
184
185
- mkdir -p $STEP_DIR || err 70
185
+ mkdir -p $STEP_DIR || err 50
186
186
187
187
# Copy SysLinux files
188
188
@@ -191,7 +191,7 @@ case $MACHINE in
191
191
192
192
createPartitionImage || exit $?
193
193
194
- $SRC_DIR /bios/mtools/syslinux --install $OUTPUT || exit 72
194
+ $SRC_DIR /bios/mtools/syslinux --install $OUTPUT || exit 52
195
195
;;
196
196
197
197
iso) # Hybrid ISO image for CDs and USB pendrives
@@ -203,15 +203,15 @@ case $MACHINE in
203
203
tar) # Combine both barebones and initramfs tarfiles in a single one
204
204
STEP_DIR=$OUTPUT
205
205
206
- mkdir -p ` dirname $STEP_DIR ` || err 80
206
+ mkdir -p ` dirname $STEP_DIR ` || err 60
207
207
208
208
gunzip $BAREBONES -c | tar --delete init | gzip > $STEP_DIR &&
209
- cat $INITRAMFS >> $STEP_DIR || err 81
209
+ cat $INITRAMFS >> $STEP_DIR || err 61
210
210
;;
211
211
212
212
* )
213
213
echo -e " ${RED} Unknown FORMAT '$FORMAT '${CLR} "
214
- exit 90
214
+ exit 70
215
215
;;
216
216
esac
217
217
;;
@@ -221,32 +221,32 @@ case $MACHINE in
221
221
img)
222
222
STEP_DIR=$IMG_DIR
223
223
224
- mkdir -p $STEP_DIR || err 100
224
+ mkdir -p $STEP_DIR || err 80
225
225
226
226
# Copy Raspberry PI extra files
227
227
# http://elinux.org/RPi_Advanced_Setup#Setting_up_the_boot_partition
228
228
#
229
229
# bootcode.bin, start.elf, cmdline.txt
230
230
(
231
- cd $STEP_DIR || exit 101
231
+ cd $STEP_DIR || exit 81
232
232
233
- wget https://github.com/raspberrypi/firmware/raw/master/boot/bootcode.bin || exit 102
234
- wget https://github.com/raspberrypi/firmware/raw/master/boot/start.elf || exit 103
233
+ wget https://github.com/raspberrypi/firmware/raw/master/boot/bootcode.bin || exit 82
234
+ wget https://github.com/raspberrypi/firmware/raw/master/boot/start.elf || exit 83
235
235
) || err $?
236
236
237
237
createPartitionImage || exit $?
238
238
;;
239
239
240
240
* )
241
241
echo -e " ${RED} Unknown FORMAT '$FORMAT '${CLR} "
242
- exit 110
242
+ exit 90
243
243
;;
244
244
esac
245
245
;;
246
246
247
247
* )
248
248
echo -e " ${RED} Unknown MACHINE '$MACHINE '${CLR} "
249
- exit 120
249
+ exit 100
250
250
;;
251
251
esac
252
252
0 commit comments