diff options
| author | Jesse Keating <jkeating@redhat.com> | 2010-02-11 17:52:04 -0800 |
|---|---|---|
| committer | Jesse Keating <jkeating@redhat.com> | 2010-02-12 08:36:24 -0800 |
| commit | e8cdfc480ccec62cfb2b70598dd792bbab43a1b2 (patch) | |
| tree | 094ce59120bcdf301f771d259463c618162b3668 | |
| parent | f1d97dc86252cf36d2eb03cc5e9f3d8d17027f95 (diff) | |
| download | anaconda-e8cdfc480ccec62cfb2b70598dd792bbab43a1b2.tar.gz anaconda-e8cdfc480ccec62cfb2b70598dd792bbab43a1b2.tar.xz anaconda-e8cdfc480ccec62cfb2b70598dd792bbab43a1b2.zip | |
Find rsyslog libs in $LIBDIR not /usr/$LIBDIR
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
| -rwxr-xr-x | scripts/mk-images | 6 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 15b6f7b1d..bc04a98aa 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -561,7 +561,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 @@ -790,9 +790,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 ec57f316f..1d4af3272 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 |