From b64d59cd1c9b798cfe4f7fd2e8e022dbc75082e3 Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Thu, 19 May 2022 16:46:19 +0100 Subject: [PATCH 07/11] boom: drop Grub2 integration scripts and defaults file Remove the 42_boom grub2-mkconfig hook script and the boom grub2 integration configuration in /etc/default/boom and fix the corresponding test cases accordingly. Closes: #2 Signed-off-by: Bryn M. Reeves --- boom.spec | 6 ---- etc/default/boom | 3 -- etc/grub.d/42_boom | 35 ------------------- .../boom_off/etc/default/boom | 3 -- .../boom_off/etc/grub.d/42_boom | 35 ------------------- .../boom_on/boot/grub2/grub.cfg | 10 ------ .../boom_on/etc/default/boom | 3 -- .../boom_on/etc/grub.d/42_boom | 35 ------------------- .../{boom_on => default}/boot/boom/boom.conf | 0 ...cc4acde98e84f671e3b-localhost-testing.host | 0 ...2b1d5e2a9ede501b2815fac9c69-localhost.host | 0 ...f0ba735fe63c50ba1d98-localhost-ALABEL.host | 0 ...31bf37c27caf168695409e2f0b4-localhost.host | 0 ...bd37511ed08919f7561c5ae6663ab027f-qux.host | 0 ...b9083be599e61d26bdff2c2c97-debian8.profile | 0 ...24192b15d91dc9612343a3-ubuntu16.04.profile | 0 ...d97a0082fcd0270da994b2bff7a-newos1.profile | 0 ...05bc2850ba01f4838739a1b-nooptions1.profile | 0 ...b20c6a46c7fc31b04be465e973-rhel7.2.profile | 0 ...869ba1756cce40c7d8c4c24db9-blanks1.profile | 0 ...25676933747d9c893374db-ubuntu17.04.profile | 0 ...92284ef45163428dd58023854d-debian7.profile | 0 ...b2903585f171e4290ff0602b5-fedora24.profile | 0 ...7d39e0abf8c265ffb144d6ca-comments1.profile | 0 ...148659c5baaa499259bbc-opensuse42.1.profile | 0 ...2e6092bde6b789d9a3c21b-ubuntu14.04.profile | 0 ...68be04e51bb25687a361e535c-fedora25.profile | 0 ...3d71ca678fea89ef1989695b3-nobtrfs1.profile | 0 ...3c8c95cb7d93f75693d2b25f764d-rhel6.profile | 0 ...85fd9ab985a4c47025884999f-fedora24.profile | 0 .../boot/boom/profiles/README | 0 ...6cb7c8762cb198a8ba49e-opensuse42.3.profile | 0 ...416bb914418b051e2d8d72d13b32-rhel5.profile | 0 ...9c01ce2081e9158eafa1920fa632-rhel8.profile | 0 ...47122f05658a2721f53c3aae4a039-foo1.profile | 0 ...c5259477cbff7a15b000dd222671-rhel7.profile | 0 ...3384a99fbd402e2ea5bcba5a49-fedora1.profile | 0 ...b1da75f0e893d5a30db8e308b58-nolvm1.profile | 0 ...9f1160c0b0291407e5990b9e0-fedora26.profile | 0 ...310fec02d25925688e4840a7869a-rhel4.profile | 0 .../{boom_off => default}/boot/grub2/grub.cfg | 0 .../no_boom/boot/grub2/grub.cfg | 10 ------ .../no_boom/etc/grub.d/42_boom | 35 ------------------- .../no_grub_d/boot/grub2/grub.cfg | 10 ------ .../no_grub_d/etc/default/boom | 3 -- tests/bootloader_tests.py | 26 +------------- 46 files changed, 1 insertion(+), 213 deletions(-) delete mode 100644 etc/default/boom delete mode 100755 etc/grub.d/42_boom delete mode 100644 tests/bootloader_configs/boom_off/etc/default/boom delete mode 100755 tests/bootloader_configs/boom_off/etc/grub.d/42_boom delete mode 100644 tests/bootloader_configs/boom_on/boot/grub2/grub.cfg delete mode 100644 tests/bootloader_configs/boom_on/etc/default/boom delete mode 100755 tests/bootloader_configs/boom_on/etc/grub.d/42_boom rename tests/bootloader_configs/{boom_on => default}/boot/boom/boom.conf (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/hosts/1a979bb835db0ce920557cc4acde98e84f671e3b-localhost-testing.host (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/hosts/2b4048d37f3c42b1d5e2a9ede501b2815fac9c69-localhost.host (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/hosts/373ccd1b66af9058ce49f0ba735fe63c50ba1d98-localhost-ALABEL.host (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/hosts/badbadbad-5ebcb1fa34dd831bf37c27caf168695409e2f0b4-localhost.host (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/hosts/cb7b3ebbd37511ed08919f7561c5ae6663ab027f-qux.host (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/01f4a140de8c7cb9083be599e61d26bdff2c2c97-debian8.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/21e37c8002f33c177524192b15d91dc9612343a3-ubuntu16.04.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/28851f93a99cad97a0082fcd0270da994b2bff7a-newos1.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/3ee2c8b6e7b5043d305bc2850ba01f4838739a1b-nooptions1.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/3fc389bba581e5b20c6a46c7fc31b04be465e973-rhel7.2.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/3fda8a315ae33e869ba1756cce40c7d8c4c24db9-blanks1.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/418203ef8b710a2dc125676933747d9c893374db-ubuntu17.04.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/6bae4a4aea177592284ef45163428dd58023854d-debian7.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/6bf746bb7231693b2903585f171e4290ff0602b5-fedora24.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/6cc6727da76d21db7d39e0abf8c265ffb144d6ca-comments1.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/7dbe237be02bc028a95148659c5baaa499259bbc-opensuse42.1.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/81a78ae30161f02d8b2e6092bde6b789d9a3c21b-ubuntu14.04.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/9736c347ccb724368be04e51bb25687a361e535c-fedora25.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/987f0daf2d004093d71ca678fea89ef1989695b3-nobtrfs1.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/98c3edb94b7b3c8c95cb7d93f75693d2b25f764d-rhel6.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/9cb53ddda889d6285fd9ab985a4c47025884999f-fedora24.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/README (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/af602322b29a22d002e6cb7c8762cb198a8ba49e-opensuse42.3.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/b730331f540c416bb914418b051e2d8d72d13b32-rhel5.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/b99ea5fd28c19c01ce2081e9158eafa1920fa632-rhel8.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/bab31a35db247122f05658a2721f53c3aae4a039-foo1.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/c0b921ea84dbc5259477cbff7a15b000dd222671-rhel7.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/c48d3c2d3fe9c53384a99fbd402e2ea5bcba5a49-fedora1.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/d3e1bd82b33d0b1da75f0e893d5a30db8e308b58-nolvm1.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/d4439b7d2f928c39f1160c0b0291407e5990b9e0-fedora26.profile (100%) rename tests/bootloader_configs/{boom_on => default}/boot/boom/profiles/efd6d41ee868310fec02d25925688e4840a7869a-rhel4.profile (100%) rename tests/bootloader_configs/{boom_off => default}/boot/grub2/grub.cfg (100%) delete mode 100644 tests/bootloader_configs/no_boom/boot/grub2/grub.cfg delete mode 100755 tests/bootloader_configs/no_boom/etc/grub.d/42_boom delete mode 100644 tests/bootloader_configs/no_grub_d/boot/grub2/grub.cfg delete mode 100644 tests/bootloader_configs/no_grub_d/etc/default/boom diff --git a/boom.spec b/boom.spec index 8b297e9..7e88e65 100644 --- a/boom.spec +++ b/boom.spec @@ -96,12 +96,6 @@ rm -r doc/_build %install %py3_install -# Install Grub2 integration scripts -mkdir -p ${RPM_BUILD_ROOT}/etc/grub.d -mkdir -p ${RPM_BUILD_ROOT}/etc/default -install -m 755 etc/grub.d/42_boom ${RPM_BUILD_ROOT}/etc/grub.d -install -m 644 etc/default/boom ${RPM_BUILD_ROOT}/etc/default - # Make configuration directories # mode 0700 - in line with /boot/grub2 directory: install -d -m 700 ${RPM_BUILD_ROOT}/boot/boom/profiles diff --git a/etc/default/boom b/etc/default/boom deleted file mode 100644 index 451cb37..0000000 --- a/etc/default/boom +++ /dev/null @@ -1,3 +0,0 @@ -BOOM_USE_SUBMENU="no" -BOOM_SUBMENU_NAME="Snapshots" -BOOM_ENABLE_GRUB="no" diff --git a/etc/grub.d/42_boom b/etc/grub.d/42_boom deleted file mode 100755 index 85611dd..0000000 --- a/etc/grub.d/42_boom +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -BOOM_CONFIG="/etc/default/boom" -. $BOOM_CONFIG - -BOOM_USE_SUBMENU="${BOOM_USE_SUBMENU:-yes}" -BOOM_SUBMENU_NAME="${BOOM_SUBMENU_NAME:-Snapshots}" -BOOM_ENABLE_GRUB="${BOOM_ENABLE_GRUB:-no}" - -# Indentation for body of submenu commands -SUBMENU_PREFIX=" " - -INSMOD_CMD="insmod blscfg" -IMPORT_CMD="bls_import" - -# Test whether boom grub menu entries are enabled -if [ "$BOOM_ENABLE_GRUB" = "no" -o "$BOOM_ENABLE_GRUB" = "n" ]; then - exit -fi - -# Do not generate grub configuration unless boom entries have -# been configured. -if [ -z "$(boom list --noheadings)" ]; then - exit -fi - -# Optional submenu support -if [ "$BOOM_USE_SUBMENU" = "yes" -o "$BOOM_SUBMENU_NAME" = "y" ]; then - echo "submenu \"$BOOM_SUBMENU_NAME\" {" - echo "${SUBMENU_PREFIX}${INSMOD_CMD}" - echo "${SUBMENU_PREFIX}${IMPORT_CMD}" - echo "}" -else - echo ${INSMOD_CMD} - echo ${IMPORT_CMD} -fi diff --git a/tests/bootloader_configs/boom_off/etc/default/boom b/tests/bootloader_configs/boom_off/etc/default/boom deleted file mode 100644 index dfb766c..0000000 --- a/tests/bootloader_configs/boom_off/etc/default/boom +++ /dev/null @@ -1,3 +0,0 @@ -BOOM_USE_SUBMENU="yes" -BOOM_SUBMENU_NAME="Snapshots" -BOOM_ENABLE_GRUB="no" diff --git a/tests/bootloader_configs/boom_off/etc/grub.d/42_boom b/tests/bootloader_configs/boom_off/etc/grub.d/42_boom deleted file mode 100755 index 85611dd..0000000 --- a/tests/bootloader_configs/boom_off/etc/grub.d/42_boom +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -BOOM_CONFIG="/etc/default/boom" -. $BOOM_CONFIG - -BOOM_USE_SUBMENU="${BOOM_USE_SUBMENU:-yes}" -BOOM_SUBMENU_NAME="${BOOM_SUBMENU_NAME:-Snapshots}" -BOOM_ENABLE_GRUB="${BOOM_ENABLE_GRUB:-no}" - -# Indentation for body of submenu commands -SUBMENU_PREFIX=" " - -INSMOD_CMD="insmod blscfg" -IMPORT_CMD="bls_import" - -# Test whether boom grub menu entries are enabled -if [ "$BOOM_ENABLE_GRUB" = "no" -o "$BOOM_ENABLE_GRUB" = "n" ]; then - exit -fi - -# Do not generate grub configuration unless boom entries have -# been configured. -if [ -z "$(boom list --noheadings)" ]; then - exit -fi - -# Optional submenu support -if [ "$BOOM_USE_SUBMENU" = "yes" -o "$BOOM_SUBMENU_NAME" = "y" ]; then - echo "submenu \"$BOOM_SUBMENU_NAME\" {" - echo "${SUBMENU_PREFIX}${INSMOD_CMD}" - echo "${SUBMENU_PREFIX}${IMPORT_CMD}" - echo "}" -else - echo ${INSMOD_CMD} - echo ${IMPORT_CMD} -fi diff --git a/tests/bootloader_configs/boom_on/boot/grub2/grub.cfg b/tests/bootloader_configs/boom_on/boot/grub2/grub.cfg deleted file mode 100644 index 4e94cc8..0000000 --- a/tests/bootloader_configs/boom_on/boot/grub2/grub.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# -# Fake grub.cfg for check_bootloader() tests. -# - -### BEGIN /etc/grub.d/42_boom ### -submenu "Snapshots" { - insmod blscfg - bls_import -} -### END /etc/grub.d/42_boom ### diff --git a/tests/bootloader_configs/boom_on/etc/default/boom b/tests/bootloader_configs/boom_on/etc/default/boom deleted file mode 100644 index cd5f772..0000000 --- a/tests/bootloader_configs/boom_on/etc/default/boom +++ /dev/null @@ -1,3 +0,0 @@ -BOOM_USE_SUBMENU="yes" -BOOM_SUBMENU_NAME="Snapshots" -BOOM_ENABLE_GRUB="yes" diff --git a/tests/bootloader_configs/boom_on/etc/grub.d/42_boom b/tests/bootloader_configs/boom_on/etc/grub.d/42_boom deleted file mode 100755 index 85611dd..0000000 --- a/tests/bootloader_configs/boom_on/etc/grub.d/42_boom +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -BOOM_CONFIG="/etc/default/boom" -. $BOOM_CONFIG - -BOOM_USE_SUBMENU="${BOOM_USE_SUBMENU:-yes}" -BOOM_SUBMENU_NAME="${BOOM_SUBMENU_NAME:-Snapshots}" -BOOM_ENABLE_GRUB="${BOOM_ENABLE_GRUB:-no}" - -# Indentation for body of submenu commands -SUBMENU_PREFIX=" " - -INSMOD_CMD="insmod blscfg" -IMPORT_CMD="bls_import" - -# Test whether boom grub menu entries are enabled -if [ "$BOOM_ENABLE_GRUB" = "no" -o "$BOOM_ENABLE_GRUB" = "n" ]; then - exit -fi - -# Do not generate grub configuration unless boom entries have -# been configured. -if [ -z "$(boom list --noheadings)" ]; then - exit -fi - -# Optional submenu support -if [ "$BOOM_USE_SUBMENU" = "yes" -o "$BOOM_SUBMENU_NAME" = "y" ]; then - echo "submenu \"$BOOM_SUBMENU_NAME\" {" - echo "${SUBMENU_PREFIX}${INSMOD_CMD}" - echo "${SUBMENU_PREFIX}${IMPORT_CMD}" - echo "}" -else - echo ${INSMOD_CMD} - echo ${IMPORT_CMD} -fi diff --git a/tests/bootloader_configs/boom_on/boot/boom/boom.conf b/tests/bootloader_configs/default/boot/boom/boom.conf similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/boom.conf rename to tests/bootloader_configs/default/boot/boom/boom.conf diff --git a/tests/bootloader_configs/boom_on/boot/boom/hosts/1a979bb835db0ce920557cc4acde98e84f671e3b-localhost-testing.host b/tests/bootloader_configs/default/boot/boom/hosts/1a979bb835db0ce920557cc4acde98e84f671e3b-localhost-testing.host similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/hosts/1a979bb835db0ce920557cc4acde98e84f671e3b-localhost-testing.host rename to tests/bootloader_configs/default/boot/boom/hosts/1a979bb835db0ce920557cc4acde98e84f671e3b-localhost-testing.host diff --git a/tests/bootloader_configs/boom_on/boot/boom/hosts/2b4048d37f3c42b1d5e2a9ede501b2815fac9c69-localhost.host b/tests/bootloader_configs/default/boot/boom/hosts/2b4048d37f3c42b1d5e2a9ede501b2815fac9c69-localhost.host similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/hosts/2b4048d37f3c42b1d5e2a9ede501b2815fac9c69-localhost.host rename to tests/bootloader_configs/default/boot/boom/hosts/2b4048d37f3c42b1d5e2a9ede501b2815fac9c69-localhost.host diff --git a/tests/bootloader_configs/boom_on/boot/boom/hosts/373ccd1b66af9058ce49f0ba735fe63c50ba1d98-localhost-ALABEL.host b/tests/bootloader_configs/default/boot/boom/hosts/373ccd1b66af9058ce49f0ba735fe63c50ba1d98-localhost-ALABEL.host similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/hosts/373ccd1b66af9058ce49f0ba735fe63c50ba1d98-localhost-ALABEL.host rename to tests/bootloader_configs/default/boot/boom/hosts/373ccd1b66af9058ce49f0ba735fe63c50ba1d98-localhost-ALABEL.host diff --git a/tests/bootloader_configs/boom_on/boot/boom/hosts/badbadbad-5ebcb1fa34dd831bf37c27caf168695409e2f0b4-localhost.host b/tests/bootloader_configs/default/boot/boom/hosts/badbadbad-5ebcb1fa34dd831bf37c27caf168695409e2f0b4-localhost.host similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/hosts/badbadbad-5ebcb1fa34dd831bf37c27caf168695409e2f0b4-localhost.host rename to tests/bootloader_configs/default/boot/boom/hosts/badbadbad-5ebcb1fa34dd831bf37c27caf168695409e2f0b4-localhost.host diff --git a/tests/bootloader_configs/boom_on/boot/boom/hosts/cb7b3ebbd37511ed08919f7561c5ae6663ab027f-qux.host b/tests/bootloader_configs/default/boot/boom/hosts/cb7b3ebbd37511ed08919f7561c5ae6663ab027f-qux.host similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/hosts/cb7b3ebbd37511ed08919f7561c5ae6663ab027f-qux.host rename to tests/bootloader_configs/default/boot/boom/hosts/cb7b3ebbd37511ed08919f7561c5ae6663ab027f-qux.host diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/01f4a140de8c7cb9083be599e61d26bdff2c2c97-debian8.profile b/tests/bootloader_configs/default/boot/boom/profiles/01f4a140de8c7cb9083be599e61d26bdff2c2c97-debian8.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/01f4a140de8c7cb9083be599e61d26bdff2c2c97-debian8.profile rename to tests/bootloader_configs/default/boot/boom/profiles/01f4a140de8c7cb9083be599e61d26bdff2c2c97-debian8.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/21e37c8002f33c177524192b15d91dc9612343a3-ubuntu16.04.profile b/tests/bootloader_configs/default/boot/boom/profiles/21e37c8002f33c177524192b15d91dc9612343a3-ubuntu16.04.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/21e37c8002f33c177524192b15d91dc9612343a3-ubuntu16.04.profile rename to tests/bootloader_configs/default/boot/boom/profiles/21e37c8002f33c177524192b15d91dc9612343a3-ubuntu16.04.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/28851f93a99cad97a0082fcd0270da994b2bff7a-newos1.profile b/tests/bootloader_configs/default/boot/boom/profiles/28851f93a99cad97a0082fcd0270da994b2bff7a-newos1.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/28851f93a99cad97a0082fcd0270da994b2bff7a-newos1.profile rename to tests/bootloader_configs/default/boot/boom/profiles/28851f93a99cad97a0082fcd0270da994b2bff7a-newos1.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/3ee2c8b6e7b5043d305bc2850ba01f4838739a1b-nooptions1.profile b/tests/bootloader_configs/default/boot/boom/profiles/3ee2c8b6e7b5043d305bc2850ba01f4838739a1b-nooptions1.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/3ee2c8b6e7b5043d305bc2850ba01f4838739a1b-nooptions1.profile rename to tests/bootloader_configs/default/boot/boom/profiles/3ee2c8b6e7b5043d305bc2850ba01f4838739a1b-nooptions1.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/3fc389bba581e5b20c6a46c7fc31b04be465e973-rhel7.2.profile b/tests/bootloader_configs/default/boot/boom/profiles/3fc389bba581e5b20c6a46c7fc31b04be465e973-rhel7.2.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/3fc389bba581e5b20c6a46c7fc31b04be465e973-rhel7.2.profile rename to tests/bootloader_configs/default/boot/boom/profiles/3fc389bba581e5b20c6a46c7fc31b04be465e973-rhel7.2.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/3fda8a315ae33e869ba1756cce40c7d8c4c24db9-blanks1.profile b/tests/bootloader_configs/default/boot/boom/profiles/3fda8a315ae33e869ba1756cce40c7d8c4c24db9-blanks1.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/3fda8a315ae33e869ba1756cce40c7d8c4c24db9-blanks1.profile rename to tests/bootloader_configs/default/boot/boom/profiles/3fda8a315ae33e869ba1756cce40c7d8c4c24db9-blanks1.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/418203ef8b710a2dc125676933747d9c893374db-ubuntu17.04.profile b/tests/bootloader_configs/default/boot/boom/profiles/418203ef8b710a2dc125676933747d9c893374db-ubuntu17.04.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/418203ef8b710a2dc125676933747d9c893374db-ubuntu17.04.profile rename to tests/bootloader_configs/default/boot/boom/profiles/418203ef8b710a2dc125676933747d9c893374db-ubuntu17.04.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/6bae4a4aea177592284ef45163428dd58023854d-debian7.profile b/tests/bootloader_configs/default/boot/boom/profiles/6bae4a4aea177592284ef45163428dd58023854d-debian7.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/6bae4a4aea177592284ef45163428dd58023854d-debian7.profile rename to tests/bootloader_configs/default/boot/boom/profiles/6bae4a4aea177592284ef45163428dd58023854d-debian7.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/6bf746bb7231693b2903585f171e4290ff0602b5-fedora24.profile b/tests/bootloader_configs/default/boot/boom/profiles/6bf746bb7231693b2903585f171e4290ff0602b5-fedora24.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/6bf746bb7231693b2903585f171e4290ff0602b5-fedora24.profile rename to tests/bootloader_configs/default/boot/boom/profiles/6bf746bb7231693b2903585f171e4290ff0602b5-fedora24.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/6cc6727da76d21db7d39e0abf8c265ffb144d6ca-comments1.profile b/tests/bootloader_configs/default/boot/boom/profiles/6cc6727da76d21db7d39e0abf8c265ffb144d6ca-comments1.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/6cc6727da76d21db7d39e0abf8c265ffb144d6ca-comments1.profile rename to tests/bootloader_configs/default/boot/boom/profiles/6cc6727da76d21db7d39e0abf8c265ffb144d6ca-comments1.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/7dbe237be02bc028a95148659c5baaa499259bbc-opensuse42.1.profile b/tests/bootloader_configs/default/boot/boom/profiles/7dbe237be02bc028a95148659c5baaa499259bbc-opensuse42.1.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/7dbe237be02bc028a95148659c5baaa499259bbc-opensuse42.1.profile rename to tests/bootloader_configs/default/boot/boom/profiles/7dbe237be02bc028a95148659c5baaa499259bbc-opensuse42.1.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/81a78ae30161f02d8b2e6092bde6b789d9a3c21b-ubuntu14.04.profile b/tests/bootloader_configs/default/boot/boom/profiles/81a78ae30161f02d8b2e6092bde6b789d9a3c21b-ubuntu14.04.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/81a78ae30161f02d8b2e6092bde6b789d9a3c21b-ubuntu14.04.profile rename to tests/bootloader_configs/default/boot/boom/profiles/81a78ae30161f02d8b2e6092bde6b789d9a3c21b-ubuntu14.04.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/9736c347ccb724368be04e51bb25687a361e535c-fedora25.profile b/tests/bootloader_configs/default/boot/boom/profiles/9736c347ccb724368be04e51bb25687a361e535c-fedora25.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/9736c347ccb724368be04e51bb25687a361e535c-fedora25.profile rename to tests/bootloader_configs/default/boot/boom/profiles/9736c347ccb724368be04e51bb25687a361e535c-fedora25.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/987f0daf2d004093d71ca678fea89ef1989695b3-nobtrfs1.profile b/tests/bootloader_configs/default/boot/boom/profiles/987f0daf2d004093d71ca678fea89ef1989695b3-nobtrfs1.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/987f0daf2d004093d71ca678fea89ef1989695b3-nobtrfs1.profile rename to tests/bootloader_configs/default/boot/boom/profiles/987f0daf2d004093d71ca678fea89ef1989695b3-nobtrfs1.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/98c3edb94b7b3c8c95cb7d93f75693d2b25f764d-rhel6.profile b/tests/bootloader_configs/default/boot/boom/profiles/98c3edb94b7b3c8c95cb7d93f75693d2b25f764d-rhel6.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/98c3edb94b7b3c8c95cb7d93f75693d2b25f764d-rhel6.profile rename to tests/bootloader_configs/default/boot/boom/profiles/98c3edb94b7b3c8c95cb7d93f75693d2b25f764d-rhel6.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/9cb53ddda889d6285fd9ab985a4c47025884999f-fedora24.profile b/tests/bootloader_configs/default/boot/boom/profiles/9cb53ddda889d6285fd9ab985a4c47025884999f-fedora24.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/9cb53ddda889d6285fd9ab985a4c47025884999f-fedora24.profile rename to tests/bootloader_configs/default/boot/boom/profiles/9cb53ddda889d6285fd9ab985a4c47025884999f-fedora24.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/README b/tests/bootloader_configs/default/boot/boom/profiles/README similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/README rename to tests/bootloader_configs/default/boot/boom/profiles/README diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/af602322b29a22d002e6cb7c8762cb198a8ba49e-opensuse42.3.profile b/tests/bootloader_configs/default/boot/boom/profiles/af602322b29a22d002e6cb7c8762cb198a8ba49e-opensuse42.3.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/af602322b29a22d002e6cb7c8762cb198a8ba49e-opensuse42.3.profile rename to tests/bootloader_configs/default/boot/boom/profiles/af602322b29a22d002e6cb7c8762cb198a8ba49e-opensuse42.3.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/b730331f540c416bb914418b051e2d8d72d13b32-rhel5.profile b/tests/bootloader_configs/default/boot/boom/profiles/b730331f540c416bb914418b051e2d8d72d13b32-rhel5.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/b730331f540c416bb914418b051e2d8d72d13b32-rhel5.profile rename to tests/bootloader_configs/default/boot/boom/profiles/b730331f540c416bb914418b051e2d8d72d13b32-rhel5.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/b99ea5fd28c19c01ce2081e9158eafa1920fa632-rhel8.profile b/tests/bootloader_configs/default/boot/boom/profiles/b99ea5fd28c19c01ce2081e9158eafa1920fa632-rhel8.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/b99ea5fd28c19c01ce2081e9158eafa1920fa632-rhel8.profile rename to tests/bootloader_configs/default/boot/boom/profiles/b99ea5fd28c19c01ce2081e9158eafa1920fa632-rhel8.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/bab31a35db247122f05658a2721f53c3aae4a039-foo1.profile b/tests/bootloader_configs/default/boot/boom/profiles/bab31a35db247122f05658a2721f53c3aae4a039-foo1.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/bab31a35db247122f05658a2721f53c3aae4a039-foo1.profile rename to tests/bootloader_configs/default/boot/boom/profiles/bab31a35db247122f05658a2721f53c3aae4a039-foo1.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/c0b921ea84dbc5259477cbff7a15b000dd222671-rhel7.profile b/tests/bootloader_configs/default/boot/boom/profiles/c0b921ea84dbc5259477cbff7a15b000dd222671-rhel7.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/c0b921ea84dbc5259477cbff7a15b000dd222671-rhel7.profile rename to tests/bootloader_configs/default/boot/boom/profiles/c0b921ea84dbc5259477cbff7a15b000dd222671-rhel7.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/c48d3c2d3fe9c53384a99fbd402e2ea5bcba5a49-fedora1.profile b/tests/bootloader_configs/default/boot/boom/profiles/c48d3c2d3fe9c53384a99fbd402e2ea5bcba5a49-fedora1.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/c48d3c2d3fe9c53384a99fbd402e2ea5bcba5a49-fedora1.profile rename to tests/bootloader_configs/default/boot/boom/profiles/c48d3c2d3fe9c53384a99fbd402e2ea5bcba5a49-fedora1.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/d3e1bd82b33d0b1da75f0e893d5a30db8e308b58-nolvm1.profile b/tests/bootloader_configs/default/boot/boom/profiles/d3e1bd82b33d0b1da75f0e893d5a30db8e308b58-nolvm1.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/d3e1bd82b33d0b1da75f0e893d5a30db8e308b58-nolvm1.profile rename to tests/bootloader_configs/default/boot/boom/profiles/d3e1bd82b33d0b1da75f0e893d5a30db8e308b58-nolvm1.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/d4439b7d2f928c39f1160c0b0291407e5990b9e0-fedora26.profile b/tests/bootloader_configs/default/boot/boom/profiles/d4439b7d2f928c39f1160c0b0291407e5990b9e0-fedora26.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/d4439b7d2f928c39f1160c0b0291407e5990b9e0-fedora26.profile rename to tests/bootloader_configs/default/boot/boom/profiles/d4439b7d2f928c39f1160c0b0291407e5990b9e0-fedora26.profile diff --git a/tests/bootloader_configs/boom_on/boot/boom/profiles/efd6d41ee868310fec02d25925688e4840a7869a-rhel4.profile b/tests/bootloader_configs/default/boot/boom/profiles/efd6d41ee868310fec02d25925688e4840a7869a-rhel4.profile similarity index 100% rename from tests/bootloader_configs/boom_on/boot/boom/profiles/efd6d41ee868310fec02d25925688e4840a7869a-rhel4.profile rename to tests/bootloader_configs/default/boot/boom/profiles/efd6d41ee868310fec02d25925688e4840a7869a-rhel4.profile diff --git a/tests/bootloader_configs/boom_off/boot/grub2/grub.cfg b/tests/bootloader_configs/default/boot/grub2/grub.cfg similarity index 100% rename from tests/bootloader_configs/boom_off/boot/grub2/grub.cfg rename to tests/bootloader_configs/default/boot/grub2/grub.cfg diff --git a/tests/bootloader_configs/no_boom/boot/grub2/grub.cfg b/tests/bootloader_configs/no_boom/boot/grub2/grub.cfg deleted file mode 100644 index 4e94cc8..0000000 --- a/tests/bootloader_configs/no_boom/boot/grub2/grub.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# -# Fake grub.cfg for check_bootloader() tests. -# - -### BEGIN /etc/grub.d/42_boom ### -submenu "Snapshots" { - insmod blscfg - bls_import -} -### END /etc/grub.d/42_boom ### diff --git a/tests/bootloader_configs/no_boom/etc/grub.d/42_boom b/tests/bootloader_configs/no_boom/etc/grub.d/42_boom deleted file mode 100755 index 85611dd..0000000 --- a/tests/bootloader_configs/no_boom/etc/grub.d/42_boom +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -BOOM_CONFIG="/etc/default/boom" -. $BOOM_CONFIG - -BOOM_USE_SUBMENU="${BOOM_USE_SUBMENU:-yes}" -BOOM_SUBMENU_NAME="${BOOM_SUBMENU_NAME:-Snapshots}" -BOOM_ENABLE_GRUB="${BOOM_ENABLE_GRUB:-no}" - -# Indentation for body of submenu commands -SUBMENU_PREFIX=" " - -INSMOD_CMD="insmod blscfg" -IMPORT_CMD="bls_import" - -# Test whether boom grub menu entries are enabled -if [ "$BOOM_ENABLE_GRUB" = "no" -o "$BOOM_ENABLE_GRUB" = "n" ]; then - exit -fi - -# Do not generate grub configuration unless boom entries have -# been configured. -if [ -z "$(boom list --noheadings)" ]; then - exit -fi - -# Optional submenu support -if [ "$BOOM_USE_SUBMENU" = "yes" -o "$BOOM_SUBMENU_NAME" = "y" ]; then - echo "submenu \"$BOOM_SUBMENU_NAME\" {" - echo "${SUBMENU_PREFIX}${INSMOD_CMD}" - echo "${SUBMENU_PREFIX}${IMPORT_CMD}" - echo "}" -else - echo ${INSMOD_CMD} - echo ${IMPORT_CMD} -fi diff --git a/tests/bootloader_configs/no_grub_d/boot/grub2/grub.cfg b/tests/bootloader_configs/no_grub_d/boot/grub2/grub.cfg deleted file mode 100644 index 4e94cc8..0000000 --- a/tests/bootloader_configs/no_grub_d/boot/grub2/grub.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# -# Fake grub.cfg for check_bootloader() tests. -# - -### BEGIN /etc/grub.d/42_boom ### -submenu "Snapshots" { - insmod blscfg - bls_import -} -### END /etc/grub.d/42_boom ### diff --git a/tests/bootloader_configs/no_grub_d/etc/default/boom b/tests/bootloader_configs/no_grub_d/etc/default/boom deleted file mode 100644 index cd5f772..0000000 --- a/tests/bootloader_configs/no_grub_d/etc/default/boom +++ /dev/null @@ -1,3 +0,0 @@ -BOOM_USE_SUBMENU="yes" -BOOM_SUBMENU_NAME="Snapshots" -BOOM_ENABLE_GRUB="yes" diff --git a/tests/bootloader_tests.py b/tests/bootloader_tests.py index 7126766..f6462e3 100644 --- a/tests/bootloader_tests.py +++ b/tests/bootloader_tests.py @@ -1171,34 +1171,10 @@ class BootLoaderTestsWithData(unittest.TestCase): class BootLoaderTestsBoomOn(BootLoaderTestsWithData): # Boot config with boom disabled - bootloader_config = "boom_on" + bootloader_config = "default" def test_check_bootloader(self): self.bootloader_config_check(True) -class BootLoaderTestsBoomOff(BootLoaderTestsWithData): - # Boot config with boom disabled - bootloader_config = "boom_off" - - def test_check_bootloader(self): - self.bootloader_config_check(True) - - -class BootLoaderTestsNoBoom(BootLoaderTestsWithData): - # Boot config with no boom configuration - bootloader_config = "no_boom" - - def test_check_bootloader(self): - self.bootloader_config_check(False) - - -class BootLoaderTestsNoGrubD(BootLoaderTestsWithData): - # Boot config with no boom configuration - bootloader_config = "no_grub_d" - - def test_check_bootloader(self): - self.bootloader_config_check(False) - - # vim: set et ts=4 sw=4 : -- 2.45.2