Unified · Split
| @@ -39,6 +39,10 @@ die() { · 38 unmodified lines | ||
| 39 | 39 | info_msg "ERROR: $@" |
| 40 | 40 | error_out 1 |
| 41 | 41 | } |
| 42 | +print_step() { | |
| 43 | + ((CURRENT_STEP=CURRENT_STEP+1)) | |
| 44 | + info_msg "[${CURRENT_STEP}/${STEP_COUNT}] $@" | |
| 45 | +} | |
| 42 | 46 | mount_pseudofs() { |
| 43 | 47 | for f in sys dev proc; do |
| 44 | 48 | mkdir -p $ROOTFS/$f |
| @@ -72,6 +76,7 @@ Options: · 27 unmodified lines | ||
| 72 | 76 | -S <freesize> Allocate this free size (MB) for the rootfs. |
| 73 | 77 | -o <file> Output file name for the ISO image (auto if unset). |
| 74 | 78 | -p "pkg pkgN ..." Install additional packages into the ISO image. |
| 79 | + -I <includedir> Include directory structure under given path into rootfs | |
| 75 | 80 | |
| 76 | 81 | -C "cmdline args" Add additional kernel command line arguments. |
| 77 | 82 | -T "title" Modify the bootloader title. |
| @@ -135,6 +140,10 @@ install_packages() { · 57 unmodified lines | ||
| 135 | 140 | rm -rf $ROOTFS/var/cache/* $ROOTFS/run/* $ROOTFS/var/run/* |
| 136 | 141 | } |
| 137 | 142 | |
| 143 | +copy_include_directory() { | |
| 144 | + find $INCLUDE_DIRECTORY -mindepth 1 -maxdepth 1 -exec cp -rfpPv {} $ROOTFS/ \; | |
| 145 | +} | |
| 146 | + | |
| 138 | 147 | generate_initramfs() { |
| 139 | 148 | local _args |
| 140 | 149 | |
| @@ -283,7 +292,7 @@ generate_iso_image() { · 142 unmodified lines | ||
| 283 | 292 | # |
| 284 | 293 | # main() |
| 285 | 294 | # |
| 286 | −while getopts "a:b:r:c:C:T:Kk:l:i:s:S:o:p:h" opt; do | |
| 295 | +while getopts "a:b:r:c:C:T:Kk:l:i:I:s:S:o:p:h" opt; do | |
| 287 | 296 | case $opt in |
| 288 | 297 | a) BASE_ARCH="$OPTARG";; |
| 289 | 298 | b) BASE_SYSTEM_PKG="$OPTARG";; |
| @@ -293,6 +302,7 @@ while getopts "a:b:r:c:C:T:Kk:l:i:s:S:o:p:h" opt; do · 3 unmodified lines | ||
| 293 | 302 | k) KEYMAP="$OPTARG";; |
| 294 | 303 | l) LOCALE="$OPTARG";; |
| 295 | 304 | i) INITRAMFS_COMPRESSION="$OPTARG";; |
| 305 | + I) INCLUDE_DIRECTORY="$OPTARG";; | |
| 296 | 306 | s) SQUASHFS_COMPRESSION="$OPTARG";; |
| 297 | 307 | S) ROOTFS_FREESIZE="$OPTARG";; |
| 298 | 308 | o) OUTPUT_FILE="$OPTARG";; |
| @@ -343,6 +353,9 @@ BOOT_DIR="$IMAGEDIR/boot" · 44 unmodified lines | ||
| 343 | 353 | ISOLINUX_DIR="$BOOT_DIR/isolinux" |
| 344 | 354 | GRUB_DIR="$BOOT_DIR/grub" |
| 345 | 355 | ISOLINUX_CFG="$ISOLINUX_DIR/isolinux.cfg" |
| 356 | +CURRENT_STEP=0 | |
| 357 | +STEP_COUNT=9 | |
| 358 | +[ -n "${INCLUDE_DIRECTORY}" ] && ((STEP_COUNT=STEP_COUNT+1)) | |
| 346 | 359 | |
| 347 | 360 | : ${SYSLINUX_DATADIR:=$VOIDHOSTDIR/usr/share/syslinux} |
| 348 | 361 | : ${GRUB_DATADIR:=$VOIDHOSTDIR/usr/share/grub} |
| @@ -356,7 +369,7 @@ ISOLINUX_CFG="$ISOLINUX_DIR/isolinux.cfg" · 7 unmodified lines | ||
| 356 | 369 | |
| 357 | 370 | mkdir -p $ROOTFS $VOIDHOSTDIR $ISOLINUX_DIR $GRUB_DIR |
| 358 | 371 | |
| 359 | −info_msg "[1/8] Synchronizing XBPS repository data..." | |
| 372 | +print_step "Synchronizing XBPS repository data..." | |
| 360 | 373 | copy_void_keys $ROOTFS |
| 361 | 374 | copy_void_keys $VOIDHOSTDIR |
| 362 | 375 | XBPS_ARCH=$BASE_ARCH $XBPS_INSTALL_CMD -r $ROOTFS ${XBPS_REPOSITORY} -S |
| @@ -368,32 +381,37 @@ KERNELVERSION=$($XBPS_UHELPER_CMD getpkgversion ${_kver}) · 5 unmodified lines | ||
| 368 | 381 | |
| 369 | 382 | : ${OUTPUT_FILE="void-live-${BASE_ARCH}-${KERNELVERSION}-$(date +%Y%m%d).iso"} |
| 370 | 383 | |
| 371 | −info_msg "[2/9] Installing software to generate the image: ${REQUIRED_PKGS} ..." | |
| 384 | +print_step "Installing software to generate the image: ${REQUIRED_PKGS} ..." | |
| 372 | 385 | install_prereqs |
| 373 | 386 | |
| 374 | 387 | mkdir -p "$ROOTFS"/etc |
| 375 | 388 | [ -s data/motd ] && cp data/motd $ROOTFS/etc |
| 376 | 389 | [ -s data/issue ] && cp data/issue $ROOTFS/etc |
| 377 | 390 | |
| 378 | −info_msg "[3/9] Installing void pkgs into the rootfs: ${PACKAGE_LIST} ..." | |
| 391 | +print_step "Installing void pkgs into the rootfs: ${PACKAGE_LIST} ..." | |
| 379 | 392 | install_packages |
| 380 | 393 | |
| 381 | −info_msg "[4/9] Generating initramfs image ($INITRAMFS_COMPRESSION)..." | |
| 394 | +if [ -n "${INCLUDE_DIRECTORY}" ];then | |
| 395 | + print_step "Copying directory structure into the rootfs: ${INCLUDE_DIRECTORY} ..." | |
| 396 | + copy_include_directory | |
| 397 | +fi | |
| 398 | + | |
| 399 | +print_step "Generating initramfs image ($INITRAMFS_COMPRESSION)..." | |
| 382 | 400 | generate_initramfs |
| 383 | 401 | |
| 384 | −info_msg "[5/9] Generating isolinux support for PC-BIOS systems..." | |
| 402 | +print_step "Generating isolinux support for PC-BIOS systems..." | |
| 385 | 403 | generate_isolinux_boot |
| 386 | 404 | |
| 387 | −info_msg "[6/9] Generating GRUB support for EFI systems..." | |
| 405 | +print_step "Generating GRUB support for EFI systems..." | |
| 388 | 406 | generate_grub_efi_boot |
| 389 | 407 | |
| 390 | −info_msg "[7/9] Cleaning up rootfs..." | |
| 408 | +print_step "Cleaning up rootfs..." | |
| 391 | 409 | cleanup_rootfs |
| 392 | 410 | |
| 393 | −info_msg "[8/9] Generating squashfs image ($SQUASHFS_COMPRESSION) from rootfs..." | |
| 411 | +print_step "Generating squashfs image ($SQUASHFS_COMPRESSION) from rootfs..." | |
| 394 | 412 | generate_squashfs |
| 395 | 413 | |
| 396 | −info_msg "[9/9] Generating ISO image..." | |
| 414 | +print_step "Generating ISO image..." | |
| 397 | 415 | generate_iso_image |
| 398 | 416 | |
| 399 | 417 | hsize=$(du -sh "$CURDIR/$OUTPUT_FILE"|awk '{print $1}') |