File tree Expand file tree Collapse file tree 3 files changed +27
-0
lines changed Expand file tree Collapse file tree 3 files changed +27
-0
lines changed Original file line number Diff line number Diff line change @@ -85,6 +85,15 @@ update_qubesconfig() {
8585 mount /usr/local || :
8686 fi
8787
88+ rootdev=$( grep -o ' ^[^ ]* / ' /proc/mounts | cut -f 1 -d ' ' ) || rootdev=
89+ # if root volume uses partitions, and is mounted directly (no dm-snapshot),
90+ # check if xvda1 needs filesystem to be created
91+ if [ -n " $rootdev " ] && [ " $( readlink -f " $rootdev " ) " = " /dev/xvda3" ]; then
92+ if [ " $( file -s -b /dev/xvda1) " = " data" ]; then
93+ /sbin/mkfs.vfat -S 4096 -n EFI /dev/xvda1
94+ fi
95+ fi
96+
8897 # Install qubes version of fstab
8998 if ! grep -q dmroot /etc/fstab; then
9099 cp -f /etc/fstab.qubes /etc/fstab
Original file line number Diff line number Diff line change @@ -166,6 +166,15 @@ case "${1}" in
166166 mount /usr/local || :
167167 fi
168168
169+ rootdev=$( grep -o ' ^[^ ]* / ' /proc/mounts | cut -f 1 -d ' ' ) || rootdev=
170+ # if root volume uses partitions, and is mounted directly (no dm-snapshot),
171+ # check if xvda1 needs filesystem to be created
172+ if [ -n " $rootdev " ] && [ " $( readlink -f " $rootdev " ) " = " /dev/xvda3" ]; then
173+ if [ " $( file -s -b /dev/xvda1) " = " data" ]; then
174+ /sbin/mkfs.vfat -S 4096 -n EFI /dev/xvda1
175+ fi
176+ fi
177+
169178 # remove old symlinks
170179 if [ -L /etc/systemd/system/sysinit.target.wants/qubes-random-seed.service ]; then
171180 rm /etc/systemd/system/sysinit.target.wants/qubes-random-seed.service
Original file line number Diff line number Diff line change @@ -574,6 +574,15 @@ if [ -L /usr/local ]; then
574574 mount /usr/local || :
575575fi
576576
577+ rootdev=$(grep -o '^[^ ]* / ' /proc/mounts | cut -f 1 -d ' ') || rootdev=
578+ # if root volume uses partitions, and is mounted directly (no dm-snapshot),
579+ # check if xvda1 needs filesystem to be created
580+ if [ -n "$rootdev" ] && [ "$(readlink -f "$rootdev")" = "/dev/xvda3" ]; then
581+ if [ "$(file -s -b /dev/xvda1)" = "data" ]; then
582+ /sbin/mkfs.vfat -S 4096 -n EFI /dev/xvda1
583+ fi
584+ fi
585+
577586%if 0%{?fedora} < 41
578587if [ ! -f /etc/qubes-dnf-hardened ]; then
579588 dnf config-manager --setopt=zchunk=0 --setopt=deltarpm=0 --save &&
You can’t perform that action at this time.
0 commit comments