diff options
Diffstat (limited to '')
| -rwxr-xr-x | share/build-scripts/curl (renamed from share/scripts/curl) | 0 | ||||
| -rwxr-xr-x | share/build-scripts/curl.d/0001-debconf (renamed from share/scripts/curl.d/0001-debconf) | 0 | ||||
| -rw-r--r-- | share/build-scripts/curl.d/0001-debconf.templates (renamed from share/scripts/curl.d/0001-debconf.templates) | 2 | ||||
| -rwxr-xr-x | share/build-scripts/debconf (renamed from share/scripts/debconf) | 12 | ||||
| -rwxr-xr-x | share/build-scripts/debconf.d/0001-preseed-file (renamed from share/scripts/debconf.d/0001-preseed-file) | 0 | ||||
| -rw-r--r-- | share/build-scripts/debconf.d/0001-preseed-file.templates (renamed from share/scripts/debconf.d/0001-preseed-file.templates) | 2 | ||||
| -rwxr-xr-x | share/build-scripts/debconf.d/0002-preseed-debconf (renamed from share/scripts/debconf.d/0002-preseed-debconf) | 0 | ||||
| -rwxr-xr-x | share/build-scripts/debconf.d/0003-debconf (renamed from share/scripts/debconf.d/0003-debconf) | 0 | ||||
| -rw-r--r-- | share/build-scripts/debconf.d/0003-debconf.templates (renamed from share/scripts/debconf.d/0003-debconf.templates) | 0 | ||||
| -rwxr-xr-x | share/build-scripts/debootstrap (renamed from share/scripts/debootstrap) | 2 |
10 files changed, 9 insertions, 9 deletions
diff --git a/share/scripts/curl b/share/build-scripts/curl index 98c2b82..98c2b82 100755 --- a/share/scripts/curl +++ b/share/build-scripts/curl diff --git a/share/scripts/curl.d/0001-debconf b/share/build-scripts/curl.d/0001-debconf index 083d469..083d469 100755 --- a/share/scripts/curl.d/0001-debconf +++ b/share/build-scripts/curl.d/0001-debconf diff --git a/share/scripts/curl.d/0001-debconf.templates b/share/build-scripts/curl.d/0001-debconf.templates index c87e47e..59319e4 100644 --- a/share/scripts/curl.d/0001-debconf.templates +++ b/share/build-scripts/curl.d/0001-debconf.templates @@ -8,4 +8,4 @@ Default: Choices-C: ${CHOICES_C} Choices: ${CHOICES} Description: Container list: - Select the system to use for creating the container. + Select the system to use for building the container. diff --git a/share/scripts/debconf b/share/build-scripts/debconf index 86c871f..39856ae 100755 --- a/share/scripts/debconf +++ b/share/build-scripts/debconf @@ -23,13 +23,14 @@ PROJECT="open-infrastructure" SOFTWARE="compute-tools" PROGRAM="container" +SCRIPT="${0}" +export SCRIPT + +CACHE="/var/cache/${PROGRAM}/build-$(basename ${SCRIPT})" CONFIG="/etc/${SOFTWARE}/config" HOOKS="/etc/${SOFTWARE}/hooks" MACHINES="/var/lib/machines" -SCRIPT="${0}" -export SCRIPT - Parameters () { GETOPT_LONGOPTIONS="bind:,bind-ro:,script:,name:,preseed-file:" @@ -98,7 +99,7 @@ Parameters () Usage () { - echo "Usage: container create -n|--name NAME -s|--script ${SCRIPT} -- [-p|--preseed-file FILE]" >&2 + echo "Usage: container build -n|--name NAME -s|--script ${SCRIPT} -- [-p|--preseed-file FILE]" >&2 exit 1 } @@ -1105,7 +1106,7 @@ do done # Run debconf parts -for DEBCONF_SCRIPT in "/usr/share/${SOFTWARE}/scripts/debconf.d"/* +for DEBCONF_SCRIPT in "/usr/share/${SOFTWARE}/build-scripts/debconf.d"/* do if [ -x "${DEBCONF_SCRIPT}" ] then @@ -1116,7 +1117,6 @@ done # Read-in configuration from debconf . "${DEBCONF_TMPDIR}/debconf.default" -CACHE="/var/cache/${PROGRAM}/${MODE}" SYSTEM="${MACHINES}/${NAME}" ## Generic parts diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/build-scripts/debconf.d/0001-preseed-file index d70e4e1..d70e4e1 100755 --- a/share/scripts/debconf.d/0001-preseed-file +++ b/share/build-scripts/debconf.d/0001-preseed-file diff --git a/share/scripts/debconf.d/0001-preseed-file.templates b/share/build-scripts/debconf.d/0001-preseed-file.templates index 7e12e0d..9be825d 100644 --- a/share/scripts/debconf.d/0001-preseed-file.templates +++ b/share/build-scripts/debconf.d/0001-preseed-file.templates @@ -13,6 +13,6 @@ Type: string Default: Description: Enter (optional) preseed file to use: A preseed file can be used to automatically answer questions to this - container create script. + container build script. . If you do not want to use a preseed file, leave this question empty. diff --git a/share/scripts/debconf.d/0002-preseed-debconf b/share/build-scripts/debconf.d/0002-preseed-debconf index 4bc4da6..4bc4da6 100755 --- a/share/scripts/debconf.d/0002-preseed-debconf +++ b/share/build-scripts/debconf.d/0002-preseed-debconf diff --git a/share/scripts/debconf.d/0003-debconf b/share/build-scripts/debconf.d/0003-debconf index c1c4e79..c1c4e79 100755 --- a/share/scripts/debconf.d/0003-debconf +++ b/share/build-scripts/debconf.d/0003-debconf diff --git a/share/scripts/debconf.d/0003-debconf.templates b/share/build-scripts/debconf.d/0003-debconf.templates index 73952a8..73952a8 100644 --- a/share/scripts/debconf.d/0003-debconf.templates +++ b/share/build-scripts/debconf.d/0003-debconf.templates diff --git a/share/scripts/debootstrap b/share/build-scripts/debootstrap index 9f5b6eb..4c047ee 100755 --- a/share/scripts/debootstrap +++ b/share/build-scripts/debootstrap @@ -111,7 +111,7 @@ Parameters () Usage () { - echo "Usage: container create -n|--name NAME -s|--script ${SCRIPT} -- [-a|--architecture ARCHITECTURE] [-d|--distribution DISTRIBUTION] [-m|--mirror MIRROR] [-p|--password PASSWORD}" >&2 + echo "Usage: container build -n|--name NAME -s|--script ${SCRIPT} -- [-a|--architecture ARCHITECTURE] [-d|--distribution DISTRIBUTION] [-m|--mirror MIRROR] [-p|--password PASSWORD}" >&2 exit 1 } |