Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pkg/bundled/alpineInit/immucore.files
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
/usr/bin/kairos-agent
/usr/bin/rsync
/usr/bin/sgdisk
/usr/bin/growpart
/usr/bin/dbus-uuidgen
/usr/sbin/multipath
/usr/sbin/parted
/usr/sbin/partprobe
/usr/sbin/resize2fs
/usr/sbin/xfs_growfs
2 changes: 1 addition & 1 deletion pkg/bundled/bundled.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ install() {

inst_check_multiple immucore kairos-agent
# add utils used by yip stages
inst_check_multiple partprobe sync udevadm parted mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.vfat mkfs.fat blkid lsblk e2fsck resize2fs mount umount sgdisk rsync cryptsetup growpart sfdisk gawk awk
inst_check_multiple sync udevadm mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.vfat mkfs.fat blkid lsblk e2fsck resize2fs mount umount sgdisk rsync cryptsetup gawk awk

# Install libraries needed by gawk
inst_libdir_file "libsigsegv.so*"
Expand Down
17 changes: 5 additions & 12 deletions pkg/values/packagemaps.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ var CommonPackages = []string{
"jq", // No idea why we need it, check if we can drop it?
"dosfstools", // For the fat32 partition on EFI systems
"e2fsprogs", // mkfs support for ext2/3/4
"parted", // Partitioning support, check if we need it anymore
"logrotate", // Log rotation support
}

Expand All @@ -65,11 +64,10 @@ var ImmucorePackages = PackageMap{
DebianFamily: {
ArchCommon: {
Common: {
"dracut", // To build the initrd
"dracut-network", // Network-legacy support for dracut
"isc-dhcp-common", // Network-legacy support for dracut, basic tools
"isc-dhcp-client", // Network-legacy support for dracut, basic tools
"cloud-guest-utils", // This brings growpart, so we can resize the partitions
"dracut", // To build the initrd
"dracut-network", // Network-legacy support for dracut
"isc-dhcp-common", // Network-legacy support for dracut, basic tools
"isc-dhcp-client", // Network-legacy support for dracut, basic tools
},
},
},
Expand Down Expand Up @@ -290,7 +288,6 @@ var BasePackages = PackageMap{
"device-mapper",
"fail2ban", // Basic security tool
"findutils",
"growpart",
"gptfdisk",
"haveged",
"htop",
Expand Down Expand Up @@ -351,7 +348,6 @@ var BasePackages = PackageMap{
"bash",
"bash-completion",
"blkid",
"cloud-utils-growpart",
"bonding",
"bridge",
"busybox-openrc",
Expand Down Expand Up @@ -428,7 +424,6 @@ var BasePackages = PackageMap{
"gdisk", // Yip requires it for partitioning, maybe BasePackages
"audit", // For audit support, check if needed?
"cracklib-dicts", // Password dictionary support
"cloud-utils-growpart", // grow partition use. Check if yip still needs it?
"device-mapper", // Device mapper support, needed for lvm and cryptsetup
"device-mapper-multipath", // For multipath support, needed for dracut
"iproute", // Basic tool for networking
Expand Down Expand Up @@ -467,10 +462,8 @@ var BasePackages = PackageMap{
ArchCommon: {
Common: {
// TODO: Check if we need all of these packages, some of them are probably not needed or can go into the family?
"fdisk", // Yip requires it for partitioning
"conntrack",
"console-data", // Console font support
"cloud-guest-utils", // Yip requires it, this brings growpart, so we can resize the partitions
"console-data", // Console font support
"gettext",
"systemd-container", // Not sure if needed?
"ubuntu-advantage-tools", // For ubuntu advantage support, enablement of ubuntu services
Expand Down