diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/n/ca-certificates/ca-certificates.SlackBuild | 2 | ||||
-rw-r--r-- | source/n/ca-certificates/doinst.sh | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/n/ca-certificates/ca-certificates.SlackBuild b/source/n/ca-certificates/ca-certificates.SlackBuild index 6e06613ac..baaf0ca18 100755 --- a/source/n/ca-certificates/ca-certificates.SlackBuild +++ b/source/n/ca-certificates/ca-certificates.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ca-certificates VERSION=${VERSION:-$(echo certdata-*.txt.xz | cut -f 2 -d - | cut -f 1 -d .)} ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/n/ca-certificates/doinst.sh b/source/n/ca-certificates/doinst.sh index 9e50c5598..cf1f984b5 100644 --- a/source/n/ca-certificates/doinst.sh +++ b/source/n/ca-certificates/doinst.sh @@ -17,7 +17,11 @@ config() { # /usr/local/share/ca-certificates directory. #config etc/ca-certificates.conf.new -if [ -x /usr/sbin/update-ca-certificates ]; then - /usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null +# We don't want to run this from the installer because we've got a script +# that runs it after all the packages are installed. But if we do run it, +# we should chroot into the target partition to make sure the updates are +# done in the correct location (and not on the calling partition): +if [ ! -r /usr/lib/setup/setup ]; then + chroot . /usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null fi |