As of rsyslog-4.4.2-4 rsyslog puts it's libs in $LIBDIR. We aren't
getting them currently and this is causing insta-traceback in stage2
---
scripts/mk-images | 6 +++---
scripts/upd-instroot | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index 92121b9..13ec0c3 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -559,7 +559,7 @@ makeinitrd() {
mkdir -p $MBD_DIR/tmp
mkdir -p $MBD_DIR/usr/libexec
mkdir -p $MBD_DIR/usr/$LIBDIR/NetworkManager
- mkdir -p $MBD_DIR/usr/$LIBDIR/rsyslog
+ mkdir -p $MBD_DIR/$LIBDIR/rsyslog
mkdir -p $MBD_DIR/usr/share/dbus-1/system-services
mkdir -p $MBD_DIR/var/cache/hald
mkdir -p $MBD_DIR/var/lib/dbus
@@ -788,9 +788,9 @@ makeinitrd() {

# rsyslog
instbin $IMGPATH /usr/sbin/rsyslogd $MBD_DIR /sbin/rsyslogd
- ( cd $IMGPATH/usr/$LIBDIR/rsyslog
+ ( cd $IMGPATH/$LIBDIR/rsyslog
for f in *.so; do
- instbin $IMGPATH /usr/$LIBDIR/rsyslog/$f $MBD_DIR /usr/$LIBDIR/rsyslog/$f
+ instbin $IMGPATH /$LIBDIR/rsyslog/$f $MBD_DIR /$LIBDIR/rsyslog/$f
done
)
# EOF has a quote in the first character on purpose; see man bash on here documents
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index ec57f31..1d4af32 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -295,6 +295,7 @@ $LIBDIR/libnssdbm3.so
$LIBDIR/libsoftokn3.so
$LIBDIR/libwrap*.so*
$LIBDIR/multipath/*
+$LIBDIR/rsyslog
$LIBDIR/security/pam_*
bin/arch
bin/basename
@@ -497,7 +498,6 @@ usr/$LIBDIR/libuser/*
usr/$LIBDIR/pango
usr/$LIBDIR/python?.?
usr/$LIBDIR/rpm/rpmpopt
-usr/$LIBDIR/rsyslog
usr/$LIBDIR/libiscsi.so*
usr/$LIBDIR/libsqlite3.so*
usr/$LIBDIR/xorg/modules
--
1.6.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

> As of rsyslog-4.4.2-4 rsyslog puts it's libs in $LIBDIR. We aren't
> getting them currently and this is causing insta-traceback in stage2

Wonderful. Fantastic. I can't wait until we get out of this stupid
game. Go ahead and commit if you've got access. Otherwise, find me in
IRC.

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list