History

Merge pull request #57 from enguerrand/master

Juan RP committed 10 years ago

Commit 719ae8a2 parents 8affcef f11d98a1 file · +28 −10Browse files

Unified · Split

mklive.sh.in+28−10
@@ -39,6 +39,10 @@ die() { · 38 unmodified lines
3939 info_msg "ERROR: $@"
4040 error_out 1
4141 }
42+print_step() {
43+ ((CURRENT_STEP=CURRENT_STEP+1))
44+ info_msg "[${CURRENT_STEP}/${STEP_COUNT}] $@"
45+}
4246 mount_pseudofs() {
4347 for f in sys dev proc; do
4448 mkdir -p $ROOTFS/$f
@@ -72,6 +76,7 @@ Options: · 27 unmodified lines
7276 -S <freesize> Allocate this free size (MB) for the rootfs.
7377 -o <file> Output file name for the ISO image (auto if unset).
7478 -p "pkg pkgN ..." Install additional packages into the ISO image.
79+ -I <includedir> Include directory structure under given path into rootfs
7580
7681 -C "cmdline args" Add additional kernel command line arguments.
7782 -T "title" Modify the bootloader title.
@@ -135,6 +140,10 @@ install_packages() { · 57 unmodified lines
135140 rm -rf $ROOTFS/var/cache/* $ROOTFS/run/* $ROOTFS/var/run/*
136141 }
137142
143+copy_include_directory() {
144+ find $INCLUDE_DIRECTORY -mindepth 1 -maxdepth 1 -exec cp -rfpPv {} $ROOTFS/ \;
145+}
146+
138147 generate_initramfs() {
139148 local _args
140149
@@ -283,7 +292,7 @@ generate_iso_image() { · 142 unmodified lines
283292 #
284293 # main()
285294 #
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
287296 case $opt in
288297 a) BASE_ARCH="$OPTARG";;
289298 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
293302 k) KEYMAP="$OPTARG";;
294303 l) LOCALE="$OPTARG";;
295304 i) INITRAMFS_COMPRESSION="$OPTARG";;
305+ I) INCLUDE_DIRECTORY="$OPTARG";;
296306 s) SQUASHFS_COMPRESSION="$OPTARG";;
297307 S) ROOTFS_FREESIZE="$OPTARG";;
298308 o) OUTPUT_FILE="$OPTARG";;
@@ -343,6 +353,9 @@ BOOT_DIR="$IMAGEDIR/boot" · 44 unmodified lines
343353 ISOLINUX_DIR="$BOOT_DIR/isolinux"
344354 GRUB_DIR="$BOOT_DIR/grub"
345355 ISOLINUX_CFG="$ISOLINUX_DIR/isolinux.cfg"
356+CURRENT_STEP=0
357+STEP_COUNT=9
358+[ -n "${INCLUDE_DIRECTORY}" ] && ((STEP_COUNT=STEP_COUNT+1))
346359
347360 : ${SYSLINUX_DATADIR:=$VOIDHOSTDIR/usr/share/syslinux}
348361 : ${GRUB_DATADIR:=$VOIDHOSTDIR/usr/share/grub}
@@ -356,7 +369,7 @@ ISOLINUX_CFG="$ISOLINUX_DIR/isolinux.cfg" · 7 unmodified lines
356369
357370 mkdir -p $ROOTFS $VOIDHOSTDIR $ISOLINUX_DIR $GRUB_DIR
358371
359−info_msg "[1/8] Synchronizing XBPS repository data..."
372+print_step "Synchronizing XBPS repository data..."
360373 copy_void_keys $ROOTFS
361374 copy_void_keys $VOIDHOSTDIR
362375 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
368381
369382 : ${OUTPUT_FILE="void-live-${BASE_ARCH}-${KERNELVERSION}-$(date +%Y%m%d).iso"}
370383
371−info_msg "[2/9] Installing software to generate the image: ${REQUIRED_PKGS} ..."
384+print_step "Installing software to generate the image: ${REQUIRED_PKGS} ..."
372385 install_prereqs
373386
374387 mkdir -p "$ROOTFS"/etc
375388 [ -s data/motd ] && cp data/motd $ROOTFS/etc
376389 [ -s data/issue ] && cp data/issue $ROOTFS/etc
377390
378−info_msg "[3/9] Installing void pkgs into the rootfs: ${PACKAGE_LIST} ..."
391+print_step "Installing void pkgs into the rootfs: ${PACKAGE_LIST} ..."
379392 install_packages
380393
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)..."
382400 generate_initramfs
383401
384−info_msg "[5/9] Generating isolinux support for PC-BIOS systems..."
402+print_step "Generating isolinux support for PC-BIOS systems..."
385403 generate_isolinux_boot
386404
387−info_msg "[6/9] Generating GRUB support for EFI systems..."
405+print_step "Generating GRUB support for EFI systems..."
388406 generate_grub_efi_boot
389407
390−info_msg "[7/9] Cleaning up rootfs..."
408+print_step "Cleaning up rootfs..."
391409 cleanup_rootfs
392410
393−info_msg "[8/9] Generating squashfs image ($SQUASHFS_COMPRESSION) from rootfs..."
411+print_step "Generating squashfs image ($SQUASHFS_COMPRESSION) from rootfs..."
394412 generate_squashfs
395413
396−info_msg "[9/9] Generating ISO image..."
414+print_step "Generating ISO image..."
397415 generate_iso_image
398416
399417 hsize=$(du -sh "$CURDIR/$OUTPUT_FILE"|awk '{print $1}')

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t