summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-09-10 15:34:00 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-09-10 15:34:00 -0500
commit2a8d253ec29ca94d858504b06a631ea320dc71e0 (patch)
treeb83a110b6eb16f5d07ccf5e32111eb7bde6bfe4c
parent72de345688dac452e3154aea9632cfd8302a1f19 (diff)
downloadimage-2a8d253ec29ca94d858504b06a631ea320dc71e0.tar.gz
image-2a8d253ec29ca94d858504b06a631ea320dc71e0.tar.bz2
image-2a8d253ec29ca94d858504b06a631ea320dc71e0.tar.xz
image-2a8d253ec29ca94d858504b06a631ea320dc71e0.zip
adelie-build-cd: Output ISOs in separate out/ dir
-rwxr-xr-xadelie-build-cd8
1 files changed, 5 insertions, 3 deletions
diff --git a/adelie-build-cd b/adelie-build-cd
index 1c6aa91..0bf4744 100755
--- a/adelie-build-cd
+++ b/adelie-build-cd
@@ -63,9 +63,10 @@ ensure_commands() {
usage() {
- printf 'usage: %s [-a ARCH] [-f|--full] [-p|--phase PHASE] [--help]\n\n' $PROGNAME
- printf 'Create an Adélie Linux CD image (.ISO) using the specified parameters.\n'
+ printf 'usage: %s [-a ARCH] [-f|--full] [-p|--phase PHASE] [-v VERSION] [--help]\n\n' $PROGNAME
+ printf 'Create an Adélie Linux CD image (.ISO) using the specified parameters.\n\n'
printf 'Default ARCH: %s\n' $def_arch
+ printf 'Default VERSION: %s\n' $def_ver
printf 'Valid phases: clean install initrd iso all\n'
}
@@ -307,7 +308,8 @@ create_iso() {
CD_VERSION=${CD_VERSION/-alpha/a}
CD_VERSION=${CD_VERSION/-beta/b}
CD_VERSION=${CD_VERSION/-rc/rc}
- xorriso -as mkisofs -o adelie-${DO_FULL:-live}-$ARCH-$VERSION-$(date +%Y%m%d).iso -joliet -rational-rock -V "Adelie $CD_VERSION $ARCH" ${CD_PARAMS} cdroot-$ARCH
+ mkdir -p out
+ xorriso -as mkisofs -o out/adelie-${DO_FULL:-live}-$ARCH-$VERSION-$(date +%Y%m%d).iso -joliet -rational-rock -V "Adelie $CD_VERSION $ARCH" ${CD_PARAMS} cdroot-$ARCH
}
case $PHASE in