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