QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to handle private.img (fail)

Browse Source 
mv and rm private.img like root.img, but this results in no private.img after reinstall.
do not use.
(cherry picked from commit 577944c8fb)
This commit is contained in:
ttasket 2016-06-20 14:04:55 -04:00 committed by Marek Marczykowski-Górecki
parent 428ff4e503
commit 7a14278a97
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom0-updates/qubes-dom0-update
View File

@ -72,7 +72,8 @@ if [ "$YUM_ACTION" == "reinstall" ] && [[ "$PKGS" == *"qubes-template-"* ]]; the
# Prepare to backup template root.img in case reinstall doesn't complete. # Prepare to backup template root.img in case reinstall doesn't complete.
TEMPLATE=${ONEPKG#qubes-template-} TEMPLATE=${ONEPKG#qubes-template-}
if ! TEMPLATE_NETVM=`qvm-prefs --force-root $TEMPLATE netvm` \ if ! TEMPLATE_NETVM=`qvm-prefs --force-root $TEMPLATE netvm` \
|| ! BAK_TEMPLATE_ROOT=`qvm-prefs --force-root $TEMPLATE root_img` ; then || ! BAK_TEMPLATE_ROOT=`qvm-prefs --force-root $TEMPLATE root_img` \
|| ! BAK_TEMPLATE_PRIVATE=`qvm-prefs --force-root $TEMPLATE private_img` ; then
exit 1 exit 1
fi fi
if [[ "$TEMPLATE_NETVM" == *"(default)" ]] ; then if [[ "$TEMPLATE_NETVM" == *"(default)" ]] ; then
@ -184,10 +185,16 @@ fi
if [ "x$PKGS" != "x" ]; then if [ "x$PKGS" != "x" ]; then
if [[ -n "$BAK_TEMPLATE_ROOT" ]] ; then if [[ -n "$BAK_TEMPLATE_ROOT" ]] ; then
# Backup root.img just in case # Backup root.img and private.img just in case
if mv "$BAK_TEMPLATE_ROOT" "$BAK_TEMPLATE_ROOT-bak" ; then if mv "$BAK_TEMPLATE_ROOT" "$BAK_TEMPLATE_ROOT-bak" \
&& mv "$BAK_TEMPLATE_PRIVATE" "$BAK_TEMPLATE_PRIVATE-bak" ; then
echo "Renamed template root.img to root.img-bak" echo "Renamed template root.img to root.img-bak"
echo "Renamed template private.img to private.img-bak"
else else
if [ -f "$BAK_TEMPLATE_ROOT-bak" ] ;then
echo "Aborting reinstall; Restoring root.img"
mv "$BAK_TEMPLATE_ROOT-bak" "$BAK_TEMPLATE_ROOT"
fi
exit 1 exit 1
fi fi
fi fi
@ -200,6 +207,8 @@ if [ "x$PKGS" != "x" ]; then
# Reinstall went OK, remove backup files. # Reinstall went OK, remove backup files.
echo "Removing $BAK_TEMPLATE_ROOT-bak" echo "Removing $BAK_TEMPLATE_ROOT-bak"
rm -f "$BAK_TEMPLATE_ROOT-bak" rm -f "$BAK_TEMPLATE_ROOT-bak"
echo "Removing $BAK_TEMPLATE_PRIVATE-bak"
rm -f "$BAK_TEMPLATE_PRIVATE-bak"
fi fi
fi fi
elif [ -f /var/lib/qubes/updates/repodata/repomd.xml ]; then elif [ -f /var/lib/qubes/updates/repodata/repomd.xml ]; then