Re: [PATCH] load_policy has moved from /usr/sbin to /sbin (#523506).

David Cantrell <dcantrell@xxxxxxxxxx> · Tue, 15 Sep 2009 12:18:03 -1000 (HST)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Looks fine.  Applied so I can do a rebuild today.

On Tue, 15 Sep 2009, Chris Lumens wrote:

---
loader/selinux.c     |    4 ++--
scripts/mk-images    |    1 +
scripts/upd-instroot |    2 +-
3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/loader/selinux.c b/loader/selinux.c
index b565a12..337d041 100644
--- a/loader/selinux.c
+++ b/loader/selinux.c
@@ -41,8 +41,8 @@ int loadpolicy() {

    if (!(pid = fork())) {
        setenv("LD_LIBRARY_PATH", LIBPATH, 1);
-        execl("/usr/sbin/load_policy",
-              "/usr/sbin/load_policy", "-q", NULL);
+        execl("/sbin/load_policy",
+              "/sbin/load_policy", "-q", NULL);
        logMessage(ERROR, "exec of load_policy failed: %m");
        exit(1);
    }
diff --git a/scripts/mk-images b/scripts/mk-images
index 67e5c70..f3a5a51 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -767,6 +767,7 @@ makeinitrd() {
    instbin $IMGPATH /usr/bin/grep $MBD_DIR /sbin/grep
    instbin $IMGPATH /usr/bin/kill $MBD_DIR /sbin/kill
    instbin $IMGPATH /usr/bin/ln $MBD_DIR /sbin/ln
+    instbin $IMGPATH /usr/sbin/load_policy $MBD_DIR /sbin/load_policy
    instbin $IMGPATH /usr/bin/mkdir $MBD_DIR /sbin/mkdir
    instbin $IMGPATH /usr/bin/readlink $MBD_DIR /sbin/readlink
    instbin $IMGPATH /usr/bin/rm $MBD_DIR /sbin/rm
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 749540e..9d4a79a 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -416,6 +416,7 @@ sbin/iscsid
sbin/iscsistart
sbin/jfs_tune
sbin/ldconfig
+sbin/load_policy
sbin/lspci
sbin/lvm*
sbin/mdadm
@@ -558,7 +559,6 @@ usr/sbin/fbset
usr/sbin/genhomedircon
usr/sbin/gptsync
usr/sbin/hald
-usr/sbin/load_policy
usr/sbin/lvm
usr/sbin/mkofboot
usr/sbin/ofpath


- -- 
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkqwEpsACgkQ5hsjjIy1Vkn5RACg7mNeS7bhJ3hi16dzftWkzMnm
/1cAoMlzVuTKZ2St3gh/d2w/cqIrCUvo
=PDOX
-----END PGP SIGNATURE-----

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




