forked from pool/grub2
Accepting request 245532 from home:michael-chang:test
- update snapper plugin for rollback support * refresh grub2-snapper-plugin.sh OBS-URL: https://build.opensuse.org/request/show/245532 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=107
This commit is contained in:
Michael Chang
Git OBS Bridge
parent
165a6b361f
commit
f605727964
@ -18,117 +18,148 @@ set -e
|
|||||||
|
|
||||||
grub_mkconfig="/usr/sbin/grub2-mkconfig"
|
grub_mkconfig="/usr/sbin/grub2-mkconfig"
|
||||||
grub_mkrelpath="/usr/bin/grub2-mkrelpath"
|
grub_mkrelpath="/usr/bin/grub2-mkrelpath"
|
||||||
|
grub_script_check="/usr/bin/grub2-script-check"
|
||||||
grub_setting="/etc/default/grub"
|
grub_setting="/etc/default/grub"
|
||||||
grub_cfg="/boot/grub2/grub.cfg"
|
grub_cfg="/boot/grub2/grub.cfg"
|
||||||
grub_snapshot_cfg="/boot/grub2/snapshot_submenu.cfg"
|
grub_snapshot_cfg="/boot/grub2/snapshot_submenu.cfg"
|
||||||
|
|
||||||
snapshot_submenu_name="snapshot_submenu.cfg"
|
snapper_snapshot_path="/.snapshots"
|
||||||
snapshot_menuentry_name="snapshot_menuentry.cfg"
|
snapshot_submenu_name="grub-snapshot.cfg"
|
||||||
snapshot_menuentry_cfg="boot/grub2/${snapshot_menuentry_name}"
|
snapper_snapshots_cfg="${snapper_snapshot_path}/${snapshot_submenu_name}"
|
||||||
|
|
||||||
rel_root=`"$grub_mkrelpath" /`
|
# add hotkeys for s390. (bnc#885668)
|
||||||
|
hotkey=
|
||||||
|
incr_hotkey()
|
||||||
|
{
|
||||||
|
[ -n "$hotkey" ] || return
|
||||||
|
expr $hotkey + 1
|
||||||
|
}
|
||||||
|
print_hotkey()
|
||||||
|
{
|
||||||
|
keys="123456789abdfgijklmnoprstuvwyz"
|
||||||
|
if [ -z "$hotkey" ]||[ $hotkey -eq 0 ]||[ $hotkey -gt 30 ]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
echo "--hotkey=$(expr substr $keys $hotkey 1)"
|
||||||
|
}
|
||||||
|
|
||||||
snapshot_submenu_refresh () {
|
|
||||||
|
|
||||||
for s_dir in /.snapshots/*; do
|
snapshot_submenu () {
|
||||||
|
|
||||||
|
s_dir="$1"
|
||||||
|
|
||||||
snapshot="${s_dir}/snapshot"
|
snapshot="${s_dir}/snapshot"
|
||||||
snapper_cfg="${s_dir}/${snapshot_submenu_name}"
|
num="`basename $s_dir`"
|
||||||
|
|
||||||
if [ ! -d "$snapshot" ]; then
|
|
||||||
rm -f "${snapper_cfg}"
|
|
||||||
rm -f "${s_dir}/${snapshot_menuentry_name}"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
# bnc#864842 Important snapshots are not marked as such in grub2 menu
|
# bnc#864842 Important snapshots are not marked as such in grub2 menu
|
||||||
# the format is "important distribution version (kernel_version, timestamp, pre/post)"
|
# the format is "important distribution version (kernel_version, timestamp, pre/post)"
|
||||||
cfgs="${s_dir}/${snapshot_menuentry_name} ${snapshot}/${snapshot_menuentry_cfg}"
|
|
||||||
date=`xmllint --xpath '/snapshot/date/text()' "${s_dir}/info.xml" || echo ""`
|
date=`xmllint --xpath '/snapshot/date/text()' "${s_dir}/info.xml" || echo ""`
|
||||||
date=`echo $date | sed 's/\(.*\) \(.*\):.*/\1,\2/'`
|
date=`echo $date | sed 's/\(.*\) \(.*\):.*/\1T\2/'`
|
||||||
important=`xmllint --xpath "/snapshot/userdata[key='important']/value/text()" "${s_dir}/info.xml" || echo ""`
|
important=`xmllint --xpath "/snapshot/userdata[key='important']/value/text()" "${s_dir}/info.xml" 2>/dev/null || echo ""`
|
||||||
stype=`xmllint --xpath '/snapshot/type/text()' "${s_dir}/info.xml" || echo ""`
|
stype=`xmllint --xpath '/snapshot/type/text()' "${s_dir}/info.xml" || echo ""`
|
||||||
kernel_ver=`readlink /boot/vmlinuz | sed 's/vmlinuz-\([^-]*\).*/\1/'`
|
kernel_ver=`readlink ${snapshot}/boot/vmlinuz | sed -e 's/^vmlinuz-//' -e 's/-default$//'`
|
||||||
|
if [ -z "$kernel_ver" -a -L ${snapshot}/boot/image ]; then
|
||||||
|
kernel_ver=`readlink ${snapshot}/boot/image | sed -e 's/^image-//' -e 's/-default$//'`
|
||||||
|
fi
|
||||||
eval `cat ${snapshot}/etc/os-release`
|
eval `cat ${snapshot}/etc/os-release`
|
||||||
test "$important" = "yes" && important="*" || important=""
|
test "$important" = "yes" && important="*" || important=" "
|
||||||
test "$stype" = "single" && stype=""
|
test "$stype" = "single" && stype=""
|
||||||
|
|
||||||
if test -n "$stype"; then
|
test -z "$stype" || stype=",$stype"
|
||||||
title="${important}${NAME} $VERSION ($kernel_ver,$date,$stype)"
|
desc=`xmllint --xpath '/snapshot/description/text()' "${s_dir}/info.xml" 2>/dev/null || echo ""`
|
||||||
else
|
#test "$desc" = "timeline" && return 1
|
||||||
title="${important}${NAME} $VERSION ($kernel_ver,$date)"
|
test -z "$desc" || desc=",$desc"
|
||||||
|
title="${important}${NAME} $VERSION ($kernel_ver,$date$stype$desc)"
|
||||||
|
|
||||||
|
cat <<EOF
|
||||||
|
|
||||||
|
if [ -f "${snapper_snapshot_path}/$num/snapshot/boot/grub2/grub.cfg" ]; then
|
||||||
|
snapshot_found=true
|
||||||
|
saved_subvol=\$btrfs_subvol
|
||||||
|
menuentry `print_hotkey` "$title" "${snapper_snapshot_path}/$num/snapshot" "`$grub_mkrelpath ${snapper_snapshot_path}/${num}/snapshot`" {
|
||||||
|
btrfs_subvol="\$2"
|
||||||
|
extra_cmdline="rootflags=subvol=\$3"
|
||||||
|
export extra_cmdline
|
||||||
|
snapshot_num=$num
|
||||||
|
export snapshot_num
|
||||||
|
configfile "\$btrfs_subvol/boot/grub2/grub.cfg"
|
||||||
|
btrfs_subvol=\$saved_subvol
|
||||||
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cat <<EOF > "${snapper_cfg}.new"
|
EOF
|
||||||
|
hotkey=`incr_hotkey`
|
||||||
for x in $cfgs; do
|
return 0
|
||||||
snap="${rel_root}${snapshot}"
|
}
|
||||||
snap_cfg="${rel_root}\$x"
|
|
||||||
|
|
||||||
if [ -f "\$snap_cfg" ]; then
|
snapper_snapshots_cfg_refresh () {
|
||||||
snapshot_found=true
|
|
||||||
submenu "$title" "\$snap" "\$snap_cfg" {
|
if [ ! -d "$snapper_snapshot_path" ]; then
|
||||||
set subvol="\$2"
|
return
|
||||||
export subvol
|
fi
|
||||||
source "\$3"
|
|
||||||
}
|
for s_dir in ${snapper_snapshot_path}/*; do
|
||||||
break
|
|
||||||
|
snapshot="${s_dir}/snapshot"
|
||||||
|
|
||||||
|
# list only read-only snapshot (bnc#878528)
|
||||||
|
if [ -w "$snapshot" ]; then
|
||||||
|
continue
|
||||||
fi
|
fi
|
||||||
|
if [ -r "${s_dir}/info.xml" -a -r "${s_dir}/snapshot/boot/grub2/grub.cfg" ]; then
|
||||||
|
cs="${s_dir}\n${cs}"
|
||||||
|
fi
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
EOF
|
hk=""
|
||||||
|
[ -z "$hotkey" ] || hk="--hotkey=s"
|
||||||
if grub2-script-check "${snapper_cfg}.new"; then
|
|
||||||
mv -f "${snapper_cfg}.new" "${snapper_cfg}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
for c in `echo -e "${cs}" | sort -Vr`; do
|
||||||
|
if ! snapshot_submenu "$c" > "${c}/${snapshot_submenu_name}"; then
|
||||||
|
rm -f "${c}/${snapshot_submenu_name}"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
snapshot_cfg="${snapshot_cfg}
|
||||||
|
if [ -f "$c/${snapshot_submenu_name}"; then
|
||||||
|
source "$c/${snapshot_submenu_name}"
|
||||||
|
fi"
|
||||||
|
done
|
||||||
|
|
||||||
}
|
cat <<EOF >"${snapper_snapshots_cfg}.new"
|
||||||
|
if [ -z "\$extra_cmdline" ]; then
|
||||||
grub_snapshot_cfg_refresh () {
|
submenu $hk "Start bootloader from a read-only snapshot" {${snapshot_cfg}
|
||||||
|
if [ x\$snapshot_found != xtrue ]; then
|
||||||
: > "${grub_snapshot_cfg}.tmp"
|
submenu "Not Found" { true; }
|
||||||
for s_dir in /.snapshots/*; do
|
fi
|
||||||
|
}
|
||||||
snapshot="${s_dir}/snapshot"
|
|
||||||
snapper_cfg="${s_dir}/${snapshot_submenu_name}"
|
|
||||||
|
|
||||||
if [ -f "${snapper_cfg}" ]; then
|
|
||||||
echo "source ${rel_root}${snapper_cfg}" >>"${grub_snapshot_cfg}.tmp"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
|
||||||
|
|
||||||
cat <<EOF >"${grub_snapshot_cfg}.new"
|
|
||||||
submenu "Bootable snapshots" {
|
|
||||||
`sort -V "${grub_snapshot_cfg}.tmp"`
|
|
||||||
if [ x\$snapshot_found != xtrue ]; then
|
|
||||||
submenu "Not Found" {true}
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
if grub2-script-check "${grub_snapshot_cfg}.new"; then
|
|
||||||
mv -f "${grub_snapshot_cfg}.new" "${grub_snapshot_cfg}"
|
|
||||||
fi
|
fi
|
||||||
|
EOF
|
||||||
|
|
||||||
|
if ${grub_script_check} "${snapper_snapshots_cfg}.new"; then
|
||||||
|
mv -f "${snapper_snapshots_cfg}.new" "${snapper_snapshots_cfg}"
|
||||||
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
snapshot_submenu_clean () {
|
snapshot_submenu_clean () {
|
||||||
|
|
||||||
for s_dir in /.snapshots/*; do
|
for s_dir in ${snapper_snapshot_path}/*; do
|
||||||
|
|
||||||
snapshot="${s_dir}/snapshot"
|
|
||||||
snapper_cfg="${s_dir}/${snapshot_submenu_name}"
|
snapper_cfg="${s_dir}/${snapshot_submenu_name}"
|
||||||
|
|
||||||
if [ -f "$snapper_cfg" ]; then
|
if [ -f "$snapper_cfg" ]; then
|
||||||
rm -f "$snapper_cfg"
|
rm -f "$snapper_cfg"
|
||||||
|
rmdir "$s_dir" 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [ -f "${snapper_snapshot_path}/${snapshot_submenu_name}" ]; then
|
||||||
|
rm -f "${snapper_snapshot_path}/${snapshot_submenu_name}"
|
||||||
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
set_grub_setting () {
|
set_grub_setting () {
|
||||||
@ -137,17 +168,32 @@ set_grub_setting () {
|
|||||||
val=$2
|
val=$2
|
||||||
|
|
||||||
if grep -q "$name" "$grub_setting"; then
|
if grep -q "$name" "$grub_setting"; then
|
||||||
sed -i -e "s/.*\($name\)=.*/\1=$val/" "$grub_setting"
|
sed -i -e "s!.*\($name\)=.*!\1=\"$val\"!" "$grub_setting"
|
||||||
else
|
else
|
||||||
echo "$name=$val" >> "$grub_setting"
|
echo "$name=\"$val\"" >> "$grub_setting"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
update_grub_cfg () {
|
enable_grub_settings () {
|
||||||
|
set_grub_setting SUSE_BTRFS_SNAPSHOT_BOOTING "true"
|
||||||
"$grub_mkconfig" -o "$grub_cfg"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
disable_grub_settings () {
|
||||||
|
set_grub_setting SUSE_BTRFS_SNAPSHOT_BOOTING "false"
|
||||||
|
}
|
||||||
|
|
||||||
|
update_grub () {
|
||||||
|
"${grub_mkconfig}" -o "${grub_cfg}"
|
||||||
|
}
|
||||||
|
|
||||||
|
machine=`uname -m`
|
||||||
|
case "$machine" in
|
||||||
|
(s390|s390x)
|
||||||
|
hotkey=1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
cmdline="$0 $* hotkey='$hotkey'"
|
||||||
|
|
||||||
# Check the arguments.
|
# Check the arguments.
|
||||||
while test $# -gt 0
|
while test $# -gt 0
|
||||||
do
|
do
|
||||||
@ -173,32 +219,20 @@ do
|
|||||||
done
|
done
|
||||||
|
|
||||||
if [ "x${opt_enable}" = "xtrue" ]; then
|
if [ "x${opt_enable}" = "xtrue" ]; then
|
||||||
|
#enable_grub_settings
|
||||||
set_grub_setting SUSE_DISABLE_BOOTING_SNAPSHOT false
|
#update_grub
|
||||||
set_grub_setting SUSE_ENABLE_CUSTOM_SNAPSHOT_SUBMENU true
|
snapper_snapshots_cfg_refresh
|
||||||
update_grub_cfg
|
|
||||||
snapshot_submenu_refresh
|
|
||||||
grub_snapshot_cfg_refresh
|
|
||||||
|
|
||||||
elif [ "x${opt_enable}" = "xfalse" ]; then
|
elif [ "x${opt_enable}" = "xfalse" ]; then
|
||||||
|
#disable_grub_settings
|
||||||
|
update_grub
|
||||||
snapshot_submenu_clean
|
snapshot_submenu_clean
|
||||||
set_grub_setting SUSE_DISABLE_BOOTING_SNAPSHOT true
|
|
||||||
set_grub_setting SUSE_ENABLE_CUSTOM_SNAPSHOT_SUBMENU false
|
|
||||||
update_grub_cfg
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ x${opt_refresh} = "xtrue" ]; then
|
if [ x${opt_refresh} = "xtrue" ]; then
|
||||||
|
snapper_snapshots_cfg_refresh
|
||||||
snapshot_submenu_refresh
|
|
||||||
grub_snapshot_cfg_refresh
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ x${opt_clean} = "xtrue" ]; then
|
if [ x${opt_clean} = "xtrue" ]; then
|
||||||
|
|
||||||
snapshot_submenu_clean
|
snapshot_submenu_clean
|
||||||
grub_snapshot_cfg_refresh
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Aug 21 06:10:07 UTC 2014 - mchang@suse.com
|
||||||
|
|
||||||
|
- update snapper plugin for rollback support
|
||||||
|
* refresh grub2-snapper-plugin.sh
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Aug 15 07:55:54 UTC 2014 - mchang@suse.com
|
Fri Aug 15 07:55:54 UTC 2014 - mchang@suse.com
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user