aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2024-02-05 00:04:09 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2024-02-05 00:04:09 +0100
commit6d6cb508fecf2d4ea96310665a6a008475f43419 (patch)
tree0e27f7e68977c703bf60a9b9d0c430fba2e30d8b
parentAdd binhost-amd64-x86-64-openrc (diff)
downloadbinhost-6d6cb508fecf2d4ea96310665a6a008475f43419.tar.gz
binhost-6d6cb508fecf2d4ea96310665a6a008475f43419.tar.bz2
binhost-6d6cb508fecf2d4ea96310665a6a008475f43419.zip
Reset changes in config files
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rwxr-xr-xbuilders/demeter/binhost-update1
-rwxr-xr-xbuilders/jiji/binhost-update1
2 files changed, 2 insertions, 0 deletions
diff --git a/builders/demeter/binhost-update b/builders/demeter/binhost-update
index 1e235c7..9d1166b 100755
--- a/builders/demeter/binhost-update
+++ b/builders/demeter/binhost-update
@@ -99,6 +99,7 @@ for n in ${NSPAWN_NAMES} ; do
echo Machine ${n} &>> ${TMPFILE}
echo &>> ${TMPFILE}
cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
+ git reset --hard &>> ${TMPFILE}
git pull -q &>> ${TMPFILE}
cd /root &>> ${TMPFILE}
systemd-nspawn --bind /var/cache/distfiles --bind-ro /var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g -M ${n} /root/bin/run-update &>> ${TMPFILE}
diff --git a/builders/jiji/binhost-update b/builders/jiji/binhost-update
index 17953d0..3c7e6bb 100755
--- a/builders/jiji/binhost-update
+++ b/builders/jiji/binhost-update
@@ -99,6 +99,7 @@ for n in ${NSPAWN_NAMES} ; do
echo Machine ${n} &>> ${TMPFILE}
echo &>> ${TMPFILE}
cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
+ git reset --hard &>> ${TMPFILE}
git pull -q &>> ${TMPFILE}
cd /root &>> ${TMPFILE}
systemd-nspawn --bind /var/cache/distfiles --bind-ro /var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g -M ${n} /root/bin/run-update &>> ${TMPFILE}