Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2011-11-14 13:17:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkinitrd", Maintainer is "MMarek@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2011-11-08 09:31:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2011-11-14 13:17:08.000000000 +0100 @@ -226,0 +227,5 @@ +Thu Sep 2 13:22:46 CEST 2010 - mmarek@suse.cz + +- Do not use the chroot binary from the target system (bnc#635856). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes new/mkinitrd-2.7.0/mkinitrd.changes --- old/mkinitrd-2.7.0/mkinitrd.changes 2011-11-07 13:55:24.000000000 +0100 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-11-09 23:19:02.000000000 +0100 @@ -224,6 +224,11 @@ - Fix for new coreutils (bnc#654364). ------------------------------------------------------------------- +Thu Sep 2 13:22:46 CEST 2010 - mmarek@suse.cz + +- Do not use the chroot binary from the target system (bnc#635856). + +------------------------------------------------------------------- Wed Aug 25 15:05:03 CEST 2010 - mmarek@suse.cz - setup-modules.sh: Cleanup. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-boot.sh new/mkinitrd-2.7.0/scripts/boot-boot.sh --- old/mkinitrd-2.7.0/scripts/boot-boot.sh 2011-11-07 13:55:24.000000000 +0100 +++ new/mkinitrd-2.7.0/scripts/boot-boot.sh 2011-11-09 23:19:02.000000000 +0100 @@ -19,7 +19,6 @@ selinux_load_policy() { local NEWROOT=$1 - local CR="${NEWROOT}/usr/bin/chroot" local SELINUX="enforcing" [ -e "$NEWROOT/etc/selinux/config" ] && . "$NEWROOT/etc/selinux/config" @@ -48,10 +47,10 @@ # load_policy does mount /proc and /selinux in # libselinux,selinux_init_load_policy() if [ -x "$NEWROOT/sbin/load_policy" ]; then - $CR "$NEWROOT" /sbin/load_policy -i + chroot "$NEWROOT" /sbin/load_policy -i ret=$? else - $CR "$NEWROOT" /usr/sbin/load_policy -i + chroot "$NEWROOT" /usr/sbin/load_policy -i ret=$? fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org