diff mbox series

swap: Start swap after mounting filesystems

Message ID 20200220190430.30134-1-michael.tremer@ipfire.org
State Accepted
Commit 6b3b3a32abf3ad2d9b018c0e1d5c61f36c3c2b92
Headers
Series swap: Start swap after mounting filesystems |

Commit Message

Michael Tremer Feb. 20, 2020, 7:04 p.m. UTC 
  When using a swap file, it is not being activated correctly
when the filesystem it is residing on is not mounted, yet.

The root file system is mounted read-only here before
S40mountfs is being executed.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/aarch64/initscripts  | 2 +-
 config/rootfiles/common/armv5tel/initscripts | 2 +-
 config/rootfiles/common/i586/initscripts     | 2 +-
 config/rootfiles/common/x86_64/initscripts   | 2 +-
 lfs/initscripts                              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 34ea1433f..9d54101ae 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -184,10 +184,10 @@  etc/rc.d/rcsysinit.d/S05modules
 etc/rc.d/rcsysinit.d/S09lvmetad
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19waitdrives
-etc/rc.d/rcsysinit.d/S20swap
 etc/rc.d/rcsysinit.d/S25partresize
 etc/rc.d/rcsysinit.d/S30checkfs
 etc/rc.d/rcsysinit.d/S40mountfs
+etc/rc.d/rcsysinit.d/S41swap
 etc/rc.d/rcsysinit.d/S42fsresize
 etc/rc.d/rcsysinit.d/S43mounttmpfs
 etc/rc.d/rcsysinit.d/S44smt
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 34ea1433f..9d54101ae 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -184,10 +184,10 @@  etc/rc.d/rcsysinit.d/S05modules
 etc/rc.d/rcsysinit.d/S09lvmetad
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19waitdrives
-etc/rc.d/rcsysinit.d/S20swap
 etc/rc.d/rcsysinit.d/S25partresize
 etc/rc.d/rcsysinit.d/S30checkfs
 etc/rc.d/rcsysinit.d/S40mountfs
+etc/rc.d/rcsysinit.d/S41swap
 etc/rc.d/rcsysinit.d/S42fsresize
 etc/rc.d/rcsysinit.d/S43mounttmpfs
 etc/rc.d/rcsysinit.d/S44smt
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 9350b0e90..120d821a0 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -183,10 +183,10 @@  etc/rc.d/rcsysinit.d/S05modules
 etc/rc.d/rcsysinit.d/S09lvmetad
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19waitdrives
-etc/rc.d/rcsysinit.d/S20swap
 etc/rc.d/rcsysinit.d/S25partresize
 etc/rc.d/rcsysinit.d/S30checkfs
 etc/rc.d/rcsysinit.d/S40mountfs
+etc/rc.d/rcsysinit.d/S41swap
 etc/rc.d/rcsysinit.d/S42fsresize
 etc/rc.d/rcsysinit.d/S43mounttmpfs
 etc/rc.d/rcsysinit.d/S44smt
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 9350b0e90..120d821a0 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -183,10 +183,10 @@  etc/rc.d/rcsysinit.d/S05modules
 etc/rc.d/rcsysinit.d/S09lvmetad
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19waitdrives
-etc/rc.d/rcsysinit.d/S20swap
 etc/rc.d/rcsysinit.d/S25partresize
 etc/rc.d/rcsysinit.d/S30checkfs
 etc/rc.d/rcsysinit.d/S40mountfs
+etc/rc.d/rcsysinit.d/S41swap
 etc/rc.d/rcsysinit.d/S42fsresize
 etc/rc.d/rcsysinit.d/S43mounttmpfs
 etc/rc.d/rcsysinit.d/S44smt
diff --git a/lfs/initscripts b/lfs/initscripts
index 3a769bd99..45059e9d5 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -164,10 +164,10 @@  $(TARGET) :
 	ln -sf ../init.d/lvmetad     /etc/rc.d/rcsysinit.d/S09lvmetad
 	ln -sf ../init.d/udev        /etc/rc.d/rcsysinit.d/S10udev
 	ln -sf ../init.d/waitdrives  /etc/rc.d/rcsysinit.d/S19waitdrives
-	ln -sf ../init.d/swap        /etc/rc.d/rcsysinit.d/S20swap
 	ln -sf ../init.d/partresize  /etc/rc.d/rcsysinit.d/S25partresize
 	ln -sf ../init.d/checkfs     /etc/rc.d/rcsysinit.d/S30checkfs
 	ln -sf ../init.d/mountfs     /etc/rc.d/rcsysinit.d/S40mountfs
+	ln -sf ../init.d/swap        /etc/rc.d/rcsysinit.d/S41swap
 	ln -sf ../init.d/fsresize    /etc/rc.d/rcsysinit.d/S42fsresize
 	ln -sf ../init.d/mounttmpfs  /etc/rc.d/rcsysinit.d/S43mounttmpfs
 	ln -sf ../init.d/smt         /etc/rc.d/rcsysinit.d/S44smt