From 15f5ec936273d5c2ce397fdf9d3b2ee4a96fbbcc Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 14 Jun 2021 14:37:40 -0400 Subject: [PATCH] Rename common to 'default' --- confluent_osdeploy/confluent_osdeploy.spec.tmpl | 3 +-- .../el8-diskless/profile/{common => default}/scripts/functions | 0 .../profile/{common => default}/scripts/imageboot.sh | 0 .../profile/{common => default}/scripts/onboot.service | 0 .../el8-diskless/profile/{common => default}/scripts/onboot.sh | 0 5 files changed, 1 insertion(+), 2 deletions(-) rename confluent_osdeploy/el8-diskless/profile/{common => default}/scripts/functions (100%) rename confluent_osdeploy/el8-diskless/profile/{common => default}/scripts/imageboot.sh (100%) rename confluent_osdeploy/el8-diskless/profile/{common => default}/scripts/onboot.service (100%) rename confluent_osdeploy/el8-diskless/profile/{common => default}/scripts/onboot.sh (100%) diff --git a/confluent_osdeploy/confluent_osdeploy.spec.tmpl b/confluent_osdeploy/confluent_osdeploy.spec.tmpl index af9f324b..ff73d71d 100644 --- a/confluent_osdeploy/confluent_osdeploy.spec.tmpl +++ b/confluent_osdeploy/confluent_osdeploy.spec.tmpl @@ -41,8 +41,7 @@ for os in el8; do mkdir ${os}disklessout cd ${os}disklessout cp -a ../opt . - #TODO: actually have el8 stateless content - #cp -a ../${os}-diskless/initramfs/* . + cp -a ../${os}-diskless/initramfs/* . cp -a ../common/* . cp -a ../stateless-bin/* opt/confluent/bin find . | cpio -H newc -o > ../addons.cpio diff --git a/confluent_osdeploy/el8-diskless/profile/common/scripts/functions b/confluent_osdeploy/el8-diskless/profile/default/scripts/functions similarity index 100% rename from confluent_osdeploy/el8-diskless/profile/common/scripts/functions rename to confluent_osdeploy/el8-diskless/profile/default/scripts/functions diff --git a/confluent_osdeploy/el8-diskless/profile/common/scripts/imageboot.sh b/confluent_osdeploy/el8-diskless/profile/default/scripts/imageboot.sh similarity index 100% rename from confluent_osdeploy/el8-diskless/profile/common/scripts/imageboot.sh rename to confluent_osdeploy/el8-diskless/profile/default/scripts/imageboot.sh diff --git a/confluent_osdeploy/el8-diskless/profile/common/scripts/onboot.service b/confluent_osdeploy/el8-diskless/profile/default/scripts/onboot.service similarity index 100% rename from confluent_osdeploy/el8-diskless/profile/common/scripts/onboot.service rename to confluent_osdeploy/el8-diskless/profile/default/scripts/onboot.service diff --git a/confluent_osdeploy/el8-diskless/profile/common/scripts/onboot.sh b/confluent_osdeploy/el8-diskless/profile/default/scripts/onboot.sh similarity index 100% rename from confluent_osdeploy/el8-diskless/profile/common/scripts/onboot.sh rename to confluent_osdeploy/el8-diskless/profile/default/scripts/onboot.sh