forked from ungleich-public/cdist
Merge branch 'master' into feature_install_and_preos
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
This commit is contained in:
commit
4a5bd2069f
7 changed files with 42 additions and 19 deletions
|
@ -11,7 +11,7 @@ cdist-type__package - Manage packages
|
|||
DESCRIPTION
|
||||
-----------
|
||||
This cdist type allows you to install or uninstall packages on the target.
|
||||
It dispatches the actual work to the package system dependant types.
|
||||
It dispatches the actual work to the package system dependent types.
|
||||
|
||||
|
||||
REQUIRED PARAMETERS
|
||||
|
@ -26,7 +26,7 @@ name::
|
|||
package name.
|
||||
version::
|
||||
The version of the package to install. Default is to install the version
|
||||
choosen by the local package manager.
|
||||
chosen by the local package manager.
|
||||
type::
|
||||
The package type to use. Default is determined based on the $os explorer
|
||||
variable.
|
||||
|
|
|
@ -28,7 +28,7 @@ state::
|
|||
|
||||
version::
|
||||
The version of the package to install. Default is to install the version
|
||||
choosen by the local package manager. For a list of available versions,
|
||||
chosen by the local package manager. For a list of available versions,
|
||||
have a look at the output of "zypper se -s packagename"
|
||||
|
||||
ptype::
|
||||
|
|
|
@ -5,7 +5,7 @@ Ramon Salvadó <rsalvado--@--gnuine--dot--com>
|
|||
|
||||
NAME
|
||||
----
|
||||
cdist-type__timezone - Allows to configure the desired localtime timezone.
|
||||
cdist-type__timezone - Allows one to configure the desired localtime timezone.
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
@ -13,6 +13,9 @@ Changelog
|
|||
* Core: Integrate initial install support (Nico Schottelius)
|
||||
* Core: Integrate initial preos support (Nico Schottelius)
|
||||
|
||||
next:
|
||||
* Documentation: Fix spelling in manual pages (Dmitry Bogatov)
|
||||
|
||||
3.1.13: 2015-05-16
|
||||
* Type __block: Fix support for non stdin blocks (Dominique Roux)
|
||||
* Type __consul: Install package unzip (Nico Schottelius)
|
||||
|
|
|
@ -84,7 +84,7 @@ confdir/manifest/init::
|
|||
|
||||
confdir/manifest/*::
|
||||
All other files in this directory are not directly used by cdist, but you
|
||||
can seperate configuration mappings, if you have a lot of code in the
|
||||
can separate configuration mappings, if you have a lot of code in the
|
||||
conf/manifest/init file. This may also be helpful to have different admins
|
||||
maintain different groups of hosts.
|
||||
|
||||
|
@ -112,10 +112,10 @@ confdir/type/<name>/gencode-remote::
|
|||
Used to generate code to be executed on the target host
|
||||
|
||||
confdir/type/<name>/parameter/required::
|
||||
Parameters required by type, \n seperated list.
|
||||
Parameters required by type, \n separated list.
|
||||
|
||||
confdir/type/<name>/parameter/optional::
|
||||
Parameters optionally accepted by type, \n seperated list.
|
||||
Parameters optionally accepted by type, \n separated list.
|
||||
|
||||
confdir/type/<name>/parameter/default/*::
|
||||
Default values for optional parameters.
|
||||
|
@ -123,7 +123,7 @@ confdir/type/<name>/parameter/default/*::
|
|||
be read from the file confdir/type/<name>/parameter/default/foo.
|
||||
|
||||
confdir/type/<name>/parameter/boolean::
|
||||
Boolean parameters accepted by type, \n seperated list.
|
||||
Boolean parameters accepted by type, \n separated list.
|
||||
|
||||
confdir/type/<name>/explorer::
|
||||
Location of the type specific explorers.
|
||||
|
|
|
@ -236,7 +236,7 @@ How to override objects:
|
|||
__user foobar --password 'some_fancy_hash' --home /home/foobarexample
|
||||
|
||||
# ... many statements and includes in the manifest later ...
|
||||
# somewhere in a conditionaly sourced manifest
|
||||
# somewhere in a conditionally sourced manifest
|
||||
# (e.g. for example only sourced if a special application is on the target host)
|
||||
|
||||
# this leads to an error ...
|
||||
|
|
|
@ -2,34 +2,54 @@
|
|||
# Nico Schottelius
|
||||
# Fri May 1 17:31:50 CEST 2015
|
||||
|
||||
# [18:09] wurzel:.cdist-ruag% ldd /usr/bin/ls | sed -e 's/=>//' -e 's/(.*//' | awk '{ if(NF == 2) { print $2 } else { print $1 } }'
|
||||
|
||||
PATH=/bin:/sbin:/usr/bin:/usr/sbin
|
||||
|
||||
if [ "$#" -ne 1 ]; then
|
||||
echo "$0 dir-out"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
out_dir=$1
|
||||
|
||||
#bin_list="udevadm bash fdisk mount syslinux umount rm mv"
|
||||
bin_list="udevadm fdisk"
|
||||
|
||||
libs=$(mktemp /tmp/cdist-preos-libs.XXXXXXXXXXXXX)
|
||||
|
||||
for bin in bin_list; do
|
||||
mkdir -p "$out_dir/bin" "$out_dir/lib"
|
||||
|
||||
(
|
||||
for bin in $bin_list; do
|
||||
src=$(which "$bin")
|
||||
cp "$src" "$out_dir/bin"
|
||||
|
||||
ldd "$src" | sed -e 's/=>//' -e 's/(.*//' | awk '{ if(NF == 2) { print $2 } else { print $1 } }'
|
||||
done
|
||||
) | sort | uniq > "$libs"
|
||||
|
||||
|
||||
done
|
||||
while read lib; do
|
||||
if echo $lib | grep '^/'; then
|
||||
# echo "Copying fqdn lib $lib ..."
|
||||
cp "$lib" "$out_dir/lib"
|
||||
else
|
||||
echo "How to copy $lib ?"
|
||||
fi
|
||||
done < "$libs"
|
||||
|
||||
|
||||
rm -f "$libs"
|
||||
|
||||
# lfs
|
||||
## ldd /bin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
|
||||
|
||||
exit 0
|
||||
|
||||
|
||||
bin=$1
|
||||
|
||||
list=""
|
||||
new_list=$(objdump -p /usr/bin/ls | awk '$1 ~ /NEEDED/ { print $2 }')
|
||||
|
||||
[18:16] wurzel:.cdist-ruag% ldconfig -p | grep 'libBrokenLocale.so.1$' | sed 's/.* => //'
|
||||
# Not used alternatives
|
||||
# new_list=$(objdump -p /usr/bin/ls | awk '$1 ~ /NEEDED/ { print $2 }')
|
||||
# ldconfig -p | grep 'libBrokenLocale.so.1$' | sed 's/.* => //'
|
||||
|
||||
|
||||
for new_item in $new_list; do
|
||||
|
|
Loading…
Reference in a new issue