diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2016-10-05 18:38:00 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2016-10-05 18:38:00 +0200 |
commit | 0f5ecab2c42b76753848cd4213336b2dd225d95c (patch) | |
tree | 2afb1bf5dbf34d45d9e96b3720e320c3c8964fea | |
parent | e9de8f0af0223971999415d5cdedb0714ed72da9 (diff) | |
download | archauto-0f5ecab2c42b76753848cd4213336b2dd225d95c.tar.gz archauto-0f5ecab2c42b76753848cd4213336b2dd225d95c.tar.bz2 |
added cfengine in auto install
-rwxr-xr-x | Attic/copy_local_packages.sh | 35 | ||||
-rwxr-xr-x | archauto.sh | 3 | ||||
-rwxr-xr-x | copy_local_packages.sh | 2 |
3 files changed, 4 insertions, 36 deletions
diff --git a/Attic/copy_local_packages.sh b/Attic/copy_local_packages.sh deleted file mode 100755 index 776d74a..0000000 --- a/Attic/copy_local_packages.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -rm -rf {core,extra,community}/os/x86_64/ -mkdir -p {core,extra,community}/os/x86_64/ - -for p in `cat archiso/arch/pkglist.x86_64.txt`; do - case $p in - core/*) - pkgname=`echo $p | cut -f 2 -d /` - if test -f /var/cache/pacman/pkg/$pkgname*x86_64.pkg.tar.xz; then - cp /var/cache/pacman/pkg/$pkgname*x86_64.pkg.tar.xz core/os/x86_64/. - fi - if test -f /var/cache/pacman/pkg/$pkgname*any.pkg.tar.xz; then - cp /var/cache/pacman/pkg/$pkgname*any.pkg.tar.xz core/os/x86_64/. - fi - ;; - esac -done - -ADDITIONAL_PKGS="libunistring-0.9.3-6 ntp-4.2.7.p441-1 joe-3.7-4 git-1.9.2-1 perl-error-0.17022-1 libxml2-2.9.1-5" -for pkgname in $ADDITIONAL_PKGS; do - if test -f /var/cache/pacman/pkg/$pkgname*x86_64.pkg.tar.xz; then - cp /var/cache/pacman/pkg/$pkgname*x86_64.pkg.tar.xz core/os/x86_64/. - fi - if test -f /var/cache/pacman/pkg/$pkgname*any.pkg.tar.xz; then - cp /var/cache/pacman/pkg/$pkgname*any.pkg.tar.xz core/os/x86_64/. - fi -done - -repo-add -n core/os/x86_64/core.db.tar.gz core/os/x86_64/* -ln -fs core.db.tar.gz core/os/x86_64/core.db -tar zcvfT extra/os/x86_64/extra.db.tar.gz /dev/null -ln -fs extra.db.tar.gz extra/os/x86_64/extra.db -tar zcvfT community/os/x86_64/community.db.tar.gz /dev/null -ln -fs community.db.tar.gz community/os/x86_64/community.db diff --git a/archauto.sh b/archauto.sh index 9fc002c..d223af4 100755 --- a/archauto.sh +++ b/archauto.sh @@ -39,6 +39,7 @@ sed -i 's/^SigLevel.*/SigLevel = Never/g' ${MOUNT_PATH}/etc/pacman.conf sed -i "/\[core\]/aServer = ${HTTP_SERVER}/\$repo/os/\$arch" ${MOUNT_PATH}/etc/pacman.conf sed -i "/\[extra\]/aServer = ${HTTP_SERVER}/\$repo/os/\$arch" ${MOUNT_PATH}/etc/pacman.conf sed -i "/\[community\]/aServer = ${HTTP_SERVER}/\$repo/os/\$arch" ${MOUNT_PATH}/etc/pacman.conf +printf "\n[myrepo]\nServer = ${HTTP_SERVER}/\$repo/os/\$arch\n" >> ${MOUNT_PATH}/etc/pacman.conf arch-chroot ${MOUNT_PATH} pacman -Sy @@ -75,6 +76,8 @@ echo "server ${NTP_SERVER}" >> ${MOUNT_PATH}/etc/ntp.conf arch-chroot ${MOUNT_PATH} systemctl enable ntpd.service +arch-chroot ${MOUNT_PATH} pacman --noconfirm -S libyaml cfengine + echo "Unmounting.." umount ${MOUNT_PATH}/boot diff --git a/copy_local_packages.sh b/copy_local_packages.sh index c7110d7..1ff3c16 100755 --- a/copy_local_packages.sh +++ b/copy_local_packages.sh @@ -17,7 +17,7 @@ for p in `cat archiso/arch/pkglist.x86_64.txt`; do esac done -ADDITIONAL_PKGS="ntp-4.2.8.p8-1" +ADDITIONAL_PKGS="ntp-4.2.8.p8-1 joe-4.3-1 libxml2-2.9.4+4+g3169602-1 lmdb-0.9.18-1 libyaml-0.1.7-1" for pkgname in $ADDITIONAL_PKGS; do if test -f /var/cache/pacman/pkg/$pkgname*x86_64.pkg.tar.xz; then cp /var/cache/pacman/pkg/$pkgname*x86_64.pkg.tar.xz core/os/x86_64/. |