iankelling.org
/
git
/
automated-distro-installer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b519001
)
nabia has a kernel now. other minor fixes
author
Ian Kelling
<iank@fsf.org>
Tue, 13 Jul 2021 21:44:26 +0000
(17:44 -0400)
committer
Ian Kelling
<iank@fsf.org>
Tue, 13 Jul 2021 21:45:04 +0000
(17:45 -0400)
fai-revm
patch
|
blob
|
history
fai/config/files/etc/apt/preferences.d/nabia-focal/NABIA
patch
|
blob
|
history
fai/config/hooks/partition.DEFAULT
patch
|
blob
|
history
fai/config/package_config/UBUNTU
patch
|
blob
|
history
diff --git
a/fai-revm
b/fai-revm
index 1b9897ebdb34a4831a31e8aca11ec1c28a94bae2..0d117e6d98e1c0a774decd27826fa25eeb6c20c1 100755
(executable)
--- a/
fai-revm
+++ b/
fai-revm
@@
-149,6
+149,9
@@
for ((i=1; i <= disk_count; i++)); do
disk_arg+=("--disk path=$f")
if $new_disk || [[ ! -e $f ]]; then
sudo rm -f $f
disk_arg+=("--disk path=$f")
if $new_disk || [[ ! -e $f ]]; then
sudo rm -f $f
+ # https://btrfs.wiki.kernel.org/index.php/FAQ
+ sudo touch $f
+ chattr +C $f
e sudo qemu-img create -o preallocation=metadata -f qcow2 $f 50G
fi
done
e sudo qemu-img create -o preallocation=metadata -f qcow2 $f 50G
fi
done
diff --git
a/fai/config/files/etc/apt/preferences.d/nabia-focal/NABIA
b/fai/config/files/etc/apt/preferences.d/nabia-focal/NABIA
index 22eb56568329f7c735ccd6e52609afaffa81389c..1e6fc34fe254d11df391c0160bed5006ae53fedb 100644
(file)
--- a/
fai/config/files/etc/apt/preferences.d/nabia-focal/NABIA
+++ b/
fai/config/files/etc/apt/preferences.d/nabia-focal/NABIA
@@
-1,7
+1,3
@@
Package: *
Pin: release n=focal,o=Ubuntu
Pin-Priority: -100
Package: *
Pin: release n=focal,o=Ubuntu
Pin-Priority: -100
-
-Package: linux-image-* linux-modules-* linux-firmware intel-microcode amd64-microcode
-Pin: release n=focal,o=Ubuntu
-Pin-Priority: 500
diff --git
a/fai/config/hooks/partition.DEFAULT
b/fai/config/hooks/partition.DEFAULT
index 0dc4c7d144450870c63eb1931ad736ff95058d26..f98e59556cb8dc338a0c6a3eb6e96344d2c4e68c 100755
(executable)
--- a/
fai/config/hooks/partition.DEFAULT
+++ b/
fai/config/hooks/partition.DEFAULT
@@
-361,8
+361,8
@@
if (( boot_space > 60000 )); then
# recovery needs and for doing pxe-kexec.
boot_mib=10000
root2_mib=200000
# recovery needs and for doing pxe-kexec.
boot_mib=10000
root2_mib=200000
- boot2_mib=
5
00
-elif (( boot_space > 30000 )); then
+ boot2_mib=
20
00
+elif (( boot_spa
_
ce > 30000 )); then
boot_mib=$(( 5000 + (boot_space - 30000) / 2 ))
root2_mib=100
boot2_mib=100
boot_mib=$(( 5000 + (boot_space - 30000) / 2 ))
root2_mib=100
boot2_mib=100
@@
-474,6
+474,9
@@
for dev in ${devs[@]}; do
done
shopt -s nullglob
done
shopt -s nullglob
+# We write to these files instead of just /etc/fstab, /etc/crypttab,
+# because these are filesystems created after our current root, and so
+# this allows us to update other root filesystems too.
rm -f /mnt/root/root2-{fs,crypt}tab
if $mkroot2; then
if $partition; then
rm -f /mnt/root/root2-{fs,crypt}tab
if $mkroot2; then
if $partition; then
diff --git
a/fai/config/package_config/UBUNTU
b/fai/config/package_config/UBUNTU
index 02f852d58d3a326272750d2dc9ba0a6e543d1e76..e672026c2aefa42bc98d263d1fa75d9fe5ce7761 100644
(file)
--- a/
fai/config/package_config/UBUNTU
+++ b/
fai/config/package_config/UBUNTU
@@
-13,5
+13,9
@@
memtest86+
PACKAGES install FLIDAS64 XENIAL64
linux-image-generic-hwe-8.0
PACKAGES install FLIDAS64 XENIAL64
linux-image-generic-hwe-8.0
+PACKAGES install NABIA64 FOCAL64
+linux-image-generic-
+linux-image-generic-hwe-20.04
+
PACKAGES install GERMAN
language-pack-gnome-de
PACKAGES install GERMAN
language-pack-gnome-de