Skip to content

Remove CentOS-specific code and assets #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aramprice merged 1 commit into from
Jun 10, 2026
Merged

Remove CentOS-specific code and assets #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion bosh-stemcell/lib/shellout_types/service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def check_service_enabled(runlevel)
stdout, stderr, status = @chroot.run("cat", "/etc/*release")
raise stderr.to_s if status != 0

raise "Cannot determine Linux distribution: #{stdout}" unless /Ubuntu|CentOS|openSUSE/.match?(stdout)
raise "Cannot determine Linux distribution: #{stdout}" unless /Ubuntu|openSUSE/.match?(stdout)
Comment thread
aramprice marked this conversation as resolved.

check_is_enabled_systemctl
end
Expand Down
8 changes: 0 additions & 8 deletions bosh-stemcell/spec/support/stemcell_shared_examples.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,5 @@
end
end
end

describe "default su directive" do
describe file("/etc/logrotate.d/default_su_directive") do
it "does `su root root` after any leading comments" do
expect(subject.content).to match(/\A(#.*\n)*su root root\Z/)
end
end
end
end
end
32 changes: 0 additions & 32 deletions stemcell_builder/stages/bosh_audit_centos/apply.sh
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions stemcell_builder/stages/image_install_grub/apply.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ add_on_exit "umount ${image_mount_point}"
# == Guide to variables in this script (all paths are defined relative to the real root dir, not the chroot)

# work: the base working directory outside the chroot
# eg: /mnt/stemcells/aws/xen/centos/work/work
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work
# disk_image: path to the stemcell disk image
# eg: /mnt/stemcells/aws/xen/centos/work/work/aws-xen-centos.raw
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work/aws-xen-ubuntu.raw
# device: path to the loopback devide mapped to the entire disk image
# eg: /dev/loop0
# loopback_dev: device node mapped to the main partition in disk_image
# eg: /dev/mapper/loop0p1
# image_mount_point: place where loopback_dev is mounted as a filesystem
# eg: /mnt/stemcells/aws/xen/centos/work/work/mnt
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work/mnt

# Generate random password
random_password=$(tr -dc A-Za-z0-9_ < /dev/urandom | head -c 16)
Expand Down
6 changes: 3 additions & 3 deletions stemcell_builder/stages/image_install_grub_efi/apply.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ add_on_exit "umount ${image_mount_point}/boot/efi"
# == Guide to variables in this script (all paths are defined relative to the real root dir, not the chroot)

# work: the base working directory outside the chroot
# eg: /mnt/stemcells/aws/xen/centos/work/work
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work
# disk_image: path to the stemcell disk image
# eg: /mnt/stemcells/aws/xen/centos/work/work/aws-xen-centos.raw
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work/aws-xen-ubuntu.raw
# device: path to the loopback devide mapped to the entire disk image
# eg: /dev/loop0
# loopback_efi_dev: device node mapped to the EFI boot ("/boot/efi") partition in disk_image
# eg: /dev/mapper/loop0p1
# loopback_root_dev: device node mapped to the root partition ("/") in disk_image
# eg: /dev/mapper/loop0p2
# image_mount_point: place where loopback_dev is mounted as a filesystem
# eg: /mnt/stemcells/aws/xen/centos/work/work/mnt
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work/mnt

# Generate random password
random_password=$(tr -dc A-Za-z0-9_ < /dev/urandom | head -c 16)
Expand Down
6 changes: 3 additions & 3 deletions stemcell_builder/stages/image_install_grub_softlayer_two_partitions/apply.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ add_on_exit "umount ${image_mount_point}/boot"
# == Guide to variables in this script (all paths are defined relative to the real root dir, not the chroot)

# work: the base working directory outside the chroot
# eg: /mnt/stemcells/aws/xen/centos/work/work
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work
# disk_image: path to the stemcell disk image
# eg: /mnt/stemcells/aws/xen/centos/work/work/aws-xen-centos.raw
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work/aws-xen-ubuntu.raw
# device: path to the loopback devide mapped to the entire disk image
# eg: /dev/loop0
# loopback_dev: device node mapped to the main partition in disk_image
# eg: /dev/mapper/loop0p1
# image_mount_point: place where loopback_dev is mounted as a filesystem
# eg: /mnt/stemcells/aws/xen/centos/work/work/mnt
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work/mnt

# Generate random password
random_password=$(tr -dc A-Za-z0-9_ < /dev/urandom | head -c 16)
Expand Down
5 changes: 0 additions & 5 deletions stemcell_builder/stages/logrotate_config/apply.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,10 @@ install_logrotate_cron_script() {
sed -i -e 's/^\s*\(\/usr\/sbin\/logrotate\)\b/nice -n 19 ionice -c3 \1/' "$chroot/usr/bin/logrotate-cron"
}

install_default_su_directive() {
cp -f "$assets_dir/default_su_directive" "$chroot/etc/logrotate.d/default_su_directive"
}

install_logrotate_conf
install_setup_logrotate_script
seed_default_logrotate_cronjob
install_logrotate_cron_script
install_default_su_directive

## TODO: either remove /etc/logrotate.d/{wtmp,btmp}
## or remove it from logrotate.conf and copy over the default created wtmp,btmp files
Expand Down
58 changes: 0 additions & 58 deletions stemcell_builder/stages/logrotate_config/assets/centos-logrotate.conf
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions stemcell_builder/stages/logrotate_config/assets/default_su_directive
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions stemcell_builder/stages/password_policies/assets/centos/password-auth.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions stemcell_builder/stages/password_policies/assets/centos/system-auth.patch
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion stemcell_builder/stages/system_open_vm_tools/apply.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ base_dir=$(readlink -nf $(dirname $0)/../..)
source $base_dir/lib/prelude_apply.bash
source $base_dir/lib/prelude_bosh.bash

# Installation on CentOS requires v7
pkg_mgr install open-vm-tools

# open-vm-tools installs unwanted fusermount binary
Expand Down
Loading