From: Michael Tremer Date: Fri, 20 Jul 2018 11:51:50 +0000 (+0000) Subject: Move update-bootloader script into installer X-Git-Tag: v2.21-core124~77^2~11 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=befc0404976287adfd52f76dd9c3a4ab6afe2ab9 Move update-bootloader script into installer Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index 70a33d6591..110114c478 100644 --- a/config/rootfiles/common/aarch64/stage2 +++ b/config/rootfiles/common/aarch64/stage2 @@ -103,7 +103,6 @@ usr/local/bin/scanhd usr/local/bin/settime usr/local/bin/timecheck usr/local/bin/timezone-transition -usr/local/bin/update-bootloader usr/local/bin/update-lang-cache usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update diff --git a/config/rootfiles/common/installer b/config/rootfiles/common/installer index ff8cda5981..d4abb97aac 100644 --- a/config/rootfiles/common/installer +++ b/config/rootfiles/common/installer @@ -1,5 +1,6 @@ #usr/bin/downloadsource.sh #usr/bin/execute-postinstall.sh +usr/bin/install-bootloader #usr/bin/installer #usr/bin/start-networking.sh #usr/lib/dracut/modules.d/99installer diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index a5ba6ae269..5665f23012 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -101,7 +101,6 @@ usr/local/bin/scanhd usr/local/bin/settime usr/local/bin/timecheck usr/local/bin/timezone-transition -usr/local/bin/update-bootloader usr/local/bin/update-lang-cache usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index 70a33d6591..110114c478 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -103,7 +103,6 @@ usr/local/bin/scanhd usr/local/bin/settime usr/local/bin/timecheck usr/local/bin/timezone-transition -usr/local/bin/update-bootloader usr/local/bin/update-lang-cache usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update diff --git a/src/installer/Makefile.am b/src/installer/Makefile.am index d0e52dc187..32f01bfa66 100644 --- a/src/installer/Makefile.am +++ b/src/installer/Makefile.am @@ -35,6 +35,7 @@ bin_PROGRAMS = \ bin_SCRIPTS = \ downloadsource.sh \ execute-postinstall.sh \ + install-bootloader \ start-networking.sh #- installer ------------------------------------------------------------------- diff --git a/src/scripts/update-bootloader b/src/installer/install-bootloader similarity index 100% rename from src/scripts/update-bootloader rename to src/installer/install-bootloader