Skip to content

Commit 8b189df

Browse files
committed
Revert "A/B root partitions, Two more for persistence"
This reverts commit 5ee7463.
1 parent bc1c763 commit 8b189df

File tree

10 files changed

+3
-52
lines changed

10 files changed

+3
-52
lines changed

features/orabos/file.exclude

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/etc/systemd/network/99-default.network
22
/etc/systemd/system/systemd-resolved.service.d/wait-for-networkd.conf
3-
/etc/repart.d/root.conf
43
/etc/kernel/cmdline.d/99-no-gpt-auto.cfg

features/orabos/file.include/etc/repart.d/30_home.conf

Lines changed: 0 additions & 5 deletions
This file was deleted.

features/orabos/file.include/etc/repart.d/40_var.conf

Lines changed: 0 additions & 5 deletions
This file was deleted.

features/orabos/file.include/etc/repart.d/10_root_a.conf renamed to features/orabos/file.include/etc/repart.d/root_a.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
[Partition]
22
Type=root
3-
SizeMaxBytes=4G

features/orabos/file.include/etc/repart.d/25_root_b.conf renamed to features/orabos/file.include/etc/repart.d/root_b.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[Partition]
22
Type=root
3-
SizeMaxBytes=4G
3+
NoAuto=on

features/orabos/file.include/etc/systemd/system/home.mount

Lines changed: 0 additions & 16 deletions
This file was deleted.

features/orabos/file.include/etc/systemd/system/local-fs.target.wants/home.mount

Lines changed: 0 additions & 1 deletion
This file was deleted.

features/orabos/file.include/etc/systemd/system/local-fs.target.wants/var.mount

Lines changed: 0 additions & 1 deletion
This file was deleted.

features/orabos/file.include/etc/systemd/system/var.mount

Lines changed: 0 additions & 16 deletions
This file was deleted.

features/orabos/fstab.mod

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ set -Eeuo pipefail
44
currentfstab="$(cat)"
55

66
if [ -n "$currentfstab" ]; then
7-
# Expand the UEFI partition and do not create a /usr partition (for now)
8-
sed \
9-
-e'/type=uefi/ s/$/,size=511M/' \
10-
-e '/^[^[:space:]]\+[[:space:]]\+\/usr[[:space:]]\+/d' \
11-
<<< "$currentfstab"
7+
# delete any predefinition of a var partition
8+
sed '/^[^[:space:]]\+[[:space:]]\+\/usr[[:space:]]\+/d' <<< "$currentfstab"
129
fi

0 commit comments

Comments
 (0)