Move update-bootloader script into installer

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index 70a33d6591ce33720f9606a9348981999f95f8fb..110114c478482e0dbc4ad67bc1ab2be81e51e165 100644 (file)
--- 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/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
 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 ff8cda5981b66b75ed61dcfbdab7ce282e77292f..d4abb97aac0550699a820fc2241270d7892c84e4 100644 (file)
--- 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/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
 #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 a5ba6ae26969ac3e53b05fda5fa8eac524d0b4b9..5665f230129c36fa2829d266b2f3d44b5b90bc44 100644 (file)
--- 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/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
 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 70a33d6591ce33720f9606a9348981999f95f8fb..110114c478482e0dbc4ad67bc1ab2be81e51e165 100644 (file)
--- 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/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
 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 d0e52dc187aaa9b6c697bfd1d13c9b266e31b177..32f01bfa66183cb654398f866fcf9e5dd32ae00f 100644 (file)
--- a/src/installer/Makefile.am
+++ b/src/installer/Makefile.am
@@ -35,6 +35,7 @@ bin_PROGRAMS = \
 bin_SCRIPTS = \
        downloadsource.sh \
        execute-postinstall.sh \
 bin_SCRIPTS = \
        downloadsource.sh \
        execute-postinstall.sh \

+       install-bootloader \

        start-networking.sh
 
 #- installer -------------------------------------------------------------------
        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