parent
97d5758b59
commit
7d69df39dc
5 changed files with 48 additions and 34 deletions
|
@ -73,6 +73,8 @@ display_settings(){
|
||||||
msg2 "arch: %s" "${arch}"
|
msg2 "arch: %s" "${arch}"
|
||||||
msg2 "branch: %s" "${branch}"
|
msg2 "branch: %s" "${branch}"
|
||||||
msg2 "chroots_iso: %s" "${chroots_iso}"
|
msg2 "chroots_iso: %s" "${chroots_iso}"
|
||||||
|
msg2 "initsys: %s" "${initsys}"
|
||||||
|
msg2 "kernel: %s" "${kernel}"
|
||||||
|
|
||||||
msg "ARGS:"
|
msg "ARGS:"
|
||||||
msg2 "clean_first: %s" "${clean_first}"
|
msg2 "clean_first: %s" "${clean_first}"
|
||||||
|
@ -91,8 +93,6 @@ display_settings(){
|
||||||
msg2 "iso_app_id: %s" "${iso_app_id}"
|
msg2 "iso_app_id: %s" "${iso_app_id}"
|
||||||
msg2 "iso_compression: %s" "${iso_compression}"
|
msg2 "iso_compression: %s" "${iso_compression}"
|
||||||
msg2 "iso_checksum: %s" "${iso_checksum}"
|
msg2 "iso_checksum: %s" "${iso_checksum}"
|
||||||
msg2 "initsys: %s" "${initsys}"
|
|
||||||
msg2 "kernel: %s" "${kernel}"
|
|
||||||
msg2 "use_overlayfs: %s" "${use_overlayfs}"
|
msg2 "use_overlayfs: %s" "${use_overlayfs}"
|
||||||
|
|
||||||
msg "BUILD QUEUE:"
|
msg "BUILD QUEUE:"
|
||||||
|
@ -128,11 +128,11 @@ usage() {
|
||||||
echo " [default: ${cache_dir_iso}]"
|
echo " [default: ${cache_dir_iso}]"
|
||||||
echo ' -k <name> Kernel to use'
|
echo ' -k <name> Kernel to use'
|
||||||
echo " [default: ${kernel}]"
|
echo " [default: ${kernel}]"
|
||||||
echo ' -z <name> Init system to use'
|
echo ' -i <name> Init system to use'
|
||||||
echo " [default: ${initsys}]"
|
echo " [default: ${initsys}]"
|
||||||
echo ' -c Disable clean work dir'
|
echo ' -c Disable clean work dir'
|
||||||
echo ' -i Build images only'
|
echo ' -x Build images only'
|
||||||
echo ' -s Generate iso only'
|
echo ' -z Generate iso only'
|
||||||
echo ' Requires pre built images (-i)'
|
echo ' Requires pre built images (-i)'
|
||||||
echo ' -v Verbose output, show profies detail (-q)'
|
echo ' -v Verbose output, show profies detail (-q)'
|
||||||
echo ' -q Query settings and pretend build'
|
echo ' -q Query settings and pretend build'
|
||||||
|
@ -144,7 +144,7 @@ usage() {
|
||||||
|
|
||||||
orig_argv=("$@")
|
orig_argv=("$@")
|
||||||
|
|
||||||
opts='p:a:b:r:t:k:z:cisvqh'
|
opts='p:a:b:r:t:k:i:czxvqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
|
@ -154,10 +154,10 @@ while getopts "${opts}" arg; do
|
||||||
r) chroots_iso="$OPTARG" ;;
|
r) chroots_iso="$OPTARG" ;;
|
||||||
t) cache_dir_iso="$OPTARG" ;;
|
t) cache_dir_iso="$OPTARG" ;;
|
||||||
k) kernel="$OPTARG" ;;
|
k) kernel="$OPTARG" ;;
|
||||||
z) initsys="$OPTARG" ;;
|
i) initsys="$OPTARG" ;;
|
||||||
c) clean_first=false ;;
|
c) clean_first=false ;;
|
||||||
i) images_only=true ;;
|
x) images_only=true ;;
|
||||||
s) iso_only=true ;;
|
z) iso_only=true ;;
|
||||||
v) verbose=true ;;
|
v) verbose=true ;;
|
||||||
q) pretend=true ;;
|
q) pretend=true ;;
|
||||||
h|?) usage 0 ;;
|
h|?) usage 0 ;;
|
||||||
|
|
|
@ -103,6 +103,18 @@
|
||||||
<listitem><para>Iso target directory where the final iso will be stored.</para></listitem>
|
<listitem><para>Iso target directory where the final iso will be stored.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><option>-i systend|openrc</option></term>
|
||||||
|
|
||||||
|
<listitem><para>The init system on the iso</para></listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><option>-k linuxXXX<option></term>
|
||||||
|
|
||||||
|
<listitem><para>The kernel on the iso</para></listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-c</option></term>
|
<term><option>-c</option></term>
|
||||||
|
|
||||||
|
@ -110,15 +122,15 @@
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-i</option></term>
|
<term><option>-x</option></term>
|
||||||
|
|
||||||
<listitem><para>Only build images, without creating an ISO file.</para></listitem>
|
<listitem><para>Only build images, without creating an ISO file.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-s</option></term>
|
<term><option>-z</option></term>
|
||||||
|
|
||||||
<listitem><para>Generate iso from already created images, for example created with the -i option.</para></listitem>
|
<listitem><para>Generate iso from already created images, for example created with the -x option.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
|
|
|
@ -272,6 +272,27 @@
|
||||||
<option>sha384</option> or <option>sha512</option>.
|
<option>sha384</option> or <option>sha512</option>.
|
||||||
</para></listitem>
|
</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><varname>initsys=</varname></term>
|
||||||
|
|
||||||
|
<listitem><para>Takes <option>systemd</option> (the default)
|
||||||
|
or <option>openrc</option>. Selecting and option will change
|
||||||
|
how the hostname, the displaymanager and services will be configured.
|
||||||
|
For services also controls if buildiso will use start_systemd and
|
||||||
|
start_systemd_live or start_openrc and start_openrc_live to determine
|
||||||
|
the default services that will be enabled automatically.
|
||||||
|
</para></listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><varname>kernel=</varname></term>
|
||||||
|
|
||||||
|
<listitem><para>Takes a string corresponding to a
|
||||||
|
manjaro kernel package (ex: linux318 for linux 3.18).
|
||||||
|
</para></listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
</variablelist>
|
</variablelist>
|
||||||
</refsect1>
|
</refsect1>
|
||||||
|
|
||||||
|
|
|
@ -67,17 +67,6 @@
|
||||||
<para>The following options are understood:</para>
|
<para>The following options are understood:</para>
|
||||||
|
|
||||||
<variablelist>
|
<variablelist>
|
||||||
<varlistentry>
|
|
||||||
<term><varname>initsys=</varname></term>
|
|
||||||
|
|
||||||
<listitem><para>Takes <option>systemd</option> (the default)
|
|
||||||
or <option>openrc</option>. Selecting and option will change
|
|
||||||
how the hostname, the displaymanager and services will be configured.
|
|
||||||
For services also controls if buildiso will use start_systemd and
|
|
||||||
start_systemd_live or start_openrc and start_openrc_live to determine
|
|
||||||
the default services that will be enabled automatically.
|
|
||||||
</para></listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>displaymanager=</varname></term>
|
<term><varname>displaymanager=</varname></term>
|
||||||
|
@ -142,14 +131,6 @@
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><varname>kernel=</varname></term>
|
|
||||||
|
|
||||||
<listitem><para>Takes a string corresponding to a
|
|
||||||
manjaro kernel package (ex: linux318 for linux 3.18).
|
|
||||||
</para></listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>efi_boot_loader=</varname></term>
|
<term><varname>efi_boot_loader=</varname></term>
|
||||||
|
|
||||||
|
|
|
@ -619,13 +619,13 @@ make_profile(){
|
||||||
import ${LIBDIR}/util-iso-${iso_fs}.sh
|
import ${LIBDIR}/util-iso-${iso_fs}.sh
|
||||||
${clean_first} && chroot_clean "${work_dir}"
|
${clean_first} && chroot_clean "${work_dir}"
|
||||||
if ${iso_only}; then
|
if ${iso_only}; then
|
||||||
[[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -i" "$1"
|
[[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "$1"
|
||||||
compress_images
|
compress_images
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if ${images_only}; then
|
if ${images_only}; then
|
||||||
build_images
|
build_images
|
||||||
warning "Continue compress: buildiso -p %s -sc ..." "$1"
|
warning "Continue compress: buildiso -p %s -zc ..." "$1"
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
build_images
|
build_images
|
||||||
|
|
Loading…
Reference in a new issue