Hello community,
here is the log from the commit of package libselinux for openSUSE:Factory
checked in at 2014-09-09 18:59:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libselinux (Old)
and /work/SRC/openSUSE:Factory/.libselinux.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libselinux"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libselinux/libselinux.changes 2014-05-22
20:38:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libselinux.new/libselinux.changes
2014-09-09 18:59:20.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Sep 8 08:25:11 UTC 2014 - jseg...@suse.com
+
+- updated selinux-ready script to handle initrd files compressed with xz
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
libselinux.spec: same change
++++++ selinux-ready ++++++
--- /var/tmp/diff_new_pack.o3yFns/_old 2014-09-09 18:59:21.000000000 +0200
+++ /var/tmp/diff_new_pack.o3yFns/_new 2014-09-09 18:59:21.000000000 +0200
@@ -97,9 +97,9 @@
return 2
fi
- cp /boot/$INITRD $TD/i.cpio.gz 2>/dev/null
+ cp /boot/$INITRD $TD/ 2>/dev/null
- if ! [ -f "$TD/i.cpio.gz" ];then
+ if ! [ -f "$TD/$INITRD" ];then
printf "\tcheck_mkinitrd: ERR. Error while copying initrd
file.'\n"
return 2
fi
@@ -109,11 +109,30 @@
cd $TD
mkdir initrd-extracted
cd initrd-extracted
- gunzip -c $TD/i.cpio.gz | cpio -i --force-local --no-absolute-filenames
2>/dev/null
- grep -E -- $MCMD boot/* 2>&1 >/dev/null
- FLG1=$?
- grep -E -- load_policy boot/* 2>&1 >/dev/null
- FLG2=$?
+ INITRD_FORMAT=$(file $TD/$INITRD | awk -F' ' '{print $2}')
+ case $INITRD_FORMAT in
+ 'XZ' )
+ xz -d -c $TD/$INITRD | cpio -i --force-local --no-absolute-filenames
2>/dev/null ;;
+ 'gzip' )
+ gzip -d -c $TD/$INITRD | cpio -i --force-local --no-absolute-filenames
2>/dev/null ;;
+ * )
+ printf "\tcheck_mkinitrd: ERR. Error while extracting initrd
file.'\n"
+ return 2
+ esac
+ if [ -d boot ]; then
+ grep -E -- $MCMD boot/* 2>&1 >/dev/null
+ FLG1=$?
+ grep -E -- load_policy boot/* 2>&1 >/dev/null
+ FLG2=$?
+ else
+ # looks like we're using dracut/systemd. We can only check if libselinux1
+ # exists
+ if [ -f lib64/libselinux.so.1 ]; then
+ # if this exists
+ FLG1=0
+ FLG2=0
+ fi
+ fi
popd 2>&1>/dev/null
if [ $FLG1 == 0 -a $FLG2 == 0 ];then
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
