Skip to content

Commit 4b05d5d

Browse files
committed
revert as jammy is now availble in the rsyslog repo
1 parent 82b80e6 commit 4b05d5d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

bosh-stemcell/spec/assets/dpkg-list-ubuntu-jammy.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ libedit2:amd64
175175
libefiboot1:amd64
176176
libefivar1:amd64
177177
libelf1:amd64
178-
libestr0:amd64
178+
libestr0
179179
libexpat1:amd64
180180
libext2fs2:amd64
181181
libfastjson4:amd64
@@ -225,6 +225,7 @@ libkrb5support0:amd64
225225
libldap-2.5-0:amd64
226226
liblmdb0:amd64
227227
liblocale-gettext-perl
228+
liblognorm5
228229
liblsan0:amd64
229230
liblz4-1:amd64
230231
liblzma5:amd64
@@ -426,6 +427,8 @@ rng-tools-debian
426427
rpcsvc-proto
427428
rsync
428429
rsyslog
430+
rsyslog-mmjsonparse
431+
rsyslog-mmnormalize
429432
rsyslog-gnutls
430433
rsyslog-relp
431434
runit

stemcell_builder/stages/base_ubuntu_packages/apply.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ if [[ "${DISTRIB_CODENAME}" == 'trusty' ]]; then
5151
rm -f nvme-cli_0.5-1_amd64.deb
5252
"
5353
fi
54-
# TODO: adiscon does not have jammy repo need to wait
55-
# run_in_chroot $chroot "add-apt-repository ppa:adiscon/v8-stable"
56-
# pkg_mgr install "rsyslog rsyslog-gnutls rsyslog-mmjsonparse rsyslog-mmnormalize rsyslog-relp"
54+
55+
run_in_chroot $chroot "add-apt-repository ppa:adiscon/v8-stable"
56+
pkg_mgr install "rsyslog rsyslog-gnutls rsyslog-mmjsonparse rsyslog-mmnormalize rsyslog-relp"
5757
pkg_mgr install "rsyslog rsyslog-gnutls rsyslog-relp"
5858
run_in_chroot $chroot "
5959
cd /tmp

0 commit comments

Comments
 (0)