From 7d69df39dc4cb70d6b33df3773cd23fe251209a8 Mon Sep 17 00:00:00 2001 From: udeved Date: Wed, 17 Feb 2016 19:21:20 +0100 Subject: [PATCH] buildiso: #162; some cosmeticss update man --- bin/buildiso.in | 18 +++++++++--------- docbook/buildiso.xml | 20 ++++++++++++++++---- docbook/manjaro-tools.conf.xml | 21 +++++++++++++++++++++ docbook/profile.conf.xml | 19 ------------------- lib/util-iso.sh | 4 ++-- 5 files changed, 48 insertions(+), 34 deletions(-) diff --git a/bin/buildiso.in b/bin/buildiso.in index 8fc6276..61f0b52 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -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 Kernel to use' echo " [default: ${kernel}]" - echo ' -z Init system to use' + echo ' -i 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 ;; diff --git a/docbook/buildiso.xml b/docbook/buildiso.xml index d1dd6ba..b5dd9d2 100644 --- a/docbook/buildiso.xml +++ b/docbook/buildiso.xml @@ -97,12 +97,24 @@ Root working directory where the iso will be built. - + Iso target directory where the final iso will be stored. + + + + The init system on the iso + + + + + + The kernel on the iso + + @@ -110,15 +122,15 @@ - + Only build images, without creating an ISO file. - + - Generate iso from already created images, for example created with the -i option. + Generate iso from already created images, for example created with the -x option. diff --git a/docbook/manjaro-tools.conf.xml b/docbook/manjaro-tools.conf.xml index 07d94f6..43378d4 100644 --- a/docbook/manjaro-tools.conf.xml +++ b/docbook/manjaro-tools.conf.xml @@ -272,6 +272,27 @@ or . + + + initsys= + + Takes (the default) + or . 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. + + + + + kernel= + + Takes a string corresponding to a + manjaro kernel package (ex: linux318 for linux 3.18). + + + diff --git a/docbook/profile.conf.xml b/docbook/profile.conf.xml index fe346a5..955bf40 100644 --- a/docbook/profile.conf.xml +++ b/docbook/profile.conf.xml @@ -67,17 +67,6 @@ The following options are understood: - - initsys= - - Takes (the default) - or . 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. - - displaymanager= @@ -142,14 +131,6 @@ - - kernel= - - Takes a string corresponding to a - manjaro kernel package (ex: linux318 for linux 3.18). - - - efi_boot_loader= diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 80979c3..af54fe4 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -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