mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mklive: use a default void vpkg configuration file for base-system.

Browse Source
This commit is contained in:
Juan RP 2014-11-04 16:36:33 +01:00
parent c39051a72b
commit 4e5adc6f04
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/void-vpkgs.conf Normal file
View File

@ -0,0 +1,7 @@
# Default void configuration
#
# - gawk as default awk
# - openbsd-man as default man(1)
#
virtualpkg=awk-0_1:gawk
virtualpkg=man-0_1:openbsd-man

15
mklive.sh.in
View File

@ -71,13 +71,15 @@ _EOF
} }
copy_void_keys() { copy_void_keys() {
if [ ! -d "$1"/var/db/xbps/keys ]; then
mkdir -p "$1"/var/db/xbps/keys mkdir -p "$1"/var/db/xbps/keys
cp keys/*.plist "$1"/var/db/xbps/keys cp keys/*.plist "$1"/var/db/xbps/keys
fi }
copy_void_conf() {
install -Dm644 data/void-vpkgs.conf "$1"/etc/xbps/virtualpkg.d/void.conf
} }
install_prereqs() { install_prereqs() {
copy_void_conf $VOIDHOSTDIR
$XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY $XBPS_CACHEDIR -y ${REQUIRED_PKGS} >> $LOGFILE 2>&1 $XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY $XBPS_CACHEDIR -y ${REQUIRED_PKGS} >> $LOGFILE 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
info_msg "Failed to install required software, exiting..." info_msg "Failed to install required software, exiting..."
@ -89,12 +91,14 @@ install_packages() {
if [ -n "$BASE_ARCH" ]; then if [ -n "$BASE_ARCH" ]; then
export XBPS_ARCH="$BASE_ARCH" export XBPS_ARCH="$BASE_ARCH"
fi fi
copy_void_conf $ROOTFS
# Check that all pkgs are reachable. # Check that all pkgs are reachable.
${XBPS_INSTALL_CMD} -r $ROOTFS $XBPS_REPOSITORY $XBPS_CACHEDIR -yn ${PACKAGE_LIST} >>$LOGFILE 2>&1 ${XBPS_INSTALL_CMD} -r $ROOTFS $XBPS_REPOSITORY $XBPS_CACHEDIR -yn ${PACKAGE_LIST} >>$LOGFILE 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
info_msg "Missing required binary packages, exiting..." info_msg "Missing required binary packages, exiting..."
error_out error_out
fi fi
${XBPS_INSTALL_CMD} -r $ROOTFS $XBPS_REPOSITORY $XBPS_CACHEDIR -y ${PACKAGE_LIST} >>$LOGFILE 2>&1 ${XBPS_INSTALL_CMD} -r $ROOTFS $XBPS_REPOSITORY $XBPS_CACHEDIR -y ${PACKAGE_LIST} >>$LOGFILE 2>&1
${XBPS_INSTALL_CMD} -r $ROOTFS $XBPS_REPOSITORY $XBPS_CACHEDIR -yu >>$LOGFILE 2>&1 ${XBPS_INSTALL_CMD} -r $ROOTFS $XBPS_REPOSITORY $XBPS_CACHEDIR -yu >>$LOGFILE 2>&1
${XBPS_REMOVE_CMD} -r $ROOTFS $XBPS_CACHEDIR -o >>$LOGFILE 2>&1 ${XBPS_REMOVE_CMD} -r $ROOTFS $XBPS_CACHEDIR -o >>$LOGFILE 2>&1
@ -125,6 +129,7 @@ generate_initramfs() {
# Install required pkgs in a temporary rootdir to create # Install required pkgs in a temporary rootdir to create
# the initramfs and to copy required files. # the initramfs and to copy required files.
copy_dracut_files $VOIDHOSTDIR copy_dracut_files $VOIDHOSTDIR
copy_void_conf $VOIDHOSTDIR
$XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY $XBPS_CACHEDIR -y base-system xz lz4 >>$LOGFILE 2>&1 $XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY $XBPS_CACHEDIR -y base-system xz lz4 >>$LOGFILE 2>&1
if [ "$BASE_SYSTEM_PKG" = "base-system-systemd" ]; then if [ "$BASE_SYSTEM_PKG" = "base-system-systemd" ]; then
@ -323,13 +328,13 @@ install_prereqs
# #
# Install live system and specified packages. # Install live system and specified packages.
# #
info_msg "[3/9] Installing void pkgs into the rootfs: ${PACKAGE_LIST} ..."
install_packages
mkdir -p "$ROOTFS"/etc mkdir -p "$ROOTFS"/etc
[ -s data/motd ] && cp data/motd $ROOTFS/etc [ -s data/motd ] && cp data/motd $ROOTFS/etc
[ -s data/issue ] && cp data/issue $ROOTFS/etc [ -s data/issue ] && cp data/issue $ROOTFS/etc
info_msg "[3/9] Installing void pkgs into the rootfs: ${PACKAGE_LIST} ..."
install_packages
export PATH=$VOIDHOSTDIR/usr/bin:$VOIDHOSTDIR/usr/sbin:$PATH export PATH=$VOIDHOSTDIR/usr/bin:$VOIDHOSTDIR/usr/sbin:$PATH
export LD_LIBRARY_PATH=$VOIDHOSTDIR/usr/lib export LD_LIBRARY_PATH=$VOIDHOSTDIR/usr/lib
# #