QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always re-create private.img

Browse Source 
To support clean in-place template reinstall for issue #2061.
This commit is contained in:
ttasket 2016-06-16 07:30:55 -04:00 committed by GitHub
parent 819757e754
commit 14f5fc2f1f
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates.spec
View File

@ -65,6 +65,7 @@ fi
%post %post
echo "--> Processing the root.img... (this might take a while)" echo "--> Processing the root.img... (this might take a while)"
rm -f %{dest_dir}/root.img
cat %{dest_dir}/root.img.part.* | tar --sparse -xf - -C %{dest_dir} cat %{dest_dir}/root.img.part.* | tar --sparse -xf - -C %{dest_dir}
rm -f %{dest_dir}/root.img.part.* rm -f %{dest_dir}/root.img.part.*
chown root.qubes %{dest_dir}/root.img chown root.qubes %{dest_dir}/root.img
@ -78,14 +79,12 @@ tar --sparse -cf %{dest_dir}/clean-volatile.img.tar -C %{dest_dir} volatile.img
chown root.qubes %{dest_dir}/clean-volatile.img.tar chown root.qubes %{dest_dir}/clean-volatile.img.tar
chmod 0660 %{dest_dir}/clean-volatile.img.tar chmod 0660 %{dest_dir}/clean-volatile.img.tar
if [ "$1" = 1 ] ; then
# installing for the first time
echo "--> Creating private.img..." echo "--> Creating private.img..."
rm -f %{dest_dir}/private.img
truncate -s 2G %{dest_dir}/private.img truncate -s 2G %{dest_dir}/private.img
mkfs.ext4 -m 0 -q -F %{dest_dir}/private.img mkfs.ext4 -m 0 -q -F %{dest_dir}/private.img
chown root.qubes %{dest_dir}/private.img chown root.qubes %{dest_dir}/private.img
chmod 0660 %{dest_dir}/private.img chmod 0660 %{dest_dir}/private.img
fi
export XDG_DATA_DIRS=/usr/share/ export XDG_DATA_DIRS=/usr/share/