sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Move do_extra_package_install to run in install phase"

Browse Source
This commit is contained in:
Jenkins 2017-04-10 01:24:55 +00:00 committed by Gerrit Code Review
commit a076bf66d6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/lib/disk-image-create
View File

@ -79,7 +79,7 @@ function show_options () {
echo " --docker-target -- specify the repo and tag to use if the output type is docker. Defaults to the value of output imagename" echo " --docker-target -- specify the repo and tag to use if the output type is docker. Defaults to the value of output imagename"
if [ "$IS_RAMDISK" == "0" ]; then if [ "$IS_RAMDISK" == "0" ]; then
echo " -n skip the default inclusion of the 'base' element" echo " -n skip the default inclusion of the 'base' element"
echo " -p package[,package,package] -- list of packages to install in the image. If specified multiple times the packages are appended to the list." echo " -p package[,p2...] [-p p3] -- extra packages to install in the image. Runs once, after 'install.d' phase. Can be specified mulitple times"
fi fi
echo " -h|--help -- display this help and exit" echo " -h|--help -- display this help and exit"
echo " --version -- display version and exit" echo " --version -- display version and exit"
@ -283,9 +283,9 @@ echo "export DIB_DEFAULT_INSTALLTYPE=\${DIB_DEFAULT_INSTALLTYPE:-\"${DIB_DEFAULT
run_d extra-data run_d extra-data
# Run pre-install scripts. These do things that prepare the chroot for package installs # Run pre-install scripts. These do things that prepare the chroot for package installs
run_d_in_target pre-install run_d_in_target pre-install
do_extra_package_install
# Call install scripts to pull in the software users want. # Call install scripts to pull in the software users want.
run_d_in_target install run_d_in_target install
do_extra_package_install
run_d_in_target post-install run_d_in_target post-install
# ensure we do not have a lost+found directory in the root folder # ensure we do not have a lost+found directory in the root folder
# that could cause copy to fail (it will be created again later # that could cause copy to fail (it will be created again later

5
releasenotes/notes/dash-p-after-install-58a87549c1c906c3.yaml Normal file
View File

@ -0,0 +1,5 @@
other:
- The packages specified with the `-p` command-line operation are
now installed after the `install.d` phase, not before. This is to
give elements priority when installing packages. The flag
documentation has been updated to describe this.