Re: [rhel6-branch] Add the rpmrc file to the initrd.img (#508242)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I think it has to be in /usr/lib so no LIBDIR should be used.

--
Martin Sivák
msivak@xxxxxxxxxx
Red Hat Czech
Anaconda team / Brno, CZ

----- "Martin Gracik" <mgracik@xxxxxxxxxx> wrote:

> We need to have this file so the rpm routines
> don't show up warnings that it's missing.
> ---
>  scripts/mk-images    |    3 +++
>  scripts/upd-instroot |    1 +
>  2 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/scripts/mk-images b/scripts/mk-images
> index bffb5bc..f70ac00 100755
> --- a/scripts/mk-images
> +++ b/scripts/mk-images
> @@ -590,6 +590,7 @@ makeinitrd() {
>      mkdir -m 111 -p $MBD_DIR/var/empty/sshd
>      mkdir -p $MBD_DIR/etc/{pam.d,security}
>      mkdir -p $MBD_DIR/$LIBDIR/security
> +    mkdir -p $MBD_DIR/usr/$LIBDIR/rpm
>  
>      for x in $IMGPATH/$LIBDIR/security/* ; do
>  	y=$(basename $x)
> @@ -857,6 +858,8 @@ makeinitrd() {
>          install -m 644 $IMGPATH/usr/share/terminfo/$i
> $MBD_DIR/etc/terminfo/$i
>      done
>  
> +    cp -a $IMGPATH/usr/$LIBDIR/rpm/rpmrc $MBD_DIR/usr/$LIBDIR/rpm
> +
>      makeproductfile $MBD_DIR
>  
>      for n in insmod rmmod modprobe depmod; do
> diff --git a/scripts/upd-instroot b/scripts/upd-instroot
> index d260726..d375590 100755
> --- a/scripts/upd-instroot
> +++ b/scripts/upd-instroot
> @@ -512,6 +512,7 @@ usr/$LIBDIR/libuser/*
>  usr/$LIBDIR/pango
>  usr/$LIBDIR/python?.?
>  usr/$LIBDIR/rpm/rpmpopt
> +usr/$LIBDIR/rpm/rpmrc
>  usr/$LIBDIR/libiscsi.so*
>  usr/$LIBDIR/libfreebl3.so
>  usr/$LIBDIR/libfreebl3.chk
> -- 
> 1.6.6.1
> 
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list

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


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux