root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

buildiso: #162; some cosmeticss

Browse source 
update man
This commit is contained in:
udeved 2016-02-17 19:21:20 +01:00
parent 97d5758b59
commit 7d69df39dc
5 changed files with 48 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bin/buildiso.in
View file

@ -73,6 +73,8 @@ display_settings(){
msg2 "arch: %s" "${arch}"
msg2 "branch: %s" "${branch}"
msg2 "chroots_iso: %s" "${chroots_iso}"
msg2 "initsys: %s" "${initsys}"
msg2 "kernel: %s" "${kernel}"
msg "ARGS:"
msg2 "clean_first: %s" "${clean_first}"
@ -91,8 +93,6 @@ display_settings(){
msg2 "iso_app_id: %s" "${iso_app_id}"
msg2 "iso_compression: %s" "${iso_compression}"
msg2 "iso_checksum: %s" "${iso_checksum}"
msg2 "initsys: %s" "${initsys}"
msg2 "kernel: %s" "${kernel}"
msg2 "use_overlayfs: %s" "${use_overlayfs}"
msg "BUILD QUEUE:"
@ -128,11 +128,11 @@ usage() {
echo " [default: ${cache_dir_iso}]"
echo ' -k <name> Kernel to use'
echo " [default: ${kernel}]"
echo ' -z <name> Init system to use'
echo ' -i <name> Init system to use'
echo " [default: ${initsys}]"
echo ' -c Disable clean work dir'
echo ' -i Build images only'
echo ' -s Generate iso only'
echo ' -x Build images only'
echo ' -z Generate iso only'
echo ' Requires pre built images (-i)'
echo ' -v Verbose output, show profies detail (-q)'
echo ' -q Query settings and pretend build'
@ -144,7 +144,7 @@ usage() {
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
case "${arg}" in
@ -154,10 +154,10 @@ while getopts "${opts}" arg; do
r) chroots_iso="$OPTARG" ;;
t) cache_dir_iso="$OPTARG" ;;
k) kernel="$OPTARG" ;;
z) initsys="$OPTARG" ;;
i) initsys="$OPTARG" ;;
c) clean_first=false ;;
i) images_only=true ;;
s) iso_only=true ;;
x) images_only=true ;;
z) iso_only=true ;;
v) verbose=true ;;
q) pretend=true ;;
h|?) usage 0 ;;

18
docbook/buildiso.xml
View file

@ -103,6 +103,18 @@
<listitem><para>Iso target directory where the final iso will be stored.</para></listitem>
</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>
<term><option>-c</option></term>
@ -110,15 +122,15 @@
</varlistentry>
<varlistentry>
<term><option>-i</option></term>
<term><option>-x</option></term>
<listitem><para>Only build images, without creating an ISO file.</para></listitem>
</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>

21
docbook/manjaro-tools.conf.xml
View file

@ -272,6 +272,27 @@
<option>sha384</option> or <option>sha512</option>.
</para></listitem>
</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>
</refsect1>

19
docbook/profile.conf.xml
View file

@ -67,17 +67,6 @@
<para>The following options are understood:</para>
<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>
<term><varname>displaymanager=</varname></term>
@ -142,14 +131,6 @@
</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>
<varlistentry>
<term><varname>efi_boot_loader=</varname></term>

4
lib/util-iso.sh
View file

@ -619,13 +619,13 @@ make_profile(){
import ${LIBDIR}/util-iso-${iso_fs}.sh
${clean_first} && chroot_clean "${work_dir}"
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
exit 1
fi
if ${images_only}; then
build_images
warning "Continue compress: buildiso -p %s -sc ..." "$1"
warning "Continue compress: buildiso -p %s -zc ..." "$1"
exit 1
else
build_images