diff --git a/bdisk/basedistro/antergos.py b/bdisk/basedistro/antergos.py new file mode 120000 index 0000000..3d58414 --- /dev/null +++ b/bdisk/basedistro/antergos.py @@ -0,0 +1 @@ +archlinux.py \ No newline at end of file diff --git a/bdisk/basedistro/arch.py b/bdisk/basedistro/arch.py new file mode 120000 index 0000000..3d58414 --- /dev/null +++ b/bdisk/basedistro/arch.py @@ -0,0 +1 @@ +archlinux.py \ No newline at end of file diff --git a/bdisk/basedistro/archlinux.py b/bdisk/basedistro/archlinux.py new file mode 100644 index 0000000..15d20fd --- /dev/null +++ b/bdisk/basedistro/archlinux.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python3.6 + +# Supported initsys values: +# systemd +# Possible future inclusions: +# openrc +# runit +# sinit +# s6 +# shepherd +initsys = 'systemd' + +# This will be run before the regular packages are installed. It can be +# whatever script you like, as long as it has the proper shebang and doesn't +# need additional packages installed. +pkg_mgr_prep = """#!/bin/bash + +""" + +# Special values: +# {PACKAGE} = the package name +# {VERSION} = the version specified in the attribute +# {REPO} = the repository specified in the attribute +# If check_cmds are needed to run before installing, set pre_check to True. +# Return code 0 means the package is installed already, anything else means we +# should try to install it. +#### AUR SUPPORT #### +packager = {'pre_check': False, + 'sys_update': ['/usr/bin/aurman', '-S', '-u'], + 'sync_cmd': ['/usr/bin/aurman', '-S', '-y', '-y'], + 'check_cmds': {'versioned': ['/usr/bin/pacman', + '-Q', '-s', + '{PACKAGE}'], + 'unversioned': ['/usr/bin/pacman', + '-Q', '-s', + '{PACKAGE}'] + }, + 'update_cmds': {'versioned': ['/usr/bin/pacman', + '-S', '-u', + '{PACKAGE}'], + 'unversioned': ['/usr/bin/pacman', + '-S', '-u', + '{PACKAGE}'] + }, + } + +# These are packages *required* to exist on the base guest, no questions asked. +# TODO: can this be trimmed down? +prereqs = ['arch-install-scripts', 'archiso', 'bzip2', 'coreutils', + 'customizepkg-scripting', 'cronie', 'dhclient', 'dhcp', 'dhcpcd', + 'dosfstools', 'dropbear', 'efibootmgr', 'efitools', 'efivar', + 'file', 'findutils', 'iproute2', 'iputils', 'libisoburn', + 'localepurge', 'lz4', 'lzo', 'lzop', 'mkinitcpio-nbd', + 'mkinitcpio-nfs-utils', 'mkinitcpio-utils', 'nbd', 'ms-sys', + 'mtools', 'net-tools', 'netctl', 'networkmanager', 'pv', + 'python', 'python-pyroute2', 'rsync', 'sed', 'shorewall', + 'squashfs-tools', 'sudo', 'sysfsutils', + 'syslinux', 'traceroute'] + diff --git a/bdisk/basedistro/manjaro.py b/bdisk/basedistro/manjaro.py new file mode 120000 index 0000000..3d58414 --- /dev/null +++ b/bdisk/basedistro/manjaro.py @@ -0,0 +1 @@ +archlinux.py \ No newline at end of file diff --git a/bdisk/bdisk.xsd b/bdisk/bdisk.xsd index d06f213..62f8b3f 100644 --- a/bdisk/bdisk.xsd +++ b/bdisk/bdisk.xsd @@ -502,6 +502,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -648,7 +696,8 @@ - + diff --git a/docs/examples/single_profile.xml b/docs/examples/single_profile.xml index 02a51b4..0692bb1 100644 --- a/docs/examples/single_profile.xml +++ b/docs/examples/single_profile.xml @@ -30,7 +30,8 @@ items. See the manual for more information. NO btags within the patterns is allowed. --> archlinux-bootstrap-[0-9]{4}\.[0-9]{2}\.[0-9]{2}-x86_64\.tar\.gz$ - archlinux-bootstrap-[0-9]{4}\.[0-9]{2}\.[0-9]{2}-x86_64\.tar\.gz\.sig$ + archlinux-bootstrap-[0-9]{4}\.[0-9]{2}\.[0-9]{2}-x86_64\.tar\.gz\.sig$ + archlinux-bootstrap-[0-9]{4}\.[0-9]{2}\.[0-9]{2}-i686\.tar\.gz$ archlinux-bootstrap-[0-9]{4}\.[0-9]{2}\.[0-9]{2}-i686\.tar\.gz\.sig$ @@ -76,12 +77,15 @@ /iso/latest {regex%tarball_i686} cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e + explicit="true">cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e {regex%sig_i686} + + openssh + {variable%bdisk_root}/base diff --git a/external/aurman-2.9.37-1-any.pkg.tar.xz b/external/aurman-2.9.37-1-any.pkg.tar.xz new file mode 100644 index 0000000..d0cc1aa Binary files /dev/null and b/external/aurman-2.9.37-1-any.pkg.tar.xz differ