Use -b base-system-runit to generate an image with eudev+runit.
Unified · Split
| @@ -71,6 +71,7 @@ usage() { · 70 unmodified lines | |||
| 71 | Usage: $(basename $0) [options] | 71 | Usage: $(basename $0) [options] |
| 72 | 72 | ||
| 73 | Options: | 73 | Options: |
| 74 | -b <system-pkg> Set an alternative base-system package (defaults to base-system). | ||
| 74 | -r <repo-url> Use this XBPS repository (may be specified multiple times). | 75 | -r <repo-url> Use this XBPS repository (may be specified multiple times). |
| 75 | -c <cachedir> Use this XBPS cache directory (/var/cache/xbps if unset). | 76 | -c <cachedir> Use this XBPS cache directory (/var/cache/xbps if unset). |
| 76 | -k <keymap> Default keymap to use (us if unset) | 77 | -k <keymap> Default keymap to use (us if unset) |
| @@ -138,8 +139,12 @@ generate_initramfs() { · 61 unmodified lines | |||
| 138 | copy_dracut_files $VOIDHOSTDIR | 139 | copy_dracut_files $VOIDHOSTDIR |
| 139 | $XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY $XBPS_CACHEDIR -y base-system >>$LOGFILE 2>&1 | 140 | $XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY $XBPS_CACHEDIR -y base-system >>$LOGFILE 2>&1 |
| 140 | 141 | ||
| 142 | if [ "$BASE_SYSTEM_PKG" = "base-system-runit" ]; then | ||
| 143 | # for runit omit the systemd module | ||
| 144 | _args="--omit 'systemd'" | ||
| 145 | fi | ||
| 141 | xbps-uchroot $VOIDHOSTDIR /usr/bin/dracut --${INITRAMFS_COMPRESSION} \ | 146 | xbps-uchroot $VOIDHOSTDIR /usr/bin/dracut --${INITRAMFS_COMPRESSION} \ |
| 142 | --force-add "vmklive" "/boot/initrd" $KERNELVERSION >>$LOGFILE 2>&1 | 147 | --force-add "vmklive" ${_args} "/boot/initrd" $KERNELVERSION >>$LOGFILE 2>&1 |
| 143 | 148 | ||
| 144 | mv $VOIDHOSTDIR/boot/initrd $BOOT_DIR | 149 | mv $VOIDHOSTDIR/boot/initrd $BOOT_DIR |
| 145 | cp $VOIDHOSTDIR/boot/vmlinuz-$KERNELVERSION $BOOT_DIR/vmlinuz | 150 | cp $VOIDHOSTDIR/boot/vmlinuz-$KERNELVERSION $BOOT_DIR/vmlinuz |
| @@ -226,14 +231,12 @@ generate_iso_image() { · 80 unmodified lines | |||
| 226 | -output "$CURDIR/$OUTPUT_FILE" "$IMAGEDIR" >>$LOGFILE 2>&1 | 231 | -output "$CURDIR/$OUTPUT_FILE" "$IMAGEDIR" >>$LOGFILE 2>&1 |
| 227 | } | 232 | } |
| 228 | 233 | ||
| 229 | # Required packages in the image for a working system. | ||
| 230 | PACKAGE_LIST="base-system dialog" | ||
| 231 | |||
| 232 | # | 234 | # |
| 233 | # main() | 235 | # main() |
| 234 | # | 236 | # |
| 235 | while getopts "r:c:k:l:i:s:o:p:h" opt; do | 237 | while getopts "b:r:c:k:l:i:s:o:p:h" opt; do |
| 236 | case $opt in | 238 | case $opt in |
| 239 | b) BASE_SYSTEM_PKG="$OPTARG";; | ||
| 237 | r) XBPS_REPOSITORY+="--repository=$OPTARG ";; | 240 | r) XBPS_REPOSITORY+="--repository=$OPTARG ";; |
| 238 | c) XBPS_CACHEDIR="--cachedir=$OPTARG";; | 241 | c) XBPS_CACHEDIR="--cachedir=$OPTARG";; |
| 239 | k) KEYMAP="$OPTARG";; | 242 | k) KEYMAP="$OPTARG";; |
| @@ -241,7 +244,7 @@ while getopts "r:c:k:l:i:s:o:p:h" opt; do · 1 unmodified line | |||
| 241 | i) INITRAMFS_COMPRESSION="$OPTARG";; | 244 | i) INITRAMFS_COMPRESSION="$OPTARG";; |
| 242 | s) SQUASHFS_COMPRESSION="$OPTARG";; | 245 | s) SQUASHFS_COMPRESSION="$OPTARG";; |
| 243 | o) OUTPUT_FILE="$OPTARG";; | 246 | o) OUTPUT_FILE="$OPTARG";; |
| 244 | p) PACKAGE_LIST+=" $OPTARG";; | 247 | p) PACKAGE_LIST="$OPTARG";; |
| 245 | h) usage;; | 248 | h) usage;; |
| 246 | esac | 249 | esac |
| 247 | done | 250 | done |
| @@ -253,6 +256,10 @@ shift $(($OPTIND - 1)) · 5 unmodified lines | |||
| 253 | : ${LOCALE:=en_US.UTF-8} | 256 | : ${LOCALE:=en_US.UTF-8} |
| 254 | : ${INITRAMFS_COMPRESSION:=xz} | 257 | : ${INITRAMFS_COMPRESSION:=xz} |
| 255 | : ${SQUASHFS_COMPRESSION:=xz} | 258 | : ${SQUASHFS_COMPRESSION:=xz} |
| 259 | : ${BASE_SYSTEM_PKG:=base-system} | ||
| 260 | |||
| 261 | # Required packages in the image for a working system. | ||
| 262 | PACKAGE_LIST="$BASE_SYSTEM_PKG dialog $PACKAGE_LIST" | ||
| 256 | 263 | ||
| 257 | LOGFILE="$(mktemp -t vmklive-XXXXXXXXXX.log)" | 264 | LOGFILE="$(mktemp -t vmklive-XXXXXXXXXX.log)" |
| 258 | 265 | ||