Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2015-01-06 09:06:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2014-12-25 23:20:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2015-01-06 09:06:37.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 25 08:52:12 UTC 2014 - [email protected] + +- grub2-snapper-plugin.sh: cleanup grub-snapshot.cfg not referring + to any snapshot (boo#909359) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2-snapper-plugin.sh ++++++ --- /var/tmp/diff_new_pack.lXiJEO/_old 2015-01-06 09:06:39.000000000 +0100 +++ /var/tmp/diff_new_pack.lXiJEO/_new 2015-01-06 09:06:39.000000000 +0100 @@ -104,12 +104,20 @@ snapshot="${s_dir}/snapshot" # list only read-only snapshot (bnc#878528) - if [ -w "$snapshot" ]; then + if [ ! -d ${s_dir} -o -w "$snapshot" ]; then continue fi if [ -r "${s_dir}/info.xml" -a -r "${s_dir}/snapshot/boot/grub2/grub.cfg" ]; then cs="${s_dir} ${cs}" + else + # cleanup any grub-snapshot.cfg without associated snapshot info + snapper_cfg="${s_dir}/${snapshot_submenu_name}" + if [ -f "$snapper_cfg" ]; then + rm -f "$snapper_cfg" + rmdir "$s_dir" 2>/dev/null || true + fi + continue fi done -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
